From 3ff4463b356b79109fd7f71ef4507fb079871659 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 27 Jul 2010 23:45:05 +0000
Subject: Merged revisions 83183,83186 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83183 | ezio.melotti | 2010-07-28 01:03:33 +0300 (Wed, 28 Jul 2010) | 1 line

  Use proper skips and assert* methods in test_asyncore.
........
  r83186 | ezio.melotti | 2010-07-28 01:24:13 +0300 (Wed, 28 Jul 2010) | 1 line

  With skipUnless there is no need to add test classes conditionally.
........
---
 Lib/test/test_asyncore.py | 193 +++++++++++++++++++++++-----------------------
 1 file changed, 96 insertions(+), 97 deletions(-)

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 6973f4b..c352c39 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -117,65 +117,65 @@ class HelperFunctionTests(unittest.TestCase):
     # http://mail.python.org/pipermail/python-list/2001-October/109973.html)
     # These constants should be present as long as poll is available
 
-    if hasattr(select, 'poll'):
-        def test_readwrite(self):
-            # Check that correct methods are called by readwrite()
-
-            attributes = ('read', 'expt', 'write', 'closed', 'error_handled')
-
-            expected = (
-                (select.POLLIN, 'read'),
-                (select.POLLPRI, 'expt'),
-                (select.POLLOUT, 'write'),
-                (select.POLLERR, 'closed'),
-                (select.POLLHUP, 'closed'),
-                (select.POLLNVAL, 'closed'),
-                )
-
-            class testobj:
-                def __init__(self):
-                    self.read = False
-                    self.write = False
-                    self.closed = False
-                    self.expt = False
-                    self.error_handled = False
-
-                def handle_read_event(self):
-                    self.read = True
-
-                def handle_write_event(self):
-                    self.write = True
-
-                def handle_close(self):
-                    self.closed = True
-
-                def handle_expt_event(self):
-                    self.expt = True
-
-                def handle_error(self):
-                    self.error_handled = True
-
-            for flag, expectedattr in expected:
-                tobj = testobj()
-                self.assertEqual(getattr(tobj, expectedattr), False)
-                asyncore.readwrite(tobj, flag)
-
-                # Only the attribute modified by the routine we expect to be
-                # called should be True.
-                for attr in attributes:
-                    self.assertEqual(getattr(tobj, attr), attr==expectedattr)
-
-                # check that ExitNow exceptions in the object handler method
-                # bubbles all the way up through asyncore readwrite call
-                tr1 = exitingdummy()
-                self.assertRaises(asyncore.ExitNow, asyncore.readwrite, tr1, flag)
-
-                # check that an exception other than ExitNow in the object handler
-                # method causes the handle_error method to get called
-                tr2 = crashingdummy()
-                self.assertEqual(tr2.error_handled, False)
-                asyncore.readwrite(tr2, flag)
-                self.assertEqual(tr2.error_handled, True)
+    @unittest.skipUnless(hasattr(select, 'poll'), 'select.poll required')
+    def test_readwrite(self):
+        # Check that correct methods are called by readwrite()
+
+        attributes = ('read', 'expt', 'write', 'closed', 'error_handled')
+
+        expected = (
+            (select.POLLIN, 'read'),
+            (select.POLLPRI, 'expt'),
+            (select.POLLOUT, 'write'),
+            (select.POLLERR, 'closed'),
+            (select.POLLHUP, 'closed'),
+            (select.POLLNVAL, 'closed'),
+            )
+
+        class testobj:
+            def __init__(self):
+                self.read = False
+                self.write = False
+                self.closed = False
+                self.expt = False
+                self.error_handled = False
+
+            def handle_read_event(self):
+                self.read = True
+
+            def handle_write_event(self):
+                self.write = True
+
+            def handle_close(self):
+                self.closed = True
+
+            def handle_expt_event(self):
+                self.expt = True
+
+            def handle_error(self):
+                self.error_handled = True
+
+        for flag, expectedattr in expected:
+            tobj = testobj()
+            self.assertEqual(getattr(tobj, expectedattr), False)
+            asyncore.readwrite(tobj, flag)
+
+            # Only the attribute modified by the routine we expect to be
+            # called should be True.
+            for attr in attributes:
+                self.assertEqual(getattr(tobj, attr), attr==expectedattr)
+
+            # check that ExitNow exceptions in the object handler method
+            # bubbles all the way up through asyncore readwrite call
+            tr1 = exitingdummy()
+            self.assertRaises(asyncore.ExitNow, asyncore.readwrite, tr1, flag)
+
+            # check that an exception other than ExitNow in the object handler
+            # method causes the handle_error method to get called
+            tr2 = crashingdummy()
+            self.assertEqual(tr2.error_handled, False)
+            asyncore.readwrite(tr2, flag)
+            self.assertEqual(tr2.error_handled, True)
 
     def test_closeall(self):
         self.closeall_check(False)
@@ -258,7 +258,7 @@ class DispatcherTests(unittest.TestCase):
             sys.stderr = stderr
 
         lines = fp.getvalue().splitlines()
-        self.assertEquals(lines, ['log: %s' % l1, 'log: %s' % l2])
+        self.assertEqual(lines, ['log: %s' % l1, 'log: %s' % l2])
 
     def test_log_info(self):
         d = asyncore.dispatcher()
@@ -280,7 +280,7 @@ class DispatcherTests(unittest.TestCase):
         lines = fp.getvalue().splitlines()
         expected = ['EGGS: %s' % l1, 'info: %s' % l2, 'SPAM: %s' % l3]
 
-        self.assertEquals(lines, expected)
+        self.assertEqual(lines, expected)
 
     def test_unhandled(self):
         d = asyncore.dispatcher()
@@ -305,7 +305,7 @@ class DispatcherTests(unittest.TestCase):
                     'warning: unhandled write event',
                     'warning: unhandled connect event',
                     'warning: unhandled accept event']
-        self.assertEquals(lines, expected)
+        self.assertEqual(lines, expected)
 
     def test_issue_8594(self):
         # XXX - this test is supposed to be removed in next major Python
@@ -321,7 +321,7 @@ class DispatcherTests(unittest.TestCase):
             warnings.simplefilter("always")
             family = d.family
             self.assertEqual(family, socket.AF_INET)
-            self.assertTrue(len(w) == 1)
+            self.assertEqual(len(w), 1)
             self.assertTrue(issubclass(w[0].category, DeprecationWarning))
 
     def test_strerror(self):
@@ -330,7 +330,7 @@ class DispatcherTests(unittest.TestCase):
         if hasattr(os, 'strerror'):
             self.assertEqual(err, os.strerror(errno.EPERM))
         err = asyncore._strerror(-1)
-        self.assertTrue("unknown error" in err.lower())
+        self.assertIn("unknown error", err.lower())
 
 
 class dispatcherwithsend_noread(asyncore.dispatcher_with_send):
@@ -393,38 +393,40 @@ class DispatcherWithSendTests(unittest.TestCase):
 class DispatcherWithSendTests_UsePoll(DispatcherWithSendTests):
     usepoll = True
 
-if hasattr(asyncore, 'file_wrapper'):
-    class FileWrapperTest(unittest.TestCase):
-        def setUp(self):
-            self.d = "It's not dead, it's sleeping!"
-            file(TESTFN, 'w').write(self.d)
+@unittest.skipUnless(hasattr(asyncore, 'file_wrapper'),
+                     'asyncore.file_wrapper required')
+class FileWrapperTest(unittest.TestCase):
+    def setUp(self):
+        self.d = "It's not dead, it's sleeping!"
+        file(TESTFN, 'w').write(self.d)
+
+    def tearDown(self):
+        unlink(TESTFN)
 
-        def tearDown(self):
-            unlink(TESTFN)
+    def test_recv(self):
+        fd = os.open(TESTFN, os.O_RDONLY)
+        w = asyncore.file_wrapper(fd)
+        os.close(fd)
 
-        def test_recv(self):
-            fd = os.open(TESTFN, os.O_RDONLY)
-            w = asyncore.file_wrapper(fd)
-            os.close(fd)
+        self.assertNotEqual(w.fd, fd)
+        self.assertNotEqual(w.fileno(), fd)
+        self.assertEqual(w.recv(13), "It's not dead")
+        self.assertEqual(w.read(6), ", it's")
+        w.close()
+        self.assertRaises(OSError, w.read, 1)
 
-            self.assertNotEqual(w.fd, fd)
-            self.assertNotEqual(w.fileno(), fd)
-            self.assertEqual(w.recv(13), "It's not dead")
-            self.assertEqual(w.read(6), ", it's")
-            w.close()
-            self.assertRaises(OSError, w.read, 1)
 
-        def test_send(self):
-            d1 = "Come again?"
-            d2 = "I want to buy some cheese."
-            fd = os.open(TESTFN, os.O_WRONLY | os.O_APPEND)
-            w = asyncore.file_wrapper(fd)
-            os.close(fd)
+    def test_send(self):
+        d1 = "Come again?"
+        d2 = "I want to buy some cheese."
+        fd = os.open(TESTFN, os.O_WRONLY | os.O_APPEND)
+        w = asyncore.file_wrapper(fd)
+        os.close(fd)
 
-            w.write(d1)
-            w.send(d2)
-            w.close()
-            self.assertEqual(file(TESTFN).read(), self.d + d1 + d2)
+        w.write(d1)
+        w.send(d2)
+        w.close()
+        self.assertEqual(file(TESTFN).read(), self.d + d1 + d2)
 
 
 class BaseTestHandler(asyncore.dispatcher):
@@ -691,18 +693,15 @@ class BaseTestAPI(unittest.TestCase):
 class TestAPI_UseSelect(BaseTestAPI):
     use_poll = False
 
+@unittest.skipUnless(hasattr(select, 'poll'), 'select.poll required')
 class TestAPI_UsePoll(BaseTestAPI):
     use_poll = True
 
 
 def test_main():
     tests = [HelperFunctionTests, DispatcherTests, DispatcherWithSendTests,
-             DispatcherWithSendTests_UsePoll, TestAPI_UseSelect]
-    if hasattr(asyncore, 'file_wrapper'):
-        tests.append(FileWrapperTest)
-    if hasattr(select, 'poll'):
-        tests.append(TestAPI_UsePoll)
-
+             DispatcherWithSendTests_UsePoll, TestAPI_UseSelect,
+             TestAPI_UsePoll, FileWrapperTest]
     run_unittest(*tests)
 
 if __name__ == "__main__":
-- 
cgit v0.12

 {$fltmax eq $fltmax1}
+} -result 1
+test binary-53.25 {Binary float round to Inf} -body {
+    binary scan [binary format H* 47effffff0000001] Q round_to_inf
+    binary scan [binary format R $round_to_inf] R inf1
+    expr {$inf1 eq Inf}
+} -result 1
+test binary-53.26 {Binary float round to -Inf} -body {
+    binary scan [binary format H* c7effffff0000001] Q round_to_inf
+    binary scan [binary format R $round_to_inf] R inf1
+    expr {$inf1 eq -Inf}
+} -result 1
+
+
 
 # scan t (s)
 test binary-54.1 {Tcl_BinaryObjCmd: scan} -returnCodes error -body {
@@ -2369,6 +2416,22 @@ test binary-62.6 {infinity} ieeeFloatingPoint {
     binary scan [binary format w 0xfff0000000000000] q d
     set d
 } -Inf
+test binary-62.7 {infinity} ieeeFloatingPoint {
+    binary scan [binary format r Inf] iu i
+    format 0x%08x $i
+} 0x7f800000
+test binary-62.8 {infinity} ieeeFloatingPoint {
+    binary scan [binary format r -Inf] iu i
+    format 0x%08x $i
+} 0xff800000
+test binary-62.9 {infinity} ieeeFloatingPoint {
+    binary scan [binary format i 0x7f800000] r d
+    set d
+} Inf
+test binary-62.10 {infinity} ieeeFloatingPoint {
+    binary scan [binary format i 0xff800000] r d
+    set d
+} -Inf
 
 # scan/format Not-a-Number
 
-- 
cgit v0.12


From d61a4c17579c4a064d692e670e06c98c45baff80 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 10 Jan 2017 13:56:10 +0000
Subject: Experimental follow-up: Change internal TclCreateSocketAddress()
 signature, from using "int port" to "const char *service".

---
 generic/tclIOSock.c | 13 +++++--------
 generic/tclInt.h    |  2 +-
 unix/tclUnixSock.c  | 10 +++++++---
 win/tclWinSock.c    | 11 ++++++++---
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 8ad268a..b4a3df4 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -158,7 +158,7 @@ TclCreateSocketAddress(
 				 * family */
     struct addrinfo **addrlist,	/* Socket address list */
     const char *host,		/* Host. NULL implies INADDR_ANY */
-    int port,			/* Port number */
+    const char *service,	/* Service */
     int willBind,		/* Is this an address to bind() to or to
 				 * connect() to? */
     const char **errorMsgPtr)	/* Place to store the error message detail, if
@@ -168,7 +168,7 @@ TclCreateSocketAddress(
     struct addrinfo *p;
     struct addrinfo *v4head = NULL, *v4ptr = NULL;
     struct addrinfo *v6head = NULL, *v6ptr = NULL;
-    char *native = NULL, portbuf[TCL_INTEGER_SPACE], *portstring;
+    char *native = NULL;
     const char *family = NULL;
     Tcl_DString ds;
     int result;
@@ -182,11 +182,8 @@ TclCreateSocketAddress(
      * when the loopback device is the only available network interface.
      */
 
-    if (host != NULL && port == 0) {
-	portstring = NULL;
-    } else {
-	TclFormatInt(portbuf, port);
-	portstring = portbuf;
+    if (host != NULL && service != NULL && !strcmp(service, "0")) {
+       service = NULL;
     }
 
     (void) memset(&hints, 0, sizeof(hints));
@@ -231,7 +228,7 @@ TclCreateSocketAddress(
 	hints.ai_flags |= AI_PASSIVE;
     }
 
-    result = getaddrinfo(native, portstring, &hints, addrlist);
+    result = getaddrinfo(native, service, &hints, addrlist);
 
     if (host != NULL) {
 	Tcl_DStringFree(&ds);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index dd0c11a..5faa275 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3068,7 +3068,7 @@ MODULE_SCOPE void	TclpFinalizePipes(void);
 MODULE_SCOPE void	TclpFinalizeSockets(void);
 MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    struct addrinfo **addrlist,
-			    const char *host, int port, int willBind,
+			    const char *host, const char *service, int willBind,
 			    const char **errorMsgPtr);
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, ClientData clientData,
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 8e97543..63bccae 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1287,13 +1287,17 @@ Tcl_OpenTcpClient(
     const char *errorMsg = NULL;
     struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
     char channelName[SOCK_CHAN_LENGTH];
+    char service[TCL_INTEGER_SPACE], myservice[TCL_INTEGER_SPACE];
 
     /*
      * Do the name lookups for the local and remote addresses.
      */
 
-    if (!TclCreateSocketAddress(interp, &addrlist, host, port, 0, &errorMsg)
-            || !TclCreateSocketAddress(interp, &myaddrlist, myaddr, myport, 1,
+    TclFormatInt(service, port);
+    TclFormatInt(myservice, myport);
+
+    if (!TclCreateSocketAddress(interp, &addrlist, host, service, 0, &errorMsg)
+            || !TclCreateSocketAddress(interp, &myaddrlist, myaddr, myservice, 1,
                     &errorMsg)) {
         if (addrlist != NULL) {
             freeaddrinfo(addrlist);
@@ -1481,7 +1485,7 @@ Tcl_OpenTcpServerEx(
 	goto error;
     }
 
-    if (!TclCreateSocketAddress(interp, &addrlist, myHost, port, 1, &errorMsg)) {
+    if (!TclCreateSocketAddress(interp, &addrlist, myHost, service, 1, &errorMsg)) {
 	my_errno = errno;
 	goto error;
     }
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 5e0d7c8..b2d77a1 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1902,6 +1902,11 @@ Tcl_OpenTcpClient(
     const char *errorMsg = NULL;
     struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
     char channelName[SOCK_CHAN_LENGTH];
+    char service[TCL_INTEGER_SPACE], myservice[TCL_INTEGER_SPACE];
+
+    TclFormatInt(service, port);
+    TclFormatInt(myservice, myport);
+
 
     if (TclpHasSockets(interp) != TCL_OK) {
 	return NULL;
@@ -1921,8 +1926,8 @@ Tcl_OpenTcpClient(
      * Do the name lookups for the local and remote addresses.
      */
 
-    if (!TclCreateSocketAddress(interp, &addrlist, host, port, 0, &errorMsg)
-            || !TclCreateSocketAddress(interp, &myaddrlist, myaddr, myport, 1,
+    if (!TclCreateSocketAddress(interp, &addrlist, host, service, 0, &errorMsg)
+            || !TclCreateSocketAddress(interp, &myaddrlist, myaddr, myservice, 1,
                     &errorMsg)) {
         if (addrlist != NULL) {
             freeaddrinfo(addrlist);
@@ -2078,7 +2083,7 @@ Tcl_OpenTcpServerEx(
 	goto error;
     }
 
-    if (!TclCreateSocketAddress(interp, &addrlist, myHost, port, 1, &errorMsg)) {
+    if (!TclCreateSocketAddress(interp, &addrlist, myHost, service, 1, &errorMsg)) {
 	goto error;
     }
 
-- 
cgit v0.12


From 8c52e2d45db4862de7e7506197321a6a111c65f6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 10 Jan 2017 14:35:13 +0000
Subject: Further experimental follow-up: Add internal function
 TclOpenTcpClientEx(), as companion to Tcl_OpenTcpServerEx(). Should be
 exported through new TIP.

---
 generic/tclIOCmd.c | 19 ++++---------------
 generic/tclInt.h   |  4 ++++
 unix/tclUnixSock.c | 29 ++++++++++++++++++++---------
 win/tclWinSock.c   | 26 ++++++++++++++++++++------
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 1bd3fe7..a5038b7 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1492,10 +1492,10 @@ Tcl_SocketObjCmd(
 	SKT_ASYNC, SKT_MYADDR, SKT_MYPORT, SKT_REUSEADDR, SKT_REUSEPORT,
 	SKT_SERVER
     };
-    int optionIndex, a, server = 0, myport = 0, async = 0, reusep = -1,
+    int optionIndex, a, server = 0, async = 0, reusep = -1,
 	reusea = -1;
     unsigned int flags = 0;
-    const char *host, *port, *myaddr = NULL;
+    const char *host, *port, *myaddr = NULL, *myport = NULL;
     Tcl_Obj *script = NULL;
     Tcl_Channel chan;
 
@@ -1532,18 +1532,13 @@ Tcl_SocketObjCmd(
 	    myaddr = TclGetString(objv[a]);
 	    break;
 	case SKT_MYPORT: {
-	    const char *myPortName;
-
 	    a++;
 	    if (a >= objc) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"no argument given for -myport option", -1));
 		return TCL_ERROR;
 	    }
-	    myPortName = TclGetString(objv[a]);
-	    if (TclSockGetPort(interp, myPortName, "tcp", &myport) != TCL_OK) {
-		return TCL_ERROR;
-	    }
+	    myport = TclGetString(objv[a]);
 	    break;
 	}
 	case SKT_SERVER:
@@ -1670,13 +1665,7 @@ Tcl_SocketObjCmd(
 
 	Tcl_CreateCloseHandler(chan, TcpServerCloseProc, acceptCallbackPtr);
     } else {
-	int portNum;
-
-	if (TclSockGetPort(interp, port, "tcp", &portNum) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-
-	chan = Tcl_OpenTcpClient(interp, portNum, host, myaddr, myport, async);
+	chan = TclOpenTcpClientEx(interp, port, host, myaddr, myport, async);
 	if (chan == NULL) {
 	    return TCL_ERROR;
 	}
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 5faa275..e42bcfb 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3070,6 +3070,10 @@ MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    struct addrinfo **addrlist,
 			    const char *host, const char *service, int willBind,
 			    const char **errorMsgPtr);
+Tcl_Channel		TclOpenTcpClientEx(Tcl_Interp *interp,
+			    const char *service, const char *host,
+			    const char *myaddr,	const char *myservice,
+			    unsigned int flags);
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, ClientData clientData,
 			    int stackSize, int flags);
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 63bccae..50452e9 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1283,19 +1283,30 @@ Tcl_OpenTcpClient(
 				 * connect. Otherwise we do a blocking
 				 * connect. */
 {
-    TcpState *statePtr;
-    const char *errorMsg = NULL;
-    struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
-    char channelName[SOCK_CHAN_LENGTH];
     char service[TCL_INTEGER_SPACE], myservice[TCL_INTEGER_SPACE];
 
-    /*
-     * Do the name lookups for the local and remote addresses.
-     */
-
     TclFormatInt(service, port);
     TclFormatInt(myservice, myport);
 
+    return TclOpenTcpClientEx(interp, service, host, myaddr, myservice, async!=0);
+}
+
+Tcl_Channel
+TclOpenTcpClientEx(
+    Tcl_Interp *interp,		/* For error reporting; can be NULL. */
+    const char *service,	/* Port number to open. */
+    const char *host,		/* Host on which to open port. */
+    const char *myaddr,		/* Client-side address */
+    const char *myservice,	/* Client-side port */
+    unsigned int flags)		/* If nonzero, attempt to do an asynchronous
+				 * connect. Otherwise we do a blocking
+				 * connect. */
+{
+    TcpState *statePtr;
+    const char *errorMsg = NULL;
+    struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
+    char channelName[SOCK_CHAN_LENGTH];
+
     if (!TclCreateSocketAddress(interp, &addrlist, host, service, 0, &errorMsg)
             || !TclCreateSocketAddress(interp, &myaddrlist, myaddr, myservice, 1,
                     &errorMsg)) {
@@ -1314,7 +1325,7 @@ Tcl_OpenTcpClient(
      */
     statePtr = ckalloc(sizeof(TcpState));
     memset(statePtr, 0, sizeof(TcpState));
-    statePtr->flags = async ? TCP_ASYNC_CONNECT : 0;
+    statePtr->flags = (flags&1) ? TCP_ASYNC_CONNECT : 0;
     statePtr->cachedBlocking = TCL_MODE_BLOCKING;
     statePtr->addrlist = addrlist;
     statePtr->myaddrlist = myaddrlist;
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index b2d77a1..8545cdd 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1873,7 +1873,7 @@ out:
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_OpenTcpClient --
+ * Tcl_OpenTcpClient, TclOpenTcpClientEx --
  *
  *	Opens a TCP client socket and creates a channel around it.
  *
@@ -1898,15 +1898,29 @@ Tcl_OpenTcpClient(
 				 * connect. Otherwise we do a blocking
 				 * connect. */
 {
-    TcpState *statePtr;
-    const char *errorMsg = NULL;
-    struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
-    char channelName[SOCK_CHAN_LENGTH];
     char service[TCL_INTEGER_SPACE], myservice[TCL_INTEGER_SPACE];
 
     TclFormatInt(service, port);
     TclFormatInt(myservice, myport);
 
+    return TclOpenTcpClientEx(interp, service, host, myaddr, myservice, async!=0);
+}
+
+Tcl_Channel
+TclOpenTcpClientEx(
+    Tcl_Interp *interp,		/* For error reporting; can be NULL. */
+    const char *service,	/* Port number to open. */
+    const char *host,		/* Host on which to open port. */
+    const char *myaddr,		/* Client-side address */
+    const char *myservice,	/* Client-side port */
+    unsigned int flags)		/* If nonzero, attempt to do an asynchronous
+				 * connect. Otherwise we do a blocking
+				 * connect. */
+{
+    TcpState *statePtr;
+    const char *errorMsg = NULL;
+    struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
+    char channelName[SOCK_CHAN_LENGTH];
 
     if (TclpHasSockets(interp) != TCL_OK) {
 	return NULL;
@@ -1942,7 +1956,7 @@ Tcl_OpenTcpClient(
     statePtr = NewSocketInfo(INVALID_SOCKET);
     statePtr->addrlist = addrlist;
     statePtr->myaddrlist = myaddrlist;
-    if (async) {
+    if (flags&1) {
 	statePtr->flags |= TCP_ASYNC_CONNECT;
     }
 
-- 
cgit v0.12

-- 
cgit v0.12


From 9372c6c29f2b15708d4b7c57d7d252bd7fa5cca6 Mon Sep 17 00:00:00 2001
From: avl <avl>
Date: Sun, 5 Mar 2017 11:22:33 +0000
Subject: cherrypick 3bcf97f766: array index syntax done.  ${...} not yet
 complete wrt backslashes.

---
 generic/tclParse.c | 23 ++++++++++++++++++-----
 generic/tclParse.h |  2 ++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/generic/tclParse.c b/generic/tclParse.c
index 9b801a3..10f016d 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -95,7 +95,7 @@ const char tclCharTypeTable[] = {
     TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
     TYPE_SPACE,       TYPE_NORMAL,      TYPE_QUOTE,       TYPE_NORMAL,
     TYPE_SUBS,        TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_CLOSE_PAREN, TYPE_NORMAL,      TYPE_NORMAL,
+    TYPE_OPEN_PAREN,  TYPE_CLOSE_PAREN, TYPE_NORMAL,      TYPE_NORMAL,
     TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
     TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
     TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
@@ -1366,7 +1366,7 @@ Tcl_ParseVarName(
 {
     Tcl_Token *tokenPtr;
     register const char *src;
-    int varIndex;
+    int varIndex, braceCount = 0;
     unsigned array;
 
     if ((numBytes == 0) || (start == NULL)) {
@@ -1419,15 +1419,20 @@ Tcl_ParseVarName(
      */
 
     if (*src == '{') {
+        char ch;
 	src++;
 	numBytes--;
 	tokenPtr->type = TCL_TOKEN_TEXT;
 	tokenPtr->start = src;
 	tokenPtr->numComponents = 0;
 
-	while (numBytes && (*src != '}')) {
+	ch = *src;
+	while (numBytes && (braceCount>0 || ch != '}')) {
+	    if (ch == '{') { braceCount++; }
+	    else if (ch == '}') { braceCount--; }
 	    numBytes--;
 	    src++;
+	    ch= *src;
 	}
 	if (numBytes == 0) {
 	    if (parsePtr->interp != NULL) {
@@ -1483,11 +1488,11 @@ Tcl_ParseVarName(
 	     * any number of substitutions.
 	     */
 
-	    if (TCL_OK != ParseTokens(src+1, numBytes-1, TYPE_CLOSE_PAREN,
+	    if (TCL_OK != ParseTokens(src+1, numBytes-1, TYPE_BAD_ARRAY_INDEX,
 		    TCL_SUBST_ALL, parsePtr)) {
 		goto error;
 	    }
-	    if ((parsePtr->term == src+numBytes) || (*parsePtr->term != ')')){
+	    if ((parsePtr->term == src+numBytes)){
 		if (parsePtr->interp != NULL) {
 		    Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
 			    "missing )", -1));
@@ -1496,6 +1501,14 @@ Tcl_ParseVarName(
 		parsePtr->term = src;
 		parsePtr->incomplete = 1;
 		goto error;
+	    } else if ((*parsePtr->term != ')')){
+		if (parsePtr->interp != NULL) {
+		    Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
+			    "invalid char in array index", -1));
+		}
+		parsePtr->errorType = TCL_PARSE_SYNTAX;
+		parsePtr->term = src;
+		goto error;
 	    }
 	    src = parsePtr->term + 1;
 	}
diff --git a/generic/tclParse.h b/generic/tclParse.h
index 20c609c..a836147 100644
--- a/generic/tclParse.h
+++ b/generic/tclParse.h
@@ -11,6 +11,8 @@
 #define TYPE_CLOSE_PAREN	0x10
 #define TYPE_CLOSE_BRACK	0x20
 #define TYPE_BRACE		0x40
+#define TYPE_OPEN_PAREN		0x80
+#define TYPE_BAD_ARRAY_INDEX	(TYPE_OPEN_PAREN|TYPE_CLOSE_PAREN|TYPE_QUOTE|TYPE_BRACE)
 
 #define CHAR_TYPE(c) (tclCharTypeTable+128)[(int)(c)]
 
-- 
cgit v0.12


From a457b16dfc3bd4a4db9171364cd2a5ab04392bb8 Mon Sep 17 00:00:00 2001
From: avl <avl>
Date: Sun, 5 Mar 2017 19:38:43 +0000
Subject: Deal with backslashes in ${...}, change "char" to "character" in
 error, fix tests.

---
 generic/tclParse.c   | 18 +++++++++++++-----
 tests/parse.test     |  6 +++---
 tests/parseExpr.test |  4 ++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/generic/tclParse.c b/generic/tclParse.c
index 10f016d..372ec92 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -1366,7 +1366,7 @@ Tcl_ParseVarName(
 {
     Tcl_Token *tokenPtr;
     register const char *src;
-    int varIndex, braceCount = 0;
+    int varIndex;
     unsigned array;
 
     if ((numBytes == 0) || (start == NULL)) {
@@ -1419,7 +1419,7 @@ Tcl_ParseVarName(
      */
 
     if (*src == '{') {
-        char ch;
+	char ch; int braceCount = 0;
 	src++;
 	numBytes--;
 	tokenPtr->type = TCL_TOKEN_TEXT;
@@ -1428,8 +1428,16 @@ Tcl_ParseVarName(
 
 	ch = *src;
 	while (numBytes && (braceCount>0 || ch != '}')) {
-	    if (ch == '{') { braceCount++; }
-	    else if (ch == '}') { braceCount--; }
+	    switch (ch) {
+	    case '{': braceCount++; break;
+	    case '}': braceCount--; break;
+	    case '\\':
+		/* if 2 or more left, consume 2, else consume
+		   just the \ and let it run into the end */ 
+		if (numBytes > 1) {
+		   src++; numBytes--;
+		}
+	    }
 	    numBytes--;
 	    src++;
 	    ch= *src;
@@ -1504,7 +1512,7 @@ Tcl_ParseVarName(
 	    } else if ((*parsePtr->term != ')')){
 		if (parsePtr->interp != NULL) {
 		    Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
-			    "invalid char in array index", -1));
+			    "invalid character in array index", -1));
 		}
 		parsePtr->errorType = TCL_PARSE_SYNTAX;
 		parsePtr->term = src;
diff --git a/tests/parse.test b/tests/parse.test
index 287c392..e031327 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -601,8 +601,8 @@ test parse-12.6 {Tcl_ParseVarName procedure, braced variable name} testparser {
     testparser {${..[]b}cd} 0
 } {- {${..[]b}cd} 1 word {${..[]b}cd} 3 variable {${..[]b}} 1 text {..[]b} 0 text cd 0 {}}
 test parse-12.7 {Tcl_ParseVarName procedure, braced variable name} testparser {
-    testparser "\$\{\{\} " 0
-} {- \$\{\{\}\  1 word \$\{\{\} 2 variable \$\{\{\} 1 text \{ 0 {}}
+    testparser "\$\{\{\\\\\}\} " 0
+} {- {${{\\}} } 1 word {${{\\}}} 2 variable {${{\\}}} 1 text {{\\}} 0 {}}
 test parse-12.8 {Tcl_ParseVarName procedure, missing close brace} testparser {
     list [catch {testparser "$\{abc" 0} msg] $msg $::errorInfo
 } {1 {missing close-brace for variable name} missing\ close-brace\ for\ variable\ name\n\ \ \ \ (remainder\ of\ script:\ \"\{abc\")\n\ \ \ \ invoked\ from\ within\n\"testparser\ \"\$\\\{abc\"\ 0\"}
@@ -797,7 +797,7 @@ test parse-15.16 {CommandComplete procedure} {
 } 1
 test parse-15.17 {CommandComplete procedure} {
     info complete {a b "c $dd("}
-} 0
+} 1
 test parse-15.18 {CommandComplete procedure} {
     info complete {a b "c \"}
 } 0
diff --git a/tests/parseExpr.test b/tests/parseExpr.test
index 47dbec5..e0c979c 100644
--- a/tests/parseExpr.test
+++ b/tests/parseExpr.test
@@ -917,8 +917,8 @@ test parseExpr-21.43 {error message} -body {
 in expression \"...8901234567890*\"foobar\$\{abcdefghijklmnopqrstuv...\""
 test parseExpr-21.44 {error message} -body {
     expr {123456789012345678901234567890*"foo$bar(abcdefghijklmnopqrstuvwxyz"}
-} -returnCodes error -result {missing )
-in expression "...8901234567890*"foo$bar(abcdefghijklmnopqrstuv..."}
+} -returnCodes error -result {invalid character in array index
+in expression "...8901234567890*"foo$bar(abcdefghijklmnopqrstu..."}
 test parseExpr-21.45 {error message} -body {
     expr {123456789012345678901234567890*"foo$bar([{}abcdefghijklmnopqrstuvwxyz])"}
 } -returnCodes error -result {extra characters after close-brace
-- 
cgit v0.12


From d64611a414a4e8609b17ae27dc02969200d2fa37 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sun, 9 Apr 2017 14:32:26 +0000
Subject: TIP 468 implementation from Shannon Noe.

---
 generic/tcl.decls   |  4 ++--
 generic/tclIOCmd.c  | 36 +++++++++++++++++++++++-------------
 generic/tclIOSock.c |  5 ++---
 unix/tclUnixSock.c  |  6 +++++-
 win/tclWinSock.c    |  7 ++++++-
 5 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index b2b91a9..c7ca44f 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2329,8 +2329,8 @@ declare 630 {
 # TIP #456
 declare 631 {
     Tcl_Channel Tcl_OpenTcpServerEx(Tcl_Interp *interp, const char *service,
-	    const char *host, unsigned int flags, Tcl_TcpAcceptProc *acceptProc,
-	    ClientData callbackData)
+	    const char *host, unsigned int flags, int backlog,
+	    Tcl_TcpAcceptProc *acceptProc, ClientData callbackData)
 }
 
 # ----- BASELINE -- FOR -- 8.7.0 ----- #
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 1bd3fe7..55685e3 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1485,15 +1485,15 @@ Tcl_SocketObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     static const char *const socketOptions[] = {
-	"-async", "-myaddr", "-myport", "-reuseaddr", "-reuseport", "-server",
-	NULL
+	"-async", "-backlog", "-myaddr", "-myport", "-reuseaddr",
+	"-reuseport", "-server", NULL
     };
     enum socketOptions {
-	SKT_ASYNC, SKT_MYADDR, SKT_MYPORT, SKT_REUSEADDR, SKT_REUSEPORT,
-	SKT_SERVER
+	SKT_ASYNC, SKT_BACKLOG, SKT_MYADDR, SKT_MYPORT, SKT_REUSEADDR,
+	SKT_REUSEPORT, SKT_SERVER
     };
     int optionIndex, a, server = 0, myport = 0, async = 0, reusep = -1,
-	reusea = -1;
+	reusea = -1, backlog = -1;
     unsigned int flags = 0;
     const char *host, *port, *myaddr = NULL;
     Tcl_Obj *script = NULL;
@@ -1583,6 +1583,17 @@ Tcl_SocketObjCmd(
 		return TCL_ERROR;
 	    }
 	    break;
+	case SKT_BACKLOG:
+	    a++;
+	    if (a >= objc) {
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			"no argument given for -backlog option", -1));
+		return TCL_ERROR;
+	    }
+	    if (Tcl_GetIntFromObj(interp, objv[a], &backlog) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    break;
 	default:
 	    Tcl_Panic("Tcl_SocketObjCmd: bad option index to SocketOptions");
 	}
@@ -1607,14 +1618,14 @@ Tcl_SocketObjCmd(
 	iPtr->flags |= INTERP_ALTERNATE_WRONG_ARGS;
 	Tcl_WrongNumArgs(interp, 1, objv,
 		"-server command ?-reuseaddr boolean? ?-reuseport boolean? "
-		"?-myaddr addr? port");
+		"?-myaddr addr? ?-backlog count? port");
 	return TCL_ERROR;
     }
 
-    if (!server && (reusea != -1 || reusep != -1)) {
+    if (!server && (reusea != -1 || reusep != -1 || backlog != -1)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"options -reuseaddr and -reuseport are only valid for servers",
-		-1));
+		"options -backlog, -reuseaddr and -reuseport are only valid "
+		"for servers", -1));
 	return TCL_ERROR;
     }
 
@@ -1638,15 +1649,14 @@ Tcl_SocketObjCmd(
     port = TclGetString(objv[a]);
 
     if (server) {
-	AcceptCallback *acceptCallbackPtr =
-		ckalloc(sizeof(AcceptCallback));
+	AcceptCallback *acceptCallbackPtr = ckalloc(sizeof(AcceptCallback));
 
 	Tcl_IncrRefCount(script);
 	acceptCallbackPtr->script = script;
 	acceptCallbackPtr->interp = interp;
 
-	chan = Tcl_OpenTcpServerEx(interp, port, host, flags, AcceptCallbackProc,
-				   acceptCallbackPtr);
+	chan = Tcl_OpenTcpServerEx(interp, port, host, flags, backlog,
+		AcceptCallbackProc, acceptCallbackPtr);
 	if (chan == NULL) {
 	    Tcl_DecrRefCount(script);
 	    ckfree(acceptCallbackPtr);
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 8ad268a..858c58e 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -307,9 +307,8 @@ Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
     char portbuf[TCL_INTEGER_SPACE];
 
     TclFormatInt(portbuf, port);
-
-    return Tcl_OpenTcpServerEx(interp, portbuf, host, TCL_TCPSERVER_REUSEADDR,
-			       acceptProc, callbackData);
+    return Tcl_OpenTcpServerEx(interp, portbuf, host, -1,
+	    TCL_TCPSERVER_REUSEADDR, acceptProc, callbackData);
 }
 
 /*
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 9387d05..1e80799 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1425,6 +1425,7 @@ Tcl_OpenTcpServerEx(
     const char *service,	/* Port number to open. */
     const char *myHost,		/* Name of local host. */
     unsigned int flags,		/* Flags. */
+    int backlog,                /* Length of OS listen backlog queue. */
     Tcl_TcpAcceptProc *acceptProc,
 				/* Callback for accepting connections from new
 				 * clients. */
@@ -1584,7 +1585,10 @@ Tcl_OpenTcpServerEx(
                 chosenport = ntohs(sockname.sa4.sin_port);
             }
         }
-        status = listen(sock, SOMAXCONN);
+        if (backlog < 0) {
+            backlog = SOMAXCONN;
+        }
+        status = listen(sock, backlog);
         if (status < 0) {
 	    if (howfar < LISTEN) {
 		howfar = LISTEN;
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 81a5449..a580a8d 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -2040,6 +2040,8 @@ Tcl_OpenTcpServerEx(
     const char *service,	/* Port number to open. */
     const char *myHost,		/* Name of local host. */
     unsigned int flags,		/* Flags. */
+    int backlog,                /* Length of OS listen backlog queue, or -1
+                                 * for default. */
     Tcl_TcpAcceptProc *acceptProc,
 				/* Callback for accepting connections from new
 				 * clients. */
@@ -2160,7 +2162,10 @@ Tcl_OpenTcpServerEx(
 	 * different, and there may be differences between TCP/IP stacks).
 	 */
 
-	if (listen(sock, SOMAXCONN) == SOCKET_ERROR) {
+        if (backlog < 0) {
+            backlog = SOMAXCONN;
+        }
+	if (listen(sock, backlog) == SOCKET_ERROR) {
 	    TclWinConvertError((DWORD) WSAGetLastError());
 	    closesocket(sock);
 	    continue;
-- 
cgit v0.12


From c0eed541eb68702b1c43e3e9fd271ea6a0a6b70e Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sat, 28 Dec 2019 13:24:59 +0000
Subject: Implementation of properties for TclOO

---
 generic/tclOO.c           |  53 +++++-
 generic/tclOOCall.c       | 200 ++++++++++++++++++-
 generic/tclOODefineCmds.c | 475 +++++++++++++++++++++++++++++++++++++++++-----
 generic/tclOOInfo.c       | 183 +++++++++++++++++-
 generic/tclOOInt.h        |  42 +++-
 generic/tclOOScript.h     | 114 +++++++++++
 tools/tclOOScript.tcl     | 131 +++++++++++++
 7 files changed, 1139 insertions(+), 59 deletions(-)

diff --git a/generic/tclOO.c b/generic/tclOO.c
index af5ea50..8710a89 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -3,7 +3,7 @@
  *
  *	This file contains the object-system core (NB: not Tcl_Obj, but ::oo)
  *
- * Copyright (c) 2005-2012 by Donal K. Fellows
+ * Copyright (c) 2005-2019 by Donal K. Fellows
  * Copyright (c) 2017 by Nathan Coulter
  *
  * See the file "license.terms" for information on usage and redistribution of
@@ -323,6 +323,7 @@ InitFoundation(
 	    DeletedObjdefNamespace);
     fPtr->helpersNs = Tcl_CreateNamespace(interp, "::oo::Helpers", fPtr,
 	    DeletedHelpersNamespace);
+    Tcl_CreateNamespace(interp, "::oo::configuresupport", NULL, NULL);
     fPtr->epoch = 0;
     fPtr->tsdPtr = tsdPtr;
     TclNewLiteralStringObj(fPtr->unknownMethodNameObj, "unknown");
@@ -961,7 +962,7 @@ TclOOReleaseClassContents(
     Class *clsPtr = oPtr->classPtr, *tmpClsPtr;
     Method *mPtr;
     Foundation *fPtr = oPtr->fPtr;
-    Tcl_Obj *variableObj;
+    Tcl_Obj *variableObj, *propertyObj;
     PrivateVariableMapping *privateVariable;
 
     /*
@@ -1015,6 +1016,29 @@ TclOOReleaseClassContents(
     }
 
     /*
+     * Squelch the property lists.
+     */
+
+    if (clsPtr->properties.allReadableCache) {
+	Tcl_DecrRefCount(clsPtr->properties.allReadableCache);
+    }
+    if (clsPtr->properties.allWritableCache) {
+	Tcl_DecrRefCount(clsPtr->properties.allWritableCache);
+    }
+    if (clsPtr->properties.readable.num) {
+	FOREACH(propertyObj, clsPtr->properties.readable) {
+	    Tcl_DecrRefCount(propertyObj);
+	}
+	ckfree(clsPtr->properties.readable.list);
+    }
+    if (clsPtr->properties.writable.num) {
+	FOREACH(propertyObj, clsPtr->properties.writable) {
+	    Tcl_DecrRefCount(propertyObj);
+	}
+	ckfree(clsPtr->properties.writable.list);
+    }
+
+    /*
      * Squelch our filter list.
      */
 
@@ -1115,7 +1139,7 @@ ObjectNamespaceDeleted(
     FOREACH_HASH_DECLS;
     Class *mixinPtr;
     Method *mPtr;
-    Tcl_Obj *filterObj, *variableObj;
+    Tcl_Obj *filterObj, *variableObj, *propertyObj;
     PrivateVariableMapping *privateVariable;
     Tcl_Interp *interp = oPtr->fPtr->interp;
     int i;
@@ -1269,6 +1293,29 @@ ObjectNamespaceDeleted(
     }
 
     /*
+     * Squelch the property lists.
+     */
+
+    if (oPtr->properties.allReadableCache) {
+	Tcl_DecrRefCount(oPtr->properties.allReadableCache);
+    }
+    if (oPtr->properties.allWritableCache) {
+	Tcl_DecrRefCount(oPtr->properties.allWritableCache);
+    }
+    if (oPtr->properties.readable.num) {
+	FOREACH(propertyObj, oPtr->properties.readable) {
+	    Tcl_DecrRefCount(propertyObj);
+	}
+	ckfree(oPtr->properties.readable.list);
+    }
+    if (oPtr->properties.writable.num) {
+	FOREACH(propertyObj, oPtr->properties.writable) {
+	    Tcl_DecrRefCount(propertyObj);
+	}
+	ckfree(oPtr->properties.writable.list);
+    }
+
+    /*
      * Because an object can be a class that is an instance of itself, the
      * class object's class structure should only be cleaned after most of
      * the cleanup on the object is done.
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index f3474b6..f647fb7 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -2,9 +2,10 @@
  * tclOOCall.c --
  *
  *	This file contains the method call chain management code for the
- *	object-system core.
+ *	object-system core. It also contains everything else that does
+ *	inheritance hierarchy traversal.
  *
- * Copyright (c) 2005-2012 by Donal K. Fellows
+ * Copyright (c) 2005-2019 by Donal K. Fellows
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -2100,6 +2101,201 @@ AddDefinitionNamespaceToChain(
     definePtr->num++;
 }
 
+static void
+FindClassProps(
+    Class *clsPtr,
+    int writable,
+    Tcl_HashTable *accumulator)
+{
+    int i, dummy;
+    Tcl_Obj *propName;
+    Class *mixin, *sup;
+
+  tailRecurse:
+    if (writable) {
+	FOREACH(propName, clsPtr->properties.writable) {
+	    Tcl_CreateHashEntry(accumulator, (void *) propName, &dummy);
+	}
+    } else {
+	FOREACH(propName, clsPtr->properties.readable) {
+	    Tcl_CreateHashEntry(accumulator, (void *) propName, &dummy);
+	}
+    }
+    if (clsPtr->thisPtr->flags & ROOT_OBJECT) {
+	/*
+	 * We do *not* traverse upwards from the root!
+	 */
+	return;
+    }
+    FOREACH(mixin, clsPtr->mixins) {
+	FindClassProps(mixin, writable, accumulator);
+    }
+    if (clsPtr->superclasses.num == 1) {
+	clsPtr = clsPtr->superclasses.list[0];
+	goto tailRecurse;
+    }
+    FOREACH(sup, clsPtr->superclasses) {
+	FindClassProps(sup, writable, accumulator);
+    }
+}
+
+static void
+FindObjectProps(
+    Object *oPtr,
+    int writable,
+    Tcl_HashTable *accumulator)
+{
+    int i, dummy;
+    Tcl_Obj *propName;
+    Class *mixin;
+
+    if (writable) {
+	FOREACH(propName, oPtr->properties.writable) {
+	    Tcl_CreateHashEntry(accumulator, (void *) propName, &dummy);
+	}
+    } else {
+	FOREACH(propName, oPtr->properties.readable) {
+	    Tcl_CreateHashEntry(accumulator, (void *) propName, &dummy);
+	}
+    }
+    FOREACH(mixin, oPtr->mixins) {
+	FindClassProps(mixin, writable, accumulator);
+    }
+    FindClassProps(oPtr->selfCls, writable, accumulator);
+}
+
+Tcl_Obj *
+TclOOGetAllClassProperties(
+    Class *clsPtr,
+    int writable,
+    int *allocated)
+{
+    Tcl_HashTable hashTable;
+    FOREACH_HASH_DECLS;
+    Tcl_Obj *propName, *result;
+    void *dummy;
+
+    /*
+     * Look in the cache.
+     */
+
+    if (clsPtr->properties.epoch == clsPtr->thisPtr->fPtr->epoch) {
+	if (writable) {
+	    if (clsPtr->properties.allWritableCache) {
+		*allocated = 0;
+		return clsPtr->properties.allWritableCache;
+	    }
+	} else {
+	    if (clsPtr->properties.allReadableCache) {
+		*allocated = 0;
+		return clsPtr->properties.allReadableCache;
+	    }
+	}
+    }
+
+    /*
+     * Gather the information. Unsorted! (Caller will sort.)
+     */
+
+    *allocated = 1;
+    Tcl_InitObjHashTable(&hashTable);
+    FindClassProps(clsPtr, writable, &hashTable);
+    result = Tcl_NewObj();
+    FOREACH_HASH(propName, dummy, &hashTable) {
+	Tcl_ListObjAppendElement(NULL, result, propName);
+    }
+    Tcl_DeleteHashTable(&hashTable);
+
+    /*
+     * Cache the information. Also purges the cache.
+     */
+
+    if (clsPtr->properties.epoch != clsPtr->thisPtr->fPtr->epoch) {
+	if (clsPtr->properties.allWritableCache) {
+	    Tcl_DecrRefCount(clsPtr->properties.allWritableCache);
+	    clsPtr->properties.allWritableCache = NULL;
+	}
+	if (clsPtr->properties.allReadableCache) {
+	    Tcl_DecrRefCount(clsPtr->properties.allReadableCache);
+	    clsPtr->properties.allReadableCache = NULL;
+	}
+    }
+    clsPtr->properties.epoch = clsPtr->thisPtr->fPtr->epoch;
+    if (writable) {
+	clsPtr->properties.allWritableCache = result;
+    } else {
+	clsPtr->properties.allReadableCache = result;
+    }
+    Tcl_IncrRefCount(result);
+    return result;
+}
+
+Tcl_Obj *
+TclOOGetAllObjectProperties(
+    Object *oPtr,
+    int writable,
+    int *allocated)
+{
+    Tcl_HashTable hashTable;
+    FOREACH_HASH_DECLS;
+    Tcl_Obj *propName, *result;
+    void *dummy;
+
+    /*
+     * Look in the cache.
+     */
+
+    if (oPtr->properties.epoch == oPtr->fPtr->epoch) {
+	if (writable) {
+	    if (oPtr->properties.allWritableCache) {
+		*allocated = 0;
+		return oPtr->properties.allWritableCache;
+	    }
+	} else {
+	    if (oPtr->properties.allReadableCache) {
+		*allocated = 0;
+		return oPtr->properties.allReadableCache;
+	    }
+	}
+    }
+
+    /*
+     * Gather the information. Unsorted! (Caller will sort.)
+     */
+
+    *allocated = 1;
+    Tcl_InitObjHashTable(&hashTable);
+    FindObjectProps(oPtr, writable, &hashTable);
+    result = Tcl_NewObj();
+    FOREACH_HASH(propName, dummy, &hashTable) {
+	Tcl_ListObjAppendElement(NULL, result, propName);
+    }
+    Tcl_DeleteHashTable(&hashTable);
+
+    /*
+     * Cache the information.
+     */
+
+    if (oPtr->properties.epoch != oPtr->fPtr->epoch) {
+	if (oPtr->properties.allWritableCache) {
+	    Tcl_DecrRefCount(oPtr->properties.allWritableCache);
+	    oPtr->properties.allWritableCache = NULL;
+	}
+	if (oPtr->properties.allReadableCache) {
+	    Tcl_DecrRefCount(oPtr->properties.allReadableCache);
+	    oPtr->properties.allReadableCache = NULL;
+	}
+    }
+    oPtr->properties.epoch = oPtr->fPtr->epoch;
+    if (writable) {
+	oPtr->properties.allWritableCache = result;
+    } else {
+	oPtr->properties.allReadableCache = result;
+    }
+    Tcl_IncrRefCount(result);
+    return result;
+}
+
 /*
  * Local Variables:
  * mode: c
diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c
index f259954..7b70c79 100644
--- a/generic/tclOODefineCmds.c
+++ b/generic/tclOODefineCmds.c
@@ -4,7 +4,7 @@
  *	This file contains the implementation of the ::oo::define command,
  *	part of the object-system core (NB: not Tcl_Obj, but ::oo).
  *
- * Copyright (c) 2006-2013 by Donal K. Fellows
+ * Copyright (c) 2006-2019 by Donal K. Fellows
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -78,51 +78,18 @@ static inline void	RecomputeClassCacheFlag(Object *oPtr);
 static int		RenameDeleteMethod(Tcl_Interp *interp, Object *oPtr,
 			    int useClass, Tcl_Obj *const fromPtr,
 			    Tcl_Obj *const toPtr);
-static int		ClassFilterGet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ClassFilterSet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ClassMixinGet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ClassMixinSet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ClassSuperGet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ClassSuperSet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ClassVarsGet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ClassVarsSet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ObjFilterGet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ObjFilterSet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ObjMixinGet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ObjMixinSet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ObjVarsGet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ObjVarsSet(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
-static int		ResolveClass(ClientData clientData,
-			    Tcl_Interp *interp, Tcl_ObjectContext context,
-			    int objc, Tcl_Obj *const *objv);
+static Tcl_MethodCallProc ClassFilterGet, ClassFilterSet;
+static Tcl_MethodCallProc ClassMixinGet, ClassMixinSet;
+static Tcl_MethodCallProc ClassRPropsGet, ClassRPropsSet;
+static Tcl_MethodCallProc ClassSuperGet, ClassSuperSet;
+static Tcl_MethodCallProc ClassVarsGet, ClassVarsSet;
+static Tcl_MethodCallProc ClassWPropsGet, ClassWPropsSet;
+static Tcl_MethodCallProc ObjFilterGet, ObjFilterSet;
+static Tcl_MethodCallProc ObjMixinGet, ObjMixinSet;
+static Tcl_MethodCallProc ObjRPropsGet, ObjRPropsSet;
+static Tcl_MethodCallProc ObjVarsGet, ObjVarsSet;
+static Tcl_MethodCallProc ObjWPropsGet, ObjWPropsSet;
+static Tcl_MethodCallProc ResolveClass;
 
 /*
  * Now define the slots used in declarations.
@@ -136,6 +103,14 @@ static const struct DeclaredSlot slots[] = {
     SLOT("objdefine::filter",   ObjFilterGet,   ObjFilterSet, NULL),
     SLOT("objdefine::mixin",    ObjMixinGet,    ObjMixinSet, ResolveClass),
     SLOT("objdefine::variable", ObjVarsGet,     ObjVarsSet, NULL),
+    SLOT("configuresupport::readableproperties",
+	    ClassRPropsGet, ClassRPropsSet, NULL),
+    SLOT("configuresupport::writableproperties",
+	    ClassWPropsGet, ClassWPropsSet, NULL),
+    SLOT("configuresupport::objreadableproperties",
+	    ObjRPropsGet, ObjRPropsSet, NULL),
+    SLOT("configuresupport::objwritableproperties",
+	    ObjWPropsGet, ObjWPropsSet, NULL),
     {NULL, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}
 };
 
@@ -201,13 +176,26 @@ BumpGlobalEpoch(
 
 	if (classPtr->thisPtr->mixins.num > 0) {
 	    classPtr->thisPtr->epoch++;
+
+	    /*
+	     * Invalidate the property caches directly.
+	     */
+
+	    if (classPtr->properties.allReadableCache) {
+		Tcl_DecrRefCount(classPtr->properties.allReadableCache);
+		classPtr->properties.allReadableCache = NULL;
+	    }
+	    if (classPtr->properties.allWritableCache) {
+		Tcl_DecrRefCount(classPtr->properties.allWritableCache);
+		classPtr->properties.allWritableCache = NULL;
+	    }
 	}
 	return;
     }
 
     /*
      * Either there's no class (?!) or we're reconfiguring something that is
-     * in use. Force regeneration of call chains.
+     * in use. Force regeneration of call chains and properties.
      */
 
     TclOOGetFoundation(interp)->epoch++;
@@ -482,6 +470,7 @@ TclOOClassSetMixins(
  *
  * ----------------------------------------------------------------------
  */
+
 static inline void
 InstallStandardVariableMapping(
     VariableNameList *vnlPtr,
@@ -3080,6 +3069,398 @@ ResolveClass(
 }
 
 /*
+ * ----------------------------------------------------------------------
+ *
+ * ClassRPropsGet, ClassRPropsSet, ObjRPropsGet, ObjRPropsSet --
+ *
+ *	Implementations of the "readableproperties" slot accessors for classes
+ *	and instances.
+ *
+ * ----------------------------------------------------------------------
+ */
+
+static void
+InstallReadableProps(
+    PropertyStorage *props,
+    int objc,
+    Tcl_Obj *const objv[])
+{
+    Tcl_Obj *propObj;
+    int i, n, created;
+    Tcl_HashTable uniqueTable;
+
+    if (props->allReadableCache) {
+	Tcl_DecrRefCount(props->allReadableCache);
+	props->allReadableCache = NULL;
+    }
+
+    for (i=0 ; i<objc ; i++) {
+	Tcl_IncrRefCount(objv[i]);
+    }
+    FOREACH(propObj, props->readable) {
+	Tcl_DecrRefCount(propObj);
+    }
+    if (i != objc) {
+	if (objc == 0) {
+	    ckfree(props->readable.list);
+	} else if (i) {
+	    props->readable.list = ckrealloc(props->readable.list,
+		    sizeof(Tcl_Obj *) * objc);
+	} else {
+	    props->readable.list = ckalloc(sizeof(Tcl_Obj *) * objc);
+	}
+    }
+    props->readable.num = 0;
+    if (objc > 0) {
+	Tcl_InitObjHashTable(&uniqueTable);
+	for (i=n=0 ; i<objc ; i++) {
+	    Tcl_CreateHashEntry(&uniqueTable, objv[i], &created);
+	    if (created) {
+		props->readable.list[n++] = objv[i];
+	    } else {
+		Tcl_DecrRefCount(objv[i]);
+	    }
+	}
+	props->readable.num = n;
+
+	/*
+	 * Shouldn't be necessary, but maintain num/list invariant.
+	 */
+
+	if (n != objc) {
+	    props->readable.list = ckrealloc(props->readable.list,
+		    sizeof(Tcl_Obj *) * n);
+	}
+	Tcl_DeleteHashTable(&uniqueTable);
+    }
+}
+
+static int
+ClassRPropsGet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    Tcl_Obj *resultObj, *propNameObj;
+    int i;
+
+    if (Tcl_ObjectContextSkippedArgs(context) != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		NULL);
+	return TCL_ERROR;
+    }
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    } else if (!oPtr->classPtr) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		"attempt to misuse API", -1));
+	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
+	return TCL_ERROR;
+    }
+
+    resultObj = Tcl_NewObj();
+    FOREACH(propNameObj, oPtr->classPtr->properties.readable) {
+	Tcl_ListObjAppendElement(NULL, resultObj, propNameObj);
+    }
+    Tcl_SetObjResult(interp, resultObj);
+    return TCL_OK;
+}
+
+static int
+ClassRPropsSet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    int varc;
+    Tcl_Obj **varv;
+
+    if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		"filterList");
+	return TCL_ERROR;
+    }
+    objv += Tcl_ObjectContextSkippedArgs(context);
+
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    } else if (!oPtr->classPtr) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		"attempt to misuse API", -1));
+	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
+	return TCL_ERROR;
+    } else if (Tcl_ListObjGetElements(interp, objv[0], &varc,
+	    &varv) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    InstallReadableProps(&oPtr->classPtr->properties, varc, varv);
+    BumpGlobalEpoch(interp, oPtr->classPtr);
+    return TCL_OK;
+}
+
+static int
+ObjRPropsGet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    Tcl_Obj *resultObj, *propNameObj;
+    int i;
+
+    if (Tcl_ObjectContextSkippedArgs(context) != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		NULL);
+	return TCL_ERROR;
+    }
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    }
+
+    resultObj = Tcl_NewObj();
+    FOREACH(propNameObj, oPtr->properties.readable) {
+	Tcl_ListObjAppendElement(NULL, resultObj, propNameObj);
+    }
+    Tcl_SetObjResult(interp, resultObj);
+    return TCL_OK;
+}
+
+static int
+ObjRPropsSet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    int varc;
+    Tcl_Obj **varv;
+
+    if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		"filterList");
+	return TCL_ERROR;
+    }
+    objv += Tcl_ObjectContextSkippedArgs(context);
+
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    } else if (Tcl_ListObjGetElements(interp, objv[0], &varc,
+	    &varv) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    InstallReadableProps(&oPtr->properties, varc, varv);
+    return TCL_OK;
+}
+
+/*
+ * ----------------------------------------------------------------------
+ *
+ * ClassWPropsGet, ClassWPropsSet, ObjWPropsGet, ObjWPropsSet --
+ *
+ *	Implementations of the "writableproperties" slot accessors for classes
+ *	and instances.
+ *
+ * ----------------------------------------------------------------------
+ */
+
+static void
+InstallWritableProps(
+    PropertyStorage *props,
+    int objc,
+    Tcl_Obj *const objv[])
+{
+    Tcl_Obj *propObj;
+    int i, n, created;
+    Tcl_HashTable uniqueTable;
+
+    if (props->allWritableCache) {
+	Tcl_DecrRefCount(props->allWritableCache);
+	props->allWritableCache = NULL;
+    }
+
+    for (i=0 ; i<objc ; i++) {
+	Tcl_IncrRefCount(objv[i]);
+    }
+    FOREACH(propObj, props->writable) {
+	Tcl_DecrRefCount(propObj);
+    }
+    if (i != objc) {
+	if (objc == 0) {
+	    ckfree(props->writable.list);
+	} else if (i) {
+	    props->writable.list = ckrealloc(props->writable.list,
+		    sizeof(Tcl_Obj *) * objc);
+	} else {
+	    props->writable.list = ckalloc(sizeof(Tcl_Obj *) * objc);
+	}
+    }
+    props->writable.num = 0;
+    if (objc > 0) {
+	Tcl_InitObjHashTable(&uniqueTable);
+	for (i=n=0 ; i<objc ; i++) {
+	    Tcl_CreateHashEntry(&uniqueTable, objv[i], &created);
+	    if (created) {
+		props->writable.list[n++] = objv[i];
+	    } else {
+		Tcl_DecrRefCount(objv[i]);
+	    }
+	}
+	props->writable.num = n;
+
+	/*
+	 * Shouldn't be necessary, but maintain num/list invariant.
+	 */
+
+	if (n != objc) {
+	    props->writable.list = ckrealloc(props->writable.list,
+		    sizeof(Tcl_Obj *) * n);
+	}
+	Tcl_DeleteHashTable(&uniqueTable);
+    }
+}
+
+static int
+ClassWPropsGet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    Tcl_Obj *resultObj, *propNameObj;
+    int i;
+
+    if (Tcl_ObjectContextSkippedArgs(context) != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		NULL);
+	return TCL_ERROR;
+    }
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    } else if (!oPtr->classPtr) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		"attempt to misuse API", -1));
+	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
+	return TCL_ERROR;
+    }
+
+    resultObj = Tcl_NewObj();
+    FOREACH(propNameObj, oPtr->classPtr->properties.writable) {
+	Tcl_ListObjAppendElement(NULL, resultObj, propNameObj);
+    }
+    Tcl_SetObjResult(interp, resultObj);
+    return TCL_OK;
+}
+
+static int
+ClassWPropsSet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    int varc;
+    Tcl_Obj **varv;
+
+    if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		"propertyList");
+	return TCL_ERROR;
+    }
+    objv += Tcl_ObjectContextSkippedArgs(context);
+
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    } else if (!oPtr->classPtr) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		"attempt to misuse API", -1));
+	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
+	return TCL_ERROR;
+    } else if (Tcl_ListObjGetElements(interp, objv[0], &varc,
+	    &varv) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    InstallWritableProps(&oPtr->classPtr->properties, varc, varv);
+    BumpGlobalEpoch(interp, oPtr->classPtr);
+    return TCL_OK;
+}
+
+static int
+ObjWPropsGet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    Tcl_Obj *resultObj, *propNameObj;
+    int i;
+
+    if (Tcl_ObjectContextSkippedArgs(context) != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		NULL);
+	return TCL_ERROR;
+    }
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    }
+
+    resultObj = Tcl_NewObj();
+    FOREACH(propNameObj, oPtr->properties.writable) {
+	Tcl_ListObjAppendElement(NULL, resultObj, propNameObj);
+    }
+    Tcl_SetObjResult(interp, resultObj);
+    return TCL_OK;
+}
+
+static int
+ObjWPropsSet(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    Tcl_ObjectContext context,
+    int objc,
+    Tcl_Obj *const *objv)
+{
+    Object *oPtr = (Object *) TclOOGetDefineCmdContext(interp);
+    int varc;
+    Tcl_Obj **varv;
+
+    if (Tcl_ObjectContextSkippedArgs(context) + 1 != objc) {
+	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+		"propertyList");
+	return TCL_ERROR;
+    }
+    objv += Tcl_ObjectContextSkippedArgs(context);
+
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    } else if (Tcl_ListObjGetElements(interp, objv[0], &varc,
+	    &varv) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    InstallWritableProps(&oPtr->properties, varc, varv);
+    return TCL_OK;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index 99918ae..ed44cc8 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -4,7 +4,7 @@
  *	This file contains the implementation of the ::oo-related [info]
  *	subcommands.
  *
- * Copyright (c) 2006-2011 by Donal K. Fellows
+ * Copyright (c) 2006-2019 by Donal K. Fellows
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -17,6 +17,7 @@
 #include "tclOOInt.h"
 
 static inline Class *	GetClassFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
+static void		SortPropList(Tcl_Obj *list);
 static Tcl_ObjCmdProc InfoObjectCallCmd;
 static Tcl_ObjCmdProc InfoObjectClassCmd;
 static Tcl_ObjCmdProc InfoObjectDefnCmd;
@@ -28,6 +29,7 @@ static Tcl_ObjCmdProc InfoObjectMethodsCmd;
 static Tcl_ObjCmdProc InfoObjectMethodTypeCmd;
 static Tcl_ObjCmdProc InfoObjectMixinsCmd;
 static Tcl_ObjCmdProc InfoObjectNsCmd;
+static Tcl_ObjCmdProc InfoObjectPropCmd;
 static Tcl_ObjCmdProc InfoObjectVarsCmd;
 static Tcl_ObjCmdProc InfoObjectVariablesCmd;
 static Tcl_ObjCmdProc InfoClassCallCmd;
@@ -41,6 +43,7 @@ static Tcl_ObjCmdProc InfoClassInstancesCmd;
 static Tcl_ObjCmdProc InfoClassMethodsCmd;
 static Tcl_ObjCmdProc InfoClassMethodTypeCmd;
 static Tcl_ObjCmdProc InfoClassMixinsCmd;
+static Tcl_ObjCmdProc InfoClassPropCmd;
 static Tcl_ObjCmdProc InfoClassSubsCmd;
 static Tcl_ObjCmdProc InfoClassSupersCmd;
 static Tcl_ObjCmdProc InfoClassVariablesCmd;
@@ -61,6 +64,7 @@ static const EnsembleImplMap infoObjectCmds[] = {
     {"methodtype", InfoObjectMethodTypeCmd, TclCompileBasic2ArgCmd, NULL, NULL, 0},
     {"mixins",	   InfoObjectMixinsCmd,	    TclCompileBasic1ArgCmd, NULL, NULL, 0},
     {"namespace",  InfoObjectNsCmd,	    TclCompileInfoObjectNamespaceCmd, NULL, NULL, 0},
+    {"property",   InfoObjectPropCmd,	    TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
     {"variables",  InfoObjectVariablesCmd,  TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
     {"vars",	   InfoObjectVarsCmd,	    TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
     {NULL, NULL, NULL, NULL, NULL, 0}
@@ -82,6 +86,7 @@ static const EnsembleImplMap infoClassCmds[] = {
     {"methods",	     InfoClassMethodsCmd,	TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
     {"methodtype",   InfoClassMethodTypeCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
     {"mixins",	     InfoClassMixinsCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 0},
+    {"property",     InfoClassPropCmd,		TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
     {"subclasses",   InfoClassSubsCmd,		TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
     {"superclasses", InfoClassSupersCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 0},
     {"variables",    InfoClassVariablesCmd,	TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
@@ -1714,6 +1719,182 @@ InfoClassCallCmd(
 }
 
 /*
+ * ----------------------------------------------------------------------
+ *
+ * InfoClassPropCmd, InfoObjectPropCmd --
+ *
+ *	Implements [info class property $clsName ?$option...?] and
+ *	[info object property $objName ?$option...?]
+ *
+ * ----------------------------------------------------------------------
+ */
+
+enum PropOpt {
+    PROP_ALL, PROP_READABLE, PROP_WRITABLE
+};
+static const char *const propOptNames[] = {
+    "-all", "-readable", "-writable",
+    NULL
+};
+
+static int
+InfoClassPropCmd(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    int objc,
+    Tcl_Obj *const objv[])
+{
+    Class *clsPtr;
+    int i, idx, all = 0, writable = 0, allocated = 0;
+    Tcl_Obj *result, *propObj;
+
+    if (objc < 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "className ?options...?");
+	return TCL_ERROR;
+    }
+    clsPtr = GetClassFromObj(interp, objv[1]);
+    if (clsPtr == NULL) {
+	return TCL_ERROR;
+    }
+    for (i = 2; i < objc; i++) {
+	if (Tcl_GetIndexFromObj(interp, objv[i], propOptNames, "option", 0,
+		&idx) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	switch (idx) {
+	case PROP_ALL:
+	    all = 1;
+	    break;
+	case PROP_READABLE:
+	    writable = 0;
+	    break;
+	case PROP_WRITABLE:
+	    writable = 1;
+	    break;
+	}
+    }
+
+    /*
+     * Get the properties.
+     */
+
+    if (all) {
+	result = TclOOGetAllClassProperties(clsPtr, writable, &allocated);
+	if (allocated) {
+	    SortPropList(result);
+	}
+    } else {
+	result = Tcl_NewObj();
+	if (writable) {
+	    FOREACH(propObj, clsPtr->properties.writable) {
+		Tcl_ListObjAppendElement(NULL, result, propObj);
+	    }
+	} else {
+	    FOREACH(propObj, clsPtr->properties.readable) {
+		Tcl_ListObjAppendElement(NULL, result, propObj);
+	    }
+	}
+	SortPropList(result);
+    }
+    Tcl_SetObjResult(interp, result);
+    return TCL_OK;
+}
+
+static int
+InfoObjectPropCmd(
+    ClientData clientData,
+    Tcl_Interp *interp,
+    int objc,
+    Tcl_Obj *const objv[])
+{
+    Object *oPtr;
+    int i, idx, all = 0, writable = 0, allocated = 0;
+    Tcl_Obj *result, *propObj;
+
+    if (objc < 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "objName ?options...?");
+	return TCL_ERROR;
+    }
+    oPtr = (Object *) Tcl_GetObjectFromObj(interp, objv[1]);
+    if (oPtr == NULL) {
+	return TCL_ERROR;
+    }
+    for (i = 2; i < objc; i++) {
+	if (Tcl_GetIndexFromObj(interp, objv[i], propOptNames, "option", 0,
+		&idx) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	switch (idx) {
+	case PROP_ALL:
+	    all = 1;
+	    break;
+	case PROP_READABLE:
+	    writable = 0;
+	    break;
+	case PROP_WRITABLE:
+	    writable = 1;
+	    break;
+	}
+    }
+
+    /*
+     * Get the properties.
+     */
+
+    if (all) {
+	result = TclOOGetAllObjectProperties(oPtr, writable, &allocated);
+	if (allocated) {
+	    SortPropList(result);
+	}
+    } else {
+	result = Tcl_NewObj();
+	if (writable) {
+	    FOREACH(propObj, oPtr->properties.writable) {
+		Tcl_ListObjAppendElement(NULL, result, propObj);
+	    }
+	} else {
+	    FOREACH(propObj, oPtr->properties.readable) {
+		Tcl_ListObjAppendElement(NULL, result, propObj);
+	    }
+	}
+	SortPropList(result);
+    }
+    Tcl_SetObjResult(interp, result);
+    return TCL_OK;
+}
+
+/*
+ * ----------------------------------------------------------------------
+ *
+ * SortPropList --
+ *	Sort a list of names of properties. Simple support function.
+ *
+ * ----------------------------------------------------------------------
+ */
+
+static int
+PropNameCompare(
+    const void *a,
+    const void *b)
+{
+    Tcl_Obj *first = *(Tcl_Obj **) a;
+    Tcl_Obj *second = *(Tcl_Obj **) b;
+
+    return strcmp(Tcl_GetString(first), Tcl_GetString(second));
+}
+
+static void
+SortPropList(
+    Tcl_Obj *list)
+{
+    int ec;
+    Tcl_Obj **ev;
+
+    Tcl_ListObjGetElements(NULL, list, &ec, &ev);
+    qsort(ev, ec, sizeof(Tcl_Obj *), PropNameCompare);
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index ca984d0..e8b8f4a 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -161,6 +161,26 @@ typedef LIST_STATIC(Tcl_Obj *) VariableNameList;
 typedef LIST_STATIC(PrivateVariableMapping) PrivateVariableList;
 
 /*
+ * This type is used in various places.
+ */
+
+typedef struct {
+    LIST_STATIC(Tcl_Obj *) readable;
+				/* The readable properties slot. */
+    LIST_STATIC(Tcl_Obj *) writable;
+				/* The writable properties slot. */
+    Tcl_Obj *allReadableCache;	/* The cache of all readable properties
+				 * exposed by this object or class (in its
+				 * stereotypical instancs). Contains a sorted
+				 * unique list if not NULL. */
+    Tcl_Obj *allWritableCache;	/* The cache of all writable properties
+				 * exposed by this object or class (in its
+				 * stereotypical instances). Contains a sorted
+				 * unique list if not NULL. */
+    int epoch;			/* The epoch that the caches are valid for. */
+} PropertyStorage;
+
+/*
  * Now, the definition of what an object actually is.
  */
 
@@ -182,8 +202,8 @@ typedef struct Object {
     LIST_STATIC(Tcl_Obj *) filters;
 				/* List of filter names. */
     struct Class *classPtr;	/* This is non-NULL for all classes, and NULL
-				 *  for everything else. It points to the class
-				 *  structure. */
+				 * for everything else. It points to the class
+				 * structure. */
     int refCount;		/* Number of strong references to this object.
 				 * Note that there may be many more weak
 				 * references; this mechanism exists to
@@ -211,12 +231,15 @@ typedef struct Object {
 				 * used inside methods. */
     Tcl_Command myclassCommand;	/* Reference to this object's class dispatcher
 				 * command. */
+    PropertyStorage properties;	/* Information relating to the lists of
+				 * properties that this object *claims* to
+				 * support. */
 } Object;
 
-#define OBJECT_DESTRUCTING	1	/* Indicates that an object is being or has
-								 *  been destroyed  */
-#define DESTRUCTOR_CALLED 2	/* Indicates that evaluation of destructor script for the
-							   object has began */
+#define OBJECT_DESTRUCTING 1	/* Indicates that an object is being or has
+				 *  been destroyed  */
+#define DESTRUCTOR_CALLED 2	/* Indicates that evaluation of destructor
+				 * script for the object has began */
 #define OO_UNUSED_4	4	/* No longer used.  */
 #define ROOT_OBJECT 0x1000	/* Flag to say that this object is the root of
 				 * the class hierarchy and should be treated
@@ -319,6 +342,9 @@ typedef struct Class {
 				 * namespace is defined but doesn't exist; we
 				 * also check at setting time but don't check
 				 * between times. */
+    PropertyStorage properties;	/* Information relating to the lists of
+				 * properties that this class *claims* to
+				 * support. */
 } Class;
 
 /*
@@ -568,6 +594,10 @@ MODULE_SCOPE void	TclOODeleteContext(CallContext *contextPtr);
 MODULE_SCOPE void	TclOODeleteDescendants(Tcl_Interp *interp,
 			    Object *oPtr);
 MODULE_SCOPE void	TclOODelMethodRef(Method *method);
+MODULE_SCOPE Tcl_Obj *	TclOOGetAllClassProperties(Class *clsPtr,
+			    int writable, int *allocated);
+MODULE_SCOPE Tcl_Obj *	TclOOGetAllObjectProperties(Object *oPtr,
+			    int writable, int *allocated);
 MODULE_SCOPE CallContext *TclOOGetCallContext(Object *oPtr,
 			    Tcl_Obj *methodNameObj, int flags,
 			    Object *contextObjPtr, Class *contextClsPtr,
diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index a1e4624..c8a79a9 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -248,6 +248,120 @@ static const char *tclOOSetupScript =
 "\t\tsuperclass class\n"
 "\t\tunexport create createWithNamespace new\n"
 "\t}\n"
+"\tnamespace eval configuresupport {\n"
+"\t\tproc property {readslot writeslot args} {\n"
+"\t\t\tfor {set i 0} {$i < [llength $args]} {incr i} {\n"
+"\t\t\t\tset prop [lindex $args $i]\n"
+"\t\t\t\tif {[string match \"-*\" $prop]} {\n"
+"\t\t\t\t\treturn -code error -errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t\"bad property name \\\"$prop\\\"; must not begin with -\"\n"
+"\t\t\t\t}\n"
+"\t\t\t\tset realprop [string cat \"-\" $prop]\n"
+"\t\t\t\tset getter [format {::set [my varname %s]} $prop]\n"
+"\t\t\t\tset setter [format {::set [my varname %s] $value} $prop]\n"
+"\t\t\t\tset kind readwrite\n"
+"\t\t\t\twhile {[string match \"-*\" [set next [lindex $args [expr {$i + 1}]]]]} {\n"
+"\t\t\t\t\tset arg [lindex $args [incr i 2]]\n"
+"\t\t\t\t\tswitch [::tcl::prefix match {-get -kind -set} $next] {\n"
+"\t\t\t\t\t\t-get {\n"
+"\t\t\t\t\t\t\tif {$i >= [llength $args]} {\n"
+"\t\t\t\t\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t\t\t\t\t\"missing body to go with -get option\"\n"
+"\t\t\t\t\t\t\t}\n"
+"\t\t\t\t\t\t\tset getter $arg\n"
+"\t\t\t\t\t\t}\n"
+"\t\t\t\t\t\t-set {\n"
+"\t\t\t\t\t\t\tif {$i >= [llength $args]} {\n"
+"\t\t\t\t\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t\t\t\t\t\"missing body to go with -set option\"\n"
+"\t\t\t\t\t\t\t}\n"
+"\t\t\t\t\t\t\tset getter $arg\n"
+"\t\t\t\t\t\t}\n"
+"\t\t\t\t\t\t-kind {\n"
+"\t\t\t\t\t\t\tif {$i >= [llength $args]} {\n"
+"\t\t\t\t\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t\t\t\t\t\"missing kind value to go with -kind option\"\n"
+"\t\t\t\t\t\t\t}\n"
+"\t\t\t\t\t\t\tset kind [::tcl::prefix match -message \"kind\" {\n"
+"\t\t\t\t\t\t\t\treadable readwrite writable\n"
+"\t\t\t\t\t\t\t} $arg]\n"
+"\t\t\t\t\t\t}\n"
+"\t\t\t\t\t}\n"
+"\t\t\t\t}\n"
+"\t\t\t\tswitch $kind {\n"
+"\t\t\t\t\treadable {\n"
+"\t\t\t\t\t\tuplevel 1 [list $readslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list method <ReadProp$realprop> {} $getter]\n"
+"\t\t\t\t\t}\n"
+"\t\t\t\t\twritable {\n"
+"\t\t\t\t\t\tuplevel 1 [list $writeslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list method <WriteProp$realprop> {value} $setter]\n"
+"\t\t\t\t\t}\n"
+"\t\t\t\t\treadwrite {\n"
+"\t\t\t\t\t\tuplevel 1 [list $readslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list $writeslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list method <ReadProp$realprop> {} $getter]\n"
+"\t\t\t\t\t\tuplevel 1 [list method <WriteProp$realprop> {value} $setter]\n"
+"\t\t\t\t\t}\n"
+"\t\t\t\t}\n"
+"\t\t\t}\n"
+"\t\t}\n"
+"\t\tnamespace eval configurableclass {\n"
+"\t\t\tproc property args {\n"
+"\t\t\t\ttailcall ::oo::configuresupport::property \\\n"
+"\t\t\t\t\t::oo::configuresupport::readableproperties \\\n"
+"\t\t\t\t\t::oo::configuresupport::writableproperties \\\n"
+"\t\t\t\t\t{*}$args\n"
+"\t\t\t}\n"
+"\t\t\tnamespace path ::oo::define\n"
+"\t\t}\n"
+"\t\tnamespace eval configurableobject {\n"
+"\t\t\tproc property args {\n"
+"\t\t\t\ttailcall ::oo::configuresupport::property \\\n"
+"\t\t\t\t\t::oo::configuresupport::objreadableproperties \\\n"
+"\t\t\t\t\t::oo::configuresupport::objwritableproperties \\\n"
+"\t\t\t\t\t{*}$args\n"
+"\t\t\t}\n"
+"\t\t\tnamespace path ::oo::objdefine\n"
+"\t\t}\n"
+"\t}\n"
+"\tclass create configurable {\n"
+"\t\tsuperclass class\n"
+"\t\tconstructor {{definitionScript \"\"}} {\n"
+"\t\t\tnext {mixin ::oo::configuresupport::configurable}\n"
+"\t\t\tnext $definitionScript\n"
+"\t\t}\n"
+"\t\tdefinitionnamespace -class configuresupport::configurableclass\n"
+"\t\tdefinitionnamespace -instance configuresupport::configurableobject\n"
+"\t}\n"
+"\tclass create configuresupport::configurable {\n"
+"\t\tprivate method Configure:Match {prop kind} {\n"
+"\t\t\tset props [info object property [self] -all $kind]\n"
+"\t\t\t::tcl::prefix match -message \"property\" $props $prop\n"
+"\t\t}\n"
+"\t\tmethod configure args {\n"
+"\t\t\tif {[llength $args] == 0} {\n"
+"\t\t\t\tset result {}\n"
+"\t\t\t\tforeach prop [info object property [self] -all -readable] {\n"
+"\t\t\t\t\tdict set result $prop [my <ReadProp$prop>]\n"
+"\t\t\t\t}\n"
+"\t\t\t\treturn $result\n"
+"\t\t\t} elseif {[llength $args] == 1} {\n"
+"\t\t\t\tset prop [my Configure:Match [lindex $args 0] -readable]\n"
+"\t\t\t\treturn [my <ReadProp$prop>]\n"
+"\t\t\t} elseif {[llength $args] % 2 == 0} {\n"
+"\t\t\t\tforeach {prop value} $args {\n"
+"\t\t\t\t\tset prop [my Configure:Match $prop -writable]\n"
+"\t\t\t\t\tmy <WriteProp$prop> $value\n"
+"\t\t\t\t}\n"
+"\t\t\t\treturn\n"
+"\t\t\t} else {\n"
+"\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t[format \"wrong # args: should be \\\"%s\\\"\" \\\n"
+"\t\t\t\t\t\t \"[self] configure \?-option value ...\?\"]\n"
+"\t\t\t}\n"
+"\t\t}\n"
+"\t}\n"
 "}\n"
 /* !END!: Do not edit above this line. */
 ;
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 5e0145f..8cc9627 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -447,6 +447,137 @@
 	superclass class
 	unexport create createWithNamespace new
     }
+
+    # ----------------------------------------------------------------------
+    #
+    # oo::configurable --
+    #
+    #	A metaclass that is used to make classes that can be configured. Also
+    #	its supporting classes and namespaces.
+    #
+    # ----------------------------------------------------------------------
+
+    namespace eval configuresupport {
+	proc property {readslot writeslot args} {
+	    for {set i 0} {$i < [llength $args]} {incr i} {
+		# Parse the property name
+		set prop [lindex $args $i]
+		if {[string match "-*" $prop]} {
+		    return -code error -errorcode {TCLOO PROPERTY_FORMAT} \
+			"bad property name \"$prop\"; must not begin with -"
+		}
+		set realprop [string cat "-" $prop]
+		set getter [format {::set [my varname %s]} $prop]
+		set setter [format {::set [my varname %s] $value} $prop]
+		set kind readwrite
+
+		# Parse the extra options
+		while {[string match "-*" [set next [lindex $args [expr {$i + 1}]]]]} {
+		    set arg [lindex $args [incr i 2]]
+		    switch [::tcl::prefix match {-get -kind -set} $next] {
+			-get {
+			    if {$i >= [llength $args]} {
+				return -code error -errorcode {TCL WRONGARGS} \
+				    "missing body to go with -get option"
+			    }
+			    set getter $arg
+			}
+			-set {
+			    if {$i >= [llength $args]} {
+				return -code error -errorcode {TCL WRONGARGS} \
+				    "missing body to go with -set option"
+			    }
+			    set getter $arg
+			}
+			-kind {
+			    if {$i >= [llength $args]} {
+				return -code error -errorcode {TCL WRONGARGS} \
+				    "missing kind value to go with -kind option"
+			    }
+			    set kind [::tcl::prefix match -message "kind" {
+				readable readwrite writable
+			    } $arg]
+			}
+		    }
+		}
+
+		# Install the option
+		switch $kind {
+		    readable {
+			uplevel 1 [list $readslot -append $realprop]
+			uplevel 1 [list method <ReadProp$realprop> {} $getter]
+		    }
+		    writable {
+			uplevel 1 [list $writeslot -append $realprop]
+			uplevel 1 [list method <WriteProp$realprop> {value} $setter]
+		    }
+		    readwrite {
+			uplevel 1 [list $readslot -append $realprop]
+			uplevel 1 [list $writeslot -append $realprop]
+			uplevel 1 [list method <ReadProp$realprop> {} $getter]
+			uplevel 1 [list method <WriteProp$realprop> {value} $setter]
+		    }
+		}
+	    }
+	}
+	namespace eval configurableclass {
+	    proc property args {
+		tailcall ::oo::configuresupport::property \
+		    ::oo::configuresupport::readableproperties \
+		    ::oo::configuresupport::writableproperties \
+		    {*}$args
+	    }
+	    namespace path ::oo::define
+	}
+	namespace eval configurableobject {
+	    proc property args {
+		tailcall ::oo::configuresupport::property \
+		    ::oo::configuresupport::objreadableproperties \
+		    ::oo::configuresupport::objwritableproperties \
+		    {*}$args
+	    }
+	    namespace path ::oo::objdefine
+	}
+    }
+
+    class create configurable {
+	superclass class
+	constructor {{definitionScript ""}} {
+	    next {mixin ::oo::configuresupport::configurable}
+	    next $definitionScript
+	}
+	definitionnamespace -class configuresupport::configurableclass
+	definitionnamespace -instance configuresupport::configurableobject
+    }
+
+    class create configuresupport::configurable {
+	private method Configure:Match {prop kind} {
+	    set props [info object property [self] -all $kind]
+	    ::tcl::prefix match -message "property" $props $prop
+	}
+	method configure args {
+	    if {[llength $args] == 0} {
+		set result {}
+		foreach prop [info object property [self] -all -readable] {
+		    dict set result $prop [my <ReadProp$prop>]
+		}
+		return $result
+	    } elseif {[llength $args] == 1} {
+		set prop [my Configure:Match [lindex $args 0] -readable]
+		return [my <ReadProp$prop>]
+	    } elseif {[llength $args] % 2 == 0} {
+		foreach {prop value} $args {
+		    set prop [my Configure:Match $prop -writable]
+		    my <WriteProp$prop> $value
+		}
+		return
+	    } else {
+		return -code error -errorcode {TCL WRONGARGS} \
+		    [format "wrong # args: should be \"%s\"" \
+			 "[self] configure ?-option value ...?"]
+	    }
+	}
+    }
 }
 
 # Local Variables:
-- 
cgit v0.12


From 76c3874ad8500c1db1360a8a80ae1f8040f32448 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sat, 28 Dec 2019 21:55:56 +0000
Subject: Starting to do the testing.

---
 generic/tclOOScript.h |  57 +++++++-----
 tests/oo.test         | 248 +++++++++++++++++++++++++++++++++++++++++++++++++-
 tools/tclOOScript.tcl | 131 ++++++++++++++++++++------
 3 files changed, 379 insertions(+), 57 deletions(-)

diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index c8a79a9..b9223ee 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -249,7 +249,7 @@ static const char *tclOOSetupScript =
 "\t\tunexport create createWithNamespace new\n"
 "\t}\n"
 "\tnamespace eval configuresupport {\n"
-"\t\tproc property {readslot writeslot args} {\n"
+"\t\tproc PropertyImpl {readslot writeslot args} {\n"
 "\t\t\tfor {set i 0} {$i < [llength $args]} {incr i} {\n"
 "\t\t\t\tset prop [lindex $args $i]\n"
 "\t\t\t\tif {[string match \"-*\" $prop]} {\n"
@@ -260,7 +260,8 @@ static const char *tclOOSetupScript =
 "\t\t\t\tset getter [format {::set [my varname %s]} $prop]\n"
 "\t\t\t\tset setter [format {::set [my varname %s] $value} $prop]\n"
 "\t\t\t\tset kind readwrite\n"
-"\t\t\t\twhile {[string match \"-*\" [set next [lindex $args [expr {$i + 1}]]]]} {\n"
+"\t\t\t\twhile {[set next [lindex $args [expr {$i + 1}]]\n"
+"\t\t\t\t\t\tstring match \"-*\" $next]} {\n"
 "\t\t\t\t\tset arg [lindex $args [incr i 2]]\n"
 "\t\t\t\t\tswitch [::tcl::prefix match {-get -kind -set} $next] {\n"
 "\t\t\t\t\t\t-get {\n"
@@ -290,50 +291,47 @@ static const char *tclOOSetupScript =
 "\t\t\t\t}\n"
 "\t\t\t\tswitch $kind {\n"
 "\t\t\t\t\treadable {\n"
-"\t\t\t\t\t\tuplevel 1 [list $readslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list method <ReadProp$realprop> {} $getter]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\t$readslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\tmethod <ReadProp$realprop> {} $getter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t\twritable {\n"
-"\t\t\t\t\t\tuplevel 1 [list $writeslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list method <WriteProp$realprop> {value} $setter]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\t$writeslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\tmethod <WriteProp$realprop> {value} $setter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t\treadwrite {\n"
-"\t\t\t\t\t\tuplevel 1 [list $readslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list $writeslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list method <ReadProp$realprop> {} $getter]\n"
-"\t\t\t\t\t\tuplevel 1 [list method <WriteProp$realprop> {value} $setter]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\t$readslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\t$writeslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\tmethod <ReadProp$realprop> {} $getter]\n"
+"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\t\t\tmethod <WriteProp$realprop> {value} $setter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t}\n"
 "\t\t\t}\n"
 "\t\t}\n"
 "\t\tnamespace eval configurableclass {\n"
 "\t\t\tproc property args {\n"
-"\t\t\t\ttailcall ::oo::configuresupport::property \\\n"
+"\t\t\t\ttailcall ::oo::configuresupport::PropertyImpl \\\n"
 "\t\t\t\t\t::oo::configuresupport::readableproperties \\\n"
-"\t\t\t\t\t::oo::configuresupport::writableproperties \\\n"
-"\t\t\t\t\t{*}$args\n"
+"\t\t\t\t\t::oo::configuresupport::writableproperties {*}$args\n"
 "\t\t\t}\n"
 "\t\t\tnamespace path ::oo::define\n"
 "\t\t}\n"
 "\t\tnamespace eval configurableobject {\n"
 "\t\t\tproc property args {\n"
-"\t\t\t\ttailcall ::oo::configuresupport::property \\\n"
+"\t\t\t\ttailcall ::oo::configuresupport::PropertyImpl \\\n"
 "\t\t\t\t\t::oo::configuresupport::objreadableproperties \\\n"
-"\t\t\t\t\t::oo::configuresupport::objwritableproperties \\\n"
-"\t\t\t\t\t{*}$args\n"
+"\t\t\t\t\t::oo::configuresupport::objwritableproperties {*}$args\n"
 "\t\t\t}\n"
 "\t\t\tnamespace path ::oo::objdefine\n"
 "\t\t}\n"
 "\t}\n"
-"\tclass create configurable {\n"
-"\t\tsuperclass class\n"
-"\t\tconstructor {{definitionScript \"\"}} {\n"
-"\t\t\tnext {mixin ::oo::configuresupport::configurable}\n"
-"\t\t\tnext $definitionScript\n"
-"\t\t}\n"
-"\t\tdefinitionnamespace -class configuresupport::configurableclass\n"
-"\t\tdefinitionnamespace -instance configuresupport::configurableobject\n"
-"\t}\n"
 "\tclass create configuresupport::configurable {\n"
 "\t\tprivate method Configure:Match {prop kind} {\n"
 "\t\t\tset props [info object property [self] -all $kind]\n"
@@ -362,6 +360,15 @@ static const char *tclOOSetupScript =
 "\t\t\t}\n"
 "\t\t}\n"
 "\t}\n"
+"\tclass create configurable {\n"
+"\t\tsuperclass class\n"
+"\t\tconstructor {{definitionScript \"\"}} {\n"
+"\t\t\tnext {mixin ::oo::configuresupport::configurable}\n"
+"\t\t\tnext $definitionScript\n"
+"\t\t}\n"
+"\t\tdefinitionnamespace -class configuresupport::configurableclass\n"
+"\t\tdefinitionnamespace -instance configuresupport::configurableobject\n"
+"\t}\n"
 "}\n"
 /* !END!: Do not edit above this line. */
 ;
diff --git a/tests/oo.test b/tests/oo.test
index 235a90d..16045dd 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -342,7 +342,7 @@ test oo-1.21 {basic test of OO functionality: default relations} -setup {
     }] {lsort [lsearch -all -not -inline $x *::delegate]}
 } -cleanup {
     interp delete $fresh
-} -result {{} {::oo::Slot ::oo::abstract ::oo::class ::oo::object ::oo::singleton} {::oo::define::filter ::oo::define::mixin ::oo::define::superclass ::oo::define::variable ::oo::objdefine::filter ::oo::objdefine::mixin ::oo::objdefine::variable} {::oo::Slot ::oo::class} {::oo::abstract ::oo::singleton} {} {} {} {} {} ::oo::object ::oo::object ::oo::class ::oo::class ::oo::class}
+} -result {{} {::oo::Slot ::oo::abstract ::oo::class ::oo::configurable ::oo::configuresupport::configurable ::oo::object ::oo::singleton} {::oo::configuresupport::objreadableproperties ::oo::configuresupport::objwritableproperties ::oo::configuresupport::readableproperties ::oo::configuresupport::writableproperties ::oo::define::filter ::oo::define::mixin ::oo::define::superclass ::oo::define::variable ::oo::objdefine::filter ::oo::objdefine::mixin ::oo::objdefine::variable} {::oo::Slot ::oo::class ::oo::configuresupport::configurable} {::oo::abstract ::oo::configurable ::oo::singleton} {} {} {} {} {} ::oo::object ::oo::object ::oo::class ::oo::class ::oo::class}
 
 test oo-2.1 {basic test of OO functionality: constructor} -setup {
     # This is a bit complex because it needs to run in a sub-interp as
@@ -2424,7 +2424,7 @@ test oo-16.2 {OO: object introspection} -body {
 } -returnCodes 1 -result {NOTANOBJECT does not refer to an object}
 test oo-16.3 {OO: object introspection} -body {
     info object gorp oo::object
-} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, class, creationid, definition, filters, forward, isa, methods, methodtype, mixins, namespace, variables, or vars}
+} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, class, creationid, definition, filters, forward, isa, methods, methodtype, mixins, namespace, property, variables, or vars}
 test oo-16.4 {OO: object introspection} -setup {
     oo::class create meta { superclass oo::class }
     [meta create instance1] create instance2
@@ -2643,7 +2643,7 @@ test oo-17.3 {OO: class introspection} -setup {
 } -result {"foo" is not a class}
 test oo-17.4 {OO: class introspection} -body {
     info class gorp oo::object
-} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, constructor, definition, definitionnamespace, destructor, filters, forward, instances, methods, methodtype, mixins, subclasses, superclasses, or variables}
+} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, constructor, definition, definitionnamespace, destructor, filters, forward, instances, methods, methodtype, mixins, property, subclasses, superclasses, or variables}
 test oo-17.5 {OO: class introspection} -setup {
     oo::class create testClass
 } -body {
@@ -4186,7 +4186,7 @@ test oo-34.1 {TIP 380: slots - presence} -setup {
 } -result {::oo::Slot ::oo::Slot ::oo::Slot ::oo::Slot ::oo::Slot ::oo::Slot ::oo::Slot}
 test oo-34.2 {TIP 380: slots - presence} {
     lsort [info class instances oo::Slot]
-} {::oo::define::filter ::oo::define::mixin ::oo::define::superclass ::oo::define::variable ::oo::objdefine::filter ::oo::objdefine::mixin ::oo::objdefine::variable}
+} {::oo::configuresupport::objreadableproperties ::oo::configuresupport::objwritableproperties ::oo::configuresupport::readableproperties ::oo::configuresupport::writableproperties ::oo::define::filter ::oo::define::mixin ::oo::define::superclass ::oo::define::variable ::oo::objdefine::filter ::oo::objdefine::mixin ::oo::objdefine::variable}
 proc getMethods obj {
     list [lsort [info object methods $obj -all]] \
 	[lsort [info object methods $obj -private]]
@@ -5448,6 +5448,246 @@ test oo-43.13 {TIP 524: definition namespace control: user-level introspection}
     parent destroy
     namespace delete foodef
 } -result {{} {} ::foodef {} {}}
+
+test oo-44.1 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set a b c
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set f e d
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set a a a
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set
+    lappend result [info class property c] [info class property c -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
+test oo-44.2 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a b c
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set f e d
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a a a
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set
+    lappend result [info class property c -all] [info class property c -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
+test oo-44.3 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set a b c
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set f e d
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set a a a
+    lappend result [info class property c] [info class property c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set
+    lappend result [info class property c] [info class property c -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
+test oo-44.4 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a b c
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set f e d
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a a a
+    lappend result [info class property c -all] [info class property c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set
+    lappend result [info class property c -all] [info class property c -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
+test oo-44.5 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a b c
+    oo::define d ::oo::configuresupport::readableproperties -set x y z
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set f e d
+    oo::define d ::oo::configuresupport::readableproperties -set r p q
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a a h
+    oo::define d ::oo::configuresupport::readableproperties -set g h g
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define d ::oo::configuresupport::readableproperties -set
+    lappend result [info class property d -all] [info class property d -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {} {}}
+test oo-44.6 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a b c
+    oo::define d ::oo::configuresupport::writableproperties -set x y z
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set f e d
+    oo::define d ::oo::configuresupport::writableproperties -set r p q
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a a h
+    oo::define d ::oo::configuresupport::writableproperties -set g h g
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set
+    lappend result [info class property d -all] [info class property d -writable -all]
+    oo::define d ::oo::configuresupport::writableproperties -set
+    lappend result [info class property d -all] [info class property d -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {}}
+test oo-44.7 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    c create o
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set a b c
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set a a h
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set
+    lappend result [info object property o] [info object property o -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c} {} {d e f} {} {a h} {} {} {}}
+test oo-44.8 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    c create o
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set a b c
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set a a h
+    lappend result [info object property o] [info object property o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set
+    lappend result [info object property o] [info object property o -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c} {} {d e f} {} {a h} {} {}}
+test oo-44.9 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    d create o
+    lappend result [info object property o -all] [info object property o -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a b
+    oo::define d ::oo::configuresupport::readableproperties -set c d
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set e f
+    lappend result [info object property o -all] [info object property o -writable -all]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d b e
+    lappend result [info object property o -all] [info object property o -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c d e f} {} {a b c d e f} {}}
+test oo-44.10 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    d create o
+    lappend result [info object property o -all] [info object property o -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a b
+    oo::define d ::oo::configuresupport::writableproperties -set c d
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set e f
+    lappend result [info object property o -all] [info object property o -writable -all]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d b e
+    lappend result [info object property o -all] [info object property o -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c d e f} {} {a b c d e f}}
+
+test oo-45.1 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+        variable x y
+        method report {} {
+            lappend ::result "x=$x, y=$y"
+        }
+    }
+    set pt [Point new -x 3]
+    $pt report
+    $pt configure -y 4
+    $pt report
+    lappend result [$pt configure -x],[$pt configure -y] [$pt configure]
+} -cleanup {
+    parent destroy
+} -result {{x=3, y=0} {x=3, y=4} 3,4 {-x 3 -y 4}}
+test oo-45.2 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -constraints knownBug -body {	# FIXME # FIXME # FIXME # FIXME
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    set pt [Point new -x 3 -y 4]
+    oo::objdefine $pt property z
+    $pt configure -z 5
+    lappend result [$pt configure -x],[$pt configure -y],[$pt configure -z] \
+	[$pt configure]
+} -cleanup {
+    parent destroy
+} -result {3,4,5 {-x 3 -y 4 -z 5}}
 
 cleanupTests
 return
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 8cc9627..5ae357a 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -450,15 +450,32 @@
 
     # ----------------------------------------------------------------------
     #
-    # oo::configurable --
+    # oo::configuresupport --
+    #
+    #	Namespace that holds all the implementation details of TIP #558.
+    #	Also includes the commands:
     #
-    #	A metaclass that is used to make classes that can be configured. Also
-    #	its supporting classes and namespaces.
+    #	 * readableproperties
+    #	 * writableproperties
+    #	 * objreadableproperties
+    #	 * objwritableproperties
+    #
+    #	Those are all slot implementations that provide access to the C layer
+    #	of property support (i.e., very fast cached lookup of property names).
     #
     # ----------------------------------------------------------------------
 
     namespace eval configuresupport {
-	proc property {readslot writeslot args} {
+
+	# ------------------------------------------------------------------
+	#
+	# oo::configuresupport --
+	#
+	#	A metaclass that is used to make classes that can be configured.
+	#
+	# ------------------------------------------------------------------
+
+	proc PropertyImpl {readslot writeslot args} {
 	    for {set i 0} {$i < [llength $args]} {incr i} {
 		# Parse the property name
 		set prop [lindex $args $i]
@@ -472,7 +489,8 @@
 		set kind readwrite
 
 		# Parse the extra options
-		while {[string match "-*" [set next [lindex $args [expr {$i + 1}]]]]} {
+		while {[set next [lindex $args [expr {$i + 1}]]
+			string match "-*" $next]} {
 		    set arg [lindex $args [incr i 2]]
 		    switch [::tcl::prefix match {-get -kind -set} $next] {
 			-get {
@@ -504,80 +522,137 @@
 		# Install the option
 		switch $kind {
 		    readable {
-			uplevel 1 [list $readslot -append $realprop]
-			uplevel 1 [list method <ReadProp$realprop> {} $getter]
+			uplevel 1 [list \
+				$readslot -append $realprop]
+			uplevel 1 [list \
+				method <ReadProp$realprop> {} $getter]
 		    }
 		    writable {
-			uplevel 1 [list $writeslot -append $realprop]
-			uplevel 1 [list method <WriteProp$realprop> {value} $setter]
+			uplevel 1 [list \
+				$writeslot -append $realprop]
+			uplevel 1 [list \
+				method <WriteProp$realprop> {value} $setter]
 		    }
 		    readwrite {
-			uplevel 1 [list $readslot -append $realprop]
-			uplevel 1 [list $writeslot -append $realprop]
-			uplevel 1 [list method <ReadProp$realprop> {} $getter]
-			uplevel 1 [list method <WriteProp$realprop> {value} $setter]
+			uplevel 1 [list \
+				$readslot -append $realprop]
+			uplevel 1 [list \
+				$writeslot -append $realprop]
+			uplevel 1 [list \
+				method <ReadProp$realprop> {} $getter]
+			uplevel 1 [list \
+				method <WriteProp$realprop> {value} $setter]
 		    }
 		}
 	    }
 	}
+
+	# ------------------------------------------------------------------
+	#
+	# oo::configuresupport::configurableclass,
+	# oo::configuresupport::configurableobject --
+	#
+	#	Namespaces used as implementation vectors for oo::define and
+	#	oo::objdefine when the class/instance is configurable.
+	# 
+	# ------------------------------------------------------------------
+
 	namespace eval configurableclass {
 	    proc property args {
-		tailcall ::oo::configuresupport::property \
+		tailcall ::oo::configuresupport::PropertyImpl \
 		    ::oo::configuresupport::readableproperties \
-		    ::oo::configuresupport::writableproperties \
-		    {*}$args
+		    ::oo::configuresupport::writableproperties {*}$args
 	    }
 	    namespace path ::oo::define
 	}
+
 	namespace eval configurableobject {
 	    proc property args {
-		tailcall ::oo::configuresupport::property \
+		tailcall ::oo::configuresupport::PropertyImpl \
 		    ::oo::configuresupport::objreadableproperties \
-		    ::oo::configuresupport::objwritableproperties \
-		    {*}$args
+		    ::oo::configuresupport::objwritableproperties {*}$args
 	    }
 	    namespace path ::oo::objdefine
 	}
     }
 
-    class create configurable {
-	superclass class
-	constructor {{definitionScript ""}} {
-	    next {mixin ::oo::configuresupport::configurable}
-	    next $definitionScript
-	}
-	definitionnamespace -class configuresupport::configurableclass
-	definitionnamespace -instance configuresupport::configurableobject
-    }
+    # ----------------------------------------------------------------------
+    #
+    # oo::configuresupport::configurable --
+    #
+    #	The class that contains the implementation of the actual 'configure'
+    #	method.
+    #
+    # ----------------------------------------------------------------------
 
     class create configuresupport::configurable {
+	#
+	# Configure:Match --
+	#	Support method for doing the matching of property names
+	#	(including unambiguous prefixes) to the actual real property
+	#	name.
+	# 
 	private method Configure:Match {prop kind} {
 	    set props [info object property [self] -all $kind]
 	    ::tcl::prefix match -message "property" $props $prop
 	}
+
+	#
+	# configure --
+	#	Method for providing client access to the property mechanism.
+	#	Has a user-facing API similar to that of [chan configure].
+	# 
 	method configure args {
 	    if {[llength $args] == 0} {
+		# Read all properties
 		set result {}
 		foreach prop [info object property [self] -all -readable] {
 		    dict set result $prop [my <ReadProp$prop>]
 		}
 		return $result
 	    } elseif {[llength $args] == 1} {
+		# Read a single property
 		set prop [my Configure:Match [lindex $args 0] -readable]
 		return [my <ReadProp$prop>]
 	    } elseif {[llength $args] % 2 == 0} {
+		# Set properties, one or several
 		foreach {prop value} $args {
 		    set prop [my Configure:Match $prop -writable]
 		    my <WriteProp$prop> $value
 		}
 		return
 	    } else {
+		# Invalid call
 		return -code error -errorcode {TCL WRONGARGS} \
 		    [format "wrong # args: should be \"%s\"" \
 			 "[self] configure ?-option value ...?"]
 	    }
 	}
     }
+
+    # ----------------------------------------------------------------------
+    #
+    # oo::configurable --
+    #
+    #	A metaclass that is used to make classes that can be configured. All
+    #	the metaclass itself does is arrange for the class created to have a
+    #	'configure' method and for oo::define and oo::objdefine (on the class
+    #	and its instances) to have a property definition for setting things up
+    #	for 'configure'.
+    #
+    # ----------------------------------------------------------------------
+
+    class create configurable {
+	superclass class
+
+	constructor {{definitionScript ""}} {
+	    next {mixin ::oo::configuresupport::configurable}
+	    next $definitionScript
+	}
+
+	definitionnamespace -class configuresupport::configurableclass
+	definitionnamespace -instance configuresupport::configurableobject
+    }
 }
 
 # Local Variables:
-- 
cgit v0.12


From a7a226fc4988c02841c106b4f1a8fd7af2c5a0c2 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sun, 29 Dec 2019 13:23:47 +0000
Subject: Property definitions now work on instances.

---
 generic/tclOOCall.c   |   9 +--
 generic/tclOOScript.h |  81 ++++++++++++++----------
 tests/oo.test         |   2 +-
 tools/tclOOScript.tcl | 167 ++++++++++++++++++++++++++++++++------------------
 4 files changed, 164 insertions(+), 95 deletions(-)

diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index f647fb7..6b88b3d 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -59,6 +59,7 @@ typedef struct {
 #define BUILDING_MIXINS	   0x400000
 #define TRAVERSED_MIXIN	   0x800000
 #define OBJECT_MIXIN	   0x1000000
+#define DEFINE_FOR_CLASS   0x2000000
 #define MIXIN_CONSISTENT(flags) \
     (((flags) & OBJECT_MIXIN) ||					\
 	!((flags) & BUILDING_MIXINS) == !((flags) & TRAVERSED_MIXIN))
@@ -1896,7 +1897,7 @@ TclOOGetDefineContextNamespace(
     DefineEntry staticSpace[DEFINE_CHAIN_STATIC_SIZE];
     DefineEntry *entryPtr;
     Tcl_Namespace *nsPtr = NULL;
-    int i;
+    int i, flags = (forClass ? DEFINE_FOR_CLASS : 0);
 
     define.list = staticSpace;
     define.num = 0;
@@ -1907,8 +1908,8 @@ TclOOGetDefineContextNamespace(
      * class mixins right.
      */
 
-    AddSimpleDefineNamespaces(oPtr, &define, forClass | BUILDING_MIXINS);
-    AddSimpleDefineNamespaces(oPtr, &define, forClass);
+    AddSimpleDefineNamespaces(oPtr, &define, flags | BUILDING_MIXINS);
+    AddSimpleDefineNamespaces(oPtr, &define, flags);
 
     /*
      * Go through the list until we find a namespace whose name we can
@@ -1992,7 +1993,7 @@ AddSimpleClassDefineNamespaces(
 		flags | TRAVERSED_MIXIN);
     }
 
-    if (flags & ~(TRAVERSED_MIXIN | BUILDING_MIXINS)) {
+    if (flags & DEFINE_FOR_CLASS) {
 	AddDefinitionNamespaceToChain(classPtr, classPtr->clsDefinitionNs,
 		definePtr, flags);
     } else {
diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index b9223ee..8d8dd2a 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -29,7 +29,7 @@ static const char *tclOOSetupScript =
 "::namespace eval ::oo {\n"
 "\t::namespace path {}\n"
 "\tnamespace eval Helpers {\n"
-"\t\t::namespace path {}\n"
+"\t\tnamespace path {}\n"
 "\t\tproc callback {method args} {\n"
 "\t\t\tlist [uplevel 1 {::namespace which my}] $method {*}$args\n"
 "\t\t}\n"
@@ -248,7 +248,7 @@ static const char *tclOOSetupScript =
 "\t\tsuperclass class\n"
 "\t\tunexport create createWithNamespace new\n"
 "\t}\n"
-"\tnamespace eval configuresupport {\n"
+"\t::namespace eval configuresupport {\n"
 "\t\tproc PropertyImpl {readslot writeslot args} {\n"
 "\t\t\tfor {set i 0} {$i < [llength $args]} {incr i} {\n"
 "\t\t\t\tset prop [lindex $args $i]\n"
@@ -316,48 +316,66 @@ static const char *tclOOSetupScript =
 "\t\t\t}\n"
 "\t\t}\n"
 "\t\tnamespace eval configurableclass {\n"
-"\t\t\tproc property args {\n"
-"\t\t\t\ttailcall ::oo::configuresupport::PropertyImpl \\\n"
+"\t\t\t::proc property args {\n"
+"\t\t\t\t::tailcall ::oo::configuresupport::PropertyImpl \\\n"
 "\t\t\t\t\t::oo::configuresupport::readableproperties \\\n"
 "\t\t\t\t\t::oo::configuresupport::writableproperties {*}$args\n"
 "\t\t\t}\n"
-"\t\t\tnamespace path ::oo::define\n"
+"\t\t\t::namespace path ::oo::define\n"
+"\t\t\t::namespace export property\n"
 "\t\t}\n"
 "\t\tnamespace eval configurableobject {\n"
-"\t\t\tproc property args {\n"
-"\t\t\t\ttailcall ::oo::configuresupport::PropertyImpl \\\n"
+"\t\t\t::proc property args {\n"
+"\t\t\t\t::tailcall ::oo::configuresupport::PropertyImpl \\\n"
 "\t\t\t\t\t::oo::configuresupport::objreadableproperties \\\n"
 "\t\t\t\t\t::oo::configuresupport::objwritableproperties {*}$args\n"
 "\t\t\t}\n"
-"\t\t\tnamespace path ::oo::objdefine\n"
+"\t\t\t::namespace path ::oo::objdefine\n"
+"\t\t\t::namespace export property\n"
 "\t\t}\n"
-"\t}\n"
-"\tclass create configuresupport::configurable {\n"
-"\t\tprivate method Configure:Match {prop kind} {\n"
-"\t\t\tset props [info object property [self] -all $kind]\n"
-"\t\t\t::tcl::prefix match -message \"property\" $props $prop\n"
+"\t\tproc ReadAll {object my} {\n"
+"\t\t\tset result {}\n"
+"\t\t\tforeach prop [info object property $object -all -readable] {\n"
+"\t\t\t\tdict set result $prop [$my <ReadProp$prop>]\n"
+"\t\t\t}\n"
+"\t\t\treturn $result\n"
 "\t\t}\n"
-"\t\tmethod configure args {\n"
-"\t\t\tif {[llength $args] == 0} {\n"
-"\t\t\t\tset result {}\n"
-"\t\t\t\tforeach prop [info object property [self] -all -readable] {\n"
-"\t\t\t\t\tdict set result $prop [my <ReadProp$prop>]\n"
+"\t\tproc Match {object propertyName kind} {\n"
+"\t\t\tset props [info object property $object -all $kind]\n"
+"\t\t\t::tcl::prefix match -message \"property\" $props $propertyName\n"
+"\t\t}\n"
+"\t\tproc ReadOne {object my propertyName} {\n"
+"\t\t\tset prop [Match $object $propertyName -readable]\n"
+"\t\t\treturn [$my <ReadProp$prop>]\n"
+"\t\t}\n"
+"\t\tproc WriteMany {object my setterMap} {\n"
+"\t\t\tforeach {prop value} $setterMap {\n"
+"\t\t\t\tset prop [Match $object $prop -writable]\n"
+"\t\t\t\t$my <WriteProp$prop> $value\n"
+"\t\t\t}\n"
+"\t\t\treturn\n"
+"\t\t}\n"
+"\t\t::oo::class create configurable {\n"
+"\t\t\tprivate variable my\n"
+"\t\t\tmethod configure args {\n"
+"\t\t\t\t::if {![::info exists my]} {\n"
+"\t\t\t\t\t::set my [::namespace which my]\n"
 "\t\t\t\t}\n"
-"\t\t\t\treturn $result\n"
-"\t\t\t} elseif {[llength $args] == 1} {\n"
-"\t\t\t\tset prop [my Configure:Match [lindex $args 0] -readable]\n"
-"\t\t\t\treturn [my <ReadProp$prop>]\n"
-"\t\t\t} elseif {[llength $args] % 2 == 0} {\n"
-"\t\t\t\tforeach {prop value} $args {\n"
-"\t\t\t\t\tset prop [my Configure:Match $prop -writable]\n"
-"\t\t\t\t\tmy <WriteProp$prop> $value\n"
+"\t\t\t\t::if {[::llength $args] == 0} {\n"
+"\t\t\t\t\t::oo::configuresupport::ReadAll [self] $my\n"
+"\t\t\t\t} elseif {[::llength $args] == 1} {\n"
+"\t\t\t\t\t::oo::configuresupport::ReadOne [self] $my \\\n"
+"\t\t\t\t\t\t[::lindex $args 0]\n"
+"\t\t\t\t} elseif {[::llength $args] % 2 == 0} {\n"
+"\t\t\t\t\t::oo::configuresupport::WriteMany [self] $my $args\n"
+"\t\t\t\t} else {\n"
+"\t\t\t\t\t::return -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t\t[::format {wrong # args: should be \"%s\"} \\\n"
+"\t\t\t\t\t\t\t\"[self] configure \?-option value ...\?\"]\n"
 "\t\t\t\t}\n"
-"\t\t\t\treturn\n"
-"\t\t\t} else {\n"
-"\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
-"\t\t\t\t\t[format \"wrong # args: should be \\\"%s\\\"\" \\\n"
-"\t\t\t\t\t\t \"[self] configure \?-option value ...\?\"]\n"
 "\t\t\t}\n"
+"\t\t\tdefinitionnamespace -instance configurableobject\n"
+"\t\t\tdefinitionnamespace -class configurableclass\n"
 "\t\t}\n"
 "\t}\n"
 "\tclass create configurable {\n"
@@ -367,7 +385,6 @@ static const char *tclOOSetupScript =
 "\t\t\tnext $definitionScript\n"
 "\t\t}\n"
 "\t\tdefinitionnamespace -class configuresupport::configurableclass\n"
-"\t\tdefinitionnamespace -instance configuresupport::configurableobject\n"
 "\t}\n"
 "}\n"
 /* !END!: Do not edit above this line. */
diff --git a/tests/oo.test b/tests/oo.test
index 16045dd..32a0cf1 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -5672,7 +5672,7 @@ test oo-45.2 {TIP 558: properties: configurable class system} -setup {
     oo::class create parent
     unset -nocomplain result
     set result {}
-} -constraints knownBug -body {	# FIXME # FIXME # FIXME # FIXME
+} -body {
     oo::configurable create Point {
 	superclass parent
 	property x y
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 5ae357a..b441765 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -18,7 +18,7 @@
     # Commands that are made available to objects by default.
     #
     namespace eval Helpers {
-	::namespace path {}
+	namespace path {}
 
 	# ------------------------------------------------------------------
 	#
@@ -465,7 +465,7 @@
     #
     # ----------------------------------------------------------------------
 
-    namespace eval configuresupport {
+    ::namespace eval configuresupport {
 
 	# ------------------------------------------------------------------
 	#
@@ -558,75 +558,127 @@
 	# ------------------------------------------------------------------
 
 	namespace eval configurableclass {
-	    proc property args {
-		tailcall ::oo::configuresupport::PropertyImpl \
+	    ::proc property args {
+		::tailcall ::oo::configuresupport::PropertyImpl \
 		    ::oo::configuresupport::readableproperties \
 		    ::oo::configuresupport::writableproperties {*}$args
 	    }
-	    namespace path ::oo::define
+	    ::namespace path ::oo::define
+	    ::namespace export property
 	}
 
 	namespace eval configurableobject {
-	    proc property args {
-		tailcall ::oo::configuresupport::PropertyImpl \
+	    ::proc property args {
+		::tailcall ::oo::configuresupport::PropertyImpl \
 		    ::oo::configuresupport::objreadableproperties \
 		    ::oo::configuresupport::objwritableproperties {*}$args
 	    }
-	    namespace path ::oo::objdefine
+	    ::namespace path ::oo::objdefine
+	    ::namespace export property
 	}
-    }
 
-    # ----------------------------------------------------------------------
-    #
-    # oo::configuresupport::configurable --
-    #
-    #	The class that contains the implementation of the actual 'configure'
-    #	method.
-    #
-    # ----------------------------------------------------------------------
+	# ------------------------------------------------------------------
+	#
+	# oo::configuresupport::ReadAll --
+	#
+	#	The implementation of [$o configure] with no extra arguments.
+	#
+	# ------------------------------------------------------------------
+
+	proc ReadAll {object my} {
+	    set result {}
+	    foreach prop [info object property $object -all -readable] {
+		dict set result $prop [$my <ReadProp$prop>]
+	    }
+	    return $result
+	}
 
-    class create configuresupport::configurable {
+	# ------------------------------------------------------------------
 	#
-	# Configure:Match --
-	#	Support method for doing the matching of property names
-	#	(including unambiguous prefixes) to the actual real property
-	#	name.
-	# 
-	private method Configure:Match {prop kind} {
-	    set props [info object property [self] -all $kind]
-	    ::tcl::prefix match -message "property" $props $prop
+	# oo::configuresupport::Match --
+	#
+	#	How to convert an imprecise property name into a full one.
+	#
+	# ------------------------------------------------------------------
+
+	proc Match {object propertyName kind} {
+	    set props [info object property $object -all $kind]
+	    ::tcl::prefix match -message "property" $props $propertyName
 	}
 
+	# ------------------------------------------------------------------
 	#
-	# configure --
-	#	Method for providing client access to the property mechanism.
-	#	Has a user-facing API similar to that of [chan configure].
-	# 
-	method configure args {
-	    if {[llength $args] == 0} {
-		# Read all properties
-		set result {}
-		foreach prop [info object property [self] -all -readable] {
-		    dict set result $prop [my <ReadProp$prop>]
+	# oo::configuresupport::ReadOne --
+	#
+	#	The implementation of [$o configure -prop] with that single
+	#	extra argument.
+	#
+	# ------------------------------------------------------------------
+
+	proc ReadOne {object my propertyName} {
+	    set prop [Match $object $propertyName -readable]
+	    return [$my <ReadProp$prop>]
+	}
+
+	# ------------------------------------------------------------------
+	#
+	# oo::configuresupport::WriteMany --
+	#
+	#	The implementation of [$o configure -prop val ?-prop val...?].
+	#
+	# ------------------------------------------------------------------
+
+	proc WriteMany {object my setterMap} {
+	    foreach {prop value} $setterMap {
+		set prop [Match $object $prop -writable]
+		$my <WriteProp$prop> $value
+	    }
+	    return
+	}
+
+	# ------------------------------------------------------------------
+	#
+	# oo::configuresupport::configurable --
+	#
+	#	The class that contains the implementation of the actual
+	#	'configure' method (mixed into actually configurable classes).
+	#	Great care needs to be taken in these methods as they are
+	#	potentially used in classes where the current namespace is set
+	#	up very strangely.
+	#
+	# ------------------------------------------------------------------
+
+	::oo::class create configurable {
+	    private variable my
+	    #
+	    # configure --
+	    #	Method for providing client access to the property mechanism.
+	    #	Has a user-facing API similar to that of [chan configure].
+	    # 
+	    method configure args {
+		::if {![::info exists my]} {
+		    ::set my [::namespace which my]
 		}
-		return $result
-	    } elseif {[llength $args] == 1} {
-		# Read a single property
-		set prop [my Configure:Match [lindex $args 0] -readable]
-		return [my <ReadProp$prop>]
-	    } elseif {[llength $args] % 2 == 0} {
-		# Set properties, one or several
-		foreach {prop value} $args {
-		    set prop [my Configure:Match $prop -writable]
-		    my <WriteProp$prop> $value
+		::if {[::llength $args] == 0} {
+		    # Read all properties
+		    ::oo::configuresupport::ReadAll [self] $my
+		} elseif {[::llength $args] == 1} {
+		    # Read a single property
+		    ::oo::configuresupport::ReadOne [self] $my \
+			[::lindex $args 0]
+		} elseif {[::llength $args] % 2 == 0} {
+		    # Set properties, one or several
+		    ::oo::configuresupport::WriteMany [self] $my $args
+		} else {
+		    # Invalid call
+		    ::return -code error -errorcode {TCL WRONGARGS} \
+			[::format {wrong # args: should be "%s"} \
+			    "[self] configure ?-option value ...?"]
 		}
-		return
-	    } else {
-		# Invalid call
-		return -code error -errorcode {TCL WRONGARGS} \
-		    [format "wrong # args: should be \"%s\"" \
-			 "[self] configure ?-option value ...?"]
 	    }
+
+	    definitionnamespace -instance configurableobject
+	    definitionnamespace -class configurableclass
 	}
     }
 
@@ -634,11 +686,11 @@
     #
     # oo::configurable --
     #
-    #	A metaclass that is used to make classes that can be configured. All
-    #	the metaclass itself does is arrange for the class created to have a
-    #	'configure' method and for oo::define and oo::objdefine (on the class
-    #	and its instances) to have a property definition for setting things up
-    #	for 'configure'.
+    #	A metaclass that is used to make classes that can be configured in
+    #	their creation phase (and later too). All the metaclass itself does is
+    #	arrange for the class created to have a 'configure' method and for
+    #	oo::define and oo::objdefine (on the class and its instances) to have
+    #	a property definition for setting things up for 'configure'.
     #
     # ----------------------------------------------------------------------
 
@@ -651,7 +703,6 @@
 	}
 
 	definitionnamespace -class configuresupport::configurableclass
-	definitionnamespace -instance configuresupport::configurableobject
     }
 }
 
-- 
cgit v0.12


From c15b6135d53724df6ead08563d101ff24a98c812 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 30 Dec 2019 10:12:16 +0000
Subject: More tests, more fixes

---
 generic/tclOOScript.h |  62 +++++---
 tests/oo.test         | 398 +++++++++++++++++++++++++++++++++++++++++++++++++-
 tools/tclOOScript.tcl |  71 +++++----
 3 files changed, 473 insertions(+), 58 deletions(-)

diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index 8d8dd2a..7a4a0bb 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -249,11 +249,13 @@ static const char *tclOOSetupScript =
 "\t\tunexport create createWithNamespace new\n"
 "\t}\n"
 "\t::namespace eval configuresupport {\n"
+"\t\tnamespace path ::tcl\n"
 "\t\tproc PropertyImpl {readslot writeslot args} {\n"
 "\t\t\tfor {set i 0} {$i < [llength $args]} {incr i} {\n"
 "\t\t\t\tset prop [lindex $args $i]\n"
 "\t\t\t\tif {[string match \"-*\" $prop]} {\n"
-"\t\t\t\t\treturn -code error -errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\treturn -code error -level 2 \\\n"
+"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
 "\t\t\t\t\t\t\"bad property name \\\"$prop\\\"; must not begin with -\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tset realprop [string cat \"-\" $prop]\n"
@@ -263,27 +265,33 @@ static const char *tclOOSetupScript =
 "\t\t\t\twhile {[set next [lindex $args [expr {$i + 1}]]\n"
 "\t\t\t\t\t\tstring match \"-*\" $next]} {\n"
 "\t\t\t\t\tset arg [lindex $args [incr i 2]]\n"
-"\t\t\t\t\tswitch [::tcl::prefix match {-get -kind -set} $next] {\n"
+"\t\t\t\t\tswitch [prefix match -error [list -level 2 -errorcode \\\n"
+"\t\t\t\t\t\t\t[list TCL LOOKUP INDEX option $next]] {-get -kind -set} $next] {\n"
 "\t\t\t\t\t\t-get {\n"
 "\t\t\t\t\t\t\tif {$i >= [llength $args]} {\n"
-"\t\t\t\t\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t\t\t\treturn -code error -level 2 \\\n"
+"\t\t\t\t\t\t\t\t\t-errorcode {TCL WRONGARGS} \\\n"
 "\t\t\t\t\t\t\t\t\t\"missing body to go with -get option\"\n"
 "\t\t\t\t\t\t\t}\n"
 "\t\t\t\t\t\t\tset getter $arg\n"
 "\t\t\t\t\t\t}\n"
 "\t\t\t\t\t\t-set {\n"
 "\t\t\t\t\t\t\tif {$i >= [llength $args]} {\n"
-"\t\t\t\t\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t\t\t\treturn -code error -level 2 \\\n"
+"\t\t\t\t\t\t\t\t\t-errorcode {TCL WRONGARGS} \\\n"
 "\t\t\t\t\t\t\t\t\t\"missing body to go with -set option\"\n"
 "\t\t\t\t\t\t\t}\n"
-"\t\t\t\t\t\t\tset getter $arg\n"
+"\t\t\t\t\t\t\tset setter $arg\n"
 "\t\t\t\t\t\t}\n"
 "\t\t\t\t\t\t-kind {\n"
 "\t\t\t\t\t\t\tif {$i >= [llength $args]} {\n"
-"\t\t\t\t\t\t\t\treturn -code error -errorcode {TCL WRONGARGS} \\\n"
+"\t\t\t\t\t\t\t\treturn -code error -level 2\\\n"
+"\t\t\t\t\t\t\t\t\t-errorcode {TCL WRONGARGS} \\\n"
 "\t\t\t\t\t\t\t\t\t\"missing kind value to go with -kind option\"\n"
 "\t\t\t\t\t\t\t}\n"
-"\t\t\t\t\t\t\tset kind [::tcl::prefix match -message \"kind\" {\n"
+"\t\t\t\t\t\t\tset kind [prefix match -message \"kind\" -error [list \\\n"
+"\t\t\t\t\t\t\t\t\t-level 2 \\\n"
+"\t\t\t\t\t\t\t\t\t-errorcode [list TCL LOOKUP INDEX kind $arg]] {\n"
 "\t\t\t\t\t\t\t\treadable readwrite writable\n"
 "\t\t\t\t\t\t\t} $arg]\n"
 "\t\t\t\t\t\t}\n"
@@ -291,25 +299,29 @@ static const char *tclOOSetupScript =
 "\t\t\t\t}\n"
 "\t\t\t\tswitch $kind {\n"
 "\t\t\t\t\treadable {\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\t$readslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
+"\t\t\t\t\t\t\t\t$writeslot -remove $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\tmethod <ReadProp$realprop> {} $getter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t\twritable {\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
+"\t\t\t\t\t\t\t\t$readslot -remove $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\t$writeslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\tmethod <WriteProp$realprop> {value} $setter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t\treadwrite {\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\t$readslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\t$writeslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\tmethod <ReadProp$realprop> {} $getter]\n"
-"\t\t\t\t\t\tuplevel 1 [list \\\n"
+"\t\t\t\t\t\tuplevel 2 [list \\\n"
 "\t\t\t\t\t\t\t\tmethod <WriteProp$realprop> {value} $setter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t}\n"
@@ -317,7 +329,7 @@ static const char *tclOOSetupScript =
 "\t\t}\n"
 "\t\tnamespace eval configurableclass {\n"
 "\t\t\t::proc property args {\n"
-"\t\t\t\t::tailcall ::oo::configuresupport::PropertyImpl \\\n"
+"\t\t\t\t::oo::configuresupport::PropertyImpl \\\n"
 "\t\t\t\t\t::oo::configuresupport::readableproperties \\\n"
 "\t\t\t\t\t::oo::configuresupport::writableproperties {*}$args\n"
 "\t\t\t}\n"
@@ -326,7 +338,7 @@ static const char *tclOOSetupScript =
 "\t\t}\n"
 "\t\tnamespace eval configurableobject {\n"
 "\t\t\t::proc property args {\n"
-"\t\t\t\t::tailcall ::oo::configuresupport::PropertyImpl \\\n"
+"\t\t\t\t::oo::configuresupport::PropertyImpl \\\n"
 "\t\t\t\t\t::oo::configuresupport::objreadableproperties \\\n"
 "\t\t\t\t\t::oo::configuresupport::objwritableproperties {*}$args\n"
 "\t\t\t}\n"
@@ -340,17 +352,21 @@ static const char *tclOOSetupScript =
 "\t\t\t}\n"
 "\t\t\treturn $result\n"
 "\t\t}\n"
-"\t\tproc Match {object propertyName kind} {\n"
-"\t\t\tset props [info object property $object -all $kind]\n"
-"\t\t\t::tcl::prefix match -message \"property\" $props $propertyName\n"
-"\t\t}\n"
 "\t\tproc ReadOne {object my propertyName} {\n"
-"\t\t\tset prop [Match $object $propertyName -readable]\n"
+"\t\t\tset props [info object property $object -all -readable]\n"
+"\t\t\tset prop [prefix match -message \"property\" -error [list\\\n"
+"\t\t\t\t\t-level 2 -errorcode [list \\\n"
+"\t\t\t\t\t\tTCL LOOKUP INDEX property $propertyName]] \\\n"
+"\t\t\t\t\t\t  $props $propertyName]\n"
 "\t\t\treturn [$my <ReadProp$prop>]\n"
 "\t\t}\n"
 "\t\tproc WriteMany {object my setterMap} {\n"
+"\t\t\tset props [info object property $object -all -writable]\n"
 "\t\t\tforeach {prop value} $setterMap {\n"
-"\t\t\t\tset prop [Match $object $prop -writable]\n"
+"\t\t\t\tset prop [prefix match -message \"property\" -error [list\\\n"
+"\t\t\t\t\t-level 2 -errorcode [list \\\n"
+"\t\t\t\t\t\tTCL LOOKUP INDEX property $prop]] \\\n"
+"\t\t\t\t\t\t\t  $props $prop]\n"
 "\t\t\t\t$my <WriteProp$prop> $value\n"
 "\t\t\t}\n"
 "\t\t\treturn\n"
diff --git a/tests/oo.test b/tests/oo.test
index 32a0cf1..f86b33a 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -5670,8 +5670,29 @@ test oo-45.1 {TIP 558: properties: configurable class system} -setup {
 } -result {{x=3, y=0} {x=3, y=4} 3,4 {-x 3 -y 4}}
 test oo-45.2 {TIP 558: properties: configurable class system} -setup {
     oo::class create parent
-    unset -nocomplain result
-    set result {}
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    oo::configurable create 3DPoint {
+	superclass Point
+	property z
+	constructor args {
+	    next -z 0 {*}$args
+	}
+    }
+    set pt [3DPoint new -x 3 -y 4 -z 5]
+    list [$pt configure -x],[$pt configure -y],[$pt configure -z] \
+	[$pt configure]
+} -cleanup {
+    parent destroy
+} -result {3,4,5 {-x 3 -y 4 -z 5}}
+test oo-45.3 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
 } -body {
     oo::configurable create Point {
 	superclass parent
@@ -5683,11 +5704,382 @@ test oo-45.2 {TIP 558: properties: configurable class system} -setup {
     set pt [Point new -x 3 -y 4]
     oo::objdefine $pt property z
     $pt configure -z 5
-    lappend result [$pt configure -x],[$pt configure -y],[$pt configure -z] \
+    list [$pt configure -x],[$pt configure -y],[$pt configure -z] \
 	[$pt configure]
 } -cleanup {
     parent destroy
 } -result {3,4,5 {-x 3 -y 4 -z 5}}
+test oo-45.4 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    [Point new] configure gorp
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property "gorp": must be -x or -y}
+test oo-45.5 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    oo::configurable create 3DPoint {
+	superclass Point
+	property z
+	constructor args {
+	    next -z 0 {*}$args
+	}
+    }
+    [3DPoint new] configure gorp
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property "gorp": must be -x, -y, or -z}
+test oo-45.6 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    [Point create p] configure -x 1 -y
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {wrong # args: should be "::p configure ?-option value ...?"}
+test oo-45.7 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+    unset -nocomplain msg
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y -kind writable
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    Point create p
+    list [p configure -y ok] [catch {p configure -y} msg] $msg
+} -cleanup {
+    parent destroy
+} -result {{} 1 {bad property "-y": must be -x}}
+test oo-45.8 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+    unset -nocomplain msg
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y -kind readable
+        constructor args {
+            my configure -x 0 {*}$args
+	    variable y 123
+        }
+    }
+    Point create p
+    list [p configure] [p configure -y] [catch {p configure -y foo} msg] $msg
+} -cleanup {
+    parent destroy
+} -result {{-x 0 -y 123} 123 1 {bad property "-y": must be -x}}
+
+test oo-46.1 {ITP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	variable xyz
+	property x -get {
+	    global result
+	    lappend result "get"
+	    return [lrepeat 3 $xyz]
+	} -set {
+	    global result
+	    lappend result [list set $value]
+	    set xyz [expr {$value * 3}]
+	}
+    }
+    Point create pt
+    pt configure -x 5
+    lappend result >[pt configure -x]<
+} -cleanup {
+    parent destroy
+} -result {{set 5} get {>15 15 15<}}
+test oo-46.2 {ITP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	variable xyz
+	property x -get {
+	    global result
+	    lappend result "get"
+	    return [lrepeat 3 $xyz]
+	} -set {
+	    global result
+	    lappend result [list set $value]
+	    set xyz [expr {$value * 3}]
+	} y -kind readable -get {return $xyz}
+    }
+    Point create pt
+    pt configure -x 5
+    lappend result >[pt configure -x]< [pt configure -y]
+} -cleanup {
+    parent destroy
+} -result {{set 5} get {>15 15 15<} 15}
+test oo-46.2 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	variable xyz
+	property -x -get {return $xyz}
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "-x"; must not begin with -}
+test oo-46.3 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -get
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing body to go with -get option}
+test oo-46.4 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -set
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing body to go with -set option}
+test oo-46.5 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -kind
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing kind value to go with -kind option}
+test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -get {} -set
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing body to go with -set option}
+test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -get {} -get {return ok}
+    }
+    [Point new] configure -x
+} -cleanup {
+    parent destroy
+} -result ok
+test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -kind gorp
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad kind "gorp": must be readable, readwrite, or writable}
+test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -k reada -g {return ok}
+    }
+    [Point new] configure -x
+} -cleanup {
+    parent destroy
+} -result ok
+test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property {*}{
+	    x -kind writable
+	    y -get {return ok}
+	}
+    }
+    [Point new] configure -y
+} -cleanup {
+    parent destroy
+} -result ok
+test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+    unset -nocomplain msg
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	variable xy
+	property x -kind readable -get {return $xy}
+	property x -kind writable -set {set xy $value}
+	property y
+    }
+    Point create pt
+    list [catch {
+	pt configure -x ok
+    } msg] $msg [catch {
+	pt configure -x
+    } msg] $msg
+} -cleanup {
+    parent destroy
+} -result {0 {} 1 {bad property "-x": must be -y}}
+
+test oo-47.1 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property -x}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad property name "-x"; must not begin with -
+    while executing
+"property -x"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property -x}"} {TCLOO PROPERTY_FORMAT}}
+test oo-47.2 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -get}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {missing body to go with -get option
+    while executing
+"property x -get"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -get}"} {TCL WRONGARGS}}
+test oo-47.3 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -set}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {missing body to go with -set option
+    while executing
+"property x -set"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -set}"} {TCL WRONGARGS}}
+test oo-47.4 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -kind}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {missing kind value to go with -kind option
+    while executing
+"property x -kind"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -kind}"} {TCL WRONGARGS}}
+test oo-47.5 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -kind gorp}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad kind "gorp": must be readable, readwrite, or writable
+    while executing
+"property x -kind gorp"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -kind gorp}"} {TCL LOOKUP INDEX kind gorp}}
+test oo-47.6 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -gorp}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad option "-gorp": must be -get, -kind, or -set
+    while executing
+"property x -gorp"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -gorp}"} {TCL LOOKUP INDEX option -gorp}}
+test oo-47.7 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x
+    }
+    Point create pt
+    list [catch {pt configure -gorp} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad property "-gorp": must be -x
+    while executing
+"pt configure -gorp"} {TCL LOOKUP INDEX property -gorp}}
+test oo-47.8 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x
+    }
+    Point create pt
+    list [catch {pt configure -gorp blarg} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad property "-gorp": must be -x
+    while executing
+"pt configure -gorp blarg"} {TCL LOOKUP INDEX property -gorp}}
 
 cleanupTests
 return
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index b441765..4dbc48c 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -466,6 +466,7 @@
     # ----------------------------------------------------------------------
 
     ::namespace eval configuresupport {
+	namespace path ::tcl
 
 	# ------------------------------------------------------------------
 	#
@@ -480,7 +481,8 @@
 		# Parse the property name
 		set prop [lindex $args $i]
 		if {[string match "-*" $prop]} {
-		    return -code error -errorcode {TCLOO PROPERTY_FORMAT} \
+		    return -code error -level 2 \
+			-errorcode {TCLOO PROPERTY_FORMAT} \
 			"bad property name \"$prop\"; must not begin with -"
 		}
 		set realprop [string cat "-" $prop]
@@ -492,27 +494,33 @@
 		while {[set next [lindex $args [expr {$i + 1}]]
 			string match "-*" $next]} {
 		    set arg [lindex $args [incr i 2]]
-		    switch [::tcl::prefix match {-get -kind -set} $next] {
+		    switch [prefix match -error [list -level 2 -errorcode \
+			    [list TCL LOOKUP INDEX option $next]] {-get -kind -set} $next] {
 			-get {
 			    if {$i >= [llength $args]} {
-				return -code error -errorcode {TCL WRONGARGS} \
+				return -code error -level 2 \
+				    -errorcode {TCL WRONGARGS} \
 				    "missing body to go with -get option"
 			    }
 			    set getter $arg
 			}
 			-set {
 			    if {$i >= [llength $args]} {
-				return -code error -errorcode {TCL WRONGARGS} \
+				return -code error -level 2 \
+				    -errorcode {TCL WRONGARGS} \
 				    "missing body to go with -set option"
 			    }
-			    set getter $arg
+			    set setter $arg
 			}
 			-kind {
 			    if {$i >= [llength $args]} {
-				return -code error -errorcode {TCL WRONGARGS} \
+				return -code error -level 2\
+				    -errorcode {TCL WRONGARGS} \
 				    "missing kind value to go with -kind option"
 			    }
-			    set kind [::tcl::prefix match -message "kind" {
+			    set kind [prefix match -message "kind" -error [list \
+				    -level 2 \
+				    -errorcode [list TCL LOOKUP INDEX kind $arg]] {
 				readable readwrite writable
 			    } $arg]
 			}
@@ -522,25 +530,29 @@
 		# Install the option
 		switch $kind {
 		    readable {
-			uplevel 1 [list \
+			uplevel 2 [list \
 				$readslot -append $realprop]
-			uplevel 1 [list \
+			uplevel 2 [list \
+				$writeslot -remove $realprop]
+			uplevel 2 [list \
 				method <ReadProp$realprop> {} $getter]
 		    }
 		    writable {
-			uplevel 1 [list \
+			uplevel 2 [list \
+				$readslot -remove $realprop]
+			uplevel 2 [list \
 				$writeslot -append $realprop]
-			uplevel 1 [list \
+			uplevel 2 [list \
 				method <WriteProp$realprop> {value} $setter]
 		    }
 		    readwrite {
-			uplevel 1 [list \
+			uplevel 2 [list \
 				$readslot -append $realprop]
-			uplevel 1 [list \
+			uplevel 2 [list \
 				$writeslot -append $realprop]
-			uplevel 1 [list \
+			uplevel 2 [list \
 				method <ReadProp$realprop> {} $getter]
-			uplevel 1 [list \
+			uplevel 2 [list \
 				method <WriteProp$realprop> {value} $setter]
 		    }
 		}
@@ -559,7 +571,7 @@
 
 	namespace eval configurableclass {
 	    ::proc property args {
-		::tailcall ::oo::configuresupport::PropertyImpl \
+		::oo::configuresupport::PropertyImpl \
 		    ::oo::configuresupport::readableproperties \
 		    ::oo::configuresupport::writableproperties {*}$args
 	    }
@@ -569,7 +581,7 @@
 
 	namespace eval configurableobject {
 	    ::proc property args {
-		::tailcall ::oo::configuresupport::PropertyImpl \
+		::oo::configuresupport::PropertyImpl \
 		    ::oo::configuresupport::objreadableproperties \
 		    ::oo::configuresupport::objwritableproperties {*}$args
 	    }
@@ -595,19 +607,6 @@
 
 	# ------------------------------------------------------------------
 	#
-	# oo::configuresupport::Match --
-	#
-	#	How to convert an imprecise property name into a full one.
-	#
-	# ------------------------------------------------------------------
-
-	proc Match {object propertyName kind} {
-	    set props [info object property $object -all $kind]
-	    ::tcl::prefix match -message "property" $props $propertyName
-	}
-
-	# ------------------------------------------------------------------
-	#
 	# oo::configuresupport::ReadOne --
 	#
 	#	The implementation of [$o configure -prop] with that single
@@ -616,7 +615,11 @@
 	# ------------------------------------------------------------------
 
 	proc ReadOne {object my propertyName} {
-	    set prop [Match $object $propertyName -readable]
+	    set props [info object property $object -all -readable]
+	    set prop [prefix match -message "property" -error [list\
+		    -level 2 -errorcode [list \
+			TCL LOOKUP INDEX property $propertyName]] \
+			  $props $propertyName]
 	    return [$my <ReadProp$prop>]
 	}
 
@@ -629,8 +632,12 @@
 	# ------------------------------------------------------------------
 
 	proc WriteMany {object my setterMap} {
+	    set props [info object property $object -all -writable]
 	    foreach {prop value} $setterMap {
-		set prop [Match $object $prop -writable]
+		set prop [prefix match -message "property" -error [list\
+		    -level 2 -errorcode [list \
+			TCL LOOKUP INDEX property $prop]] \
+			      $props $prop]
 		$my <WriteProp$prop> $value
 	    }
 	    return
-- 
cgit v0.12


From 6eb109c913cd2b43ad9298df8f9eaf9e66c75a77 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 30 Dec 2019 15:35:51 +0000
Subject: Even more tests, this time of the return-code semantics of property
 getters and setters.

---
 generic/tclOOScript.h |  49 +++++++++++++-
 tests/oo.test         | 174 +++++++++++++++++++++++++++++++++++++++++++++++---
 tools/tclOOScript.tcl |  49 +++++++++++++-
 3 files changed, 256 insertions(+), 16 deletions(-)

diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index 7a4a0bb..e8fd814 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -348,7 +348,21 @@ static const char *tclOOSetupScript =
 "\t\tproc ReadAll {object my} {\n"
 "\t\t\tset result {}\n"
 "\t\t\tforeach prop [info object property $object -all -readable] {\n"
-"\t\t\t\tdict set result $prop [$my <ReadProp$prop>]\n"
+"\t\t\t\ttry {\n"
+"\t\t\t\t\tdict set result $prop [$my <ReadProp$prop>]\n"
+"\t\t\t\t} on error {msg opt} {\n"
+"\t\t\t\t\tdict set opt -level 2\n"
+"\t\t\t\t\treturn -options $opt $msg\n"
+"\t\t\t\t} on return {msg opt} {\n"
+"\t\t\t\t\tdict incr opt -level 2\n"
+"\t\t\t\t\treturn -options $opt $msg\n"
+"\t\t\t\t} on break {} {\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\t\t\"property getter for $prop did a break\"\n"
+"\t\t\t\t} on continue {} {\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\t\t\"property getter for $prop did a continue\"\n"
+"\t\t\t\t}\n"
 "\t\t\t}\n"
 "\t\t\treturn $result\n"
 "\t\t}\n"
@@ -358,7 +372,22 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\t-level 2 -errorcode [list \\\n"
 "\t\t\t\t\t\tTCL LOOKUP INDEX property $propertyName]] \\\n"
 "\t\t\t\t\t\t  $props $propertyName]\n"
-"\t\t\treturn [$my <ReadProp$prop>]\n"
+"\t\t\ttry {\n"
+"\t\t\t\tset value [$my <ReadProp$prop>]\n"
+"\t\t\t} on error {msg opt} {\n"
+"\t\t\t\tdict set opt -level 2\n"
+"\t\t\t\treturn -options $opt $msg\n"
+"\t\t\t} on return {msg opt} {\n"
+"\t\t\t\tdict incr opt -level 2\n"
+"\t\t\t\treturn -options $opt $msg\n"
+"\t\t\t} on break {} {\n"
+"\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\t\"property getter for $prop did a break\"\n"
+"\t\t\t} on continue {} {\n"
+"\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\t\"property getter for $prop did a continue\"\n"
+"\t\t\t}\n"
+"\t\t\treturn $value\n"
 "\t\t}\n"
 "\t\tproc WriteMany {object my setterMap} {\n"
 "\t\t\tset props [info object property $object -all -writable]\n"
@@ -367,7 +396,21 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\t-level 2 -errorcode [list \\\n"
 "\t\t\t\t\t\tTCL LOOKUP INDEX property $prop]] \\\n"
 "\t\t\t\t\t\t\t  $props $prop]\n"
-"\t\t\t\t$my <WriteProp$prop> $value\n"
+"\t\t\t\ttry {\n"
+"\t\t\t\t\t$my <WriteProp$prop> $value\n"
+"\t\t\t\t} on error {msg opt} {\n"
+"\t\t\t\t\tdict set opt -level 2\n"
+"\t\t\t\t\treturn -options $opt $msg\n"
+"\t\t\t\t} on return {msg opt} {\n"
+"\t\t\t\t\tdict incr opt -level 2\n"
+"\t\t\t\t\treturn -options $opt $msg\n"
+"\t\t\t\t} on break {} {\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\t\t\"property setter for $prop did a break\"\n"
+"\t\t\t\t} on continue {} {\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\t\t\"property setter for $prop did a continue\"\n"
+"\t\t\t\t}\n"
 "\t\t\t}\n"
 "\t\t\treturn\n"
 "\t\t}\n"
diff --git a/tests/oo.test b/tests/oo.test
index f86b33a..631c84d 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -5894,8 +5894,8 @@ test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
 test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
+    oo::configurable create Point {
+	superclass parent
 	property x -get {} -get {return ok}
     }
     [Point new] configure -x
@@ -5905,8 +5905,8 @@ test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
 test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
+    oo::configurable create Point {
+	superclass parent
 	property x -kind gorp
     }
 } -returnCodes error -cleanup {
@@ -5915,8 +5915,8 @@ test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
 test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
+    oo::configurable create Point {
+	superclass parent
 	property x -k reada -g {return ok}
     }
     [Point new] configure -x
@@ -5926,8 +5926,8 @@ test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
 test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
+    oo::configurable create Point {
+	superclass parent
 	property {*}{
 	    x -kind writable
 	    y -get {return ok}
@@ -5941,8 +5941,8 @@ test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
     unset -nocomplain msg
 } -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
+    oo::configurable create Point {
+	superclass parent
 	variable xy
 	property x -kind readable -get {return $xy}
 	property x -kind writable -set {set xy $value}
@@ -5957,6 +5957,160 @@ test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result {0 {} 1 {bad property "-x": must be -y}}
+test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -code break}
+    }
+    while 1 {
+	[Point new] configure -x
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property getter for -x did a break}
+test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -code break}
+    }
+    while 1 {
+	[Point new] configure
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property getter for -x did a break}
+test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {error "boo"}
+    }
+    while 1 {
+	[Point new] configure -x
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result boo
+test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {error "boo"}
+    }
+    while 1 {
+	[Point new] configure
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result boo
+test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -code continue}
+    }
+    while 1 {
+	[Point new] configure -x
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property getter for -x did a continue}
+test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -level 2 ok}
+    }
+    apply {{} {
+	[Point new] configure
+	return bad
+    }}
+} -cleanup {
+    parent destroy
+} -result ok
+test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -level 2 ok}
+    }
+    apply {{} {
+	[Point new] configure -x
+	return bad
+    }}
+} -cleanup {
+    parent destroy
+} -result ok
+test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {return -code break}
+    }
+    while 1 {
+	[Point new] configure -x gorp
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property setter for -x did a break}
+test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {return -code continue}
+    }
+    while 1 {
+	[Point new] configure -x gorp
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property setter for -x did a continue}
+test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {error "boo"}
+    }
+    while 1 {
+	[Point new] configure -x gorp
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result boo
+test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {return -level 2 ok}
+    }
+    apply {{} {
+	[Point new] configure -x gorp
+	return bad
+    }}
+} -cleanup {
+    parent destroy
+} -result ok
 
 test oo-47.1 {TIP 558: properties: error details} -setup {
     oo::class create parent
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 4dbc48c..56a7bf8 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -600,7 +600,21 @@
 	proc ReadAll {object my} {
 	    set result {}
 	    foreach prop [info object property $object -all -readable] {
-		dict set result $prop [$my <ReadProp$prop>]
+		try {
+		    dict set result $prop [$my <ReadProp$prop>]
+		} on error {msg opt} {
+		    dict set opt -level 2
+		    return -options $opt $msg
+		} on return {msg opt} {
+		    dict incr opt -level 2
+		    return -options $opt $msg
+		} on break {} {
+		    return -code error -level 2 -errorcode {TCLOO SHENANIGANS} \
+			"property getter for $prop did a break"
+		} on continue {} {
+		    return -code error -level 2 -errorcode {TCLOO SHENANIGANS} \
+			"property getter for $prop did a continue"
+		}
 	    }
 	    return $result
 	}
@@ -620,7 +634,22 @@
 		    -level 2 -errorcode [list \
 			TCL LOOKUP INDEX property $propertyName]] \
 			  $props $propertyName]
-	    return [$my <ReadProp$prop>]
+	    try {
+		set value [$my <ReadProp$prop>]
+	    } on error {msg opt} {
+		dict set opt -level 2
+		return -options $opt $msg
+	    } on return {msg opt} {
+		dict incr opt -level 2
+		return -options $opt $msg
+	    } on break {} {
+		return -code error -level 2 -errorcode {TCLOO SHENANIGANS} \
+		    "property getter for $prop did a break"
+	    } on continue {} {
+		return -code error -level 2 -errorcode {TCLOO SHENANIGANS} \
+		    "property getter for $prop did a continue"
+	    }
+	    return $value
 	}
 
 	# ------------------------------------------------------------------
@@ -638,7 +667,21 @@
 		    -level 2 -errorcode [list \
 			TCL LOOKUP INDEX property $prop]] \
 			      $props $prop]
-		$my <WriteProp$prop> $value
+		try {
+		    $my <WriteProp$prop> $value
+		} on error {msg opt} {
+		    dict set opt -level 2
+		    return -options $opt $msg
+		} on return {msg opt} {
+		    dict incr opt -level 2
+		    return -options $opt $msg
+		} on break {} {
+		    return -code error -level 2 -errorcode {TCLOO SHENANIGANS} \
+			"property setter for $prop did a break"
+		} on continue {} {
+		    return -code error -level 2 -errorcode {TCLOO SHENANIGANS} \
+			"property setter for $prop did a continue"
+		}
 	    }
 	    return
 	}
-- 
cgit v0.12


From d4b3d3a460efcdaa6f0ef897a6c3e52b3331e421 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 31 Dec 2019 14:56:32 +0000
Subject: Added docs

---
 doc/configurable.n | 334 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/info.n         |  47 ++++++++
 2 files changed, 381 insertions(+)
 create mode 100644 doc/configurable.n

diff --git a/doc/configurable.n b/doc/configurable.n
new file mode 100644
index 0000000..f01f051
--- /dev/null
+++ b/doc/configurable.n
@@ -0,0 +1,334 @@
+'\"
+'\" Copyright (c) 2019 Donal K. Fellows
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+'\"
+.TH configurable n 0.1 TclOO "TclOO Commands"
+.so man.macros
+.BS
+'\" Note:  do not modify the .SH NAME line immediately below!
+.SH NAME
+oo::configurable, configure, property \- class that makes configurable classes and objects, and supports making configurable properties
+.SH SYNOPSIS
+.nf
+package require TclOO
+
+\fBoo::configurable create \fIclass\fR \fR?\fIdefinitionScript\fR?
+
+\fBoo::define \fIclass\fB {\fR
+    \fBproperty \fIpropName\fR ?\fIoptions...\fR? ?\fIpropName\fR ?\fIoptions...\fR?...?
+\fB}\fR
+
+\fBoo::objdefine \fIobject\fB {\fR
+    \fBproperty \fIpropName\fR ?\fIoptions...\fR? ?\fIpropName\fR ?\fIoptions...\fR?...?
+\fB}\fR
+
+\fIobjectName \fBconfigure\fR
+\fIobjectName \fBconfigure\fR \fI\-prop\fR
+\fIobjectName \fBconfigure\fR \fI\-prop value\fR ?\fI\-prop value\fR...\fR
+.fi
+.SH "CLASS HIERARCHY"
+.nf
+\fBoo::object\fR
+   \(-> \fBoo::class\fR
+       \(-> \fBoo::configurable\fR
+
+\fBoo::object\fR
+   \(-> \fBoo::class\fR
+       \(-> \fBoo::configurablesupport::configurable\fR
+.fi
+.BE
+.SH DESCRIPTION
+.PP
+Configurable objects are objects that support being configured with a
+\fBconfigure\fR method. Each of the configurable entities of the object is
+known as a property of the object. Properties may be defined on classes or
+instances; when configuring an object, any of the properties defined by its
+classes (direct or indirect) or by the instance itself may be configured.
+.PP
+The \fBoo::configurable\fR metaclass installs basic support for making
+configurable objects into a class. This consists of making a \fBproperty\fR
+definition command available in definition scripts for the class and instances
+(e.g., from the class's constructor, within \fBoo::define\fR and within
+\fBoo::objdefine\fR) and making a \fBconfigure\fR method available within the
+instances.
+.SS "CONFIGURE METHOD"
+.PP
+The behavior of the \fBconfigure\fR method is modelled after the
+\fBfconfigure\fR/\fBchan configure\fR command.
+.PP
+If passed no additional arguments, the \fBconfigure\fR method returns an
+alphabetically sorted dictionary of all \fIreadable\fR and \fIread-write\fR
+properties and their current values.
+.PP
+If passed a single addiional argument, that argument to the \fBconfigure\fR
+method must be the name of a property to read (or an unambiguous prefix
+thereof); its value is returned.
+.PP
+Otherwise, if passed an even number of arguments then each pair of arguments
+specifies a property name (or an unambiguous prefix thereof) and the value to
+set it to. The properties will be set in the order specified, including
+duplicates. If the setting of any property fails, the overall \fBconfigure\fR
+method fails, the preceding pairs (if any) will continue to have been applied,
+and the succeeding pairs (if any) will be not applied. On success, the result
+of the \fBconfigure\fR method in this mode operation will be an empty string.
+.SS "PROPERTY DEFINITIONS"
+.PP
+When a class has been manufactured by the \fBoo::configurable\fR metaclass (or
+one of its subclasses), it gains an extra definition, \fBproperty\fR. The
+\fBproperty\fR definition defines one or more properties that will be exposed
+by the class's instances.
+.PP
+The \fBproperty\fR command takes the name of a property to define first,
+\fIwithout a leading hyphen\fR, followed by a number of option-value pairs
+that modify the basic behavior of the property. This can then be followed by
+an arbitrary number of other property definitions. The supported options are:
+.TP
+\fB\-get \fIgetterScript\fR
+.
+This defines the implementation of how to read from the property; the
+\fIgetterScript\fR will become the body of a method (taking no arguments)
+defined on the class, if the kind of the property is such that the property
+can be read from. The method will be named
+\fB<ReadProp-\fIpropertyName\fB>\fR, and will default to being a simple read
+of the instance variable with the same name as the property (e.g.,
+.QW "\fBproperty\fR xyz"
+will result in a method
+.QW <ReadProp-xyz>
+being created).
+.TP
+\fB\-kind \fIpropertyKind\fR
+.
+This defines what sort of property is being created. The \fIpropertyKind\fR
+must be exactly one of \fBreadable\fR, \fBwritable\fR, or \fBreadwrite\fR
+(which is the default) which will make the property read-only, write-only or
+read-write, respectively.  Read-only properties can only ever be read from,
+write-only properties can only ever be written to, and read-write properties
+can be both read and written.
+.RS
+.PP
+Note that write-only properties are not particularly discoverable as they are
+never reported by the \fBconfigure\fR method other than by error messages when
+attempting to write to a property that does not exist.
+.RE
+.TP
+\fB\-set \fIsetterScript\fR
+.
+This defines the implementation of how to write to the property; the
+\fIsetterScript\fR will become the body of a method taking a single argument,
+\fIvalue\fR, defined on the class, if the kind of the property is such that
+the property can be written to. The method will be named
+\fB<WriteProp-\fIpropertyName\fB>\fR, and will default to being a simple write
+of the instance variable with the same name as the property (e.g.,
+.QW "\fBproperty\fR xyz"
+will result in a method
+.QW <WriteProp-xyz>
+being created).
+.PP
+Instances of the class that was created by \fBoo::configurable\fR will also
+support \fBproperty\fR definitions; the semantics will be exactly as above
+except that the properties will be defined on the instance alone.
+.PP
+Note that the property implementation methods that \fBproperty\fR defines
+should not be private, as this makes them inaccessible from the implementation
+of \fBconfigure\fR (by design; the property configuration mechanism is
+intended for use mainly from outside a class, whereas a class may access
+variables directly). The variables accessed by the default implementations of
+the properties \fImay\fR be private, if so declared.
+.SH "ADVANCED USAGE"
+.PP
+The configurable class system is comprised of several pieces. The
+\fBoo::configurable\fR metaclass works by mixing in a class and setting
+definition namespaces during object creation that provide the other bits and
+pieces of machinery. The key pieces of the implementation are enumerated here
+so that they can be used by other code:
+.TP
+\fBoo::configuresupport::configurable\fR
+.
+This is a class that provids the implementation of the \fBconfigure\fR method
+(described above in \fBCONFIGURE METHOD\fR).
+.TP
+\fBoo::configuresupport::configurableclass\fR
+.
+This is a namespace that contains the definition dialect that provides the
+\fBproperty\fR declaration for use in classes (i.e., via \fBoo::define\fR, and
+class constructors under normal circumstances), as described above in
+\fBPROPERTY DEFINITIONS\fR. It \fBnamespace export\fRs its \fBproperty\fR
+command so that it may be used easily in user definition dialects.
+.TP
+.
+\fBoo::configuresupport::configurableobject\fR
+.
+This is a namespace that contains the definition dialect that provides the
+\fBproperty\fR declaration for use in instance objects (i.e., via
+\fBoo::objdefine\fR, and the\fB self\R declaration in \fBoo::define), as
+described above in \fBPROPERTY DEFINITIONS\fR. It \fBnamespace export\fRs its
+\fBproperty\fR command so that it may be used easily in user definition
+dialects.
+.PP
+The underlying property discovery mechanism relies on four slots (see
+\fBoo::define\fR for what that implies) that list the properties that can be
+configured. These slots do not themselves impose any semantics on what the
+slots mean other than that they have unique names, no important order, can be
+inherited and discovered on classes and instances.
+.PP
+These slots, and their intended semantics, are:
+.TP
+\fBoo::configuresupport::readableproperties\fR
+.
+The set of properties of a class (not including those from its superclasses)
+that may be read from when configuring an instance of the class. This slot can
+also be read with the \fBinfo class property\fR command.
+.TP
+\fBoo::configuresupport::writableproperties\fR
+.
+The set of properties of a class (not including those from its superclasses)
+that may be written to when configuring an instance of the class. This slot
+can also be read with the \fBinfo class property\fR command.
+.TP
+\fBoo::configuresupport::objreadableproperties\fR
+.
+The set of properties of an object instance (not including those from its
+classes) that may be read from when configuring the object. This slot can
+also be read with the \fBinfo object property\fR command.
+.TP
+\fBoo::configuresupport::objwritableproperties\fR
+.
+The set of properties of an object instance (not including those from its
+classes) that may be written to when configuring the object. This slot can
+also be read with the \fBinfo object property\fR command.
+.PP
+Note that though these are slots, they are \fInot\fR in the standard
+\fBoo::define\fR or \fBoo::objdefine\fR namespaces; in order to use them
+inside a definition script, they need to be referred to by full name. This is
+because they are intended to be building bricks of configurable property
+system, and not directly used by normal user code.
+.SS "IMPLEMENTATION NOTE"
+.PP
+The implementation of the \fBconfigure\fR method uses
+\fBinfo object property\fR with the \fB\-all\fR option to discover what
+properties it may manipulate.
+.SH EXAMPLES
+.PP
+Here we create a simple configurable class and demonstrate how it can be
+configured:
+.PP
+.CS
+\fBoo::configurable\fR create Point {
+    \fBproperty\fR x y
+    constructor args {
+        my \fBconfigure\fR -x 0 -y 0 {*}$args
+    }
+    variable x y
+    method print {} {
+        puts "x=$x, y=$y"
+    }
+}
+
+set pt [Point new -x 27]
+$pt print;   \fI# x=27, y=0\fR
+$pt \fBconfigure\fR -y 42
+$pt print;   \fI# x=27, y=42\fR
+puts "distance from origin: [expr {
+    hypot([$pt \fBconfigure\fR -x], [$pt \fBconfigure\fR -y])
+}]";         \fI# distance from origin: 49.92995093127971\fR
+puts [$pt \fBconfigure\fR]
+             \fI# -x 27 -y 42\fR
+.CE
+.PP
+Such a configurable class can be extended by subclassing, though the subclass
+needs to also be created by \fBoo::configurable\fR if it will use the
+\fBproperty\fR definition:
+.PP
+.CS
+\fBoo::configurable\fR create Point3D {
+    superclass Point
+    \fBproperty\fR z
+    constructor args {
+        next -z 0 {*}$args
+    }
+}
+
+set pt2 [Point3D new -x 2 -y 3 -z 4]
+puts [$pt2 \fBconfigure\fR]
+             \fI# -x 2 -y 3 -z 4\fR
+.CE
+.PP
+Once you have a configurable class, you can also add instance properties to
+it. (The backing variables for all properties start unset.) Note below that we
+are using an unambiguous prefix of a property name when setting it; this is
+supported for all properties though full names are normally recommended
+because subclasses will not make an unambiguous prefix become ambiguous in
+that case.
+.PP
+.CS
+oo::objdefine $pt {
+    \fBproperty\fR color
+}
+$pt \fBconfigure\fR -c bisque
+puts [$pt \fBconfigure\fR]
+             \fI# -color bisque -x 27 -y 42\fR
+.CE
+.PP
+You can also do derived properties by making them read-only and supplying a
+script that computes them.
+.PP
+.CS
+\fBoo::configurable\fR create PointMk2 {
+    \fBproperty\fR x y
+    \fBproperty\fR distance -kind readable -get {
+        return [expr {hypot($x, $y)}]
+    }
+    variable x y
+    constructor args {
+        my \fBconfigure\fR -x 0 -y 0 {*}$args
+    }
+}
+
+set pt3 [PointMk2 new -x 3 -y 4]
+puts [$pt3 \fBconfigure\fR -distance]
+             \fI# 5.0\fR
+$pt3 \fBconfigure\fR -distance 10
+             \fI# ERROR: bad property "-distance": must be -x or -y\fR
+.CE
+.PP
+Setters are used to validate the type of a property:
+.PP
+.CS
+\fBoo::configurable\fR create PointMk3 {
+    \fBproperty\fR x -set {
+        if {![string is double -strict $value]} {
+            error "-x property must be a number"
+        }
+        set x $value
+    }
+    \fBproperty\fR y -set {
+        if {![string is double -strict $value]} {
+            error "-y property must be a number"
+        }
+        set y $value
+    }
+    variable x y
+    constructor args {
+        my \fBconfigure\fR -x 0 -y 0 {*}$args
+    }
+}
+
+set pt4 [PointMk3 new]
+puts [$pt4 \fBconfigure\fR]
+             \fI# -x 0 -y 0\fR
+$pt4 \fBconfigure\fR -x 3 -y 4
+puts [$pt4 \fBconfigure\fR]
+             \fI# -x 3 -y 4\fR
+$pt4 \fBconfigure\fR -x "obviously not a number"
+             \fI# ERROR: -x property must be a number\fR
+.CE
+.SH "SEE ALSO"
+info(n), oo::class(n), oo::define(n)
+.SH KEYWORDS
+class, object, properties, configuration
+.\" Local variables:
+.\" mode: nroff
+.\" fill-column: 78
+.\" End:
diff --git a/doc/info.n b/doc/info.n
index dc21ac1..ecf438b 100644
--- a/doc/info.n
+++ b/doc/info.n
@@ -492,6 +492,29 @@ be discovered with \fBinfo class forward\fR.
 This subcommand returns a list of all classes that have been mixed into the
 class named \fIclass\fR.
 .TP
+\fBinfo class property\fI class\fR ?\fIoptions...\fR
+.VS "TIP 558"
+This subcommand returns a sorted list of properties defined on the class named
+\fIclass\fR. The \fIoptions\fR define exactly which properties are returned:
+.RS
+.TP
+\fB\-all\fR
+.
+With this option, the properties from the superclasses and mixins of the class
+are also returned.
+.TP
+\fB\-readable\fR
+.
+This option (the default behavior) asks for the readable properties to be
+returned. Only readable or writable properties are returned, not both.
+.TP
+\fB\-writable\fR
+.
+This option asks for the writable properties to be returned.  Only readable or
+writable properties are returned, not both.
+.RE
+.VE "TIP 558"
+.TP
 \fBinfo class subclasses\fI class\fR ?\fIpattern\fR?
 .
 This subcommand returns a list of direct subclasses of class \fIclass\fR. If
@@ -681,6 +704,30 @@ object named \fIobject\fR.
 This subcommand returns the name of the internal namespace of the object named
 \fIobject\fR.
 .TP
+\fBinfo object property\fI object\fR ?\fIoptions...\fR
+.VS "TIP 558"
+This subcommand returns a sorted list of properties defined on the object
+named \fIobject\fR. The \fIoptions\fR define exactly which properties are
+returned:
+.RS
+.TP
+\fB\-all\fR
+.
+With this option, the properties from the class, superclasses and mixins of
+the object are also returned.
+.TP
+\fB\-readable\fR
+.
+This option (the default behavior) asks for the readable properties to be
+returned. Only readable or writable properties are returned, not both.
+.TP
+\fB\-writable\fR
+.
+This option asks for the writable properties to be returned. Only readable or
+writable properties are returned, not both.
+.RE
+.VE "TIP 558"
+.TP
 \fBinfo object variables\fI object\fRR ?\fB\-private\fR?
 .
 This subcommand returns a list of all variables that have been declared for
-- 
cgit v0.12


From c4f94adb460fd2389bbf4b3db9befcbfb97dae0b Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 31 Dec 2019 22:58:01 +0000
Subject: Other list-returning [info class] subcommands are plurals, so change
 property -> properties

---
 doc/configurable.n    |  10 ++---
 doc/info.n            |   4 +-
 generic/tclOOInfo.c   |  12 +++---
 generic/tclOOScript.h |  40 ++++++++----------
 tests/oo.test         | 113 ++++++++++++++++++++++++++++----------------------
 tools/tclOOScript.tcl |  42 +++++++++----------
 6 files changed, 113 insertions(+), 108 deletions(-)

diff --git a/doc/configurable.n b/doc/configurable.n
index f01f051..9a2a478 100644
--- a/doc/configurable.n
+++ b/doc/configurable.n
@@ -179,25 +179,25 @@ These slots, and their intended semantics, are:
 .
 The set of properties of a class (not including those from its superclasses)
 that may be read from when configuring an instance of the class. This slot can
-also be read with the \fBinfo class property\fR command.
+also be read with the \fBinfo class properties\fR command.
 .TP
 \fBoo::configuresupport::writableproperties\fR
 .
 The set of properties of a class (not including those from its superclasses)
 that may be written to when configuring an instance of the class. This slot
-can also be read with the \fBinfo class property\fR command.
+can also be read with the \fBinfo class properties\fR command.
 .TP
 \fBoo::configuresupport::objreadableproperties\fR
 .
 The set of properties of an object instance (not including those from its
 classes) that may be read from when configuring the object. This slot can
-also be read with the \fBinfo object property\fR command.
+also be read with the \fBinfo object properties\fR command.
 .TP
 \fBoo::configuresupport::objwritableproperties\fR
 .
 The set of properties of an object instance (not including those from its
 classes) that may be written to when configuring the object. This slot can
-also be read with the \fBinfo object property\fR command.
+also be read with the \fBinfo object properties\fR command.
 .PP
 Note that though these are slots, they are \fInot\fR in the standard
 \fBoo::define\fR or \fBoo::objdefine\fR namespaces; in order to use them
@@ -207,7 +207,7 @@ system, and not directly used by normal user code.
 .SS "IMPLEMENTATION NOTE"
 .PP
 The implementation of the \fBconfigure\fR method uses
-\fBinfo object property\fR with the \fB\-all\fR option to discover what
+\fBinfo object properties\fR with the \fB\-all\fR option to discover what
 properties it may manipulate.
 .SH EXAMPLES
 .PP
diff --git a/doc/info.n b/doc/info.n
index ecf438b..cffaf49 100644
--- a/doc/info.n
+++ b/doc/info.n
@@ -492,7 +492,7 @@ be discovered with \fBinfo class forward\fR.
 This subcommand returns a list of all classes that have been mixed into the
 class named \fIclass\fR.
 .TP
-\fBinfo class property\fI class\fR ?\fIoptions...\fR
+\fBinfo class properties\fI class\fR ?\fIoptions...\fR
 .VS "TIP 558"
 This subcommand returns a sorted list of properties defined on the class named
 \fIclass\fR. The \fIoptions\fR define exactly which properties are returned:
@@ -704,7 +704,7 @@ object named \fIobject\fR.
 This subcommand returns the name of the internal namespace of the object named
 \fIobject\fR.
 .TP
-\fBinfo object property\fI object\fR ?\fIoptions...\fR
+\fBinfo object properties\fI object\fR ?\fIoptions...\fR
 .VS "TIP 558"
 This subcommand returns a sorted list of properties defined on the object
 named \fIobject\fR. The \fIoptions\fR define exactly which properties are
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index ed44cc8..ffdcc10 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -64,7 +64,7 @@ static const EnsembleImplMap infoObjectCmds[] = {
     {"methodtype", InfoObjectMethodTypeCmd, TclCompileBasic2ArgCmd, NULL, NULL, 0},
     {"mixins",	   InfoObjectMixinsCmd,	    TclCompileBasic1ArgCmd, NULL, NULL, 0},
     {"namespace",  InfoObjectNsCmd,	    TclCompileInfoObjectNamespaceCmd, NULL, NULL, 0},
-    {"property",   InfoObjectPropCmd,	    TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
+    {"properties", InfoObjectPropCmd,	    TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
     {"variables",  InfoObjectVariablesCmd,  TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
     {"vars",	   InfoObjectVarsCmd,	    TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
     {NULL, NULL, NULL, NULL, NULL, 0}
@@ -86,7 +86,7 @@ static const EnsembleImplMap infoClassCmds[] = {
     {"methods",	     InfoClassMethodsCmd,	TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
     {"methodtype",   InfoClassMethodTypeCmd,	TclCompileBasic2ArgCmd, NULL, NULL, 0},
     {"mixins",	     InfoClassMixinsCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 0},
-    {"property",     InfoClassPropCmd,		TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
+    {"properties",   InfoClassPropCmd,		TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
     {"subclasses",   InfoClassSubsCmd,		TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
     {"superclasses", InfoClassSupersCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 0},
     {"variables",    InfoClassVariablesCmd,	TclCompileBasic1Or2ArgCmd, NULL, NULL, 0},
@@ -1723,8 +1723,8 @@ InfoClassCallCmd(
  *
  * InfoClassPropCmd, InfoObjectPropCmd --
  *
- *	Implements [info class property $clsName ?$option...?] and
- *	[info object property $objName ?$option...?]
+ *	Implements [info class properties $clsName ?$option...?] and
+ *	[info object properties $objName ?$option...?]
  *
  * ----------------------------------------------------------------------
  */
@@ -1867,7 +1867,9 @@ InfoObjectPropCmd(
  * ----------------------------------------------------------------------
  *
  * SortPropList --
- *	Sort a list of names of properties. Simple support function.
+ *	Sort a list of names of properties. Simple support function. Assumes
+ *	that the list Tcl_Obj is unshared and doesn't have a string
+ *	representation.
  *
  * ----------------------------------------------------------------------
  */
diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index e8fd814..9782875 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -297,32 +297,24 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\t\t}\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t}\n"
+"\t\t\t\tset reader <ReadProp$realprop>\n"
+"\t\t\t\tset writer <WriteProp$realprop>\n"
 "\t\t\t\tswitch $kind {\n"
 "\t\t\t\t\treadable {\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\t$readslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\t$writeslot -remove $realprop]\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\tmethod <ReadProp$realprop> {} $getter]\n"
+"\t\t\t\t\t\tuplevel 2 [list $readslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list $writeslot -remove $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list method $reader -unexport {} $getter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t\twritable {\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\t$readslot -remove $realprop]\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\t$writeslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\tmethod <WriteProp$realprop> {value} $setter]\n"
+"\t\t\t\t\t\tuplevel 2 [list $readslot -remove $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list $writeslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list method $writer -unexport {value} $setter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t\treadwrite {\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\t$readslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\t$writeslot -append $realprop]\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\tmethod <ReadProp$realprop> {} $getter]\n"
-"\t\t\t\t\t\tuplevel 2 [list \\\n"
-"\t\t\t\t\t\t\t\tmethod <WriteProp$realprop> {value} $setter]\n"
+"\t\t\t\t\t\tuplevel 2 [list $readslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list $writeslot -append $realprop]\n"
+"\t\t\t\t\t\tuplevel 2 [list method $reader -unexport {} $getter]\n"
+"\t\t\t\t\t\tuplevel 2 [list method $writer -unexport {value} $setter]\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t}\n"
 "\t\t\t}\n"
@@ -333,6 +325,7 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\t::oo::configuresupport::readableproperties \\\n"
 "\t\t\t\t\t::oo::configuresupport::writableproperties {*}$args\n"
 "\t\t\t}\n"
+"\t\t\t::proc properties args {::tailcall property {*}$args}\n"
 "\t\t\t::namespace path ::oo::define\n"
 "\t\t\t::namespace export property\n"
 "\t\t}\n"
@@ -342,12 +335,13 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\t::oo::configuresupport::objreadableproperties \\\n"
 "\t\t\t\t\t::oo::configuresupport::objwritableproperties {*}$args\n"
 "\t\t\t}\n"
+"\t\t\t::proc properties args {::tailcall property {*}$args}\n"
 "\t\t\t::namespace path ::oo::objdefine\n"
 "\t\t\t::namespace export property\n"
 "\t\t}\n"
 "\t\tproc ReadAll {object my} {\n"
 "\t\t\tset result {}\n"
-"\t\t\tforeach prop [info object property $object -all -readable] {\n"
+"\t\t\tforeach prop [info object properties $object -all -readable] {\n"
 "\t\t\t\ttry {\n"
 "\t\t\t\t\tdict set result $prop [$my <ReadProp$prop>]\n"
 "\t\t\t\t} on error {msg opt} {\n"
@@ -367,7 +361,7 @@ static const char *tclOOSetupScript =
 "\t\t\treturn $result\n"
 "\t\t}\n"
 "\t\tproc ReadOne {object my propertyName} {\n"
-"\t\t\tset props [info object property $object -all -readable]\n"
+"\t\t\tset props [info object properties $object -all -readable]\n"
 "\t\t\tset prop [prefix match -message \"property\" -error [list\\\n"
 "\t\t\t\t\t-level 2 -errorcode [list \\\n"
 "\t\t\t\t\t\tTCL LOOKUP INDEX property $propertyName]] \\\n"
@@ -390,7 +384,7 @@ static const char *tclOOSetupScript =
 "\t\t\treturn $value\n"
 "\t\t}\n"
 "\t\tproc WriteMany {object my setterMap} {\n"
-"\t\t\tset props [info object property $object -all -writable]\n"
+"\t\t\tset props [info object properties $object -all -writable]\n"
 "\t\t\tforeach {prop value} $setterMap {\n"
 "\t\t\t\tset prop [prefix match -message \"property\" -error [list\\\n"
 "\t\t\t\t\t-level 2 -errorcode [list \\\n"
diff --git a/tests/oo.test b/tests/oo.test
index 631c84d..3fce886 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -2424,7 +2424,7 @@ test oo-16.2 {OO: object introspection} -body {
 } -returnCodes 1 -result {NOTANOBJECT does not refer to an object}
 test oo-16.3 {OO: object introspection} -body {
     info object gorp oo::object
-} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, class, creationid, definition, filters, forward, isa, methods, methodtype, mixins, namespace, property, variables, or vars}
+} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, class, creationid, definition, filters, forward, isa, methods, methodtype, mixins, namespace, properties, variables, or vars}
 test oo-16.4 {OO: object introspection} -setup {
     oo::class create meta { superclass oo::class }
     [meta create instance1] create instance2
@@ -2643,7 +2643,7 @@ test oo-17.3 {OO: class introspection} -setup {
 } -result {"foo" is not a class}
 test oo-17.4 {OO: class introspection} -body {
     info class gorp oo::object
-} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, constructor, definition, definitionnamespace, destructor, filters, forward, instances, methods, methodtype, mixins, property, subclasses, superclasses, or variables}
+} -returnCodes 1 -result {unknown or ambiguous subcommand "gorp": must be call, constructor, definition, definitionnamespace, destructor, filters, forward, instances, methods, methodtype, mixins, properties, subclasses, superclasses, or variables}
 test oo-17.5 {OO: class introspection} -setup {
     oo::class create testClass
 } -body {
@@ -5455,15 +5455,15 @@ test oo-44.1 {TIP 558: properties: core support} -setup {
     set result {}
 } -body {
     oo::class create c {superclass parent}
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::readableproperties -set a b c
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::readableproperties -set f e d
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::readableproperties -set a a a
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::readableproperties -set
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
 } -cleanup {
     parent destroy
 } -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
@@ -5473,15 +5473,15 @@ test oo-44.2 {TIP 558: properties: core support} -setup {
     set result {}
 } -body {
     oo::class create c {superclass parent}
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set a b c
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set f e d
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set a a a
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
 } -cleanup {
     parent destroy
 } -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
@@ -5491,15 +5491,15 @@ test oo-44.3 {TIP 558: properties: core support} -setup {
     set result {}
 } -body {
     oo::class create c {superclass parent}
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::writableproperties -set a b c
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::writableproperties -set f e d
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::writableproperties -set a a a
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
     oo::define c ::oo::configuresupport::writableproperties -set
-    lappend result [info class property c] [info class property c -writable]
+    lappend result [info class properties c] [info class properties c -writable]
 } -cleanup {
     parent destroy
 } -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
@@ -5509,15 +5509,15 @@ test oo-44.4 {TIP 558: properties: core support} -setup {
     set result {}
 } -body {
     oo::class create c {superclass parent}
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set a b c
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set f e d
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set a a a
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set
-    lappend result [info class property c -all] [info class property c -writable -all]
+    lappend result [info class properties c -all] [info class properties c -writable -all]
 } -cleanup {
     parent destroy
 } -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
@@ -5528,20 +5528,20 @@ test oo-44.5 {TIP 558: properties: core support} -setup {
 } -body {
     oo::class create c {superclass parent}
     oo::class create d {superclass c}
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set a b c
     oo::define d ::oo::configuresupport::readableproperties -set x y z
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set f e d
     oo::define d ::oo::configuresupport::readableproperties -set r p q
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set a a h
     oo::define d ::oo::configuresupport::readableproperties -set g h g
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define d ::oo::configuresupport::readableproperties -set
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
 } -cleanup {
     parent destroy
 } -result {{} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {} {}}
@@ -5552,20 +5552,20 @@ test oo-44.6 {TIP 558: properties: core support} -setup {
 } -body {
     oo::class create c {superclass parent}
     oo::class create d {superclass c}
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set a b c
     oo::define d ::oo::configuresupport::writableproperties -set x y z
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set f e d
     oo::define d ::oo::configuresupport::writableproperties -set r p q
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set a a h
     oo::define d ::oo::configuresupport::writableproperties -set g h g
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
     oo::define d ::oo::configuresupport::writableproperties -set
-    lappend result [info class property d -all] [info class property d -writable -all]
+    lappend result [info class properties d -all] [info class properties d -writable -all]
 } -cleanup {
     parent destroy
 } -result {{} {} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {}}
@@ -5576,15 +5576,15 @@ test oo-44.7 {TIP 558: properties: core support} -setup {
 } -body {
     oo::class create c {superclass parent}
     c create o
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objreadableproperties -set a b c
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objreadableproperties -set a a h
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objreadableproperties -set
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
 } -cleanup {
     parent destroy
 } -result {{} {} {a b c} {} {d e f} {} {a h} {} {} {}}
@@ -5595,15 +5595,15 @@ test oo-44.8 {TIP 558: properties: core support} -setup {
 } -body {
     oo::class create c {superclass parent}
     c create o
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objwritableproperties -set a b c
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objwritableproperties -set a a h
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
     oo::objdefine o ::oo::configuresupport::objwritableproperties -set
-    lappend result [info object property o] [info object property o -writable]
+    lappend result [info object properties o] [info object properties o -writable]
 } -cleanup {
     parent destroy
 } -result {{} {} {} {a b c} {} {d e f} {} {a h} {} {}}
@@ -5615,13 +5615,13 @@ test oo-44.9 {TIP 558: properties: core support} -setup {
     oo::class create c {superclass parent}
     oo::class create d {superclass c}
     d create o
-    lappend result [info object property o -all] [info object property o -writable -all]
+    lappend result [info object properties o -all] [info object properties o -writable -all]
     oo::define c ::oo::configuresupport::readableproperties -set a b
     oo::define d ::oo::configuresupport::readableproperties -set c d
     oo::objdefine o ::oo::configuresupport::objreadableproperties -set e f
-    lappend result [info object property o -all] [info object property o -writable -all]
+    lappend result [info object properties o -all] [info object properties o -writable -all]
     oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d b e
-    lappend result [info object property o -all] [info object property o -writable -all]
+    lappend result [info object properties o -all] [info object properties o -writable -all]
 } -cleanup {
     parent destroy
 } -result {{} {} {a b c d e f} {} {a b c d e f} {}}
@@ -5633,13 +5633,13 @@ test oo-44.10 {TIP 558: properties: core support} -setup {
     oo::class create c {superclass parent}
     oo::class create d {superclass c}
     d create o
-    lappend result [info object property o -all] [info object property o -writable -all]
+    lappend result [info object properties o -all] [info object properties o -writable -all]
     oo::define c ::oo::configuresupport::writableproperties -set a b
     oo::define d ::oo::configuresupport::writableproperties -set c d
     oo::objdefine o ::oo::configuresupport::objwritableproperties -set e f
-    lappend result [info object property o -all] [info object property o -writable -all]
+    lappend result [info object properties o -all] [info object properties o -writable -all]
     oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d b e
-    lappend result [info object property o -all] [info object property o -writable -all]
+    lappend result [info object properties o -all] [info object properties o -writable -all]
 } -cleanup {
     parent destroy
 } -result {{} {} {} {a b c d e f} {} {a b c d e f}}
@@ -6111,6 +6111,19 @@ test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
+test oo-46.23 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	private property var
+    }
+    Point create pt
+    pt configure -var ok
+    pt configure -var
+} -cleanup {
+    parent destroy
+} -result ok
 
 test oo-47.1 {TIP 558: properties: error details} -setup {
     oo::class create parent
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 56a7bf8..095a3ad 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -528,32 +528,24 @@
 		}
 
 		# Install the option
+		set reader <ReadProp$realprop>
+		set writer <WriteProp$realprop>
 		switch $kind {
 		    readable {
-			uplevel 2 [list \
-				$readslot -append $realprop]
-			uplevel 2 [list \
-				$writeslot -remove $realprop]
-			uplevel 2 [list \
-				method <ReadProp$realprop> {} $getter]
+			uplevel 2 [list $readslot -append $realprop]
+			uplevel 2 [list $writeslot -remove $realprop]
+			uplevel 2 [list method $reader -unexport {} $getter]
 		    }
 		    writable {
-			uplevel 2 [list \
-				$readslot -remove $realprop]
-			uplevel 2 [list \
-				$writeslot -append $realprop]
-			uplevel 2 [list \
-				method <WriteProp$realprop> {value} $setter]
+			uplevel 2 [list $readslot -remove $realprop]
+			uplevel 2 [list $writeslot -append $realprop]
+			uplevel 2 [list method $writer -unexport {value} $setter]
 		    }
 		    readwrite {
-			uplevel 2 [list \
-				$readslot -append $realprop]
-			uplevel 2 [list \
-				$writeslot -append $realprop]
-			uplevel 2 [list \
-				method <ReadProp$realprop> {} $getter]
-			uplevel 2 [list \
-				method <WriteProp$realprop> {value} $setter]
+			uplevel 2 [list $readslot -append $realprop]
+			uplevel 2 [list $writeslot -append $realprop]
+			uplevel 2 [list method $reader -unexport {} $getter]
+			uplevel 2 [list method $writer -unexport {value} $setter]
 		    }
 		}
 	    }
@@ -575,6 +567,8 @@
 		    ::oo::configuresupport::readableproperties \
 		    ::oo::configuresupport::writableproperties {*}$args
 	    }
+	    # Plural alias just in case; deliberately NOT documented!
+	    ::proc properties args {::tailcall property {*}$args}
 	    ::namespace path ::oo::define
 	    ::namespace export property
 	}
@@ -585,6 +579,8 @@
 		    ::oo::configuresupport::objreadableproperties \
 		    ::oo::configuresupport::objwritableproperties {*}$args
 	    }
+	    # Plural alias just in case; deliberately NOT documented!
+	    ::proc properties args {::tailcall property {*}$args}
 	    ::namespace path ::oo::objdefine
 	    ::namespace export property
 	}
@@ -599,7 +595,7 @@
 
 	proc ReadAll {object my} {
 	    set result {}
-	    foreach prop [info object property $object -all -readable] {
+	    foreach prop [info object properties $object -all -readable] {
 		try {
 		    dict set result $prop [$my <ReadProp$prop>]
 		} on error {msg opt} {
@@ -629,7 +625,7 @@
 	# ------------------------------------------------------------------
 
 	proc ReadOne {object my propertyName} {
-	    set props [info object property $object -all -readable]
+	    set props [info object properties $object -all -readable]
 	    set prop [prefix match -message "property" -error [list\
 		    -level 2 -errorcode [list \
 			TCL LOOKUP INDEX property $propertyName]] \
@@ -661,7 +657,7 @@
 	# ------------------------------------------------------------------
 
 	proc WriteMany {object my setterMap} {
-	    set props [info object property $object -all -writable]
+	    set props [info object properties $object -all -writable]
 	    foreach {prop value} $setterMap {
 		set prop [prefix match -message "property" -error [list\
 		    -level 2 -errorcode [list \
-- 
cgit v0.12


From 995eed36fdc1c5eba5c874e149f17e213a261e7c Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 31 Dec 2019 23:25:58 +0000
Subject: Better error messages when a property has the wrong kind for the type
 of access desired

---
 generic/tclOOScript.h | 30 ++++++++++++++++++++++--------
 tests/oo.test         |  9 +++++----
 tools/tclOOScript.tcl | 32 +++++++++++++++++++++++---------
 3 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index 9782875..ed8d2dd 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -362,10 +362,17 @@ static const char *tclOOSetupScript =
 "\t\t}\n"
 "\t\tproc ReadOne {object my propertyName} {\n"
 "\t\t\tset props [info object properties $object -all -readable]\n"
-"\t\t\tset prop [prefix match -message \"property\" -error [list\\\n"
-"\t\t\t\t\t-level 2 -errorcode [list \\\n"
-"\t\t\t\t\t\tTCL LOOKUP INDEX property $propertyName]] \\\n"
-"\t\t\t\t\t\t  $props $propertyName]\n"
+"\t\t\ttry {\n"
+"\t\t\t\tset prop [prefix match -message \"property\" $props $propertyName]\n"
+"\t\t\t} on error {msg} {\n"
+"\t\t\t\tcatch {\n"
+"\t\t\t\t\tset wps [info object properties $object -all -writable]\n"
+"\t\t\t\t\tset wprop [prefix match $wps $propertyName]\n"
+"\t\t\t\t\tset msg \"property \\\"$wprop\\\" is write only\"\n"
+"\t\t\t\t}\n"
+"\t\t\t\treturn -code error -level 2 -errorcode [list \\\n"
+"\t\t\t\t\t\tTCL LOOKUP INDEX property $propertyName] $msg\n"
+"\t\t\t}\n"
 "\t\t\ttry {\n"
 "\t\t\t\tset value [$my <ReadProp$prop>]\n"
 "\t\t\t} on error {msg opt} {\n"
@@ -386,10 +393,17 @@ static const char *tclOOSetupScript =
 "\t\tproc WriteMany {object my setterMap} {\n"
 "\t\t\tset props [info object properties $object -all -writable]\n"
 "\t\t\tforeach {prop value} $setterMap {\n"
-"\t\t\t\tset prop [prefix match -message \"property\" -error [list\\\n"
-"\t\t\t\t\t-level 2 -errorcode [list \\\n"
-"\t\t\t\t\t\tTCL LOOKUP INDEX property $prop]] \\\n"
-"\t\t\t\t\t\t\t  $props $prop]\n"
+"\t\t\t\ttry {\n"
+"\t\t\t\t\tset prop [prefix match -message \"property\" $props $prop]\n"
+"\t\t\t\t} on error {msg} {\n"
+"\t\t\t\t\tcatch {\n"
+"\t\t\t\t\t\tset rps [info object properties $object -all -readable]\n"
+"\t\t\t\t\t\tset rprop [prefix match $rps $prop]\n"
+"\t\t\t\t\t\tset msg \"property \\\"$rprop\\\" is read only\"\n"
+"\t\t\t\t\t}\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode [list \\\n"
+"\t\t\t\t\t\t\tTCL LOOKUP INDEX property $prop] $msg\n"
+"\t\t\t\t}\n"
 "\t\t\t\ttry {\n"
 "\t\t\t\t\t$my <WriteProp$prop> $value\n"
 "\t\t\t\t} on error {msg opt} {\n"
diff --git a/tests/oo.test b/tests/oo.test
index 3fce886..e869a3c 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -5773,7 +5773,7 @@ test oo-45.7 {TIP 558: properties: configurable class system} -setup {
     list [p configure -y ok] [catch {p configure -y} msg] $msg
 } -cleanup {
     parent destroy
-} -result {{} 1 {bad property "-y": must be -x}}
+} -result {{} 1 {property "-y" is write only}}
 test oo-45.8 {TIP 558: properties: configurable class system} -setup {
     oo::class create parent
     unset -nocomplain msg
@@ -5790,7 +5790,7 @@ test oo-45.8 {TIP 558: properties: configurable class system} -setup {
     list [p configure] [p configure -y] [catch {p configure -y foo} msg] $msg
 } -cleanup {
     parent destroy
-} -result {{-x 0 -y 123} 123 1 {bad property "-y": must be -x}}
+} -result {{-x 0 -y 123} 123 1 {property "-y" is read only}}
 
 test oo-46.1 {ITP 558: properties: declaration semantics} -setup {
     oo::class create parent
@@ -5946,17 +5946,18 @@ test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
 	variable xy
 	property x -kind readable -get {return $xy}
 	property x -kind writable -set {set xy $value}
-	property y
     }
     Point create pt
     list [catch {
 	pt configure -x ok
     } msg] $msg [catch {
 	pt configure -x
+    } msg] $msg [catch {
+	pt configure -y 1
     } msg] $msg
 } -cleanup {
     parent destroy
-} -result {0 {} 1 {bad property "-x": must be -y}}
+} -result {0 {} 1 {property "-x" is write only} 1 {bad property "-y": must be -x}}
 test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 095a3ad..12288e4 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -4,7 +4,7 @@
 # 	that the code can be definitely run even in safe interpreters; TclOO's
 # 	core setup is safe.
 #
-# Copyright (c) 2012-2018 Donal K. Fellows
+# Copyright (c) 2012-2019 Donal K. Fellows
 # Copyright (c) 2013 Andreas Kupries
 # Copyright (c) 2017 Gerald Lester
 #
@@ -626,10 +626,17 @@
 
 	proc ReadOne {object my propertyName} {
 	    set props [info object properties $object -all -readable]
-	    set prop [prefix match -message "property" -error [list\
-		    -level 2 -errorcode [list \
-			TCL LOOKUP INDEX property $propertyName]] \
-			  $props $propertyName]
+	    try {
+		set prop [prefix match -message "property" $props $propertyName]
+	    } on error {msg} {
+		catch {
+		    set wps [info object properties $object -all -writable]
+		    set wprop [prefix match $wps $propertyName]
+		    set msg "property \"$wprop\" is write only"
+		}
+		return -code error -level 2 -errorcode [list \
+			TCL LOOKUP INDEX property $propertyName] $msg
+	    }
 	    try {
 		set value [$my <ReadProp$prop>]
 	    } on error {msg opt} {
@@ -659,10 +666,17 @@
 	proc WriteMany {object my setterMap} {
 	    set props [info object properties $object -all -writable]
 	    foreach {prop value} $setterMap {
-		set prop [prefix match -message "property" -error [list\
-		    -level 2 -errorcode [list \
-			TCL LOOKUP INDEX property $prop]] \
-			      $props $prop]
+		try {
+		    set prop [prefix match -message "property" $props $prop]
+		} on error {msg} {
+		    catch {
+			set rps [info object properties $object -all -readable]
+			set rprop [prefix match $rps $prop]
+			set msg "property \"$rprop\" is read only"
+		    }
+		    return -code error -level 2 -errorcode [list \
+			    TCL LOOKUP INDEX property $prop] $msg
+		}
 		try {
 		    $my <WriteProp$prop> $value
 		} on error {msg opt} {
-- 
cgit v0.12


From b308bd97e6cdee90b11f3409a485253c414bbac0 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 1 Jan 2020 16:01:36 +0000
Subject: Check for another tricky edge case

---
 generic/tclOOScript.h |  5 +++++
 tests/oo.test         | 58 ++++++++++++++++++++++++++++++---------------------
 tools/tclOOScript.tcl |  5 +++++
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index ed8d2dd..ae58ccb 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -258,6 +258,11 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
 "\t\t\t\t\t\t\"bad property name \\\"$prop\\\"; must not begin with -\"\n"
 "\t\t\t\t}\n"
+"\t\t\t\tif {$prop ne [list $prop]} {\n"
+"\t\t\t\t\treturn -code error -level 2 \\\n"
+"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t\"bad property name \\\"$prop\\\"; must be a simple word\"\n"
+"\t\t\t\t}\n"
 "\t\t\t\tset realprop [string cat \"-\" $prop]\n"
 "\t\t\t\tset getter [format {::set [my varname %s]} $prop]\n"
 "\t\t\t\tset setter [format {::set [my varname %s] $value} $prop]\n"
diff --git a/tests/oo.test b/tests/oo.test
index e869a3c..673b941 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -5792,7 +5792,7 @@ test oo-45.8 {TIP 558: properties: configurable class system} -setup {
     parent destroy
 } -result {{-x 0 -y 123} 123 1 {property "-y" is read only}}
 
-test oo-46.1 {ITP 558: properties: declaration semantics} -setup {
+test oo-46.1 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
     unset -nocomplain result
     set result {}
@@ -5816,7 +5816,7 @@ test oo-46.1 {ITP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result {{set 5} get {>15 15 15<}}
-test oo-46.2 {ITP 558: properties: declaration semantics} -setup {
+test oo-46.2 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
     unset -nocomplain result
     set result {}
@@ -5840,7 +5840,7 @@ test oo-46.2 {ITP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result {{set 5} get {>15 15 15<} 15}
-test oo-46.2 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.3 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5851,7 +5851,17 @@ test oo-46.2 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {bad property name "-x"; must not begin with -}
-test oo-46.3 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.4 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property "x y"
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "x y"; must be a simple word}
+test oo-46.5 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5861,7 +5871,7 @@ test oo-46.3 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing body to go with -get option}
-test oo-46.4 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5871,7 +5881,7 @@ test oo-46.4 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing body to go with -set option}
-test oo-46.5 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5881,7 +5891,7 @@ test oo-46.5 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing kind value to go with -kind option}
-test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5891,7 +5901,7 @@ test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing body to go with -set option}
-test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5902,7 +5912,7 @@ test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5912,7 +5922,7 @@ test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {bad kind "gorp": must be readable, readwrite, or writable}
-test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5923,7 +5933,7 @@ test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5937,7 +5947,7 @@ test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
     unset -nocomplain msg
 } -body {
@@ -5958,7 +5968,7 @@ test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result {0 {} 1 {property "-x" is write only} 1 {bad property "-y": must be -x}}
-test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5972,7 +5982,7 @@ test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property getter for -x did a break}
-test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5986,7 +5996,7 @@ test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property getter for -x did a break}
-test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6000,7 +6010,7 @@ test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result boo
-test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6014,7 +6024,7 @@ test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result boo
-test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6028,7 +6038,7 @@ test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property getter for -x did a continue}
-test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6042,7 +6052,7 @@ test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6056,7 +6066,7 @@ test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6070,7 +6080,7 @@ test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property setter for -x did a break}
-test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6084,7 +6094,7 @@ test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property setter for -x did a continue}
-test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.23 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6098,7 +6108,7 @@ test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result boo
-test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.24 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6112,7 +6122,7 @@ test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.23 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.25 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 12288e4..e10eda2 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -485,6 +485,11 @@
 			-errorcode {TCLOO PROPERTY_FORMAT} \
 			"bad property name \"$prop\"; must not begin with -"
 		}
+		if {$prop ne [list $prop]} {
+		    return -code error -level 2 \
+			-errorcode {TCLOO PROPERTY_FORMAT} \
+			"bad property name \"$prop\"; must be a simple word"
+		}
 		set realprop [string cat "-" $prop]
 		set getter [format {::set [my varname %s]} $prop]
 		set setter [format {::set [my varname %s] $value} $prop]
-- 
cgit v0.12


From 8249e877dffdca52ba20e0ffebdc9c7bd37c30ae Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 1 Jan 2020 16:46:55 +0000
Subject: More error cases

---
 generic/tclOOScript.h | 14 ++++++++--
 tests/oo.test         | 76 +++++++++++++++++++++++++++++++++++----------------
 tools/tclOOScript.tcl | 14 ++++++++--
 3 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index ae58ccb..2b61866 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -256,12 +256,22 @@ static const char *tclOOSetupScript =
 "\t\t\t\tif {[string match \"-*\" $prop]} {\n"
 "\t\t\t\t\treturn -code error -level 2 \\\n"
 "\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
-"\t\t\t\t\t\t\"bad property name \\\"$prop\\\"; must not begin with -\"\n"
+"\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must not begin with -\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tif {$prop ne [list $prop]} {\n"
 "\t\t\t\t\treturn -code error -level 2 \\\n"
 "\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
-"\t\t\t\t\t\t\"bad property name \\\"$prop\\\"; must be a simple word\"\n"
+"\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must be a simple word\"\n"
+"\t\t\t\t}\n"
+"\t\t\t\tif {[string first \"::\" $prop] != -1} {\n"
+"\t\t\t\t\treturn -code error -level 2 \\\n"
+"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must not contain namespace separators\"\n"
+"\t\t\t\t}\n"
+"\t\t\t\tif {[string match {*[()]*} $prop]} {\n"
+"\t\t\t\t\treturn -code error -level 2 \\\n"
+"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must not contain parentheses\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tset realprop [string cat \"-\" $prop]\n"
 "\t\t\t\tset getter [format {::set [my varname %s]} $prop]\n"
diff --git a/tests/oo.test b/tests/oo.test
index 673b941..4d28794 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -5850,7 +5850,7 @@ test oo-46.3 {TIP 558: properties: declaration semantics} -setup {
     }
 } -returnCodes error -cleanup {
     parent destroy
-} -result {bad property name "-x"; must not begin with -}
+} -result {bad property name "-x": must not begin with -}
 test oo-46.4 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
@@ -5860,18 +5860,48 @@ test oo-46.4 {TIP 558: properties: declaration semantics} -setup {
     }
 } -returnCodes error -cleanup {
     parent destroy
-} -result {bad property name "x y"; must be a simple word}
+} -result {bad property name "x y": must be a simple word}
 test oo-46.5 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
     oo::define Point {
+	property ::x
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "::x": must not contain namespace separators}
+test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x(
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "x(": must not contain parentheses}
+test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x)
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "x)": must not contain parentheses}
+test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
 	property x -get
     }
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing body to go with -get option}
-test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5881,7 +5911,7 @@ test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing body to go with -set option}
-test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5891,7 +5921,7 @@ test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing kind value to go with -kind option}
-test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {superclass parent}
@@ -5901,7 +5931,7 @@ test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {missing body to go with -set option}
-test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5912,7 +5942,7 @@ test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5922,7 +5952,7 @@ test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {bad kind "gorp": must be readable, readwrite, or writable}
-test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5933,7 +5963,7 @@ test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5947,7 +5977,7 @@ test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
     unset -nocomplain msg
 } -body {
@@ -5968,7 +5998,7 @@ test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result {0 {} 1 {property "-x" is write only} 1 {bad property "-y": must be -x}}
-test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5982,7 +6012,7 @@ test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property getter for -x did a break}
-test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -5996,7 +6026,7 @@ test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property getter for -x did a break}
-test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6010,7 +6040,7 @@ test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result boo
-test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6024,7 +6054,7 @@ test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result boo
-test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6038,7 +6068,7 @@ test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property getter for -x did a continue}
-test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6052,7 +6082,7 @@ test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.23 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6066,7 +6096,7 @@ test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.24 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6080,7 +6110,7 @@ test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property setter for -x did a break}
-test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.25 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6094,7 +6124,7 @@ test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result {property setter for -x did a continue}
-test oo-46.23 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.26 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6108,7 +6138,7 @@ test oo-46.23 {TIP 558: properties: declaration semantics} -setup {
 } -returnCodes error -cleanup {
     parent destroy
 } -result boo
-test oo-46.24 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.27 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6122,7 +6152,7 @@ test oo-46.24 {TIP 558: properties: declaration semantics} -setup {
 } -cleanup {
     parent destroy
 } -result ok
-test oo-46.25 {TIP 558: properties: declaration semantics} -setup {
+test oo-46.28 {TIP 558: properties: declaration semantics} -setup {
     oo::class create parent
 } -body {
     oo::configurable create Point {
@@ -6145,7 +6175,7 @@ test oo-47.1 {TIP 558: properties: error details} -setup {
 	[dict get $opt -errorinfo] [dict get $opt -errorcode]
 } -cleanup {
     parent destroy
-} -result {1 {bad property name "-x"; must not begin with -
+} -result {1 {bad property name "-x": must not begin with -
     while executing
 "property -x"
     (in definition script for class "::Point" line 1)
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index e10eda2..e918787 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -483,12 +483,22 @@
 		if {[string match "-*" $prop]} {
 		    return -code error -level 2 \
 			-errorcode {TCLOO PROPERTY_FORMAT} \
-			"bad property name \"$prop\"; must not begin with -"
+			"bad property name \"$prop\": must not begin with -"
 		}
 		if {$prop ne [list $prop]} {
 		    return -code error -level 2 \
 			-errorcode {TCLOO PROPERTY_FORMAT} \
-			"bad property name \"$prop\"; must be a simple word"
+			"bad property name \"$prop\": must be a simple word"
+		}
+		if {[string first "::" $prop] != -1} {
+		    return -code error -level 2 \
+			-errorcode {TCLOO PROPERTY_FORMAT} \
+			"bad property name \"$prop\": must not contain namespace separators"
+		}
+		if {[string match {*[()]*} $prop]} {
+		    return -code error -level 2 \
+			-errorcode {TCLOO PROPERTY_FORMAT} \
+			"bad property name \"$prop\": must not contain parentheses"
 		}
 		set realprop [string cat "-" $prop]
 		set getter [format {::set [my varname %s]} $prop]
-- 
cgit v0.12


From 743e0e4e1a39cf24723ff9390322f904113e770b Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 1 Jan 2020 16:57:08 +0000
Subject: Move the TIP 558 tests into their own file

---
 tests/oo.test     | 840 ----------------------------------------------------
 tests/ooProp.test | 862 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 862 insertions(+), 840 deletions(-)
 create mode 100644 tests/ooProp.test

diff --git a/tests/oo.test b/tests/oo.test
index 4d28794..1ec33e7 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -5448,846 +5448,6 @@ test oo-43.13 {TIP 524: definition namespace control: user-level introspection}
     parent destroy
     namespace delete foodef
 } -result {{} {} ::foodef {} {}}
-
-test oo-44.1 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::readableproperties -set a b c
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::readableproperties -set f e d
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::readableproperties -set a a a
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::readableproperties -set
-    lappend result [info class properties c] [info class properties c -writable]
-} -cleanup {
-    parent destroy
-} -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
-test oo-44.2 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set a b c
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set f e d
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set a a a
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-} -cleanup {
-    parent destroy
-} -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
-test oo-44.3 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::writableproperties -set a b c
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::writableproperties -set f e d
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::writableproperties -set a a a
-    lappend result [info class properties c] [info class properties c -writable]
-    oo::define c ::oo::configuresupport::writableproperties -set
-    lappend result [info class properties c] [info class properties c -writable]
-} -cleanup {
-    parent destroy
-} -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
-test oo-44.4 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set a b c
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set f e d
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set a a a
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set
-    lappend result [info class properties c -all] [info class properties c -writable -all]
-} -cleanup {
-    parent destroy
-} -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
-test oo-44.5 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    oo::class create d {superclass c}
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set a b c
-    oo::define d ::oo::configuresupport::readableproperties -set x y z
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set f e d
-    oo::define d ::oo::configuresupport::readableproperties -set r p q
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set a a h
-    oo::define d ::oo::configuresupport::readableproperties -set g h g
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define d ::oo::configuresupport::readableproperties -set
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-} -cleanup {
-    parent destroy
-} -result {{} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {} {}}
-test oo-44.6 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    oo::class create d {superclass c}
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set a b c
-    oo::define d ::oo::configuresupport::writableproperties -set x y z
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set f e d
-    oo::define d ::oo::configuresupport::writableproperties -set r p q
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set a a h
-    oo::define d ::oo::configuresupport::writableproperties -set g h g
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-    oo::define d ::oo::configuresupport::writableproperties -set
-    lappend result [info class properties d -all] [info class properties d -writable -all]
-} -cleanup {
-    parent destroy
-} -result {{} {} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {}}
-test oo-44.7 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    c create o
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objreadableproperties -set a b c
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objreadableproperties -set a a h
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objreadableproperties -set
-    lappend result [info object properties o] [info object properties o -writable]
-} -cleanup {
-    parent destroy
-} -result {{} {} {a b c} {} {d e f} {} {a h} {} {} {}}
-test oo-44.8 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    c create o
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objwritableproperties -set a b c
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objwritableproperties -set a a h
-    lappend result [info object properties o] [info object properties o -writable]
-    oo::objdefine o ::oo::configuresupport::objwritableproperties -set
-    lappend result [info object properties o] [info object properties o -writable]
-} -cleanup {
-    parent destroy
-} -result {{} {} {} {a b c} {} {d e f} {} {a h} {} {}}
-test oo-44.9 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    oo::class create d {superclass c}
-    d create o
-    lappend result [info object properties o -all] [info object properties o -writable -all]
-    oo::define c ::oo::configuresupport::readableproperties -set a b
-    oo::define d ::oo::configuresupport::readableproperties -set c d
-    oo::objdefine o ::oo::configuresupport::objreadableproperties -set e f
-    lappend result [info object properties o -all] [info object properties o -writable -all]
-    oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d b e
-    lappend result [info object properties o -all] [info object properties o -writable -all]
-} -cleanup {
-    parent destroy
-} -result {{} {} {a b c d e f} {} {a b c d e f} {}}
-test oo-44.10 {TIP 558: properties: core support} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::class create c {superclass parent}
-    oo::class create d {superclass c}
-    d create o
-    lappend result [info object properties o -all] [info object properties o -writable -all]
-    oo::define c ::oo::configuresupport::writableproperties -set a b
-    oo::define d ::oo::configuresupport::writableproperties -set c d
-    oo::objdefine o ::oo::configuresupport::objwritableproperties -set e f
-    lappend result [info object properties o -all] [info object properties o -writable -all]
-    oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d b e
-    lappend result [info object properties o -all] [info object properties o -writable -all]
-} -cleanup {
-    parent destroy
-} -result {{} {} {} {a b c d e f} {} {a b c d e f}}
-
-test oo-45.1 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y
-        constructor args {
-            my configure -x 0 -y 0 {*}$args
-        }
-        variable x y
-        method report {} {
-            lappend ::result "x=$x, y=$y"
-        }
-    }
-    set pt [Point new -x 3]
-    $pt report
-    $pt configure -y 4
-    $pt report
-    lappend result [$pt configure -x],[$pt configure -y] [$pt configure]
-} -cleanup {
-    parent destroy
-} -result {{x=3, y=0} {x=3, y=4} 3,4 {-x 3 -y 4}}
-test oo-45.2 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y
-        constructor args {
-            my configure -x 0 -y 0 {*}$args
-        }
-    }
-    oo::configurable create 3DPoint {
-	superclass Point
-	property z
-	constructor args {
-	    next -z 0 {*}$args
-	}
-    }
-    set pt [3DPoint new -x 3 -y 4 -z 5]
-    list [$pt configure -x],[$pt configure -y],[$pt configure -z] \
-	[$pt configure]
-} -cleanup {
-    parent destroy
-} -result {3,4,5 {-x 3 -y 4 -z 5}}
-test oo-45.3 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y
-        constructor args {
-            my configure -x 0 -y 0 {*}$args
-        }
-    }
-    set pt [Point new -x 3 -y 4]
-    oo::objdefine $pt property z
-    $pt configure -z 5
-    list [$pt configure -x],[$pt configure -y],[$pt configure -z] \
-	[$pt configure]
-} -cleanup {
-    parent destroy
-} -result {3,4,5 {-x 3 -y 4 -z 5}}
-test oo-45.4 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y
-        constructor args {
-            my configure -x 0 -y 0 {*}$args
-        }
-    }
-    [Point new] configure gorp
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad property "gorp": must be -x or -y}
-test oo-45.5 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y
-        constructor args {
-            my configure -x 0 -y 0 {*}$args
-        }
-    }
-    oo::configurable create 3DPoint {
-	superclass Point
-	property z
-	constructor args {
-	    next -z 0 {*}$args
-	}
-    }
-    [3DPoint new] configure gorp
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad property "gorp": must be -x, -y, or -z}
-test oo-45.6 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y
-        constructor args {
-            my configure -x 0 -y 0 {*}$args
-        }
-    }
-    [Point create p] configure -x 1 -y
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {wrong # args: should be "::p configure ?-option value ...?"}
-test oo-45.7 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-    unset -nocomplain msg
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y -kind writable
-        constructor args {
-            my configure -x 0 -y 0 {*}$args
-        }
-    }
-    Point create p
-    list [p configure -y ok] [catch {p configure -y} msg] $msg
-} -cleanup {
-    parent destroy
-} -result {{} 1 {property "-y" is write only}}
-test oo-45.8 {TIP 558: properties: configurable class system} -setup {
-    oo::class create parent
-    unset -nocomplain msg
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x y -kind readable
-        constructor args {
-            my configure -x 0 {*}$args
-	    variable y 123
-        }
-    }
-    Point create p
-    list [p configure] [p configure -y] [catch {p configure -y foo} msg] $msg
-} -cleanup {
-    parent destroy
-} -result {{-x 0 -y 123} 123 1 {property "-y" is read only}}
-
-test oo-46.1 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	variable xyz
-	property x -get {
-	    global result
-	    lappend result "get"
-	    return [lrepeat 3 $xyz]
-	} -set {
-	    global result
-	    lappend result [list set $value]
-	    set xyz [expr {$value * 3}]
-	}
-    }
-    Point create pt
-    pt configure -x 5
-    lappend result >[pt configure -x]<
-} -cleanup {
-    parent destroy
-} -result {{set 5} get {>15 15 15<}}
-test oo-46.2 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-    unset -nocomplain result
-    set result {}
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	variable xyz
-	property x -get {
-	    global result
-	    lappend result "get"
-	    return [lrepeat 3 $xyz]
-	} -set {
-	    global result
-	    lappend result [list set $value]
-	    set xyz [expr {$value * 3}]
-	} y -kind readable -get {return $xyz}
-    }
-    Point create pt
-    pt configure -x 5
-    lappend result >[pt configure -x]< [pt configure -y]
-} -cleanup {
-    parent destroy
-} -result {{set 5} get {>15 15 15<} 15}
-test oo-46.3 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	variable xyz
-	property -x -get {return $xyz}
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad property name "-x": must not begin with -}
-test oo-46.4 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property "x y"
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad property name "x y": must be a simple word}
-test oo-46.5 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property ::x
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad property name "::x": must not contain namespace separators}
-test oo-46.6 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property x(
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad property name "x(": must not contain parentheses}
-test oo-46.7 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property x)
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad property name "x)": must not contain parentheses}
-test oo-46.8 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property x -get
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {missing body to go with -get option}
-test oo-46.9 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property x -set
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {missing body to go with -set option}
-test oo-46.10 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property x -kind
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {missing kind value to go with -kind option}
-test oo-46.11 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {superclass parent}
-    oo::define Point {
-	property x -get {} -set
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {missing body to go with -set option}
-test oo-46.12 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {} -get {return ok}
-    }
-    [Point new] configure -x
-} -cleanup {
-    parent destroy
-} -result ok
-test oo-46.13 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -kind gorp
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {bad kind "gorp": must be readable, readwrite, or writable}
-test oo-46.14 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -k reada -g {return ok}
-    }
-    [Point new] configure -x
-} -cleanup {
-    parent destroy
-} -result ok
-test oo-46.15 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property {*}{
-	    x -kind writable
-	    y -get {return ok}
-	}
-    }
-    [Point new] configure -y
-} -cleanup {
-    parent destroy
-} -result ok
-test oo-46.16 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-    unset -nocomplain msg
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	variable xy
-	property x -kind readable -get {return $xy}
-	property x -kind writable -set {set xy $value}
-    }
-    Point create pt
-    list [catch {
-	pt configure -x ok
-    } msg] $msg [catch {
-	pt configure -x
-    } msg] $msg [catch {
-	pt configure -y 1
-    } msg] $msg
-} -cleanup {
-    parent destroy
-} -result {0 {} 1 {property "-x" is write only} 1 {bad property "-y": must be -x}}
-test oo-46.17 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {return -code break}
-    }
-    while 1 {
-	[Point new] configure -x
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {property getter for -x did a break}
-test oo-46.18 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {return -code break}
-    }
-    while 1 {
-	[Point new] configure
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {property getter for -x did a break}
-test oo-46.19 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {error "boo"}
-    }
-    while 1 {
-	[Point new] configure -x
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result boo
-test oo-46.20 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {error "boo"}
-    }
-    while 1 {
-	[Point new] configure
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result boo
-test oo-46.21 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {return -code continue}
-    }
-    while 1 {
-	[Point new] configure -x
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {property getter for -x did a continue}
-test oo-46.22 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {return -level 2 ok}
-    }
-    apply {{} {
-	[Point new] configure
-	return bad
-    }}
-} -cleanup {
-    parent destroy
-} -result ok
-test oo-46.23 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -get {return -level 2 ok}
-    }
-    apply {{} {
-	[Point new] configure -x
-	return bad
-    }}
-} -cleanup {
-    parent destroy
-} -result ok
-test oo-46.24 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -set {return -code break}
-    }
-    while 1 {
-	[Point new] configure -x gorp
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {property setter for -x did a break}
-test oo-46.25 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -set {return -code continue}
-    }
-    while 1 {
-	[Point new] configure -x gorp
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result {property setter for -x did a continue}
-test oo-46.26 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -set {error "boo"}
-    }
-    while 1 {
-	[Point new] configure -x gorp
-	break
-    }
-} -returnCodes error -cleanup {
-    parent destroy
-} -result boo
-test oo-46.27 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x -set {return -level 2 ok}
-    }
-    apply {{} {
-	[Point new] configure -x gorp
-	return bad
-    }}
-} -cleanup {
-    parent destroy
-} -result ok
-test oo-46.28 {TIP 558: properties: declaration semantics} -setup {
-    oo::class create parent
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	private property var
-    }
-    Point create pt
-    pt configure -var ok
-    pt configure -var
-} -cleanup {
-    parent destroy
-} -result ok
-
-test oo-47.1 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {superclass parent}
-    list [catch {oo::define Point {property -x}} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {bad property name "-x": must not begin with -
-    while executing
-"property -x"
-    (in definition script for class "::Point" line 1)
-    invoked from within
-"oo::define Point {property -x}"} {TCLOO PROPERTY_FORMAT}}
-test oo-47.2 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {superclass parent}
-    list [catch {oo::define Point {property x -get}} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {missing body to go with -get option
-    while executing
-"property x -get"
-    (in definition script for class "::Point" line 1)
-    invoked from within
-"oo::define Point {property x -get}"} {TCL WRONGARGS}}
-test oo-47.3 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {superclass parent}
-    list [catch {oo::define Point {property x -set}} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {missing body to go with -set option
-    while executing
-"property x -set"
-    (in definition script for class "::Point" line 1)
-    invoked from within
-"oo::define Point {property x -set}"} {TCL WRONGARGS}}
-test oo-47.4 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {superclass parent}
-    list [catch {oo::define Point {property x -kind}} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {missing kind value to go with -kind option
-    while executing
-"property x -kind"
-    (in definition script for class "::Point" line 1)
-    invoked from within
-"oo::define Point {property x -kind}"} {TCL WRONGARGS}}
-test oo-47.5 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {superclass parent}
-    list [catch {oo::define Point {property x -kind gorp}} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {bad kind "gorp": must be readable, readwrite, or writable
-    while executing
-"property x -kind gorp"
-    (in definition script for class "::Point" line 1)
-    invoked from within
-"oo::define Point {property x -kind gorp}"} {TCL LOOKUP INDEX kind gorp}}
-test oo-47.6 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {superclass parent}
-    list [catch {oo::define Point {property x -gorp}} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {bad option "-gorp": must be -get, -kind, or -set
-    while executing
-"property x -gorp"
-    (in definition script for class "::Point" line 1)
-    invoked from within
-"oo::define Point {property x -gorp}"} {TCL LOOKUP INDEX option -gorp}}
-test oo-47.7 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x
-    }
-    Point create pt
-    list [catch {pt configure -gorp} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {bad property "-gorp": must be -x
-    while executing
-"pt configure -gorp"} {TCL LOOKUP INDEX property -gorp}}
-test oo-47.8 {TIP 558: properties: error details} -setup {
-    oo::class create parent
-    unset -nocomplain msg opt
-} -body {
-    oo::configurable create Point {
-	superclass parent
-	property x
-    }
-    Point create pt
-    list [catch {pt configure -gorp blarg} msg opt] \
-	[dict get $opt -errorinfo] [dict get $opt -errorcode]
-} -cleanup {
-    parent destroy
-} -result {1 {bad property "-gorp": must be -x
-    while executing
-"pt configure -gorp blarg"} {TCL LOOKUP INDEX property -gorp}}
 
 cleanupTests
 return
diff --git a/tests/ooProp.test b/tests/ooProp.test
new file mode 100644
index 0000000..55f945a
--- /dev/null
+++ b/tests/ooProp.test
@@ -0,0 +1,862 @@
+# This file contains a collection of tests for Tcl's built-in object system,
+# specifically the parts that support configurable properties on objects.
+# Sourcing this file into Tcl runs the tests and generates output for errors.
+# No output means no errors were found.
+#
+# Copyright (c) 2019-2020 Donal K. Fellows
+#
+# See the file "license.terms" for information on usage and redistribution of
+# this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+package require TclOO 1.0.3
+package require tcltest 2
+if {"::tcltest" in [namespace children]} {
+    namespace import -force ::tcltest::*
+}
+
+test ooProp-1.1 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set a b c
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set f e d
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set a a a
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::readableproperties -set
+    lappend result [info class properties c] [info class properties c -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
+test ooProp-1.2 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a b c
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set f e d
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a a a
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c} {} {d e f} {} a {} {} {}}
+test ooProp-1.3 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set a b c
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set f e d
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set a a a
+    lappend result [info class properties c] [info class properties c -writable]
+    oo::define c ::oo::configuresupport::writableproperties -set
+    lappend result [info class properties c] [info class properties c -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
+test ooProp-1.4 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a b c
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set f e d
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a a a
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set
+    lappend result [info class properties c -all] [info class properties c -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c} {} {d e f} {} a {} {}}
+test ooProp-1.5 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a b c
+    oo::define d ::oo::configuresupport::readableproperties -set x y z
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set f e d
+    oo::define d ::oo::configuresupport::readableproperties -set r p q
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a a h
+    oo::define d ::oo::configuresupport::readableproperties -set g h g
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define d ::oo::configuresupport::readableproperties -set
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {} {}}
+test ooProp-1.6 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a b c
+    oo::define d ::oo::configuresupport::writableproperties -set x y z
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set f e d
+    oo::define d ::oo::configuresupport::writableproperties -set r p q
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a a h
+    oo::define d ::oo::configuresupport::writableproperties -set g h g
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+    oo::define d ::oo::configuresupport::writableproperties -set
+    lappend result [info class properties d -all] [info class properties d -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c x y z} {} {d e f p q r} {} {a g h} {} {g h} {} {}}
+test ooProp-1.7 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    c create o
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set a b c
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set a a h
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set
+    lappend result [info object properties o] [info object properties o -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c} {} {d e f} {} {a h} {} {} {}}
+test ooProp-1.8 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    c create o
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set a b c
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set a a h
+    lappend result [info object properties o] [info object properties o -writable]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set
+    lappend result [info object properties o] [info object properties o -writable]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c} {} {d e f} {} {a h} {} {}}
+test ooProp-1.9 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    d create o
+    lappend result [info object properties o -all] [info object properties o -writable -all]
+    oo::define c ::oo::configuresupport::readableproperties -set a b
+    oo::define d ::oo::configuresupport::readableproperties -set c d
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set e f
+    lappend result [info object properties o -all] [info object properties o -writable -all]
+    oo::objdefine o ::oo::configuresupport::objreadableproperties -set f e d b e
+    lappend result [info object properties o -all] [info object properties o -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {a b c d e f} {} {a b c d e f} {}}
+test ooProp-1.10 {TIP 558: properties: core support} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::class create c {superclass parent}
+    oo::class create d {superclass c}
+    d create o
+    lappend result [info object properties o -all] [info object properties o -writable -all]
+    oo::define c ::oo::configuresupport::writableproperties -set a b
+    oo::define d ::oo::configuresupport::writableproperties -set c d
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set e f
+    lappend result [info object properties o -all] [info object properties o -writable -all]
+    oo::objdefine o ::oo::configuresupport::objwritableproperties -set f e d b e
+    lappend result [info object properties o -all] [info object properties o -writable -all]
+} -cleanup {
+    parent destroy
+} -result {{} {} {} {a b c d e f} {} {a b c d e f}}
+
+test ooProp-2.1 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+        variable x y
+        method report {} {
+            lappend ::result "x=$x, y=$y"
+        }
+    }
+    set pt [Point new -x 3]
+    $pt report
+    $pt configure -y 4
+    $pt report
+    lappend result [$pt configure -x],[$pt configure -y] [$pt configure]
+} -cleanup {
+    parent destroy
+} -result {{x=3, y=0} {x=3, y=4} 3,4 {-x 3 -y 4}}
+test ooProp-2.2 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    oo::configurable create 3DPoint {
+	superclass Point
+	property z
+	constructor args {
+	    next -z 0 {*}$args
+	}
+    }
+    set pt [3DPoint new -x 3 -y 4 -z 5]
+    list [$pt configure -x],[$pt configure -y],[$pt configure -z] \
+	[$pt configure]
+} -cleanup {
+    parent destroy
+} -result {3,4,5 {-x 3 -y 4 -z 5}}
+test ooProp-2.3 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    set pt [Point new -x 3 -y 4]
+    oo::objdefine $pt property z
+    $pt configure -z 5
+    list [$pt configure -x],[$pt configure -y],[$pt configure -z] \
+	[$pt configure]
+} -cleanup {
+    parent destroy
+} -result {3,4,5 {-x 3 -y 4 -z 5}}
+test ooProp-2.4 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    [Point new] configure gorp
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property "gorp": must be -x or -y}
+test ooProp-2.5 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    oo::configurable create 3DPoint {
+	superclass Point
+	property z
+	constructor args {
+	    next -z 0 {*}$args
+	}
+    }
+    [3DPoint new] configure gorp
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property "gorp": must be -x, -y, or -z}
+test ooProp-2.6 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    [Point create p] configure -x 1 -y
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {wrong # args: should be "::p configure ?-option value ...?"}
+test ooProp-2.7 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+    unset -nocomplain msg
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y -kind writable
+        constructor args {
+            my configure -x 0 -y 0 {*}$args
+        }
+    }
+    Point create p
+    list [p configure -y ok] [catch {p configure -y} msg] $msg
+} -cleanup {
+    parent destroy
+} -result {{} 1 {property "-y" is write only}}
+test ooProp-2.8 {TIP 558: properties: configurable class system} -setup {
+    oo::class create parent
+    unset -nocomplain msg
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x y -kind readable
+        constructor args {
+            my configure -x 0 {*}$args
+	    variable y 123
+        }
+    }
+    Point create p
+    list [p configure] [p configure -y] [catch {p configure -y foo} msg] $msg
+} -cleanup {
+    parent destroy
+} -result {{-x 0 -y 123} 123 1 {property "-y" is read only}}
+
+test ooProp-3.1 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	variable xyz
+	property x -get {
+	    global result
+	    lappend result "get"
+	    return [lrepeat 3 $xyz]
+	} -set {
+	    global result
+	    lappend result [list set $value]
+	    set xyz [expr {$value * 3}]
+	}
+    }
+    Point create pt
+    pt configure -x 5
+    lappend result >[pt configure -x]<
+} -cleanup {
+    parent destroy
+} -result {{set 5} get {>15 15 15<}}
+test ooProp-3.2 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+    unset -nocomplain result
+    set result {}
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	variable xyz
+	property x -get {
+	    global result
+	    lappend result "get"
+	    return [lrepeat 3 $xyz]
+	} -set {
+	    global result
+	    lappend result [list set $value]
+	    set xyz [expr {$value * 3}]
+	} y -kind readable -get {return $xyz}
+    }
+    Point create pt
+    pt configure -x 5
+    lappend result >[pt configure -x]< [pt configure -y]
+} -cleanup {
+    parent destroy
+} -result {{set 5} get {>15 15 15<} 15}
+test ooProp-3.3 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	variable xyz
+	property -x -get {return $xyz}
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "-x": must not begin with -}
+test ooProp-3.4 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property "x y"
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "x y": must be a simple word}
+test ooProp-3.5 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property ::x
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "::x": must not contain namespace separators}
+test ooProp-3.6 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x(
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "x(": must not contain parentheses}
+test ooProp-3.7 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x)
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad property name "x)": must not contain parentheses}
+test ooProp-3.8 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -get
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing body to go with -get option}
+test ooProp-3.9 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -set
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing body to go with -set option}
+test ooProp-3.10 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -kind
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing kind value to go with -kind option}
+test ooProp-3.11 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {superclass parent}
+    oo::define Point {
+	property x -get {} -set
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {missing body to go with -set option}
+test ooProp-3.12 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {} -get {return ok}
+    }
+    [Point new] configure -x
+} -cleanup {
+    parent destroy
+} -result ok
+test ooProp-3.13 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -kind gorp
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {bad kind "gorp": must be readable, readwrite, or writable}
+test ooProp-3.14 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -k reada -g {return ok}
+    }
+    [Point new] configure -x
+} -cleanup {
+    parent destroy
+} -result ok
+test ooProp-3.15 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property {*}{
+	    x -kind writable
+	    y -get {return ok}
+	}
+    }
+    [Point new] configure -y
+} -cleanup {
+    parent destroy
+} -result ok
+test ooProp-3.16 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+    unset -nocomplain msg
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	variable xy
+	property x -kind readable -get {return $xy}
+	property x -kind writable -set {set xy $value}
+    }
+    Point create pt
+    list [catch {
+	pt configure -x ok
+    } msg] $msg [catch {
+	pt configure -x
+    } msg] $msg [catch {
+	pt configure -y 1
+    } msg] $msg
+} -cleanup {
+    parent destroy
+} -result {0 {} 1 {property "-x" is write only} 1 {bad property "-y": must be -x}}
+test ooProp-3.17 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -code break}
+    }
+    while 1 {
+	[Point new] configure -x
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property getter for -x did a break}
+test ooProp-3.18 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -code break}
+    }
+    while 1 {
+	[Point new] configure
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property getter for -x did a break}
+test ooProp-3.19 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {error "boo"}
+    }
+    while 1 {
+	[Point new] configure -x
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result boo
+test ooProp-3.20 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {error "boo"}
+    }
+    while 1 {
+	[Point new] configure
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result boo
+test ooProp-3.21 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -code continue}
+    }
+    while 1 {
+	[Point new] configure -x
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property getter for -x did a continue}
+test ooProp-3.22 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -level 2 ok}
+    }
+    apply {{} {
+	[Point new] configure
+	return bad
+    }}
+} -cleanup {
+    parent destroy
+} -result ok
+test ooProp-3.23 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -get {return -level 2 ok}
+    }
+    apply {{} {
+	[Point new] configure -x
+	return bad
+    }}
+} -cleanup {
+    parent destroy
+} -result ok
+test ooProp-3.24 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {return -code break}
+    }
+    while 1 {
+	[Point new] configure -x gorp
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property setter for -x did a break}
+test ooProp-3.25 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {return -code continue}
+    }
+    while 1 {
+	[Point new] configure -x gorp
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result {property setter for -x did a continue}
+test ooProp-3.26 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {error "boo"}
+    }
+    while 1 {
+	[Point new] configure -x gorp
+	break
+    }
+} -returnCodes error -cleanup {
+    parent destroy
+} -result boo
+test ooProp-3.27 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x -set {return -level 2 ok}
+    }
+    apply {{} {
+	[Point new] configure -x gorp
+	return bad
+    }}
+} -cleanup {
+    parent destroy
+} -result ok
+test ooProp-3.28 {TIP 558: properties: declaration semantics} -setup {
+    oo::class create parent
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	private property var
+    }
+    Point create pt
+    pt configure -var ok
+    pt configure -var
+} -cleanup {
+    parent destroy
+} -result ok
+
+test ooProp-4.1 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property -x}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad property name "-x": must not begin with -
+    while executing
+"property -x"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property -x}"} {TCLOO PROPERTY_FORMAT}}
+test ooProp-4.2 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -get}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {missing body to go with -get option
+    while executing
+"property x -get"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -get}"} {TCL WRONGARGS}}
+test ooProp-4.3 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -set}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {missing body to go with -set option
+    while executing
+"property x -set"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -set}"} {TCL WRONGARGS}}
+test ooProp-4.4 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -kind}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {missing kind value to go with -kind option
+    while executing
+"property x -kind"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -kind}"} {TCL WRONGARGS}}
+test ooProp-4.5 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -kind gorp}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad kind "gorp": must be readable, readwrite, or writable
+    while executing
+"property x -kind gorp"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -kind gorp}"} {TCL LOOKUP INDEX kind gorp}}
+test ooProp-4.6 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {superclass parent}
+    list [catch {oo::define Point {property x -gorp}} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad option "-gorp": must be -get, -kind, or -set
+    while executing
+"property x -gorp"
+    (in definition script for class "::Point" line 1)
+    invoked from within
+"oo::define Point {property x -gorp}"} {TCL LOOKUP INDEX option -gorp}}
+test ooProp-4.7 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x
+    }
+    Point create pt
+    list [catch {pt configure -gorp} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad property "-gorp": must be -x
+    while executing
+"pt configure -gorp"} {TCL LOOKUP INDEX property -gorp}}
+test ooProp-4.8 {TIP 558: properties: error details} -setup {
+    oo::class create parent
+    unset -nocomplain msg opt
+} -body {
+    oo::configurable create Point {
+	superclass parent
+	property x
+    }
+    Point create pt
+    list [catch {pt configure -gorp blarg} msg opt] \
+	[dict get $opt -errorinfo] [dict get $opt -errorcode]
+} -cleanup {
+    parent destroy
+} -result {1 {bad property "-gorp": must be -x
+    while executing
+"pt configure -gorp blarg"} {TCL LOOKUP INDEX property -gorp}}
+
+cleanupTests
+return
+
+# Local Variables:
+# mode: tcl
+# End:
-- 
cgit v0.12


From dafa1487f9a55f45fa67c4ff1583b3ac1397b940 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Fri, 7 Feb 2020 09:21:08 +0000
Subject: caching is one of the two hard things in CS (along with naming and
 off-by-one-errors)

---
 generic/tclOODefineCmds.c | 42 +++++++++++++++++++++++++++++++++++-------
 tests/ooProp.test         | 23 +++++++++++++++++++++++
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c
index 7b70c79..e68f15d 100644
--- a/generic/tclOODefineCmds.c
+++ b/generic/tclOODefineCmds.c
@@ -60,6 +60,7 @@ struct DeclaredSlot {
  */
 
 static inline void	BumpGlobalEpoch(Tcl_Interp *interp, Class *classPtr);
+static inline void	BumpInstanceEpoch(Object *oPtr);
 static Tcl_Command	FindCommand(Tcl_Interp *interp, Tcl_Obj *stringObj,
 			    Tcl_Namespace *const namespacePtr);
 static inline void	GenerateErrorInfo(Tcl_Interp *interp, Object *oPtr,
@@ -204,6 +205,33 @@ BumpGlobalEpoch(
 /*
  * ----------------------------------------------------------------------
  *
+ * BumpInstanceEpoch --
+ *
+ *	Advances the epoch and clears the property cache of an object. The
+ *	equivalent for classes is BumpGlobalEpoch(), as classes have a more
+ *	complex set of relationships to other entities.
+ *
+ * ----------------------------------------------------------------------
+ */
+
+static inline void
+BumpInstanceEpoch(
+    Object *oPtr)
+{
+    oPtr->epoch++;
+    if (oPtr->properties.allReadableCache) {
+	Tcl_DecrRefCount(oPtr->properties.allReadableCache);
+	oPtr->properties.allReadableCache = NULL;
+    }
+    if (oPtr->properties.allWritableCache) {
+	Tcl_DecrRefCount(oPtr->properties.allWritableCache);
+	oPtr->properties.allWritableCache = NULL;
+    }
+}
+
+/*
+ * ----------------------------------------------------------------------
+ *
  * RecomputeClassCacheFlag --
  *
  *	Determine whether the object is prototypical of its class, and hence
@@ -280,7 +308,7 @@ TclOOObjectSetFilters(
 	oPtr->filters.num = numFilters;
 	oPtr->flags &= ~USE_CLASS_CACHE;
     }
-    oPtr->epoch++;		/* Only this object can be affected. */
+    BumpInstanceEpoch(oPtr);	/* Only this object can be affected. */
 }
 
 /*
@@ -403,7 +431,7 @@ TclOOObjectSetMixins(
 	    }
 	}
     }
-    oPtr->epoch++;
+    BumpInstanceEpoch(oPtr);
 }
 
 /*
@@ -1494,7 +1522,7 @@ TclOODefineClassObjCmd(
 	if (oPtr->classPtr != NULL) {
 	    BumpGlobalEpoch(interp, oPtr->classPtr);
 	} else {
-	    oPtr->epoch++;
+	    BumpInstanceEpoch(oPtr);
 	}
     }
     return TCL_OK;
@@ -1704,7 +1732,7 @@ TclOODefineDeleteMethodObjCmd(
     }
 
     if (isInstanceDeleteMethod) {
-	oPtr->epoch++;
+	BumpInstanceEpoch(oPtr);
     } else {
 	BumpGlobalEpoch(interp, oPtr->classPtr);
     }
@@ -1864,7 +1892,7 @@ TclOODefineExportObjCmd(
 
     if (changed) {
 	if (isInstanceExport) {
-	    oPtr->epoch++;
+	    BumpInstanceEpoch(oPtr);
 	} else {
 	    BumpGlobalEpoch(interp, clsPtr);
 	}
@@ -2082,7 +2110,7 @@ TclOODefineRenameMethodObjCmd(
     }
 
     if (isInstanceRenameMethod) {
-	oPtr->epoch++;
+	BumpInstanceEpoch(oPtr);
     } else {
 	BumpGlobalEpoch(interp, oPtr->classPtr);
     }
@@ -2176,7 +2204,7 @@ TclOODefineUnexportObjCmd(
 
     if (changed) {
 	if (isInstanceUnexport) {
-	    oPtr->epoch++;
+	    BumpInstanceEpoch(oPtr);
 	} else {
 	    BumpGlobalEpoch(interp, clsPtr);
 	}
diff --git a/tests/ooProp.test b/tests/ooProp.test
index 55f945a..256b934 100644
--- a/tests/ooProp.test
+++ b/tests/ooProp.test
@@ -208,6 +208,29 @@ test ooProp-1.10 {TIP 558: properties: core support} -setup {
 } -cleanup {
     parent destroy
 } -result {{} {} {} {a b c d e f} {} {a b c d e f}}
+test ooProp-1.11 {TIP 558: properties: core support cache} -setup {
+    oo::class create parent
+    unset -nocomplain result
+} -body {
+    oo::class create m {
+	superclass parent
+	::oo::configuresupport::readableproperties -set a
+	::oo::configuresupport::writableproperties -set c
+    }
+    oo::class create c {
+	superclass parent
+	::oo::configuresupport::readableproperties -set b
+	::oo::configuresupport::writableproperties -set d
+    }
+    c create o
+    lappend result [info object properties o -all -readable] \
+	[info object properties o -all -writable]
+    oo::objdefine o mixin m
+    lappend result [info object properties o -all -readable] \
+	[info object properties o -all -writable]
+} -cleanup {
+    parent destroy
+} -result {b d {a b} {c d}}
 
 test ooProp-2.1 {TIP 558: properties: configurable class system} -setup {
     oo::class create parent
-- 
cgit v0.12


From 99145db40b9162cb8ac82c74d08da7f8f74eb911 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sat, 15 Feb 2020 10:28:01 +0000
Subject: There are subtle cases where an append-if-new operation is really
 useful for a slot.

---
 doc/define.n          |  6 ++++++
 generic/tclOOScript.h | 43 ++++++++++++++++++++++++++-----------------
 tests/oo.test         | 16 ++++++++--------
 tools/tclOOScript.tcl | 45 +++++++++++++++++++++++++++------------------
 4 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/doc/define.n b/doc/define.n
index 9046203..342b4c9 100644
--- a/doc/define.n
+++ b/doc/define.n
@@ -493,6 +493,12 @@ the slot:
 .
 This appends the given \fImember\fR elements to the slot definition.
 .TP
+\fIslot\fR \fB\-appendifnew\fR ?\fImember ...\fR?
+.VS TIP558
+This appends the given \fImember\fR elements to the slot definition if they
+do not already exist.
+.VE TIP558
+.TP
 \fIslot\fR \fB\-clear\fR
 .
 This sets the slot definition to the empty list.
diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index 2b61866..b3ff92f 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -98,9 +98,9 @@ static const char *tclOOSetupScript =
 "\t\t\tif {![info object isa class $d]} {\n"
 "\t\t\t\tcontinue\n"
 "\t\t\t}\n"
-"\t\t\tdefine $delegate ::oo::define::superclass -append $d\n"
+"\t\t\tdefine $delegate ::oo::define::superclass -appendifnew $d\n"
 "\t\t}\n"
-"\t\tobjdefine $class ::oo::objdefine::mixin -append $delegate\n"
+"\t\tobjdefine $class ::oo::objdefine::mixin -appendifnew $delegate\n"
 "\t}\n"
 "\tproc UpdateClassDelegatesAfterClone {originObject targetObject} {\n"
 "\t\tset originDelegate [DelegateName $originObject]\n"
@@ -141,34 +141,44 @@ static const char *tclOOSetupScript =
 "\t\t::namespace delete tmp\n"
 "\t}\n"
 "\tdefine Slot {\n"
-"\t\tmethod Get {} {\n"
+"\t\tmethod Get -unexport {} {\n"
 "\t\t\treturn -code error -errorcode {TCLOO ABSTRACT_SLOT} \"unimplemented\"\n"
 "\t\t}\n"
-"\t\tmethod Set list {\n"
+"\t\tmethod Set -unexport list {\n"
 "\t\t\treturn -code error -errorcode {TCLOO ABSTRACT_SLOT} \"unimplemented\"\n"
 "\t\t}\n"
-"\t\tmethod Resolve list {\n"
+"\t\tmethod Resolve -unexport list {\n"
 "\t\t\treturn $list\n"
 "\t\t}\n"
-"\t\tmethod -set args {\n"
+"\t\tmethod -set -export args {\n"
 "\t\t\tset my [namespace which my]\n"
 "\t\t\tset args [lmap a $args {uplevel 1 [list $my Resolve $a]}]\n"
 "\t\t\ttailcall my Set $args\n"
 "\t\t}\n"
-"\t\tmethod -append args {\n"
+"\t\tmethod -append -export args {\n"
 "\t\t\tset my [namespace which my]\n"
 "\t\t\tset args [lmap a $args {uplevel 1 [list $my Resolve $a]}]\n"
 "\t\t\tset current [uplevel 1 [list $my Get]]\n"
 "\t\t\ttailcall my Set [list {*}$current {*}$args]\n"
 "\t\t}\n"
-"\t\tmethod -clear {} {tailcall my Set {}}\n"
-"\t\tmethod -prepend args {\n"
+"\t\tmethod -appendifnew -export args {\n"
+"\t\t\tset my [namespace which my]\n"
+"\t\t\tset current [uplevel 1 [list $my Get]]\n"
+"\t\t\tset args [lmap a $args {\n"
+"\t\t\t\tset a [uplevel 1 [list $my Resolve $a]]\n"
+"\t\t\t\tif {$a in $current} continue\n"
+"\t\t\t\tset a\n"
+"\t\t\t}]\n"
+"\t\t\ttailcall my Set [list {*}$current {*}$args]\n"
+"\t\t}\n"
+"\t\tmethod -clear -export {} {tailcall my Set {}}\n"
+"\t\tmethod -prepend -export args {\n"
 "\t\t\tset my [namespace which my]\n"
 "\t\t\tset args [lmap a $args {uplevel 1 [list $my Resolve $a]}]\n"
 "\t\t\tset current [uplevel 1 [list $my Get]]\n"
 "\t\t\ttailcall my Set [list {*}$args {*}$current]\n"
 "\t\t}\n"
-"\t\tmethod -remove args {\n"
+"\t\tmethod -remove -export args {\n"
 "\t\t\tset my [namespace which my]\n"
 "\t\t\tset args [lmap a $args {uplevel 1 [list $my Resolve $a]}]\n"
 "\t\t\tset current [uplevel 1 [list $my Get]]\n"
@@ -177,7 +187,7 @@ static const char *tclOOSetupScript =
 "\t\t\t}]\n"
 "\t\t}\n"
 "\t\tforward --default-operation my -append\n"
-"\t\tmethod unknown {args} {\n"
+"\t\tmethod unknown -unexport {args} {\n"
 "\t\t\tset def --default-operation\n"
 "\t\t\tif {[llength $args] == 0} {\n"
 "\t\t\t\ttailcall my $def\n"
@@ -186,13 +196,12 @@ static const char *tclOOSetupScript =
 "\t\t\t}\n"
 "\t\t\tnext {*}$args\n"
 "\t\t}\n"
-"\t\texport -set -append -clear -prepend -remove\n"
-"\t\tunexport unknown destroy\n"
+"\t\tunexport destroy\n"
 "\t}\n"
 "\tobjdefine define::superclass forward --default-operation my -set\n"
 "\tobjdefine define::mixin forward --default-operation my -set\n"
 "\tobjdefine objdefine::mixin forward --default-operation my -set\n"
-"\tdefine object method <cloned> {originObject} {\n"
+"\tdefine object method <cloned> -unexport {originObject} {\n"
 "\t\tforeach p [info procs [info object namespace $originObject]::*] {\n"
 "\t\t\tset args [info args $p]\n"
 "\t\t\tset idx -1\n"
@@ -219,7 +228,7 @@ static const char *tclOOSetupScript =
 "\t\t\t}\n"
 "\t\t}\n"
 "\t}\n"
-"\tdefine class method <cloned> {originObject} {\n"
+"\tdefine class method <cloned> -unexport {originObject} {\n"
 "\t\tnext $originObject\n"
 "\t\t::oo::UpdateClassDelegatesAfterClone $originObject [self]\n"
 "\t}\n"
@@ -235,7 +244,7 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\t\t::return -code error -errorcode {TCLOO SINGLETON} \\\n"
 "\t\t\t\t\t\t\t\"may not destroy a singleton object\"\n"
 "\t\t\t\t\t}\n"
-"\t\t\t\t\tmethod <cloned> {originObject} {\n"
+"\t\t\t\t\tmethod <cloned> -unexport {originObject} {\n"
 "\t\t\t\t\t\t::return -code error -errorcode {TCLOO SINGLETON} \\\n"
 "\t\t\t\t\t\t\t\"may not clone a singleton object\"\n"
 "\t\t\t\t\t}\n"
@@ -439,7 +448,7 @@ static const char *tclOOSetupScript =
 "\t\t}\n"
 "\t\t::oo::class create configurable {\n"
 "\t\t\tprivate variable my\n"
-"\t\t\tmethod configure args {\n"
+"\t\t\tmethod configure -export args {\n"
 "\t\t\t\t::if {![::info exists my]} {\n"
 "\t\t\t\t\t::set my [::namespace which my]\n"
 "\t\t\t\t}\n"
diff --git a/tests/oo.test b/tests/oo.test
index c1907d5..0fa2559 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -4163,7 +4163,7 @@ test oo-33.4 {TIP 380: slots - errors} -setup [SampleSlotSetup {
 } -returnCodes error -cleanup [SampleSlotCleanup {
     rename $s {}
 }] -result \
-    {unknown method "-grill": must be -append, -clear, -prepend, -remove, -set, contents or ops}
+    {unknown method "-grill": must be -append, -appendifnew, -clear, -prepend, -remove, -set, contents or ops}
 
 test oo-34.1 {TIP 380: slots - presence} -setup {
     set obj [oo::object new]
@@ -4193,25 +4193,25 @@ proc getMethods obj {
 }
 test oo-34.3 {TIP 380: slots - presence} {
     getMethods oo::define::filter
-} {{-append -clear -prepend -remove -set} {Get Set}}
+} {{-append -appendifnew -clear -prepend -remove -set} {Get Set}}
 test oo-34.4 {TIP 380: slots - presence} {
     getMethods oo::define::mixin
-} {{-append -clear -prepend -remove -set} {--default-operation Get Resolve Set}}
+} {{-append -appendifnew -clear -prepend -remove -set} {--default-operation Get Resolve Set}}
 test oo-34.5 {TIP 380: slots - presence} {
     getMethods oo::define::superclass
-} {{-append -clear -prepend -remove -set} {--default-operation Get Resolve Set}}
+} {{-append -appendifnew -clear -prepend -remove -set} {--default-operation Get Resolve Set}}
 test oo-34.6 {TIP 380: slots - presence} {
     getMethods oo::define::variable
-} {{-append -clear -prepend -remove -set} {Get Set}}
+} {{-append -appendifnew -clear -prepend -remove -set} {Get Set}}
 test oo-34.7 {TIP 380: slots - presence} {
     getMethods oo::objdefine::filter
-} {{-append -clear -prepend -remove -set} {Get Set}}
+} {{-append -appendifnew -clear -prepend -remove -set} {Get Set}}
 test oo-34.8 {TIP 380: slots - presence} {
     getMethods oo::objdefine::mixin
-} {{-append -clear -prepend -remove -set} {--default-operation Get Resolve Set}}
+} {{-append -appendifnew -clear -prepend -remove -set} {--default-operation Get Resolve Set}}
 test oo-34.9 {TIP 380: slots - presence} {
     getMethods oo::objdefine::variable
-} {{-append -clear -prepend -remove -set} {Get Set}}
+} {{-append -appendifnew -clear -prepend -remove -set} {Get Set}}
 test oo-34.10 {TIP 516: slots - resolution} -setup {
     oo::class create parent
     set result {}
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index e918787..7355ad0 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -153,9 +153,9 @@
 	    if {![info object isa class $d]} {
 		continue
 	    }
-	    define $delegate ::oo::define::superclass -append $d
+	    define $delegate ::oo::define::superclass -appendifnew $d
 	}
-	objdefine $class ::oo::objdefine::mixin -append $delegate
+	objdefine $class ::oo::objdefine::mixin -appendifnew $delegate
     }
 
     # ----------------------------------------------------------------------
@@ -257,7 +257,7 @@
 	#
 	# ------------------------------------------------------------------
 
-	method Get {} {
+	method Get -unexport {} {
 	    return -code error -errorcode {TCLOO ABSTRACT_SLOT} "unimplemented"
 	}
 
@@ -270,7 +270,7 @@
 	#
 	# ------------------------------------------------------------------
 
-	method Set list {
+	method Set -unexport list {
 	    return -code error -errorcode {TCLOO ABSTRACT_SLOT} "unimplemented"
 	}
 
@@ -284,7 +284,7 @@
 	#
 	# ------------------------------------------------------------------
 
-	method Resolve list {
+	method Resolve -unexport list {
 	    return $list
 	}
 
@@ -297,25 +297,35 @@
 	#
 	# ------------------------------------------------------------------
 
-	method -set args {
+	method -set -export args {
 	    set my [namespace which my]
 	    set args [lmap a $args {uplevel 1 [list $my Resolve $a]}]
 	    tailcall my Set $args
 	}
-	method -append args {
+	method -append -export args {
 	    set my [namespace which my]
 	    set args [lmap a $args {uplevel 1 [list $my Resolve $a]}]
 	    set current [uplevel 1 [list $my Get]]
 	    tailcall my Set [list {*}$current {*}$args]
 	}
-	method -clear {} {tailcall my Set {}}
-	method -prepend args {
+	method -appendifnew -export args {
+	    set my [namespace which my]
+	    set current [uplevel 1 [list $my Get]]
+	    set args [lmap a $args {
+		set a [uplevel 1 [list $my Resolve $a]]
+		if {$a in $current} continue
+		set a
+	    }]
+	    tailcall my Set [list {*}$current {*}$args]
+	}
+	method -clear -export {} {tailcall my Set {}}
+	method -prepend -export args {
 	    set my [namespace which my]
 	    set args [lmap a $args {uplevel 1 [list $my Resolve $a]}]
 	    set current [uplevel 1 [list $my Get]]
 	    tailcall my Set [list {*}$args {*}$current]
 	}
-	method -remove args {
+	method -remove -export args {
 	    set my [namespace which my]
 	    set args [lmap a $args {uplevel 1 [list $my Resolve $a]}]
 	    set current [uplevel 1 [list $my Get]]
@@ -326,7 +336,7 @@
 
 	# Default handling
 	forward --default-operation my -append
-	method unknown {args} {
+	method unknown -unexport {args} {
 	    set def --default-operation
 	    if {[llength $args] == 0} {
 		tailcall my $def
@@ -336,9 +346,8 @@
 	    next {*}$args
 	}
 
-	# Set up what is exported and what isn't
-	export -set -append -clear -prepend -remove
-	unexport unknown destroy
+	# Hide destroy
+	unexport destroy
     }
 
     # Set the default operation differently for these slots
@@ -356,7 +365,7 @@
     #
     # ----------------------------------------------------------------------
 
-    define object method <cloned> {originObject} {
+    define object method <cloned> -unexport {originObject} {
 	# Copy over the procedures from the original namespace
 	foreach p [info procs [info object namespace $originObject]::*] {
 	    set args [info args $p]
@@ -397,7 +406,7 @@
     #
     # ----------------------------------------------------------------------
 
-    define class method <cloned> {originObject} {
+    define class method <cloned> -unexport {originObject} {
 	next $originObject
 	# Rebuild the class inheritance delegation class
 	::oo::UpdateClassDelegatesAfterClone $originObject [self]
@@ -424,7 +433,7 @@
 			::return -code error -errorcode {TCLOO SINGLETON} \
 			    "may not destroy a singleton object"
 		    }
-		    method <cloned> {originObject} {
+		    method <cloned> -unexport {originObject} {
 			::return -code error -errorcode {TCLOO SINGLETON} \
 			    "may not clone a singleton object"
 		    }
@@ -730,7 +739,7 @@
 	    #	Method for providing client access to the property mechanism.
 	    #	Has a user-facing API similar to that of [chan configure].
 	    # 
-	    method configure args {
+	    method configure -export args {
 		::if {![::info exists my]} {
 		    ::set my [::namespace which my]
 		}
-- 
cgit v0.12


From 004c1e1c8e680a5b55b04bc747c5e8575538dd56 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sat, 22 Feb 2020 12:31:11 +0000
Subject: Less contorted code

---
 tools/tclOOScript.tcl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 7355ad0..8167f83 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -311,12 +311,13 @@
 	method -appendifnew -export args {
 	    set my [namespace which my]
 	    set current [uplevel 1 [list $my Get]]
-	    set args [lmap a $args {
+	    foreach a $args {
 		set a [uplevel 1 [list $my Resolve $a]]
-		if {$a in $current} continue
-		set a
-	    }]
-	    tailcall my Set [list {*}$current {*}$args]
+		if {$a ni $current} {
+		    lappend current $a
+		}
+	    }
+	    tailcall my Set $current
 	}
 	method -clear -export {} {tailcall my Set {}}
 	method -prepend -export args {
-- 
cgit v0.12

-- 
cgit v0.12


From cbed1606a6e4917db28ee91660c0cd1d672db7b6 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 10:01:51 +0000
Subject: Apply patch for new features other than -autoPath

---
 library/safe.tcl | 127 ++++++++++++++++++---
 tests/safe.test  | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 444 insertions(+), 22 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 3429b9e..dcf3c82 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -249,10 +249,11 @@ proc ::safe::interpConfigure {args} {
 # Optional Arguments :
 # + slave name : if empty, generated name will be used
 # + access_path: path list controlling where load/source can occur,
-#                if empty: the master auto_path will be used.
+#                if empty: the master auto_path and its subdirectories will be
+#                used.
 # + staticsok  : flag, if 0 :no static package can be loaded (load {} Xxx)
 #                      if 1 :static packages are ok.
-# + nestedok: flag, if 0 :no loading to sub-sub interps (load xx xx sub)
+# + nestedok   : flag, if 0 :no loading to sub-sub interps (load xx xx sub)
 #                      if 1 : multiple levels are ok.
 
 # use the full name and no indent so auto_mkIndex can find us
@@ -278,12 +279,16 @@ proc ::safe::InterpCreate {
 
 #
 # InterpSetConfig (was setAccessPath) :
-#    Sets up slave virtual auto_path and corresponding structure within
+#    Sets up slave virtual access path and corresponding structure within
 #    the master. Also sets the tcl_library in the slave to be the first
 #    directory in the path.
 #    NB: If you change the path after the slave has been initialized you
 #    probably need to call "auto_reset" in the slave in order that it gets
 #    the right auto_index() array values.
+#
+#    It is the caller's responsibility, if it supplies a non-empty value for
+#    access_path, to make the first directory in the path suitable for use as
+#    tcl_library, and (if ![SetAutoPathSync]), to set the slave's ::auto_path.
 
 proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     global auto_path
@@ -309,10 +314,14 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 			moved it to front of slave's access_path" NOTICE
 	}
 
+	set raw_auto_path $access_path
+
 	# Add 1st level sub dirs (will searched by auto loading from tcl
 	# code in the slave using glob and thus fail, so we add them here
 	# so by default it works the same).
 	set access_path [AddSubDirs $access_path]
+    } else {
+	set raw_auto_path {}
     }
 
     Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\
@@ -343,7 +352,20 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	incr i
     }
 
+    # Set the slave auto_path.
+    # If [SetAutoPathSync], SyncAccessPath will overwrite this value with the
+    # full access path.
+    # If ![SetAutoPathSync], Safe Base code will not change this value.
+    set tokens_auto_path {}
+    foreach dir $raw_auto_path {
+	if {[dict exists $remap_access_path $dir]} {
+	    lappend tokens_auto_path [dict get $remap_access_path $dir]
+	}
+    }
+    ::interp eval $slave [list set auto_path $tokens_auto_path]
+
     set morepaths [::tcl::tm::list]
+    set firstpass 1
     while {[llength $morepaths]} {
 	set addpaths $morepaths
 	set morepaths {}
@@ -361,7 +383,12 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	    lappend map_access_path    $token $dir
 	    lappend remap_access_path  $dir $token
 	    lappend norm_access_path   [file normalize $dir]
-	    lappend slave_tm_path $token
+	    if {$firstpass} {
+		# $dir is in [::tcl::tm::list] and belongs in the slave_tm_path.
+		# Later passes handle subdirectories, which belong in the
+		# access path but not in the module path.
+		lappend slave_tm_path  $token
+	    }
 	    incr i
 
 	    # [Bug 2854929]
@@ -372,6 +399,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	    # subdirectories.
 	    lappend morepaths {*}[glob -nocomplain -directory $dir -type d *]
 	}
+	set firstpass 0
     }
 
     set state(access_path)       $access_path
@@ -547,6 +575,15 @@ proc ::safe::interpDelete {slave} {
 
     namespace upvar ::safe S$slave state
 
+    # Sub interpreters would be deleted automatically, but if they are managed
+    # by the Safe Base we also need to clean up, and this needs to be done
+    # independently of the cleanupHook.
+    foreach sub [interp slaves $slave] {
+        if {[info exists ::safe::S[list $slave $sub]]} {
+            ::safe::interpDelete [list $slave $sub]
+        }
+    }
+
     # If the slave has a cleanup hook registered, call it.  Check the
     # existance because we might be called to delete an interp which has
     # not been registered with us at all
@@ -613,20 +650,23 @@ proc ::safe::setLogCmd {args} {
 # ------------------- END OF PUBLIC METHODS ------------
 
 #
-# Sets the slave auto_path to the master recorded value.  Also sets
-# tcl_library to the first token of the virtual path.
+# Sets the slave auto_path to its recorded access path.  Also sets
+# tcl_library to the first token of the access path.
 #
 proc ::safe::SyncAccessPath {slave} {
+    variable AutoPathSync
     namespace upvar ::safe S$slave state
 
     set slave_access_path $state(access_path,slave)
-    ::interp eval $slave [list set auto_path $slave_access_path]
+    if {$AutoPathSync} {
+	::interp eval $slave [list set auto_path $slave_access_path]
 
-    Log $slave "auto_path in $slave has been set to $slave_access_path"\
-	NOTICE
+	Log $slave "auto_path in $slave has been set to $slave_access_path"\
+		NOTICE
+    }
 
     # This code assumes that info library is the first element in the
-    # list of auto_path's. See -> InterpSetConfig for the code which
+    # list of access path's. See -> InterpSetConfig for the code which
     # ensures this condition.
 
     ::interp eval $slave [list \
@@ -690,6 +730,7 @@ proc ::safe::AliasFileSubcommand {slave subcommand name} {
 # AliasGlob is the target of the "glob" alias in safe interpreters.
 
 proc ::safe::AliasGlob {slave args} {
+    variable AutoPathSync
     Log $slave "GLOB ! $args" NOTICE
     set cmd {}
     set at 0
@@ -712,11 +753,15 @@ proc ::safe::AliasGlob {slave args} {
 
     while {$at < [llength $args]} {
 	switch -glob -- [set opt [lindex $args $at]] {
-	    -nocomplain - -- - -join - -tails {
+	    -nocomplain - -- - -tails {
 		lappend cmd $opt
 		set got($opt) 1
 		incr at
 	    }
+	    -join {
+		set got($opt) 1
+		incr at
+	    }
 	    -types - -type {
 		lappend cmd -types [lindex $args [incr at]]
 		incr at
@@ -731,15 +776,20 @@ proc ::safe::AliasGlob {slave args} {
 		incr at
 	    }
 	    pkgIndex.tcl {
-		# Oops, this is globbing a subdirectory in regular package
-		# search. That is not wanted. Abort, handler does catch
-		# already (because glob was not defined before). See
-		# package.tcl, lines 484ff in tclPkgUnknown.
-		return -code error "unknown command glob"
+		if {$AutoPathSync} {
+		    # Oops, this is globbing a subdirectory in regular package
+		    # search. That is not wanted. Abort, handler does catch
+		    # already (because glob was not defined before). See
+		    # package.tcl, lines 484ff in tclPkgUnknown.
+		    return -code error "unknown command glob"
+		} else {
+		    break
+		}
 	    }
 	    -* {
 		Log $slave "Safe base rejecting glob option '$opt'"
 		return -code error "Safe base rejecting glob option '$opt'"
+		# unsafe/unnecessary options rejected: -path
 	    }
 	    default {
 		break
@@ -763,7 +813,7 @@ proc ::safe::AliasGlob {slave args} {
 	lappend cmd -directory $dir
     }
 
-    # Apply the -join semantics ourselves
+    # Apply the -join semantics ourselves (hence -join not copied to $cmd)
     if {$got(-join)} {
 	set args [lreplace $args $at end [join [lrange $args $at end] "/"]]
     }
@@ -1105,8 +1155,49 @@ proc ::safe::Setup {} {
     return
 }
 
+# Accessor method for ::safe::SetAutoPathSync
+# Usage: ::safe::SetAutoPathSync ?newValue?
+
+proc ::safe::SetAutoPathSync {args} {
+    variable AutoPathSync
+
+    if {[llength $args] == 1} {
+        set newValue [lindex $args 0]
+        if {![string is boolean -strict $newValue]} {
+            return -code error "new value must be a valid boolean"
+        }
+        set args [expr {$newValue && $newValue}]
+        if {([info vars ::safe::S*] ne {}) && ($args != $AutoPathSync)} {
+            return -code error \
+                    "cannot change AutoPathSync while Safe Base slaves exist"
+        }
+    }
+
+    set AutoPathSync {*}$args
+}
+
 namespace eval ::safe {
-    # internal variables
+    # internal variables (must not begin with "S")
+
+    # AutoPathSync
+    #
+    # Set AutoPathSync to 0 to give a slave's ::auto_path the same meaning as
+    # for an unsafe interpreter: the package command will search its directories
+    # and first-level subdirectories for pkgIndex.tcl files; the auto-loader
+    # will search its directories for tclIndex files.  The access path and
+    # module path will be maintained as separate values, and ::auto_path will
+    # not be updated when the user calls ::safe::interpAddToAccessPath to add to
+    # the access path.  If the user specifies an access path when calling
+    # interpCreate, interpInit or interpConfigure, it is the user's
+    # responsibility to define the slave's auto_path.  If these commands are
+    # called with no (or empty) access path, the slave's auto_path will be set
+    # to a tokenized form of the master's auto_path, and these directories and
+    # their first-level subdirectories will be added to the access path.
+    #
+    # Set to 1 for "traditional" behavior: a slave's entire access path and
+    # module path are copied to its ::auto_path, which is updated whenever
+    # the user calls ::safe::interpAddToAccessPath to add to the access path.
+    variable AutoPathSync 1
 
     # Log command, set via 'setLogCmd'. Logging is disabled when empty.
     variable Log {}
diff --git a/tests/safe.test b/tests/safe.test
index 11ad2a9..fac52f1 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -17,6 +17,8 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
     namespace import -force ::tcltest::*
 }
 
+testConstraint AutoSyncDefined 1
+
 foreach i [interp slaves] {
     interp delete $i
 }
@@ -180,22 +182,46 @@ test safe-6.3 {test safe interpreters knowledge of the world} {
 # leaking infos, but they still do...
 
 # high level general test
-test safe-7.1 {tests that everything works at high level} -body {
+test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    }
+
     set i [safe::interpCreate]
+
+} -body {
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
     #  package require in a slave works like in the master)
     set v [interp eval $i {package require http 2}]
     # no error shall occur:
     interp eval $i {http::config}
-    safe::interpDelete $i
     set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result 2.*
-test safe-7.2 {tests specific path and interpFind/AddToAccessPath} -body {
+test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p1
+    # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
     # an error shall occur (http is not anymore in the secure 0-level
     # provided deep path)
@@ -203,6 +229,10 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath} -body {
 	    [catch {interp eval $i {package require http 1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 test safe-7.3 {check that safe subinterpreters work} {
     set i [safe::interpCreate]
@@ -210,6 +240,64 @@ test safe-7.3 {check that safe subinterpreters work} {
     list [interp eval $j {join {o k} ""}] [safe::interpDelete $i] [interp exists $j]
 } {ok {} 0}
 
+test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+    # this time, unlike test safe-7.2, http 1.0 should be found
+    list $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+    # Note that the glob match elides directories (those from the module path)
+    # other than the first and last in the access path.
+} -cleanup {
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    }
+
+    set i [safe::interpCreate]
+
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (module ancestor directory issue)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
+
 # test source control on file name
 set i "a"
 test safe-8.1 {safe source control on file} -setup {
@@ -403,6 +491,8 @@ test safe-9.6 {interpConfigure widget like behaviour} -body {
 	 safe::interpConfigure $i]\
 	[safe::interpConfigure $i -deleteHook toto -nosta -nested 0
 	 safe::interpConfigure $i]
+} -cleanup {
+    safe::interpDelete $i
 } -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
 
 catch {teststaticpkg Safepkg1 0 0}
@@ -831,6 +921,247 @@ test safe-16.4 {Bug 3529949: defang ~user in globs} -setup {
 } -cleanup {
     safe::interpDelete $i
 } -result {}
+
+### 17. The first element in a slave's ::auto_path and access path must be [info library].
+
+test safe-17.1 {Check that first element of slave auto_path (and access path) is Tcl Library} -setup {
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+} -result [list [info library] [info library]]
+
+test safe-17.2 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master} -setup {
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib2 $lib1]
+    # Unexpected order, should be reversed in the slave
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+} -result [list [info library] [info library]]
+
+### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
+
+test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+
+    # Without AutoPathSync, we need a more complete auto_path, because the slave will use the same value.
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs
+    #  so package require in a slave works like in the master)
+    set v [interp eval $i {package require http 1}]
+    # no error shall occur:
+    interp eval $i {http_config}
+    set v
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result 1.0
+
+test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    set auto1 [interp eval $i {set ::auto_path}]
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p1
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # an error shall occur (http is not anymore in the secure 0-level
+    # provided deep path)
+    list $auto1 $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+
+    set i [safe::interpCreate]
+
+} -body {
+    # This file's header sets auto_path to a single directory [info library],
+    # which is the one required by Safe Base to be present & first in the list.
+
+    set ap {}
+    foreach token [$i eval set ::auto_path] {
+        lappend ap [dict get [set ::safe::S${i}(access_path,map)] $token]
+    }
+    return $ap
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+	safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result [set ::auto_path]
+
+test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+
+    # should not have been set by Safe Base:
+    set auto1 [interp eval $i {set ::auto_path}]
+
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+
+    # should not have been changed by Safe Base:
+    set auto2 [interp eval $i {set ::auto_path}]
+
+    # This time, unlike test safe-18.2 and the try above, http 1.0 should be found:
+    list $auto1 $auto2 $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+	safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+
+    set i [safe::interpCreate]
+
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (tests module ancestor directory rule)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
+
+### 19. Test tokenization of directories available to a slave.
+
+test safe-19.1 {Check that each directory of the default auto_path is a valid token} -setup {
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+} -result {}
+
+test safe-19.2 {Check that each directory of the module path is a valid token} -setup {
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+} -result {}
+
 
 set ::auto_path $saveAutoPath
 # cleanup
-- 
cgit v0.12


From 40970bda3738a098f7adea63dcaed2ccb4ef15c0 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 10:11:35 +0000
Subject: Add code for -autoPath option in Safe Base.

---
 library/safe.tcl | 150 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 132 insertions(+), 18 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index dcf3c82..a1fadb1 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -78,18 +78,29 @@ proc ::safe::InterpNested {} {
 
 # Interface/entry point function and front end for "Create"
 proc ::safe::interpCreate {args} {
+    variable AutoPathSync
+    if {$AutoPathSync} {
+        set autoPath {}
+    }
     set Args [::tcl::OptKeyParse ::safe::interpCreate $args]
+
+    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
     InterpCreate $slave $accessPath \
-	[InterpStatics] [InterpNested] $deleteHook
+	[InterpStatics] [InterpNested] $deleteHook $autoPath $withAutoPath
 }
 
 proc ::safe::interpInit {args} {
+    variable AutoPathSync
+    if {$AutoPathSync} {
+        set autoPath {}
+    }
     set Args [::tcl::OptKeyParse ::safe::interpIC $args]
     if {![::interp exists $slave]} {
 	return -code error "\"$slave\" is not an interpreter"
     }
+    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
     InterpInit $slave $accessPath \
-	[InterpStatics] [InterpNested] $deleteHook
+	[InterpStatics] [InterpNested] $deleteHook $autoPath $withAutoPath
 }
 
 # Check that the given slave is "one of us"
@@ -115,6 +126,7 @@ proc ::safe::CheckInterp {slave} {
 # So this will be hopefully written and some integrated with opt1.0
 # (hopefully for tcl8.1 ?)
 proc ::safe::interpConfigure {args} {
+    variable AutoPathSync
     switch [llength $args] {
 	1 {
 	    # If we have exactly 1 argument the semantic is to return all
@@ -125,11 +137,17 @@ proc ::safe::interpConfigure {args} {
 	    CheckInterp $slave
 	    namespace upvar ::safe S$slave state
 
-	    return [join [list \
+	    set TMP [list \
 		[list -accessPath $state(access_path)] \
 		[list -statics    $state(staticsok)]   \
 		[list -nested     $state(nestedok)]    \
-	        [list -deleteHook $state(cleanupHook)]]]
+	        [list -deleteHook $state(cleanupHook)] \
+	    ]
+	    if {!$AutoPathSync} {
+	        set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
+	        lappend TMP [list -autoPath $SLAP]
+	    }
+	    return [join $TMP]
 	}
 	2 {
 	    # If we have exactly 2 arguments the semantic is a "configure
@@ -154,6 +172,14 @@ proc ::safe::interpConfigure {args} {
 		-accessPath {
 		    return [list -accessPath $state(access_path)]
 		}
+		-autoPath {
+		    if {$AutoPathSync} {
+		        return -code error "unknown flag $name (bug)"
+		    } else {
+		        set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
+		        return [list -autoPath $SLAP]
+		    }
+		}
 		-statics    {
 		    return [list -statics $state(staticsok)]
 		}
@@ -194,9 +220,17 @@ proc ::safe::interpConfigure {args} {
 	    if {![::tcl::OptProcArgGiven -accessPath]} {
 		set doreset 1
 		set accessPath $state(access_path)
+		# BUG? is doreset the wrong way round?
 	    } else {
 		set doreset 0
 	    }
+	    if {(!$AutoPathSync) && (![::tcl::OptProcArgGiven -autoPath])} {
+		set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
+		set autoPath $SLAP
+	    } elseif {$AutoPathSync} {
+		set autoPath {}
+	    } else {
+	    }
 	    if {
 		![::tcl::OptProcArgGiven -statics]
 		&& ![::tcl::OptProcArgGiven -noStatics]
@@ -217,7 +251,9 @@ proc ::safe::interpConfigure {args} {
 		set deleteHook $state(cleanupHook)
 	    }
 	    # we can now reconfigure :
-	    InterpSetConfig $slave $accessPath $statics $nested $deleteHook
+	    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
+	    set res [InterpSetConfig $slave $accessPath $statics $nested $deleteHook $autoPath $withAutoPath]
+puts stderr [list changed_map $res do_reset $doreset]
 	    # auto_reset the slave (to completly synch the new access_path)
 	    if {$doreset} {
 		if {[catch {::interp eval $slave {auto_reset}} msg]} {
@@ -263,6 +299,8 @@ proc ::safe::InterpCreate {
 			   staticsok
 			   nestedok
 			   deletehook
+			   autoPath
+			   withAutoPath
 		       } {
     # Create the slave.
     if {$slave ne ""} {
@@ -274,7 +312,7 @@ proc ::safe::InterpCreate {
     Log $slave "Created" NOTICE
 
     # Initialize it. (returns slave name)
-    InterpInit $slave $access_path $staticsok $nestedok $deletehook
+    InterpInit $slave $access_path $staticsok $nestedok $deletehook $autoPath $withAutoPath
 }
 
 #
@@ -290,8 +328,9 @@ proc ::safe::InterpCreate {
 #    access_path, to make the first directory in the path suitable for use as
 #    tcl_library, and (if ![SetAutoPathSync]), to set the slave's ::auto_path.
 
-proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
+proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook autoPath withAutoPath} {
     global auto_path
+    variable AutoPathSync
 
     # determine and store the access path if empty
     if {$access_path eq ""} {
@@ -321,11 +360,18 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	# so by default it works the same).
 	set access_path [AddSubDirs $access_path]
     } else {
-	set raw_auto_path {}
+        set raw_auto_path $autoPath
+    }
+
+    if {$withAutoPath} {
+        set raw_auto_path $autoPath
     }
 
     Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\
 		nestedok=$nestedok deletehook=($deletehook)" NOTICE
+    if {!$AutoPathSync} {
+        Log $slave "Setting auto_path=($raw_auto_path)" NOTICE
+    }
 
     namespace upvar ::safe S$slave state
 
@@ -335,7 +381,11 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     # We save the virtual form separately as well, as syncing it with the
     # slave has to be defered until the necessary commands are present for
     # setup.
-
+if {[info exists state(access_path,map)]} {
+    set old_map_access_path $state(access_path,map)
+} else {
+    set old_map_access_path {}
+}
     set norm_access_path  {}
     set slave_access_path {}
     set map_access_path   {}
@@ -352,7 +402,8 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	incr i
     }
 
-    # Set the slave auto_path.
+    # Set the slave auto_path to a tokenized raw_auto_path.
+    # Silently ignore any directories that are not in the access path.
     # If [SetAutoPathSync], SyncAccessPath will overwrite this value with the
     # full access path.
     # If ![SetAutoPathSync], Safe Base code will not change this value.
@@ -364,6 +415,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     }
     ::interp eval $slave [list set auto_path $tokens_auto_path]
 
+    # Add the tcl::tm directories to the access path.
     set morepaths [::tcl::tm::list]
     set firstpass 1
     while {[llength $morepaths]} {
@@ -413,23 +465,50 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     set state(cleanupHook)       $deletehook
 
     SyncAccessPath $slave
+
+    set result [expr {[lrange $map_access_path 0 end] ne [lrange $old_map_access_path 0 end]}]
+    return $result
+}
+
+
+#
+# DetokPath:
+#    Convert tokens to directories where possible.
+#    Leave undefined tokens unconverted.  They are
+#    nonsense in both the slave and the master.
+#
+proc ::safe::DetokPath {slave tokenPath} {
+    namespace upvar ::safe S$slave state
+
+    set slavePath {}
+    foreach token $tokenPath {
+	if {[dict exists $state(access_path,map) $token]} {
+	    lappend slavePath [dict get $state(access_path,map) $token]
+	} else {
+	    lappend slavePath $token
+	}
+    }
+    return $slavePath
 }
 
 #
 #
-# FindInAccessPath:
+# interpFindInAccessPath:
 #    Search for a real directory and returns its virtual Id (including the
 #    "$")
+#
+#    When debugging, use TranslatePath for the inverse operation.
 proc ::safe::interpFindInAccessPath {slave path} {
     namespace upvar ::safe S$slave state
 
     if {![dict exists $state(access_path,remap) $path]} {
-	return -code error "$path not found in access path $access_path"
+	return -code error "$path not found in access path"
     }
 
     return [dict get $state(access_path,remap) $path]
 }
 
+
 #
 # addToAccessPath:
 #    add (if needed) a real directory to access path and return its
@@ -465,9 +544,11 @@ proc ::safe::InterpInit {
 			 staticsok
 			 nestedok
 			 deletehook
+			 autoPath
+			 withAutoPath
 		     } {
     # Configure will generate an access_path when access_path is empty.
-    InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook
+    InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook $autoPath $withAutoPath
 
     # NB we need to add [namespace current], aliases are always absolute
     # paths.
@@ -671,6 +752,7 @@ proc ::safe::SyncAccessPath {slave} {
 
     ::interp eval $slave [list \
 	      set tcl_library [lindex $slave_access_path 0]]
+    return
 }
 
 # Returns the virtual token for directory number N.
@@ -1109,16 +1191,21 @@ proc ::safe::Setup {} {
     # Setup the arguments parsing
     #
     ####
+    variable AutoPathSync
 
     # Share the descriptions
-    set temp [::tcl::OptKeyRegister {
+    set OptList {
 	{-accessPath -list {} "access path for the slave"}
 	{-noStatics "prevent loading of statically linked pkgs"}
 	{-statics true "loading of statically linked pkgs"}
 	{-nestedLoadOk "allow nested loading"}
 	{-nested false "nested loading"}
 	{-deleteHook -script {} "delete hook"}
-    }]
+    }
+    if {!$AutoPathSync} {
+        lappend OptList {-autoPath -list {} "::auto_path for the slave"}
+    }
+    set temp [::tcl::OptKeyRegister $OptList]
 
     # create case (slave is optional)
     ::tcl::OptKeyRegister {
@@ -1157,11 +1244,23 @@ proc ::safe::Setup {} {
 
 # Accessor method for ::safe::SetAutoPathSync
 # Usage: ::safe::SetAutoPathSync ?newValue?
+# Respond to changes by calling Setup again, precerving any
+# caller-defined logging.  This allows complete equivalence with
+# prior Safe Base behavior if AutoPathSync is true.
+#
+#                   >>> WARNING <<<
+#
+# DO NOT CHANGE AutoPathSync EXCEPT BY THIS COMMAND - IT IS VITAL THAT WHENEVER
+# THE VALUE CHANGES, THE EXISTING PARSE TOKENS ARE DELETED AND Setup IS CALLED
+# AGAIN.
+# (The initialization of AutoPathSync at the end of this file is acceptable
+#  because Setup has not yet been called.)
 
 proc ::safe::SetAutoPathSync {args} {
     variable AutoPathSync
 
-    if {[llength $args] == 1} {
+    if {[llength $args] == 0} {
+    } elseif {[llength $args] == 1} {
         set newValue [lindex $args 0]
         if {![string is boolean -strict $newValue]} {
             return -code error "new value must be a valid boolean"
@@ -1169,11 +1268,22 @@ proc ::safe::SetAutoPathSync {args} {
         set args [expr {$newValue && $newValue}]
         if {([info vars ::safe::S*] ne {}) && ($args != $AutoPathSync)} {
             return -code error \
-                    "cannot change AutoPathSync while Safe Base slaves exist"
+                    "cannot set new value while Safe Base slaves exist"
+        }
+        if {($args != $AutoPathSync)} {
+            set AutoPathSync {*}$args
+            ::tcl::OptKeyDelete ::safe::interpCreate
+            ::tcl::OptKeyDelete ::safe::interpIC
+            set TmpLog [setLogCmd]
+            Setup
+            setLogCmd $TmpLog
         }
+    } else {
+        set msg {wrong # args: should be "safe::SetAutoPathSync ?newValue?"}
+        return -code error $msg
     }
 
-    set AutoPathSync {*}$args
+    return $AutoPathSync
 }
 
 namespace eval ::safe {
@@ -1219,6 +1329,10 @@ namespace eval ::safe {
     # staticsok         : Value of option -statics
     # nestedok          : Value of option -nested
     # cleanupHook       : Value of option -deleteHook
+    #
+    # Because the slave can change its value of ::auto_path, the value of
+    # option -autoPath is not stored in the array but must be obtained from
+    # the slave.
 }
 
 ::safe::Setup
-- 
cgit v0.12

-- 
cgit v0.12


From e2c60c3b2f641c71c3df876f2c1ee8280252e91b Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 11:13:41 +0000
Subject: Apply patch for new features other than -autoPath

---
 library/safe.tcl | 127 ++++++++++++++++++---
 tests/safe.test  | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 444 insertions(+), 22 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 470cfa3..9e9b40b 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -249,10 +249,11 @@ proc ::safe::interpConfigure {args} {
 # Optional Arguments :
 # + slave name : if empty, generated name will be used
 # + access_path: path list controlling where load/source can occur,
-#                if empty: the master auto_path will be used.
+#                if empty: the master auto_path and its subdirectories will be
+#                used.
 # + staticsok  : flag, if 0 :no static package can be loaded (load {} Xxx)
 #                      if 1 :static packages are ok.
-# + nestedok: flag, if 0 :no loading to sub-sub interps (load xx xx sub)
+# + nestedok   : flag, if 0 :no loading to sub-sub interps (load xx xx sub)
 #                      if 1 : multiple levels are ok.
 
 # use the full name and no indent so auto_mkIndex can find us
@@ -278,12 +279,16 @@ proc ::safe::InterpCreate {
 
 #
 # InterpSetConfig (was setAccessPath) :
-#    Sets up slave virtual auto_path and corresponding structure within
+#    Sets up slave virtual access path and corresponding structure within
 #    the master. Also sets the tcl_library in the slave to be the first
 #    directory in the path.
 #    NB: If you change the path after the slave has been initialized you
 #    probably need to call "auto_reset" in the slave in order that it gets
 #    the right auto_index() array values.
+#
+#    It is the caller's responsibility, if it supplies a non-empty value for
+#    access_path, to make the first directory in the path suitable for use as
+#    tcl_library, and (if ![SetAutoPathSync]), to set the slave's ::auto_path.
 
 proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     global auto_path
@@ -309,10 +314,14 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 			moved it to front of slave's access_path" NOTICE
 	}
 
+	set raw_auto_path $access_path
+
 	# Add 1st level sub dirs (will searched by auto loading from tcl
 	# code in the slave using glob and thus fail, so we add them here
 	# so by default it works the same).
 	set access_path [AddSubDirs $access_path]
+    } else {
+	set raw_auto_path {}
     }
 
     Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\
@@ -343,7 +352,20 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	incr i
     }
 
+    # Set the slave auto_path.
+    # If [SetAutoPathSync], SyncAccessPath will overwrite this value with the
+    # full access path.
+    # If ![SetAutoPathSync], Safe Base code will not change this value.
+    set tokens_auto_path {}
+    foreach dir $raw_auto_path {
+	if {[dict exists $remap_access_path $dir]} {
+	    lappend tokens_auto_path [dict get $remap_access_path $dir]
+	}
+    }
+    ::interp eval $slave [list set auto_path $tokens_auto_path]
+
     set morepaths [::tcl::tm::list]
+    set firstpass 1
     while {[llength $morepaths]} {
 	set addpaths $morepaths
 	set morepaths {}
@@ -361,7 +383,12 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	    lappend map_access_path    $token $dir
 	    lappend remap_access_path  $dir $token
 	    lappend norm_access_path   [file normalize $dir]
-	    lappend slave_tm_path $token
+	    if {$firstpass} {
+		# $dir is in [::tcl::tm::list] and belongs in the slave_tm_path.
+		# Later passes handle subdirectories, which belong in the
+		# access path but not in the module path.
+		lappend slave_tm_path  $token
+	    }
 	    incr i
 
 	    # [Bug 2854929]
@@ -372,6 +399,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	    # subdirectories.
 	    lappend morepaths {*}[glob -nocomplain -directory $dir -type d *]
 	}
+	set firstpass 0
     }
 
     set state(access_path)       $access_path
@@ -545,6 +573,15 @@ proc ::safe::interpDelete {slave} {
 
     namespace upvar ::safe S$slave state
 
+    # Sub interpreters would be deleted automatically, but if they are managed
+    # by the Safe Base we also need to clean up, and this needs to be done
+    # independently of the cleanupHook.
+    foreach sub [interp slaves $slave] {
+        if {[info exists ::safe::S[list $slave $sub]]} {
+            ::safe::interpDelete [list $slave $sub]
+        }
+    }
+
     # If the slave has a cleanup hook registered, call it.  Check the
     # existance because we might be called to delete an interp which has
     # not been registered with us at all
@@ -611,20 +648,23 @@ proc ::safe::setLogCmd {args} {
 # ------------------- END OF PUBLIC METHODS ------------
 
 #
-# Sets the slave auto_path to the master recorded value.  Also sets
-# tcl_library to the first token of the virtual path.
+# Sets the slave auto_path to its recorded access path.  Also sets
+# tcl_library to the first token of the access path.
 #
 proc ::safe::SyncAccessPath {slave} {
+    variable AutoPathSync
     namespace upvar ::safe S$slave state
 
     set slave_access_path $state(access_path,slave)
-    ::interp eval $slave [list set auto_path $slave_access_path]
+    if {$AutoPathSync} {
+	::interp eval $slave [list set auto_path $slave_access_path]
 
-    Log $slave "auto_path in $slave has been set to $slave_access_path"\
-	NOTICE
+	Log $slave "auto_path in $slave has been set to $slave_access_path"\
+		NOTICE
+    }
 
     # This code assumes that info library is the first element in the
-    # list of auto_path's. See -> InterpSetConfig for the code which
+    # list of access path's. See -> InterpSetConfig for the code which
     # ensures this condition.
 
     ::interp eval $slave [list \
@@ -688,6 +728,7 @@ proc ::safe::AliasFileSubcommand {slave subcommand name} {
 # AliasGlob is the target of the "glob" alias in safe interpreters.
 
 proc ::safe::AliasGlob {slave args} {
+    variable AutoPathSync
     Log $slave "GLOB ! $args" NOTICE
     set cmd {}
     set at 0
@@ -710,11 +751,15 @@ proc ::safe::AliasGlob {slave args} {
 
     while {$at < [llength $args]} {
 	switch -glob -- [set opt [lindex $args $at]] {
-	    -nocomplain - -- - -join - -tails {
+	    -nocomplain - -- - -tails {
 		lappend cmd $opt
 		set got($opt) 1
 		incr at
 	    }
+	    -join {
+		set got($opt) 1
+		incr at
+	    }
 	    -types - -type {
 		lappend cmd -types [lindex $args [incr at]]
 		incr at
@@ -729,15 +774,20 @@ proc ::safe::AliasGlob {slave args} {
 		incr at
 	    }
 	    pkgIndex.tcl {
-		# Oops, this is globbing a subdirectory in regular package
-		# search. That is not wanted. Abort, handler does catch
-		# already (because glob was not defined before). See
-		# package.tcl, lines 484ff in tclPkgUnknown.
-		return -code error "unknown command glob"
+		if {$AutoPathSync} {
+		    # Oops, this is globbing a subdirectory in regular package
+		    # search. That is not wanted. Abort, handler does catch
+		    # already (because glob was not defined before). See
+		    # package.tcl, lines 484ff in tclPkgUnknown.
+		    return -code error "unknown command glob"
+		} else {
+		    break
+		}
 	    }
 	    -* {
 		Log $slave "Safe base rejecting glob option '$opt'"
 		return -code error "Safe base rejecting glob option '$opt'"
+		# unsafe/unnecessary options rejected: -path
 	    }
 	    default {
 		break
@@ -761,7 +811,7 @@ proc ::safe::AliasGlob {slave args} {
 	lappend cmd -directory $dir
     }
 
-    # Apply the -join semantics ourselves
+    # Apply the -join semantics ourselves (hence -join not copied to $cmd)
     if {$got(-join)} {
 	set args [lreplace $args $at end [join [lrange $args $at end] "/"]]
     }
@@ -1100,8 +1150,49 @@ proc ::safe::Setup {} {
     return
 }
 
+# Accessor method for ::safe::SetAutoPathSync
+# Usage: ::safe::SetAutoPathSync ?newValue?
+
+proc ::safe::SetAutoPathSync {args} {
+    variable AutoPathSync
+
+    if {[llength $args] == 1} {
+        set newValue [lindex $args 0]
+        if {![string is boolean -strict $newValue]} {
+            return -code error "new value must be a valid boolean"
+        }
+        set args [expr {$newValue && $newValue}]
+        if {([info vars ::safe::S*] ne {}) && ($args != $AutoPathSync)} {
+            return -code error \
+                    "cannot change AutoPathSync while Safe Base slaves exist"
+        }
+    }
+
+    set AutoPathSync {*}$args
+}
+
 namespace eval ::safe {
-    # internal variables
+    # internal variables (must not begin with "S")
+
+    # AutoPathSync
+    #
+    # Set AutoPathSync to 0 to give a slave's ::auto_path the same meaning as
+    # for an unsafe interpreter: the package command will search its directories
+    # and first-level subdirectories for pkgIndex.tcl files; the auto-loader
+    # will search its directories for tclIndex files.  The access path and
+    # module path will be maintained as separate values, and ::auto_path will
+    # not be updated when the user calls ::safe::interpAddToAccessPath to add to
+    # the access path.  If the user specifies an access path when calling
+    # interpCreate, interpInit or interpConfigure, it is the user's
+    # responsibility to define the slave's auto_path.  If these commands are
+    # called with no (or empty) access path, the slave's auto_path will be set
+    # to a tokenized form of the master's auto_path, and these directories and
+    # their first-level subdirectories will be added to the access path.
+    #
+    # Set to 1 for "traditional" behavior: a slave's entire access path and
+    # module path are copied to its ::auto_path, which is updated whenever
+    # the user calls ::safe::interpAddToAccessPath to add to the access path.
+    variable AutoPathSync 1
 
     # Log command, set via 'setLogCmd'. Logging is disabled when empty.
     variable Log {}
diff --git a/tests/safe.test b/tests/safe.test
index 356e176..8fb0983 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -17,6 +17,8 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
     namespace import -force ::tcltest::*
 }
 
+testConstraint AutoSyncDefined 1
+
 foreach i [interp slaves] {
     interp delete $i
 }
@@ -180,22 +182,46 @@ test safe-6.3 {test safe interpreters knowledge of the world} {
 # leaking infos, but they still do...
 
 # high level general test
-test safe-7.1 {tests that everything works at high level} -body {
+test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    }
+
     set i [safe::interpCreate]
+
+} -body {
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
     #  package require in a slave works like in the master)
     set v [interp eval $i {package require http 2}]
     # no error shall occur:
     interp eval $i {http::config}
-    safe::interpDelete $i
     set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result 2.*
-test safe-7.2 {tests specific path and interpFind/AddToAccessPath} -body {
+test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p1
+    # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
     # an error shall occur (http is not anymore in the secure 0-level
     # provided deep path)
@@ -203,6 +229,10 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath} -body {
 	    [catch {interp eval $i {package require http 1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 test safe-7.3 {check that safe subinterpreters work} {
     set i [safe::interpCreate]
@@ -210,6 +240,64 @@ test safe-7.3 {check that safe subinterpreters work} {
     list [interp eval $j {join {o k} ""}] [safe::interpDelete $i] [interp exists $j]
 } {ok {} 0}
 
+test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+    # this time, unlike test safe-7.2, http 1.0 should be found
+    list $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+    # Note that the glob match elides directories (those from the module path)
+    # other than the first and last in the access path.
+} -cleanup {
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 1
+    }
+
+    set i [safe::interpCreate]
+
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (module ancestor directory issue)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
+
 # test source control on file name
 set i "a"
 test safe-8.1 {safe source control on file} -setup {
@@ -403,6 +491,8 @@ test safe-9.6 {interpConfigure widget like behaviour} -body {
 	 safe::interpConfigure $i]\
 	[safe::interpConfigure $i -deleteHook toto -nosta -nested 0
 	 safe::interpConfigure $i]
+} -cleanup {
+    safe::interpDelete $i
 } -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
 
 catch {teststaticpkg Safepkg1 0 0}
@@ -827,6 +917,247 @@ test safe-16.4 {Bug 3529949: defang ~user in globs} -setup {
 } -cleanup {
     safe::interpDelete $i
 } -result {}
+
+### 17. The first element in a slave's ::auto_path and access path must be [info library].
+
+test safe-17.1 {Check that first element of slave auto_path (and access path) is Tcl Library} -setup {
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+} -result [list [info library] [info library]]
+
+test safe-17.2 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master} -setup {
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib2 $lib1]
+    # Unexpected order, should be reversed in the slave
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+} -result [list [info library] [info library]]
+
+### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
+
+test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+
+    # Without AutoPathSync, we need a more complete auto_path, because the slave will use the same value.
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs
+    #  so package require in a slave works like in the master)
+    set v [interp eval $i {package require http 1}]
+    # no error shall occur:
+    interp eval $i {http_config}
+    set v
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result 1.0
+
+test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    set auto1 [interp eval $i {set ::auto_path}]
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p1
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # an error shall occur (http is not anymore in the secure 0-level
+    # provided deep path)
+    list $auto1 $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+
+    set i [safe::interpCreate]
+
+} -body {
+    # This file's header sets auto_path to a single directory [info library],
+    # which is the one required by Safe Base to be present & first in the list.
+
+    set ap {}
+    foreach token [$i eval set ::auto_path] {
+        lappend ap [dict get [set ::safe::S${i}(access_path,map)] $token]
+    }
+    return $ap
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+	safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result [set ::auto_path]
+
+test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+
+    # should not have been set by Safe Base:
+    set auto1 [interp eval $i {set ::auto_path}]
+
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+
+    # should not have been changed by Safe Base:
+    set auto2 [interp eval $i {set ::auto_path}]
+
+    # This time, unlike test safe-18.2 and the try above, http 1.0 should be found:
+    list $auto1 $auto2 $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+	safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::SetAutoPathSync]
+        safe::SetAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+    }
+
+    set i [safe::interpCreate]
+
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (tests module ancestor directory rule)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::SetAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
+
+### 19. Test tokenization of directories available to a slave.
+
+test safe-19.1 {Check that each directory of the default auto_path is a valid token} -setup {
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+} -result {}
+
+test safe-19.2 {Check that each directory of the module path is a valid token} -setup {
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+} -result {}
+
 
 set ::auto_path $saveAutoPath
 # cleanup
-- 
cgit v0.12


From 05389ab99699d81541bec827e0e419bf240fe81a Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 11:39:19 +0000
Subject: Add code for -autoPath option in Safe Base.

---
 library/safe.tcl | 150 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 132 insertions(+), 18 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 9e9b40b..54f9cc9 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -78,18 +78,29 @@ proc ::safe::InterpNested {} {
 
 # Interface/entry point function and front end for "Create"
 proc ::safe::interpCreate {args} {
+    variable AutoPathSync
+    if {$AutoPathSync} {
+        set autoPath {}
+    }
     set Args [::tcl::OptKeyParse ::safe::interpCreate $args]
+
+    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
     InterpCreate $slave $accessPath \
-	[InterpStatics] [InterpNested] $deleteHook
+	[InterpStatics] [InterpNested] $deleteHook $autoPath $withAutoPath
 }
 
 proc ::safe::interpInit {args} {
+    variable AutoPathSync
+    if {$AutoPathSync} {
+        set autoPath {}
+    }
     set Args [::tcl::OptKeyParse ::safe::interpIC $args]
     if {![::interp exists $slave]} {
 	return -code error "\"$slave\" is not an interpreter"
     }
+    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
     InterpInit $slave $accessPath \
-	[InterpStatics] [InterpNested] $deleteHook
+	[InterpStatics] [InterpNested] $deleteHook $autoPath $withAutoPath
 }
 
 # Check that the given slave is "one of us"
@@ -115,6 +126,7 @@ proc ::safe::CheckInterp {slave} {
 # So this will be hopefully written and some integrated with opt1.0
 # (hopefully for tcl8.1 ?)
 proc ::safe::interpConfigure {args} {
+    variable AutoPathSync
     switch [llength $args] {
 	1 {
 	    # If we have exactly 1 argument the semantic is to return all
@@ -125,11 +137,17 @@ proc ::safe::interpConfigure {args} {
 	    CheckInterp $slave
 	    namespace upvar ::safe S$slave state
 
-	    return [join [list \
+	    set TMP [list \
 		[list -accessPath $state(access_path)] \
 		[list -statics    $state(staticsok)]   \
 		[list -nested     $state(nestedok)]    \
-	        [list -deleteHook $state(cleanupHook)]]]
+	        [list -deleteHook $state(cleanupHook)] \
+	    ]
+	    if {!$AutoPathSync} {
+	        set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
+	        lappend TMP [list -autoPath $SLAP]
+	    }
+	    return [join $TMP]
 	}
 	2 {
 	    # If we have exactly 2 arguments the semantic is a "configure
@@ -154,6 +172,14 @@ proc ::safe::interpConfigure {args} {
 		-accessPath {
 		    return [list -accessPath $state(access_path)]
 		}
+		-autoPath {
+		    if {$AutoPathSync} {
+		        return -code error "unknown flag $name (bug)"
+		    } else {
+		        set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
+		        return [list -autoPath $SLAP]
+		    }
+		}
 		-statics    {
 		    return [list -statics $state(staticsok)]
 		}
@@ -194,9 +220,17 @@ proc ::safe::interpConfigure {args} {
 	    if {![::tcl::OptProcArgGiven -accessPath]} {
 		set doreset 1
 		set accessPath $state(access_path)
+		# BUG? is doreset the wrong way round?
 	    } else {
 		set doreset 0
 	    }
+	    if {(!$AutoPathSync) && (![::tcl::OptProcArgGiven -autoPath])} {
+		set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
+		set autoPath $SLAP
+	    } elseif {$AutoPathSync} {
+		set autoPath {}
+	    } else {
+	    }
 	    if {
 		![::tcl::OptProcArgGiven -statics]
 		&& ![::tcl::OptProcArgGiven -noStatics]
@@ -217,7 +251,9 @@ proc ::safe::interpConfigure {args} {
 		set deleteHook $state(cleanupHook)
 	    }
 	    # we can now reconfigure :
-	    InterpSetConfig $slave $accessPath $statics $nested $deleteHook
+	    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
+	    set res [InterpSetConfig $slave $accessPath $statics $nested $deleteHook $autoPath $withAutoPath]
+puts stderr [list changed_map $res do_reset $doreset]
 	    # auto_reset the slave (to completly synch the new access_path)
 	    if {$doreset} {
 		if {[catch {::interp eval $slave {auto_reset}} msg]} {
@@ -263,6 +299,8 @@ proc ::safe::InterpCreate {
 			   staticsok
 			   nestedok
 			   deletehook
+			   autoPath
+			   withAutoPath
 		       } {
     # Create the slave.
     if {$slave ne ""} {
@@ -274,7 +312,7 @@ proc ::safe::InterpCreate {
     Log $slave "Created" NOTICE
 
     # Initialize it. (returns slave name)
-    InterpInit $slave $access_path $staticsok $nestedok $deletehook
+    InterpInit $slave $access_path $staticsok $nestedok $deletehook $autoPath $withAutoPath
 }
 
 #
@@ -290,8 +328,9 @@ proc ::safe::InterpCreate {
 #    access_path, to make the first directory in the path suitable for use as
 #    tcl_library, and (if ![SetAutoPathSync]), to set the slave's ::auto_path.
 
-proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
+proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook autoPath withAutoPath} {
     global auto_path
+    variable AutoPathSync
 
     # determine and store the access path if empty
     if {$access_path eq ""} {
@@ -321,11 +360,18 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	# so by default it works the same).
 	set access_path [AddSubDirs $access_path]
     } else {
-	set raw_auto_path {}
+        set raw_auto_path $autoPath
+    }
+
+    if {$withAutoPath} {
+        set raw_auto_path $autoPath
     }
 
     Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\
 		nestedok=$nestedok deletehook=($deletehook)" NOTICE
+    if {!$AutoPathSync} {
+        Log $slave "Setting auto_path=($raw_auto_path)" NOTICE
+    }
 
     namespace upvar ::safe S$slave state
 
@@ -335,7 +381,11 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     # We save the virtual form separately as well, as syncing it with the
     # slave has to be defered until the necessary commands are present for
     # setup.
-
+if {[info exists state(access_path,map)]} {
+    set old_map_access_path $state(access_path,map)
+} else {
+    set old_map_access_path {}
+}
     set norm_access_path  {}
     set slave_access_path {}
     set map_access_path   {}
@@ -352,7 +402,8 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	incr i
     }
 
-    # Set the slave auto_path.
+    # Set the slave auto_path to a tokenized raw_auto_path.
+    # Silently ignore any directories that are not in the access path.
     # If [SetAutoPathSync], SyncAccessPath will overwrite this value with the
     # full access path.
     # If ![SetAutoPathSync], Safe Base code will not change this value.
@@ -364,6 +415,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     }
     ::interp eval $slave [list set auto_path $tokens_auto_path]
 
+    # Add the tcl::tm directories to the access path.
     set morepaths [::tcl::tm::list]
     set firstpass 1
     while {[llength $morepaths]} {
@@ -413,23 +465,50 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     set state(cleanupHook)       $deletehook
 
     SyncAccessPath $slave
+
+    set result [expr {[lrange $map_access_path 0 end] ne [lrange $old_map_access_path 0 end]}]
+    return $result
+}
+
+
+#
+# DetokPath:
+#    Convert tokens to directories where possible.
+#    Leave undefined tokens unconverted.  They are
+#    nonsense in both the slave and the master.
+#
+proc ::safe::DetokPath {slave tokenPath} {
+    namespace upvar ::safe S$slave state
+
+    set slavePath {}
+    foreach token $tokenPath {
+	if {[dict exists $state(access_path,map) $token]} {
+	    lappend slavePath [dict get $state(access_path,map) $token]
+	} else {
+	    lappend slavePath $token
+	}
+    }
+    return $slavePath
 }
 
 #
 #
-# FindInAccessPath:
+# interpFindInAccessPath:
 #    Search for a real directory and returns its virtual Id (including the
 #    "$")
+#
+#    When debugging, use TranslatePath for the inverse operation.
 proc ::safe::interpFindInAccessPath {slave path} {
     namespace upvar ::safe S$slave state
 
     if {![dict exists $state(access_path,remap) $path]} {
-	return -code error "$path not found in access path $access_path"
+	return -code error "$path not found in access path"
     }
 
     return [dict get $state(access_path,remap) $path]
 }
 
+
 #
 # addToAccessPath:
 #    add (if needed) a real directory to access path and return its
@@ -465,9 +544,11 @@ proc ::safe::InterpInit {
 			 staticsok
 			 nestedok
 			 deletehook
+			 autoPath
+			 withAutoPath
 		     } {
     # Configure will generate an access_path when access_path is empty.
-    InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook
+    InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook $autoPath $withAutoPath
 
     # NB we need to add [namespace current], aliases are always absolute
     # paths.
@@ -669,6 +750,7 @@ proc ::safe::SyncAccessPath {slave} {
 
     ::interp eval $slave [list \
 	      set tcl_library [lindex $slave_access_path 0]]
+    return
 }
 
 # Returns the virtual token for directory number N.
@@ -1104,16 +1186,21 @@ proc ::safe::Setup {} {
     # Setup the arguments parsing
     #
     ####
+    variable AutoPathSync
 
     # Share the descriptions
-    set temp [::tcl::OptKeyRegister {
+    set OptList {
 	{-accessPath -list {} "access path for the slave"}
 	{-noStatics "prevent loading of statically linked pkgs"}
 	{-statics true "loading of statically linked pkgs"}
 	{-nestedLoadOk "allow nested loading"}
 	{-nested false "nested loading"}
 	{-deleteHook -script {} "delete hook"}
-    }]
+    }
+    if {!$AutoPathSync} {
+        lappend OptList {-autoPath -list {} "::auto_path for the slave"}
+    }
+    set temp [::tcl::OptKeyRegister $OptList]
 
     # create case (slave is optional)
     ::tcl::OptKeyRegister {
@@ -1152,11 +1239,23 @@ proc ::safe::Setup {} {
 
 # Accessor method for ::safe::SetAutoPathSync
 # Usage: ::safe::SetAutoPathSync ?newValue?
+# Respond to changes by calling Setup again, precerving any
+# caller-defined logging.  This allows complete equivalence with
+# prior Safe Base behavior if AutoPathSync is true.
+#
+#                   >>> WARNING <<<
+#
+# DO NOT CHANGE AutoPathSync EXCEPT BY THIS COMMAND - IT IS VITAL THAT WHENEVER
+# THE VALUE CHANGES, THE EXISTING PARSE TOKENS ARE DELETED AND Setup IS CALLED
+# AGAIN.
+# (The initialization of AutoPathSync at the end of this file is acceptable
+#  because Setup has not yet been called.)
 
 proc ::safe::SetAutoPathSync {args} {
     variable AutoPathSync
 
-    if {[llength $args] == 1} {
+    if {[llength $args] == 0} {
+    } elseif {[llength $args] == 1} {
         set newValue [lindex $args 0]
         if {![string is boolean -strict $newValue]} {
             return -code error "new value must be a valid boolean"
@@ -1164,11 +1263,22 @@ proc ::safe::SetAutoPathSync {args} {
         set args [expr {$newValue && $newValue}]
         if {([info vars ::safe::S*] ne {}) && ($args != $AutoPathSync)} {
             return -code error \
-                    "cannot change AutoPathSync while Safe Base slaves exist"
+                    "cannot set new value while Safe Base slaves exist"
+        }
+        if {($args != $AutoPathSync)} {
+            set AutoPathSync {*}$args
+            ::tcl::OptKeyDelete ::safe::interpCreate
+            ::tcl::OptKeyDelete ::safe::interpIC
+            set TmpLog [setLogCmd]
+            Setup
+            setLogCmd $TmpLog
         }
+    } else {
+        set msg {wrong # args: should be "safe::SetAutoPathSync ?newValue?"}
+        return -code error $msg
     }
 
-    set AutoPathSync {*}$args
+    return $AutoPathSync
 }
 
 namespace eval ::safe {
@@ -1214,6 +1324,10 @@ namespace eval ::safe {
     # staticsok         : Value of option -statics
     # nestedok          : Value of option -nested
     # cleanupHook       : Value of option -deleteHook
+    #
+    # Because the slave can change its value of ::auto_path, the value of
+    # option -autoPath is not stored in the array but must be obtained from
+    # the slave.
 }
 
 ::safe::Setup
-- 
cgit v0.12


From 2ccefe1d8265285eee3b36fb090840c55306ccde Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 16:26:35 +0000
Subject: Update safe(n) to document the changes.

---
 doc/safe.n | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 133 insertions(+), 2 deletions(-)

diff --git a/doc/safe.n b/doc/safe.n
index b39f2c2..5b95eeb 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -23,10 +23,13 @@ safe \- Creating and manipulating safe interpreters
 .sp
 \fB::safe::interpFindInAccessPath\fR \fIslave\fR \fIdirectory\fR
 .sp
+\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+.sp
 \fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
 .SS OPTIONS
 .PP
 ?\fB\-accessPath\fR \fIpathList\fR?
+?\fB\-autoPath\fR \fIpathList\fR?
 ?\fB\-statics\fR \fIboolean\fR? ?\fB\-noStatics\fR?
 ?\fB\-nested\fR \fIboolean\fR? ?\fB\-nestedLoadOk\fR?
 ?\fB\-deleteHook\fR \fIscript\fR?
@@ -140,6 +143,15 @@ $slave eval [list set tk_library \e
 .CE
 .RE
 .TP
+\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+This command is used to get or set the "Sync Mode" of the Safe Base.
+When an argument is supplied, the command returns an error if the argument
+is not a boolean value, or if any Safe Base interpreters exist.  Typically
+the value will be set as part of initialization - boolean true for
+"Sync Mode" on (the default), false for "Sync Mode" off.  With "Sync Mode"
+on, the Safe Base keeps each slave interpreter's ::auto_path synchronized
+with its access path.  See the section \fBSYNC MODE\fR below for details.
+.TP
 \fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
 This command installs a script that will be called when interesting
 life cycle events occur for a safe interpreter.
@@ -191,6 +203,13 @@ master for auto-loading.
 See the section \fBSECURITY\fR below for more detail about virtual paths,
 tokens and access control.
 .TP
+\fB\-autoPath\fR \fIdirectoryList\fR
+This option sets the list of directories in the safe interpreter's
+::auto_path.  The option is undefined if the Safe Base has "Sync Mode" on
+- in that case the safe interpreter's ::auto_path is managed by the Safe
+Base and is a tokenized form of its access path.
+See the section \fBSYNC MODE\fR below for details.
+.TP
 \fB\-statics\fR \fIboolean\fR
 This option specifies if the safe interpreter will be allowed
 to load statically linked packages (like \fBload {} Tk\fR).
@@ -323,7 +342,8 @@ list will be assigned a token that will be set in
 the slave \fBauto_path\fR and the first element of that list will be set as
 the \fBtcl_library\fR for that slave.
 .PP
-If the access path argument is not given or is the empty list,
+If the access path argument is not given to \fB::safe::interpCreate\fR or
+\fB::safe::interpInit\fR or is the empty list,
 the default behavior is to let the slave access the same packages
 as the master has access to (Or to be more precise:
 only packages written in Tcl (which by definition cannot be dangerous
@@ -349,8 +369,119 @@ When the \fIaccessPath\fR is changed after the first creation or
 initialization (i.e. through \fBinterpConfigure -accessPath \fR\fIlist\fR),
 an \fBauto_reset\fR is automatically evaluated in the safe interpreter
 to synchronize its \fBauto_index\fR with the new token list.
+.SH SYNC MODE
+Before Tcl version 8.6.x, the Safe Base kept each safe interpreter's
+::auto_path synchronized with a tokenized form of its access path.
+Limitations of Tcl 8.4 and earlier made this feature necessary.  This
+definition of ::auto_path did not conform its specification in library(n)
+and pkg_mkIndex(n), but nevertheless worked perfectly well for the discovery
+and loading of packages.  The introduction of Tcl modules in Tcl 8.5 added a
+large number of directories to the access path, and it is inconvenient to
+have these additional directories unnecessarily appended to the ::auto_path.
+.PP
+In order to preserve compatibility with existing code, this synchronization
+of the ::auto_path and access path ("Sync Mode" on) is still the default.
+However, the Safe Base offers the option of limiting the safe interpreter's
+::auto_path to the much shorter list of directories that is necessary for
+it to perform its function ("Sync Mode" off).  Use the command
+\fB::safe::setAutoPathSync\fR to choose the mode before creating any Safe
+Base interpreters.
+.PP
+In either mode, the most convenient way to initialize a safe interpreter is
+to call \fB::safe::interpCreate\fR or \fB::safe::interpInit\fR without the
+\fB\-accessPath\fR or \fB\-autoPath\fR options (or with the \fB\-accessPath\fR
+option set to the
+empty list), which will give the safe interpreter the same access as the
+master interpreter to packages, modules, and autoloader files.  With
+"Sync Mode" off, the ::auto_path will be set to a tokenized form of the master's
+::auto_path.
+.PP
+With "Sync Mode" off, if a value is specified for \fB\-autoPath\fR, even the empty
+list, in a call to \fB::safe::interpCreate\fR, \fB::safe::interpInit\fR, or
+\fB::safe::interpConfigure\fR, it will be tokenized and used as the safe
+interpreter's ::auto_path.  Any directories that do not also belong to the
+access path cannot be tokenized and will be silently ignored.
+.PP
+With "Sync Mode" off, if the access path is reset to the values in the
+master interpreter by calling \fB::safe::interpConfigure\fR with arguments
+\fB\-accessPath\fR {}, then the ::auto_path will also be reset unless the argument
+\fB\-autoPath\fR is supplied to specify a different value.
+.PP
+With "Sync Mode" off, if a non-empty value of \fB\-accessPath\fR is supplied, the
+safe interpreter's ::auto_path will be set to {} (by
+\fB::safe::interpCreate\fR, \fB::safe::interpInit\fR) or left unchanged
+(by \fB::safe::interpConfigure\fR).  If the same command specifies a new
+value for \fB\-autoPath\fR, it will be applied after the \fB\-accessPath\fR argument has
+been processed.
+
+Examples of use with "Sync Mode" off: any of these commands will set the
+::auto_path to a tokenized form of its value in the master interpreter:
+.RS
+.PP
+.CS
+ safe::interpCreate foo
+ safe::interpCreate foo -accessPath {}
+ safe::interpInit bar
+ safe::interpInit bar -accessPath {}
+ safe::interpConfigure foo -accessPath {}
+.CE
+.RE
+.TP
+Example of use with "Sync Mode" off: when initializing a safe interpreter
+with a non-empty access path, the ::auto_path will be set to {} unless its
+own value is also specified:
+.RS
+.PP
+.CS
+ safe::interpCreate foo -accessPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib/tcl8.6/http1.0
+     /usr/local/TclHome/lib/tcl8.6/opt0.4
+     /usr/local/TclHome/lib/tcl8.6/msgs
+     /usr/local/TclHome/lib/tcl8.6/encoding
+     /usr/local/TclHome/lib
+ }
+
+ # The slave's ::auto_path must be given a suitable value:
+
+ safe::interpConfigure foo -autoPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib
+ }
+
+ # The two commands can be combined:
+
+ safe::interpCreate foo -accessPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib/tcl8.6/http1.0
+     /usr/local/TclHome/lib/tcl8.6/opt0.4
+     /usr/local/TclHome/lib/tcl8.6/msgs
+     /usr/local/TclHome/lib/tcl8.6/encoding
+     /usr/local/TclHome/lib
+ } -autoPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib
+ }
+.CE
+.RE
+.TP
+Example of use with "Sync Mode" off: the command
+\fBsafe::interpAddToAccessPath\fR does not change the safe interpreter's
+::auto_path, and so any necessary change must be made by the script:
+.RS
+.PP
+.CS
+ safe::interpAddToAccessPath foo /usr/local/TclHome/lib/extras/Img1.4.11
+
+ lassign [safe::interpConfigure foo -autoPath] DUM slaveAutoPath
+ lappend slaveAutoPath /usr/local/TclHome/lib/extras/Img1.4.11
+ safe::interpConfigure foo -autoPath $slaveAutoPath
+.CE
+.RE
+.TP
 .SH "SEE ALSO"
-interp(n), library(n), load(n), package(n), source(n), unknown(n)
+interp(n), library(n), load(n), package(n), pkg_mkIndex(n), source(n),
+tm(n), unknown(n)
 .SH KEYWORDS
 alias, auto\-loading, auto_mkindex, load, master interpreter, safe
 interpreter, slave interpreter, source
-- 
cgit v0.12


From a52e71f534a53b923ecdd96be5dec47ca9875544 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 17:03:02 +0000
Subject: Rename command ::safe::SetAutoPathSync to ::safe::setAutoPathSync and
 add to library/tclIndex.

---
 library/safe.tcl | 16 +++++------
 library/tclIndex |  1 +
 tests/safe.test  | 82 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index a1fadb1..474dd01 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -326,7 +326,7 @@ proc ::safe::InterpCreate {
 #
 #    It is the caller's responsibility, if it supplies a non-empty value for
 #    access_path, to make the first directory in the path suitable for use as
-#    tcl_library, and (if ![SetAutoPathSync]), to set the slave's ::auto_path.
+#    tcl_library, and (if ![setAutoPathSync]), to set the slave's ::auto_path.
 
 proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook autoPath withAutoPath} {
     global auto_path
@@ -404,9 +404,9 @@ if {[info exists state(access_path,map)]} {
 
     # Set the slave auto_path to a tokenized raw_auto_path.
     # Silently ignore any directories that are not in the access path.
-    # If [SetAutoPathSync], SyncAccessPath will overwrite this value with the
+    # If [setAutoPathSync], SyncAccessPath will overwrite this value with the
     # full access path.
-    # If ![SetAutoPathSync], Safe Base code will not change this value.
+    # If ![setAutoPathSync], Safe Base code will not change this value.
     set tokens_auto_path {}
     foreach dir $raw_auto_path {
 	if {[dict exists $remap_access_path $dir]} {
@@ -1242,9 +1242,9 @@ proc ::safe::Setup {} {
     return
 }
 
-# Accessor method for ::safe::SetAutoPathSync
-# Usage: ::safe::SetAutoPathSync ?newValue?
-# Respond to changes by calling Setup again, precerving any
+# Accessor method for ::safe::AutoPathSync
+# Usage: ::safe::setAutoPathSync ?newValue?
+# Respond to changes by calling Setup again, preserving any
 # caller-defined logging.  This allows complete equivalence with
 # prior Safe Base behavior if AutoPathSync is true.
 #
@@ -1256,7 +1256,7 @@ proc ::safe::Setup {} {
 # (The initialization of AutoPathSync at the end of this file is acceptable
 #  because Setup has not yet been called.)
 
-proc ::safe::SetAutoPathSync {args} {
+proc ::safe::setAutoPathSync {args} {
     variable AutoPathSync
 
     if {[llength $args] == 0} {
@@ -1279,7 +1279,7 @@ proc ::safe::SetAutoPathSync {args} {
             setLogCmd $TmpLog
         }
     } else {
-        set msg {wrong # args: should be "safe::SetAutoPathSync ?newValue?"}
+        set msg {wrong # args: should be "safe::setAutoPathSync ?newValue?"}
         return -code error $msg
     }
 
diff --git a/library/tclIndex b/library/tclIndex
index 0409d9b..0d2db02 100644
--- a/library/tclIndex
+++ b/library/tclIndex
@@ -61,6 +61,7 @@ set auto_index(::safe::DirInAccessPath) [list source [file join $dir safe.tcl]]
 set auto_index(::safe::Subset) [list source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasSubset) [list source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasEncoding) [list source [file join $dir safe.tcl]]
+set auto_index(::safe::setAutoPathSync) [list source [file join $dir safe.tcl]]
 set auto_index(tcl_wordBreakAfter) [list source [file join $dir word.tcl]]
 set auto_index(tcl_wordBreakBefore) [list source [file join $dir word.tcl]]
 set auto_index(tcl_endOfWord) [list source [file join $dir word.tcl]]
diff --git a/tests/safe.test b/tests/safe.test
index fac52f1..2a910fd 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -184,11 +184,11 @@ test safe-6.3 {test safe interpreters knowledge of the world} {
 # high level general test
 test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     }
 
     set i [safe::interpCreate]
@@ -204,16 +204,16 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result 2.*
 test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     } else {
         set SyncVal_TMP 1
     }
@@ -231,7 +231,7 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventio
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 test safe-7.3 {check that safe subinterpreters work} {
@@ -242,11 +242,11 @@ test safe-7.3 {check that safe subinterpreters work} {
 
 test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     } else {
         set SyncVal_TMP 1
     }
@@ -265,17 +265,17 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     # other than the first and last in the access path.
 } -cleanup {
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     }
 
     set i [safe::interpCreate]
@@ -294,7 +294,7 @@ test safe-7.5 {tests positive and negative module loading with conventional Auto
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
@@ -966,13 +966,13 @@ test safe-17.2 {Check that first element of slave auto_path (and access path) is
 
 test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 
     # Without AutoPathSync, we need a more complete auto_path, because the slave will use the same value.
@@ -994,19 +994,19 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -result 1.0
 
 test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -1024,19 +1024,19 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 
     set i [safe::interpCreate]
@@ -1053,19 +1053,19 @@ test safe-18.3 {Check that default auto_path is the same as in the master interp
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-	safe::SetAutoPathSync $SyncVal_TMP
+	safe::setAutoPathSync $SyncVal_TMP
     }
 } -result [set ::auto_path]
 
 test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -1091,19 +1091,19 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-	safe::SetAutoPathSync $SyncVal_TMP
+	safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 
     set i [safe::interpCreate]
@@ -1122,7 +1122,7 @@ test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading withou
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
-- 
cgit v0.12


From 541671a2f136159742365818e09d29f6be51f96b Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 17:37:34 +0000
Subject: Revise tests safe-18.2 and safe-18.4 to allow for -autoPath in
 interpConfigure output.

---
 tests/safe.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index 2a910fd..ce70bf9 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1026,7 +1026,7 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
@@ -1093,7 +1093,7 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 
 test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-- 
cgit v0.12


From 4ca3e59e50cd57a6c696d5bb9810787733a0415d Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 17:48:16 +0000
Subject: Update safe(n) to document the changes.

---
 doc/safe.n | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 133 insertions(+), 2 deletions(-)

diff --git a/doc/safe.n b/doc/safe.n
index b39f2c2..5b95eeb 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -23,10 +23,13 @@ safe \- Creating and manipulating safe interpreters
 .sp
 \fB::safe::interpFindInAccessPath\fR \fIslave\fR \fIdirectory\fR
 .sp
+\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+.sp
 \fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
 .SS OPTIONS
 .PP
 ?\fB\-accessPath\fR \fIpathList\fR?
+?\fB\-autoPath\fR \fIpathList\fR?
 ?\fB\-statics\fR \fIboolean\fR? ?\fB\-noStatics\fR?
 ?\fB\-nested\fR \fIboolean\fR? ?\fB\-nestedLoadOk\fR?
 ?\fB\-deleteHook\fR \fIscript\fR?
@@ -140,6 +143,15 @@ $slave eval [list set tk_library \e
 .CE
 .RE
 .TP
+\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+This command is used to get or set the "Sync Mode" of the Safe Base.
+When an argument is supplied, the command returns an error if the argument
+is not a boolean value, or if any Safe Base interpreters exist.  Typically
+the value will be set as part of initialization - boolean true for
+"Sync Mode" on (the default), false for "Sync Mode" off.  With "Sync Mode"
+on, the Safe Base keeps each slave interpreter's ::auto_path synchronized
+with its access path.  See the section \fBSYNC MODE\fR below for details.
+.TP
 \fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
 This command installs a script that will be called when interesting
 life cycle events occur for a safe interpreter.
@@ -191,6 +203,13 @@ master for auto-loading.
 See the section \fBSECURITY\fR below for more detail about virtual paths,
 tokens and access control.
 .TP
+\fB\-autoPath\fR \fIdirectoryList\fR
+This option sets the list of directories in the safe interpreter's
+::auto_path.  The option is undefined if the Safe Base has "Sync Mode" on
+- in that case the safe interpreter's ::auto_path is managed by the Safe
+Base and is a tokenized form of its access path.
+See the section \fBSYNC MODE\fR below for details.
+.TP
 \fB\-statics\fR \fIboolean\fR
 This option specifies if the safe interpreter will be allowed
 to load statically linked packages (like \fBload {} Tk\fR).
@@ -323,7 +342,8 @@ list will be assigned a token that will be set in
 the slave \fBauto_path\fR and the first element of that list will be set as
 the \fBtcl_library\fR for that slave.
 .PP
-If the access path argument is not given or is the empty list,
+If the access path argument is not given to \fB::safe::interpCreate\fR or
+\fB::safe::interpInit\fR or is the empty list,
 the default behavior is to let the slave access the same packages
 as the master has access to (Or to be more precise:
 only packages written in Tcl (which by definition cannot be dangerous
@@ -349,8 +369,119 @@ When the \fIaccessPath\fR is changed after the first creation or
 initialization (i.e. through \fBinterpConfigure -accessPath \fR\fIlist\fR),
 an \fBauto_reset\fR is automatically evaluated in the safe interpreter
 to synchronize its \fBauto_index\fR with the new token list.
+.SH SYNC MODE
+Before Tcl version 8.6.x, the Safe Base kept each safe interpreter's
+::auto_path synchronized with a tokenized form of its access path.
+Limitations of Tcl 8.4 and earlier made this feature necessary.  This
+definition of ::auto_path did not conform its specification in library(n)
+and pkg_mkIndex(n), but nevertheless worked perfectly well for the discovery
+and loading of packages.  The introduction of Tcl modules in Tcl 8.5 added a
+large number of directories to the access path, and it is inconvenient to
+have these additional directories unnecessarily appended to the ::auto_path.
+.PP
+In order to preserve compatibility with existing code, this synchronization
+of the ::auto_path and access path ("Sync Mode" on) is still the default.
+However, the Safe Base offers the option of limiting the safe interpreter's
+::auto_path to the much shorter list of directories that is necessary for
+it to perform its function ("Sync Mode" off).  Use the command
+\fB::safe::setAutoPathSync\fR to choose the mode before creating any Safe
+Base interpreters.
+.PP
+In either mode, the most convenient way to initialize a safe interpreter is
+to call \fB::safe::interpCreate\fR or \fB::safe::interpInit\fR without the
+\fB\-accessPath\fR or \fB\-autoPath\fR options (or with the \fB\-accessPath\fR
+option set to the
+empty list), which will give the safe interpreter the same access as the
+master interpreter to packages, modules, and autoloader files.  With
+"Sync Mode" off, the ::auto_path will be set to a tokenized form of the master's
+::auto_path.
+.PP
+With "Sync Mode" off, if a value is specified for \fB\-autoPath\fR, even the empty
+list, in a call to \fB::safe::interpCreate\fR, \fB::safe::interpInit\fR, or
+\fB::safe::interpConfigure\fR, it will be tokenized and used as the safe
+interpreter's ::auto_path.  Any directories that do not also belong to the
+access path cannot be tokenized and will be silently ignored.
+.PP
+With "Sync Mode" off, if the access path is reset to the values in the
+master interpreter by calling \fB::safe::interpConfigure\fR with arguments
+\fB\-accessPath\fR {}, then the ::auto_path will also be reset unless the argument
+\fB\-autoPath\fR is supplied to specify a different value.
+.PP
+With "Sync Mode" off, if a non-empty value of \fB\-accessPath\fR is supplied, the
+safe interpreter's ::auto_path will be set to {} (by
+\fB::safe::interpCreate\fR, \fB::safe::interpInit\fR) or left unchanged
+(by \fB::safe::interpConfigure\fR).  If the same command specifies a new
+value for \fB\-autoPath\fR, it will be applied after the \fB\-accessPath\fR argument has
+been processed.
+
+Examples of use with "Sync Mode" off: any of these commands will set the
+::auto_path to a tokenized form of its value in the master interpreter:
+.RS
+.PP
+.CS
+ safe::interpCreate foo
+ safe::interpCreate foo -accessPath {}
+ safe::interpInit bar
+ safe::interpInit bar -accessPath {}
+ safe::interpConfigure foo -accessPath {}
+.CE
+.RE
+.TP
+Example of use with "Sync Mode" off: when initializing a safe interpreter
+with a non-empty access path, the ::auto_path will be set to {} unless its
+own value is also specified:
+.RS
+.PP
+.CS
+ safe::interpCreate foo -accessPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib/tcl8.6/http1.0
+     /usr/local/TclHome/lib/tcl8.6/opt0.4
+     /usr/local/TclHome/lib/tcl8.6/msgs
+     /usr/local/TclHome/lib/tcl8.6/encoding
+     /usr/local/TclHome/lib
+ }
+
+ # The slave's ::auto_path must be given a suitable value:
+
+ safe::interpConfigure foo -autoPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib
+ }
+
+ # The two commands can be combined:
+
+ safe::interpCreate foo -accessPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib/tcl8.6/http1.0
+     /usr/local/TclHome/lib/tcl8.6/opt0.4
+     /usr/local/TclHome/lib/tcl8.6/msgs
+     /usr/local/TclHome/lib/tcl8.6/encoding
+     /usr/local/TclHome/lib
+ } -autoPath {
+     /usr/local/TclHome/lib/tcl8.6
+     /usr/local/TclHome/lib
+ }
+.CE
+.RE
+.TP
+Example of use with "Sync Mode" off: the command
+\fBsafe::interpAddToAccessPath\fR does not change the safe interpreter's
+::auto_path, and so any necessary change must be made by the script:
+.RS
+.PP
+.CS
+ safe::interpAddToAccessPath foo /usr/local/TclHome/lib/extras/Img1.4.11
+
+ lassign [safe::interpConfigure foo -autoPath] DUM slaveAutoPath
+ lappend slaveAutoPath /usr/local/TclHome/lib/extras/Img1.4.11
+ safe::interpConfigure foo -autoPath $slaveAutoPath
+.CE
+.RE
+.TP
 .SH "SEE ALSO"
-interp(n), library(n), load(n), package(n), source(n), unknown(n)
+interp(n), library(n), load(n), package(n), pkg_mkIndex(n), source(n),
+tm(n), unknown(n)
 .SH KEYWORDS
 alias, auto\-loading, auto_mkindex, load, master interpreter, safe
 interpreter, slave interpreter, source
-- 
cgit v0.12


From a6ad8c5f1b59fd374e129d9643732581744475b8 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 17:56:33 +0000
Subject: Rename command ::safe::SetAutoPathSync to ::safe::setAutoPathSync and
 add to library/tclIndex.

---
 library/safe.tcl | 14 +++++-----
 library/tclIndex |  1 +
 tests/safe.test  | 82 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 54f9cc9..84db786 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -326,7 +326,7 @@ proc ::safe::InterpCreate {
 #
 #    It is the caller's responsibility, if it supplies a non-empty value for
 #    access_path, to make the first directory in the path suitable for use as
-#    tcl_library, and (if ![SetAutoPathSync]), to set the slave's ::auto_path.
+#    tcl_library, and (if ![setAutoPathSync]), to set the slave's ::auto_path.
 
 proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook autoPath withAutoPath} {
     global auto_path
@@ -404,9 +404,9 @@ if {[info exists state(access_path,map)]} {
 
     # Set the slave auto_path to a tokenized raw_auto_path.
     # Silently ignore any directories that are not in the access path.
-    # If [SetAutoPathSync], SyncAccessPath will overwrite this value with the
+    # If [setAutoPathSync], SyncAccessPath will overwrite this value with the
     # full access path.
-    # If ![SetAutoPathSync], Safe Base code will not change this value.
+    # If ![setAutoPathSync], Safe Base code will not change this value.
     set tokens_auto_path {}
     foreach dir $raw_auto_path {
 	if {[dict exists $remap_access_path $dir]} {
@@ -1237,8 +1237,8 @@ proc ::safe::Setup {} {
     return
 }
 
-# Accessor method for ::safe::SetAutoPathSync
-# Usage: ::safe::SetAutoPathSync ?newValue?
+# Accessor method for ::safe::AutoPathSync
+# Usage: ::safe::setAutoPathSync ?newValue?
 # Respond to changes by calling Setup again, precerving any
 # caller-defined logging.  This allows complete equivalence with
 # prior Safe Base behavior if AutoPathSync is true.
@@ -1251,7 +1251,7 @@ proc ::safe::Setup {} {
 # (The initialization of AutoPathSync at the end of this file is acceptable
 #  because Setup has not yet been called.)
 
-proc ::safe::SetAutoPathSync {args} {
+proc ::safe::setAutoPathSync {args} {
     variable AutoPathSync
 
     if {[llength $args] == 0} {
@@ -1274,7 +1274,7 @@ proc ::safe::SetAutoPathSync {args} {
             setLogCmd $TmpLog
         }
     } else {
-        set msg {wrong # args: should be "safe::SetAutoPathSync ?newValue?"}
+        set msg {wrong # args: should be "safe::setAutoPathSync ?newValue?"}
         return -code error $msg
     }
 
diff --git a/library/tclIndex b/library/tclIndex
index 87a2814..6bb3fa6 100644
--- a/library/tclIndex
+++ b/library/tclIndex
@@ -61,6 +61,7 @@ set auto_index(::safe::DirInAccessPath) [list ::tcl::Pkg::source [file join $dir
 set auto_index(::safe::Subset) [list ::tcl::Pkg::source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasSubset) [list ::tcl::Pkg::source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasEncoding) [list ::tcl::Pkg::source [file join $dir safe.tcl]]
+set auto_index(::safe::setAutoPathSync) [list source [file join $dir safe.tcl]]
 set auto_index(tcl_wordBreakAfter) [list ::tcl::Pkg::source [file join $dir word.tcl]]
 set auto_index(tcl_wordBreakBefore) [list ::tcl::Pkg::source [file join $dir word.tcl]]
 set auto_index(tcl_endOfWord) [list ::tcl::Pkg::source [file join $dir word.tcl]]
diff --git a/tests/safe.test b/tests/safe.test
index 8fb0983..4fd3eef 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -184,11 +184,11 @@ test safe-6.3 {test safe interpreters knowledge of the world} {
 # high level general test
 test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     }
 
     set i [safe::interpCreate]
@@ -204,16 +204,16 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result 2.*
 test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     } else {
         set SyncVal_TMP 1
     }
@@ -231,7 +231,7 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventio
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 test safe-7.3 {check that safe subinterpreters work} {
@@ -242,11 +242,11 @@ test safe-7.3 {check that safe subinterpreters work} {
 
 test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     } else {
         set SyncVal_TMP 1
     }
@@ -265,17 +265,17 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     # other than the first and last in the access path.
 } -cleanup {
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 1
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     }
 
     set i [safe::interpCreate]
@@ -294,7 +294,7 @@ test safe-7.5 {tests positive and negative module loading with conventional Auto
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
@@ -962,13 +962,13 @@ test safe-17.2 {Check that first element of slave auto_path (and access path) is
 
 test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 
     # Without AutoPathSync, we need a more complete auto_path, because the slave will use the same value.
@@ -990,19 +990,19 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -result 1.0
 
 test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -1020,19 +1020,19 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 
     set i [safe::interpCreate]
@@ -1049,19 +1049,19 @@ test safe-18.3 {Check that default auto_path is the same as in the master interp
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-	safe::SetAutoPathSync $SyncVal_TMP
+	safe::setAutoPathSync $SyncVal_TMP
     }
 } -result [set ::auto_path]
 
 test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -1087,19 +1087,19 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-	safe::SetAutoPathSync $SyncVal_TMP
+	safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::SetAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
-        set SyncVal_TMP [safe::SetAutoPathSync]
-        safe::SetAutoPathSync 0
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
     } else {
-        error {This test is meaningful only if the command ::safe::SetAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 
     set i [safe::interpCreate]
@@ -1118,7 +1118,7 @@ test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading withou
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::SetAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
-- 
cgit v0.12


From 4d4cf2d35a338f40c1a4063d43cab631c796ebf3 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 9 Jul 2020 18:51:24 +0000
Subject: Revise tests safe-18.[24] to allow for -autoPath in interpConfigure
 output.  Use opt in place of http 1.0 in positive/negative package search
 tests safe-7.[124], safe-18.[124].

---
 tests/safe.test | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index 4fd3eef..869b9a4 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -197,16 +197,17 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
     #  package require in a slave works like in the master)
-    set v [interp eval $i {package require http 2}]
+    set v [interp eval $i {package require opt}]
     # no error shall occur:
-    interp eval $i {http::config}
+    interp eval $i {::tcl::Lempty {a list}}
     set v
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result 2.*
+} -match glob -result 0.4.*
+
 test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -223,17 +224,17 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventio
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # an error shall occur (http is not anymore in the secure 0-level
+    # an error shall occur (opt is not anymore in the secure 0-level
     # provided deep path)
     list $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package opt} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 test safe-7.3 {check that safe subinterpreters work} {
     set i [safe::interpCreate]
     set j [safe::interpCreate [list $i x]]
@@ -255,10 +256,10 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
-    # this time, unlike test safe-7.2, http 1.0 should be found
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] opt]]
+    # this time, unlike test safe-7.2, opt should be found
     list $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
     # Note that the glob match elides directories (those from the module path)
@@ -267,7 +268,7 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 0.4.* {-accessPath {[list $tcl_library *$tcl_library/opt]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
@@ -980,11 +981,11 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     set i [safe::interpCreate]
 } -body {
     # no error shall occur:
-    # (because the default access_path shall include 1st level sub dirs
-    #  so package require in a slave works like in the master)
-    set v [interp eval $i {package require http 1}]
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require opt}]
     # no error shall occur:
-    interp eval $i {http_config}
+    interp eval $i {::tcl::Lempty {a list}}
     set v
 } -cleanup {
     set ::auto_path $::auto_TMP
@@ -992,7 +993,7 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result 1.0
+} -match glob -result 0.4.*
 
 test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
@@ -1012,17 +1013,18 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p1
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # an error shall occur (http is not anymore in the secure 0-level
+    # an error shall occur (opt is not anymore in the secure 0-level
     # provided deep path)
     list $auto1 $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package opt} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+
 
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
@@ -1075,21 +1077,21 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
     set token1 [safe::interpAddToAccessPath $i [info library]]
 
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] opt]]
 
     # should not have been changed by Safe Base:
     set auto2 [interp eval $i {set ::auto_path}]
 
-    # This time, unlike test safe-18.2 and the try above, http 1.0 should be found:
+    # This time, unlike test safe-18.2 and the try above, opt should be found:
     list $auto1 $auto2 $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 0.4.* {-accessPath {[list $tcl_library *$tcl_library/opt]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 
 test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
@@ -1167,3 +1169,4 @@ return
 # Local Variables:
 # mode: tcl
 # End:
+
-- 
cgit v0.12


From 586ba274757dbac124ef994fd13adf1fd0a9cbe7 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Tue, 14 Jul 2020 16:15:19 +0000
Subject: Sync with bugfixes and tests pushed upstream via safe-bugfixes-8-6 to
 core-8-6-branch.

---
 library/safe.tcl |  70 ++++--
 library/tm.tcl   |   6 +-
 tests/safe.test  | 733 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 770 insertions(+), 39 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 474dd01..cf2c164 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -218,11 +218,10 @@ proc ::safe::interpConfigure {args} {
 	    # Get the current (and not the default) values of whatever has
 	    # not been given:
 	    if {![::tcl::OptProcArgGiven -accessPath]} {
-		set doreset 1
+		set doreset 0
 		set accessPath $state(access_path)
-		# BUG? is doreset the wrong way round?
 	    } else {
-		set doreset 0
+		set doreset 1
 	    }
 	    if {(!$AutoPathSync) && (![::tcl::OptProcArgGiven -autoPath])} {
 		set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
@@ -252,8 +251,7 @@ proc ::safe::interpConfigure {args} {
 	    }
 	    # we can now reconfigure :
 	    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
-	    set res [InterpSetConfig $slave $accessPath $statics $nested $deleteHook $autoPath $withAutoPath]
-puts stderr [list changed_map $res do_reset $doreset]
+	    set slave_tm_rel [InterpSetConfig $slave $accessPath $statics $nested $deleteHook $autoPath $withAutoPath]
 	    # auto_reset the slave (to completly synch the new access_path)
 	    if {$doreset} {
 		if {[catch {::interp eval $slave {auto_reset}} msg]} {
@@ -261,6 +259,26 @@ puts stderr [list changed_map $res do_reset $doreset]
 		} else {
 		    Log $slave "successful auto_reset" NOTICE
 		}
+
+		# Sync the paths used to search for Tcl modules.
+		::interp eval $slave {tcl::tm::path remove {*}[tcl::tm::list]}
+		if {[llength $state(tm_path_slave)] > 0} {
+		    ::interp eval $slave [list \
+			    ::tcl::tm::add {*}[lreverse $state(tm_path_slave)]]
+		}
+
+		# Wherever possible, refresh package/module data.
+		# - Ideally [package ifneeded $pkg $ver {}] would clear the
+		#   stale data from the interpreter, but instead it sets a
+		#   nonsense empty script.
+		# - We cannot purge stale package data, but we can overwrite
+		#   it where we have fresh data.  Any remaining stale data will
+		#   do no harm but the error messages may be cryptic.
+		::interp eval $slave [list catch {package require NOEXIST}]
+		foreach rel $slave_tm_rel {
+		    set cmd [list package require [string map {/ ::} $rel]::NOEXIST]
+		    ::interp eval $slave [list catch $cmd]
+		}
 	    }
 	}
     }
@@ -381,16 +399,13 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook au
     # We save the virtual form separately as well, as syncing it with the
     # slave has to be defered until the necessary commands are present for
     # setup.
-if {[info exists state(access_path,map)]} {
-    set old_map_access_path $state(access_path,map)
-} else {
-    set old_map_access_path {}
-}
     set norm_access_path  {}
     set slave_access_path {}
     set map_access_path   {}
     set remap_access_path {}
     set slave_tm_path     {}
+    set slave_tm_roots    {}
+    set slave_tm_rel      {}
 
     set i 0
     foreach dir $access_path {
@@ -426,6 +441,13 @@ if {[info exists state(access_path,map)]} {
 	    # Prevent the addition of dirs on the tm list to the
 	    # result if they are already known.
 	    if {[dict exists $remap_access_path $dir]} {
+	        if {$firstpass} {
+		    # $dir is in [::tcl::tm::list] and belongs in the slave_tm_path.
+		    # Later passes handle subdirectories, which belong in the
+		    # access path but not in the module path.
+		    lappend slave_tm_path  [dict get $remap_access_path $dir]
+		    lappend slave_tm_roots [file normalize $dir] [file normalize $dir]
+		}
 		continue
 	    }
 
@@ -440,6 +462,7 @@ if {[info exists state(access_path,map)]} {
 		# Later passes handle subdirectories, which belong in the
 		# access path but not in the module path.
 		lappend slave_tm_path  $token
+		lappend slave_tm_roots [file normalize $dir] [file normalize $dir]
 	    }
 	    incr i
 
@@ -450,6 +473,14 @@ if {[info exists state(access_path,map)]} {
 	    # 'platform/shell-X.tm', i.e arbitrarily deep
 	    # subdirectories.
 	    lappend morepaths {*}[glob -nocomplain -directory $dir -type d *]
+	    foreach sub [glob -nocomplain -directory $dir -type d *] {
+	        lappend slave_tm_roots [file normalize $sub] [dict get $slave_tm_roots $dir]
+	        set lenny [string length [dict get $slave_tm_roots $dir]]
+	        set relpath [string range [file normalize $sub] $lenny+1 end]
+                if {$relpath ni $slave_tm_rel} {
+	            lappend slave_tm_rel $relpath
+                }
+	    }
 	}
 	set firstpass 0
     }
@@ -465,9 +496,7 @@ if {[info exists state(access_path,map)]} {
     set state(cleanupHook)       $deletehook
 
     SyncAccessPath $slave
-
-    set result [expr {[lrange $map_access_path 0 end] ne [lrange $old_map_access_path 0 end]}]
-    return $result
+    return $slave_tm_rel
 }
 
 
@@ -656,15 +685,6 @@ proc ::safe::interpDelete {slave} {
 
     namespace upvar ::safe S$slave state
 
-    # Sub interpreters would be deleted automatically, but if they are managed
-    # by the Safe Base we also need to clean up, and this needs to be done
-    # independently of the cleanupHook.
-    foreach sub [interp slaves $slave] {
-        if {[info exists ::safe::S[list $slave $sub]]} {
-            ::safe::interpDelete [list $slave $sub]
-        }
-    }
-
     # If the slave has a cleanup hook registered, call it.  Check the
     # existance because we might be called to delete an interp which has
     # not been registered with us at all
@@ -835,15 +855,11 @@ proc ::safe::AliasGlob {slave args} {
 
     while {$at < [llength $args]} {
 	switch -glob -- [set opt [lindex $args $at]] {
-	    -nocomplain - -- - -tails {
+	    -nocomplain - -- - -join - -tails {
 		lappend cmd $opt
 		set got($opt) 1
 		incr at
 	    }
-	    -join {
-		set got($opt) 1
-		incr at
-	    }
 	    -types - -type {
 		lappend cmd -types [lindex $args [incr at]]
 		incr at
diff --git a/library/tm.tcl b/library/tm.tcl
index 1802bb9..3861532 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -238,12 +238,16 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 			continue
 		    }
 
-		    if {[package ifneeded $pkgname $pkgversion] ne {}} {
+		    if {    ([package ifneeded $pkgname $pkgversion] ne {})
+			 && (![interp issafe])
+		    } {
 			# There's already a provide script registered for
 			# this version of this package.  Since all units of
 			# code claiming to be the same version of the same
 			# package ought to be identical, just stick with
 			# the one we already have.
+			# This does not apply to Safe Base interpreters because
+			# the token-to-directory mapping may have changed.
 			continue
 		    }
 
diff --git a/tests/safe.test b/tests/safe.test
index ce70bf9..2de29fd 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -26,6 +26,8 @@ foreach i [interp slaves] {
 set saveAutoPath $::auto_path
 set ::auto_path [info library]
 
+set TestsDir [file normalize [file dirname [info script]]]
+
 # Force actual loading of the safe package because we use un exported (and
 # thus un-autoindexed) APIs in this test result arguments:
 catch {safe::interpConfigure}
@@ -181,31 +183,164 @@ test safe-6.3 {test safe interpreters knowledge of the world} {
 # More test should be added to check that hostname, nameofexecutable, aren't
 # leaking infos, but they still do...
 
+# Tests 7.0* test the example files before using them to test safe interpreters.
+
+test safe-7.0a {example tclIndex commands, test in master interpreter} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0 auto1] [file join $TestsDir auto0 auto2]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {0 ok1 0 ok2}
+
+test safe-7.0b {example tclIndex commands, negative test in master interpreter} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
+
+test safe-7.0c {example pkgIndex.tcl packages, test in master interpreter, child directories} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
+
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+
+test safe-7.0d {example pkgIndex.tcl packages, test in master interpreter, main directories} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0 auto1] \
+                        [file join $TestsDir auto0 auto2]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
+
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+
+test safe-7.0e {example modules packages, test in master interpreter, replace path} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    # Try to load the modules and run a command from each one.
+    set code0 [catch {package require test0} msg0]
+    set code1 [catch {package require mod1::test1} msg1]
+    set code2 [catch {package require mod2::test2} msg2]
+    set out0  [test0::try0]
+    set out1  [mod1::test1::try1]
+    set out2  [mod2::test2::try2]
+
+    list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    catch {package forget test0}
+    catch {package forget mod1::test1}
+    catch {package forget mod2::test2}
+    catch {namespace delete ::test0}
+    catch {namespace delete ::mod1}
+} -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
+
+test safe-7.0f {example modules packages, test in master interpreter, append to path} -setup {
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    # Try to load the modules and run a command from each one.
+    set code0 [catch {package require test0} msg0]
+    set code1 [catch {package require mod1::test1} msg1]
+    set code2 [catch {package require mod2::test2} msg2]
+    set out0  [test0::try0]
+    set out1  [mod1::test1::try1]
+    set out2  [mod2::test2::try2]
+
+    list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    catch {package forget test0}
+    catch {package forget mod1::test1}
+    catch {package forget mod2::test2}
+    catch {namespace delete ::test0}
+    catch {namespace delete ::mod1}
+} -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
+
 # high level general test
+# Use example packages not http1.0
 test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
-
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0]
     set i [safe::interpCreate]
-
+    set ::auto_path $tmpAutoPath
 } -body {
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
     #  package require in a slave works like in the master)
-    set v [interp eval $i {package require http 2}]
+    set v [interp eval $i {package require SafeTestPackage1}]
     # no error shall occur:
-    interp eval $i {http::config}
+    interp eval $i {HeresPackage1}
     set v
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
+} -match glob -result 1.2.3
+# high level general test
+test safe-7.1http {tests that everything works at high level, uses http 2} -body {
+    set i [safe::interpCreate]
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require http 2}]
+    # no error shall occur:
+    interp eval $i {http::config}
+    safe::interpDelete $i
+    set v
 } -match glob -result 2.*
 test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
@@ -223,16 +358,34 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventio
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # an error shall occur (http is not anymore in the secure 0-level
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
     # provided deep path)
-    list $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+    list $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 1\
+        {can't find package SafeTestPackage1}\
+        {-accessPath {[list $tcl_library */dummy/unixlike/test/path $TestsDir/auto0]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+test safe-7.2http {tests specific path and interpFind/AddToAccessPath, uses http1.0} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p1
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # an error shall occur (http is not anymore in the secure 0-level
+    # provided deep path)
+    list $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
 test safe-7.3 {check that safe subinterpreters work} {
     set i [safe::interpCreate]
@@ -255,10 +408,10 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
-    # this time, unlike test safe-7.2, http 1.0 should be found
+    set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
+    # this time, unlike test safe-7.2, SafeTestPackage1 should be found
     list $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
     # Note that the glob match elides directories (those from the module path)
@@ -267,6 +420,20 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.2.3\
+        {-accessPath {[list $tcl_library * $TestsDir/auto0/auto1]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+test safe-7.4http {tests specific path and positive search, uses http1.0} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p1
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+    # this time, unlike test safe-7.2, http should be found
+    list $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
@@ -494,6 +661,549 @@ test safe-9.6 {interpConfigure widget like behaviour} -body {
 } -cleanup {
     safe::interpDelete $i
 } -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
+test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
+   # this test shall work, believed equivalent to 9.6
+    set i [safe::interpCreate \
+	    -noStatics \
+	    -nestedLoadOk \
+	    -deleteHook {foo bar} \
+    ]
+
+	   safe::interpConfigure $i -accessPath /foo/bar
+    set a [safe::interpConfigure $i]
+    set b [safe::interpConfigure $i -aCCess]
+    set c [safe::interpConfigure $i -nested]
+    set d [safe::interpConfigure $i -statics]
+    set e [safe::interpConfigure $i -DEL]
+	   safe::interpConfigure $i -accessPath /blah -statics 1
+    set f [safe::interpConfigure $i]
+	   safe::interpConfigure $i -deleteHook toto -nosta -nested 0
+    set g [safe::interpConfigure $i]
+
+    list $a $b $c $d $e $f $g
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
+
+test safe-9.8 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset)} -setup {
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Load and run the commands.
+    # This guarantees the test will pass even if the tokens are swapped.
+    set code1 [catch {interp eval $i {report1}} msg1]
+    set code2 [catch {interp eval $i {report2}} msg2]
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset)} -setup {
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Do not load the commands.  With the tokens swapped, the test
+    # will pass only if the Safe Base has called auto_reset.
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load and run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.10 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement} -setup {
+} -body {
+    # For complete correspondence to safe-9.10opt, include auto0 in access path.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0] \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:2:)} and {$p(:3:)}.
+    # This would have no effect because the records in Pkg of these directories
+    # were from access as children of {$p(:1:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0] \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
+
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result "{\$p(:2:)} {\$p(:3:)} {\$p(:3:)} {\$p(:2:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $TestsDir/auto0 $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0 $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+
+test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0} -setup {
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+
+test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed} -setup {
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
+    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+
+    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
+        1 {* not found in access path} 1 {*} 1 {*}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.20 {check module loading} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]*}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.21 {interpConfigure change the access path; check module loading; stale data case 1} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Load pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                        $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                        $TestsDir/auto0/auto1 \
+                        $TestsDir/auto0/auto2 \
+                        $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.22 {interpConfigure change the access path; check module loading; stale data case 0} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                          [file join $TestsDir auto0 auto1] \
+                                          [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/auto1 \
+                            $TestsDir/auto0/auto2 \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.23 {interpConfigure change the access path; check module loading; stale data case 3} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Refresh stale pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/auto1 \
+                            $TestsDir/auto0/auto2 \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.24 {interpConfigure change the access path; check module loading; stale data case 2 (worst case)} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+			    $TestsDir/auto0/auto1 \
+			    $TestsDir/auto0/auto2 \
+			    $TestsDir/auto0/modules \
+			    $TestsDir/auto0/modules/mod1 \
+			    $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
 
 catch {teststaticpkg Safepkg1 0 0}
 test safe-10.1 {testing statics loading} -constraints TcltestPackage -setup {
@@ -1164,6 +1874,7 @@ test safe-19.2 {Check that each directory of the module path is a valid token} -
 
 
 set ::auto_path $saveAutoPath
+unset saveAutoPath TestsDir
 # cleanup
 ::tcltest::cleanupTests
 return
-- 
cgit v0.12


From b1d03f8f36eac45fe770b94db11c95d3e17eedf5 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Tue, 14 Jul 2020 16:49:10 +0000
Subject: Sync with bugfixes and tests pushed upstream via safe-extra-tests-8-7
 and safe-bugfixes-8-6 to core-8-branch

---
 library/safe.tcl |   57 +-
 library/tm.tcl   |    7 +-
 tests/safe.test  | 2191 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 2167 insertions(+), 88 deletions(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 84db786..9218380 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -218,11 +218,10 @@ proc ::safe::interpConfigure {args} {
 	    # Get the current (and not the default) values of whatever has
 	    # not been given:
 	    if {![::tcl::OptProcArgGiven -accessPath]} {
-		set doreset 1
+		set doreset 0
 		set accessPath $state(access_path)
-		# BUG? is doreset the wrong way round?
 	    } else {
-		set doreset 0
+		set doreset 1
 	    }
 	    if {(!$AutoPathSync) && (![::tcl::OptProcArgGiven -autoPath])} {
 		set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
@@ -252,15 +251,35 @@ proc ::safe::interpConfigure {args} {
 	    }
 	    # we can now reconfigure :
 	    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
-	    set res [InterpSetConfig $slave $accessPath $statics $nested $deleteHook $autoPath $withAutoPath]
-puts stderr [list changed_map $res do_reset $doreset]
-	    # auto_reset the slave (to completly synch the new access_path)
+	    set slave_tm_rel [InterpSetConfig $slave $accessPath $statics $nested $deleteHook $autoPath $withAutoPath]
+
+	    # auto_reset the slave (to completely synch the new access_path) tests safe-9.8 safe-9.9
 	    if {$doreset} {
 		if {[catch {::interp eval $slave {auto_reset}} msg]} {
 		    Log $slave "auto_reset failed: $msg"
 		} else {
 		    Log $slave "successful auto_reset" NOTICE
 		}
+
+		# Sync the paths used to search for Tcl modules.
+		::interp eval $slave {tcl::tm::path remove {*}[tcl::tm::list]}
+		if {[llength $state(tm_path_slave)] > 0} {
+		    ::interp eval $slave [list \
+			    ::tcl::tm::add {*}[lreverse $state(tm_path_slave)]]
+		}
+
+		# Wherever possible, refresh package/module data.
+		# - Ideally [package ifneeded $pkg $ver {}] would clear the
+		#   stale data from the interpreter, but instead it sets a
+		#   nonsense empty script.
+		# - We cannot purge stale package data, but we can overwrite
+		#   it where we have fresh data.  Any remaining stale data will
+		#   do no harm but the error messages may be cryptic.
+		::interp eval $slave [list catch {package require NOEXIST}]
+		foreach rel $slave_tm_rel {
+		    set cmd [list package require [string map {/ ::} $rel]::NOEXIST]
+		    ::interp eval $slave [list catch $cmd]
+		}
 	    }
 	}
     }
@@ -381,16 +400,13 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook au
     # We save the virtual form separately as well, as syncing it with the
     # slave has to be defered until the necessary commands are present for
     # setup.
-if {[info exists state(access_path,map)]} {
-    set old_map_access_path $state(access_path,map)
-} else {
-    set old_map_access_path {}
-}
     set norm_access_path  {}
     set slave_access_path {}
     set map_access_path   {}
     set remap_access_path {}
     set slave_tm_path     {}
+    set slave_tm_roots    {}
+    set slave_tm_rel      {}
 
     set i 0
     foreach dir $access_path {
@@ -426,6 +442,13 @@ if {[info exists state(access_path,map)]} {
 	    # Prevent the addition of dirs on the tm list to the
 	    # result if they are already known.
 	    if {[dict exists $remap_access_path $dir]} {
+	        if {$firstpass} {
+		    # $dir is in [::tcl::tm::list] and belongs in the slave_tm_path.
+		    # Later passes handle subdirectories, which belong in the
+		    # access path but not in the module path.
+		    lappend slave_tm_path  [dict get $remap_access_path $dir]
+		    lappend slave_tm_roots [file normalize $dir] [file normalize $dir]
+		}
 		continue
 	    }
 
@@ -440,6 +463,7 @@ if {[info exists state(access_path,map)]} {
 		# Later passes handle subdirectories, which belong in the
 		# access path but not in the module path.
 		lappend slave_tm_path  $token
+		lappend slave_tm_roots [file normalize $dir] [file normalize $dir]
 	    }
 	    incr i
 
@@ -450,6 +474,14 @@ if {[info exists state(access_path,map)]} {
 	    # 'platform/shell-X.tm', i.e arbitrarily deep
 	    # subdirectories.
 	    lappend morepaths {*}[glob -nocomplain -directory $dir -type d *]
+	    foreach sub [glob -nocomplain -directory $dir -type d *] {
+	        lappend slave_tm_roots [file normalize $sub] [dict get $slave_tm_roots $dir]
+	        set lenny [string length [dict get $slave_tm_roots $dir]]
+	        set relpath [string range [file normalize $sub] $lenny+1 end]
+                if {$relpath ni $slave_tm_rel} {
+	            lappend slave_tm_rel $relpath
+                }
+	    }
 	}
 	set firstpass 0
     }
@@ -466,8 +498,7 @@ if {[info exists state(access_path,map)]} {
 
     SyncAccessPath $slave
 
-    set result [expr {[lrange $map_access_path 0 end] ne [lrange $old_map_access_path 0 end]}]
-    return $result
+    return $slave_tm_rel
 }
 
 
diff --git a/library/tm.tcl b/library/tm.tcl
index 1802bb9..94ebb46 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -237,13 +237,16 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 			# acceptable to "package vcompare".
 			continue
 		    }
-
-		    if {[package ifneeded $pkgname $pkgversion] ne {}} {
+		    if {    ([package ifneeded $pkgname $pkgversion] ne {})
+			 && (![interp issafe])
+		    } {
 			# There's already a provide script registered for
 			# this version of this package.  Since all units of
 			# code claiming to be the same version of the same
 			# package ought to be identical, just stick with
 			# the one we already have.
+			# This does not apply to Safe Base interpreters because
+			# the token-to-directory mapping may have changed.
 			continue
 		    }
 
diff --git a/tests/safe.test b/tests/safe.test
index 869b9a4..75dc2bf 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -26,7 +26,63 @@ foreach i [interp slaves] {
 set saveAutoPath $::auto_path
 set ::auto_path [info library]
 
-# Force actual loading of the safe package because we use un exported (and
+# The defunct package http 1.0 was convenient for testing package loading.
+# - Replaced here with tests using example packages provided in subdirectory
+#   auto0 of the tests directory, which are independent of any changes
+#   made to the packages provided with Tcl.
+#   - These are tests 7.1 7.2 7.4 9.10 9.12 18.1 18.2 18.4
+#   - Tests 7.0[a-f] test the example packages themselves before they
+#     are used to test Safe Base interpreters.
+# - Alternatively use packages opt and (from cookiejar) tcl::idna.
+#   - These alternative tests have suffix "opt".
+#   - These are 7.[124]opt, 9.1[02]opt, 18.[124]opt.
+#   - Tests 7.[124]opt, 9.1[02]opt, 18.[124]opt use "package require opt".
+#   - Tests 9.1[02]opt also use "package require tcl::idna".
+#
+# When using package opt for testing positive/negative package search:
+# - The directory location and the error message depend on whether
+#   and how the package is installed.
+
+# Error message for tests 7.2opt, 18.2opt for "package require opt".
+if {[string match *zipfs:/* [info library]]} {
+    # pkgIndex.tcl is in [info library]
+    # file to be sourced is in [info library]/opt*
+    set pkgOptErrMsg {permission denied}
+} else {
+    # pkgIndex.tcl and file to be sourced are
+    # both in [info library]/opt*
+    set pkgOptErrMsg {can't find package opt}
+}
+
+# Directory of opt for tests 7.4opt, 9.10opt, 9.12opt, 18.4opt
+# for "package require opt".
+if {[file exists [file join [info library] opt0.4]]} {
+    # Installed files in lib8.7/opt0.4
+    set pkgOptDir opt0.4
+} elseif {[file exists [file join [info library] opt]]} {
+    # Installed files in zipfs, or source files used by "make test"
+    set pkgOptDir opt
+} else {
+    error {cannot find opt library}
+}
+
+# Directory of cookiejar for tests 9.10opt, 9.12opt
+# for "package require tcl::idna".
+if {[file exists [file join [info library] cookiejar0.2]]} {
+    # Installed files in lib8.7/cookiejar0.2
+    set pkgJarDir cookiejar0.2
+} elseif {[file exists [file join [info library] cookiejar]]} {
+    # Installed files in zipfs, or source files used by "make test"
+    set pkgJarDir cookiejar
+} else {
+    error {cannot find cookiejar library}
+}
+
+set TestsDir [file normalize [file dirname [info script]]]
+set ZipMountPoint [zipfs root]auto-files
+zipfs mount $ZipMountPoint [file join $TestsDir auto-files.zip]
+
+# Force actual loading of the safe package because we use un-exported (and
 # thus un-autoindexed) APIs in this test result arguments:
 catch {safe::interpConfigure}
 
@@ -181,8 +237,247 @@ test safe-6.3 {test safe interpreters knowledge of the world} {
 # More test should be added to check that hostname, nameofexecutable, aren't
 # leaking infos, but they still do...
 
+# Tests 7.0* test the example files before using them to test safe interpreters.
+
+test safe-7.0a {example tclIndex commands, test in master interpreter} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0 auto1] [file join $TestsDir auto0 auto2]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {0 ok1 0 ok2}
+
+test safe-7.0b {example tclIndex commands, negative test in master interpreter} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
+
+test safe-7.0c {example pkgIndex.tcl packages, test in master interpreter, child directories} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
+
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+
+test safe-7.0d {example pkgIndex.tcl packages, test in master interpreter, main directories} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0 auto1] \
+                        [file join $TestsDir auto0 auto2]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
+
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+
+test safe-7.0e {example modules packages, test in master interpreter, replace path} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    # Try to load the modules and run a command from each one.
+    set code0 [catch {package require test0} msg0]
+    set code1 [catch {package require mod1::test1} msg1]
+    set code2 [catch {package require mod2::test2} msg2]
+    set out0  [test0::try0]
+    set out1  [mod1::test1::try1]
+    set out2  [mod2::test2::try2]
+
+    list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    catch {package forget test0}
+    catch {package forget mod1::test1}
+    catch {package forget mod2::test2}
+    catch {namespace delete ::test0}
+    catch {namespace delete ::mod1}
+} -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
+
+test safe-7.0f {example modules packages, test in master interpreter, append to path} -setup {
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    # Try to load the modules and run a command from each one.
+    set code0 [catch {package require test0} msg0]
+    set code1 [catch {package require mod1::test1} msg1]
+    set code2 [catch {package require mod2::test2} msg2]
+    set out0  [test0::try0]
+    set out1  [mod1::test1::try1]
+    set out2  [mod2::test2::try2]
+
+    list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    catch {package forget test0}
+    catch {package forget mod1::test1}
+    catch {package forget mod2::test2}
+    catch {namespace delete ::test0}
+    catch {namespace delete ::mod1}
+} -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
+
+test safe-7.0az {example tclIndex commands, test in master interpreter; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0 auto1] [file join $ZipMountPoint auto0 auto2]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {0 ok1 0 ok2}
+
+test safe-7.0bz {example tclIndex commands, negative test in master interpreter; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
+
+test safe-7.0cz {example pkgIndex.tcl packages, test in master interpreter, child directories; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
+
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+
+test safe-7.0dz {example pkgIndex.tcl packages, test in master interpreter, main directories; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0 auto1] \
+                        [file join $ZipMountPoint auto0 auto2]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
+
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+
+test safe-7.0ez {example modules packages, test in master interpreter, replace path; zipfs} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+} -body {
+    # Try to load the modules and run a command from each one.
+    set code0 [catch {package require test0} msg0]
+    set code1 [catch {package require mod1::test1} msg1]
+    set code2 [catch {package require mod2::test2} msg2]
+    set out0  [test0::try0]
+    set out1  [mod1::test1::try1]
+    set out2  [mod2::test2::try2]
+
+    list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    catch {package forget test0}
+    catch {package forget mod1::test1}
+    catch {package forget mod2::test2}
+    catch {namespace delete ::test0}
+    catch {namespace delete ::mod1}
+} -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
+
+test safe-7.0fz {example modules packages, test in master interpreter, append to path; zipfs} -setup {
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+} -body {
+    # Try to load the modules and run a command from each one.
+    set code0 [catch {package require test0} msg0]
+    set code1 [catch {package require mod1::test1} msg1]
+    set code2 [catch {package require mod2::test2} msg2]
+    set out0  [test0::try0]
+    set out1  [mod1::test1::try1]
+    set out2  [mod2::test2::try2]
+
+    list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    catch {package forget test0}
+    catch {package forget mod1::test1}
+    catch {package forget mod2::test2}
+    catch {namespace delete ::test0}
+    catch {namespace delete ::mod1}
+} -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
+
+
 # high level general test
-test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
+test safe-7.1opt {tests that everything works at high level with conventional AutoPathSync, use pkg opt} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -208,7 +503,67 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
     }
 } -match glob -result 0.4.*
 
-test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
+# high level general test
+# Use example packages not tcl8.x/opt
+test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0]
+    set i [safe::interpCreate]
+    set ::auto_path $tmpAutoPath
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require SafeTestPackage1}]
+    # no error shall occur:
+    interp eval $i {HeresPackage1}
+    set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result 1.2.3
+
+# high level general test
+# Use zipped example packages not tcl8.x/opt
+test safe-7.1z {tests that everything works at high level with conventional AutoPathSync; zipfs} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $TestsDir auto0]
+    set i [safe::interpCreate]
+    set ::auto_path $tmpAutoPath
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require SafeTestPackage1}]
+    # no error shall occur:
+    interp eval $i {HeresPackage1}
+    set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result 1.2.3
+
+test safe-7.2opt {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync, use pkg opt} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -234,14 +589,83 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventio
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package opt} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {$pkgOptErrMsg}\
+        {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
+    # provided deep path)
+    list $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 1\
+        {can't find package SafeTestPackage1}\
+        {-accessPath {[list $tcl_library */dummy/unixlike/test/path $TestsDir/auto0]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-7.2z {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync; zipfs} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
+    # provided deep path)
+    list $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 1\
+        {can't find package SafeTestPackage1}\
+        {-accessPath {[list $tcl_library */dummy/unixlike/test/path $TestsDir/auto0]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+
 test safe-7.3 {check that safe subinterpreters work} {
     set i [safe::interpCreate]
     set j [safe::interpCreate [list $i x]]
     list [interp eval $j {join {o k} ""}] [safe::interpDelete $i] [interp exists $j]
 } {ok {} 0}
 
-test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
+test safe-7.4opt {tests specific path and positive search with conventional AutoPathSync, use pkg opt} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -256,8 +680,8 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] opt]]
-    # this time, unlike test safe-7.2, opt should be found
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] $pkgOptDir]]
+    # this time, unlike test safe-7.2opt, opt should be found
     list $token1 $token2 \
 	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
@@ -268,7 +692,71 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 0.4.* {-accessPath {[list $tcl_library *$tcl_library/opt]} -statics 0 -nested 1 -deleteHook {}} {}"
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 0.4.*\
+        {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
+    # this time, unlike test safe-7.2, SafeTestPackage1 should be found
+    list $token1 $token2 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+    # Note that the glob match elides directories (those from the module path)
+    # other than the first and last in the access path.
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.2.3\
+        {-accessPath {[list $tcl_library * $TestsDir/auto0/auto1]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-7.4z {tests specific path and positive search with conventional AutoPathSync; zipfs} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
+    # this time, unlike test safe-7.2z, SafeTestPackage1 should be found
+    list $token1 $token2 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+    # Note that the glob match elides directories (those from the module path)
+    # other than the first and last in the access path.
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.2.3\
+        {-accessPath {[list $tcl_library * $TestsDir/auto0/auto1]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
 
 test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
@@ -439,62 +927,1377 @@ test safe-9.1 {safe interps' deleteHook} -setup {
 	# mark that we've been here (successfully)
 	set res $args
     }
-    safe::interpCreate $i -deleteHook "testDelHook arg1 arg2"
-    list [interp eval $i exit] $res
-} -result {{} {arg1 arg2 a}}
-test safe-9.2 {safe interps' error in deleteHook} -setup {
-    catch {safe::interpDelete $i}
-    set res {}
-    set log {}
-    proc safe-test-log {str} {lappend ::log $str}
-    set prevlog [safe::setLogCmd]
-} -body {
-    proc testDelHook {args} {
-	global res
-	# the interp still exists at that point
-	interp eval a {set delete 1}
-	# mark that we've been here (successfully)
-	set res $args
-	# create an exception
-	error "being catched"
+    safe::interpCreate $i -deleteHook "testDelHook arg1 arg2"
+    list [interp eval $i exit] $res
+} -result {{} {arg1 arg2 a}}
+test safe-9.2 {safe interps' error in deleteHook} -setup {
+    catch {safe::interpDelete $i}
+    set res {}
+    set log {}
+    proc safe-test-log {str} {lappend ::log $str}
+    set prevlog [safe::setLogCmd]
+} -body {
+    proc testDelHook {args} {
+	global res
+	# the interp still exists at that point
+	interp eval a {set delete 1}
+	# mark that we've been here (successfully)
+	set res $args
+	# create an exception
+	error "being catched"
+    }
+    safe::interpCreate $i -deleteHook "testDelHook arg1 arg2"
+    safe::setLogCmd safe-test-log
+    list [safe::interpDelete $i] $res $log
+} -cleanup {
+    safe::setLogCmd $prevlog
+    unset log
+} -result {{} {arg1 arg2 a} {{NOTICE for slave a : About to delete} {ERROR for slave a : Delete hook error (being catched)} {NOTICE for slave a : Deleted}}}
+test safe-9.3 {dual specification of statics} -returnCodes error -body {
+    safe::interpCreate -stat true -nostat
+} -result {conflicting values given for -statics and -noStatics}
+test safe-9.4 {dual specification of statics} {
+    # no error shall occur
+    safe::interpDelete [safe::interpCreate -stat false -nostat]
+} {}
+test safe-9.5 {dual specification of nested} -returnCodes error -body {
+    safe::interpCreate -nested 0 -nestedload
+} -result {conflicting values given for -nested and -nestedLoadOk}
+test safe-9.6 {interpConfigure widget like behaviour} -body {
+   # this test shall work, don't try to "fix it" unless you *really* know what
+   # you are doing (ie you are me :p) -- dl
+   list [set i [safe::interpCreate \
+		    -noStatics \
+		    -nestedLoadOk \
+		    -deleteHook {foo bar}]
+         safe::interpConfigure $i -accessPath /foo/bar
+         safe::interpConfigure $i]\
+	[safe::interpConfigure $i -aCCess]\
+	[safe::interpConfigure $i -nested]\
+	[safe::interpConfigure $i -statics]\
+	[safe::interpConfigure $i -DEL]\
+	[safe::interpConfigure $i -accessPath /blah -statics 1
+	 safe::interpConfigure $i]\
+	[safe::interpConfigure $i -deleteHook toto -nosta -nested 0
+	 safe::interpConfigure $i]
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
+
+test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
+   # this test shall work, believed equivalent to 9.6
+    set i [safe::interpCreate \
+	    -noStatics \
+	    -nestedLoadOk \
+	    -deleteHook {foo bar} \
+    ]
+
+	   safe::interpConfigure $i -accessPath /foo/bar
+    set a [safe::interpConfigure $i]
+    set b [safe::interpConfigure $i -aCCess]
+    set c [safe::interpConfigure $i -nested]
+    set d [safe::interpConfigure $i -statics]
+    set e [safe::interpConfigure $i -DEL]
+	   safe::interpConfigure $i -accessPath /blah -statics 1
+    set f [safe::interpConfigure $i]
+	   safe::interpConfigure $i -deleteHook toto -nosta -nested 0
+    set g [safe::interpConfigure $i]
+
+    list $a $b $c $d $e $f $g
+} -cleanup {
+    safe::interpDelete $i
+} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
+
+test safe-9.8 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset)} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Load and run the commands.
+    # This guarantees the test will pass even if the tokens are swapped.
+    set code1 [catch {interp eval $i {report1}} msg1]
+    set code2 [catch {interp eval $i {report2}} msg2]
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset)} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Do not load the commands.  With the tokens swapped, the test
+    # will pass only if the Safe Base has called auto_reset.
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load and run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.10opt {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, use pkg opt and tcl::idna} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $tcl_library $pkgOptDir] \
+                                            [file join $tcl_library $pkgJarDir]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    # This has no effect because the records in Pkg of these directories were from access as children of {$p(:0:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $tcl_library $pkgJarDir] \
+                                           [file join $tcl_library $pkgOptDir]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require tcl::idna}} msg3]
+    set code4 [catch {interp eval $i {package require opt}} msg4]
+    set code5 [catch {interp eval $i {::tcl::Lempty {a list}}} msg5]
+    set code6 [catch {interp eval $i {::tcl::idna::IDNAencode example.com}} msg6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 \
+         $confA $confB $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.* 0 0.4.*\
+        {-accessPath {[list $tcl_library $tcl_library/$pkgOptDir $tcl_library/$pkgJarDir]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $tcl_library/$pkgJarDir $tcl_library/$pkgOptDir]*}\
+        -statics 1 -nested 0 -deleteHook {}} 0 0 0 example.com"
+
+test safe-9.10 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    # For complete correspondence to safe-9.10opt, include auto0 in access path.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0] \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:2:)} and {$p(:3:)}.
+    # This would have no effect because the records in Pkg of these directories
+    # were from access as children of {$p(:1:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0] \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
+
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:2:)} {\$p(:3:)} {\$p(:3:)} {\$p(:2:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $TestsDir/auto0 $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0 $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+
+test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+
+test safe-9.12opt {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, use pkg opt and tcl::idna} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $tcl_library $pkgOptDir] \
+                                            [file join $tcl_library $pkgJarDir]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require opt}} msg3]
+    set code6 [catch {interp eval $i {package require tcl::idna}} msg6]
+
+    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
+        1 {* not found in access path} 1 {*} 1 {*}\
+        {-accessPath {[list $tcl_library $tcl_library/$pkgOptDir $tcl_library/$pkgJarDir]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
+    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+
+    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
+        1 {* not found in access path} 1 {*} 1 {*}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.20 {check module loading} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]*}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.21 {interpConfigure change the access path; check module loading; stale data case 1} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Load pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                        $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                        $TestsDir/auto0/auto1 \
+                        $TestsDir/auto0/auto2 \
+                        $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.22 {interpConfigure change the access path; check module loading; stale data case 0} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                          [file join $TestsDir auto0 auto1] \
+                                          [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/auto1 \
+                            $TestsDir/auto0/auto2 \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.23 {interpConfigure change the access path; check module loading; stale data case 3} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Refresh stale pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/auto1 \
+                            $TestsDir/auto0/auto2 \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.24 {interpConfigure change the access path; check module loading; stale data case 2 (worst case)} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+			    $TestsDir/auto0/auto1 \
+			    $TestsDir/auto0/auto2 \
+			    $TestsDir/auto0/modules \
+			    $TestsDir/auto0/modules/mod1 \
+			    $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+
+test safe-9.8z {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset); zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Load and run the commands.
+    # This guarantees the test will pass even if the tokens are swapped.
+    set code1 [catch {interp eval $i {report1}} msg1]
+    set code2 [catch {interp eval $i {report2}} msg2]
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.9z {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset); zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Do not load the commands.  With the tokens swapped, the test
+    # will pass only if the Safe Base has called auto_reset.
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load and run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.10z {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    # For complete correspondence to safe-9.10opt, include auto0 in access path.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0] \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:2:)} and {$p(:3:)}.
+    # This would have no effect because the records in Pkg of these directories
+    # were from access as children of {$p(:1:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0] \
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
+
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:2:)} {\$p(:3:)} {\$p(:3:)} {\$p(:2:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0 $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0 $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+
+test safe-9.11z {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+
+test safe-9.12z {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
+    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+
+    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
+        1 {* not found in access path} 1 {*} 1 {*}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
+
+test safe-9.20z {check module loading; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/modules \
+                        $ZipMountPoint/auto0/modules/mod1 \
+                        $ZipMountPoint/auto0/modules/mod2]*}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.21z {interpConfigure change the access path; check module loading; stale data case 1; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto1] \
+                                           [file join $ZipMountPoint auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Load pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                        $ZipMountPoint/auto0/modules \
+                        $ZipMountPoint/auto0/modules/mod1 \
+                        $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                        $ZipMountPoint/auto0/auto1 \
+                        $ZipMountPoint/auto0/auto2 \
+                        $ZipMountPoint/auto0/modules \
+                        $ZipMountPoint/auto0/modules/mod1 \
+                        $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.22z {interpConfigure change the access path; check module loading; stale data case 0; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                          [file join $ZipMountPoint auto0 auto1] \
+                                          [file join $ZipMountPoint auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $ZipMountPoint/auto0/modules \
+                            $ZipMountPoint/auto0/modules/mod1 \
+                            $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $ZipMountPoint/auto0/auto1 \
+                            $ZipMountPoint/auto0/auto2 \
+                            $ZipMountPoint/auto0/modules \
+                            $ZipMountPoint/auto0/modules/mod1 \
+                            $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.23z {interpConfigure change the access path; check module loading; stale data case 3; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
     }
-    safe::interpCreate $i -deleteHook "testDelHook arg1 arg2"
-    safe::setLogCmd safe-test-log
-    list [safe::interpDelete $i] $res $log
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto1] \
+                                           [file join $ZipMountPoint auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Refresh stale pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
+
 } -cleanup {
-    safe::setLogCmd $prevlog
-    unset log
-} -result {{} {arg1 arg2 a} {{NOTICE for slave a : About to delete} {ERROR for slave a : Delete hook error (being catched)} {NOTICE for slave a : Deleted}}}
-test safe-9.3 {dual specification of statics} -returnCodes error -body {
-    safe::interpCreate -stat true -nostat
-} -result {conflicting values given for -statics and -noStatics}
-test safe-9.4 {dual specification of statics} {
-    # no error shall occur
-    safe::interpDelete [safe::interpCreate -stat false -nostat]
-} {}
-test safe-9.5 {dual specification of nested} -returnCodes error -body {
-    safe::interpCreate -nested 0 -nestedload
-} -result {conflicting values given for -nested and -nestedLoadOk}
-test safe-9.6 {interpConfigure widget like behaviour} -body {
-   # this test shall work, don't try to "fix it" unless you *really* know what
-   # you are doing (ie you are me :p) -- dl
-   list [set i [safe::interpCreate \
-		    -noStatics \
-		    -nestedLoadOk \
-		    -deleteHook {foo bar}]
-         safe::interpConfigure $i -accessPath /foo/bar
-         safe::interpConfigure $i]\
-	[safe::interpConfigure $i -aCCess]\
-	[safe::interpConfigure $i -nested]\
-	[safe::interpConfigure $i -statics]\
-	[safe::interpConfigure $i -DEL]\
-	[safe::interpConfigure $i -accessPath /blah -statics 1
-	 safe::interpConfigure $i]\
-	[safe::interpConfigure $i -deleteHook toto -nosta -nested 0
-	 safe::interpConfigure $i]
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $ZipMountPoint/auto0/modules \
+                            $ZipMountPoint/auto0/modules/mod1 \
+                            $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $ZipMountPoint/auto0/auto1 \
+                            $ZipMountPoint/auto0/auto2 \
+                            $ZipMountPoint/auto0/modules \
+                            $ZipMountPoint/auto0/modules/mod1 \
+                            $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+
+test safe-9.24z {interpConfigure change the access path; check module loading; stale data case 2 (worst case); zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto1] \
+                                           [file join $ZipMountPoint auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
 } -cleanup {
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
     safe::interpDelete $i
-} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $ZipMountPoint/auto0/modules \
+                            $ZipMountPoint/auto0/modules/mod1 \
+                            $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+			    $ZipMountPoint/auto0/auto1 \
+			    $ZipMountPoint/auto0/auto2 \
+			    $ZipMountPoint/auto0/modules \
+			    $ZipMountPoint/auto0/modules/mod1 \
+			    $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
 
 catch {teststaticpkg Safepkg1 0 0}
 test safe-10.1 {testing statics loading} -constraints TcltestPackage -setup {
@@ -961,7 +2764,7 @@ test safe-17.2 {Check that first element of slave auto_path (and access path) is
 
 ### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
 
-test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+test safe-18.1opt {cf. safe-7.1opt - tests that everything works at high level without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -972,13 +2775,15 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 
-    # Without AutoPathSync, we need a more complete auto_path, because the slave will use the same value.
+    # Without AutoPathSync, we need a more complete auto_path,
+    # because the slave will use the same value.
     set lib1        [info library]
     set lib2        [file dirname $lib1]
     set ::auto_TMP  $::auto_path
     set ::auto_path [list $lib1 $lib2]
 
     set i [safe::interpCreate]
+    set ::auto_path $::auto_TMP
 } -body {
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
@@ -988,14 +2793,48 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     interp eval $i {::tcl::Lempty {a list}}
     set v
 } -cleanup {
-    set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result 0.4.*
 
-test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    # Without AutoPathSync, we need a more complete auto_path,
+    # because the slave will use the same value.
+    set lib1        [info library]
+    set lib2        [file join $TestsDir auto0]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+    set ::auto_path $::auto_TMP
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require SafeTestPackage1}]
+    # no error shall occur:
+    interp eval $i HeresPackage1
+    set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result 1.2.3
+
+test safe-18.2opt {cf. safe-7.2opt - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -1011,7 +2850,7 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
     interp eval $i {set ::auto_path [list {$p(:0:)}]}
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p1
+    # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
     # an error shall occur (opt is not anymore in the secure 0-level
     # provided deep path)
@@ -1023,8 +2862,46 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package opt} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {$pkgOptErrMsg}\
+        {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
+        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+
+test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    set auto1 [interp eval $i {set ::auto_path}]
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
+    # provided deep path)
+    list $auto1 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
+        1 {can't find package SafeTestPackage1}\
+        {-accessPath {[list $tcl_library \
+                            */dummy/unixlike/test/path \
+                            $TestsDir/auto0]}\
+        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
@@ -1053,9 +2930,9 @@ test safe-18.3 {Check that default auto_path is the same as in the master interp
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -result [set ::auto_path]
+} -result $::auto_path
 
-test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+test safe-18.4opt {cf. safe-7.4opt - tests specific path and positive search and auto_path without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -1077,12 +2954,12 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
     set token1 [safe::interpAddToAccessPath $i [info library]]
 
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] opt]]
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] $pkgOptDir]]
 
     # should not have been changed by Safe Base:
     set auto2 [interp eval $i {set ::auto_path}]
 
-    # This time, unlike test safe-18.2 and the try above, opt should be found:
+    # This time, unlike test safe-18.2opt and the try above, opt should be found:
     list $auto1 $auto2 $token1 $token2 \
 	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
@@ -1091,7 +2968,55 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 0.4.* {-accessPath {[list $tcl_library *$tcl_library/opt]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 0.4.*\
+        {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
+        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+
+test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+
+    # should not have been set by Safe Base:
+    set auto1 [interp eval $i {set ::auto_path}]
+
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
+
+    # should not have been changed by Safe Base:
+    set auto2 [interp eval $i {set ::auto_path}]
+
+    set auto3 [interp eval $i [list set ::auto_path [list {$p(:0:)} $token2]]]
+
+    # This time, unlike test safe-18.2 and the try above, SafeTestPackage1 should be found:
+    list $auto1 $auto2 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+	safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
+        {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
+        -statics 0 -nested 1 -deleteHook {}\
+        -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
 
 test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
@@ -1124,6 +3049,125 @@ test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading withou
     }
 } -result {1 {can't find package shell} 0}
 
+test safe-18.1z {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    # Without AutoPathSync, we need a more complete auto_path,
+    # because the slave will use the same value.
+    set lib1        [info library]
+    set lib2        [file join $ZipMountPoint auto0]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+    set ::auto_path $::auto_TMP
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require SafeTestPackage1}]
+    # no error shall occur:
+    interp eval $i HeresPackage1
+    set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result 1.2.3
+
+test safe-18.2z {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    set auto1 [interp eval $i {set ::auto_path}]
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0]]
+    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
+    # provided deep path)
+    list $auto1 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
+        1 {can't find package SafeTestPackage1}\
+        {-accessPath {[list $tcl_library \
+                            */dummy/unixlike/test/path \
+                            $ZipMountPoint/auto0]}\
+        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+
+test safe-18.4z {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+
+    # should not have been set by Safe Base:
+    set auto1 [interp eval $i {set ::auto_path}]
+
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0]]
+
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+
+    # should not have been changed by Safe Base:
+    set auto2 [interp eval $i {set ::auto_path}]
+
+    set auto3 [interp eval $i [list set ::auto_path [list {$p(:0:)} $token2]]]
+
+    # This time, unlike test safe-18.2 and the try above, SafeTestPackage1 should be found:
+    list $auto1 $auto2 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+	safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
+        {-accessPath {[list $tcl_library *$ZipMountPoint/auto0 $ZipMountPoint/auto0/auto1]}\
+        -statics 0 -nested 1 -deleteHook {}\
+        -autoPath {[list $tcl_library $ZipMountPoint/auto0]}} {}"
+
+
 ### 19. Test tokenization of directories available to a slave.
 
 test safe-19.1 {Check that each directory of the default auto_path is a valid token} -setup {
@@ -1160,8 +3204,10 @@ test safe-19.2 {Check that each directory of the module path is a valid token} -
     safe::interpDelete $i
 } -result {}
 
-
+
 set ::auto_path $saveAutoPath
+zipfs unmount ${ZipMountPoint}
+unset pkgOptErrMsg pkgOptDir pkgJarDir saveAutoPath TestsDir ZipMountPoint
 # cleanup
 ::tcltest::cleanupTests
 return
@@ -1169,4 +3215,3 @@ return
 # Local Variables:
 # mode: tcl
 # End:
-
-- 
cgit v0.12


From eeb4747a4dc3cef279db5fd9c9415ebca8091b72 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Tue, 14 Jul 2020 16:57:38 +0000
Subject: Rearrange tests in tests/safe.test to agree with upstream order

---
 tests/safe.test | 1550 +++++++++++++++++++++++++++----------------------------
 1 file changed, 748 insertions(+), 802 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index 75dc2bf..9e942be 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -253,7 +253,20 @@ test safe-7.0a {example tclIndex commands, test in master interpreter} -setup {
     set ::auto_path $tmpAutoPath
     auto_reset
 } -match glob -result {0 ok1 0 ok2}
-
+test safe-7.0az {example tclIndex commands, test in master interpreter; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0 auto1] [file join $ZipMountPoint auto0 auto2]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {0 ok1 0 ok2}
 test safe-7.0b {example tclIndex commands, negative test in master interpreter} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0]
@@ -268,7 +281,20 @@ test safe-7.0b {example tclIndex commands, negative test in master interpreter}
     set ::auto_path $tmpAutoPath
     auto_reset
 } -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
-
+test safe-7.0bz {example tclIndex commands, negative test in master interpreter; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0]
+} -body {
+    # Try to load the commands.
+    set code3 [catch report1 msg3]
+    set code4 [catch report2 msg4]
+    list $code3 $msg3 $code4 $msg4
+} -cleanup {
+    catch {rename report1 {}}
+    catch {rename report2 {}}
+    set ::auto_path $tmpAutoPath
+    auto_reset
+} -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
 test safe-7.0c {example pkgIndex.tcl packages, test in master interpreter, child directories} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0]
@@ -287,7 +313,24 @@ test safe-7.0c {example pkgIndex.tcl packages, test in master interpreter, child
     catch {rename HeresPackage1 {}}
     catch {rename HeresPackage2 {}}
 } -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+test safe-7.0cz {example pkgIndex.tcl packages, test in master interpreter, child directories; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
 
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
 test safe-7.0d {example pkgIndex.tcl packages, test in master interpreter, main directories} -setup {
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0 auto1] \
@@ -307,7 +350,25 @@ test safe-7.0d {example pkgIndex.tcl packages, test in master interpreter, main
     catch {rename HeresPackage1 {}}
     catch {rename HeresPackage2 {}}
 } -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
+test safe-7.0dz {example pkgIndex.tcl packages, test in master interpreter, main directories; zipfs} -setup {
+    set tmpAutoPath $::auto_path
+    lappend ::auto_path [file join $ZipMountPoint auto0 auto1] \
+                        [file join $ZipMountPoint auto0 auto2]
+} -body {
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {package require SafeTestPackage1} msg3]
+    set code4 [catch {package require SafeTestPackage2} msg4]
+    set code5 [catch HeresPackage1 msg5]
+    set code6 [catch HeresPackage2 msg6]
 
+    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
+} -cleanup {
+    set ::auto_path $tmpAutoPath
+    catch {package forget SafeTestPackage1}
+    catch {package forget SafeTestPackage2}
+    catch {rename HeresPackage1 {}}
+    catch {rename HeresPackage2 {}}
+} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
 test safe-7.0e {example modules packages, test in master interpreter, replace path} -setup {
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -335,9 +396,12 @@ test safe-7.0e {example modules packages, test in master interpreter, replace pa
     catch {namespace delete ::test0}
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
-
-test safe-7.0f {example modules packages, test in master interpreter, append to path} -setup {
-    tcl::tm::path add [file join $TestsDir auto0 modules]
+test safe-7.0ez {example modules packages, test in master interpreter, replace path; zipfs} -setup {
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
 } -body {
     # Try to load the modules and run a command from each one.
     set code0 [catch {package require test0} msg0]
@@ -349,89 +413,18 @@ test safe-7.0f {example modules packages, test in master interpreter, append to
 
     list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
 } -cleanup {
-    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
     catch {package forget test0}
     catch {package forget mod1::test1}
     catch {package forget mod2::test2}
     catch {namespace delete ::test0}
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
-
-test safe-7.0az {example tclIndex commands, test in master interpreter; zipfs} -setup {
-    set tmpAutoPath $::auto_path
-    lappend ::auto_path [file join $ZipMountPoint auto0 auto1] [file join $ZipMountPoint auto0 auto2]
-} -body {
-    # Try to load the commands.
-    set code3 [catch report1 msg3]
-    set code4 [catch report2 msg4]
-    list $code3 $msg3 $code4 $msg4
-} -cleanup {
-    catch {rename report1 {}}
-    catch {rename report2 {}}
-    set ::auto_path $tmpAutoPath
-    auto_reset
-} -match glob -result {0 ok1 0 ok2}
-
-test safe-7.0bz {example tclIndex commands, negative test in master interpreter; zipfs} -setup {
-    set tmpAutoPath $::auto_path
-    lappend ::auto_path [file join $ZipMountPoint auto0]
-} -body {
-    # Try to load the commands.
-    set code3 [catch report1 msg3]
-    set code4 [catch report2 msg4]
-    list $code3 $msg3 $code4 $msg4
-} -cleanup {
-    catch {rename report1 {}}
-    catch {rename report2 {}}
-    set ::auto_path $tmpAutoPath
-    auto_reset
-} -match glob -result {1 {invalid command name "report1"} 1 {invalid command name "report2"}}
-
-test safe-7.0cz {example pkgIndex.tcl packages, test in master interpreter, child directories; zipfs} -setup {
-    set tmpAutoPath $::auto_path
-    lappend ::auto_path [file join $ZipMountPoint auto0]
-} -body {
-    # Try to load the packages and run a command from each one.
-    set code3 [catch {package require SafeTestPackage1} msg3]
-    set code4 [catch {package require SafeTestPackage2} msg4]
-    set code5 [catch HeresPackage1 msg5]
-    set code6 [catch HeresPackage2 msg6]
-
-    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
-} -cleanup {
-    set ::auto_path $tmpAutoPath
-    catch {package forget SafeTestPackage1}
-    catch {package forget SafeTestPackage2}
-    catch {rename HeresPackage1 {}}
-    catch {rename HeresPackage2 {}}
-} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
-
-test safe-7.0dz {example pkgIndex.tcl packages, test in master interpreter, main directories; zipfs} -setup {
-    set tmpAutoPath $::auto_path
-    lappend ::auto_path [file join $ZipMountPoint auto0 auto1] \
-                        [file join $ZipMountPoint auto0 auto2]
-} -body {
-    # Try to load the packages and run a command from each one.
-    set code3 [catch {package require SafeTestPackage1} msg3]
-    set code4 [catch {package require SafeTestPackage2} msg4]
-    set code5 [catch HeresPackage1 msg5]
-    set code6 [catch HeresPackage2 msg6]
-
-    list $code3 $msg3 $code4 $msg4 $code5 $msg5 $code6 $msg6
-} -cleanup {
-    set ::auto_path $tmpAutoPath
-    catch {package forget SafeTestPackage1}
-    catch {package forget SafeTestPackage2}
-    catch {rename HeresPackage1 {}}
-    catch {rename HeresPackage2 {}}
-} -match glob -result {0 1.2.3 0 2.3.4 0 OK1 0 OK2}
-
-test safe-7.0ez {example modules packages, test in master interpreter, replace path; zipfs} -setup {
-    set oldTm [tcl::tm::path list]
-    foreach path $oldTm {
-        tcl::tm::path remove $path
-    }
-    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+test safe-7.0f {example modules packages, test in master interpreter, append to path} -setup {
+    tcl::tm::path add [file join $TestsDir auto0 modules]
 } -body {
     # Try to load the modules and run a command from each one.
     set code0 [catch {package require test0} msg0]
@@ -443,17 +436,13 @@ test safe-7.0ez {example modules packages, test in master interpreter, replace p
 
     list $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $out0 $out1 $out2
 } -cleanup {
-    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
-    foreach path [lreverse $oldTm] {
-        tcl::tm::path add $path
-    }
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
     catch {package forget test0}
     catch {package forget mod1::test1}
     catch {package forget mod2::test2}
     catch {namespace delete ::test0}
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
-
 test safe-7.0fz {example modules packages, test in master interpreter, append to path; zipfs} -setup {
     tcl::tm::path add [file join $ZipMountPoint auto0 modules]
 } -body {
@@ -475,34 +464,6 @@ test safe-7.0fz {example modules packages, test in master interpreter, append to
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
 
-
-# high level general test
-test safe-7.1opt {tests that everything works at high level with conventional AutoPathSync, use pkg opt} -setup {
-    # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-
-    set i [safe::interpCreate]
-
-} -body {
-    # no error shall occur:
-    # (because the default access_path shall include 1st level sub dirs so
-    #  package require in a slave works like in the master)
-    set v [interp eval $i {package require opt}]
-    # no error shall occur:
-    interp eval $i {::tcl::Lempty {a list}}
-    set v
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -match glob -result 0.4.*
-
 # high level general test
 # Use example packages not tcl8.x/opt
 test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
@@ -532,7 +493,6 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result 1.2.3
-
 # high level general test
 # Use zipped example packages not tcl8.x/opt
 test safe-7.1z {tests that everything works at high level with conventional AutoPathSync; zipfs} -setup {
@@ -562,37 +522,32 @@ test safe-7.1z {tests that everything works at high level with conventional Auto
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result 1.2.3
-
-test safe-7.2opt {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync, use pkg opt} -setup {
+# high level general test
+test safe-7.1opt {tests that everything works at high level with conventional AutoPathSync, use pkg opt} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
-    } else {
-        set SyncVal_TMP 1
     }
+
+    set i [safe::interpCreate]
+
 } -body {
-    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
-    # should not add anything (p0)
-    set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # an error shall occur (opt is not anymore in the secure 0-level
-    # provided deep path)
-    list $token1 $token2 \
-	    [catch {interp eval $i {package require opt}} msg] $msg \
-	    [safe::interpConfigure $i]\
-	    [safe::interpDelete $i]
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require opt}]
+    # no error shall occur:
+    interp eval $i {::tcl::Lempty {a list}}
+    set v
 } -cleanup {
+    safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {$pkgOptErrMsg}\
-        {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
-        -statics 0 -nested 1 -deleteHook {}} {}"
-
+} -match glob -result 0.4.*
 test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -625,7 +580,6 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventio
         {can't find package SafeTestPackage1}\
         {-accessPath {[list $tcl_library */dummy/unixlike/test/path $TestsDir/auto0]}\
         -statics 0 -nested 1 -deleteHook {}} {}"
-
 test safe-7.2z {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync; zipfs} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -658,14 +612,7 @@ test safe-7.2z {tests specific path and interpFind/AddToAccessPath with conventi
         {can't find package SafeTestPackage1}\
         {-accessPath {[list $tcl_library */dummy/unixlike/test/path $TestsDir/auto0]}\
         -statics 0 -nested 1 -deleteHook {}} {}"
-
-test safe-7.3 {check that safe subinterpreters work} {
-    set i [safe::interpCreate]
-    set j [safe::interpCreate [list $i x]]
-    list [interp eval $j {join {o k} ""}] [safe::interpDelete $i] [interp exists $j]
-} {ok {} 0}
-
-test safe-7.4opt {tests specific path and positive search with conventional AutoPathSync, use pkg opt} -setup {
+test safe-7.2opt {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync, use pkg opt} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -680,22 +627,25 @@ test safe-7.4opt {tests specific path and positive search with conventional Auto
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] $pkgOptDir]]
-    # this time, unlike test safe-7.2opt, opt should be found
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # an error shall occur (opt is not anymore in the secure 0-level
+    # provided deep path)
     list $token1 $token2 \
 	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
-    # Note that the glob match elides directories (those from the module path)
-    # other than the first and last in the access path.
 } -cleanup {
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 0.4.*\
-        {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {$pkgOptErrMsg}\
+        {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
         -statics 0 -nested 1 -deleteHook {}} {}"
-
+test safe-7.3 {check that safe subinterpreters work} {
+    set i [safe::interpCreate]
+    set j [safe::interpCreate [list $i x]]
+    list [interp eval $j {join {o k} ""}] [safe::interpDelete $i] [interp exists $j]
+} {ok {} 0}
 test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -726,7 +676,6 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.2.3\
         {-accessPath {[list $tcl_library * $TestsDir/auto0/auto1]}\
         -statics 0 -nested 1 -deleteHook {}} {}"
-
 test safe-7.4z {tests specific path and positive search with conventional AutoPathSync; zipfs} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -757,8 +706,38 @@ test safe-7.4z {tests specific path and positive search with conventional AutoPa
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 1.2.3\
         {-accessPath {[list $tcl_library * $TestsDir/auto0/auto1]}\
         -statics 0 -nested 1 -deleteHook {}} {}"
-
-test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
+test safe-7.4opt {tests specific path and positive search with conventional AutoPathSync, use pkg opt} -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] $pkgOptDir]]
+    # this time, unlike test safe-7.2opt, opt should be found
+    list $token1 $token2 \
+	    [catch {interp eval $i {package require opt}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+    # Note that the glob match elides directories (those from the module path)
+    # other than the first and last in the access path.
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 0 0.4.*\
+        {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
+        -statics 0 -nested 1 -deleteHook {}} {}"
+
+test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -983,7 +962,6 @@ test safe-9.6 {interpConfigure widget like behaviour} -body {
 } -cleanup {
     safe::interpDelete $i
 } -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
-
 test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
    # this test shall work, believed equivalent to 9.6
     set i [safe::interpCreate \
@@ -1007,7 +985,6 @@ test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
 } -cleanup {
     safe::interpDelete $i
 } -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
-
 test safe-9.8 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset)} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -1057,7 +1034,55 @@ test safe-9.8 {interpConfigure change the access path; tclIndex commands unaffec
         -statics 1 -nested 0 -deleteHook {}}\
         {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
         -statics 1 -nested 0 -deleteHook {}}"
+test safe-9.8z {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset); zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Load and run the commands.
+    # This guarantees the test will pass even if the tokens are swapped.
+    set code1 [catch {interp eval $i {report1}} msg1]
+    set code2 [catch {interp eval $i {report2}} msg2]
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
 
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
 test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset)} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -1105,8 +1130,7 @@ test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffec
         -statics 1 -nested 0 -deleteHook {}}\
         {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
         -statics 1 -nested 0 -deleteHook {}}"
-
-test safe-9.10opt {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, use pkg opt and tcl::idna} -setup {
+test safe-9.9z {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset); zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1114,47 +1138,45 @@ test safe-9.10opt {interpConfigure change the access path; pkgIndex.tcl packages
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $tcl_library $pkgOptDir] \
-                                            [file join $tcl_library $pkgJarDir]]]
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
-    set path1 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
 
-    # Load pkgIndex.tcl data.
-    catch {interp eval $i {package require NOEXIST}}
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Do not load the commands.  With the tokens swapped, the test
+    # will pass only if the Safe Base has called auto_reset.
 
     # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
-    # This has no effect because the records in Pkg of these directories were from access as children of {$p(:0:)}.
     safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $tcl_library $pkgJarDir] \
-                                           [file join $tcl_library $pkgOptDir]]
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
-    set path3 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
 
-    # Try to load the packages and run a command from each one.
-    set code3 [catch {interp eval $i {package require tcl::idna}} msg3]
-    set code4 [catch {interp eval $i {package require opt}} msg4]
-    set code5 [catch {interp eval $i {::tcl::Lempty {a list}}} msg5]
-    set code6 [catch {interp eval $i {::tcl::idna::IDNAencode example.com}} msg6]
+    # Load and run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
 
-    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 \
-         $confA $confB $code5 $msg5 $code6 $msg6
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.* 0 0.4.*\
-        {-accessPath {[list $tcl_library $tcl_library/$pkgOptDir $tcl_library/$pkgJarDir]*}\
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
         -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library $tcl_library/$pkgJarDir $tcl_library/$pkgOptDir]*}\
-        -statics 1 -nested 0 -deleteHook {}} 0 0 0 example.com"
-
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}"
 test safe-9.10 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -1210,35 +1232,40 @@ test safe-9.10 {interpConfigure change the access path; pkgIndex.tcl packages un
         {-accessPath {[list $tcl_library $TestsDir/auto0 $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
         -statics 1 -nested 0 -deleteHook {}}\
         0 OK1 0 OK2"
-
-test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0} -setup {
+test safe-9.10z {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement; zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
 } -body {
+    # For complete correspondence to safe-9.10opt, include auto0 in access path.
     set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $TestsDir auto0 auto1] \
-                                            [file join $TestsDir auto0 auto2]]]
+                                            [file join $ZipMountPoint auto0] \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
-    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
 
     # Load pkgIndex.tcl data.
     catch {interp eval $i {package require NOEXIST}}
 
-    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    # Rearrange access path.  Swap tokens {$p(:2:)} and {$p(:3:)}.
+    # This would have no effect because the records in Pkg of these directories
+    # were from access as children of {$p(:1:)}.
     safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $TestsDir auto0 auto2] \
-                                           [file join $TestsDir auto0 auto1]]
+                                           [file join $ZipMountPoint auto0] \
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
-    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
 
     # Try to load the packages and run a command from each one.
     set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
@@ -1248,19 +1275,19 @@ test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages un
 
     list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
          $code5 $msg5 $code6 $msg6
+
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.2.3 0 2.3.4\
-        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+} -match glob -result "{\$p(:2:)} {\$p(:3:)} {\$p(:3:)} {\$p(:2:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0 $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
         -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0 $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
         -statics 1 -nested 0 -deleteHook {}}\
         0 OK1 0 OK2"
-
-test safe-9.12opt {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, use pkg opt and tcl::idna} -setup {
+test safe-9.10opt {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, use pkg opt and tcl::idna} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1279,31 +1306,36 @@ test safe-9.12opt {interpConfigure change the access path; pkgIndex.tcl packages
     # Load pkgIndex.tcl data.
     catch {interp eval $i {package require NOEXIST}}
 
-    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
-    safe::interpConfigure $i -accessPath [list $tcl_library]
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    # This has no effect because the records in Pkg of these directories were from access as children of {$p(:0:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $tcl_library $pkgJarDir] \
+                                           [file join $tcl_library $pkgOptDir]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
-    set code4 [catch {::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]} path4]
-    set code5 [catch {::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]} path5]
+    set path3 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]]
 
-    # Try to load the packages.
-    set code3 [catch {interp eval $i {package require opt}} msg3]
-    set code6 [catch {interp eval $i {package require tcl::idna}} msg6]
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require tcl::idna}} msg3]
+    set code4 [catch {interp eval $i {package require opt}} msg4]
+    set code5 [catch {interp eval $i {::tcl::Lempty {a list}}} msg5]
+    set code6 [catch {interp eval $i {::tcl::idna::IDNAencode example.com}} msg6]
 
-    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 \
+         $confA $confB $code5 $msg5 $code6 $msg6
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
-        1 {* not found in access path} 1 {*} 1 {*}\
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.* 0 0.4.*\
         {-accessPath {[list $tcl_library $tcl_library/$pkgOptDir $tcl_library/$pkgJarDir]*}\
         -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
-
-test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed} -setup {
+        {-accessPath {[list $tcl_library $tcl_library/$pkgJarDir $tcl_library/$pkgOptDir]*}\
+        -statics 1 -nested 0 -deleteHook {}} 0 0 0 example.com"
+test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1322,79 +1354,210 @@ test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages fa
     # Load pkgIndex.tcl data.
     catch {interp eval $i {package require NOEXIST}}
 
-    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
-    safe::interpConfigure $i -accessPath [list $tcl_library]
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
-    set code4 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]} path4]
-    set code5 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]} path5]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
 
-    # Try to load the packages.
-    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
-    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
 
-    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
-        1 {* not found in access path} 1 {*} 1 {*}\
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.2.3 0 2.3.4\
         {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
         -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
-
-test safe-9.20 {check module loading} -setup {
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto2 $TestsDir/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+test safe-9.11z {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0; zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
-    set oldTm [tcl::tm::path list]
-    foreach path $oldTm {
-        tcl::tm::path remove $path
-    }
-    tcl::tm::path add [file join $TestsDir auto0 modules]
 } -body {
-    set i [safe::interpCreate -accessPath [list $tcl_library]]
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
-    set modsA [interp eval $i {tcl::tm::path list}]
-    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
-    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
 
-    # Try to load the packages and run a command from each one.
-    set code0 [catch {interp eval $i {package require test0}} msg0]
-    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
-    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
-    set out0  [interp eval $i {test0::try0}]
-    set out1  [interp eval $i {mod1::test1::try1}]
-    set out2  [interp eval $i {mod2::test2::try2}]
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
 
-    list $path0 $path1 $path2 -- $modsA -- \
-         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $out0 $out1 $out2
-} -cleanup {
-    tcl::tm::path remove [file join $TestsDir auto0 modules]
-    foreach path [lreverse $oldTm] {
-        tcl::tm::path add $path
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $ZipMountPoint auto0 auto2] \
+                                           [file join $ZipMountPoint auto0 auto1]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
+         $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.2.3 0 2.3.4\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        0 OK1 0 OK2"
+test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
     }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
+    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+
+    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+} -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
-        0 0.5 0 1.0 0 2.0 --\
-        {-accessPath {[list $tcl_library $TestsDir/auto0/modules \
-                        $TestsDir/auto0/modules/mod1 \
-                        $TestsDir/auto0/modules/mod2]*}\
-        -statics 1 -nested 0 -deleteHook {}} --\
-        res0 res1 res2"
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
+        1 {* not found in access path} 1 {*} 1 {*}\
+        {-accessPath {[list $tcl_library $TestsDir/auto0/auto1 $TestsDir/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
+test safe-9.12z {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed; zipfs} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $ZipMountPoint auto0 auto1] \
+                                            [file join $ZipMountPoint auto0 auto2]]]
 
-test safe-9.21 {interpConfigure change the access path; check module loading; stale data case 1} -setup {
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
+    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+
+    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
+        1 {* not found in access path} 1 {*} 1 {*}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
+test safe-9.12opt {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, use pkg opt and tcl::idna} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $tcl_library $pkgOptDir] \
+                                            [file join $tcl_library $pkgJarDir]]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set path1 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $tcl_library $pkgOptDir]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $tcl_library $pkgJarDir]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require opt}} msg3]
+    set code6 [catch {interp eval $i {package require tcl::idna}} msg6]
+
+    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
+        1 {* not found in access path} 1 {*} 1 {*}\
+        {-accessPath {[list $tcl_library $tcl_library/$pkgOptDir $tcl_library/$pkgJarDir]*}\
+        -statics 1 -nested 0 -deleteHook {}}\
+        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
+test safe-9.20 {check module loading} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1415,24 +1578,6 @@ test safe-9.21 {interpConfigure change the access path; check module loading; st
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
-    # Add to access path.
-    # This injects more tokens, pushing modules to higher token numbers.
-    safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $TestsDir auto0 auto1] \
-                                           [file join $TestsDir auto0 auto2]]
-
-    # Inspect.
-    set confB [safe::interpConfigure $i]
-    set modsB [interp eval $i {tcl::tm::path list}]
-    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
-    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
-
-    # Load pkg data.
-    catch {interp eval $i {package require NOEXIST}}
-    catch {interp eval $i {package require mod1::NOEXIST}}
-    catch {interp eval $i {package require mod2::NOEXIST}}
-
     # Try to load the packages and run a command from each one.
     set code0 [catch {interp eval $i {package require test0}} msg0]
     set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
@@ -1441,9 +1586,8 @@ test safe-9.21 {interpConfigure change the access path; check module loading; st
     set out1  [interp eval $i {mod1::test1::try1}]
     set out2  [interp eval $i {mod2::test2::try2}]
 
-    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
-         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
-         $out0 $out1 $out2
+    list $path0 $path1 $path2 -- $modsA -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $out0 $out1 $out2
 } -cleanup {
     tcl::tm::path remove [file join $TestsDir auto0 modules]
     foreach path [lreverse $oldTm] {
@@ -1454,23 +1598,13 @@ test safe-9.21 {interpConfigure change the access path; check module loading; st
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
-        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
-        {-accessPath {[list $tcl_library \
-                        $TestsDir/auto0/modules \
-                        $TestsDir/auto0/modules/mod1 \
-                        $TestsDir/auto0/modules/mod2]}\
-        -statics 1 -nested 0 -deleteHook {}} --\
-        {-accessPath {[list $tcl_library \
-                        $TestsDir/auto0/auto1 \
-                        $TestsDir/auto0/auto2 \
-                        $TestsDir/auto0/modules \
+        {-accessPath {[list $tcl_library $TestsDir/auto0/modules \
                         $TestsDir/auto0/modules/mod1 \
-                        $TestsDir/auto0/modules/mod2]}\
+                        $TestsDir/auto0/modules/mod2]*}\
         -statics 1 -nested 0 -deleteHook {}} --\
         res0 res1 res2"
-
-test safe-9.22 {interpConfigure change the access path; check module loading; stale data case 0} -setup {
+test safe-9.20z {check module loading; zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1480,29 +1614,16 @@ test safe-9.22 {interpConfigure change the access path; check module loading; st
     foreach path $oldTm {
         tcl::tm::path remove $path
     }
-    tcl::tm::path add [file join $TestsDir auto0 modules]
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
     set modsA [interp eval $i {tcl::tm::path list}]
-    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
-    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
-
-    # Add to access path.
-    # This injects more tokens, pushing modules to higher token numbers.
-    safe::interpConfigure $i -accessPath [list $tcl_library \
-                                          [file join $TestsDir auto0 auto1] \
-                                          [file join $TestsDir auto0 auto2]]
-
-    # Inspect.
-    set confB [safe::interpConfigure $i]
-    set modsB [interp eval $i {tcl::tm::path list}]
-    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
-    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
 
     # Try to load the packages and run a command from each one.
     set code0 [catch {interp eval $i {package require test0}} msg0]
@@ -1512,11 +1633,10 @@ test safe-9.22 {interpConfigure change the access path; check module loading; st
     set out1  [interp eval $i {mod1::test1::try1}]
     set out2  [interp eval $i {mod2::test2::try2}]
 
-    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
-         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
-         $out0 $out1 $out2
+    list $path0 $path1 $path2 -- $modsA -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $out0 $out1 $out2
 } -cleanup {
-    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
     foreach path [lreverse $oldTm] {
         tcl::tm::path add $path
     }
@@ -1525,23 +1645,13 @@ test safe-9.22 {interpConfigure change the access path; check module loading; st
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
-        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
-        {-accessPath {[list $tcl_library \
-                            $TestsDir/auto0/modules \
-                            $TestsDir/auto0/modules/mod1 \
-                            $TestsDir/auto0/modules/mod2]}\
-        -statics 1 -nested 0 -deleteHook {}} --\
-        {-accessPath {[list $tcl_library \
-                            $TestsDir/auto0/auto1 \
-                            $TestsDir/auto0/auto2 \
-                            $TestsDir/auto0/modules \
-                            $TestsDir/auto0/modules/mod1 \
-                            $TestsDir/auto0/modules/mod2]}\
+        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/modules \
+                        $ZipMountPoint/auto0/modules/mod1 \
+                        $ZipMountPoint/auto0/modules/mod2]*}\
         -statics 1 -nested 0 -deleteHook {}} --\
         res0 res1 res2"
-
-test safe-9.23 {interpConfigure change the access path; check module loading; stale data case 3} -setup {
+test safe-9.21 {interpConfigure change the access path; check module loading; stale data case 1} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1562,11 +1672,6 @@ test safe-9.23 {interpConfigure change the access path; check module loading; st
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
-    # Force the interpreter to acquire pkg data which will soon become stale.
-    catch {interp eval $i {package require NOEXIST}}
-    catch {interp eval $i {package require mod1::NOEXIST}}
-    catch {interp eval $i {package require mod2::NOEXIST}}
-
     # Add to access path.
     # This injects more tokens, pushing modules to higher token numbers.
     safe::interpConfigure $i -accessPath [list $tcl_library \
@@ -1580,7 +1685,7 @@ test safe-9.23 {interpConfigure change the access path; check module loading; st
     set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
     set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
-    # Refresh stale pkg data.
+    # Load pkg data.
     catch {interp eval $i {package require NOEXIST}}
     catch {interp eval $i {package require mod1::NOEXIST}}
     catch {interp eval $i {package require mod2::NOEXIST}}
@@ -1596,7 +1701,6 @@ test safe-9.23 {interpConfigure change the access path; check module loading; st
     list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
          $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
          $out0 $out1 $out2
-
 } -cleanup {
     tcl::tm::path remove [file join $TestsDir auto0 modules]
     foreach path [lreverse $oldTm] {
@@ -1610,20 +1714,19 @@ test safe-9.23 {interpConfigure change the access path; check module loading; st
         {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
         {-accessPath {[list $tcl_library \
-                            $TestsDir/auto0/modules \
-                            $TestsDir/auto0/modules/mod1 \
-                            $TestsDir/auto0/modules/mod2]}\
-        -statics 1 -nested 0 -deleteHook {}} --\
+                        $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
         {-accessPath {[list $tcl_library \
-                            $TestsDir/auto0/auto1 \
-                            $TestsDir/auto0/auto2 \
-                            $TestsDir/auto0/modules \
-                            $TestsDir/auto0/modules/mod1 \
-                            $TestsDir/auto0/modules/mod2]}\
+                        $TestsDir/auto0/auto1 \
+                        $TestsDir/auto0/auto2 \
+                        $TestsDir/auto0/modules \
+                        $TestsDir/auto0/modules/mod1 \
+                        $TestsDir/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         res0 res1 res2"
-
-test safe-9.24 {interpConfigure change the access path; check module loading; stale data case 2 (worst case)} -setup {
+test safe-9.21z {interpConfigure change the access path; check module loading; stale data case 1; zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1633,34 +1736,34 @@ test safe-9.24 {interpConfigure change the access path; check module loading; st
     foreach path $oldTm {
         tcl::tm::path remove $path
     }
-    tcl::tm::path add [file join $TestsDir auto0 modules]
+    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
     set modsA [interp eval $i {tcl::tm::path list}]
-    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
-    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
-
-    # Force the interpreter to acquire pkg data which will soon become stale.
-    catch {interp eval $i {package require NOEXIST}}
-    catch {interp eval $i {package require mod1::NOEXIST}}
-    catch {interp eval $i {package require mod2::NOEXIST}}
+    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
 
     # Add to access path.
     # This injects more tokens, pushing modules to higher token numbers.
     safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $TestsDir auto0 auto1] \
-                                           [file join $TestsDir auto0 auto2]]
+                                           [file join $ZipMountPoint auto0 auto1] \
+                                           [file join $ZipMountPoint auto0 auto2]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
     set modsB [interp eval $i {tcl::tm::path list}]
-    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
-    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
+    # Load pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
 
     # Try to load the packages and run a command from each one.
     set code0 [catch {interp eval $i {package require test0}} msg0]
@@ -1674,7 +1777,7 @@ test safe-9.24 {interpConfigure change the access path; check module loading; st
          $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
          $out0 $out1 $out2
 } -cleanup {
-    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
     foreach path [lreverse $oldTm] {
         tcl::tm::path add $path
     }
@@ -1686,267 +1789,89 @@ test safe-9.24 {interpConfigure change the access path; check module loading; st
         {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
         {-accessPath {[list $tcl_library \
-                            $TestsDir/auto0/modules \
-                            $TestsDir/auto0/modules/mod1 \
-                            $TestsDir/auto0/modules/mod2]}\
+                        $ZipMountPoint/auto0/modules \
+                        $ZipMountPoint/auto0/modules/mod1 \
+                        $ZipMountPoint/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         {-accessPath {[list $tcl_library \
-			    $TestsDir/auto0/auto1 \
-			    $TestsDir/auto0/auto2 \
-			    $TestsDir/auto0/modules \
-			    $TestsDir/auto0/modules/mod1 \
-			    $TestsDir/auto0/modules/mod2]}\
-        -statics 1 -nested 0 -deleteHook {}} --\
-        res0 res1 res2"
-
-
-test safe-9.8z {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset); zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-} -body {
-    set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $ZipMountPoint auto0 auto1] \
-                                            [file join $ZipMountPoint auto0 auto2]]]
-
-    # Inspect.
-    set confA [safe::interpConfigure $i]
-    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Load auto_load data.
-    interp eval $i {catch nonExistentCommand}
-
-    # Load and run the commands.
-    # This guarantees the test will pass even if the tokens are swapped.
-    set code1 [catch {interp eval $i {report1}} msg1]
-    set code2 [catch {interp eval $i {report2}} msg2]
-
-    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
-    safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $ZipMountPoint auto0 auto2] \
-                                           [file join $ZipMountPoint auto0 auto1]]
-
-    # Inspect.
-    set confB [safe::interpConfigure $i]
-    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Run the commands.
-    set code3 [catch {interp eval $i {report1}} msg3]
-    set code4 [catch {interp eval $i {report2}} msg4]
-
-    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
-        -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
-        -statics 1 -nested 0 -deleteHook {}}"
-
-test safe-9.9z {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset); zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-} -body {
-    set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $ZipMountPoint auto0 auto1] \
-                                            [file join $ZipMountPoint auto0 auto2]]]
-
-    # Inspect.
-    set confA [safe::interpConfigure $i]
-    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Load auto_load data.
-    interp eval $i {catch nonExistentCommand}
-
-    # Do not load the commands.  With the tokens swapped, the test
-    # will pass only if the Safe Base has called auto_reset.
-
-    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
-    safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $ZipMountPoint auto0 auto2] \
-                                           [file join $ZipMountPoint auto0 auto1]]
-
-    # Inspect.
-    set confB [safe::interpConfigure $i]
-    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Load and run the commands.
-    set code3 [catch {interp eval $i {report1}} msg3]
-    set code4 [catch {interp eval $i {report2}} msg4]
-
-    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 ok1 0 ok2\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
-        -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
-        -statics 1 -nested 0 -deleteHook {}}"
-
-test safe-9.10z {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-} -body {
-    # For complete correspondence to safe-9.10opt, include auto0 in access path.
-    set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $ZipMountPoint auto0] \
-                                            [file join $ZipMountPoint auto0 auto1] \
-                                            [file join $ZipMountPoint auto0 auto2]]]
-
-    # Inspect.
-    set confA [safe::interpConfigure $i]
-    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0]]
-    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Load pkgIndex.tcl data.
-    catch {interp eval $i {package require NOEXIST}}
-
-    # Rearrange access path.  Swap tokens {$p(:2:)} and {$p(:3:)}.
-    # This would have no effect because the records in Pkg of these directories
-    # were from access as children of {$p(:1:)}.
-    safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $ZipMountPoint auto0] \
-                                           [file join $ZipMountPoint auto0 auto2] \
-                                           [file join $ZipMountPoint auto0 auto1]]
-
-    # Inspect.
-    set confB [safe::interpConfigure $i]
-    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Try to load the packages and run a command from each one.
-    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
-    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
-    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
-    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
-
-    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
-         $code5 $msg5 $code6 $msg6
-
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -match glob -result "{\$p(:2:)} {\$p(:3:)} {\$p(:3:)} {\$p(:2:)} 0 1.2.3 0 2.3.4\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0 $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
-        -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0 $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
-        -statics 1 -nested 0 -deleteHook {}}\
-        0 OK1 0 OK2"
-
-test safe-9.11z {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-} -body {
-    set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $ZipMountPoint auto0 auto1] \
-                                            [file join $ZipMountPoint auto0 auto2]]]
-
-    # Inspect.
-    set confA [safe::interpConfigure $i]
-    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Load pkgIndex.tcl data.
-    catch {interp eval $i {package require NOEXIST}}
-
-    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
-    safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $ZipMountPoint auto0 auto2] \
-                                           [file join $ZipMountPoint auto0 auto1]]
-
-    # Inspect.
-    set confB [safe::interpConfigure $i]
-    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Try to load the packages and run a command from each one.
-    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
-    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
-    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
-    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
-
-    list $path1 $path2 $path3 $path4 $code3 $msg3 $code4 $msg4 $confA $confB \
-         $code5 $msg5 $code6 $msg6
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:2:)} {\$p(:1:)} 0 1.2.3 0 2.3.4\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
-        -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto2 $ZipMountPoint/auto0/auto1]*}\
-        -statics 1 -nested 0 -deleteHook {}}\
-        0 OK1 0 OK2"
-
-test safe-9.12z {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed; zipfs} -setup {
+                        $ZipMountPoint/auto0/auto1 \
+                        $ZipMountPoint/auto0/auto2 \
+                        $ZipMountPoint/auto0/modules \
+                        $ZipMountPoint/auto0/modules/mod1 \
+                        $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+test safe-9.22 {interpConfigure change the access path; check module loading; stale data case 0} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
 } -body {
-    set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $ZipMountPoint auto0 auto1] \
-                                            [file join $ZipMountPoint auto0 auto2]]]
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
-    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]]
-
-    # Load pkgIndex.tcl data.
-    catch {interp eval $i {package require NOEXIST}}
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
-    # Limit access path.  Remove tokens {$p(:1:)} and {$p(:2:)}.
-    safe::interpConfigure $i -accessPath [list $tcl_library]
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                          [file join $TestsDir auto0 auto1] \
+                                          [file join $TestsDir auto0 auto2]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
-    set code4 [catch {::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto1]} path4]
-    set code5 [catch {::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 auto2]} path5]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
-    # Try to load the packages.
-    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
-    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
 
-    list $path1 $path2 $code4 $path4 $code5 $path5 $code3 $msg3 $code6 $msg6 $confA $confB
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
 } -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{\$p(:1:)} {\$p(:2:)} 1 {* not found in access path}\
-        1 {* not found in access path} 1 {*} 1 {*}\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/auto1 $ZipMountPoint/auto0/auto2]*}\
-        -statics 1 -nested 0 -deleteHook {}}\
-        {-accessPath {[list $tcl_library]*} -statics 1 -nested 0 -deleteHook {}}"
-
-test safe-9.20z {check module loading; zipfs} -setup {
+} -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $TestsDir/auto0/auto1 \
+                            $TestsDir/auto0/auto2 \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        res0 res1 res2"
+test safe-9.22z {interpConfigure change the access path; check module loading; stale data case 0; zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1967,6 +1892,19 @@ test safe-9.20z {check module loading; zipfs} -setup {
     set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
 
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                          [file join $ZipMountPoint auto0 auto1] \
+                                          [file join $ZipMountPoint auto0 auto2]]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+
     # Try to load the packages and run a command from each one.
     set code0 [catch {interp eval $i {package require test0}} msg0]
     set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
@@ -1975,8 +1913,9 @@ test safe-9.20z {check module loading; zipfs} -setup {
     set out1  [interp eval $i {mod1::test1::try1}]
     set out2  [interp eval $i {mod2::test2::try2}]
 
-    list $path0 $path1 $path2 -- $modsA -- \
-         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $out0 $out1 $out2
+    list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
+         $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
+         $out0 $out1 $out2
 } -cleanup {
     tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
     foreach path [lreverse $oldTm] {
@@ -1987,14 +1926,22 @@ test safe-9.20z {check module loading; zipfs} -setup {
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{\$p(:1:)} {\$p(:2:)} {\$p(:3:)} -- {{\$p(:1:)}} --\
+        {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
-        {-accessPath {[list $tcl_library $ZipMountPoint/auto0/modules \
-                        $ZipMountPoint/auto0/modules/mod1 \
-                        $ZipMountPoint/auto0/modules/mod2]*}\
+        {-accessPath {[list $tcl_library \
+                            $ZipMountPoint/auto0/modules \
+                            $ZipMountPoint/auto0/modules/mod1 \
+                            $ZipMountPoint/auto0/modules/mod2]}\
+        -statics 1 -nested 0 -deleteHook {}} --\
+        {-accessPath {[list $tcl_library \
+                            $ZipMountPoint/auto0/auto1 \
+                            $ZipMountPoint/auto0/auto2 \
+                            $ZipMountPoint/auto0/modules \
+                            $ZipMountPoint/auto0/modules/mod1 \
+                            $ZipMountPoint/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         res0 res1 res2"
-
-test safe-9.21z {interpConfigure change the access path; check module loading; stale data case 1; zipfs} -setup {
+test safe-9.23 {interpConfigure change the access path; check module loading; stale data case 3} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -2004,31 +1951,36 @@ test safe-9.21z {interpConfigure change the access path; check module loading; s
     foreach path $oldTm {
         tcl::tm::path remove $path
     }
-    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+    tcl::tm::path add [file join $TestsDir auto0 modules]
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
     set modsA [interp eval $i {tcl::tm::path list}]
-    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
-    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
 
     # Add to access path.
     # This injects more tokens, pushing modules to higher token numbers.
     safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $ZipMountPoint auto0 auto1] \
-                                           [file join $ZipMountPoint auto0 auto2]]
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
     set modsB [interp eval $i {tcl::tm::path list}]
-    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
-    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
-    # Load pkg data.
+    # Refresh stale pkg data.
     catch {interp eval $i {package require NOEXIST}}
     catch {interp eval $i {package require mod1::NOEXIST}}
     catch {interp eval $i {package require mod2::NOEXIST}}
@@ -2044,8 +1996,9 @@ test safe-9.21z {interpConfigure change the access path; check module loading; s
     list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
          $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
          $out0 $out1 $out2
+
 } -cleanup {
-    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
     foreach path [lreverse $oldTm] {
         tcl::tm::path add $path
     }
@@ -2057,20 +2010,19 @@ test safe-9.21z {interpConfigure change the access path; check module loading; s
         {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
         {-accessPath {[list $tcl_library \
-                        $ZipMountPoint/auto0/modules \
-                        $ZipMountPoint/auto0/modules/mod1 \
-                        $ZipMountPoint/auto0/modules/mod2]}\
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         {-accessPath {[list $tcl_library \
-                        $ZipMountPoint/auto0/auto1 \
-                        $ZipMountPoint/auto0/auto2 \
-                        $ZipMountPoint/auto0/modules \
-                        $ZipMountPoint/auto0/modules/mod1 \
-                        $ZipMountPoint/auto0/modules/mod2]}\
+                            $TestsDir/auto0/auto1 \
+                            $TestsDir/auto0/auto2 \
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         res0 res1 res2"
-
-test safe-9.22z {interpConfigure change the access path; check module loading; stale data case 0; zipfs} -setup {
+test safe-9.23z {interpConfigure change the access path; check module loading; stale data case 3; zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -2091,11 +2043,16 @@ test safe-9.22z {interpConfigure change the access path; check module loading; s
     set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
 
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
     # Add to access path.
     # This injects more tokens, pushing modules to higher token numbers.
     safe::interpConfigure $i -accessPath [list $tcl_library \
-                                          [file join $ZipMountPoint auto0 auto1] \
-                                          [file join $ZipMountPoint auto0 auto2]]
+                                           [file join $ZipMountPoint auto0 auto1] \
+                                           [file join $ZipMountPoint auto0 auto2]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
@@ -2104,6 +2061,11 @@ test safe-9.22z {interpConfigure change the access path; check module loading; s
     set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
     set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
 
+    # Refresh stale pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
     # Try to load the packages and run a command from each one.
     set code0 [catch {interp eval $i {package require test0}} msg0]
     set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
@@ -2115,6 +2077,7 @@ test safe-9.22z {interpConfigure change the access path; check module loading; s
     list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
          $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
          $out0 $out1 $out2
+
 } -cleanup {
     tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
     foreach path [lreverse $oldTm] {
@@ -2140,8 +2103,7 @@ test safe-9.22z {interpConfigure change the access path; check module loading; s
                             $ZipMountPoint/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         res0 res1 res2"
-
-test safe-9.23z {interpConfigure change the access path; check module loading; stale data case 3; zipfs} -setup {
+test safe-9.24 {interpConfigure change the access path; check module loading; stale data case 2 (worst case)} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -2151,16 +2113,16 @@ test safe-9.23z {interpConfigure change the access path; check module loading; s
     foreach path $oldTm {
         tcl::tm::path remove $path
     }
-    tcl::tm::path add [file join $ZipMountPoint auto0 modules]
+    tcl::tm::path add [file join $TestsDir auto0 modules]
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library]]
 
     # Inspect.
     set confA [safe::interpConfigure $i]
     set modsA [interp eval $i {tcl::tm::path list}]
-    set path0 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
-    set path1 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
     # Force the interpreter to acquire pkg data which will soon become stale.
     catch {interp eval $i {package require NOEXIST}}
@@ -2170,20 +2132,15 @@ test safe-9.23z {interpConfigure change the access path; check module loading; s
     # Add to access path.
     # This injects more tokens, pushing modules to higher token numbers.
     safe::interpConfigure $i -accessPath [list $tcl_library \
-                                           [file join $ZipMountPoint auto0 auto1] \
-                                           [file join $ZipMountPoint auto0 auto2]]
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
 
     # Inspect.
     set confB [safe::interpConfigure $i]
     set modsB [interp eval $i {tcl::tm::path list}]
-    set path3 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules]]
-    set path4 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod1]]
-    set path5 [::safe::interpFindInAccessPath $i [file join $ZipMountPoint auto0 modules mod2]]
-
-    # Refresh stale pkg data.
-    catch {interp eval $i {package require NOEXIST}}
-    catch {interp eval $i {package require mod1::NOEXIST}}
-    catch {interp eval $i {package require mod2::NOEXIST}}
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
 
     # Try to load the packages and run a command from each one.
     set code0 [catch {interp eval $i {package require test0}} msg0]
@@ -2196,9 +2153,8 @@ test safe-9.23z {interpConfigure change the access path; check module loading; s
     list $path0 $path1 $path2 -- $modsA -- $path3 $path4 $path5 -- $modsB -- \
          $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $confA -- $confB -- \
          $out0 $out1 $out2
-
 } -cleanup {
-    tcl::tm::path remove [file join $ZipMountPoint auto0 modules]
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
     foreach path [lreverse $oldTm] {
         tcl::tm::path add $path
     }
@@ -2210,19 +2166,18 @@ test safe-9.23z {interpConfigure change the access path; check module loading; s
         {\$p(:3:)} {\$p(:4:)} {\$p(:5:)} -- {{\$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
         {-accessPath {[list $tcl_library \
-                            $ZipMountPoint/auto0/modules \
-                            $ZipMountPoint/auto0/modules/mod1 \
-                            $ZipMountPoint/auto0/modules/mod2]}\
+                            $TestsDir/auto0/modules \
+                            $TestsDir/auto0/modules/mod1 \
+                            $TestsDir/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         {-accessPath {[list $tcl_library \
-                            $ZipMountPoint/auto0/auto1 \
-                            $ZipMountPoint/auto0/auto2 \
-                            $ZipMountPoint/auto0/modules \
-                            $ZipMountPoint/auto0/modules/mod1 \
-                            $ZipMountPoint/auto0/modules/mod2]}\
+			    $TestsDir/auto0/auto1 \
+			    $TestsDir/auto0/auto2 \
+			    $TestsDir/auto0/modules \
+			    $TestsDir/auto0/modules/mod1 \
+			    $TestsDir/auto0/modules/mod2]}\
         -statics 1 -nested 0 -deleteHook {}} --\
         res0 res1 res2"
-
 test safe-9.24z {interpConfigure change the access path; check module loading; stale data case 2 (worst case); zipfs} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -2764,7 +2719,41 @@ test safe-17.2 {Check that first element of slave auto_path (and access path) is
 
 ### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
 
-test safe-18.1opt {cf. safe-7.1opt - tests that everything works at high level without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
+test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    # Without AutoPathSync, we need a more complete auto_path,
+    # because the slave will use the same value.
+    set lib1        [info library]
+    set lib2        [file join $TestsDir auto0]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+    set ::auto_path $::auto_TMP
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require SafeTestPackage1}]
+    # no error shall occur:
+    interp eval $i HeresPackage1
+    set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result 1.2.3
+test safe-18.1z {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -2778,7 +2767,7 @@ test safe-18.1opt {cf. safe-7.1opt - tests that everything works at high level w
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
     set lib1        [info library]
-    set lib2        [file dirname $lib1]
+    set lib2        [file join $ZipMountPoint auto0]
     set ::auto_TMP  $::auto_path
     set ::auto_path [list $lib1 $lib2]
 
@@ -2788,18 +2777,17 @@ test safe-18.1opt {cf. safe-7.1opt - tests that everything works at high level w
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
     #  package require in a slave works like in the master)
-    set v [interp eval $i {package require opt}]
+    set v [interp eval $i {package require SafeTestPackage1}]
     # no error shall occur:
-    interp eval $i {::tcl::Lempty {a list}}
+    interp eval $i HeresPackage1
     set v
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result 0.4.*
-
-test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+} -match glob -result 1.2.3
+test safe-18.1opt {cf. safe-7.1opt - tests that everything works at high level without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -2813,7 +2801,7 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
     set lib1        [info library]
-    set lib2        [file join $TestsDir auto0]
+    set lib2        [file dirname $lib1]
     set ::auto_TMP  $::auto_path
     set ::auto_path [list $lib1 $lib2]
 
@@ -2823,18 +2811,17 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
     #  package require in a slave works like in the master)
-    set v [interp eval $i {package require SafeTestPackage1}]
+    set v [interp eval $i {package require opt}]
     # no error shall occur:
-    interp eval $i HeresPackage1
+    interp eval $i {::tcl::Lempty {a list}}
     set v
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result 1.2.3
-
-test safe-18.2opt {cf. safe-7.2opt - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
+} -match glob -result 0.4.*
+test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -2852,21 +2839,25 @@ test safe-18.2opt {cf. safe-7.2opt - tests specific path and interpFind/AddToAcc
     set token1 [safe::interpAddToAccessPath $i [info library]]
     # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # an error shall occur (opt is not anymore in the secure 0-level
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
     # provided deep path)
-    list $auto1 $token1 $token2 \
-	    [catch {interp eval $i {package require opt}} msg] $msg \
+    list $auto1 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {$pkgOptErrMsg}\
-        {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
+        1 {can't find package SafeTestPackage1}\
+        {-accessPath {[list $tcl_library \
+                            */dummy/unixlike/test/path \
+                            $TestsDir/auto0]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-
-test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+test safe-18.2z {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -2885,7 +2876,7 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
     # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
     # should add as p* (not p2 if master has a module path)
-    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    set token3 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0]]
     # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
     # provided deep path)
     list $auto1 $token1 $token2 $token3 \
@@ -2900,9 +2891,39 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
         1 {can't find package SafeTestPackage1}\
         {-accessPath {[list $tcl_library \
                             */dummy/unixlike/test/path \
-                            $TestsDir/auto0]}\
+                            $ZipMountPoint/auto0]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+test safe-18.2opt {cf. safe-7.2opt - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    set auto1 [interp eval $i {set ::auto_path}]
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # an error shall occur (opt is not anymore in the secure 0-level
+    # provided deep path)
+    list $auto1 $token1 $token2 \
+	    [catch {interp eval $i {package require opt}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {$pkgOptErrMsg}\
+        {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
+        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -2931,8 +2952,7 @@ test safe-18.3 {Check that default auto_path is the same as in the master interp
 	safe::setAutoPathSync $SyncVal_TMP
     }
 } -result $::auto_path
-
-test safe-18.4opt {cf. safe-7.4opt - tests specific path and positive search and auto_path without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
+test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -2954,25 +2974,30 @@ test safe-18.4opt {cf. safe-7.4opt - tests specific path and positive search and
     set token1 [safe::interpAddToAccessPath $i [info library]]
 
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] $pkgOptDir]]
+    set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
 
     # should not have been changed by Safe Base:
     set auto2 [interp eval $i {set ::auto_path}]
 
-    # This time, unlike test safe-18.2opt and the try above, opt should be found:
-    list $auto1 $auto2 $token1 $token2 \
-	    [catch {interp eval $i {package require opt}} msg] $msg \
+    set auto3 [interp eval $i [list set ::auto_path [list {$p(:0:)} $token2]]]
+
+    # This time, unlike test safe-18.2 and the try above, SafeTestPackage1 should be found:
+    list $auto1 $auto2 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 0.4.*\
-        {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
-        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-
-test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
+        {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
+        -statics 0 -nested 1 -deleteHook {}\
+        -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
+test safe-18.4z {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -2994,10 +3019,10 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
     set token1 [safe::interpAddToAccessPath $i [info library]]
 
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    set token2 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0]]
 
     # should add as p* (not p2 if master has a module path)
-    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
+    set token3 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0 auto1]]
 
     # should not have been changed by Safe Base:
     set auto2 [interp eval $i {set ::auto_path}]
@@ -3014,77 +3039,10 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
 	safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
-        {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
+        {-accessPath {[list $tcl_library *$ZipMountPoint/auto0 $ZipMountPoint/auto0/auto1]}\
         -statics 0 -nested 1 -deleteHook {}\
-        -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
-
-test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-
-    set i [safe::interpCreate]
-
-    interp eval $i {
-        package forget platform::shell
-        package forget platform
-        catch {namespace delete ::platform}
-    }
-} -body {
-    # Should raise an error (tests module ancestor directory rule)
-    set code1 [catch {interp eval $i {package require shell}} msg1]
-    # Should not raise an error
-    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
-    return [list $code1 $msg1 $code2]
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result {1 {can't find package shell} 0}
-
-test safe-18.1z {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-
-    # Without AutoPathSync, we need a more complete auto_path,
-    # because the slave will use the same value.
-    set lib1        [info library]
-    set lib2        [file join $ZipMountPoint auto0]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib1 $lib2]
-
-    set i [safe::interpCreate]
-    set ::auto_path $::auto_TMP
-} -body {
-    # no error shall occur:
-    # (because the default access_path shall include 1st level sub dirs so
-    #  package require in a slave works like in the master)
-    set v [interp eval $i {package require SafeTestPackage1}]
-    # no error shall occur:
-    interp eval $i HeresPackage1
-    set v
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -match glob -result 1.2.3
-
-test safe-18.2z {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
+        -autoPath {[list $tcl_library $ZipMountPoint/auto0]}} {}"
+test safe-18.4opt {cf. safe-7.4opt - tests specific path and positive search and auto_path without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -3096,32 +3054,34 @@ test safe-18.2z {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPa
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+
+    # should not have been set by Safe Base:
     set auto1 [interp eval $i {set ::auto_path}]
+
     interp eval $i {set ::auto_path [list {$p(:0:)}]}
+
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
+
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # should add as p* (not p2 if master has a module path)
-    set token3 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0]]
-    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
-    # provided deep path)
-    list $auto1 $token1 $token2 $token3 \
-	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] $pkgOptDir]]
+
+    # should not have been changed by Safe Base:
+    set auto2 [interp eval $i {set ::auto_path}]
+
+    # This time, unlike test safe-18.2opt and the try above, opt should be found:
+    list $auto1 $auto2 $token1 $token2 \
+	    [catch {interp eval $i {package require opt}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+	safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
-        1 {can't find package SafeTestPackage1}\
-        {-accessPath {[list $tcl_library \
-                            */dummy/unixlike/test/path \
-                            $ZipMountPoint/auto0]}\
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 0.4.*\
+        {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-
-test safe-18.4z {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
+test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
     # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
 
@@ -3131,41 +3091,27 @@ test safe-18.4z {cf. safe-7.4 - tests specific path and positive search and auto
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-} -body {
-    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
-
-    # should not have been set by Safe Base:
-    set auto1 [interp eval $i {set ::auto_path}]
-
-    interp eval $i {set ::auto_path [list {$p(:0:)}]}
-
-    # should not add anything (p0)
-    set token1 [safe::interpAddToAccessPath $i [info library]]
-
-    # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0]]
-
-    # should add as p* (not p2 if master has a module path)
-    set token3 [safe::interpAddToAccessPath $i [file join $ZipMountPoint auto0 auto1]]
-
-    # should not have been changed by Safe Base:
-    set auto2 [interp eval $i {set ::auto_path}]
 
-    set auto3 [interp eval $i [list set ::auto_path [list {$p(:0:)} $token2]]]
+    set i [safe::interpCreate]
 
-    # This time, unlike test safe-18.2 and the try above, SafeTestPackage1 should be found:
-    list $auto1 $auto2 $token1 $token2 $token3 \
-	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
-	    [safe::interpConfigure $i]\
-	    [safe::interpDelete $i]
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (tests module ancestor directory rule)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
 } -cleanup {
+    safe::interpDelete $i
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+        safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
-        {-accessPath {[list $tcl_library *$ZipMountPoint/auto0 $ZipMountPoint/auto0/auto1]}\
-        -statics 0 -nested 1 -deleteHook {}\
-        -autoPath {[list $tcl_library $ZipMountPoint/auto0]}} {}"
+} -result {1 {can't find package shell} 0}
+
 
 
 ### 19. Test tokenization of directories available to a slave.
-- 
cgit v0.12


From b7691676aafa7a3b4ae2464af6e1c4051084c12d Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Wed, 22 Jul 2020 19:38:22 +0000
Subject: Move tests that depend on platform::shell and http1.0 from safe.test
 to safe-stock86.test, and replace with tests that use example packages.  Add
 -setup and -cleanup code where missing from tests that use AutoPathSync.

---
 tests/safe-stock86.test | 157 +++++++++++++++++++++++++++++++-
 tests/safe.test         | 231 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 303 insertions(+), 85 deletions(-)

diff --git a/tests/safe-stock86.test b/tests/safe-stock86.test
index 2fbe108..a3f6bb5 100644
--- a/tests/safe-stock86.test
+++ b/tests/safe-stock86.test
@@ -50,6 +50,7 @@ catch {safe::interpConfigure}
 # package - Tcltest - but it might be absent if we're in standard tclsh)
 
 testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
+testConstraint AutoSyncDefined 1
 
 # high level general test
 test safe-stock86-7.1 {tests that everything works at high level, uses http 2} -body {
@@ -91,6 +92,31 @@ test safe-stock86-7.4 {tests specific path and positive search, uses http1.0} -b
 	    [catch {interp eval $i {package require http 1}} msg] $msg -- \
 	    $mappA -- [safe::interpDelete $i]
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.0 -- {TCLLIB *TCLLIB/http1.0} -- {}}
+test safe-stock86-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set i [safe::interpCreate]
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+# for platform::shell use mod1::test1
+    }
+} -body {
+    # Should raise an error (module ancestor directory issue)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
 
 # The following test checks whether the definition of tcl_endOfWord can be
 # obtained from auto_loading.  It was previously test "safe-5.1".
@@ -102,12 +128,139 @@ test safe-stock86-9.8 {test auto-loading in safe interpreters, was test 5.1} -se
 } -cleanup {
     safe::interpDelete a
 } -result -1
+
+### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
+test safe-stock86-18.1 {cf. safe-stock86-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    # Without AutoPathSync, we need a more complete auto_path,
+    # because the slave will use the same value.
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+    set ::auto_path $::auto_TMP
+} -body {
+    # no error shall occur:
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require http 1}]
+    # no error shall occur:
+    interp eval $i {http_config}
+    set v
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result 1.0
+test safe-stock86-18.2 {cf. safe-stock86-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    set auto1 [interp eval $i {set ::auto_path}]
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+    # should add as p1
+    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
+    # an error shall occur (http is not anymore in the secure 0-level
+    # provided deep path)
+    list $auto1 $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+test safe-stock86-18.4 {cf. safe-stock86-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+    # All ::safe commands are loaded at start of file.
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+
+    # should not have been set by Safe Base:
+    set auto1 [interp eval $i {set ::auto_path}]
+
+    interp eval $i {set ::auto_path [list {$p(:0:)}]}
+
+    # should not add anything (p0)
+    set token1 [safe::interpAddToAccessPath $i [info library]]
+
+    # should add as p* (not p1 if master has a module path)
+    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+
+    # should not have been changed by Safe Base:
+    set auto2 [interp eval $i {set ::auto_path}]
+
+    # This time, unlike test safe-stock86-18.2 and the try above, http 1.0 should be found:
+    list $auto1 $auto2 $token1 $token2 \
+	    [catch {interp eval $i {package require http 1}} msg] $msg \
+	    [safe::interpConfigure $i]\
+	    [safe::interpDelete $i]
+} -cleanup {
+    if {$SyncExists} {
+	safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+test safe-stock86-18.5 {cf. safe-stock86-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (tests module ancestor directory rule)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
 
+# cleanup
 set ::auto_path $SaveAutoPath
 unset SaveAutoPath TestsDir PathMapp
 rename mapList {}
-
-# cleanup
 ::tcltest::cleanupTests
 return
 
diff --git a/tests/safe.test b/tests/safe.test
index ec469ee..5987ce8 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -28,8 +28,6 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
     namespace import -force ::tcltest::*
 }
 
-testConstraint AutoSyncDefined 1
-
 foreach i [interp slaves] {
     interp delete $i
 }
@@ -62,6 +60,7 @@ catch {safe::interpConfigure}
 # package - Tcltest - but it might be absent if we're in standard tclsh)
 
 testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
+testConstraint AutoSyncDefined 1
 
 test safe-1.1 {safe::interpConfigure syntax} -returnCodes error -body {
     safe::interpConfigure
@@ -287,7 +286,6 @@ test safe-5.6 {example modules packages, test in master interpreter, append to p
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
 
-
 # test safe interps 'information leak'
 proc SafeEval {script} {
     # Helper procedure that ensures the safe interp is cleaned up even if
@@ -319,9 +317,8 @@ rename SafeEval {}
 # leaking infos, but they still do...
 
 # high level general test
-# Use example packages not http1.0
+# Use example packages not http1.0 etc
 test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -346,9 +343,7 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
     }
 } -match glob -result 1.2.3
 test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
@@ -409,9 +404,7 @@ test safe-7.3.1 {check that safe subinterpreters work with namespace names} -set
             [interp exists $j] [info vars ::safe::S*]
 } -match glob -result {{} {} ok ok {} 0 {}}
 test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
@@ -439,33 +432,30 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.2.3 --\
         {TCLLIB * TESTSDIR/auto0/auto1} -- {}}
 test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
-
+    tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
-
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
     interp eval $i {
-        package forget platform::shell
-        package forget platform
-        catch {namespace delete ::platform}
+        package forget mod1::test1
+        catch {namespace delete ::mod1}
     }
 } -body {
     # Should raise an error (module ancestor directory issue)
-    set code1 [catch {interp eval $i {package require shell}} msg1]
+    set code1 [catch {interp eval $i {package require test1}} msg1]
     # Should not raise an error
-    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    set code2 [catch {interp eval $i {package require mod1::test1}} msg2]
     return [list $code1 $msg1 $code2]
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {1 {can't find package shell} 0}
+} -result {1 {can't find package test1} 0}
 
 # test source control on file name
 test safe-8.1 {safe source control on file} -setup {
@@ -734,7 +724,12 @@ test safe-9.8 {test autoloading commands indexed in tclIndex files} -setup {
     safe::interpDelete $i
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*}}
-test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset)} -setup {
+test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
                                             [file join $TestsDir auto0 auto1] \
@@ -770,10 +765,18 @@ test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffec
     list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- $mappA -- $mappB
 } -cleanup {
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
-test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset)} -setup {
+test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
                                             [file join $TestsDir auto0 auto1] \
@@ -807,11 +810,19 @@ test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffe
     list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- $mappA -- $mappB
 } -cleanup {
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
-test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement} -setup {
+test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
 } -body {
     # For complete correspondence to safe-9.10opt, include auto0 in access path.
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -851,11 +862,19 @@ test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages un
          $mappA -- $mappB -- $code5 $msg5 $code6 $msg6
 } -cleanup {
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
-test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0} -setup {
+test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0, with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
                                             [file join $TestsDir auto0 auto1] \
@@ -890,12 +909,20 @@ test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages un
             $code5 $msg5 $code6 $msg6
 } -cleanup {
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
-test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed} -setup {
+test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
                                             [file join $TestsDir auto0 auto1] \
@@ -926,10 +953,18 @@ test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fa
             $mappA -- $mappB
 } -cleanup {
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} -- {TCLLIB*}}
-test safe-9.20 {check module loading} -setup {
+test safe-9.20 {check module loading, with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
         tcl::tm::path remove $path
@@ -962,6 +997,9 @@ test safe-9.20 {check module loading} -setup {
         tcl::tm::path add $path
     }
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         0 0.5 0 1.0 0 2.0 --\
         {TCLLIB TESTSDIR/auto0/modules TESTSDIR/auto0/modules/mod1\
@@ -975,7 +1013,12 @@ test safe-9.20 {check module loading} -setup {
 #   directories in the access path.  Both those things must be sorted before
 #   comparing with expected results.  The test is therefore not totally strict,
 #   but will notice missing or surplus directories.
-test safe-9.21 {interpConfigure change the access path; check module loading; stale data case 1} -setup {
+test safe-9.21 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 1} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
         tcl::tm::path remove $path
@@ -1028,6 +1071,9 @@ test safe-9.21 {interpConfigure change the access path; check module loading; st
         tcl::tm::path add $path
     }
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -1037,7 +1083,12 @@ test safe-9.21 {interpConfigure change the access path; check module loading; st
          TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
-test safe-9.22 {interpConfigure change the access path; check module loading; stale data case 0} -setup {
+test safe-9.22 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 0} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
         tcl::tm::path remove $path
@@ -1075,7 +1126,7 @@ test safe-9.22 {interpConfigure change the access path; check module loading; st
     set out1  [interp eval $i {mod1::test1::try1}]
     set out2  [interp eval $i {mod2::test2::try2}]
 
-    list [lsort [list $path0 $path1 $path2]] -- $modsA --\
+    list [lsort [list $path0 $path1 $path2]] -- $modsA -- \
             [lsort [list $path3 $path4 $path5]] -- $modsB -- \
             $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $sortA -- $sortB -- \
             $out0 $out1 $out2
@@ -1085,6 +1136,9 @@ test safe-9.22 {interpConfigure change the access path; check module loading; st
         tcl::tm::path add $path
     }
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -1094,7 +1148,12 @@ test safe-9.22 {interpConfigure change the access path; check module loading; st
          TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
-test safe-9.23 {interpConfigure change the access path; check module loading; stale data case 3} -setup {
+test safe-9.23 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 3} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
         tcl::tm::path remove $path
@@ -1142,7 +1201,7 @@ test safe-9.23 {interpConfigure change the access path; check module loading; st
     set out1  [interp eval $i {mod1::test1::try1}]
     set out2  [interp eval $i {mod2::test2::try2}]
 
-    list [lsort [list $path0 $path1 $path2]] -- $modsA --\
+    list [lsort [list $path0 $path1 $path2]] -- $modsA -- \
             [lsort [list $path3 $path4 $path5]] -- $modsB -- \
             $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $sortA -- $sortB -- \
             $out0 $out1 $out2
@@ -1152,6 +1211,9 @@ test safe-9.23 {interpConfigure change the access path; check module loading; st
         tcl::tm::path add $path
     }
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -1161,7 +1223,12 @@ test safe-9.23 {interpConfigure change the access path; check module loading; st
          TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
-test safe-9.24 {interpConfigure change the access path; check module loading; stale data case 2 (worst case)} -setup {
+test safe-9.24 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 2 (worst case)} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
         tcl::tm::path remove $path
@@ -1214,6 +1281,9 @@ test safe-9.24 {interpConfigure change the access path; check module loading; st
         tcl::tm::path add $path
     }
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -1606,7 +1676,7 @@ test safe-15.1 {safe file ensemble does not surprise code} -setup {
     unset -nocomplain msg
     interp delete $i
 } -result {1 {a b c} 1 {a b c} 1 {invalid command name "file"} 1 0 {a b c} 1 {not allowed to invoke subcommand isdirectory of file}}
-test safe-15.1.1 {safe file ensemble does not surprise code} -setup {
+test safe-15.2 {safe file ensemble does not surprise code} -setup {
     set i [interp create -safe]
 } -body {
     set result [expr {"file" in [interp hidden $i]}]
@@ -1721,9 +1791,9 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
     safe::interpDelete $i
     unset user
 } -result {~USER}
-
-### 17. The first element in a slave's ::auto_path and access path must be [info library].
 
+### 17. The first element in a slave's ::auto_path and access path must be [info library].
+### Merge back to no-TIP safe.test
 test safe-17.1 {Check that first element of slave auto_path (and access path) is Tcl Library} -setup {
     set lib1        [info library]
     set lib2        [file dirname $lib1]
@@ -1763,45 +1833,39 @@ test safe-17.2 {Check that first element of slave auto_path (and access path) is
 } -result [list [info library] [info library]]
 
 ### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
-
 test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
-    # Without AutoPathSync, we need a more complete auto_path, because the slave will use the same value.
+    # Without AutoPathSync, we need a more complete auto_path,
+    # because the slave will use the same value.
     set lib1        [info library]
-    set lib2        [file dirname $lib1]
+    set lib2        [file join $TestsDir auto0]
     set ::auto_TMP  $::auto_path
     set ::auto_path [list $lib1 $lib2]
 
     set i [safe::interpCreate]
+    set ::auto_path $::auto_TMP
 } -body {
     # no error shall occur:
-    # (because the default access_path shall include 1st level sub dirs
-    #  so package require in a slave works like in the master)
-    set v [interp eval $i {package require http 1}]
+    # (because the default access_path shall include 1st level sub dirs so
+    #  package require in a slave works like in the master)
+    set v [interp eval $i {package require SafeTestPackage1}]
     # no error shall occur:
-    interp eval $i {http_config}
+    interp eval $i HeresPackage1
     set v
 } -cleanup {
-    set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result 1.0
-
+} -match glob -result 1.2.3
 test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -1814,37 +1878,38 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
     interp eval $i {set ::auto_path [list {$p(:0:)}]}
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p1
+    # should add as p* (not p1 if master has a module path)
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
-    # an error shall occur (http is not anymore in the secure 0-level
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
     # provided deep path)
-    list $auto1 $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+    list $auto1 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
+        1 {can't find package SafeTestPackage1}\
+        {-accessPath {[list $tcl_library \
+                            */dummy/unixlike/test/path \
+                            $TestsDir/auto0]}\
+        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
     set i [safe::interpCreate]
-
 } -body {
     # This file's header sets auto_path to a single directory [info library],
     # which is the one required by Safe Base to be present & first in the list.
-
     set ap {}
     foreach token [$i eval set ::auto_path] {
         lappend ap [dict get [set ::safe::S${i}(access_path,map)] $token]
@@ -1855,12 +1920,9 @@ test safe-18.3 {Check that default auto_path is the same as in the master interp
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -result [set ::auto_path]
-
+} -result $::auto_path
 test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -1879,55 +1941,59 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
     set token1 [safe::interpAddToAccessPath $i [info library]]
 
     # should add as p* (not p1 if master has a module path)
-    set token2 [safe::interpAddToAccessPath $i [file join [info library] http1.0]]
+    set token2 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
+
+    # should add as p* (not p2 if master has a module path)
+    set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0 auto1]]
 
     # should not have been changed by Safe Base:
     set auto2 [interp eval $i {set ::auto_path}]
 
-    # This time, unlike test safe-18.2 and the try above, http 1.0 should be found:
-    list $auto1 $auto2 $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
+    set auto3 [interp eval $i [list set ::auto_path [list {$p(:0:)} $token2]]]
+
+    # This time, unlike test safe-18.2 and the try above, SafeTestPackage1 should be found:
+    list $auto1 $auto2 $token1 $token2 $token3 \
+	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
+        {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
+        -statics 0 -nested 1 -deleteHook {}\
+        -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
 test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
+    tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
-
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
     interp eval $i {
-        package forget platform::shell
-        package forget platform
-        catch {namespace delete ::platform}
+        package forget mod1::test1
+        catch {namespace delete ::mod1}
     }
 } -body {
     # Should raise an error (tests module ancestor directory rule)
-    set code1 [catch {interp eval $i {package require shell}} msg1]
+    set code1 [catch {interp eval $i {package require test1}} msg1]
     # Should not raise an error
-    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    set code2 [catch {interp eval $i {package require mod1::test1}} msg2]
     return [list $code1 $msg1 $code2]
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {1 {can't find package shell} 0}
+} -result {1 {can't find package test1} 0}
 
 ### 19. Test tokenization of directories available to a slave.
-
+### Merge back to no-TIP safe.test
 test safe-19.1 {Check that each directory of the default auto_path is a valid token} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1962,12 +2028,11 @@ test safe-19.2 {Check that each directory of the module path is a valid token} -
     safe::interpDelete $i
 } -result {}
 
+# cleanup
 set ::auto_path $SaveAutoPath
 unset SaveAutoPath TestsDir PathMapp
 rename mapList {}
 rename mapAndSortList {}
-
-# cleanup
 ::tcltest::cleanupTests
 return
 
-- 
cgit v0.12


From 356b2f5829e52ff52c28cba8b5b6b5558a562c89 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Wed, 22 Jul 2020 19:42:38 +0000
Subject: Move tests that depend on platform::shell from safe.test to
 safe-stock86.test, and replace with tests that use example packages.

---
 tests/safe-stock87.test | 65 +++++++++++++++++++++++++++++++++++-----------
 tests/safe-zipfs.test   | 13 ++--------
 tests/safe.test         | 68 ++++++++++++++-----------------------------------
 3 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/tests/safe-stock87.test b/tests/safe-stock87.test
index a8f5bd2..1a29018 100644
--- a/tests/safe-stock87.test
+++ b/tests/safe-stock87.test
@@ -107,19 +107,15 @@ catch {safe::interpConfigure}
 # package - Tcltest - but it might be absent if we're in standard tclsh)
 
 testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
-
 testConstraint AutoSyncDefined 1
 
 # high level general test
 test safe-stock87-7.1 {tests that everything works at high level with conventional AutoPathSync, use pkg opt} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
-
     set i [safe::interpCreate]
 } -body {
     # no error shall occur:
@@ -136,9 +132,7 @@ test safe-stock87-7.1 {tests that everything works at high level with convention
     }
 } -match glob -result 0.4.*
 test safe-stock87-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync, use pkg opt} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
@@ -165,9 +159,7 @@ test safe-stock87-7.2 {tests specific path and interpFind/AddToAccessPath with c
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} -- 1 {$pkgOptErrMsg} --\
         {TCLLIB */dummy/unixlike/test/path} -- {}"
 test safe-stock87-7.4 {tests specific path and positive search with conventional AutoPathSync, use pkg opt} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
@@ -194,6 +186,30 @@ test safe-stock87-7.4 {tests specific path and positive search with conventional
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 0.4.* --\
         {TCLLIB * TCLLIB/OPTDIR} -- {}}
+test safe-stock87-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set i [safe::interpCreate]
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (module ancestor directory issue)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
 
 # The following test checks whether the definition of tcl_endOfWord can be
 # obtained from auto_loading.  It was previously test "safe-5.1".
@@ -296,16 +312,13 @@ test safe-stock87-9.13 {interpConfigure change the access path; pkgIndex.tcl pac
         {TCLLIB TCLLIB/OPTDIR TCLLIB/JARDIR*} -- {TCLLIB*}}
 
 test safe-stock87-18.1 {cf. safe-stock87-7.1opt - tests that everything works at high level without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
     set lib1        [info library]
@@ -330,9 +343,7 @@ test safe-stock87-18.1 {cf. safe-stock87-7.1opt - tests that everything works at
     }
 } -match glob -result 0.4.*
 test safe-stock87-18.2 {cf. safe-stock87-7.2opt - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -361,9 +372,7 @@ test safe-stock87-18.2 {cf. safe-stock87-7.2opt - tests specific path and interp
         {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-stock87-18.4 {cf. safe-stock87-7.4opt - tests specific path and positive search and auto_path without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -399,6 +408,32 @@ test safe-stock87-18.4 {cf. safe-stock87-7.4opt - tests specific path and positi
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 0.4.*\
         {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+test safe-stock87-18.5 {cf. safe-stock87-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+    interp eval $i {
+        package forget platform::shell
+        package forget platform
+        catch {namespace delete ::platform}
+    }
+} -body {
+    # Should raise an error (tests module ancestor directory rule)
+    set code1 [catch {interp eval $i {package require shell}} msg1]
+    # Should not raise an error
+    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    return [list $code1 $msg1 $code2]
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {1 {can't find package shell} 0}
 
 set ::auto_path $SaveAutoPath
 unset pkgOptErrMsg pkgOptDir pkgJarDir SaveAutoPath TestsDir PathMapp
diff --git a/tests/safe-zipfs.test b/tests/safe-zipfs.test
index 4793bb2..4ec01d1 100644
--- a/tests/safe-zipfs.test
+++ b/tests/safe-zipfs.test
@@ -172,9 +172,8 @@ test safe-zipfs-5.6 {example modules packages, test in master interpreter, appen
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
 
 # high level general test
-# Use zipped example packages not tcl8.x/opt
+# Use zipped example packages not http1.0 etc
 test safe-zipfs-7.1 {tests that everything works at high level with conventional AutoPathSync; zipfs} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -199,7 +198,6 @@ test safe-zipfs-7.1 {tests that everything works at high level with conventional
     }
 } -match glob -result 1.2.3
 test safe-zipfs-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync; zipfs} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -230,7 +228,6 @@ test safe-zipfs-7.2 {tests specific path and interpFind/AddToAccessPath with con
         1 {can't find package SafeTestPackage1} --\
         {TCLLIB */dummy/unixlike/test/path ZIPDIR/auto0} -- {}}
 test safe-zipfs-7.4 {tests specific path and positive search with conventional AutoPathSync; zipfs} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -829,16 +826,13 @@ test safe-zipfs-9.24 {interpConfigure change the access path; check module loadi
 # See comments on lsort after test safe-zipfs-9.20.
 
 test safe-zipfs-18.1 {cf. safe-zipfs-7.1 - tests that everything works at high level without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
     set lib1        [info library]
@@ -863,9 +857,7 @@ test safe-zipfs-18.1 {cf. safe-zipfs-7.1 - tests that everything works at high l
     }
 } -match glob -result 1.2.3
 test safe-zipfs-18.2 {cf. safe-zipfs-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -899,7 +891,6 @@ test safe-zipfs-18.2 {cf. safe-zipfs-7.2 - tests specific path and interpFind/Ad
                             $ZipMountPoint/auto0]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-zipfs-18.4 {cf. safe-zipfs-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -943,12 +934,12 @@ test safe-zipfs-18.4 {cf. safe-zipfs-7.4 - tests specific path and positive sear
         -statics 0 -nested 1 -deleteHook {}\
         -autoPath {[list $tcl_library $ZipMountPoint/auto0]}} {}"
 
+# cleanup
 set ::auto_path $SaveAutoPath
 zipfs unmount ${ZipMountPoint}
 unset SaveAutoPath TestsDir ZipMountPoint PathMapp
 rename mapList {}
 rename mapAndSortList {}
-# cleanup
 ::tcltest::cleanupTests
 return
 
diff --git a/tests/safe.test b/tests/safe.test
index ae4af7c..1b118a9 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -286,7 +286,6 @@ test safe-5.6 {example modules packages, test in master interpreter, append to p
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
 
-
 # test safe interps 'information leak'
 proc SafeEval {script} {
     # Helper procedure that ensures the safe interp is cleaned up even if
@@ -318,16 +317,13 @@ rename SafeEval {}
 # leaking infos, but they still do...
 
 # high level general test
-# Use example packages not tcl8.x/opt
+# Use example packages not http1.0 etc
 test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
-
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0]
     set i [safe::interpCreate]
@@ -347,9 +343,7 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
     }
 } -match glob -result 1.2.3
 test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
@@ -410,9 +404,7 @@ test safe-7.3.1 {check that safe subinterpreters work with namespace names} -set
             [interp exists $j] [info vars ::safe::S*]
 } -match glob -result {{} {} ok ok {} 0 {}}
 test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
@@ -440,33 +432,30 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.2.3 --\
         {TCLLIB * TESTSDIR/auto0/auto1} -- {}}
 test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 1
     }
-
+    tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
-
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
     interp eval $i {
-        package forget platform::shell
-        package forget platform
-        catch {namespace delete ::platform}
+        package forget mod1::test1
+        catch {namespace delete ::mod1}
     }
 } -body {
     # Should raise an error (module ancestor directory issue)
-    set code1 [catch {interp eval $i {package require shell}} msg1]
+    set code1 [catch {interp eval $i {package require test1}} msg1]
     # Should not raise an error
-    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    set code2 [catch {interp eval $i {package require mod1::test1}} msg2]
     return [list $code1 $msg1 $code2]
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {1 {can't find package shell} 0}
+} -result {1 {can't find package test1} 0}
 
 # test source control on file name
 test safe-8.1 {safe source control on file} -setup {
@@ -857,7 +846,6 @@ test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages un
                                            [file join $TestsDir auto0] \
                                            [file join $TestsDir auto0 auto2] \
                                            [file join $TestsDir auto0 auto1]]
-
     # Inspect.
     set confB [safe::interpConfigure $i]
     set mappB [mapList $PathMapp [dict get $confB -accessPath]]
@@ -1801,7 +1789,7 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
 } -result {~USER}
 
 ### 17. The first element in a slave's ::auto_path and access path must be [info library].
-
+### Merge back to no-TIP safe.test
 test safe-17.1 {Check that first element of slave auto_path (and access path) is Tcl Library} -setup {
     set lib1        [info library]
     set lib2        [file dirname $lib1]
@@ -1841,18 +1829,14 @@ test safe-17.2 {Check that first element of slave auto_path (and access path) is
 } -result [list [info library] [info library]]
 
 ### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
-
 test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
     set lib1        [info library]
@@ -1877,9 +1861,7 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
     }
 } -match glob -result 1.2.3
 test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -1913,22 +1895,17 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
                             $TestsDir/auto0]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
     set i [safe::interpCreate]
-
 } -body {
     # This file's header sets auto_path to a single directory [info library],
     # which is the one required by Safe Base to be present & first in the list.
-
     set ap {}
     foreach token [$i eval set ::auto_path] {
         lappend ap [dict get [set ::safe::S${i}(access_path,map)] $token]
@@ -1941,9 +1918,7 @@ test safe-18.3 {Check that default auto_path is the same as in the master interp
     }
 } -result $::auto_path
 test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -1986,40 +1961,35 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
         -statics 0 -nested 1 -deleteHook {}\
         -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
 test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
-    # All ::safe commands are loaded at start of file.
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
+    tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
-
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
     interp eval $i {
-        package forget platform::shell
-        package forget platform
-        catch {namespace delete ::platform}
+        package forget mod1::test1
+        catch {namespace delete ::mod1}
     }
 } -body {
     # Should raise an error (tests module ancestor directory rule)
-    set code1 [catch {interp eval $i {package require shell}} msg1]
+    set code1 [catch {interp eval $i {package require test1}} msg1]
     # Should not raise an error
-    set code2 [catch {interp eval $i {package require platform::shell}} msg2]
+    set code2 [catch {interp eval $i {package require mod1::test1}} msg2]
     return [list $code1 $msg1 $code2]
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {1 {can't find package shell} 0}
-
-
+} -result {1 {can't find package test1} 0}
 
 ### 19. Test tokenization of directories available to a slave.
-
+### Merge back to no-TIP safe.test
 test safe-19.1 {Check that each directory of the default auto_path is a valid token} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -2053,12 +2023,12 @@ test safe-19.2 {Check that each directory of the module path is a valid token} -
 } -cleanup {
     safe::interpDelete $i
 } -result {}
-
+
+# cleanup
 set ::auto_path $SaveAutoPath
 unset SaveAutoPath TestsDir PathMapp
 rename mapList {}
 rename mapAndSortList {}
-# cleanup
 ::tcltest::cleanupTests
 return
 
-- 
cgit v0.12


From a18c844695bc12871386e04a67dfd913be5d0c76 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 23 Jul 2020 10:12:25 +0000
Subject: Add tests for cases that might differ when ::auto_path is not
 synchronized.  Renumber some tests not yet added to core, but do not yet
 reorder them.  Change some test descriptions.

---
 tests/safe.test | 1007 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 938 insertions(+), 69 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index 5987ce8..0c5bd37 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -62,12 +62,26 @@ catch {safe::interpConfigure}
 testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
 testConstraint AutoSyncDefined 1
 
+###  1. Basic help/error messages.
+
 test safe-1.1 {safe::interpConfigure syntax} -returnCodes error -body {
     safe::interpConfigure
 } -result {no value given for parameter "slave" (use -help for full usage) :
     slave name () name of the slave}
-test safe-1.2 {safe::interpCreate syntax} -returnCodes error -body {
+test safe-1.2 {safe::interpCreate syntax, Sync Mode on} -returnCodes error -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    } else {
+        set SyncVal_TMP 1
+    }
+} -body {
     safe::interpCreate -help
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -result {Usage information:
     Var/FlagName  Type     Value   Help
     ------------  ----     -----   ----
@@ -79,11 +93,39 @@ test safe-1.2 {safe::interpCreate syntax} -returnCodes error -body {
     -nestedLoadOk boolflag (false) allow nested loading
     -nested       boolean  (false) nested loading
     -deleteHook   script   ()      delete hook}
+test safe-1.2.1 {safe::interpCreate syntax, Sync Mode off} -returnCodes error -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    safe::interpCreate -help
+} -cleanup {
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {Usage information:
+    Var/FlagName  Type     Value   Help
+    ------------  ----     -----   ----
+    (-help                         gives this help)
+    ?slave?       name     ()      name of the slave (optional)
+    -accessPath   list     ()      access path for the slave
+    -noStatics    boolflag (false) prevent loading of statically linked pkgs
+    -statics      boolean  (true)  loading of statically linked pkgs
+    -nestedLoadOk boolflag (false) allow nested loading
+    -nested       boolean  (false) nested loading
+    -deleteHook   script   ()      delete hook
+    -autoPath     list     ()      ::auto_path for the slave}
 test safe-1.3 {safe::interpInit syntax} -returnCodes error -body {
     safe::interpInit -noStatics
 } -result {bad value "-noStatics" for parameter
     slave name () name of the slave}
 
+###  2. Aliases in a new "interp create" interpreter.
+
 test safe-2.1 {creating interpreters, should have no aliases} emptyTest {
     # Disabled this test.  It tests nothing sensible.  [Bug 999612]
     # interp aliases
@@ -107,6 +149,9 @@ test safe-2.3 {creating safe interpreters, should have no unexpected aliases} -s
     interp delete a
 } -result {::tcl::mathfunc::max ::tcl::mathfunc::min clock}
 
+###  3. Simple use of interpCreate, interpInit.
+###     Aliases in a new "interpCreate/interpInit" interpreter.
+
 test safe-3.1 {calling safe::interpInit is safe} -setup {
     catch {safe::interpDelete a}
     interp create a -safe
@@ -141,6 +186,8 @@ test safe-3.4 {calling safe::interpCreate on trusted interp} -setup {
     safe::interpDelete a
 } -result {}
 
+###  4. Testing safe::interpDelete, double interpCreate.
+
 test safe-4.1 {safe::interpDelete} -setup {
     catch {safe::interpDelete a}
 } -body {
@@ -173,9 +220,9 @@ test safe-4.6 {safe::interpDelete, indirectly} -setup {
     a eval exit
 } -result ""
 
-# The old test "safe-5.1" has been moved to "safe-stock86-9.8".
-# A replacement test using example files is "safe-9.8".
-# Tests 5.* test the example files before using them to test safe interpreters.
+###  5. Test the example files before using them to test safe interpreters.
+###     The old test "safe-5.1" has been moved to "safe-stock86-9.8".
+###     A replacement test using example files is "safe-9.8".
 
 test safe-5.1 {example tclIndex commands, test in master interpreter} -setup {
     set tmpAutoPath $::auto_path
@@ -286,7 +333,8 @@ test safe-5.6 {example modules packages, test in master interpreter, append to p
     catch {namespace delete ::mod1}
 } -match glob -result {0 0.5 0 1.0 0 2.0 -- res0 res1 res2}
 
-# test safe interps 'information leak'
+###  6. Test safe interps 'information leak'.
+
 proc SafeEval {script} {
     # Helper procedure that ensures the safe interp is cleaned up even if
     # there is a failure in the script.
@@ -316,9 +364,11 @@ rename SafeEval {}
 # More test should be added to check that hostname, nameofexecutable, aren't
 # leaking infos, but they still do...
 
-# high level general test
-# Use example packages not http1.0 etc
-test safe-7.1 {tests that everything works at high level with conventional AutoPathSync} -setup {
+###  7. Test the use of ::auto_path for loading commands (via tclIndex files)
+###     and non-module packages (via pkgIndex.tcl files).
+###     Corresponding tests with Sync Mode off are 17.*
+
+test safe-7.1 {positive non-module package require, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -342,7 +392,7 @@ test safe-7.1 {tests that everything works at high level with conventional AutoP
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result 1.2.3
-test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync} -setup {
+test safe-7.2 {negative non-module package require with specific path and interpAddToAccessPath, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -360,8 +410,7 @@ test safe-7.2 {tests specific path and interpFind/AddToAccessPath with conventio
     set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
     set confA [safe::interpConfigure $i]
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
-    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
-    # provided deep path)
+    # an error shall occur (SafeTestPackage1 is not in auto0 but a subdirectory)
     list $token1 $token2 $token3 -- \
 	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg -- \
 	    $mappA -- [safe::interpDelete $i]
@@ -403,7 +452,7 @@ test safe-7.3.1 {check that safe subinterpreters work with namespace names} -set
             [safe::interpDelete $i] \
             [interp exists $j] [info vars ::safe::S*]
 } -match glob -result {{} {} ok ok {} 0 {}}
-test safe-7.4 {tests specific path and positive search with conventional AutoPathSync} -setup {
+test safe-7.4 {positive non-module package require with specific path and interpAddToAccessPath, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -431,7 +480,7 @@ test safe-7.4 {tests specific path and positive search with conventional AutoPat
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.2.3 --\
         {TCLLIB * TESTSDIR/auto0/auto1} -- {}}
-test safe-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
+test safe-7.5 {positive and negative module package require, including ancestor directory issue, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -457,7 +506,8 @@ test safe-7.5 {tests positive and negative module loading with conventional Auto
     }
 } -result {1 {can't find package test1} 0}
 
-# test source control on file name
+###  8. Test source control on file name.
+
 test safe-8.1 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -602,6 +652,9 @@ test safe-8.10 {safe source and return} -setup {
     unset i
 } -result ok
 
+###  9. Assorted options, including changes to option values.
+###     If Sync Mode is on, a corresponding test with Sync Mode off is 19.*
+
 test safe-9.1 {safe interps' deleteHook} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -704,7 +757,12 @@ test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
         {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}}\
         {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}}\
         {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
-test safe-9.8 {test autoloading commands indexed in tclIndex files} -setup {
+test safe-9.8 {autoloading commands indexed in tclIndex files, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
                                             [file join $TestsDir auto0 auto1] \
@@ -722,9 +780,12 @@ test safe-9.8 {test autoloading commands indexed in tclIndex files} -setup {
     list $path1 $path2 -- $code1 $msg1 $code2 $msg2 -- $mappA
 } -cleanup {
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*}}
-test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), with conventional AutoPathSync} -setup {
+test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -771,7 +832,7 @@ test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffec
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
-test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), with conventional AutoPathSync} -setup {
+test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -817,7 +878,7 @@ test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffe
         0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
-test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, with conventional AutoPathSync} -setup {
+test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -869,7 +930,7 @@ test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages un
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
-test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0, with conventional AutoPathSync} -setup {
+test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, safe-9.11 without path auto0, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -917,7 +978,7 @@ test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages un
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
-test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, with conventional AutoPathSync} -setup {
+test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -959,7 +1020,7 @@ test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fa
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} -- {TCLLIB*}}
-test safe-9.20 {check module loading, with conventional AutoPathSync} -setup {
+test safe-9.20 {check module loading, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1013,7 +1074,7 @@ test safe-9.20 {check module loading, with conventional AutoPathSync} -setup {
 #   directories in the access path.  Both those things must be sorted before
 #   comparing with expected results.  The test is therefore not totally strict,
 #   but will notice missing or surplus directories.
-test safe-9.21 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 1} -setup {
+test safe-9.21 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 1} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1083,7 +1144,7 @@ test safe-9.21 {interpConfigure change the access path; check module loading, wi
          TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
-test safe-9.22 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 0} -setup {
+test safe-9.22 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 0} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1148,7 +1209,7 @@ test safe-9.22 {interpConfigure change the access path; check module loading, wi
          TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
-test safe-9.23 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 3} -setup {
+test safe-9.23 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 3} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1223,7 +1284,7 @@ test safe-9.23 {interpConfigure change the access path; check module loading, wi
          TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
-test safe-9.24 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 2 (worst case)} -setup {
+test safe-9.24 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 2 (worst case)} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1294,6 +1355,8 @@ test safe-9.24 {interpConfigure change the access path; check module loading, wi
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 
+### 10. Test options -statics -nostatics -nested -nestedloadok
+
 catch {teststaticpkg Safepkg1 0 0}
 test safe-10.1 {testing statics loading} -constraints TcltestPackage -setup {
     set i [safe::interpCreate]
@@ -1347,6 +1410,8 @@ test safe-10.4.1 {testing nested statics loading / -nestedloadok} -constraints T
     invoked from within
 "interp eval $i {interp create x; load {} Safepkg1 x}"}
 
+### 11. Safe encoding.
+
 test safe-11.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1445,6 +1510,9 @@ test safe-11.8.1 {testing safe encoding} -setup {
     invoked from within
 "interp eval $i encoding convertto"}
 
+### 12. Safe glob.
+###     More tests of glob in sections 13, 16.
+
 test safe-12.1 {glob is restricted [Bug 2906841]} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1495,6 +1563,9 @@ test safe-12.7 {glob is restricted} -setup {
     safe::interpDelete $i
 } -result {permission denied}
 
+### 13. More tests for Safe base glob, with patches @ Bug 2964715
+###     More tests of glob in sections 12, 16.
+
 proc buildEnvironment {filename} {
     upvar 1 testdir testdir testdir2 testdir2 testfile testfile
     set testdir [makeDirectory deletethisdir]
@@ -1510,7 +1581,7 @@ proc buildEnvironment2 {filename} {
     set testdir3 [makeDirectory deleteme $testdir]
     set testfile2 [makeFile {} $filename $testdir3]
 }
-#### New tests for Safe base glob, with patches @ Bug 2964715
+
 test safe-13.1 {glob is restricted [Bug 2964715]} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1647,7 +1718,8 @@ test safe-13.10 {as 13.8 but test silent failure when result is outside access_p
 rename buildEnvironment {}
 rename buildEnvironment2 {}
 
-#### Test for the module path
+### 14. Sanity checks on paths - module path, access path, auto_path.
+
 test safe-14.1 {Check that module path is the same as in the master interpreter [Bug 2964715]} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1660,6 +1732,8 @@ test safe-14.1 {Check that module path is the same as in the master interpreter
     safe::interpDelete $i
 } -result [::tcl::tm::path list]
 
+### 15. Safe file ensemble.
+
 test safe-15.1 {safe file ensemble does not surprise code} -setup {
     set i [interp create -safe]
 } -body {
@@ -1697,7 +1771,10 @@ test safe-15.2 {safe file ensemble does not surprise code} -setup {
     invoked from within
 "interp eval $i {file isdirectory .}"}}
 
-### ~ should have no special meaning in paths in safe interpreters
+### 16. ~ should have no special meaning in paths in safe interpreters.
+###     Defang it in glob.
+###     More tests of glob in sections 12, 13.
+
 test safe-16.1 {Bug 3529949: defang ~ in paths} -setup {
     set savedHOME $env(HOME)
     set env(HOME) /foo/bar
@@ -1792,9 +1869,43 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
     unset user
 } -result {~USER}
 
-### 17. The first element in a slave's ::auto_path and access path must be [info library].
-### Merge back to no-TIP safe.test
-test safe-17.1 {Check that first element of slave auto_path (and access path) is Tcl Library} -setup {
+### 14.x move above.
+
+test safe-14.2 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
+test safe-14.2.1 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
     set lib1        [info library]
     set lib2        [file dirname $lib1]
     set ::auto_TMP  $::auto_path
@@ -1810,9 +1921,47 @@ test safe-17.1 {Check that first element of slave auto_path (and access path) is
 } -cleanup {
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
+test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib2 $lib1]
+    # Unexpected order, should be reversed in the slave
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -result [list [info library] [info library]]
+test safe-14.3.1 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
 
-test safe-17.2 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master} -setup {
     set lib1        [info library]
     set lib2        [file dirname $lib1]
     set ::auto_TMP  $::auto_path
@@ -1830,10 +1979,16 @@ test safe-17.2 {Check that first element of slave auto_path (and access path) is
 } -cleanup {
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -result [list [info library] [info library]]
 
-### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
-test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+### 17. Test the use of ::auto_path for loading commands (via tclIndex files)
+###     and non-module packages (via pkgIndex.tcl files).
+###     Corresponding tests with Sync Mode on are 7.*
+
+test safe-17.1 {cf. safe-7.1 - positive non-module package require, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1864,7 +2019,7 @@ test safe-18.1 {cf. safe-7.1 - tests that everything works at high level without
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result 1.2.3
-test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1882,8 +2037,7 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
     set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"]
     # should add as p* (not p2 if master has a module path)
     set token3 [safe::interpAddToAccessPath $i [file join $TestsDir auto0]]
-    # an error shall occur (SafeTestPackage1 is not anymore in the secure 0-level
-    # provided deep path)
+    # an error shall occur (SafeTestPackage1 is not in auto0 but a subdirectory)
     list $auto1 $token1 $token2 $token3 \
 	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
@@ -1898,7 +2052,8 @@ test safe-18.2 {cf. safe-7.2 - tests specific path and interpFind/AddToAccessPat
                             */dummy/unixlike/test/path \
                             $TestsDir/auto0]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-test safe-18.3 {Check that default auto_path is the same as in the master interpreter without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+# (not a counterpart of safe-7.3)
+test safe-17.3 {Check that default auto_path is the same as in the master interpreter, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1921,7 +2076,7 @@ test safe-18.3 {Check that default auto_path is the same as in the master interp
 	safe::setAutoPathSync $SyncVal_TMP
     }
 } -result $::auto_path
-test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
+test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1951,7 +2106,7 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
 
     set auto3 [interp eval $i [list set ::auto_path [list {$p(:0:)} $token2]]]
 
-    # This time, unlike test safe-18.2 and the try above, SafeTestPackage1 should be found:
+    # This time, unlike test safe-17.2 and the try above, SafeTestPackage1 should be found:
     list $auto1 $auto2 $token1 $token2 $token3 \
 	    [catch {interp eval $i {package require SafeTestPackage1}} msg] $msg \
 	    [safe::interpConfigure $i]\
@@ -1964,7 +2119,7 @@ test safe-18.4 {cf. safe-7.4 - tests specific path and positive search and auto_
         {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
         -statics 0 -nested 1 -deleteHook {}\
         -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
-test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
+test safe-17.5 {cf. safe-7.5 - positive and negative module package require, including ancestor directory issue, Sync Mode off} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -1992,40 +2147,754 @@ test safe-18.5 {cf. safe-7.5 - tests positive and negative module loading withou
     }
 } -result {1 {can't find package test1} 0}
 
-### 19. Test tokenization of directories available to a slave.
-### Merge back to no-TIP safe.test
-test safe-19.1 {Check that each directory of the default auto_path is a valid token} -setup {
-    set i [safe::interpCreate]
-} -body {
-    set badTokens {}
-    foreach dir [$i eval {set ::auto_path}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
+### 19. Assorted options, including changes to option values.
+###     Mostly these are changes to access path, auto_path, module path.
+###     If Sync Mode is on, a corresponding test with Sync Mode off is 9.*
+
+test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-    set badTokens
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load and run the commands.
+    set code1 [catch {interp eval $i {report1}} msg1]
+    set code2 [catch {interp eval $i {report2}} msg2]
+
+    list $path1 $path2 -- $code1 $msg1 $code2 $msg2 -- $mappA
 } -cleanup {
     safe::interpDelete $i
-} -result {}
-
-test safe-19.2 {Check that each directory of the module path is a valid token} -setup {
-    set i [safe::interpCreate]
-} -body {
-    set badTokens {}
-    foreach dir [$i eval {::tcl::tm::path list}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
     }
-    set badTokens
+} -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*}}
+test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Load and run the commands.
+    # This guarantees the test will pass even if the tokens are swapped.
+    set code1 [catch {interp eval $i {report1}} msg1]
+    set code2 [catch {interp eval $i {report2}} msg2]
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]] \
+                             -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- $mappA -- $mappB
 } -cleanup {
     safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
+test safe-19.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), Sync Mode off} -constraints {AutoSyncDefined} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load auto_load data.
+    interp eval $i {catch nonExistentCommand}
+
+    # Do not load the commands.  With the tokens swapped, the test
+    # will pass only if the Safe Base has called auto_reset.
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:2:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]] \
+                             -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load and run the commands.
+    set code3 [catch {interp eval $i {report1}} msg3]
+    set code4 [catch {interp eval $i {report2}} msg4]
+
+    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- $mappA -- $mappB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
+        0 ok1 0 ok2 --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
+test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    # For complete correspondence to safe-stock87-9.11, include auto0 in access path.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0] \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:2:)} and {$p(:3:)}.
+    # This would have no effect because the records in Pkg of these directories
+    # were from access as children of {$p(:1:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0] \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0]]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- \
+         $mappA -- $mappB -- $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
+        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
+        0 OK1 0 OK2}
+test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, safe-19.11 without path auto0, Sync Mode off} -constraints {AutoSyncDefined} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    # To manage without path auto0, use an auto_path that is unusual for
+    # package discovery.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:2:)} and {$p(:3:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto2] \
+                                            [file join $TestsDir auto0 auto1]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- \
+            $mappA -- $mappB -- \
+            $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
+        0 1.2.3 0 2.3.4 --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
+        0 OK1 0 OK2}
+test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, Sync Mode off} -constraints {AutoSyncDefined} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    # Path auto0 added (cf. safe-9.3) because it is needed for auto_path.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0] \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Limit access path.  Remove tokens {$p(:2:)} and {$p(:3:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library]
+
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set code4 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]} path4]
+    set code5 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]} path5]
+
+    # Try to load the packages.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
+    set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
+
+    list $path1 $path2 -- $code4 $path4 -- $code5 $path5 -- $code3 $code6 -- \
+            $mappA -- $mappB
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:2:)} {$p(:3:)} -- 1 {* not found in access path} --\
+        1 {* not found in access path} -- 1 1 --\
+        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} -- {TCLLIB*}}
+test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set sortA [mapAndSortList $PathMapp [dict get $confA -accessPath]]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list [lsort [list $path0 $path1 $path2]] -- $modsA -- \
+            $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $sortA -- $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {TCLLIB TESTSDIR/auto0/modules TESTSDIR/auto0/modules/mod1\
+         TESTSDIR/auto0/modules/mod2} -- res0 res1 res2}
+# See comments on lsort after test safe-9.20.
+test safe-19.21 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 1} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set sortA [mapAndSortList $PathMapp [dict get $confA -accessPath]]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set sortB [mapAndSortList $PathMapp [dict get $confB -accessPath]]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Load pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list [lsort [list $path0 $path1 $path2]] -- $modsA -- \
+            [lsort [list $path3 $path4 $path5]] -- $modsB -- \
+            $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $sortA -- $sortB -- \
+            $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
+        {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {TCLLIB TESTSDIR/auto0/modules TESTSDIR/auto0/modules/mod1\
+         TESTSDIR/auto0/modules/mod2} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2 TESTSDIR/auto0/modules\
+         TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
+        res0 res1 res2}
+# See comments on lsort after test safe-9.20.
+test safe-19.22 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 0} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set sortA [mapAndSortList $PathMapp [dict get $confA -accessPath]]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                          [file join $TestsDir auto0 auto1] \
+                                          [file join $TestsDir auto0 auto2]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set sortB [mapAndSortList $PathMapp [dict get $confB -accessPath]]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list [lsort [list $path0 $path1 $path2]] -- $modsA -- \
+            [lsort [list $path3 $path4 $path5]] -- $modsB -- \
+            $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $sortA -- $sortB -- \
+            $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
+        {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {TCLLIB TESTSDIR/auto0/modules TESTSDIR/auto0/modules/mod1\
+         TESTSDIR/auto0/modules/mod2} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2 TESTSDIR/auto0/modules\
+         TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
+        res0 res1 res2}
+# See comments on lsort after test safe-9.20.
+test safe-19.23 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 3} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set sortA [mapAndSortList $PathMapp [dict get $confA -accessPath]]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set sortB [mapAndSortList $PathMapp [dict get $confB -accessPath]]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Refresh stale pkg data.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list [lsort [list $path0 $path1 $path2]] -- $modsA -- \
+            [lsort [list $path3 $path4 $path5]] -- $modsB -- \
+            $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $sortA -- $sortB -- \
+            $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
+        {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {TCLLIB TESTSDIR/auto0/modules TESTSDIR/auto0/modules/mod1\
+         TESTSDIR/auto0/modules/mod2} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2 TESTSDIR/auto0/modules\
+         TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
+        res0 res1 res2}
+# See comments on lsort after test safe-9.20.
+test safe-19.24 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 2 (worst case)} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set oldTm [tcl::tm::path list]
+    foreach path $oldTm {
+        tcl::tm::path remove $path
+    }
+    tcl::tm::path add [file join $TestsDir auto0 modules]
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library]]
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set sortA [mapAndSortList $PathMapp [dict get $confA -accessPath]]
+    set modsA [interp eval $i {tcl::tm::path list}]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Force the interpreter to acquire pkg data which will soon become stale.
+    catch {interp eval $i {package require NOEXIST}}
+    catch {interp eval $i {package require mod1::NOEXIST}}
+    catch {interp eval $i {package require mod2::NOEXIST}}
+
+    # Add to access path.
+    # This injects more tokens, pushing modules to higher token numbers.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0 auto2]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set sortB [mapAndSortList $PathMapp [dict get $confB -accessPath]]
+    set modsB [interp eval $i {tcl::tm::path list}]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod1]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 modules mod2]]
+
+    # Try to load the packages and run a command from each one.
+    set code0 [catch {interp eval $i {package require test0}} msg0]
+    set code1 [catch {interp eval $i {package require mod1::test1}} msg1]
+    set code2 [catch {interp eval $i {package require mod2::test2}} msg2]
+    set out0  [interp eval $i {test0::try0}]
+    set out1  [interp eval $i {mod1::test1::try1}]
+    set out2  [interp eval $i {mod2::test2::try2}]
+
+    list [lsort [list $path0 $path1 $path2]] -- $modsA -- \
+            [lsort [list $path3 $path4 $path5]] -- $modsB -- \
+            $code0 $msg0 $code1 $msg1 $code2 $msg2 -- $sortA -- $sortB -- \
+            $out0 $out1 $out2
+} -cleanup {
+    tcl::tm::path remove [file join $TestsDir auto0 modules]
+    foreach path [lreverse $oldTm] {
+        tcl::tm::path add $path
+    }
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
+        {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
+        0 0.5 0 1.0 0 2.0 --\
+        {TCLLIB TESTSDIR/auto0/modules TESTSDIR/auto0/modules/mod1\
+         TESTSDIR/auto0/modules/mod2} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2 TESTSDIR/auto0/modules\
+         TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
+        res0 res1 res2}
+# See comments on lsort after test safe-9.20.
+
+### 18. Test tokenization of directories available to a slave.
+
+test safe-18.1 {Check that each directory of the default auto_path is a valid token, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.1.1 {Check that each directory of the default auto_path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.2 {Check that each directory of the module path is a valid token, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.2.1 {Check that each directory of the module path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -result {}
 
 # cleanup
-- 
cgit v0.12


From 50e33715bae0885fa0a16f51f1880352e8490a09 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Thu, 23 Jul 2020 19:04:07 +0000
Subject: For each slave, record a value of -autoPath instead of discarding it
 and relying on the value of ::auto_path in the slave. Clarify the distinction
 between the two, both in library/safe.tcl and in doc/safe.n.  Amend four
 tests to expect the correct value.  Add code to tests to examine both values
 where appropriate.  Add three more tests for cases in which the distinction
 is important.  Renumber and re-title tests in safe-stock86.test to correspond
 to those in safe.test, and add code to safe-stock86.test to set the Sync
 Mode.

---
 doc/safe.n              |  10 +-
 library/safe.tcl        |  24 +++--
 tests/safe-stock86.test |  84 +++++++++++----
 tests/safe.test         | 265 ++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 331 insertions(+), 52 deletions(-)

diff --git a/doc/safe.n b/doc/safe.n
index 5777f74..8aa8686 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -401,14 +401,18 @@ to call \fB::safe::interpCreate\fR or \fB::safe::interpInit\fR without the
 option set to the
 empty list), which will give the safe interpreter the same access as the
 master interpreter to packages, modules, and autoloader files.  With
-"Sync Mode" off, the ::auto_path will be set to a tokenized form of the master's
-::auto_path.
+"Sync Mode" off, the Safe Base will set the value of \fB\-autoPath\fR to the
+master's ::auto_path, and will set the slave's ::auto_path to a tokenized form
+of the master's ::auto_path.
 .PP
 With "Sync Mode" off, if a value is specified for \fB\-autoPath\fR, even the empty
 list, in a call to \fB::safe::interpCreate\fR, \fB::safe::interpInit\fR, or
 \fB::safe::interpConfigure\fR, it will be tokenized and used as the safe
 interpreter's ::auto_path.  Any directories that do not also belong to the
-access path cannot be tokenized and will be silently ignored.
+access path cannot be tokenized and will be silently ignored.  However, the
+value of \fB\-autoPath\fR will remain as specified, and will be used to
+re-tokenize the slave's ::auto_path if \fB::safe::interpConfigure\fR is called
+to change the value of \fB\-accessPath\fR.
 .PP
 With "Sync Mode" off, if the access path is reset to the values in the
 master interpreter by calling \fB::safe::interpConfigure\fR with arguments
diff --git a/library/safe.tcl b/library/safe.tcl
index 88f59fc..5a5ddb5 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -147,8 +147,7 @@ proc ::safe::interpConfigure {args} {
 	        [list -deleteHook $state(cleanupHook)] \
 	    ]
 	    if {!$AutoPathSync} {
-	        set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
-	        lappend TMP [list -autoPath $SLAP]
+	        lappend TMP [list -autoPath $state(auto_path)]
 	    }
 	    return [join $TMP]
 	}
@@ -179,8 +178,7 @@ proc ::safe::interpConfigure {args} {
 		    if {$AutoPathSync} {
 		        return -code error "unknown flag $name (bug)"
 		    } else {
-		        set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
-		        return [list -autoPath $SLAP]
+		        return [list -autoPath $state(auto_path)]
 		    }
 		}
 		-statics    {
@@ -227,8 +225,7 @@ proc ::safe::interpConfigure {args} {
 		set doreset 1
 	    }
 	    if {(!$AutoPathSync) && (![::tcl::OptProcArgGiven -autoPath])} {
-		set SLAP [DetokPath $slave [$slave eval set ::auto_path]]
-		set autoPath $SLAP
+		set autoPath $state(auto_path)
 	    } elseif {$AutoPathSync} {
 		set autoPath {}
 	    } else {
@@ -487,6 +484,10 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook au
     set state(nestedok)          $nestedok
     set state(cleanupHook)       $deletehook
 
+    if {!$AutoPathSync} {
+        set state(auto_path)     $raw_auto_path
+    }
+
     SyncAccessPath $slave
     return
 }
@@ -1441,13 +1442,20 @@ namespace eval ::safe {
     # access_path,slave : Ditto, as the path tokens as seen by the slave.
     # access_path,map   : dict ( token -> path )
     # access_path,remap : dict ( path -> token )
+    # auto_path         : List of paths requested by the caller as slave's ::auto_path.
     # tm_path_slave     : List of TM root directories, as tokens seen by the slave.
     # staticsok         : Value of option -statics
     # nestedok          : Value of option -nested
     # cleanupHook       : Value of option -deleteHook
     #
-    # Because the slave can change its value of ::auto_path, the value of
-    # option -autoPath is not stored in the array but must be obtained from
+    # In principle, the slave can change its value of ::auto_path -
+    # - a package might add a path (that is already in the access path) for
+    #   access to tclIndex files;
+    # - the script might remove some elements of the auto_path.
+    # However, this is really the business of the master, and the auto_path will
+    # be reset whenever the token mapping changes (i.e. when option -accessPath is
+    # used to change the access path).
+    # -autoPath is now stored in the array and is no longer obtained from
     # the slave.
 }
 
diff --git a/tests/safe-stock86.test b/tests/safe-stock86.test
index a3f6bb5..e13d37e 100644
--- a/tests/safe-stock86.test
+++ b/tests/safe-stock86.test
@@ -52,8 +52,17 @@ catch {safe::interpConfigure}
 testConstraint TcltestPackage [expr {![catch {package require Tcltest}]}]
 testConstraint AutoSyncDefined 1
 
-# high level general test
-test safe-stock86-7.1 {tests that everything works at high level, uses http 2} -body {
+###  7. Test the use of ::auto_path for loading commands (via tclIndex files)
+###     and non-module packages (via pkgIndex.tcl files).
+###     Corresponding tests with Sync Mode off are 17.*
+
+test safe-stock86-7.1 {positive non-module package require, uses http 2, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
     set i [safe::interpCreate]
     # no error shall occur:
     # (because the default access_path shall include 1st level sub dirs so
@@ -63,8 +72,19 @@ test safe-stock86-7.1 {tests that everything works at high level, uses http 2} -
     interp eval $i {http::config}
     safe::interpDelete $i
     set v
+} -cleanup {
+    catch {safe::interpDelete $i}
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result 2.*
-test safe-stock86-7.2 {tests specific path and interpFind/AddToAccessPath, uses http1.0} -body {
+test safe-stock86-7.2 {negative non-module package require with specific path and interpAddToAccessPath, uses http1.0, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
@@ -77,9 +97,20 @@ test safe-stock86-7.2 {tests specific path and interpFind/AddToAccessPath, uses
     list $token1 $token2 -- \
 	    [catch {interp eval $i {package require http 1}} msg] $msg -- \
 	    $mappA -- [safe::interpDelete $i]
+} -cleanup {
+    catch {safe::interpDelete $i}
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 1 {can't find package http 1} --\
         {TCLLIB */dummy/unixlike/test/path} -- {}}
-test safe-stock86-7.4 {tests specific path and positive search, uses http1.0} -body {
+test safe-stock86-7.4 {positive non-module package require with specific path and interpAddToAccessPath, uses http1.0, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+} -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
@@ -91,8 +122,13 @@ test safe-stock86-7.4 {tests specific path and positive search, uses http1.0} -b
     list $token1 $token2 -- \
 	    [catch {interp eval $i {package require http 1}} msg] $msg -- \
 	    $mappA -- [safe::interpDelete $i]
+} -cleanup {
+    catch {safe::interpDelete $i}
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.0 -- {TCLLIB *TCLLIB/http1.0} -- {}}
-test safe-stock86-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
+test safe-stock86-7.5 {positive and negative module package require, including ancestor directory issue, uses platform::shell, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -120,27 +156,35 @@ test safe-stock86-7.5 {tests positive and negative module loading with conventio
 
 # The following test checks whether the definition of tcl_endOfWord can be
 # obtained from auto_loading.  It was previously test "safe-5.1".
-test safe-stock86-9.8 {test auto-loading in safe interpreters, was test 5.1} -setup {
+test safe-stock86-9.8 {autoloading commands indexed in tclIndex files, was test 5.1, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
     catch {safe::interpDelete a}
     safe::interpCreate a
 } -body {
     interp eval a {tcl_endOfWord "" 0}
 } -cleanup {
     safe::interpDelete a
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
 } -result -1
 
-### 18. Tests for AutoSyncDefined without conventional AutoPathSync, i.e. with AutoPathSync off.
-test safe-stock86-18.1 {cf. safe-stock86-7.1 - tests that everything works at high level without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+### 17. Test the use of ::auto_path for loading commands (via tclIndex files)
+###     and non-module packages (via pkgIndex.tcl files).
+###     Corresponding tests with Sync Mode on are 7.*
 
+test safe-stock86-17.1 {cf. safe-7.1 - positive non-module package require, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
     set lib1        [info library]
@@ -164,10 +208,8 @@ test safe-stock86-18.1 {cf. safe-stock86-7.1 - tests that everything works at hi
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -result 1.0
-test safe-stock86-18.2 {cf. safe-stock86-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
+test safe-stock86-17.2 {cf. safe-7.2 - negative non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -189,14 +231,13 @@ test safe-stock86-18.2 {cf. safe-stock86-7.2 - tests specific path and interpFin
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
+    catch {safe::interpDelete $i}
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-test safe-stock86-18.4 {cf. safe-stock86-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync} -constraints AutoSyncDefined -setup {
-    # All ::safe commands are loaded at start of file.
+} -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath {}} {}"
+test safe-stock86-17.4 {cf. safe-7.4 - positive non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
         safe::setAutoPathSync 0
@@ -220,17 +261,18 @@ test safe-stock86-18.4 {cf. safe-stock86-7.4 - tests specific path and positive
     # should not have been changed by Safe Base:
     set auto2 [interp eval $i {set ::auto_path}]
 
-    # This time, unlike test safe-stock86-18.2 and the try above, http 1.0 should be found:
+    # This time, unlike test safe-stock86-17.2 and the try above, http 1.0 should be found:
     list $auto1 $auto2 $token1 $token2 \
 	    [catch {interp eval $i {package require http 1}} msg] $msg \
 	    [safe::interpConfigure $i]\
 	    [safe::interpDelete $i]
 } -cleanup {
+    catch {safe::interpDelete $i}
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
-test safe-stock86-18.5 {cf. safe-stock86-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
+} -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {} -autoPath {}} {}"
+test safe-stock86-17.5 {cf. safe-7.5 - positive and negative module package require, including ancestor directory issue, Sync Mode off} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
diff --git a/tests/safe.test b/tests/safe.test
index f24c4d3..19daabc 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1917,14 +1917,15 @@ test safe-14.2.1 {Check that first element of slave auto_path (and access path)
     set token [lindex [$i eval set ::auto_path] 0]
     set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
     set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-    return [list [lindex $accessList 0] $auto0]
+    set autoList   [lindex [safe::interpConfigure $i -autoPath] 1]
+    return [list [lindex $accessList 0] [lindex $autoList 0] $auto0]
 } -cleanup {
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result [list [info library] [info library]]
+} -result [list [info library] [info library] [info library]]
 test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -1974,15 +1975,16 @@ test safe-14.3.1 {Check that first element of slave auto_path (and access path)
     set token [lindex [$i eval set ::auto_path] 0]
     set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
     set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    set autoList   [lindex [safe::interpConfigure $i -autoPath] 1]
 
-    return [list [lindex $accessList 0] $auto0]
+    return [list [lindex $accessList 0] [lindex $autoList 0] $auto0]
 } -cleanup {
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result [list [info library] [info library]]
+} -result [list [info library] [info library] [info library]]
 
 ### 17. Test the use of ::auto_path for loading commands (via tclIndex files)
 ###     and non-module packages (via pkgIndex.tcl files).
@@ -2029,7 +2031,9 @@ test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
+    # should not have been set by Safe Base:
     set auto1 [interp eval $i {set ::auto_path}]
+    # This does not change the value of option -autoPath:
     interp eval $i {set ::auto_path [list {$p(:0:)}]}
     # should not add anything (p0)
     set token1 [safe::interpAddToAccessPath $i [info library]]
@@ -2051,7 +2055,7 @@ test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific
         {-accessPath {[list $tcl_library \
                             */dummy/unixlike/test/path \
                             $TestsDir/auto0]}\
-        -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
+        -statics 0 -nested 1 -deleteHook {} -autoPath {}} {}"
 # (not a counterpart of safe-7.3)
 test safe-17.3 {Check that default auto_path is the same as in the master interpreter, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -2069,13 +2073,13 @@ test safe-17.3 {Check that default auto_path is the same as in the master interp
     foreach token [$i eval set ::auto_path] {
         lappend ap [dict get [set ::safe::S${i}(access_path,map)] $token]
     }
-    return $ap
+    return [list $ap [lindex [::safe::interpConfigure $i -autoPath] 1]]
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
 	safe::setAutoPathSync $SyncVal_TMP
     }
-} -result $::auto_path
+} -result [list $::auto_path $::auto_path]
 test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -2090,6 +2094,7 @@ test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific
     # should not have been set by Safe Base:
     set auto1 [interp eval $i {set ::auto_path}]
 
+    # This does not change the value of option -autoPath.
     interp eval $i {set ::auto_path [list {$p(:0:)}]}
 
     # should not add anything (p0)
@@ -2118,7 +2123,7 @@ test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
         {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
         -statics 0 -nested 1 -deleteHook {}\
-        -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
+        -autoPath {}} {}"
 test safe-17.5 {cf. safe-7.5 - positive and negative module package require, including ancestor directory issue, Sync Mode off} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -2171,19 +2176,23 @@ test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
 
     # Load and run the commands.
     set code1 [catch {interp eval $i {report1}} msg1]
     set code2 [catch {interp eval $i {report2}} msg2]
 
-    list $path1 $path2 -- $code1 $msg1 $code2 $msg2 -- $mappA
+    list $path1 $path2 -- $code1 $msg1 $code2 $msg2 -- $mappA -- $mappC -- $toksC
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
-        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*}}
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {{$p(:0:)} {$p(:1:)} {$p(:2:)}}}
 test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -2204,6 +2213,8 @@ test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffe
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
 
     # Load auto_load data.
     interp eval $i {catch nonExistentCommand}
@@ -2225,12 +2236,15 @@ test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffe
     set mappB [mapList $PathMapp [dict get $confB -accessPath]]
     set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappD [mapList $PathMapp [dict get $confB -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
 
     # Run the commands.
     set code3 [catch {interp eval $i {report1}} msg3]
     set code4 [catch {interp eval $i {report2}} msg4]
 
-    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- $mappA -- $mappB
+    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- \
+            $mappA -- $mappB -- $mappC -- $mappD -- $toksC -- $toksD
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
@@ -2238,7 +2252,10 @@ test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffe
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
-        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
+        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {{$p(:0:)} {$p(:1:)} {$p(:2:)}} -- {{$p(:0:)} {$p(:2:)} {$p(:1:)}}}
 test safe-19.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), Sync Mode off} -constraints {AutoSyncDefined} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
@@ -2259,6 +2276,8 @@ test safe-19.10 {interpConfigure change the access path; tclIndex commands unaff
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
 
     # Load auto_load data.
     interp eval $i {catch nonExistentCommand}
@@ -2278,12 +2297,15 @@ test safe-19.10 {interpConfigure change the access path; tclIndex commands unaff
     set mappB [mapList $PathMapp [dict get $confB -accessPath]]
     set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappD [mapList $PathMapp [dict get $confB -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
 
     # Load and run the commands.
     set code3 [catch {interp eval $i {report1}} msg3]
     set code4 [catch {interp eval $i {report2}} msg4]
 
-    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- $mappA -- $mappB
+    list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- \
+            $mappA -- $mappB -- $mappC -- $mappD -- $toksC -- $toksD
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
@@ -2292,8 +2314,11 @@ test safe-19.10 {interpConfigure change the access path; tclIndex commands unaff
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
-        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
-test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, Sync Mode off} -constraints AutoSyncDefined -setup {
+        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2} --\
+        {{$p(:0:)} {$p(:1:)} {$p(:2:)}} -- {{$p(:0:)} {$p(:2:)} {$p(:1:)}}}
+test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement (1), Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -2302,7 +2327,6 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
 } -body {
-    # For complete correspondence to safe-stock87-9.11, include auto0 in access path.
     set i [safe::interpCreate -accessPath [list $tcl_library \
                                             [file join $TestsDir auto0] \
                                             [file join $TestsDir auto0 auto1] \
@@ -2315,6 +2339,8 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
     set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
 
     # Load pkgIndex.tcl data.
     catch {interp eval $i {package require NOEXIST}}
@@ -2333,6 +2359,8 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
     set mappB [mapList $PathMapp [dict get $confB -accessPath]]
     set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappD [mapList $PathMapp [dict get $confB -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
 
     # Try to load the packages and run a command from each one.
     set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
@@ -2341,7 +2369,8 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
     set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
 
     list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- \
-         $mappA -- $mappB -- $code5 $msg5 $code6 $msg6
+         $mappA -- $mappB -- $mappC -- $mappD -- $toksC -- $toksD -- \
+         $code5 $msg5 $code6 $msg6
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
@@ -2350,6 +2379,8 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
+        {TCLLIB TESTSDIR/auto0} -- {TCLLIB TESTSDIR/auto0} --\
+        {{$p(:0:)} {$p(:1:)}} -- {{$p(:0:)} {$p(:1:)}} --\
         0 OK1 0 OK2}
 test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, safe-19.11 without path auto0, Sync Mode off} -constraints {AutoSyncDefined} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -2373,6 +2404,8 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
 
     # Load pkgIndex.tcl data.
     catch {interp eval $i {package require NOEXIST}}
@@ -2389,6 +2422,8 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
     set mappB [mapList $PathMapp [dict get $confB -accessPath]]
     set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappD [mapList $PathMapp [dict get $confB -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
 
     # Try to load the packages and run a command from each one.
     set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
@@ -2397,7 +2432,7 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
     set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
 
     list $path1 $path2 -- $path3 $path4 -- $code3 $msg3 $code4 $msg4 -- \
-            $mappA -- $mappB -- \
+            $mappA -- $mappB -- $mappC -- $mappD -- $toksC -- $toksD -- \
             $code5 $msg5 $code6 $msg6
 } -cleanup {
     safe::interpDelete $i
@@ -2408,6 +2443,9 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
         0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2} --\
+        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1} --\
+        {{$p(:0:)} {$p(:1:)} {$p(:2:)}} -- {{$p(:0:)} {$p(:1:)} {$p(:2:)}} --\
         0 OK1 0 OK2}
 test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, Sync Mode off} -constraints {AutoSyncDefined} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
@@ -2430,6 +2468,8 @@ test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages f
     set mappA [mapList $PathMapp [dict get $confA -accessPath]]
     set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
     set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
 
     # Load pkgIndex.tcl data.
     catch {interp eval $i {package require NOEXIST}}
@@ -2442,13 +2482,15 @@ test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages f
     set mappB [mapList $PathMapp [dict get $confB -accessPath]]
     set code4 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]} path4]
     set code5 [catch {::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]} path5]
+    set mappD [mapList $PathMapp [dict get $confB -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
 
     # Try to load the packages.
     set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
     set code6 [catch {interp eval $i {package require SafeTestPackage2}} msg6]
 
     list $path1 $path2 -- $code4 $path4 -- $code5 $path5 -- $code3 $code6 -- \
-            $mappA -- $mappB
+            $mappA -- $mappB -- $mappC -- $mappD -- $toksC -- $toksD
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
@@ -2456,7 +2498,190 @@ test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages f
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
-        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} -- {TCLLIB*}}
+        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB*} -- {TCLLIB TESTSDIR/auto0} -- {TCLLIB TESTSDIR/auto0} --\
+        {{$p(:0:)} {$p(:1:)}} -- {{$p(:0:)}}}
+# (no counterpart safe-9.14)
+test safe-19.14 {when interpConfigure changes the access path, ::auto_path uses -autoPath value and new tokens, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    # Test that although -autoPath is unchanged, the slave's ::auto_path changes to
+    # reflect the changes in token mappings.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0] \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Swap tokens {$p(:1:)} and {$p(:3:)}.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                           [file join $TestsDir auto0 auto2] \
+                                           [file join $TestsDir auto0 auto1] \
+                                           [file join $TestsDir auto0]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappD [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path0 $path1 $path2 -- $path5 $path3 $path4 -- $toksC -- $toksD -- \
+         $code3 $msg3 $code4 $msg4 -- \
+         $mappA -- $mappB -- $mappC -- $mappD -- $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:1:)} {$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} {$p(:1:)} -- {{$p(:0:)} {$p(:1:)}} -- {{$p(:0:)} {$p(:3:)}} -- 0 1.2.3 0 2.3.4 --\
+        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1 TESTSDIR/auto0*} --\
+        {TCLLIB TESTSDIR/auto0} --\
+        {TCLLIB TESTSDIR/auto0} --\
+        0 OK1 0 OK2}
+# (no counterpart safe-9.15)
+test safe-19.15 {when interpConfigure changes the access path, ::auto_path uses -autoPath value and new tokens, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    # Test that although -autoPath is unchanged, the slave's ::auto_path changes to
+    # reflect the changes in token mappings; and that it is based on the -autoPath
+    # value, not the previously restricted slave ::auto_path.
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path0 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Add more directories.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0] \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path4 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappD [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3 opts3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4 opts4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path0 -- $path5 $path3 $path4 -- $toksC -- $toksD -- \
+         $code3 $msg3 $code4 $msg4 -- \
+         $mappA -- $mappB -- $mappC -- $mappD -- $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:1:)} -- {$p(:1:)} {$p(:2:)} {$p(:3:)} -- {{$p(:0:)}} -- {{$p(:0:)} {$p(:2:)} {$p(:3:)}} -- 0 1.2.3 0 2.3.4 --\
+        {TCLLIB TESTSDIR/auto0*} --\
+        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2} --\
+        {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2} --\
+        0 OK1 0 OK2}
+# (no counterpart safe-9.16)
+test safe-19.16 {default value for -accessPath and -autoPath on creation; -autoPath preserved when -accessPath changes, ::auto_path using changed tokens, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set tmpAutoPath $::auto_path
+    set ::auto_path [list $tcl_library [file join $TestsDir auto0]]
+    set i [safe::interpCreate]
+    set ::auto_path $tmpAutoPath
+} -body {
+    # Test that the -autoPath acquires and keeps the master's value unless otherwise specified.
+
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
+
+    # Load pkgIndex.tcl data.
+    catch {interp eval $i {package require NOEXIST}}
+
+    # Rearrange access path.  Remove a directory.
+    safe::interpConfigure $i -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0] \
+                                            [file join $TestsDir auto0 auto1]]
+    # Inspect.
+    set confB [safe::interpConfigure $i]
+    set mappB [mapList $PathMapp [dict get $confB -accessPath]]
+    set path5 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0]]
+    set path3 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set mappD [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksD [interp eval $i set ::auto_path]
+
+    # Try to load the packages and run a command from each one.
+    set code3 [catch {interp eval $i {package require SafeTestPackage1}} msg3]
+    set code4 [catch {interp eval $i {package require SafeTestPackage2}} msg4]
+    set code5 [catch {interp eval $i {HeresPackage1}} msg5 opts5]
+    set code6 [catch {interp eval $i {HeresPackage2}} msg6 opts6]
+
+    list $path5 $path3 -- [lindex $toksC 0] [llength $toksC] -- \
+            $toksD -- $code3 $msg3 $code4 $msg4 -- \
+            $mappB -- $mappC -- $mappD -- $code5 $msg5 $code6 $msg6
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:0:)} 2 --\
+        {{$p(:0:)} {$p(:1:)}} -- 0 1.2.3 1 {can't find package SafeTestPackage2} --\
+        {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1*} --\
+        {TCLLIB TESTSDIR/auto0} -- {TCLLIB TESTSDIR/auto0} --\
+        0 OK1 1 {invalid command name "HeresPackage2"}}
 test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
-- 
cgit v0.12


From b64759fbc4e900de70694bebbc5a48c8ed52be9b Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Sat, 25 Jul 2020 01:46:56 +0000
Subject: Rearrange tests in safe.test so they are in numerical order, add 24
 more tests of -accessPath/-autoPath cases.

---
 tests/safe.test | 808 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 620 insertions(+), 188 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index 19daabc..e0a2d84 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -37,6 +37,11 @@ set ::auto_path [info library]
 set TestsDir [file normalize [file dirname [info script]]]
 set PathMapp [list $tcl_library TCLLIB $TestsDir TESTSDIR]
 
+proc getAutoPath {slave} {
+    set ap1 [lrange [lindex [safe::interpConfigure $slave -autoPath] 1] 0 end]
+    set ap2 [::safe::DetokPath $slave [interp eval $slave set ::auto_path]]
+    list $ap1 -- $ap2
+}
 proc mapList {map listIn} {
     set listOut {}
     foreach element $listIn {
@@ -1731,6 +1736,120 @@ test safe-14.1 {Check that module path is the same as in the master interpreter
 } -cleanup {
     safe::interpDelete $i
 } -result [::tcl::tm::path list]
+test safe-14.2 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
+test safe-14.2.1 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    set autoList   [lindex [safe::interpConfigure $i -autoPath] 1]
+    return [list [lindex $accessList 0] [lindex $autoList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library] [info library]]
+test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib2 $lib1]
+    # Unexpected order, should be reversed in the slave
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
+test safe-14.3.1 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib2 $lib1]
+    # Unexpected order, should be reversed in the slave
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    set autoList   [lindex [safe::interpConfigure $i -autoPath] 1]
+
+    return [list [lindex $accessList 0] [lindex $autoList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library] [info library]]
 
 ### 15. Safe file ensemble.
 
@@ -1869,123 +1988,6 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
     unset user
 } -result {~USER}
 
-### 14.x move above.
-
-test safe-14.2 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib1 $lib2]
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-    return [list [lindex $accessList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library]]
-test safe-14.2.1 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib1 $lib2]
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-    set autoList   [lindex [safe::interpConfigure $i -autoPath] 1]
-    return [list [lindex $accessList 0] [lindex $autoList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library] [info library]]
-test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib2 $lib1]
-    # Unexpected order, should be reversed in the slave
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-
-    return [list [lindex $accessList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library]]
-test safe-14.3.1 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib2 $lib1]
-    # Unexpected order, should be reversed in the slave
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-    set autoList   [lindex [safe::interpConfigure $i -autoPath] 1]
-
-    return [list [lindex $accessList 0] [lindex $autoList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library] [info library]]
-
 ### 17. Test the use of ::auto_path for loading commands (via tclIndex files)
 ###     and non-module packages (via pkgIndex.tcl files).
 ###     Corresponding tests with Sync Mode on are 7.*
@@ -2152,33 +2154,136 @@ test safe-17.5 {cf. safe-7.5 - positive and negative module package require, inc
     }
 } -result {1 {can't find package test1} 0}
 
-### 19. Assorted options, including changes to option values.
-###     Mostly these are changes to access path, auto_path, module path.
-###     If Sync Mode is on, a corresponding test with Sync Mode off is 9.*
+### 18. Test tokenization of directories available to a slave.
 
-test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -constraints AutoSyncDefined -setup {
+test safe-18.1 {Check that each directory of the default auto_path is a valid token, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        safe::setAutoPathSync 1
     }
+    set i [safe::interpCreate]
 } -body {
-    set i [safe::interpCreate -accessPath [list $tcl_library \
-                                            [file join $TestsDir auto0 auto1] \
-                                            [file join $TestsDir auto0 auto2]] \
-                              -autoPath [list $tcl_library \
-                                            [file join $TestsDir auto0 auto1] \
-                                            [file join $TestsDir auto0 auto2]]]
-    # Inspect.
-    set confA [safe::interpConfigure $i]
-    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
-    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
-    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
-    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
-    set toksC [interp eval $i set ::auto_path]
-
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.1.1 {Check that each directory of the default auto_path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.2 {Check that each directory of the module path is a valid token, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.2.1 {Check that each directory of the module path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+
+### 19. Assorted options, including changes to option values.
+###     Mostly these are changes to access path, auto_path, module path.
+###     If Sync Mode is on, a corresponding test with Sync Mode off is 9.*
+
+test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]] \
+                              -autoPath [list $tcl_library \
+                                            [file join $TestsDir auto0 auto1] \
+                                            [file join $TestsDir auto0 auto2]]]
+    # Inspect.
+    set confA [safe::interpConfigure $i]
+    set mappA [mapList $PathMapp [dict get $confA -accessPath]]
+    set path1 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto1]]
+    set path2 [::safe::interpFindInAccessPath $i [file join $TestsDir auto0 auto2]]
+    set mappC [mapList $PathMapp [dict get $confA -autoPath]]
+    set toksC [interp eval $i set ::auto_path]
+
     # Load and run the commands.
     set code1 [catch {interp eval $i {report1}} msg1]
     set code2 [catch {interp eval $i {report2}} msg2]
@@ -3019,33 +3124,63 @@ test safe-19.24 {interpConfigure change the access path; check module loading, S
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 
-### 18. Test tokenization of directories available to a slave.
 
-test safe-18.1 {Check that each directory of the default auto_path is a valid token, Sync Mode on} -setup {
+### 20. safe::interpCreate with different cases of -accessPath, -autoPath.
+
+set ::auto_path [list $tcl_library [file dirname $tcl_library] [file join $TestsDir auto0]]
+
+test safe-20.1 "create -accessPath NULL -autoPath NULL -> master's ::auto_path" -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
+} -body {
     set i [safe::interpCreate]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list $::auto_path -- $::auto_path]
+test safe-20.2 "create -accessPath {} -autoPath NULL -> master's ::auto_path" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
 } -body {
-    set badTokens {}
-    foreach dir [$i eval {set ::auto_path}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
+    set i [safe::interpCreate -accessPath {}]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
     }
-    set badTokens
+} -result [list $::auto_path -- $::auto_path]
+test safe-20.3 "create -accessPath path1 -autoPath NULL -> {}" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1]]
+    getAutoPath $i
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {}
-test safe-18.1.1 {Check that each directory of the default auto_path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+} -result {{} -- {}}
+test safe-20.4 "create -accessPath NULL -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -3053,49 +3188,67 @@ test safe-18.1.1 {Check that each directory of the default auto_path is a valid
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-    set i [safe::interpCreate]
 } -body {
-    set badTokens {}
-    foreach dir [$i eval {set ::auto_path}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
+    set i [safe::interpCreate -autoPath {}]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
     }
-    set badTokens
+} -result {{} -- {}}
+test safe-20.5 "create -accessPath {} -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath {} -autoPath {}]
+    getAutoPath $i
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {}
-test safe-18.2 {Check that each directory of the module path is a valid token, Sync Mode on} -setup {
+} -result {{} -- {}}
+test safe-20.6 "create -accessPath path1 -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-    set i [safe::interpCreate]
 } -body {
-    set badTokens {}
-    foreach dir [$i eval {::tcl::tm::path list}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath {}]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
     }
-    set badTokens
+} -result {{} -- {}}
+test safe-20.7 "create -accessPath NULL -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -autoPath [lrange $::auto_path 0 0]]
+    getAutoPath $i
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {}
-test safe-18.2.1 {Check that each directory of the module path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+} -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
+test safe-20.8 "create -accessPath {} -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
     set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
     if {$SyncExists} {
         set SyncVal_TMP [safe::setAutoPathSync]
@@ -3103,28 +3256,307 @@ test safe-18.2.1 {Check that each directory of the module path is a valid token,
     } else {
         error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
     }
-    set i [safe::interpCreate]
 } -body {
-    set badTokens {}
-    foreach dir [$i eval {::tcl::tm::path list}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
+    set i [safe::interpCreate -accessPath {} -autoPath [lrange $::auto_path 0 0]]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
     }
-    set badTokens
+} -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
+test safe-20.9 "create -accessPath path1 -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+    getAutoPath $i
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
         safe::setAutoPathSync $SyncVal_TMP
     }
-} -result {}
+} -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
+test safe-20.10 "create -accessPath NULL -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -autoPath /not/in/access/path]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {/not/in/access/path -- {}}
+test safe-20.11 "create -accessPath {} -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath {} -autoPath /not/in/access/path]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {/not/in/access/path -- {}}
+test safe-20.12 "create -accessPath path1 -autoPath pathX -> {pathX}" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+} -body {
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath /not/in/access/path]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {/not/in/access/path -- {}}
+
+### 21. safe::interpConfigure with different cases of -accessPath, -autoPath.
+
+test safe-21.1 "interpConfigure -accessPath NULL -autoPath NULL -> no change" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -deleteHook {}
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
+test safe-21.2 "interpConfigure -accessPath {} -autoPath NULL -> master's ::auto_path" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath {}
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list $::auto_path -- $::auto_path]
+test safe-21.3 "interpConfigure -accessPath path1 -autoPath NULL -> no change" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath [lrange $::auto_path 0 1]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
+test safe-21.4 "interpConfigure -accessPath NULL -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -autoPath {}
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {{} -- {}}
+test safe-21.5 "interpConfigure -accessPath {} -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath {} -autoPath {}
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {{} -- {}}
+test safe-21.6 "interpConfigure -accessPath {path1} -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath [lrange $::auto_path 1 1] -autoPath {}
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {{} -- {}}
+test safe-21.7 "interpConfigure -accessPath NULL -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -autoPath [lrange $::auto_path 1 1]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [lrange $::auto_path 1 1] -- [lrange $::auto_path 1 1]]
+test safe-21.8 "interpConfigure -accessPath {} -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath {} -autoPath [lrange $::auto_path 1 1]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [lrange $::auto_path 1 1] -- [lrange $::auto_path 1 1]]
+test safe-21.9 "interpConfigure -accessPath path1 -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath [lrange $::auto_path 0 2] -autoPath [lrange $::auto_path 1 1]
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [lrange $::auto_path 1 1] -- [lrange $::auto_path 1 1]]
+test safe-21.10 "interpConfigure -accessPath NULL -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -autoPath /not/in/access/path
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {/not/in/access/path -- {}}
+test safe-21.11 "interpConfigure -accessPath {} -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath {} -autoPath /not/in/access/path
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {/not/in/access/path -- {}}
+test safe-21.12 "interpConfigure -accessPath path1 -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
+} -body {
+    safe::interpConfigure $i -accessPath [lrange $::auto_path 0 2] -autoPath /not/in/access/path
+    getAutoPath $i
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {/not/in/access/path -- {}}
 
 # cleanup
 set ::auto_path $SaveAutoPath
 unset SaveAutoPath TestsDir PathMapp
+rename getAutoPath {}
 rename mapList {}
 rename mapAndSortList {}
 ::tcltest::cleanupTests
-- 
cgit v0.12


From 1b7f4189f054796e18cbc8211d7eed39495ffa9c Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Sat, 25 Jul 2020 02:08:08 +0000
Subject: Rename command safe::setAutoPathSync to safe::setSyncMode.  Add a
 section TYPICAL USE to doc/safe.n.

---
 doc/safe.n              |  36 ++-
 library/safe.tcl        |  12 +-
 library/tclIndex        |   2 +-
 tests/safe-stock86.test |  80 +++---
 tests/safe.test         | 640 ++++++++++++++++++++++++------------------------
 5 files changed, 400 insertions(+), 370 deletions(-)

diff --git a/doc/safe.n b/doc/safe.n
index 8aa8686..ab424d3 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -23,7 +23,7 @@ safe \- Creating and manipulating safe interpreters
 .sp
 \fB::safe::interpFindInAccessPath\fR \fIslave\fR \fIdirectory\fR
 .sp
-\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+\fB::safe::setSyncMode\fR ?\fInewValue\fR?
 .sp
 \fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
 .SS OPTIONS
@@ -151,7 +151,7 @@ $slave eval [list set tk_library \e
 .CE
 .RE
 .TP
-\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+\fB::safe::setSyncMode\fR ?\fInewValue\fR?
 This command is used to get or set the "Sync Mode" of the Safe Base.
 When an argument is supplied, the command returns an error if the argument
 is not a boolean value, or if any Safe Base interpreters exist.  Typically
@@ -377,6 +377,36 @@ When the \fIaccessPath\fR is changed after the first creation or
 initialization (i.e. through \fBinterpConfigure -accessPath \fR\fIlist\fR),
 an \fBauto_reset\fR is automatically evaluated in the safe interpreter
 to synchronize its \fBauto_index\fR with the new token list.
+.SH TYPICAL USE
+In many cases, the properties of a Safe Base interpreter can be specified
+when the interpreter is created, and then left unchanged for the lifetime
+of the interpreter.
+.PP
+If you wish to use Safe Base interpreters with "Sync Mode" off, evaluate
+the command
+.RS
+.PP
+.CS
+ safe::setSyncMode 0
+.CE
+.RE
+.PP
+Use \fB::safe::interpCreate\fR or \fB::safe::interpInit\fR to create an
+interpreter with the properties that you require.  The simplest way is not
+to specify \fB\-accessPath\fR or \fB\-autoPath\fR, which means the safe
+interpreter will use the same paths as the master interpreter.  However,
+if \fB\-accessPath\fR is specified, then \fB\-autoPath\fR must also be
+specified, or else it will be set to {}.
+.PP
+The value of \fB\-autoPath\fR will be that required to access tclIndex
+and pkgIndex.txt files according to the same rules as an unsafe
+interpreter (see pkg_mkIndex(n) and library(n)).
+.PP
+With "Sync Mode" on, the option \fB\-autoPath\fR is undefined, and
+the Safe Base sets the slave's ::auto_path to a tokenized form of the
+access path. In addition to the directories present if "Safe Mode" is off,
+the ::auto_path includes the numerous subdirectories and module paths
+that belong to the access path.
 .SH SYNC MODE
 Before Tcl version 8.6.x, the Safe Base kept each safe interpreter's
 ::auto_path synchronized with a tokenized form of its access path.
@@ -392,7 +422,7 @@ of the ::auto_path and access path ("Sync Mode" on) is still the default.
 However, the Safe Base offers the option of limiting the safe interpreter's
 ::auto_path to the much shorter list of directories that is necessary for
 it to perform its function ("Sync Mode" off).  Use the command
-\fB::safe::setAutoPathSync\fR to choose the mode before creating any Safe
+\fB::safe::setSyncMode\fR to choose the mode before creating any Safe
 Base interpreters.
 .PP
 In either mode, the most convenient way to initialize a safe interpreter is
diff --git a/library/safe.tcl b/library/safe.tcl
index 5a5ddb5..9a701a4 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -345,7 +345,7 @@ proc ::safe::InterpCreate {
 #
 #    It is the caller's responsibility, if it supplies a non-empty value for
 #    access_path, to make the first directory in the path suitable for use as
-#    tcl_library, and (if ![setAutoPathSync]), to set the slave's ::auto_path.
+#    tcl_library, and (if ![setSyncMode]), to set the slave's ::auto_path.
 
 proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook autoPath withAutoPath} {
     global auto_path
@@ -418,9 +418,9 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook au
 
     # Set the slave auto_path to a tokenized raw_auto_path.
     # Silently ignore any directories that are not in the access path.
-    # If [setAutoPathSync], SyncAccessPath will overwrite this value with the
+    # If [setSyncMode], SyncAccessPath will overwrite this value with the
     # full access path.
-    # If ![setAutoPathSync], Safe Base code will not change this value.
+    # If ![setSyncMode], Safe Base code will not change this value.
     set tokens_auto_path {}
     foreach dir $raw_auto_path {
 	if {[dict exists $remap_access_path $dir]} {
@@ -1360,7 +1360,7 @@ proc ::safe::Setup {} {
 }
 
 # Accessor method for ::safe::AutoPathSync
-# Usage: ::safe::setAutoPathSync ?newValue?
+# Usage: ::safe::setSyncMode ?newValue?
 # Respond to changes by calling Setup again, preserving any
 # caller-defined logging.  This allows complete equivalence with
 # prior Safe Base behavior if AutoPathSync is true.
@@ -1373,7 +1373,7 @@ proc ::safe::Setup {} {
 # (The initialization of AutoPathSync at the end of this file is acceptable
 #  because Setup has not yet been called.)
 
-proc ::safe::setAutoPathSync {args} {
+proc ::safe::setSyncMode {args} {
     variable AutoPathSync
 
     if {[llength $args] == 0} {
@@ -1396,7 +1396,7 @@ proc ::safe::setAutoPathSync {args} {
             setLogCmd $TmpLog
         }
     } else {
-        set msg {wrong # args: should be "safe::setAutoPathSync ?newValue?"}
+        set msg {wrong # args: should be "safe::setSyncMode ?newValue?"}
         return -code error $msg
     }
 
diff --git a/library/tclIndex b/library/tclIndex
index 0d2db02..efc29a8 100644
--- a/library/tclIndex
+++ b/library/tclIndex
@@ -61,7 +61,7 @@ set auto_index(::safe::DirInAccessPath) [list source [file join $dir safe.tcl]]
 set auto_index(::safe::Subset) [list source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasSubset) [list source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasEncoding) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::setAutoPathSync) [list source [file join $dir safe.tcl]]
+set auto_index(::safe::setSyncMode) [list source [file join $dir safe.tcl]]
 set auto_index(tcl_wordBreakAfter) [list source [file join $dir word.tcl]]
 set auto_index(tcl_wordBreakBefore) [list source [file join $dir word.tcl]]
 set auto_index(tcl_endOfWord) [list source [file join $dir word.tcl]]
diff --git a/tests/safe-stock86.test b/tests/safe-stock86.test
index e13d37e..1ec7ee5 100644
--- a/tests/safe-stock86.test
+++ b/tests/safe-stock86.test
@@ -57,10 +57,10 @@ testConstraint AutoSyncDefined 1
 ###     Corresponding tests with Sync Mode off are 17.*
 
 test safe-stock86-7.1 {positive non-module package require, uses http 2, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate]
@@ -75,14 +75,14 @@ test safe-stock86-7.1 {positive non-module package require, uses http 2, Sync Mo
 } -cleanup {
     catch {safe::interpDelete $i}
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 2.*
 test safe-stock86-7.2 {negative non-module package require with specific path and interpAddToAccessPath, uses http1.0, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -100,15 +100,15 @@ test safe-stock86-7.2 {negative non-module package require with specific path an
 } -cleanup {
     catch {safe::interpDelete $i}
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 1 {can't find package http 1} --\
         {TCLLIB */dummy/unixlike/test/path} -- {}}
 test safe-stock86-7.4 {positive non-module package require with specific path and interpAddToAccessPath, uses http1.0, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -125,14 +125,14 @@ test safe-stock86-7.4 {positive non-module package require with specific path an
 } -cleanup {
     catch {safe::interpDelete $i}
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.0 -- {TCLLIB *TCLLIB/http1.0} -- {}}
 test safe-stock86-7.5 {positive and negative module package require, including ancestor directory issue, uses platform::shell, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set i [safe::interpCreate]
     interp eval $i {
@@ -150,17 +150,17 @@ test safe-stock86-7.5 {positive and negative module package require, including a
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
 # The following test checks whether the definition of tcl_endOfWord can be
 # obtained from auto_loading.  It was previously test "safe-5.1".
 test safe-stock86-9.8 {autoloading commands indexed in tclIndex files, was test 5.1, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     catch {safe::interpDelete a}
     safe::interpCreate a
@@ -169,7 +169,7 @@ test safe-stock86-9.8 {autoloading commands indexed in tclIndex files, was test
 } -cleanup {
     safe::interpDelete a
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result -1
 
@@ -178,12 +178,12 @@ test safe-stock86-9.8 {autoloading commands indexed in tclIndex files, was test
 ###     Corresponding tests with Sync Mode on are 7.*
 
 test safe-stock86-17.1 {cf. safe-7.1 - positive non-module package require, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
@@ -205,16 +205,16 @@ test safe-stock86-17.1 {cf. safe-7.1 - positive non-module package require, Sync
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result 1.0
 test safe-stock86-17.2 {cf. safe-7.2 - negative non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -233,16 +233,16 @@ test safe-stock86-17.2 {cf. safe-7.2 - negative non-module package require with
 } -cleanup {
     catch {safe::interpDelete $i}
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {} -autoPath {}} {}"
 test safe-stock86-17.4 {cf. safe-7.4 - positive non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -269,16 +269,16 @@ test safe-stock86-17.4 {cf. safe-7.4 - positive non-module package require with
 } -cleanup {
     catch {safe::interpDelete $i}
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+	safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 1.0 {-accessPath {[list $tcl_library *$tcl_library/http1.0]} -statics 0 -nested 1 -deleteHook {} -autoPath {}} {}"
 test safe-stock86-17.5 {cf. safe-7.5 - positive and negative module package require, including ancestor directory issue, Sync Mode off} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
     interp eval $i {
@@ -295,7 +295,7 @@ test safe-stock86-17.5 {cf. safe-7.5 - positive and negative module package requ
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
diff --git a/tests/safe.test b/tests/safe.test
index e0a2d84..ec348b4 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -74,10 +74,10 @@ test safe-1.1 {safe::interpConfigure syntax} -returnCodes error -body {
 } -result {no value given for parameter "slave" (use -help for full usage) :
     slave name () name of the slave}
 test safe-1.2 {safe::interpCreate syntax, Sync Mode on} -returnCodes error -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -85,7 +85,7 @@ test safe-1.2 {safe::interpCreate syntax, Sync Mode on} -returnCodes error -setu
     safe::interpCreate -help
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {Usage information:
     Var/FlagName  Type     Value   Help
@@ -99,18 +99,18 @@ test safe-1.2 {safe::interpCreate syntax, Sync Mode on} -returnCodes error -setu
     -nested       boolean  (false) nested loading
     -deleteHook   script   ()      delete hook}
 test safe-1.2.1 {safe::interpCreate syntax, Sync Mode off} -returnCodes error -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     safe::interpCreate -help
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {Usage information:
     Var/FlagName  Type     Value   Help
@@ -374,10 +374,10 @@ rename SafeEval {}
 ###     Corresponding tests with Sync Mode off are 17.*
 
 test safe-7.1 {positive non-module package require, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0]
@@ -394,14 +394,14 @@ test safe-7.1 {positive non-module package require, Sync Mode on} -setup {
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 1.2.3
 test safe-7.2 {negative non-module package require with specific path and interpAddToAccessPath, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -421,7 +421,7 @@ test safe-7.2 {negative non-module package require with specific path and interp
 	    $mappA -- [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} {$p(:*:)} --\
         1 {can't find package SafeTestPackage1} --\
@@ -458,10 +458,10 @@ test safe-7.3.1 {check that safe subinterpreters work with namespace names} -set
             [interp exists $j] [info vars ::safe::S*]
 } -match glob -result {{} {} ok ok {} 0 {}}
 test safe-7.4 {positive non-module package require with specific path and interpAddToAccessPath, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -481,15 +481,15 @@ test safe-7.4 {positive non-module package require with specific path and interp
     # other than the first and last in the access path.
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.2.3 --\
         {TCLLIB * TESTSDIR/auto0/auto1} -- {}}
 test safe-7.5 {positive and negative module package require, including ancestor directory issue, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
@@ -507,7 +507,7 @@ test safe-7.5 {positive and negative module package require, including ancestor
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package test1} 0}
 
@@ -763,10 +763,10 @@ test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
         {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}}\
         {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
 test safe-9.8 {autoloading commands indexed in tclIndex files, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -786,15 +786,15 @@ test safe-9.8 {autoloading commands indexed in tclIndex files, Sync Mode on} -se
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*}}
 test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -832,16 +832,16 @@ test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffec
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
 test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -877,17 +877,17 @@ test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffe
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
 test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     # For complete correspondence to safe-9.10opt, include auto0 in access path.
@@ -929,17 +929,17 @@ test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages un
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, safe-9.11 without path auto0, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -976,7 +976,7 @@ test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages un
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 1.2.3 0 2.3.4 --\
@@ -984,10 +984,10 @@ test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages un
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -1020,16 +1020,16 @@ test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fa
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} -- {TCLLIB*}}
 test safe-9.20 {check module loading, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1064,7 +1064,7 @@ test safe-9.20 {check module loading, Sync Mode on} -setup {
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -1080,10 +1080,10 @@ test safe-9.20 {check module loading, Sync Mode on} -setup {
 #   comparing with expected results.  The test is therefore not totally strict,
 #   but will notice missing or surplus directories.
 test safe-9.21 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 1} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1138,7 +1138,7 @@ test safe-9.21 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1150,10 +1150,10 @@ test safe-9.21 {interpConfigure change the access path; check module loading, Sy
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-9.22 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 0} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1203,7 +1203,7 @@ test safe-9.22 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1215,10 +1215,10 @@ test safe-9.22 {interpConfigure change the access path; check module loading, Sy
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-9.23 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 3} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1278,7 +1278,7 @@ test safe-9.23 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1290,10 +1290,10 @@ test safe-9.23 {interpConfigure change the access path; check module loading, Sy
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-9.24 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 2 (worst case)} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1348,7 +1348,7 @@ test safe-9.24 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1737,10 +1737,10 @@ test safe-14.1 {Check that module path is the same as in the master interpreter
     safe::interpDelete $i
 } -result [::tcl::tm::path list]
 test safe-14.2 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 
     set lib1        [info library]
@@ -1759,16 +1759,16 @@ test safe-14.2 {Check that first element of slave auto_path (and access path) is
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library]]
 test safe-14.2.1 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 
     set lib1        [info library]
@@ -1788,14 +1788,14 @@ test safe-14.2.1 {Check that first element of slave auto_path (and access path)
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library] [info library]]
 test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 
     set lib1        [info library]
@@ -1816,16 +1816,16 @@ test safe-14.3 {Check that first element of slave auto_path (and access path) is
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library]]
 test safe-14.3.1 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 
     set lib1        [info library]
@@ -1847,7 +1847,7 @@ test safe-14.3.1 {Check that first element of slave auto_path (and access path)
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library] [info library]]
 
@@ -1993,12 +1993,12 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
 ###     Corresponding tests with Sync Mode on are 7.*
 
 test safe-17.1 {cf. safe-7.1 - positive non-module package require, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
@@ -2020,16 +2020,16 @@ test safe-17.1 {cf. safe-7.1 - positive non-module package require, Sync Mode of
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 1.2.3
 test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -2050,7 +2050,7 @@ test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
         1 {can't find package SafeTestPackage1}\
@@ -2060,12 +2060,12 @@ test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific
         -statics 0 -nested 1 -deleteHook {} -autoPath {}} {}"
 # (not a counterpart of safe-7.3)
 test safe-17.3 {Check that default auto_path is the same as in the master interpreter, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
 } -body {
@@ -2079,16 +2079,16 @@ test safe-17.3 {Check that default auto_path is the same as in the master interp
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+	safe::setSyncMode $SyncVal_TMP
     }
 } -result [list $::auto_path $::auto_path]
 test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -2120,19 +2120,19 @@ test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+	safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
         {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
         -statics 0 -nested 1 -deleteHook {}\
         -autoPath {}} {}"
 test safe-17.5 {cf. safe-7.5 - positive and negative module package require, including ancestor directory issue, Sync Mode off} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
@@ -2150,17 +2150,17 @@ test safe-17.5 {cf. safe-7.5 - positive and negative module package require, inc
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package test1} 0}
 
 ### 18. Test tokenization of directories available to a slave.
 
 test safe-18.1 {Check that each directory of the default auto_path is a valid token, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set i [safe::interpCreate]
 } -body {
@@ -2177,16 +2177,16 @@ test safe-18.1 {Check that each directory of the default auto_path is a valid to
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 test safe-18.1.1 {Check that each directory of the default auto_path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
 } -body {
@@ -2203,14 +2203,14 @@ test safe-18.1.1 {Check that each directory of the default auto_path is a valid
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 test safe-18.2 {Check that each directory of the module path is a valid token, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set i [safe::interpCreate]
 } -body {
@@ -2227,16 +2227,16 @@ test safe-18.2 {Check that each directory of the module path is a valid token, S
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 test safe-18.2.1 {Check that each directory of the module path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
 } -body {
@@ -2253,7 +2253,7 @@ test safe-18.2.1 {Check that each directory of the module path is a valid token,
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 
@@ -2262,12 +2262,12 @@ test safe-18.2.1 {Check that each directory of the module path is a valid token,
 ###     If Sync Mode is on, a corresponding test with Sync Mode off is 9.*
 
 test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -2292,19 +2292,19 @@ test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {{$p(:0:)} {$p(:1:)} {$p(:2:)}}}
 test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -2353,7 +2353,7 @@ test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffe
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
@@ -2362,12 +2362,12 @@ test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffe
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {{$p(:0:)} {$p(:1:)} {$p(:2:)}} -- {{$p(:0:)} {$p(:2:)} {$p(:1:)}}}
 test safe-19.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), Sync Mode off} -constraints {AutoSyncDefined} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -2414,7 +2414,7 @@ test safe-19.10 {interpConfigure change the access path; tclIndex commands unaff
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 ok1 0 ok2 --\
@@ -2424,12 +2424,12 @@ test safe-19.10 {interpConfigure change the access path; tclIndex commands unaff
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2} --\
         {{$p(:0:)} {$p(:1:)} {$p(:2:)}} -- {{$p(:0:)} {$p(:2:)} {$p(:1:)}}}
 test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement (1), Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -2479,7 +2479,7 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
@@ -2488,12 +2488,12 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
         {{$p(:0:)} {$p(:1:)}} -- {{$p(:0:)} {$p(:1:)}} --\
         0 OK1 0 OK2}
 test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, safe-19.11 without path auto0, Sync Mode off} -constraints {AutoSyncDefined} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     # To manage without path auto0, use an auto_path that is unusual for
@@ -2542,7 +2542,7 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 1.2.3 0 2.3.4 --\
@@ -2553,12 +2553,12 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
         {{$p(:0:)} {$p(:1:)} {$p(:2:)}} -- {{$p(:0:)} {$p(:1:)} {$p(:2:)}} --\
         0 OK1 0 OK2}
 test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, Sync Mode off} -constraints {AutoSyncDefined} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     # Path auto0 added (cf. safe-9.3) because it is needed for auto_path.
@@ -2599,7 +2599,7 @@ test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages f
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
@@ -2608,12 +2608,12 @@ test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages f
         {{$p(:0:)} {$p(:1:)}} -- {{$p(:0:)}}}
 # (no counterpart safe-9.14)
 test safe-19.14 {when interpConfigure changes the access path, ::auto_path uses -autoPath value and new tokens, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     # Test that although -autoPath is unchanged, the slave's ::auto_path changes to
@@ -2662,7 +2662,7 @@ test safe-19.14 {when interpConfigure changes the access path, ::auto_path uses
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} {$p(:1:)} -- {{$p(:0:)} {$p(:1:)}} -- {{$p(:0:)} {$p(:3:)}} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
@@ -2672,12 +2672,12 @@ test safe-19.14 {when interpConfigure changes the access path, ::auto_path uses
         0 OK1 0 OK2}
 # (no counterpart safe-9.15)
 test safe-19.15 {when interpConfigure changes the access path, ::auto_path uses -autoPath value and new tokens, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     # Test that although -autoPath is unchanged, the slave's ::auto_path changes to
@@ -2724,7 +2724,7 @@ test safe-19.15 {when interpConfigure changes the access path, ::auto_path uses
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} -- {$p(:1:)} {$p(:2:)} {$p(:3:)} -- {{$p(:0:)}} -- {{$p(:0:)} {$p(:2:)} {$p(:3:)}} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0*} --\
@@ -2734,12 +2734,12 @@ test safe-19.15 {when interpConfigure changes the access path, ::auto_path uses
         0 OK1 0 OK2}
 # (no counterpart safe-9.16)
 test safe-19.16 {default value for -accessPath and -autoPath on creation; -autoPath preserved when -accessPath changes, ::auto_path using changed tokens, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set tmpAutoPath $::auto_path
     set ::auto_path [list $tcl_library [file join $TestsDir auto0]]
@@ -2780,7 +2780,7 @@ test safe-19.16 {default value for -accessPath and -autoPath on creation; -autoP
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:0:)} 2 --\
         {{$p(:0:)} {$p(:1:)}} -- 0 1.2.3 1 {can't find package SafeTestPackage2} --\
@@ -2788,12 +2788,12 @@ test safe-19.16 {default value for -accessPath and -autoPath on creation; -autoP
         {TCLLIB TESTSDIR/auto0} -- {TCLLIB TESTSDIR/auto0} --\
         0 OK1 1 {invalid command name "HeresPackage2"}}
 test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2828,7 +2828,7 @@ test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefin
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -2836,12 +2836,12 @@ test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefin
          TESTSDIR/auto0/modules/mod2} -- res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.21 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 1} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2896,7 +2896,7 @@ test safe-19.21 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -2908,12 +2908,12 @@ test safe-19.21 {interpConfigure change the access path; check module loading, S
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.22 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 0} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2963,7 +2963,7 @@ test safe-19.22 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -2975,12 +2975,12 @@ test safe-19.22 {interpConfigure change the access path; check module loading, S
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.23 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 3} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -3040,7 +3040,7 @@ test safe-19.23 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -3052,12 +3052,12 @@ test safe-19.23 {interpConfigure change the access path; check module loading, S
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.24 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 2 (worst case)} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -3112,7 +3112,7 @@ test safe-19.24 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -3130,12 +3130,12 @@ test safe-19.24 {interpConfigure change the access path; check module loading, S
 set ::auto_path [list $tcl_library [file dirname $tcl_library] [file join $TestsDir auto0]]
 
 test safe-20.1 "create -accessPath NULL -autoPath NULL -> master's ::auto_path" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate]
@@ -3143,16 +3143,16 @@ test safe-20.1 "create -accessPath NULL -autoPath NULL -> master's ::auto_path"
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list $::auto_path -- $::auto_path]
 test safe-20.2 "create -accessPath {} -autoPath NULL -> master's ::auto_path" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath {}]
@@ -3160,16 +3160,16 @@ test safe-20.2 "create -accessPath {} -autoPath NULL -> master's ::auto_path" -c
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list $::auto_path -- $::auto_path]
 test safe-20.3 "create -accessPath path1 -autoPath NULL -> {}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1]]
@@ -3177,16 +3177,16 @@ test safe-20.3 "create -accessPath path1 -autoPath NULL -> {}" -constraints Auto
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {{} -- {}}
 test safe-20.4 "create -accessPath NULL -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -autoPath {}]
@@ -3194,16 +3194,16 @@ test safe-20.4 "create -accessPath NULL -autoPath {} -> {}" -constraints AutoSyn
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {{} -- {}}
 test safe-20.5 "create -accessPath {} -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath {} -autoPath {}]
@@ -3211,16 +3211,16 @@ test safe-20.5 "create -accessPath {} -autoPath {} -> {}" -constraints AutoSyncD
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {{} -- {}}
 test safe-20.6 "create -accessPath path1 -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath {}]
@@ -3228,16 +3228,16 @@ test safe-20.6 "create -accessPath path1 -autoPath {} -> {}" -constraints AutoSy
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {{} -- {}}
 test safe-20.7 "create -accessPath NULL -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -autoPath [lrange $::auto_path 0 0]]
@@ -3245,16 +3245,16 @@ test safe-20.7 "create -accessPath NULL -autoPath path2 -> path2" -constraints A
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
 test safe-20.8 "create -accessPath {} -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath {} -autoPath [lrange $::auto_path 0 0]]
@@ -3262,16 +3262,16 @@ test safe-20.8 "create -accessPath {} -autoPath path2 -> path2" -constraints Aut
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
 test safe-20.9 "create -accessPath path1 -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
@@ -3279,16 +3279,16 @@ test safe-20.9 "create -accessPath path1 -autoPath path2 -> path2" -constraints
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
 test safe-20.10 "create -accessPath NULL -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -autoPath /not/in/access/path]
@@ -3296,16 +3296,16 @@ test safe-20.10 "create -accessPath NULL -autoPath pathX -> pathX" -constraints
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {/not/in/access/path -- {}}
 test safe-20.11 "create -accessPath {} -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath {} -autoPath /not/in/access/path]
@@ -3313,16 +3313,16 @@ test safe-20.11 "create -accessPath {} -autoPath pathX -> pathX" -constraints Au
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {/not/in/access/path -- {}}
 test safe-20.12 "create -accessPath path1 -autoPath pathX -> {pathX}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath /not/in/access/path]
@@ -3330,19 +3330,19 @@ test safe-20.12 "create -accessPath path1 -autoPath pathX -> {pathX}" -constrain
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {/not/in/access/path -- {}}
 
 ### 21. safe::interpConfigure with different cases of -accessPath, -autoPath.
 
 test safe-21.1 "interpConfigure -accessPath NULL -autoPath NULL -> no change" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3351,16 +3351,16 @@ test safe-21.1 "interpConfigure -accessPath NULL -autoPath NULL -> no change" -c
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
 test safe-21.2 "interpConfigure -accessPath {} -autoPath NULL -> master's ::auto_path" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3369,16 +3369,16 @@ test safe-21.2 "interpConfigure -accessPath {} -autoPath NULL -> master's ::auto
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list $::auto_path -- $::auto_path]
 test safe-21.3 "interpConfigure -accessPath path1 -autoPath NULL -> no change" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3387,16 +3387,16 @@ test safe-21.3 "interpConfigure -accessPath path1 -autoPath NULL -> no change" -
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 0 0] -- [lrange $::auto_path 0 0]]
 test safe-21.4 "interpConfigure -accessPath NULL -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3405,16 +3405,16 @@ test safe-21.4 "interpConfigure -accessPath NULL -autoPath {} -> {}" -constraint
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {{} -- {}}
 test safe-21.5 "interpConfigure -accessPath {} -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3423,16 +3423,16 @@ test safe-21.5 "interpConfigure -accessPath {} -autoPath {} -> {}" -constraints
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {{} -- {}}
 test safe-21.6 "interpConfigure -accessPath {path1} -autoPath {} -> {}" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3441,16 +3441,16 @@ test safe-21.6 "interpConfigure -accessPath {path1} -autoPath {} -> {}" -constra
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {{} -- {}}
 test safe-21.7 "interpConfigure -accessPath NULL -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3459,16 +3459,16 @@ test safe-21.7 "interpConfigure -accessPath NULL -autoPath path2 -> path2" -cons
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 1 1] -- [lrange $::auto_path 1 1]]
 test safe-21.8 "interpConfigure -accessPath {} -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3477,16 +3477,16 @@ test safe-21.8 "interpConfigure -accessPath {} -autoPath path2 -> path2" -constr
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 1 1] -- [lrange $::auto_path 1 1]]
 test safe-21.9 "interpConfigure -accessPath path1 -autoPath path2 -> path2" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3495,16 +3495,16 @@ test safe-21.9 "interpConfigure -accessPath path1 -autoPath path2 -> path2" -con
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [lrange $::auto_path 1 1] -- [lrange $::auto_path 1 1]]
 test safe-21.10 "interpConfigure -accessPath NULL -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3513,16 +3513,16 @@ test safe-21.10 "interpConfigure -accessPath NULL -autoPath pathX -> pathX" -con
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {/not/in/access/path -- {}}
 test safe-21.11 "interpConfigure -accessPath {} -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3531,16 +3531,16 @@ test safe-21.11 "interpConfigure -accessPath {} -autoPath pathX -> pathX" -const
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {/not/in/access/path -- {}}
 test safe-21.12 "interpConfigure -accessPath path1 -autoPath pathX -> pathX" -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate -accessPath [lrange $::auto_path 0 1] -autoPath [lrange $::auto_path 0 0]]
 } -body {
@@ -3549,7 +3549,7 @@ test safe-21.12 "interpConfigure -accessPath path1 -autoPath pathX -> pathX" -co
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {/not/in/access/path -- {}}
 
-- 
cgit v0.12


From f2815760c5d26291fa3af7efe04b78a40743415e Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Sat, 25 Jul 2020 12:15:14 +0000
Subject: Rearrange tests in safe.test so they are in numerical order.

---
 tests/safe.test | 433 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 215 insertions(+), 218 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index d28c093..8959523 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1726,6 +1726,118 @@ test safe-14.1 {Check that module path is the same as in the master interpreter
 } -cleanup {
     safe::interpDelete $i
 } -result [::tcl::tm::path list]
+test safe-14.2 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
+test safe-14.2.1 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib1 $lib2]
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
+test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib2 $lib1]
+    # Unexpected order, should be reversed in the slave
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
+test safe-14.3.1 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+
+    set lib1        [info library]
+    set lib2        [file dirname $lib1]
+    set ::auto_TMP  $::auto_path
+    set ::auto_path [list $lib2 $lib1]
+    # Unexpected order, should be reversed in the slave
+
+    set i [safe::interpCreate]
+} -body {
+    set autoList {}
+    set token [lindex [$i eval set ::auto_path] 0]
+    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
+    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
+
+    return [list [lindex $accessList 0] $auto0]
+} -cleanup {
+    set ::auto_path $::auto_TMP
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result [list [info library] [info library]]
 
 ### 15. Safe file ensemble.
 
@@ -1864,121 +1976,6 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
     unset user
 } -result {~USER}
 
-### 14.x move above.
-
-test safe-14.2 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib1 $lib2]
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-    return [list [lindex $accessList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library]]
-test safe-14.2.1 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib1 $lib2]
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-    return [list [lindex $accessList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library]]
-test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib2 $lib1]
-    # Unexpected order, should be reversed in the slave
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-
-    return [list [lindex $accessList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library]]
-test safe-14.3.1 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-
-    set lib1        [info library]
-    set lib2        [file dirname $lib1]
-    set ::auto_TMP  $::auto_path
-    set ::auto_path [list $lib2 $lib1]
-    # Unexpected order, should be reversed in the slave
-
-    set i [safe::interpCreate]
-} -body {
-    set autoList {}
-    set token [lindex [$i eval set ::auto_path] 0]
-    set auto0 [dict get [set ::safe::S${i}(access_path,map)] $token]
-    set accessList [lindex [safe::interpConfigure $i -accessPath] 1]
-
-    return [list [lindex $accessList 0] $auto0]
-} -cleanup {
-    set ::auto_path $::auto_TMP
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result [list [info library] [info library]]
-
 ### 17. Test the use of ::auto_path for loading commands (via tclIndex files)
 ###     and non-module packages (via pkgIndex.tcl files).
 ###     Corresponding tests with Sync Mode on are 7.*
@@ -2142,6 +2139,109 @@ test safe-17.5 {cf. safe-7.5 - positive and negative module package require, inc
     }
 } -result {1 {can't find package test1} 0}
 
+### 18. Test tokenization of directories available to a slave.
+
+test safe-18.1 {Check that each directory of the default auto_path is a valid token, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.1.1 {Check that each directory of the default auto_path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {set ::auto_path}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.2 {Check that each directory of the module path is a valid token, Sync Mode on} -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 1
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+test safe-18.2.1 {Check that each directory of the module path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
+    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    if {$SyncExists} {
+        set SyncVal_TMP [safe::setAutoPathSync]
+        safe::setAutoPathSync 0
+    } else {
+        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+    }
+    set i [safe::interpCreate]
+} -body {
+    set badTokens {}
+    foreach dir [$i eval {::tcl::tm::path list}] {
+        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
+            # Match - OK - token has expected form
+        } else {
+            # No match - possibly an ordinary path has not been tokenized
+            lappend badTokens $dir
+        }
+    }
+    set badTokens
+} -cleanup {
+    safe::interpDelete $i
+    if {$SyncExists} {
+        safe::setAutoPathSync $SyncVal_TMP
+    }
+} -result {}
+
 ### 19. Assorted options, including changes to option values.
 ###     Mostly these are changes to access path, auto_path, module path.
 ###     If Sync Mode is on, a corresponding test with Sync Mode off is 9.*
@@ -2788,109 +2888,6 @@ test safe-19.24 {interpConfigure change the access path; check module loading, S
          TESTSDIR/auto0/modules/mod1 TESTSDIR/auto0/modules/mod2} --\
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
-
-### 18. Test tokenization of directories available to a slave.
-
-test safe-18.1 {Check that each directory of the default auto_path is a valid token, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-    set i [safe::interpCreate]
-} -body {
-    set badTokens {}
-    foreach dir [$i eval {set ::auto_path}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
-    }
-    set badTokens
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result {}
-test safe-18.1.1 {Check that each directory of the default auto_path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-    set i [safe::interpCreate]
-} -body {
-    set badTokens {}
-    foreach dir [$i eval {set ::auto_path}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
-    }
-    set badTokens
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result {}
-test safe-18.2 {Check that each directory of the module path is a valid token, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
-    }
-    set i [safe::interpCreate]
-} -body {
-    set badTokens {}
-    foreach dir [$i eval {::tcl::tm::path list}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
-    }
-    set badTokens
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result {}
-test safe-18.2.1 {Check that each directory of the module path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
-    if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
-    } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
-    }
-    set i [safe::interpCreate]
-} -body {
-    set badTokens {}
-    foreach dir [$i eval {::tcl::tm::path list}] {
-        if {[regexp {^\$p\(:[0-9]+:\)$} $dir]} {
-            # Match - OK - token has expected form
-        } else {
-            # No match - possibly an ordinary path has not been tokenized
-            lappend badTokens $dir
-        }
-    }
-    set badTokens
-} -cleanup {
-    safe::interpDelete $i
-    if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
-    }
-} -result {}
 
 # cleanup
 set ::auto_path $SaveAutoPath
-- 
cgit v0.12


From 0d094ff62aa60c15d6afecdc694e910646c813cf Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Sat, 25 Jul 2020 12:24:26 +0000
Subject: Rename command safe::setAutoPathSync to safe::setSyncMode.

---
 doc/safe.n              |   6 +-
 library/safe.tcl        |  12 +-
 library/tclIndex        |   2 +-
 tests/safe-stock87.test |  88 ++++++------
 tests/safe-zipfs.test   | 134 +++++++++---------
 tests/safe.test         | 370 ++++++++++++++++++++++++------------------------
 6 files changed, 306 insertions(+), 306 deletions(-)

diff --git a/doc/safe.n b/doc/safe.n
index 5777f74..7bae0be 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -23,7 +23,7 @@ safe \- Creating and manipulating safe interpreters
 .sp
 \fB::safe::interpFindInAccessPath\fR \fIslave\fR \fIdirectory\fR
 .sp
-\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+\fB::safe::setSyncMode\fR ?\fInewValue\fR?
 .sp
 \fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
 .SS OPTIONS
@@ -151,7 +151,7 @@ $slave eval [list set tk_library \e
 .CE
 .RE
 .TP
-\fB::safe::setAutoPathSync\fR ?\fInewValue\fR?
+\fB::safe::setSyncMode\fR ?\fInewValue\fR?
 This command is used to get or set the "Sync Mode" of the Safe Base.
 When an argument is supplied, the command returns an error if the argument
 is not a boolean value, or if any Safe Base interpreters exist.  Typically
@@ -392,7 +392,7 @@ of the ::auto_path and access path ("Sync Mode" on) is still the default.
 However, the Safe Base offers the option of limiting the safe interpreter's
 ::auto_path to the much shorter list of directories that is necessary for
 it to perform its function ("Sync Mode" off).  Use the command
-\fB::safe::setAutoPathSync\fR to choose the mode before creating any Safe
+\fB::safe::setSyncMode\fR to choose the mode before creating any Safe
 Base interpreters.
 .PP
 In either mode, the most convenient way to initialize a safe interpreter is
diff --git a/library/safe.tcl b/library/safe.tcl
index d7b0966..f17d854 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -349,7 +349,7 @@ proc ::safe::InterpCreate {
 #
 #    It is the caller's responsibility, if it supplies a non-empty value for
 #    access_path, to make the first directory in the path suitable for use as
-#    tcl_library, and (if ![setAutoPathSync]), to set the slave's ::auto_path.
+#    tcl_library, and (if ![setSyncMode]), to set the slave's ::auto_path.
 
 proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook autoPath withAutoPath} {
     global auto_path
@@ -422,9 +422,9 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook au
 
     # Set the slave auto_path to a tokenized raw_auto_path.
     # Silently ignore any directories that are not in the access path.
-    # If [setAutoPathSync], SyncAccessPath will overwrite this value with the
+    # If [setSyncMode], SyncAccessPath will overwrite this value with the
     # full access path.
-    # If ![setAutoPathSync], Safe Base code will not change this value.
+    # If ![setSyncMode], Safe Base code will not change this value.
     set tokens_auto_path {}
     foreach dir $raw_auto_path {
 	if {[dict exists $remap_access_path $dir]} {
@@ -1355,7 +1355,7 @@ proc ::safe::Setup {} {
 }
 
 # Accessor method for ::safe::AutoPathSync
-# Usage: ::safe::setAutoPathSync ?newValue?
+# Usage: ::safe::setSyncMode ?newValue?
 # Respond to changes by calling Setup again, preserving any
 # caller-defined logging.  This allows complete equivalence with
 # prior Safe Base behavior if AutoPathSync is true.
@@ -1368,7 +1368,7 @@ proc ::safe::Setup {} {
 # (The initialization of AutoPathSync at the end of this file is acceptable
 #  because Setup has not yet been called.)
 
-proc ::safe::setAutoPathSync {args} {
+proc ::safe::setSyncMode {args} {
     variable AutoPathSync
 
     if {[llength $args] == 0} {
@@ -1391,7 +1391,7 @@ proc ::safe::setAutoPathSync {args} {
             setLogCmd $TmpLog
         }
     } else {
-        set msg {wrong # args: should be "safe::setAutoPathSync ?newValue?"}
+        set msg {wrong # args: should be "safe::setSyncMode ?newValue?"}
         return -code error $msg
     }
 
diff --git a/library/tclIndex b/library/tclIndex
index 731bdbb..a8db3cb 100644
--- a/library/tclIndex
+++ b/library/tclIndex
@@ -61,7 +61,7 @@ set auto_index(::safe::DirInAccessPath) [list ::tcl::Pkg::source [file join $dir
 set auto_index(::safe::Subset) [list ::tcl::Pkg::source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasSubset) [list ::tcl::Pkg::source [file join $dir safe.tcl]]
 set auto_index(::safe::AliasEncoding) [list ::tcl::Pkg::source [file join $dir safe.tcl]]
-set auto_index(::safe::setAutoPathSync) [list source [file join $dir safe.tcl]]
+set auto_index(::safe::setSyncMode) [list ::tcl::Pkg::source [file join $dir safe.tcl]]
 set auto_index(tcl_wordBreakAfter) [list ::tcl::Pkg::source [file join $dir word.tcl]]
 set auto_index(tcl_wordBreakBefore) [list ::tcl::Pkg::source [file join $dir word.tcl]]
 set auto_index(tcl_endOfWord) [list ::tcl::Pkg::source [file join $dir word.tcl]]
diff --git a/tests/safe-stock87.test b/tests/safe-stock87.test
index 1a29018..c36792c 100644
--- a/tests/safe-stock87.test
+++ b/tests/safe-stock87.test
@@ -111,10 +111,10 @@ testConstraint AutoSyncDefined 1
 
 # high level general test
 test safe-stock87-7.1 {tests that everything works at high level with conventional AutoPathSync, use pkg opt} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set i [safe::interpCreate]
 } -body {
@@ -128,14 +128,14 @@ test safe-stock87-7.1 {tests that everything works at high level with convention
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 0.4.*
 test safe-stock87-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync, use pkg opt} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -154,15 +154,15 @@ test safe-stock87-7.2 {tests specific path and interpFind/AddToAccessPath with c
 	    $mappA -- [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{\$p(:0:)} {\$p(:*:)} -- 1 {$pkgOptErrMsg} --\
         {TCLLIB */dummy/unixlike/test/path} -- {}"
 test safe-stock87-7.4 {tests specific path and positive search with conventional AutoPathSync, use pkg opt} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -182,15 +182,15 @@ test safe-stock87-7.4 {tests specific path and positive search with conventional
     # other than the first and last in the access path.
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 0.4.* --\
         {TCLLIB * TCLLIB/OPTDIR} -- {}}
 test safe-stock87-7.5 {tests positive and negative module loading with conventional AutoPathSync} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set i [safe::interpCreate]
     interp eval $i {
@@ -207,7 +207,7 @@ test safe-stock87-7.5 {tests positive and negative module loading with conventio
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
@@ -222,10 +222,10 @@ test safe-stock87-9.8 {test auto-loading in safe interpreters, was safe-5.1} -se
     safe::interpDelete a
 } -result -1
 test safe-stock87-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement with conventional AutoPathSync, uses pkg opt and tcl::idna} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -262,17 +262,17 @@ test safe-stock87-9.11 {interpConfigure change the access path; pkgIndex.tcl pac
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 1.* 0 0.4.* --\
         {TCLLIB TCLLIB/OPTDIR TCLLIB/JARDIR*} --\
         {TCLLIB TCLLIB/JARDIR TCLLIB/OPTDIR*} --\
         0 0 0 example.com}
 test safe-stock87-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed with conventional AutoPathSync, uses pkg opt and tcl::idna} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -305,19 +305,19 @@ test safe-stock87-9.13 {interpConfigure change the access path; pkgIndex.tcl pac
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
         {TCLLIB TCLLIB/OPTDIR TCLLIB/JARDIR*} -- {TCLLIB*}}
 
 test safe-stock87-18.1 {cf. safe-stock87-7.1opt - tests that everything works at high level without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
@@ -339,16 +339,16 @@ test safe-stock87-18.1 {cf. safe-stock87-7.1opt - tests that everything works at
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 0.4.*
 test safe-stock87-18.2 {cf. safe-stock87-7.2opt - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -366,18 +366,18 @@ test safe-stock87-18.2 {cf. safe-stock87-7.2opt - tests specific path and interp
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {\$p(:0:)} {\$p(:*:)} 1 {$pkgOptErrMsg}\
         {-accessPath {[list $tcl_library */dummy/unixlike/test/path]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-stock87-18.4 {cf. safe-stock87-7.4opt - tests specific path and positive search and auto_path without conventional AutoPathSync, use pkg opt} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -403,18 +403,18 @@ test safe-stock87-18.4 {cf. safe-stock87-7.4opt - tests specific path and positi
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+	safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} 0 0.4.*\
         {-accessPath {[list $tcl_library *$tcl_library/$pkgOptDir]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-stock87-18.5 {cf. safe-stock87-7.5 - tests positive and negative module loading without conventional AutoPathSync} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
     interp eval $i {
@@ -431,7 +431,7 @@ test safe-stock87-18.5 {cf. safe-stock87-7.5 - tests positive and negative modul
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package shell} 0}
 
diff --git a/tests/safe-zipfs.test b/tests/safe-zipfs.test
index 4ec01d1..7594e3a 100644
--- a/tests/safe-zipfs.test
+++ b/tests/safe-zipfs.test
@@ -174,10 +174,10 @@ test safe-zipfs-5.6 {example modules packages, test in master interpreter, appen
 # high level general test
 # Use zipped example packages not http1.0 etc
 test safe-zipfs-7.1 {tests that everything works at high level with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $ZipMountPoint auto0]
@@ -194,14 +194,14 @@ test safe-zipfs-7.1 {tests that everything works at high level with conventional
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 1.2.3
 test safe-zipfs-7.2 {tests specific path and interpFind/AddToAccessPath with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -222,16 +222,16 @@ test safe-zipfs-7.2 {tests specific path and interpFind/AddToAccessPath with con
             $mappA -- [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} {$p(:*:)} --\
         1 {can't find package SafeTestPackage1} --\
         {TCLLIB */dummy/unixlike/test/path ZIPDIR/auto0} -- {}}
 test safe-zipfs-7.4 {tests specific path and positive search with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -251,16 +251,16 @@ test safe-zipfs-7.4 {tests specific path and positive search with conventional A
     # other than the first and last in the access path.
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.2.3 --\
         {TCLLIB * ZIPDIR/auto0/auto1} -- {}}
 
 test safe-zipfs-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset) with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -298,16 +298,16 @@ test safe-zipfs-9.9 {interpConfigure change the access path; tclIndex commands u
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB ZIPDIR/auto0/auto1 ZIPDIR/auto0/auto2*} --\
         {TCLLIB ZIPDIR/auto0/auto2 ZIPDIR/auto0/auto1*}}
 test safe-zipfs-9.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset) with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -343,17 +343,17 @@ test safe-zipfs-9.10 {interpConfigure change the access path; tclIndex commands
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 ok1 0 ok2 --\
         {TCLLIB ZIPDIR/auto0/auto1 ZIPDIR/auto0/auto2*} --\
         {TCLLIB ZIPDIR/auto0/auto2 ZIPDIR/auto0/auto1*}}
 test safe-zipfs-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     # For complete correspondence to safe-stock87-9.11, include auto0 in access path.
@@ -395,17 +395,17 @@ test safe-zipfs-9.11 {interpConfigure change the access path; pkgIndex.tcl packa
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB ZIPDIR/auto0 ZIPDIR/auto0/auto1 ZIPDIR/auto0/auto2*} --\
         {TCLLIB ZIPDIR/auto0 ZIPDIR/auto0/auto2 ZIPDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-zipfs-9.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, 9.10 without path auto0 with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -441,7 +441,7 @@ test safe-zipfs-9.12 {interpConfigure change the access path; pkgIndex.tcl packa
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 1.2.3 0 2.3.4 --\
@@ -449,10 +449,10 @@ test safe-zipfs-9.12 {interpConfigure change the access path; pkgIndex.tcl packa
         {TCLLIB ZIPDIR/auto0/auto2 ZIPDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-zipfs-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -485,16 +485,16 @@ test safe-zipfs-9.13 {interpConfigure change the access path; pkgIndex.tcl packa
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
         {TCLLIB ZIPDIR/auto0/auto1 ZIPDIR/auto0/auto2*} -- {TCLLIB*}}
 test safe-zipfs-9.20 {check module loading, with conventional AutoPathSync; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -529,7 +529,7 @@ test safe-zipfs-9.20 {check module loading, with conventional AutoPathSync; zipf
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -545,10 +545,10 @@ test safe-zipfs-9.20 {check module loading, with conventional AutoPathSync; zipf
 #   comparing with expected results.  The test is therefore not totally strict,
 #   but will notice missing or surplus directories.
 test safe-zipfs-9.21 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 1; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -603,7 +603,7 @@ test safe-zipfs-9.21 {interpConfigure change the access path; check module loadi
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -615,10 +615,10 @@ test safe-zipfs-9.21 {interpConfigure change the access path; check module loadi
         res0 res1 res2}
 # See comments on lsort after test safe-zipfs-9.20.
 test safe-zipfs-9.22 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 0; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -668,7 +668,7 @@ test safe-zipfs-9.22 {interpConfigure change the access path; check module loadi
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -680,10 +680,10 @@ test safe-zipfs-9.22 {interpConfigure change the access path; check module loadi
         res0 res1 res2}
 # See comments on lsort after test safe-zipfs-9.20.
 test safe-zipfs-9.23 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 3; zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -743,7 +743,7 @@ test safe-zipfs-9.23 {interpConfigure change the access path; check module loadi
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -755,10 +755,10 @@ test safe-zipfs-9.23 {interpConfigure change the access path; check module loadi
         res0 res1 res2}
 # See comments on lsort after test safe-zipfs-9.20.
 test safe-zipfs-9.24 {interpConfigure change the access path; check module loading, with conventional AutoPathSync; stale data case 2 (worst case); zipfs} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -813,7 +813,7 @@ test safe-zipfs-9.24 {interpConfigure change the access path; check module loadi
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -826,12 +826,12 @@ test safe-zipfs-9.24 {interpConfigure change the access path; check module loadi
 # See comments on lsort after test safe-zipfs-9.20.
 
 test safe-zipfs-18.1 {cf. safe-zipfs-7.1 - tests that everything works at high level without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
@@ -853,16 +853,16 @@ test safe-zipfs-18.1 {cf. safe-zipfs-7.1 - tests that everything works at high l
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 1.2.3
 test safe-zipfs-18.2 {cf. safe-zipfs-7.2 - tests specific path and interpFind/AddToAccessPath without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -882,7 +882,7 @@ test safe-zipfs-18.2 {cf. safe-zipfs-7.2 - tests specific path and interpFind/Ad
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
         1 {can't find package SafeTestPackage1}\
@@ -891,12 +891,12 @@ test safe-zipfs-18.2 {cf. safe-zipfs-7.2 - tests specific path and interpFind/Ad
                             $ZipMountPoint/auto0]}\
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 test safe-zipfs-18.4 {cf. safe-zipfs-7.4 - tests specific path and positive search and auto_path without conventional AutoPathSync; zipfs} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -927,7 +927,7 @@ test safe-zipfs-18.4 {cf. safe-zipfs-7.4 - tests specific path and positive sear
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+	safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
         {-accessPath {[list $tcl_library *$ZipMountPoint/auto0 $ZipMountPoint/auto0/auto1]}\
diff --git a/tests/safe.test b/tests/safe.test
index 8959523..16fa94f 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -68,10 +68,10 @@ test safe-1.1 {safe::interpConfigure syntax} -returnCodes error -body {
 } -result {no value given for parameter "slave" (use -help for full usage) :
     slave name () name of the slave}
 test safe-1.2 {safe::interpCreate syntax, Sync Mode on} -returnCodes error -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -79,7 +79,7 @@ test safe-1.2 {safe::interpCreate syntax, Sync Mode on} -returnCodes error -setu
     safe::interpCreate -help
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {Usage information:
     Var/FlagName  Type     Value   Help
@@ -93,18 +93,18 @@ test safe-1.2 {safe::interpCreate syntax, Sync Mode on} -returnCodes error -setu
     -nested       boolean  (false) nested loading
     -deleteHook   script   ()      delete hook}
 test safe-1.2.1 {safe::interpCreate syntax, Sync Mode off} -returnCodes error -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     safe::interpCreate -help
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {Usage information:
     Var/FlagName  Type     Value   Help
@@ -368,10 +368,10 @@ rename SafeEval {}
 ###     Corresponding tests with Sync Mode off are 17.*
 
 test safe-7.1 {positive non-module package require, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set tmpAutoPath $::auto_path
     lappend ::auto_path [file join $TestsDir auto0]
@@ -388,14 +388,14 @@ test safe-7.1 {positive non-module package require, Sync Mode on} -setup {
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 1.2.3
 test safe-7.2 {negative non-module package require with specific path and interpAddToAccessPath, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -415,7 +415,7 @@ test safe-7.2 {negative non-module package require with specific path and interp
 	    $mappA -- [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} {$p(:*:)} --\
         1 {can't find package SafeTestPackage1} --\
@@ -452,10 +452,10 @@ test safe-7.3.1 {check that safe subinterpreters work with namespace names} -set
             [interp exists $j] [info vars ::safe::S*]
 } -match glob -result {{} {} ok ok {} 0 {}}
 test safe-7.4 {positive non-module package require with specific path and interpAddToAccessPath, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     } else {
         set SyncVal_TMP 1
     }
@@ -475,15 +475,15 @@ test safe-7.4 {positive non-module package require with specific path and interp
     # other than the first and last in the access path.
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:0:)} {$p(:*:)} -- 0 1.2.3 --\
         {TCLLIB * TESTSDIR/auto0/auto1} -- {}}
 test safe-7.5 {positive and negative module package require, including ancestor directory issue, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
@@ -501,7 +501,7 @@ test safe-7.5 {positive and negative module package require, including ancestor
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package test1} 0}
 
@@ -757,10 +757,10 @@ test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
         {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}}\
         {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
 test safe-9.8 {autoloading commands indexed in tclIndex files, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -780,15 +780,15 @@ test safe-9.8 {autoloading commands indexed in tclIndex files, Sync Mode on} -se
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*}}
 test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -826,16 +826,16 @@ test safe-9.9 {interpConfigure change the access path; tclIndex commands unaffec
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
 test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -871,17 +871,17 @@ test safe-9.10 {interpConfigure change the access path; tclIndex commands unaffe
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
 test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     # For complete correspondence to safe-9.10opt, include auto0 in access path.
@@ -923,17 +923,17 @@ test safe-9.11 {interpConfigure change the access path; pkgIndex.tcl packages un
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, safe-9.11 without path auto0, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -970,7 +970,7 @@ test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages un
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 1.2.3 0 2.3.4 --\
@@ -978,10 +978,10 @@ test safe-9.12 {interpConfigure change the access path; pkgIndex.tcl packages un
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -1014,16 +1014,16 @@ test safe-9.13 {interpConfigure change the access path; pkgIndex.tcl packages fa
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} -- {TCLLIB*}}
 test safe-9.20 {check module loading, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1058,7 +1058,7 @@ test safe-9.20 {check module loading, Sync Mode on} -setup {
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -1074,10 +1074,10 @@ test safe-9.20 {check module loading, Sync Mode on} -setup {
 #   comparing with expected results.  The test is therefore not totally strict,
 #   but will notice missing or surplus directories.
 test safe-9.21 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 1} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1132,7 +1132,7 @@ test safe-9.21 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1144,10 +1144,10 @@ test safe-9.21 {interpConfigure change the access path; check module loading, Sy
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-9.22 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 0} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1197,7 +1197,7 @@ test safe-9.22 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1209,10 +1209,10 @@ test safe-9.22 {interpConfigure change the access path; check module loading, Sy
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-9.23 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 3} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1272,7 +1272,7 @@ test safe-9.23 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1284,10 +1284,10 @@ test safe-9.23 {interpConfigure change the access path; check module loading, Sy
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-9.24 {interpConfigure change the access path; check module loading, Sync Mode on; stale data case 2 (worst case)} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -1342,7 +1342,7 @@ test safe-9.24 {interpConfigure change the access path; check module loading, Sy
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -1727,10 +1727,10 @@ test safe-14.1 {Check that module path is the same as in the master interpreter
     safe::interpDelete $i
 } -result [::tcl::tm::path list]
 test safe-14.2 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 
     set lib1        [info library]
@@ -1749,16 +1749,16 @@ test safe-14.2 {Check that first element of slave auto_path (and access path) is
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library]]
 test safe-14.2.1 {Check that first element of slave auto_path (and access path) is Tcl Library, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 
     set lib1        [info library]
@@ -1777,14 +1777,14 @@ test safe-14.2.1 {Check that first element of slave auto_path (and access path)
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library]]
 test safe-14.3 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
 
     set lib1        [info library]
@@ -1805,16 +1805,16 @@ test safe-14.3 {Check that first element of slave auto_path (and access path) is
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library]]
 test safe-14.3.1 {Check that first element of slave auto_path (and access path) is Tcl Library, even if not true for master, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 
     set lib1        [info library]
@@ -1835,7 +1835,7 @@ test safe-14.3.1 {Check that first element of slave auto_path (and access path)
     set ::auto_path $::auto_TMP
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result [list [info library] [info library]]
 
@@ -1981,12 +1981,12 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
 ###     Corresponding tests with Sync Mode on are 7.*
 
 test safe-17.1 {cf. safe-7.1 - positive non-module package require, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     # Without AutoPathSync, we need a more complete auto_path,
     # because the slave will use the same value.
@@ -2008,16 +2008,16 @@ test safe-17.1 {cf. safe-7.1 - positive non-module package require, Sync Mode of
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result 1.2.3
 test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -2036,7 +2036,7 @@ test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)}\
         1 {can't find package SafeTestPackage1}\
@@ -2046,12 +2046,12 @@ test safe-17.2 {cf. safe-7.2 - negative non-module package require with specific
         -statics 0 -nested 1 -deleteHook {} -autoPath [list $tcl_library]} {}"
 # (not a counterpart of safe-7.3)
 test safe-17.3 {Check that default auto_path is the same as in the master interpreter, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
 } -body {
@@ -2065,16 +2065,16 @@ test safe-17.3 {Check that default auto_path is the same as in the master interp
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+	safe::setSyncMode $SyncVal_TMP
     }
 } -result $::auto_path
 test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific path and interpAddToAccessPath, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]]
@@ -2105,19 +2105,19 @@ test safe-17.4 {cf. safe-7.4 - positive non-module package require with specific
 	    [safe::interpDelete $i]
 } -cleanup {
     if {$SyncExists} {
-	safe::setAutoPathSync $SyncVal_TMP
+	safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result "{} {{\$p(:0:)}} {\$p(:0:)} {\$p(:*:)} {\$p(:*:)} 0 1.2.3\
         {-accessPath {[list $tcl_library *$TestsDir/auto0 $TestsDir/auto0/auto1]}\
         -statics 0 -nested 1 -deleteHook {}\
         -autoPath {[list $tcl_library $TestsDir/auto0]}} {}"
 test safe-17.5 {cf. safe-7.5 - positive and negative module package require, including ancestor directory issue, Sync Mode off} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     tcl::tm::path add [file join $TestsDir auto0 modules]
     set i [safe::interpCreate]
@@ -2135,17 +2135,17 @@ test safe-17.5 {cf. safe-7.5 - positive and negative module package require, inc
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {1 {can't find package test1} 0}
 
 ### 18. Test tokenization of directories available to a slave.
 
 test safe-18.1 {Check that each directory of the default auto_path is a valid token, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set i [safe::interpCreate]
 } -body {
@@ -2162,16 +2162,16 @@ test safe-18.1 {Check that each directory of the default auto_path is a valid to
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 test safe-18.1.1 {Check that each directory of the default auto_path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
 } -body {
@@ -2188,14 +2188,14 @@ test safe-18.1.1 {Check that each directory of the default auto_path is a valid
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 test safe-18.2 {Check that each directory of the module path is a valid token, Sync Mode on} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 1
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 1
     }
     set i [safe::interpCreate]
 } -body {
@@ -2212,16 +2212,16 @@ test safe-18.2 {Check that each directory of the module path is a valid token, S
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 test safe-18.2.1 {Check that each directory of the module path is a valid token, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set i [safe::interpCreate]
 } -body {
@@ -2238,7 +2238,7 @@ test safe-18.2.1 {Check that each directory of the module path is a valid token,
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -result {}
 
@@ -2247,12 +2247,12 @@ test safe-18.2.1 {Check that each directory of the module path is a valid token,
 ###     If Sync Mode is on, a corresponding test with Sync Mode off is 9.*
 
 test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -2275,17 +2275,17 @@ test safe-19.8 {autoloading commands indexed in tclIndex files, Sync Mode off} -
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*}}
 test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (dummy test of doreset), Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -2329,18 +2329,18 @@ test safe-19.9 {interpConfigure change the access path; tclIndex commands unaffe
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} -- 0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
 test safe-19.10 {interpConfigure change the access path; tclIndex commands unaffected by token rearrangement (actual test of doreset), Sync Mode off} -constraints {AutoSyncDefined} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     set i [safe::interpCreate -accessPath [list $tcl_library \
@@ -2382,19 +2382,19 @@ test safe-19.10 {interpConfigure change the access path; tclIndex commands unaff
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 ok1 0 ok2 --\
         {TCLLIB TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*}}
 test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     # For complete correspondence to safe-stock87-9.11, include auto0 in access path.
@@ -2440,19 +2440,19 @@ test safe-19.11 {interpConfigure change the access path; pkgIndex.tcl packages u
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- {$p(:3:)} {$p(:2:)} -- 0 1.2.3 0 2.3.4 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages unaffected by token rearrangement, safe-19.11 without path auto0, Sync Mode off} -constraints {AutoSyncDefined} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     # To manage without path auto0, use an auto_path that is unusual for
@@ -2497,7 +2497,7 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:1:)} {$p(:2:)} -- {$p(:2:)} {$p(:1:)} --\
         0 1.2.3 0 2.3.4 --\
@@ -2505,12 +2505,12 @@ test safe-19.12 {interpConfigure change the access path; pkgIndex.tcl packages u
         {TCLLIB TESTSDIR/auto0/auto2 TESTSDIR/auto0/auto1*} --\
         0 OK1 0 OK2}
 test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages fail if directory de-listed, Sync Mode off} -constraints {AutoSyncDefined} -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
 } -body {
     # Path auto0 added (cf. safe-9.3) because it is needed for auto_path.
@@ -2547,18 +2547,18 @@ test safe-19.13 {interpConfigure change the access path; pkgIndex.tcl packages f
 } -cleanup {
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{$p(:2:)} {$p(:3:)} -- 1 {* not found in access path} --\
         1 {* not found in access path} -- 1 1 --\
         {TCLLIB TESTSDIR/auto0 TESTSDIR/auto0/auto1 TESTSDIR/auto0/auto2*} -- {TCLLIB*}}
 test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2593,7 +2593,7 @@ test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefin
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         0 0.5 0 1.0 0 2.0 --\
@@ -2601,12 +2601,12 @@ test safe-19.20 {check module loading, Sync Mode off} -constraints AutoSyncDefin
          TESTSDIR/auto0/modules/mod2} -- res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.21 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 1} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2661,7 +2661,7 @@ test safe-19.21 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -2673,12 +2673,12 @@ test safe-19.21 {interpConfigure change the access path; check module loading, S
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.22 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 0} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2728,7 +2728,7 @@ test safe-19.22 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -2740,12 +2740,12 @@ test safe-19.22 {interpConfigure change the access path; check module loading, S
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.23 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 3} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2805,7 +2805,7 @@ test safe-19.23 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
@@ -2817,12 +2817,12 @@ test safe-19.23 {interpConfigure change the access path; check module loading, S
         res0 res1 res2}
 # See comments on lsort after test safe-9.20.
 test safe-19.24 {interpConfigure change the access path; check module loading, Sync Mode off; stale data case 2 (worst case)} -constraints AutoSyncDefined -setup {
-    set SyncExists [expr {[info commands ::safe::setAutoPathSync] ne {}}]
+    set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-        set SyncVal_TMP [safe::setAutoPathSync]
-        safe::setAutoPathSync 0
+        set SyncVal_TMP [safe::setSyncMode]
+        safe::setSyncMode 0
     } else {
-        error {This test is meaningful only if the command ::safe::setAutoPathSync is defined}
+        error {This test is meaningful only if the command ::safe::setSyncMode is defined}
     }
     set oldTm [tcl::tm::path list]
     foreach path $oldTm {
@@ -2877,7 +2877,7 @@ test safe-19.24 {interpConfigure change the access path; check module loading, S
     }
     safe::interpDelete $i
     if {$SyncExists} {
-        safe::setAutoPathSync $SyncVal_TMP
+        safe::setSyncMode $SyncVal_TMP
     }
 } -match glob -result {{{$p(:1:)} {$p(:2:)} {$p(:3:)}} -- {{$p(:1:)}} --\
         {{$p(:3:)} {$p(:4:)} {$p(:5:)}} -- {{$p(:3:)}} --\
-- 
cgit v0.12


From 6bad0fe2c0035a1724e85f23cc97a86ca15ae2c0 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Sun, 26 Jul 2020 02:54:33 +0000
Subject: Fix merge error in library/safe.tcl.  Has effect only if using
 private command safe::DetokPath with interp name that has namespace
 separators.

---
 library/safe.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 18360ce..b5ee95f 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -501,7 +501,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook au
 #    nonsense in both the slave and the master.
 #
 proc ::safe::DetokPath {slave tokenPath} {
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe [VarName $slave] state
 
     set slavePath {}
     foreach token $tokenPath {
-- 
cgit v0.12


From 1a08f933917a45ce6efae1951ab01ba5ebedacfc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 4 Dec 2021 17:55:32 +0000
Subject: Experiment: Make tcl.h from Tcl 9.0 usable to compile extensions for
 Tcl 8.x too (WIP)

---
 generic/tcl.decls      | 170 ++++++++++++------------
 generic/tcl.h          |  85 +++++++++---
 generic/tclDecls.h     | 342 +++++++++++++++++++++++++------------------------
 generic/tclPlatDecls.h |   4 +-
 4 files changed, 324 insertions(+), 277 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 5b013e6..87242cc 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -40,22 +40,22 @@ declare 2 {
     TCL_NORETURN void Tcl_Panic(const char *format, ...)
 }
 declare 3 {
-    void *Tcl_Alloc(size_t size)
+    void *Tcl_Alloc(Tcl_Size size)
 }
 declare 4 {
     void Tcl_Free(void *ptr)
 }
 declare 5 {
-    void *Tcl_Realloc(void *ptr, size_t size)
+    void *Tcl_Realloc(void *ptr, Tcl_Size size)
 }
 declare 6 {
-    void *Tcl_DbCkalloc(size_t size, const char *file, int line)
+    void *Tcl_DbCkalloc(Tcl_Size size, const char *file, int line)
 }
 declare 7 {
     void Tcl_DbCkfree(void *ptr, const char *file, int line)
 }
 declare 8 {
-    void *Tcl_DbCkrealloc(void *ptr, size_t size,
+    void *Tcl_DbCkrealloc(void *ptr, Tcl_Size size,
 	    const char *file, int line)
 }
 
@@ -86,7 +86,7 @@ declare 15 {
     void Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...)
 }
 declare 16 {
-    void Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes, size_t length)
+    void Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes, Tcl_Size length)
 }
 declare 17 {
     Tcl_Obj *Tcl_ConcatObj(int objc, Tcl_Obj *const objv[])
@@ -109,7 +109,7 @@ declare 21 {
 #    Tcl_Obj *Tcl_DbNewBooleanObj(int boolValue, const char *file, int line)
 #}
 declare 23 {
-    Tcl_Obj *Tcl_DbNewByteArrayObj(const unsigned char *bytes, size_t length,
+    Tcl_Obj *Tcl_DbNewByteArrayObj(const unsigned char *bytes, Tcl_Size numBytes,
 	    const char *file, int line)
 }
 declare 24 {
@@ -128,7 +128,7 @@ declare 27 {
     Tcl_Obj *Tcl_DbNewObj(const char *file, int line)
 }
 declare 28 {
-    Tcl_Obj *Tcl_DbNewStringObj(const char *bytes, size_t length,
+    Tcl_Obj *Tcl_DbNewStringObj(const char *bytes, Tcl_Size length,
 	    const char *file, int line)
 }
 declare 29 {
@@ -206,7 +206,7 @@ declare 48 {
 #    Tcl_Obj *Tcl_NewBooleanObj(int boolValue)
 #}
 declare 50 {
-    Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char *bytes, size_t length)
+    Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char *bytes, Tcl_Size numBytes)
 }
 declare 51 {
     Tcl_Obj *Tcl_NewDoubleObj(double doubleValue)
@@ -226,18 +226,18 @@ declare 55 {
     Tcl_Obj *Tcl_NewObj(void)
 }
 declare 56 {
-    Tcl_Obj *Tcl_NewStringObj(const char *bytes, size_t length)
+    Tcl_Obj *Tcl_NewStringObj(const char *bytes, Tcl_Size length)
 }
 # Removed in 9.0 (changed to macro):
 #declare 57 {
 #    void Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue)
 #}
 declare 58 {
-    unsigned char *Tcl_SetByteArrayLength(Tcl_Obj *objPtr, size_t length)
+    unsigned char *Tcl_SetByteArrayLength(Tcl_Obj *objPtr, Tcl_Size numBytes)
 }
 declare 59 {
     void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, const unsigned char *bytes,
-	    size_t length)
+	    Tcl_Size numBytes)
 }
 declare 60 {
     void Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue)
@@ -254,10 +254,10 @@ declare 62 {
 #    void Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue)
 #}
 declare 64 {
-    void Tcl_SetObjLength(Tcl_Obj *objPtr, size_t length)
+    void Tcl_SetObjLength(Tcl_Obj *objPtr, Tcl_Size length)
 }
 declare 65 {
-    void Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes, size_t length)
+    void Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes, Tcl_Size length)
 }
 # Removed in 9.0, replaced by macro.
 #declare 66 {
@@ -323,10 +323,10 @@ declare 83 {
     char *Tcl_Concat(int argc, const char *const *argv)
 }
 declare 84 {
-    size_t Tcl_ConvertElement(const char *src, char *dst, int flags)
+    Tcl_Size Tcl_ConvertElement(const char *src, char *dst, int flags)
 }
 declare 85 {
-    size_t Tcl_ConvertCountedElement(const char *src, size_t length, char *dst,
+    Tcl_Size Tcl_ConvertCountedElement(const char *src, Tcl_Size length, char *dst,
 	    int flags)
 }
 declare 86 {
@@ -446,7 +446,7 @@ declare 116 {
     void Tcl_DoWhenIdle(Tcl_IdleProc *proc, void *clientData)
 }
 declare 117 {
-    char *Tcl_DStringAppend(Tcl_DString *dsPtr, const char *bytes, size_t length)
+    char *Tcl_DStringAppend(Tcl_DString *dsPtr, const char *bytes, Tcl_Size length)
 }
 declare 118 {
     char *Tcl_DStringAppendElement(Tcl_DString *dsPtr, const char *element)
@@ -467,7 +467,7 @@ declare 123 {
     void Tcl_DStringResult(Tcl_Interp *interp, Tcl_DString *dsPtr)
 }
 declare 124 {
-    void Tcl_DStringSetLength(Tcl_DString *dsPtr, size_t length)
+    void Tcl_DStringSetLength(Tcl_DString *dsPtr, Tcl_Size length)
 }
 declare 125 {
     void Tcl_DStringStartSublist(Tcl_DString *dsPtr)
@@ -626,10 +626,10 @@ declare 168 {
     Tcl_PathType Tcl_GetPathType(const char *path)
 }
 declare 169 {
-    size_t Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr)
+    Tcl_Size Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr)
 }
 declare 170 {
-    size_t Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr)
+    Tcl_Size Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr)
 }
 declare 171 {
     int Tcl_GetServiceMode(void)
@@ -758,7 +758,7 @@ declare 205 {
     void Tcl_QueueEvent(Tcl_Event *evPtr, Tcl_QueuePosition position)
 }
 declare 206 {
-    size_t Tcl_Read(Tcl_Channel chan, char *bufPtr, size_t toRead)
+    Tcl_Size Tcl_Read(Tcl_Channel chan, char *bufPtr, Tcl_Size toRead)
 }
 declare 207 {
     void Tcl_ReapDetachedProcs(void)
@@ -787,7 +787,7 @@ declare 214 {
 	    const char *pattern)
 }
 declare 215 {
-    void Tcl_RegExpRange(Tcl_RegExp regexp, size_t index,
+    void Tcl_RegExpRange(Tcl_RegExp regexp, Tcl_Size index,
 	    const char **startPtr, const char **endPtr)
 }
 declare 216 {
@@ -797,10 +797,10 @@ declare 217 {
     void Tcl_ResetResult(Tcl_Interp *interp)
 }
 declare 218 {
-    size_t Tcl_ScanElement(const char *src, int *flagPtr)
+    Tcl_Size Tcl_ScanElement(const char *src, int *flagPtr)
 }
 declare 219 {
-    size_t Tcl_ScanCountedElement(const char *src, size_t length, int *flagPtr)
+    Tcl_Size Tcl_ScanCountedElement(const char *src, Tcl_Size length, int *flagPtr)
 }
 # Removed in 9.0:
 #declare 220 {
@@ -913,7 +913,7 @@ declare 249 {
 	    Tcl_DString *bufferPtr)
 }
 declare 250 {
-    size_t Tcl_Ungets(Tcl_Channel chan, const char *str, size_t len, int atHead)
+    Tcl_Size Tcl_Ungets(Tcl_Channel chan, const char *str, Tcl_Size len, int atHead)
 }
 declare 251 {
     void Tcl_UnlinkVar(Tcl_Interp *interp, const char *varName)
@@ -965,7 +965,7 @@ declare 262 {
 	    void *prevClientData)
 }
 declare 263 {
-    size_t Tcl_Write(Tcl_Channel chan, const char *s, size_t slen)
+    Tcl_Size Tcl_Write(Tcl_Channel chan, const char *s, Tcl_Size slen)
 }
 declare 264 {
     void Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
@@ -1089,7 +1089,7 @@ declare 289 {
 #    void Tcl_DiscardResult(Tcl_SavedResult *statePtr)
 #}
 declare 291 {
-    int Tcl_EvalEx(Tcl_Interp *interp, const char *script, size_t numBytes,
+    int Tcl_EvalEx(Tcl_Interp *interp, const char *script, Tcl_Size numBytes,
 	    int flags)
 }
 declare 292 {
@@ -1104,13 +1104,13 @@ declare 294 {
 }
 declare 295 {
     int Tcl_ExternalToUtf(Tcl_Interp *interp, Tcl_Encoding encoding,
-	    const char *src, size_t srcLen, int flags,
-	    Tcl_EncodingState *statePtr, char *dst, size_t dstLen,
+	    const char *src, Tcl_Size srcLen, int flags,
+	    Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen,
 	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
 }
 declare 296 {
     char *Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
-	    const char *src, size_t srcLen, Tcl_DString *dsPtr)
+	    const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr)
 }
 declare 297 {
     void Tcl_FinalizeThread(void)
@@ -1135,11 +1135,11 @@ declare 303 {
 }
 declare 304 {
     int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    const void *tablePtr, size_t offset, const char *msg, int flags,
+	    const void *tablePtr, Tcl_Size offset, const char *msg, int flags,
 	    int *indexPtr)
 }
 declare 305 {
-    void *Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, size_t size)
+    void *Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, Tcl_Size size)
 }
 declare 306 {
     Tcl_Obj *Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
@@ -1162,11 +1162,11 @@ declare 311 {
 	    const Tcl_Time *timePtr)
 }
 declare 312 {
-    size_t Tcl_NumUtfChars(const char *src, size_t length)
+    Tcl_Size Tcl_NumUtfChars(const char *src, Tcl_Size length)
 }
 declare 313 {
-    size_t Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
-	    size_t charsToRead, int appendFlag)
+    Tcl_Size Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+	    Tcl_Size charsToRead, int appendFlag)
 }
 # Removed in 9.0, replaced by macro.
 #declare 314 {
@@ -1191,7 +1191,7 @@ declare 319 {
 	    Tcl_QueuePosition position)
 }
 declare 320 {
-    int Tcl_UniCharAtIndex(const char *src, size_t index)
+    int Tcl_UniCharAtIndex(const char *src, Tcl_Size index)
 }
 declare 321 {
     int Tcl_UniCharToLower(int ch)
@@ -1206,13 +1206,13 @@ declare 324 {
     int Tcl_UniCharToUtf(int ch, char *buf)
 }
 declare 325 {
-    const char *Tcl_UtfAtIndex(const char *src, size_t index)
+    const char *Tcl_UtfAtIndex(const char *src, Tcl_Size index)
 }
 declare 326 {
-    int TclUtfCharComplete(const char *src, size_t length)
+    int TclUtfCharComplete(const char *src, Tcl_Size length)
 }
 declare 327 {
-    size_t Tcl_UtfBackslash(const char *src, int *readPtr, char *dst)
+    Tcl_Size Tcl_UtfBackslash(const char *src, int *readPtr, char *dst)
 }
 declare 328 {
     const char *Tcl_UtfFindFirst(const char *src, int ch)
@@ -1228,13 +1228,13 @@ declare 331 {
 }
 declare 332 {
     int Tcl_UtfToExternal(Tcl_Interp *interp, Tcl_Encoding encoding,
-	    const char *src, size_t srcLen, int flags,
-	    Tcl_EncodingState *statePtr, char *dst, size_t dstLen,
+	    const char *src, Tcl_Size srcLen, int flags,
+	    Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen,
 	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
 }
 declare 333 {
     char *Tcl_UtfToExternalDString(Tcl_Encoding encoding,
-	    const char *src, size_t srcLen, Tcl_DString *dsPtr)
+	    const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr)
 }
 declare 334 {
     int Tcl_UtfToLower(char *src)
@@ -1249,10 +1249,10 @@ declare 337 {
     int Tcl_UtfToUpper(char *src)
 }
 declare 338 {
-    size_t Tcl_WriteChars(Tcl_Channel chan, const char *src, size_t srcLen)
+    Tcl_Size Tcl_WriteChars(Tcl_Channel chan, const char *src, Tcl_Size srcLen)
 }
 declare 339 {
-    size_t Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr)
+    Tcl_Size Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr)
 }
 declare 340 {
     char *Tcl_GetString(Tcl_Obj *objPtr)
@@ -1294,20 +1294,20 @@ declare 351 {
 }
 # Removed in 9.0:
 #declare 352 {
-#    size_t Tcl_UniCharLen(const Tcl_UniChar *uniStr)
+#    int Tcl_UniCharLen(const Tcl_UniChar *uniStr)
 #}
 # Removed in 9.0:
 #declare 353 {
 #    int Tcl_UniCharNcmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct,
-#	    size_t numChars)
+#	    unsigned long numChars)
 #}
 declare 354 {
     char *Tcl_Char16ToUtfDString(const unsigned short *uniStr,
-	    size_t uniLength, Tcl_DString *dsPtr)
+	    Tcl_Size uniLength, Tcl_DString *dsPtr)
 }
 declare 355 {
     unsigned short *Tcl_UtfToChar16DString(const char *src,
-	    size_t length, Tcl_DString *dsPtr)
+	    Tcl_Size length, Tcl_DString *dsPtr)
 }
 declare 356 {
     Tcl_RegExp Tcl_GetRegExpFromObj(Tcl_Interp *interp, Tcl_Obj *patObj,
@@ -1323,29 +1323,29 @@ declare 358 {
 }
 declare 359 {
     void Tcl_LogCommandInfo(Tcl_Interp *interp, const char *script,
-	    const char *command, size_t length)
+	    const char *command, Tcl_Size length)
 }
 declare 360 {
     int Tcl_ParseBraces(Tcl_Interp *interp, const char *start,
-	    size_t numBytes, Tcl_Parse *parsePtr, int append,
+	    Tcl_Size numBytes, Tcl_Parse *parsePtr, int append,
 	    const char **termPtr)
 }
 declare 361 {
     int Tcl_ParseCommand(Tcl_Interp *interp, const char *start,
-	    size_t numBytes, int nested, Tcl_Parse *parsePtr)
+	    Tcl_Size numBytes, int nested, Tcl_Parse *parsePtr)
 }
 declare 362 {
-    int Tcl_ParseExpr(Tcl_Interp *interp, const char *start, size_t numBytes,
+    int Tcl_ParseExpr(Tcl_Interp *interp, const char *start, Tcl_Size numBytes,
 	    Tcl_Parse *parsePtr)
 }
 declare 363 {
     int Tcl_ParseQuotedString(Tcl_Interp *interp, const char *start,
-	    size_t numBytes, Tcl_Parse *parsePtr, int append,
+	    Tcl_Size numBytes, Tcl_Parse *parsePtr, int append,
 	    const char **termPtr)
 }
 declare 364 {
     int Tcl_ParseVarName(Tcl_Interp *interp, const char *start,
-	    size_t numBytes, Tcl_Parse *parsePtr, int append)
+	    Tcl_Size numBytes, Tcl_Parse *parsePtr, int append)
 }
 # These 4 functions are obsolete, use Tcl_FSGetCwd, Tcl_FSChdir,
 # Tcl_FSAccess and Tcl_FSStat
@@ -1384,35 +1384,35 @@ declare 375 {
 }
 declare 376 {
     int Tcl_RegExpExecObj(Tcl_Interp *interp, Tcl_RegExp regexp,
-	    Tcl_Obj *textObj, size_t offset, size_t nmatches, int flags)
+	    Tcl_Obj *textObj, Tcl_Size offset, Tcl_Size nmatches, int flags)
 }
 declare 377 {
     void Tcl_RegExpGetInfo(Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr)
 }
 declare 378 {
-    Tcl_Obj *Tcl_NewUnicodeObj(const Tcl_UniChar *unicode, size_t numChars)
+    Tcl_Obj *Tcl_NewUnicodeObj(const Tcl_UniChar *unicode, Tcl_Size numChars)
 }
 declare 379 {
     void Tcl_SetUnicodeObj(Tcl_Obj *objPtr, const Tcl_UniChar *unicode,
-	    size_t numChars)
+	    Tcl_Size numChars)
 }
 declare 380 {
-    size_t Tcl_GetCharLength(Tcl_Obj *objPtr)
+    Tcl_Size Tcl_GetCharLength(Tcl_Obj *objPtr)
 }
 declare 381 {
-    int Tcl_GetUniChar(Tcl_Obj *objPtr, size_t index)
+    int Tcl_GetUniChar(Tcl_Obj *objPtr, Tcl_Size index)
 }
 # Removed in 9.0, replaced by macro.
 #declare 382 {
 #    Tcl_UniChar *Tcl_GetUnicode(Tcl_Obj *objPtr)
 #}
 declare 383 {
-    Tcl_Obj *Tcl_GetRange(Tcl_Obj *objPtr, size_t first, size_t last)
+    Tcl_Obj *Tcl_GetRange(Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last)
 }
 # Removed in 9.0
 #declare 384 {
 #    void Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr, const Tcl_UniChar *unicode,
-#	    size_t length)
+#	    int length)
 #}
 declare 385 {
     int Tcl_RegExpMatchObj(Tcl_Interp *interp, Tcl_Obj *textObj,
@@ -1442,15 +1442,15 @@ declare 392 {
 }
 declare 393 {
     int Tcl_CreateThread(Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc,
-	    void *clientData, size_t stackSize, int flags)
+	    void *clientData, Tcl_Size stackSize, int flags)
 }
 
 # Introduced in 8.3.2
 declare 394 {
-    size_t Tcl_ReadRaw(Tcl_Channel chan, char *dst, size_t bytesToRead)
+    Tcl_Size Tcl_ReadRaw(Tcl_Channel chan, char *dst, Tcl_Size bytesToRead)
 }
 declare 395 {
-    size_t Tcl_WriteRaw(Tcl_Channel chan, const char *src, size_t srcLen)
+    Tcl_Size Tcl_WriteRaw(Tcl_Channel chan, const char *src, Tcl_Size srcLen)
 }
 declare 396 {
     Tcl_Channel Tcl_GetTopChannel(Tcl_Channel chan)
@@ -1541,7 +1541,7 @@ declare 418 {
 # Removed in 9.0:
 #declare 419 {
 #    int Tcl_UniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct,
-#	    size_t numChars)
+#	    unsigned long numChars)
 #}
 # Removed in 9.0:
 #declare 420 {
@@ -1578,20 +1578,20 @@ declare 427 {
 	    int flags, Tcl_CommandTraceProc *proc, void *clientData)
 }
 declare 428 {
-    void *Tcl_AttemptAlloc(size_t size)
+    void *Tcl_AttemptAlloc(Tcl_Size size)
 }
 declare 429 {
-    void *Tcl_AttemptDbCkalloc(size_t size, const char *file, int line)
+    void *Tcl_AttemptDbCkalloc(Tcl_Size size, const char *file, int line)
 }
 declare 430 {
-    void *Tcl_AttemptRealloc(void *ptr, size_t size)
+    void *Tcl_AttemptRealloc(void *ptr, Tcl_Size size)
 }
 declare 431 {
-    void *Tcl_AttemptDbCkrealloc(void *ptr, size_t size,
+    void *Tcl_AttemptDbCkrealloc(void *ptr, Tcl_Size size,
 	    const char *file, int line)
 }
 declare 432 {
-    int Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, size_t length)
+    int Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, Tcl_Size length)
 }
 
 # TIP#10 (thread-aware channels) akupries
@@ -1771,7 +1771,7 @@ declare 480 {
 # TIP#56 (evaluate a parsed script) msofer
 declare 481 {
     int Tcl_EvalTokensStandard(Tcl_Interp *interp, Tcl_Token *tokenPtr,
-	    size_t count)
+	    Tcl_Size count)
 }
 
 # TIP#73 (access to current time) kbk
@@ -2152,7 +2152,7 @@ declare 574 {
 }
 declare 575 {
     void Tcl_AppendLimitedToObj(Tcl_Obj *objPtr, const char *bytes,
-	    size_t length, size_t limit, const char *ellipsis)
+	    Tcl_Size length, Tcl_Size limit, const char *ellipsis)
 }
 declare 576 {
     Tcl_Obj *Tcl_Format(Tcl_Interp *interp, const char *format, int objc,
@@ -2304,15 +2304,15 @@ declare 610 {
 }
 declare 611 {
     int Tcl_ZlibInflate(Tcl_Interp *interp, int format, Tcl_Obj *data,
-	    size_t buffersize, Tcl_Obj *gzipHeaderDictObj)
+	    Tcl_Size buffersize, Tcl_Obj *gzipHeaderDictObj)
 }
 declare 612 {
     unsigned int Tcl_ZlibCRC32(unsigned int crc, const unsigned char *buf,
-	    size_t len)
+	    Tcl_Size len)
 }
 declare 613 {
     unsigned int Tcl_ZlibAdler32(unsigned int adler, const unsigned char *buf,
-	    size_t len)
+	    Tcl_Size len)
 }
 declare 614 {
     int Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode, int format,
@@ -2332,7 +2332,7 @@ declare 618 {
 }
 declare 619 {
     int Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle, Tcl_Obj *data,
-	    size_t count)
+	    Tcl_Size count)
 }
 declare 620 {
     int Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle)
@@ -2415,7 +2415,7 @@ declare 636 {
 }
 declare 637 {
     char *Tcl_InitStringRep(Tcl_Obj *objPtr, const char *bytes,
-	    size_t numBytes)
+	    Tcl_Size numBytes)
 }
 declare 638 {
     Tcl_ObjInternalRep *Tcl_FetchInternalRep(Tcl_Obj *objPtr, const Tcl_ObjType *typePtr)
@@ -2444,12 +2444,12 @@ declare 643 {
 # TIP#312 New Tcl_LinkArray() function
 declare 644 {
     int Tcl_LinkArray(Tcl_Interp *interp, const char *varName, void *addr,
-	    int type, size_t size)
+	    int type, Tcl_Size size)
 }
 
 declare 645 {
     int Tcl_GetIntForIndex(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    size_t endValue, size_t *indexPtr)
+	    Tcl_Size endValue, Tcl_Size *indexPtr)
 }
 
 # TIP #548
@@ -2458,21 +2458,21 @@ declare 646 {
 }
 declare 647 {
     char *Tcl_UniCharToUtfDString(const int *uniStr,
-	    size_t uniLength, Tcl_DString *dsPtr)
+	    Tcl_Size uniLength, Tcl_DString *dsPtr)
 }
 declare 648 {
     int *Tcl_UtfToUniCharDString(const char *src,
-	    size_t length, Tcl_DString *dsPtr)
+	    Tcl_Size length, Tcl_DString *dsPtr)
 }
 
 # TIP #568
 declare 649 {
     unsigned char *TclGetBytesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    int *lengthPtr)
+	    int *numBytesPtr)
 }
 declare 650 {
     unsigned char *Tcl_GetBytesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    size_t *lengthPtr)
+	    size_t *numBytesPtr)
 }
 
 # TIP #481
@@ -2483,12 +2483,12 @@ declare 652 {
     Tcl_UniChar *Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr, size_t *lengthPtr)
 }
 declare 653 {
-    unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, size_t *lengthPtr)
+    unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, size_t *numBytesPtr)
 }
 
 # TIP #575
 declare 654 {
-    int Tcl_UtfCharComplete(const char *src, size_t length)
+    int Tcl_UtfCharComplete(const char *src, Tcl_Size length)
 }
 declare 655 {
     const char *Tcl_UtfNext(const char *src)
@@ -2524,7 +2524,7 @@ interface tclPlat
 declare 1 {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, const char *bundleVersion,
-	    int hasResourceFile, size_t maxPathLen, char *libraryPath)
+	    int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath)
 }
 declare 2 {
     void Tcl_MacOSXNotifierAddRunLoopMode(const void *runLoopMode)
diff --git a/generic/tcl.h b/generic/tcl.h
index c3db670..0f5eb2e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -47,6 +47,7 @@ extern "C" {
  * unix/tcl.spec	(1 LOC patch)
  */
 
+#if !defined(TCL_MAJOR_VERSION) || (TCL_MAJOR_VERSION == 9)
 #define TCL_MAJOR_VERSION   9
 #define TCL_MINOR_VERSION   0
 #define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
@@ -54,6 +55,7 @@ extern "C" {
 
 #define TCL_VERSION	    "9.0"
 #define TCL_PATCH_LEVEL	    "9.0a4"
+#endif /* TCL_MAJOR_VERSION */
 
 #if defined(RC_INVOKED)
 /*
@@ -306,7 +308,7 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
 #define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
 
-#if defined(_WIN32)
+#ifdef _WIN32
     typedef struct __stat64 Tcl_StatBuf;
 #elif defined(__CYGWIN__)
     typedef struct {
@@ -448,6 +450,7 @@ typedef void (Tcl_ThreadCreateProc) (void *clientData);
  * string.
  */
 
+#if TCL_MAJOR_VERSION >= 9
 typedef struct Tcl_RegExpIndices {
     size_t start;			/* Character offset of first character in
 				 * match. */
@@ -462,6 +465,23 @@ typedef struct Tcl_RegExpInfo {
     size_t extendStart;		/* The offset at which a subsequent match
 				 * might begin. */
 } Tcl_RegExpInfo;
+#else
+typedef struct Tcl_RegExpIndices {
+    long start;			/* Character offset of first character in
+				 * match. */
+    long end;			/* Character offset of first character after
+				 * the match. */
+} Tcl_RegExpIndices;
+
+typedef struct Tcl_RegExpInfo {
+    int nsubs;			/* Number of subexpressions in the compiled
+				 * expression. */
+    Tcl_RegExpIndices *matches;	/* Array of nsubs match offset pairs. */
+    long extendStart;		/* The offset at which a subsequent match
+				 * might begin. */
+    long reserved;		/* Reserved for later use. */
+} Tcl_RegExpInfo;
+#endif
 
 /*
  * Picky compilers complain if this typdef doesn't appear before the struct's
@@ -635,9 +655,15 @@ typedef union Tcl_ObjInternalRep {	/* The internal representation: */
  * An object stores a value as either a string, some internal representation,
  * or both.
  */
+#if TCL_MAJOR_VERSION >= 9
+#   define Tcl_Size size_t
+#else
+#   define Tcl_Size int
+#endif
+
 
 typedef struct Tcl_Obj {
-    size_t refCount;		/* When 0 the object will be freed. */
+    Tcl_Size refCount;		/* When 0 the object will be freed. */
     char *bytes;		/* This points to the first byte of the
 				 * object's string representation. The array
 				 * must be followed by a null byte (i.e., at
@@ -649,7 +675,7 @@ typedef struct Tcl_Obj {
 				 * should use Tcl_GetStringFromObj or
 				 * Tcl_GetString to get a pointer to the byte
 				 * array as a readonly value. */
-    size_t length;		/* The number of bytes at *bytes, not
+    Tcl_Size length;			/* The number of bytes at *bytes, not
 				 * including the terminating null. */
     const Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
 				 * corresponds to the type of the object's
@@ -779,9 +805,9 @@ typedef struct Tcl_CmdInfo {
 typedef struct Tcl_DString {
     char *string;		/* Points to beginning of string: either
 				 * staticSpace below or a malloced array. */
-    size_t length;		/* Number of non-NULL characters in the
+    Tcl_Size length;		/* Number of non-NULL characters in the
 				 * string. */
-    size_t spaceAvl;		/* Total number of bytes available for the
+    Tcl_Size spaceAvl;		/* Total number of bytes available for the
 				 * string and its terminating NULL char. */
     char staticSpace[TCL_DSTRING_STATIC_SIZE];
 				/* Space to use in common case where string is
@@ -944,7 +970,11 @@ typedef struct Tcl_DString {
  */
 
 #ifndef TCL_HASH_TYPE
+#if TCL_MAJOR_VERSION >= 9
 #  define TCL_HASH_TYPE size_t
+#else
+#  define TCL_HASH_TYPE unsigned
+#endif
 #endif
 
 typedef struct Tcl_HashKeyType Tcl_HashKeyType;
@@ -967,7 +997,7 @@ struct Tcl_HashEntry {
 				 * or NULL for end of chain. */
     Tcl_HashTable *tablePtr;	/* Pointer to table containing entry. */
     size_t hash;		/* Hash value. */
-    void *clientData;		/* Application stores something here with
+    void *clientData;	/* Application stores something here with
 				 * Tcl_SetHashValue. */
     union {			/* Key has one of these forms: */
 	char *oneWordValue;	/* One-word value for key. */
@@ -1055,16 +1085,21 @@ struct Tcl_HashTable {
     Tcl_HashEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
 				/* Bucket array used for small tables (to
 				 * avoid mallocs and frees). */
-    size_t numBuckets;		/* Total number of buckets allocated at
+    Tcl_Size numBuckets;		/* Total number of buckets allocated at
 				 * **bucketPtr. */
-    size_t numEntries;		/* Total number of entries present in
+    Tcl_Size numEntries;		/* Total number of entries present in
 				 * table. */
-    size_t rebuildSize;		/* Enlarge table when numEntries gets to be
+    Tcl_Size rebuildSize;		/* Enlarge table when numEntries gets to be
 				 * this large. */
-    size_t mask;		/* Mask value used in hashing function. */
+#if TCL_MAJOR_VERSION >= 9
+    Tcl_Size mask;		/* Mask value used in hashing function. */
+#endif
     int downShift;		/* Shift count used in hashing function.
 				 * Designed to use high-order bits of
 				 * randomized keys. */
+#if TCL_MAJOR_VERSION <= 8
+    int mask;		/* Mask value used in hashing function. */
+#endif
     int keyType;		/* Type of keys used in this table. It's
 				 * either TCL_CUSTOM_KEYS, TCL_STRING_KEYS,
 				 * TCL_ONE_WORD_KEYS, or an integer giving the
@@ -1085,7 +1120,7 @@ struct Tcl_HashTable {
 
 typedef struct Tcl_HashSearch {
     Tcl_HashTable *tablePtr;	/* Table being searched. */
-    size_t nextIndex;		/* Index of next bucket to be enumerated after
+    Tcl_Size nextIndex;		/* Index of next bucket to be enumerated after
 				 * present one. */
     Tcl_HashEntry *nextEntryPtr;/* Next entry to be enumerated in the current
 				 * bucket. */
@@ -1126,7 +1161,7 @@ typedef struct Tcl_HashSearch {
 typedef struct {
     void *next;			/* Search position for underlying hash
 				 * table. */
-    size_t epoch;		/* Epoch marker for dictionary being searched,
+    TCL_HASH_TYPE epoch; 	/* Epoch marker for dictionary being searched,
 				 * or 0 if search has terminated. */
     Tcl_Dict dictionaryPtr;	/* Reference to dictionary being searched. */
 } Tcl_DictSearch;
@@ -1480,7 +1515,7 @@ typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
 
 typedef struct Tcl_Filesystem {
     const char *typeName;	/* The name of the filesystem. */
-    size_t structureLength;	/* Length of this structure, so future binary
+    Tcl_Size structureLength;	/* Length of this structure, so future binary
 				 * compatibility can be assured. */
     Tcl_FSVersion version;	/* Version of the filesystem type. */
     Tcl_FSPathInFilesystemProc *pathInFilesystemProc;
@@ -1642,8 +1677,8 @@ typedef struct Tcl_Token {
     int type;			/* Type of token, such as TCL_TOKEN_WORD; see
 				 * below for valid types. */
     const char *start;		/* First character in token. */
-    size_t size;			/* Number of bytes in token. */
-    size_t numComponents;		/* If this token is composed of other tokens,
+    Tcl_Size size;			/* Number of bytes in token. */
+    Tcl_Size numComponents;		/* If this token is composed of other tokens,
 				 * this field tells how many of them there are
 				 * (including components of components, etc.).
 				 * The component tokens immediately follow
@@ -1757,7 +1792,7 @@ typedef struct Tcl_Token {
 typedef struct Tcl_Parse {
     const char *commentStart;	/* Pointer to # that begins the first of one
 				 * or more comments preceding the command. */
-    size_t commentSize;		/* Number of bytes in comments (up through
+    Tcl_Size commentSize;		/* Number of bytes in comments (up through
 				 * newline character that terminates the last
 				 * comment). If there were no comments, this
 				 * field is 0. */
@@ -1930,7 +1965,11 @@ typedef struct Tcl_EncodingType {
  */
 
 #ifndef TCL_UTF_MAX
+#if TCL_MAJOR_VERSION >= 9
 #define TCL_UTF_MAX		4
+#else
+#define TCL_UTF_MAX		3
+#endif
 #endif
 
 /*
@@ -2113,12 +2152,12 @@ typedef int (Tcl_ArgvGenFuncProc)(void *clientData, Tcl_Interp *interp,
 #define TCL_TCPSERVER_REUSEPORT (1<<1)
 
 /*
- * Constants for special size_t-typed values, see TIP #494
+ * Constants for special Tcl_Size-typed values, see TIP #494
  */
 
-#define TCL_IO_FAILURE	((size_t)-1)
-#define TCL_AUTO_LENGTH	((size_t)-1)
-#define TCL_INDEX_NONE  ((size_t)-1)
+#define TCL_IO_FAILURE	((Tcl_Size)-1)
+#define TCL_AUTO_LENGTH	((Tcl_Size)-1)
+#define TCL_INDEX_NONE  ((Tcl_Size)-1)
 
 /*
  *----------------------------------------------------------------------------
@@ -2134,7 +2173,11 @@ typedef int (Tcl_NRPostProc) (void *data[], Tcl_Interp *interp,
  * stubs tables.
  */
 
-#define TCL_STUB_MAGIC		((int) 0xFCA3BACB + (int) sizeof(void *))
+#if TCL_MAJOR_VERSION >= 9
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACB + (int) sizeof(void *))
+#else
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
+#endif
 
 /*
  * The following function is required to be defined in all stubs aware
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 459ddc5..dea8d8c 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -59,18 +59,18 @@ EXTERN const char *	Tcl_PkgRequireEx(Tcl_Interp *interp,
 /* 2 */
 EXTERN TCL_NORETURN void Tcl_Panic(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
 /* 3 */
-EXTERN void *		Tcl_Alloc(size_t size);
+EXTERN void *		Tcl_Alloc(Tcl_Size size);
 /* 4 */
 EXTERN void		Tcl_Free(void *ptr);
 /* 5 */
-EXTERN void *		Tcl_Realloc(void *ptr, size_t size);
+EXTERN void *		Tcl_Realloc(void *ptr, Tcl_Size size);
 /* 6 */
-EXTERN void *		Tcl_DbCkalloc(size_t size, const char *file,
+EXTERN void *		Tcl_DbCkalloc(Tcl_Size size, const char *file,
 				int line);
 /* 7 */
 EXTERN void		Tcl_DbCkfree(void *ptr, const char *file, int line);
 /* 8 */
-EXTERN void *		Tcl_DbCkrealloc(void *ptr, size_t size,
+EXTERN void *		Tcl_DbCkrealloc(void *ptr, Tcl_Size size,
 				const char *file, int line);
 /* 9 */
 EXTERN void		Tcl_CreateFileHandler(int fd, int mask,
@@ -90,7 +90,7 @@ EXTERN int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
 EXTERN void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
 /* 16 */
 EXTERN void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
-				size_t length);
+				Tcl_Size length);
 /* 17 */
 EXTERN Tcl_Obj *	Tcl_ConcatObj(int objc, Tcl_Obj *const objv[]);
 /* 18 */
@@ -108,7 +108,8 @@ EXTERN int		Tcl_DbIsShared(Tcl_Obj *objPtr, const char *file,
 /* Slot 22 is reserved */
 /* 23 */
 EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
-				size_t length, const char *file, int line);
+				Tcl_Size numBytes, const char *file,
+				int line);
 /* 24 */
 EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
 				const char *file, int line);
@@ -119,8 +120,8 @@ EXTERN Tcl_Obj *	Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
 /* 27 */
 EXTERN Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
 /* 28 */
-EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes, size_t length,
-				const char *file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes,
+				Tcl_Size length, const char *file, int line);
 /* 29 */
 EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
 /* 30 */
@@ -180,7 +181,7 @@ EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
 /* Slot 49 is reserved */
 /* 50 */
 EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
-				size_t length);
+				Tcl_Size numBytes);
 /* 51 */
 EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
 /* Slot 52 is reserved */
@@ -190,14 +191,15 @@ EXTERN Tcl_Obj *	Tcl_NewListObj(int objc, Tcl_Obj *const objv[]);
 /* 55 */
 EXTERN Tcl_Obj *	Tcl_NewObj(void);
 /* 56 */
-EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, size_t length);
+EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, Tcl_Size length);
 /* Slot 57 is reserved */
 /* 58 */
 EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr,
-				size_t length);
+				Tcl_Size numBytes);
 /* 59 */
 EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
-				const unsigned char *bytes, size_t length);
+				const unsigned char *bytes,
+				Tcl_Size numBytes);
 /* 60 */
 EXTERN void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
 /* Slot 61 is reserved */
@@ -206,10 +208,10 @@ EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, int objc,
 				Tcl_Obj *const objv[]);
 /* Slot 63 is reserved */
 /* 64 */
-EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, size_t length);
+EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, Tcl_Size length);
 /* 65 */
 EXTERN void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
-				size_t length);
+				Tcl_Size length);
 /* Slot 66 is reserved */
 /* Slot 67 is reserved */
 /* 68 */
@@ -248,11 +250,11 @@ EXTERN int		Tcl_CommandComplete(const char *cmd);
 /* 83 */
 EXTERN char *		Tcl_Concat(int argc, const char *const *argv);
 /* 84 */
-EXTERN size_t		Tcl_ConvertElement(const char *src, char *dst,
+EXTERN Tcl_Size		Tcl_ConvertElement(const char *src, char *dst,
 				int flags);
 /* 85 */
-EXTERN size_t		Tcl_ConvertCountedElement(const char *src,
-				size_t length, char *dst, int flags);
+EXTERN Tcl_Size		Tcl_ConvertCountedElement(const char *src,
+				Tcl_Size length, char *dst, int flags);
 /* 86 */
 EXTERN int		Tcl_CreateAlias(Tcl_Interp *childInterp,
 				const char *childCmd, Tcl_Interp *target,
@@ -348,7 +350,7 @@ EXTERN int		Tcl_DoOneEvent(int flags);
 EXTERN void		Tcl_DoWhenIdle(Tcl_IdleProc *proc, void *clientData);
 /* 117 */
 EXTERN char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
-				const char *bytes, size_t length);
+				const char *bytes, Tcl_Size length);
 /* 118 */
 EXTERN char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
 				const char *element);
@@ -366,7 +368,7 @@ EXTERN void		Tcl_DStringResult(Tcl_Interp *interp,
 				Tcl_DString *dsPtr);
 /* 124 */
 EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr,
-				size_t length);
+				Tcl_Size length);
 /* 125 */
 EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
 /* 126 */
@@ -483,9 +485,9 @@ EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
 /* 168 */
 EXTERN Tcl_PathType	Tcl_GetPathType(const char *path);
 /* 169 */
-EXTERN size_t		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
+EXTERN Tcl_Size		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
 /* 170 */
-EXTERN size_t		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+EXTERN Tcl_Size		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 171 */
 EXTERN int		Tcl_GetServiceMode(void);
 /* 172 */
@@ -571,8 +573,8 @@ EXTERN const char *	Tcl_PosixError(Tcl_Interp *interp);
 EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr,
 				Tcl_QueuePosition position);
 /* 206 */
-EXTERN size_t		Tcl_Read(Tcl_Channel chan, char *bufPtr,
-				size_t toRead);
+EXTERN Tcl_Size		Tcl_Read(Tcl_Channel chan, char *bufPtr,
+				Tcl_Size toRead);
 /* 207 */
 EXTERN void		Tcl_ReapDetachedProcs(void);
 /* 208 */
@@ -596,17 +598,17 @@ EXTERN int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
 EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
 				const char *pattern);
 /* 215 */
-EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, size_t index,
+EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, Tcl_Size index,
 				const char **startPtr, const char **endPtr);
 /* 216 */
 EXTERN void		Tcl_Release(void *clientData);
 /* 217 */
 EXTERN void		Tcl_ResetResult(Tcl_Interp *interp);
 /* 218 */
-EXTERN size_t		Tcl_ScanElement(const char *src, int *flagPtr);
+EXTERN Tcl_Size		Tcl_ScanElement(const char *src, int *flagPtr);
 /* 219 */
-EXTERN size_t		Tcl_ScanCountedElement(const char *src,
-				size_t length, int *flagPtr);
+EXTERN Tcl_Size		Tcl_ScanCountedElement(const char *src,
+				Tcl_Size length, int *flagPtr);
 /* Slot 220 is reserved */
 /* 221 */
 EXTERN int		Tcl_ServiceAll(void);
@@ -676,8 +678,8 @@ EXTERN int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
 EXTERN char *		Tcl_TranslateFileName(Tcl_Interp *interp,
 				const char *name, Tcl_DString *bufferPtr);
 /* 250 */
-EXTERN size_t		Tcl_Ungets(Tcl_Channel chan, const char *str,
-				size_t len, int atHead);
+EXTERN Tcl_Size		Tcl_Ungets(Tcl_Channel chan, const char *str,
+				Tcl_Size len, int atHead);
 /* 251 */
 EXTERN void		Tcl_UnlinkVar(Tcl_Interp *interp,
 				const char *varName);
@@ -711,8 +713,8 @@ EXTERN void *		Tcl_VarTraceInfo2(Tcl_Interp *interp,
 				int flags, Tcl_VarTraceProc *procPtr,
 				void *prevClientData);
 /* 263 */
-EXTERN size_t		Tcl_Write(Tcl_Channel chan, const char *s,
-				size_t slen);
+EXTERN Tcl_Size		Tcl_Write(Tcl_Channel chan, const char *s,
+				Tcl_Size slen);
 /* 264 */
 EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], const char *message);
@@ -771,7 +773,7 @@ EXTERN void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
 /* Slot 290 is reserved */
 /* 291 */
 EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
-				size_t numBytes, int flags);
+				Tcl_Size numBytes, int flags);
 /* 292 */
 EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], int flags);
@@ -783,13 +785,13 @@ EXTERN TCL_NORETURN void Tcl_ExitThread(int status);
 /* 295 */
 EXTERN int		Tcl_ExternalToUtf(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
-				size_t srcLen, int flags,
+				Tcl_Size srcLen, int flags,
 				Tcl_EncodingState *statePtr, char *dst,
-				size_t dstLen, int *srcReadPtr,
+				Tcl_Size dstLen, int *srcReadPtr,
 				int *dstWrotePtr, int *dstCharsPtr);
 /* 296 */
 EXTERN char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
-				const char *src, size_t srcLen,
+				const char *src, Tcl_Size srcLen,
 				Tcl_DString *dsPtr);
 /* 297 */
 EXTERN void		Tcl_FinalizeThread(void);
@@ -808,11 +810,11 @@ EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
 /* 304 */
 EXTERN int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const void *tablePtr,
-				size_t offset, const char *msg, int flags,
+				Tcl_Size offset, const char *msg, int flags,
 				int *indexPtr);
 /* 305 */
 EXTERN void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
-				size_t size);
+				Tcl_Size size);
 /* 306 */
 EXTERN Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
 				const char *part2, int flags);
@@ -828,10 +830,10 @@ EXTERN void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
 EXTERN void		Tcl_ConditionWait(Tcl_Condition *condPtr,
 				Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr);
 /* 312 */
-EXTERN size_t		Tcl_NumUtfChars(const char *src, size_t length);
+EXTERN Tcl_Size		Tcl_NumUtfChars(const char *src, Tcl_Size length);
 /* 313 */
-EXTERN size_t		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
-				size_t charsToRead, int appendFlag);
+EXTERN Tcl_Size		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+				Tcl_Size charsToRead, int appendFlag);
 /* Slot 314 is reserved */
 /* Slot 315 is reserved */
 /* 316 */
@@ -847,7 +849,7 @@ EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
 EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
 				Tcl_Event *evPtr, Tcl_QueuePosition position);
 /* 320 */
-EXTERN int		Tcl_UniCharAtIndex(const char *src, size_t index);
+EXTERN int		Tcl_UniCharAtIndex(const char *src, Tcl_Size index);
 /* 321 */
 EXTERN int		Tcl_UniCharToLower(int ch);
 /* 322 */
@@ -857,11 +859,11 @@ EXTERN int		Tcl_UniCharToUpper(int ch);
 /* 324 */
 EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
 /* 325 */
-EXTERN const char *	Tcl_UtfAtIndex(const char *src, size_t index);
+EXTERN const char *	Tcl_UtfAtIndex(const char *src, Tcl_Size index);
 /* 326 */
-EXTERN int		TclUtfCharComplete(const char *src, size_t length);
+EXTERN int		TclUtfCharComplete(const char *src, Tcl_Size length);
 /* 327 */
-EXTERN size_t		Tcl_UtfBackslash(const char *src, int *readPtr,
+EXTERN Tcl_Size		Tcl_UtfBackslash(const char *src, int *readPtr,
 				char *dst);
 /* 328 */
 EXTERN const char *	Tcl_UtfFindFirst(const char *src, int ch);
@@ -874,13 +876,13 @@ EXTERN const char *	TclUtfPrev(const char *src, const char *start);
 /* 332 */
 EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
-				size_t srcLen, int flags,
+				Tcl_Size srcLen, int flags,
 				Tcl_EncodingState *statePtr, char *dst,
-				size_t dstLen, int *srcReadPtr,
+				Tcl_Size dstLen, int *srcReadPtr,
 				int *dstWrotePtr, int *dstCharsPtr);
 /* 333 */
 EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
-				const char *src, size_t srcLen,
+				const char *src, Tcl_Size srcLen,
 				Tcl_DString *dsPtr);
 /* 334 */
 EXTERN int		Tcl_UtfToLower(char *src);
@@ -892,10 +894,10 @@ EXTERN int		Tcl_UtfToChar16(const char *src,
 /* 337 */
 EXTERN int		Tcl_UtfToUpper(char *src);
 /* 338 */
-EXTERN size_t		Tcl_WriteChars(Tcl_Channel chan, const char *src,
-				size_t srcLen);
+EXTERN Tcl_Size		Tcl_WriteChars(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
 /* 339 */
-EXTERN size_t		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+EXTERN Tcl_Size		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 340 */
 EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
 /* Slot 341 is reserved */
@@ -922,10 +924,10 @@ EXTERN int		Tcl_UniCharIsWordChar(int ch);
 /* Slot 353 is reserved */
 /* 354 */
 EXTERN char *		Tcl_Char16ToUtfDString(const unsigned short *uniStr,
-				size_t uniLength, Tcl_DString *dsPtr);
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
 /* 355 */
 EXTERN unsigned short *	 Tcl_UtfToChar16DString(const char *src,
-				size_t length, Tcl_DString *dsPtr);
+				Tcl_Size length, Tcl_DString *dsPtr);
 /* 356 */
 EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
 				Tcl_Obj *patObj, int flags);
@@ -935,27 +937,27 @@ EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
 /* 359 */
 EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
 				const char *script, const char *command,
-				size_t length);
+				Tcl_Size length);
 /* 360 */
 EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
-				const char *start, size_t numBytes,
+				const char *start, Tcl_Size numBytes,
 				Tcl_Parse *parsePtr, int append,
 				const char **termPtr);
 /* 361 */
 EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
-				const char *start, size_t numBytes,
+				const char *start, Tcl_Size numBytes,
 				int nested, Tcl_Parse *parsePtr);
 /* 362 */
 EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
-				size_t numBytes, Tcl_Parse *parsePtr);
+				Tcl_Size numBytes, Tcl_Parse *parsePtr);
 /* 363 */
 EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
-				const char *start, size_t numBytes,
+				const char *start, Tcl_Size numBytes,
 				Tcl_Parse *parsePtr, int append,
 				const char **termPtr);
 /* 364 */
 EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
-				const char *start, size_t numBytes,
+				const char *start, Tcl_Size numBytes,
 				Tcl_Parse *parsePtr, int append);
 /* 365 */
 EXTERN char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
@@ -984,24 +986,26 @@ EXTERN int		Tcl_UniCharIsPunct(int ch);
 /* 376 */
 EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
 				Tcl_RegExp regexp, Tcl_Obj *textObj,
-				size_t offset, size_t nmatches, int flags);
+				Tcl_Size offset, Tcl_Size nmatches,
+				int flags);
 /* 377 */
 EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
 				Tcl_RegExpInfo *infoPtr);
 /* 378 */
 EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const Tcl_UniChar *unicode,
-				size_t numChars);
+				Tcl_Size numChars);
 /* 379 */
 EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
-				const Tcl_UniChar *unicode, size_t numChars);
+				const Tcl_UniChar *unicode,
+				Tcl_Size numChars);
 /* 380 */
-EXTERN size_t		Tcl_GetCharLength(Tcl_Obj *objPtr);
+EXTERN Tcl_Size		Tcl_GetCharLength(Tcl_Obj *objPtr);
 /* 381 */
-EXTERN int		Tcl_GetUniChar(Tcl_Obj *objPtr, size_t index);
+EXTERN int		Tcl_GetUniChar(Tcl_Obj *objPtr, Tcl_Size index);
 /* Slot 382 is reserved */
 /* 383 */
-EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, size_t first,
-				size_t last);
+EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, Tcl_Size first,
+				Tcl_Size last);
 /* Slot 384 is reserved */
 /* 385 */
 EXTERN int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
@@ -1025,13 +1029,13 @@ EXTERN void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
 /* 393 */
 EXTERN int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
 				Tcl_ThreadCreateProc *proc, void *clientData,
-				size_t stackSize, int flags);
+				Tcl_Size stackSize, int flags);
 /* 394 */
-EXTERN size_t		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
-				size_t bytesToRead);
+EXTERN Tcl_Size		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
+				Tcl_Size bytesToRead);
 /* 395 */
-EXTERN size_t		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
-				size_t srcLen);
+EXTERN Tcl_Size		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
 /* 396 */
 EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
 /* 397 */
@@ -1111,18 +1115,18 @@ EXTERN void		Tcl_UntraceCommand(Tcl_Interp *interp,
 				const char *varName, int flags,
 				Tcl_CommandTraceProc *proc, void *clientData);
 /* 428 */
-EXTERN void *		Tcl_AttemptAlloc(size_t size);
+EXTERN void *		Tcl_AttemptAlloc(Tcl_Size size);
 /* 429 */
-EXTERN void *		Tcl_AttemptDbCkalloc(size_t size, const char *file,
+EXTERN void *		Tcl_AttemptDbCkalloc(Tcl_Size size, const char *file,
 				int line);
 /* 430 */
-EXTERN void *		Tcl_AttemptRealloc(void *ptr, size_t size);
+EXTERN void *		Tcl_AttemptRealloc(void *ptr, Tcl_Size size);
 /* 431 */
-EXTERN void *		Tcl_AttemptDbCkrealloc(void *ptr, size_t size,
+EXTERN void *		Tcl_AttemptDbCkrealloc(void *ptr, Tcl_Size size,
 				const char *file, int line);
 /* 432 */
 EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr,
-				size_t length);
+				Tcl_Size length);
 /* 433 */
 EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
 /* 434 */
@@ -1248,7 +1252,7 @@ EXTERN int		Tcl_OutputBuffered(Tcl_Channel chan);
 EXTERN void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
 /* 481 */
 EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
-				Tcl_Token *tokenPtr, size_t count);
+				Tcl_Token *tokenPtr, Tcl_Size count);
 /* 482 */
 EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
 /* 483 */
@@ -1518,8 +1522,8 @@ EXTERN void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
 /* 575 */
 EXTERN void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
-				const char *bytes, size_t length,
-				size_t limit, const char *ellipsis);
+				const char *bytes, Tcl_Size length,
+				Tcl_Size limit, const char *ellipsis);
 /* 576 */
 EXTERN Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
 				int objc, Tcl_Obj *const objv[]);
@@ -1618,14 +1622,14 @@ EXTERN int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
 				Tcl_Obj *gzipHeaderDictObj);
 /* 611 */
 EXTERN int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
-				Tcl_Obj *data, size_t buffersize,
+				Tcl_Obj *data, Tcl_Size buffersize,
 				Tcl_Obj *gzipHeaderDictObj);
 /* 612 */
 EXTERN unsigned int	Tcl_ZlibCRC32(unsigned int crc,
-				const unsigned char *buf, size_t len);
+				const unsigned char *buf, Tcl_Size len);
 /* 613 */
 EXTERN unsigned int	Tcl_ZlibAdler32(unsigned int adler,
-				const unsigned char *buf, size_t len);
+				const unsigned char *buf, Tcl_Size len);
 /* 614 */
 EXTERN int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
 				int format, int level, Tcl_Obj *dictObj,
@@ -1641,7 +1645,7 @@ EXTERN int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
 				Tcl_Obj *data, int flush);
 /* 619 */
 EXTERN int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
-				Tcl_Obj *data, size_t count);
+				Tcl_Obj *data, Tcl_Size count);
 /* 620 */
 EXTERN int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
 /* 621 */
@@ -1697,7 +1701,7 @@ EXTERN int		TclZipfs_MountBuffer(Tcl_Interp *interp,
 EXTERN void		Tcl_FreeInternalRep(Tcl_Obj *objPtr);
 /* 637 */
 EXTERN char *		Tcl_InitStringRep(Tcl_Obj *objPtr, const char *bytes,
-				size_t numBytes);
+				Tcl_Size numBytes);
 /* 638 */
 EXTERN Tcl_ObjInternalRep * Tcl_FetchInternalRep(Tcl_Obj *objPtr,
 				const Tcl_ObjType *typePtr);
@@ -1716,25 +1720,25 @@ EXTERN int		Tcl_IsShared(Tcl_Obj *objPtr);
 /* 644 */
 EXTERN int		Tcl_LinkArray(Tcl_Interp *interp,
 				const char *varName, void *addr, int type,
-				size_t size);
+				Tcl_Size size);
 /* 645 */
 EXTERN int		Tcl_GetIntForIndex(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, size_t endValue,
-				size_t *indexPtr);
+				Tcl_Obj *objPtr, Tcl_Size endValue,
+				Tcl_Size *indexPtr);
 /* 646 */
 EXTERN int		Tcl_UtfToUniChar(const char *src, int *chPtr);
 /* 647 */
 EXTERN char *		Tcl_UniCharToUtfDString(const int *uniStr,
-				size_t uniLength, Tcl_DString *dsPtr);
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
 /* 648 */
 EXTERN int *		Tcl_UtfToUniCharDString(const char *src,
-				size_t length, Tcl_DString *dsPtr);
+				Tcl_Size length, Tcl_DString *dsPtr);
 /* 649 */
 EXTERN unsigned char *	TclGetBytesFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int *lengthPtr);
+				Tcl_Obj *objPtr, int *numBytesPtr);
 /* 650 */
 EXTERN unsigned char *	Tcl_GetBytesFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, size_t *lengthPtr);
+				Tcl_Obj *objPtr, size_t *numBytesPtr);
 /* 651 */
 EXTERN char *		Tcl_GetStringFromObj(Tcl_Obj *objPtr,
 				size_t *lengthPtr);
@@ -1743,9 +1747,9 @@ EXTERN Tcl_UniChar *	Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr,
 				size_t *lengthPtr);
 /* 653 */
 EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
-				size_t *lengthPtr);
+				size_t *numBytesPtr);
 /* 654 */
-EXTERN int		Tcl_UtfCharComplete(const char *src, size_t length);
+EXTERN int		Tcl_UtfCharComplete(const char *src, Tcl_Size length);
 /* 655 */
 EXTERN const char *	Tcl_UtfNext(const char *src);
 /* 656 */
@@ -1771,12 +1775,12 @@ typedef struct TclStubs {
     int (*tcl_PkgProvideEx) (Tcl_Interp *interp, const char *name, const char *version, const void *clientData); /* 0 */
     const char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, const char *name, const char *version, int exact, void *clientDataPtr); /* 1 */
     TCL_NORETURN1 void (*tcl_Panic) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 2 */
-    void * (*tcl_Alloc) (size_t size); /* 3 */
+    void * (*tcl_Alloc) (Tcl_Size size); /* 3 */
     void (*tcl_Free) (void *ptr); /* 4 */
-    void * (*tcl_Realloc) (void *ptr, size_t size); /* 5 */
-    void * (*tcl_DbCkalloc) (size_t size, const char *file, int line); /* 6 */
+    void * (*tcl_Realloc) (void *ptr, Tcl_Size size); /* 5 */
+    void * (*tcl_DbCkalloc) (Tcl_Size size, const char *file, int line); /* 6 */
     void (*tcl_DbCkfree) (void *ptr, const char *file, int line); /* 7 */
-    void * (*tcl_DbCkrealloc) (void *ptr, size_t size, const char *file, int line); /* 8 */
+    void * (*tcl_DbCkrealloc) (void *ptr, Tcl_Size size, const char *file, int line); /* 8 */
     void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, void *clientData); /* 9 */
     void (*tcl_DeleteFileHandler) (int fd); /* 10 */
     void (*tcl_SetTimer) (const Tcl_Time *timePtr); /* 11 */
@@ -1784,19 +1788,19 @@ typedef struct TclStubs {
     int (*tcl_WaitForEvent) (const Tcl_Time *timePtr); /* 13 */
     int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */
     void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */
-    void (*tcl_AppendToObj) (Tcl_Obj *objPtr, const char *bytes, size_t length); /* 16 */
+    void (*tcl_AppendToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 16 */
     Tcl_Obj * (*tcl_ConcatObj) (int objc, Tcl_Obj *const objv[]); /* 17 */
     int (*tcl_ConvertToType) (Tcl_Interp *interp, Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 18 */
     void (*tcl_DbDecrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 19 */
     void (*tcl_DbIncrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 20 */
     int (*tcl_DbIsShared) (Tcl_Obj *objPtr, const char *file, int line); /* 21 */
     void (*reserved22)(void);
-    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char *bytes, size_t length, const char *file, int line); /* 23 */
+    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes, const char *file, int line); /* 23 */
     Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, const char *file, int line); /* 24 */
     Tcl_Obj * (*tcl_DbNewListObj) (int objc, Tcl_Obj *const *objv, const char *file, int line); /* 25 */
     void (*reserved26)(void);
     Tcl_Obj * (*tcl_DbNewObj) (const char *file, int line); /* 27 */
-    Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, size_t length, const char *file, int line); /* 28 */
+    Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, Tcl_Size length, const char *file, int line); /* 28 */
     Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
     void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
     int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *boolPtr); /* 31 */
@@ -1818,22 +1822,22 @@ typedef struct TclStubs {
     int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr); /* 47 */
     int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, int first, int count, int objc, Tcl_Obj *const objv[]); /* 48 */
     void (*reserved49)(void);
-    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, size_t length); /* 50 */
+    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes); /* 50 */
     Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
     void (*reserved52)(void);
     Tcl_Obj * (*tcl_NewListObj) (int objc, Tcl_Obj *const objv[]); /* 53 */
     void (*reserved54)(void);
     Tcl_Obj * (*tcl_NewObj) (void); /* 55 */
-    Tcl_Obj * (*tcl_NewStringObj) (const char *bytes, size_t length); /* 56 */
+    Tcl_Obj * (*tcl_NewStringObj) (const char *bytes, Tcl_Size length); /* 56 */
     void (*reserved57)(void);
-    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, size_t length); /* 58 */
-    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, const unsigned char *bytes, size_t length); /* 59 */
+    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, Tcl_Size numBytes); /* 58 */
+    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, const unsigned char *bytes, Tcl_Size numBytes); /* 59 */
     void (*tcl_SetDoubleObj) (Tcl_Obj *objPtr, double doubleValue); /* 60 */
     void (*reserved61)(void);
     void (*tcl_SetListObj) (Tcl_Obj *objPtr, int objc, Tcl_Obj *const objv[]); /* 62 */
     void (*reserved63)(void);
-    void (*tcl_SetObjLength) (Tcl_Obj *objPtr, size_t length); /* 64 */
-    void (*tcl_SetStringObj) (Tcl_Obj *objPtr, const char *bytes, size_t length); /* 65 */
+    void (*tcl_SetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 64 */
+    void (*tcl_SetStringObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 65 */
     void (*reserved66)(void);
     void (*reserved67)(void);
     void (*tcl_AllowExceptions) (Tcl_Interp *interp); /* 68 */
@@ -1852,8 +1856,8 @@ typedef struct TclStubs {
     void (*reserved81)(void);
     int (*tcl_CommandComplete) (const char *cmd); /* 82 */
     char * (*tcl_Concat) (int argc, const char *const *argv); /* 83 */
-    size_t (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
-    size_t (*tcl_ConvertCountedElement) (const char *src, size_t length, char *dst, int flags); /* 85 */
+    Tcl_Size (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
+    Tcl_Size (*tcl_ConvertCountedElement) (const char *src, Tcl_Size length, char *dst, int flags); /* 85 */
     int (*tcl_CreateAlias) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, int argc, const char *const *argv); /* 86 */
     int (*tcl_CreateAliasObj) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, int objc, Tcl_Obj *const objv[]); /* 87 */
     Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType *typePtr, const char *chanName, void *instanceData, int mask); /* 88 */
@@ -1885,14 +1889,14 @@ typedef struct TclStubs {
     void (*tcl_DontCallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, void *clientData); /* 114 */
     int (*tcl_DoOneEvent) (int flags); /* 115 */
     void (*tcl_DoWhenIdle) (Tcl_IdleProc *proc, void *clientData); /* 116 */
-    char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, const char *bytes, size_t length); /* 117 */
+    char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, const char *bytes, Tcl_Size length); /* 117 */
     char * (*tcl_DStringAppendElement) (Tcl_DString *dsPtr, const char *element); /* 118 */
     void (*tcl_DStringEndSublist) (Tcl_DString *dsPtr); /* 119 */
     void (*tcl_DStringFree) (Tcl_DString *dsPtr); /* 120 */
     void (*tcl_DStringGetResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 121 */
     void (*tcl_DStringInit) (Tcl_DString *dsPtr); /* 122 */
     void (*tcl_DStringResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 123 */
-    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, size_t length); /* 124 */
+    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, Tcl_Size length); /* 124 */
     void (*tcl_DStringStartSublist) (Tcl_DString *dsPtr); /* 125 */
     int (*tcl_Eof) (Tcl_Channel chan); /* 126 */
     const char * (*tcl_ErrnoId) (void); /* 127 */
@@ -1937,8 +1941,8 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */
     int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int forWriting, int checkUsage, void **filePtr); /* 167 */
     Tcl_PathType (*tcl_GetPathType) (const char *path); /* 168 */
-    size_t (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
-    size_t (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
+    Tcl_Size (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
+    Tcl_Size (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
     int (*tcl_GetServiceMode) (void); /* 171 */
     Tcl_Interp * (*tcl_GetChild) (Tcl_Interp *interp, const char *name); /* 172 */
     Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
@@ -1974,7 +1978,7 @@ typedef struct TclStubs {
     int (*tcl_PutEnv) (const char *assignment); /* 203 */
     const char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */
     void (*tcl_QueueEvent) (Tcl_Event *evPtr, Tcl_QueuePosition position); /* 205 */
-    size_t (*tcl_Read) (Tcl_Channel chan, char *bufPtr, size_t toRead); /* 206 */
+    Tcl_Size (*tcl_Read) (Tcl_Channel chan, char *bufPtr, Tcl_Size toRead); /* 206 */
     void (*tcl_ReapDetachedProcs) (void); /* 207 */
     int (*tcl_RecordAndEval) (Tcl_Interp *interp, const char *cmd, int flags); /* 208 */
     int (*tcl_RecordAndEvalObj) (Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags); /* 209 */
@@ -1983,11 +1987,11 @@ typedef struct TclStubs {
     Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp *interp, const char *pattern); /* 212 */
     int (*tcl_RegExpExec) (Tcl_Interp *interp, Tcl_RegExp regexp, const char *text, const char *start); /* 213 */
     int (*tcl_RegExpMatch) (Tcl_Interp *interp, const char *text, const char *pattern); /* 214 */
-    void (*tcl_RegExpRange) (Tcl_RegExp regexp, size_t index, const char **startPtr, const char **endPtr); /* 215 */
+    void (*tcl_RegExpRange) (Tcl_RegExp regexp, Tcl_Size index, const char **startPtr, const char **endPtr); /* 215 */
     void (*tcl_Release) (void *clientData); /* 216 */
     void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */
-    size_t (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
-    size_t (*tcl_ScanCountedElement) (const char *src, size_t length, int *flagPtr); /* 219 */
+    Tcl_Size (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
+    Tcl_Size (*tcl_ScanCountedElement) (const char *src, Tcl_Size length, int *flagPtr); /* 219 */
     void (*reserved220)(void);
     int (*tcl_ServiceAll) (void); /* 221 */
     int (*tcl_ServiceEvent) (int flags); /* 222 */
@@ -2018,7 +2022,7 @@ typedef struct TclStubs {
     void (*reserved247)(void);
     int (*tcl_TraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 248 */
     char * (*tcl_TranslateFileName) (Tcl_Interp *interp, const char *name, Tcl_DString *bufferPtr); /* 249 */
-    size_t (*tcl_Ungets) (Tcl_Channel chan, const char *str, size_t len, int atHead); /* 250 */
+    Tcl_Size (*tcl_Ungets) (Tcl_Channel chan, const char *str, Tcl_Size len, int atHead); /* 250 */
     void (*tcl_UnlinkVar) (Tcl_Interp *interp, const char *varName); /* 251 */
     int (*tcl_UnregisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 252 */
     void (*reserved253)(void);
@@ -2031,7 +2035,7 @@ typedef struct TclStubs {
     int (*tcl_VarEval) (Tcl_Interp *interp, ...); /* 260 */
     void (*reserved261)(void);
     void * (*tcl_VarTraceInfo2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *procPtr, void *prevClientData); /* 262 */
-    size_t (*tcl_Write) (Tcl_Channel chan, const char *s, size_t slen); /* 263 */
+    Tcl_Size (*tcl_Write) (Tcl_Channel chan, const char *s, Tcl_Size slen); /* 263 */
     void (*tcl_WrongNumArgs) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *message); /* 264 */
     int (*tcl_DumpActiveMemory) (const char *fileName); /* 265 */
     void (*tcl_ValidateAllMemory) (const char *file, int line); /* 266 */
@@ -2059,12 +2063,12 @@ typedef struct TclStubs {
     void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 288 */
     void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 289 */
     void (*reserved290)(void);
-    int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, size_t numBytes, int flags); /* 291 */
+    int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, Tcl_Size numBytes, int flags); /* 291 */
     int (*tcl_EvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags); /* 292 */
     int (*tcl_EvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 293 */
     TCL_NORETURN1 void (*tcl_ExitThread) (int status); /* 294 */
-    int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, size_t srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, size_t dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */
-    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char *src, size_t srcLen, Tcl_DString *dsPtr); /* 296 */
+    int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */
+    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 296 */
     void (*tcl_FinalizeThread) (void); /* 297 */
     void (*tcl_FinalizeNotifier) (void *clientData); /* 298 */
     void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */
@@ -2072,42 +2076,42 @@ typedef struct TclStubs {
     Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp *interp, const char *name); /* 301 */
     const char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
     void (*tcl_GetEncodingNames) (Tcl_Interp *interp); /* 303 */
-    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, size_t offset, const char *msg, int flags, int *indexPtr); /* 304 */
-    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, size_t size); /* 305 */
+    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, Tcl_Size offset, const char *msg, int flags, int *indexPtr); /* 304 */
+    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, Tcl_Size size); /* 305 */
     Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 306 */
     void * (*tcl_InitNotifier) (void); /* 307 */
     void (*tcl_MutexLock) (Tcl_Mutex *mutexPtr); /* 308 */
     void (*tcl_MutexUnlock) (Tcl_Mutex *mutexPtr); /* 309 */
     void (*tcl_ConditionNotify) (Tcl_Condition *condPtr); /* 310 */
     void (*tcl_ConditionWait) (Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr); /* 311 */
-    size_t (*tcl_NumUtfChars) (const char *src, size_t length); /* 312 */
-    size_t (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, size_t charsToRead, int appendFlag); /* 313 */
+    Tcl_Size (*tcl_NumUtfChars) (const char *src, Tcl_Size length); /* 312 */
+    Tcl_Size (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, Tcl_Size charsToRead, int appendFlag); /* 313 */
     void (*reserved314)(void);
     void (*reserved315)(void);
     int (*tcl_SetSystemEncoding) (Tcl_Interp *interp, const char *name); /* 316 */
     Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */
     void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
     void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event *evPtr, Tcl_QueuePosition position); /* 319 */
-    int (*tcl_UniCharAtIndex) (const char *src, size_t index); /* 320 */
+    int (*tcl_UniCharAtIndex) (const char *src, Tcl_Size index); /* 320 */
     int (*tcl_UniCharToLower) (int ch); /* 321 */
     int (*tcl_UniCharToTitle) (int ch); /* 322 */
     int (*tcl_UniCharToUpper) (int ch); /* 323 */
     int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
-    const char * (*tcl_UtfAtIndex) (const char *src, size_t index); /* 325 */
-    int (*tclUtfCharComplete) (const char *src, size_t length); /* 326 */
-    size_t (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
+    const char * (*tcl_UtfAtIndex) (const char *src, Tcl_Size index); /* 325 */
+    int (*tclUtfCharComplete) (const char *src, Tcl_Size length); /* 326 */
+    Tcl_Size (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
     const char * (*tcl_UtfFindFirst) (const char *src, int ch); /* 328 */
     const char * (*tcl_UtfFindLast) (const char *src, int ch); /* 329 */
     const char * (*tclUtfNext) (const char *src); /* 330 */
     const char * (*tclUtfPrev) (const char *src, const char *start); /* 331 */
-    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, size_t srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, size_t dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
-    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, size_t srcLen, Tcl_DString *dsPtr); /* 333 */
+    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
+    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 333 */
     int (*tcl_UtfToLower) (char *src); /* 334 */
     int (*tcl_UtfToTitle) (char *src); /* 335 */
     int (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
     int (*tcl_UtfToUpper) (char *src); /* 337 */
-    size_t (*tcl_WriteChars) (Tcl_Channel chan, const char *src, size_t srcLen); /* 338 */
-    size_t (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
+    Tcl_Size (*tcl_WriteChars) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 338 */
+    Tcl_Size (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
     char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
     void (*reserved341)(void);
     void (*reserved342)(void);
@@ -2122,17 +2126,17 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsWordChar) (int ch); /* 351 */
     void (*reserved352)(void);
     void (*reserved353)(void);
-    char * (*tcl_Char16ToUtfDString) (const unsigned short *uniStr, size_t uniLength, Tcl_DString *dsPtr); /* 354 */
-    unsigned short * (*tcl_UtfToChar16DString) (const char *src, size_t length, Tcl_DString *dsPtr); /* 355 */
+    char * (*tcl_Char16ToUtfDString) (const unsigned short *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 354 */
+    unsigned short * (*tcl_UtfToChar16DString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 355 */
     Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp *interp, Tcl_Obj *patObj, int flags); /* 356 */
     void (*reserved357)(void);
     void (*tcl_FreeParse) (Tcl_Parse *parsePtr); /* 358 */
-    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, size_t length); /* 359 */
-    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, size_t numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 360 */
-    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, size_t numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
-    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, size_t numBytes, Tcl_Parse *parsePtr); /* 362 */
-    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, size_t numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 363 */
-    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, size_t numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
+    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, Tcl_Size length); /* 359 */
+    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 360 */
+    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
+    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr); /* 362 */
+    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 363 */
+    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
     char * (*tcl_GetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 365 */
     int (*tcl_Chdir) (const char *dirName); /* 366 */
     int (*tcl_Access) (const char *path, int mode); /* 367 */
@@ -2144,14 +2148,14 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsGraph) (int ch); /* 373 */
     int (*tcl_UniCharIsPrint) (int ch); /* 374 */
     int (*tcl_UniCharIsPunct) (int ch); /* 375 */
-    int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, size_t offset, size_t nmatches, int flags); /* 376 */
+    int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, Tcl_Size offset, Tcl_Size nmatches, int flags); /* 376 */
     void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr); /* 377 */
-    Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar *unicode, size_t numChars); /* 378 */
-    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, size_t numChars); /* 379 */
-    size_t (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
-    int (*tcl_GetUniChar) (Tcl_Obj *objPtr, size_t index); /* 381 */
+    Tcl_Obj * (*tcl_NewUnicodeObj) (const Tcl_UniChar *unicode, Tcl_Size numChars); /* 378 */
+    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const Tcl_UniChar *unicode, Tcl_Size numChars); /* 379 */
+    Tcl_Size (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
+    int (*tcl_GetUniChar) (Tcl_Obj *objPtr, Tcl_Size index); /* 381 */
     void (*reserved382)(void);
-    Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, size_t first, size_t last); /* 383 */
+    Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last); /* 383 */
     void (*reserved384)(void);
     int (*tcl_RegExpMatchObj) (Tcl_Interp *interp, Tcl_Obj *textObj, Tcl_Obj *patternObj); /* 385 */
     void (*tcl_SetNotifier) (Tcl_NotifierProcs *notifierProcPtr); /* 386 */
@@ -2161,9 +2165,9 @@ typedef struct TclStubs {
     int (*tcl_ProcObjCmd) (void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 390 */
     void (*tcl_ConditionFinalize) (Tcl_Condition *condPtr); /* 391 */
     void (*tcl_MutexFinalize) (Tcl_Mutex *mutex); /* 392 */
-    int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc, void *clientData, size_t stackSize, int flags); /* 393 */
-    size_t (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, size_t bytesToRead); /* 394 */
-    size_t (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, size_t srcLen); /* 395 */
+    int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc, void *clientData, Tcl_Size stackSize, int flags); /* 393 */
+    Tcl_Size (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, Tcl_Size bytesToRead); /* 394 */
+    Tcl_Size (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 395 */
     Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */
     int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */
     const char * (*tcl_ChannelName) (const Tcl_ChannelType *chanTypePtr); /* 398 */
@@ -2196,11 +2200,11 @@ typedef struct TclStubs {
     void * (*tcl_CommandTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *procPtr, void *prevClientData); /* 425 */
     int (*tcl_TraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, void *clientData); /* 426 */
     void (*tcl_UntraceCommand) (Tcl_Interp *interp, const char *varName, int flags, Tcl_CommandTraceProc *proc, void *clientData); /* 427 */
-    void * (*tcl_AttemptAlloc) (size_t size); /* 428 */
-    void * (*tcl_AttemptDbCkalloc) (size_t size, const char *file, int line); /* 429 */
-    void * (*tcl_AttemptRealloc) (void *ptr, size_t size); /* 430 */
-    void * (*tcl_AttemptDbCkrealloc) (void *ptr, size_t size, const char *file, int line); /* 431 */
-    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, size_t length); /* 432 */
+    void * (*tcl_AttemptAlloc) (Tcl_Size size); /* 428 */
+    void * (*tcl_AttemptDbCkalloc) (Tcl_Size size, const char *file, int line); /* 429 */
+    void * (*tcl_AttemptRealloc) (void *ptr, Tcl_Size size); /* 430 */
+    void * (*tcl_AttemptDbCkrealloc) (void *ptr, Tcl_Size size, const char *file, int line); /* 431 */
+    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 432 */
     Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
     Tcl_UniChar * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */
     void (*reserved435)(void);
@@ -2249,7 +2253,7 @@ typedef struct TclStubs {
     Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj *pathPtr); /* 478 */
     int (*tcl_OutputBuffered) (Tcl_Channel chan); /* 479 */
     void (*tcl_FSMountsChanged) (const Tcl_Filesystem *fsPtr); /* 480 */
-    int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, size_t count); /* 481 */
+    int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Size count); /* 481 */
     void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */
     Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
     int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */
@@ -2343,7 +2347,7 @@ typedef struct TclStubs {
     const char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString *bufPtr); /* 572 */
     int (*tcl_PkgRequireProc) (Tcl_Interp *interp, const char *name, int objc, Tcl_Obj *const objv[], void *clientDataPtr); /* 573 */
     void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */
-    void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, const char *bytes, size_t length, size_t limit, const char *ellipsis); /* 575 */
+    void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length, Tcl_Size limit, const char *ellipsis); /* 575 */
     Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, const char *format, int objc, Tcl_Obj *const objv[]); /* 576 */
     int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *format, int objc, Tcl_Obj *const objv[]); /* 577 */
     Tcl_Obj * (*tcl_ObjPrintf) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 578 */
@@ -2379,15 +2383,15 @@ typedef struct TclStubs {
     int (*tcl_InterpActive) (Tcl_Interp *interp); /* 608 */
     void (*tcl_BackgroundException) (Tcl_Interp *interp, int code); /* 609 */
     int (*tcl_ZlibDeflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, int level, Tcl_Obj *gzipHeaderDictObj); /* 610 */
-    int (*tcl_ZlibInflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, size_t buffersize, Tcl_Obj *gzipHeaderDictObj); /* 611 */
-    unsigned int (*tcl_ZlibCRC32) (unsigned int crc, const unsigned char *buf, size_t len); /* 612 */
-    unsigned int (*tcl_ZlibAdler32) (unsigned int adler, const unsigned char *buf, size_t len); /* 613 */
+    int (*tcl_ZlibInflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, Tcl_Size buffersize, Tcl_Obj *gzipHeaderDictObj); /* 611 */
+    unsigned int (*tcl_ZlibCRC32) (unsigned int crc, const unsigned char *buf, Tcl_Size len); /* 612 */
+    unsigned int (*tcl_ZlibAdler32) (unsigned int adler, const unsigned char *buf, Tcl_Size len); /* 613 */
     int (*tcl_ZlibStreamInit) (Tcl_Interp *interp, int mode, int format, int level, Tcl_Obj *dictObj, Tcl_ZlibStream *zshandle); /* 614 */
     Tcl_Obj * (*tcl_ZlibStreamGetCommandName) (Tcl_ZlibStream zshandle); /* 615 */
     int (*tcl_ZlibStreamEof) (Tcl_ZlibStream zshandle); /* 616 */
     int (*tcl_ZlibStreamChecksum) (Tcl_ZlibStream zshandle); /* 617 */
     int (*tcl_ZlibStreamPut) (Tcl_ZlibStream zshandle, Tcl_Obj *data, int flush); /* 618 */
-    int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj *data, size_t count); /* 619 */
+    int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj *data, Tcl_Size count); /* 619 */
     int (*tcl_ZlibStreamClose) (Tcl_ZlibStream zshandle); /* 620 */
     int (*tcl_ZlibStreamReset) (Tcl_ZlibStream zshandle); /* 621 */
     void (*tcl_SetStartupScript) (Tcl_Obj *path, const char *encoding); /* 622 */
@@ -2405,24 +2409,24 @@ typedef struct TclStubs {
     Tcl_Obj * (*tclZipfs_TclLibrary) (void); /* 634 */
     int (*tclZipfs_MountBuffer) (Tcl_Interp *interp, const char *mountPoint, unsigned char *data, size_t datalen, int copy); /* 635 */
     void (*tcl_FreeInternalRep) (Tcl_Obj *objPtr); /* 636 */
-    char * (*tcl_InitStringRep) (Tcl_Obj *objPtr, const char *bytes, size_t numBytes); /* 637 */
+    char * (*tcl_InitStringRep) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size numBytes); /* 637 */
     Tcl_ObjInternalRep * (*tcl_FetchInternalRep) (Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 638 */
     void (*tcl_StoreInternalRep) (Tcl_Obj *objPtr, const Tcl_ObjType *typePtr, const Tcl_ObjInternalRep *irPtr); /* 639 */
     int (*tcl_HasStringRep) (Tcl_Obj *objPtr); /* 640 */
     void (*tcl_IncrRefCount) (Tcl_Obj *objPtr); /* 641 */
     void (*tcl_DecrRefCount) (Tcl_Obj *objPtr); /* 642 */
     int (*tcl_IsShared) (Tcl_Obj *objPtr); /* 643 */
-    int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, size_t size); /* 644 */
-    int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, size_t endValue, size_t *indexPtr); /* 645 */
+    int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, Tcl_Size size); /* 644 */
+    int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size endValue, Tcl_Size *indexPtr); /* 645 */
     int (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
-    char * (*tcl_UniCharToUtfDString) (const int *uniStr, size_t uniLength, Tcl_DString *dsPtr); /* 647 */
-    int * (*tcl_UtfToUniCharDString) (const char *src, size_t length, Tcl_DString *dsPtr); /* 648 */
-    unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *lengthPtr); /* 649 */
-    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, size_t *lengthPtr); /* 650 */
+    char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
+    int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
+    unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
+    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, size_t *numBytesPtr); /* 650 */
     char * (*tcl_GetStringFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */
     Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */
-    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 653 */
-    int (*tcl_UtfCharComplete) (const char *src, size_t length); /* 654 */
+    unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, size_t *numBytesPtr); /* 653 */
+    int (*tcl_UtfCharComplete) (const char *src, Tcl_Size length); /* 654 */
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
     int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 871a2d3..bcaff5e 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -63,7 +63,7 @@ extern "C" {
 EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				Tcl_Interp *interp, const char *bundleName,
 				const char *bundleVersion,
-				int hasResourceFile, size_t maxPathLen,
+				int hasResourceFile, Tcl_Size maxPathLen,
 				char *libraryPath);
 /* 2 */
 EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
@@ -76,7 +76,7 @@ typedef struct TclPlatStubs {
     void *hooks;
 
     void (*reserved0)(void);
-    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, size_t maxPathLen, char *libraryPath); /* 1 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
     void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
     void (*tcl_WinConvertError) (unsigned errCode); /* 3 */
 } TclPlatStubs;
-- 
cgit v0.12


From e3074edc8ab3d499540f736d2beebe02d46200aa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 22 Feb 2022 21:01:20 +0000
Subject: TIP #618: New Tcl_GetBool* functions with INDEX_NULL_OK flag

---
 doc/BoolObj.3         | 13 ++++++++---
 doc/GetIndex.3        |  4 ++--
 generic/tcl.decls     | 13 +++++++++--
 generic/tcl.h         |  4 ++--
 generic/tclCmdMZ.c    |  2 +-
 generic/tclDecls.h    | 61 +++++++++++++++++++++++++++++++++++++++++++++++----
 generic/tclExecute.c  |  8 +++----
 generic/tclGet.c      | 23 ++++++++++++++++---
 generic/tclIndexObj.c |  8 +++----
 generic/tclInt.h      |  4 ++--
 generic/tclObj.c      | 57 ++++++++++++++++++++++++++++++++++++++---------
 generic/tclStubInit.c |  9 ++++++++
 generic/tclTest.c     | 15 +++++++------
 tests/indexObj.test   |  4 ++--
 14 files changed, 179 insertions(+), 46 deletions(-)

diff --git a/doc/BoolObj.3 b/doc/BoolObj.3
index 9bbdc7e..afbd1d1 100644
--- a/doc/BoolObj.3
+++ b/doc/BoolObj.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_NewBooleanObj, Tcl_SetBooleanObj, Tcl_GetBooleanFromObj \- store/retrieve boolean value in a Tcl_Obj
+Tcl_NewBooleanObj, Tcl_SetBooleanObj, Tcl_GetBooleanFromObj, Tcl_GetBoolFromObj \- store/retrieve boolean value in a Tcl_Obj
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -21,6 +21,9 @@ Tcl_Obj *
 .sp
 int
 \fBTcl_GetBooleanFromObj\fR(\fIinterp, objPtr, boolPtr\fR)
+.sp
+int
+\fBTcl_GetBoolFromObj\fR(\fIinterp, objPtr, flags. boolPtr\fR)
 .SH ARGUMENTS
 .AS Tcl_Interp boolValue in/out
 .AP int boolValue in
@@ -32,9 +35,13 @@ retrieve a boolean value.
 If a boolean value cannot be retrieved,
 an error message is left in the interpreter's result value
 unless \fIinterp\fR is NULL.
-.AP int *boolPtr out
-Points to place where \fBTcl_GetBooleanFromObj\fR
+.AP int | short | char *boolPtr out
+Points to place where \fBTcl_GetBooleanFromObj\fR/\fBTcl_GetBoolFromObj\fR
 stores the boolean value (0 or 1) obtained from \fIobjPtr\fR.
+.AP int flags in
+Value 0 or TCL_NULL_OK. If TCL_NULL_OK, then the empty
+string or NULL will result in \fBTcl_GetBoolFromObj\fR return
+TCL_OK, the *boolPtr filled with the value -1;
 .BE
 
 .SH DESCRIPTION
diff --git a/doc/GetIndex.3 b/doc/GetIndex.3
index 1169c6c..176b0b2 100644
--- a/doc/GetIndex.3
+++ b/doc/GetIndex.3
@@ -54,7 +54,7 @@ Null-terminated string describing what is being looked up, such as
 .AP int flags in
 OR-ed combination of bits providing additional information for
 operation.  The only bits that are currently defined are \fBTCL_EXACT\fR
-, \fBTCL_INDEX_TEMP_TABLE\fR, and \fBTCL_INDEX_NULL_OK\fR.
+, \fBTCL_INDEX_TEMP_TABLE\fR, and \fBTCL_NULL_OK\fR.
 .AP enum|char|short|int|long *indexPtr out
 If not (int *)NULL, the index of the string in \fItablePtr\fR that
 matches the value of \fIobjPtr\fR is returned here. The variable can
@@ -93,7 +93,7 @@ operation.  Note: \fBTcl_GetIndexFromObj\fR assumes that the entries
 in \fItablePtr\fR are static: they must not change between
 invocations.  This caching mechanism can be disallowed by specifying
 the \fBTCL_INDEX_TEMP_TABLE\fR flag.
-If the \fBTCL_INDEX_NULL_OK\fR flag was specified, objPtr is allowed
+If the \fBTCL_NULL_OK\fR flag was specified, objPtr is allowed
 to be NULL or the empty string. The resulting index is -1.
 Otherwise, if the value of \fIobjPtr\fR is the empty string,
 \fBTcl_GetIndexFromObj\fR will treat it as a non-matching value
diff --git a/generic/tcl.decls b/generic/tcl.decls
index c137a88..4d630ca 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -136,11 +136,11 @@ declare 30 {
     void TclFreeObj(Tcl_Obj *objPtr)
 }
 declare 31 {
-    int Tcl_GetBoolean(Tcl_Interp *interp, const char *src, int *boolPtr)
+    int Tcl_GetBoolean(Tcl_Interp *interp, const char *src, void *boolPtr)
 }
 declare 32 {
     int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    int *boolPtr)
+	    void *boolPtr)
 }
 declare 33 {
     unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, int *numBytesPtr)
@@ -2442,6 +2442,15 @@ declare 660 {
     int Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async, int sigNumber)
 }
 
+declare 668 {
+    int Tcl_GetBool(Tcl_Interp *interp, const char *src, int flags,
+	    void *boolPtr)
+}
+declare 669 {
+    int Tcl_GetBoolFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+	    int flags, void *boolPtr)
+}
+
 # ----- BASELINE -- FOR -- 8.7.0 ----- #
 
 ##############################################################################
diff --git a/generic/tcl.h b/generic/tcl.h
index b82cf0a..560d441 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -979,13 +979,13 @@ typedef struct Tcl_DString {
  * TCL_EXACT disallows abbreviated strings.
  * TCL_INDEX_TEMP_TABLE disallows caching of lookups. A possible use case is
  *      a table that will not live long enough to make it worthwhile.
- * TCL_INDEX_NULL_OK allows the empty string or NULL to return TCL_OK.
+ * TCL_NULL_OK allows the empty string or NULL to return TCL_OK.
  *      The returned value will be -1;
  */
 
 #define TCL_EXACT		1
 #define TCL_INDEX_TEMP_TABLE	2
-#define TCL_INDEX_NULL_OK	4
+#define TCL_NULL_OK		32
 
 /*
  *----------------------------------------------------------------------------
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index f394035..6b991eb 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1620,7 +1620,7 @@ StringIsCmd(
 		result = length1 == 0;
 	    }
 	} else if (index != STR_IS_BOOL) {
-	    TclGetBooleanFromObj(NULL, objPtr, &i);
+	    TclGetBoolFromObj(NULL, objPtr, 0, &i);
 	    if ((index == STR_IS_TRUE) ^ i) {
 		result = 0;
 	    }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index b5697ea..da28cb7 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -146,10 +146,10 @@ EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
 EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
 /* 31 */
 EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
-				int *boolPtr);
+				void *boolPtr);
 /* 32 */
 EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int *boolPtr);
+				Tcl_Obj *objPtr, void *boolPtr);
 /* 33 */
 EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
 				int *numBytesPtr);
@@ -1948,6 +1948,19 @@ EXTERN int		Tcl_UniCharIsUnicode(int ch);
 /* 660 */
 EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
 				int sigNumber);
+/* Slot 661 is reserved */
+/* Slot 662 is reserved */
+/* Slot 663 is reserved */
+/* Slot 664 is reserved */
+/* Slot 665 is reserved */
+/* Slot 666 is reserved */
+/* Slot 667 is reserved */
+/* 668 */
+EXTERN int		Tcl_GetBool(Tcl_Interp *interp, const char *src,
+				int flags, void *boolPtr);
+/* 669 */
+EXTERN int		Tcl_GetBoolFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, int flags, void *boolPtr);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2006,8 +2019,8 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, int length, const char *file, int line); /* 28 */
     Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
     void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
-    int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *boolPtr); /* 31 */
-    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *boolPtr); /* 32 */
+    int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, void *boolPtr); /* 31 */
+    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void *boolPtr); /* 32 */
     unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *numBytesPtr); /* 33 */
     int (*tcl_GetDouble) (Tcl_Interp *interp, const char *src, double *doublePtr); /* 34 */
     int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
@@ -2644,6 +2657,15 @@ typedef struct TclStubs {
     void (*reserved658)(void);
     void (*reserved659)(void);
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
+    void (*reserved661)(void);
+    void (*reserved662)(void);
+    void (*reserved663)(void);
+    void (*reserved664)(void);
+    void (*reserved665)(void);
+    void (*reserved666)(void);
+    void (*reserved667)(void);
+    int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, void *boolPtr); /* 668 */
+    int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, void *boolPtr); /* 669 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -3994,6 +4016,17 @@ extern const TclStubs *tclStubsPtr;
 /* Slot 659 is reserved */
 #define Tcl_AsyncMarkFromSignal \
 	(tclStubsPtr->tcl_AsyncMarkFromSignal) /* 660 */
+/* Slot 661 is reserved */
+/* Slot 662 is reserved */
+/* Slot 663 is reserved */
+/* Slot 664 is reserved */
+/* Slot 665 is reserved */
+/* Slot 666 is reserved */
+/* Slot 667 is reserved */
+#define Tcl_GetBool \
+	(tclStubsPtr->tcl_GetBool) /* 668 */
+#define Tcl_GetBoolFromObj \
+	(tclStubsPtr->tcl_GetBoolFromObj) /* 669 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
@@ -4210,6 +4243,10 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetUnicodeFromObj(objPtr, (int *)NULL)
 #undef Tcl_GetBytesFromObj
 #undef Tcl_GetIndexFromObjStruct
+#undef Tcl_GetBoolFromObj
+#undef Tcl_GetBool
+#undef Tcl_GetBooleanFromObj
+#undef Tcl_GetBoolean
 #ifdef TCL_NO_DEPRECATED
 #undef Tcl_GetStringFromObj
 #undef Tcl_GetUnicodeFromObj
@@ -4220,6 +4257,14 @@ extern const TclStubs *tclStubsPtr;
 	(sizeof(*sizePtr) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)sizePtr) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)sizePtr))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*indexPtr)<<8), (indexPtr)))
+#define Tcl_GetBoolFromObj(interp, objPtr, flags, boolPtr) \
+	(tclStubsPtr->tcl_GetBoolFromObj((interp), (objPtr), (flags)|(int)(sizeof(*boolPtr)<<8), (boolPtr)))
+#define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
+	(tclStubsPtr->tcl_GetBool((interp), (objPtr), (flags)|(int)(sizeof(*boolPtr)<<8), (boolPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*boolPtr) == sizeof(int) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)boolPtr) : Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(sizeof(*boolPtr) == sizeof(int) ? tclStubsPtr->tcl_GetBoolean(interp, src, (int *)boolPtr) : Tcl_GetBool(interp, src, 0, boolPtr))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*sizePtr) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)sizePtr) : tclStubsPtr->tclGetStringFromObj(objPtr, (size_t *)sizePtr))
@@ -4233,6 +4278,14 @@ extern const TclStubs *tclStubsPtr;
 	(sizeof(*sizePtr) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)sizePtr) : (Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)sizePtr))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*indexPtr)<<8), (indexPtr)))
+#define Tcl_GetBoolFromObj(interp, objPtr, flags, boolPtr) \
+	((Tcl_GetBoolFromObj)((interp), (objPtr), (flags)|(int)(sizeof(*boolPtr)<<8), (boolPtr)))
+#define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
+	((Tcl_GetBool)((interp), (objPtr), (flags)|(int)(sizeof(*boolPtr)<<8), (boolPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*boolPtr) == sizeof(int) ? (Tcl_GetBooleanFromObj)(interp, objPtr, (int *)boolPtr) : Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(sizeof(*boolPtr) == sizeof(int) ? (Tcl_GetBoolean)(interp, src, (int *)boolPtr) : Tcl_GetBool(interp, src, 0, boolPtr))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*sizePtr) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)sizePtr) : (TclGetStringFromObj)(objPtr, (size_t *)sizePtr))
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index dfb195a..2c4cde4 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4346,7 +4346,7 @@ TEBCresume(
 
 	/* TODO - check claim that taking address of b harms performance */
 	/* TODO - consider optimization search for constants */
-	if (TclGetBooleanFromObj(interp, valuePtr, &b) != TCL_OK) {
+	if (TclGetBoolFromObj(interp, valuePtr, 0, &b) != TCL_OK) {
 	    TRACE_ERROR(interp);
 	    goto gotError;
 	}
@@ -4414,7 +4414,7 @@ TEBCresume(
 
 	value2Ptr = OBJ_AT_TOS;
 	valuePtr = OBJ_UNDER_TOS;
-	if (TclGetBooleanFromObj(NULL, valuePtr, &i1) != TCL_OK) {
+	if (TclGetBoolFromObj(NULL, valuePtr, 0, &i1) != TCL_OK) {
 	    TRACE(("\"%.20s\" => ILLEGAL TYPE %s \n", O2S(valuePtr),
 		    (valuePtr->typePtr? valuePtr->typePtr->name : "null")));
 	    DECACHE_STACK_INFO();
@@ -4423,7 +4423,7 @@ TEBCresume(
 	    goto gotError;
 	}
 
-	if (TclGetBooleanFromObj(NULL, value2Ptr, &i2) != TCL_OK) {
+	if (TclGetBoolFromObj(NULL, value2Ptr, 0, &i2) != TCL_OK) {
 	    TRACE(("\"%.20s\" => ILLEGAL TYPE %s \n", O2S(value2Ptr),
 		    (value2Ptr->typePtr? value2Ptr->typePtr->name : "null")));
 	    DECACHE_STACK_INFO();
@@ -6222,7 +6222,7 @@ TEBCresume(
 
 	/* TODO - check claim that taking address of b harms performance */
 	/* TODO - consider optimization search for constants */
-	if (TclGetBooleanFromObj(NULL, valuePtr, &b) != TCL_OK) {
+	if (TclGetBoolFromObj(NULL, valuePtr, 0, &b) != TCL_OK) {
 	    TRACE(("\"%.20s\" => ERROR: illegal type %s\n", O2S(valuePtr),
 		    (valuePtr->typePtr? valuePtr->typePtr->name : "null")));
 	    DECACHE_STACK_INFO();
diff --git a/generic/tclGet.c b/generic/tclGet.c
index 970e093..1beac24 100644
--- a/generic/tclGet.c
+++ b/generic/tclGet.c
@@ -121,17 +121,22 @@ Tcl_GetDouble(
  *----------------------------------------------------------------------
  */
 
+#undef Tcl_GetBool
 int
-Tcl_GetBoolean(
+Tcl_GetBool(
     Tcl_Interp *interp,		/* Interpreter used for error reporting. */
     const char *src,		/* String containing one of the boolean values
 				 * 1, 0, true, false, yes, no, on, off. */
-    int *boolPtr)		/* Place to store converted result, which will
+    int flags,
+    void *boolPtr)		/* Place to store converted result, which will
 				 * be 0 or 1. */
 {
     Tcl_Obj obj;
     int code;
 
+    if (((src == NULL) || (*src == '\0')) && (flags & TCL_NULL_OK)) {
+	return (Tcl_GetBoolFromObj)(NULL, NULL, flags, boolPtr);
+    }
     obj.refCount = 1;
     obj.bytes = (char *) src;
     obj.length = strlen(src);
@@ -142,10 +147,22 @@ Tcl_GetBoolean(
 	Tcl_Panic("invalid sharing of Tcl_Obj on C stack");
     }
     if (code == TCL_OK) {
-	TclGetBooleanFromObj(NULL, &obj, boolPtr);
+	(Tcl_GetBoolFromObj)(NULL, &obj, flags, boolPtr);
     }
     return code;
 }
+
+#undef Tcl_GetBoolean
+int
+Tcl_GetBoolean(
+    Tcl_Interp *interp,		/* Interpreter used for error reporting. */
+    const char *src,		/* String containing one of the boolean values
+				 * 1, 0, true, false, yes, no, on, off. */
+    void *boolPtr)		/* Place to store converted result, which will
+				 * be 0 or 1. */
+{
+    return Tcl_GetBool(interp, src, 0, boolPtr);
+}
 
 /*
  * Local Variables:
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 1f600c5..f5e3958 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -263,7 +263,7 @@ Tcl_GetIndexFromObjStruct(
     int offset,			/* The number of bytes between entries */
     const char *msg,		/* Identifying word to use in error
 				 * messages. */
-    int flags,			/* 0, TCL_EXACT, TCL_INDEX_TEMP_TABLE or TCL_INDEX_NULL_OK */
+    int flags,			/* 0, TCL_EXACT, TCL_INDEX_TEMP_TABLE or TCL_NULL_OK */
     void *indexPtr)		/* Place to store resulting index. */
 {
     int index, idx, numAbbrev;
@@ -304,7 +304,7 @@ Tcl_GetIndexFromObjStruct(
     index = -1;
     numAbbrev = 0;
 
-    if (!*key && (flags & TCL_INDEX_NULL_OK)) {
+    if (!*key && (flags & TCL_NULL_OK)) {
 	goto uncachedDone;
     }
     /*
@@ -411,7 +411,7 @@ Tcl_GetIndexFromObjStruct(
 		    *entryPtr, NULL);
 	    entryPtr = NEXT_ENTRY(entryPtr, offset);
 	    while (*entryPtr != NULL) {
-		if ((*NEXT_ENTRY(entryPtr, offset) == NULL) && !(flags & TCL_INDEX_NULL_OK)) {
+		if ((*NEXT_ENTRY(entryPtr, offset) == NULL) && !(flags & TCL_NULL_OK)) {
 		    Tcl_AppendStringsToObj(resultPtr, (count > 0 ? "," : ""),
 			    " or ", *entryPtr, NULL);
 		} else if (**entryPtr) {
@@ -420,7 +420,7 @@ Tcl_GetIndexFromObjStruct(
 		}
 		entryPtr = NEXT_ENTRY(entryPtr, offset);
 	    }
-	    if ((flags & TCL_INDEX_NULL_OK)) {
+	    if ((flags & TCL_NULL_OK)) {
 		Tcl_AppendStringsToObj(resultPtr, ", or \"\"", NULL);
 	    }
 	}
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 75cd6e5..25593b2 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2504,12 +2504,12 @@ typedef struct List {
  * WARNING: these macros eval their args more than once.
  */
 
-#define TclGetBooleanFromObj(interp, objPtr, boolPtr) \
+#define TclGetBoolFromObj(interp, objPtr, flags, boolPtr) \
     (((objPtr)->typePtr == &tclIntType)			\
 	? (*(boolPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
 	: ((objPtr)->typePtr == &tclBooleanType)			\
 	? (*(boolPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
-	: Tcl_GetBooleanFromObj((interp), (objPtr), (boolPtr)))
+	: Tcl_GetBoolFromObj((interp), (objPtr), (flags), (boolPtr)))
 
 #ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetLongFromObj(interp, objPtr, longPtr) \
diff --git a/generic/tclObj.c b/generic/tclObj.c
index a06b8fd..636f8e0 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2139,7 +2139,7 @@ Tcl_SetBooleanObj(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_GetBooleanFromObj --
+ * Tcl_GetBoolFromObj, Tcl_GetBooleanFromObj --
  *
  *	Attempt to return a boolean from the Tcl object "objPtr". This
  *	includes conversion from any of Tcl's numeric types.
@@ -2155,20 +2155,28 @@ Tcl_SetBooleanObj(
  *----------------------------------------------------------------------
  */
 
+#undef Tcl_GetBoolFromObj
 int
-Tcl_GetBooleanFromObj(
+Tcl_GetBoolFromObj(
     Tcl_Interp *interp,         /* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr,	/* The object from which to get boolean. */
-    int *boolPtr)	/* Place to store resulting boolean. */
+    int flags,
+    void *boolPtr)	/* Place to store resulting boolean. */
 {
+    int result;
+
+    if ((flags & TCL_NULL_OK) && (objPtr == NULL || Tcl_GetString(objPtr)[0] == '\0')) {
+	result = -1;
+	goto boolEnd;
+    }
     do {
 	if (objPtr->typePtr == &tclIntType) {
-	    *boolPtr = (objPtr->internalRep.wideValue != 0);
-	    return TCL_OK;
+	    result = (objPtr->internalRep.wideValue != 0);
+	    goto boolEnd;
 	}
 	if (objPtr->typePtr == &tclBooleanType) {
-	    *boolPtr = objPtr->internalRep.longValue != 0;
-	    return TCL_OK;
+	    result = objPtr->internalRep.longValue != 0;
+	    goto boolEnd;
 	}
 	if (objPtr->typePtr == &tclDoubleType) {
 	    /*
@@ -2184,11 +2192,30 @@ Tcl_GetBooleanFromObj(
 	    if (Tcl_GetDoubleFromObj(interp, objPtr, &d) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    *boolPtr = (d != 0.0);
-	    return TCL_OK;
+	    result = (d != 0.0);
+	    goto boolEnd;
 	}
 	if (objPtr->typePtr == &tclBignumType) {
-	    *boolPtr = 1;
+	    result = 1;
+	boolEnd:
+	    if (boolPtr != NULL) {
+		if ((flags>>8) & (int)~sizeof(int)) {
+		    if ((flags>>8) == sizeof(uint64_t)) {
+			*(uint64_t *)boolPtr = result;
+			return TCL_OK;
+		    } else if ((flags>>8) == sizeof(uint32_t)) {
+			*(uint32_t *)boolPtr = result;
+			return TCL_OK;
+		    } else if ((flags>>8) == sizeof(uint16_t)) {
+			*(uint16_t *)boolPtr = result;
+			return TCL_OK;
+		    } else if ((flags>>8) == sizeof(uint8_t)) {
+			*(uint8_t *)boolPtr = result;
+			return TCL_OK;
+		}
+		}
+		*(int *)boolPtr = result;
+	    }
 	    return TCL_OK;
 	}
     } while ((ParseBoolean(objPtr) == TCL_OK) || (TCL_OK ==
@@ -2196,6 +2223,16 @@ Tcl_GetBooleanFromObj(
     return TCL_ERROR;
 }
 
+#undef Tcl_GetBooleanFromObj
+int
+Tcl_GetBooleanFromObj(
+    Tcl_Interp *interp,         /* Used for error reporting if not NULL. */
+    Tcl_Obj *objPtr,	/* The object from which to get boolean. */
+    void *boolPtr)	/* Place to store resulting boolean. */
+{
+    return Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr);
+}
+
 /*
  *----------------------------------------------------------------------
  *
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index a1878c1..ff2b296 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1944,6 +1944,15 @@ const TclStubs tclStubs = {
     0, /* 658 */
     0, /* 659 */
     Tcl_AsyncMarkFromSignal, /* 660 */
+    0, /* 661 */
+    0, /* 662 */
+    0, /* 663 */
+    0, /* 664 */
+    0, /* 665 */
+    0, /* 666 */
+    0, /* 667 */
+    Tcl_GetBool, /* 668 */
+    Tcl_GetBoolFromObj, /* 669 */
 };
 
 /* !END!: Do not edit above this line. */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 009c95f..97fd57f 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2174,7 +2174,7 @@ TesteventProc(
     Tcl_Obj *command = ev->command;
     int result = Tcl_EvalObjEx(interp, command,
 	    TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
-    int retval;
+    char retval[3];
 
     if (result != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
@@ -2183,18 +2183,18 @@ TesteventProc(
 	return 1;		/* Avoid looping on errors */
     }
     if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
-	    &retval) != TCL_OK) {
+	    &retval[1]) != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
 		"    (return value from \"testevent\" callback)");
 	Tcl_BackgroundException(interp, TCL_ERROR);
 	return 1;
     }
-    if (retval) {
+    if (retval[1]) {
 	Tcl_DecrRefCount(ev->tag);
 	Tcl_DecrRefCount(ev->command);
     }
 
-    return retval;
+    return retval[1];
 }
 
 /*
@@ -5188,7 +5188,8 @@ TestsaveresultCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     Interp* iPtr = (Interp*) interp;
-    int discard, result, index;
+    int result, index;
+    short discard[3];
     Tcl_SavedResult state;
     Tcl_Obj *objPtr;
     static const char *const optionStrings[] = {
@@ -5210,7 +5211,7 @@ TestsaveresultCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (Tcl_GetBooleanFromObj(interp, objv[3], &discard) != TCL_OK) {
+    if (Tcl_GetBooleanFromObj(interp, objv[3], &discard[1]) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -5247,7 +5248,7 @@ TestsaveresultCmd(
 	result = Tcl_EvalEx(interp, Tcl_GetString(objv[2]), -1, 0);
     }
 
-    if (discard) {
+    if (discard[1]) {
 	Tcl_DiscardResult(&state);
     } else {
 	Tcl_RestoreResult(interp, &state);
diff --git a/tests/indexObj.test b/tests/indexObj.test
index c327274..f10bd2a 100644
--- a/tests/indexObj.test
+++ b/tests/indexObj.test
@@ -142,8 +142,8 @@ test indexObj-6.6 {Tcl_GetIndexFromObjStruct with NULL input} -constraints testi
 } -returnCodes error -result {ambiguous dummy "": must be a, c, or ee}
 test indexObj-6.7 {Tcl_GetIndexFromObjStruct} testindexobj {
     set x ""
-    testgetindexfromobjstruct $x -1 4
-} "wrong # args: should be \"testgetindexfromobjstruct {} -1 4\""
+    testgetindexfromobjstruct $x -1 32
+} "wrong # args: should be \"testgetindexfromobjstruct {} -1 32\""
 
 test indexObj-7.1 {Tcl_ParseArgsObjv} testparseargs {
     testparseargs
-- 
cgit v0.12


From b488f3edf6ee202281aca13745c0d4212310f654 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 Mar 2022 13:05:38 +0000
Subject: TIP #619 implementation. tests not working yet

---
 generic/tcl.h         |  7 +++++++
 generic/tclCmdMZ.c    |  2 ++
 generic/tclDecls.h    |  8 ++++++++
 generic/tclEncoding.c | 21 ++++++++++++---------
 generic/tclParse.c    |  7 ++++---
 generic/tclUtf.c      | 18 +++++++++++++++---
 tests/utf.test        |  6 +++---
 7 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 6b69929..8778203 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -835,6 +835,13 @@ typedef struct Tcl_DString {
 #define TCL_INDEX_NULL_OK	4
 
 /*
+ * Flags that may be passed to Tcl_UniCharToUtf.
+ * TCL_COMBINE Combine surrogates
+ */
+
+#define TCL_COMBINE		0x200000
+
+/*
  *----------------------------------------------------------------------------
  * Flag values passed to Tcl_RecordAndEval, Tcl_EvalObj, Tcl_EvalObjv.
  * WARNING: these bit choices must not conflict with the bit choices for
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 85174ec..b50eacb 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1432,9 +1432,11 @@ StringIndexCmd(
 	    char buf[4] = "";
 
 	    end = Tcl_UniCharToUtf(ch, buf);
+#if TCL_UTF_MAX < 4
 	    if ((ch >= 0xD800) && (end < 3)) {
 		end += Tcl_UniCharToUtf(-1, buf + end);
 	    }
+#endif
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, end));
 	}
     }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 9205401..d073edd 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3919,6 +3919,14 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_UtfToUniChar Tcl_UtfToChar16
 #   undef Tcl_UniCharLen
 #   define Tcl_UniCharLen Tcl_Char16Len
+#   undef Tcl_UniCharToUtf
+#   if defined(USE_TCL_STUBS)
+#	define Tcl_UniCharToUtf(c, p) \
+		(tclStubsPtr->tcl_UniCharToUtf((c)|TCL_COMBINE, (p)))
+#   else
+#	define Tcl_UniCharToUtf(c, p) \
+		((Tcl_UniCharToUtf)((c)|TCL_COMBINE, (p)))
+#   endif
 #endif
 #if defined(USE_TCL_STUBS)
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 3a6385f..765f98b 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2228,7 +2228,6 @@ UtfToUtfProc(
 	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else {
-	    int low;
 	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
 	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_STOPONERROR)
@@ -2246,13 +2245,20 @@ UtfToUtfProc(
 		    *dst++ = (char) (((ch >> 10) & 0x3F) | 0x80);
 		    ch = (ch & 0x0CFF) | 0xDC00;
 		}
-		goto cesu8;
+#if TCL_UTF_MAX < 4
+	    cesu8:
+#endif
+		*dst++ = (char) (((ch >> 12) | 0xE0) & 0xEF);
+		*dst++ = (char) (((ch >> 6) | 0x80) & 0xBF);
+		*dst++ = (char) ((ch | 0x80) & 0xBF);
+		continue;
+#if TCL_UTF_MAX < 4
 	    } else if ((ch | 0x7FF) == 0xDFFF) {
 		/*
 		 * A surrogate character is detected, handle especially.
 		 */
 
-		low = ch;
+		int low = ch;
 		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;
 
 		if (((low & ~0x3FF) != 0xDC00) || (ch & 0x400)) {
@@ -2261,15 +2267,12 @@ UtfToUtfProc(
 			src = saveSrc;
 			break;
 		    }
-		cesu8:
-		    *dst++ = (char) (((ch >> 12) | 0xE0) & 0xEF);
-		    *dst++ = (char) (((ch >> 6) | 0x80) & 0xBF);
-		    *dst++ = (char) ((ch | 0x80) & 0xBF);
-		    continue;
+		    goto cesu8;
 		}
 		src += len;
 		dst += Tcl_UniCharToUtf(ch, dst);
 		ch = low;
+#endif
 	    } else if (!Tcl_UniCharIsUnicode(ch)) {
 		if (flags & TCL_ENCODING_STOPONERROR) {
 		    result = TCL_CONVERT_UNKNOWN;
@@ -2578,7 +2581,7 @@ Utf16ToUtfProc(
 	if (ch && ch < 0x80) {
 	    *dst++ = (ch & 0xFF);
 	} else {
-	    dst += Tcl_UniCharToUtf(ch, dst);
+	    dst += Tcl_UniCharToUtf(ch | TCL_COMBINE, dst);
 	}
 	src += sizeof(unsigned short);
     }
diff --git a/generic/tclParse.c b/generic/tclParse.c
index 614401f..fdd1478 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -869,6 +869,7 @@ TclParseBackslash(
 	     * No hexdigits -> This is just "u".
 	     */
 	    result = 'u';
+#if TCL_UTF_MAX < 4
 	} else if (((result & 0xFC00) == 0xD800) && (count == 6)
 		    && (p[5] == '\\') && (p[6] == 'u') && (numBytes >= 10)) {
 	    /* If high surrogate is immediately followed by a low surrogate
@@ -879,6 +880,7 @@ TclParseBackslash(
 		result = ((result & 0x3FF)<<10 | (low & 0x3FF)) + 0x10000;
 		count += count2 + 2;
 	    }
+#endif
 	}
 	break;
     case 'U':
@@ -888,9 +890,6 @@ TclParseBackslash(
 	     * No hexdigits -> This is just "U".
 	     */
 	    result = 'U';
-	} else if ((result | 0x7FF) == 0xDFFF) {
-	    /* Upper or lower surrogate, not allowed in this syntax. */
-	    result = 0xFFFD;
 	}
 	break;
     case '\n':
@@ -954,10 +953,12 @@ TclParseBackslash(
 	*readPtr = count;
     }
     count = Tcl_UniCharToUtf(result, dst);
+#if TCL_UTF_MAX < 4
     if ((result >= 0xD800) && (count < 3)) {
 	/* Special case for handling high surrogates. */
 	count += Tcl_UniCharToUtf(-1, dst + count);
     }
+#endif
     return count;
 }
 
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index e353b7f..a04e41c 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -208,15 +208,23 @@ Invalid(
  *---------------------------------------------------------------------------
  */
 
+#undef Tcl_UniCharToUtf
 int
 Tcl_UniCharToUtf(
     int ch,			/* The Tcl_UniChar to be stored in the
-				 * buffer. */
+				 * buffer. Can be or'ed with flag TCL_COMBINE */
     char *buf)			/* Buffer in which the UTF-8 representation of
 				 * the Tcl_UniChar is stored. Buffer must be
 				 * large enough to hold the UTF-8 character
 				 * (at most 4 bytes). */
 {
+#if TCL_UTF_MAX > 3
+    int flags = ch;
+#endif
+
+    if (ch >= TCL_COMBINE) {
+	ch &= (TCL_COMBINE - 1);
+    }
     if ((unsigned)(ch - 1) < (UNICODE_SELF - 1)) {
 	buf[0] = (char) ch;
 	return 1;
@@ -228,7 +236,11 @@ Tcl_UniCharToUtf(
 	    return 2;
 	}
 	if (ch <= 0xFFFF) {
-	    if ((ch & 0xF800) == 0xD800) {
+	    if (
+#if TCL_UTF_MAX > 3
+		    (flags & TCL_COMBINE) &&
+#endif
+		    ((ch & 0xF800) == 0xD800)) {
 		if (ch & 0x0400) {
 		    /* Low surrogate */
 		    if (((buf[0] & 0xC0) == 0x80) && ((buf[1] & 0xCF) == 0)) {
@@ -377,7 +389,7 @@ Tcl_Char16ToUtfDString(
 	    /* Special case for handling high surrogates. */
 	    p += Tcl_UniCharToUtf(-1, p);
 	}
-	len = Tcl_UniCharToUtf(*w, p);
+	len = Tcl_UniCharToUtf(*w | TCL_COMBINE, p);
 	p += len;
 	if ((*w >= 0xD800) && (len < 3)) {
 	    len = 0; /* Indication that high surrogate was found */
diff --git a/tests/utf.test b/tests/utf.test
index 09599b6..f094a23 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -78,11 +78,11 @@ test utf-1.11 {Tcl_UniCharToUtf: 3 byte sequence, low surrogate} testbytestring
 test utf-1.12 {Tcl_UniCharToUtf: 4 byte sequence, high/low surrogate} {pairsTo4bytes testbytestring} {
     expr {"\uD842\uDC42" eq [testbytestring \xF0\xA0\xA1\x82]}
 } 1
-test utf-1.13.0 {Tcl_UniCharToUtf: Invalid surrogate} {Uesc ucs2} {
+test utf-1.13.0 {Tcl_UniCharToUtf: Invalid surrogate} {Uesc} {
     expr {"\UD842" eq "\uD842"}
 } 1
-test utf-1.13.1 {Tcl_UniCharToUtf: Invalid surrogate} {fullutf testbytestring} {
-    expr {"\UD842" eq [testbytestring \xEF\xBF\xBD]}
+test utf-1.13.1 {Tcl_UniCharToUtf: Invalid surrogate} {testbytestring} {
+    expr {"\UD842" eq [testbytestring \xED\xA1\x82]}
 } 1
 test utf-1.14 {Tcl_UniCharToUtf: surrogate pairs from concat} {
     set lo \uDE02
-- 
cgit v0.12


From e9e4041670725dbaa04756d51351bb717a17fa46 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 31 Mar 2022 07:20:00 +0000
Subject: Minor change in utf.test

---
 tests/utf.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utf.test b/tests/utf.test
index f094a23..389bbce 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -81,7 +81,7 @@ test utf-1.12 {Tcl_UniCharToUtf: 4 byte sequence, high/low surrogate} {pairsTo4b
 test utf-1.13.0 {Tcl_UniCharToUtf: Invalid surrogate} {Uesc} {
     expr {"\UD842" eq "\uD842"}
 } 1
-test utf-1.13.1 {Tcl_UniCharToUtf: Invalid surrogate} {testbytestring} {
+test utf-1.13.1 {Tcl_UniCharToUtf: Invalid surrogate} {fullutf testbytestring} {
     expr {"\UD842" eq [testbytestring \xED\xA1\x82]}
 } 1
 test utf-1.14 {Tcl_UniCharToUtf: surrogate pairs from concat} {
-- 
cgit v0.12


From e9f9cac4be915b90b69b1ee6d0b72c2f57ce590d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 31 Mar 2022 09:44:20 +0000
Subject: Oops

---
 generic/tclStringObj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index f1dc0f5..47b532d 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -70,7 +70,7 @@ static void		SetUnicodeObj(Tcl_Obj *objPtr,
 static size_t		UnicodeLength(const Tcl_UniChar *unicode);
 static void		UpdateStringOfString(Tcl_Obj *objPtr);
 
-#if TCL+UTF_MAX > 3
+#if TCL_UTF_MAX > 3
 #define ISCONTINUATION(bytes) (\
 	((bytes)[0] & 0xC0) == 0x80)
 #else
-- 
cgit v0.12


From e0f543167d530ab16a23c67931db48f52c6a8ef3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 31 Mar 2022 10:08:13 +0000
Subject: Final tweaks in testcases

---
 tests/encoding.test | 10 +++++-----
 tests/utf.test      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index dfe844f..99ea70c 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -340,13 +340,13 @@ test encoding-15.3 {UtfToUtfProc null character input} teststringbytes {
 test encoding-15.4 {UtfToUtfProc emoji character input} -body {
     set x \xED\xA0\xBD\xED\xB8\x82
     set y [encoding convertfrom -nocomplain utf-8 \xED\xA0\xBD\xED\xB8\x82]
-    list [string length $y] $y
-} -result "2 \uD83D\uDE02"
-test encoding-15.5 {UtfToUtfProc emoji character input} ucs4 {
+    list [string length $x] $y
+} -result "6 \uD83D\uDE02"
+test encoding-15.5 {UtfToUtfProc emoji character input} {
     set x \xF0\x9F\x98\x82
     set y [encoding convertfrom utf-8 \xF0\x9F\x98\x82]
-    list [string length $y] $y
-} "1 😂"
+    list [string length $x] $y
+} "4 😂"
 test encoding-15.6 {UtfToUtfProc emoji character output} ucs4 {
     set x \uDE02\uD83D\uDE02\uD83D
     set y [encoding convertto -nocomplain utf-8 \uDE02\uD83D\uDE02\uD83D]
diff --git a/tests/utf.test b/tests/utf.test
index 389bbce..4a1c063 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -78,7 +78,7 @@ test utf-1.11 {Tcl_UniCharToUtf: 3 byte sequence, low surrogate} testbytestring
 test utf-1.12 {Tcl_UniCharToUtf: 4 byte sequence, high/low surrogate} {pairsTo4bytes testbytestring} {
     expr {"\uD842\uDC42" eq [testbytestring \xF0\xA0\xA1\x82]}
 } 1
-test utf-1.13.0 {Tcl_UniCharToUtf: Invalid surrogate} {Uesc} {
+test utf-1.13.0 {Tcl_UniCharToUtf: Invalid surrogate} Uesc {
     expr {"\UD842" eq "\uD842"}
 } 1
 test utf-1.13.1 {Tcl_UniCharToUtf: Invalid surrogate} {fullutf testbytestring} {
-- 
cgit v0.12


From c9e33a6348a3521e24d190c2d8a653a70e62f0ee Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 31 Mar 2022 13:24:31 +0000
Subject: uint??_t -> int??_t

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

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 636f8e0..11a8530 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2200,17 +2200,17 @@ Tcl_GetBoolFromObj(
 	boolEnd:
 	    if (boolPtr != NULL) {
 		if ((flags>>8) & (int)~sizeof(int)) {
-		    if ((flags>>8) == sizeof(uint64_t)) {
-			*(uint64_t *)boolPtr = result;
+		    if ((flags>>8) == sizeof(int64_t)) {
+			*(int64_t *)boolPtr = result;
 			return TCL_OK;
-		    } else if ((flags>>8) == sizeof(uint32_t)) {
-			*(uint32_t *)boolPtr = result;
+		    } else if ((flags>>8) == sizeof(int32_t)) {
+			*(int32_t *)boolPtr = result;
 			return TCL_OK;
-		    } else if ((flags>>8) == sizeof(uint16_t)) {
-			*(uint16_t *)boolPtr = result;
+		    } else if ((flags>>8) == sizeof(int16_t)) {
+			*(int16_t *)boolPtr = result;
 			return TCL_OK;
-		    } else if ((flags>>8) == sizeof(uint8_t)) {
-			*(uint8_t *)boolPtr = result;
+		    } else if ((flags>>8) == sizeof(int8_t)) {
+			*(int8_t *)boolPtr = result;
 			return TCL_OK;
 		}
 		}
-- 
cgit v0.12


From d78db33c23ca9fad833989314d1288dafbfd039e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 31 Mar 2022 13:37:09 +0000
Subject: Handle objPtr == NULL / interp == NULL better

---
 generic/tclObj.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 11a8530..ae20e16 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2168,6 +2168,13 @@ Tcl_GetBoolFromObj(
     if ((flags & TCL_NULL_OK) && (objPtr == NULL || Tcl_GetString(objPtr)[0] == '\0')) {
 	result = -1;
 	goto boolEnd;
+    } else if (objPtr == NULL) {
+	if (interp) {
+	    TclNewObj(objPtr);
+	    TclParseNumber(interp, objPtr, "boolean value", NULL,-1,NULL,0);
+	    Tcl_DecrRefCount(objPtr);
+	}
+	return TCL_ERROR;
     }
     do {
 	if (objPtr->typePtr == &tclIntType) {
-- 
cgit v0.12


From 9ad31cfcf31c75506cd932dfb2d637d4ff299131 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 31 Mar 2022 13:48:51 +0000
Subject: Better errpr-handling

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

diff --git a/generic/tclGet.c b/generic/tclGet.c
index 1beac24..27f3235 100644
--- a/generic/tclGet.c
+++ b/generic/tclGet.c
@@ -134,8 +134,8 @@ Tcl_GetBool(
     Tcl_Obj obj;
     int code;
 
-    if (((src == NULL) || (*src == '\0')) && (flags & TCL_NULL_OK)) {
-	return (Tcl_GetBoolFromObj)(NULL, NULL, flags, boolPtr);
+    if ((src == NULL) || (*src == '\0')) {
+	return (Tcl_GetBoolFromObj)(interp, NULL, flags, boolPtr);
     }
     obj.refCount = 1;
     obj.bytes = (char *) src;
-- 
cgit v0.12


From 05de893f6ff1e5b322d9579f183a83ad49be48df Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 1 Apr 2022 09:48:44 +0000
Subject: Fix some more testcases (involving string reverse/trim)

---
 tests/string.test | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/string.test b/tests/string.test
index 70b0e0f..8d99e88 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -34,6 +34,8 @@ testConstraint testindexobj [expr {[info commands testindexobj] ne {}}]
 testConstraint testevalex [expr {[info commands testevalex] ne {}}]
 testConstraint fullutf [expr {[string length \U010000] == 1}]
 testConstraint testbytestring   [llength [info commands testbytestring]]
+testConstraint ucs4 [expr {[testConstraint fullutf]
+		&& [string length [format %c 0x10000]] == 1}]
 
 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
@@ -1941,13 +1943,13 @@ test string-21.22.$noComp {string trimright, unicode} {
     run {string trimright "\uF602Hello world!\uF602" \uD83D\uDE02}
 } "\uF602Hello world!\uF602"
 test string-21.23.$noComp {string trim, unicode} {
-    run {string trim "\uD83D\uDE02Hello world!\uD83D\uDE02" \uD93D\uDE02}
+    run {string trim "\uD83D\uDE02Hello world!\uD83D\uDE02" \uD93D}
 } "\uD83D\uDE02Hello world!\uD83D\uDE02"
 test string-21.24.$noComp {string trimleft, unicode} {
     run {string trimleft "\uD83D\uDE02Hello world!\uD83D\uDE02" \uD93D\uDE02}
 } "\uD83D\uDE02Hello world!\uD83D\uDE02"
 test string-21.25.$noComp {string trimright, unicode} {
-    run {string trimright "\uD83D\uDE02Hello world!\uD83D\uDE02" \uD93D\uDE02}
+    run {string trimright "\uD83D\uDE02Hello world!\uD83D\uDE02" \uD93D}
 } "\uD83D\uDE02Hello world!\uD83D\uDE02"
 
 test string-22.1.$noComp {string wordstart} -body {
@@ -2111,24 +2113,24 @@ test string-24.15.$noComp {string reverse command - pure bytearray} {
     binary scan [run {tcl::string::reverse [binary format H* 010203]}] H* x
     set x
 } 030201
-test string-24.16.$noComp {string reverse command - surrogates} {
+test string-24.16.$noComp {string reverse command - surrogates} ucs4 {
     run {string reverse \u0444bulb\uD83D\uDE02}
-} \uD83D\uDE02blub\u0444
-test string-24.17.$noComp {string reverse command - surrogates} {
+} \uDE02\uD83Dblub\u0444
+test string-24.17.$noComp {string reverse command - surrogates} ucs4 {
     run {string reverse \uD83D\uDE02hello\uD83D\uDE02}
-} \uD83D\uDE02olleh\uD83D\uDE02
-test string-24.18.$noComp {string reverse command - surrogates} {
+} \uDE02\uD83Dolleh\uDE02\uD83D
+test string-24.18.$noComp {string reverse command - surrogates} ucs4 {
     set s \u0444bulb\uD83D\uDE02
     # shim shimmery ...
     string index $s 0
     run {string reverse $s}
-} \uD83D\uDE02blub\u0444
-test string-24.19.$noComp {string reverse command - surrogates} {
+} \uDE02\uD83Dblub\u0444
+test string-24.19.$noComp {string reverse command - surrogates} ucs4 {
     set s \uD83D\uDE02hello\uD83D\uDE02
     # shim shimmery ...
     string index $s 0
     run {string reverse $s}
-} \uD83D\uDE02olleh\uD83D\uDE02
+} \uDE02\uD83Dolleh\uDE02\uD83D
 
 test string-25.1.$noComp {string is list} {
     run {string is list {a b c}}
-- 
cgit v0.12


From bcedb2cdf604551b21205b0319c6876a108893e1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 3 Apr 2022 12:11:25 +0000
Subject: Add Ashok's example

---
 generic/tclTest.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 72a055e..8d2272c 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -30,6 +30,7 @@
 #endif
 #include "tclOO.h"
 #include <math.h>
+#include <stdbool.h>
 
 /*
  * Required for Testregexp*Cmd
@@ -5277,7 +5278,7 @@ TestsaveresultCmd(
 {
     Interp* iPtr = (Interp*) interp;
     int result, index;
-    short discard[3];
+    bool b[3];
     Tcl_SavedResult state;
     Tcl_Obj *objPtr;
     static const char *const optionStrings[] = {
@@ -5299,7 +5300,7 @@ TestsaveresultCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (Tcl_GetBooleanFromObj(interp, objv[3], &discard[1]) != TCL_OK) {
+    if (Tcl_GetBoolFromObj(interp, objv[3], 0, b+1) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -5336,7 +5337,7 @@ TestsaveresultCmd(
 	result = Tcl_EvalEx(interp, Tcl_GetString(objv[2]), -1, 0);
     }
 
-    if (discard[1]) {
+    if (b[1]) {
 	Tcl_DiscardResult(&state);
     } else {
 	Tcl_RestoreResult(interp, &state);
-- 
cgit v0.12


From 9b8a5d56d248638f34ad54292129773ed663c63a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 4 Apr 2022 01:42:45 +0000
Subject: Panic if Testsaveresult call to Tcl_GetBoolFromObj overwrites memory.

---
 generic/tclTest.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 8d2272c..51d3764 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -5300,11 +5300,17 @@ TestsaveresultCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (Tcl_GetBoolFromObj(interp, objv[3], 0, b+1) != TCL_OK) {
-	return TCL_ERROR;
-    }
+	b[0] = b[1] = b[2] = 100;
+	if (Tcl_GetBoolFromObj(interp, objv[3], 0, b + 1) != TCL_OK)
+	{
+		return TCL_ERROR;
+	}
+	if (b[0] != 100 || b[2] != 100) {
+		Tcl_Panic("MEMORY OVERWRITE IN Tcl_GetBoolFromObj");
+		return TCL_ERROR;
+	}
 
-    freeCount = 0;
+	freeCount = 0;
     objPtr = NULL;		/* Lint. */
     switch ((enum options) index) {
     case RESULT_SMALL:
-- 
cgit v0.12


From 706ec57375c74eee06320a7b6c722e464a10a9ae Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 15 Apr 2022 11:50:49 +0000
Subject: Use lower 5 bits of flags for sizeof(*(boolPtr))

---
 generic/tclDecls.h |  8 ++++----
 generic/tclObj.c   | 16 +++++++---------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 4b8c09a..3cfbc42 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4285,9 +4285,9 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<8), (indexPtr)))
 #define Tcl_GetBoolFromObj(interp, objPtr, flags, boolPtr) \
-	(tclStubsPtr->tcl_GetBoolFromObj((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))<<8), (boolPtr)))
+	(tclStubsPtr->tcl_GetBoolFromObj((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
-	(tclStubsPtr->tcl_GetBool((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))<<8), (boolPtr)))
+	(tclStubsPtr->tcl_GetBool((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
 	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr))
 #define Tcl_GetBoolean(interp, src, boolPtr) \
@@ -4306,9 +4306,9 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<8), (indexPtr)))
 #define Tcl_GetBoolFromObj(interp, objPtr, flags, boolPtr) \
-	((Tcl_GetBoolFromObj)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))<<8), (boolPtr)))
+	((Tcl_GetBoolFromObj)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
-	((Tcl_GetBool)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))<<8), (boolPtr)))
+	((Tcl_GetBool)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
 	(sizeof(*(boolPtr)) == sizeof(int) ? (Tcl_GetBooleanFromObj)(interp, objPtr, (int *)(boolPtr)) : Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr))
 #define Tcl_GetBoolean(interp, src, boolPtr) \
diff --git a/generic/tclObj.c b/generic/tclObj.c
index ae20e16..439e854 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2206,22 +2206,20 @@ Tcl_GetBoolFromObj(
 	    result = 1;
 	boolEnd:
 	    if (boolPtr != NULL) {
-		if ((flags>>8) & (int)~sizeof(int)) {
-		    if ((flags>>8) == sizeof(int64_t)) {
+		flags &= (TCL_NULL_OK - 1);
+		if (flags & (int)~sizeof(int8_t)) {
+		    if (flags == sizeof(int64_t)) {
 			*(int64_t *)boolPtr = result;
 			return TCL_OK;
-		    } else if ((flags>>8) == sizeof(int32_t)) {
+		    } else if (flags == sizeof(int32_t)) {
 			*(int32_t *)boolPtr = result;
 			return TCL_OK;
-		    } else if ((flags>>8) == sizeof(int16_t)) {
+		    } else if (flags == sizeof(int16_t)) {
 			*(int16_t *)boolPtr = result;
 			return TCL_OK;
-		    } else if ((flags>>8) == sizeof(int8_t)) {
-			*(int8_t *)boolPtr = result;
-			return TCL_OK;
-		}
+		    }
 		}
-		*(int *)boolPtr = result;
+		*(int8_t *)boolPtr = result;
 	    }
 	    return TCL_OK;
 	}
-- 
cgit v0.12


From 42cd1c73d2440e5f4c6c5015bc740f13d0b8decd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 15 Apr 2022 12:20:31 +0000
Subject: Restore Tcl_GetBoolenanFromObj/Tcl_GetBoolenan signatures

---
 generic/tcl.decls  |  4 ++--
 generic/tclDecls.h | 16 ++++------------
 generic/tclGet.c   |  4 ++--
 generic/tclObj.c   |  4 ++--
 generic/tclTest.c  |  4 ++--
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 883312e..a450130 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -136,11 +136,11 @@ declare 30 {
     void TclFreeObj(Tcl_Obj *objPtr)
 }
 declare 31 {
-    int Tcl_GetBoolean(Tcl_Interp *interp, const char *src, void *boolPtr)
+    int Tcl_GetBoolean(Tcl_Interp *interp, const char *src, int *boolPtr)
 }
 declare 32 {
     int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    void *boolPtr)
+	    int *boolPtr)
 }
 declare 33 {
     unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, int *numBytesPtr)
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 3cfbc42..ebaa279 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -146,10 +146,10 @@ EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
 EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
 /* 31 */
 EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, const char *src,
-				void *boolPtr);
+				int *boolPtr);
 /* 32 */
 EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, void *boolPtr);
+				Tcl_Obj *objPtr, int *boolPtr);
 /* 33 */
 EXTERN unsigned char *	Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr,
 				int *numBytesPtr);
@@ -2032,8 +2032,8 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, int length, const char *file, int line); /* 28 */
     Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
     void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
-    int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, void *boolPtr); /* 31 */
-    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void *boolPtr); /* 32 */
+    int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *boolPtr); /* 31 */
+    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *boolPtr); /* 32 */
     unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *numBytesPtr); /* 33 */
     int (*tcl_GetDouble) (Tcl_Interp *interp, const char *src, double *doublePtr); /* 34 */
     int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
@@ -4288,10 +4288,6 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_GetBoolFromObj((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
 	(tclStubsPtr->tcl_GetBool((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
-#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr))
-#define Tcl_GetBoolean(interp, src, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBoolean(interp, src, (int *)(boolPtr)) : Tcl_GetBool(interp, src, 0, boolPtr))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (size_t *)(sizePtr)))
@@ -4309,10 +4305,6 @@ extern const TclStubs *tclStubsPtr;
 	((Tcl_GetBoolFromObj)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
 	((Tcl_GetBool)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
-#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? (Tcl_GetBooleanFromObj)(interp, objPtr, (int *)(boolPtr)) : Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr))
-#define Tcl_GetBoolean(interp, src, boolPtr) \
-	(sizeof(*(boolPtr)) == sizeof(int) ? (Tcl_GetBoolean)(interp, src, (int *)(boolPtr)) : Tcl_GetBool(interp, src, 0, boolPtr))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (size_t *)(sizePtr)))
diff --git a/generic/tclGet.c b/generic/tclGet.c
index 27f3235..9a1b3c0 100644
--- a/generic/tclGet.c
+++ b/generic/tclGet.c
@@ -158,10 +158,10 @@ Tcl_GetBoolean(
     Tcl_Interp *interp,		/* Interpreter used for error reporting. */
     const char *src,		/* String containing one of the boolean values
 				 * 1, 0, true, false, yes, no, on, off. */
-    void *boolPtr)		/* Place to store converted result, which will
+    int *boolPtr)		/* Place to store converted result, which will
 				 * be 0 or 1. */
 {
-    return Tcl_GetBool(interp, src, 0, boolPtr);
+    return Tcl_GetBool(interp, src, sizeof(int), boolPtr);
 }
 
 /*
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 439e854..89b576c 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2233,9 +2233,9 @@ int
 Tcl_GetBooleanFromObj(
     Tcl_Interp *interp,         /* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr,	/* The object from which to get boolean. */
-    void *boolPtr)	/* Place to store resulting boolean. */
+    int *boolPtr)	/* Place to store resulting boolean. */
 {
-    return Tcl_GetBoolFromObj(interp, objPtr, 0, boolPtr);
+    return Tcl_GetBoolFromObj(interp, objPtr, sizeof(int), boolPtr);
 }
 
 /*
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 646987b..db25379 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2270,8 +2270,8 @@ TesteventProc(
 	Tcl_BackgroundException(interp, TCL_ERROR);
 	return 1;		/* Avoid looping on errors */
     }
-    if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
-	    &retval[1]) != TCL_OK) {
+    if (Tcl_GetBoolFromObj(interp, Tcl_GetObjResult(interp),
+	    0, &retval[1]) != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
 		"    (return value from \"testevent\" callback)");
 	Tcl_BackgroundException(interp, TCL_ERROR);
-- 
cgit v0.12


From 757c9098818f6fa4cb48fa8e522e767d6c0dde4d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 15 Apr 2022 12:27:39 +0000
Subject: Remove macro's for Tcl_GetBoolFromObj/Tcl_GetBool

---
 generic/tclDecls.h | 12 ------------
 generic/tclTest.c  |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index ebaa279..790af99 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4270,10 +4270,6 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetUnicodeFromObj(objPtr, (int *)NULL)
 #undef Tcl_GetBytesFromObj
 #undef Tcl_GetIndexFromObjStruct
-#undef Tcl_GetBoolFromObj
-#undef Tcl_GetBool
-#undef Tcl_GetBooleanFromObj
-#undef Tcl_GetBoolean
 #ifdef TCL_NO_DEPRECATED
 #undef Tcl_GetStringFromObj
 #undef Tcl_GetUnicodeFromObj
@@ -4284,10 +4280,6 @@ extern const TclStubs *tclStubsPtr;
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<8), (indexPtr)))
-#define Tcl_GetBoolFromObj(interp, objPtr, flags, boolPtr) \
-	(tclStubsPtr->tcl_GetBoolFromObj((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
-#define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
-	(tclStubsPtr->tcl_GetBool((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (size_t *)(sizePtr)))
@@ -4301,10 +4293,6 @@ extern const TclStubs *tclStubsPtr;
 	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<8), (indexPtr)))
-#define Tcl_GetBoolFromObj(interp, objPtr, flags, boolPtr) \
-	((Tcl_GetBoolFromObj)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
-#define Tcl_GetBool(interp, objPtr, flags, boolPtr) \
-	((Tcl_GetBool)((interp), (objPtr), (flags)|(int)(sizeof(*(boolPtr))), (boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (size_t *)(sizePtr)))
diff --git a/generic/tclTest.c b/generic/tclTest.c
index db25379..4cd9bab 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2271,7 +2271,7 @@ TesteventProc(
 	return 1;		/* Avoid looping on errors */
     }
     if (Tcl_GetBoolFromObj(interp, Tcl_GetObjResult(interp),
-	    0, &retval[1]) != TCL_OK) {
+	    sizeof(retval[1]), &retval[1]) != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
 		"    (return value from \"testevent\" callback)");
 	Tcl_BackgroundException(interp, TCL_ERROR);
@@ -5300,7 +5300,7 @@ TestsaveresultCmd(
 	return TCL_ERROR;
     }
 	b[0] = b[1] = b[2] = 100;
-	if (Tcl_GetBoolFromObj(interp, objv[3], 0, b + 1) != TCL_OK)
+	if (Tcl_GetBoolFromObj(interp, objv[3], sizeof(b[1]), b + 1) != TCL_OK)
 	{
 		return TCL_ERROR;
 	}
-- 
cgit v0.12


From ad9c975e41ced7cdc2f156f683fa8845fb33735a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 15 Apr 2022 14:46:00 +0000
Subject: Update documentation

---
 doc/BoolObj.3 | 18 +++++++++++++-----
 doc/GetInt.3  | 21 ++++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/doc/BoolObj.3 b/doc/BoolObj.3
index afbd1d1..c5bb05f 100644
--- a/doc/BoolObj.3
+++ b/doc/BoolObj.3
@@ -20,7 +20,7 @@ Tcl_Obj *
 \fBTcl_SetBooleanObj\fR(\fIobjPtr, boolValue\fR)
 .sp
 int
-\fBTcl_GetBooleanFromObj\fR(\fIinterp, objPtr, boolPtr\fR)
+\fBTcl_GetBooleanFromObj\fR(\fIinterp, objPtr, intPtr\fR)
 .sp
 int
 \fBTcl_GetBoolFromObj\fR(\fIinterp, objPtr, flags. boolPtr\fR)
@@ -35,13 +35,16 @@ retrieve a boolean value.
 If a boolean value cannot be retrieved,
 an error message is left in the interpreter's result value
 unless \fIinterp\fR is NULL.
+.AP int *intPtr out
+Points to place where \fBTcl_GetBooleanFromObj\fR
+stores the boolean value (0 or 1) obtained from \fIobjPtr\fR.
 .AP int | short | char *boolPtr out
-Points to place where \fBTcl_GetBooleanFromObj\fR/\fBTcl_GetBoolFromObj\fR
+Points to place where \fBTcl_GetBoolFromObj\fR
 stores the boolean value (0 or 1) obtained from \fIobjPtr\fR.
 .AP int flags in
-Value 0 or TCL_NULL_OK. If TCL_NULL_OK, then the empty
-string or NULL will result in \fBTcl_GetBoolFromObj\fR return
-TCL_OK, the *boolPtr filled with the value -1;
+sizeof(*(boolPtr)), possibly combined with TCL_NULL_OK. If TCL_NULL_OK
+is used, then the empty string or NULL will result in \fBTcl_GetBoolFromObj\fR
+return TCL_OK, the *boolPtr filled with the value -1;
 .BE
 
 .SH DESCRIPTION
@@ -83,6 +86,11 @@ fields of \fI*objPtr\fR so that future calls to
 \fBTcl_GetBooleanFromObj\fR on the same \fIobjPtr\fR can be
 performed more efficiently.
 .PP
+\fBTcl_GetBoolFromObj\fR functions almost the same as
+\fBTcl_GetBooleanFromObj\fR, but it has an additional parameter
+\fBflags\fR, which can be used to specify the size of the \fBboolPtr\fR
+variable, and also whether the empty string or NULL is accepted as valid.
+.PP
 Note that the routines \fBTcl_GetBooleanFromObj\fR and
 \fBTcl_GetBoolean\fR are not functional equivalents.
 The set of values for which \fBTcl_GetBooleanFromObj\fR
diff --git a/doc/GetInt.3 b/doc/GetInt.3
index f9b91a2..edce6c1 100644
--- a/doc/GetInt.3
+++ b/doc/GetInt.3
@@ -21,7 +21,10 @@ int
 \fBTcl_GetDouble\fR(\fIinterp, src, doublePtr\fR)
 .sp
 int
-\fBTcl_GetBoolean\fR(\fIinterp, src, boolPtr\fR)
+\fBTcl_GetBoolean\fR(\fIinterp, src, intPtr\fR)
+.sp
+int
+\fBTcl_GetBool\fR(\fIinterp, src, flags, boolPtr\fR)
 .SH ARGUMENTS
 .AS Tcl_Interp *doublePtr out
 .AP Tcl_Interp *interp in
@@ -34,7 +37,11 @@ Points to place to store integer value converted from \fIsrc\fR.
 Points to place to store double-precision floating-point
 value converted from \fIsrc\fR.
 .AP int | short | char *boolPtr out
-Points to place to store boolean value (0 or 1) converted from \fIsrc\fR.
+Points to place to store boolean value (0 or 1) value converted from \fIsrc\fR.
+.AP int flags in
+sizeof(*(boolPtr)), possibly combined with TCL_NULL_OK. If TCL_NULL_OK
+is used, then the empty string or NULL will result in \fBTcl_GetBool\fR
+return TCL_OK, the *boolPtr filled with the value -1;
 .BE
 
 .SH DESCRIPTION
@@ -94,11 +101,15 @@ inter-digit separator be present.
 \fBTcl_GetBoolean\fR expects \fIsrc\fR to specify a boolean
 value.  If \fIsrc\fR is any of \fB0\fR, \fBfalse\fR,
 \fBno\fR, or \fBoff\fR, then \fBTcl_GetBoolean\fR stores a zero
-value at \fI*boolPtr\fR.
+value at \fI*intPtr\fR.
 If \fIsrc\fR is any of \fB1\fR, \fBtrue\fR, \fByes\fR, or \fBon\fR,
-then 1 is stored at \fI*boolPtr\fR.
+then 1 is stored at \fI*intPtr\fR.
 Any of these values may be abbreviated, and upper-case spellings
 are also acceptable.
-
+.PP
+\fBTcl_GetBool\fR functions almost the same as \fBTcl_GetBoolean\fR,
+but it has an additional parameter \fBflags\fR, which can be used
+to specify the size of the \fBboolPtr\fR variable, and also whether
+the empty string or NULL is accepted as valid.
 .SH KEYWORDS
 boolean, conversion, double, floating-point, integer
-- 
cgit v0.12


From 43ea8e68e8f54392631b95557d6dc9c621afc667 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 20 Apr 2022 14:26:06 +0000
Subject: Simplify TclGetBoolFromObj() macro

---
 generic/tclCmdMZ.c   | 2 +-
 generic/tclExecute.c | 8 ++++----
 generic/tclInt.h     | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 3eaf055..f394035 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1620,7 +1620,7 @@ StringIsCmd(
 		result = length1 == 0;
 	    }
 	} else if (index != STR_IS_BOOL) {
-	    TclGetBoolFromObj(NULL, objPtr, sizeof(i), &i);
+	    TclGetBooleanFromObj(NULL, objPtr, &i);
 	    if ((index == STR_IS_TRUE) ^ i) {
 		result = 0;
 	    }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 1e16da5..0ec2404 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4346,7 +4346,7 @@ TEBCresume(
 
 	/* TODO - check claim that taking address of b harms performance */
 	/* TODO - consider optimization search for constants */
-	if (TclGetBoolFromObj(interp, valuePtr, sizeof(b), &b) != TCL_OK) {
+	if (TclGetBooleanFromObj(interp, valuePtr, &b) != TCL_OK) {
 	    TRACE_ERROR(interp);
 	    goto gotError;
 	}
@@ -4414,7 +4414,7 @@ TEBCresume(
 
 	value2Ptr = OBJ_AT_TOS;
 	valuePtr = OBJ_UNDER_TOS;
-	if (TclGetBoolFromObj(NULL, valuePtr, sizeof(i1), &i1) != TCL_OK) {
+	if (TclGetBooleanFromObj(NULL, valuePtr, &i1) != TCL_OK) {
 	    TRACE(("\"%.20s\" => ILLEGAL TYPE %s \n", O2S(valuePtr),
 		    (valuePtr->typePtr? valuePtr->typePtr->name : "null")));
 	    DECACHE_STACK_INFO();
@@ -4423,7 +4423,7 @@ TEBCresume(
 	    goto gotError;
 	}
 
-	if (TclGetBoolFromObj(NULL, value2Ptr, sizeof(i2), &i2) != TCL_OK) {
+	if (TclGetBooleanFromObj(NULL, value2Ptr, &i2) != TCL_OK) {
 	    TRACE(("\"%.20s\" => ILLEGAL TYPE %s \n", O2S(value2Ptr),
 		    (value2Ptr->typePtr? value2Ptr->typePtr->name : "null")));
 	    DECACHE_STACK_INFO();
@@ -6223,7 +6223,7 @@ TEBCresume(
 
 	/* TODO - check claim that taking address of b harms performance */
 	/* TODO - consider optimization search for constants */
-	if (TclGetBoolFromObj(NULL, valuePtr, sizeof(b), &b) != TCL_OK) {
+	if (TclGetBooleanFromObj(NULL, valuePtr, &b) != TCL_OK) {
 	    TRACE(("\"%.20s\" => ERROR: illegal type %s\n", O2S(valuePtr),
 		    (valuePtr->typePtr? valuePtr->typePtr->name : "null")));
 	    DECACHE_STACK_INFO();
diff --git a/generic/tclInt.h b/generic/tclInt.h
index e3ebe57..c39a9f6 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2507,12 +2507,12 @@ typedef struct List {
  * WARNING: these macros eval their args more than once.
  */
 
-#define TclGetBoolFromObj(interp, objPtr, flags, boolPtr) \
+#define TclGetBooleanFromObj(interp, objPtr, intPtr) \
     (((objPtr)->typePtr == &tclIntType)			\
-	? (*(boolPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
+	? (*(intPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
 	: ((objPtr)->typePtr == &tclBooleanType)			\
-	? (*(boolPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
-	: Tcl_GetBoolFromObj((interp), (objPtr), (flags), (boolPtr)))
+	? (*(intPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
+	: (Tcl_GetBoolFromObj)((interp), (objPtr), (int)sizeof(int), (intPtr)))
 
 #ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetLongFromObj(interp, objPtr, longPtr) \
-- 
cgit v0.12


From d3662a9dca03f16538eae7240e56fb57589bd9e5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 29 Apr 2022 20:09:48 +0000
Subject: re-structure, add more examples

---
 generic/tcl.decls       |  4 ++--
 generic/tclCompCmdsGR.c |  3 ++-
 generic/tclCompCmdsSZ.c |  4 +++-
 generic/tclCompExpr.c   |  3 ++-
 generic/tclDecls.h      | 26 ++++++++++++++++++++++----
 generic/tclGet.c        |  9 +++++++--
 generic/tclInt.h        |  2 +-
 generic/tclObj.c        | 30 ++++++++++++------------------
 generic/tclTest.c       | 29 ++++++++++++-----------------
 9 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 3d59139..2c19545 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2457,11 +2457,11 @@ declare 668 {
 
 declare 674 {
     int Tcl_GetBool(Tcl_Interp *interp, const char *src, int flags,
-	    void *boolPtr)
+	    char *boolPtr)
 }
 declare 675 {
     int Tcl_GetBoolFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    int flags, void *boolPtr)
+	    int flags, char *boolPtr)
 }
 
 
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index da557a4..839fbde 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -17,6 +17,7 @@
 #include "tclInt.h"
 #include "tclCompile.h"
 #include <assert.h>
+#include <stdbool.h>
 
 /*
  * Prototypes for procedures defined later in this file:
@@ -185,7 +186,7 @@ TclCompileIfCmd(
     const char *word;
     int realCond = 1;		/* Set to 0 for static conditions:
 				 * "if 0 {..}" */
-    int boolVal;		/* Value of static condition. */
+    bool boolVal;		/* Value of static condition. */
     int compileScripts = 1;
 
     /*
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index cd3bd37..fa490a1 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -18,6 +18,7 @@
 #include "tclInt.h"
 #include "tclCompile.h"
 #include "tclStringTrim.h"
+#include <stdbool.h>
 
 /*
  * Prototypes for procedures defined later in this file:
@@ -3759,7 +3760,8 @@ TclCompileWhileCmd(
     DefineLineInformation;	/* TIP #280 */
     Tcl_Token *testTokenPtr, *bodyTokenPtr;
     JumpFixup jumpEvalCondFixup;
-    int testCodeOffset, bodyCodeOffset, jumpDist, range, code, boolVal;
+    int testCodeOffset, bodyCodeOffset, jumpDist, range, code;
+    bool boolVal;
     int loopMayEnd = 1;		/* This is set to 0 if it is recognized as an
 				 * infinite loop. */
     Tcl_Obj *boolObj;
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 23d8711..c245b4e 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -13,6 +13,7 @@
 
 #include "tclInt.h"
 #include "tclCompile.h"		/* CompileEnv */
+#include <stdbool.h>
 
 /*
  * Expression parsing takes place in the routine ParseExpr(). It takes a
@@ -708,7 +709,7 @@ ParseExpr(
 	 */
 
 	if ((NODE_TYPE & lexeme) == 0) {
-	    int b;
+	    bool b;
 
 	    switch (lexeme) {
 	    case COMMENT:
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index d75e605..04f8aa3 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1970,10 +1970,10 @@ EXTERN int		Tcl_UniCharLen(const int *uniStr);
 /* Slot 673 is reserved */
 /* 674 */
 EXTERN int		Tcl_GetBool(Tcl_Interp *interp, const char *src,
-				int flags, void *boolPtr);
+				int flags, char *boolPtr);
 /* 675 */
 EXTERN int		Tcl_GetBoolFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int flags, void *boolPtr);
+				Tcl_Obj *objPtr, int flags, char *boolPtr);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2683,8 +2683,8 @@ typedef struct TclStubs {
     void (*reserved671)(void);
     void (*reserved672)(void);
     void (*reserved673)(void);
-    int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, void *boolPtr); /* 674 */
-    int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, void *boolPtr); /* 675 */
+    int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *boolPtr); /* 674 */
+    int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *boolPtr); /* 675 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4270,12 +4270,22 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetUnicodeFromObj(objPtr, (int *)NULL)
 #undef Tcl_GetBytesFromObj
 #undef Tcl_GetIndexFromObjStruct
+#undef Tcl_GetBoolean
+#undef Tcl_GetBooleanFromObj
 #ifdef TCL_NO_DEPRECATED
 #undef Tcl_GetStringFromObj
 #undef Tcl_GetUnicodeFromObj
 #undef Tcl_GetByteArrayFromObj
 #endif
 #if defined(USE_TCL_STUBS)
+#define Tcl_GetBoolean(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBoolean(interp, objPtr, (int *)(boolPtr)) : \
+	(sizeof(*(boolPtr)) == sizeof(char) ? tclStubsPtr->tcl_GetBool(interp, objPtr, 0, (char *)(boolPtr)) : \
+	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
+	(sizeof(*(boolPtr)) == sizeof(char) ? tclStubsPtr->tcl_GetBoolFromObj(interp, objPtr, 0, (char *)(boolPtr)) : \
+	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
@@ -4289,6 +4299,14 @@ extern const TclStubs *tclStubsPtr;
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (size_t *)(sizePtr)))
 #endif
 #else
+#define Tcl_GetBoolean(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? (Tcl_GetBoolean)(interp, objPtr, (int *)(boolPtr)) : \
+	(sizeof(*(boolPtr)) == sizeof(char) ? (Tcl_GetBool)(interp, objPtr, 0, (char *)(boolPtr)) : \
+	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? (Tcl_GetBooleanFromObj)(interp, objPtr, (int *)(boolPtr)) : \
+	(sizeof(*(boolPtr)) == sizeof(char) ? (Tcl_GetBoolFromObj)(interp, objPtr, 0, (char *)(boolPtr)) : \
+	(Tcl_Panic("Invalid boolean variable: sizeof() must be 1 or 4"), TCL_ERROR)))
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
diff --git a/generic/tclGet.c b/generic/tclGet.c
index 0e07da1..a60d3a6 100644
--- a/generic/tclGet.c
+++ b/generic/tclGet.c
@@ -128,7 +128,7 @@ Tcl_GetBool(
     const char *src,		/* String containing one of the boolean values
 				 * 1, 0, true, false, yes, no, on, off. */
     int flags,
-    void *boolPtr)		/* Place to store converted result, which will
+    char *boolPtr)		/* Place to store converted result, which will
 				 * be 0 or 1. */
 {
     Tcl_Obj obj;
@@ -161,7 +161,12 @@ Tcl_GetBoolean(
     int *intPtr)		/* Place to store converted result, which will
 				 * be 0 or 1. */
 {
-    return Tcl_GetBool(interp, src, sizeof(int), intPtr);
+    char boolValue;
+    int result = Tcl_GetBool(interp, src, 0, &boolValue);
+    if (intPtr) {
+	*intPtr = boolValue;
+    }
+    return result;
 }
 
 /*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2ee22f3..61cc3b3 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2512,7 +2512,7 @@ typedef struct List {
 	? (*(intPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
 	: ((objPtr)->typePtr == &tclBooleanType)			\
 	? (*(intPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
-	: Tcl_GetBoolFromObj((interp), (objPtr), (int)sizeof(int), (intPtr)))
+	: Tcl_GetBooleanFromObj((interp), (objPtr), (intPtr)))
 
 #ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetLongFromObj(interp, objPtr, longPtr) \
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 40fc73b..7842d0d 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2161,7 +2161,7 @@ Tcl_GetBoolFromObj(
     Tcl_Interp *interp,         /* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr,	/* The object from which to get boolean. */
     int flags,
-    void *boolPtr)	/* Place to store resulting boolean. */
+    char *boolPtr)	/* Place to store resulting boolean. */
 {
     int result;
 
@@ -2171,7 +2171,8 @@ Tcl_GetBoolFromObj(
     } else if (objPtr == NULL) {
 	if (interp) {
 	    TclNewObj(objPtr);
-	    TclParseNumber(interp, objPtr, "boolean value", NULL,-1,NULL,0);
+	    TclParseNumber(interp, objPtr, (flags & TCL_NULL_OK)
+		    ? "boolean value or \"\"" : "boolean value", NULL, -1, NULL, 0);
 	    Tcl_DecrRefCount(objPtr);
 	}
 	return TCL_ERROR;
@@ -2206,25 +2207,13 @@ Tcl_GetBoolFromObj(
 	    result = 1;
 	boolEnd:
 	    if (boolPtr != NULL) {
-		flags &= (TCL_NULL_OK - 1);
-		if (flags & (int)~sizeof(int8_t)) {
-		    if (flags == sizeof(int16_t)) {
-			*(int16_t *)boolPtr = result;
-			return TCL_OK;
-		    } else if (flags == sizeof(int32_t)) {
-			*(int32_t *)boolPtr = result;
-			return TCL_OK;
-		    } else if (flags == sizeof(int64_t)) {
-			*(int64_t *)boolPtr = result;
-			return TCL_OK;
-		    }
-		}
-		*(int8_t *)boolPtr = result;
+		*boolPtr = result;
 	    }
 	    return TCL_OK;
 	}
     } while ((ParseBoolean(objPtr) == TCL_OK) || (TCL_OK ==
-	    TclParseNumber(interp, objPtr, "boolean value", NULL,-1,NULL,0)));
+	    TclParseNumber(interp, objPtr, (flags & TCL_NULL_OK)
+		    ? "boolean value or \"\"" : "boolean value", NULL,-1,NULL,0)));
     return TCL_ERROR;
 }
 
@@ -2235,7 +2224,12 @@ Tcl_GetBooleanFromObj(
     Tcl_Obj *objPtr,	/* The object from which to get boolean. */
     int *intPtr)	/* Place to store resulting boolean. */
 {
-    return Tcl_GetBoolFromObj(interp, objPtr, sizeof(int), intPtr);
+    char boolValue;
+    int result = Tcl_GetBoolFromObj(interp, objPtr, 0, &boolValue);
+    if (intPtr) {
+	*intPtr = boolValue;
+    }
+    return result;
 }
 
 /*
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 4cd9bab..39364d6 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -30,6 +30,7 @@
 #endif
 #include "tclOO.h"
 #include <math.h>
+#include <stdbool.h>
 
 /*
  * Required for Testregexp*Cmd
@@ -2262,7 +2263,7 @@ TesteventProc(
     Tcl_Obj *command = ev->command;
     int result = Tcl_EvalObjEx(interp, command,
 	    TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
-    char retval[3];
+    bool retval;
 
     if (result != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
@@ -2270,19 +2271,19 @@ TesteventProc(
 	Tcl_BackgroundException(interp, TCL_ERROR);
 	return 1;		/* Avoid looping on errors */
     }
-    if (Tcl_GetBoolFromObj(interp, Tcl_GetObjResult(interp),
-	    sizeof(retval[1]), &retval[1]) != TCL_OK) {
+    if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
+	    &retval) != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
 		"    (return value from \"testevent\" callback)");
 	Tcl_BackgroundException(interp, TCL_ERROR);
 	return 1;
     }
-    if (retval[1]) {
+    if (retval) {
 	Tcl_DecrRefCount(ev->tag);
 	Tcl_DecrRefCount(ev->command);
     }
 
-    return retval[1];
+    return retval;
 }
 
 /*
@@ -5277,7 +5278,7 @@ TestsaveresultCmd(
 {
     Interp* iPtr = (Interp*) interp;
     int result, index;
-    char b[3];
+    bool discard;
     Tcl_SavedResult state;
     Tcl_Obj *objPtr;
     static const char *const optionStrings[] = {
@@ -5299,17 +5300,11 @@ TestsaveresultCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-	b[0] = b[1] = b[2] = 100;
-	if (Tcl_GetBoolFromObj(interp, objv[3], sizeof(b[1]), b + 1) != TCL_OK)
-	{
-		return TCL_ERROR;
-	}
-	if (b[0] != 100 || b[2] != 100) {
-		Tcl_Panic("MEMORY OVERWRITE IN Tcl_GetBoolFromObj");
-		return TCL_ERROR;
-	}
+    if (Tcl_GetBooleanFromObj(interp, objv[3], &discard) != TCL_OK) {
+	return TCL_ERROR;
+    }
 
-	freeCount = 0;
+    freeCount = 0;
     objPtr = NULL;		/* Lint. */
     switch ((enum options) index) {
     case RESULT_SMALL:
@@ -5342,7 +5337,7 @@ TestsaveresultCmd(
 	result = Tcl_EvalEx(interp, Tcl_GetString(objv[2]), -1, 0);
     }
 
-    if (b[1]) {
+    if (discard) {
 	Tcl_DiscardResult(&state);
     } else {
 	Tcl_RestoreResult(interp, &state);
-- 
cgit v0.12


From a83edfe07c35a66fbcf357a99349c43e103e6d9e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 10 May 2022 10:18:44 +0000
Subject: Update doc

---
 doc/BoolObj.3    |  4 ++--
 doc/GetInt.3     |  3 +--
 generic/tclGet.c |  6 +++---
 generic/tclObj.c | 30 +++++++++++++++---------------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/doc/BoolObj.3 b/doc/BoolObj.3
index cc8729e..47a2189 100644
--- a/doc/BoolObj.3
+++ b/doc/BoolObj.3
@@ -88,8 +88,8 @@ performed more efficiently.
 .PP
 \fBTcl_GetBoolFromObj\fR functions almost the same as
 \fBTcl_GetBooleanFromObj\fR, but it has an additional parameter
-\fBflags\fR, which can be used to specify the size of the \fBbool\fR
-variable, and also whether the empty string or NULL is accepted as valid.
+\fBflags\fR, which can be used to specify whether the empty
+string or NULL is accepted as valid.
 .PP
 Note that the routines \fBTcl_GetBooleanFromObj\fR and
 \fBTcl_GetBoolean\fR are not functional equivalents.
diff --git a/doc/GetInt.3 b/doc/GetInt.3
index 62e8f51..f15c12d 100644
--- a/doc/GetInt.3
+++ b/doc/GetInt.3
@@ -109,8 +109,7 @@ are also acceptable.
 .PP
 \fBTcl_GetBool\fR functions almost the same as \fBTcl_GetBoolean\fR,
 but it has an additional parameter \fBflags\fR, which can be used
-to specify the size of the \fBbool\fR variable, and also whether
-the empty string or NULL is accepted as valid.
+to specify whether the empty string or NULL is accepted as valid.
 
 .SH KEYWORDS
 boolean, conversion, double, floating-point, integer
diff --git a/generic/tclGet.c b/generic/tclGet.c
index 9670450..3c458dc 100644
--- a/generic/tclGet.c
+++ b/generic/tclGet.c
@@ -161,10 +161,10 @@ Tcl_GetBoolean(
     int *intPtr)		/* Place to store converted result, which will
 				 * be 0 or 1. */
 {
-    char boolValue;
-    int result = Tcl_GetBool(interp, src, 0, &boolValue);
+    char charValue;
+    int result = Tcl_GetBool(interp, src, 0, &charValue);
     if (intPtr) {
-	*intPtr = boolValue;
+	*intPtr = charValue;
     }
     return result;
 }
diff --git a/generic/tclObj.c b/generic/tclObj.c
index f7d9dfc..ce13638 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2004,7 +2004,7 @@ Tcl_FreeInternalRep(
  *
  *	This function is normally called when not debugging: i.e., when
  *	TCL_MEM_DEBUG is not defined. It creates a new Tcl_Obj and
- *	initializes it from the argument boolean value. A nonzero "boolValue"
+ *	initializes it from the argument boolean value. A nonzero "intValue"
  *	is coerced to 1.
  *
  *	When TCL_MEM_DEBUG is defined, this function just returns the result
@@ -2025,20 +2025,20 @@ Tcl_FreeInternalRep(
 
 Tcl_Obj *
 Tcl_NewBooleanObj(
-    int boolValue)	/* Boolean used to initialize new object. */
+    int intValue)	/* Boolean used to initialize new object. */
 {
-    return Tcl_DbNewWideIntObj(boolValue!=0, "unknown", 0);
+    return Tcl_DbNewWideIntObj(intValue!=0, "unknown", 0);
 }
 
 #else /* if not TCL_MEM_DEBUG */
 
 Tcl_Obj *
 Tcl_NewBooleanObj(
-    int boolValue)	/* Boolean used to initialize new object. */
+    int intValue)	/* Boolean used to initialize new object. */
 {
     Tcl_Obj *objPtr;
 
-    TclNewIntObj(objPtr, boolValue!=0);
+    TclNewIntObj(objPtr, intValue!=0);
     return objPtr;
 }
 #endif /* TCL_MEM_DEBUG */
@@ -2075,7 +2075,7 @@ Tcl_NewBooleanObj(
 
 Tcl_Obj *
 Tcl_DbNewBooleanObj(
-    int boolValue,	/* Boolean used to initialize new object. */
+    int intValue,	/* Boolean used to initialize new object. */
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
     int line)			/* Line number in the source file; used for
@@ -2087,7 +2087,7 @@ Tcl_DbNewBooleanObj(
     /* Optimized TclInvalidateStringRep() */
     objPtr->bytes = NULL;
 
-    objPtr->internalRep.wideValue = (boolValue != 0);
+    objPtr->internalRep.wideValue = (intValue != 0);
     objPtr->typePtr = &tclIntType;
     return objPtr;
 }
@@ -2096,11 +2096,11 @@ Tcl_DbNewBooleanObj(
 
 Tcl_Obj *
 Tcl_DbNewBooleanObj(
-    int boolValue,	/* Boolean used to initialize new object. */
+    int intValue,	/* Boolean used to initialize new object. */
     TCL_UNUSED(const char *) /*file*/,
     TCL_UNUSED(int) /*line*/)
 {
-    return Tcl_NewBooleanObj(boolValue);
+    return Tcl_NewBooleanObj(intValue);
 }
 #endif /* TCL_MEM_DEBUG */
 
@@ -2110,7 +2110,7 @@ Tcl_DbNewBooleanObj(
  * Tcl_SetBooleanObj --
  *
  *	Modify an object to be a boolean object and to have the specified
- *	boolean value. A nonzero "boolValue" is coerced to 1.
+ *	boolean value. A nonzero "intValue" is coerced to 1.
  *
  * Results:
  *	None.
@@ -2126,13 +2126,13 @@ Tcl_DbNewBooleanObj(
 void
 Tcl_SetBooleanObj(
     Tcl_Obj *objPtr,	/* Object whose internal rep to init. */
-    int boolValue)	/* Boolean used to set object's value. */
+    int intValue)	/* Boolean used to set object's value. */
 {
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_SetBooleanObj");
     }
 
-    TclSetIntObj(objPtr, boolValue!=0);
+    TclSetIntObj(objPtr, intValue!=0);
 }
 #endif /* TCL_NO_DEPRECATED */
 
@@ -2224,10 +2224,10 @@ Tcl_GetBooleanFromObj(
     Tcl_Obj *objPtr,	/* The object from which to get boolean. */
     int *intPtr)	/* Place to store resulting boolean. */
 {
-    char boolValue;
-    int result = Tcl_GetBoolFromObj(interp, objPtr, 0, &boolValue);
+    char charValue;
+    int result = Tcl_GetBoolFromObj(interp, objPtr, 0, &charValue);
     if (intPtr) {
-	*intPtr = boolValue;
+	*intPtr = charValue;
     }
     return result;
 }
-- 
cgit v0.12


From 9b1a7da59be393b5b4695631cadf5423a3c87a7d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 6 Jun 2022 16:51:24 +0000
Subject: Bump to 8.6.13 for release

---
 README.md         |  2 +-
 generic/tcl.h     |  4 ++--
 library/init.tcl  |  2 +-
 unix/configure    |  3 +--
 unix/configure.in |  2 +-
 unix/tcl.spec     |  2 +-
 win/configure     | 25 +++++++++++--------------
 win/configure.in  |  2 +-
 8 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 045a287..1c5cd4b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # README:  Tcl
 
-This is the **Tcl 8.6.12** source distribution.
+This is the **Tcl 8.6.13** source distribution.
 
 You can get any source release of Tcl from [our distribution
 site](https://sourceforge.net/projects/tcl/files/Tcl/).
diff --git a/generic/tcl.h b/generic/tcl.h
index 41025e7..3a4622e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -51,10 +51,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   6
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  12
+#define TCL_RELEASE_SERIAL  13
 
 #define TCL_VERSION	    "8.6"
-#define TCL_PATCH_LEVEL	    "8.6.12"
+#define TCL_PATCH_LEVEL	    "8.6.13"
 
 /*
  *----------------------------------------------------------------------------
diff --git a/library/init.tcl b/library/init.tcl
index edf6bd5..0655dc8 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -16,7 +16,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.6.12
+package require -exact Tcl 8.6.13
 
 # 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 5dee873..57d5081 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=".12"
+TCL_PATCH_LEVEL=".13"
 VERSION=${TCL_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}
@@ -2823,7 +2823,6 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
-#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
diff --git a/unix/configure.in b/unix/configure.in
index c73f368..62ab90e 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -26,7 +26,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".12"
+TCL_PATCH_LEVEL=".13"
 VERSION=${TCL_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}
diff --git a/unix/tcl.spec b/unix/tcl.spec
index 2e4a433..f4177a4 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -4,7 +4,7 @@
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.6.12
+Version:       8.6.13
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/configure b/win/configure
index ab9771f..2765e6c 100755
--- a/win/configure
+++ b/win/configure
@@ -1325,7 +1325,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".12"
+TCL_PATCH_LEVEL=".13"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
@@ -2729,7 +2729,6 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
-#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -3032,26 +3031,24 @@ fi
 
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set x ${MAKE-make}
-ac_make=`echo "" | sed 'y,:./+-,___p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
 all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+	@echo 'ac_maketemp="$(MAKE)"'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
 rm -f conftest.make
 fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
diff --git a/win/configure.in b/win/configure.in
index 1f52c52..2538a92 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -15,7 +15,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".12"
+TCL_PATCH_LEVEL=".13"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
-- 
cgit v0.12


From e396c1dd368d128a020f50ded11b388ad9bd4b4b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Jun 2022 15:13:33 +0000
Subject: Make the idea (finally) work

---
 generic/tcl.h           | 13 ++++++++++---
 generic/tclStubLib.c    |  2 +-
 unix/configure          |  8 ++------
 unix/configure.ac       |  8 ++------
 unix/dltest/Makefile.in | 35 +++++++++++++++++++++++++++++++++--
 5 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 429054c..d6a59c6 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2215,7 +2215,12 @@ void *			TclStubCall(void *arg);
 #endif
 
 #ifdef USE_TCL_STUBS
-#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
+#if TCL_MAJOR_VERSION < 9
+#   define Tcl_InitStubs(interp, version, exact) \
+	(Tcl_InitStubs)(interp, version, \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(0xFF<<16), \
+	    TCL_STUB_MAGIC)
+#elif TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
 #   define Tcl_InitStubs(interp, version, exact) \
 	(Tcl_InitStubs)(interp, version, \
 	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
@@ -2227,7 +2232,9 @@ void *			TclStubCall(void *arg);
 	    TCL_STUB_MAGIC)
 #endif
 #else
-#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
+#if TCL_MAJOR_VERSION < 9
+#   error "Please define -DUSE_TCL_STUBS"
+#elif TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
 #   define Tcl_InitStubs(interp, version, exact) \
 	Tcl_PkgInitStubsCheck(interp, version, \
 		(exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
@@ -2276,7 +2283,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
     EXTERN TCL_NORETURN void Tcl_MainExW(size_t argc, wchar_t **argv,
 	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 #endif
-#ifdef USE_TCL_STUBS
+#if defined(USE_TCL_STUBS) && (TCL_MAJOR_VERSION > 8)
 #define Tcl_SetPanicProc(panicProc) \
     TclInitStubTable(((const char *(*)(Tcl_PanicProc *))TclStubCall((void *)panicProc))(panicProc))
 #define Tcl_InitSubsystems() \
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index d09ab2b..74fcedd 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -68,7 +68,7 @@ Tcl_InitStubs(
      * times. [Bug 615304]
      */
 
-    if (!stubsPtr || (stubsPtr->magic != (((exact&0xFF00) >= 0x900) ? magic : TCL_STUB_MAGIC))) {
+    if (!stubsPtr || (stubsPtr->magic != (((exact&0xFF00) >= 0x900) ? magic : -56378673))) {
 	iPtr->legacyResult = "interpreter uses an incompatible stubs mechanism";
 	iPtr->legacyFreeProc = 0; /* TCL_STATIC */
 	return NULL;
diff --git a/unix/configure b/unix/configure
index 4e69ed6..ca94150 100755
--- a/unix/configure
+++ b/unix/configure
@@ -11237,15 +11237,11 @@ fi
 # Replace ${VERSION} with contents of ${TCL_VERSION}
 # double-eval to account for TCL_TRIM_DOTS.
 #
-eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
+eval "TCL_STUB_LIB_FILE=libtclstub.a"
 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
 eval "TCL_STUB_LIB_DIR=\"${libdir}\""
 
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
-else
-    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
-fi
+TCL_STUB_LIB_FLAG="-ltclstub"
 
 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
diff --git a/unix/configure.ac b/unix/configure.ac
index a1a6b17..29933bd 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -932,15 +932,11 @@ fi
 # Replace ${VERSION} with contents of ${TCL_VERSION}
 # double-eval to account for TCL_TRIM_DOTS.
 #
-eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
+eval "TCL_STUB_LIB_FILE=libtclstub.a"
 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
 eval "TCL_STUB_LIB_DIR=\"${libdir}\""
 
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
-else
-    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
-fi
+TCL_STUB_LIB_FLAG="-ltclstub"
 
 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 7a872c5..19b7d84 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -25,11 +25,15 @@ LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
 CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
 	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
-all: embtest tcl9pkga${SHLIB_SUFFIX} tcl9pkgb${SHLIB_SUFFIX} tcl9pkgc${SHLIB_SUFFIX} tcl9pkgd${SHLIB_SUFFIX} tcl9pkge${SHLIB_SUFFIX} tcl9pkgua${SHLIB_SUFFIX} tcl9pkgooa${SHLIB_SUFFIX}
+all: embtest tcl9pkga${SHLIB_SUFFIX} tcl9pkgb${SHLIB_SUFFIX} tcl9pkgc${SHLIB_SUFFIX} \
+	tcl9pkgd${SHLIB_SUFFIX} tcl9pkge${SHLIB_SUFFIX} tcl9pkgua${SHLIB_SUFFIX} tcl9pkgooa${SHLIB_SUFFIX} \
+	pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX}
 	@if test -n "$(DLTEST_SUFFIX)"; then $(MAKE) dltest_suffix; fi
 	@touch ../dltest.marker
 
-dltest_suffix: tcl9pkga${DLTEST_SUFFIX} tcl9pkgb${DLTEST_SUFFIX} tcl9pkgc${DLTEST_SUFFIX} tcl9pkgd${DLTEST_SUFFIX} tcl9pkge${DLTEST_SUFFIX} tcl9pkgua${DLTEST_SUFFIX} tcl9pkgooa${DLTEST_SUFFIX}
+dltest_suffix: tcl9pkga${DLTEST_SUFFIX} tcl9pkgb${DLTEST_SUFFIX} tcl9pkgc${DLTEST_SUFFIX} \
+	tcl9pkgd${DLTEST_SUFFIX} tcl9pkge${DLTEST_SUFFIX} tcl9pkgua${DLTEST_SUFFIX} tcl9pkgooa${DLTEST_SUFFIX} \
+	pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX}
 	@touch ../dltest.marker
 
 embtest.o: $(SRC_DIR)/embtest.c
@@ -47,6 +51,15 @@ pkgb.o: $(SRC_DIR)/pkgb.c
 pkgc.o: $(SRC_DIR)/pkgc.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c
 
+tcl8pkga.o: $(SRC_DIR)/pkga.c
+	$(CC) -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(SRC_DIR)/pkga.c
+
+tcl8pkgb.o: $(SRC_DIR)/pkgb.c
+	$(CC) -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(SRC_DIR)/pkgb.c
+
+tcl8pkgc.o: $(SRC_DIR)/pkgc.c
+	$(CC) -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(SRC_DIR)/pkgc.c
+
 pkgd.o: $(SRC_DIR)/pkgd.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c
 
@@ -74,6 +87,15 @@ tcl9pkgb${SHLIB_SUFFIX}: pkgb.o
 tcl9pkgc${SHLIB_SUFFIX}: pkgc.o
 	${SHLIB_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
+pkga${SHLIB_SUFFIX}: tcl8pkga.o
+	${SHLIB_LD} -o $@ tcl8pkga.o ${SHLIB_LD_LIBS}
+
+pkgb${SHLIB_SUFFIX}: tcl8pkgb.o
+	${SHLIB_LD} -o $@ tcl8pkgb.o ${SHLIB_LD_LIBS}
+
+pkgc${SHLIB_SUFFIX}: tcl8pkgc.o
+	${SHLIB_LD} -o $@ tcl8pkgc.o ${SHLIB_LD_LIBS}
+
 tcl9pkgd${SHLIB_SUFFIX}: pkgd.o
 	${SHLIB_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
@@ -98,6 +120,15 @@ tcl9pkgb${DLTEST_SUFFIX}: pkgb.o
 tcl9pkgc${DLTEST_SUFFIX}: pkgc.o
 	${DLTEST_LD} -o $@ pkgc.o ${SHLIB_LD_LIBS}
 
+pkga${DLTEST_SUFFIX}: tcl8pkga.o
+	${DLTEST_LD} -o $@ tcl8pkga.o ${SHLIB_LD_LIBS}
+
+pkgb${DLTEST_SUFFIX}: tcl8pkgb.o
+	${DLTEST_LD} -o $@ tcl8pkgb.o ${SHLIB_LD_LIBS}
+
+pkgc${DLTEST_SUFFIX}: tcl8pkgc.o
+	${DLTEST_LD} -o $@ tcl8pkgc.o ${SHLIB_LD_LIBS}
+
 tcl9pkgd${DLTEST_SUFFIX}: pkgd.o
 	${DLTEST_LD} -o $@ pkgd.o ${SHLIB_LD_LIBS}
 
-- 
cgit v0.12


From 778ad9fdfa3acfdca6c6089137485eb69af19391 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Jun 2022 16:54:04 +0000
Subject: Enhance for Windows

---
 win/Makefile.in  | 20 +++++++++++++++++++-
 win/configure    |  4 ++--
 win/configure.ac |  4 ++--
 win/rules.vc     |  9 +++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index 23f7fe4..d0305c5 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -150,8 +150,10 @@ TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
 TCL_DLL_FILE		= @TCL_DLL_FILE@
 TCL_LIB_FILE		= @TCL_LIB_FILE@
 DDE_DLL_FILE		= tcl9dde$(DDEVER)${DLLSUFFIX}
+DDE_DLL_FILE8		= dde$(DDEVER)${DLLSUFFIX}
 DDE_LIB_FILE		= @LIBPREFIX@tcldde$(DDEVER)${DLLSUFFIX}${LIBSUFFIX}
 REG_DLL_FILE		= tcl9registry$(REGVER)${DLLSUFFIX}
+REG_DLL_FILE8		= registry$(REGVER)${DLLSUFFIX}
 REG_LIB_FILE		= @LIBPREFIX@tclregistry$(REGVER)${DLLSUFFIX}${LIBSUFFIX}
 TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
 TEST_EXE_FILE		= tcltest${EXESUFFIX}
@@ -514,7 +516,7 @@ tcltest: binaries $(TEST_EXE_FILE) $(TEST_DLL_FILE) $(CAT32) tcltest.cmd
 
 binaries: $(TCL_STUB_LIB_FILE) @LIBRARIES@ winextensions ${TCL_ZIP_FILE} $(TCLSH)
 
-winextensions: ${DDE_DLL_FILE} ${REG_DLL_FILE}
+winextensions: ${DDE_DLL_FILE} ${REG_DLL_FILE} ${DDE_DLL_FILE8} ${REG_DLL_FILE8}
 
 libraries:
 
@@ -588,6 +590,14 @@ ${REG_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${REG_OBJS}
 	@MAKE_DLL@ ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
 	$(COPY) tclsh.exe.manifest ${REG_DLL_FILE}.manifest
 
+${DDE_DLL_FILE8}: ${TCL_STUB_LIB_FILE} ${DDE_OBJS}
+	@MAKE_DLL@ -DTCL_MAJOR_VERSION=8 ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+	$(COPY) tclsh.exe.manifest ${DDE_DLL_FILE8}.manifest
+
+${REG_DLL_FILE8}: ${TCL_STUB_LIB_FILE} ${REG_OBJS}
+	@MAKE_DLL@ -DTCL_MAJOR_VERSION=8 ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+	$(COPY) tclsh.exe.manifest ${REG_DLL_FILE8}.manifest
+
 ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
 	@$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}
 	@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
@@ -839,6 +849,10 @@ install-binaries: binaries
 	    $(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
 		"$(LIB_INSTALL_DIR)/dde${DDEDOTVER}"; \
 	    fi
+	@if [ -f $(DDE_DLL_FILE8) ]; then \
+	    echo Installing $(DDE_DLL_FILE8); \
+	    $(COPY) $(DDE_DLL_FILE8) "$(LIB_INSTALL_DIR)/dde${DDEDOTVER}"; \
+	    fi
 	@if [ -f $(DDE_LIB_FILE) ]; then \
 	    echo Installing $(DDE_LIB_FILE); \
 	    $(COPY) $(DDE_LIB_FILE) "$(LIB_INSTALL_DIR)/dde${DDEDOTVER}"; \
@@ -849,6 +863,10 @@ install-binaries: binaries
 	    $(COPY) $(ROOT_DIR)/library/registry/pkgIndex.tcl \
 		"$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
 	    fi
+	@if [ -f $(REG_DLL_FILE8) ]; then \
+	    echo Installing $(REG_DLL_FILE8); \
+	    $(COPY) $(REG_DLL_FILE8) "$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
+	    fi
 	@if [ -f $(REG_LIB_FILE) ]; then \
 	    echo Installing $(REG_LIB_FILE); \
 	    $(COPY) $(REG_LIB_FILE) "$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
diff --git a/win/configure b/win/configure
index 703125e..d47fc6cb 100755
--- a/win/configure
+++ b/win/configure
@@ -5804,8 +5804,8 @@ eval "TCL_SRC_DIR=\"`cd $srcdir/..; $CYGPATH $(pwd)`\""
 
 eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}"
 
-eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
-eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\""
+eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${LIBSUFFIX}\""
+eval "TCL_STUB_LIB_FLAG=\"-ltclstub${LIBFLAGSUFFIX}\""
 eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`$CYGPATH $(pwd)` ${TCL_STUB_LIB_FLAG}\""
 eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\""
 eval "TCL_BUILD_STUB_LIB_PATH=\"`$CYGPATH $(pwd)`/${TCL_STUB_LIB_FILE}\""
diff --git a/win/configure.ac b/win/configure.ac
index dccc3b6..c6ff202 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -313,8 +313,8 @@ eval "TCL_SRC_DIR=\"`cd $srcdir/..; $CYGPATH $(pwd)`\""
 
 eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}"
 
-eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
-eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\""
+eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${LIBSUFFIX}\""
+eval "TCL_STUB_LIB_FLAG=\"-ltclstub${LIBFLAGSUFFIX}\""
 eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`$CYGPATH $(pwd)` ${TCL_STUB_LIB_FLAG}\""
 eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\""
 eval "TCL_BUILD_STUB_LIB_PATH=\"`$CYGPATH $(pwd)`/${TCL_STUB_LIB_FILE}\""
diff --git a/win/rules.vc b/win/rules.vc
index 47c0742..1b8df9c 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1162,7 +1162,12 @@ TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
 
+
+!if "$(TCL_MAJOR_VERSION)" == "8"
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
+!else
+TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib
+!endif
 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib
 # When building extensions, may be linking against Tcl that does not add
 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
@@ -1182,7 +1187,11 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 !if !exist($(TCLSH))
 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
+!if "$(TCL_MAJOR_VERSION)" == "8"
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
+!else
+TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib
+!endif
 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib
 # When building extensions, may be linking against Tcl that does not add
 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
-- 
cgit v0.12


From 6187c67f3b8fae634b2be035c2e600b04120adf0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Jun 2022 20:08:56 +0000
Subject: Handle list/dict compatibility better

---
 generic/tcl.decls     |  1 +
 generic/tclDecls.h    | 28 ++++++++++++++--------------
 generic/tclStubInit.c | 12 ++++++------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 12a8cbe..1e16c5e 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -312,6 +312,7 @@ declare 79 {
 declare 80 {
     void Tcl_CancelIdleCall(Tcl_IdleProc *idleProc, void *clientData)
 }
+# Only available in Tcl 8.x, NULL in Tcl 9.0
 declare 81 {
     int Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan)
 }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index d9115ed..20ba011 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4051,31 +4051,31 @@ extern const TclStubs *tclStubsPtr;
 		? (Tcl_Size (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
 #   undef Tcl_ListObjGetElements
-#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(size_t) \
+#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) != sizeof(int) \
 		? tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)) \
 		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)))
 #   undef Tcl_ListObjLength
-#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(size_t) \
+#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) != sizeof(int) \
 		? tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (size_t *)(void *)(lengthPtr)) \
 		: tclStubsPtr->tclListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)))
 #   undef Tcl_DictObjSize
-#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(size_t) \
+#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) != sizeof(int) \
 		? tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (size_t *)(void *)(sizePtr)) \
 		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)))
 #   undef Tcl_SplitList
-#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(size_t) \
+#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
 		? tclStubsPtr->tcl_SplitList((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)) \
 		: tclStubsPtr->tclSplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_SplitPath
-#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(size_t) \
+#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
 		? tclStubsPtr->tcl_SplitPath((path), (size_t *)(void *)(argcPtr), (argvPtr)) \
 		: tclStubsPtr->tclSplitPath((path), (int *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_FSSplitPath
-#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(size_t) \
+#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) != sizeof(int) \
 		? tclStubsPtr->tcl_FSSplitPath((pathPtr), (size_t *)(void *)(lenPtr)) \
 		: tclStubsPtr->tclFSSplitPath((pathPtr), (int *)(void *)(lenPtr)))
 #   undef Tcl_ParseArgsObjv
-#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(size_t) \
+#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) != sizeof(int) \
 		? tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)) \
 		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)))
 #else
@@ -4091,25 +4091,25 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
 		? (Tcl_Size (*)(wchar_t *))Tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
-#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(size_t) \
+#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) != sizeof(int) \
 		? (Tcl_ListObjGetElements)((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)) \
 		: TclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)))
-#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(size_t) \
+#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) != sizeof(int) \
 		? (Tcl_ListObjLength)((interp), (listPtr), (size_t *)(void *)(lengthPtr)) \
 		: TclListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)))
-#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(size_t) \
+#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) != sizeof(int) \
 		? (Tcl_DictObjSize)((interp), (dictPtr), (size_t *)(void *)(sizePtr)) \
 		: TclDictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)))
-#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(size_t) \
+#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
 		? (Tcl_SplitList)((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)) \
 		: TclSplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)))
-#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(size_t) \
+#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
 		? (Tcl_SplitPath)((path), (size_t *)(void *)(argcPtr), (argvPtr)) \
 		: TclSplitPath((path), (int *)(void *)(argcPtr), (argvPtr)))
-#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(size_t) \
+#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) != sizeof(int) \
 		? (Tcl_FSSplitPath)((pathPtr), (size_t *)(void *)(lenPtr)) \
 		: TclFSSplitPath((pathPtr), (int *)(void *)(lenPtr)))
-#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(size_t) \
+#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) != sizeof(int) \
 		? (Tcl_ParseArgsObjv)((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)) \
 		: TclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)))
 #endif
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 721c8ea..030fd0a 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -95,7 +95,7 @@ int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
     size_t n = TCL_INDEX_NONE;
     int result = Tcl_ListObjGetElements(interp, listPtr, &n, objvPtr);
     if (objcPtr) {
-	if ((result == TCL_OK) && (n > INT_MAX)) {
+	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
 		Tcl_AppendResult(interp, "List too large to be processed", NULL);
 	    }
@@ -110,7 +110,7 @@ int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
     size_t n = TCL_INDEX_NONE;
     int result = Tcl_ListObjLength(interp, listPtr, &n);
     if (lengthPtr) {
-	if ((result == TCL_OK) && (n > INT_MAX)) {
+	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
 		Tcl_AppendResult(interp, "List too large to be processed", NULL);
 	    }
@@ -125,7 +125,7 @@ int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
     size_t n = TCL_INDEX_NONE;
     int result = Tcl_DictObjSize(interp, dictPtr, &n);
     if (sizePtr) {
-	if ((result == TCL_OK) && (n > INT_MAX)) {
+	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
 		Tcl_AppendResult(interp, "Dict too large to be processed", NULL);
 	    }
@@ -140,7 +140,7 @@ int TclSplitList(Tcl_Interp *interp, const char *listStr, int *argcPtr,
     size_t n = TCL_INDEX_NONE;
     int result = Tcl_SplitList(interp, listStr, &n, argvPtr);
     if (argcPtr) {
-	if ((result == TCL_OK) && (n > INT_MAX)) {
+	if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) {
 	    if (interp) {
 		Tcl_AppendResult(interp, "List too large to be processed", NULL);
 	    }
@@ -155,7 +155,7 @@ void TclSplitPath(const char *path, int *argcPtr, const char ***argvPtr) {
     size_t n = TCL_INDEX_NONE;
     Tcl_SplitPath(path, &n, argvPtr);
     if (argcPtr) {
-	if (n > INT_MAX) {
+	if ((sizeof(int) != sizeof(size_t)) && (n > INT_MAX)) {
 	    n = TCL_INDEX_NONE; /* No other way to return an error-situation */
 	    Tcl_Free((void *)*argvPtr);
 	    *argvPtr = NULL;
@@ -167,7 +167,7 @@ Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, int *lenPtr) {
     size_t n = TCL_INDEX_NONE;
     Tcl_Obj *result = Tcl_FSSplitPath(pathPtr, &n);
     if (lenPtr) {
-	if (result && (n > INT_MAX)) {
+	if ((sizeof(int) != sizeof(size_t)) && result && (n > INT_MAX)) {
 	    Tcl_DecrRefCount(result);
 	    return NULL;
 	}
-- 
cgit v0.12


From 21b41010750dbec0d33b56bb9ad2e39ba55eaf1b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Jun 2022 21:23:17 +0000
Subject: Handle Tcl_GetByteArrayFromObj() better

---
 generic/tcl.decls     |   2 +
 generic/tclBinary.c   |  37 ---------------
 generic/tclDecls.h    | 125 ++++++++++++++++++++++++++------------------------
 generic/tclStubInit.c |   4 ++
 4 files changed, 72 insertions(+), 96 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 1e16c5e..683863b 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -144,6 +144,7 @@ declare 32 {
     int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    int *intPtr)
 }
+# Only available in Tcl 8.x, NULL in Tcl 9.0
 declare 33 {
     unsigned char *TclGetByteArrayFromObj(Tcl_Obj *objPtr, int *numBytesPtr)
 }
@@ -2480,6 +2481,7 @@ declare 651 {
 declare 652 {
     Tcl_UniChar *Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr, size_t *lengthPtr)
 }
+# Only available in Tcl 8.x, NULL in Tcl 9.0
 declare 653 {
     unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, size_t *numBytesPtr)
 }
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index a45e4b2..90efc9f 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -408,43 +408,6 @@ TclGetBytesFromObj(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_GetByteArrayFromObj --
- *
- *	Attempt to get the array of bytes from the Tcl object. If the object
- *	is not already a ByteArray object, an attempt will be made to convert
- *	it to one.
- *
- * Results:
- *	Pointer to array of bytes representing the ByteArray object.
- *
- * Side effects:
- *	Frees old internal rep. Allocates memory for new internal rep.
- *
- *----------------------------------------------------------------------
- */
-
-#undef Tcl_GetByteArrayFromObj
-unsigned char *
-TclGetByteArrayFromObj(
-    Tcl_Obj *objPtr,		/* The ByteArray object. */
-    int *numBytesPtr)		/* If non-NULL, write the number of bytes
-				 * in the array here */
-{
-    return TclGetBytesFromObj(NULL, objPtr, numBytesPtr);
-}
-
-unsigned char *
-Tcl_GetByteArrayFromObj(
-    Tcl_Obj *objPtr,		/* The ByteArray object. */
-    size_t *numBytesPtr)	/* If non-NULL, write the number of bytes
-				 * in the array here */
-{
-    return Tcl_GetBytesFromObj(NULL, objPtr, numBytesPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * Tcl_SetByteArrayLength --
  *
  *	This procedure changes the length of the byte array for this object.
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 20ba011..ae8e90c 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3948,45 +3948,52 @@ extern const TclStubs *tclStubsPtr;
 #undef Tcl_GetUnicodeFromObj
 #undef Tcl_GetByteArrayFromObj
 #if defined(USE_TCL_STUBS)
-#define Tcl_GetStringFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? \
-		tclStubsPtr->tclGetStringFromObj(objPtr, (int *)(void *)(sizePtr)) : \
-		tclStubsPtr->tcl_GetStringFromObj(objPtr, (size_t *)(void *)(sizePtr)))
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? \
 		tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(void *)(sizePtr)) : \
 		tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)(void *)(sizePtr)))
+#define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
+	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), \
+		(flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+#define Tcl_GetStringFromObj(objPtr, sizePtr) \
+	(sizeof(*(sizePtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclGetStringFromObj(objPtr, (int *)(void *)(sizePtr)) : \
+		tclStubsPtr->tcl_GetStringFromObj(objPtr, (size_t *)(void *)(sizePtr)))
+#if TCL_MAJOR_VERSION > 8
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? \
 		tclStubsPtr->tclGetBytesFromObj(NULL, objPtr, (int *)(void *)(sizePtr)) : \
 		tclStubsPtr->tcl_GetBytesFromObj(NULL, objPtr, (size_t *)(void *)(sizePtr)))
+#else
+#define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
+	(sizeof(*(sizePtr)) <= sizeof(int) ? \
+		tclStubsPtr->tclGetByteArrayFromObj(objPtr, (int *)(void *)(sizePtr)) : \
+		tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (size_t *)(void *)(sizePtr)))
+#endif
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? \
 		tclStubsPtr->tclGetUnicodeFromObj(objPtr, (int *)(void *)(sizePtr)) : \
 		tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (size_t *)(void *)(sizePtr)))
+#else
+#define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
+	(sizeof(*(sizePtr)) <= sizeof(int) ? \
+		TclGetBytesFromObj(interp, objPtr, (int *)(void *)(sizePtr)) : \
+		(Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(void *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
-	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), \
+	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), \
 		(flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
-#else
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? \
-		(TclGetStringFromObj)(objPtr, (int *)(void *)(sizePtr)) : \
+		TclGetStringFromObj(objPtr, (int *)(void *)(sizePtr)) : \
 		(Tcl_GetStringFromObj)(objPtr, (size_t *)(void *)(sizePtr)))
-#define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? \
-		(TclGetBytesFromObj)(interp, objPtr, (int *)(void *)(sizePtr)) : \
-		(Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(void *)(sizePtr)))
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? \
-		(TclGetBytesFromObj)(NULL, objPtr, (int *)(void *)(sizePtr)) : \
+		TclGetBytesFromObj(NULL, objPtr, (int *)(void *)(sizePtr)) : \
 		(Tcl_GetBytesFromObj)(NULL, objPtr, (size_t *)(void *)(sizePtr)))
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? \
-		(TclGetUnicodeFromObj)(objPtr, (int *)(void *)(sizePtr)) : \
-		Tcl_GetUnicodeFromObj(objPtr, (size_t *)(void *)(sizePtr)))
-#define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
-	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), \
-		(flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+		TclGetUnicodeFromObj(objPtr, (int *)(void *)(sizePtr)) : \
+		(Tcl_GetUnicodeFromObj)(objPtr, (size_t *)(void *)(sizePtr)))
 #endif
 
 #ifdef TCL_MEM_DEBUG
@@ -4051,33 +4058,33 @@ extern const TclStubs *tclStubsPtr;
 		? (Tcl_Size (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
 #   undef Tcl_ListObjGetElements
-#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) != sizeof(int) \
-		? tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)) \
-		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)))
+#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
+		? tclStubsPtr->tclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
+		: tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)))
 #   undef Tcl_ListObjLength
-#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) != sizeof(int) \
-		? tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (size_t *)(void *)(lengthPtr)) \
-		: tclStubsPtr->tclListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)))
+#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
+		? tclStubsPtr->tclListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)) \
+		: tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (size_t *)(void *)(lengthPtr)))
 #   undef Tcl_DictObjSize
-#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) != sizeof(int) \
-		? tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (size_t *)(void *)(sizePtr)) \
-		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)))
+#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
+		? tclStubsPtr->tclDictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)) \
+		: tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (size_t *)(void *)(sizePtr)))
 #   undef Tcl_SplitList
-#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
-		? tclStubsPtr->tcl_SplitList((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)))
+#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
+		? tclStubsPtr->tclSplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
+		: tclStubsPtr->tcl_SplitList((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_SplitPath
-#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
-		? tclStubsPtr->tcl_SplitPath((path), (size_t *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitPath((path), (int *)(void *)(argcPtr), (argvPtr)))
+#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
+		? tclStubsPtr->tclSplitPath((path), (int *)(void *)(argcPtr), (argvPtr)) \
+		: tclStubsPtr->tcl_SplitPath((path), (size_t *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_FSSplitPath
-#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) != sizeof(int) \
-		? tclStubsPtr->tcl_FSSplitPath((pathPtr), (size_t *)(void *)(lenPtr)) \
-		: tclStubsPtr->tclFSSplitPath((pathPtr), (int *)(void *)(lenPtr)))
+#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
+		? tclStubsPtr->tclFSSplitPath((pathPtr), (int *)(void *)(lenPtr)) \
+		: tclStubsPtr->tcl_FSSplitPath((pathPtr), (size_t *)(void *)(lenPtr)))
 #   undef Tcl_ParseArgsObjv
-#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) != sizeof(int) \
-		? tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)) \
-		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)))
+#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
+		? tclStubsPtr->tclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
+		: tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
 #else
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
 		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
@@ -4091,27 +4098,27 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
 		? (Tcl_Size (*)(wchar_t *))Tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
-#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) != sizeof(int) \
-		? (Tcl_ListObjGetElements)((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)) \
-		: TclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)))
-#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) != sizeof(int) \
-		? (Tcl_ListObjLength)((interp), (listPtr), (size_t *)(void *)(lengthPtr)) \
-		: TclListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)))
-#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) != sizeof(int) \
-		? (Tcl_DictObjSize)((interp), (dictPtr), (size_t *)(void *)(sizePtr)) \
-		: TclDictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)))
-#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
-		? (Tcl_SplitList)((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)))
-#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) != sizeof(int) \
-		? (Tcl_SplitPath)((path), (size_t *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitPath((path), (int *)(void *)(argcPtr), (argvPtr)))
-#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) != sizeof(int) \
-		? (Tcl_FSSplitPath)((pathPtr), (size_t *)(void *)(lenPtr)) \
-		: TclFSSplitPath((pathPtr), (int *)(void *)(lenPtr)))
-#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) != sizeof(int) \
-		? (Tcl_ParseArgsObjv)((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)) \
-		: TclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)))
+#   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
+		? TclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
+		: (Tcl_ListObjGetElements)((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)))
+#   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
+		? TclListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)) \
+		: (Tcl_ListObjLength)((interp), (listPtr), (size_t *)(void *)(lengthPtr)))
+#   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
+		? TclDictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)) \
+		: (Tcl_DictObjSize)((interp), (dictPtr), (size_t *)(void *)(sizePtr)))
+#   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
+		? TclSplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
+		: (Tcl_SplitList)((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)))
+#   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
+		? TclSplitPath((path), (int *)(void *)(argcPtr), (argvPtr)) \
+		: (Tcl_SplitPath)((path), (size_t *)(void *)(argcPtr), (argvPtr)))
+#   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
+		? TclFSSplitPath((pathPtr), (int *)(void *)(lenPtr)) \
+		: (Tcl_FSSplitPath)((pathPtr), (size_t *)(void *)(lenPtr)))
+#   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
+		? TclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
+		: (Tcl_ParseArgsObjv)((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
 #endif
 
 /*
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 030fd0a..0bbf756 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -73,6 +73,10 @@
 #endif
 #undef Tcl_Close
 #define Tcl_Close 0
+#undef TclGetByteArrayFromObj
+#define TclGetByteArrayFromObj 0
+#undef Tcl_GetByteArrayFromObj
+#define Tcl_GetByteArrayFromObj 0
 
 
 #if TCL_UTF_MAX < 4
-- 
cgit v0.12


From 887f84bb457ee952ff10f6d891037fbe2e1e739c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 13 Jun 2022 07:32:21 +0000
Subject: Use TCL_8_COMPAT to change Tcl_Size to ptrdiff_t

---
 generic/tcl.h        | 11 ++++++++---
 generic/tclBasic.c   |  2 +-
 generic/tclCompile.c |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 4e5fc31..f81aad9 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -671,10 +671,15 @@ typedef union Tcl_ObjInternalRep {	/* The internal representation: */
  * An object stores a value as either a string, some internal representation,
  * or both.
  */
-#if TCL_MAJOR_VERSION > 8
-#   define Tcl_Size size_t
-#else
+#if TCL_MAJOR_VERSION < 9
 #   define Tcl_Size int
+#elif defined(TCL_8_COMPAT)
+#   ifdef BUILD_tcl
+#	error "TCL_8_COMPAT not supported when building Tcl"
+#   endif
+#   define Tcl_Size ptrdiff_t
+#else
+#   define Tcl_Size size_t
 #endif
 
 
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 422445c..1d4b686 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5197,7 +5197,7 @@ TclEvalEx(
 		wordStart = tokenPtr->start;
 
 		lines[objectsUsed] = TclWordKnownAtCompileTime(tokenPtr, NULL)
-			? wordLine : -1;
+			? wordLine : TCL_INDEX_NONE;
 
 		if (eeFramePtr->type == TCL_LOCATION_SOURCE) {
 		    iPtr->evalFlags |= TCL_EVAL_FILE;
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 77181ed..f60459b 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -3330,7 +3330,7 @@ EnterCmdWordData(
 	/* See Ticket 4b61afd660 */
 	wwlines[wordIdx] =
 		((wordIdx == 0) || TclWordKnownAtCompileTime(tokenPtr, NULL))
-		? wordLine : -1;
+		? wordLine : TCL_INDEX_NONE;
 	ePtr->line[wordIdx] = wordLine;
 	ePtr->next[wordIdx] = wordNext;
 	last = tokenPtr->start;
-- 
cgit v0.12


From 94394a076d75649ea7a6d3d9890d15131d6d04b0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 13 Jun 2022 13:46:45 +0000
Subject: Use Tcl_Size in dde/registry

---
 win/tclWinDde.c | 60 +++++++++++++++------------------------------------------
 win/tclWinReg.c | 38 +++++++++---------------------------
 2 files changed, 25 insertions(+), 73 deletions(-)

diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 2570954..696f273 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -125,27 +125,9 @@ static int		DdeObjCmd(void *clientData,
 #   define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString
 #   define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString
 # endif
+# define Tcl_Size int
 #endif
 
-static unsigned char *
-getByteArrayFromObj(
-	Tcl_Obj *objPtr,
-	size_t *lengthPtr
-) {
-    int length;
-
-    unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &length);
-#if TCL_MAJOR_VERSION > 8
-    if (sizeof(TCL_HASH_TYPE) > sizeof(int)) {
-	/* 64-bit and TIP #494 situation: */
-	 *lengthPtr = *(TCL_HASH_TYPE *) objPtr->internalRep.twoPtrValue.ptr1;
-    } else
-#endif
-	/* 32-bit or without TIP #494 */
-    *lengthPtr = (size_t) (unsigned) length;
-    return result;
-}
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -647,7 +629,7 @@ DdeServerProc(
 				/* Transaction-dependent data. */
 {
     Tcl_DString dString;
-    size_t len;
+    Tcl_Size len;
     DWORD dlen;
     WCHAR *utilString;
     Tcl_Obj *ddeObjectPtr;
@@ -767,8 +749,7 @@ DdeServerProc(
 		    CP_WINUNICODE);
 	    if (_wcsicmp(utilString, TCL_DDE_EXECUTE_RESULT) == 0) {
 		returnString =
-			Tcl_GetString(convPtr->returnPackagePtr);
-		len = convPtr->returnPackagePtr->length;
+			Tcl_GetStringFromObj(convPtr->returnPackagePtr, &len);
 		if (uFmt != CF_TEXT) {
 		    Tcl_DStringInit(&dsBuf);
 		    Tcl_UtfToWCharDString(returnString, len, &dsBuf);
@@ -790,8 +771,7 @@ DdeServerProc(
 			    convPtr->riPtr->interp, Tcl_DStringValue(&ds), NULL,
 			    TCL_GLOBAL_ONLY);
 		    if (variableObjPtr != NULL) {
-			returnString = Tcl_GetString(variableObjPtr);
-			len = variableObjPtr->length;
+			returnString = Tcl_GetStringFromObj(variableObjPtr, &len);
 			if (uFmt != CF_TEXT) {
 			    Tcl_DStringInit(&dsBuf);
 			    Tcl_UtfToWCharDString(returnString, len, &dsBuf);
@@ -939,8 +919,7 @@ DdeServerProc(
 	 */
 
 	HSZPAIR *returnPtr;
-	int i;
-	int numItems;
+	Tcl_Size i, numItems;
 
 	for (i = 0, riPtr = tsdPtr->interpListPtr; riPtr != NULL;
 		i++, riPtr = riPtr->nextPtr) {
@@ -1325,7 +1304,7 @@ DdeObjCmd(
     };
 
     int index, i, argIndex;
-    size_t length;
+    Tcl_Size length;
     int flags = 0, result = TCL_OK, firstArg = 0;
     HSZ ddeService = NULL, ddeTopic = NULL, ddeItem = NULL, ddeCookie = NULL;
     HDDEDATA ddeData = NULL, ddeItemData = NULL, ddeReturn;
@@ -1488,9 +1467,8 @@ DdeObjCmd(
     Initialize();
 
     if (firstArg != 1) {
-	const char *src = Tcl_GetString(objv[firstArg]);
+	const char *src = Tcl_GetStringFromObj(objv[firstArg], &length);
 
-	length = objv[firstArg]->length;
 	Tcl_DStringInit(&serviceBuf);
 	Tcl_UtfToWCharDString(src, length, &serviceBuf);
 	serviceName = (WCHAR *) Tcl_DStringValue(&serviceBuf);
@@ -1507,9 +1485,8 @@ DdeObjCmd(
     }
 
     if ((index != DDE_SERVERNAME) && (index != DDE_EVAL)) {
-	const char *src = Tcl_GetString(objv[firstArg + 1]);
+	const char *src = Tcl_GetStringFromObj(objv[firstArg + 1], &length);
 
-	length = objv[firstArg + 1]->length;
 	Tcl_DStringInit(&topicBuf);
 	topicName = Tcl_UtfToWCharDString(src, length, &topicBuf);
 	length = Tcl_DStringLength(&topicBuf) / sizeof(WCHAR);
@@ -1539,19 +1516,18 @@ DdeObjCmd(
 	break;
 
     case DDE_EXECUTE: {
-	size_t dataLength;
+	Tcl_Size dataLength;
 	const void *dataString;
 	Tcl_DString dsBuf;
 
 	Tcl_DStringInit(&dsBuf);
 	if (flags & DDE_FLAG_BINARY) {
 	    dataString =
-		    getByteArrayFromObj(objv[firstArg + 2], &dataLength);
+		    Tcl_GetByteArrayFromObj(objv[firstArg + 2], &dataLength);
 	} else {
 	    const char *src;
 
-	    src = Tcl_GetString(objv[firstArg + 2]);
-	    dataLength = objv[firstArg + 2]->length;
+	    src = Tcl_GetStringFromObj(objv[firstArg + 2], &dataLength);
 	    Tcl_DStringInit(&dsBuf);
 	    dataString =
 		    Tcl_UtfToWCharDString(src, dataLength, &dsBuf);
@@ -1604,8 +1580,7 @@ DdeObjCmd(
 	const WCHAR *itemString;
 	const char *src;
 
-	src = Tcl_GetString(objv[firstArg + 2]);
-	length = objv[firstArg + 2]->length;
+	src = Tcl_GetStringFromObj(objv[firstArg + 2], &length);
 	Tcl_DStringInit(&itemBuf);
 	itemString = Tcl_UtfToWCharDString(src, length, &itemBuf);
 	length = Tcl_DStringLength(&itemBuf) / sizeof(WCHAR);
@@ -1672,8 +1647,7 @@ DdeObjCmd(
 	BYTE *dataString;
 	const char *src;
 
-	src = Tcl_GetString(objv[firstArg + 2]);
-	length = objv[firstArg + 2]->length;
+	src = Tcl_GetStringFromObj(objv[firstArg + 2], &length);
 	Tcl_DStringInit(&itemBuf);
 	itemString = Tcl_UtfToWCharDString(src, length, &itemBuf);
 	length = Tcl_DStringLength(&itemBuf) / sizeof(WCHAR);
@@ -1687,11 +1661,10 @@ DdeObjCmd(
 	Tcl_DStringInit(&dsBuf);
 	if (flags & DDE_FLAG_BINARY) {
 	    dataString = (BYTE *)
-		    getByteArrayFromObj(objv[firstArg + 3], &length);
+		    Tcl_GetByteArrayFromObj(objv[firstArg + 3], &length);
 	} else {
 	    const char *data =
-		    Tcl_GetString(objv[firstArg + 3]);
-	    length = objv[firstArg + 3]->length;
+		    Tcl_GetStringFromObj(objv[firstArg + 3], &length);
 	    Tcl_DStringInit(&dsBuf);
 	    dataString = (BYTE *)
 		    Tcl_UtfToWCharDString(data, length, &dsBuf);
@@ -1855,8 +1828,7 @@ DdeObjCmd(
 	    }
 
 	    objPtr = Tcl_ConcatObj(objc, objv);
-	    string = Tcl_GetString(objPtr);
-	    length = objPtr->length;
+	    string = Tcl_GetStringFromObj(objPtr, &length);
 	    Tcl_DStringInit(&dsBuf);
 	    Tcl_UtfToWCharDString(string, length, &dsBuf);
 	    string = Tcl_DStringValue(&dsBuf);
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 998521c..57cf0c6 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -134,25 +134,6 @@ static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
 # endif
 #endif
 
-static unsigned char *
-getByteArrayFromObj(
-	Tcl_Obj *objPtr,
-	size_t *lengthPtr
-) {
-    int length;
-
-    unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &length);
-#if TCL_MAJOR_VERSION > 8
-    if (sizeof(TCL_HASH_TYPE) > sizeof(int)) {
-	/* 64-bit and TIP #494 situation: */
-	 *lengthPtr = *(TCL_HASH_TYPE *) objPtr->internalRep.twoPtrValue.ptr1;
-    } else
-#endif
-	/* 32-bit or without TIP #494 */
-    *lengthPtr = (size_t) (unsigned) length;
-    return result;
-}
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1289,8 +1270,8 @@ SetValue(
     if (typeObj == NULL) {
 	type = REG_SZ;
     } else if (Tcl_GetIndexFromObj(interp, typeObj, typeNames, "type",
-	    0, (int *) &type) != TCL_OK) {
-	if (Tcl_GetIntFromObj(NULL, typeObj, (int *) &type) != TCL_OK) {
+	    0, &type) != TCL_OK) {
+	if (Tcl_GetIntFromObj(NULL, typeObj, &type) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	Tcl_ResetResult(interp);
@@ -1318,7 +1299,7 @@ SetValue(
 		(DWORD) type, (BYTE *) &value, sizeof(DWORD));
     } else if (type == REG_MULTI_SZ) {
 	Tcl_DString data, buf;
-	int objc, i;
+	Tcl_Size objc, i;
 	Tcl_Obj **objv;
 
 	if (Tcl_ListObjGetElements(interp, dataObj, &objc, &objv) != TCL_OK) {
@@ -1372,13 +1353,13 @@ SetValue(
 	Tcl_DStringFree(&buf);
     } else {
 	BYTE *data;
-	size_t bytelength;
+	Tcl_Size bytelength;
 
 	/*
 	 * Store binary data in the registry.
 	 */
 
-	data = (BYTE *) getByteArrayFromObj(dataObj, &bytelength);
+	data = (BYTE *) Tcl_GetByteArrayFromObj(dataObj, &bytelength);
 	result = RegSetValueExW(key, (WCHAR *) valueName, 0,
 		(DWORD) type, data, (DWORD) bytelength);
     }
@@ -1421,15 +1402,14 @@ BroadcastValue(
     LRESULT result;
     DWORD_PTR sendResult;
     int timeout = 3000;
-    size_t len;
+    Tcl_Size len;
     const char *str;
     Tcl_Obj *objPtr;
     WCHAR *wstr;
     Tcl_DString ds;
 
     if (objc == 3) {
-	str = Tcl_GetString(objv[1]);
-	len = objv[1]->length;
+	str = Tcl_GetStringFromObj(objv[1], &len);
 	if ((len < 2) || (*str != '-') || strncmp(str, "-timeout", len)) {
 	    return TCL_BREAK;
 	}
@@ -1438,9 +1418,9 @@ BroadcastValue(
 	}
     }
 
-    str = Tcl_GetString(objv[0]);
+    str = Tcl_GetStringFromObj(objv[0], &len);
     Tcl_DStringInit(&ds);
-    wstr = Tcl_UtfToWCharDString(str, objv[0]->length, &ds);
+    wstr = Tcl_UtfToWCharDString(str, len, &ds);
     if (Tcl_DStringLength(&ds) == 0) {
 	wstr = NULL;
     }
-- 
cgit v0.12


From 573a1e921995ebff38426b73818fc32d234c9efa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Jun 2022 15:13:48 +0000
Subject: More Tcl_Size

---
 generic/tclInt.decls  | 52 ++++++++++++++---------------
 generic/tclIntDecls.h | 90 +++++++++++++++++++++++++--------------------------
 generic/tclProc.c     |  2 +-
 3 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 9a92888..7e73d58 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -28,18 +28,18 @@ declare 3 {
     void TclAllocateFreeObjects(void)
 }
 declare 5 {
-    int TclCleanupChildren(Tcl_Interp *interp, size_t numPids, Tcl_Pid *pidPtr,
+    int TclCleanupChildren(Tcl_Interp *interp, Tcl_Size numPids, Tcl_Pid *pidPtr,
 	    Tcl_Channel errorChan)
 }
 declare 6 {
     void TclCleanupCommand(Command *cmdPtr)
 }
 declare 7 {
-    size_t TclCopyAndCollapse(size_t count, const char *src, char *dst)
+    Tcl_Size TclCopyAndCollapse(Tcl_Size count, const char *src, char *dst)
 }
 # TclCreatePipeline unofficially exported for use by BLT.
 declare 9 {
-    size_t TclCreatePipeline(Tcl_Interp *interp, size_t argc, const char **argv,
+    Tcl_Size TclCreatePipeline(Tcl_Interp *interp, Tcl_Size argc, const char **argv,
 	    Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr,
 	    TclFile *errFilePtr)
 }
@@ -63,7 +63,7 @@ declare 16 {
 declare 22 {
     int TclFindElement(Tcl_Interp *interp, const char *listStr,
 	    int listLength, const char **elementPtr, const char **nextPtr,
-	    size_t *sizePtr, int *bracePtr)
+	    Tcl_Size *sizePtr, int *bracePtr)
 }
 declare 23 {
     Proc *TclFindProc(Interp *iPtr, const char *procName)
@@ -146,7 +146,7 @@ declare 64 {
 	    int flags)
 }
 declare 69 {
-    void *TclpAlloc(size_t size)
+    void *TclpAlloc(TCL_HASH_TYPE size)
 }
 declare 74 {
     void TclpFree(void *ptr)
@@ -158,7 +158,7 @@ declare 76 {
     unsigned long long TclpGetSeconds(void)
 }
 declare 81 {
-    void *TclpRealloc(void *ptr, size_t size)
+    void *TclpRealloc(void *ptr, TCL_HASH_TYPE size)
 }
 declare 89 {
     int TclPreventAliasLoop(Tcl_Interp *interp, Tcl_Interp *cmdInterp,
@@ -203,7 +203,7 @@ declare 109 {
     int TclUpdateReturnInfo(Interp *iPtr)
 }
 declare 110 {
-    int TclSockMinimumBuffers(void *sock, size_t size)
+    int TclSockMinimumBuffers(void *sock, Tcl_Size size)
 }
 # Removed in 8.1:
 #  declare 110 {
@@ -264,7 +264,7 @@ declare 142 {
 	    CompileHookProc *hookProc, void *clientData)
 }
 declare 143 {
-    size_t TclAddLiteralObj(struct CompileEnv *envPtr, Tcl_Obj *objPtr,
+    Tcl_Size TclAddLiteralObj(struct CompileEnv *envPtr, Tcl_Obj *objPtr,
 	    LiteralEntry **litPtrPtr)
 }
 declare 144 {
@@ -290,8 +290,8 @@ declare 150 {
     int TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re)
 }
 declare 151 {
-    void TclRegExpRangeUniChar(Tcl_RegExp re, size_t index, size_t *startPtr,
-	    size_t *endPtr)
+    void TclRegExpRangeUniChar(Tcl_RegExp re, Tcl_Size index, Tcl_Size *startPtr,
+	    Tcl_Size *endPtr)
 }
 declare 152 {
     void TclSetLibraryPath(Tcl_Obj *pathPtr)
@@ -339,7 +339,7 @@ declare 165 {
 # New function due to TIP #33
 declare 166 {
     int TclListObjSetElement(Tcl_Interp *interp, Tcl_Obj *listPtr,
-	    size_t index, Tcl_Obj *valuePtr)
+	    Tcl_Size index, Tcl_Obj *valuePtr)
 }
 
 # variant of Tcl_UtfNCmp that takes n as bytes, not chars
@@ -348,20 +348,20 @@ declare 169 {
 }
 declare 170 {
     int TclCheckInterpTraces(Tcl_Interp *interp, const char *command,
-	    size_t numChars, Command *cmdPtr, int result, int traceFlags,
-	    size_t objc, Tcl_Obj *const objv[])
+	    Tcl_Size numChars, Command *cmdPtr, int result, int traceFlags,
+	    Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 171 {
     int TclCheckExecutionTraces(Tcl_Interp *interp, const char *command,
-	    size_t numChars, Command *cmdPtr, int result, int traceFlags,
-	    size_t objc, Tcl_Obj *const objv[])
+	    Tcl_Size numChars, Command *cmdPtr, int result, int traceFlags,
+	    Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 172 {
     int TclInThreadExit(void)
 }
 declare 173 {
-    int TclUniCharMatch(const Tcl_UniChar *string, size_t strLen,
-	    const Tcl_UniChar *pattern, size_t ptnLen, int flags)
+    int TclUniCharMatch(const Tcl_UniChar *string, Tcl_Size strLen,
+	    const Tcl_UniChar *pattern, Tcl_Size ptnLen, int flags)
 }
 declare 175 {
     int TclCallVarTraces(Interp *iPtr, Var *arrayPtr, Var *varPtr,
@@ -419,7 +419,7 @@ declare 214 {
     void TclSetObjNameOfExecutable(Tcl_Obj *name, Tcl_Encoding encoding)
 }
 declare 215 {
-    void *TclStackAlloc(Tcl_Interp *interp, size_t numBytes)
+    void *TclStackAlloc(Tcl_Interp *interp, Tcl_Size numBytes)
 }
 declare 216 {
     void TclStackFree(Tcl_Interp *interp, void *freePtr)
@@ -438,13 +438,13 @@ declare 224 {
 }
 declare 225 {
     Tcl_Obj *TclTraceDictPath(Tcl_Interp *interp, Tcl_Obj *rootPtr,
-	    size_t keyc, Tcl_Obj *const keyv[], int flags)
+	    Tcl_Size keyc, Tcl_Obj *const keyv[], int flags)
 }
 declare 226 {
     int TclObjBeingDeleted(Tcl_Obj *objPtr)
 }
 declare 227 {
-    void TclSetNsPath(Namespace *nsPtr, size_t pathLength,
+    void TclSetNsPath(Namespace *nsPtr, Tcl_Size pathLength,
             Tcl_Namespace *pathAry[])
 }
 declare 229 {
@@ -492,7 +492,7 @@ declare 238 {
 }
 declare 239 {
     int TclNRInterpProcCore(Tcl_Interp *interp, Tcl_Obj *procNameObj,
-			    size_t skip, ProcErrorProc *errorProc)
+	    Tcl_Size skip, ProcErrorProc *errorProc)
 }
 declare 240 {
     int TclNRRunCallbacks(Tcl_Interp *interp, int result,
@@ -503,7 +503,7 @@ declare 241 {
 	    const CmdFrame *invoker, int word)
 }
 declare 242 {
-    int TclNREvalObjv(Tcl_Interp *interp, size_t objc,
+    int TclNREvalObjv(Tcl_Interp *interp, Tcl_Size objc,
 	      Tcl_Obj *const objv[], int flags, Command *cmdPtr)
 }
 
@@ -520,8 +520,8 @@ declare 245 {
     Tcl_HashTable *TclGetNamespaceCommandTable(Tcl_Namespace *nsPtr)
 }
 declare 246 {
-    int TclInitRewriteEnsemble(Tcl_Interp *interp, size_t numRemoved,
-	    size_t numInserted, Tcl_Obj *const *objv)
+    int TclInitRewriteEnsemble(Tcl_Interp *interp, Tcl_Size numRemoved,
+	    Tcl_Size numInserted, Tcl_Obj *const *objv)
 }
 declare 247 {
     void TclResetRewriteEnsemble(Tcl_Interp *interp, int isRootEnsemble)
@@ -543,8 +543,8 @@ declare 250 {
 
 # Allow extensions for optimization
 declare 251 {
-    size_t TclRegisterLiteral(void *envPtr,
-	    const char *bytes, size_t length, int flags)
+    Tcl_Size TclRegisterLiteral(void *envPtr,
+	    const char *bytes, Tcl_Size length, int flags)
 }
 
 # Exporting of the internal API to variables.
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index d3c05d5..d71f355 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -51,16 +51,16 @@ EXTERN void		TclAllocateFreeObjects(void);
 /* Slot 4 is reserved */
 /* 5 */
 EXTERN int		TclCleanupChildren(Tcl_Interp *interp,
-				size_t numPids, Tcl_Pid *pidPtr,
+				Tcl_Size numPids, Tcl_Pid *pidPtr,
 				Tcl_Channel errorChan);
 /* 6 */
 EXTERN void		TclCleanupCommand(Command *cmdPtr);
 /* 7 */
-EXTERN size_t		TclCopyAndCollapse(size_t count, const char *src,
+EXTERN Tcl_Size		TclCopyAndCollapse(Tcl_Size count, const char *src,
 				char *dst);
 /* Slot 8 is reserved */
 /* 9 */
-EXTERN size_t		TclCreatePipeline(Tcl_Interp *interp, size_t argc,
+EXTERN Tcl_Size		TclCreatePipeline(Tcl_Interp *interp, Tcl_Size argc,
 				const char **argv, Tcl_Pid **pidArrayPtr,
 				TclFile *inPipePtr, TclFile *outPipePtr,
 				TclFile *errFilePtr);
@@ -89,7 +89,7 @@ EXTERN void		TclExprFloatError(Tcl_Interp *interp, double value);
 EXTERN int		TclFindElement(Tcl_Interp *interp,
 				const char *listStr, int listLength,
 				const char **elementPtr,
-				const char **nextPtr, size_t *sizePtr,
+				const char **nextPtr, Tcl_Size *sizePtr,
 				int *bracePtr);
 /* 23 */
 EXTERN Proc *		TclFindProc(Interp *iPtr, const char *procName);
@@ -179,7 +179,7 @@ EXTERN int		TclObjInvoke(Tcl_Interp *interp, int objc,
 /* Slot 67 is reserved */
 /* Slot 68 is reserved */
 /* 69 */
-EXTERN void *		TclpAlloc(size_t size);
+EXTERN void *		TclpAlloc(TCL_HASH_TYPE size);
 /* Slot 70 is reserved */
 /* Slot 71 is reserved */
 /* Slot 72 is reserved */
@@ -195,7 +195,7 @@ EXTERN unsigned long long TclpGetSeconds(void);
 /* Slot 79 is reserved */
 /* Slot 80 is reserved */
 /* 81 */
-EXTERN void *		TclpRealloc(void *ptr, size_t size);
+EXTERN void *		TclpRealloc(void *ptr, TCL_HASH_TYPE size);
 /* Slot 82 is reserved */
 /* Slot 83 is reserved */
 /* Slot 84 is reserved */
@@ -243,7 +243,7 @@ EXTERN void		TclTeardownNamespace(Namespace *nsPtr);
 /* 109 */
 EXTERN int		TclUpdateReturnInfo(Interp *iPtr);
 /* 110 */
-EXTERN int		TclSockMinimumBuffers(void *sock, size_t size);
+EXTERN int		TclSockMinimumBuffers(void *sock, Tcl_Size size);
 /* 111 */
 EXTERN void		Tcl_AddInterpResolvers(Tcl_Interp *interp,
 				const char *name,
@@ -309,7 +309,7 @@ EXTERN int		TclSetByteCodeFromAny(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, CompileHookProc *hookProc,
 				void *clientData);
 /* 143 */
-EXTERN size_t		TclAddLiteralObj(struct CompileEnv *envPtr,
+EXTERN Tcl_Size		TclAddLiteralObj(struct CompileEnv *envPtr,
 				Tcl_Obj *objPtr, LiteralEntry **litPtrPtr);
 /* 144 */
 EXTERN void		TclHideLiteral(Tcl_Interp *interp,
@@ -327,8 +327,8 @@ EXTERN void		TclHandleRelease(TclHandle handle);
 /* 150 */
 EXTERN int		TclRegAbout(Tcl_Interp *interp, Tcl_RegExp re);
 /* 151 */
-EXTERN void		TclRegExpRangeUniChar(Tcl_RegExp re, size_t index,
-				size_t *startPtr, size_t *endPtr);
+EXTERN void		TclRegExpRangeUniChar(Tcl_RegExp re, Tcl_Size index,
+				Tcl_Size *startPtr, Tcl_Size *endPtr);
 /* 152 */
 EXTERN void		TclSetLibraryPath(Tcl_Obj *pathPtr);
 /* 153 */
@@ -358,7 +358,7 @@ EXTERN void		TclExpandCodeArray(void *envPtr);
 EXTERN void		TclpSetInitialEncodings(void);
 /* 166 */
 EXTERN int		TclListObjSetElement(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, size_t index,
+				Tcl_Obj *listPtr, Tcl_Size index,
 				Tcl_Obj *valuePtr);
 /* Slot 167 is reserved */
 /* Slot 168 is reserved */
@@ -367,20 +367,20 @@ EXTERN int		TclpUtfNcmp2(const char *s1, const char *s2,
 				size_t n);
 /* 170 */
 EXTERN int		TclCheckInterpTraces(Tcl_Interp *interp,
-				const char *command, size_t numChars,
+				const char *command, Tcl_Size numChars,
 				Command *cmdPtr, int result, int traceFlags,
-				size_t objc, Tcl_Obj *const objv[]);
+				Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 171 */
 EXTERN int		TclCheckExecutionTraces(Tcl_Interp *interp,
-				const char *command, size_t numChars,
+				const char *command, Tcl_Size numChars,
 				Command *cmdPtr, int result, int traceFlags,
-				size_t objc, Tcl_Obj *const objv[]);
+				Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 172 */
 EXTERN int		TclInThreadExit(void);
 /* 173 */
 EXTERN int		TclUniCharMatch(const Tcl_UniChar *string,
-				size_t strLen, const Tcl_UniChar *pattern,
-				size_t ptnLen, int flags);
+				Tcl_Size strLen, const Tcl_UniChar *pattern,
+				Tcl_Size ptnLen, int flags);
 /* Slot 174 is reserved */
 /* 175 */
 EXTERN int		TclCallVarTraces(Interp *iPtr, Var *arrayPtr,
@@ -451,7 +451,7 @@ EXTERN Tcl_Obj *	TclGetObjNameOfExecutable(void);
 EXTERN void		TclSetObjNameOfExecutable(Tcl_Obj *name,
 				Tcl_Encoding encoding);
 /* 215 */
-EXTERN void *		TclStackAlloc(Tcl_Interp *interp, size_t numBytes);
+EXTERN void *		TclStackAlloc(Tcl_Interp *interp, Tcl_Size numBytes);
 /* 216 */
 EXTERN void		TclStackFree(Tcl_Interp *interp, void *freePtr);
 /* 217 */
@@ -470,12 +470,12 @@ EXTERN void		TclPopStackFrame(Tcl_Interp *interp);
 EXTERN TclPlatformType * TclGetPlatform(void);
 /* 225 */
 EXTERN Tcl_Obj *	TclTraceDictPath(Tcl_Interp *interp,
-				Tcl_Obj *rootPtr, size_t keyc,
+				Tcl_Obj *rootPtr, Tcl_Size keyc,
 				Tcl_Obj *const keyv[], int flags);
 /* 226 */
 EXTERN int		TclObjBeingDeleted(Tcl_Obj *objPtr);
 /* 227 */
-EXTERN void		TclSetNsPath(Namespace *nsPtr, size_t pathLength,
+EXTERN void		TclSetNsPath(Namespace *nsPtr, Tcl_Size pathLength,
 				Tcl_Namespace *pathAry[]);
 /* Slot 228 is reserved */
 /* 229 */
@@ -508,7 +508,7 @@ EXTERN int		TclNRInterpProc(void *clientData, Tcl_Interp *interp,
 				int objc, Tcl_Obj *const objv[]);
 /* 239 */
 EXTERN int		TclNRInterpProcCore(Tcl_Interp *interp,
-				Tcl_Obj *procNameObj, size_t skip,
+				Tcl_Obj *procNameObj, Tcl_Size skip,
 				ProcErrorProc *errorProc);
 /* 240 */
 EXTERN int		TclNRRunCallbacks(Tcl_Interp *interp, int result,
@@ -517,7 +517,7 @@ EXTERN int		TclNRRunCallbacks(Tcl_Interp *interp, int result,
 EXTERN int		TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags, const CmdFrame *invoker, int word);
 /* 242 */
-EXTERN int		TclNREvalObjv(Tcl_Interp *interp, size_t objc,
+EXTERN int		TclNREvalObjv(Tcl_Interp *interp, Tcl_Size objc,
 				Tcl_Obj *const objv[], int flags,
 				Command *cmdPtr);
 /* 243 */
@@ -528,7 +528,7 @@ EXTERN Tcl_HashTable *	TclGetNamespaceChildTable(Tcl_Namespace *nsPtr);
 EXTERN Tcl_HashTable *	TclGetNamespaceCommandTable(Tcl_Namespace *nsPtr);
 /* 246 */
 EXTERN int		TclInitRewriteEnsemble(Tcl_Interp *interp,
-				size_t numRemoved, size_t numInserted,
+				Tcl_Size numRemoved, Tcl_Size numInserted,
 				Tcl_Obj *const *objv);
 /* 247 */
 EXTERN void		TclResetRewriteEnsemble(Tcl_Interp *interp,
@@ -544,8 +544,8 @@ EXTERN char *		TclDoubleDigits(double dv, int ndigits, int flags,
 EXTERN void		TclSetChildCancelFlags(Tcl_Interp *interp, int flags,
 				int force);
 /* 251 */
-EXTERN size_t		TclRegisterLiteral(void *envPtr, const char *bytes,
-				size_t length, int flags);
+EXTERN Tcl_Size		TclRegisterLiteral(void *envPtr, const char *bytes,
+				Tcl_Size length, int flags);
 /* 252 */
 EXTERN Tcl_Obj *	TclPtrGetVar(Tcl_Interp *interp, Tcl_Var varPtr,
 				Tcl_Var arrayPtr, Tcl_Obj *part1Ptr,
@@ -586,11 +586,11 @@ typedef struct TclIntStubs {
     void (*reserved2)(void);
     void (*tclAllocateFreeObjects) (void); /* 3 */
     void (*reserved4)(void);
-    int (*tclCleanupChildren) (Tcl_Interp *interp, size_t numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan); /* 5 */
+    int (*tclCleanupChildren) (Tcl_Interp *interp, Tcl_Size numPids, Tcl_Pid *pidPtr, Tcl_Channel errorChan); /* 5 */
     void (*tclCleanupCommand) (Command *cmdPtr); /* 6 */
-    size_t (*tclCopyAndCollapse) (size_t count, const char *src, char *dst); /* 7 */
+    Tcl_Size (*tclCopyAndCollapse) (Tcl_Size count, const char *src, char *dst); /* 7 */
     void (*reserved8)(void);
-    size_t (*tclCreatePipeline) (Tcl_Interp *interp, size_t argc, const char **argv, Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, TclFile *errFilePtr); /* 9 */
+    Tcl_Size (*tclCreatePipeline) (Tcl_Interp *interp, Tcl_Size argc, const char **argv, Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, TclFile *errFilePtr); /* 9 */
     int (*tclCreateProc) (Tcl_Interp *interp, Namespace *nsPtr, const char *procName, Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr); /* 10 */
     void (*tclDeleteCompiledLocalVars) (Interp *iPtr, CallFrame *framePtr); /* 11 */
     void (*tclDeleteVars) (Interp *iPtr, TclVarHashTable *tablePtr); /* 12 */
@@ -603,7 +603,7 @@ typedef struct TclIntStubs {
     void (*reserved19)(void);
     void (*reserved20)(void);
     void (*reserved21)(void);
-    int (*tclFindElement) (Tcl_Interp *interp, const char *listStr, int listLength, const char **elementPtr, const char **nextPtr, size_t *sizePtr, int *bracePtr); /* 22 */
+    int (*tclFindElement) (Tcl_Interp *interp, const char *listStr, int listLength, const char **elementPtr, const char **nextPtr, Tcl_Size *sizePtr, int *bracePtr); /* 22 */
     Proc * (*tclFindProc) (Interp *iPtr, const char *procName); /* 23 */
     size_t (*tclFormatInt) (char *buffer, Tcl_WideInt n); /* 24 */
     void (*tclFreePackageInfo) (Interp *iPtr); /* 25 */
@@ -650,7 +650,7 @@ typedef struct TclIntStubs {
     void (*reserved66)(void);
     void (*reserved67)(void);
     void (*reserved68)(void);
-    void * (*tclpAlloc) (size_t size); /* 69 */
+    void * (*tclpAlloc) (TCL_HASH_TYPE size); /* 69 */
     void (*reserved70)(void);
     void (*reserved71)(void);
     void (*reserved72)(void);
@@ -662,7 +662,7 @@ typedef struct TclIntStubs {
     void (*reserved78)(void);
     void (*reserved79)(void);
     void (*reserved80)(void);
-    void * (*tclpRealloc) (void *ptr, size_t size); /* 81 */
+    void * (*tclpRealloc) (void *ptr, TCL_HASH_TYPE size); /* 81 */
     void (*reserved82)(void);
     void (*reserved83)(void);
     void (*reserved84)(void);
@@ -691,7 +691,7 @@ typedef struct TclIntStubs {
     void (*reserved107)(void);
     void (*tclTeardownNamespace) (Namespace *nsPtr); /* 108 */
     int (*tclUpdateReturnInfo) (Interp *iPtr); /* 109 */
-    int (*tclSockMinimumBuffers) (void *sock, size_t size); /* 110 */
+    int (*tclSockMinimumBuffers) (void *sock, Tcl_Size size); /* 110 */
     void (*tcl_AddInterpResolvers) (Tcl_Interp *interp, const char *name, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc); /* 111 */
     void (*reserved112)(void);
     void (*reserved113)(void);
@@ -724,7 +724,7 @@ typedef struct TclIntStubs {
     void (*reserved140)(void);
     const char * (*tclpGetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 141 */
     int (*tclSetByteCodeFromAny) (Tcl_Interp *interp, Tcl_Obj *objPtr, CompileHookProc *hookProc, void *clientData); /* 142 */
-    size_t (*tclAddLiteralObj) (struct CompileEnv *envPtr, Tcl_Obj *objPtr, LiteralEntry **litPtrPtr); /* 143 */
+    Tcl_Size (*tclAddLiteralObj) (struct CompileEnv *envPtr, Tcl_Obj *objPtr, LiteralEntry **litPtrPtr); /* 143 */
     void (*tclHideLiteral) (Tcl_Interp *interp, struct CompileEnv *envPtr, int index); /* 144 */
     const struct AuxDataType * (*tclGetAuxDataType) (const char *typeName); /* 145 */
     TclHandle (*tclHandleCreate) (void *ptr); /* 146 */
@@ -732,7 +732,7 @@ typedef struct TclIntStubs {
     TclHandle (*tclHandlePreserve) (TclHandle handle); /* 148 */
     void (*tclHandleRelease) (TclHandle handle); /* 149 */
     int (*tclRegAbout) (Tcl_Interp *interp, Tcl_RegExp re); /* 150 */
-    void (*tclRegExpRangeUniChar) (Tcl_RegExp re, size_t index, size_t *startPtr, size_t *endPtr); /* 151 */
+    void (*tclRegExpRangeUniChar) (Tcl_RegExp re, Tcl_Size index, Tcl_Size *startPtr, Tcl_Size *endPtr); /* 151 */
     void (*tclSetLibraryPath) (Tcl_Obj *pathPtr); /* 152 */
     Tcl_Obj * (*tclGetLibraryPath) (void); /* 153 */
     void (*reserved154)(void);
@@ -747,14 +747,14 @@ typedef struct TclIntStubs {
     const void * (*tclGetInstructionTable) (void); /* 163 */
     void (*tclExpandCodeArray) (void *envPtr); /* 164 */
     void (*tclpSetInitialEncodings) (void); /* 165 */
-    int (*tclListObjSetElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t index, Tcl_Obj *valuePtr); /* 166 */
+    int (*tclListObjSetElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size index, Tcl_Obj *valuePtr); /* 166 */
     void (*reserved167)(void);
     void (*reserved168)(void);
     int (*tclpUtfNcmp2) (const char *s1, const char *s2, size_t n); /* 169 */
-    int (*tclCheckInterpTraces) (Tcl_Interp *interp, const char *command, size_t numChars, Command *cmdPtr, int result, int traceFlags, size_t objc, Tcl_Obj *const objv[]); /* 170 */
-    int (*tclCheckExecutionTraces) (Tcl_Interp *interp, const char *command, size_t numChars, Command *cmdPtr, int result, int traceFlags, size_t objc, Tcl_Obj *const objv[]); /* 171 */
+    int (*tclCheckInterpTraces) (Tcl_Interp *interp, const char *command, Tcl_Size numChars, Command *cmdPtr, int result, int traceFlags, Tcl_Size objc, Tcl_Obj *const objv[]); /* 170 */
+    int (*tclCheckExecutionTraces) (Tcl_Interp *interp, const char *command, Tcl_Size numChars, Command *cmdPtr, int result, int traceFlags, Tcl_Size objc, Tcl_Obj *const objv[]); /* 171 */
     int (*tclInThreadExit) (void); /* 172 */
-    int (*tclUniCharMatch) (const Tcl_UniChar *string, size_t strLen, const Tcl_UniChar *pattern, size_t ptnLen, int flags); /* 173 */
+    int (*tclUniCharMatch) (const Tcl_UniChar *string, Tcl_Size strLen, const Tcl_UniChar *pattern, Tcl_Size ptnLen, int flags); /* 173 */
     void (*reserved174)(void);
     int (*tclCallVarTraces) (Interp *iPtr, Var *arrayPtr, Var *varPtr, const char *part1, const char *part2, int flags, int leaveErrMsg); /* 175 */
     void (*tclCleanupVar) (Var *varPtr, Var *arrayPtr); /* 176 */
@@ -796,7 +796,7 @@ typedef struct TclIntStubs {
     void (*tclpFindExecutable) (const char *argv0); /* 212 */
     Tcl_Obj * (*tclGetObjNameOfExecutable) (void); /* 213 */
     void (*tclSetObjNameOfExecutable) (Tcl_Obj *name, Tcl_Encoding encoding); /* 214 */
-    void * (*tclStackAlloc) (Tcl_Interp *interp, size_t numBytes); /* 215 */
+    void * (*tclStackAlloc) (Tcl_Interp *interp, Tcl_Size numBytes); /* 215 */
     void (*tclStackFree) (Tcl_Interp *interp, void *freePtr); /* 216 */
     int (*tclPushStackFrame) (Tcl_Interp *interp, Tcl_CallFrame **framePtrPtr, Tcl_Namespace *namespacePtr, int isProcCallFrame); /* 217 */
     void (*tclPopStackFrame) (Tcl_Interp *interp); /* 218 */
@@ -806,9 +806,9 @@ typedef struct TclIntStubs {
     void (*reserved222)(void);
     void (*reserved223)(void);
     TclPlatformType * (*tclGetPlatform) (void); /* 224 */
-    Tcl_Obj * (*tclTraceDictPath) (Tcl_Interp *interp, Tcl_Obj *rootPtr, size_t keyc, Tcl_Obj *const keyv[], int flags); /* 225 */
+    Tcl_Obj * (*tclTraceDictPath) (Tcl_Interp *interp, Tcl_Obj *rootPtr, Tcl_Size keyc, Tcl_Obj *const keyv[], int flags); /* 225 */
     int (*tclObjBeingDeleted) (Tcl_Obj *objPtr); /* 226 */
-    void (*tclSetNsPath) (Namespace *nsPtr, size_t pathLength, Tcl_Namespace *pathAry[]); /* 227 */
+    void (*tclSetNsPath) (Namespace *nsPtr, Tcl_Size pathLength, Tcl_Namespace *pathAry[]); /* 227 */
     void (*reserved228)(void);
     int (*tclPtrMakeUpvar) (Tcl_Interp *interp, Var *otherP1Ptr, const char *myName, int myFlags, int index); /* 229 */
     Var * (*tclObjLookupVar) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, const char *part2, int flags, const char *msg, int createPart1, int createPart2, Var **arrayPtrPtr); /* 230 */
@@ -820,19 +820,19 @@ typedef struct TclIntStubs {
     void (*reserved236)(void);
     int (*tclResetCancellation) (Tcl_Interp *interp, int force); /* 237 */
     int (*tclNRInterpProc) (void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 238 */
-    int (*tclNRInterpProcCore) (Tcl_Interp *interp, Tcl_Obj *procNameObj, size_t skip, ProcErrorProc *errorProc); /* 239 */
+    int (*tclNRInterpProcCore) (Tcl_Interp *interp, Tcl_Obj *procNameObj, Tcl_Size skip, ProcErrorProc *errorProc); /* 239 */
     int (*tclNRRunCallbacks) (Tcl_Interp *interp, int result, struct NRE_callback *rootPtr); /* 240 */
     int (*tclNREvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, const CmdFrame *invoker, int word); /* 241 */
-    int (*tclNREvalObjv) (Tcl_Interp *interp, size_t objc, Tcl_Obj *const objv[], int flags, Command *cmdPtr); /* 242 */
+    int (*tclNREvalObjv) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], int flags, Command *cmdPtr); /* 242 */
     void (*tclDbDumpActiveObjects) (FILE *outFile); /* 243 */
     Tcl_HashTable * (*tclGetNamespaceChildTable) (Tcl_Namespace *nsPtr); /* 244 */
     Tcl_HashTable * (*tclGetNamespaceCommandTable) (Tcl_Namespace *nsPtr); /* 245 */
-    int (*tclInitRewriteEnsemble) (Tcl_Interp *interp, size_t numRemoved, size_t numInserted, Tcl_Obj *const *objv); /* 246 */
+    int (*tclInitRewriteEnsemble) (Tcl_Interp *interp, Tcl_Size numRemoved, Tcl_Size numInserted, Tcl_Obj *const *objv); /* 246 */
     void (*tclResetRewriteEnsemble) (Tcl_Interp *interp, int isRootEnsemble); /* 247 */
     int (*tclCopyChannel) (Tcl_Interp *interp, Tcl_Channel inChan, Tcl_Channel outChan, long long toRead, Tcl_Obj *cmdPtr); /* 248 */
     char * (*tclDoubleDigits) (double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); /* 249 */
     void (*tclSetChildCancelFlags) (Tcl_Interp *interp, int flags, int force); /* 250 */
-    size_t (*tclRegisterLiteral) (void *envPtr, const char *bytes, size_t length, int flags); /* 251 */
+    Tcl_Size (*tclRegisterLiteral) (void *envPtr, const char *bytes, Tcl_Size length, int flags); /* 251 */
     Tcl_Obj * (*tclPtrGetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 252 */
     Tcl_Obj * (*tclPtrSetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 253 */
     Tcl_Obj * (*tclPtrIncrObjVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr, int flags); /* 254 */
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 5c7702f..e8f379d 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -2228,7 +2228,7 @@ TclUpdateReturnInfo(
 Tcl_ObjCmdProc *
 TclGetObjInterpProc(void)
 {
-    return (Tcl_ObjCmdProc *) TclObjInterpProc;
+    return TclObjInterpProc;
 }
 
 /*
-- 
cgit v0.12


From 105bdf44be38516b1fdc48557cfb55d9e440a94c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Jun 2022 21:26:54 +0000
Subject: More Tcl_Size ,

---
 generic/tclInt.decls  |   4 +-
 generic/tclInt.h      | 269 +++++++++++++++++++++++++++-----------------------
 generic/tclIntDecls.h |   8 +-
 generic/tclUtil.c     |   2 +-
 4 files changed, 154 insertions(+), 129 deletions(-)

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 7e73d58..8a4a0ca 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -62,7 +62,7 @@ declare 16 {
 }
 declare 22 {
     int TclFindElement(Tcl_Interp *interp, const char *listStr,
-	    int listLength, const char **elementPtr, const char **nextPtr,
+	    Tcl_Size listLength, const char **elementPtr, const char **nextPtr,
 	    Tcl_Size *sizePtr, int *bracePtr)
 }
 declare 23 {
@@ -70,7 +70,7 @@ declare 23 {
 }
 # Replaced with macro (see tclInt.h) in Tcl 8.5.0, restored in 8.5.10
 declare 24 {
-    size_t TclFormatInt(char *buffer, Tcl_WideInt n)
+    Tcl_Size TclFormatInt(char *buffer, Tcl_WideInt n)
 }
 declare 25 {
     void TclFreePackageInfo(Interp *iPtr)
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 9caef63..8b09c0f 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -171,7 +171,7 @@ typedef struct Tcl_ResolvedVarInfo {
 } Tcl_ResolvedVarInfo;
 
 typedef int (Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp,
-	const char *name, size_t length, Tcl_Namespace *context,
+	const char *name, Tcl_Size length, Tcl_Namespace *context,
 	Tcl_ResolvedVarInfo **rPtr);
 
 typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp, const char *name,
@@ -273,16 +273,20 @@ typedef struct Namespace {
 				 * strings; values have type (Namespace *). If
 				 * NULL, there are no children. */
 #endif
+#if TCL_MAJOR_VERSION > 8
     size_t nsId;		/* Unique id for the namespace. */
+#else
+    unsigned long nsId;
+#endif
     Tcl_Interp *interp;	/* The interpreter containing this
 				 * namespace. */
     int flags;			/* OR-ed combination of the namespace status
 				 * flags NS_DYING and NS_DEAD listed below. */
-    size_t activationCount;	/* Number of "activations" or active call
+    Tcl_Size activationCount;	/* Number of "activations" or active call
 				 * frames for this namespace that are on the
 				 * Tcl call stack. The namespace won't be
 				 * freed until activationCount becomes zero. */
-    size_t refCount;		/* Count of references by namespaceName
+    TCL_HASH_TYPE refCount;	/* Count of references by namespaceName
 				 * objects. The namespace can't be freed until
 				 * refCount becomes zero. */
     Tcl_HashTable cmdTable;	/* Contains all the commands currently
@@ -303,16 +307,16 @@ typedef struct Namespace {
 				 * commands; however, no namespace qualifiers
 				 * are allowed. NULL if no export patterns are
 				 * registered. */
-    size_t numExportPatterns;	/* Number of export patterns currently
+    Tcl_Size numExportPatterns;	/* Number of export patterns currently
 				 * registered using "namespace export". */
-    size_t maxExportPatterns;	/* Number of export patterns for which space
+    Tcl_Size maxExportPatterns;	/* Number of export patterns for which space
 				 * is currently allocated. */
-    size_t cmdRefEpoch;		/* Incremented if a newly added command
+    TCL_HASH_TYPE cmdRefEpoch;	/* Incremented if a newly added command
 				 * shadows a command for which this namespace
 				 * has already cached a Command* pointer; this
 				 * causes all its cached Command* pointers to
 				 * be invalidated. */
-    size_t resolverEpoch;	/* Incremented whenever (a) the name
+    TCL_HASH_TYPE resolverEpoch;	/* Incremented whenever (a) the name
 				 * resolution rules change for this namespace
 				 * or (b) a newly added command shadows a
 				 * command that is compiled to bytecodes. This
@@ -339,7 +343,7 @@ typedef struct Namespace {
 				 * LookupCompiledLocal to resolve variable
 				 * references within the namespace at compile
 				 * time. */
-    size_t exportLookupEpoch;	/* Incremented whenever a command is added to
+    TCL_HASH_TYPE exportLookupEpoch;	/* Incremented whenever a command is added to
 				 * a namespace, removed from a namespace or
 				 * the exports of a namespace are changed.
 				 * Allows TIP#112-driven command lists to be
@@ -350,7 +354,7 @@ typedef struct Namespace {
     Tcl_Obj *unknownHandlerPtr;	/* A script fragment to be used when command
 				 * resolution in this namespace fails. TIP
 				 * 181. */
-    size_t commandPathLength;	/* The length of the explicit path. */
+    Tcl_Size commandPathLength;	/* The length of the explicit path. */
     NamespacePathEntry *commandPathArray;
 				/* The explicit path of the namespace as an
 				 * array. */
@@ -438,7 +442,7 @@ typedef struct EnsembleConfig {
 				 * if the command has been deleted (or never
 				 * existed; the global namespace never has an
 				 * ensemble command.) */
-    size_t epoch;		/* The epoch at which this ensemble's table of
+    TCL_HASH_TYPE epoch;		/* The epoch at which this ensemble's table of
 				 * exported commands is valid. */
     char **subcommandArrayPtr;	/* Array of ensemble subcommand names. At all
 				 * consistent points, this will have the same
@@ -495,7 +499,7 @@ typedef struct EnsembleConfig {
 				 * core, presumably because the ensemble
 				 * itself has been updated. */
     Tcl_Obj *parameterList;	/* List of ensemble parameter names. */
-    size_t numParameters;		/* Cached number of parameters. This is either
+    Tcl_Size numParameters;		/* Cached number of parameters. This is either
 				 * 0 (if the parameterList field is NULL) or
 				 * the length of the list in the parameterList
 				 * field. */
@@ -551,7 +555,7 @@ typedef struct CommandTrace {
     struct CommandTrace *nextPtr;
 				/* Next in list of traces associated with a
 				 * particular command. */
-    size_t refCount;	/* Used to ensure this structure is not
+    TCL_HASH_TYPE refCount; /* Used to ensure this structure is not
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
@@ -624,7 +628,7 @@ typedef struct Var {
 
 typedef struct VarInHash {
     Var var;
-    size_t refCount;		/* Counts number of active uses of this
+    TCL_HASH_TYPE refCount;	/* Counts number of active uses of this
 				 * variable: 1 for the entry in the hash
 				 * table, 1 for each additional variable whose
 				 * linkPtr points here, 1 for each nested
@@ -927,9 +931,9 @@ typedef struct CompiledLocal {
 				/* Next compiler-recognized local variable for
 				 * this procedure, or NULL if this is the last
 				 * local. */
-    size_t nameLength;		/* The number of bytes in local variable's name.
+    Tcl_Size nameLength;		/* The number of bytes in local variable's name.
 				 * Among others used to speed up var lookups. */
-    size_t frameIndex;		/* Index in the array of compiler-assigned
+    Tcl_Size frameIndex;		/* Index in the array of compiler-assigned
 				 * variables in the procedure call frame. */
 #if TCL_UTF_MAX < 9
     int flags;
@@ -966,7 +970,7 @@ typedef struct CompiledLocal {
 typedef struct Proc {
     struct Interp *iPtr;	/* Interpreter for which this command is
 				 * defined. */
-    size_t refCount;		/* Reference count: 1 if still present in
+    TCL_HASH_TYPE refCount;	/* Reference count: 1 if still present in
 				 * command table plus 1 for each call to the
 				 * procedure that is currently active. This
 				 * structure can be freed when refCount
@@ -977,8 +981,8 @@ typedef struct Proc {
 				 * procedure. */
     Tcl_Obj *bodyPtr;		/* Points to the ByteCode object for
 				 * procedure's body command. */
-    size_t numArgs;		/* Number of formal parameters. */
-    size_t numCompiledLocals;	/* Count of local variables recognized by the
+    Tcl_Size numArgs;		/* Number of formal parameters. */
+    Tcl_Size numCompiledLocals;	/* Count of local variables recognized by the
 				 * compiler including arguments and
 				 * temporaries. */
     CompiledLocal *firstLocalPtr;
@@ -1083,8 +1087,8 @@ typedef struct AssocData {
  */
 
 typedef struct LocalCache {
-    size_t refCount;
-    size_t numVars;
+    TCL_HASH_TYPE refCount;
+    Tcl_Size numVars;
     Tcl_Obj *varName0;
 } LocalCache;
 
@@ -1104,7 +1108,7 @@ typedef struct CallFrame {
 				 * If FRAME_IS_PROC is set, the frame was
 				 * pushed to execute a Tcl procedure and may
 				 * have local vars. */
-    size_t objc;			/* This and objv below describe the arguments
+    Tcl_Size objc;			/* This and objv below describe the arguments
 				 * for this procedure call. */
     Tcl_Obj *const *objv;	/* Array of argument objects. */
     struct CallFrame *callerPtr;
@@ -1118,7 +1122,7 @@ typedef struct CallFrame {
 				 * callerPtr unless an "uplevel" command or
 				 * something equivalent was active in the
 				 * caller). */
-    size_t level;			/* Level of this procedure, for "uplevel"
+    Tcl_Size level;			/* Level of this procedure, for "uplevel"
 				 * purposes (i.e. corresponds to nesting of
 				 * callerVarPtr's, not callerPtr's). 1 for
 				 * outermost procedure, 0 for top-level. */
@@ -1132,7 +1136,7 @@ typedef struct CallFrame {
 				 * recognized by the compiler, or created at
 				 * execution time through, e.g., upvar.
 				 * Initially NULL and created if needed. */
-    size_t numCompiledLocals;	/* Count of local variables recognized
+    Tcl_Size numCompiledLocals;	/* Count of local variables recognized
 				 * by the compiler including arguments. */
     Var *compiledLocals;	/* Points to the array of local variables
 				 * recognized by the compiler. The compiler
@@ -1194,7 +1198,7 @@ typedef struct CmdFrame {
     int level;			/* Number of frames in stack, prevent O(n)
 				 * scan of list. */
     int *line;			/* Lines the words of the command start on. */
-    size_t nline;
+    Tcl_Size nline;
     CallFrame *framePtr;	/* Procedure activation record, may be
 				 * NULL. */
     struct CmdFrame *nextPtr;	/* Link to calling frame. */
@@ -1238,7 +1242,7 @@ typedef struct CmdFrame {
     } data;
     Tcl_Obj *cmdObj;
     const char *cmd;		/* The executed command, if possible... */
-    size_t len;			/* ... and its length. */
+    Tcl_Size len;			/* ... and its length. */
     const struct CFWordBC *litarg;
 				/* Link to set of literal arguments which have
 				 * ben pushed on the lineLABCPtr stack by
@@ -1248,16 +1252,16 @@ typedef struct CmdFrame {
 
 typedef struct CFWord {
     CmdFrame *framePtr;		/* CmdFrame to access. */
-    size_t word;			/* Index of the word in the command. */
-    size_t refCount;		/* Number of times the word is on the
+    Tcl_Size word;			/* Index of the word in the command. */
+    TCL_HASH_TYPE refCount;	/* Number of times the word is on the
 				 * stack. */
 } CFWord;
 
 typedef struct CFWordBC {
     CmdFrame *framePtr;		/* CmdFrame to access. */
-    size_t pc;			/* Instruction pointer of a command in
+    Tcl_Size pc;			/* Instruction pointer of a command in
 				 * ExtCmdLoc.loc[.] */
-    size_t word;			/* Index of word in
+    Tcl_Size word;			/* Index of word in
 				 * ExtCmdLoc.loc[cmd]->line[.] */
     struct CFWordBC *prevPtr;	/* Previous entry in stack for same Tcl_Obj. */
     struct CFWordBC *nextPtr;	/* Next entry for same command call. See
@@ -1286,7 +1290,7 @@ typedef struct CFWordBC {
 #define CLL_END		(-1)
 
 typedef struct ContLineLoc {
-    size_t num;			/* Number of entries in loc, not counting the
+    Tcl_Size num;			/* Number of entries in loc, not counting the
 				 * final -1 marker entry. */
     int loc[TCLFLEXARRAY];/* Table of locations, as character offsets.
 				 * The table is allocated as part of the
@@ -1336,7 +1340,7 @@ typedef struct {
 				 * proc field is NULL. */
 } ExtraFrameInfoField;
 typedef struct {
-    size_t length;			/* Length of array. */
+    Tcl_Size length;			/* Length of array. */
     ExtraFrameInfoField fields[2];
 				/* Really as long as necessary, but this is
 				 * long enough for nearly anything. */
@@ -1467,11 +1471,11 @@ typedef struct CoroutineData {
     CorContext running;
     Tcl_HashTable *lineLABCPtr;    /* See Interp.lineLABCPtr */
     void *stackLevel;
-    size_t auxNumLevels;		/* While the coroutine is running the
+    Tcl_Size auxNumLevels;		/* While the coroutine is running the
 				 * numLevels of the create/resume command is
 				 * stored here; for suspended coroutines it
 				 * holds the nesting numLevels at yield. */
-    size_t nargs;                  /* Number of args required for resuming this
+    Tcl_Size nargs;                  /* Number of args required for resuming this
 				 * coroutine; COROUTINE_ARGUMENTS_SINGLE_OPTIONAL means "0 or 1"
 				 * (default), COROUTINE_ARGUMENTS_ARBITRARY means "any" */
     Tcl_Obj *yieldPtr;		/* The command to yield to.  Stored here in
@@ -1517,7 +1521,7 @@ typedef struct LiteralEntry {
 				 * NULL if end of chain. */
     Tcl_Obj *objPtr;		/* Points to Tcl object that holds the
 				 * literal's bytes and length. */
-    size_t refCount;		/* If in an interpreter's global literal
+    TCL_HASH_TYPE refCount; /* If in an interpreter's global literal
 				 * table, the number of ByteCode structures
 				 * that share the literal object; the literal
 				 * entry can be freed when refCount drops to
@@ -1535,13 +1539,13 @@ typedef struct LiteralTable {
     LiteralEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
 				/* Bucket array used for small tables to avoid
 				 * mallocs and frees. */
-    size_t numBuckets;		/* Total number of buckets allocated at
+    TCL_HASH_TYPE numBuckets; /* Total number of buckets allocated at
 				 * **buckets. */
-    size_t numEntries;		/* Total number of entries present in
+    TCL_HASH_TYPE numEntries; /* Total number of entries present in
 				 * table. */
-    size_t rebuildSize;		/* Enlarge table when numEntries gets to be
+    TCL_HASH_TYPE rebuildSize; /* Enlarge table when numEntries gets to be
 				 * this large. */
-    size_t mask;		/* Mask value used in hashing function. */
+    TCL_HASH_TYPE mask;		/* Mask value used in hashing function. */
 } LiteralTable;
 
 /*
@@ -1659,12 +1663,12 @@ typedef struct Command {
 				 * recreated). */
     Namespace *nsPtr;		/* Points to the namespace containing this
 				 * command. */
-    size_t refCount;		/* 1 if in command hashtable plus 1 for each
+    TCL_HASH_TYPE refCount;		/* 1 if in command hashtable plus 1 for each
 				 * reference from a CmdName Tcl object
 				 * representing a command's name in a ByteCode
 				 * instruction sequence. This structure can be
 				 * freed when refCount becomes zero. */
-    size_t cmdEpoch;		/* Incremented to invalidate any references
+    TCL_HASH_TYPE cmdEpoch;		/* Incremented to invalidate any references
 				 * that point to this command when it is
 				 * renamed, deleted, hidden, or exposed. */
     CompileProc *compileProc;	/* Procedure called to compile command. NULL
@@ -1836,18 +1840,22 @@ typedef struct Interp {
     void *interpInfo;	/* Information used by tclInterp.c to keep
 				 * track of parent/child interps on a
 				 * per-interp basis. */
+#if TCL_MAJOR_VERSION > 8
     void (*optimizer)(void *envPtr);
+#else
+    Tcl_HashTable unused2; /* No longer used */
+#endif
     /*
      * Information related to procedures and variables. See tclProc.c and
      * tclVar.c for usage.
      */
 
-    size_t numLevels;		/* Keeps track of how many nested calls to
+    Tcl_Size numLevels;		/* Keeps track of how many nested calls to
 				 * Tcl_Eval are in progress for this
 				 * interpreter. It's used to delay deletion of
 				 * the table until all Tcl_Eval invocations
 				 * are completed. */
-    size_t maxNestingDepth;	/* If numLevels exceeds this value then Tcl
+    Tcl_Size maxNestingDepth;	/* If numLevels exceeds this value then Tcl
 				 * assumes that infinite recursion has
 				 * occurred and it generates an error. */
     CallFrame *framePtr;	/* Points to top-most in stack of all nested
@@ -1866,6 +1874,17 @@ typedef struct Interp {
 				 * TCL_EVAL_INVOKE call to Tcl_EvalObjv. */
 
     /*
+     * Information used by Tcl_AppendResult to keep track of partial results.
+     * See Tcl_AppendResult code for details.
+     */
+
+#if TCL_MAJOR_VERSION < 9
+    char *appendResultDontUse;
+    int appendAvlDontUse;
+    int appendUsedDontUse;
+#endif
+
+    /*
      * Information about packages. Used only in tclPkg.c.
      */
 
@@ -1881,18 +1900,21 @@ typedef struct Interp {
      * Miscellaneous information:
      */
 
-    size_t cmdCount;		/* Total number of times a command procedure
+    Tcl_Size cmdCount;		/* Total number of times a command procedure
 				 * has been called for this interpreter. */
     int evalFlags;		/* Flags to control next call to Tcl_Eval.
 				 * Normally zero, but may be set before
 				 * calling Tcl_Eval. See below for valid
 				 * values. */
+#if TCL_MAJOR_VERSION < 9
+    int unused1;		/* No longer used (was termOffset) */
+#endif
     LiteralTable literalTable;	/* Contains LiteralEntry's describing all Tcl
 				 * objects holding literals of scripts
 				 * compiled by the interpreter. Indexed by the
 				 * string representations of literals. Used to
 				 * avoid creating duplicate objects. */
-    size_t compileEpoch;	/* Holds the current "compilation epoch" for
+    TCL_HASH_TYPE compileEpoch;	/* Holds the current "compilation epoch" for
 				 * this interpreter. This is incremented to
 				 * invalidate existing ByteCodes when, e.g., a
 				 * command with a compile procedure is
@@ -1924,6 +1946,9 @@ typedef struct Interp {
 				 * string. Returned by Tcl_ObjSetVar2 when
 				 * variable traces change a variable in a
 				 * gross way. */
+#if TCL_MAJOR_VERSION < 9
+    char resultSpaceDontUse[TCL_DSTRING_STATIC_SIZE+1];
+#endif
     Tcl_Obj *objResultPtr;	/* If the last command returned an object
 				 * result, this points to it. Should not be
 				 * accessed directly; see comment above. */
@@ -1936,7 +1961,7 @@ typedef struct Interp {
 				/* First in list of active traces for interp,
 				 * or NULL if no active traces. */
 
-    size_t tracesForbiddingInline;	/* Count of traces (in the list headed by
+    Tcl_Size tracesForbiddingInline;	/* Count of traces (in the list headed by
 				 * tracePtr) that forbid inline bytecode
 				 * compilation. */
 
@@ -1966,7 +1991,7 @@ typedef struct Interp {
 				 * as flag values the same as the 'active'
 				 * field. */
 
-	size_t cmdCount;		/* Limit for how many commands to execute in
+	Tcl_Size cmdCount;		/* Limit for how many commands to execute in
 				 * the interpreter. */
 	LimitHandler *cmdHandlers;
 				/* Handlers to execute when the limit is
@@ -2002,9 +2027,9 @@ typedef struct Interp {
 				 * *root* ensemble command? (Nested ensembles
 				 * don't rewrite this.) NULL if we're not
 				 * processing an ensemble. */
-	size_t numRemovedObjs;	/* How many arguments have been stripped off
+	Tcl_Size numRemovedObjs;	/* How many arguments have been stripped off
 				 * because of ensemble processing. */
-	size_t numInsertedObjs;	/* How many of the current arguments were
+	Tcl_Size numInsertedObjs;	/* How many of the current arguments were
 				 * inserted by an ensemble. */
     } ensembleRewrite;
 
@@ -2374,9 +2399,9 @@ typedef enum TclEolTranslation {
  */
 
 typedef struct List {
-    size_t refCount;
-    size_t maxElemCount;		/* Total number of element array slots. */
-    size_t elemCount;		/* Current number of list elements. */
+    TCL_HASH_TYPE refCount;
+    Tcl_Size maxElemCount;		/* Total number of element array slots. */
+    Tcl_Size elemCount;		/* Current number of list elements. */
     int canonicalFlag;		/* Set if the string representation was
 				 * derived from the list representation. May
 				 * be ignored if there is no string rep at
@@ -2464,8 +2489,8 @@ typedef struct List {
 	    : Tcl_GetIntFromObj((interp), (objPtr), (intPtr)))
 #define TclGetIntForIndexM(interp, objPtr, endValue, idxPtr) \
     ((((objPtr)->typePtr == &tclIntType) && ((objPtr)->internalRep.wideValue >= 0) \
-	    && ((Tcl_WideUInt)(objPtr)->internalRep.wideValue <= (size_t)(endValue) + 1)) \
-	    ? ((*(idxPtr) = (size_t)(objPtr)->internalRep.wideValue), TCL_OK) \
+	    && ((Tcl_WideUInt)(objPtr)->internalRep.wideValue <= (Tcl_WideUInt)(endValue + 1))) \
+	    ? ((*(idxPtr) = (Tcl_Size)(objPtr)->internalRep.wideValue), TCL_OK) \
 	    : Tcl_GetIntForIndex((interp), (objPtr), (endValue), (idxPtr)))
 
 /*
@@ -2586,7 +2611,7 @@ typedef Tcl_Channel (TclOpenFileChannelProc_)(Tcl_Interp *interp,
  *----------------------------------------------------------------
  */
 
-typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, size_t *lengthPtr,
+typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, TCL_HASH_TYPE *lengthPtr,
 	Tcl_Encoding *encodingPtr);
 
 /*
@@ -2598,9 +2623,9 @@ typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, size_t *lengthPtr,
  */
 
 typedef struct ProcessGlobalValue {
-    size_t epoch;		/* Epoch counter to detect changes in the
+    TCL_HASH_TYPE epoch;		/* Epoch counter to detect changes in the
 				 * global value. */
-    size_t numBytes;		/* Length of the global string. */
+    TCL_HASH_TYPE numBytes;		/* Length of the global string. */
     char *value;		/* The global string value. */
     Tcl_Encoding encoding;	/* system encoding when global string was
 				 * initialized. */
@@ -2780,7 +2805,7 @@ typedef struct ForIterData {
     Tcl_Obj *body;		/* Loop body. */
     Tcl_Obj *next;		/* Loop step script, NULL for 'while'. */
     const char *msg;		/* Error message part. */
-    size_t word;			/* Index of the body script in the command */
+    Tcl_Size word;			/* Index of the body script in the command */
 } ForIterData;
 
 /* TIP #357 - Structure doing the bookkeeping of handles for Tcl_LoadFile
@@ -2825,12 +2850,12 @@ struct Tcl_LoadHandle_ {
  */
 
 MODULE_SCOPE void	TclAppendBytesToByteArray(Tcl_Obj *objPtr,
-			    const unsigned char *bytes, size_t len);
+			    const unsigned char *bytes, Tcl_Size len);
 MODULE_SCOPE int	TclNREvalCmd(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    int flags);
-MODULE_SCOPE void	TclAdvanceContinuations(size_t *line, int **next,
+MODULE_SCOPE void	TclAdvanceContinuations(Tcl_Size *line, int **next,
 			    int loc);
-MODULE_SCOPE void	TclAdvanceLines(size_t *line, const char *start,
+MODULE_SCOPE void	TclAdvanceLines(Tcl_Size *line, const char *start,
 			    const char *end);
 MODULE_SCOPE void	TclArgumentEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc, CmdFrame *cf);
@@ -2838,18 +2863,18 @@ MODULE_SCOPE void	TclArgumentRelease(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc);
 MODULE_SCOPE void	TclArgumentBCEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc,
-			    void *codePtr, CmdFrame *cfPtr, int cmd, size_t pc);
+			    void *codePtr, CmdFrame *cfPtr, int cmd, Tcl_Size pc);
 MODULE_SCOPE void	TclArgumentBCRelease(Tcl_Interp *interp,
 			    CmdFrame *cfPtr);
 MODULE_SCOPE void	TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj,
 			    CmdFrame **cfPtrPtr, int *wordPtr);
 MODULE_SCOPE int	TclAsyncNotifier(int sigNumber, Tcl_ThreadId threadId,
-			    ClientData clientData, int *flagPtr, int value);
+			    void *clientData, int *flagPtr, int value);
 MODULE_SCOPE void	TclAsyncMarkFromNotifier(void);
 MODULE_SCOPE double	TclBignumToDouble(const void *bignum);
 MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
-			    size_t strLen, const unsigned char *pattern,
-			    size_t ptnLen, int flags);
+			    Tcl_Size strLen, const unsigned char *pattern,
+			    Tcl_Size ptnLen, int flags);
 MODULE_SCOPE double	TclCeil(const void *a);
 MODULE_SCOPE void	TclChannelPreserve(Tcl_Channel chan);
 MODULE_SCOPE void	TclChannelRelease(Tcl_Channel chan);
@@ -2862,14 +2887,14 @@ MODULE_SCOPE Tcl_ObjCmdProc TclChannelNamesCmd;
 MODULE_SCOPE Tcl_NRPostProc TclClearRootEnsemble;
 MODULE_SCOPE int	TclCompareTwoNumbers(Tcl_Obj *valuePtr,
 			    Tcl_Obj *value2Ptr);
-MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, size_t num,
+MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, Tcl_Size num,
 			    int *loc);
 MODULE_SCOPE void	TclContinuationsEnterDerived(Tcl_Obj *objPtr,
 			    int start, int *clNext);
 MODULE_SCOPE ContLineLoc *TclContinuationsGet(Tcl_Obj *objPtr);
 MODULE_SCOPE void	TclContinuationsCopy(Tcl_Obj *objPtr,
 			    Tcl_Obj *originObjPtr);
-MODULE_SCOPE size_t	TclConvertElement(const char *src, size_t length,
+MODULE_SCOPE Tcl_Size	TclConvertElement(const char *src, Tcl_Size length,
 			    char *dst, int flags);
 MODULE_SCOPE Tcl_Command TclCreateObjCommandInNs(Tcl_Interp *interp,
 			    const char *cmdName, Tcl_Namespace *nsPtr,
@@ -2881,12 +2906,12 @@ MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(Tcl_Interp *interp,
 MODULE_SCOPE void	TclDeleteNamespaceVars(Namespace *nsPtr);
 MODULE_SCOPE void	TclDeleteNamespaceChildren(Namespace *nsPtr);
 MODULE_SCOPE int	TclFindDictElement(Tcl_Interp *interp,
-			    const char *dict, size_t dictLength,
+			    const char *dict, Tcl_Size dictLength,
 			    const char **elementPtr, const char **nextPtr,
-			    size_t *sizePtr, int *literalPtr);
+			    Tcl_Size *sizePtr, int *literalPtr);
 /* TIP #280 - Modified token based evaluation, with line information. */
 MODULE_SCOPE int	TclEvalEx(Tcl_Interp *interp, const char *script,
-			    size_t numBytes, int flags, size_t line,
+			    Tcl_Size numBytes, int flags, Tcl_Size line,
 			    int *clNextOuter, const char *outerScript);
 MODULE_SCOPE Tcl_ObjCmdProc TclFileAttrsCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileCopyCmd;
@@ -2907,7 +2932,7 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 			    Tcl_DString *toAppendPtr);
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *TclFetchEnsembleRoot(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, size_t objc, size_t *objcPtr);
+			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size *objcPtr);
 MODULE_SCOPE Tcl_Obj *const *TclEnsembleGetRewriteValues(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Namespace *TclEnsureNamespace(Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
@@ -2965,7 +2990,7 @@ MODULE_SCOPE Tcl_Obj *	TclGetProcessGlobalValue(ProcessGlobalValue *pgvPtr);
 MODULE_SCOPE Tcl_Obj *	TclGetSourceFromFrame(CmdFrame *cfPtr, int objc,
 			    Tcl_Obj *const objv[]);
 MODULE_SCOPE char *	TclGetStringStorage(Tcl_Obj *objPtr,
-			    size_t *sizePtr);
+			    TCL_HASH_TYPE *sizePtr);
 MODULE_SCOPE int	TclGetLoadedLibraries(Tcl_Interp *interp,
 				const char *targetName,
 				const char *packageName);
@@ -3003,28 +3028,28 @@ MODULE_SCOPE void	TclInitObjSubsystem(void);
 MODULE_SCOPE int	TclInterpReady(Tcl_Interp *interp);
 MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
-MODULE_SCOPE Tcl_Obj *	TclJoinPath(size_t elements, Tcl_Obj * const objv[],
+MODULE_SCOPE Tcl_Obj *	TclJoinPath(Tcl_Size elements, Tcl_Obj * const objv[],
 			    int forceRelative);
 MODULE_SCOPE int	TclJoinThread(Tcl_ThreadId id, int *result);
 MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Obj *	TclLindexList(Tcl_Interp *interp,
 			    Tcl_Obj *listPtr, Tcl_Obj *argPtr);
 MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    size_t indexCount, Tcl_Obj *const indexArray[]);
+			    Tcl_Size indexCount, Tcl_Obj *const indexArray[]);
 /* TIP #280 */
-MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, size_t line, int n,
+MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, Tcl_Size line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
-MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, size_t fromIdx,
-			    size_t toIdx);
+MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, Tcl_Size fromIdx,
+			    Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    size_t indexCount, Tcl_Obj *const indexArray[],
+			    Tcl_Size indexCount, Tcl_Obj *const indexArray[],
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Command TclMakeEnsemble(Tcl_Interp *interp, const char *name,
 			    const EnsembleImplMap map[]);
-MODULE_SCOPE int	TclMaxListLength(const char *bytes, size_t numBytes,
+MODULE_SCOPE int	TclMaxListLength(const char *bytes, Tcl_Size numBytes,
 			    const char **endPtr);
 MODULE_SCOPE int	TclMergeReturnOptions(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr,
@@ -3043,15 +3068,15 @@ MODULE_SCOPE int	TclObjInvokeNamespace(Tcl_Interp *interp,
 MODULE_SCOPE int	TclObjUnsetVar2(Tcl_Interp *interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags);
 MODULE_SCOPE int	TclParseBackslash(const char *src,
-			    size_t numBytes, size_t *readPtr, char *dst);
-MODULE_SCOPE int	TclParseHex(const char *src, size_t numBytes,
+			    Tcl_Size numBytes, Tcl_Size *readPtr, char *dst);
+MODULE_SCOPE int	TclParseHex(const char *src, Tcl_Size numBytes,
 			    int *resultPtr);
 MODULE_SCOPE int	TclParseNumber(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    const char *expected, const char *bytes,
-			    size_t numBytes, const char **endPtrPtr, int flags);
+			    Tcl_Size numBytes, const char **endPtrPtr, int flags);
 MODULE_SCOPE void	TclParseInit(Tcl_Interp *interp, const char *string,
-			    size_t numBytes, Tcl_Parse *parsePtr);
-MODULE_SCOPE size_t	TclParseAllWhiteSpace(const char *src, size_t numBytes);
+			    Tcl_Size numBytes, Tcl_Parse *parsePtr);
+MODULE_SCOPE Tcl_Size	TclParseAllWhiteSpace(const char *src, Tcl_Size numBytes);
 MODULE_SCOPE int	TclProcessReturn(Tcl_Interp *interp,
 			    int code, int level, Tcl_Obj *returnOpts);
 MODULE_SCOPE int	TclpObjLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
@@ -3059,19 +3084,19 @@ MODULE_SCOPE Tcl_Obj *	TclpTempFileName(void);
 MODULE_SCOPE Tcl_Obj *  TclpTempFileNameForLibrary(Tcl_Interp *interp,
 			    Tcl_Obj* pathPtr);
 MODULE_SCOPE Tcl_Obj *	TclNewFSPathObj(Tcl_Obj *dirPtr, const char *addStrRep,
-			    size_t len);
-MODULE_SCOPE void	TclpAlertNotifier(ClientData clientData);
+			    Tcl_Size len);
+MODULE_SCOPE void	TclpAlertNotifier(void *clientData);
 MODULE_SCOPE ClientData	TclpNotifierData(void);
 MODULE_SCOPE void	TclpServiceModeHook(int mode);
 MODULE_SCOPE void	TclpSetTimer(const Tcl_Time *timePtr);
 MODULE_SCOPE int	TclpWaitForEvent(const Tcl_Time *timePtr);
 MODULE_SCOPE void	TclpCreateFileHandler(int fd, int mask,
-			    Tcl_FileProc *proc, ClientData clientData);
+			    Tcl_FileProc *proc, void *clientData);
 MODULE_SCOPE int	TclpDeleteFile(const void *path);
 MODULE_SCOPE void	TclpDeleteFileHandler(int fd);
 MODULE_SCOPE void	TclpFinalizeCondition(Tcl_Condition *condPtr);
 MODULE_SCOPE void	TclpFinalizeMutex(Tcl_Mutex *mutexPtr);
-MODULE_SCOPE void	TclpFinalizeNotifier(ClientData clientData);
+MODULE_SCOPE void	TclpFinalizeNotifier(void *clientData);
 MODULE_SCOPE void	TclpFinalizePipes(void);
 MODULE_SCOPE void	TclpFinalizeSockets(void);
 MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
@@ -3080,10 +3105,10 @@ MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    const char **errorMsgPtr);
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, void *clientData,
-			    size_t stackSize, int flags);
-MODULE_SCOPE size_t	TclpFindVariable(const char *name, size_t *lengthPtr);
+			    Tcl_Size stackSize, int flags);
+MODULE_SCOPE Tcl_Size	TclpFindVariable(const char *name, Tcl_Size *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
-			    size_t *lengthPtr, Tcl_Encoding *encodingPtr);
+			    TCL_HASH_TYPE *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
 MODULE_SCOPE ClientData	TclpInitNotifier(void);
 MODULE_SCOPE void	TclpInitPlatform(void);
@@ -3096,9 +3121,9 @@ MODULE_SCOPE int	TclpMatchFiles(Tcl_Interp *interp, char *separators,
 MODULE_SCOPE int	TclpObjNormalizePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathPtr, int nextCheckpoint);
 MODULE_SCOPE void	TclpNativeJoinPath(Tcl_Obj *prefix, const char *joining);
-MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr);
+MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, Tcl_Size *lenPtr);
 MODULE_SCOPE Tcl_PathType TclpGetNativePathType(Tcl_Obj *pathPtr,
-			    size_t *driveNameLengthPtr, Tcl_Obj **driveNameRef);
+			    Tcl_Size *driveNameLengthPtr, Tcl_Obj **driveNameRef);
 MODULE_SCOPE int	TclCrossFilesystemCopy(Tcl_Interp *interp,
 			    Tcl_Obj *source, Tcl_Obj *target);
 MODULE_SCOPE int	TclpMatchInDirectory(Tcl_Interp *interp,
@@ -3129,9 +3154,9 @@ MODULE_SCOPE void	TclRememberJoinableThread(Tcl_ThreadId id);
 MODULE_SCOPE void	TclRememberMutex(Tcl_Mutex *mutex);
 MODULE_SCOPE void	TclRemoveScriptLimitCallbacks(Tcl_Interp *interp);
 MODULE_SCOPE int	TclReToGlob(Tcl_Interp *interp, const char *reStr,
-			    size_t reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
+			    Tcl_Size reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
 			    int *quantifiersFoundPtr);
-MODULE_SCOPE size_t	TclScanElement(const char *string, size_t length,
+MODULE_SCOPE Tcl_Size	TclScanElement(const char *string, Tcl_Size length,
 			    char *flagPtr);
 MODULE_SCOPE void	TclSetBgErrorHandler(Tcl_Interp *interp,
 			    Tcl_Obj *cmdPrefix);
@@ -3146,44 +3171,44 @@ MODULE_SCOPE void	TclSetProcessGlobalValue(ProcessGlobalValue *pgvPtr,
 			    Tcl_Obj *newValue, Tcl_Encoding encoding);
 MODULE_SCOPE void	TclSignalExitThread(Tcl_ThreadId id, int result);
 MODULE_SCOPE void	TclSpellFix(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, size_t objc, size_t subIdx,
+			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size subIdx,
 			    Tcl_Obj *bad, Tcl_Obj *fix);
 MODULE_SCOPE void *	TclStackRealloc(Tcl_Interp *interp, void *ptr,
-			    size_t numBytes);
+			    Tcl_Size numBytes);
 typedef int (*memCmpFn_t)(const void*, const void*, size_t);
 MODULE_SCOPE int	TclStringCmp(Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr,
-			    int checkEq, int nocase, size_t reqlength);
+			    int checkEq, int nocase, Tcl_Size reqlength);
 MODULE_SCOPE int	TclStringCmpOpts(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int *nocase,
 			    int *reqlength);
-MODULE_SCOPE int	TclStringMatch(const char *str, size_t strLen,
+MODULE_SCOPE int	TclStringMatch(const char *str, Tcl_Size strLen,
 			    const char *pattern, int ptnLen, int flags);
 MODULE_SCOPE int	TclStringMatchObj(Tcl_Obj *stringObj,
 			    Tcl_Obj *patternObj, int flags);
 MODULE_SCOPE void	TclSubstCompile(Tcl_Interp *interp, const char *bytes,
-			    size_t numBytes, int flags, size_t line,
+			    Tcl_Size numBytes, int flags, Tcl_Size line,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, size_t numOpts,
+MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, Tcl_Size numOpts,
 			    Tcl_Obj *const opts[], int *flagPtr);
 MODULE_SCOPE void	TclSubstParse(Tcl_Interp *interp, const char *bytes,
-			    size_t numBytes, int flags, Tcl_Parse *parsePtr,
+			    Tcl_Size numBytes, int flags, Tcl_Parse *parsePtr,
 			    Tcl_InterpState *statePtr);
 MODULE_SCOPE int	TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
-			    size_t count, int *tokensLeftPtr, size_t line,
+			    Tcl_Size count, int *tokensLeftPtr, Tcl_Size line,
 			    int *clNextOuter, const char *outerScript);
-MODULE_SCOPE size_t	TclTrim(const char *bytes, size_t numBytes,
-			    const char *trim, size_t numTrim, size_t *trimRight);
-MODULE_SCOPE size_t	TclTrimLeft(const char *bytes, size_t numBytes,
-			    const char *trim, size_t numTrim);
-MODULE_SCOPE size_t	TclTrimRight(const char *bytes, size_t numBytes,
-			    const char *trim, size_t numTrim);
+MODULE_SCOPE Tcl_Size	TclTrim(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim, Tcl_Size *trimRight);
+MODULE_SCOPE Tcl_Size	TclTrimLeft(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim);
+MODULE_SCOPE Tcl_Size	TclTrimRight(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim);
 MODULE_SCOPE const char*TclGetCommandTypeName(Tcl_Command command);
 MODULE_SCOPE void	TclRegisterCommandTypeName(
 			    Tcl_ObjCmdProc *implementationProc,
 			    const char *nameStr);
 MODULE_SCOPE int	TclUtfCmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCasecmp(const char *cs, const char *ct);
-MODULE_SCOPE size_t	TclUtfCount(int ch);
+MODULE_SCOPE Tcl_Size	TclUtfCount(int ch);
 #if TCL_UTF_MAX > 3
 #   define TclUtfToUCS4 Tcl_UtfToUniChar
 #   define TclUniCharToUCS4(src, ptr) (*ptr = *(src),1)
@@ -3230,7 +3255,7 @@ MODULE_SCOPE void	TclpThreadDeleteKey(void *keyPtr);
 MODULE_SCOPE void	TclpThreadSetGlobalTSD(void *tsdKeyPtr, void *ptr);
 MODULE_SCOPE void *	TclpThreadGetGlobalTSD(void *tsdKeyPtr);
 MODULE_SCOPE void	TclErrorStackResetIf(Tcl_Interp *interp,
-			    const char *msg, size_t length);
+			    const char *msg, Tcl_Size length);
 /* Tip 430 */
 MODULE_SCOPE int    TclZipfs_Init(Tcl_Interp *interp);
 
@@ -3307,7 +3332,7 @@ MODULE_SCOPE int	TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
 			    Tcl_Obj *part2Ptr, int index, int pathc,
 			    Tcl_Obj *const pathv[], Tcl_Obj *keysPtr);
 MODULE_SCOPE Tcl_Obj *	TclDictWithInit(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-			    size_t pathc, Tcl_Obj *const pathv[]);
+			    Tcl_Size pathc, Tcl_Obj *const pathv[]);
 MODULE_SCOPE int	Tcl_DisassembleObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
@@ -4014,13 +4039,13 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
 MODULE_SCOPE Tcl_Obj *	TclStringCat(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    size_t start);
+			    Tcl_Size start);
 MODULE_SCOPE Tcl_Obj *	TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    size_t last);
+			    Tcl_Size last);
 MODULE_SCOPE Tcl_Obj *	TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    size_t count, int flags);
+			    Tcl_Size count, int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReplace(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    size_t first, size_t count, Tcl_Obj *insertPtr,
+			    Tcl_Size first, Tcl_Size count, Tcl_Obj *insertPtr,
 			    int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReverse(Tcl_Obj *objPtr, int flags);
 
@@ -4147,12 +4172,12 @@ MODULE_SCOPE Tcl_Obj *	TclGetArrayDefault(Var *arrayPtr);
  */
 
 MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    size_t before, size_t after, int *indexPtr);
-MODULE_SCOPE size_t	TclIndexDecode(int encoded, size_t endValue);
+			    Tcl_Size before, Tcl_Size after, int *indexPtr);
+MODULE_SCOPE Tcl_Size	TclIndexDecode(int encoded, Tcl_Size endValue);
 
 /* Constants used in index value encoding routines. */
-#define TCL_INDEX_END           ((size_t)-2)
-#define TCL_INDEX_START         ((size_t)0)
+#define TCL_INDEX_END           ((Tcl_Size)-2)
+#define TCL_INDEX_START         ((Tcl_Size)0)
 
 /*
  *----------------------------------------------------------------------
@@ -4625,8 +4650,8 @@ MODULE_SCOPE const TclFileAttrProcs	tclpFileAttrProcs[];
 	    : Tcl_UtfToUniChar(str, chPtr))
 #else
 #define TclUtfToUniChar(str, chPtr) \
-	((((unsigned char) *(str)) < 0x80) ?		\
-	    ((*(chPtr) = (unsigned char) *(str)), 1)	\
+	(((UCHAR(*(str))) < 0x80) ?		\
+	    ((*(chPtr) = UCHAR(*(str))), 1)	\
 	    : Tcl_UtfToChar16(str, chPtr))
 #endif
 
@@ -4785,7 +4810,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
  *
  * MODULE_SCOPE void	TclNewIntObj(Tcl_Obj *objPtr, Tcl_WideInt w);
  * MODULE_SCOPE void	TclNewDoubleObj(Tcl_Obj *objPtr, double d);
- * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, size_t len);
+ * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, Tcl_Size len);
  * MODULE_SCOPE void	TclNewLiteralStringObj(Tcl_Obj*objPtr, const char *sLiteral);
  *
  *----------------------------------------------------------------
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index d71f355..425a03c 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -87,14 +87,14 @@ EXTERN void		TclExprFloatError(Tcl_Interp *interp, double value);
 /* Slot 21 is reserved */
 /* 22 */
 EXTERN int		TclFindElement(Tcl_Interp *interp,
-				const char *listStr, int listLength,
+				const char *listStr, Tcl_Size listLength,
 				const char **elementPtr,
 				const char **nextPtr, Tcl_Size *sizePtr,
 				int *bracePtr);
 /* 23 */
 EXTERN Proc *		TclFindProc(Interp *iPtr, const char *procName);
 /* 24 */
-EXTERN size_t		TclFormatInt(char *buffer, Tcl_WideInt n);
+EXTERN Tcl_Size		TclFormatInt(char *buffer, Tcl_WideInt n);
 /* 25 */
 EXTERN void		TclFreePackageInfo(Interp *iPtr);
 /* Slot 26 is reserved */
@@ -603,9 +603,9 @@ typedef struct TclIntStubs {
     void (*reserved19)(void);
     void (*reserved20)(void);
     void (*reserved21)(void);
-    int (*tclFindElement) (Tcl_Interp *interp, const char *listStr, int listLength, const char **elementPtr, const char **nextPtr, Tcl_Size *sizePtr, int *bracePtr); /* 22 */
+    int (*tclFindElement) (Tcl_Interp *interp, const char *listStr, Tcl_Size listLength, const char **elementPtr, const char **nextPtr, Tcl_Size *sizePtr, int *bracePtr); /* 22 */
     Proc * (*tclFindProc) (Interp *iPtr, const char *procName); /* 23 */
-    size_t (*tclFormatInt) (char *buffer, Tcl_WideInt n); /* 24 */
+    Tcl_Size (*tclFormatInt) (char *buffer, Tcl_WideInt n); /* 24 */
     void (*tclFreePackageInfo) (Interp *iPtr); /* 25 */
     void (*reserved26)(void);
     void (*reserved27)(void);
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 17a9dfe..4593057 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -493,7 +493,7 @@ TclFindElement(
     const char *list,		/* Points to the first byte of a string
 				 * containing a Tcl list with zero or more
 				 * elements (possibly in braces). */
-    int listLength,		/* Number of bytes in the list's string. */
+    size_t listLength,		/* Number of bytes in the list's string. */
     const char **elementPtr,	/* Where to put address of first significant
 				 * character in first element of list. */
     const char **nextPtr,	/* Fill in with location of character just
-- 
cgit v0.12


From 26e99bad85be55cb8f27649867fdcebfd92d424b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Jun 2022 21:47:26 +0000
Subject: Fix (internal) TclFindElement() signature (int -> size_t)

---
 generic/tclInt.decls  |  2 +-
 generic/tclIntDecls.h |  4 ++--
 generic/tclUtil.c     | 18 ++++++++----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 9a92888..4c05de8 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -62,7 +62,7 @@ declare 16 {
 }
 declare 22 {
     int TclFindElement(Tcl_Interp *interp, const char *listStr,
-	    int listLength, const char **elementPtr, const char **nextPtr,
+	    size_t listLength, const char **elementPtr, const char **nextPtr,
 	    size_t *sizePtr, int *bracePtr)
 }
 declare 23 {
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index d3c05d5..9393c96 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -87,7 +87,7 @@ EXTERN void		TclExprFloatError(Tcl_Interp *interp, double value);
 /* Slot 21 is reserved */
 /* 22 */
 EXTERN int		TclFindElement(Tcl_Interp *interp,
-				const char *listStr, int listLength,
+				const char *listStr, size_t listLength,
 				const char **elementPtr,
 				const char **nextPtr, size_t *sizePtr,
 				int *bracePtr);
@@ -603,7 +603,7 @@ typedef struct TclIntStubs {
     void (*reserved19)(void);
     void (*reserved20)(void);
     void (*reserved21)(void);
-    int (*tclFindElement) (Tcl_Interp *interp, const char *listStr, int listLength, const char **elementPtr, const char **nextPtr, size_t *sizePtr, int *bracePtr); /* 22 */
+    int (*tclFindElement) (Tcl_Interp *interp, const char *listStr, size_t listLength, const char **elementPtr, const char **nextPtr, size_t *sizePtr, int *bracePtr); /* 22 */
     Proc * (*tclFindProc) (Interp *iPtr, const char *procName); /* 23 */
     size_t (*tclFormatInt) (char *buffer, Tcl_WideInt n); /* 24 */
     void (*tclFreePackageInfo) (Interp *iPtr); /* 25 */
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 17a9dfe..43a24f7 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -493,7 +493,7 @@ TclFindElement(
     const char *list,		/* Points to the first byte of a string
 				 * containing a Tcl list with zero or more
 				 * elements (possibly in braces). */
-    int listLength,		/* Number of bytes in the list's string. */
+    size_t listLength,		/* Number of bytes in the list's string. */
     const char **elementPtr,	/* Where to put address of first significant
 				 * character in first element of list. */
     const char **nextPtr,	/* Fill in with location of character just
@@ -550,7 +550,7 @@ FindElement(
 				 * containing a Tcl list or dictionary with
 				 * zero or more elements (possibly in
 				 * braces). */
-    size_t stringLength1,		/* Number of bytes in the string. */
+    size_t stringLength,		/* Number of bytes in the string. */
     const char *typeStr,	/* The name of the type of thing we are
 				 * parsing, for error messages. */
     const char *typeCode,	/* The type code for thing we are parsing, for
@@ -572,13 +572,12 @@ FindElement(
     const char *p = string;
     const char *elemStart;	/* Points to first byte of first element. */
     const char *limit;		/* Points just after list/dict's last byte. */
-    int openBraces = 0;		/* Brace nesting level during parse. */
+    size_t openBraces = 0;		/* Brace nesting level during parse. */
     int inQuotes = 0;
-    int size = 0;
+    size_t size = 0;
     size_t numChars;
     int literal = 1;
     const char *p2;
-    int stringLength = stringLength1;
 
     /*
      * Skim off leading white space and check for an opening brace or quote.
@@ -976,7 +975,7 @@ Tcl_ScanCountedElement(
 				 * Tcl_ConvertElement. */
 {
     char flags = CONVERT_ANY;
-    int numBytes = TclScanElement(src, length, &flags);
+    size_t numBytes = TclScanElement(src, length, &flags);
 
     *flagPtr = flags;
     return numBytes;
@@ -1020,7 +1019,7 @@ TclScanElement(
 				 * Tcl_ConvertElement. */
 {
     const char *p = src;
-    int nestingLevel = 0;	/* Brace nesting count */
+    size_t nestingLevel = 0;	/* Brace nesting count */
     int forbidNone = 0;		/* Do not permit CONVERT_NONE mode. Something
 				 * needs protection or escape. */
     int requireEscape = 0;	/* Force use of CONVERT_ESCAPE mode.  For some
@@ -1089,8 +1088,7 @@ TclScanElement(
 	    braceCount++;
 #endif /* COMPAT */
 	    extra++;				/* Escape '}' => '\}' */
-	    nestingLevel--;
-	    if (nestingLevel < 0) {
+	    if (nestingLevel-- < 1) {
 		/*
 		 * Unbalanced braces!  Cannot format with brace quoting.
 		 */
@@ -1171,7 +1169,7 @@ TclScanElement(
     }
 
   endOfString:
-    if (nestingLevel != 0) {
+    if (nestingLevel > 0) {
 	/*
 	 * Unbalanced braces!  Cannot format with brace quoting.
 	 */
-- 
cgit v0.12


From daf02b80ddf417691daacbfc8e1c926b16ea8b18 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Jun 2022 14:24:51 +0000
Subject: No quotes when testing for TCL_MAJOR_VERSION

---
 win/rules.vc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index 1b8df9c..16551d5 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1162,8 +1162,7 @@ TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
 
-
-!if "$(TCL_MAJOR_VERSION)" == "8"
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
 !else
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib
@@ -1187,7 +1186,7 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 !if !exist($(TCLSH))
 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
-!if "$(TCL_MAJOR_VERSION)" == "8"
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
 !else
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib
@@ -1427,7 +1426,7 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_CFG_DO64BIT
 OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64=1
 !endif
 
-!if "$(TCL_MAJOR_VERSION)" == "8"
+!if $(TCL_MAJOR_VERSION) == 8
 !if "$(_USE_64BIT_TIME_T)" == "1"
 OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
 !endif
-- 
cgit v0.12


From 5ea6733979199c89c9ad45cd247fdf1874a529c0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Jun 2022 22:25:44 +0000
Subject: Forget about TCL_8_COMPAT

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

diff --git a/generic/tcl.h b/generic/tcl.h
index 6c1ebf4..26ebe90 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -50,7 +50,7 @@ extern "C" {
 #if !defined(TCL_MAJOR_VERSION)
 #   define TCL_MAJOR_VERSION   9
 #endif
-#if (TCL_MAJOR_VERSION == 9)
+#if TCL_MAJOR_VERSION == 9
 #   define TCL_MINOR_VERSION   0
 #   define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
 #   define TCL_RELEASE_SERIAL  4
@@ -673,15 +673,10 @@ typedef union Tcl_ObjInternalRep {	/* The internal representation: */
  * An object stores a value as either a string, some internal representation,
  * or both.
  */
-#if TCL_MAJOR_VERSION < 9
-#   define Tcl_Size int
-#elif defined(TCL_8_COMPAT)
-#   ifdef BUILD_tcl
-#	error "TCL_8_COMPAT not supported when building Tcl"
-#   endif
-#   define Tcl_Size ptrdiff_t
-#else
+#if TCL_MAJOR_VERSION > 8
 #   define Tcl_Size size_t
+#else
+#   define Tcl_Size int
 #endif
 
 
-- 
cgit v0.12


From 6ebde0d07536315b422d5dbad8d2dd66d8500ead Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 24 Jun 2022 13:07:16 +0000
Subject: Better tcl8 compatibility for tclInt.h

---
 generic/tclInt.h | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 3f5f57c..af61507 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1844,7 +1844,14 @@ typedef struct Interp {
 #if TCL_MAJOR_VERSION > 8
     void (*optimizer)(void *envPtr);
 #else
-    Tcl_HashTable unused2; /* No longer used */
+    union {
+	void (*optimizer)(void *envPtr);
+	Tcl_HashTable unused2;	/* No longer used (was mathFuncTable). The
+				 * unused space in interp was repurposed for
+				 * pluggable bytecode optimizers. The core
+				 * contains one optimizer, which can be
+				 * selectively overridden by extensions. */
+    } extra;
 #endif
     /*
      * Information related to procedures and variables. See tclProc.c and
@@ -2462,11 +2469,20 @@ typedef struct List {
  * WARNING: these macros eval their args more than once.
  */
 
+#if TCL_MAJOR_VERSION > 8
 #define TclGetBooleanFromObj(interp, objPtr, intPtr) \
     (((objPtr)->typePtr == &tclIntType \
 	    || (objPtr)->typePtr == &tclBooleanType) \
 	? (*(intPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
 	: Tcl_GetBooleanFromObj((interp), (objPtr), (intPtr)))
+#else
+#define TclGetBooleanFromObj(interp, objPtr, intPtr) \
+    (((objPtr)->typePtr == &tclIntType)			\
+	? (*(intPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
+	: ((objPtr)->typePtr == &tclBooleanType)			\
+	? (*(intPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
+	: Tcl_GetBooleanFromObj((interp), (objPtr), (intPtr)))
+#endif
 
 #ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetLongFromObj(interp, objPtr, longPtr) \
@@ -2491,7 +2507,7 @@ typedef struct List {
 #define TclGetIntForIndexM(interp, objPtr, endValue, idxPtr) \
     ((((objPtr)->typePtr == &tclIntType) && ((objPtr)->internalRep.wideValue >= 0) \
 	    && ((Tcl_WideUInt)(objPtr)->internalRep.wideValue <= (Tcl_WideUInt)(endValue + 1))) \
-	    ? ((*(idxPtr) = (Tcl_Size)(objPtr)->internalRep.wideValue), TCL_OK) \
+	    ? ((*(idxPtr) = (objPtr)->internalRep.wideValue), TCL_OK) \
 	    : Tcl_GetIntForIndex((interp), (objPtr), (endValue), (idxPtr)))
 
 /*
@@ -2966,8 +2982,7 @@ MODULE_SCOPE int	TclFSFileAttrIndex(Tcl_Obj *pathPtr,
 MODULE_SCOPE Tcl_Command TclNRCreateCommandInNs(Tcl_Interp *interp,
 			    const char *cmdName, Tcl_Namespace *nsPtr,
 			    Tcl_ObjCmdProc *proc, Tcl_ObjCmdProc *nreProc,
-			    void *clientData,
-			    Tcl_CmdDeleteProc *deleteProc);
+			    void *clientData, Tcl_CmdDeleteProc *deleteProc);
 MODULE_SCOPE int	TclNREvalFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 			    const char *encodingName);
 MODULE_SCOPE void	TclFSUnloadTempFile(Tcl_LoadHandle loadHandle);
@@ -4663,7 +4678,7 @@ MODULE_SCOPE const TclFileAttrProcs	tclpFileAttrProcs[];
  * of counting along a string of all one-byte characters.  The ANSI C
  * "prototype" for this macro is:
  *
- * MODULE_SCOPE void	TclNumUtfCharsM(size_t numChars, const char *bytes,
+ * MODULE_SCOPE void	TclNumUtfCharsM(int | size_t numChars, const char *bytes,
  *				size_t numBytes);
  *----------------------------------------------------------------
  */
@@ -4836,7 +4851,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	TclAllocObjStorage(objPtr);			\
 	(objPtr)->refCount = 0;				\
 	(objPtr)->bytes = NULL;				\
-	(objPtr)->internalRep.wideValue = ((_w) == TCL_INDEX_NONE) ? -1 : (Tcl_WideInt)(_w); \
+	(objPtr)->internalRep.wideValue = ((size_t)(_w) == (size_t)TCL_INDEX_NONE) ? -1 : (Tcl_WideInt)(_w); \
 	(objPtr)->typePtr = &tclIntType;		\
 	TCL_DTRACE_OBJ_CREATE(objPtr);			\
     } while (0)
-- 
cgit v0.12


From 5ad300bf4aa456914215c358584488170220f8d5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 24 Jun 2022 13:30:14 +0000
Subject: Use TCL_MAJOR_VERSION to document (kind of) what's the difference
 between Tcl8 and Tcl9

---
 generic/tclInt.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 3ac2240..8d8c764 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -932,7 +932,7 @@ typedef struct CompiledLocal {
 				 * Among others used to speed up var lookups. */
     size_t frameIndex;		/* Index in the array of compiler-assigned
 				 * variables in the procedure call frame. */
-#if TCL_UTF_MAX < 9
+#if TCL_MAJOR_VERSION < 9
     int flags;
 #endif
     Tcl_Obj *defValuePtr;	/* Pointer to the default value of an
@@ -945,7 +945,7 @@ typedef struct CompiledLocal {
 				 * is marked by a unique tag during
 				 * compilation, and that same tag is used to
 				 * find the variable at runtime. */
-#if TCL_UTF_MAX > 8
+#if TCL_MAJOR_VERSION > 8
     int flags;			/* Flag bits for the local variable. Same as
 				 * the flags for the Var structure above,
 				 * although only VAR_ARGUMENT, VAR_TEMPORARY,
@@ -1866,6 +1866,12 @@ typedef struct Interp {
     Namespace *lookupNsPtr;	/* Namespace to use ONLY on the next
 				 * TCL_EVAL_INVOKE call to Tcl_EvalObjv. */
 
+#if TCL_MAJOR_VERSION < 9
+    char *appendResultDontUse;
+    int appendAvlDontUse;
+    int appendUsedDontUse;
+#endif
+
     /*
      * Information about packages. Used only in tclPkg.c.
      */
@@ -1888,6 +1894,9 @@ typedef struct Interp {
 				 * Normally zero, but may be set before
 				 * calling Tcl_Eval. See below for valid
 				 * values. */
+#if TCL_MAJOR_VERSION < 9
+    int unused1;		/* No longer used (was termOffset) */
+#endif
     LiteralTable literalTable;	/* Contains LiteralEntry's describing all Tcl
 				 * objects holding literals of scripts
 				 * compiled by the interpreter. Indexed by the
@@ -1925,6 +1934,9 @@ typedef struct Interp {
 				 * string. Returned by Tcl_ObjSetVar2 when
 				 * variable traces change a variable in a
 				 * gross way. */
+#if TCL_MAJOR_VERSION < 9
+    char resultSpaceDontUse[TCL_DSTRING_STATIC_SIZE+1];
+#endif
     Tcl_Obj *objResultPtr;	/* If the last command returned an object
 				 * result, this points to it. Should not be
 				 * accessed directly; see comment above. */
-- 
cgit v0.12


From b456ce6d74e9d801a105f103e737b9c4c523e0f7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 24 Jun 2022 14:44:08 +0000
Subject: Complete removal of version from stub library

---
 win/rules.vc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/win/rules.vc b/win/rules.vc
index 0067b25..4280b9b 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1146,7 +1146,11 @@ TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
 TCLSCRIPTZIP    = $(OUT_DIR)\$(TCLSCRIPTZIPNAME)
 
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
+!else
+TCLSTUBLIBNAME	= $(STUBPREFIX).lib
+!endif
 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)
 TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
 
@@ -1290,7 +1294,11 @@ PRJLIBNAME	= $(PRJLIBNAME9)
 !endif
 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)
 
+!if $(TCL_MAJOR_VERSION) == 8
 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
+!else
+PRJSTUBLIBNAME	= $(STUBPREFIX).lib
+!endif
 PRJSTUBLIB	= $(OUT_DIR)\$(PRJSTUBLIBNAME)
 
 # If extension parent makefile has not defined a resource definition file,
-- 
cgit v0.12


From 9b6113c6b13629e4d525a98f201289c0ed42d143 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Jun 2022 21:23:55 +0000
Subject: Better Tcl8 compatibility for tclPlatDecls.h and tclInt.h

---
 generic/tclInt.h          |   4 +-
 generic/tclIntPlatDecls.h |   5 +++
 generic/tclPlatDecls.h    | 102 +++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 0c07e97..87f10f0 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -5115,7 +5115,9 @@ typedef struct NRE_callback {
 #endif
 
 #include "tclIntDecls.h"
-#include "tclIntPlatDecls.h"
+#if TCL_MAJOR_VERSION > 8
+#   include "tclIntPlatDecls.h"
+#endif
 
 #if !defined(USE_TCL_STUBS) && !defined(TCL_MEM_DEBUG)
 #define Tcl_AttemptAlloc        TclpAlloc
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 0e51eef..2e032a3 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -13,6 +13,11 @@
 #ifndef _TCLINTPLATDECLS
 #define _TCLINTPLATDECLS
 
+
+#if TCL_MAJOR_VERSION < 9
+#error "This header-file only works for Tcl 9"
+#endif
+
 #undef TCL_STORAGE_CLASS
 #ifdef BUILD_tcl
 #   define TCL_STORAGE_CLASS DLLEXPORT
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index bcaff5e..1c60bf8 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -48,6 +48,94 @@
 #   endif
 #endif
 
+#if TCL_MAJOR_VERSION < 9
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+/* 0 */
+EXTERN TCHAR *		Tcl_WinUtfToTChar(const char *str, int len,
+				Tcl_DString *dsPtr);
+/* 1 */
+EXTERN char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
+				Tcl_DString *dsPtr);
+/* Slot 2 is reserved */
+/* 3 */
+EXTERN void		Tcl_WinConvertError(unsigned errCode);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 0 */
+EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
+				const char *bundleName, int hasResourceFile,
+				int maxPathLen, char *libraryPath);
+/* 1 */
+EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
+				Tcl_Interp *interp, const char *bundleName,
+				const char *bundleVersion,
+				int hasResourceFile, int maxPathLen,
+				char *libraryPath);
+/* 2 */
+EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
+				const void *runLoopMode);
+#endif /* MACOSX */
+
+typedef struct TclPlatStubs {
+    int magic;
+    void *hooks;
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    TCHAR * (*tcl_WinUtfToTChar) (const char *str, int len, Tcl_DString *dsPtr); /* 0 */
+    char * (*tcl_WinTCharToUtf) (const TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */
+    void (*reserved2)(void);
+    void (*tcl_WinConvertError) (unsigned errCode); /* 3 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */
+    void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
+#endif /* MACOSX */
+} TclPlatStubs;
+
+extern const TclPlatStubs *tclPlatStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#define Tcl_WinUtfToTChar \
+	(tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */
+#define Tcl_WinTCharToUtf \
+	(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */
+/* Slot 2 is reserved */
+#define Tcl_WinConvertError \
+	(tclPlatStubsPtr->tcl_WinConvertError) /* 3 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define Tcl_MacOSXOpenBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */
+#define Tcl_MacOSXOpenVersionedBundleResources \
+	(tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */
+#define Tcl_MacOSXNotifierAddRunLoopMode \
+	(tclPlatStubsPtr->tcl_MacOSXNotifierAddRunLoopMode) /* 2 */
+#endif /* MACOSX */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+#else /* TCL_MAJOR_VERSION > 8 */
+
 /* !BEGIN!: Do not edit below this line. */
 
 #ifdef __cplusplus
@@ -105,6 +193,13 @@ extern const TclPlatStubs *tclPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
+#endif /* TCL_MAJOR_VERSION */
+
+#ifdef MAC_OSX_TCL /* MACOSX */
+#undef Tcl_MacOSXOpenBundleResources
+#define Tcl_MacOSXOpenBundleResources(a,b,c,d,e) Tcl_MacOSXOpenVersionedBundleResources(a,b,NULL,c,d,e)
+#endif
+
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
@@ -118,11 +213,16 @@ extern const TclPlatStubs *tclPlatStubsPtr;
 #   undef Tcl_MacOSXNotifierAddRunLoopMode
 #endif
 
-#if defined(USE_TCL_STUBS) && defined(_WIN32) && !defined(TCL_NO_DEPRECATED)
+#if defined(USE_TCL_STUBS) && (defined(_WIN32) || defined(__CYGWIN__))\
+	&& (defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8)
+#undef Tcl_WinUtfToTChar
+#undef Tcl_WinTCharToUtf
+#ifdef _WIN32
 #define Tcl_WinUtfToTChar(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \
 		(TCHAR *)Tcl_UtfToChar16DString((string), (len), (dsPtr)))
 #define Tcl_WinTCharToUtf(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \
 		(char *)Tcl_Char16ToUtfDString((const unsigned short *)(string), ((((len) + 2) >> 1) - 1), (dsPtr)))
 #endif
+#endif
 
 #endif /* _TCLPLATDECLS */
-- 
cgit v0.12


From 7974d5f010f2cda4ccd9dcfb0186af3940b3750a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Jun 2022 21:59:53 +0000
Subject: Fix TclpGetClicks/TclpGetSeconds's Tcl 8 compabitility

---
 generic/tclIntDecls.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 425a03c..1566890 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -1265,6 +1265,15 @@ extern const TclIntStubs *tclIntStubsPtr;
 	(tclIntStubsPtr->tclStaticLibrary)
 #endif /* defined(USE_TCL_STUBS) */
 
+#if (TCL_MAJOR_VERSION < 9) && defined(USE_TCL_STUBS)
+#undef TclpGetClicks
+#define TclpGetClicks() \
+		((unsigned long)tclIntStubsPtr->tclpGetClicks())
+#undef TclpGetSeconds
+#define TclpGetSeconds() \
+		((unsigned long)tclIntStubsPtr->tclpGetSeconds())
+#endif
+
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-- 
cgit v0.12


From 2f8db2f9267772834f968133202224d8279fa6fe Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Jun 2022 22:49:16 +0000
Subject: Add OPTS=tcl8

---
 win/rules.vc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/win/rules.vc b/win/rules.vc
index 4280b9b..a5b868a 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -877,6 +877,12 @@ TCL_THREADS = 0
 USE_THREAD_ALLOC= 0
 !endif
 
+!if [nmakehlp -f $(OPTS) "tcl8"]
+!message *** Build for Tcl8
+TCL_MAJOR_VERSION = 8
+!endif
+!endif
+
 !if $(TCL_MAJOR_VERSION) == 8
 !if [nmakehlp -f $(OPTS) "time64bit"]
 !message *** Force 64-bit time_t
@@ -1445,6 +1451,9 @@ COMPILERFLAGS  = /D_ATL_XP_TARGETING
 !if "$(TCL_UTF_MAX)" == "3"
 OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3
 !endif
+!if "$(TCL_MAJOR_VERSION)" == "8"
+OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
+!endif
 
 # Like the TEA system only set this non empty for non-Tk extensions
 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME
-- 
cgit v0.12


From 1ff4bd27f45558a18705f3a0750f232c01b2d0d7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 27 Jun 2022 10:07:13 +0000
Subject: Fix superflous !endif

---
 win/rules.vc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index a5b868a..6e06943 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -881,7 +881,6 @@ USE_THREAD_ALLOC= 0
 !message *** Build for Tcl8
 TCL_MAJOR_VERSION = 8
 !endif
-!endif
 
 !if $(TCL_MAJOR_VERSION) == 8
 !if [nmakehlp -f $(OPTS) "time64bit"]
@@ -1451,7 +1450,7 @@ COMPILERFLAGS  = /D_ATL_XP_TARGETING
 !if "$(TCL_UTF_MAX)" == "3"
 OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3
 !endif
-!if "$(TCL_MAJOR_VERSION)" == "8"
+!if $(TCL_MAJOR_VERSION) == 8
 OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
 !endif
 
-- 
cgit v0.12


From 3df7fe883ed9238895ce61465294b40360d5b9df Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 28 Jun 2022 08:02:08 +0000
Subject: Handle tclIntPlatDecls.h

---
 generic/tclInt.h          |   4 +-
 generic/tclIntPlatDecls.h | 596 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 572 insertions(+), 28 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 87f10f0..0c07e97 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -5115,9 +5115,7 @@ typedef struct NRE_callback {
 #endif
 
 #include "tclIntDecls.h"
-#if TCL_MAJOR_VERSION > 8
-#   include "tclIntPlatDecls.h"
-#endif
+#include "tclIntPlatDecls.h"
 
 #if !defined(USE_TCL_STUBS) && !defined(TCL_MEM_DEBUG)
 #define Tcl_AttemptAlloc        TclpAlloc
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 2e032a3..3eb7baa 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -13,11 +13,6 @@
 #ifndef _TCLINTPLATDECLS
 #define _TCLINTPLATDECLS
 
-
-#if TCL_MAJOR_VERSION < 9
-#error "This header-file only works for Tcl 9"
-#endif
-
 #undef TCL_STORAGE_CLASS
 #ifdef BUILD_tcl
 #   define TCL_STORAGE_CLASS DLLEXPORT
@@ -35,6 +30,539 @@
  * in the generic/tclInt.decls script.
  */
 
+#if TCL_MAJOR_VERSION < 9
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+#if !defined(_WIN32) && !defined(__CYGWIN__) && !defined(MAC_OSX_TCL) /* UNIX */
+/* 0 */
+EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 1 */
+EXTERN int		TclpCloseFile(TclFile file);
+/* 2 */
+EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+				TclFile writeFile, TclFile errorFile,
+				int numPids, Tcl_Pid *pidPtr);
+/* 3 */
+EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+/* 4 */
+EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+				const char **argv, TclFile inputFile,
+				TclFile outputFile, TclFile errorFile,
+				Tcl_Pid *pidPtr);
+/* 5 */
+EXTERN int		TclUnixWaitForFile_(int fd, int mask, int timeout);
+/* 6 */
+EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+/* 7 */
+EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+/* 8 */
+EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+/* 9 */
+EXTERN TclFile		TclpCreateTempFile(const char *contents);
+/* 10 */
+EXTERN Tcl_DirEntry *	TclpReaddir(TclDIR *dir);
+/* 11 */
+EXTERN struct tm *	TclpLocaltime_unix(const time_t *clock);
+/* 12 */
+EXTERN struct tm *	TclpGmtime_unix(const time_t *clock);
+/* 13 */
+EXTERN char *		TclpInetNtoa(struct in_addr addr);
+/* 14 */
+EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+				const Tcl_StatBuf *statBufPtr,
+				int dontCopyAtts);
+/* 15 */
+EXTERN int		TclMacOSXGetFileAttribute(Tcl_Interp *interp,
+				int objIndex, Tcl_Obj *fileName,
+				Tcl_Obj **attributePtrPtr);
+/* 16 */
+EXTERN int		TclMacOSXSetFileAttribute(Tcl_Interp *interp,
+				int objIndex, Tcl_Obj *fileName,
+				Tcl_Obj *attributePtr);
+/* 17 */
+EXTERN int		TclMacOSXCopyFileAttributes(const char *src,
+				const char *dst,
+				const Tcl_StatBuf *statBufPtr);
+/* 18 */
+EXTERN int		TclMacOSXMatchType(Tcl_Interp *interp,
+				const char *pathName, const char *fileName,
+				Tcl_StatBuf *statBufPtr,
+				Tcl_GlobTypeData *types);
+/* 19 */
+EXTERN void		TclMacOSXNotifierAddRunLoopMode(
+				const void *runLoopMode);
+/* Slot 20 is reserved */
+/* Slot 21 is reserved */
+/* 22 */
+EXTERN TclFile		TclpCreateTempFile_(const char *contents);
+/* Slot 23 is reserved */
+/* Slot 24 is reserved */
+/* Slot 25 is reserved */
+/* Slot 26 is reserved */
+/* Slot 27 is reserved */
+/* Slot 28 is reserved */
+/* 29 */
+EXTERN int		TclWinCPUID(int index, int *regs);
+/* 30 */
+EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
+				Tcl_Obj *basenameObj, Tcl_Obj *extensionObj,
+				Tcl_Obj *resultingNameObj);
+#endif /* UNIX */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+/* 0 */
+EXTERN void		TclWinConvertError(DWORD errCode);
+/* 1 */
+EXTERN void		TclWinConvertWSAError(DWORD errCode);
+/* 2 */
+EXTERN struct servent *	 TclWinGetServByName(const char *nm,
+				const char *proto);
+/* 3 */
+EXTERN int		TclWinGetSockOpt(SOCKET s, int level, int optname,
+				char *optval, int *optlen);
+/* 4 */
+EXTERN HINSTANCE	TclWinGetTclInstance(void);
+/* 5 */
+EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+/* 6 */
+EXTERN unsigned short	TclWinNToHS(unsigned short ns);
+/* 7 */
+EXTERN int		TclWinSetSockOpt(SOCKET s, int level, int optname,
+				const char *optval, int optlen);
+/* 8 */
+EXTERN int		TclpGetPid(Tcl_Pid pid);
+/* 9 */
+EXTERN int		TclWinGetPlatformId(void);
+/* 10 */
+EXTERN Tcl_DirEntry *	TclpReaddir(TclDIR *dir);
+/* 11 */
+EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 12 */
+EXTERN int		TclpCloseFile(TclFile file);
+/* 13 */
+EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+				TclFile writeFile, TclFile errorFile,
+				int numPids, Tcl_Pid *pidPtr);
+/* 14 */
+EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+/* 15 */
+EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+				const char **argv, TclFile inputFile,
+				TclFile outputFile, TclFile errorFile,
+				Tcl_Pid *pidPtr);
+/* 16 */
+EXTERN int		TclpIsAtty(int fd);
+/* 17 */
+EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+				const Tcl_StatBuf *statBufPtr,
+				int dontCopyAtts);
+/* 18 */
+EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+/* 19 */
+EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+/* 20 */
+EXTERN void		TclWinAddProcess(HANDLE hProcess, DWORD id);
+/* 21 */
+EXTERN char *		TclpInetNtoa(struct in_addr addr);
+/* 22 */
+EXTERN TclFile		TclpCreateTempFile(const char *contents);
+/* Slot 23 is reserved */
+/* 24 */
+EXTERN char *		TclWinNoBackslash(char *path);
+/* Slot 25 is reserved */
+/* 26 */
+EXTERN void		TclWinSetInterfaces(int wide);
+/* 27 */
+EXTERN void		TclWinFlushDirtyChannels(void);
+/* 28 */
+EXTERN void		TclWinResetInterfaces(void);
+/* 29 */
+EXTERN int		TclWinCPUID(int index, int *regs);
+/* 30 */
+EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
+				Tcl_Obj *basenameObj, Tcl_Obj *extensionObj,
+				Tcl_Obj *resultingNameObj);
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+/* 0 */
+EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
+				Tcl_Channel chan);
+/* 1 */
+EXTERN int		TclpCloseFile(TclFile file);
+/* 2 */
+EXTERN Tcl_Channel	TclpCreateCommandChannel(TclFile readFile,
+				TclFile writeFile, TclFile errorFile,
+				int numPids, Tcl_Pid *pidPtr);
+/* 3 */
+EXTERN int		TclpCreatePipe(TclFile *readPipe, TclFile *writePipe);
+/* 4 */
+EXTERN int		TclpCreateProcess(Tcl_Interp *interp, int argc,
+				const char **argv, TclFile inputFile,
+				TclFile outputFile, TclFile errorFile,
+				Tcl_Pid *pidPtr);
+/* 5 */
+EXTERN int		TclUnixWaitForFile_(int fd, int mask, int timeout);
+/* 6 */
+EXTERN TclFile		TclpMakeFile(Tcl_Channel channel, int direction);
+/* 7 */
+EXTERN TclFile		TclpOpenFile(const char *fname, int mode);
+/* 8 */
+EXTERN int		TclUnixWaitForFile(int fd, int mask, int timeout);
+/* 9 */
+EXTERN TclFile		TclpCreateTempFile(const char *contents);
+/* 10 */
+EXTERN Tcl_DirEntry *	TclpReaddir(TclDIR *dir);
+/* 11 */
+EXTERN struct tm *	TclpLocaltime_unix(const time_t *clock);
+/* 12 */
+EXTERN struct tm *	TclpGmtime_unix(const time_t *clock);
+/* 13 */
+EXTERN char *		TclpInetNtoa(struct in_addr addr);
+/* 14 */
+EXTERN int		TclUnixCopyFile(const char *src, const char *dst,
+				const Tcl_StatBuf *statBufPtr,
+				int dontCopyAtts);
+/* 15 */
+EXTERN int		TclMacOSXGetFileAttribute(Tcl_Interp *interp,
+				int objIndex, Tcl_Obj *fileName,
+				Tcl_Obj **attributePtrPtr);
+/* 16 */
+EXTERN int		TclMacOSXSetFileAttribute(Tcl_Interp *interp,
+				int objIndex, Tcl_Obj *fileName,
+				Tcl_Obj *attributePtr);
+/* 17 */
+EXTERN int		TclMacOSXCopyFileAttributes(const char *src,
+				const char *dst,
+				const Tcl_StatBuf *statBufPtr);
+/* 18 */
+EXTERN int		TclMacOSXMatchType(Tcl_Interp *interp,
+				const char *pathName, const char *fileName,
+				Tcl_StatBuf *statBufPtr,
+				Tcl_GlobTypeData *types);
+/* 19 */
+EXTERN void		TclMacOSXNotifierAddRunLoopMode(
+				const void *runLoopMode);
+/* Slot 20 is reserved */
+/* Slot 21 is reserved */
+/* 22 */
+EXTERN TclFile		TclpCreateTempFile_(const char *contents);
+/* Slot 23 is reserved */
+/* Slot 24 is reserved */
+/* Slot 25 is reserved */
+/* Slot 26 is reserved */
+/* Slot 27 is reserved */
+/* Slot 28 is reserved */
+/* 29 */
+EXTERN int		TclWinCPUID(int index, int *regs);
+/* 30 */
+EXTERN int		TclUnixOpenTemporaryFile(Tcl_Obj *dirObj,
+				Tcl_Obj *basenameObj, Tcl_Obj *extensionObj,
+				Tcl_Obj *resultingNameObj);
+#endif /* MACOSX */
+
+typedef struct TclIntPlatStubs {
+    int magic;
+    void *hooks;
+
+#if !defined(_WIN32) && !defined(__CYGWIN__) && !defined(MAC_OSX_TCL) /* UNIX */
+    void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 0 */
+    int (*tclpCloseFile) (TclFile file); /* 1 */
+    Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 2 */
+    int (*tclpCreatePipe) (TclFile *readPipe, TclFile *writePipe); /* 3 */
+    int (*tclpCreateProcess) (Tcl_Interp *interp, int argc, const char **argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr); /* 4 */
+    int (*tclUnixWaitForFile_) (int fd, int mask, int timeout); /* 5 */
+    TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 6 */
+    TclFile (*tclpOpenFile) (const char *fname, int mode); /* 7 */
+    int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
+    TclFile (*tclpCreateTempFile) (const char *contents); /* 9 */
+    Tcl_DirEntry * (*tclpReaddir) (TclDIR *dir); /* 10 */
+    struct tm * (*tclpLocaltime_unix) (const time_t *clock); /* 11 */
+    struct tm * (*tclpGmtime_unix) (const time_t *clock); /* 12 */
+    char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
+    int (*tclUnixCopyFile) (const char *src, const char *dst, const Tcl_StatBuf *statBufPtr, int dontCopyAtts); /* 14 */
+    int (*tclMacOSXGetFileAttribute) (Tcl_Interp *interp, int objIndex, Tcl_Obj *fileName, Tcl_Obj **attributePtrPtr); /* 15 */
+    int (*tclMacOSXSetFileAttribute) (Tcl_Interp *interp, int objIndex, Tcl_Obj *fileName, Tcl_Obj *attributePtr); /* 16 */
+    int (*tclMacOSXCopyFileAttributes) (const char *src, const char *dst, const Tcl_StatBuf *statBufPtr); /* 17 */
+    int (*tclMacOSXMatchType) (Tcl_Interp *interp, const char *pathName, const char *fileName, Tcl_StatBuf *statBufPtr, Tcl_GlobTypeData *types); /* 18 */
+    void (*tclMacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 19 */
+    void (*reserved20)(void);
+    void (*reserved21)(void);
+    TclFile (*tclpCreateTempFile_) (const char *contents); /* 22 */
+    void (*reserved23)(void);
+    void (*reserved24)(void);
+    void (*reserved25)(void);
+    void (*reserved26)(void);
+    void (*reserved27)(void);
+    void (*reserved28)(void);
+    int (*tclWinCPUID) (int index, int *regs); /* 29 */
+    int (*tclUnixOpenTemporaryFile) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj, Tcl_Obj *extensionObj, Tcl_Obj *resultingNameObj); /* 30 */
+#endif /* UNIX */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    void (*tclWinConvertError) (DWORD errCode); /* 0 */
+    void (*tclWinConvertWSAError) (DWORD errCode); /* 1 */
+    struct servent * (*tclWinGetServByName) (const char *nm, const char *proto); /* 2 */
+    int (*tclWinGetSockOpt) (SOCKET s, int level, int optname, char *optval, int *optlen); /* 3 */
+    HINSTANCE (*tclWinGetTclInstance) (void); /* 4 */
+    int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 5 */
+    unsigned short (*tclWinNToHS) (unsigned short ns); /* 6 */
+    int (*tclWinSetSockOpt) (SOCKET s, int level, int optname, const char *optval, int optlen); /* 7 */
+    int (*tclpGetPid) (Tcl_Pid pid); /* 8 */
+    int (*tclWinGetPlatformId) (void); /* 9 */
+    Tcl_DirEntry * (*tclpReaddir) (TclDIR *dir); /* 10 */
+    void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 11 */
+    int (*tclpCloseFile) (TclFile file); /* 12 */
+    Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 13 */
+    int (*tclpCreatePipe) (TclFile *readPipe, TclFile *writePipe); /* 14 */
+    int (*tclpCreateProcess) (Tcl_Interp *interp, int argc, const char **argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr); /* 15 */
+    int (*tclpIsAtty) (int fd); /* 16 */
+    int (*tclUnixCopyFile) (const char *src, const char *dst, const Tcl_StatBuf *statBufPtr, int dontCopyAtts); /* 17 */
+    TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 18 */
+    TclFile (*tclpOpenFile) (const char *fname, int mode); /* 19 */
+    void (*tclWinAddProcess) (HANDLE hProcess, DWORD id); /* 20 */
+    char * (*tclpInetNtoa) (struct in_addr addr); /* 21 */
+    TclFile (*tclpCreateTempFile) (const char *contents); /* 22 */
+    void (*reserved23)(void);
+    char * (*tclWinNoBackslash) (char *path); /* 24 */
+    void (*reserved25)(void);
+    void (*tclWinSetInterfaces) (int wide); /* 26 */
+    void (*tclWinFlushDirtyChannels) (void); /* 27 */
+    void (*tclWinResetInterfaces) (void); /* 28 */
+    int (*tclWinCPUID) (int index, int *regs); /* 29 */
+    int (*tclUnixOpenTemporaryFile) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj, Tcl_Obj *extensionObj, Tcl_Obj *resultingNameObj); /* 30 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+    void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 0 */
+    int (*tclpCloseFile) (TclFile file); /* 1 */
+    Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 2 */
+    int (*tclpCreatePipe) (TclFile *readPipe, TclFile *writePipe); /* 3 */
+    int (*tclpCreateProcess) (Tcl_Interp *interp, int argc, const char **argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr); /* 4 */
+    int (*tclUnixWaitForFile_) (int fd, int mask, int timeout); /* 5 */
+    TclFile (*tclpMakeFile) (Tcl_Channel channel, int direction); /* 6 */
+    TclFile (*tclpOpenFile) (const char *fname, int mode); /* 7 */
+    int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
+    TclFile (*tclpCreateTempFile) (const char *contents); /* 9 */
+    Tcl_DirEntry * (*tclpReaddir) (TclDIR *dir); /* 10 */
+    struct tm * (*tclpLocaltime_unix) (const time_t *clock); /* 11 */
+    struct tm * (*tclpGmtime_unix) (const time_t *clock); /* 12 */
+    char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
+    int (*tclUnixCopyFile) (const char *src, const char *dst, const Tcl_StatBuf *statBufPtr, int dontCopyAtts); /* 14 */
+    int (*tclMacOSXGetFileAttribute) (Tcl_Interp *interp, int objIndex, Tcl_Obj *fileName, Tcl_Obj **attributePtrPtr); /* 15 */
+    int (*tclMacOSXSetFileAttribute) (Tcl_Interp *interp, int objIndex, Tcl_Obj *fileName, Tcl_Obj *attributePtr); /* 16 */
+    int (*tclMacOSXCopyFileAttributes) (const char *src, const char *dst, const Tcl_StatBuf *statBufPtr); /* 17 */
+    int (*tclMacOSXMatchType) (Tcl_Interp *interp, const char *pathName, const char *fileName, Tcl_StatBuf *statBufPtr, Tcl_GlobTypeData *types); /* 18 */
+    void (*tclMacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 19 */
+    void (*reserved20)(void);
+    void (*reserved21)(void);
+    TclFile (*tclpCreateTempFile_) (const char *contents); /* 22 */
+    void (*reserved23)(void);
+    void (*reserved24)(void);
+    void (*reserved25)(void);
+    void (*reserved26)(void);
+    void (*reserved27)(void);
+    void (*reserved28)(void);
+    int (*tclWinCPUID) (int index, int *regs); /* 29 */
+    int (*tclUnixOpenTemporaryFile) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj, Tcl_Obj *extensionObj, Tcl_Obj *resultingNameObj); /* 30 */
+#endif /* MACOSX */
+} TclIntPlatStubs;
+
+extern const TclIntPlatStubs *tclIntPlatStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_TCL_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+#if !defined(_WIN32) && !defined(__CYGWIN__) && !defined(MAC_OSX_TCL) /* UNIX */
+#define TclGetAndDetachPids \
+	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 0 */
+#define TclpCloseFile \
+	(tclIntPlatStubsPtr->tclpCloseFile) /* 1 */
+#define TclpCreateCommandChannel \
+	(tclIntPlatStubsPtr->tclpCreateCommandChannel) /* 2 */
+#define TclpCreatePipe \
+	(tclIntPlatStubsPtr->tclpCreatePipe) /* 3 */
+#define TclpCreateProcess \
+	(tclIntPlatStubsPtr->tclpCreateProcess) /* 4 */
+#define TclUnixWaitForFile_ \
+	(tclIntPlatStubsPtr->tclUnixWaitForFile_) /* 5 */
+#define TclpMakeFile \
+	(tclIntPlatStubsPtr->tclpMakeFile) /* 6 */
+#define TclpOpenFile \
+	(tclIntPlatStubsPtr->tclpOpenFile) /* 7 */
+#define TclUnixWaitForFile \
+	(tclIntPlatStubsPtr->tclUnixWaitForFile) /* 8 */
+#define TclpCreateTempFile \
+	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 9 */
+#define TclpReaddir \
+	(tclIntPlatStubsPtr->tclpReaddir) /* 10 */
+#define TclpLocaltime_unix \
+	(tclIntPlatStubsPtr->tclpLocaltime_unix) /* 11 */
+#define TclpGmtime_unix \
+	(tclIntPlatStubsPtr->tclpGmtime_unix) /* 12 */
+#define TclpInetNtoa \
+	(tclIntPlatStubsPtr->tclpInetNtoa) /* 13 */
+#define TclUnixCopyFile \
+	(tclIntPlatStubsPtr->tclUnixCopyFile) /* 14 */
+#define TclMacOSXGetFileAttribute \
+	(tclIntPlatStubsPtr->tclMacOSXGetFileAttribute) /* 15 */
+#define TclMacOSXSetFileAttribute \
+	(tclIntPlatStubsPtr->tclMacOSXSetFileAttribute) /* 16 */
+#define TclMacOSXCopyFileAttributes \
+	(tclIntPlatStubsPtr->tclMacOSXCopyFileAttributes) /* 17 */
+#define TclMacOSXMatchType \
+	(tclIntPlatStubsPtr->tclMacOSXMatchType) /* 18 */
+#define TclMacOSXNotifierAddRunLoopMode \
+	(tclIntPlatStubsPtr->tclMacOSXNotifierAddRunLoopMode) /* 19 */
+/* Slot 20 is reserved */
+/* Slot 21 is reserved */
+#define TclpCreateTempFile_ \
+	(tclIntPlatStubsPtr->tclpCreateTempFile_) /* 22 */
+/* Slot 23 is reserved */
+/* Slot 24 is reserved */
+/* Slot 25 is reserved */
+/* Slot 26 is reserved */
+/* Slot 27 is reserved */
+/* Slot 28 is reserved */
+#define TclWinCPUID \
+	(tclIntPlatStubsPtr->tclWinCPUID) /* 29 */
+#define TclUnixOpenTemporaryFile \
+	(tclIntPlatStubsPtr->tclUnixOpenTemporaryFile) /* 30 */
+#endif /* UNIX */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#define TclWinConvertError \
+	(tclIntPlatStubsPtr->tclWinConvertError) /* 0 */
+#define TclWinConvertWSAError \
+	(tclIntPlatStubsPtr->tclWinConvertWSAError) /* 1 */
+#define TclWinGetServByName \
+	(tclIntPlatStubsPtr->tclWinGetServByName) /* 2 */
+#define TclWinGetSockOpt \
+	(tclIntPlatStubsPtr->tclWinGetSockOpt) /* 3 */
+#define TclWinGetTclInstance \
+	(tclIntPlatStubsPtr->tclWinGetTclInstance) /* 4 */
+#define TclUnixWaitForFile \
+	(tclIntPlatStubsPtr->tclUnixWaitForFile) /* 5 */
+#define TclWinNToHS \
+	(tclIntPlatStubsPtr->tclWinNToHS) /* 6 */
+#define TclWinSetSockOpt \
+	(tclIntPlatStubsPtr->tclWinSetSockOpt) /* 7 */
+#define TclpGetPid \
+	(tclIntPlatStubsPtr->tclpGetPid) /* 8 */
+#define TclWinGetPlatformId \
+	(tclIntPlatStubsPtr->tclWinGetPlatformId) /* 9 */
+#define TclpReaddir \
+	(tclIntPlatStubsPtr->tclpReaddir) /* 10 */
+#define TclGetAndDetachPids \
+	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 11 */
+#define TclpCloseFile \
+	(tclIntPlatStubsPtr->tclpCloseFile) /* 12 */
+#define TclpCreateCommandChannel \
+	(tclIntPlatStubsPtr->tclpCreateCommandChannel) /* 13 */
+#define TclpCreatePipe \
+	(tclIntPlatStubsPtr->tclpCreatePipe) /* 14 */
+#define TclpCreateProcess \
+	(tclIntPlatStubsPtr->tclpCreateProcess) /* 15 */
+#define TclpIsAtty \
+	(tclIntPlatStubsPtr->tclpIsAtty) /* 16 */
+#define TclUnixCopyFile \
+	(tclIntPlatStubsPtr->tclUnixCopyFile) /* 17 */
+#define TclpMakeFile \
+	(tclIntPlatStubsPtr->tclpMakeFile) /* 18 */
+#define TclpOpenFile \
+	(tclIntPlatStubsPtr->tclpOpenFile) /* 19 */
+#define TclWinAddProcess \
+	(tclIntPlatStubsPtr->tclWinAddProcess) /* 20 */
+#define TclpInetNtoa \
+	(tclIntPlatStubsPtr->tclpInetNtoa) /* 21 */
+#define TclpCreateTempFile \
+	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */
+/* Slot 23 is reserved */
+#define TclWinNoBackslash \
+	(tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */
+/* Slot 25 is reserved */
+#define TclWinSetInterfaces \
+	(tclIntPlatStubsPtr->tclWinSetInterfaces) /* 26 */
+#define TclWinFlushDirtyChannels \
+	(tclIntPlatStubsPtr->tclWinFlushDirtyChannels) /* 27 */
+#define TclWinResetInterfaces \
+	(tclIntPlatStubsPtr->tclWinResetInterfaces) /* 28 */
+#define TclWinCPUID \
+	(tclIntPlatStubsPtr->tclWinCPUID) /* 29 */
+#define TclUnixOpenTemporaryFile \
+	(tclIntPlatStubsPtr->tclUnixOpenTemporaryFile) /* 30 */
+#endif /* WIN */
+#ifdef MAC_OSX_TCL /* MACOSX */
+#define TclGetAndDetachPids \
+	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 0 */
+#define TclpCloseFile \
+	(tclIntPlatStubsPtr->tclpCloseFile) /* 1 */
+#define TclpCreateCommandChannel \
+	(tclIntPlatStubsPtr->tclpCreateCommandChannel) /* 2 */
+#define TclpCreatePipe \
+	(tclIntPlatStubsPtr->tclpCreatePipe) /* 3 */
+#define TclpCreateProcess \
+	(tclIntPlatStubsPtr->tclpCreateProcess) /* 4 */
+#define TclUnixWaitForFile_ \
+	(tclIntPlatStubsPtr->tclUnixWaitForFile_) /* 5 */
+#define TclpMakeFile \
+	(tclIntPlatStubsPtr->tclpMakeFile) /* 6 */
+#define TclpOpenFile \
+	(tclIntPlatStubsPtr->tclpOpenFile) /* 7 */
+#define TclUnixWaitForFile \
+	(tclIntPlatStubsPtr->tclUnixWaitForFile) /* 8 */
+#define TclpCreateTempFile \
+	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 9 */
+#define TclpReaddir \
+	(tclIntPlatStubsPtr->tclpReaddir) /* 10 */
+#define TclpLocaltime_unix \
+	(tclIntPlatStubsPtr->tclpLocaltime_unix) /* 11 */
+#define TclpGmtime_unix \
+	(tclIntPlatStubsPtr->tclpGmtime_unix) /* 12 */
+#define TclpInetNtoa \
+	(tclIntPlatStubsPtr->tclpInetNtoa) /* 13 */
+#define TclUnixCopyFile \
+	(tclIntPlatStubsPtr->tclUnixCopyFile) /* 14 */
+#define TclMacOSXGetFileAttribute \
+	(tclIntPlatStubsPtr->tclMacOSXGetFileAttribute) /* 15 */
+#define TclMacOSXSetFileAttribute \
+	(tclIntPlatStubsPtr->tclMacOSXSetFileAttribute) /* 16 */
+#define TclMacOSXCopyFileAttributes \
+	(tclIntPlatStubsPtr->tclMacOSXCopyFileAttributes) /* 17 */
+#define TclMacOSXMatchType \
+	(tclIntPlatStubsPtr->tclMacOSXMatchType) /* 18 */
+#define TclMacOSXNotifierAddRunLoopMode \
+	(tclIntPlatStubsPtr->tclMacOSXNotifierAddRunLoopMode) /* 19 */
+/* Slot 20 is reserved */
+/* Slot 21 is reserved */
+#define TclpCreateTempFile_ \
+	(tclIntPlatStubsPtr->tclpCreateTempFile_) /* 22 */
+/* Slot 23 is reserved */
+/* Slot 24 is reserved */
+/* Slot 25 is reserved */
+/* Slot 26 is reserved */
+/* Slot 27 is reserved */
+/* Slot 28 is reserved */
+#define TclWinCPUID \
+	(tclIntPlatStubsPtr->tclWinCPUID) /* 29 */
+#define TclUnixOpenTemporaryFile \
+	(tclIntPlatStubsPtr->tclUnixOpenTemporaryFile) /* 30 */
+#endif /* MACOSX */
+
+#endif /* defined(USE_TCL_STUBS) */
+
+#else /* TCL_MAJOR_VERSION > 8 */
 /* !BEGIN!: Do not edit below this line. */
 
 #ifdef __cplusplus
@@ -207,32 +735,50 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 #endif /* defined(USE_TCL_STUBS) */
 
 /* !END!: Do not edit above this line. */
+#endif /* TCL_MAJOR_VERSION */
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
-#define TclWinConvertWSAError Tcl_WinConvertError
-#define TclWinConvertError Tcl_WinConvertError
+#undef TclpLocaltime_unix
+#undef TclpGmtime_unix
+#undef TclWinConvertWSAError
+#define TclWinConvertWSAError TclWinConvertError
+#if !defined(TCL_USE_STUBS) && !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#   undef TclWinConvertError
+#   define TclWinConvertError Tcl_WinConvertError
+#endif
 
-#ifdef MAC_OSX_TCL /* not accessable on Win32/UNIX */
-MODULE_SCOPE int TclMacOSXGetFileAttribute(Tcl_Interp *interp,
-	int objIndex, Tcl_Obj *fileName,
-	Tcl_Obj **attributePtrPtr);
-/* 16 */
-MODULE_SCOPE int TclMacOSXSetFileAttribute(Tcl_Interp *interp,
-	int objIndex, Tcl_Obj *fileName,
-	Tcl_Obj *attributePtr);
-/* 17 */
-MODULE_SCOPE int TclMacOSXCopyFileAttributes(const char *src,
-	const char *dst,
-	const Tcl_StatBuf *statBufPtr);
-/* 18 */
-MODULE_SCOPE int TclMacOSXMatchType(Tcl_Interp *interp,
-	const char *pathName, const char *fileName,
-	Tcl_StatBuf *statBufPtr,
-	Tcl_GlobTypeData *types);
+#undef TclpInetNtoa
+#define TclpInetNtoa inet_ntoa
+
+#undef TclpCreateTempFile_
+#undef TclUnixWaitForFile_
+#ifndef MAC_OSX_TCL /* not accessable on Win32/UNIX */
+#undef TclMacOSXGetFileAttribute /* 15 */
+#undef TclMacOSXSetFileAttribute /* 16 */
+#undef TclMacOSXCopyFileAttributes /* 17 */
+#undef TclMacOSXMatchType /* 18 */
+#undef TclMacOSXNotifierAddRunLoopMode /* 19 */
 #endif
 
-#if !defined(_WIN32)
+#if defined(_WIN32)
+#   undef TclWinNToHS
+#   undef TclWinGetServByName
+#   undef TclWinGetSockOpt
+#   undef TclWinSetSockOpt
+#   undef TclWinGetPlatformId
+#   undef TclWinResetInterfaces
+#   undef TclWinSetInterfaces
+#   if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#	define TclWinNToHS ntohs
+#	define TclWinGetServByName getservbyname
+#	define TclWinGetSockOpt getsockopt
+#	define TclWinSetSockOpt setsockopt
+#	define TclWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */
+#	define TclWinResetInterfaces() /* nop */
+#	define TclWinSetInterfaces(dummy) /* nop */
+#   endif /* TCL_NO_DEPRECATED */
+#else
 #   undef TclpGetPid
 #   define TclpGetPid(pid) ((size_t)(pid))
 #endif
-- 
cgit v0.12

-- 
cgit v0.12


From 9336a020ee8538c5927e9cbe8cbad80ef915c741 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 8 Jul 2022 04:06:35 +0000
Subject: Start on TIP-602 implementation. Work in progress

---
 generic/tclEnv.c      |  3 ++
 generic/tclFCmd.c     |  8 +++--
 generic/tclFileName.c | 86 +++++++++++++++++++++++++++++++++++++++++----------
 generic/tclIOUtil.c   | 10 ++++--
 generic/tclInt.h      |  2 ++
 generic/tclPathObj.c  | 22 +++++++++----
 library/safe.tcl      |  2 ++
 unix/tclUnixInit.c    | 15 +++++++++
 win/tclWinFCmd.c      |  8 +++--
 9 files changed, 126 insertions(+), 30 deletions(-)

diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 73a8b84..e469fe9 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -365,6 +365,7 @@ TclSetEnv(
 
     Tcl_MutexUnlock(&envMutex);
 
+#ifdef TCL_TILDE_EXPAND
     if (!strcmp(name, "HOME")) {
 	/*
 	 * If the user's home directory has changed, we must invalidate the
@@ -373,6 +374,8 @@ TclSetEnv(
 
 	Tcl_FSMountsChanged(NULL);
     }
+#endif
+
 }
 
 /*
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index ad60146..c19623d 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -882,7 +882,8 @@ FileBasename(
     Tcl_IncrRefCount(splitPtr);
 
     if (objc != 0) {
-	if ((objc == 1) && (*TclGetString(pathPtr) == '~')) {
+#ifdef TCL_TILDE_EXPAND
+        if ((objc == 1) && (*TclGetString(pathPtr) == '~')) {
 	    Tcl_DecrRefCount(splitPtr);
 	    if (Tcl_FSConvertToPathType(interp, pathPtr) != TCL_OK) {
 		return NULL;
@@ -890,9 +891,10 @@ FileBasename(
 	    splitPtr = Tcl_FSSplitPath(pathPtr, &objc);
 	    Tcl_IncrRefCount(splitPtr);
 	}
+#endif
 
-	/*
-	 * Return the last component, unless it is the only component, and it
+        /*
+         * Return the last component, unless it is the only component, and it
 	 * is the root of an absolute path.
 	 */
 
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index dba137c..b13a435 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -362,6 +362,7 @@ Tcl_GetPathType(
  *	file). The exported function Tcl_FSGetPathType should be used by
  *	extensions.
  *
+ *      If TCL_TILDE_EXPAND defined:
  *	Note that '~' paths are always considered TCL_PATH_ABSOLUTE, even
  *	though expanding the '~' could lead to any possible path type. This
  *	function should therefore be considered a low-level, string
@@ -389,8 +390,9 @@ TclpGetNativePathType(
     const char *path = TclGetString(pathPtr);
 
     if (path[0] == '~') {
-	/*
-	 * This case is common to all platforms. Paths that begin with ~ are
+#ifdef TCL_TILDE_EXPAND
+        /*
+         * This case is common to all platforms. Paths that begin with ~ are
 	 * absolute.
 	 */
 
@@ -401,6 +403,9 @@ TclpGetNativePathType(
 	    }
 	    *driveNameLengthPtr = end - path;
 	}
+#else
+        type = TCL_PATH_RELATIVE;
+#endif
     } else {
 	switch (tclPlatform) {
 	case TCL_PLATFORM_UNIX: {
@@ -697,13 +702,17 @@ SplitUnixPath(
 	length = path - elementStart;
 	if (length > 0) {
 	    Tcl_Obj *nextElt;
-	    if ((elementStart[0] == '~') && (elementStart != origPath)) {
+#ifdef TCL_TILDE_EXPAND
+            if ((elementStart[0] == '~') && (elementStart != origPath)) {
 		TclNewLiteralStringObj(nextElt, "./");
 		Tcl_AppendToObj(nextElt, elementStart, length);
 	    } else {
 		nextElt = Tcl_NewStringObj(elementStart, length);
 	    }
-	    Tcl_ListObjAppendElement(NULL, result, nextElt);
+#else
+            nextElt = Tcl_NewStringObj(elementStart, length);
+#endif
+            Tcl_ListObjAppendElement(NULL, result, nextElt);
 	}
 	if (*path++ == '\0') {
 	    break;
@@ -766,10 +775,13 @@ SplitWinPath(
 	length = p - elementStart;
 	if (length > 0) {
 	    Tcl_Obj *nextElt;
-	    if ((elementStart != path) && ((elementStart[0] == '~')
-		    || (isalpha(UCHAR(elementStart[0]))
-			&& elementStart[1] == ':'))) {
-		TclNewLiteralStringObj(nextElt, "./");
+	    if ((elementStart != path) &&
+                (
+#ifdef TCL_TILDE_EXPAND
+                    (elementStart[0] == '~') ||
+#endif
+                    (isalpha(UCHAR(elementStart[0])) && elementStart[1] == ':'))) {
+                TclNewLiteralStringObj(nextElt, "./");
 		Tcl_AppendToObj(nextElt, elementStart, length);
 	    } else {
 		nextElt = Tcl_NewStringObj(elementStart, length);
@@ -871,9 +883,15 @@ TclpNativeJoinPath(
     p = joining;
 
     if (length != 0) {
-	if ((p[0] == '.') && (p[1] == '/') && ((p[2] == '~')
-		|| (tclPlatform==TCL_PLATFORM_WINDOWS && isalpha(UCHAR(p[2]))
-		&& (p[3] == ':')))) {
+	if ((p[0] == '.') &&
+            (p[1] == '/') &&
+            (
+#ifdef TCL_TILDE_EXPAND
+                (p[2] == '~') ||
+#endif
+                (tclPlatform==TCL_PLATFORM_WINDOWS &&
+                 isalpha(UCHAR(p[2])) &&
+                 (p[3] == ':')))) {
 	    p += 2;
 	}
     }
@@ -1146,6 +1164,7 @@ TclGetExtension(
     return p;
 }
 
+#ifdef TCL_TILDE_EXPAND
 /*
  *----------------------------------------------------------------------
  *
@@ -1204,6 +1223,35 @@ DoTildeSubst(
     }
     return Tcl_DStringValue(resultPtr);
 }
+#endif /* TCL_TILDE_EXPAND */
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclResolveTildePaths --
+ *
+ *	Given a Tcl_Obj that is a list of paths, returns a Tcl_Obj containing
+ *	the paths with any ~-prefixed paths resolved. Returns NULL if
+ *	none of the paths contained a ~-prefixed path, or passed in value
+ *	was not a list, or if NULL was passed in.
+ *
+ *	~-prefixed paths that cannot be resolved are removed from the
+ *	returned list.
+ *
+ * Results:
+ *	Returns a Tcl_Obj with resolved paths or NULL.
+ *
+ *----------------------------------------------------------------------
+ */
+Tcl_Obj *TclResolveTildePaths(
+    Tcl_Interp *interp,
+    Tcl_Obj *pathsObj)
+{
+    /* TODO */
+
+    return NULL;
+}
+
 
 /*
  *----------------------------------------------------------------------
@@ -1729,7 +1777,6 @@ TclGlob(
 				 * NULL. */
 {
     const char *separators;
-    const char *head;
     char *tail, *start;
     int result;
     Tcl_Obj *filenamesObj, *savedResultObj;
@@ -1745,7 +1792,6 @@ TclGlob(
     }
 
     if (pathPrefix == NULL) {
-	char c;
 	Tcl_DString buffer;
 	Tcl_DStringInit(&buffer);
 
@@ -1755,7 +1801,10 @@ TclGlob(
 	 * Perform tilde substitution, if needed.
 	 */
 
-	if (start[0] == '~') {
+#ifdef TCL_TILDE_EXPAND
+        if (start[0] == '~') {
+            const char *head;
+            char c;
 	    /*
 	     * Find the first path separator after the tilde.
 	     */
@@ -1794,6 +1843,9 @@ TclGlob(
 	} else {
 	    tail = pattern;
 	}
+#else
+        tail = pattern;
+#endif /* TCL_TILDE_EXPAND */
     } else {
 	Tcl_IncrRefCount(pathPrefix);
 	tail = pattern;
@@ -2351,14 +2403,16 @@ DoGlob(
 	    for (i=0; result==TCL_OK && i<subdirc; i++) {
 		Tcl_Obj *copy = NULL;
 
-		if (pathPtr == NULL && TclGetString(subdirv[i])[0] == '~') {
+#ifdef TCL_TILDE_EXPAND
+                if (pathPtr == NULL && TclGetString(subdirv[i])[0] == '~') {
 		    TclListObjLengthM(NULL, matchesObj, &repair);
 		    copy = subdirv[i];
 		    subdirv[i] = Tcl_NewStringObj("./", 2);
 		    Tcl_AppendObjToObj(subdirv[i], copy);
 		    Tcl_IncrRefCount(subdirv[i]);
 		}
-		result = DoGlob(interp, matchesObj, separators, subdirv[i],
+#endif /* TCL_TILDE_EXPAND */
+                result = DoGlob(interp, matchesObj, separators, subdirv[i],
 			1, p+1, types);
 		if (copy) {
 		    size_t end;
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index d51491f..50346b6 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1215,7 +1215,7 @@ FsAddMountsToGlobResult(
  *	(4) The mapping from a string representation of a file to a full,
  *	normalized pathname changes. For example, if 'env(HOME)' is modified,
  *	then any pathname containing '~' maps to a different item, possibly in
- *	a different filesystem.
+ *	a different filesystem. (Only if TCL_TILDE_EXPAND is defined)
  *
  *	Tcl has no control over (2) and (3), so each registered filesystem must
  *	call Tcl_FSMountsChnaged in each of those circumstances.
@@ -3939,13 +3939,17 @@ Tcl_FSSplitPath(
 	if (length > 0) {
 	    Tcl_Obj *nextElt;
 
-	    if (elementStart[0] == '~') {
+#ifdef TCL_TILDE_EXPAND
+            if (elementStart[0] == '~') {
 		TclNewLiteralStringObj(nextElt, "./");
 		Tcl_AppendToObj(nextElt, elementStart, length);
 	    } else {
 		nextElt = Tcl_NewStringObj(elementStart, length);
 	    }
-	    Tcl_ListObjAppendElement(NULL, result, nextElt);
+#else
+            nextElt = Tcl_NewStringObj(elementStart, length);
+#endif /* TCL_TILDE_EXPAND */
+            Tcl_ListObjAppendElement(NULL, result, nextElt);
 	}
 	if (*p++ == '\0') {
 	    break;
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 6997dda..0923795 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3020,6 +3020,8 @@ MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
 MODULE_SCOPE Tcl_Obj *	TclJoinPath(size_t elements, Tcl_Obj * const objv[],
 			    int forceRelative);
+MODULE_SCOPE Tcl_Obj *	TclResolveTildePaths(Tcl_Interp *interp,
+			    Tcl_Obj *pathsObj);
 MODULE_SCOPE int	TclJoinThread(Tcl_ThreadId id, int *result);
 MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Obj *	TclLindexList(Tcl_Interp *interp,
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index f7da276..aff0a33 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -699,7 +699,8 @@ TclPathPart(
 
 	splitPtr = Tcl_FSSplitPath(pathPtr, &splitElements);
 	Tcl_IncrRefCount(splitPtr);
-	if (splitElements == 1  &&  TclGetString(pathPtr)[0] == '~') {
+#ifdef TCL_TILDE_EXPAND
+        if (splitElements == 1  &&  TclGetString(pathPtr)[0] == '~') {
 	    Tcl_Obj *norm;
 
 	    TclDecrRefCount(splitPtr);
@@ -710,7 +711,8 @@ TclPathPart(
 	    splitPtr = Tcl_FSSplitPath(norm, &splitElements);
 	    Tcl_IncrRefCount(splitPtr);
 	}
-	if (portion == TCL_PATH_TAIL) {
+#endif /* TCL_TILDE_EXPAND */
+        if (portion == TCL_PATH_TAIL) {
 	    /*
 	     * Return the last component, unless it is the only component, and
 	     * it is the root of an absolute path.
@@ -1038,8 +1040,9 @@ TclJoinPath(
 	}
 	ptr = Tcl_GetStringFromObj(res, &length);
 
-	/*
-	 * Strip off any './' before a tilde, unless this is the beginning of
+#ifdef TCL_TILDE_EXPAND
+        /*
+         * Strip off any './' before a tilde, unless this is the beginning of
 	 * the path.
 	 */
 
@@ -1047,9 +1050,10 @@ TclJoinPath(
 		(strElt[1] == '/') && (strElt[2] == '~')) {
 	    strElt += 2;
 	}
+#endif /* TCL_TILDE_EXPAND */
 
-	/*
-	 * A NULL value for fsPtr at this stage basically means we're trying
+        /*
+         * A NULL value for fsPtr at this stage basically means we're trying
 	 * to join a relative path onto something which is also relative (or
 	 * empty). There's nothing particularly wrong with that.
 	 */
@@ -1246,6 +1250,7 @@ TclNewFSPathObj(
     const char *p;
     int state = 0, count = 0;
 
+#ifdef TCL_TILDE_EXPAND
     /* [Bug 2806250] - this is only a partial solution of the problem.
      * The PATHFLAGS != 0 representation assumes in many places that
      * the "tail" part stored in the normPathPtr field is itself a
@@ -1269,6 +1274,7 @@ TclNewFSPathObj(
 	Tcl_DecrRefCount(tail);
 	return pathPtr;
     }
+#endif /* TCL_TILDE_EXPAND */
 
     TclNewObj(pathPtr);
     fsPathPtr = (FsPath *)Tcl_Alloc(sizeof(FsPath));
@@ -2230,6 +2236,7 @@ SetFsPathFromAny(
      * Handle tilde substitutions, if needed.
      */
 
+#ifdef TCL_TILDE_EXPAND
     if (len && name[0] == '~') {
 	Tcl_DString temp;
 	size_t split;
@@ -2341,6 +2348,9 @@ SetFsPathFromAny(
     } else {
 	transPtr = TclJoinPath(1, &pathPtr, 1);
     }
+#else
+    transPtr = TclJoinPath(1, &pathPtr, 1);
+#endif /* TCL_TILDE_EXPAND */
 
     /*
      * Now we have a translated filename in 'transPtr'. This will have forward
diff --git a/library/safe.tcl b/library/safe.tcl
index 6c905fb..09c82e5 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -733,6 +733,8 @@ proc ::safe::CheckFileName {child file} {
 # prevent discovery of what home directories exist.
 
 proc ::safe::AliasFileSubcommand {child subcommand name} {
+    # TODO - if TIP602 is accepted for Tcl9, this check could be removed.
+    # The check is required if TCL_TILDE_EXPAND is defined.
     if {[string match ~* $name]} {
 	set name ./$name
     }
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index ec85fbe..9d84a21 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -863,6 +863,21 @@ TclpSetVariables(
 	Tcl_SetVar2(interp, "tcl_pkgPath", NULL, pkgPath, TCL_GLOBAL_ONLY);
     }
 
+#ifndef TCL_TILDE_EXPAND
+    {
+        Tcl_Obj *resolvedPaths =
+            TclResolveTildePaths(interp,
+                                 Tcl_GetVar2Ex(
+                                     interp,
+                                     "tcl_pkgPath",
+                                     NULL,
+                                     TCL_GLOBAL_ONLY));
+        if (resolvedPaths) {
+            Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL, resolvedPaths, TCL_GLOBAL_ONLY);
+        }
+    }
+#endif
+
 #ifdef DJGPP
     Tcl_SetVar2(interp, "tcl_platform", "platform", "dos", TCL_GLOBAL_ONLY);
 #else
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 025ac4b..003f7bb 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -1719,7 +1719,8 @@ ConvertFileNameFormat(
 	     * Deal with issues of tildes being absolute.
 	     */
 
-	    if (Tcl_DStringValue(&dsTemp)[0] == '~') {
+#ifdef TCL_TILDE_EXPAND
+            if (Tcl_DStringValue(&dsTemp)[0] == '~') {
 		TclNewLiteralStringObj(tempPath, "./");
 		Tcl_AppendToObj(tempPath, Tcl_DStringValue(&dsTemp),
 			Tcl_DStringLength(&dsTemp));
@@ -1727,7 +1728,10 @@ ConvertFileNameFormat(
 	    } else {
 		tempPath = TclDStringToObj(&dsTemp);
 	    }
-	    Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath);
+#else
+            tempPath = TclDStringToObj(&dsTemp);
+#endif /* TCL_TILDE_EXPAND */
+            Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath);
 	    FindClose(handle);
 	}
     }
-- 
cgit v0.12


From 3674905dbda8443171db562a6c69bf50228f18fb Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 8 Jul 2022 13:48:36 +0000
Subject: Resolve ~ for MacOS during initialization

---
 generic/tclFileName.c |  28 --------
 generic/tclInt.h      |   3 +-
 generic/tclPathObj.c  | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++
 unix/tclUnixInit.c    |  16 ++---
 4 files changed, 197 insertions(+), 38 deletions(-)

diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index b13a435..3ffdede 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -1228,34 +1228,6 @@ DoTildeSubst(
 /*
  *----------------------------------------------------------------------
  *
- * TclResolveTildePaths --
- *
- *	Given a Tcl_Obj that is a list of paths, returns a Tcl_Obj containing
- *	the paths with any ~-prefixed paths resolved. Returns NULL if
- *	none of the paths contained a ~-prefixed path, or passed in value
- *	was not a list, or if NULL was passed in.
- *
- *	~-prefixed paths that cannot be resolved are removed from the
- *	returned list.
- *
- * Results:
- *	Returns a Tcl_Obj with resolved paths or NULL.
- *
- *----------------------------------------------------------------------
- */
-Tcl_Obj *TclResolveTildePaths(
-    Tcl_Interp *interp,
-    Tcl_Obj *pathsObj)
-{
-    /* TODO */
-
-    return NULL;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
  * Tcl_GlobObjCmd --
  *
  *	This procedure is invoked to process the "glob" Tcl command. See the
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 0923795..394fc54 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3020,8 +3020,9 @@ MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
 MODULE_SCOPE Tcl_Obj *	TclJoinPath(size_t elements, Tcl_Obj * const objv[],
 			    int forceRelative);
-MODULE_SCOPE Tcl_Obj *	TclResolveTildePaths(Tcl_Interp *interp,
+MODULE_SCOPE Tcl_Obj *	TclResolveTildePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathsObj);
+MODULE_SCOPE Tcl_Obj *	TclResolveTildePathList(Tcl_Obj *pathsObj);
 MODULE_SCOPE int	TclJoinThread(Tcl_ThreadId id, int *result);
 MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Obj *	TclLindexList(Tcl_Interp *interp,
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index aff0a33..7efd14e 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2569,6 +2569,194 @@ TclNativePathInFilesystem(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * TclResolveTildePath --
+ *
+ *	If the passed Tcl_Obj is begins with a tilde, does tilde resolution
+ *	and returns a Tcl_Obj containing the resolved path. If the tilde
+ *	component cannot be resolved, returns NULL. If the path does not
+ *	begin with a tilde, returns unmodified.
+ *
+ *      The trailing components of the path are returned verbatim. No
+ *	processing is done on them. Moreover, no assumptions should be
+ *	made about the separators in the returned path. They may be /
+ *	or native. Appropriate path manipulations functions should be
+ *	used by caller if desired.
+ *
+ * Results:
+ *	Returns a Tcl_Obj with resolved path and reference count 0, or the
+ *	original Tcl_Obj if it does not begin with a tilde. Returns NULL
+ *	if the path begins with a ~ that cannot be resolved.
+ *
+ *----------------------------------------------------------------------
+ */
+Tcl_Obj *
+TclResolveTildePath(
+    Tcl_Interp *interp, /* May be NULL. Only used for error messages */
+    Tcl_Obj *pathObj)
+{
+    size_t len;
+    Tcl_Obj *resolvedObj;
+    const char *name;
+    Tcl_DString dirString;
+    size_t split;
+    char separator = '/';
+
+    /*
+     * Copied almost verbatim from the corresponding SetFsPathFromAny fragment
+     * in 8.7.
+     *
+     * First step is to translate the filename. This is similar to
+     * Tcl_TranslateFilename, but shouldn't convert everything to windows
+     * backslashes on that platform. The current implementation of this piece
+     * is a slightly optimised version of the various Tilde/Split/Join stuff
+     * to avoid multiple split/join operations.
+     *
+     * We remove any trailing directory separator.
+     *
+     * However, the split/join routines are quite complex, and one has to make
+     * sure not to break anything on Unix or Win (fCmd.test, fileName.test and
+     * cmdAH.test exercise most of the code).
+     */
+
+    name = Tcl_GetStringFromObj(pathObj, &len);
+    if (name[0] != '~') {
+        return pathObj; /* No tilde prefix, no need to resolve */
+    }
+
+    /*
+     * We have multiple cases '~/foo/bar...', '~user/foo/bar...', etc.
+     * split becomes value 1 for '~/...' as well as for '~'.
+     */
+    split = FindSplitPos(name, separator);
+
+    if (split == 1) {
+        /* No user name specified -> current user */
+
+        const char *dir;
+        Tcl_DString dirString;
+
+        Tcl_DStringInit(&dirString);
+        dir = TclGetEnv("HOME", &dirString);
+        if (dir == NULL) {
+            if (interp) {
+                Tcl_SetObjResult(interp, Tcl_NewStringObj(
+                                     "couldn't find HOME environment variable to"
+                                     " expand path", -1));
+                Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH",
+                                 "HOMELESS", NULL);
+            }
+            return NULL;
+        }
+    } else {
+        /* User name specified - ~user */
+
+        const char *expandedUser;
+        Tcl_DString userName;
+
+        Tcl_DStringInit(&userName);
+        Tcl_DStringAppend(&userName, name+1, split-1);
+        expandedUser = Tcl_DStringValue(&userName);
+
+        Tcl_DStringInit(&dirString);
+        if (TclpGetUserHome(expandedUser, &dirString) == NULL) {
+            if (interp != NULL) {
+                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                                     "user \"%s\" doesn't exist", expandedUser));
+                Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH", "NOUSER",
+                                 NULL);
+            }
+            Tcl_DStringFree(&userName);
+            Tcl_DStringFree(&dirString);
+            return NULL;
+        }
+        Tcl_DStringFree(&userName);
+    }
+    resolvedObj = TclDStringToObj(&dirString);
+
+    if (split < len) {
+        /* If any trailer, append it verbatim */
+        Tcl_AppendToObj(resolvedObj, split + name, len-split);
+    }
+
+    return resolvedObj;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclResolveTildePathList --
+ *
+ *	Given a Tcl_Obj that is a list of paths, returns a Tcl_Obj containing
+ *	the paths with any ~-prefixed paths resolved.
+ *
+ *	Empty strings and ~-prefixed paths that cannot be resolved are
+ *      removed from the returned list.
+ *
+ *      The trailing components of the path are returned verbatim. No
+ *	processing is done on them. Moreover, no assumptions should be
+ *	made about the separators in the returned path. They may be /
+ *	or native. Appropriate path manipulations functions should be
+ *	used by caller if desired.
+ *
+ * Results:
+ *	Returns a Tcl_Obj with resolved paths. This may be a new Tcl_Obj with
+ *	reference count 0 or the original passed-in Tcl_Obj if no paths needed
+ *	resolution. A NULL is returned if the passed in value is not a list
+ *	or was NULL.
+ *
+ *----------------------------------------------------------------------
+ */
+Tcl_Obj *
+TclResolveTildePathList(
+    Tcl_Obj *pathsObj)
+{
+    Tcl_Obj **objv;
+    size_t objc;
+    size_t i;
+    Tcl_Obj *resolvedPaths;
+    const char *path;
+
+    if (pathsObj == NULL) {
+        return NULL;
+    }
+    if (Tcl_ListObjGetElements(NULL, pathsObj, &objc, &objv) != TCL_OK) {
+        return NULL; /* Not a list */
+    }
+
+    /*
+     * Figure out if any paths need resolving to avoid unnecessary allocations.
+     */
+    for (i = 0; i < objc; ++i) {
+        path = Tcl_GetString(objv[i]);
+        if (path[0] == '~') {
+            break; /* At least one path needs resolution */
+        }
+    }
+    if (i == objc) {
+        return pathsObj; /* No paths needed to be resolved */
+    }
+
+    resolvedPaths = Tcl_NewListObj(objc, NULL);
+    for (i = 0; i < objc; ++i) {
+        Tcl_Obj *resolvedPath;
+
+        path = Tcl_GetString(objv[i]);
+        if (path[0] == 0) {
+            continue; /* Skip empty strings */
+        }
+        resolvedPath = TclResolveTildePath(NULL, objv[i]);
+        if (resolvedPath) {
+            Tcl_ListObjAppendElement(NULL, resolvedPaths, resolvedPath);
+        }
+    }
+
+    return resolvedPaths;
+}
+
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 9d84a21..50befc3 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -865,15 +865,13 @@ TclpSetVariables(
 
 #ifndef TCL_TILDE_EXPAND
     {
-        Tcl_Obj *resolvedPaths =
-            TclResolveTildePaths(interp,
-                                 Tcl_GetVar2Ex(
-                                     interp,
-                                     "tcl_pkgPath",
-                                     NULL,
-                                     TCL_GLOBAL_ONLY));
-        if (resolvedPaths) {
-            Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL, resolvedPaths, TCL_GLOBAL_ONLY);
+        Tcl_Obj *origPaths;
+        Tcl_Obj *resolvedPaths;
+        origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);
+        resolvedPaths = TclResolveTildePathList(origPaths);
+        if (resolvedPaths != origPaths && resolvedPaths != NULL) {
+            Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL,
+		resolvedPaths, TCL_GLOBAL_ONLY);
         }
     }
 #endif
-- 
cgit v0.12


From a41449f1cd90f78d0810898baea3568d4adabf39 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 14 Jul 2022 12:35:19 +0000
Subject: First shot at TIP #625 for Tcl 9.0. Mark lrepeat-1.8 as 'knownBug',
 that's OK for now.

---
 generic/tclCmdIL.c         |   44 +-
 generic/tclInt.h           |  232 ++-
 generic/tclInterp.c        |   17 +-
 generic/tclListObj.c       | 3553 +++++++++++++++++++++++++++++---------------
 tests-perf/comparePerf.tcl |  371 +++++
 tests-perf/listPerf.tcl    | 1290 ++++++++++++++++
 tests/lrepeat.test         |    2 +-
 7 files changed, 4262 insertions(+), 1247 deletions(-)
 create mode 100644 tests-perf/comparePerf.tcl
 create mode 100644 tests-perf/listPerf.tcl

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index f59d832..f0969fe 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2888,7 +2888,7 @@ Tcl_LrepeatObjCmd(
 
     if (elementCount && objc > LIST_MAX/elementCount) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"max length of a Tcl list (%d elements) exceeded", LIST_MAX));
+		"max length of a Tcl list (%" TCL_Z_MODIFIER "u elements) exceeded", LIST_MAX));
 	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	return TCL_ERROR;
     }
@@ -2901,10 +2901,15 @@ Tcl_LrepeatObjCmd(
 
     listPtr = Tcl_NewListObj(totalElems, NULL);
     if (totalElems) {
-	List *listRepPtr = ListRepPtr(listPtr);
-
-	listRepPtr->elemCount = elementCount*objc;
-	dataArray = listRepPtr->elements;
+	ListRep listRep;
+	ListObjGetRep(listPtr, &listRep);
+	dataArray = ListRepElementsBase(&listRep);
+	listRep.storePtr->numUsed = totalElems;
+	if (listRep.spanPtr) {
+	    /* Future proofing in case Tcl_NewListObj returns a span */
+	    listRep.spanPtr->spanStart = listRep.storePtr->firstUsed;
+	    listRep.spanPtr->spanLength = listRep.storePtr->numUsed;
+	}
     }
 
     /*
@@ -3084,14 +3089,21 @@ Tcl_LreverseObjCmd(
     }
 
     if (Tcl_IsShared(objv[1])
-	    || (ListRepPtr(objv[1])->refCount > 1)) {	/* Bug 1675044 */
+	|| ListObjRepIsShared(objv[1])) { /* Bug 1675044 */
 	Tcl_Obj *resultObj, **dataArray;
-	List *listRepPtr;
+	ListRep listRep;
 
 	resultObj = Tcl_NewListObj(elemc, NULL);
-	listRepPtr = ListRepPtr(resultObj);
-	listRepPtr->elemCount = elemc;
-	dataArray = listRepPtr->elements;
+
+	/* Modify the internal rep in-place */
+	ListObjGetRep(resultObj, &listRep);
+	listRep.storePtr->numUsed = elemc;
+	dataArray = ListRepElementsBase(&listRep);
+	if (listRep.spanPtr) {
+	    /* Future proofing */
+	    listRep.spanPtr->spanStart = listRep.storePtr->firstUsed;
+	    listRep.spanPtr->spanLength = listRep.storePtr->numUsed;
+	}
 
 	for (i=0,j=elemc-1 ; i<elemc ; i++,j--) {
 	    dataArray[j] = elemv[i];
@@ -4419,12 +4431,12 @@ Tcl_LsortObjCmd(
      */
 
     if (sortInfo.resultCode == TCL_OK) {
-	List *listRepPtr;
+	ListRep listRep;
 	Tcl_Obj **newArray, *objPtr;
 
 	resultPtr = Tcl_NewListObj(sortInfo.numElements * groupSize, NULL);
-	listRepPtr = ListRepPtr(resultPtr);
-	newArray = listRepPtr->elements;
+	ListObjGetRep(resultPtr, &listRep);
+	newArray = ListRepElementsBase(&listRep);
 	if (group) {
 	    for (i=0; elementPtr!=NULL ; elementPtr=elementPtr->nextPtr) {
 		idx = elementPtr->payload.index;
@@ -4453,7 +4465,11 @@ Tcl_LsortObjCmd(
 		Tcl_IncrRefCount(objPtr);
 	    }
 	}
-	listRepPtr->elemCount = i;
+	listRep.storePtr->numUsed = i;
+	if (listRep.spanPtr) {
+	    listRep.spanPtr->spanStart = listRep.storePtr->firstUsed;
+	    listRep.spanPtr->spanLength = listRep.storePtr->numUsed;
+	}
 	Tcl_SetObjResult(interp, resultPtr);
     }
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index b6d5b9a..5a59e39 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2381,59 +2381,208 @@ typedef enum TclEolTranslation {
 #define TCL_INVOKE_NO_TRACEBACK	(1<<2)
 
 /*
- * The structure used as the internal representation of Tcl list objects. This
- * struct is grown (reallocated and copied) as necessary to hold all the
- * list's element pointers. The struct might contain more slots than currently
- * used to hold all element pointers. This is done to make append operations
- * faster.
+ * TclListSizeT is the type for holding list element counts. It's defined
+ * simplify sharing source between Tcl8 and Tcl9.
  */
+#if TCL_MAJOR_VERSION > 8
 
-typedef struct List {
-    size_t refCount;
-    size_t maxElemCount;		/* Total number of element array slots. */
-    size_t elemCount;		/* Current number of list elements. */
-    int canonicalFlag;		/* Set if the string representation was
-				 * derived from the list representation. May
-				 * be ignored if there is no string rep at
-				 * all.*/
-    Tcl_Obj *elements[TCLFLEXARRAY];		/* First list element; the struct is grown to
-				 * accommodate all elements. */
-} List;
+typedef ptrdiff_t ListSizeT; /* TODO - may need to fix to match Tcl9's API */
+
+/*
+ * SSIZE_MAX, NOT SIZE_MAX as negative differences need to be expressed
+ * between values of the ListSizeT type so limit the range to signed
+ */
+#define ListSizeT_MAX PTRDIFF_MAX
 
-#define LIST_MAX \
-	((int)(((size_t)UINT_MAX - offsetof(List, elements))/sizeof(Tcl_Obj *)))
-#define LIST_SIZE(numElems) \
-	(TCL_HASH_TYPE)(offsetof(List, elements) + ((numElems) * sizeof(Tcl_Obj *)))
+#else
+
+typedef int ListSizeT;
+#define ListSizeT_MAX INT_MAX
+
+#endif
 
 /*
- * Macro used to get the elements of a list object.
+ * ListStore --
+ *
+ * A Tcl list's internal representation is defined through three structures.
+ *
+ * A ListStore struct is a structure that includes a variable size array that
+ * serves as storage for a Tcl list. A contiguous sequence of slots in the
+ * array, the "in-use" area, holds valid pointers to Tcl_Obj values that
+ * belong to one or more Tcl lists. The unused slots before and after these
+ * are free slots that may be used to prepend and append without having to
+ * reallocate the struct. The ListStore may be shared amongst multiple lists
+ * and reference counted.
+ *
+ * A ListSpan struct defines a sequence of slots within a ListStore. This sequence
+ * always lies within the "in-use" area of the ListStore. Like ListStore, the
+ * structure may be shared among multiple lists and is reference counted.
+ *
+ * A ListRep struct holds the internal representation of a Tcl list as stored
+ * in a Tcl_Obj. It is composed of a ListStore and a ListSpan that together
+ * define the content of the list. The ListSpan specifies the range of slots
+ * within the ListStore that hold elements for this list. The ListSpan is
+ * optional in which case the list includes all the "in-use" slots of the
+ * ListStore.
+ *
  */
+typedef struct ListStore {
+    ListSizeT firstUsed;    /* Index of first slot in use within slots[] */
+    ListSizeT numUsed;      /* Number of slots in use (starting firstUsed) */
+    ListSizeT numAllocated; /* Total number of slots[] array slots. */
+    int refCount;           /* Number of references to this instance */
+    int flags;              /* LISTSTORE_* flags */
+    Tcl_Obj *slots[TCLFLEXARRAY];      /* Variable size array. Grown as needed */
+} ListStore;
 
-#define ListRepPtr(listPtr) \
-    ((List *) (listPtr)->internalRep.twoPtrValue.ptr1)
+#define LISTSTORE_CANONICAL 0x1 /* All Tcl_Obj's referencing this
+                                   store have their string representation
+                                   derived from the list representation */
 
-#define ListObjGetElements(listPtr, objc, objv) \
-    ((objv) = ListRepPtr(listPtr)->elements, \
-     (objc) = ListRepPtr(listPtr)->elemCount)
+/* Max number of elements that can be contained in a list */
+#define LIST_MAX                                               \
+    ((ListSizeT)(((size_t)ListSizeT_MAX - offsetof(ListStore, slots)) \
+		   / sizeof(Tcl_Obj *)))
+/* Memory size needed for a ListStore to hold numSlots_ elements */
+#define LIST_SIZE(numSlots_) \
+	((int)(offsetof(ListStore, slots) + ((numSlots_) * sizeof(Tcl_Obj *))))
 
-#define ListObjLength(listPtr, len) \
-    ((len) = ListRepPtr(listPtr)->elemCount)
+/*
+ * ListSpan --
+ * See comments above for ListStore
+ */
+typedef struct ListSpan {
+    ListSizeT spanStart;    /* Starting index of the span */
+    ListSizeT spanLength;   /* Number of elements in the span */
+    int refCount;     /* Count of references to this span record */
+} ListSpan;
 
-#define ListObjIsCanonical(listPtr) \
-    (((listPtr)->bytes == NULL) || ListRepPtr(listPtr)->canonicalFlag)
+/*
+ * ListRep --
+ * See comments above for ListStore
+ */
+typedef struct ListRep {
+    ListStore *storePtr;/* element array shared amongst different lists */
+    ListSpan *spanPtr;  /* If not NULL, the span holds the range of slots
+                           within *storePtr that contain this list elements. */
+} ListRep;
 
-#define TclListObjGetElementsM(interp, listPtr, objcPtr, objvPtr) \
-    (((listPtr)->typePtr == &tclListType) \
-	    ? ((ListObjGetElements((listPtr), *(objcPtr), *(objvPtr))), TCL_OK)\
-	    : Tcl_ListObjGetElements((interp), (listPtr), (objcPtr), (objvPtr)))
+/*
+ * Macros used to get access list internal representations.
+ *
+ * Naming conventions:
+ * ListRep* - expect a pointer to a valid ListRep
+ * ListObj* - expect a pointer to a Tcl_Obj whose internal type is known to
+ *            be a list (tclListType). Will crash otherwise.
+ * TclListObj* - expect a pointer to a Tcl_Obj whose internal type may or may not
+ *            be tclListType. These will convert as needed and return error if
+ *            conversion not possible.
+ */
+
+/* Returns the starting slot for this listRep in the contained ListStore */
+#define ListRepStart(listRepPtr_)                               \
+    ((listRepPtr_)->spanPtr ? (listRepPtr_)->spanPtr->spanStart \
+			    : (listRepPtr_)->storePtr->firstUsed)
+
+/* Returns the number of elements in this listRep */
+#define ListRepLength(listRepPtr_)                               \
+    ((listRepPtr_)->spanPtr ? (listRepPtr_)->spanPtr->spanLength \
+			    : (listRepPtr_)->storePtr->numUsed)
+
+/* Returns a pointer to the first slot containing this ListRep elements */
+#define ListRepElementsBase(listRepPtr_) \
+    (&(listRepPtr_)->storePtr->slots[ListRepStart(listRepPtr_)])
+
+/* Stores the number of elements and base address of the element array */
+#define ListRepElements(listRepPtr_, objc_, objv_) \
+    (((objv_) = ListRepElementsBase(listRepPtr_)), \
+     ((objc_) = ListRepLength(listRepPtr_)))
+
+/* Returns 1/0 whether the ListRep's ListStore is shared. */
+#define ListRepIsShared(listRepPtr_) ((listRepPtr_)->storePtr->refCount > 1)
+
+/* Returns a pointer to the ListStore component */
+#define ListObjStorePtr(listObj_) \
+    ((ListStore *)((listObj_)->internalRep.twoPtrValue.ptr1))
+
+/* Returns a pointer to the ListSpan component */
+#define ListObjSpanPtr(listObj_) \
+    ((ListSpan *)((listObj_)->internalRep.twoPtrValue.ptr2))
+
+/* Returns the ListRep internal representaton in a Tcl_Obj */
+#define ListObjGetRep(listObj_, listRepPtr_)                 \
+    do {                                                     \
+	(listRepPtr_)->storePtr = ListObjStorePtr(listObj_); \
+	(listRepPtr_)->spanPtr = ListObjSpanPtr(listObj_);   \
+    } while (0)
+
+/* Returns the length of the list */
+#define ListObjLength(listObj_, len_)                                         \
+    ((len_) = ListObjSpanPtr(listObj_) ? ListObjSpanPtr(listObj_)->spanLength \
+				       : ListObjStorePtr(listObj_)->numUsed)
+
+/* Returns the starting slot index of this list's elements in the ListStore */
+#define ListObjStart(listObj_)                                      \
+    (ListObjSpanPtr(listObj_) ? ListObjSpanPtr(listObj_)->spanStart \
+			      : ListObjStorePtr(listObj_)->firstUsed)
+
+/* Stores the element count and base address of this list's elements */
+#define ListObjGetElements(listObj_, objc_, objv_) \
+    (((objv_) = &ListObjStorePtr(listObj_)->slots[ListObjStart(listObj_)]), \
+     (ListObjLength(listObj_, (objc_))))
+
+/*
+ * Returns 1/0 whether the internal representation (not the Tcl_Obj itself)
+ * is shared.  Note by intent this only checks for sharing of ListStore,
+ * not spans.
+ */
+#define ListObjRepIsShared(listObj_) (ListObjStorePtr(listObj_)->refCount > 1)
 
-#define TclListObjLengthM(interp, listPtr, lenPtr) \
-    (((listPtr)->typePtr == &tclListType) \
-	    ? ((ListObjLength((listPtr), *(lenPtr))), TCL_OK)\
-	    : Tcl_ListObjLength((interp), (listPtr), (lenPtr)))
+/*
+ * Certain commands like concat are optimized if an existing string
+ * representation of a list object is known to be in canonical format (i.e.
+ * generated from the list representation). There are three conditions when
+ * this will be the case:
+ * (1) No string representation exists which means it will obviously have
+ * to be generated from the list representation when needed
+ * (2) The ListStore flags is marked canonical. This is done at the time
+ * the string representation is generated from the list IF the list
+ * representation does not have a span (see comments in UpdateStringOfList).
+ * (3) The list representation does not have a span component. This is
+ * because list Tcl_Obj's with spans are always created from existing lists
+ * and never from strings (see SetListFromAny) and thus their string
+ * representation will always be canonical.
+ */
+#define ListObjIsCanonical(listObj_)                             \
+    (((listObj_)->bytes == NULL)                                 \
+     || (ListObjStorePtr(listObj_)->flags & LISTSTORE_CANONICAL) \
+     || ListObjSpanPtr(listObj_) != NULL)
+
+/*
+ * Converts the Tcl_Obj to a list if it isn't one and stores the element
+ * count and base address of this list's elements in objcPtr_ and objvPtr_.
+ * Return TCL_OK on success or TCL_ERROR if the Tcl_Obj cannot be
+ * converted to a list.
+ */
+#define TclListObjGetElementsM(interp_, listObj_, objcPtr_, objvPtr_)    \
+    (((listObj_)->typePtr == &tclListType)                              \
+	 ? ((ListObjGetElements((listObj_), *(objcPtr_), *(objvPtr_))), \
+	    TCL_OK)                                                     \
+	 : Tcl_ListObjGetElements(                                      \
+	     (interp_), (listObj_), (objcPtr_), (objvPtr_)))
+
+/*
+ * Converts the Tcl_Obj to a list if it isn't one and stores the element
+ * count in lenPtr_.  Returns TCL_OK on success or TCL_ERROR if the
+ * Tcl_Obj cannot be converted to a list.
+ */
+#define TclListObjLengthM(interp_, listObj_, lenPtr_)         \
+    (((listObj_)->typePtr == &tclListType)                   \
+	 ? ((ListObjLength((listObj_), *(lenPtr_))), TCL_OK) \
+	 : Tcl_ListObjLength((interp_), (listObj_), (lenPtr_)))
 
-#define TclListObjIsCanonical(listPtr) \
-    (((listPtr)->typePtr == &tclListType) ? ListObjIsCanonical((listPtr)) : 0)
+#define TclListObjIsCanonical(listObj_) \
+    (((listObj_)->typePtr == &tclListType) ? ListObjIsCanonical((listObj_)) : 0)
 
 /*
  * Modes for collecting (or not) in the implementations of TclNRForeachCmd,
@@ -3030,6 +3179,9 @@ MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
 MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, size_t line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
+MODULE_SCOPE int	TclListObjAppendElements(Tcl_Interp *interp,
+			    Tcl_Obj *toObj, size_t elemCount,
+			    Tcl_Obj *const elemObjv[]);
 MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, size_t fromIdx,
 			    size_t toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index d368829..589b0da 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -1829,7 +1829,7 @@ AliasNRCmd(
     int prefc, cmdc, i;
     Tcl_Obj **prefv, **cmdv;
     Tcl_Obj *listPtr;
-    List *listRep;
+    ListRep listRep;
     int flags = TCL_EVAL_INVOKE;
 
     /*
@@ -1841,14 +1841,19 @@ AliasNRCmd(
     prefv = &aliasPtr->objPtr;
     cmdc = prefc + objc - 1;
 
+    /* TODO - encapsulate this into tclListObj.c */
     listPtr = Tcl_NewListObj(cmdc, NULL);
-    listRep = ListRepPtr(listPtr);
-    listRep->elemCount = cmdc;
-    cmdv = listRep->elements;
+    ListObjGetRep(listPtr, &listRep);
+    cmdv = ListRepElementsBase(&listRep);
+    listRep.storePtr->numUsed = cmdc;
+    if (listRep.spanPtr) {
+	listRep.spanPtr->spanStart = listRep.storePtr->firstUsed;
+	listRep.spanPtr->spanLength = listRep.storePtr->numUsed;
+    }
 
     prefv = &aliasPtr->objPtr;
-    memcpy(cmdv, prefv, (prefc * sizeof(Tcl_Obj *)));
-    memcpy(cmdv+prefc, objv+1, ((objc-1) * sizeof(Tcl_Obj *)));
+    memcpy(cmdv, prefv, prefc * sizeof(Tcl_Obj *));
+    memcpy(cmdv+prefc, objv+1, (objc-1) * sizeof(Tcl_Obj *));
 
     for (i=0; i<cmdc; i++) {
 	Tcl_IncrRefCount(cmdv[i]);
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index b0a21ca..95f2d61 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -3,9 +3,7 @@
  *
  *	This file contains functions that implement the Tcl list object type.
  *
- * Copyright © 1995-1997 Sun Microsystems, Inc.
- * Copyright © 1998 Scriptics Corporation.
- * Copyright © 2001 Kevin B. Kenny.  All rights reserved.
+ * Copyright © 2022 Ashok P. Nadkarni.  All rights reserved.
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -14,13 +12,131 @@
 #include "tclInt.h"
 #include <assert.h>
 
+/* TODO - memmove is fast. Measure at what size we should prefer memmove
+   (for unshared objects only) in lieu of range operations */
+
+/*
+ * Macros for validation and bug checking.
+ */
+
+/*
+ * Control whether asserts are enabled. Always enable in debug builds. In non-debug
+ * builds, can be set with cdebug="-DENABLE_LIST_ASSERTS" on the nmake command line.
+ */
+#ifdef ENABLE_LIST_ASSERTS
+# ifdef NDEBUG
+#  undef NDEBUG /* Activate assert() macro */
+# endif
+#else
+# ifndef NDEBUG
+#  define ENABLE_LIST_ASSERTS /* Always activate list asserts in debug mode */
+# endif
+#endif
+
+#ifdef ENABLE_LIST_ASSERTS
+
+#define LIST_ASSERT(cond_) assert(cond_) /* TODO - is there a Tcl-specific one? */
+/*
+ * LIST_INDEX_ASSERT is to catch errors with negative indices and counts
+ * being passed AFTER validation. On Tcl9 length types are unsigned hence
+ * the checks against LIST_MAX. On Tcl8 length types are signed hence the
+ * also checks against 0.
+ */
+#define LIST_INDEX_ASSERT(idxarg_)                                 \
+    do {                                                           \
+	ListSizeT idx_ = (idxarg_); /* To guard against ++ etc. */ \
+	LIST_ASSERT(idx_ >= 0 && idx_ < LIST_MAX);                 \
+    } while (0)
+/* Ditto for counts except upper limit is different */
+#define LIST_COUNT_ASSERT(countarg_)                                   \
+    do {                                                               \
+	ListSizeT count_ = (countarg_); /* To guard against ++ etc. */ \
+	LIST_ASSERT(count_ >= 0 && count_ <= LIST_MAX);                \
+    } while (0)
+
+#else
+
+#define LIST_ASSERT(cond_) ((void) 0)
+#define LIST_INDEX_ASSERT(idx_) ((void) 0)
+#define LIST_COUNT_ASSERT(count_) ((void) 0)
+
+#endif
+
+/* Checks for when caller should have already converted to internal list type */
+#define LIST_ASSERT_TYPE(listObj_) \
+    LIST_ASSERT((listObj_)->typePtr == &tclListType);
+
+
 /*
- * Prototypes for functions defined later in this file:
+ * If ENABLE_LIST_INVARIANTS is enabled (-DENABLE_LIST_INVARIANTS from the
+ * command line), the entire list internal representation is checked for
+ * inconsistencies. This has a non-trivial cost so has to be separately
+ * enabled and not part of assertions checking.
  */
+#ifdef ENABLE_LIST_INVARIANTS
+#define LISTREP_CHECK(listRepPtr_) ListRepValidate(listRepPtr_)
+#else
+#define LISTREP_CHECK(listRepPtr_) (void) 0
+#endif
+
+/*
+ * Flags used for controlling behavior of allocation of list
+ * internal representations.
+ *
+ * If the LISTREP_PANIC_ON_FAIL bit is set, the function will panic if
+ * list is too large or memory cannot be allocated. Without the flag
+ * a NULL pointer is returned.
+ *
+ * The LISTREP_SPACE_FAVOR_NONE, LISTREP_SPACE_FAVOR_FRONT,
+ * LISTREP_SPACE_FAVOR_BACK, LISTREP_SPACE_ONLY_BACK flags are used to
+ * control additional space when allocating.
+ * - If none of these flags is present, the exact space requested is
+ *   allocated, nothing more.
+ * - Otherwise, if only LISTREP_FAVOR_FRONT is present, extra space is
+ *   allocated with more towards the front.
+ * - Conversely, if only LISTREP_FAVOR_BACK is present extra space is allocated
+ *   with more to the back.
+ * - If both flags are present (LISTREP_SPACE_FAVOR_NONE), the extra space
+ *   is equally apportioned.
+ * - Finally if LISTREP_SPACE_ONLY_BACK is present, ALL extra space is at
+ *   the back.
+ */
+#define LISTREP_PANIC_ON_FAIL         0x00000001
+#define LISTREP_SPACE_FAVOR_FRONT     0x00000002
+#define LISTREP_SPACE_FAVOR_BACK      0x00000004
+#define LISTREP_SPACE_ONLY_BACK       0x00000008
+#define LISTREP_SPACE_FAVOR_NONE \
+    (LISTREP_SPACE_FAVOR_FRONT | LISTREP_SPACE_FAVOR_BACK)
+#define LISTREP_SPACE_FLAGS                               \
+    (LISTREP_SPACE_FAVOR_FRONT | LISTREP_SPACE_FAVOR_BACK \
+     | LISTREP_SPACE_ONLY_BACK)
+
+/*
+ * Prototypes for non-inline static functions defined later in this file:
+ */
+static int MemoryAllocationError(Tcl_Interp *, size_t size);
+static int ListLimitExceededError(Tcl_Interp *);
+static ListStore *
+ListStoreNew(ListSizeT objc, Tcl_Obj *const objv[], int flags);
+static int
+ListRepInit(ListSizeT objc, Tcl_Obj *const objv[], int flags, ListRep *);
+static int ListRepInitAttempt(Tcl_Interp *,
+			      ListSizeT objc,
+			      Tcl_Obj *const objv[],
+			      ListRep *);
+static void ListRepClone(ListRep *fromRepPtr, ListRep *toRepPtr, int flags);
+static void ListRepUnsharedFreeUnreferenced(const ListRep *repPtr);
+static int TclListObjGetRep(Tcl_Interp *, Tcl_Obj *listPtr, ListRep *repPtr);
+static void ListRepRange(ListRep *srcRepPtr,
+			 ListSizeT rangeStart,
+			 ListSizeT rangeEnd,
+			 int preserveSrcRep,
+			 ListRep *rangeRepPtr);
+static ListStore *ListStoreReallocate(ListStore *storePtr, ListSizeT numSlots);
+#ifdef ENABLE_LIST_ASSERTS /* Else gcc complains about unused static */
+static void ListRepValidate(const ListRep *repPtr);
+#endif
 
-static List *		AttemptNewList(Tcl_Interp *interp, size_t objc,
-			    Tcl_Obj *const objv[]);
-static List *		NewListInternalRep(size_t objc, Tcl_Obj *const objv[], size_t p);
 static void		DupListInternalRep(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
 static void		FreeListInternalRep(Tcl_Obj *listPtr);
 static int		SetListFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
@@ -30,13 +146,7 @@ static void		UpdateStringOfList(Tcl_Obj *listPtr);
  * The structure below defines the list Tcl object type by means of functions
  * that can be invoked by generic object code.
  *
- * The internal representation of a list object is a two-pointer
- * representation. The first pointer designates a List structure that contains
- * an array of pointers to the element objects, together with integers that
- * represent the current element count and the allocated size of the array.
- * The second pointer is normally NULL; during execution of functions in this
- * file that operate on nested sublists, it is occasionally used as working
- * storage to avoid an auxiliary stack.
+ * The internal representation of a list object is ListRep defined in tcl.h.
  */
 
 const Tcl_ObjType tclListType = {
@@ -48,144 +158,929 @@ const Tcl_ObjType tclListType = {
 };
 
 /* Macros to manipulate the List internal rep */
+#define ListRepIncrRefs(repPtr_)            \
+    do {                                    \
+	(repPtr_)->storePtr->refCount++;    \
+	if ((repPtr_)->spanPtr)             \
+	    (repPtr_)->spanPtr->refCount++; \
+    } while (0)
+
+/* Returns number of free unused slots at the back of the ListRep's ListStore */
+#define ListRepNumFreeTail(repPtr_) \
+    ((repPtr_)->storePtr->numAllocated \
+     - ((repPtr_)->storePtr->firstUsed + (repPtr_)->storePtr->numUsed))
+
+/* Returns number of free unused slots at the front of the ListRep's ListStore */
+#define ListRepNumFreeHead(repPtr_) ((repPtr_)->storePtr->firstUsed)
+
+/* Returns a pointer to the slot corresponding to list index listIdx_ */
+#define ListRepSlotPtr(repPtr_, listIdx_) \
+    (&(repPtr_)->storePtr->slots[ListRepStart(repPtr_) + (listIdx_)])
 
-#define ListSetInternalRep(objPtr, listRepPtr)				\
-    do {								\
-	Tcl_ObjInternalRep ir;						\
-	ir.twoPtrValue.ptr1 = (listRepPtr);				\
-	ir.twoPtrValue.ptr2 = NULL;					\
-	(listRepPtr)->refCount++;					\
-	Tcl_StoreInternalRep((objPtr), &tclListType, &ir);			\
+/*
+ * Macros to replace the internal representation in a Tcl_Obj. There are
+ * subtle differences in each so make sure to use the right one to avoid
+ * memory leaks, access to freed memory and the like.
+ *
+ * ListObjStompRep - assumes the Tcl_Obj internal representation can be
+ * overwritten AND that the passed ListRep already has reference counts that
+ * include the reference from the Tcl_Obj. Basically just copies the pointers
+ * and sets the internal Tcl_Obj type to list
+ *
+ * ListObjOverwriteRep - like ListObjOverwriteRep but additionally
+ * increments reference counts on the passed ListRep. Generally used when
+ * the string representation of the Tcl_Obj is not to be modified.
+ *
+ * ListObjReplaceRepAndInvalidate - Like ListObjOverwriteRep but additionally
+ * assumes the Tcl_Obj internal rep is valid (and possibly even same as
+ * passed ListRep) and frees it first. Additionally invalidates the string
+ * representation. Generally used when modifying a Tcl_Obj value.
+ */
+#define ListObjStompRep(objPtr_, repPtr_)                              \
+    do {                                                               \
+	(objPtr_)->internalRep.twoPtrValue.ptr1 = (repPtr_)->storePtr; \
+	(objPtr_)->internalRep.twoPtrValue.ptr2 = (repPtr_)->spanPtr;  \
+	(objPtr_)->typePtr = &tclListType;                             \
     } while (0)
 
-#define ListGetInternalRep(objPtr, listRepPtr)				\
-    do {								\
-	const Tcl_ObjInternalRep *irPtr;					\
-	irPtr = TclFetchInternalRep((objPtr), &tclListType);		\
-	(listRepPtr) = irPtr ? (List *)irPtr->twoPtrValue.ptr1 : NULL;		\
+#define ListObjOverwriteRep(objPtr_, repPtr_) \
+    do {                                      \
+	ListRepIncrRefs(repPtr_);             \
+	ListObjStompRep(objPtr_, repPtr_);    \
     } while (0)
 
-#define ListResetInternalRep(objPtr, listRepPtr) \
-    TclFetchInternalRep((objPtr), &tclListType)->twoPtrValue.ptr1 = (listRepPtr)
+#define ListObjReplaceRepAndInvalidate(objPtr_, repPtr_)           \
+    do {                                                           \
+	/* Note order important, don't use ListObjOverwriteRep! */ \
+	ListRepIncrRefs(repPtr_);                                  \
+	TclFreeInternalRep(objPtr_);                               \
+	TclInvalidateStringRep(objPtr_);                           \
+	ListObjStompRep(objPtr_, repPtr_);                         \
+    } while (0)
 
-#ifndef TCL_MIN_ELEMENT_GROWTH
-#define TCL_MIN_ELEMENT_GROWTH TCL_MIN_GROWTH/sizeof(Tcl_Obj *)
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListSpanNew --
+ *
+ *    Allocates and initializes memory for a new ListSpan. The reference
+ *    count on the returned struct is 0.
+ *
+ * Results:
+ *    Non-NULL pointer to the allocated ListSpan.
+ *
+ * Side effects:
+ *    The function will panic on memory allocation failure.
+ *
+ *------------------------------------------------------------------------
+ */
+static inline ListSpan *
+ListSpanNew(
+    ListSizeT firstSlot, /* Starting slot index of the span */
+    ListSizeT numSlots)  /* Number of slots covered by the span */
+{
+    ListSpan *spanPtr = (ListSpan *) Tcl_Alloc(sizeof(*spanPtr));
+    spanPtr->refCount = 0;
+    spanPtr->spanStart = firstSlot;
+    spanPtr->spanLength = numSlots;
+    return spanPtr;
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListSpanIncrRefs --
+ *
+ *   Increments the reference count on the spanPtr
+ *
+ * Results:
+ *   None.
+ *
+ * Side effects:
+ *   The obvious.
+ *
+ *------------------------------------------------------------------------
+ */
+
+static inline void
+ListSpanIncrRefs(ListSpan *spanPtr)
+{
+    spanPtr->refCount += 1;
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListSpanDecrRefs --
+ *
+ *   Decrements the reference count on a span, freeing the memory if
+ *   it drops to zero or less.
+ *
+ * Results:
+ *   None.
+ *
+ * Side effects:
+ *   The memory may be freed.
+ *
+ *------------------------------------------------------------------------
+ */
+
+static inline void
+ListSpanDecrRefs(ListSpan *spanPtr)
+{
+    if (spanPtr->refCount <= 1) {
+	Tcl_Free(spanPtr);
+    } else {
+	spanPtr->refCount -= 1;
+    }
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListSpanMerited --
+ *
+ *    Creation of a new list may sometimes be done as a span on existing
+ *    storage instead of allocating new. The tradeoff is that if the
+ *    original list is released, the new span-based list may hold on to
+ *    more memory than desired. This function implements heuristics for
+ *    deciding which option is better.
+ *
+ * Results:
+ *    Returns non-0 if a span-based list is likely to be more optimal
+ *    and 0 if not.
+ *
+ * Side effects:
+ *    None.
+ *
+ *------------------------------------------------------------------------
+ */
+
+static inline int
+ListSpanMerited(
+    ListSizeT length,                 /* Length of the proposed span */
+    ListSizeT usedStorageLength,      /* Number of slots currently in used */
+    ListSizeT allocatedStorageLength) /* Length of the currently allocation */
+{
+    /*
+     TODO
+     - heuristics thresholds need to be determined
+     - currently, information about the sharing (ref count) of existing
+       storage is not passed. Perhaps it should be. For example if the
+       existing storage has a "large" ref count, then it might make sense
+       to do even a small span.
+     */
+#ifndef TCL_LIST_SPAN_MINSIZE /* May be set on build line */
+#define TCL_LIST_SPAN_MINSIZE 101
 #endif
-
+
+    if (length < TCL_LIST_SPAN_MINSIZE)
+	return 0;/* No span for small lists */
+    if (length < (allocatedStorageLength/2 - allocatedStorageLength/8))
+	return 0; /* No span if less than 3/8 of allocation */
+    if (length < usedStorageLength / 2)
+	return 0; /* No span if less than half current storage */
+
+    return 1;
+}
+
 /*
- *----------------------------------------------------------------------
+ *------------------------------------------------------------------------
+ *
+ * ListStoreUpSize --
+ *
+ *    For reasons of efficiency, extra space is allocated for a ListStore
+ *    compared to what was requested. This function calculates how many
+ *    slots should actually be allocated for a given request size.
+ *
+ * Results:
+ *    Number of slots to allocate.
+ *
+ * Side effects:
+ *    None.
  *
- * NewListInternalRep --
+ *------------------------------------------------------------------------
+ */
+static inline ListSizeT
+ListStoreUpSize(ListSizeT numSlotsRequested) {
+    /* TODO -how much extra? May be double only for smaller requests? */
+    return numSlotsRequested < (LIST_MAX / 2) ? 2 * numSlotsRequested
+						 : LIST_MAX;
+}
+
+/*
+ *------------------------------------------------------------------------
  *
- *	Creates a 'List' structure with space for 'objc' elements.  'objc' must
- *	be > 0.  If 'objv' is not NULL, The list is initialized with first
- *	'objc' values in that array.  Otherwise the list is initialized to have
- *	0 elements, with space to add 'objc' more.  Flag value 'p' indicates
- *	how to behave on failure.
+ * ListRepFreeUnreferenced --
  *
- * Value
+ *    Inline wrapper for ListRepUnsharedFreeUnreferenced that does quick checks
+ *    before calling it.
  *
- *	A new 'List' structure with refCount 0. If some failure
- *	prevents this NULL is returned if 'p' is 0 , and 'Tcl_Panic'
- *	is called if it is not.
+ *    IMPORTANT: this function must not be called on an internal
+ *    representation of a Tcl_Obj that is itself shared.
  *
- * Effect
+ * Results:
+ *    None.
  *
- *	The refCount of each value in 'objv' is incremented as it is added
- *	to the list.
+ * Side effects:
+ *    See comments for ListRepUnsharedFreeUnreferenced.
  *
- *----------------------------------------------------------------------
+ *------------------------------------------------------------------------
+ */
+static inline void
+ListRepFreeUnreferenced(const ListRep *repPtr)
+{
+    if (! ListRepIsShared(repPtr) && repPtr->spanPtr) {
+	ListRepUnsharedFreeUnreferenced(repPtr);
+    }
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ObjArrayIncrRefs --
+ *
+ *    Increments the reference counts for Tcl_Obj's in a subarray.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    As above.
+ *
+ *------------------------------------------------------------------------
+ */
+static inline void
+ObjArrayIncrRefs(
+    Tcl_Obj * const *objv,  /* Pointer to the array */
+    ListSizeT startIdx,     /* Starting index of subarray within objv */
+    ListSizeT count)        /* Number of elements in the subarray */
+{
+    Tcl_Obj * const *end;
+    LIST_INDEX_ASSERT(startIdx);
+    LIST_COUNT_ASSERT(count);
+    objv += startIdx;
+    end = objv + count;
+    while (objv < end) {
+	Tcl_IncrRefCount(*objv);
+	++objv;
+    }
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ObjArrayDecrRefs --
+ *
+ *    Decrements the reference counts for Tcl_Obj's in a subarray.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    As above.
+ *
+ *------------------------------------------------------------------------
+ */
+static inline void
+ObjArrayDecrRefs(
+    Tcl_Obj * const *objv, /* Pointer to the array */
+    ListSizeT startIdx,    /* Starting index of subarray within objv */
+    ListSizeT count)       /* Number of elements in the subarray */
+{
+    Tcl_Obj * const *end;
+    LIST_INDEX_ASSERT(startIdx);
+    LIST_COUNT_ASSERT(count);
+    objv += startIdx;
+    end = objv + count;
+    while (objv < end) {
+	Tcl_DecrRefCount(*objv);
+	++objv;
+    }
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ObjArrayCopy --
+ *
+ *    Copies an array of Tcl_Obj* pointers.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    Reference counts on copied Tcl_Obj's are incremented.
+ *
+ *------------------------------------------------------------------------
+ */
+static inline void
+ObjArrayCopy(
+    Tcl_Obj **to,          /* Destination */
+    ListSizeT count,       /* Number of pointers to copy */
+    Tcl_Obj *const from[]) /* Source array of Tcl_Obj* */
+{
+    Tcl_Obj **end;
+    LIST_COUNT_ASSERT(count);
+    end = to + count;
+    /* TODO - would memmove followed by separate IncrRef loop be faster? */
+    while (to < end) {
+	Tcl_IncrRefCount(*from);
+	*to++ = *from++;
+    }
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * MemoryAllocationError --
+ *
+ *    Generates a memory allocation failure error.
+ *
+ * Results:
+ *    Always TCL_ERROR.
+ *
+ * Side effects:
+ *    Error message and code are stored in the interpreter if not NULL.
+ *
+ *------------------------------------------------------------------------
+ */
+static int
+MemoryAllocationError(
+    Tcl_Interp *interp, /* Interpreter for error message. May be NULL */
+    size_t size)        /* Size of attempted allocation that failed */
+{
+    if (interp != NULL) {
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_ObjPrintf(
+		"list construction failed: unable to alloc %" TCL_LL_MODIFIER
+		"u bytes",
+		(Tcl_WideInt)size));
+	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+    }
+    return TCL_ERROR;
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListLimitExceeded --
+ *
+ *    Generates an error for exceeding maximum list size.
+ *
+ * Results:
+ *    Always TCL_ERROR.
+ *
+ * Side effects:
+ *    Error message and code are stored in the interpreter if not NULL.
+ *
+ *------------------------------------------------------------------------
+ */
+static int
+ListLimitExceededError(Tcl_Interp *interp)
+{
+    if (interp != NULL) {
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_ObjPrintf("max length of a Tcl list (%" TCL_Z_MODIFIER "u) elements) exceeded",
+			  LIST_MAX));
+	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+    }
+    return TCL_ERROR;
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListRepUnsharedShiftDown --
+ *
+ *    Shifts the "in-use" contents in the ListStore for a ListRep down
+ *    by the given number of slots. The ListStore must be unshared and
+ *    the free space at the front of the storage area must be big enough.
+ *    It is the caller's responsibility to check.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    The contents of the ListRep's ListStore area are shifted down in the
+ *    storage area. The ListRep's ListSpan is updated accordingly.
+ *
+ *------------------------------------------------------------------------
+ */
+static inline void
+ListRepUnsharedShiftDown(ListRep *repPtr, ListSizeT shiftCount)
+{
+    ListStore *storePtr;
+
+    LISTREP_CHECK(repPtr);
+    LIST_ASSERT(!ListRepIsShared(repPtr));
+
+    storePtr = repPtr->storePtr;
+
+    LIST_COUNT_ASSERT(shiftCount);
+    LIST_ASSERT(storePtr->firstUsed >= shiftCount);
+
+    memmove(&storePtr->slots[storePtr->firstUsed - shiftCount],
+	    &storePtr->slots[storePtr->firstUsed],
+	    storePtr->numUsed * sizeof(Tcl_Obj *));
+    storePtr->firstUsed -= shiftCount;
+    if (repPtr->spanPtr) {
+	repPtr->spanPtr->spanStart -= shiftCount;
+	LIST_ASSERT(repPtr->spanPtr->spanLength == storePtr->numUsed);
+    } else {
+	/*
+	 * If there was no span, firstUsed must have been 0 (Invariant)
+	 * AND shiftCount must have been 0 (<= firstUsed on call)
+	 * In other words, this would have been a no-op
+	 */
+
+	LIST_ASSERT(storePtr->firstUsed == 0);
+	LIST_ASSERT(shiftCount == 0);
+    }
+
+    LISTREP_CHECK(repPtr);
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListRepUnsharedShiftUp --
+ *
+ *    Shifts the "in-use" contents in the ListStore for a ListRep up
+ *    by the given number of slots. The ListStore must be unshared and
+ *    the free space at the back of the storage area must be big enough.
+ *    It is the caller's responsibility to check.
+ *    TODO - this function is not currently used.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    The contents of the ListRep's ListStore area are shifted up in the
+ *    storage area. The ListRep's ListSpan is updated accordingly.
+ *
+ *------------------------------------------------------------------------
  */
+static inline void
+ListRepUnsharedShiftUp(ListRep *repPtr, ListSizeT shiftCount)
+{
+    ListStore *storePtr;
+
+    LISTREP_CHECK(repPtr);
+    LIST_ASSERT(!ListRepIsShared(repPtr));
+    LIST_COUNT_ASSERT(shiftCount);
+
+    storePtr = repPtr->storePtr;
+    LIST_ASSERT((storePtr->firstUsed + storePtr->numUsed + shiftCount)
+		<= storePtr->numAllocated);
+
+    memmove(&storePtr->slots[storePtr->firstUsed + shiftCount],
+	    &storePtr->slots[storePtr->firstUsed],
+	    storePtr->numUsed * sizeof(Tcl_Obj *));
+    storePtr->firstUsed += shiftCount;
+    if (repPtr->spanPtr) {
+	repPtr->spanPtr->spanStart += shiftCount;
+    } else {
+	/* No span means entire original list is span */
+	/* Should have been zero before shift - Invariant TBD */
+	LIST_ASSERT(storePtr->firstUsed == shiftCount);
+	repPtr->spanPtr = ListSpanNew(shiftCount, storePtr->numUsed);
+    }
 
-static List *
-NewListInternalRep(
-    size_t objc,
+    LISTREP_CHECK(repPtr);
+}
+
+#ifdef ENABLE_LIST_ASSERTS /* Else gcc complains about unused static */
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListRepValidate --
+ *
+ *    Checks all invariants for a ListRep.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    Panics (assertion failure) if any invariant is not met.
+ *
+ *------------------------------------------------------------------------
+ */
+static void
+ListRepValidate(const ListRep *repPtr)
+{
+    ListStore *storePtr = repPtr->storePtr;
+
+    (void)storePtr; /* To stop gcc from whining about unused vars */
+
+    /* Separate each condition so line number gives exact reason for failure */
+    LIST_ASSERT(storePtr != NULL);
+    LIST_ASSERT(storePtr->numAllocated >= 0);
+    LIST_ASSERT(storePtr->numAllocated <= LIST_MAX);
+    LIST_ASSERT(storePtr->firstUsed >= 0);
+    LIST_ASSERT(storePtr->firstUsed < storePtr->numAllocated);
+    LIST_ASSERT(storePtr->numUsed >= 0);
+    LIST_ASSERT(storePtr->numUsed <= storePtr->numAllocated);
+    LIST_ASSERT(storePtr->firstUsed
+		<= (storePtr->numAllocated - storePtr->numUsed));
+
+#if 0 && defined(LIST_MEM_DEBUG)
+    /* Corresponding zeroing out not implemented yet */
+    for (i = 0; i < storePtr->firstUsed; ++i) {
+	LIST_ASSERT(storePtr->slots[i] == NULL);
+    }
+    for (i = storePtr->firstUsed + storePtr->numUsed;
+	 i < storePtr->numAllocated;
+	 ++i) {
+	LIST_ASSERT(storePtr->slots[i] == NULL);
+    }
+#endif
+
+    if (! ListRepIsShared(repPtr)) {
+	/*
+	 * If this is the only reference and there is no span, then store
+	 * occupancy must begin at 0
+	 */
+	LIST_ASSERT(repPtr->spanPtr || repPtr->storePtr->firstUsed == 0);
+    }
+
+    LIST_ASSERT(ListRepStart(repPtr) >= storePtr->firstUsed);
+    LIST_ASSERT(ListRepLength(repPtr) <= storePtr->numUsed);
+    LIST_ASSERT(ListRepStart(repPtr)
+		<= (storePtr->firstUsed + storePtr->numUsed - ListRepLength(repPtr)));
+
+}
+#endif /* ENABLE_LIST_ASSERTS */
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ListStoreNew --
+ *
+ *	Allocates a new ListStore with space for at least objc elements. objc
+ *	must be > 0.  If objv!=NULL, initializes with the first objc values
+ *	in that array.  If objv==NULL, initalize 0 elements, with space
+ *	to add objc more.
+ *
+ *      Normally the function allocates the exact space requested unless
+ *      the flags arguments has any LISTREP_SPACE_*
+ *      bits set. See the comments for those #defines.
+ *
+ * Results:
+ *      On success, a pointer to the allocated ListStore is returned.
+ *      On allocation failure, panics if LISTREP_PANIC_ON_FAIL is set in
+ *      flags; otherwise returns NULL.
+ *
+ * Side effects:
+ *	The ref counts of the elements in objv are incremented on success
+ *	since the returned ListStore references them.
+ *
+ *----------------------------------------------------------------------
+ */
+static ListStore *
+ListStoreNew(
+    ListSizeT objc,
     Tcl_Obj *const objv[],
-    size_t p)
+    int flags)
 {
-    List *listRepPtr;
+    ListStore *storePtr;
+    ListSizeT capacity;
 
-    listRepPtr = (List *)Tcl_AttemptAlloc(LIST_SIZE(objc));
-    if (listRepPtr == NULL) {
-	if (p) {
-	    Tcl_Panic("list creation failed: unable to alloc %" TCL_Z_MODIFIER "u bytes",
+    /*
+     * First check to see if we'd overflow and try to allocate an object
+     * larger than our memory allocator allows.
+     */
+    if (objc > LIST_MAX) {
+	if (flags & LISTREP_PANIC_ON_FAIL) {
+	    Tcl_Panic("max length of a Tcl list (%" TCL_Z_MODIFIER "u elements) exceeded",
+		    LIST_MAX);
+	}
+	return NULL;
+    }
+
+    if (flags & LISTREP_SPACE_FLAGS) {
+	capacity = ListStoreUpSize(objc);
+    } else {
+	capacity = objc;
+    }
+
+    storePtr = (ListStore *)Tcl_AttemptAlloc(LIST_SIZE(capacity));
+    if (storePtr == NULL && capacity != objc) {
+	capacity = objc; /* Try allocating exact size */
+	storePtr = (ListStore *)Tcl_AttemptAlloc(LIST_SIZE(capacity));
+    }
+    if (storePtr == NULL) {
+	if (flags & LISTREP_PANIC_ON_FAIL) {
+	    Tcl_Panic("list creation failed: unable to alloc %u bytes",
 		    LIST_SIZE(objc));
 	}
 	return NULL;
     }
 
-    listRepPtr->canonicalFlag = 0;
-    listRepPtr->refCount = 0;
-    listRepPtr->maxElemCount = objc;
+    storePtr->refCount = 0;
+    storePtr->flags = 0;
+    storePtr->numAllocated = capacity;
+    if (capacity == objc) {
+	storePtr->firstUsed = 0;
+    } else {
+	ListSizeT extra = capacity - objc;
+	int spaceFlags = flags & LISTREP_SPACE_FLAGS;
+	if (spaceFlags == LISTREP_SPACE_ONLY_BACK) {
+	    storePtr->firstUsed = 0;
+	} else if (spaceFlags == LISTREP_SPACE_FAVOR_FRONT) {
+	    /* Leave more space in the front */
+	    storePtr->firstUsed =
+		extra - (extra / 4); /* NOT same as 3*extra/4 */
+	} else if (spaceFlags == LISTREP_SPACE_FAVOR_BACK) {
+	    /* Leave more space in the back */
+	    storePtr->firstUsed = extra / 4;
+	} else {
+	    /* Apportion equally */
+	    storePtr->firstUsed = extra / 2;
+	}
+    }
 
     if (objv) {
-	Tcl_Obj **elemPtrs;
-	size_t i;
-
-	listRepPtr->elemCount = objc;
-	elemPtrs = listRepPtr->elements;
-	for (i = 0;  i < objc;  i++) {
-	    elemPtrs[i] = objv[i];
-	    Tcl_IncrRefCount(elemPtrs[i]);
-	}
+	storePtr->numUsed = objc;
+	ObjArrayCopy(&storePtr->slots[storePtr->firstUsed], objc, objv);
     } else {
-	listRepPtr->elemCount = 0;
+	storePtr->numUsed = 0;
     }
-    return listRepPtr;
+
+    return storePtr;
 }
-
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListStoreReallocate --
+ *
+ *    Reallocates the memory for a ListStore.
+ *
+ * Results:
+ *    Pointer to the ListStore which may be the same as storePtr or pointer
+ *    to a new block of memory. On reallocation failure, NULL is returned.
+ *
+ *
+ * Side effects:
+ *    The memory pointed to by storePtr is freed if it a new block has to
+ *    be returned.
+ *
+ *
+ *------------------------------------------------------------------------
+ */
+ListStore *
+ListStoreReallocate (ListStore *storePtr, ListSizeT numSlots)
+{
+    ListSizeT newCapacity;
+    ListStore *newStorePtr;
+
+    newCapacity = ListStoreUpSize(numSlots);
+    newStorePtr =
+	(ListStore *)Tcl_AttemptRealloc(storePtr, LIST_SIZE(newCapacity));
+    if (newStorePtr == NULL) {
+	newCapacity = numSlots;
+	newStorePtr = (ListStore *)Tcl_AttemptRealloc(storePtr,
+						    LIST_SIZE(newCapacity));
+	if (newStorePtr == NULL)
+	    return NULL;
+    }
+    /* Only the capacity has changed, fix it in the header */
+    newStorePtr->numAllocated = newCapacity;
+    return newStorePtr;
+}
+
 /*
  *----------------------------------------------------------------------
  *
- *  AttemptNewList --
+ * ListRepInit --
  *
- *	Like NewListInternalRep, but additionally sets an error message on failure.
+ *      Initializes a ListRep to hold a list internal representation
+ *      with space for objc elements.
+ *
+ *      objc must be > 0. If objv!=NULL, initializes with the first objc
+ *      values in that array. If objv==NULL, initalize list internal rep to
+ *      have 0 elements, with space to add objc more.
+ *
+ *	Normally the function allocates the exact space requested unless
+ *	the flags arguments has one of the LISTREP_SPACE_* bits set.
+ *	See the comments for those #defines.
+ *
+ *      The reference counts of the ListStore and ListSpan (if present)
+ *	pointed to by the initialized repPtr are set to zero.
+ *	Caller has to manage them as necessary.
+ *
+ * Results:
+ *      On success, TCL_OK is returned with *listRepPtr initialized.
+ *      On failure, panics if LISTREP_PANIC_ON_FAIL is set in flags; otherwise
+ *	returns TCL_ERROR with *listRepPtr fields set to NULL.
+ *
+ * Side effects:
+ *	The ref counts of the elements in objv are incremented since the
+ *	resulting list now refers to them.
  *
  *----------------------------------------------------------------------
  */
+static int
+ListRepInit(
+    ListSizeT objc,
+    Tcl_Obj *const objv[],
+    int flags,
+    ListRep *repPtr
+    )
+{
+    ListStore *storePtr;
+
+    /*
+     * The whole list implementation has an implicit assumption that lenths
+     * and indices used a signed integer type. Tcl9 API's currently use
+     * unsigned types. This assert is to remind that need to review code
+     * when adapting for Tcl9.
+     */
+    LIST_ASSERT(((ListSizeT)-1) < 0);
+
+    storePtr = ListStoreNew(objc, objv, flags);
+    if (storePtr) {
+	repPtr->storePtr = storePtr;
+	if (storePtr->firstUsed == 0) {
+	    repPtr->spanPtr = NULL;
+	} else {
+	    repPtr->spanPtr =
+		ListSpanNew(storePtr->firstUsed, storePtr->numUsed);
+	}
+	return TCL_OK;
+    }
+    /*
+     * Initialize to keep gcc happy at the call site. Else it complains
+     * about possibly uninitialized use.
+     */
+    repPtr->storePtr = NULL;
+    repPtr->spanPtr = NULL;
+    return TCL_ERROR;
+}
 
-static List *
-AttemptNewList(
+/*
+ *----------------------------------------------------------------------
+ *
+ * ListRepInitAttempt --
+ *
+ *	Creates a list internal rep with space for objc elements. See
+ *	ListRepInit for requirements for parameters (in particular objc must
+ *	be > 0). This function only adds error messages to the interpreter if
+ *	not NULL.
+ *
+ *      The reference counts of the ListStore and ListSpan (if present)
+ *	pointed to by the initialized repPtr are set to zero.
+ *	Caller has to manage them as necessary.
+ *
+ * Results:
+ *      On success, TCL_OK is returned with *listRepPtr initialized.
+ *	On allocation failure, returnes TCL_ERROR with an error message
+ *	in the interpreter if non-NULL.
+ *
+ * Side effects:
+ *	The ref counts of the elements in objv are incremented since the
+ *	resulting list now refers to them.
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+ListRepInitAttempt(
     Tcl_Interp *interp,
-    size_t objc,
-    Tcl_Obj *const objv[])
+    ListSizeT objc,
+    Tcl_Obj *const objv[],
+    ListRep *repPtr)
 {
-    List *listRepPtr = NewListInternalRep(objc, objv, 0);
+    int result = ListRepInit(objc, objv, 0, repPtr);
 
-    if (interp != NULL && listRepPtr == NULL) {
+    if (result != TCL_OK && interp != NULL) {
 	if (objc > LIST_MAX) {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "max length of a Tcl list (%d elements) exceeded",
-		    LIST_MAX));
+	    ListLimitExceededError(interp);
 	} else {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "list creation failed: unable to alloc %" TCL_Z_MODIFIER "u bytes",
-		    LIST_SIZE(objc)));
+	    MemoryAllocationError(interp, LIST_SIZE(objc));
 	}
-	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
     }
-    return listRepPtr;
+    return result;
 }
-
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListRepClone --
+ *
+ *    Does a deep clone of an existing ListRep.
+ *
+ *    Normally the function allocates the exact space needed unless
+ *    the flags arguments has one of the LISTREP_SPACE_* bits set.
+ *    See the comments for those #defines.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    The toRepPtr location is initialized with the ListStore and ListSpan
+ *    (if needed) containing a copy of the list elements in fromRepPtr.
+ *    The function will panic if memory cannot be allocated.
+ *
+ *------------------------------------------------------------------------
+ */
+static void
+ListRepClone(ListRep *fromRepPtr, ListRep *toRepPtr, int flags)
+{
+    Tcl_Obj **fromObjs;
+    ListSizeT numFrom;
+
+    ListRepElements(fromRepPtr, numFrom, fromObjs);
+    ListRepInit(numFrom, fromObjs, flags | LISTREP_PANIC_ON_FAIL, toRepPtr);
+}
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * ListRepUnsharedFreeUnreferenced --
+ *
+ *    Frees any Tcl_Obj's from the "in-use" area of the ListStore for a
+ *    ListRep that are not actually references from any lists.
+ *
+ *    IMPORTANT: this function must not be called on a shared internal
+ *    representation or the internal representation of a shared Tcl_Obj.
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    The firstUsed and numUsed fields of the ListStore are updated to
+ *    reflect the new "in-use" extent.
+ *
+ *------------------------------------------------------------------------
+ */
+
+static void ListRepUnsharedFreeUnreferenced(const ListRep *repPtr)
+{
+    ListSizeT count;
+    ListStore *storePtr;
+    ListSpan *spanPtr;
+
+    LIST_ASSERT(!ListRepIsShared(repPtr));
+    LISTREP_CHECK(repPtr);
+
+    storePtr = repPtr->storePtr;
+    spanPtr = repPtr->spanPtr;
+    if (spanPtr == NULL) {
+	LIST_ASSERT(storePtr->firstUsed == 0); /* Invariant TBD */
+	return;
+    }
+
+    /* Collect garbage at front */
+    count = spanPtr->spanStart - storePtr->firstUsed;
+    LIST_COUNT_ASSERT(count);
+    if (count > 0) {
+	ObjArrayDecrRefs(storePtr->slots, storePtr->firstUsed, count);
+	storePtr->firstUsed = spanPtr->spanStart;
+	LIST_ASSERT(storePtr->numUsed >= count);
+	storePtr->numUsed -= count;
+    }
+
+    /* Collect garbage at back */
+    count = (storePtr->firstUsed + storePtr->numUsed)
+	  - (spanPtr->spanStart + spanPtr->spanLength);
+    LIST_COUNT_ASSERT(count);
+    if (count > 0) {
+	ObjArrayDecrRefs(
+	    storePtr->slots, spanPtr->spanStart + spanPtr->spanLength, count);
+	LIST_ASSERT(storePtr->numUsed >= count);
+	storePtr->numUsed -= count;
+    }
+
+    LIST_ASSERT(ListRepStart(repPtr) == storePtr->firstUsed);
+    LIST_ASSERT(ListRepLength(repPtr) == storePtr->numUsed);
+    LISTREP_CHECK(repPtr);
+}
+
 /*
  *----------------------------------------------------------------------
  *
  * Tcl_NewListObj --
  *
- *	Creates a new list object and adds values to it. When TCL_MEM_DEBUG is
- *	defined, 'Tcl_DbNewListObj' is called instead.
- *
- * Value
+ *	This function is normally called when not debugging: i.e., when
+ *	TCL_MEM_DEBUG is not defined. It creates a new list object from an
+ *	(objc,objv) array: that is, each of the objc elements of the array
+ *	referenced by objv is inserted as an element into a new Tcl object.
  *
- *	A new list 'Tcl_Obj' to which is appended values from 'objv', or if
- *	'objc' is less than or equal to zero, a list 'Tcl_Obj' having no
- *	elements.  The string representation of the new 'Tcl_Obj' is set to
- *	NULL.  The refCount of the list is 0.
+ *	When TCL_MEM_DEBUG is defined, this function just returns the result
+ *	of calling the debugging version Tcl_DbNewListObj.
  *
- * Effect
+ * Results:
+ *	A new list object is returned that is initialized from the object
+ *	pointers in objv. If objc is less than or equal to zero, an empty
+ *	object is returned. The new object's string representation is left
+ *	NULL. The resulting new list object has ref count 0.
  *
- *	The refCount of each elements in 'objv' is incremented as it is added
- *	to the list.
+ * Side effects:
+ *	The ref counts of the elements in objv are incremented since the
+ *	resulting list now refers to them.
  *
  *----------------------------------------------------------------------
  */
@@ -195,7 +1090,7 @@ AttemptNewList(
 
 Tcl_Obj *
 Tcl_NewListObj(
-    size_t objc,			/* Count of objects referenced by objv. */
+    ListSizeT objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
     return Tcl_DbNewListObj(objc, objv, "unknown", 0);
@@ -205,45 +1100,50 @@ Tcl_NewListObj(
 
 Tcl_Obj *
 Tcl_NewListObj(
-    size_t objc,			/* Count of objects referenced by objv. */
+    size_t objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
-    List *listRepPtr;
-    Tcl_Obj *listPtr;
+    ListRep listRep;
+    Tcl_Obj *listObj;
 
-    TclNewObj(listPtr);
+    TclNewObj(listObj);
 
     if (objc + 1 <= 1) {
-	return listPtr;
+	return listObj;
     }
 
-    /*
-     * Create the internal rep.
-     */
-
-    listRepPtr = NewListInternalRep(objc, objv, 1);
+    ListRepInit(objc, objv, LISTREP_PANIC_ON_FAIL, &listRep);
+    ListObjReplaceRepAndInvalidate(listObj, &listRep);
 
-    /*
-     * Now create the object.
-     */
-
-    TclInvalidateStringRep(listPtr);
-    ListSetInternalRep(listPtr, listRepPtr);
-    return listPtr;
+    return listObj;
 }
 #endif /* if TCL_MEM_DEBUG */
-
+
 /*
  *----------------------------------------------------------------------
  *
- *  Tcl_DbNewListObj --
+ * Tcl_DbNewListObj --
+ *
+ *	This function is normally called when debugging: i.e., when
+ *	TCL_MEM_DEBUG is defined. It creates new list objects. It is the same
+ *	as the Tcl_NewListObj function above except that it calls
+ *	Tcl_DbCkalloc directly with the file name and line number from its
+ *	caller. This simplifies debugging since then the [memory active]
+ *	command will report the correct file name and line number when
+ *	reporting objects that haven't been freed.
+ *
+ *	When TCL_MEM_DEBUG is not defined, this function just returns the
+ *	result of calling Tcl_NewListObj.
  *
- *	Like 'Tcl_NewListObj', but it calls Tcl_DbCkalloc directly with the
- *	file name and line number from its caller.  This simplifies debugging
- *	since the [memory active] command will report the correct file
- *	name and line number when reporting objects that haven't been freed.
+ * Results:
+ *	A new list object is returned that is initialized from the object
+ *	pointers in objv. If objc is less than or equal to zero, an empty
+ *	object is returned. The new object's string representation is left
+ *	NULL. The new list object has ref count 0.
  *
- *	When TCL_MEM_DEBUG is not defined, 'Tcl_NewListObj' is called instead.
+ * Side effects:
+ *	The ref counts of the elements in objv are incremented since the
+ *	resulting list now refers to them.
  *
  *----------------------------------------------------------------------
  */
@@ -252,91 +1152,188 @@ Tcl_NewListObj(
 
 Tcl_Obj *
 Tcl_DbNewListObj(
-    size_t objc,			/* Count of objects referenced by objv. */
+    ListSizeT objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[],	/* An array of pointers to Tcl objects. */
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
     int line)			/* Line number in the source file; used for
 				 * debugging. */
 {
-    Tcl_Obj *listPtr;
-    List *listRepPtr;
+    Tcl_Obj *listObj;
+    ListRep listRep;
+
+    TclDbNewObj(listObj, file, line);
+
+    if (objc <= 0) {
+	return listObj;
+    }
+
+    ListRepInit(objc, objv, LISTREP_PANIC_ON_FAIL, &listRep);
+    ListObjReplaceRepAndInvalidate(listObj, &listRep);
+
+    return listObj;
+}
+
+#else /* if not TCL_MEM_DEBUG */
+
+Tcl_Obj *
+Tcl_DbNewListObj(
+    size_t objc,		/* Count of objects referenced by objv. */
+    Tcl_Obj *const objv[],	/* An array of pointers to Tcl objects. */
+    TCL_UNUSED(const char *) /*file*/,
+    TCL_UNUSED(int) /*line*/)
+{
+    return Tcl_NewListObj(objc, objv);
+}
+#endif /* TCL_MEM_DEBUG */
 
-    TclDbNewObj(listPtr, file, line);
+/*
+ *------------------------------------------------------------------------
+ *
+ * TclNewListObj2 --
+ *
+ *    Create a new Tcl_Obj list comprising of the concatenation of two
+ *    Tcl_Obj* arrays.
+ *    TODO - currently this function is not used within tclListObj but
+ *    need to see if it would be useful in other files that preallocate
+ *    lists and then append.
+ *
+ * Results:
+ *    Non-NULL pointer to the allocate Tcl_Obj.
+ *
+ * Side effects:
+ *    None.
+ *
+ *------------------------------------------------------------------------
+ */
+Tcl_Obj *
+TclNewListObj2(
+    ListSizeT objc1,		/* Count of objects referenced by objv1. */
+    Tcl_Obj *const objv1[],	/* First array of pointers to Tcl objects. */
+    ListSizeT objc2,		/* Count of objects referenced by objv2. */
+    Tcl_Obj *const objv2[]	/* Second array of pointers to Tcl objects. */
+)
+{
+    Tcl_Obj *listObj;
+    ListStore *storePtr;
+    ListSizeT objc = objc1 + objc2;
 
-    if (objc + 1 <= 1) {
-	return listPtr;
+    listObj = Tcl_NewListObj(objc, NULL);
+    if (objc == 0) {
+	return listObj; /* An empty object */
     }
+    LIST_ASSERT_TYPE(listObj);
 
-    /*
-     * Create the internal rep.
-     */
-
-    listRepPtr = NewListInternalRep(objc, objv, 1);
+    storePtr = ListObjStorePtr(listObj);
 
-    /*
-     * Now create the object.
-     */
+    LIST_ASSERT(ListObjSpanPtr(listObj) == NULL);
+    LIST_ASSERT(storePtr->firstUsed == 0);
+    LIST_ASSERT(storePtr->numUsed == 0);
+    LIST_ASSERT(storePtr->numAllocated >= objc);
 
-    TclInvalidateStringRep(listPtr);
-    ListSetInternalRep(listPtr, listRepPtr);
-
-    return listPtr;
+    if (objc1) {
+	ObjArrayCopy(storePtr->slots, objc1, objv1);
+    }
+    if (objc2) {
+	ObjArrayCopy(&storePtr->slots[objc1], objc2, objv2);
+    }
+    storePtr->numUsed = objc;
+    return listObj;
 }
 
-#else /* if not TCL_MEM_DEBUG */
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclListObjGetRep --
+ *
+ *	This function returns a copy of the ListRep stored
+ *	as the internal representation of an object. The reference
+ *	counts of the (ListStore, ListSpan) contained in the representation
+ *	are NOT incremented.
+ *
+ * Results:
+ *	The return value is normally TCL_OK; in this case *listRepP
+ *	is set to a copy of the descriptor stored as the internal
+ *	representation of the Tcl_Obj containing a list. if listPtr does not
+ *	refer to a list object and the object can not be converted to one,
+ *	TCL_ERROR is returned and an error message will be left in the
+ *	interpreter's result if interp is not NULL.
+ *
+ * Side effects:
+ *	The possible conversion of the object referenced by listPtr
+ *	to a list object. *repPtr is initialized to the internal rep
+ *      if result is TCL_OK, or set to NULL on error.
+ *----------------------------------------------------------------------
+ */
 
-Tcl_Obj *
-Tcl_DbNewListObj(
-    size_t objc,			/* Count of objects referenced by objv. */
-    Tcl_Obj *const objv[],	/* An array of pointers to Tcl objects. */
-    TCL_UNUSED(const char *) /*file*/,
-    TCL_UNUSED(int) /*line*/)
+static int
+TclListObjGetRep(
+    Tcl_Interp *interp, /* Used to report errors if not NULL. */
+    Tcl_Obj *listObj,   /* List object for which an element array is
+			 * to be returned. */
+    ListRep *repPtr) /* Location to store descriptor */
 {
-    return Tcl_NewListObj(objc, objv);
+    if (!TclHasInternalRep(listObj, &tclListType)) {
+	int result;
+	result = SetListFromAny(interp, listObj);
+	if (result != TCL_OK) {
+	    /* Init to keep gcc happy wrt uninitialized fields at call site */
+	    repPtr->storePtr = NULL;
+	    repPtr->spanPtr = NULL;
+	    return result;
+	}
+    }
+    ListObjGetRep(listObj, repPtr);
+    LISTREP_CHECK(repPtr);
+    return TCL_OK;
 }
-#endif /* TCL_MEM_DEBUG */
-
+
 /*
  *----------------------------------------------------------------------
  *
  * Tcl_SetListObj --
  *
- *	Like 'Tcl_NewListObj', but operates on an existing 'Tcl_Obj'instead of
- *	creating a new one.
+ *	Modify an object to be a list containing each of the objc elements of
+ *	the object array referenced by objv.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	The object is made a list object and is initialized from the object
+ *	pointers in objv. If objc is less than or equal to zero, an empty
+ *	object is returned. The new object's string representation is left
+ *	NULL. The ref counts of the elements in objv are incremented since the
+ *	list now refers to them. The object's old string and internal
+ *	representations are freed and its type is set NULL.
  *
  *----------------------------------------------------------------------
  */
-
 void
 Tcl_SetListObj(
     Tcl_Obj *objPtr,		/* Object whose internal rep to init. */
-    size_t objc,			/* Count of objects referenced by objv. */
+    size_t objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
-    List *listRepPtr;
-
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_SetListObj");
     }
 
     /*
-     * Free any old string rep and any internal rep for the old type.
-     */
-
-    TclFreeInternalRep(objPtr);
-    TclInvalidateStringRep(objPtr);
-
-    /*
      * Set the object's type to "list" and initialize the internal rep.
      * However, if there are no elements to put in the list, just give the
-     * object an empty string rep and a NULL type.
+     * object an empty string rep and a NULL type. NOTE ListRepInit must
+     * not be called with objc == 0!
      */
 
-    if (objc > 0) {
-	listRepPtr = NewListInternalRep(objc, objv, 1);
-	ListSetInternalRep(objPtr, listRepPtr);
+    if (objc + 1 > 1) {
+	ListRep listRep;
+	/* TODO - perhaps ask for extra space? */
+	ListRepInit(objc, objv, LISTREP_PANIC_ON_FAIL, &listRep);
+	ListObjReplaceRepAndInvalidate(objPtr, &listRep);
     } else {
+	TclFreeInternalRep(objPtr);
+	TclInvalidateStringRep(objPtr);
 	Tcl_InitStringRep(objPtr, NULL, 0);
     }
 }
@@ -346,20 +1343,18 @@ Tcl_SetListObj(
  *
  * TclListObjCopy --
  *
- *	Creates a new 'Tcl_Obj' which is a pure copy of a list value. This
- *	provides for the C level a counterpart of the [lrange $list 0 end]
- *	command, while using internals details to be as efficient as possible.
+ *	Makes a "pure list" copy of a list value. This provides for the C
+ *	level a counterpart of the [lrange $list 0 end] command, while using
+ *	internals details to be as efficient as possible.
  *
- * Value
- *
- *	The address of the new 'Tcl_Obj' which shares its internal
- *	representation with 'listPtr', and whose refCount is 0.  If 'listPtr'
- *	is not actually a list, the value is NULL, and an error message is left
- *	in 'interp' if it is not NULL.
- *
- * Effect
+ * Results:
+ *	Normally returns a pointer to a new Tcl_Obj, that contains the same
+ *	list value as *listPtr does. The returned Tcl_Obj has a refCount of
+ *	zero. If *listPtr does not hold a list, NULL is returned, and if
+ *	interp is non-NULL, an error message is recorded there.
  *
- *	'listPtr' is converted to a list if it isn't one already.
+ * Side effects:
+ *	None.
  *
  *----------------------------------------------------------------------
  */
@@ -367,137 +1362,254 @@ Tcl_SetListObj(
 Tcl_Obj *
 TclListObjCopy(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *listPtr)		/* List object for which an element array is
+    Tcl_Obj *listObj)		/* List object for which an element array is
 				 * to be returned. */
 {
-    Tcl_Obj *copyPtr;
-    List *listRepPtr;
+    Tcl_Obj *copyObj;
 
-    ListGetInternalRep(listPtr, listRepPtr);
-    if (NULL == listRepPtr) {
-	if (SetListFromAny(interp, listPtr) != TCL_OK) {
+    if (!TclHasInternalRep(listObj, &tclListType)) {
+	if (SetListFromAny(interp, listObj) != TCL_OK) {
 	    return NULL;
 	}
     }
 
-    TclNewObj(copyPtr);
-    TclInvalidateStringRep(copyPtr);
-    DupListInternalRep(listPtr, copyPtr);
-    return copyPtr;
+    TclNewObj(copyObj);
+    TclInvalidateStringRep(copyObj);
+    DupListInternalRep(listObj, copyObj);
+    return copyObj;
 }
 
 /*
- *----------------------------------------------------------------------
+ *------------------------------------------------------------------------
  *
- * TclListObjRange --
+ * ListRepRange --
  *
- *	Makes a slice of a list value.
- *      *listPtr must be known to be a valid list.
+ *	Initializes a ListRep as a range within the passed ListRep.
+ *	The range limits are clamped to the list boundaries.
  *
  * Results:
- *	Returns a pointer to the sliced list.
- *      This may be a new object or the same object if not shared.
+ *	None.
  *
  * Side effects:
- *	The possible conversion of the object referenced by listPtr
- *	to a list object.
- *
- *----------------------------------------------------------------------
+ *	The ListStore and ListSpan referenced by in the returned ListRep
+ *	may or may not be the same as those passed in. For example, the
+ *	ListStore may differ because the range is small enough that a new
+ *	ListStore is more memory-optimal. The ListSpan may differ because
+ *	it is NULL or shared. Regardless, reference counts on the returned
+ *	values are not incremented. Generally, ListObjReplaceRepAndInvalidate may be
+ *	used to store the new ListRep back into an object or a ListRepIncRefs
+ *      followed by ListRepDecrRefs to free in case of errors.
+ *      TODO WARNING:- this is not a very clean interface and easy for caller
+ *      to get wrong. Better change it to pass in the source ListObj
+ *
+ *------------------------------------------------------------------------
  */
-
-Tcl_Obj *
-TclListObjRange(
-    Tcl_Obj *listPtr,		/* List object to take a range from. */
-    size_t fromIdx,		/* Index of first element to include. */
-    size_t toIdx)			/* Index of last element to include. */
+static void
+ListRepRange(
+    ListRep *srcRepPtr,    /* Contains source of the range */
+    ListSizeT rangeStart,  /* Index of first element to include */
+    ListSizeT rangeEnd,    /* Index of last element to include */
+    int preserveSrcRep,    /* If true, srcRepPtr contents must not be
+			      modified (generally because a shared Tcl_Obj
+			      references it) */
+    ListRep *rangeRepPtr)  /* Output. Must NOT be == srcRepPtr */
 {
-    Tcl_Obj **elemPtrs;
-    size_t listLen, i, newLen;
-    List *listRepPtr;
+    Tcl_Obj **srcElems;
+    ListSizeT numSrcElems = ListRepLength(srcRepPtr);
+    ListSizeT rangeLen;
+    int doSpan;
 
-    TclListObjGetElementsM(NULL, listPtr, &listLen, &elemPtrs);
+    LISTREP_CHECK(srcRepPtr);
 
-    if (fromIdx == TCL_INDEX_NONE) {
-	fromIdx = 0;
+    /* Take the opportunity to garbage collect */
+    /* TODO - we probably do not need the preserveSrcRep here unlike later */
+    if (!preserveSrcRep) {
+	ListRepFreeUnreferenced(srcRepPtr);
     }
-    if (toIdx + 1 >= listLen + 1) {
-	toIdx = listLen-1;
+
+    if (rangeStart < 0) {
+	rangeStart = 0;
     }
-    if (fromIdx + 1 > toIdx + 1) {
-	Tcl_Obj *obj;
-	TclNewObj(obj);
-	return obj;
+    if (rangeEnd >= numSrcElems) {
+	rangeEnd = numSrcElems - 1;
     }
-
-    newLen = toIdx - fromIdx + 1;
-
-    if (Tcl_IsShared(listPtr) ||
-	    ((ListRepPtr(listPtr)->refCount > 1))) {
-	return Tcl_NewListObj(newLen, &elemPtrs[fromIdx]);
+    if (rangeStart > rangeEnd) {
+	/* Empty list of capacity 1. */
+	ListRepInit(1, NULL, LISTREP_PANIC_ON_FAIL, rangeRepPtr);
+	return;
     }
 
-    /*
-     * In-place is possible.
-     */
+    rangeLen = rangeEnd - rangeStart + 1;
 
     /*
-     * Even if nothing below cause any changes, we still want the
-     * string-canonizing effect of [lrange 0 end].
+     * We can create a range one of three ways:
+     *  (1) Use a ListSpan referencing the current ListStore
+     *  (2) Creating a new ListStore
+     *  (3) Removing all elements outside the range in the current ListStore
+     * Option (3) may only be done if caller has not disallowed it AND
+     * the ListStore is not shared.
+     *
+     * The choice depends on heuristics related to speed and memory.
+     * TODO - heuristics below need to be measured and tuned.
+     *
+     * Note: Even if nothing below cause any changes, we still want the
+     * string-canonizing effect of [lrange 0 end] so the Tcl_Obj should not
+     * be returned as is even if the range encompasses the whole list.
      */
+    doSpan = ListSpanMerited(rangeLen,
+			    srcRepPtr->storePtr->numUsed,
+			    srcRepPtr->storePtr->numAllocated);
+
+    if (doSpan) {
+	/* Option 1 - because span would be most efficient */
+	ListSizeT spanStart = ListRepStart(srcRepPtr) + rangeStart;
+	if (!preserveSrcRep && srcRepPtr->spanPtr
+	    && srcRepPtr->spanPtr->refCount <= 1) {
+	    /* If span is not shared reuse it */
+	    srcRepPtr->spanPtr->spanStart = spanStart;
+	    srcRepPtr->spanPtr->spanLength = rangeLen;
+	    *rangeRepPtr = *srcRepPtr;
+	} else {
+	    /* Span not present or is shared - Allocate a new span */
+	    rangeRepPtr->storePtr = srcRepPtr->storePtr;
+	    rangeRepPtr->spanPtr = ListSpanNew(spanStart, rangeLen);
+	}
+        /*
+         * We have potentially created a new internal representation that
+         * references the same storage as srcRep but not yet incremented its
+         * reference count. So do NOT call freezombies if preserveSrcRep
+         * is mandated.
+         */
+	if (!preserveSrcRep) {
+	    ListRepFreeUnreferenced(rangeRepPtr);
+	}
+    } else if (preserveSrcRep || ListRepIsShared(srcRepPtr)) {
+	/* Option 2 - span or modification in place not allowed/desired */
+	ListRepElements(srcRepPtr, numSrcElems, srcElems);
+	/* TODO - allocate extra space? */
+	ListRepInit(rangeLen,
+		    &srcElems[rangeStart],
+		    LISTREP_PANIC_ON_FAIL,
+		    rangeRepPtr);
+    } else {
+	/*
+	 * Option 3 - modify in place. Note that because of the invariant
+	 * that spanless list stores must start at 0, we have to move
+	 * everything to the front.
+	 * TODO - perhaps if a span already exists, no need to move to front?
+	 * or maybe no need to move all the way to the front?
+	 * TODO - if range is small relative to allocation, allocate new?
+	 */
+	ListSizeT numAfterRangeEnd;
 
-    TclInvalidateStringRep(listPtr);
-
-    /*
-     * Delete elements that should not be included.
-     */
+	/* Asserts follow from call to ListRepFreeUnreferenced earlier */
+	LIST_ASSERT(!preserveSrcRep);
+	LIST_ASSERT(!ListRepIsShared(srcRepPtr));
+	LIST_ASSERT(ListRepStart(srcRepPtr) == srcRepPtr->storePtr->firstUsed);
+	LIST_ASSERT(ListRepLength(srcRepPtr) == srcRepPtr->storePtr->numUsed);
 
-    for (i = 0; i < fromIdx; i++) {
-	TclDecrRefCount(elemPtrs[i]);
-    }
-    for (i = toIdx + 1; i < (size_t)listLen; i++) {
-	TclDecrRefCount(elemPtrs[i]);
-    }
+	ListRepElements(srcRepPtr, numSrcElems, srcElems);
 
-    if (fromIdx > 0) {
-	memmove(elemPtrs, &elemPtrs[fromIdx],
-		(size_t) newLen * sizeof(Tcl_Obj*));
+	/* Free leading elements outside range */
+	if (rangeStart != 0) {
+	    ObjArrayDecrRefs(srcElems, 0, rangeStart);
+	}
+	/* Ditto for trailing */
+	numAfterRangeEnd = numSrcElems - (rangeEnd + 1);
+	LIST_ASSERT(numAfterRangeEnd
+		    >= 0); /* Because numSrcElems > rangeEnd earlier */
+	if (numAfterRangeEnd != 0) {
+	    ObjArrayDecrRefs(srcElems, rangeEnd + 1, numAfterRangeEnd);
+	}
+	memmove(&srcRepPtr->storePtr->slots[0],
+		&srcRepPtr->storePtr
+		     ->slots[srcRepPtr->storePtr->firstUsed + rangeStart],
+		rangeLen * sizeof(Tcl_Obj *));
+	srcRepPtr->storePtr->firstUsed = 0;
+	srcRepPtr->storePtr->numUsed = rangeLen;
+	srcRepPtr->storePtr->flags = 0;
+	rangeRepPtr->storePtr = srcRepPtr->storePtr; /* Note no incr ref */
+	rangeRepPtr->spanPtr = NULL;
     }
 
-    listRepPtr = ListRepPtr(listPtr);
-    listRepPtr->elemCount = newLen;
+    /* TODO - call freezombies here if !preserveSrcRep? */
 
-    return listPtr;
+    /* Note ref counts intentionally not incremented */
+    LISTREP_CHECK(rangeRepPtr);
+    return;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_ListObjGetElements --
- *
- *	Retreive the elements in a list 'Tcl_Obj'.
+ * TclListObjRange --
  *
- * Value
+ *	Makes a slice of a list value.
+ *      *listObj must be known to be a valid list.
  *
- *	TCL_OK
+ * Results:
+ *	Returns a pointer to the sliced list.
+ *      This may be a new object or the same object if not shared.
+ *	Returns NULL if passed listObj was not a list and could not be
+ *	converted to one.
  *
- *	    A count of list elements is stored, 'objcPtr', And a pointer to the
- *	    array of elements in the list is stored in 'objvPtr'.
+ * Side effects:
+ *	The possible conversion of the object referenced by listPtr
+ *	to a list object.
  *
- *	    The elements accessible via 'objvPtr' should be treated as readonly
- *	    and the refCount for each object is _not_ incremented; the caller
- *	    must do that if it holds on to a reference. Furthermore, the
- *	    pointer and length returned by this function may change as soon as
- *	    any function is called on the list object. Be careful about
- *	    retaining the pointer in a local data structure.
+ *----------------------------------------------------------------------
+ */
+
+Tcl_Obj *
+TclListObjRange(
+    Tcl_Obj *listObj,		/* List object to take a range from. */
+    size_t rangeStart,	/* Index of first element to include. */
+    size_t rangeEnd)		/* Index of last element to include. */
+{
+    ListRep listRep;
+    ListRep resultRep;
+
+    int isShared;
+    if (TclListObjGetRep(NULL, listObj, &listRep) != TCL_OK)
+	return NULL;
+
+    isShared = Tcl_IsShared(listObj);
+
+    ListRepRange(&listRep, rangeStart, rangeEnd, isShared, &resultRep);
+
+    if (isShared) {
+	TclNewObj(listObj);
+    }
+    ListObjReplaceRepAndInvalidate(listObj, &resultRep);
+    return listObj;
+}
+
+/*
+ *----------------------------------------------------------------------
  *
- *	TCL_ERROR
+ * Tcl_ListObjGetElements --
  *
- *	    'listPtr' is not a valid list. An error message is left in the
- *	    interpreter's result if 'interp' is not NULL.
+ *	This function returns an (objc,objv) array of the elements in a list
+ *	object.
  *
- * Effect
+ * Results:
+ *	The return value is normally TCL_OK; in this case *objcPtr is set to
+ *	the count of list elements and *objvPtr is set to a pointer to an
+ *	array of (*objcPtr) pointers to each list element. If listPtr does not
+ *	refer to a list object and the object can not be converted to one,
+ *	TCL_ERROR is returned and an error message will be left in the
+ *	interpreter's result if interp is not NULL.
+ *
+ *	The objects referenced by the returned array should be treated as
+ *	readonly and their ref counts are _not_ incremented; the caller must
+ *	do that if it holds on to a reference. Furthermore, the pointer and
+ *	length returned by this function may change as soon as any function is
+ *	called on the list object; be careful about retaining the pointer in a
+ *	local data structure.
  *
- *	'listPtr' is converted to a list object if it isn't one already.
+ * Side effects:
+ *	The possible conversion of the object referenced by listPtr
+ *	to a list object.
  *
  *----------------------------------------------------------------------
  */
@@ -506,35 +1618,18 @@ TclListObjRange(
 int
 Tcl_ListObjGetElements(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *listPtr,	/* List object for which an element array is
+    Tcl_Obj *objPtr,		/* List object for which an element array is
 				 * to be returned. */
     size_t *objcPtr,		/* Where to store the count of objects
 				 * referenced by objv. */
     Tcl_Obj ***objvPtr)		/* Where to store the pointer to an array of
 				 * pointers to the list's objects. */
 {
-    List *listRepPtr;
-
-    ListGetInternalRep(listPtr, listRepPtr);
-
-    if (listRepPtr == NULL) {
-	int result;
-	size_t length;
+    ListRep listRep;
 
-	(void) Tcl_GetStringFromObj(listPtr, &length);
-	if (length == 0) {
-	    *objcPtr = 0;
-	    *objvPtr = NULL;
-	    return TCL_OK;
-	}
-	result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	ListGetInternalRep(listPtr, listRepPtr);
-    }
-    *objcPtr = listRepPtr->elemCount;
-    *objvPtr = listRepPtr->elements;
+    if (TclListObjGetRep(interp, objPtr, &listRep) != TCL_OK)
+	return TCL_ERROR;
+    ListRepElements(&listRep, *objcPtr, *objvPtr);
     return TCL_OK;
 }
 
@@ -543,27 +1638,20 @@ Tcl_ListObjGetElements(
  *
  * Tcl_ListObjAppendList --
  *
- *	Appends the elements of elemListPtr to those of listPtr.
+ *	This function appends the elements in the list fromObj
+ *	to toObj. toObj must not be shared else the function will panic.
  *
- * Value
- *
- *	TCL_OK
- *
- *	    Success.
- *
- *	TCL_ERROR
- *
- *	    'listPtr' or 'elemListPtr' are not valid lists.  An error
- *	    message is left in the interpreter's result if 'interp' is not NULL.
- *
- * Effect
+ * Results:
+ *	The return value is normally TCL_OK. If fromObj or toObj do not
+ *	refer to list values, TCL_ERROR is returned and an error message is
+ *	left in the interpreter's result if interp is not NULL.
  *
- *	The reference count of each element of 'elemListPtr' as it is added to
- *	'listPtr'. 'listPtr' and 'elemListPtr' are converted to 'tclListType'
- *	if they are not already. Appending the new elements may cause the
- *	array of element pointers in 'listObj' to grow.  If any objects are
- *	appended to 'listPtr'. Any preexisting string representation of
- *	'listPtr' is invalidated.
+ * Side effects:
+ *	The reference counts of the elements in fromObj are incremented
+ *	since the list now refers to them. toObj and fromObj are
+ *	converted, if necessary, to list objects. Also, appending the new
+ *	elements may cause toObj's array of element pointers to grow.
+ *	toObj's old string representation, if any, is invalidated.
  *
  *----------------------------------------------------------------------
  */
@@ -571,21 +1659,17 @@ Tcl_ListObjGetElements(
 int
 Tcl_ListObjAppendList(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *listPtr,	/* List object to append elements to. */
-    Tcl_Obj *elemListPtr)	/* List obj with elements to append. */
+    Tcl_Obj *toObj,		/* List object to append elements to. */
+    Tcl_Obj *fromObj)		/* List obj with elements to append. */
 {
     size_t objc;
     Tcl_Obj **objv;
 
-    if (Tcl_IsShared(listPtr)) {
+    if (Tcl_IsShared(toObj)) {
 	Tcl_Panic("%s called with shared object", "Tcl_ListObjAppendList");
     }
 
-    /*
-     * Pull the elements to append from elemListPtr.
-     */
-
-    if (TCL_OK != TclListObjGetElementsM(interp, elemListPtr, &objc, &objv)) {
+    if (TclListObjGetElementsM(interp, fromObj, &objc, &objv) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -594,249 +1678,241 @@ Tcl_ListObjAppendList(
      * Delete zero existing elements.
      */
 
-    return Tcl_ListObjReplace(interp, listPtr, LIST_MAX, 0, objc, objv);
+    return TclListObjAppendElements(interp, toObj, objc, objv);
 }
-
+
 /*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjAppendElement --
- *
- *	Like 'Tcl_ListObjAppendList', but Appends a single value to a list.
+ *------------------------------------------------------------------------
  *
- * Value
+ * TclListObjAppendElements --
  *
- *	TCL_OK
+ *      Appends multiple elements to a Tcl_Obj list object. If
+ *      the passed Tcl_Obj is not a list object, it will be converted to one
+ *      and an error raised if the conversion fails.
  *
- *	    'objPtr' is appended to the elements of 'listPtr'.
+ * 	The Tcl_Obj must not be shared though the internal representation
+ * 	may be.
  *
- *	TCL_ERROR
- *
- *	    listPtr does not refer to a list object and the object can not be
- *	    converted to one. An error message will be left in the
- *	    interpreter's result if interp is not NULL.
- *
- * Effect
+ * Results:
+ *	On success, TCL_OK is returned with the specified elements appended.
+ *	On failure, TCL_ERROR is returned with an error message in the
+ *	interpreter if not NULL.
  *
- *	If 'listPtr' is not already of type 'tclListType', it is converted.
- *	The 'refCount' of 'objPtr' is incremented as it is added to 'listPtr'.
- *	Appending the new element may cause the the array of element pointers
- *	in 'listObj' to grow.  Any preexisting string representation of
- *	'listPtr' is invalidated.
+ * Side effects:
+ *    None.
  *
- *----------------------------------------------------------------------
+ *------------------------------------------------------------------------
  */
-
-int
-Tcl_ListObjAppendElement(
+ int TclListObjAppendElements (
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *listPtr,		/* List object to append objPtr to. */
-    Tcl_Obj *objPtr)		/* Object to append to listPtr's list. */
+    Tcl_Obj *toObj,		/* List object to append */
+    size_t elemCount,        /* Number of elements in elemObjs[] */
+    Tcl_Obj * const elemObjv[])	/* Objects to append to toObj's list. */
 {
-    List *listRepPtr, *newPtr = NULL;
-    size_t numElems, numRequired;
-    int needGrow, isShared, attempt;
+    ListRep listRep;
+    Tcl_Obj **toObjv;
+    size_t toLen;
+    size_t finalLen;
 
-    if (Tcl_IsShared(listPtr)) {
-	Tcl_Panic("%s called with shared object", "Tcl_ListObjAppendElement");
+    if (Tcl_IsShared(toObj)) {
+	Tcl_Panic("%s called with shared object", "TclListObjAppendElements");
     }
 
-    ListGetInternalRep(listPtr, listRepPtr);
-    if (listRepPtr == NULL) {
-	int result;
-	size_t length;
-
-	(void) Tcl_GetStringFromObj(listPtr, &length);
-	if (length == 0) {
-	    Tcl_SetListObj(listPtr, 1, &objPtr);
-	    return TCL_OK;
-	}
-	result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	ListGetInternalRep(listPtr, listRepPtr);
-    }
+    if (TclListObjGetRep(interp, toObj, &listRep) != TCL_OK)
+	return TCL_ERROR; /* Cannot be converted to a list */
 
-    numElems = listRepPtr->elemCount;
-    numRequired = numElems + 1 ;
-    needGrow = (numRequired > listRepPtr->maxElemCount);
-    isShared = (listRepPtr->refCount > 1);
+    if (elemCount == 0)
+	return TCL_OK; /* Nothing to do. Note AFTER check for list above */
 
-    if (numRequired > LIST_MAX) {
-	if (interp != NULL) {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "max length of a Tcl list (%d elements) exceeded",
-		    LIST_MAX));
-	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
-	}
-	return TCL_ERROR;
+    ListRepElements(&listRep, toLen, toObjv);
+    if (elemCount > LIST_MAX || toLen > (LIST_MAX - elemCount)) {
+	return ListLimitExceededError(interp);
     }
 
-    if (needGrow && !isShared) {
+    finalLen = toLen + elemCount;
+    if (!ListRepIsShared(&listRep)) {
 	/*
-	 * Need to grow + unshared internalrep => try to realloc
+	 * Reuse storage if possible. Even if too small, realloc-ing instead
+	 * of creating a new ListStore will save us on manipulating Tcl_Obj
+	 * reference counts on the elements which is a substantial cost
+	 * if the list is not small.
 	 */
+	size_t numTailFree;
 
-	attempt = 2 * numRequired;
-	if (attempt <= LIST_MAX) {
-	    newPtr = (List *)Tcl_AttemptRealloc(listRepPtr, LIST_SIZE(attempt));
-	}
-	if (newPtr == NULL) {
-	    attempt = numRequired + 1 + TCL_MIN_ELEMENT_GROWTH;
-	    if (attempt > LIST_MAX) {
-		attempt = LIST_MAX;
-	    }
-	    newPtr = (List *)Tcl_AttemptRealloc(listRepPtr, LIST_SIZE(attempt));
-	}
-	if (newPtr == NULL) {
-	    attempt = numRequired;
-	    newPtr = (List *)Tcl_AttemptRealloc(listRepPtr, LIST_SIZE(attempt));
-	}
-	if (newPtr) {
-	    listRepPtr = newPtr;
-	    listRepPtr->maxElemCount = attempt;
-	    needGrow = 0;
-	}
-    }
-    if (isShared || needGrow) {
-	Tcl_Obj **dst, **src = listRepPtr->elements;
+	ListRepFreeUnreferenced(&listRep); /* Collect garbage before checking room */
 
-	/*
-	 * Either we have a shared internalrep and we must copy to write, or we
-	 * need to grow and realloc attempts failed.  Attempt internalrep copy.
-	 */
+	LIST_ASSERT(ListRepStart(&listRep) == listRep.storePtr->firstUsed);
+	LIST_ASSERT(ListRepLength(&listRep) == listRep.storePtr->numUsed);
+	LIST_ASSERT(toLen == listRep.storePtr->numUsed);
 
-	attempt = 2 * numRequired;
-	newPtr = AttemptNewList(NULL, attempt, NULL);
-	if (newPtr == NULL) {
-	    attempt = numRequired + 1 + TCL_MIN_ELEMENT_GROWTH;
-	    if (attempt > LIST_MAX) {
-		attempt = LIST_MAX;
+	if (finalLen > (size_t)listRep.storePtr->numAllocated) {
+	    ListStore *newStorePtr;
+	    newStorePtr = ListStoreReallocate(listRep.storePtr, finalLen);
+	    if (newStorePtr == NULL) {
+		return MemoryAllocationError(interp, LIST_SIZE(finalLen));
 	    }
-	    newPtr = AttemptNewList(NULL, attempt, NULL);
-	}
-	if (newPtr == NULL) {
-	    attempt = numRequired;
-	    newPtr = AttemptNewList(interp, attempt, NULL);
-	}
-	if (newPtr == NULL) {
+	    LIST_ASSERT(newStorePtr->numAllocated >= finalLen);
+	    listRep.storePtr = newStorePtr;
 	    /*
-	     * All growth attempts failed; throw the error.
+	     * WARNING: at this point the Tcl_Obj internal rep potentially
+	     * points to freed storage if the reallocation returned a
+	     * different location. Overwrite it to bring it back in sync.
 	     */
-
-	    return TCL_ERROR;
+	    ListObjStompRep(toObj, &listRep);
 	}
-
-	dst = newPtr->elements;
-	newPtr->refCount++;
-	newPtr->canonicalFlag = listRepPtr->canonicalFlag;
-	newPtr->elemCount = listRepPtr->elemCount;
-
-	if (isShared) {
-	    /*
-	     * The original internalrep must remain undisturbed.  Copy into the new
-	     * one and bump refcounts
-	     */
-	    while (numElems--) {
-		*dst = *src++;
-		Tcl_IncrRefCount(*dst++);
-	    }
-	    listRepPtr->refCount--;
-	} else {
-	    /*
-	     * Old internalrep to be freed, re-use refCounts.
-	     */
-
-	    memcpy(dst, src, numElems * sizeof(Tcl_Obj *));
-	    Tcl_Free(listRepPtr);
+	LIST_ASSERT(listRep.storePtr->numAllocated >= finalLen);
+	/* Current store big enough */
+	numTailFree = ListRepNumFreeTail(&listRep);
+	LIST_ASSERT((numTailFree + listRep.storePtr->firstUsed)
+		    >= elemCount); /* Total free */
+	if (numTailFree < elemCount) {
+	    /* Not enough room at back. Move some to front */
+	    ListSizeT shiftCount = elemCount - numTailFree;
+	    /* Divide remaining space between front and back */
+	    shiftCount += (listRep.storePtr->numAllocated - finalLen) / 2;
+	    LIST_ASSERT(shiftCount <= listRep.storePtr->firstUsed);
+	    if (shiftCount)
+		ListRepUnsharedShiftDown(&listRep, shiftCount);
 	}
-	listRepPtr = newPtr;
-    }
-    ListResetInternalRep(listPtr, listRepPtr);
-    listRepPtr->refCount++;
-    TclFreeInternalRep(listPtr);
-    ListSetInternalRep(listPtr, listRepPtr);
-    listRepPtr->refCount--;
-
-    /*
-     * Add objPtr to the end of listPtr's array of element pointers. Increment
-     * the ref count for the (now shared) objPtr.
-     */
+	ObjArrayCopy(&listRep.storePtr->slots[ListRepStart(&listRep)
+					      + ListRepLength(&listRep)],
+		     elemCount,
+		     elemObjv);
+	listRep.storePtr->numUsed = finalLen;
+	if (listRep.spanPtr) {
+	    LIST_ASSERT(listRep.spanPtr->spanStart
+			== listRep.storePtr->firstUsed);
+	    listRep.spanPtr->spanLength = finalLen;
+	}
+	LIST_ASSERT(ListRepStart(&listRep) == listRep.storePtr->firstUsed);
+	LIST_ASSERT(ListRepLength(&listRep) == finalLen);
+	LISTREP_CHECK(&listRep);
 
-    listRepPtr->elements[listRepPtr->elemCount] = objPtr;
-    Tcl_IncrRefCount(objPtr);
-    listRepPtr->elemCount++;
+	ListObjReplaceRepAndInvalidate(toObj, &listRep);
+	return TCL_OK;
+    }
 
     /*
-     * Invalidate any old string representation since the list's internal
-     * representation has changed.
+     * Have to make a new list rep, either shared or no room in old one.
+     * If the old list did not have a span (all elements at front), do
+     * not leave space in the front either, assuming all appends and no
+     * prepends.
      */
+    if (ListRepInit(finalLen,
+		    NULL,
+		    listRep.spanPtr ? LISTREP_SPACE_FAVOR_BACK
+				    : LISTREP_SPACE_ONLY_BACK,
+		    &listRep)
+	!= TCL_OK) {
+	return TCL_ERROR;
+    }
+    LIST_ASSERT(listRep.storePtr->numAllocated >= finalLen);
 
-    TclInvalidateStringRep(listPtr);
+    if (toLen) {
+	ObjArrayCopy(ListRepSlotPtr(&listRep, 0), toLen, toObjv);
+    }
+    ObjArrayCopy(ListRepSlotPtr(&listRep, toLen), elemCount, elemObjv);
+    listRep.storePtr->numUsed = finalLen;
+    if (listRep.spanPtr) {
+	LIST_ASSERT(listRep.spanPtr->spanStart == listRep.storePtr->firstUsed);
+	listRep.spanPtr->spanLength = finalLen;
+    }
+    LISTREP_CHECK(&listRep);
+    ListObjReplaceRepAndInvalidate(toObj, &listRep);
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_ListObjIndex --
+ * Tcl_ListObjAppendElement --
  *
- * 	Retrieve a pointer to the element of 'listPtr' at 'index'.  The index
- * 	of the first element is 0.
+ *	This function is a special purpose version of Tcl_ListObjAppendList:
+ *	it appends a single object referenced by elemObj to the list object
+ *	referenced by toObj. If toObj is not already a list object, an
+ *	attempt will be made to convert it to one.
  *
- * Value
+ * Results:
+ *	The return value is normally TCL_OK; in this case elemObj is added to
+ *	the end of toObj's list. If toObj does not refer to a list object
+ *	and the object can not be converted to one, TCL_ERROR is returned and
+ *	an error message will be left in the interpreter's result if interp is
+ *	not NULL.
  *
- * 	TCL_OK
+ * Side effects:
+ *	The ref count of elemObj is incremented since the list now refers to
+ *	it. toObj will be converted, if necessary, to a list object. Also,
+ *	appending the new element may cause listObj's array of element
+ *	pointers to grow. toObj's old string representation, if any, is
+ *	invalidated.
  *
- *	    A pointer to the element at 'index' is stored in 'objPtrPtr'.  If
- *	    'index' is out of range, NULL is stored in 'objPtrPtr'.  This
- *	    object should be treated as readonly and its 'refCount' is _not_
- *	    incremented. The caller must do that if it holds on to the
- *	    reference.
+ *----------------------------------------------------------------------
+ */
+
+int
+Tcl_ListObjAppendElement(
+    Tcl_Interp *interp,		/* Used to report errors if not NULL. */
+    Tcl_Obj *toObj,		/* List object to append elemObj to. */
+    Tcl_Obj *elemObj)		/* Object to append to toObj's list. */
+{
+    /*
+     * TODO - compare perf with 8.6 to see if worth optimizing single
+     * element case
+     */
+    return TclListObjAppendElements(interp, toObj, 1, &elemObj);
+}
+
+/*
+ *----------------------------------------------------------------------
  *
- * 	TCL_ERROR
+ * Tcl_ListObjIndex --
  *
- * 	    'listPtr' is not a valid list. An an error message is left in the
- * 	    interpreter's result if 'interp' is not NULL.
+ *	This function returns a pointer to the index'th object from the list
+ *	referenced by listPtr. The first element has index 0. If index is
+ *	negative or greater than or equal to the number of elements in the
+ *	list, a NULL is returned. If listPtr is not a list object, an attempt
+ *	will be made to convert it to a list.
  *
- *  Effect
+ * Results:
+ *	The return value is normally TCL_OK; in this case objPtrPtr is set to
+ *	the Tcl_Obj pointer for the index'th list element or NULL if index is
+ *	out of range. This object should be treated as readonly and its ref
+ *	count is _not_ incremented; the caller must do that if it holds on to
+ *	the reference. If listPtr does not refer to a list and can't be
+ *	converted to one, TCL_ERROR is returned and an error message is left
+ *	in the interpreter's result if interp is not NULL.
  *
- * 	If 'listPtr' is not already of type 'tclListType', it is converted.
+ * Side effects:
+ *	listPtr will be converted, if necessary, to a list object.
  *
  *----------------------------------------------------------------------
  */
 
 int
 Tcl_ListObjIndex(
-    Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *listPtr,	/* List object to index into. */
-    size_t index,		/* Index of element to return. */
-    Tcl_Obj **objPtrPtr)	/* The resulting Tcl_Obj* is stored here. */
+    Tcl_Interp *interp,  /* Used to report errors if not NULL. */
+    Tcl_Obj *listObj,    /* List object to index into. */
+    size_t index,           /* Index of element to return. */
+    Tcl_Obj **objPtrPtr) /* The resulting Tcl_Obj* is stored here. */
 {
-    List *listRepPtr;
-
-    ListGetInternalRep(listPtr, listRepPtr);
-    if (listRepPtr == NULL) {
-	int result;
-	size_t length;
+    Tcl_Obj **elemObjs;
+    size_t numElems;
 
-	(void) Tcl_GetStringFromObj(listPtr, &length);
-	if (length == 0) {
-	    *objPtrPtr = NULL;
-	    return TCL_OK;
-	}
-	result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	ListGetInternalRep(listPtr, listRepPtr);
+    /*
+     * TODO
+     * Unlike the original list code, this does not optimize for lindex'ing
+     * an empty string when the internal rep is not already a list. On the
+     * other hand, this code will be faster for the case where the object
+     * is currently a dict. Benchmark the two cases.
+     */
+    if (TclListObjGetElementsM(interp, listObj, &numElems, &elemObjs)
+	!= TCL_OK) {
+	return TCL_ERROR;
     }
-
-    if (index >= listRepPtr->elemCount) {
+    if (index >= numElems) {
 	*objPtrPtr = NULL;
     } else {
-	*objPtrPtr = listRepPtr->elements[index];
+	*objPtrPtr = elemObjs[index];
     }
 
     return TCL_OK;
@@ -847,20 +1923,19 @@ Tcl_ListObjIndex(
  *
  * Tcl_ListObjLength --
  *
- * 	Retrieve the number of elements in a list.
- *
- * Value
- *
- *	TCL_OK
- *
- *	    A count of list elements is stored at the address provided by
- *	    'intPtr'. If 'listPtr' is not already of type 'tclListPtr', it is
- *	    converted.
+ *	This function returns the number of elements in a list object. If the
+ *	object is not already a list object, an attempt will be made to
+ *	convert it to one.
  *
- *	TCL_ERROR
+ * Results:
+ *	The return value is normally TCL_OK; in this case *intPtr will be set
+ *	to the integer count of list elements. If listPtr does not refer to a
+ *	list object and the object can not be converted to one, TCL_ERROR is
+ *	returned and an error message will be left in the interpreter's result
+ *	if interp is not NULL.
  *
- *	    'listPtr' is not a valid list.  An error message will be left in
- *	    the interpreter's result if 'interp' is not NULL.
+ * Side effects:
+ *	The possible conversion of the argument object to a list object.
  *
  *----------------------------------------------------------------------
  */
@@ -868,337 +1943,498 @@ Tcl_ListObjIndex(
 #undef Tcl_ListObjLength
 int
 Tcl_ListObjLength(
-    Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *listPtr,	/* List object whose #elements to return. */
-    size_t *intPtr)	/* The resulting length is stored here. */
+    Tcl_Interp *interp,	/* Used to report errors if not NULL. */
+    Tcl_Obj *listObj,	/* List object whose #elements to return. */
+    size_t *lenPtr)	/* The resulting int is stored here. */
 {
-    List *listRepPtr;
-
-    ListGetInternalRep(listPtr, listRepPtr);
-    if (listRepPtr == NULL) {
-	int result;
-	size_t length;
+    ListRep listRep;
 
-	(void) Tcl_GetStringFromObj(listPtr, &length);
-	if (length == 0) {
-	    *intPtr = 0;
-	    return TCL_OK;
-	}
-	result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	ListGetInternalRep(listPtr, listRepPtr);
+    /*
+     * TODO
+     * Unlike the original list code, this does not optimize for lindex'ing
+     * an empty string when the internal rep is not already a list. On the
+     * other hand, this code will be faster for the case where the object
+     * is currently a dict. Benchmark the two cases.
+     */
+    if (TclListObjGetRep(interp, listObj, &listRep) != TCL_OK) {
+	return TCL_ERROR;
     }
-
-    *intPtr = listRepPtr->elemCount;
+    *lenPtr = ListRepLength(&listRep);
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_ListObjReplace --
- *
- *	Replace values in a list.
- *
- *	If 'first' is zero or TCL_INDEX_NONE, it refers to the first element. If
- *	'first' outside the range of elements in the list, no elements are
- *	deleted.
- *
- *	If 'count' is zero or TCL_INDEX_NONE no elements are deleted, and any new
- *	elements are inserted at the beginning of the list.
- *
- * Value
- *
- *	TCL_OK
- *
- *	    The first 'objc' values of 'objv' replaced 'count' elements in 'listPtr'
- *	    starting at 'first'.  If 'objc' 0, no new elements are added.
- *
- *	TCL_ERROR
+ * Tcl_ListObjReplace --
  *
- *	    'listPtr' is not a valid list.   An error message is left in the
- *	    interpreter's result if 'interp' is not NULL.
+ *	This function replaces zero or more elements of the list referenced by
+ *	listObj with the objects from an (objc,objv) array. The objc elements
+ *	of the array referenced by objv replace the count elements in listPtr
+ *	starting at first.
  *
- * Effect
+ *	If the argument first is zero or negative, it refers to the first
+ *	element. If first is greater than or equal to the number of elements
+ *	in the list, then no elements are deleted; the new elements are
+ *	appended to the list. Count gives the number of elements to replace.
+ *	If count is zero or negative then no elements are deleted; the new
+ *	elements are simply inserted before first.
  *
- *	If 'listPtr' is not of type 'tclListType', it is converted if possible.
+ *	The argument objv refers to an array of objc pointers to the new
+ *	elements to be added to listPtr in place of those that were deleted.
+ *	If objv is NULL, no new elements are added. If listPtr is not a list
+ *	object, an attempt will be made to convert it to one.
  *
- *	The 'refCount' of each element appended to the list is incremented.
- *	Similarly, the 'refCount' for each replaced element is decremented.
+ * Results:
+ *	The return value is normally TCL_OK. If listPtr does not refer to a
+ *	list object and can not be converted to one, TCL_ERROR is returned and
+ *	an error message will be left in the interpreter's result if interp is
+ *	not NULL.
  *
- *	If 'listPtr' is modified, any previous string representation is
- *	invalidated.
+ * Side effects:
+ *	The ref counts of the objc elements in objv are incremented since the
+ *	resulting list now refers to them. Similarly, the ref counts for
+ *	replaced objects are decremented. listObj is converted, if necessary,
+ *	to a list object. listObj's old string representation, if any, is
+ *	freed.
  *
  *----------------------------------------------------------------------
  */
-
 int
 Tcl_ListObjReplace(
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
-    Tcl_Obj *listPtr,		/* List object whose elements to replace. */
-    size_t first,			/* Index of first element to replace. */
-    size_t count,			/* Number of elements to replace. */
-    size_t objc,			/* Number of objects to insert. */
-    Tcl_Obj *const objv[])	/* An array of objc pointers to Tcl objects to
-				 * insert. */
+    Tcl_Obj *listObj,		/* List object whose elements to replace. */
+    size_t first,		/* Index of first element to replace. */
+    size_t numToDelete,	/* Number of elements to replace. */
+    size_t numToInsert,	/* Number of objects to insert. */
+    Tcl_Obj *const insertObjs[])/* Tcl objects to insert */
 {
-    List *listRepPtr;
-    Tcl_Obj **elemPtrs;
-    size_t numElems, numRequired, numAfterLast, start, i, j;
-    int needGrow, isShared;
-
-    if (Tcl_IsShared(listPtr)) {
+    ListRep listRep;
+    ListSizeT origListLen;
+    ListSizeT lenChange;
+    ListSizeT leadSegmentLen;
+    ListSizeT tailSegmentLen;
+    ListSizeT numFreeSlots;
+    ListSizeT leadShift;
+    ListSizeT tailShift;
+    Tcl_Obj **listObjs;
+
+    if (Tcl_IsShared(listObj)) {
 	Tcl_Panic("%s called with shared object", "Tcl_ListObjReplace");
     }
 
-    ListGetInternalRep(listPtr, listRepPtr);
-    if (listRepPtr == NULL) {
-	size_t length;
+    if (TclListObjGetRep(interp, listObj, &listRep) != TCL_OK)
+	return TCL_ERROR; /* Cannot be converted to a list */
 
-	(void) Tcl_GetStringFromObj(listPtr, &length);
-	if (length == 0) {
-	    if (objc == 0) {
-		return TCL_OK;
-	    }
-	    Tcl_SetListObj(listPtr, objc, NULL);
-	} else {
-	    int result = SetListFromAny(interp, listPtr);
+    /* TODO - will need modification if Tcl9 sticks to unsigned indices */
 
-	    if (result != TCL_OK) {
-		return result;
-	    }
-	}
-	ListGetInternalRep(listPtr, listRepPtr);
+    /* Make limits sane */
+    origListLen = ListRepLength(&listRep);
+    if (first == TCL_INDEX_NONE) {
+	first = 0;
+    }
+    if (first > (size_t)origListLen) {
+	first = origListLen;	/* So we'll insert after last element. */
+    }
+    if (numToDelete == TCL_INDEX_NONE) {
+	numToDelete = 0;
+    } else if (first > ListSizeT_MAX - numToDelete /* Handle integer overflow */
+             || (size_t)origListLen < first + numToDelete) {
+	numToDelete = origListLen - first;
+    }
+
+    if (numToInsert > ListSizeT_MAX - (origListLen - numToDelete)) {
+	return ListLimitExceededError(interp);
     }
 
     /*
-     * Note that when count == 0 and objc == 0, this routine is logically a
-     * no-op, removing and adding no elements to the list. However, by flowing
-     * through this routine anyway, we get the important side effect that the
-     * resulting listPtr is a list in canoncial form. This is important.
-     * Resist any temptation to optimize this case.
+     * There are a number of special cases to consider from an optimization
+     * point of view.
+     * (1) Pure deletes (numToInsert==0) from the front or back can be treated
+     * as a range op irrespective of whether the ListStore is shared or not
+     * (2) Pure inserts (numToDelete == 0)
+     *   (2a) Pure inserts at the back can be treated as appends
+     *   (2b) Pure inserts from the *front* can be optimized under certain
+     *   conditions by inserting before first ListStore slot in use if there
+     *   is room, again irrespective of sharing
+     * (3) If the ListStore is shared OR there is insufficient free space
+     * OR existing allocation is too large compared to new size, create
+     * a new ListStore
+     * (4) Unshared ListStore with sufficient free space. Delete, shift and
+     * insert within the ListStore.
      */
 
-    elemPtrs = listRepPtr->elements;
-    numElems = listRepPtr->elemCount;
+    /* Note: do not do TclInvalidateStringRep as yet in case there are errors */
 
-    if (first == TCL_INDEX_NONE) {
-	first = 0;
-    }
-    if (first >= numElems) {
-	first = numElems;	/* So we'll insert after last element. */
+    /* Check Case (1) - Treat pure deletes from front or back as range ops */
+    if (numToInsert == 0) {
+	if (numToDelete == 0) {
+	    /* Should force canonical even for no-op */
+	    TclInvalidateStringRep(listObj);
+	    return TCL_OK;
+	}
+	if (first == 0) {
+	    /* Delete from front, so return tail */
+	    ListRep tailRep;
+	    ListRepRange(&listRep, numToDelete, origListLen-1, 0, &tailRep);
+	    ListObjReplaceRepAndInvalidate(listObj, &tailRep);
+	    return TCL_OK;
+	} else if ((first+numToDelete) >= (size_t)origListLen) {
+	    /* Delete from tail, so return head */
+	    ListRep headRep;
+	    ListRepRange(&listRep, 0, first-1, 0, &headRep);
+	    ListObjReplaceRepAndInvalidate(listObj, &headRep);
+	    return TCL_OK;
+	}
+	/* Deletion from middle. Fall through to general case */
     }
-    if (count == TCL_INDEX_NONE) {
-	count = 0;
-    } else if (count > LIST_MAX /* Handle integer overflow */
-	    || numElems < first+count) {
 
-	count = numElems - first;
+    /* Garbage collect before checking the pure insert optimization */
+    ListRepFreeUnreferenced(&listRep);
+
+    /*
+     * Check Case (2) - pure inserts under certain conditions:
+     */
+    if (numToDelete == 0) {
+	/* Case (2a) - Append to list */
+	if (first == (size_t)origListLen) {
+	    return TclListObjAppendElements(
+		interp, listObj, numToInsert, insertObjs);
+	}
+
+	/*
+	 * Case (2b) - pure inserts at front under some circumstances
+	 * (i) Insertion must be at head of list
+	 * (ii) The list's span must be at head of the in-use slots in the store
+	 * (iii) There must be unused room at front of the store
+	 * NOTE THIS IS TRUE EVEN IF THE ListStore IS SHARED as it will not
+	 * affect the other Tcl_Obj's referencing this ListStore. See the TIP.
+	 */
+	if (first == 0 &&                                            /* (i) */
+	    ListRepStart(&listRep) == listRep.storePtr->firstUsed && /* (ii) */
+	    numToInsert <= (size_t)listRep.storePtr->firstUsed               /* (iii) */
+	) {
+	    ListSizeT newLen;
+	    LIST_ASSERT(numToInsert); /* Else would have returned above */
+	    listRep.storePtr->firstUsed -= numToInsert;
+	    ObjArrayCopy(&listRep.storePtr->slots[listRep.storePtr->firstUsed],
+			 numToInsert,
+			 insertObjs);
+	    listRep.storePtr->numUsed += numToInsert;
+	    newLen = listRep.spanPtr->spanLength + numToInsert;
+	    if (listRep.spanPtr && listRep.spanPtr->refCount <= 1) {
+		/* An unshared span record, re-use it */
+		listRep.spanPtr->spanStart = listRep.storePtr->firstUsed;
+		listRep.spanPtr->spanLength = newLen;
+	    } else {
+		/* Need a new span record */
+		if (listRep.storePtr->firstUsed == 0) {
+		    listRep.spanPtr = NULL;
+		} else {
+		    listRep.spanPtr =
+			ListSpanNew(listRep.storePtr->firstUsed, newLen);
+		}
+	    }
+	    ListObjReplaceRepAndInvalidate(listObj, &listRep);
+	    return TCL_OK;
+	}
     }
 
-    isShared = (listRepPtr->refCount > 1);
-    numRequired = numElems - count + objc; /* Known <= LIST_MAX */
-    needGrow = numRequired > listRepPtr->maxElemCount;
 
-    for (i = 0;  i < objc;  i++) {
-	Tcl_IncrRefCount(objv[i]);
+    /* Just for readability of the code */
+    lenChange = numToInsert - numToDelete;
+    leadSegmentLen = first;
+    tailSegmentLen = origListLen - (first + numToDelete);
+    numFreeSlots = listRep.storePtr->numAllocated - listRep.storePtr->numUsed;
+
+    /*
+     * Before further processing, if unshared, try and reallocate to avoid
+     * new allocation below. This avoids expensive ref count manipulation
+     * later by not having to go through the ListRepInit and
+     * ListObjReplaceAndInvalidate below.
+     */
+    if (numFreeSlots < lenChange && !ListRepIsShared(&listRep)) {
+	ListStore *newStorePtr =
+	    ListStoreReallocate(listRep.storePtr, origListLen + lenChange);
+	if (newStorePtr == NULL) {
+	    return MemoryAllocationError(interp,
+					 LIST_SIZE(origListLen + lenChange));
+	}
+	listRep.storePtr = newStorePtr;
+	numFreeSlots =
+	    listRep.storePtr->numAllocated - listRep.storePtr->numUsed;
+	/*
+	 * WARNING: at this point the Tcl_Obj internal rep potentially
+	 * points to freed storage if the reallocation returned a
+	 * different location. Overwrite it to bring it back in sync.
+	 */
+	ListObjStompRep(listObj, &listRep);
     }
 
-    if (needGrow && !isShared) {
-	/* Try to use realloc */
-	List *newPtr = NULL;
-	size_t attempt = 2 * numRequired;
-	if (attempt <= LIST_MAX) {
-	    newPtr = (List *)Tcl_AttemptRealloc(listRepPtr, LIST_SIZE(attempt));
+    /*
+     * Case (3) a new ListStore is required
+     * (a) The passed-in ListStore is shared
+     * (b) There is not enough free space in the unshared passed-in ListStore
+     * (c) The new unshared size is much "smaller" (TODO) than the allocated space
+     * TODO - for unshared case ONLY, consider a "move" based implementation
+     */
+    if (ListRepIsShared(&listRep) || /* 3a */
+	numFreeSlots < lenChange ||  /* 3b */
+	(origListLen + lenChange) < (listRep.storePtr->numAllocated / 4) /* 3c */
+    ) {
+	ListRep newRep;
+	Tcl_Obj **toObjs;
+	listObjs = &listRep.storePtr->slots[ListRepStart(&listRep)];
+	ListRepInit(origListLen + lenChange,
+		    NULL,
+		    LISTREP_PANIC_ON_FAIL | LISTREP_SPACE_FAVOR_NONE,
+		    &newRep);
+	toObjs = ListRepSlotPtr(&newRep, 0);
+	if (leadSegmentLen > 0) {
+	    ObjArrayCopy(toObjs, leadSegmentLen, listObjs);
 	}
-	if (newPtr == NULL) {
-	    attempt = numRequired + 1 + TCL_MIN_ELEMENT_GROWTH;
-	    if (attempt > LIST_MAX) {
-		attempt = LIST_MAX;
-	    }
-	    newPtr = (List *)Tcl_AttemptRealloc(listRepPtr, LIST_SIZE(attempt));
+	if (numToInsert > 0) {
+	    ObjArrayCopy(&toObjs[leadSegmentLen],
+			 numToInsert,
+			 insertObjs);
 	}
-	if (newPtr == NULL) {
-	    attempt = numRequired;
-	    newPtr = (List *)Tcl_AttemptRealloc(listRepPtr, LIST_SIZE(attempt));
+	if (tailSegmentLen > 0) {
+	    ObjArrayCopy(&toObjs[leadSegmentLen + numToInsert],
+			 tailSegmentLen,
+			 &listObjs[leadSegmentLen+numToDelete]);
 	}
-	if (newPtr) {
-	    listRepPtr = newPtr;
-	    ListResetInternalRep(listPtr, listRepPtr);
-	    elemPtrs = listRepPtr->elements;
-	    listRepPtr->maxElemCount = attempt;
-	    needGrow = numRequired > listRepPtr->maxElemCount;
+	newRep.storePtr->numUsed = origListLen + lenChange;
+	if (newRep.spanPtr) {
+	    newRep.spanPtr->spanLength = newRep.storePtr->numUsed;
 	}
+	LISTREP_CHECK(&newRep);
+	ListObjReplaceRepAndInvalidate(listObj, &newRep);
+	return TCL_OK;
     }
-    if (!needGrow && !isShared) {
-	int shift;
 
-	/*
-	 * Can use the current List struct. First "delete" count elements
-	 * starting at first.
-	 */
+    /*
+     * Case (4) - unshared ListStore with sufficient room.
+     * After deleting elements, there will be a corresponding gap. If this
+     * gap does not match number of insertions, either the lead segment,
+     * or the tail segment, or both will have to be moved.
+     * The general strategy is to move the fewest number of elements. If
+     *
+     * TODO - what about appends to unshared ? Is below sufficiently optimal?
+     */
 
-	for (j = first;  j < first + count;  j++) {
-	    Tcl_Obj *victimPtr = elemPtrs[j];
+    /* Following must hold for unshared listreps after ListRepFreeUnreferenced above */
+    LIST_ASSERT(origListLen == listRep.storePtr->numUsed);
+    LIST_ASSERT(origListLen == ListRepLength(&listRep));
+    LIST_ASSERT(ListRepStart(&listRep) == listRep.storePtr->firstUsed);
 
-	    TclDecrRefCount(victimPtr);
-	}
+    LIST_ASSERT((numToDelete + numToInsert) > 0);
 
-	/*
-	 * Shift the elements after the last one removed to their new
-	 * locations.
-	 */
+    /* Base of slot array holding the list elements */
+    listObjs = &listRep.storePtr->slots[ListRepStart(&listRep)];
+
+    /*
+     * Free up elements to be deleted. Before that, increment the ref counts
+     * for objects to be inserted in case there is overlap. See bug3598580
+     * or test listobj-11.1
+     */
+    if (numToInsert) {
+	ObjArrayIncrRefs(insertObjs, 0, numToInsert);
+    }
+    if (numToDelete) {
+	ObjArrayDecrRefs(listObjs, first, numToDelete);
+    }
 
-	start = first + count;
-	numAfterLast = numElems - start;
-	shift = objc - count;	/* numNewElems - numDeleted */
-	if ((numAfterLast > 0) && (shift != 0)) {
-	    Tcl_Obj **src = elemPtrs + start;
+    /*
+     * Calculate shifts if necessary to accomodate insertions.
+     * NOTE: all indices are relative to listObjs which is not necessarily the
+     * start of the ListStore storage area.
+     *
+     * leadShift - how much to shift the lead segment
+     * tailShift - how much to shift the tail segment
+     * insertTarget - index where to insert.
+     */
 
-	    memmove(src+shift, src, numAfterLast * sizeof(Tcl_Obj*));
-	}
-    } else {
+    if (lenChange == 0) {
+	/* Exact fit */
+	leadShift = 0;
+	tailShift = 0;
+    } else if (lenChange < 0) {
 	/*
-	 * Cannot use the current List struct; it is shared, too small, or
-	 * both. Allocate a new struct and insert elements into it.
+	 * More deletions than insertions. The gap after deletions is large
+	 * enough for insertions. Move a segment depending on size.
 	 */
-
-	List *oldListRepPtr = listRepPtr;
-	Tcl_Obj **oldPtrs = elemPtrs;
-	int newMax;
-
-	if (needGrow) {
-	    newMax = 2 * numRequired;
+	if (leadSegmentLen > tailSegmentLen) {
+	    /* Tail segment smaller. Insert after lead, move tail down */
+	    leadShift = 0;
+	    tailShift = lenChange;
 	} else {
-	    newMax = listRepPtr->maxElemCount;
+	    /* Lead segment smaller. Insert before tail, move lead up */
+	    leadShift = -lenChange;
+	    tailShift = 0;
 	}
+    } else {
+	LIST_ASSERT(lenChange > 0); /* Reminder */
 
-	listRepPtr = AttemptNewList(NULL, newMax, NULL);
-	if (listRepPtr == NULL) {
-	    unsigned int limit = LIST_MAX - numRequired;
-	    unsigned int extra = numRequired - numElems
-		    + TCL_MIN_ELEMENT_GROWTH;
-	    int growth = (int) ((extra > limit) ? limit : extra);
-
-	    listRepPtr = AttemptNewList(NULL, numRequired + growth, NULL);
-	    if (listRepPtr == NULL) {
-		listRepPtr = AttemptNewList(interp, numRequired, NULL);
-		if (listRepPtr == NULL) {
-		    for (i = 0;  i < objc;  i++) {
-			/* See bug 3598580 */
-			Tcl_DecrRefCount(objv[i]);
-		    }
-		    return TCL_ERROR;
+	/*
+	 * We need to make room for the insertions. Again we have multiple
+	 * possibilities. We may be able to get by just shifting one segment
+	 * or need to shift both. In the former case, favor shifting the
+	 * smaller segment.
+	 */
+	ListSizeT leadSpace = ListRepNumFreeHead(&listRep);
+	ListSizeT tailSpace = ListRepNumFreeTail(&listRep);
+	ListSizeT finalFreeSpace = leadSpace + tailSpace - lenChange;
+
+	LIST_ASSERT((leadSpace + tailSpace) >= lenChange);
+	if (leadSpace >= lenChange
+	    && (leadSegmentLen < tailSegmentLen || tailSpace < lenChange)) {
+	    /* Move only lead to the front to make more room */
+	    leadShift = -lenChange;
+	    tailShift = 0;
+	    /*
+	     * Redistribute the remaining free space between the front and
+	     * back if either there is no tail space left or if the
+	     * entire list is the head anyways. This is an important
+	     * optimization for further operations like further asymmetric
+	     * insertions.
+	     */
+	    if (finalFreeSpace > 1 && (tailSpace == 0 || tailSegmentLen == 0)) {
+		ListSizeT postShiftLeadSpace = leadSpace - lenChange;
+		if (postShiftLeadSpace > (finalFreeSpace/2)) {
+		    ListSizeT extraShift = postShiftLeadSpace - (finalFreeSpace / 2);
+		    leadShift -= extraShift;
+		    tailShift = -extraShift; /* Move tail to the front as well */
 		}
 	    }
-	}
-
-	ListResetInternalRep(listPtr, listRepPtr);
-	listRepPtr->refCount++;
-
-	elemPtrs = listRepPtr->elements;
-
-	if (isShared) {
+	    LIST_ASSERT(leadShift >= 0 || leadSpace >= -leadShift);
+	} else if (tailSpace >= lenChange) {
+	    /* Move only tail segment to the back to make more room. */
+	    leadShift = 0;
+	    tailShift = lenChange;
 	    /*
-	     * The old struct will remain in place; need new refCounts for the
-	     * new List struct references. Copy over only the surviving
-	     * elements.
+	     * See comments above. This is analogous.
 	     */
-
-	    for (i=0; i < first; i++) {
-		elemPtrs[i] = oldPtrs[i];
-		Tcl_IncrRefCount(elemPtrs[i]);
-	    }
-	    for (i = first + count, j = first + objc;
-		    j < numRequired; i++, j++) {
-		elemPtrs[j] = oldPtrs[i];
-		Tcl_IncrRefCount(elemPtrs[j]);
+	    if (finalFreeSpace > 1 && (leadSpace == 0 || leadSegmentLen == 0)) {
+		ListSizeT postShiftTailSpace = tailSpace - lenChange;
+		if (postShiftTailSpace > (finalFreeSpace/2)) {
+		    ListSizeT extraShift = postShiftTailSpace - (finalFreeSpace / 2);
+		    tailShift += extraShift;
+		    leadShift = extraShift; /* Move head to the back as well */
+		}
 	    }
-
-	    oldListRepPtr->refCount--;
+	    LIST_ASSERT(tailShift <= tailSpace);
 	} else {
 	    /*
-	     * The old struct will be removed; use its inherited refCounts.
+	     * Both lead and tail need to be shifted to make room.
+	     * Divide remaining free space equally between front and back.
 	     */
-
-	    if (first > 0) {
-		memcpy(elemPtrs, oldPtrs, first * sizeof(Tcl_Obj *));
-	    }
+	    LIST_ASSERT(leadSpace < lenChange);
+	    LIST_ASSERT(tailSpace < lenChange);
 
 	    /*
-	     * "Delete" count elements starting at first.
+	     * leadShift = leadSpace - (finalFreeSpace/2)
+	     * Thus leadShift <= leadSpace
+	     * Also,
+	     * = leadSpace - (leadSpace + tailSpace - lenChange)/2
+	     * = leadSpace/2 - tailSpace/2 + lenChange/2
+	     * >= 0 because lenChange > tailSpace
 	     */
-
-	    for (j = first;  j < first + count;  j++) {
-		Tcl_Obj *victimPtr = oldPtrs[j];
-
-		TclDecrRefCount(victimPtr);
+	    leadShift = leadSpace - (finalFreeSpace / 2);
+	    tailShift = lenChange - leadShift;
+	    if (tailShift > tailSpace) {
+		/* Account for integer division errors */
+		leadShift += 1;
+		tailShift -= 1;
 	    }
-
 	    /*
-	     * Copy the elements after the last one removed, shifted to their
-	     * new locations.
+	     * Following must be true because otherwise one of the previous
+	     * if clauses would have been taken.
 	     */
-
-	    start = first + count;
-	    numAfterLast = numElems - start;
-	    if (numAfterLast > 0) {
-		memcpy(elemPtrs + first + objc, oldPtrs + start,
-			(size_t) numAfterLast * sizeof(Tcl_Obj *));
-	    }
-
-	    Tcl_Free(oldListRepPtr);
+	    LIST_ASSERT(leadShift > 0 && leadShift < lenChange);
+	    LIST_ASSERT(tailShift > 0 && tailShift < lenChange);
+	    leadShift = -leadShift; /* Lead is actually shifted downward */
 	}
     }
 
-    /*
-     * Insert the new elements into elemPtrs before "first".
-     */
-
-    for (i=0,j=first ; i<objc ; i++,j++) {
-	elemPtrs[j] = objv[i];
+    /* Careful about order of moves! */
+    if (leadShift > 0) {
+	/* Will happen when we have to make room at bottom */
+	if (tailShift != 0 && tailSegmentLen != 0) {
+	    ListSizeT tailStart = leadSegmentLen + numToDelete;
+	    memmove(&listObjs[tailStart + tailShift],
+		    &listObjs[tailStart],
+		    tailSegmentLen * sizeof(Tcl_Obj *));
+	}
+	if (leadSegmentLen != 0) {
+	    memmove(&listObjs[leadShift],
+		    &listObjs[0],
+		    leadSegmentLen * sizeof(Tcl_Obj *));
+	}
+    } else {
+	if (leadShift != 0 && leadSegmentLen != 0) {
+	    memmove(&listObjs[leadShift],
+		    &listObjs[0],
+		    leadSegmentLen * sizeof(Tcl_Obj *));
+	}
+	if (tailShift != 0 && tailSegmentLen != 0) {
+	    ListSizeT tailStart = leadSegmentLen + numToDelete;
+	    memmove(&listObjs[tailStart + tailShift],
+		    &listObjs[tailStart],
+		    tailSegmentLen * sizeof(Tcl_Obj *));
+	}
+    }
+    if (numToInsert) {
+	/* Do NOT use ObjArrayCopy here since we have already incr'ed ref counts */
+	memmove(&listObjs[leadSegmentLen + leadShift],
+		insertObjs,
+		numToInsert * sizeof(Tcl_Obj *));
     }
 
-    /*
-     * Update the count of elements.
-     */
-
-    listRepPtr->elemCount = numRequired;
-
-    /*
-     * Invalidate and free any old representations that may not agree
-     * with the revised list's internal representation.
-     */
+    listRep.storePtr->firstUsed += leadShift;
+    listRep.storePtr->numUsed = origListLen + lenChange;
+    listRep.storePtr->flags = 0;
 
-    listRepPtr->refCount++;
-    TclFreeInternalRep(listPtr);
-    ListSetInternalRep(listPtr, listRepPtr);
-    listRepPtr->refCount--;
+    if (listRep.spanPtr && listRep.spanPtr->refCount <= 1) {
+	/* An unshared span record, re-use it, even if not required */
+	listRep.spanPtr->spanStart = listRep.storePtr->firstUsed;
+	listRep.spanPtr->spanLength = listRep.storePtr->numUsed;
+    } else {
+	/* Need a new span record */
+	if (listRep.storePtr->firstUsed == 0) {
+	    listRep.spanPtr = NULL;
+	} else {
+	    listRep.spanPtr = ListSpanNew(listRep.storePtr->firstUsed,
+					  listRep.storePtr->numUsed);
+	}
+    }
 
-    TclInvalidateStringRep(listPtr);
+    LISTREP_CHECK(&listRep);
+    ListObjReplaceRepAndInvalidate(listObj, &listRep);
     return TCL_OK;
 }
+
 
 /*
  *----------------------------------------------------------------------
  *
  * TclLindexList --
  *
- *	Implements the 'lindex' command when objc==3.
+ *	This procedure handles the 'lindex' command when objc==3.
  *
- *	Implemented entirely as a wrapper around 'TclLindexFlat'. Reconfigures
- *	the argument format into required form while taking care to manage
- *	shimmering so as to tend to keep the most useful internalreps
- *	and/or avoid the most expensive conversions.
- *
- * Value
+ * Results:
+ *	Returns a pointer to the object extracted, or NULL if an error
+ *	occurred. The returned object already includes one reference count for
+ *	the pointer returned.
  *
- *	A pointer to the specified element, with its 'refCount' incremented, or
- *	NULL if an error occurred.
+ * Side effects:
+ *	None.
  *
- * Notes
+ * Notes:
+ *	This procedure is implemented entirely as a wrapper around
+ *	TclLindexFlat. All it does is reconfigure the argument format into the
+ *	form required by TclLindexFlat, while taking care to manage shimmering
+ *	in such a way that we tend to keep the most useful internalreps and/or
+ *	avoid the most expensive conversions.
  *
  *----------------------------------------------------------------------
  */
@@ -1206,28 +2442,27 @@ Tcl_ListObjReplace(
 Tcl_Obj *
 TclLindexList(
     Tcl_Interp *interp,		/* Tcl interpreter. */
-    Tcl_Obj *listPtr,		/* List being unpacked. */
-    Tcl_Obj *argPtr)		/* Index or index list. */
+    Tcl_Obj *listObj,		/* List being unpacked. */
+    Tcl_Obj *argObj)		/* Index or index list. */
 {
-
     size_t index;			/* Index into the list. */
     Tcl_Obj *indexListCopy;
-    List *listRepPtr;
+    Tcl_Obj **indexObjs;
+    ListSizeT numIndexObjs;
 
     /*
      * Determine whether argPtr designates a list or a single index. We have
      * to be careful about the order of the checks to avoid repeated
-     * shimmering; see TIP#22 and TIP#33 for the details.
+     * shimmering; if internal rep is already a list do not shimmer it.
+     * see TIP#22 and TIP#33 for the details.
      */
-
-    ListGetInternalRep(argPtr, listRepPtr);
-    if ((listRepPtr == NULL)
-	    && TclGetIntForIndexM(NULL , argPtr, (size_t)WIDE_MAX - 1, &index) == TCL_OK) {
+    if (!TclHasInternalRep(argObj, &tclListType)
+	&& TclGetIntForIndexM(NULL, argObj, ListSizeT_MAX - 1, &index)
+	       == TCL_OK) {
 	/*
 	 * argPtr designates a single index.
 	 */
-
-	return TclLindexFlat(interp, listPtr, 1, &argPtr);
+	return TclLindexFlat(interp, listObj, 1, &argObj);
     }
 
     /*
@@ -1242,43 +2477,44 @@ TclLindexList(
      * implementation does not.
      */
 
-    indexListCopy = TclListObjCopy(NULL, argPtr);
+    indexListCopy = TclListObjCopy(NULL, argObj);
     if (indexListCopy == NULL) {
 	/*
-	 * argPtr designates something that is neither an index nor a
-	 * well-formed list. Report the error via TclLindexFlat.
+	 * The argument is neither an index nor a well-formed list.
+	 * Report the error via TclLindexFlat.
+	 * TODO - This is as original. why not directly return an error?
 	 */
-
-	return TclLindexFlat(interp, listPtr, 1, &argPtr);
+	return TclLindexFlat(interp, listObj, 1, &argObj);
     }
 
-    ListGetInternalRep(indexListCopy, listRepPtr);
-
-    assert(listRepPtr != NULL);
-
-    listPtr = TclLindexFlat(interp, listPtr, listRepPtr->elemCount,
-		listRepPtr->elements);
+    ListObjGetElements(indexListCopy, numIndexObjs, indexObjs);
+    listObj = TclLindexFlat(interp, listObj, numIndexObjs, indexObjs);
     Tcl_DecrRefCount(indexListCopy);
-    return listPtr;
+    return listObj;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- *  TclLindexFlat --
- *
- * 	The core of the 'lindex' command, with all index
- * 	arguments presented as a flat list.
+ * TclLindexFlat --
  *
- *  Value
+ *	This procedure is the core of the 'lindex' command, with all index
+ *	arguments presented as a flat list.
  *
- *	A pointer to the object extracted, with its 'refCount' incremented,  or
- *	NULL if an error occurred.  Thus, the calling code will usually do
- *	something like:
+ * Results:
+ *	Returns a pointer to the object extracted, or NULL if an error
+ *	occurred. The returned object already includes one reference count for
+ *	the pointer returned.
  *
- * 		Tcl_SetObjResult(interp, result);
- * 		Tcl_DecrRefCount(result);
+ * Side effects:
+ *	None.
  *
+ * Notes:
+ *	The reference count of the returned object includes one reference
+ *	corresponding to the pointer returned. Thus, the calling code will
+ *	usually do something like:
+ *		Tcl_SetObjResult(interp, result);
+ *		Tcl_DecrRefCount(result);
  *
  *----------------------------------------------------------------------
  */
@@ -1286,16 +2522,16 @@ TclLindexList(
 Tcl_Obj *
 TclLindexFlat(
     Tcl_Interp *interp,		/* Tcl interpreter. */
-    Tcl_Obj *listPtr,		/* Tcl object representing the list. */
+    Tcl_Obj *listObj,		/* Tcl object representing the list. */
     size_t indexCount,		/* Count of indices. */
     Tcl_Obj *const indexArray[])/* Array of pointers to Tcl objects that
 				 * represent the indices in the list. */
 {
     size_t i;
 
-    Tcl_IncrRefCount(listPtr);
+    Tcl_IncrRefCount(listObj);
 
-    for (i=0 ; i<indexCount && listPtr ; i++) {
+    for (i=0 ; i<indexCount && listObj ; i++) {
 	size_t index, listLen = 0;
 	Tcl_Obj **elemPtrs = NULL, *sublistCopy;
 
@@ -1305,48 +2541,44 @@ TclLindexFlat(
 	 * while we are still using it. See test lindex-8.4.
 	 */
 
-	sublistCopy = TclListObjCopy(interp, listPtr);
-	Tcl_DecrRefCount(listPtr);
-	listPtr = NULL;
+	sublistCopy = TclListObjCopy(interp, listObj);
+	Tcl_DecrRefCount(listObj);
+	listObj = NULL;
 
 	if (sublistCopy == NULL) {
-	    /*
-	     * The sublist is not a list at all => error.
-	     */
-
+	    /* The sublist is not a list at all => error.  */
 	    break;
 	}
-	TclListObjGetElementsM(NULL, sublistCopy, &listLen, &elemPtrs);
+	LIST_ASSERT_TYPE(sublistCopy);
+	ListObjGetElements(sublistCopy, listLen, elemPtrs);
 
 	if (TclGetIntForIndexM(interp, indexArray[i], /*endValue*/ listLen-1,
 		&index) == TCL_OK) {
-	    if (index >= (size_t)listLen) {
+	    if (index >= listLen) {
 		/*
 		 * Index is out of range. Break out of loop with empty result.
 		 * First check remaining indices for validity
 		 */
 
 		while (++i < indexCount) {
-		    if (TclGetIntForIndexM(interp, indexArray[i], (size_t)WIDE_MAX - 1, &index)
+		    if (TclGetIntForIndexM(
+			    interp, indexArray[i], ListSizeT_MAX - 1, &index)
 			!= TCL_OK) {
 			Tcl_DecrRefCount(sublistCopy);
 			return NULL;
 		    }
 		}
-		TclNewObj(listPtr);
+		TclNewObj(listObj);
 	    } else {
-		/*
-		 * Extract the pointer to the appropriate element.
-		 */
-
-		listPtr = elemPtrs[index];
+		/* Extract the pointer to the appropriate element. */
+		listObj = elemPtrs[index];
 	    }
-	    Tcl_IncrRefCount(listPtr);
+	    Tcl_IncrRefCount(listObj);
 	}
 	Tcl_DecrRefCount(sublistCopy);
     }
 
-    return listPtr;
+    return listObj;
 }
 
 /*
@@ -1354,17 +2586,24 @@ TclLindexFlat(
  *
  * TclLsetList --
  *
- *	The core of [lset] when objc == 4. Objv[2] may be either a
+ *	Core of the 'lset' command when objc == 4. Objv[2] may be either a
  *	scalar index or a list of indices.
  *      It also handles 'lpop' when given a NULL value.
  *
- *	Implemented entirely as a wrapper around 'TclLindexFlat', as described
- *	for 'TclLindexList'.
+ * Results:
+ *	Returns the new value of the list variable, or NULL if there was an
+ *	error. The returned object includes one reference count for the
+ *	pointer returned.
  *
- * Value
+ * Side effects:
+ *	None.
  *
- *	The new list, with the 'refCount' of 'valuPtr' incremented, or NULL if
- *	there was an error.
+ * Notes:
+ *	This procedure is implemented entirely as a wrapper around
+ *	TclLsetFlat. All it does is reconfigure the argument format into the
+ *	form required by TclLsetFlat, while taking care to manage shimmering
+ *	in such a way that we tend to keep the most useful internalreps and/or
+ *	avoid the most expensive conversions.
  *
  *----------------------------------------------------------------------
  */
@@ -1372,16 +2611,15 @@ TclLindexFlat(
 Tcl_Obj *
 TclLsetList(
     Tcl_Interp *interp,		/* Tcl interpreter. */
-    Tcl_Obj *listPtr,		/* Pointer to the list being modified. */
-    Tcl_Obj *indexArgPtr,	/* Index or index-list arg to 'lset'. */
-    Tcl_Obj *valuePtr)		/* Value arg to 'lset' or NULL to 'lpop'. */
+    Tcl_Obj *listObj,		/* Pointer to the list being modified. */
+    Tcl_Obj *indexArgObj,	/* Index or index-list arg to 'lset'. */
+    Tcl_Obj *valueObj)		/* Value arg to 'lset' or NULL to 'lpop'. */
 {
-    size_t indexCount = 0;		/* Number of indices in the index list. */
+    ListSizeT indexCount = 0;   /* Number of indices in the index list. */
     Tcl_Obj **indices = NULL;	/* Vector of indices in the index list. */
-    Tcl_Obj *retValuePtr;	/* Pointer to the list to be returned. */
-    size_t index;			/* Current index in the list - discarded. */
+    Tcl_Obj *retValueObj;	/* Pointer to the list to be returned. */
+    size_t index;            /* Current index in the list - discarded. */
     Tcl_Obj *indexListCopy;
-    List *listRepPtr;
 
     /*
      * Determine whether the index arg designates a list or a single index.
@@ -1389,36 +2627,32 @@ TclLsetList(
      * shimmering; see TIP #22 and #23 for details.
      */
 
-    ListGetInternalRep(indexArgPtr, listRepPtr);
-    if (listRepPtr == NULL
-	    && TclGetIntForIndexM(NULL, indexArgPtr, (size_t)WIDE_MAX - 1, &index) == TCL_OK) {
-	/*
-	 * indexArgPtr designates a single index.
-	 */
-
-	return TclLsetFlat(interp, listPtr, 1, &indexArgPtr, valuePtr);
-
+    if (!TclHasInternalRep(indexArgObj, &tclListType)
+	&& TclGetIntForIndexM(NULL, indexArgObj, ListSizeT_MAX - 1, &index)
+	       == TCL_OK) {
+	/* indexArgPtr designates a single index. */
+	return TclLsetFlat(interp, listObj, 1, &indexArgObj, valueObj);
     }
 
-    indexListCopy = TclListObjCopy(NULL, indexArgPtr);
+    indexListCopy = TclListObjCopy(NULL, indexArgObj);
     if (indexListCopy == NULL) {
 	/*
 	 * indexArgPtr designates something that is neither an index nor a
 	 * well formed list. Report the error via TclLsetFlat.
 	 */
-
-	return TclLsetFlat(interp, listPtr, 1, &indexArgPtr, valuePtr);
+	return TclLsetFlat(interp, listObj, 1, &indexArgObj, valueObj);
     }
-    TclListObjGetElementsM(NULL, indexArgPtr, &indexCount, &indices);
+    LIST_ASSERT_TYPE(indexListCopy);
+    ListObjGetElements(indexListCopy, indexCount, indices);
 
     /*
      * Let TclLsetFlat handle the actual lset'ting.
      */
 
-    retValuePtr = TclLsetFlat(interp, listPtr, indexCount, indices, valuePtr);
+    retValueObj = TclLsetFlat(interp, listObj, indexCount, indices, valueObj);
 
     Tcl_DecrRefCount(indexListCopy);
-    return retValuePtr;
+    return retValueObj;
 }
 
 /*
@@ -1429,41 +2663,31 @@ TclLsetList(
  *	Core engine of the 'lset' command.
  *      It also handles 'lpop' when given a NULL value.
  *
- * Value
- *
- *	The resulting list
- *
- *	    The 'refCount' of 'valuePtr' is incremented.  If 'listPtr' was not
- *	    duplicated, its 'refCount' is incremented.  The reference count of
- *	    an unduplicated object is therefore 2 (one for the returned pointer
- *	    and one for the variable that holds it).  The reference count of a
- *	    duplicate object is 1, reflecting that result is the only active
- *	    reference. The caller is expected to store the result in the
- *	    variable and decrement its reference count. (INST_STORE_* does
- *	    exactly this.)
- *
- *	NULL
- *
- *	    An error occurred.  If 'listPtr' was duplicated, the reference
- *	    count on the duplicate is decremented so that it is 0, causing any
- *	    memory allocated by this function to be freed.
- *
- *
- * Effect
- *
- *	On entry, the reference count of 'listPtr' does not reflect any
- *	references held on the stack. The first action of this function is to
- *	determine whether 'listPtr' is shared and to create a duplicate
- *	unshared copy if it is.  The reference count of the duplicate is
- *	incremented. At this point, the reference count is 1 in either case so
- *	that the object is considered unshared.
+ * Results:
+ *	Returns the new value of the list variable, or NULL if an error
+ *	occurred. The returned object includes one reference count for the
+ *	pointer returned.
  *
- *	The unshared list is altered directly to produce the result.
- *	'TclLsetFlat' maintains a linked list of 'Tcl_Obj' values whose string
- *	representations must be spoilt by threading via 'ptr2' of the
- *	two-pointer internal representation. On entry to 'TclLsetFlat', the
- *	values of 'ptr2' are immaterial; on exit, the 'ptr2' field of any
- *	Tcl_Obj that has been modified is set to NULL.
+ * Side effects:
+ *	On entry, the reference count of the variable value does not reflect
+ *	any references held on the stack. The first action of this function is
+ *	to determine whether the object is shared, and to duplicate it if it
+ *	is. The reference count of the duplicate is incremented. At this
+ *	point, the reference count will be 1 for either case, so that the
+ *	object will appear to be unshared.
+ *
+ *	If an error occurs, and the object has been duplicated, the reference
+ *	count on the duplicate is decremented so that it is now 0: this
+ *	dismisses any memory that was allocated by this function.
+ *
+ *	If no error occurs, the reference count of the original object is
+ *	incremented if the object has not been duplicated, and nothing is done
+ *	to a reference count of the duplicate. Now the reference count of an
+ *	unduplicated object is 2 (the returned pointer, plus the one stored in
+ *	the variable). The reference count of a duplicate object is 1,
+ *	reflecting that the returned pointer is the only active reference. The
+ *	caller is expected to store the returned value back in the variable
+ *	and decrement its reference count. (INST_STORE_* does exactly this.)
  *
  *----------------------------------------------------------------------
  */
@@ -1471,52 +2695,60 @@ TclLsetList(
 Tcl_Obj *
 TclLsetFlat(
     Tcl_Interp *interp,		/* Tcl interpreter. */
-    Tcl_Obj *listPtr,		/* Pointer to the list being modified. */
+    Tcl_Obj *listObj,		/* Pointer to the list being modified. */
     size_t indexCount,		/* Number of index args. */
     Tcl_Obj *const indexArray[],
 				/* Index args. */
-    Tcl_Obj *valuePtr)		/* Value arg to 'lset' or NULL to 'lpop'. */
+    Tcl_Obj *valueObj)		/* Value arg to 'lset' or NULL to 'lpop'. */
 {
     size_t index, len;
-    int result;
-    Tcl_Obj *subListPtr, *retValuePtr, *chainPtr;
-    Tcl_ObjInternalRep *irPtr;
+	int result;
+    Tcl_Obj *subListObj, *retValueObj;
+    Tcl_Obj *pendingInvalidates[10];
+    Tcl_Obj **pendingInvalidatesPtr = pendingInvalidates;
+    ListSizeT numPendingInvalidates = 0;
 
     /*
      * If there are no indices, simply return the new value.  (Without
      * indices, [lset] is a synonym for [set].
-     * [lpop] does not use this but protect for NULL valuePtr just in case.
+     * [lpop] does not use this but protect for NULL valueObj just in case.
      */
 
     if (indexCount == 0) {
-	if (valuePtr != NULL) {
-	    Tcl_IncrRefCount(valuePtr);
+	if (valueObj != NULL) {
+	    Tcl_IncrRefCount(valueObj);
 	}
-	return valuePtr;
+	return valueObj;
     }
 
     /*
      * If the list is shared, make a copy we can modify (copy-on-write).  We
      * use Tcl_DuplicateObj() instead of TclListObjCopy() for a few reasons:
-     * 1) we have not yet confirmed listPtr is actually a list; 2) We make a
+     * 1) we have not yet confirmed listObj is actually a list; 2) We make a
      * verbatim copy of any existing string rep, and when we combine that with
      * the delayed invalidation of string reps of modified Tcl_Obj's
      * implemented below, the outcome is that any error condition that causes
-     * this routine to return NULL, will leave the string rep of listPtr and
+     * this routine to return NULL, will leave the string rep of listObj and
      * all elements to be unchanged.
      */
 
-    subListPtr = Tcl_IsShared(listPtr) ? Tcl_DuplicateObj(listPtr) : listPtr;
+    subListObj = Tcl_IsShared(listObj) ? Tcl_DuplicateObj(listObj) : listObj;
 
     /*
      * Anchor the linked list of Tcl_Obj's whose string reps must be
      * invalidated if the operation succeeds.
      */
 
-    retValuePtr = subListPtr;
-    chainPtr = NULL;
+    retValueObj = subListObj;
     result = TCL_OK;
 
+    /* Allocate if static array for pending invalidations is too small */
+    if (indexCount
+        > (int) (sizeof(pendingInvalidates) / sizeof(pendingInvalidates[0]))) {
+	pendingInvalidatesPtr =
+	    (Tcl_Obj **) Tcl_Alloc(indexCount * sizeof(*pendingInvalidatesPtr));
+    }
+
     /*
      * Loop through all the index arguments, and for each one dive into the
      * appropriate sublist.
@@ -1530,8 +2762,8 @@ TclLsetFlat(
 	 * Check for the possible error conditions...
 	 */
 
-	if (TclListObjGetElementsM(interp, subListPtr, &elemCount, &elemPtrs)
-		!= TCL_OK) {
+	if (TclListObjGetElementsM(interp, subListObj, &elemCount, &elemPtrs)
+	    != TCL_OK) {
 	    /* ...the sublist we're indexing into isn't a list at all. */
 	    result = TCL_ERROR;
 	    break;
@@ -1543,22 +2775,27 @@ TclLsetFlat(
 	 */
 
 	if (TclGetIntForIndexM(interp, *indexArray, elemCount - 1, &index)
-		!= TCL_OK)  {
+	    != TCL_OK) {
 	    /* ...the index we're trying to use isn't an index at all. */
 	    result = TCL_ERROR;
-	    indexArray++;
+	    indexArray++; /* Why bother with this increment? TBD */
 	    break;
 	}
 	indexArray++;
 
 	if (index > elemCount
-		|| (valuePtr == NULL && index >= elemCount)) {
+	    || (valueObj == NULL && index >= elemCount)) {
 	    /* ...the index points outside the sublist. */
 	    if (interp != NULL) {
-		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"index \"%s\" out of range", Tcl_GetString(indexArray[-1])));
-		Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX"
-			"OUTOFRANGE", NULL);
+		Tcl_SetObjResult(interp,
+		                 Tcl_ObjPrintf("index \"%s\" out of range",
+		                               Tcl_GetString(indexArray[-1])));
+		Tcl_SetErrorCode(interp,
+		                 "TCL",
+		                 "VALUE",
+		                 "INDEX"
+		                 "OUTOFRANGE",
+		                 NULL);
 	    }
 	    result = TCL_ERROR;
 	    break;
@@ -1566,128 +2803,126 @@ TclLsetFlat(
 
 	/*
 	 * No error conditions.  As long as we're not yet on the last index,
-	 * determine the next sublist for the next pass through the loop, and
-	 * take steps to make sure it is an unshared copy, as we intend to
-	 * modify it.
+	 * determine the next sublist for the next pass through the loop,
+	 * and take steps to make sure it is an unshared copy, as we intend
+	 * to modify it.
 	 */
 
 	if (--indexCount) {
-	    parentList = subListPtr;
-	    if (index == (size_t)elemCount) {
-		TclNewObj(subListPtr);
+	    parentList = subListObj;
+	    if (index == elemCount) {
+		TclNewObj(subListObj);
 	    } else {
-		subListPtr = elemPtrs[index];
+		subListObj = elemPtrs[index];
 	    }
-	    if (Tcl_IsShared(subListPtr)) {
-		subListPtr = Tcl_DuplicateObj(subListPtr);
+	    if (Tcl_IsShared(subListObj)) {
+		subListObj = Tcl_DuplicateObj(subListObj);
 	    }
 
 	    /*
 	     * Replace the original elemPtr[index] in parentList with a copy
 	     * we know to be unshared.  This call will also deal with the
 	     * situation where parentList shares its internalrep with other
-	     * Tcl_Obj's.  Dealing with the shared internalrep case can cause
-	     * subListPtr to become shared again, so detect that case and make
-	     * and store another copy.
+	     * Tcl_Obj's.  Dealing with the shared internalrep case can
+	     * cause subListObj to become shared again, so detect that case
+	     * and make and store another copy.
 	     */
 
-	    if (index == (size_t)elemCount) {
-		Tcl_ListObjAppendElement(NULL, parentList, subListPtr);
+	    if (index == elemCount) {
+		Tcl_ListObjAppendElement(NULL, parentList, subListObj);
 	    } else {
-		TclListObjSetElement(NULL, parentList, index, subListPtr);
+		TclListObjSetElement(NULL, parentList, index, subListObj);
 	    }
-	    if (Tcl_IsShared(subListPtr)) {
-		subListPtr = Tcl_DuplicateObj(subListPtr);
-		TclListObjSetElement(NULL, parentList, index, subListPtr);
+	    if (Tcl_IsShared(subListObj)) {
+		subListObj = Tcl_DuplicateObj(subListObj);
+		TclListObjSetElement(NULL, parentList, index, subListObj);
 	    }
 
 	    /*
-	     * The TclListObjSetElement() calls do not spoil the string rep of
-	     * parentList, and that's fine for now, since all we've done so
-	     * far is replace a list element with an unshared copy.  The list
-	     * value remains the same, so the string rep. is still valid, and
-	     * unchanged, which is good because if this whole routine returns
-	     * NULL, we'd like to leave no change to the value of the lset
-	     * variable.  Later on, when we set valuePtr in its proper place,
-	     * then all containing lists will have their values changed, and
-	     * will need their string reps spoiled.  We maintain a list of all
-	     * those Tcl_Obj's (via a little internalrep surgery) so we can spoil
-	     * them at that time.
+	     * The TclListObjSetElement() calls do not spoil the string rep
+	     * of parentList, and that's fine for now, since all we've done
+	     * so far is replace a list element with an unshared copy.  The
+	     * list value remains the same, so the string rep. is still
+	     * valid, and unchanged, which is good because if this whole
+	     * routine returns NULL, we'd like to leave no change to the
+	     * value of the lset variable.  Later on, when we set valueObj
+	     * in its proper place, then all containing lists will have
+	     * their values changed, and will need their string reps
+	     * spoiled.  We maintain a list of all those Tcl_Obj's (via a
+	     * little internalrep surgery) so we can spoil them at that
+	     * time.
 	     */
 
-	    irPtr = TclFetchInternalRep(parentList, &tclListType);
-	    irPtr->twoPtrValue.ptr2 = chainPtr;
-	    chainPtr = parentList;
+	    pendingInvalidatesPtr[numPendingInvalidates] = parentList;
+	    ++numPendingInvalidates;
 	}
     } while (indexCount > 0);
 
     /*
      * Either we've detected and error condition, and exited the loop with
      * result == TCL_ERROR, or we've successfully reached the last index, and
-     * we're ready to store valuePtr.  In either case, we need to clean up our
-     * string spoiling list of Tcl_Obj's.
+     * we're ready to store valueObj. On success, we need to invalidate
+     * the string representations of intermediate lists whose contained
+     * list element would have changed.
      */
+    if (result == TCL_OK) {
+	while (numPendingInvalidates > 0) {
+	    Tcl_Obj *objPtr;
 
-    while (chainPtr) {
-	Tcl_Obj *objPtr = chainPtr;
-	List *listRepPtr;
-
-	/*
-	 * Clear away our internalrep surgery mess.
-	 */
-
-	irPtr = TclFetchInternalRep(objPtr, &tclListType);
-	listRepPtr = (List *)irPtr->twoPtrValue.ptr1;
-	chainPtr = (Tcl_Obj *)irPtr->twoPtrValue.ptr2;
-
-	if (result == TCL_OK) {
-
-	    /*
-	     * We're going to store valuePtr, so spoil string reps of all
-	     * containing lists.
-	     */
-
-	    listRepPtr->refCount++;
-	    TclFreeInternalRep(objPtr);
-	    ListSetInternalRep(objPtr, listRepPtr);
-	    listRepPtr->refCount--;
+	    --numPendingInvalidates;
+	    objPtr = pendingInvalidatesPtr[numPendingInvalidates];
 
-	    TclInvalidateStringRep(objPtr);
-	} else {
-	    irPtr->twoPtrValue.ptr2 = NULL;
+	    if (result == TCL_OK) {
+		/*
+		 * We're going to store valueObj, so spoil string reps of all
+		 * containing lists.
+		 * TODO - historically, the storing of the internal rep was done
+		 * because the ptr2 field of the internal rep was used to chain
+		 * objects whose string rep needed to be invalidated. Now this
+		 * is no longer the case, so replacing of the internal rep
+		 * should not be needed. The TclInvalidateStringRep should
+		 * suffice. Formulate a test case before changing.
+		 */
+		ListRep objInternalRep;
+		TclListObjGetRep(NULL, objPtr, &objInternalRep);
+		ListObjReplaceRepAndInvalidate(objPtr, &objInternalRep);
+	    }
 	}
     }
 
+    if (pendingInvalidatesPtr != pendingInvalidates)
+	Tcl_Free(pendingInvalidatesPtr);
+
     if (result != TCL_OK) {
 	/*
 	 * Error return; message is already in interp. Clean up any excess
 	 * memory.
 	 */
 
-	if (retValuePtr != listPtr) {
-	    Tcl_DecrRefCount(retValuePtr);
+	if (retValueObj != listObj) {
+	    Tcl_DecrRefCount(retValueObj);
 	}
 	return NULL;
     }
 
     /*
-     * Store valuePtr in proper sublist and return. The TCL_INDEX_NONE is
-     * to avoid a compiler warning (not a problem because we checked that
-     * we have a proper list - or something convertible to one - above).
+     * Store valueObj in proper sublist and return. The -1 is to avoid a
+     * compiler warning (not a problem because we checked that we have a
+     * proper list - or something convertible to one - above).
      */
 
-    len = TCL_INDEX_NONE;
-    TclListObjLengthM(NULL, subListPtr, &len);
-    if (valuePtr == NULL) {
-	Tcl_ListObjReplace(NULL, subListPtr, index, 1, 0, NULL);
-    } else if (index == (size_t)len) {
-	Tcl_ListObjAppendElement(NULL, subListPtr, valuePtr);
+    len = -1;
+    TclListObjLengthM(NULL, subListObj, &len);
+    if (valueObj == NULL) {
+	Tcl_ListObjReplace(NULL, subListObj, index, 1, 0, NULL);
+    } else if (index == len) {
+	Tcl_ListObjAppendElement(NULL, subListObj, valueObj);
     } else {
-	TclListObjSetElement(NULL, subListPtr, index, valuePtr);
-	TclInvalidateStringRep(subListPtr);
+	TclListObjSetElement(NULL, subListObj, index, valueObj);
+	TclInvalidateStringRep(subListObj);
     }
-    Tcl_IncrRefCount(retValuePtr);
-    return retValuePtr;
+    Tcl_IncrRefCount(retValueObj);
+    return retValueObj;
 }
 
 /*
@@ -1695,38 +2930,23 @@ TclLsetFlat(
  *
  * TclListObjSetElement --
  *
- *	Set a single element of a list to a specified value.
- *
- *	It is the caller's responsibility to invalidate the string
- *	representation of the 'listPtr'.
+ *	Set a single element of a list to a specified value
  *
- * Value
- *
- * 	TCL_OK
- *
- *	    Success.
- *
- *	TCL_ERROR
- *
- *	    'listPtr' does not refer to a list object and cannot be converted
- *	    to one.  An error message will be left in the interpreter result if
- *	    interp is not NULL.
- *
- *	TCL_ERROR
- *
- *	    An index designates an element outside the range [0..listLength-1],
- *	    where 'listLength' is the count of elements in the list object
- *	    designated by 'listPtr'.  An error message is left in the
- *	    interpreter result.
- *
- * Effect
- *
- *	If 'listPtr' designates a shared object, 'Tcl_Panic' is called.  If
- *	'listPtr' is not already of type 'tclListType', it is converted and the
- *	internal representation is unshared. The 'refCount' of the element at
- *	'index' is decremented and replaced in the list with the 'valuePtr',
- *	whose 'refCount' in turn is incremented.
+ * Results:
+ *	The return value is normally TCL_OK. If listObj does not refer to a
+ *	list object and cannot be converted to one, TCL_ERROR is returned and
+ *	an error message will be left in the interpreter result if interp is
+ *	not NULL. Similarly, if index designates an element outside the range
+ *	[0..listLength-1], where listLength is the count of elements in the
+ *	list object designated by listObj, TCL_ERROR is returned and an error
+ *	message is left in the interpreter result.
  *
+ * Side effects:
+ *	Tcl_Panic if listObj designates a shared object. Otherwise, attempts
+ *	to convert it to a list with a non-shared internal rep. Decrements the
+ *	ref count of the object at the specified index within the list,
+ *	replaces with the object designated by valueObj, and increments the
+ *	ref count of the replacement object.
  *
  *----------------------------------------------------------------------
  */
@@ -1735,53 +2955,29 @@ int
 TclListObjSetElement(
     Tcl_Interp *interp,		/* Tcl interpreter; used for error reporting
 				 * if not NULL. */
-    Tcl_Obj *listPtr,		/* List object in which element should be
+    Tcl_Obj *listObj,		/* List object in which element should be
 				 * stored. */
-    size_t index,			/* Index of element to store. */
-    Tcl_Obj *valuePtr)		/* Tcl object to store in the designated list
+    size_t index,		/* Index of element to store. */
+    Tcl_Obj *valueObj)		/* Tcl object to store in the designated list
 				 * element. */
 {
-    List *listRepPtr;		/* Internal representation of the list being
-				 * modified. */
-    Tcl_Obj **elemPtrs;		/* Pointers to elements of the list. */
+    ListRep listRep;
+    Tcl_Obj **elemPtrs;         /* Pointers to elements of the list. */
     size_t elemCount;		/* Number of elements in the list. */
 
-    /*
-     * Ensure that the listPtr parameter designates an unshared list.
-     */
+    /* Ensure that the listObj parameter designates an unshared list. */
 
-    if (Tcl_IsShared(listPtr)) {
+    if (Tcl_IsShared(listObj)) {
 	Tcl_Panic("%s called with shared object", "TclListObjSetElement");
     }
 
-    ListGetInternalRep(listPtr, listRepPtr);
-    if (listRepPtr == NULL) {
-	int result;
-	size_t length;
-
-	(void) Tcl_GetStringFromObj(listPtr, &length);
-	if (length == 0) {
-	    if (interp != NULL) {
-		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"index \"%" TCL_Z_MODIFIER "u\" out of range", index));
-		Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX",
-			"OUTOFRANGE", NULL);
-	    }
-	    return TCL_ERROR;
-	}
-	result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	ListGetInternalRep(listPtr, listRepPtr);
+    if (TclListObjGetRep(interp, listObj, &listRep) != TCL_OK) {
+	return TCL_ERROR;
     }
 
-    elemCount = listRepPtr->elemCount;
-
-    /*
-     * Ensure that the index is in bounds.
-     */
+    elemCount = ListRepLength(&listRep);
 
+    /* Ensure that the index is in bounds. */
     if (index>=elemCount) {
 	if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -1792,66 +2988,27 @@ TclListObjSetElement(
 	return TCL_ERROR;
     }
 
-    /*
-     * If the internal rep is shared, replace it with an unshared copy.
-     */
-
-    if (listRepPtr->refCount > 1) {
-	Tcl_Obj **dst, **src = listRepPtr->elements;
-	List *newPtr = AttemptNewList(NULL, listRepPtr->maxElemCount, NULL);
-
-	if (newPtr == NULL) {
-	    newPtr = AttemptNewList(interp, elemCount, NULL);
-	    if (newPtr == NULL) {
-		return TCL_ERROR;
-	    }
-	}
-	newPtr->refCount++;
-	newPtr->elemCount = elemCount;
-	newPtr->canonicalFlag = listRepPtr->canonicalFlag;
-
-	dst = newPtr->elements;
-	while (elemCount--) {
-	    *dst = *src++;
-	    Tcl_IncrRefCount(*dst++);
-	}
-
-	listRepPtr->refCount--;
-
-	listRepPtr = newPtr;
-	ListResetInternalRep(listPtr, listRepPtr);
+    /* Replace a shared internal rep with an unshared copy */
+    if (listRep.storePtr->refCount > 1) {
+	ListRep newInternalRep;
+	/* TODO - leave extra space? */
+	ListRepClone(&listRep, &newInternalRep, LISTREP_PANIC_ON_FAIL);
+	listRep = newInternalRep;
     }
-    elemPtrs = listRepPtr->elements;
-
-    /*
-     * Add a reference to the new list element.
-     */
 
-    Tcl_IncrRefCount(valuePtr);
+    /* Retrieve element array AFTER potential cloning above */
+    ListRepElements(&listRep, elemCount, elemPtrs);
 
     /*
-     * Remove a reference from the old list element.
+     * Add a reference to the new list element and remove from old before
+     * replacing it. Order is important!
      */
-
+    Tcl_IncrRefCount(valueObj);
     Tcl_DecrRefCount(elemPtrs[index]);
+    elemPtrs[index] = valueObj;
 
-    /*
-     * Stash the new object in the list.
-     */
-
-    elemPtrs[index] = valuePtr;
-
-    /*
-     * Invalidate outdated internalreps.
-     */
-
-    ListGetInternalRep(listPtr, listRepPtr);
-    listRepPtr->refCount++;
-    TclFreeInternalRep(listPtr);
-    ListSetInternalRep(listPtr, listRepPtr);
-    listRepPtr->refCount--;
-
-    TclInvalidateStringRep(listPtr);
+    /* Internal rep may be cloned so replace */
+    ListObjReplaceRepAndInvalidate(listObj, &listRep);
 
     return TCL_OK;
 }
@@ -1861,11 +3018,13 @@ TclListObjSetElement(
  *
  * FreeListInternalRep --
  *
- *	Deallocate the storage associated with the internal representation of a
- *	a list object.
+ *	Deallocate the storage associated with a list object's internal
+ *	representation.
  *
- * Effect
+ * Results:
+ *	None.
  *
+ * Side effects:
  *	Frees listPtr's List* internal representation, if no longer shared.
  *	May decrement the ref counts of element objects, which may free them.
  *
@@ -1874,21 +3033,19 @@ TclListObjSetElement(
 
 static void
 FreeListInternalRep(
-    Tcl_Obj *listPtr)		/* List object with internal rep to free. */
+    Tcl_Obj *listObj)		/* List object with internal rep to free. */
 {
-    List *listRepPtr;
-
-    ListGetInternalRep(listPtr, listRepPtr);
-    assert(listRepPtr != NULL);
-
-    if (listRepPtr->refCount-- <= 1) {
-	Tcl_Obj **elemPtrs = listRepPtr->elements;
-	int i, numElems = listRepPtr->elemCount;
-
-	for (i = 0;  i < numElems;  i++) {
-	    Tcl_DecrRefCount(elemPtrs[i]);
-	}
-	Tcl_Free(listRepPtr);
+    ListRep listRep;
+
+    ListObjGetRep(listObj, &listRep);
+    if (listRep.storePtr->refCount-- <= 1) {
+	ObjArrayDecrRefs(
+	    listRep.storePtr->slots,
+	    listRep.storePtr->firstUsed, listRep.storePtr->numUsed);
+	Tcl_Free(listRep.storePtr);
+    }
+    if (listRep.spanPtr) {
+	ListSpanDecrRefs(listRep.spanPtr);
     }
 }
 
@@ -1897,47 +3054,43 @@ FreeListInternalRep(
  *
  * DupListInternalRep --
  *
- *	Initialize the internal representation of a list 'Tcl_Obj' to share the
+ *	Initialize the internal representation of a list Tcl_Obj to share the
  *	internal representation of an existing list object.
  *
- * Effect
+ * Results:
+ *	None.
  *
- *	The 'refCount' of the List internal rep is incremented.
+ * Side effects:
+ *	The reference count of the List internal rep is incremented.
  *
  *----------------------------------------------------------------------
  */
 
 static void
 DupListInternalRep(
-    Tcl_Obj *srcPtr,		/* Object with internal rep to copy. */
-    Tcl_Obj *copyPtr)		/* Object with internal rep to set. */
+    Tcl_Obj *srcObj,		/* Object with internal rep to copy. */
+    Tcl_Obj *copyObj)		/* Object with internal rep to set. */
 {
-    List *listRepPtr;
-
-    ListGetInternalRep(srcPtr, listRepPtr);
-    assert(listRepPtr != NULL);
-    ListSetInternalRep(copyPtr, listRepPtr);
+    ListRep listRep;
+    ListObjGetRep(srcObj, &listRep);
+    ListObjOverwriteRep(copyObj, &listRep);
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
  * SetListFromAny --
  *
- *	Convert any object to a list.
- *
- * Value
- *
- *    TCL_OK
- *
- *	Success.  The internal representation of 'objPtr' is set, and the type
- *	of 'objPtr' is 'tclListType'.
+ *	Attempt to generate a list internal form for the Tcl object "objPtr".
  *
- *    TCL_ERROR
- *
- *	An error occured during conversion. An error message is left in the
- *	interpreter's result if 'interp' is not NULL.
+ * Results:
+ *	The return value is TCL_OK or TCL_ERROR. If an error occurs during
+ *	conversion, an error message is left in the interpreter's result
+ *	unless "interp" is NULL.
  *
+ * Side effects:
+ *	If no error occurs, a list is stored as "objPtr"s internal
+ *	representation.
  *
  *----------------------------------------------------------------------
  */
@@ -1947,8 +3100,8 @@ SetListFromAny(
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr)		/* The object to convert. */
 {
-    List *listRepPtr;
     Tcl_Obj **elemPtrs;
+    ListRep listRep;
 
     /*
      * Dictionaries are a special case; they have a string representation such
@@ -1962,7 +3115,7 @@ SetListFromAny(
 	Tcl_Obj *keyPtr, *valuePtr;
 	Tcl_DictSearch search;
 	int done;
-	size_t size;
+	ListSizeT size;
 
 	/*
 	 * Create the new list representation. Note that we do not need to do
@@ -1974,17 +3127,22 @@ SetListFromAny(
 	 */
 
 	Tcl_DictObjSize(NULL, objPtr, &size);
-	listRepPtr = AttemptNewList(interp, size > 0 ? 2*size : 1, NULL);
-	if (!listRepPtr) {
+	/* TODO - leave space in front and/or back? */
+	if (ListRepInitAttempt(
+		interp, size > 0 ? 2 * size : 1, NULL, &listRep)
+	    != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	listRepPtr->elemCount = 2 * size;
 
-	/*
-	 * Populate the list representation.
-	 */
+	LIST_ASSERT(listRep.spanPtr == NULL); /* Guard against future changes */
+	LIST_ASSERT(listRep.storePtr->firstUsed == 0);
+	LIST_ASSERT((listRep.storePtr->flags & LISTSTORE_CANONICAL) == 0);
+
+	listRep.storePtr->numUsed = 2 * size;
 
-	elemPtrs = listRepPtr->elements;
+	/* Populate the list representation. */
+
+	elemPtrs = listRep.storePtr->slots;
 	Tcl_DictObjFirst(NULL, objPtr, &search, &keyPtr, &valuePtr, &done);
 	while (!done) {
 	    *elemPtrs++ = keyPtr;
@@ -1994,7 +3152,7 @@ SetListFromAny(
 	    Tcl_DictObjNext(&search, &keyPtr, &valuePtr, &done);
 	}
     } else {
-	size_t estCount, length;
+	ListSizeT estCount, length;
 	const char *limit, *nextElem = Tcl_GetStringFromObj(objPtr, &length);
 
 	/*
@@ -2005,15 +3163,18 @@ SetListFromAny(
 	estCount = TclMaxListLength(nextElem, length, &limit);
 	estCount += (estCount == 0);	/* Smallest list struct holds 1
 					 * element. */
-	listRepPtr = AttemptNewList(interp, estCount, NULL);
-	if (listRepPtr == NULL) {
+	/* TODO - allocate additional space? */
+	if (ListRepInitAttempt(interp, estCount, NULL, &listRep)
+	    != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	elemPtrs = listRepPtr->elements;
 
-	/*
-	 * Each iteration, parse and store a list element.
-	 */
+	LIST_ASSERT(listRep.spanPtr == NULL); /* Guard against future changes */
+	LIST_ASSERT(listRep.storePtr->firstUsed == 0);
+
+	elemPtrs = listRep.storePtr->slots;
+
+	/* Each iteration, parse and store a list element. */
 
 	while (nextElem < limit) {
 	    const char *elemStart;
@@ -2023,11 +3184,11 @@ SetListFromAny(
 
 	    if (TCL_OK != TclFindElement(interp, nextElem, limit - nextElem,
 		    &elemStart, &nextElem, &elemSize, &literal)) {
-	    fail:
-		while (--elemPtrs >= listRepPtr->elements) {
+fail:
+		while (--elemPtrs >= listRep.storePtr->slots) {
 		    Tcl_DecrRefCount(*elemPtrs);
 		}
-		Tcl_Free(listRepPtr);
+		Tcl_Free(listRep.storePtr);
 		return TCL_ERROR;
 	    }
 	    if (elemStart == limit) {
@@ -2039,11 +3200,7 @@ SetListFromAny(
 	    check = Tcl_InitStringRep(*elemPtrs, literal ? elemStart : NULL,
 		    elemSize);
 	    if (elemSize && check == NULL) {
-		if (interp) {
-		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "cannot construct list, out of memory", -1));
-		    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
-		}
+		MemoryAllocationError(interp, elemSize);
 		goto fail;
 	    }
 	    if (!literal) {
@@ -2054,16 +3211,29 @@ SetListFromAny(
 	    Tcl_IncrRefCount(*elemPtrs++);/* Since list now holds ref to it. */
 	}
 
- 	listRepPtr->elemCount = elemPtrs - listRepPtr->elements;
+	listRep.storePtr->numUsed =
+	    elemPtrs - listRep.storePtr->slots;
     }
 
+    LISTREP_CHECK(&listRep);
+
     /*
      * Store the new internalRep. We do this as late
      * as possible to allow the conversion code, in particular
      * Tcl_GetStringFromObj, to use the old internalRep.
      */
 
-    ListSetInternalRep(objPtr, listRepPtr);
+    /*
+     * Note old string representation NOT to be invalidated.
+     * So do NOT use ListObjReplaceRepAndInvalidate. InternalRep to be freed AFTER
+     * IncrRefs so do not use ListObjOverwriteRep
+     */
+    ListRepIncrRefs(&listRep);
+    TclFreeInternalRep(objPtr);
+    objPtr->internalRep.twoPtrValue.ptr1 = listRep.storePtr;
+    objPtr->internalRep.twoPtrValue.ptr2 = listRep.spanPtr;
+    objPtr->typePtr = &tclListType;
+
     return TCL_OK;
 }
 
@@ -2072,73 +3242,84 @@ SetListFromAny(
  *
  * UpdateStringOfList --
  *
- *	Update the string representation for a list object.
- *
- *	Any previously-exising string representation is not invalidated, so
- *	storage is lost if this has not been taken care of.
+ *	Update the string representation for a list object. Note: This
+ *	function does not invalidate an existing old string rep so storage
+ *	will be lost if this has not already been done.
  *
- * Effect
+ * Results:
+ *	None.
  *
- *	The string representation of 'listPtr' is set to the resulting string.
- *	This string will be empty if the list has no elements. It is assumed
- *	that the list internal representation is not NULL.
+ * Side effects:
+ *	The object's string is set to a valid string that results from the
+ *	list-to-string conversion. This string will be empty if the list has
+ *	no elements. The list internal representation should not be NULL and
+ *	we assume it is not NULL.
  *
  *----------------------------------------------------------------------
  */
 
 static void
 UpdateStringOfList(
-    Tcl_Obj *listPtr)		/* List object with string rep to update. */
+    Tcl_Obj *listObj)		/* List object with string rep to update. */
 {
 #   define LOCAL_SIZE 64
     char localFlags[LOCAL_SIZE], *flagPtr = NULL;
-    size_t numElems, i, length, bytesNeeded = 0;
+    ListSizeT numElems, i, length, bytesNeeded = 0;
     const char *elem, *start;
     char *dst;
     Tcl_Obj **elemPtrs;
-    List *listRepPtr;
+    ListRep listRep;
 
-    ListGetInternalRep(listPtr, listRepPtr);
+    ListObjGetRep(listObj, &listRep);
+    LISTREP_CHECK(&listRep);
 
-    assert(listRepPtr != NULL);
-
-    numElems = listRepPtr->elemCount;
+    ListRepElements(&listRep, numElems, elemPtrs);
 
     /*
      * Mark the list as being canonical; although it will now have a string
      * rep, it is one we derived through proper "canonical" quoting and so
      * it's known to be free from nasties relating to [concat] and [eval].
+     * However, we only do this if this is not a spanned list. Marking the
+     * storage canonical for a spanned list make ALL lists using the storage
+     * canonical which is not right. (Consider a list generated from a
+     * string and then this function called for a spanned list generated
+     * from it). On the other hand, a spanned list is always canonical
+     * (never generated from a string) so it does not have to be explicitly
+     * marked as such. The ListObjIsCanonical macro takes this into account.
+     * See the comments there.
      */
+    if (listRep.spanPtr == NULL) {
+	LIST_ASSERT(listRep.storePtr->firstUsed == 0);/* Invariant */
+	listRep.storePtr->flags |= LISTSTORE_CANONICAL;
+    }
 
-    listRepPtr->canonicalFlag = 1;
-
-    /*
-     * Handle empty list case first, so rest of the routine is simpler.
-     */
+    /* Handle empty list case first, so rest of the routine is simpler. */
 
     if (numElems == 0) {
-	Tcl_InitStringRep(listPtr, NULL, 0);
+	Tcl_InitStringRep(listObj, NULL, 0);
 	return;
     }
 
-    /*
-     * Pass 1: estimate space, gather flags.
-     */
+    /* Pass 1: estimate space, gather flags. */
 
     if (numElems <= LOCAL_SIZE) {
 	flagPtr = localFlags;
     } else {
-	/*
-	 * We know numElems <= LIST_MAX, so this is safe.
-	 */
-
+	/* We know numElems <= LIST_MAX, so this is safe. */
 	flagPtr = (char *)Tcl_Alloc(numElems);
     }
-    elemPtrs = listRepPtr->elements;
     for (i = 0; i < numElems; i++) {
 	flagPtr[i] = (i ? TCL_DONT_QUOTE_HASH : 0);
 	elem = Tcl_GetStringFromObj(elemPtrs[i], &length);
 	bytesNeeded += TclScanElement(elem, length, flagPtr+i);
+	if (bytesNeeded < 0) {
+	    /* TODO - what is the max #define for Tcl9? */
+	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
+	}
+    }
+    /* TODO - what is the max #define for Tcl9? */
+    if (bytesNeeded > INT_MAX - numElems + 1) {
+	Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
     }
     bytesNeeded += numElems - 1;
 
@@ -2146,7 +3327,7 @@ UpdateStringOfList(
      * Pass 2: copy into string rep buffer.
      */
 
-    start = dst = Tcl_InitStringRep(listPtr, NULL, bytesNeeded);
+    start = dst = Tcl_InitStringRep(listObj, NULL, bytesNeeded);
     TclOOM(dst, bytesNeeded);
     for (i = 0; i < numElems; i++) {
 	flagPtr[i] |= (i ? TCL_DONT_QUOTE_HASH : 0);
@@ -2156,7 +3337,7 @@ UpdateStringOfList(
     }
 
     /* Set the string length to what was actually written, the safe choice */
-    (void) Tcl_InitStringRep(listPtr, NULL, dst - 1 - start);
+    (void) Tcl_InitStringRep(listObj, NULL, dst - 1 - start);
 
     if (flagPtr != localFlags) {
 	Tcl_Free(flagPtr);
diff --git a/tests-perf/comparePerf.tcl b/tests-perf/comparePerf.tcl
new file mode 100644
index 0000000..f35da21
--- /dev/null
+++ b/tests-perf/comparePerf.tcl
@@ -0,0 +1,371 @@
+#!/usr/bin/tclsh
+# ------------------------------------------------------------------------
+#
+# comparePerf.tcl --
+#
+#  Script to compare performance data from multiple runs.
+#
+# ------------------------------------------------------------------------
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file.
+#
+# Usage:
+#   tclsh comparePerf.tcl [--regexp RE] [--ratio time|rate] [--combine] [--base BASELABEL] PERFFILE ...
+#
+# The test data from each input file is tabulated so as to compare the results
+# of test runs. If a PERFFILE does not exist, it is retried by adding the
+# .perf extension. If the --regexp is specified, only test results whose
+# id matches RE are examined.
+#
+# If the --combine option is specified, results of test sets with the same
+# label are combined and averaged in the output.
+#
+# If the --base option is specified, the BASELABEL is used as the label to use
+# the base timing. Otherwise, the label of the first data file is used.
+#
+# If --ratio option is "time" the ratio of test timing vs base test timing
+# is shown. If "rate" (default) the inverse is shown.
+#
+# If --no-header is specified, the header describing test configuration is
+# not output.
+#
+# The format of input files is as follows:
+#
+# Each line must begin with one of the characters below followed by a space
+# followed by a string whose semantics depend on the initial character.
+# E - Full path to the Tcl executable that was used to generate the file
+# V - The Tcl patchlevel of the implementation
+# D - A description for the test run for human consumption
+# L - A label used to identify run environment. The --combine option will
+#     average all measuremets that have the same label. An input file without
+#     a label is treated as having a unique label and not combined with any other.
+# P - A test measurement (see below)
+# R - The number of runs made for the each test
+# # - A comment, may be an arbitrary string. Usually included in performance
+#     data to describe the test. This is silently ignored
+#
+# Any lines not matching one of the above are ignored with a warning to stderr.
+#
+# A line beginning with the "P" marker is a test measurement. The first word
+# following is a floating point number representing the test runtime.
+# The remaining line (after trimming of whitespace) is the id of the test.
+# Test generators are encouraged to make the id a well-defined machine-parseable
+# as well human readable description of the test. The id must not appear more
+# than once. An example test measurement line:
+# P    2.32280 linsert in unshared L[10000] 1 elems 10000 times at 0 (var)
+# Note here the iteration count is not present.
+#
+
+namespace eval perf::compare {
+    # List of dictionaries, one per input file
+    variable PerfData
+}
+
+proc perf::compare::warn {message} {
+    puts stderr "Warning: $message"
+}
+proc perf::compare::print {text} {
+    puts stdout $text
+}
+proc perf::compare::slurp {testrun_path} {
+    variable PerfData
+
+    set runtimes [dict create]
+
+    set path [file normalize $testrun_path]
+    set fd [open $path]
+    array set header {}
+    while {[gets $fd line] >= 0} {
+        set line [regsub -all {\s+} [string trim $line] " "]
+        switch -glob -- $line {
+            "#*" {
+                # Skip comments
+            }
+            "R *" -
+            "L *" -
+            "D *" -
+            "V *" -
+            "T *" -
+            "E *" {
+                set marker [lindex $line 0]
+                if {[info exists header($marker)]} {
+                    warn "Ignoring $marker record (duplicate): \"$line\""
+                }
+                set header($marker) [string range $line 2 end]
+            }
+            "P *" {
+                if {[scan $line "P %f %n" runtime id_start] == 2} {
+                    set id [string range $line $id_start end]
+                    if {[dict exists $runtimes $id]} {
+                        warn "Ignoring duplicate test id \"$id\""
+                    } else {
+                        dict set runtimes $id $runtime
+                    }
+                } else {
+                    warn "Invalid test result line format: \"$line\""
+                }
+            }
+            default {
+                puts stderr "Warning: ignoring unrecognized line \"$line\""
+            }
+        }
+    }
+    close $fd
+
+    set result [dict create Input $path Runtimes $runtimes]
+    foreach {c k} {
+        L Label
+        V Version
+        E Executable
+        D Description
+    } {
+        if {[info exists header($c)]} {
+            dict set result $k $header($c)
+        }
+    }
+
+    return $result
+}
+
+proc perf::compare::burp {test_sets} {
+    variable Options
+
+    # Print the key for each test run
+    set header "           "
+    set separator "           "
+    foreach test_set $test_sets {
+        set test_set_key "\[[incr test_set_num]\]"
+        if {! $Options(--no-header)} {
+            print "$test_set_key"
+            foreach k {Label Executable Version Input Description} {
+                if {[dict exists $test_set $k]} {
+                    print "$k: [dict get $test_set $k]"
+                }
+            }
+        }
+        append header $test_set_key $separator
+        set separator "                 "; # Expand because later columns have ratio
+    }
+    set header [string trimright $header]
+
+    if {! $Options(--no-header)} {
+        print ""
+        if {$Options(--ratio) eq "rate"} {
+            set ratio_description "ratio of baseline to the measurement (higher is faster)."
+        } else {
+            set ratio_description "ratio of measurement to the baseline (lower is faster)."
+        }
+        print "The first column \[1\] is the baseline measurement."
+        print "Subsequent columns are pairs of the additional measurement and "
+        print $ratio_description
+        print ""
+    }
+
+    # Print the actual test run data
+
+    print $header
+    set test_sets [lassign $test_sets base_set]
+    set fmt {%#10.5f}
+    set fmt_ratio {%-6.2f}
+    foreach {id base_runtime} [dict get $base_set Runtimes] {
+        if {[info exists Options(--regexp)]} {
+            if {![regexp $Options(--regexp) $id]} {
+                continue
+            }
+        }
+        if {$Options(--print-test-number)} {
+            set line "[format %-4s [incr counter].]"
+        } else {
+            set line ""
+        }
+        append line [format $fmt $base_runtime]
+        foreach test_set $test_sets {
+            if {[dict exists $test_set Runtimes $id]} {
+                set runtime [dict get $test_set Runtimes $id]
+                if {$Options(--ratio) eq "time"} {
+                    if {$base_runtime != 0} {
+                        set ratio [format $fmt_ratio [expr {$runtime/$base_runtime}]]
+                    } else {
+                        if {$runtime == 0} {
+                            set ratio "NaN   "
+                        } else {
+                            set ratio "Inf   "
+                        }
+                    }
+                } else {
+                    if {$runtime != 0} {
+                        set ratio [format $fmt_ratio [expr {$base_runtime/$runtime}]]
+                    } else {
+                        if {$base_runtime == 0} {
+                            set ratio "NaN   "
+                        } else {
+                            set ratio "Inf   "
+                        }
+                    }
+                }
+                append line "|" [format $fmt $runtime] "|" $ratio
+            } else {
+                append line [string repeat { } 11]
+            }
+        }
+        append line "|" $id
+        print $line
+    }
+}
+
+proc perf::compare::chew {test_sets} {
+    variable Options
+
+    # Combine test sets that have the same label, averaging the values
+    set unlabeled_sets {}
+    array set labeled_sets {}
+
+    foreach test_set $test_sets {
+        # If there is no label, treat as independent set
+        if {![dict exists $test_set Label]} {
+            lappend unlabeled_sets $test_set
+        } else {
+            lappend labeled_sets([dict get $test_set Label]) $test_set
+        }
+    }
+
+    foreach label [array names labeled_sets] {
+        set combined_set [lindex $labeled_sets($label) 0]
+        set runtimes [dict get $combined_set Runtimes]
+        foreach test_set [lrange $labeled_sets($label) 1 end] {
+            dict for {id timing} [dict get $test_set Runtimes] {
+                dict lappend runtimes $id $timing
+            }
+        }
+        dict for {id timings} $runtimes {
+            set total [tcl::mathop::+ {*}$timings]
+            dict set runtimes $id [expr {$total/[llength $timings]}]
+        }
+        dict set combined_set Runtimes $runtimes
+        set labeled_sets($label) $combined_set
+    }
+
+    # Choose the "base" test set
+    if {![info exists Options(--base)]} {
+        set first_set [lindex $test_sets 0]
+        if {[dict exists $first_set Label]} {
+            # Use label of first as the base
+            set Options(--base) [dict get $first_set Label]
+        }
+    }
+
+    if {[info exists Options(--base)] && $Options(--base) ne ""} {
+        lappend combined_sets $labeled_sets($Options(--base));# Will error if no such
+        unset labeled_sets($Options(--base))
+    } else {
+        lappend combined_sets [lindex $unlabeled_sets 0]
+        set unlabeled_sets [lrange $unlabeled_sets 1 end]
+    }
+    foreach label [array names labeled_sets] {
+        lappend combined_sets $labeled_sets($label)
+    }
+    lappend combined_sets {*}$unlabeled_sets
+
+    return $combined_sets
+}
+
+proc perf::compare::setup {argv} {
+    variable Options
+
+    array set Options {
+        --ratio rate
+        --combine 0
+        --print-test-number 0
+        --no-header 0
+    }
+    while {[llength $argv]} {
+        set argv [lassign $argv arg]
+        switch -glob -- $arg {
+            -r -
+            --regexp {
+                if {[llength $argv] == 0} {
+                    error "Missing value for option $arg"
+                }
+                set argv [lassign $argv val]
+                set Options(--regexp) $val
+            }
+            --ratio {
+                if {[llength $argv] == 0} {
+                    error "Missing value for option $arg"
+                }
+                set argv [lassign $argv val]
+                if {$val ni {time rate}} {
+                    error "Value for option $arg must be either \"time\" or \"rate\""
+                }
+                set Options(--ratio) $val
+            }
+            --print-test-number -
+            --combine -
+            --no-header {
+                set Options($arg) 1
+            }
+            --base {
+                if {[llength $argv] == 0} {
+                    error "Missing value for option $arg"
+                }
+                set argv [lassign $argv val]
+                set Options($arg) $val
+            }
+            -- {
+                # Remaining will be passed back to the caller
+                break
+            }
+            --* {
+                error "Unknown option $arg"
+            }
+            -* {
+                error "Unknown option -[lindex $arg 0]"
+            }
+            default {
+                # Remaining will be passed back to the caller
+                set argv [linsert $argv 0 $arg]
+                break;
+            }
+        }
+    }
+
+    set paths {}
+    foreach path $argv {
+        set path [file join $path]; # Convert from native else glob fails
+        if {[file isfile $path]} {
+            lappend paths $path
+            continue
+        }
+        if {[file isfile $path.perf]} {
+            lappend paths $path.perf
+            continue
+        }
+        lappend paths {*}[glob -nocomplain $path]
+    }
+    return $paths
+}
+proc perf::compare::main {} {
+    variable Options
+
+    set paths [setup $::argv]
+    if {[llength $paths] == 0} {
+        error "No test data files specified."
+    }
+    set test_data [list ]
+    set seen [dict create]
+    foreach path $paths {
+        if {![dict exists $seen $path]} {
+            lappend test_data [slurp $path]
+            dict set seen $path ""
+        }
+    }
+
+    if {$Options(--combine)} {
+        set test_data [chew $test_data]
+    }
+
+    burp $test_data
+}
+
+perf::compare::main
diff --git a/tests-perf/listPerf.tcl b/tests-perf/listPerf.tcl
new file mode 100644
index 0000000..4472810
--- /dev/null
+++ b/tests-perf/listPerf.tcl
@@ -0,0 +1,1290 @@
+#!/usr/bin/tclsh
+# ------------------------------------------------------------------------
+#
+# listPerf.tcl --
+#
+#  This file provides performance tests for list operations.
+#
+# ------------------------------------------------------------------------
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file.
+#
+# Note: this file does not use the test-performance.tcl framework as we want
+# more direct control over timerate options.
+
+catch {package require twapi}
+
+namespace eval perf::list {
+    variable perfScript [file normalize [info script]]
+
+    # Test for each of these lengths
+    variable Lengths {10 100 1000 10000}
+
+    variable RunTimes
+    set RunTimes(command) 0.0
+    set RunTimes(total) 0.0
+
+    variable Options
+    array set Options {
+        --print-comments   0
+        --print-iterations 0
+    }
+
+    # Procs used for calibrating overhead
+    proc proc2args {a b} {}
+    proc proc3args {a b c} {}
+
+    proc print {s} {
+        puts $s
+    }
+    proc print_usage {} {
+        puts stderr "Usage: [file tail [info nameofexecutable]] $::argv0 \[options\] \[command ...\]"
+        puts stderr "\t--description DESC\tHuman readable description of test run"
+        puts stderr "\t--label LABEL\tA label used to identify test environment"
+        puts stderr "\t--print-comments\tPrint comment for each test"
+        puts stderr "\t--print-iterations\tPrint number of iterations run for each test"
+    }
+
+    proc setup {argv} {
+        variable Options
+        variable Lengths
+
+        while {[llength $argv]} {
+            set argv [lassign $argv arg]
+            switch -glob -- $arg {
+                --print-comments -
+                --print-iterations {
+                    set Options($arg) 1
+                }
+                --label -
+                --description {
+                    if {[llength $argv] == 0} {
+                        error "Missing value for option $arg"
+                    }
+                    set argv [lassign $argv val]
+                    set Options($arg) $val
+                }
+                --lengths {
+                    if {[llength $argv] == 0} {
+                        error "Missing value for option $arg"
+                    }
+                    set argv [lassign $argv val]
+                    set Lengths $val
+                }
+                -- {
+                    # Remaining will be passed back to the caller
+                    break
+                }
+                --* {
+                    error "Unknown option $arg"
+                }
+                default {
+                    # Remaining will be passed back to the caller
+                    set argv [linsert $argv 0 $arg]
+                    break;
+                }
+            }
+        }
+
+        return $argv
+    }
+    proc format_timings {us iters} {
+        variable Options
+        if {!$Options(--print-iterations)} {
+            return "[format {%#10.4f} $us]"
+        }
+        return "[format {%#10.4f} $us] [format {%8d} $iters]"
+    }
+    proc measure {id script args} {
+        variable NullOverhead
+        variable RunTimes
+        variable Options
+
+        set opts(-overhead) ""
+        set opts(-runs) 5
+        while {[llength $args]} {
+            set args [lassign $args opt]
+            if {[llength $args] == 0} {
+                error "No argument supplied for $opt option. Test: $id"
+            }
+            set args [lassign $args val]
+            switch $opt {
+                -setup -
+                -cleanup -
+                -overhead -
+                -time -
+                -runs -
+                -reps {
+                    set opts($opt) $val
+                }
+                default {
+                    error "Unknown option $opt. Test: $id"
+                }
+            }
+        }
+
+        set timerate_args {}
+        if {[info exists opts(-time)]} {
+            lappend timerate_args $opts(-time)
+        }
+        if {[info exists opts(-reps)]} {
+            if {[info exists opts(-time)]} {
+                set timerate_args [list $opts(-time) $opts(-reps)]
+            } else {
+                # Force the default for first time option
+                set timerate_args [list 1000 $opts(-reps)]
+            }
+        } elseif {[info exists opts(-time)]} {
+            set timerate_args [list $opts(-time)]
+        }
+        if {[info exists opts(-setup)]} {
+            uplevel 1 $opts(-setup)
+        }
+        # Cache the empty overhead to prevent unnecessary delays. Note if you modify
+        # to cache other scripts, the cache key must be AFTER substituting the
+        # overhead script in the caller's context.
+        if {$opts(-overhead) eq ""} {
+            if {![info exists NullOverhead]} {
+                set NullOverhead [lindex [timerate {}] 0]
+            }
+            set overhead_us $NullOverhead
+        } else {
+            # The overhead measurements might use setup so we need to setup
+            # first and then cleanup in preparation for setting up again for
+            # the script to be measured
+            if {[info exists opts(-setup)]} {
+                uplevel 1 $opts(-setup)
+            }
+            set overhead_us [lindex [uplevel 1 [list timerate $opts(-overhead)]] 0]
+            if {[info exists opts(-cleanup)]} {
+                uplevel 1 $opts(-cleanup)
+            }
+        }
+        set timings {}
+        for {set i 0} {$i < $opts(-runs)} {incr i} {
+            if {[info exists opts(-setup)]} {
+                uplevel 1 $opts(-setup)
+            }
+            lappend timings [uplevel 1 [list timerate -overhead $overhead_us $script {*}$timerate_args]]
+            if {[info exists opts(-cleanup)]} {
+                uplevel 1 $opts(-cleanup)
+            }
+        }
+        set timings [lsort -real -index 0 $timings]
+        if {$opts(-runs) > 15} {
+            set ignore [expr {$opts(-runs)/8}]
+        } elseif {$opts(-runs) >= 5} {
+            set ignore 2
+        } else {
+            set ignore 0
+        }
+        # Ignore highest and lowest
+        set timings [lrange $timings 0 end-$ignore]
+        # Average it out
+        set us 0
+        set iters 0
+        foreach timing $timings {
+            set us [expr {$us + [lindex $timing 0]}]
+            set iters [expr {$iters + [lindex $timing 2]}]
+        }
+        set us [expr {$us/[llength $timings]}]
+        set iters [expr {$iters/[llength $timings]}]
+
+        set RunTimes(command) [expr {$RunTimes(command) + $us}]
+        print "P [format_timings $us $iters] $id"
+    }
+    proc comment {args} {
+        variable Options
+        if {$Options(--print-comments)} {
+            print "# [join $args { }]"
+        }
+    }
+    proc spanned_list {len} {
+        # Note - for small len, this will not create a spanned list
+        set delta [expr {$len/8}]
+        return [lrange [lrepeat [expr {$len+(2*$delta)}] a] $delta [expr {$delta+$len-1}]]
+    }
+    proc print_separator {command} {
+        comment [string repeat = 80]
+        comment Command: $command
+    }
+
+    oo::class create ListPerf {
+        constructor {args} {
+            my variable Opts
+            # Note default Opts can be overridden in construct as well as in measure
+            set Opts [dict merge {
+                -setup {
+                    set L [lrepeat $len a]
+                    set Lspan [perf::list::spanned_list $len]
+                } -cleanup {
+                    unset -nocomplain L
+                    unset -nocomplain Lspan
+                    unset -nocomplain L2
+                }
+            } $args]
+        }
+        method measure {comment script locals args} {
+            my variable Opts
+            dict with locals {}
+            ::perf::list::measure $comment $script {*}[dict merge $Opts $args]
+        }
+        method option {opt val} {
+            my variable Opts
+            dict set Opts $opt $val
+        }
+        method option_unset {opt} {
+            my variable Opts
+            unset -nocomplain Opts($opt)
+        }
+    }
+
+    proc linsert_describe {share_mode len at num iters} {
+        return "linsert L\[$len\] $share_mode $num elems $iters times at $at"
+    }
+    proc linsert_perf {} {
+        variable Lengths
+
+        print_separator linsert
+
+        ListPerf create perf -overhead {set L {}} -time 1000
+
+        # Note: Const indices take different path through bytecode than variable
+        # indices hence separate cases below
+
+
+        # Var case
+        foreach share_mode {shared unshared} {
+            set idx 0
+            if {$share_mode eq "shared"} {
+                comment == Insert into empty lists
+                comment Insert one element into empty list
+                measure [linsert_describe shared 0 "0 (var)" 1 1] {linsert $L $idx ""} -setup {set idx 0; set L {}}
+            } else {
+                comment == Insert into empty lists
+                comment Insert one element into empty list
+                measure [linsert_describe unshared 0 "0 (var)" 1 1] {linsert {} $idx ""} -setup {set idx 0}
+            }
+            foreach idx_str [list 0 1 mid end-1 end] {
+                foreach len $Lengths {
+                    if {$idx_str eq "mid"} {
+                        set idx [expr {$len/2}]
+                    } else {
+                        set idx $idx_str
+                    }
+                    # perf option -reps $reps
+                    set reps 1000
+                    if {$share_mode eq "shared"} {
+                        comment Insert once to shared list with variable index
+                        perf measure [linsert_describe shared $len "$idx (var)" 1 1] \
+                            {linsert $L $idx x} [list len $len idx $idx] -overhead {} -reps 100000
+
+                        comment Insert multiple times to shared list with variable index
+                        perf measure [linsert_describe shared $len "$idx (var)" 1 $reps] {
+                            set L [linsert $L $idx X]
+                        } [list len $len idx $idx] -reps $reps
+
+                        comment Insert multiple items multiple times to shared list with variable index
+                        perf measure [linsert_describe shared $len "$idx (var)" 5 $reps] {
+                            set L [linsert $L $idx X X X X X]
+                        } [list len $len idx $idx] -reps $reps
+                    } else {
+                        # NOTE : the Insert once case is left out for unshared lists
+                        # because it requires re-init on every iteration resulting
+                        # in a lot of measurement noise
+                        comment Insert multiple times to unshared list with variable index
+                        perf measure [linsert_describe unshared $len "$idx (var)" 1 $reps] {
+                            set L [linsert $L[set L {}] $idx X]
+                        } [list len $len idx $idx] -reps $reps
+                        comment Insert multiple items multiple times to unshared list with variable index
+                        perf measure [linsert_describe unshared $len "$idx (var)" 5 $reps] {
+                            set L [linsert $L[set L {}] $idx X X X X X]
+                        } [list len $len idx $idx] -reps $reps
+                    }
+                }
+            }
+        }
+
+        # Const index
+        foreach share_mode {shared unshared} {
+            if {$share_mode eq "shared"} {
+                comment == Insert into empty lists
+                comment Insert one element into empty list
+                measure [linsert_describe shared 0 "0 (const)" 1 1] {linsert $L 0 ""} -setup {set L {}}
+            } else {
+                comment == Insert into empty lists
+                comment Insert one element into empty list
+                measure [linsert_describe unshared 0 "0 (const)" 1 1] {linsert {} 0 ""}
+            }
+            foreach idx_str [list 0 1 mid end end-1] {
+                foreach len $Lengths {
+                    # Note end, end-1 explicitly calculated as otherwise they
+                    # are not treated as const
+                    if {$idx_str eq "mid"} {
+                        set idx [expr {$len/2}]
+                    } elseif {$idx_str eq "end"} {
+                        set idx [expr {$len-1}]
+                    } elseif {$idx_str eq "end-1"} {
+                        set idx [expr {$len-2}]
+                    } else {
+                        set idx $idx_str
+                    }
+                    #perf option -reps $reps
+                    set reps 100
+                    if {$share_mode eq "shared"} {
+                        comment Insert once to shared list with const index
+                        perf measure [linsert_describe shared $len "$idx (const)" 1 1] \
+                            "linsert \$L $idx x" [list len $len] -overhead {} -reps 10000
+
+                        comment Insert multiple times to shared list with const index
+                        perf measure [linsert_describe shared $len "$idx (const)" 1 $reps] \
+                            "set L \[linsert \$L $idx X\]" [list len $len] -reps $reps
+
+                        comment Insert multiple items multiple times to shared list with const index
+                        perf measure [linsert_describe shared $len "$idx (const)" 5 $reps] \
+                            "set L \[linsert \$L $idx X X X X X\]" [list len $len] -reps $reps
+                    } else {
+                        comment Insert multiple times to unshared list with const index
+                        perf measure [linsert_describe unshared $len "$idx (const)" 1 $reps] \
+                            "set L \[linsert \$L\[set L {}\] $idx X]" [list len $len] -reps $reps
+
+                        comment Insert multiple items multiple times to unshared list with const index
+                        perf measure [linsert_describe unshared $len "$idx (const)" 5 $reps] \
+                            "set L \[linsert \$L\[set L {}\] $idx X X X X X]" [list len $len] -reps $reps
+                    }
+                }
+            }
+        }
+
+        # Note: no span tests because the inserts above will themselves create
+        # spanned lists
+
+        perf destroy
+    }
+
+    proc list_describe {len text} {
+        return "list L\[$len\] $text"
+    }
+    proc list_perf {} {
+        variable Lengths
+
+        print_separator list
+
+        ListPerf create perf
+        foreach len $Lengths {
+            set s [join [lrepeat $len x]]
+            comment Create a list from a string
+            perf measure [list_describe $len "from a string"] {list $s} [list s $s len $len]
+        }
+        foreach len $Lengths {
+            comment Create a list from expansion - single list (special optimal case)
+            perf measure [list_describe $len "from a {*}list"] {list {*}$L} [list len $len]
+            comment Create a list from two lists - real test of expansion speed
+            perf measure [list_describe $len "from a {*}list {*}list"] {list {*}$L {*}$L} [list len [expr {$len/2}]]
+        }
+    }
+
+    proc lappend_describe {share_mode len num iters} {
+        return "lappend L\[$len\] $share_mode $num elems $iters times"
+    }
+    proc lappend_perf {} {
+        variable Lengths
+
+        print_separator lappend
+
+        ListPerf create perf -setup {set L [lrepeat [expr {$len/4}] x]}
+
+        # Shared
+        foreach len $Lengths {
+            comment Append to a shared list variable multiple times
+            perf measure [lappend_describe shared [expr {$len/2}] 1 $len] {
+                set L2 $L; # Make shared
+                lappend L x
+            } [list len $len] -reps $len -overhead {set L2 $L}
+        }
+
+        # Unshared
+        foreach len $Lengths {
+            comment Append to a unshared list variable multiple times
+            perf measure [lappend_describe unshared [expr {$len/2}] 1 $len] {
+                lappend L x
+            } [list len $len] -reps $len
+        }
+
+        # Span
+        foreach len $Lengths {
+            comment Append to a unshared-span list variable multiple times
+            perf measure [lappend_describe unshared-span [expr {$len/2}] 1 $len] {
+                lappend Lspan x
+            } [list len $len] -reps $len
+        }
+
+        perf destroy
+    }
+
+    proc lpop_describe {share_mode len at reps} {
+        return "lpop L\[$len\] $share_mode at $at $reps times"
+    }
+    proc lpop_perf {} {
+        variable Lengths
+
+        print_separator lpop
+
+        ListPerf create perf
+
+        # Shared
+        perf option -overhead {set L2 $L}
+        foreach len $Lengths {
+            set reps [expr {($len >= 1000 ? ($len/2) : $len) - 2}]
+            foreach idx {0 1 end-1 end}  {
+                comment Pop element at position $idx from a shared list variable
+                perf measure [lpop_describe shared $len $idx $reps] {
+                    set L2 $L
+                    lpop L $idx
+                } [list len $len idx $idx] -reps $reps
+            }
+        }
+
+        # Unshared
+        perf option -overhead {}
+        foreach len $Lengths {
+            set reps [expr {($len >= 1000 ? ($len/2) : $len) - 2}]
+            foreach idx {0 1 end-1 end}  {
+                comment Pop element at position $idx from an unshared list variable
+                perf measure [lpop_describe unshared $len $idx $reps] {
+                    lpop L $idx
+                } [list len $len idx $idx] -reps $reps
+            }
+        }
+
+        perf destroy
+
+        # Nested
+        ListPerf create perf -setup {
+            set L [lrepeat $len [list a b]]
+        }
+
+        # Shared, nested index
+        perf option -overhead {set L2 $L; set L L2}
+        foreach len $Lengths {
+            set reps [expr {($len >= 1000 ? ($len/2) : $len) - 2}]
+            foreach idx {0 1 end-1 end}  {
+                perf measure [lpop_describe shared $len "{$idx 0}" $reps] {
+                    set L2 $L
+                    lpop L $idx 0
+                    set L $L2
+                } [list len $len idx $idx] -reps $reps
+            }
+        }
+
+        # TODO - Nested Unshared
+        # Not sure how to measure performance. When unshared there is no copy
+        # so deleting a nested index repeatedly is not feasible
+
+        perf destroy
+    }
+
+    proc lassign_describe {share_mode len num reps} {
+        return "lassign L\[$len\] $share_mode $num elems $reps times"
+    }
+    proc lassign_perf {} {
+        variable Lengths
+
+        print_separator lassign
+
+        ListPerf create perf
+
+        foreach share_mode {shared unshared} {
+            foreach len $Lengths {
+                if {$share_mode eq "shared"} {
+                    set reps 1000
+                    comment Reflexive lassign - shared
+                    perf measure [lassign_describe shared $len 1 $reps] {
+                        set L2 $L
+                        set L2 [lassign $L2 v]
+                    } [list len $len] -overhead {set L2 $L} -reps $reps
+
+                    comment Reflexive lassign - shared, multiple
+                    perf measure [lassign_describe shared $len 5 $reps] {
+                        set L2 $L
+                        set L2 [lassign $L2 a b c d e]
+                    } [list len $len] -overhead {set L2 $L} -reps $reps
+                } else {
+                    set reps [expr {($len >= 1000 ? ($len/2) : $len) - 2}]
+                    comment Reflexive lassign - unshared
+                    perf measure [lassign_describe unshared $len 1 $reps] {
+                        set L [lassign $L v]
+                    } [list len $len] -reps $reps
+                }
+            }
+        }
+        perf destroy
+    }
+
+    proc lrepeat_describe {len num} {
+        return "lrepeat L\[$len\] $num elems at a time"
+    }
+    proc lrepeat_perf {} {
+        variable Lengths
+
+        print_separator lrepeat
+
+        ListPerf create perf -reps 100000
+        foreach len $Lengths {
+            comment Generate a list from a single repeated element
+            perf measure [lrepeat_describe $len 1] {
+                lrepeat $len a
+            } [list len $len]
+
+            comment Generate a list from multiple repeated elements
+            perf measure [lrepeat_describe $len 5] {
+                lrepeat $len a b c d e
+            } [list len $len]
+        }
+
+        perf destroy
+    }
+
+    proc lreverse_describe {share_mode len} {
+        return "lreverse L\[$len\] $share_mode"
+    }
+    proc lreverse_perf {} {
+        variable Lengths
+
+        print_separator lreverse
+
+        ListPerf create perf -reps 10000
+
+        foreach share_mode {shared unshared} {
+            foreach len $Lengths {
+                if {$share_mode eq "shared"} {
+                    comment Reverse a shared list
+                    perf measure [lreverse_describe shared $len] {
+                        lreverse $L
+                    } [list len $len]
+
+                    if {$len > 100} {
+                        comment Reverse a shared-span list
+                        perf measure [lreverse_describe shared-span $len] {
+                            lreverse $Lspan
+                        } [list len $len]
+                    }
+                } else {
+                    comment Reverse a unshared list
+                    perf measure [lreverse_describe unshared $len] {
+                        set L [lreverse $L[set L {}]]
+                    } [list len $len] -overhead {set L $L; set L {}}
+
+                    if {$len >= 100} {
+                        comment Reverse a unshared-span list
+                        perf measure [lreverse_describe unshared-span $len] {
+                            set Lspan [lreverse $Lspan[set Lspan {}]]
+                        } [list len $len] -overhead {set Lspan $Lspan; set Lspan {}}
+                    }
+                }
+            }
+        }
+
+        perf destroy
+    }
+
+    proc llength_describe {share_mode len} {
+        return "llength L\[$len\] $share_mode"
+    }
+    proc llength_perf {} {
+        variable Lengths
+
+        print_separator llength
+
+        ListPerf create perf -reps 100000
+
+        foreach len $Lengths {
+            comment Length of a list
+            perf measure [llength_describe shared $len] {
+                llength $L
+            } [list len $len]
+
+            if {$len >= 100} {
+                comment Length of a span list
+                perf measure [llength_describe shared-span $len] {
+                    llength $Lspan
+                } [list len $len]
+            }
+        }
+
+        perf destroy
+    }
+
+    proc lindex_describe {share_mode len at} {
+        return "lindex L\[$len\] $share_mode at $at"
+    }
+    proc lindex_perf {} {
+        variable Lengths
+
+        print_separator lindex
+
+        ListPerf create perf -reps 100000
+
+        foreach len $Lengths {
+            comment Index into a list
+            set idx [expr {$len/2}]
+            perf measure [lindex_describe shared $len $idx] {
+                lindex $L $idx
+            } [list len $len idx $idx]
+
+            if {$len >= 100} {
+                comment Index into a span list
+                perf measure [lindex_describe shared-span $len $idx] {
+                    lindex $Lspan $idx
+                } [list len $len idx $idx]
+            }
+        }
+
+        perf destroy
+    }
+
+    proc lrange_describe {share_mode len range} {
+        return "lrange L\[$len\] $share_mode range $range"
+    }
+
+    proc lrange_perf {} {
+        variable Lengths
+
+        print_separator lrange
+
+        ListPerf create perf -time 1000 -reps 100000
+
+        foreach share_mode {shared unshared} {
+            foreach len $Lengths {
+                set eighth [expr {$len/8}]
+                set ranges [list \
+                                [list 0 0]  [list 0 end-1] \
+                                [list $eighth [expr {3*$eighth}]] \
+                                [list $eighth [expr {7*$eighth}]] \
+                                [list 1 end] [list end-1 end] \
+                               ]
+                foreach range $ranges {
+                    comment Range $range in $share_mode list of length $len
+                    if {$share_mode eq "shared"} {
+                        perf measure [lrange_describe shared $len $range] \
+                            "lrange \$L $range" [list len $len range $range]
+                    } else {
+                        perf measure [lrange_describe unshared $len $range] \
+                            "lrange \[lrepeat \$len\ a] $range" \
+                            [list len $len range $range] -overhead {lrepeat $len a}
+                    }
+                }
+
+                if {$len >= 100} {
+                    foreach range $ranges {
+                        comment Range $range in ${share_mode}-span list of length $len
+                        if {$share_mode eq "shared"} {
+                            perf measure [lrange_describe shared-span $len $range] \
+                                "lrange \$Lspan {*}$range" [list len $len range $range]
+                        } else {
+                            perf measure [lrange_describe unshared-span $len $range] \
+                                "lrange \[perf::list::spanned_list \$len\] $range" \
+                                [list len $len range $range] -overhead {perf::list::spanned_list $len}
+                        }
+                    }
+                }
+            }
+        }
+
+        perf destroy
+    }
+
+    proc lset_describe {share_mode len at} {
+        return "lset L\[$len\] $share_mode at $at"
+    }
+    proc lset_perf {} {
+        variable Lengths
+
+        print_separator lset
+
+        ListPerf create perf -reps 10000
+
+        # Shared
+        foreach share_mode {shared unshared} {
+            foreach len $Lengths {
+                foreach idx {0 1 end-1 end end+1}  {
+                    comment lset at position $idx in a $share_mode list variable
+                    if {$share_mode eq "shared"} {
+                        perf measure [lset_describe shared $len $idx] {
+                            set L2 $L
+                            lset L $idx X
+                        } [list len $len idx $idx] -overhead {set L2 $L}
+                    } else {
+                        perf measure [lset_describe unshared $len $idx] {
+                            lset L $idx X
+                        } [list len $len idx $idx]
+                    }
+                }
+            }
+        }
+
+        perf destroy
+
+        # Nested
+        ListPerf create perf -setup {
+            set L [lrepeat $len [list a b]]
+        }
+
+        foreach share_mode {shared unshared} {
+            foreach len $Lengths {
+                foreach idx {0 1 end-1 end}  {
+                    comment lset at position $idx in a $share_mode list variable
+                    if {$share_mode eq "shared"} {
+                        perf measure [lset_describe shared $len "{$idx 0}"] {
+                            set L2 $L
+                            lset L $idx 0 X
+                        } [list len $len idx $idx] -overhead {set L2 $L}
+                    } else {
+                        perf measure [lset_describe unshared $len "{$idx 0}"] {
+                            lset L $idx 0 {X Y}
+                        } [list len $len idx $idx]
+                    }
+                }
+            }
+        }
+
+        perf destroy
+    }
+
+    proc lremove_describe {share_mode len at nremoved} {
+        return "lremove L\[$len\] $share_mode $nremoved elements at $at"
+    }
+    proc lremove_perf {} {
+        variable Lengths
+
+        print_separator lremove
+
+        ListPerf create perf -reps 10000
+
+        foreach share_mode {shared unshared} {
+            foreach len $Lengths {
+                foreach idx [list 0 1 [expr {$len/2}] end-1 end] {
+                    if {$share_mode eq "shared"} {
+                        comment Remove one element from shared list
+                        perf measure [lremove_describe shared $len $idx 1] \
+                            {lremove $L $idx} [list len $len idx $idx]
+
+                    } else {
+                        comment Remove one element from unshared list
+                        set reps [expr {$len >= 1000 ? ($len/8) : ($len-2)}]
+                        perf measure [lremove_describe unshared $len $idx 1] \
+                            {set L [lremove $L[set L {}] $idx]} [list len $len idx $idx] \
+                            -overhead {set L $L; set L {}} -reps $reps
+                    }
+                }
+                if {$share_mode eq "shared"} {
+                    comment Remove multiple elements from shared list
+                    perf measure [lremove_describe shared $len [list 0 1 [expr {$len/2}] end-1 end] 5] {
+                        lremove $L 0 1 [expr {$len/2}] end-1 end
+                    } [list len $len]
+                }
+            }
+            # Span
+            foreach len $Lengths {
+                foreach idx [list 0 1 [expr {$len/2}] end-1 end] {
+                    if {$share_mode eq "shared"} {
+                        comment Remove one element from shared-span list
+                        perf measure [lremove_describe shared-span $len $idx 1] \
+                            {lremove $Lspan $idx} [list len $len idx $idx]
+                    } else {
+                        comment Remove one element from unshared-span list
+                        set reps [expr {$len >= 1000 ? ($len/8) : ($len-2)}]
+                        perf measure [lremove_describe unshared-span $len $idx 1] \
+                            {set Lspan [lremove $Lspan[set Lspan {}] $idx]} [list len $len idx $idx] \
+                            -overhead {set Lspan $Lspan; set Lspan {}} -reps $reps
+                    }
+                }
+                if {$share_mode eq "shared"} {
+                    comment Remove multiple elements from shared-span list
+                    perf measure [lremove_describe shared-span $len [list 0 1 [expr {$len/2}] end-1 end] 5] {
+                        lremove $Lspan 0 1 [expr {$len/2}] end-1 end
+                    } [list len $len]
+                }
+            }
+        }
+
+        perf destroy
+    }
+
+    proc lreplace_describe {share_mode len first last ninsert {times 1}} {
+        if {$last < $first} {
+            return "lreplace L\[$len\] $share_mode 0 ($first:$last) elems at $first with $ninsert elems $times times."
+        }
+        return "lreplace L\[$len\] $share_mode $first:$last with $ninsert elems $times times."
+    }
+    proc lreplace_perf {} {
+        variable Lengths
+
+        print_separator lreplace
+
+        set default_reps 10000
+        ListPerf create perf -reps $default_reps
+
+        foreach share_mode {shared unshared} {
+            # Insert only
+            foreach len $Lengths {
+                set reps [expr {$len <= 100 ? ($len-2) : ($len/8)}]
+                foreach first [list 0 1 [expr {$len/2}] end-1 end] {
+                    if {$share_mode eq "shared"} {
+                        comment Insert one to shared list
+                        perf measure [lreplace_describe shared $len $first -1 1] {
+                            lreplace $L $first -1 x
+                        } [list len $len first $first]
+
+                        comment Insert multiple to shared list
+                        perf measure [lreplace_describe shared $len $first -1 10] {
+                            lreplace $L $first -1 X X X X X X X X X X
+                        } [list len $len first $first]
+
+                        comment Insert one to shared list repeatedly
+                        perf measure [lreplace_describe shared $len $first -1 1 $reps] {
+                            set L [lreplace $L $first -1 x]
+                        } [list len $len first $first] -reps $reps
+
+                        comment Insert multiple to shared list repeatedly
+                        perf measure [lreplace_describe shared $len $first -1 10 $reps] {
+                            set L [lreplace $L $first -1 X X X X X X X X X X]
+                        } [list len $len first $first] -reps $reps
+
+                    } else {
+                        comment Insert one to unshared list
+                        perf measure [lreplace_describe unshared $len $first -1 1] {
+                            set L [lreplace $L[set L {}] $first -1 x]
+                        } [list len $len first $first] -overhead {
+                            set L $L; set L {}
+                        } -reps $reps
+
+                        comment Insert multiple to unshared list
+                        perf measure [lreplace_describe unshared $len $first -1 10] {
+                            set L [lreplace $L[set L {}] $first -1 X X X X X X X X X X]
+                        } [list len $len first $first] -overhead {
+                            set L $L; set L {}
+                        } -reps $reps
+                    }
+                }
+            }
+
+            # Delete only
+            foreach len $Lengths {
+                set reps [expr {$len <= 100 ? ($len-2) : ($len/8)}]
+                foreach first [list 0 1 [expr {$len/2}] end-1 end] {
+                    if {$share_mode eq "shared"} {
+                        comment Delete one from shared list
+                        perf measure [lreplace_describe shared $len $first $first 0] {
+                            lreplace $L $first $first
+                        } [list len $len first $first]
+                    } else {
+                        comment Delete one from unshared list
+                        perf measure [lreplace_describe unshared $len $first $first 0] {
+                            set L [lreplace $L[set L {}] $first $first x]
+                        } [list len $len first $first] -overhead {
+                            set L $L; set L {}
+                        } -reps $reps
+                    }
+                }
+            }
+
+            # Insert + delete
+            foreach len $Lengths {
+                set reps [expr {$len <= 100 ? ($len-2) : ($len/8)}]
+                foreach range [list {0 1} {1 2} {end-2 end-1} {end-1 end}] {
+                    lassign $range first last
+                    if {$share_mode eq "shared"} {
+                        comment Insertions more than deletions from shared list
+                        perf measure [lreplace_describe shared $len $first $last 3] {
+                            lreplace $L $first $last X Y Z
+                        } [list len $len first $first last $last]
+
+                        comment Insertions same as deletions from shared list
+                        perf measure [lreplace_describe shared $len $first $last 2] {
+                            lreplace $L $first $last X Y 
+                        } [list len $len first $first last $last]
+
+                        comment Insertions fewer than deletions from shared list
+                        perf measure [lreplace_describe shared $len $first $last 1] {
+                            lreplace $L $first $last X
+                        } [list len $len first $first last $last]
+                    } else {
+                        comment Insertions more than deletions from unshared list
+                        perf measure [lreplace_describe unshared $len $first $last 3] {
+                            set L [lreplace $L[set L {}] $first $last X Y Z]
+                        } [list len $len first $first last $last] -overhead {
+                            set L $L; set L {}
+                        } -reps $reps
+
+                        comment Insertions same as deletions from unshared list
+                        perf measure [lreplace_describe unshared $len $first $last 2] {
+                            set L [lreplace $L[set L {}] $first $last X Y ]
+                        } [list len $len first $first last $last] -overhead {
+                            set L $L; set L {}
+                        } -reps $reps
+
+                        comment Insertions fewer than deletions from unshared list
+                        perf measure [lreplace_describe unshared $len $first $last 1] {
+                            set L [lreplace $L[set L {}] $first $last X]
+                        } [list len $len first $first last $last] -overhead {
+                            set L $L; set L {}
+                        } -reps $reps
+                    }
+                }
+            }
+            # Spanned Insert + delete
+            foreach len $Lengths {
+                set reps [expr {$len <= 100 ? ($len-2) : ($len/8)}]
+                foreach range [list {0 1} {1 2} {end-2 end-1} {end-1 end}] {
+                    lassign $range first last
+                    if {$share_mode eq "shared"} {
+                        comment Insertions more than deletions from shared-span list
+                        perf measure [lreplace_describe shared-span $len $first $last 3] {
+                            lreplace $Lspan $first $last X Y Z
+                        } [list len $len first $first last $last]
+
+                        comment Insertions same as deletions from shared-span list
+                        perf measure [lreplace_describe shared-span $len $first $last 2] {
+                            lreplace $Lspan $first $last X Y 
+                        } [list len $len first $first last $last]
+
+                        comment Insertions fewer than deletions from shared-span list
+                        perf measure [lreplace_describe shared-span $len $first $last 1] {
+                            lreplace $Lspan $first $last X
+                        } [list len $len first $first last $last]
+                    } else {
+                        comment Insertions more than deletions from unshared-span list
+                        perf measure [lreplace_describe unshared-span $len $first $last 3] {
+                            set Lspan [lreplace $Lspan[set Lspan {}] $first $last X Y Z]
+                        } [list len $len first $first last $last] -overhead {
+                            set Lspan $Lspan; set Lspan {}
+                        } -reps $reps
+
+                        comment Insertions same as deletions from unshared-span list
+                        perf measure [lreplace_describe unshared-span $len $first $last 2] {
+                            set Lspan [lreplace $Lspan[set Lspan {}] $first $last X Y ]
+                        } [list len $len first $first last $last] -overhead {
+                            set Lspan $Lspan; set Lspan {}
+                        } -reps $reps
+
+                        comment Insertions fewer than deletions from unshared-span list
+                        perf measure [lreplace_describe unshared-span $len $first $last 1] {
+                            set Lspan [lreplace $Lspan[set Lspan {}] $first $last X]
+                        } [list len $len first $first last $last] -overhead {
+                            set Lspan $Lspan; set Lspan {}
+                        } -reps $reps
+                    }
+                }
+            }
+        }
+
+        perf destroy
+    }
+
+    proc split_describe {len} {
+        return "split L\[$len\]"
+    }
+    proc split_perf {} {
+        variable Lengths
+        print_separator split
+
+        ListPerf create perf -setup {set S [string repeat "x " $len]}
+        foreach len $Lengths {
+            comment Split a string
+            perf measure [split_describe $len] {
+                split $S " "
+            } [list len $len]
+        }
+    }
+
+    proc join_describe {share_mode len} {
+        return "join L\[$len\] $share_mode"
+    }
+    proc join_perf {} {
+        variable Lengths
+
+        print_separator join
+
+        ListPerf create perf -reps 10000
+        foreach len $Lengths {
+            comment Join a list
+            perf measure [join_describe shared $len] {
+                join $L
+            } [list len $len]
+        }
+        foreach len $Lengths {
+            comment Join a spanned list
+            perf measure [join_describe shared-span $len] {
+                join $Lspan
+            } [list len $len]
+        }
+        perf destroy
+    }
+
+    proc lsearch_describe {share_mode len} {
+        return "lsearch L\[$len\] $share_mode"
+    }
+    proc lsearch_perf {} {
+        variable Lengths
+
+        print_separator lsearch
+
+        ListPerf create perf -reps 100000
+        foreach len $Lengths {
+            comment Search a list
+            perf measure [lsearch_describe shared $len] {
+                lsearch $L needle
+            } [list len $len]
+        }
+        foreach len $Lengths {
+            comment Search a spanned list
+            perf measure [lsearch_describe shared-span $len] {
+                lsearch $Lspan needle
+            } [list len $len]
+        }
+        perf destroy
+    }
+
+    proc foreach_describe {share_mode len} {
+        return "foreach L\[$len\] $share_mode"
+    }
+    proc foreach_perf {} {
+        variable Lengths
+
+        print_separator foreach
+
+        ListPerf create perf -reps 10000
+        foreach len $Lengths {
+            comment Iterate through a list
+            perf measure [foreach_describe shared $len] {
+                foreach e $L {}
+            } [list len $len]
+        }
+        foreach len $Lengths {
+            comment Iterate a spanned list
+            perf measure [foreach_describe shared-span $len] {
+                foreach e $Lspan {}
+            } [list len $len]
+        }
+        perf destroy
+    }
+
+    proc lmap_describe {share_mode len} {
+        return "lmap L\[$len\] $share_mode"
+    }
+    proc lmap_perf {} {
+        variable Lengths
+
+        print_separator lmap
+
+        ListPerf create perf -reps 10000
+        foreach len $Lengths {
+            comment Iterate through a list
+            perf measure [lmap_describe shared $len] {
+                lmap e $L {}
+            } [list len $len]
+        }
+        foreach len $Lengths {
+            comment Iterate a spanned list
+            perf measure [lmap_describe shared-span $len] {
+                lmap e $Lspan {}
+            } [list len $len]
+        }
+        perf destroy
+    }
+
+    proc get_sort_sample {{spanned 0}} {
+        variable perfScript
+        variable sortSampleText
+
+        if {![info exists sortSampleText]} {
+            set fd [open $perfScript]
+            set sortSampleText [split [read $fd] ""]
+            close $fd
+        }
+        set sortSampleText [string range $sortSampleText 0 9999]
+
+        # NOTE: do NOT cache list result in a variable as we need it unshared
+        if {$spanned} {
+            return [lrange [split $sortSampleText ""] 1 end-1]
+        } else {
+            return [split $sortSampleText ""]
+        }
+    }
+    proc lsort_describe {share_mode len} {
+        return "lsort L\[$len] $share_mode"
+    }
+    proc lsort_perf {} {
+        print_separator lsort
+
+        ListPerf create perf -setup {}
+
+        comment Sort a shared list
+        perf measure [lsort_describe shared [llength [perf::list::get_sort_sample]]] {
+            lsort $L
+        } {} -setup {set L [perf::list::get_sort_sample]}
+
+        comment Sort a shared-span list
+        perf measure [lsort_describe shared-span [llength [perf::list::get_sort_sample 1]]] {
+            lsort $L
+        } {} -setup {set L [perf::list::get_sort_sample 1]}
+
+        comment Sort an unshared list
+        perf measure [lsort_describe unshared [llength [perf::list::get_sort_sample]]] {
+            lsort [perf::list::get_sort_sample]
+        } {} -overhead {perf::list::get_sort_sample}
+
+        comment Sort an unshared-span list
+        perf measure [lsort_describe unshared-span [llength [perf::list::get_sort_sample 1]]] {
+            lsort [perf::list::get_sort_sample 1]
+        } {} -overhead {perf::list::get_sort_sample 1}
+
+        perf destroy
+    }
+
+    proc concat_describe {canonicality len elemlen} {
+        return "concat L\[$len\] $canonicality with elements of length $elemlen"
+    }
+    proc concat_perf {} {
+        variable Lengths
+
+        print_separator concat
+
+        ListPerf create perf -reps 100000
+
+        foreach len $Lengths {
+            foreach elemlen {1 100} {
+                comment Pure lists (no string representation)
+                perf measure [concat_describe "pure lists" $len $elemlen] {
+                    concat $L $L
+                } [list len $len elemlen $elemlen] -setup {
+                    set L [lrepeat $len [string repeat a $elemlen]]
+                }
+
+                comment Canonical lists (with string representation)
+                perf measure [concat_describe "canonical lists" $len $elemlen] {
+                    concat $L $L
+                } [list len $len elemlen $elemlen] -setup {
+                    set L [lrepeat $len [string repeat a $elemlen]]
+                    append x x $L; # Generate string while keeping internal rep list
+                    unset x
+                }
+
+                comment Non-canonical lists
+                perf measure [concat_describe "non-canonical lists" $len $elemlen] {
+                    concat $L $L
+                } [list len $len elemlen $elemlen] -setup {
+                    set L [string repeat "[string repeat a $elemlen] " $len]
+                    llength $L
+                }
+            }
+        }
+
+        # Span version
+        foreach len $Lengths {
+            foreach elemlen {1 100} {
+                comment Pure span lists (no string representation)
+                perf measure [concat_describe "pure spanned lists" $len $elemlen] {
+                    concat $L $L
+                } [list len $len elemlen $elemlen] -setup {
+                    set L [lrange [lrepeat [expr {$len+2}] [string repeat a $elemlen]] 1 end-1]
+                }
+
+                comment Canonical span lists (with string representation)
+                perf measure [concat_describe "canonical spanned lists" $len $elemlen] {
+                    concat $L $L
+                } [list len $len elemlen $elemlen] -setup {
+                    set L [lrange [lrepeat [expr {$len+2}] [string repeat a $elemlen]] 1 end-1]
+                    append x x $L; # Generate string while keeping internal rep list
+                    unset x
+                }
+            }
+        }
+
+        perf destroy
+    }
+
+    proc test {} {
+        variable RunTimes
+        variable Options
+
+        set selections [perf::list::setup $::argv]
+        if {[llength $selections] == 0} {
+            set commands [info commands ::perf::list::*_perf]
+        } else {
+            set commands [lmap sel $selections {
+                if {$sel eq "help"} {
+                    print_usage
+                    continue
+                }
+                set cmd ::perf::list::${sel}_perf
+                if {$cmd ni [info commands ::perf::list::*_perf]} {
+                    puts stderr "Error: command $sel is not known or supported. Skipping."
+                    continue
+                }
+                set cmd
+            }]
+        }
+        comment Setting up
+        timerate -calibrate {}
+        if {[info exists Options(--label)]} {
+            print "L $Options(--label)"
+        }
+        print "V [info patchlevel]"
+        print "E [info nameofexecutable]"
+        if {[info exists Options(--description)]} {
+            print "D $Options(--description)"
+        }
+        set twapi_keys {-privatebytes -workingset -workingsetpeak}
+        if {[info commands ::twapi::get_process_memory_info] ne ""} {
+            set twapi_vm_pre [::twapi::get_process_memory_info]
+        }
+        foreach cmd [lsort -dictionary $commands] {
+            set RunTimes(command) 0.0
+            $cmd
+            set RunTimes(total) [expr {$RunTimes(total)+$RunTimes(command)}]
+            print "P [format_timings $RunTimes(command) 1] [string range $cmd 14 end-5] total run time"
+        }
+        # Print total runtime in same format as timerate output
+        print "P [format_timings $RunTimes(total) 1] Total run time"
+
+        if {[info exists twapi_vm_pre]} {
+            set twapi_vm_post [::twapi::get_process_memory_info]
+            set MB 1048576.0
+            foreach key $twapi_keys {
+                set pre [expr {[dict get $twapi_vm_pre $key]/$MB}]
+                set post [expr {[dict get $twapi_vm_post $key]/$MB}]
+                print "P [format_timings $pre 1] Memory (MB) $key pre-test"
+                print "P [format_timings $post 1] Memory (MB) $key post-test"
+                print "P [format_timings [expr {$post-$pre}] 1] Memory (MB) delta $key"
+            }
+        }
+        if {[info commands memory] ne ""} {
+            foreach line [split [memory info] \n] {
+                if {$line eq ""} continue
+                set line [split $line]
+                set val [expr {[lindex $line end]/1000.0}]
+                set line [string trim [join [lrange $line 0 end-1]]]
+                print "P [format_timings $val 1] memdbg $line (in thousands)"
+            }
+            print "# Allocations not freed on exit written to the lost-memory.tmp file."
+            print "# These will have to be manually compared."
+            # env TCL_FINALIZE_ON_EXIT must be set to 1 for this.
+            # DO NOT SET HERE - set ::env(TCL_FINALIZE_ON_EXIT) 1
+            # Must be set in environment before starting tclsh else bogus results
+            if {[info exists Options(--label)]} {
+                set dump_file list-memory-$Options(--label).memdmp
+            } else {
+                set dump_file list-memory-[pid].memdmp
+            }
+            memory onexit $dump_file
+        }
+    }
+}
+
+
+if {[info exists ::argv0] && [file tail $::argv0] eq [file tail [info script]]} {
+    ::perf::list::test
+}
diff --git a/tests/lrepeat.test b/tests/lrepeat.test
index c1c8b02..6734281 100644
--- a/tests/lrepeat.test
+++ b/tests/lrepeat.test
@@ -61,7 +61,7 @@ test lrepeat-1.7 {Accept zero repetitions (TIP 323)} {
     }
     -result {}
 }
-test lrepeat-1.8 {Do not build enormous lists - Bug 2130992} -body {
+test lrepeat-1.8 {Do not build enormous lists - Bug 2130992} -constraints knownBug -body {
      lrepeat 0x10000000 a b c d e f g h
 } -returnCodes error -match glob -result *
 
-- 
cgit v0.12


From 41c87a4bf59377b2fcccc1d36a2812032e7a56e3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 14 Jul 2022 15:25:47 +0000
Subject: More progress

---
 generic/tclCmdIL.c   |   2 +-
 generic/tclInt.h     |  12 ++---
 generic/tclListObj.c | 127 +++++++++++++++++++++++----------------------------
 3 files changed, 64 insertions(+), 77 deletions(-)

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index f0969fe..031168f 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2886,7 +2886,7 @@ Tcl_LrepeatObjCmd(
 
     /* Final sanity check. Do not exceed limits on max list length. */
 
-    if (elementCount && objc > LIST_MAX/elementCount) {
+    if (elementCount && (size_t)objc > LIST_MAX/elementCount) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"max length of a Tcl list (%" TCL_Z_MODIFIER "u elements) exceeded", LIST_MAX));
 	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 5a59e39..03b2f12 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2381,18 +2381,18 @@ typedef enum TclEolTranslation {
 #define TCL_INVOKE_NO_TRACEBACK	(1<<2)
 
 /*
- * TclListSizeT is the type for holding list element counts. It's defined
+ * ListSizeT is the type for holding list element counts. It's defined
  * simplify sharing source between Tcl8 and Tcl9.
  */
 #if TCL_MAJOR_VERSION > 8
 
-typedef ptrdiff_t ListSizeT; /* TODO - may need to fix to match Tcl9's API */
+typedef size_t ListSizeT;
 
 /*
  * SSIZE_MAX, NOT SIZE_MAX as negative differences need to be expressed
  * between values of the ListSizeT type so limit the range to signed
  */
-#define ListSizeT_MAX PTRDIFF_MAX
+#define ListSizeT_MAX ((ListSizeT)PTRDIFF_MAX)
 
 #else
 
@@ -2441,11 +2441,11 @@ typedef struct ListStore {
 
 /* Max number of elements that can be contained in a list */
 #define LIST_MAX                                               \
-    ((ListSizeT)(((size_t)ListSizeT_MAX - offsetof(ListStore, slots)) \
-		   / sizeof(Tcl_Obj *)))
+    ((ListSizeT_MAX - offsetof(ListStore, slots)) \
+		   / sizeof(Tcl_Obj *))
 /* Memory size needed for a ListStore to hold numSlots_ elements */
 #define LIST_SIZE(numSlots_) \
-	((int)(offsetof(ListStore, slots) + ((numSlots_) * sizeof(Tcl_Obj *))))
+	(offsetof(ListStore, slots) + ((numSlots_) * sizeof(Tcl_Obj *)))
 
 /*
  * ListSpan --
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 95f2d61..f0597b9 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -45,13 +45,13 @@
 #define LIST_INDEX_ASSERT(idxarg_)                                 \
     do {                                                           \
 	ListSizeT idx_ = (idxarg_); /* To guard against ++ etc. */ \
-	LIST_ASSERT(idx_ >= 0 && idx_ < LIST_MAX);                 \
+	LIST_ASSERT(idx_ != TCL_INDEX_NONE && idx_ < LIST_MAX);                 \
     } while (0)
 /* Ditto for counts except upper limit is different */
 #define LIST_COUNT_ASSERT(countarg_)                                   \
     do {                                                               \
 	ListSizeT count_ = (countarg_); /* To guard against ++ etc. */ \
-	LIST_ASSERT(count_ >= 0 && count_ <= LIST_MAX);                \
+	LIST_ASSERT(count_ != TCL_INDEX_NONE && count_ <= LIST_MAX);                \
     } while (0)
 
 #else
@@ -114,7 +114,7 @@
 /*
  * Prototypes for non-inline static functions defined later in this file:
  */
-static int MemoryAllocationError(Tcl_Interp *, size_t size);
+static int MemoryAllocationError(Tcl_Interp *, ListSizeT size);
 static int ListLimitExceededError(Tcl_Interp *);
 static ListStore *
 ListStoreNew(ListSizeT objc, Tcl_Obj *const objv[], int flags);
@@ -508,7 +508,7 @@ ObjArrayCopy(
 static int
 MemoryAllocationError(
     Tcl_Interp *interp, /* Interpreter for error message. May be NULL */
-    size_t size)        /* Size of attempted allocation that failed */
+    ListSizeT size)        /* Size of attempted allocation that failed */
 {
     if (interp != NULL) {
 	Tcl_SetObjResult(
@@ -773,7 +773,7 @@ ListStoreNew(
     }
     if (storePtr == NULL) {
 	if (flags & LISTREP_PANIC_ON_FAIL) {
-	    Tcl_Panic("list creation failed: unable to alloc %u bytes",
+	    Tcl_Panic("list creation failed: unable to alloc %" TCL_Z_MODIFIER "u bytes",
 		    LIST_SIZE(objc));
 	}
 	return NULL;
@@ -893,14 +893,6 @@ ListRepInit(
 {
     ListStore *storePtr;
 
-    /*
-     * The whole list implementation has an implicit assumption that lenths
-     * and indices used a signed integer type. Tcl9 API's currently use
-     * unsigned types. This assert is to remind that need to review code
-     * when adapting for Tcl9.
-     */
-    LIST_ASSERT(((ListSizeT)-1) < 0);
-
     storePtr = ListStoreNew(objc, objv, flags);
     if (storePtr) {
 	repPtr->storePtr = storePtr;
@@ -1100,7 +1092,7 @@ Tcl_NewListObj(
 
 Tcl_Obj *
 Tcl_NewListObj(
-    size_t objc,		/* Count of objects referenced by objv. */
+    ListSizeT objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
     ListRep listRep;
@@ -1164,7 +1156,7 @@ Tcl_DbNewListObj(
 
     TclDbNewObj(listObj, file, line);
 
-    if (objc <= 0) {
+    if (objc + 1 <= 1) {
 	return listObj;
     }
 
@@ -1178,7 +1170,7 @@ Tcl_DbNewListObj(
 
 Tcl_Obj *
 Tcl_DbNewListObj(
-    size_t objc,		/* Count of objects referenced by objv. */
+    ListSizeT objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[],	/* An array of pointers to Tcl objects. */
     TCL_UNUSED(const char *) /*file*/,
     TCL_UNUSED(int) /*line*/)
@@ -1312,7 +1304,7 @@ TclListObjGetRep(
 void
 Tcl_SetListObj(
     Tcl_Obj *objPtr,		/* Object whose internal rep to init. */
-    size_t objc,		/* Count of objects referenced by objv. */
+    ListSizeT objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
     if (Tcl_IsShared(objPtr)) {
@@ -1427,13 +1419,13 @@ ListRepRange(
 	ListRepFreeUnreferenced(srcRepPtr);
     }
 
-    if (rangeStart < 0) {
+    if (rangeStart == TCL_INDEX_NONE) {
 	rangeStart = 0;
     }
-    if (rangeEnd >= numSrcElems) {
+    if ((rangeEnd != TCL_INDEX_NONE) && (rangeEnd >= numSrcElems)) {
 	rangeEnd = numSrcElems - 1;
     }
-    if (rangeStart > rangeEnd) {
+    if (rangeStart + 1 > rangeEnd + 1) {
 	/* Empty list of capacity 1. */
 	ListRepInit(1, NULL, LISTREP_PANIC_ON_FAIL, rangeRepPtr);
 	return;
@@ -1563,8 +1555,8 @@ ListRepRange(
 Tcl_Obj *
 TclListObjRange(
     Tcl_Obj *listObj,		/* List object to take a range from. */
-    size_t rangeStart,	/* Index of first element to include. */
-    size_t rangeEnd)		/* Index of last element to include. */
+    ListSizeT rangeStart,	/* Index of first element to include. */
+    ListSizeT rangeEnd)		/* Index of last element to include. */
 {
     ListRep listRep;
     ListRep resultRep;
@@ -1620,7 +1612,7 @@ Tcl_ListObjGetElements(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
     Tcl_Obj *objPtr,		/* List object for which an element array is
 				 * to be returned. */
-    size_t *objcPtr,		/* Where to store the count of objects
+    ListSizeT *objcPtr,		/* Where to store the count of objects
 				 * referenced by objv. */
     Tcl_Obj ***objvPtr)		/* Where to store the pointer to an array of
 				 * pointers to the list's objects. */
@@ -1662,7 +1654,7 @@ Tcl_ListObjAppendList(
     Tcl_Obj *toObj,		/* List object to append elements to. */
     Tcl_Obj *fromObj)		/* List obj with elements to append. */
 {
-    size_t objc;
+    ListSizeT objc;
     Tcl_Obj **objv;
 
     if (Tcl_IsShared(toObj)) {
@@ -1706,13 +1698,13 @@ Tcl_ListObjAppendList(
  int TclListObjAppendElements (
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
     Tcl_Obj *toObj,		/* List object to append */
-    size_t elemCount,        /* Number of elements in elemObjs[] */
+    ListSizeT elemCount,        /* Number of elements in elemObjs[] */
     Tcl_Obj * const elemObjv[])	/* Objects to append to toObj's list. */
 {
     ListRep listRep;
     Tcl_Obj **toObjv;
-    size_t toLen;
-    size_t finalLen;
+    ListSizeT toLen;
+    ListSizeT finalLen;
 
     if (Tcl_IsShared(toObj)) {
 	Tcl_Panic("%s called with shared object", "TclListObjAppendElements");
@@ -1737,7 +1729,7 @@ Tcl_ListObjAppendList(
 	 * reference counts on the elements which is a substantial cost
 	 * if the list is not small.
 	 */
-	size_t numTailFree;
+	ListSizeT numTailFree;
 
 	ListRepFreeUnreferenced(&listRep); /* Collect garbage before checking room */
 
@@ -1745,7 +1737,7 @@ Tcl_ListObjAppendList(
 	LIST_ASSERT(ListRepLength(&listRep) == listRep.storePtr->numUsed);
 	LIST_ASSERT(toLen == listRep.storePtr->numUsed);
 
-	if (finalLen > (size_t)listRep.storePtr->numAllocated) {
+	if (finalLen > listRep.storePtr->numAllocated) {
 	    ListStore *newStorePtr;
 	    newStorePtr = ListStoreReallocate(listRep.storePtr, finalLen);
 	    if (newStorePtr == NULL) {
@@ -1892,11 +1884,11 @@ int
 Tcl_ListObjIndex(
     Tcl_Interp *interp,  /* Used to report errors if not NULL. */
     Tcl_Obj *listObj,    /* List object to index into. */
-    size_t index,           /* Index of element to return. */
+    ListSizeT index,           /* Index of element to return. */
     Tcl_Obj **objPtrPtr) /* The resulting Tcl_Obj* is stored here. */
 {
     Tcl_Obj **elemObjs;
-    size_t numElems;
+    ListSizeT numElems;
 
     /*
      * TODO
@@ -1945,7 +1937,7 @@ int
 Tcl_ListObjLength(
     Tcl_Interp *interp,	/* Used to report errors if not NULL. */
     Tcl_Obj *listObj,	/* List object whose #elements to return. */
-    size_t *lenPtr)	/* The resulting int is stored here. */
+    ListSizeT *lenPtr)	/* The resulting int is stored here. */
 {
     ListRep listRep;
 
@@ -2004,19 +1996,19 @@ int
 Tcl_ListObjReplace(
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
     Tcl_Obj *listObj,		/* List object whose elements to replace. */
-    size_t first,		/* Index of first element to replace. */
-    size_t numToDelete,	/* Number of elements to replace. */
-    size_t numToInsert,	/* Number of objects to insert. */
+    ListSizeT first,		/* Index of first element to replace. */
+    ListSizeT numToDelete,	/* Number of elements to replace. */
+    ListSizeT numToInsert,	/* Number of objects to insert. */
     Tcl_Obj *const insertObjs[])/* Tcl objects to insert */
 {
     ListRep listRep;
     ListSizeT origListLen;
-    ListSizeT lenChange;
-    ListSizeT leadSegmentLen;
-    ListSizeT tailSegmentLen;
+    ptrdiff_t lenChange;
+    ptrdiff_t leadSegmentLen;
+    ptrdiff_t tailSegmentLen;
     ListSizeT numFreeSlots;
-    ListSizeT leadShift;
-    ListSizeT tailShift;
+    ptrdiff_t leadShift;
+    ptrdiff_t tailShift;
     Tcl_Obj **listObjs;
 
     if (Tcl_IsShared(listObj)) {
@@ -2033,13 +2025,13 @@ Tcl_ListObjReplace(
     if (first == TCL_INDEX_NONE) {
 	first = 0;
     }
-    if (first > (size_t)origListLen) {
+    if (first > origListLen) {
 	first = origListLen;	/* So we'll insert after last element. */
     }
     if (numToDelete == TCL_INDEX_NONE) {
 	numToDelete = 0;
     } else if (first > ListSizeT_MAX - numToDelete /* Handle integer overflow */
-             || (size_t)origListLen < first + numToDelete) {
+             || origListLen < first + numToDelete) {
 	numToDelete = origListLen - first;
     }
 
@@ -2079,7 +2071,7 @@ Tcl_ListObjReplace(
 	    ListRepRange(&listRep, numToDelete, origListLen-1, 0, &tailRep);
 	    ListObjReplaceRepAndInvalidate(listObj, &tailRep);
 	    return TCL_OK;
-	} else if ((first+numToDelete) >= (size_t)origListLen) {
+	} else if ((first+numToDelete) >= origListLen) {
 	    /* Delete from tail, so return head */
 	    ListRep headRep;
 	    ListRepRange(&listRep, 0, first-1, 0, &headRep);
@@ -2097,7 +2089,7 @@ Tcl_ListObjReplace(
      */
     if (numToDelete == 0) {
 	/* Case (2a) - Append to list */
-	if (first == (size_t)origListLen) {
+	if (first == origListLen) {
 	    return TclListObjAppendElements(
 		interp, listObj, numToInsert, insertObjs);
 	}
@@ -2112,7 +2104,7 @@ Tcl_ListObjReplace(
 	 */
 	if (first == 0 &&                                            /* (i) */
 	    ListRepStart(&listRep) == listRep.storePtr->firstUsed && /* (ii) */
-	    numToInsert <= (size_t)listRep.storePtr->firstUsed               /* (iii) */
+	    numToInsert <= listRep.storePtr->firstUsed               /* (iii) */
 	) {
 	    ListSizeT newLen;
 	    LIST_ASSERT(numToInsert); /* Else would have returned above */
@@ -2153,7 +2145,7 @@ Tcl_ListObjReplace(
      * later by not having to go through the ListRepInit and
      * ListObjReplaceAndInvalidate below.
      */
-    if (numFreeSlots < lenChange && !ListRepIsShared(&listRep)) {
+    if ((ptrdiff_t)numFreeSlots < lenChange && !ListRepIsShared(&listRep)) {
 	ListStore *newStorePtr =
 	    ListStoreReallocate(listRep.storePtr, origListLen + lenChange);
 	if (newStorePtr == NULL) {
@@ -2179,7 +2171,7 @@ Tcl_ListObjReplace(
      * TODO - for unshared case ONLY, consider a "move" based implementation
      */
     if (ListRepIsShared(&listRep) || /* 3a */
-	numFreeSlots < lenChange ||  /* 3b */
+	(ptrdiff_t)numFreeSlots < lenChange ||  /* 3b */
 	(origListLen + lenChange) < (listRep.storePtr->numAllocated / 4) /* 3c */
     ) {
 	ListRep newRep;
@@ -2281,9 +2273,9 @@ Tcl_ListObjReplace(
 	 * or need to shift both. In the former case, favor shifting the
 	 * smaller segment.
 	 */
-	ListSizeT leadSpace = ListRepNumFreeHead(&listRep);
-	ListSizeT tailSpace = ListRepNumFreeTail(&listRep);
-	ListSizeT finalFreeSpace = leadSpace + tailSpace - lenChange;
+	ptrdiff_t leadSpace = ListRepNumFreeHead(&listRep);
+	ptrdiff_t tailSpace = ListRepNumFreeTail(&listRep);
+	ptrdiff_t finalFreeSpace = leadSpace + tailSpace - lenChange;
 
 	LIST_ASSERT((leadSpace + tailSpace) >= lenChange);
 	if (leadSpace >= lenChange
@@ -2299,7 +2291,7 @@ Tcl_ListObjReplace(
 	     * insertions.
 	     */
 	    if (finalFreeSpace > 1 && (tailSpace == 0 || tailSegmentLen == 0)) {
-		ListSizeT postShiftLeadSpace = leadSpace - lenChange;
+		ptrdiff_t postShiftLeadSpace = leadSpace - lenChange;
 		if (postShiftLeadSpace > (finalFreeSpace/2)) {
 		    ListSizeT extraShift = postShiftLeadSpace - (finalFreeSpace / 2);
 		    leadShift -= extraShift;
@@ -2315,7 +2307,7 @@ Tcl_ListObjReplace(
 	     * See comments above. This is analogous.
 	     */
 	    if (finalFreeSpace > 1 && (leadSpace == 0 || leadSegmentLen == 0)) {
-		ListSizeT postShiftTailSpace = tailSpace - lenChange;
+		ptrdiff_t postShiftTailSpace = tailSpace - lenChange;
 		if (postShiftTailSpace > (finalFreeSpace/2)) {
 		    ListSizeT extraShift = postShiftTailSpace - (finalFreeSpace / 2);
 		    tailShift += extraShift;
@@ -2445,7 +2437,7 @@ TclLindexList(
     Tcl_Obj *listObj,		/* List being unpacked. */
     Tcl_Obj *argObj)		/* Index or index list. */
 {
-    size_t index;			/* Index into the list. */
+    ListSizeT index;			/* Index into the list. */
     Tcl_Obj *indexListCopy;
     Tcl_Obj **indexObjs;
     ListSizeT numIndexObjs;
@@ -2523,16 +2515,16 @@ Tcl_Obj *
 TclLindexFlat(
     Tcl_Interp *interp,		/* Tcl interpreter. */
     Tcl_Obj *listObj,		/* Tcl object representing the list. */
-    size_t indexCount,		/* Count of indices. */
+    ListSizeT indexCount,		/* Count of indices. */
     Tcl_Obj *const indexArray[])/* Array of pointers to Tcl objects that
 				 * represent the indices in the list. */
 {
-    size_t i;
+    ListSizeT i;
 
     Tcl_IncrRefCount(listObj);
 
     for (i=0 ; i<indexCount && listObj ; i++) {
-	size_t index, listLen = 0;
+	ListSizeT index, listLen = 0;
 	Tcl_Obj **elemPtrs = NULL, *sublistCopy;
 
 	/*
@@ -2618,7 +2610,7 @@ TclLsetList(
     ListSizeT indexCount = 0;   /* Number of indices in the index list. */
     Tcl_Obj **indices = NULL;	/* Vector of indices in the index list. */
     Tcl_Obj *retValueObj;	/* Pointer to the list to be returned. */
-    size_t index;            /* Current index in the list - discarded. */
+    ListSizeT index;            /* Current index in the list - discarded. */
     Tcl_Obj *indexListCopy;
 
     /*
@@ -2696,12 +2688,12 @@ Tcl_Obj *
 TclLsetFlat(
     Tcl_Interp *interp,		/* Tcl interpreter. */
     Tcl_Obj *listObj,		/* Pointer to the list being modified. */
-    size_t indexCount,		/* Number of index args. */
+    ListSizeT indexCount,		/* Number of index args. */
     Tcl_Obj *const indexArray[],
 				/* Index args. */
     Tcl_Obj *valueObj)		/* Value arg to 'lset' or NULL to 'lpop'. */
 {
-    size_t index, len;
+    ListSizeT index, len;
 	int result;
     Tcl_Obj *subListObj, *retValueObj;
     Tcl_Obj *pendingInvalidates[10];
@@ -2755,7 +2747,7 @@ TclLsetFlat(
      */
 
     do {
-	size_t elemCount;
+	ListSizeT elemCount;
 	Tcl_Obj *parentList, **elemPtrs;
 
 	/*
@@ -2957,13 +2949,13 @@ TclListObjSetElement(
 				 * if not NULL. */
     Tcl_Obj *listObj,		/* List object in which element should be
 				 * stored. */
-    size_t index,		/* Index of element to store. */
+    ListSizeT index,		/* Index of element to store. */
     Tcl_Obj *valueObj)		/* Tcl object to store in the designated list
 				 * element. */
 {
     ListRep listRep;
     Tcl_Obj **elemPtrs;         /* Pointers to elements of the list. */
-    size_t elemCount;		/* Number of elements in the list. */
+    ListSizeT elemCount;		/* Number of elements in the list. */
 
     /* Ensure that the listObj parameter designates an unshared list. */
 
@@ -3179,7 +3171,7 @@ SetListFromAny(
 	while (nextElem < limit) {
 	    const char *elemStart;
 	    char *check;
-	    size_t elemSize;
+	    ListSizeT elemSize;
 	    int literal;
 
 	    if (TCL_OK != TclFindElement(interp, nextElem, limit - nextElem,
@@ -3312,15 +3304,10 @@ UpdateStringOfList(
 	flagPtr[i] = (i ? TCL_DONT_QUOTE_HASH : 0);
 	elem = Tcl_GetStringFromObj(elemPtrs[i], &length);
 	bytesNeeded += TclScanElement(elem, length, flagPtr+i);
-	if (bytesNeeded < 0) {
-	    /* TODO - what is the max #define for Tcl9? */
-	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
+	if (bytesNeeded > SIZE_MAX - numElems) {
+	    Tcl_Panic("max size for a Tcl value (%" TCL_Z_MODIFIER "u bytes) exceeded", SIZE_MAX);
 	}
     }
-    /* TODO - what is the max #define for Tcl9? */
-    if (bytesNeeded > INT_MAX - numElems + 1) {
-	Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
-    }
     bytesNeeded += numElems - 1;
 
     /*
-- 
cgit v0.12


From 4e9c7a9ae0adaee122394db9ebf41650340fe023 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 30 Jul 2022 21:47:58 +0000
Subject: Undo knownBug constraint: no longer necessary

---
 tests/apply.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/apply.test b/tests/apply.test
index 47fcb67..a5f1f8f 100644
--- a/tests/apply.test
+++ b/tests/apply.test
@@ -261,7 +261,7 @@ test apply-9.1 {leaking internal rep} -setup {
 	lindex $lines 3 3
     }
     set lam [list {} {set a 1}]
-} -constraints {memory knownBug} -body {
+} -constraints memory -body {
     set end [getbytes]
     for {set i 0} {$i < 5} {incr i} {
 	::apply [lrange $lam 0 end]
-- 
cgit v0.12


From 515f8ab0440b2d4cb6411790c2c08210cadfee6a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 31 Jul 2022 11:54:14 +0000
Subject: Add 'file home' command

---
 generic/tclCmdAH.c   |   1 +
 generic/tclFCmd.c    |  39 +++++++++++++
 generic/tclInt.h     |   5 +-
 generic/tclPathObj.c | 161 +++++++++++++++++++++++++++++----------------------
 4 files changed, 137 insertions(+), 69 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 41ab339..48b90bc 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -1042,6 +1042,7 @@ TclInitFileCmd(
 	{"executable",	FileAttrIsExecutableCmd, TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"exists",	FileAttrIsExistingCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"extension",	PathExtensionCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
+	{"home",	TclFileHomeCmd,		TclCompileBasic0Or1ArgCmd, NULL, NULL, 0},
 	{"isdirectory",	FileAttrIsDirectoryCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"isfile",	FileAttrIsFileCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"join",	PathJoinCmd,		TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index c19623d..c786395 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1653,6 +1653,45 @@ TclFileTempDirCmd(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * TclFileHomeCmd --
+ *
+ *	This function is invoked to process the "file home" Tcl command.
+ *	See the user documentation for details on what it does.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclFileHomeCmd(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int objc,
+    Tcl_Obj *const objv[])
+{
+    Tcl_Obj *homeDirObj;
+    Tcl_DString dirString;
+
+    if (objc != 1 && objc != 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "?user?");
+	return TCL_ERROR;
+    }
+    if (TclGetHomeDir(interp, objc == 1 ? NULL : Tcl_GetString(objv[1]), &dirString) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    homeDirObj = TclDStringToObj(&dirString);
+    Tcl_SetObjResult(interp, homeDirObj);
+    return TCL_OK;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 69b18b1..b09ef8f 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2912,6 +2912,7 @@ MODULE_SCOPE Tcl_ObjCmdProc TclFileReadLinkCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileRenameCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileTempDirCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileTemporaryCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclFileHomeCmd;
 MODULE_SCOPE void	TclCreateLateExitHandler(Tcl_ExitProc *proc,
 			    void *clientData);
 MODULE_SCOPE void	TclDeleteLateExitHandler(Tcl_ExitProc *proc,
@@ -3020,8 +3021,10 @@ MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
 MODULE_SCOPE Tcl_Obj *	TclJoinPath(size_t elements, Tcl_Obj * const objv[],
 			    int forceRelative);
+MODULE_SCOPE int	TclGetHomeDir(Tcl_Interp *interp, const char *user,
+			    Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *	TclResolveTildePath(Tcl_Interp *interp,
-			    Tcl_Obj *pathsObj);
+			    Tcl_Obj *pathObj);
 MODULE_SCOPE Tcl_Obj *	TclResolveTildePathList(Tcl_Obj *pathsObj);
 MODULE_SCOPE int	TclJoinThread(Tcl_ThreadId id, int *result);
 MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 7efd14e..d9fccb7 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -25,7 +25,7 @@ static void		DupFsPathInternalRep(Tcl_Obj *srcPtr,
 static void		FreeFsPathInternalRep(Tcl_Obj *pathPtr);
 static void		UpdateStringOfFsPath(Tcl_Obj *pathPtr);
 static int		SetFsPathFromAny(Tcl_Interp *interp, Tcl_Obj *pathPtr);
-static size_t	FindSplitPos(const char *path, int separator);
+static size_t		FindSplitPos(const char *path, int separator);
 static int		IsSeparatorOrNull(int ch);
 static Tcl_Obj *	GetExtension(Tcl_Obj *pathPtr);
 static int		MakePathFromNormalized(Tcl_Interp *interp,
@@ -2571,12 +2571,72 @@ TclNativePathInFilesystem(
 /*
  *----------------------------------------------------------------------
  *
+ * TclGetHomeDir --
+ *
+ *      Returns the home directory of a user.  Note there is a difference
+ *	between not specifying a user and explicitly specifying the current
+ *	user. This mimics Tcl8's tilde expansion.
+ *
+ * Results:
+ *	Returns TCL_OK on success with home directory path in *dsPtr
+ *	and TCL_ERROR on failure with error message in interp if non-NULL.
+ *
+ *----------------------------------------------------------------------
+ */
+int
+TclGetHomeDir(
+    Tcl_Interp *interp, /* May be NULL. Only used for error messages */
+    const char *user,   /* User name. NULL -> current user */
+    Tcl_DString *dsPtr) /* Output. Is initialized by the function. Must be
+                           freed on success */
+{
+    const char *dir;
+    Tcl_DString nativeString;
+
+    Tcl_DStringInit(dsPtr);
+    Tcl_DStringInit(&nativeString);
+
+    if (user == NULL || user[0] == 0) {
+        /* No user name specified -> current user */
+
+	dir = TclGetEnv("HOME", &nativeString);
+	if (dir == NULL) {
+            if (interp) {
+                Tcl_SetObjResult(interp, Tcl_NewStringObj(
+                                     "couldn't find HOME environment variable to"
+                                     " expand path", -1));
+                Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH",
+                                 "HOMELESS", NULL);
+            }
+            return TCL_ERROR;
+        }
+    } else {
+        /* User name specified - ~user */
+	dir = TclpGetUserHome(user, &nativeString);
+	if (dir == NULL) {
+	    if (interp != NULL) {
+                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                                     "user \"%s\" doesn't exist", user));
+                Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH", "NOUSER",
+                                 NULL);
+            }
+            return TCL_ERROR;
+	}
+    }
+    Tcl_JoinPath(1, &dir, dsPtr);
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TclResolveTildePath --
  *
- *	If the passed Tcl_Obj is begins with a tilde, does tilde resolution
+ *	If the passed path is begins with a tilde, does tilde resolution
  *	and returns a Tcl_Obj containing the resolved path. If the tilde
  *	component cannot be resolved, returns NULL. If the path does not
- *	begin with a tilde, returns unmodified.
+ *	begin with a tilde, returns as is.
  *
  *      The trailing components of the path are returned verbatim. No
  *	processing is done on them. Moreover, no assumptions should be
@@ -2585,9 +2645,11 @@ TclNativePathInFilesystem(
  *	used by caller if desired.
  *
  * Results:
- *	Returns a Tcl_Obj with resolved path and reference count 0, or the
- *	original Tcl_Obj if it does not begin with a tilde. Returns NULL
- *	if the path begins with a ~ that cannot be resolved.
+ *      Returns a Tcl_Obj with resolved path. This may be a new Tcl_Obj
+ *	with ref count 0 or that pathObj that was passed in without its
+ *	ref count modified.
+ *      Returns NULL if the path begins with a ~ that cannot be resolved
+ *	and stores an error message in interp if non-NULL.
  *
  *----------------------------------------------------------------------
  */
@@ -2596,59 +2658,30 @@ TclResolveTildePath(
     Tcl_Interp *interp, /* May be NULL. Only used for error messages */
     Tcl_Obj *pathObj)
 {
+    const char *path;
     size_t len;
     Tcl_Obj *resolvedObj;
-    const char *name;
     Tcl_DString dirString;
     size_t split;
-    char separator = '/';
 
-    /*
-     * Copied almost verbatim from the corresponding SetFsPathFromAny fragment
-     * in 8.7.
-     *
-     * First step is to translate the filename. This is similar to
-     * Tcl_TranslateFilename, but shouldn't convert everything to windows
-     * backslashes on that platform. The current implementation of this piece
-     * is a slightly optimised version of the various Tilde/Split/Join stuff
-     * to avoid multiple split/join operations.
-     *
-     * We remove any trailing directory separator.
-     *
-     * However, the split/join routines are quite complex, and one has to make
-     * sure not to break anything on Unix or Win (fCmd.test, fileName.test and
-     * cmdAH.test exercise most of the code).
-     */
-
-    name = Tcl_GetStringFromObj(pathObj, &len);
-    if (name[0] != '~') {
-        return pathObj; /* No tilde prefix, no need to resolve */
+    path = Tcl_GetStringFromObj(pathObj, &len);
+    if (path[0] != '~') {
+	return pathObj;
     }
 
     /*
      * We have multiple cases '~/foo/bar...', '~user/foo/bar...', etc.
-     * split becomes value 1 for '~/...' as well as for '~'.
+     * split becomes value 1 for '~/...' as well as for '~'. Note on
+     * Windows FindSplitPos will implicitly check for '\' as separator
+     * in addition to what is passed.
      */
-    split = FindSplitPos(name, separator);
+    split = FindSplitPos(path, '/');
 
     if (split == 1) {
         /* No user name specified -> current user */
-
-        const char *dir;
-        Tcl_DString dirString;
-
-        Tcl_DStringInit(&dirString);
-        dir = TclGetEnv("HOME", &dirString);
-        if (dir == NULL) {
-            if (interp) {
-                Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                                     "couldn't find HOME environment variable to"
-                                     " expand path", -1));
-                Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH",
-                                 "HOMELESS", NULL);
-            }
-            return NULL;
-        }
+	if (TclGetHomeDir(interp, NULL, &dirString) != TCL_OK) {
+	    return NULL;
+	}
     } else {
         /* User name specified - ~user */
 
@@ -2656,28 +2689,20 @@ TclResolveTildePath(
         Tcl_DString userName;
 
         Tcl_DStringInit(&userName);
-        Tcl_DStringAppend(&userName, name+1, split-1);
+        Tcl_DStringAppend(&userName, path+1, split-1);
         expandedUser = Tcl_DStringValue(&userName);
 
-        Tcl_DStringInit(&dirString);
-        if (TclpGetUserHome(expandedUser, &dirString) == NULL) {
-            if (interp != NULL) {
-                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                                     "user \"%s\" doesn't exist", expandedUser));
-                Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH", "NOUSER",
-                                 NULL);
-            }
+	if (TclGetHomeDir(interp, expandedUser, &dirString) != TCL_OK) {
             Tcl_DStringFree(&userName);
-            Tcl_DStringFree(&dirString);
-            return NULL;
-        }
+	    return NULL;
+	}
         Tcl_DStringFree(&userName);
     }
     resolvedObj = TclDStringToObj(&dirString);
 
     if (split < len) {
         /* If any trailer, append it verbatim */
-        Tcl_AppendToObj(resolvedObj, split + name, len-split);
+        Tcl_AppendToObj(resolvedObj, split + path, len-split);
     }
 
     return resolvedObj;
@@ -2740,16 +2765,16 @@ TclResolveTildePathList(
 
     resolvedPaths = Tcl_NewListObj(objc, NULL);
     for (i = 0; i < objc; ++i) {
-        Tcl_Obj *resolvedPath;
-
+	Tcl_Obj *resolvedPath;
         path = Tcl_GetString(objv[i]);
-        if (path[0] == 0) {
-            continue; /* Skip empty strings */
-        }
-        resolvedPath = TclResolveTildePath(NULL, objv[i]);
-        if (resolvedPath) {
-            Tcl_ListObjAppendElement(NULL, resolvedPaths, resolvedPath);
-        }
+	if (path[0] == 0) {
+	    continue; /* Skip empty strings */
+	}
+	resolvedPath = TclResolveTildePath(NULL, objv[i]);
+	if (resolvedPath) {
+	    /* Paths that cannot be resolved are skipped */
+	    Tcl_ListObjAppendElement(NULL, resolvedPaths, resolvedPath);
+	}
     }
 
     return resolvedPaths;
-- 
cgit v0.12


From 7754129cabaa2aa7f6a487106c0551d0c5f2c2d3 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 1 Aug 2022 17:07:54 +0000
Subject: Update tests for TIP 602

---
 generic/tclCmdAH.c    |   5 +-
 generic/tclFCmd.c     |   5 +-
 generic/tclInt.h      |   1 +
 generic/tclPathObj.c  |  26 ++++++
 tests/chanio.test     |  21 ++---
 tests/cmdAH.test      |  74 +++++++----------
 tests/exec.test       |  16 ++--
 tests/fCmd.test       | 220 ++++++++++++++++++++++++++++++++++++++++++--------
 tests/fileName.test   | 138 ++++++++++++++-----------------
 tests/fileSystem.test |  24 +++---
 tests/io.test         |   2 +-
 tests/safe.test       |   8 +-
 tests/winFile.test    |   2 +-
 13 files changed, 345 insertions(+), 197 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 48b90bc..eec3e0f 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -271,7 +271,10 @@ Tcl_CdObjCmd(
     if (objc == 2) {
 	dir = objv[1];
     } else {
-	TclNewLiteralStringObj(dir, "~");
+	dir = TclGetHomeDirObj(interp, NULL);
+	if (dir == NULL) {
+	    return TCL_ERROR;
+	}
 	Tcl_IncrRefCount(dir);
     }
     if (Tcl_FSConvertToPathType(interp, dir) != TCL_OK) {
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index c786395..9a107da 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1677,16 +1677,15 @@ TclFileHomeCmd(
     Tcl_Obj *const objv[])
 {
     Tcl_Obj *homeDirObj;
-    Tcl_DString dirString;
 
     if (objc != 1 && objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?user?");
 	return TCL_ERROR;
     }
-    if (TclGetHomeDir(interp, objc == 1 ? NULL : Tcl_GetString(objv[1]), &dirString) != TCL_OK) {
+    homeDirObj = TclGetHomeDirObj(interp, objc == 1 ? NULL : Tcl_GetString(objv[1]));
+    if (homeDirObj == NULL) {
 	return TCL_ERROR;
     }
-    homeDirObj = TclDStringToObj(&dirString);
     Tcl_SetObjResult(interp, homeDirObj);
     return TCL_OK;
 }
diff --git a/generic/tclInt.h b/generic/tclInt.h
index b09ef8f..51f7e75 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3023,6 +3023,7 @@ MODULE_SCOPE Tcl_Obj *	TclJoinPath(size_t elements, Tcl_Obj * const objv[],
 			    int forceRelative);
 MODULE_SCOPE int	TclGetHomeDir(Tcl_Interp *interp, const char *user,
 			    Tcl_DString *dsPtr);
+MODULE_SCOPE Tcl_Obj *	TclGetHomeDirObj(Tcl_Interp *interp, const char *user);
 MODULE_SCOPE Tcl_Obj *	TclResolveTildePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathObj);
 MODULE_SCOPE Tcl_Obj *	TclResolveTildePathList(Tcl_Obj *pathsObj);
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index d9fccb7..c123613 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2631,6 +2631,32 @@ TclGetHomeDir(
 /*
  *----------------------------------------------------------------------
  *
+ * TclGetHomeDirObj --
+ *
+ *	Wrapper around TclGetHomeDir. See that function.
+ *
+ * Results:
+ *      Returns a Tcl_Obj containing the home directory of a user
+ *	or NULL on failure with error message in interp if non-NULL.
+ *
+ *----------------------------------------------------------------------
+ */
+Tcl_Obj *
+TclGetHomeDirObj(
+    Tcl_Interp *interp, /* May be NULL. Only used for error messages */
+    const char *user)   /* User name. NULL -> current user */
+{
+    Tcl_DString dirString;
+
+    if (TclGetHomeDir(interp, user, &dirString) != TCL_OK) {
+	return NULL;
+    }
+    return TclDStringToObj(&dirString);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TclResolveTildePath --
  *
  *	If the passed path is begins with a tilde, does tilde resolution
diff --git a/tests/chanio.test b/tests/chanio.test
index 8d922a2..c1085f4 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -61,7 +61,7 @@ namespace eval ::tcl::test::io {
     set umaskValue 0
     testConstraint umask [expr {![catch {set umaskValue [scan [exec /bin/sh -c umask] %o]}]}]
 
-    testConstraint makeFileInHome [expr {![file exists ~/_test_] && [file writable ~]}]
+    testConstraint makeFileInHome [expr {![file exists $::env(HOME)/_test_] && [file writable $::env(HOME)]}]
 
     # set up a long data file for some of the following tests
 
@@ -5488,21 +5488,16 @@ test chan-io-40.15 {POSIX open access modes: RDWR} {
     chan close $f
     lappend x [viewFile test3]
 } {zzy abzzy}
-test chan-io-40.16 {tilde substitution in open} -constraints makeFileInHome -setup {
-    makeFile {Some text} _test_ ~
+test chan-io-40.16 {verify no tilde substitution in open} -setup {
+    set curdir [pwd]
+    cd [temporaryDirectory]
 } -body {
-    file exists [file join $::env(HOME) _test_]
+    close [open ~ w]
+    list [file isfile ~]
 } -cleanup {
-    removeFile _test_ ~
+    file delete ./~ ;# ./ because don't want to delete home in case of bugs!
+    cd $curdir
 } -result 1
-test chan-io-40.17 {tilde substitution in open} -setup {
-    set home $::env(HOME)
-} -body {
-    unset ::env(HOME)
-    open ~/foo
-} -returnCodes error -cleanup {
-    set ::env(HOME) $home
-} -result {couldn't find HOME environment variable to expand path}
 
 test chan-io-41.1 {Tcl_FileeventCmd: errors} -constraints fileevent -body {
     chan event foo
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index fb74b7f..3c78842 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -100,7 +100,7 @@ test cmdAH-2.3 {Tcl_CdObjCmd} -setup {
     set env(HOME) $oldpwd
     file mkdir $foodir
     cd $foodir
-    cd ~
+    cd [file home]
     string equal [pwd] $oldpwd
 } -cleanup {
     cd $oldpwd
@@ -124,8 +124,21 @@ test cmdAH-2.4 {Tcl_CdObjCmd} -setup {
     set env(HOME) $temp
 } -result 1
 test cmdAH-2.5 {Tcl_CdObjCmd} -returnCodes error -body {
-    cd ~~
-} -result {user "~" doesn't exist}
+    cd ~
+} -result {couldn't change working directory to "~": no such file or directory}
+test cmdAH-2.5.1 {Tcl_CdObjCmd} -setup {
+    set oldpwd [pwd]
+    cd [temporaryDirectory]
+    file delete ./~
+    file mkdir ~
+} -body {
+    cd ~
+    pwd
+} -cleanup {
+    cd [temporaryDirectory]
+    file delete ./~
+    cd $oldpwd
+} -result [file join [temporaryDirectory] ~]
 test cmdAH-2.6 {Tcl_CdObjCmd} -returnCodes error -body {
     cd _foobar
 } -result {couldn't change working directory to "_foobar": no such file or directory}
@@ -349,7 +362,7 @@ test cmdAH-5.1 {Tcl_FileObjCmd} -returnCodes error -body {
 } -result {wrong # args: should be "file subcommand ?arg ...?"}
 test cmdAH-5.2 {Tcl_FileObjCmd} -returnCodes error -body {
     file x
-} -result {unknown or ambiguous subcommand "x": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, type, volumes, or writable}
+} -result {unknown or ambiguous subcommand "x": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, home, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, type, volumes, or writable}
 test cmdAH-5.3 {Tcl_FileObjCmd} -returnCodes error -body {
     file exists
 } -result {wrong # args: should be "file exists name"}
@@ -496,7 +509,7 @@ test cmdAH-8.43 {Tcl_FileObjCmd: dirname} -setup {
 } -constraints testsetplatform -body {
     set env(HOME) "/homewontexist/test"
     testsetplatform unix
-    file dirname ~
+    file dirname [file home]
 } -cleanup {
     set env(HOME) $temp
 } -result /homewontexist
@@ -506,19 +519,13 @@ test cmdAH-8.44 {Tcl_FileObjCmd: dirname} -setup {
 } -constraints testsetplatform -body {
     set env(HOME) "~"
     testsetplatform unix
-    file dirname ~
+    file dirname [file home]
 } -cleanup {
     set env(HOME) $temp
-} -result ~
-test cmdAH-8.45 {Tcl_FileObjCmd: dirname} -setup {
-    set temp $::env(HOME)
-} -constraints {win testsetplatform} -match regexp -body {
-    set ::env(HOME) "/homewontexist/test"
-    testsetplatform windows
+} -result .
+test cmdAH-8.45 {Tcl_FileObjCmd: dirname ~} -body {
     file dirname ~
-} -cleanup {
-    set ::env(HOME) $temp
-} -result {([a-zA-Z]:?)/homewontexist}
+} -result .
 test cmdAH-8.46 {Tcl_FileObjCmd: dirname} {
     set f [file normalize [info nameof]]
     file exists $f
@@ -626,36 +633,19 @@ test cmdAH-9.26 {Tcl_FileObjCmd: tail} testsetplatform {
     testsetplatform windows
     file tail {//foo/bar}
 } {}
-test cmdAH-9.42 {Tcl_FileObjCmd: tail} -constraints testsetplatform -setup {
-    global env
-    set temp $env(HOME)
-} -body {
-    set env(HOME) "/home/test"
-    testsetplatform unix
+test cmdAH-9.42 {Tcl_FileObjCmd: tail ~} -body {
     file tail ~
-} -cleanup {
-    set env(HOME) $temp
-} -result test
+} -result ~
 test cmdAH-9.43 {Tcl_FileObjCmd: tail} -constraints testsetplatform -setup {
     global env
     set temp $env(HOME)
 } -body {
     set env(HOME) "~"
     testsetplatform unix
-    file tail ~
-} -cleanup {
-    set env(HOME) $temp
-} -result {}
-test cmdAH-9.44 {Tcl_FileObjCmd: tail} -constraints testsetplatform -setup {
-    global env
-    set temp $env(HOME)
-} -body {
-    set env(HOME) "/home/test"
-    testsetplatform windows
-    file tail ~
+    file tail [file home]
 } -cleanup {
     set env(HOME) $temp
-} -result test
+} -result ~
 test cmdAH-9.46 {Tcl_FileObjCmd: tail} testsetplatform {
     testsetplatform unix
     file tail {f.oo\bar/baz.bat}
@@ -686,7 +676,7 @@ test cmdAH-9.52 {Tcl_FileObjCmd: tail / normalize, bug 7a9dc52b29} {
 	[file tail {~/test/~foo}] \
 	[file tail [file normalize {~/~foo}]] \
 	[file tail [file normalize {~/test/~foo}]]
-} [lrepeat 4 ./~foo]
+} [lrepeat 4 ~foo]
 
 # rootname
 test cmdAH-10.1 {Tcl_FileObjCmd: rootname} -returnCodes error -body {
@@ -940,7 +930,7 @@ test cmdAH-14.3 {Tcl_FileObjCmd: join} testsetplatform {
 test cmdAH-15.1 {Tcl_FileObjCmd} -constraints testsetplatform -body {
     testsetplatform unix
     file atime ~_bad_user
-} -returnCodes error -result {user "_bad_user" doesn't exist}
+} -returnCodes error -result {could not read "~_bad_user": no such file or directory}
 
 catch {testsetplatform $platform}
 
@@ -1063,9 +1053,8 @@ test cmdAH-19.9 {Tcl_FileObjCmd: ~ : exists} {
     file exists ~nOsUcHuSeR
 } 0
 test cmdAH-19.10 {Tcl_FileObjCmd: ~ : nativename} -body {
-    # should probably be a non-error in fact...
     file nativename ~nOsUcHuSeR
-} -returnCodes error -match glob -result *
+} -result ~nOsUcHuSeR
 # The test below has to be done in /tmp rather than the current directory in
 # order to guarantee (?) a local file system: some NFS file systems won't do
 # the stuff below correctly.
@@ -1680,7 +1669,7 @@ test cmdAH-29.6.1 {
 # Error conditions
 test cmdAH-30.1 {Tcl_FileObjCmd: error conditions} -returnCodes error -body {
     file gorp x
-} -result {unknown or ambiguous subcommand "gorp": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, type, volumes, or writable}
+} -result {unknown or ambiguous subcommand "gorp": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, home, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, type, volumes, or writable}
 test cmdAH-30.2 {Tcl_FileObjCmd: error conditions} -returnCodes error -body {
     file ex x
 } -match glob -result {unknown or ambiguous subcommand "ex": must be *}
@@ -1699,9 +1688,6 @@ test cmdAH-30.6 {Tcl_FileObjCmd: error conditions} -returnCodes error -body {
 test cmdAH-30.7 {Tcl_FileObjCmd: error conditions} -returnCodes error -body {
     file t x
 } -match glob -result {unknown or ambiguous subcommand "t": must be *}
-test cmdAH-30.8 {Tcl_FileObjCmd: error conditions} -returnCodes error -body {
-    file dirname ~woohgy
-} -result {user "woohgy" doesn't exist}
 
 # channels
 # In testing 'file channels', we need to make sure that a channel created in
diff --git a/tests/exec.test b/tests/exec.test
index 6e4718a..5ecfcac 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -440,15 +440,21 @@ test exec-10.19 {errors in exec invocation} -constraints {exec} -body {
     exec cat >@ $f
 } -returnCodes error -result "channel \"$f\" wasn't opened for writing"
 close $f
-test exec-10.20 {errors in exec invocation} -constraints {exec notValgrind} -body {
+test exec-10.20.1 {errors in exec invocation} -constraints {unix exec notValgrind} -body {
     exec ~non_existent_user/foo/bar
-} -returnCodes error -result {user "non_existent_user" doesn't exist}
-test exec-10.21 {errors in exec invocation} -constraints {exec notValgrind} -body {
+} -returnCodes error -result {couldn't execute "~non_existent_user/foo/bar": no such file or directory}
+test exec-10.20.1 {errors in exec invocation} -constraints {win exec notValgrind} -body {
+    exec ~non_existent_user/foo/bar
+} -returnCodes error -result {couldn't execute "~non_existent_user\foo\bar": no such file or directory}
+test exec-10.21.1 {errors in exec invocation} -constraints {unix exec notValgrind} -body {
+    exec [interpreter] true | ~xyzzy_bad_user/x | false
+} -returnCodes error -result {couldn't execute "~xyzzy_bad_user/x": no such file or directory}
+test exec-10.21.2 {errors in exec invocation} -constraints {win exec notValgrind} -body {
     exec [interpreter] true | ~xyzzy_bad_user/x | false
-} -returnCodes error -result {user "xyzzy_bad_user" doesn't exist}
+} -returnCodes error -result {couldn't execute "~xyzzy_bad_user\x": no such file or directory}
 test exec-10.22 {errors in exec invocation} -constraints {exec notValgrind} -body {
     exec echo test > ~non_existent_user/foo/bar
-} -returnCodes error -result {user "non_existent_user" doesn't exist}
+} -returnCodes error -result {couldn't write file "~non_existent_user/foo/bar": no such file or directory}
 # Commands in background.
 
 test exec-11.1 {commands in background} {exec} {
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 13f3720..e9d7667 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -96,6 +96,14 @@ if {[testConstraint unix]} {
 	set user "root"
     }
 }
+if {[testConstraint win]} {
+    catch {
+        set user $::env(USERNAME)
+    }
+    if {$user eq ""} {
+        set user Administrator
+    }
+}
 
 proc createfile {file {string a}} {
     set f [open $file w]
@@ -122,6 +130,10 @@ proc checkcontent {file matchString} {
 }
 
 proc openup {path} {
+    # Double check for inadvertent ~ -> home directory mapping
+    if {[string match ~* $path]} {
+        set file ./$path
+    }
     testchmod 0o777 $path
     if {[file isdirectory $path]} {
 	catch {
@@ -137,9 +149,13 @@ proc cleanup {args} {
     foreach p [concat $wd $args] {
 	set x ""
 	catch {
-	    set x [glob -directory $p tf* td*]
+	    set x [glob -directory $p tf* td* ~*]
 	}
 	foreach file $x {
+            # Double check for inadvertent ~ -> home directory mapping
+            if {[string match ~* $file]} {
+                set file ./$file
+            }
 	    if {
 		[catch {file delete -force -- $file}]
 		&& [testConstraint testchmod]
@@ -179,6 +195,43 @@ test fCmd-1.1 {TclFileRenameCmd} -constraints {notRoot} -setup {
     file rename tf1 tf2
     glob tf*
 } -result {tf2}
+test fCmd-1.2 {TclFileRenameCmd when target is ~} -setup {
+    cleanup
+    createfile tf1
+} -cleanup {
+    file delete ./~
+} -body {
+    file rename tf1 ~
+    file isfile ~
+} -result 1
+test fCmd-1.3 {TclFileRenameCmd when target is ~user} -setup {
+    cleanup
+    createfile tf1
+} -cleanup {
+    file delete ./~$user
+} -body {
+    file rename tf1 ~$user
+    file isfile ~$user
+} -result 1
+test fCmd-1.4 {TclFileRenameCmd when source is ~} -setup {
+    cleanup
+    createfile ./~
+} -cleanup {
+    file delete ./~
+} -body {
+    file rename ~ tf1
+    list [file exists ~] [file exists tf1]
+} -result {0 1}
+test fCmd-1.5 {TclFileRenameCmd when source is ~user} -setup {
+    cleanup
+    createfile ./~$user
+} -cleanup {
+    file delete ./~$user
+} -body {
+    file rename ~$user tf1
+    list [file exists ~$user] [file exists tf1]
+} -result {0 1}
+
 
 test fCmd-2.1 {TclFileCopyCmd} -constraints {notRoot} -setup {
     cleanup
@@ -187,6 +240,42 @@ test fCmd-2.1 {TclFileCopyCmd} -constraints {notRoot} -setup {
     file copy tf1 tf2
     lsort [glob tf*]
 } -result {tf1 tf2}
+test fCmd-2.2 {TclFileCopyCmd when target is ~} -setup {
+    cleanup
+    createfile tf1
+} -cleanup {
+    file delete ./~
+} -body {
+    file copy tf1 ~
+    list [file exists tf1] [file exists ~]
+} -result {1 1}
+test fCmd-2.3 {TclFileCopyCmd when target is ~user} -setup {
+    cleanup
+    createfile tf1
+} -cleanup {
+    file delete ./~$user
+} -body {
+    file copy tf1 ~$user
+    list [file exists tf1] [file exists ~$user]
+} -result {1 1}
+test fCmd-2.4 {TclFileCopyCmd when source is ~} -setup {
+    cleanup
+    createfile ./~
+} -cleanup {
+    file delete ./~
+} -body {
+    file copy ~ tf1
+    list [file exists ~] [file exists tf1]
+} -result {1 1}
+test fCmd-2.5 {TclFileCopyCmd when source is ~user} -setup {
+    cleanup
+    createfile ./~$user
+} -cleanup {
+    file delete ./~$user
+} -body {
+    file copy ~$user tf1
+    list [file exists ~$user] [file exists tf1]
+} -result {1 1}
 
 test fCmd-3.1 {FileCopyRename: FileForceOption fails} -constraints {notRoot} -body {
     file rename -xyz
@@ -196,7 +285,7 @@ test fCmd-3.2 {FileCopyRename: not enough args} -constraints {notRoot} -body {
 } -returnCodes error -result {wrong # args: should be "file rename ?-option value ...? source ?source ...? target"}
 test fCmd-3.3 {FileCopyRename: Tcl_TranslateFileName fails} -constraints {notRoot} -body {
     file rename xyz ~_totally_bogus_user
-} -returnCodes error -result {user "_totally_bogus_user" doesn't exist}
+} -returnCodes error -result {error renaming "xyz": no such file or directory}
 test fCmd-3.4 {FileCopyRename: Tcl_TranslateFileName passes} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
@@ -270,7 +359,7 @@ test fCmd-3.14 {FileCopyRename: FileBasename fails} -setup {
 } -constraints {notRoot} -returnCodes error -body {
     file mkdir td1
     file rename ~_totally_bogus_user td1
-} -result {user "_totally_bogus_user" doesn't exist}
+} -result {error renaming "~_totally_bogus_user": no such file or directory}
 test fCmd-3.15 {FileCopyRename: source[0] == '\x00'} -setup {
     cleanup
 } -constraints {notRoot unixOrWin} -returnCodes error -body {
@@ -308,11 +397,17 @@ test fCmd-4.3 {TclFileMakeDirsCmd: stops on first error} -setup {
     catch {file mkdir td1 td2 tf1 td3 td4}
     glob td1 td2 tf1 td3 td4
 } -result {td1 td2 tf1}
-test fCmd-4.4 {TclFileMakeDirsCmd: Tcl_TranslateFileName fails} -setup {
+test fCmd-4.4 {TclFileMakeDirsCmd: Tcl_TranslateFileName treats ~ as normal char} -setup {
     cleanup
-} -constraints {notRoot} -returnCodes error -body {
+} -constraints {notRoot} -body {
+    list [file isdir ~] [file mkdir ~] [file isdir ~]
+} -result {0 {} 1}
+test fCmd-4.4.1 {TclFileMakeDirsCmd: Tcl_TranslateFileName treats ~ as normal char} -setup {
+    cleanup
+} -constraints {notRoot} -body {
     file mkdir ~_totally_bogus_user
-} -result {user "_totally_bogus_user" doesn't exist}
+    file isdir ~_totally_bogus_user
+} -result 1
 test fCmd-4.5 {TclFileMakeDirsCmd: Tcl_SplitPath returns 0: *name == '\x00'} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
@@ -420,15 +515,16 @@ test fCmd-5.5 {TclFileDeleteCmd: stop at first error} -setup {
     catch {file delete tf1 td1 $root tf2}
     list [file exists tf1] [file exists tf2] [file exists td1]
 } -cleanup {cleanup} -result {0 1 0}
-test fCmd-5.6 {TclFileDeleteCmd: Tcl_TranslateFileName fails} -constraints {notRoot} -body {
+test fCmd-5.6 {
+    TclFileDeleteCmd: Tcl_TranslateFileName treats ~user as normal char
+} -constraints {notRoot} -body {
     file delete ~_totally_bogus_user
-} -returnCodes error -result {user "_totally_bogus_user" doesn't exist}
-test fCmd-5.7 {TclFileDeleteCmd: Tcl_TranslateFileName succeeds} -setup {
-    catch {file delete ~/tf1}
+} -result {}
+test fCmd-5.7 {
+    TclFileDeleteCmd: Tcl_TranslateFileName treats ~ as normal char
 } -constraints {notRoot} -body {
     createfile ~/tf1
-    file delete ~/tf1
-} -result {}
+} -returnCodes error -result {couldn't open "~/tf1": no such file or directory}
 test fCmd-5.8 {TclFileDeleteCmd: file doesn't exist: lstat(name) != 0} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -627,37 +723,37 @@ test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
 test fCmd-6.24 {CopyRenameOneFile: error uses original name} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
-    file mkdir ~/td1/td2
-    set td1name [file join [file dirname ~] [file tail ~] td1]
+    file mkdir [file home]/td1/td2
+    set td1name [file join [file dirname [file home]] [file tail [file home]] td1]
     file attributes $td1name -permissions 0
-    file copy ~/td1 td1
+    file copy [file home]/td1 td1
 } -returnCodes error -cleanup {
     file attributes $td1name -permissions 0o755
-    file delete -force ~/td1
-} -result {error copying "~/td1": permission denied}
+    file delete -force [file home]/td1
+} -result "error copying \"[file home]/td1\": permission denied"
 test fCmd-6.25 {CopyRenameOneFile: error uses original name} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
     file mkdir td2
-    file mkdir ~/td1
-    set td1name [file join [file dirname ~] [file tail ~] td1]
+    file mkdir [file home]/td1
+    set td1name [file join [file dirname [file home]] [file tail [file home]] td1]
     file attributes $td1name -permissions 0
-    file copy td2 ~/td1
+    file copy td2 [file home]/td1
 } -returnCodes error -cleanup {
     file attributes $td1name -permissions 0o755
-    file delete -force ~/td1
-} -result {error copying "td2" to "~/td1/td2": permission denied}
+    file delete -force [file home]/td1
+} -result "error copying \"td2\" to \"[file home]/td1/td2\": permission denied"
 test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
-    file mkdir ~/td1/td2
-    set td2name [file join [file dirname ~] [file tail ~] td1 td2]
+    file mkdir [file home]/td1/td2
+    set td2name [file join [file dirname [file home]] [file tail [file home]] td1 td2]
     file attributes $td2name -permissions 0
-    file copy ~/td1 td1
+    file copy [file home]/td1 td1
 } -returnCodes error -cleanup {
     file attributes $td2name -permissions 0o755
-    file delete -force ~/td1
-} -result "error copying \"~/td1\" to \"td1\": \"[file join $::env(HOME) td1 td2]\": permission denied"
+    file delete -force [file home]/td1
+} -result "error copying \"[file home]/td1\" to \"td1\": \"[file join $::env(HOME) td1 td2]\": permission denied"
 test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
 } -constraints {notRoot xdev} -returnCodes error -body {
@@ -741,7 +837,7 @@ test fCmd-7.5 {FileForceOption: multiple times through loop} -setup {
 } -result {no files matched glob patterns "-- -force"}
 
 test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
-    -constraints {unix notRoot knownBug} -body {
+    -constraints {unix notRoot knownBug tildeexpansion} -body {
     # Labelled knownBug because it is dangerous [Bug: 3881]
     file mkdir td1
     file attr td1 -perm 0o40000
@@ -752,11 +848,11 @@ test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
 test fCmd-8.2 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
 	-constraints {unix notRoot} -body {
     string equal [file tail ~$user] ~$user
-} -result 0
+} -result 1
 test fCmd-8.3 {file copy and path translation: ensure correct error} -body {
-    file copy ~ [file join this file doesnt exist]
+    file copy [file home] [file join this file doesnt exist]
 } -returnCodes error -result [subst \
-	{error copying "~" to "[file join this file doesnt exist]": no such file or directory}]
+   {error copying "[file home]" to "[file join this file doesnt exist]": no such file or directory}]
 
 test fCmd-9.1 {file rename: comprehensive: EACCES} -setup {
     cleanup
@@ -1498,15 +1594,17 @@ test fCmd-14.8 {copyfile: copy directory failing} -setup {
 #
 # Coverage tests for TclMkdirCmd()
 #
+
+# ~ is no longer a special char. Need a test case where translation fails.
 test fCmd-15.1 {TclMakeDirsCmd: target filename translation failing} -setup {
     set temp $::env(HOME)
-} -constraints {notRoot} -body {
+} -constraints {notRoot TODO} -body {
     global env
     unset env(HOME)
     catch {file mkdir ~/tfa}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 #
 # Can Tcl_SplitPath return argc == 0? If so them we need a test for that code.
 #
@@ -1599,9 +1697,10 @@ test fCmd-16.4 {accept zero files (TIP 323)} -body {
 test fCmd-16.5 {accept zero files (TIP 323)} -body {
     file delete --
 } -result {}
+# ~ is no longer a special char. Need a test case where translation fails.
 test fCmd-16.6 {delete: source filename translation failing} -setup {
     set temp $::env(HOME)
-} -constraints {notRoot} -body {
+} -constraints {notRoot TODO} -body {
     global env
     unset env(HOME)
     catch {file delete ~/tfa}
@@ -2227,7 +2326,7 @@ test fCmd-27.2 {TclFileAttrsCmd - Tcl_TranslateFileName fails} -setup {
     file attributes ~_totally_bogus_user
 } -returnCodes error -cleanup {
     testsetplatform $platform
-} -result {user "_totally_bogus_user" doesn't exist}
+} -result {could not read "~_totally_bogus_user": no such file or directory}
 test fCmd-27.3 {TclFileAttrsCmd - all attributes} -setup {
     catch {file delete -force -- foo.tmp}
 } -body {
@@ -2556,6 +2655,57 @@ test fCmd-30.3 {file readable on 'pagefile.sys'} -constraints {win notInCIenv} -
     }
     return $r
 } -result {exists 1 readable 0 stat 0 {}}
+
+test fCmd-31.1 {file home} -body {
+    file home
+} -result [file join $::env(HOME)]
+test fCmd-31.2 {file home - obeys env} -setup {
+    set ::env(HOME) $::env(HOME)/xxx
+} -cleanup {
+    set ::env(HOME) [file dirname $::env(HOME)]
+} -body {
+    file home
+} -result [file join $::env(HOME) xxx]
+test fCmd-31.3 {file home - \ -> /} -constraints win -setup {
+    set saved $::env(HOME)
+    set ::env(HOME) C:\\backslash\\path
+} -cleanup {
+    set ::env(HOME) $saved
+} -body {
+    file home
+} -result C:/backslash/path
+test fCmd-31.4 {file home - error} -setup {
+    set saved $::env(HOME)
+    unset ::env(HOME)
+} -cleanup {
+    set ::env(HOME) $saved
+} -body {
+    file home
+} -returnCodes error -result {couldn't find HOME environment variable to expand path}
+test fCmd-31.5 {
+    file home - relative path. Following 8.x ~ expansion behavior, relative
+    paths are not made absolute
+} -setup {
+    set saved $::env(HOME)
+    set ::env(HOME) relative/path
+} -cleanup {
+    set ::env(HOME) $saved
+} -body {
+    file home
+} -result relative/path
+test fCmd-31.6 {file home USER} -body {
+    # Note - as in 8.x this form does NOT necessarily give same result as
+    # env(HOME) even when user is current user. Assume result contains user
+    # name, else not sure how to check
+    file home $::tcl_platform(user)
+} -match glob -result "*$::tcl_platform(user)*"
+test fCmd-31.6 {file home UNKNOWNUSER} -body {
+    file home nosuchuser
+} -returnCodes error -result {user "nosuchuser" doesn't exist}
+test fCmd-31.7 {file home extra arg} -body {
+    file home $::tcl_platform(user) arg
+} -returnCodes error -result {wrong # args: should be "file home ?user?"}
+
 
 # cleanup
 cleanup
diff --git a/tests/fileName.test b/tests/fileName.test
index 04273d7..0dd6f86 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -71,15 +71,15 @@ test filename-1.4 {Tcl_GetPathType: unix} {testsetplatform} {
 test filename-1.5 {Tcl_GetPathType: unix} {testsetplatform} {
     testsetplatform unix
     file pathtype ~
-} absolute
+} relative
 test filename-1.6 {Tcl_GetPathType: unix} {testsetplatform} {
     testsetplatform unix
     file pathtype ~/foo
-} absolute
+} relative
 test filename-1.7 {Tcl_GetPathType: unix} {testsetplatform} {
     testsetplatform unix
     file pathtype ~foo
-} absolute
+} relative
 test filename-1.8 {Tcl_GetPathType: unix} {testsetplatform} {
     testsetplatform unix
     file pathtype ./~foo
@@ -136,15 +136,15 @@ test filename-3.12 {Tcl_GetPathType: windows} {testsetplatform} {
 test filename-3.13 {Tcl_GetPathType: windows} {testsetplatform} {
     testsetplatform windows
     file pathtype ~foo
-} absolute
+} relative
 test filename-3.14 {Tcl_GetPathType: windows} {testsetplatform} {
     testsetplatform windows
     file pathtype ~
-} absolute
+} relative
 test filename-3.15 {Tcl_GetPathType: windows} {testsetplatform} {
     testsetplatform windows
     file pathtype ~/foo
-} absolute
+} relative
 test filename-3.16 {Tcl_GetPathType: windows} {testsetplatform} {
     testsetplatform windows
     file pathtype ./~foo
@@ -213,11 +213,11 @@ test filename-4.15 {Tcl_SplitPath: unix} {testsetplatform} {
 test filename-4.16 {Tcl_SplitPath: unix} {testsetplatform} {
     testsetplatform unix
     file split ~foo/~bar
-} {~foo ./~bar}
+} {~foo ~bar}
 test filename-4.17 {Tcl_SplitPath: unix} {testsetplatform} {
     testsetplatform unix
     file split ~foo/~bar/~baz
-} {~foo ./~bar ./~baz}
+} {~foo ~bar ~baz}
 test filename-4.18 {Tcl_SplitPath: unix} {testsetplatform} {
     testsetplatform unix
     file split foo/bar~/baz
@@ -357,11 +357,11 @@ test filename-6.26 {Tcl_SplitPath: win} {testsetplatform} {
 test filename-6.27 {Tcl_SplitPath: win} {testsetplatform} {
     testsetplatform win
     file split ~foo/~bar
-} {~foo ./~bar}
+} {~foo ~bar}
 test filename-6.28 {Tcl_SplitPath: win} {testsetplatform} {
     testsetplatform win
     file split ~foo/~bar/~baz
-} {~foo ./~bar ./~baz}
+} {~foo ~bar ~baz}
 test filename-6.29 {Tcl_SplitPath: win} {testsetplatform} {
     testsetplatform win
     file split foo/bar~/baz
@@ -369,7 +369,7 @@ test filename-6.29 {Tcl_SplitPath: win} {testsetplatform} {
 test filename-6.30 {Tcl_SplitPath: win} {testsetplatform} {
     testsetplatform win
     file split c:~foo
-} {c: ./~foo}
+} {c: ~foo}
 
 test filename-7.1 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
@@ -414,7 +414,7 @@ test filename-7.10 {Tcl_JoinPath: unix} {testsetplatform} {
 test filename-7.11 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join ~a ~b
-} {~b}
+} {~a/~b}
 test filename-7.12 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join ./~a b
@@ -422,11 +422,11 @@ test filename-7.12 {Tcl_JoinPath: unix} {testsetplatform} {
 test filename-7.13 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join ./~a ~b
-} {~b}
+} {./~a/~b}
 test filename-7.14 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join ./~a ./~b
-} {./~a/~b}
+} {./~a/./~b}
 test filename-7.15 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join a . b
@@ -434,7 +434,7 @@ test filename-7.15 {Tcl_JoinPath: unix} {testsetplatform} {
 test filename-7.16 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join a . ./~b
-} {a/./~b}
+} {a/././~b}
 test filename-7.17 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join //a b
@@ -490,11 +490,11 @@ test filename-9.10 {Tcl_JoinPath: win} {testsetplatform} {
 test filename-9.11 {Tcl_JoinPath: win} {testsetplatform} {
     testsetplatform win
     file join ~ ./~foo
-} {~/~foo}
+} {~/./~foo}
 test filename-9.12 {Tcl_JoinPath: win} {testsetplatform} {
     testsetplatform win
     file join / ~foo
-} {~foo}
+} {/~foo}
 test filename-9.13 {Tcl_JoinPath: win} {testsetplatform} {
     testsetplatform win
     file join ./a/ b c
@@ -600,7 +600,7 @@ test filename-10.6 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~/foo
 } -cleanup {
     set env(HOME) $temp
-} -result {/home/test/foo}
+} -result {~/foo}
 test filename-10.7 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -608,9 +608,9 @@ test filename-10.7 {Tcl_TranslateFileName} -setup {
     unset env(HOME)
     testsetplatform unix
     testtranslatefilename ~/foo
-} -returnCodes error -cleanup {
+} -cleanup {
     set env(HOME) $temp
-} -result {couldn't find HOME environment variable to expand path}
+} -result {~/foo}
 test filename-10.8 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -620,7 +620,7 @@ test filename-10.8 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~
 } -cleanup {
     set env(HOME) $temp
-} -result {/home/test}
+} -result {~}
 test filename-10.9 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -630,7 +630,7 @@ test filename-10.9 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~
 } -cleanup {
     set env(HOME) $temp
-} -result {/home/test}
+} -result {~}
 test filename-10.10 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -640,7 +640,7 @@ test filename-10.10 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~/foo
 } -cleanup {
     set env(HOME) $temp
-} -result {/home/test/foo}
+} -result {~/foo}
 test filename-10.17 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -650,7 +650,7 @@ test filename-10.17 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~/foo
 } -cleanup {
     set env(HOME) $temp
-} -result {\home\foo}
+} -result {~\foo}
 test filename-10.18 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -660,7 +660,7 @@ test filename-10.18 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~/foo\\bar
 } -cleanup {
     set env(HOME) $temp
-} -result {\home\foo\bar}
+} -result {~\foo\bar}
 test filename-10.19 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -670,11 +670,11 @@ test filename-10.19 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~/foo
 } -cleanup {
     set env(HOME) $temp
-} -result {c:foo}
-test filename-10.20 {Tcl_TranslateFileName} -returnCodes error -body {
+} -result {~\foo}
+test filename-10.20 {Tcl_TranslateFileName} -body {
     testtranslatefilename ~blorp/foo
 } -constraints {testtranslatefilename testtranslatefilename} \
-    -result {user "blorp" doesn't exist}
+    -result {~blorp\foo}
 test filename-10.21 {Tcl_TranslateFileName} -setup {
     global env
     set temp $env(HOME)
@@ -684,7 +684,7 @@ test filename-10.21 {Tcl_TranslateFileName} -setup {
     testtranslatefilename ~/foo
 } -cleanup {
     set env(HOME) $temp
-} -result {c:\foo}
+} -result {~\foo}
 test filename-10.22 {Tcl_TranslateFileName} -body {
     testsetplatform windows
     testtranslatefilename foo//bar
@@ -713,12 +713,13 @@ test filename-11.3 {Tcl_GlobCmd} -body {
 test filename-11.4 {Tcl_GlobCmd} -body {
     glob -nocomplain
 } -result {}
-test filename-11.5 {Tcl_GlobCmd} -returnCodes error -body {
-    glob -nocomplain * ~xyqrszzz
-} -result {user "xyqrszzz" doesn't exist}
+test filename-11.5 {Tcl_GlobCmd} -body {
+    # Should not error out because of ~
+    catch {glob -nocomplain * ~xyqrszzz}
+} -result 0
 test filename-11.6 {Tcl_GlobCmd} -returnCodes error -body {
     glob ~xyqrszzz
-} -result {user "xyqrszzz" doesn't exist}
+} -result {no files matched glob pattern "~xyqrszzz"}
 test filename-11.7 {Tcl_GlobCmd} -returnCodes error -body {
     glob -- -nocomplain
 } -result {no files matched glob pattern "-nocomplain"}
@@ -728,15 +729,15 @@ test filename-11.8 {Tcl_GlobCmd} -body {
 test filename-11.9 {Tcl_GlobCmd} -constraints {testsetplatform} -body {
     testsetplatform unix
     glob ~\\xyqrszzz/bar
-} -returnCodes error -result {user "\xyqrszzz" doesn't exist}
+} -returnCodes error -result {no files matched glob pattern "~\xyqrszzz/bar"}
 test filename-11.10 {Tcl_GlobCmd} -constraints {testsetplatform} -body {
     testsetplatform unix
     glob -nocomplain ~\\xyqrszzz/bar
-} -returnCodes error -result {user "\xyqrszzz" doesn't exist}
+} -result {}
 test filename-11.11 {Tcl_GlobCmd} -constraints {testsetplatform} -body {
     testsetplatform unix
     glob ~xyqrszzz\\/\\bar
-} -returnCodes error -result {user "xyqrszzz" doesn't exist}
+} -returnCodes error -result {no files matched glob pattern "~xyqrszzz\/\bar"}
 test filename-11.12 {Tcl_GlobCmd} -constraints {testsetplatform} -setup {
     testsetplatform unix
     set home $env(HOME)
@@ -745,13 +746,13 @@ test filename-11.12 {Tcl_GlobCmd} -constraints {testsetplatform} -setup {
     glob ~/*
 } -returnCodes error -cleanup {
     set env(HOME) $home
-} -result {couldn't find HOME environment variable to expand path}
+} -result {no files matched glob pattern "~/*"}
 if {[testConstraint testsetplatform]} {
     testsetplatform $platform
 }
-test filename-11.13 {Tcl_GlobCmd} {
+test filename-11.13 {Tcl_GlobCmd} -body {
     file join [lindex [glob ~] 0]
-} [file join $env(HOME)]
+} -returnCodes error -result {no files matched glob pattern "~"}
 set oldpwd [pwd]
 set oldhome $env(HOME)
 catch {cd [makeDirectory tcl[pid]]}
@@ -769,12 +770,12 @@ touch globTest/a1/b1/x2.c
 touch globTest/a1/b2/y2.c
 touch globTest/.1
 touch globTest/x,z1.c
-test filename-11.14 {Tcl_GlobCmd} {
+test filename-11.14 {Tcl_GlobCmd} -body {
     glob ~/globTest
-} [list [file join $env(HOME) globTest]]
-test filename-11.15 {Tcl_GlobCmd} {
+} -returnCodes error -result {no files matched glob pattern "~/globTest"}
+test filename-11.15 {Tcl_GlobCmd} -body {
     glob ~\\/globTest
-} [list [file join $env(HOME) globTest]]
+} -returnCodes error -result {no files matched glob pattern "~\/globTest"}
 test filename-11.16 {Tcl_GlobCmd} {
     glob globTest
 } {globTest}
@@ -1252,7 +1253,7 @@ test filename-14.17 {asterisks, question marks, and brackets} -setup {
     set temp $env(HOME)
 } -body {
     set env(HOME) [file join $env(HOME) globTest]
-    glob ~/z*
+    glob [file home]/z*
 } -cleanup {
     set env(HOME) $temp
 } -result [list [file join $env(HOME) globTest z1.c]]
@@ -1349,11 +1350,10 @@ test filename-15.4 {unix specific no complain: no errors, good result} \
     glob -nocomplain ~ouster ~foo ~welch
 } {/home/ouster /home/welch}
 test filename-15.4.1 {no complain: errors, sequencing} {
-    # test used to fail because if an error occurs, the interp's result is
-    # reset... But, the sequence means we throw a different error first.
+    # ~xxx no longer expanded so errors about unknown users should not occur
     list [catch {glob -nocomplain ~wontexist ~blahxyz ~} res1] $res1 \
 	[catch {glob -nocomplain ~ ~blahxyz ~wontexist} res2] $res2
-} {1 {user "wontexist" doesn't exist} 1 {user "blahxyz" doesn't exist}}
+} {0 {} 0 {}}
 test filename-15.4.2 {no complain: errors, sequencing} -body {
     # test used to fail because if an error occurs, the interp's result is
     # reset...
@@ -1363,20 +1363,12 @@ test filename-15.4.2 {no complain: errors, sequencing} -body {
 test filename-15.5 {unix specific globbing} {unix nonPortable} {
     glob ~ouster/.csh*
 } "/home/ouster/.cshrc"
-touch globTest/odd\\\[\]*?\{\}name
-test filename-15.6 {unix specific globbing} -constraints {unix} -setup {
-    global env
-    set temp $env(HOME)
-} -body {
-    set env(HOME) $env(HOME)/globTest/odd\\\[\]*?\{\}name
-    glob ~
-} -cleanup {
-    set env(HOME) $temp
-} -result [list [lindex [glob ~] 0]/globTest/odd\\\[\]*?\{\}name]
-catch {file delete -force globTest/odd\\\[\]*?\{\}name}
-test filename-15.7 {win specific globbing} -constraints {win} -body {
+# 15.6 removed. It checked if glob ~ returned valid information if
+# home directory contained glob chars. Since ~ expansion is no longer
+# supported, the test was meaningless
+test filename-15.7 {glob tilde} -body {
     glob ~
-} -match regexp -result {[^/]$}
+} -returnCodes error -result {no files matched glob pattern "~"}
 test filename-15.8 {win and unix specific globbing} -constraints {unixOrWin} -setup {
     global env
     set temp $env(HOME)
@@ -1387,7 +1379,7 @@ test filename-15.8 {win and unix specific globbing} -constraints {unixOrWin} -se
 } -cleanup {
     set env(HOME) $temp
     catch {file delete -force $env(HOME)/globTest/anyname}
-} -result [list [lindex [glob ~] 0]/globTest/anyname]
+} -returnCodes error -result {no files matched glob pattern "~"}
 
 # The following tests are only valid for Windows systems.
 set oldDir [pwd]
@@ -1566,7 +1558,7 @@ test fileName-20.5 {Bug 2837800} -setup {
 test fileName-20.6 {Bug 2837800} -setup {
     # Recall that we have $env(HOME) set so that references
     # to ~ point to [temporaryDirectory]
-    makeFile {} test ~
+    makeFile {} test [file home]
     set dd [makeDirectory isolate]
     set d [makeDirectory ./~ $dd]
     set savewd [pwd]
@@ -1602,33 +1594,21 @@ test fileName-20.8 {Bug 2806250} -setup {
     removeFile ./~test $d
     removeDirectory isolate
     cd $savewd
-} -result ./~test
-test fileName-20.9 {globbing for special chars} -setup {
-    makeFile {} test ~
-    set d [makeDirectory isolate]
-    set savewd [pwd]
-    cd $d
-} -body {
-   glob -nocomplain -directory ~ test
-} -cleanup {
-    cd $savewd
-    removeDirectory isolate
-    removeFile test ~
-} -result ~/test
+} -result ~test
 test fileName-20.10 {globbing for special chars} -setup {
-    set s [makeDirectory sub ~]
+    set s [makeDirectory sub [file home]]
     makeFile {} fileName-20.10 $s
     set d [makeDirectory isolate]
     set savewd [pwd]
     cd $d
 } -body {
-   glob -nocomplain -directory ~ -join * fileName-20.10
+    glob -nocomplain -directory [file home] -join * fileName-20.10
 } -cleanup {
     cd $savewd
     removeDirectory isolate
     removeFile fileName-20.10 $s
-    removeDirectory sub ~
-} -result ~/sub/fileName-20.10
+    removeDirectory sub [file home]
+} -result [file home]/sub/fileName-20.10
 
 # cleanup
 catch {file delete -force C:/globTest}
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 0b53be5..462b61e 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -267,15 +267,14 @@ file delete -force [file join dir.dir dirinside.link]
 removeFile [file join dir.dir inside.file]
 removeDirectory [file join dir.dir dirinside.dir]
 removeDirectory dir.dir
-test filesystem-1.30 {normalisation of nonexistent user} -body {
+test filesystem-1.30 {
+    normalisation of nonexistent user - verify no tilde expansion
+} -body {
     file normalize ~noonewiththisname
-} -returnCodes error -result {user "noonewiththisname" doesn't exist}
+} -result [file join [pwd] ~noonewiththisname]
 test filesystem-1.30.1 {normalisation of existing user} -body {
-    catch {file normalize ~$::tcl_platform(user)}
-} -result {0}
-test filesystem-1.30.2 {normalisation of nonexistent user specified as user@domain} -body {
-    file normalize ~nonexistentuser@nonexistentdomain
-} -returnCodes error -result {user "nonexistentuser@nonexistentdomain" doesn't exist}
+    file normalize ~$::tcl_platform(user)
+} -result [file join [pwd] ~$::tcl_platform(user)]
 test filesystem-1.31 {link normalisation: link near filesystem root} {testsetplatform} {
     testsetplatform unix
     file normalize /foo/../bar
@@ -473,7 +472,10 @@ test filesystem-4.3 {testfilesystem} -constraints testfilesystem -body {
     return $filesystemReport
 } -match glob -result {*{matchindirectory *}*}
 
-test filesystem-5.1 {cache and ~} -constraints testfilesystem -setup {
+# This test is meaningless if there is no tilde expansion
+test filesystem-5.1 {cache and ~} -constraints {
+    testfilesystem tildeexpansion
+} -setup {
     set orig $::env(HOME)
 } -body {
     set ::env(HOME) /foo/bar/blah
@@ -939,7 +941,7 @@ test filesystem-9.7 {path objects and glob and file tail and tilde} -setup {
     cd [tcltest::temporaryDirectory]
     file delete -force tilde
     cd $origdir
-} -result {0 1 {user "testNotExist" doesn't exist} ~testNotExist 0 1 {user "testNotExist" doesn't exist} 1 {user "testNotExist" doesn't exist}}
+} -result {1 0 ~testNotExist ~testNotExist 1 0 ~testNotExist 0 ~testNotExist}
 test filesystem-9.8 {path objects and glob and file tail and tilde} -setup {
     set res {}
     set origdir [pwd]
@@ -957,7 +959,7 @@ test filesystem-9.8 {path objects and glob and file tail and tilde} -setup {
     cd [tcltest::temporaryDirectory]
     file delete -force tilde
     cd $origdir
-} -result {~testNotExist ~testNotExist 1 {user "testNotExist" doesn't exist} 1 {user "testNotExist" doesn't exist}}
+} -result {~testNotExist ~testNotExist 0 ~testNotExist 0 ~testNotExist}
 test filesystem-9.9 {path objects and glob and file tail and tilde} -setup {
     set res {}
     set origdir [pwd]
@@ -975,7 +977,7 @@ test filesystem-9.9 {path objects and glob and file tail and tilde} -setup {
     cd [tcltest::temporaryDirectory]
     file delete -force tilde
     cd $origdir
-} -result {0 0 0 0 1}
+} -result {0 1 0 1 1}
 
 # ----------------------------------------------------------------------
 
diff --git a/tests/io.test b/tests/io.test
index dca88a4..c4a6b5a 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -5956,7 +5956,7 @@ test io-40.17 {tilde substitution in open} {
     set x [list [catch {open ~/foo} msg] $msg]
     set ::env(HOME) $home
     set x
-} {1 {couldn't find HOME environment variable to expand path}}
+} {1 {couldn't open "~/foo": no such file or directory}}
 
 test io-41.1 {Tcl_FileeventCmd: errors} {fileevent} {
     list [catch {fileevent foo} msg] $msg
diff --git a/tests/safe.test b/tests/safe.test
index c355171..6fc4fbe 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1621,7 +1621,7 @@ test safe-16.5 {Bug 3529949: defang ~ in paths used by AliasGlob (1)} -setup {
     safe::interpDelete $i
     set env(HOME) $savedHOME
     unset savedHOME
-} -result {~}
+} -result {$p(:0:)/~}
 test safe-16.6 {Bug 3529949: defang ~ in paths used by AliasGlob (2)} -setup {
     set savedHOME $env(HOME)
     set env(HOME) /foo/bar
@@ -1635,7 +1635,7 @@ test safe-16.6 {Bug 3529949: defang ~ in paths used by AliasGlob (2)} -setup {
     safe::interpDelete $i
     set env(HOME) $savedHOME
     unset savedHOME
-} -result {~}
+} -result {$p(:0:)/foo/bar/~}
 test safe-16.7 {Bug 3529949: defang ~user in paths used by AliasGlob (1)} -setup {
     set i [safe::interpCreate]
     set user $tcl_platform(user)
@@ -1644,7 +1644,7 @@ test safe-16.7 {Bug 3529949: defang ~user in paths used by AliasGlob (1)} -setup
 } -cleanup {
     safe::interpDelete $i
     unset user
-} -result {~USER}
+} -result {$p(:0:)/~USER}
 test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup {
     set i [safe::interpCreate]
     set user $tcl_platform(user)
@@ -1653,7 +1653,7 @@ test safe-16.8 {Bug 3529949: defang ~user in paths used by AliasGlob (2)} -setup
 } -cleanup {
     safe::interpDelete $i
     unset user
-} -result {~USER}
+} -result {$p(:0:)/foo/bar/~USER}
 
 # cleanup
 set ::auto_path $SaveAutoPath
diff --git a/tests/winFile.test b/tests/winFile.test
index 0c13a0e..38f6954 100644
--- a/tests/winFile.test
+++ b/tests/winFile.test
@@ -28,7 +28,7 @@ testConstraint notWine [expr {![info exists ::env(CI_USING_WINE)]}]
 
 test winFile-1.1 {TclpGetUserHome} -constraints {win} -body {
     glob ~nosuchuser
-} -returnCodes error -result {user "nosuchuser" doesn't exist}
+} -returnCodes error -result {no files matched glob pattern "~nosuchuser"}
 test winFile-1.2 {TclpGetUserHome} -constraints {win nonPortable} -body {
     # The administrator account should always exist.
     glob ~administrator
-- 
cgit v0.12

-- 
cgit v0.12


From c0481e830577e5c171081870edce6c95d6f6ef87 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 7 Aug 2022 07:16:38 +0000
Subject: TIP 631 - lsubst command

---
 generic/tclBasic.c  |   1 +
 generic/tclCmdIL.c  | 117 +++++++++++++++++++++
 generic/tclInt.h    |   3 +
 tests/lreplace.test | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 416 insertions(+)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index a0c5a91..f7e0929 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -324,6 +324,7 @@ static const CmdInfo builtInCmds[] = {
     {"lsearch",		Tcl_LsearchObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
     {"lset",		Tcl_LsetObjCmd,		TclCompileLsetCmd,	NULL,	CMD_IS_SAFE},
     {"lsort",		Tcl_LsortObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
+    {"lsubst",		Tcl_LsubstObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
     {"package",		Tcl_PackageObjCmd,	NULL,			TclNRPackageObjCmd,	CMD_IS_SAFE},
     {"proc",		Tcl_ProcObjCmd,		NULL,			NULL,	CMD_IS_SAFE},
     {"regexp",		Tcl_RegexpObjCmd,	TclCompileRegexpCmd,	NULL,	CMD_IS_SAFE},
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index cdc302c..7776c78 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -4486,6 +4486,123 @@ Tcl_LsortObjCmd(
 /*
  *----------------------------------------------------------------------
  *
+ * Tcl_LsubstObjCmd --
+ *
+ *	This procedure is invoked to process the "lsubst" Tcl command. See the
+ *	user documentation for details on what it does.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	See the user documentation.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tcl_LsubstObjCmd(
+    TCL_UNUSED(ClientData),
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument values. */
+{
+    Tcl_Obj *listPtr;		/* Pointer to the list being altered. */
+    Tcl_Obj *finalValuePtr;	/* Value finally assigned to the variable. */
+    int createdNewObj;
+    int result;
+    int first;
+    int last;
+    int listLen;
+    int numToDelete;
+
+    if (objc < 4) {
+	Tcl_WrongNumArgs(interp, 1, objv,
+		"listVar first last ?element ...?");
+	return TCL_ERROR;
+    }
+
+    listPtr = Tcl_ObjGetVar2(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG);
+    if (listPtr == NULL) {
+	return TCL_ERROR;
+    }
+
+    /*
+     * TODO - refactor the index extraction into a common function shared
+     * by Tcl_{Lrange,Lreplace,Lsubst}ObjCmd
+     */
+
+    result = TclListObjLengthM(interp, listPtr, &listLen);
+    if (result != TCL_OK) {
+	return result;
+    }
+
+    result = TclGetIntForIndexM(interp, objv[2], /*end*/ listLen-1, &first);
+    if (result != TCL_OK) {
+	return result;
+    }
+
+    result = TclGetIntForIndexM(interp, objv[3], /*end*/ listLen-1, &last);
+    if (result != TCL_OK) {
+	return result;
+    }
+
+    if (first == TCL_INDEX_NONE) {
+	first = 0;
+    } else if (first > listLen) {
+	first = listLen;
+    }
+
+    if (last >= listLen) {
+	last = listLen - 1;
+    }
+    if (first <= last) {
+	numToDelete = last - first + 1;
+    } else {
+	numToDelete = 0;
+    }
+
+    if (Tcl_IsShared(listPtr)) {
+	listPtr = TclListObjCopy(NULL, listPtr);
+	createdNewObj = 1;
+    } else {
+	createdNewObj = 0;
+    }
+
+    result =
+	Tcl_ListObjReplace(interp, listPtr, first, numToDelete, objc - 4, objv + 4);
+    if (result != TCL_OK) {
+	if (createdNewObj) {
+	    Tcl_DecrRefCount(listPtr);
+	}
+	return result;
+    }
+
+    /*
+     * Tcl_ObjSetVar2 mau return a value different from listPtr in the
+     * presence of traces etc.. Note that finalValuePtr will always have a
+     * reference count of at least 1 corresponding to the reference from the
+     * var. If it is same as listPtr, then ref count will be at least 2
+     * since we are incr'ing the latter below (safer when calling
+     * Tcl_ObjSetVar2 which can release it in some cases). Note that we
+     * leave the incrref of listPtr this late because we want to pass it as
+     * unshared to Tcl_ListObjReplace above if possible.
+     */
+    Tcl_IncrRefCount(listPtr);
+    finalValuePtr =
+	Tcl_ObjSetVar2(interp, objv[1], NULL, listPtr, TCL_LEAVE_ERR_MSG);
+    Tcl_DecrRefCount(listPtr); /* safe irrespective of createdNewObj */
+    if (finalValuePtr == NULL) {
+	return TCL_ERROR;
+    }
+
+    Tcl_SetObjResult(interp, finalValuePtr);
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * MergeLists -
  *
  *	This procedure combines two sorted lists of SortElement structures
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 06ec2ad..562140c 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3711,6 +3711,9 @@ MODULE_SCOPE int	Tcl_LsetObjCmd(ClientData clientData,
 MODULE_SCOPE int	Tcl_LsortObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
+MODULE_SCOPE int	Tcl_LsubstObjCmd(ClientData clientData,
+			    Tcl_Interp *interp, int objc,
+			    Tcl_Obj *const objv[]);
 MODULE_SCOPE Tcl_Command TclInitNamespaceCmd(Tcl_Interp *interp);
 MODULE_SCOPE int	TclNamespaceEnsembleCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
diff --git a/tests/lreplace.test b/tests/lreplace.test
index 0b26e86..4204c2f 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -236,6 +236,301 @@ apply {{} {
     }
 }}
 
+# Essentially same tests as above but for lsubst
+test lsubst-1.1 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 0 0 a] $l
+} {{a 2 3 4 5} {a 2 3 4 5}}
+test lsubst-1.2 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 1 1 a] $l
+} {{1 a 3 4 5} {1 a 3 4 5}}
+test lsubst-1.3 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 2 2 a] $l
+} {{1 2 a 4 5} {1 2 a 4 5}}
+test lsubst-1.4 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 3 3 a] $l
+} {{1 2 3 a 5} {1 2 3 a 5}}
+test lsubst-1.5 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 4 4 a] $l
+} {{1 2 3 4 a} {1 2 3 4 a}}
+test lsubst-1.6 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 4 5 a] $l
+} {{1 2 3 4 a} {1 2 3 4 a}}
+test lsubst-1.7 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l -1 -1 a] $l
+} {{a 1 2 3 4 5} {a 1 2 3 4 5}}
+test lsubst-1.8 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 2 end a b c d] $l
+} {{1 2 a b c d} {1 2 a b c d}}
+test lsubst-1.9 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 0 3] $l
+} {5 5}
+test lsubst-1.10 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 0 4] $l
+} {{} {}}
+test lsubst-1.11 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 0 1] $l
+} {{3 4 5} {3 4 5}}
+test lsubst-1.12 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 2 3] $l
+} {{1 2 5} {1 2 5}}
+test lsubst-1.13 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l 3 end] $l
+} {{1 2 3} {1 2 3}}
+test lsubst-1.14 {lsubst command} {
+    set l {1 2 3 4 5}
+    list [lsubst l -1 4 a b c] $l
+} {{a b c} {a b c}}
+test lsubst-1.15 {lsubst command} {
+    set l {a b "c c" d e f}
+    list [lsubst l 3 3] $l
+} {{a b {c c} e f} {a b {c c} e f}}
+test lsubst-1.16 {lsubst command} {
+    set l { 1 2 3 4 5}
+    list [lsubst l 0 0 a] $l
+} {{a 2 3 4 5} {a 2 3 4 5}}
+test lsubst-1.17 {lsubst command} {
+    set l {1 2 3 4 "5 6"}
+    list [lsubst l 4 4 a] $l
+} {{1 2 3 4 a} {1 2 3 4 a}}
+test lsubst-1.18 {lsubst command} {
+    set l {1 2 3 4 {5 6}}
+    list [lsubst l 4 4 a] $l
+} {{1 2 3 4 a} {1 2 3 4 a}}
+test lsubst-1.19 {lsubst command} {
+    set l {1 2 3 4}
+    list [lsubst l 2 end x y z] $l
+} {{1 2 x y z} {1 2 x y z}}
+test lsubst-1.20 {lsubst command} {
+    set l {1 2 3 4}
+    list [lsubst l end end a] $l
+} {{1 2 3 a} {1 2 3 a}}
+test lsubst-1.21 {lsubst command} {
+    set l {1 2 3 4}
+    list [lsubst l end 3 a] $l
+} {{1 2 3 a} {1 2 3 a}}
+test lsubst-1.22 {lsubst command} {
+    set l {1 2 3 4}
+    list [lsubst l end end] $l
+} {{1 2 3} {1 2 3}}
+test lsubst-1.23 {lsubst command} {
+    set l {1 2 3 4}
+    list [lsubst l 2 -1 xy] $l
+} {{1 2 xy 3 4} {1 2 xy 3 4}}
+test lsubst-1.24 {lsubst command} {
+    set l {1 2 3 4}
+    list [lsubst l end -1 z] $l
+} {{1 2 3 z 4} {1 2 3 z 4}}
+test lsubst-1.25 {lsubst command} {
+    set l {\}\     hello}
+    concat \"[lsubst l end end]\" $l
+} {"\}\ " \}\ }
+test lsubst-1.26 {lsubst command} {
+    catch {unset foo}
+    set foo {a b}
+    list [lsubst foo end end] $foo \
+        [lsubst foo end end] $foo \
+        [lsubst foo end end] $foo
+} {a a {} {} {} {}}
+test lsubst-1.27 {lsubset command} -body {
+    set l x
+    list [lsubst l 1 1] $l
+} -result {x x}
+test lsubst-1.28 {lsubst command} -body {
+    set l x
+    list [lsubst l 1 1 y] $l
+} -result {{x y} {x y}}
+test lsubst-1.29 {lsubst command} -body {
+    set l x
+    lsubst l 1 1 [error foo]
+} -returnCodes 1 -result {foo}
+test lsubst-1.30 {lsubst command} -body {
+    set l {not {}alist}
+    lsubst l 0 0 [error foo]
+} -returnCodes 1 -result {foo}
+test lsubst-1.31 {lsubst command} -body {
+    unset -nocomplain arr
+    set arr(x) {a b}
+    list [lsubst arr(x) 0 0 c] $arr(x)
+} -result {{c b} {c b}}
+
+test lsubst-2.1 {lsubst errors} -body {
+    list [catch lsubst msg] $msg
+} -result {1 {wrong # args: should be "lsubst listVar first last ?element ...?"}}
+test lsubst-2.2 {lsubst errors} -body {
+    unset -nocomplain x
+    list [catch {lsubst l b} msg] $msg
+} -result {1 {wrong # args: should be "lsubst listVar first last ?element ...?"}}
+test lsubst-2.3 {lsubst errors} -body {
+    set x {}
+    list [catch {lsubst x a 10} msg] $msg
+} -result {1 {bad index "a": must be integer?[+-]integer? or end?[+-]integer?}}
+test lsubst-2.4 {lsubst errors} -body {
+    set l {}
+    list [catch {lsubst l 10 x} msg] $msg
+} -result {1 {bad index "x": must be integer?[+-]integer? or end?[+-]integer?}}
+test lsubst-2.5 {lsubst errors} -body {
+    set l {}
+    list [catch {lsubst l 10 1x} msg] $msg
+} -result {1 {bad index "1x": must be integer?[+-]integer? or end?[+-]integer?}}
+test lsubst-2.6 {lsubst errors} -body {
+    set l x
+    list [catch {lsubst l 3 2} msg] $msg
+} -result {0 x}
+test lsubst-2.7 {lsubst errors} -body {
+    set l x
+    list [catch {lsubst l 2 2} msg] $msg
+} -result {0 x}
+test lsubst-2.8 {lsubst errors} -body {
+    unset -nocomplain l
+    lsubst l 0 0 x
+} -returnCodes error -result {can't read "l": no such variable}
+test lsubst-2.9 {lsubst errors} -body {
+    unset -nocomplain arr
+    lsubst arr(x) 0 0 x
+} -returnCodes error -result {can't read "arr(x)": no such variable}
+test lsubst-2.10 {lsubst errors} -body {
+    unset -nocomplain arr
+    set arr(y) y
+    lsubst arr(x) 0 0 x
+} -returnCodes error -result {can't read "arr(x)": no such element in array}
+
+test lsubst-3.1 {lsubst won't modify shared argument objects} {
+    proc p {} {
+        set l "a b c"
+        lsubst l 1 1 "x y"
+        # The literal in locals table should be unmodified
+        return [list "a b c" $l]
+    }
+    p
+} {{a b c} {a {x y} c}}
+
+# Following bugs were in lreplace. Make sure lsubst does not have them
+test lsubst-4.1 {Bug ccc2c2cc98: lreplace edge case} {
+    set l {}
+    list [lsubst l 1 1] $l
+} {{} {}}
+test lsubst-4.2 {Bug ccc2c2cc98: lreplace edge case} {
+    set l { }
+    list [lsubst l 1 1] $l
+} {{} {}}
+test lsubst-4.3 {lreplace edge case} {
+    set l {1 2 3}
+    lsubst l 2 0
+} {1 2 3}
+test lsubst-4.4 {lsubst edge case} {
+    set l {1 2 3 4 5}
+    list [lsubst l 3 1] $l
+} {{1 2 3 4 5} {1 2 3 4 5}}
+test lreplace-4.5 {lreplace edge case} {
+    lreplace {1 2 3 4 5} 3 0 _
+} {1 2 3 _ 4 5}
+test lsubst-4.6 {lsubst end-x: bug a4cb3f06c4} {
+    set l {0 1 2 3 4}
+    list [lsubst l 0 end-2] $l
+} {{3 4} {3 4}}
+test lsubst-4.6.1 {lsubst end-x: bug a4cb3f06c4} {
+    set l {0 1 2 3 4}
+    list [lsubst l 0 end-2 a b c] $l
+} {{a b c 3 4} {a b c 3 4}}
+test lsubst-4.7 {lsubst with two end-indexes: increasing} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 end-1] $l
+} {{0 1 4} {0 1 4}}
+test lsubst-4.7.1 {lsubst with two end-indexes: increasing} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 end-1 a b c] $l
+} {{0 1 a b c 4} {0 1 a b c 4}}
+test lsubst-4.8 {lsubst with two end-indexes: equal} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 end-2] $l
+} {{0 1 3 4} {0 1 3 4}}
+test lsubst-4.8.1 {lsubst with two end-indexes: equal} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 end-2 a b c] $l
+} {{0 1 a b c 3 4} {0 1 a b c 3 4}}
+test lsubst-4.9 {lsubst with two end-indexes: decreasing} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 end-3] $l
+} {{0 1 2 3 4} {0 1 2 3 4}}
+test lsubst-4.9.1 {lsubst with two end-indexes: decreasing} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 end-3 a b c] $l
+} {{0 1 a b c 2 3 4} {0 1 a b c 2 3 4}}
+test lsubst-4.10 {lsubst with two equal indexes} {
+    set l {0 1 2 3 4}
+    list [lsubst l 2 2] $l
+} {{0 1 3 4} {0 1 3 4}}
+test lsubst-4.10.1 {lsubst with two equal indexes} {
+    set l {0 1 2 3 4}
+    list [lsubst l 2 2 a b c] $l
+} {{0 1 a b c 3 4} {0 1 a b c 3 4}}
+test lsubst-4.11 {lsubst end index first} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 1 a b c] $l
+} {{0 1 a b c 2 3 4} {0 1 a b c 2 3 4}}
+test lsubst-4.12 {lsubst end index first} {
+    set l {0 1 2 3 4}
+    list [lsubst l end-2 2 a b c] $l
+} {{0 1 a b c 3 4} {0 1 a b c 3 4}}
+test lsubst-4.13 {lsubst empty list} {
+    set l {}
+    list [lsubst l 1 1 1] $l
+} {1 1}
+test lsubst-4.14 {lsubst empty list} {
+    set l {}
+    list [lsubst l 2 2 2] $l
+} {2 2}
+
+test lsubst-5.1 {compiled lreplace: Bug 47ac84309b} {
+    apply {x {
+	lsubst x end 0
+    }} {a b c}
+} {a b c}
+test lsubst-5.2 {compiled lreplace: Bug 47ac84309b} {
+    apply {x {
+	lsubst x end 0 A
+    }} {a b c}
+} {a b A c}
+
+# Testing for compiled behaviour. Far too many variations to check with
+# spelt-out tests. Note that this *just* checks whether the compiled version
+# and the interpreted version are the same, not whether the interpreted
+# version is correct.
+apply {{} {
+    set lss     {{} {a} {a b c} {a b c d}}
+    set ins     {{} A {A B}}
+    set idxs    {-2 -1 0 1 2 3 end-3 end-2 end-1 end end+1 end+2}
+    set lreplace lreplace
+
+    foreach ls $lss {
+	foreach a $idxs {
+	    foreach b $idxs {
+		foreach i $ins {
+		    set expected [list [catch {$lreplace $ls $a $b {*}$i} m] $m]
+		    set tester [list lsubst ls $a $b {*}$i]
+		    set script [list catch $tester m]
+		    set script "list \[$script\] \$m"
+		    test lsubst-6.[incr n] {lsubst battery} -body \
+			[list apply [list {ls} $script] $ls] -result $expected
+		}
+	    }
+	}
+    }
+}}
+
 # cleanup
 catch {unset foo}
 ::tcltest::cleanupTests
-- 
cgit v0.12


From b4eda6649fc4011ca9c9693ee8752f1ba2c24437 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 7 Aug 2022 10:11:42 +0000
Subject: Remove code that was ifdef'ed out

---
 generic/tclEnv.c      |  12 --
 generic/tclFCmd.c     |  11 --
 generic/tclFileName.c | 295 +++++++++++---------------------------------------
 generic/tclIOUtil.c   |  14 +--
 generic/tclPathObj.c  | 157 +--------------------------
 library/safe.tcl      |   5 -
 unix/tclUnixInit.c    |   3 +-
 win/tclWinFCmd.c      |  15 ---
 8 files changed, 70 insertions(+), 442 deletions(-)

diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index e469fe9..07cdbb0 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -364,18 +364,6 @@ TclSetEnv(
     }
 
     Tcl_MutexUnlock(&envMutex);
-
-#ifdef TCL_TILDE_EXPAND
-    if (!strcmp(name, "HOME")) {
-	/*
-	 * If the user's home directory has changed, we must invalidate the
-	 * filesystem cache, because '~' expansions will now be incorrect.
-	 */
-
-	Tcl_FSMountsChanged(NULL);
-    }
-#endif
-
 }
 
 /*
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 9a107da..d7fa750 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -882,17 +882,6 @@ FileBasename(
     Tcl_IncrRefCount(splitPtr);
 
     if (objc != 0) {
-#ifdef TCL_TILDE_EXPAND
-        if ((objc == 1) && (*TclGetString(pathPtr) == '~')) {
-	    Tcl_DecrRefCount(splitPtr);
-	    if (Tcl_FSConvertToPathType(interp, pathPtr) != TCL_OK) {
-		return NULL;
-	    }
-	    splitPtr = Tcl_FSSplitPath(pathPtr, &objc);
-	    Tcl_IncrRefCount(splitPtr);
-	}
-#endif
-
         /*
          * Return the last component, unless it is the only component, and it
 	 * is the root of an absolute path.
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 3ffdede..d560710 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -362,13 +362,6 @@ Tcl_GetPathType(
  *	file). The exported function Tcl_FSGetPathType should be used by
  *	extensions.
  *
- *      If TCL_TILDE_EXPAND defined:
- *	Note that '~' paths are always considered TCL_PATH_ABSOLUTE, even
- *	though expanding the '~' could lead to any possible path type. This
- *	function should therefore be considered a low-level, string
- *	manipulation function only -- it doesn't actually do any expansion in
- *	making its determination.
- *
  * Results:
  *	Returns one of TCL_PATH_ABSOLUTE, TCL_PATH_RELATIVE, or
  *	TCL_PATH_VOLUME_RELATIVE.
@@ -389,85 +382,66 @@ TclpGetNativePathType(
     Tcl_PathType type = TCL_PATH_ABSOLUTE;
     const char *path = TclGetString(pathPtr);
 
-    if (path[0] == '~') {
-#ifdef TCL_TILDE_EXPAND
-        /*
-         * This case is common to all platforms. Paths that begin with ~ are
-	 * absolute.
-	 */
-
-	if (driveNameLengthPtr != NULL) {
-	    const char *end = path + 1;
-	    while ((*end != '\0') && (*end != '/')) {
-		end++;
-	    }
-	    *driveNameLengthPtr = end - path;
-	}
-#else
-        type = TCL_PATH_RELATIVE;
-#endif
-    } else {
-	switch (tclPlatform) {
-	case TCL_PLATFORM_UNIX: {
-	    const char *origPath = path;
+    switch (tclPlatform) {
+    case TCL_PLATFORM_UNIX: {
+        const char *origPath = path;
 
-	    /*
-	     * Paths that begin with / are absolute.
-	     */
+        /*
+         * Paths that begin with / are absolute.
+         */
 
-	    if (path[0] == '/') {
-		++path;
+        if (path[0] == '/') {
+            ++path;
 #if defined(__CYGWIN__) || defined(__QNX__)
-		/*
-		 * Check for "//" network path prefix
-		 */
-		if ((*path == '/') && path[1] && (path[1] != '/')) {
-		    path += 2;
-		    while (*path && *path != '/') {
-			++path;
-		    }
+            /*
+             * Check for "//" network path prefix
+             */
+            if ((*path == '/') && path[1] && (path[1] != '/')) {
+                path += 2;
+                while (*path && *path != '/') {
+                    ++path;
+                }
 #if defined(__CYGWIN__)
-		    /* UNC paths need to be followed by a share name */
-		    if (*path++ && (*path && *path != '/')) {
-			++path;
-			while (*path && *path != '/') {
-			    ++path;
-			}
-		    } else {
-			path = origPath + 1;
-		    }
+                /* UNC paths need to be followed by a share name */
+                if (*path++ && (*path && *path != '/')) {
+                    ++path;
+                    while (*path && *path != '/') {
+                        ++path;
+                    }
+                } else {
+                    path = origPath + 1;
+                }
 #endif
-		}
+            }
 #endif
-		if (driveNameLengthPtr != NULL) {
-		    /*
-		     * We need this addition in case the QNX or Cygwin code was used.
-		     */
-
-		    *driveNameLengthPtr = (path - origPath);
-		}
-	    } else {
-		type = TCL_PATH_RELATIVE;
-	    }
-	    break;
-	}
-	case TCL_PLATFORM_WINDOWS: {
-	    Tcl_DString ds;
-	    const char *rootEnd;
-
-	    Tcl_DStringInit(&ds);
-	    rootEnd = ExtractWinRoot(path, &ds, 0, &type);
-	    if ((rootEnd != path) && (driveNameLengthPtr != NULL)) {
-		*driveNameLengthPtr = rootEnd - path;
-		if (driveNameRef != NULL) {
-		    *driveNameRef = TclDStringToObj(&ds);
-		    Tcl_IncrRefCount(*driveNameRef);
-		}
-	    }
-	    Tcl_DStringFree(&ds);
-	    break;
-	}
-	}
+            if (driveNameLengthPtr != NULL) {
+                /*
+                 * We need this addition in case the QNX or Cygwin code was used.
+                 */
+
+                *driveNameLengthPtr = (path - origPath);
+            }
+        } else {
+            type = TCL_PATH_RELATIVE;
+        }
+        break;
+    }
+    case TCL_PLATFORM_WINDOWS: {
+        Tcl_DString ds;
+        const char *rootEnd;
+
+        Tcl_DStringInit(&ds);
+        rootEnd = ExtractWinRoot(path, &ds, 0, &type);
+        if ((rootEnd != path) && (driveNameLengthPtr != NULL)) {
+            *driveNameLengthPtr = rootEnd - path;
+            if (driveNameRef != NULL) {
+                *driveNameRef = TclDStringToObj(&ds);
+                Tcl_IncrRefCount(*driveNameRef);
+            }
+        }
+        Tcl_DStringFree(&ds);
+        break;
+    }
     }
     return type;
 }
@@ -702,16 +676,7 @@ SplitUnixPath(
 	length = path - elementStart;
 	if (length > 0) {
 	    Tcl_Obj *nextElt;
-#ifdef TCL_TILDE_EXPAND
-            if ((elementStart[0] == '~') && (elementStart != origPath)) {
-		TclNewLiteralStringObj(nextElt, "./");
-		Tcl_AppendToObj(nextElt, elementStart, length);
-	    } else {
-		nextElt = Tcl_NewStringObj(elementStart, length);
-	    }
-#else
             nextElt = Tcl_NewStringObj(elementStart, length);
-#endif
             Tcl_ListObjAppendElement(NULL, result, nextElt);
 	}
 	if (*path++ == '\0') {
@@ -775,12 +740,9 @@ SplitWinPath(
 	length = p - elementStart;
 	if (length > 0) {
 	    Tcl_Obj *nextElt;
-	    if ((elementStart != path) &&
-                (
-#ifdef TCL_TILDE_EXPAND
-                    (elementStart[0] == '~') ||
-#endif
-                    (isalpha(UCHAR(elementStart[0])) && elementStart[1] == ':'))) {
+            if ((elementStart != path) &&
+                isalpha(UCHAR(elementStart[0])) &&
+                (elementStart[1] == ':')) {
                 TclNewLiteralStringObj(nextElt, "./");
 		Tcl_AppendToObj(nextElt, elementStart, length);
 	    } else {
@@ -885,14 +847,10 @@ TclpNativeJoinPath(
     if (length != 0) {
 	if ((p[0] == '.') &&
             (p[1] == '/') &&
-            (
-#ifdef TCL_TILDE_EXPAND
-                (p[2] == '~') ||
-#endif
-                (tclPlatform==TCL_PLATFORM_WINDOWS &&
-                 isalpha(UCHAR(p[2])) &&
-                 (p[3] == ':')))) {
-	    p += 2;
+            (tclPlatform==TCL_PLATFORM_WINDOWS) &&
+            isalpha(UCHAR(p[2])) &&
+            (p[3] == ':')) {
+            p += 2;
 	}
     }
     if (*p == '\0') {
@@ -1164,67 +1122,6 @@ TclGetExtension(
     return p;
 }
 
-#ifdef TCL_TILDE_EXPAND
-/*
- *----------------------------------------------------------------------
- *
- * DoTildeSubst --
- *
- *	Given a string following a tilde, this routine returns the
- *	corresponding home directory.
- *
- * Results:
- *	The result is a pointer to a static string containing the home
- *	directory in native format. If there was an error in processing the
- *	substitution, then an error message is left in the interp's result and
- *	the return value is NULL. On success, the results are appended to
- *	resultPtr, and the contents of resultPtr are returned.
- *
- * Side effects:
- *	Information may be left in resultPtr.
- *
- *----------------------------------------------------------------------
- */
-
-static const char *
-DoTildeSubst(
-    Tcl_Interp *interp,		/* Interpreter in which to store error message
-				 * (if necessary). */
-    const char *user,		/* Name of user whose home directory should be
-				 * substituted, or "" for current user. */
-    Tcl_DString *resultPtr)	/* Initialized DString filled with name after
-				 * tilde substitution. */
-{
-    const char *dir;
-
-    if (*user == '\0') {
-	Tcl_DString dirString;
-
-	dir = TclGetEnv("HOME", &dirString);
-	if (dir == NULL) {
-	    if (interp) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"couldn't find HOME environment "
-			"variable to expand path", -1));
-		Tcl_SetErrorCode(interp, "TCL", "FILENAME", "NO_HOME", NULL);
-	    }
-	    return NULL;
-	}
-	Tcl_JoinPath(1, &dir, resultPtr);
-	Tcl_DStringFree(&dirString);
-    } else if (TclpGetUserHome(user, resultPtr) == NULL) {
-	if (interp) {
-	    Tcl_ResetResult(interp);
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "user \"%s\" doesn't exist", user));
-	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "USER", user, NULL);
-	}
-	return NULL;
-    }
-    return Tcl_DStringValue(resultPtr);
-}
-#endif /* TCL_TILDE_EXPAND */
-
 /*
  *----------------------------------------------------------------------
  *
@@ -1749,7 +1646,7 @@ TclGlob(
 				 * NULL. */
 {
     const char *separators;
-    char *tail, *start;
+    char *tail;
     int result;
     Tcl_Obj *filenamesObj, *savedResultObj;
 
@@ -1763,65 +1660,10 @@ TclGlob(
 	break;
     }
 
-    if (pathPrefix == NULL) {
-	Tcl_DString buffer;
-	Tcl_DStringInit(&buffer);
-
-	start = pattern;
-
-	/*
-	 * Perform tilde substitution, if needed.
-	 */
-
-#ifdef TCL_TILDE_EXPAND
-        if (start[0] == '~') {
-            const char *head;
-            char c;
-	    /*
-	     * Find the first path separator after the tilde.
-	     */
-
-	    for (tail = start; *tail != '\0'; tail++) {
-		if (*tail == '\\') {
-		    if (strchr(separators, tail[1]) != NULL) {
-			break;
-		    }
-		} else if (strchr(separators, *tail) != NULL) {
-		    break;
-		}
-	    }
-
-	    /*
-	     * Determine the home directory for the specified user.
-	     */
-
-	    c = *tail;
-	    *tail = '\0';
-	    head = DoTildeSubst(interp, start+1, &buffer);
-	    *tail = c;
-	    if (head == NULL) {
-		return TCL_ERROR;
-	    }
-	    if (head != Tcl_DStringValue(&buffer)) {
-		Tcl_DStringAppend(&buffer, head, -1);
-	    }
-	    pathPrefix = TclDStringToObj(&buffer);
-	    Tcl_IncrRefCount(pathPrefix);
-	    globFlags |= TCL_GLOBMODE_DIR;
-	    if (c != '\0') {
-		tail++;
-	    }
-	    Tcl_DStringFree(&buffer);
-	} else {
-	    tail = pattern;
-	}
-#else
-        tail = pattern;
-#endif /* TCL_TILDE_EXPAND */
-    } else {
+    if (pathPrefix != NULL) {
 	Tcl_IncrRefCount(pathPrefix);
-	tail = pattern;
     }
+    tail = pattern;
 
     /*
      * Handling empty path prefixes with glob patterns like 'C:' or
@@ -2375,15 +2217,6 @@ DoGlob(
 	    for (i=0; result==TCL_OK && i<subdirc; i++) {
 		Tcl_Obj *copy = NULL;
 
-#ifdef TCL_TILDE_EXPAND
-                if (pathPtr == NULL && TclGetString(subdirv[i])[0] == '~') {
-		    TclListObjLengthM(NULL, matchesObj, &repair);
-		    copy = subdirv[i];
-		    subdirv[i] = Tcl_NewStringObj("./", 2);
-		    Tcl_AppendObjToObj(subdirv[i], copy);
-		    Tcl_IncrRefCount(subdirv[i]);
-		}
-#endif /* TCL_TILDE_EXPAND */
                 result = DoGlob(interp, matchesObj, separators, subdirv[i],
 			1, p+1, types);
 		if (copy) {
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 50346b6..d7322f7 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1213,9 +1213,7 @@ FsAddMountsToGlobResult(
  *	native file system; see note below).
  *
  *	(4) The mapping from a string representation of a file to a full,
- *	normalized pathname changes. For example, if 'env(HOME)' is modified,
- *	then any pathname containing '~' maps to a different item, possibly in
- *	a different filesystem. (Only if TCL_TILDE_EXPAND is defined)
+ *	normalized pathname changes.
  *
  *	Tcl has no control over (2) and (3), so each registered filesystem must
  *	call Tcl_FSMountsChnaged in each of those circumstances.
@@ -3938,17 +3936,7 @@ Tcl_FSSplitPath(
 	length = p - elementStart;
 	if (length > 0) {
 	    Tcl_Obj *nextElt;
-
-#ifdef TCL_TILDE_EXPAND
-            if (elementStart[0] == '~') {
-		TclNewLiteralStringObj(nextElt, "./");
-		Tcl_AppendToObj(nextElt, elementStart, length);
-	    } else {
-		nextElt = Tcl_NewStringObj(elementStart, length);
-	    }
-#else
             nextElt = Tcl_NewStringObj(elementStart, length);
-#endif /* TCL_TILDE_EXPAND */
             Tcl_ListObjAppendElement(NULL, result, nextElt);
 	}
 	if (*p++ == '\0') {
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index c123613..82b79f5 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -699,19 +699,7 @@ TclPathPart(
 
 	splitPtr = Tcl_FSSplitPath(pathPtr, &splitElements);
 	Tcl_IncrRefCount(splitPtr);
-#ifdef TCL_TILDE_EXPAND
-        if (splitElements == 1  &&  TclGetString(pathPtr)[0] == '~') {
-	    Tcl_Obj *norm;
 
-	    TclDecrRefCount(splitPtr);
-	    norm = Tcl_FSGetNormalizedPath(interp, pathPtr);
-	    if (norm == NULL) {
-		return NULL;
-	    }
-	    splitPtr = Tcl_FSSplitPath(norm, &splitElements);
-	    Tcl_IncrRefCount(splitPtr);
-	}
-#endif /* TCL_TILDE_EXPAND */
         if (portion == TCL_PATH_TAIL) {
 	    /*
 	     * Return the last component, unless it is the only component, and
@@ -1040,18 +1028,6 @@ TclJoinPath(
 	}
 	ptr = Tcl_GetStringFromObj(res, &length);
 
-#ifdef TCL_TILDE_EXPAND
-        /*
-         * Strip off any './' before a tilde, unless this is the beginning of
-	 * the path.
-	 */
-
-	if (length > 0 && strEltLen > 0 && (strElt[0] == '.') &&
-		(strElt[1] == '/') && (strElt[2] == '~')) {
-	    strElt += 2;
-	}
-#endif /* TCL_TILDE_EXPAND */
-
         /*
          * A NULL value for fsPtr at this stage basically means we're trying
 	 * to join a relative path onto something which is also relative (or
@@ -1250,8 +1226,10 @@ TclNewFSPathObj(
     const char *p;
     int state = 0, count = 0;
 
-#ifdef TCL_TILDE_EXPAND
-    /* [Bug 2806250] - this is only a partial solution of the problem.
+    /*
+     * This comment is kept from the days of tilde expansion because
+     * it is illustrative of a more general problem.
+     * [Bug 2806250] - this is only a partial solution of the problem.
      * The PATHFLAGS != 0 representation assumes in many places that
      * the "tail" part stored in the normPathPtr field is itself a
      * relative path.  Strings that begin with "~" are not relative paths,
@@ -1267,14 +1245,6 @@ TclNewFSPathObj(
      * that by mounting on path prefixes like foo:// which cannot be the
      * name of a file or directory read from a native [glob] operation.
      */
-    if (addStrRep[0] == '~') {
-	Tcl_Obj *tail = Tcl_NewStringObj(addStrRep, len);
-
-	pathPtr = AppendPath(dirPtr, tail);
-	Tcl_DecrRefCount(tail);
-	return pathPtr;
-    }
-#endif /* TCL_TILDE_EXPAND */
 
     TclNewObj(pathPtr);
     fsPathPtr = (FsPath *)Tcl_Alloc(sizeof(FsPath));
@@ -2231,126 +2201,7 @@ SetFsPathFromAny(
      */
 
     name = Tcl_GetStringFromObj(pathPtr, &len);
-
-    /*
-     * Handle tilde substitutions, if needed.
-     */
-
-#ifdef TCL_TILDE_EXPAND
-    if (len && name[0] == '~') {
-	Tcl_DString temp;
-	size_t split;
-	char separator = '/';
-
-	/*
-	 * We have multiple cases '~/foo/bar...', '~user/foo/bar...', etc.
-	 * split becomes value 1 for '~/...' as well as for '~'.
-	 */
-	split = FindSplitPos(name, separator);
-
-	/*
-	 * Do some tilde substitution.
-	 */
-
-	if (split == 1) {
-	    /*
-	     * We have just '~' (or '~/...')
-	     */
-
-	    const char *dir;
-	    Tcl_DString dirString;
-
-	    dir = TclGetEnv("HOME", &dirString);
-	    if (dir == NULL) {
-		if (interp) {
-		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "couldn't find HOME environment variable to"
-			    " expand path", -1));
-		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH",
-			    "HOMELESS", NULL);
-		}
-		return TCL_ERROR;
-	    }
-	    Tcl_DStringInit(&temp);
-	    Tcl_JoinPath(1, &dir, &temp);
-	    Tcl_DStringFree(&dirString);
-	} else {
-	    /*
-	     * There is a '~user'
-	     */
-
-	    const char *expandedUser;
-	    Tcl_DString userName;
-
-	    Tcl_DStringInit(&userName);
-	    Tcl_DStringAppend(&userName, name+1, split-1);
-	    expandedUser = Tcl_DStringValue(&userName);
-
-	    Tcl_DStringInit(&temp);
-	    if (TclpGetUserHome(expandedUser, &temp) == NULL) {
-		if (interp != NULL) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "user \"%s\" doesn't exist", expandedUser));
-		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "PATH", "NOUSER",
-			    NULL);
-		}
-		Tcl_DStringFree(&userName);
-		Tcl_DStringFree(&temp);
-		return TCL_ERROR;
-	    }
-	    Tcl_DStringFree(&userName);
-	}
-
-	transPtr = TclDStringToObj(&temp);
-
-	if (split != len) {
-	    /*
-	     * Join up the tilde substitution with the rest.
-	     */
-
-	    if (name[split+1] == separator) {
-		/*
-		 * Somewhat tricky case like ~//foo/bar. Make use of
-		 * Split/Join machinery to get it right. Assumes all paths
-		 * beginning with ~ are part of the native filesystem.
-		 */
-
-		size_t objc;
-		Tcl_Obj **objv;
-		Tcl_Obj *parts = TclpNativeSplitPath(pathPtr, NULL);
-
-		TclListObjGetElementsM(NULL, parts, &objc, &objv);
-
-		/*
-		 * Skip '~'. It's replaced by its expansion.
-		 */
-
-		objc--; objv++;
-		while (objc--) {
-		    TclpNativeJoinPath(transPtr, TclGetString(*objv));
-		    objv++;
-		}
-		TclDecrRefCount(parts);
-	    } else {
-		Tcl_Obj *pair[2];
-
-		pair[0] = transPtr;
-		pair[1] = Tcl_NewStringObj(name+split+1, -1);
-		transPtr = TclJoinPath(2, pair, 1);
-		if (transPtr != pair[0]) {
-		    Tcl_DecrRefCount(pair[0]);
-		}
-		if (transPtr != pair[1]) {
-		    Tcl_DecrRefCount(pair[1]);
-		}
-	    }
-	}
-    } else {
-	transPtr = TclJoinPath(1, &pathPtr, 1);
-    }
-#else
     transPtr = TclJoinPath(1, &pathPtr, 1);
-#endif /* TCL_TILDE_EXPAND */
 
     /*
      * Now we have a translated filename in 'transPtr'. This will have forward
diff --git a/library/safe.tcl b/library/safe.tcl
index 09c82e5..c082c33 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -733,11 +733,6 @@ proc ::safe::CheckFileName {child file} {
 # prevent discovery of what home directories exist.
 
 proc ::safe::AliasFileSubcommand {child subcommand name} {
-    # TODO - if TIP602 is accepted for Tcl9, this check could be removed.
-    # The check is required if TCL_TILDE_EXPAND is defined.
-    if {[string match ~* $name]} {
-	set name ./$name
-    }
     tailcall ::interp invokehidden $child tcl:file:$subcommand $name
 }
 
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index cb74630..148caa0 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -863,8 +863,8 @@ TclpSetVariables(
 	Tcl_SetVar2(interp, "tcl_pkgPath", NULL, pkgPath, TCL_GLOBAL_ONLY);
     }
 
-#ifndef TCL_TILDE_EXPAND
     {
+        /* Some platforms build configure scripts expect ~ expansion so do that */
         Tcl_Obj *origPaths;
         Tcl_Obj *resolvedPaths;
         origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);
@@ -874,7 +874,6 @@ TclpSetVariables(
 		resolvedPaths, TCL_GLOBAL_ONLY);
         }
     }
-#endif
 
 #ifdef DJGPP
     Tcl_SetVar2(interp, "tcl_platform", "platform", "dos", TCL_GLOBAL_ONLY);
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 5f55354..e52874e 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -1715,22 +1715,7 @@ ConvertFileNameFormat(
 	    Tcl_WCharToUtfDString(nativeName, TCL_INDEX_NONE, &dsTemp);
 	    Tcl_DStringFree(&ds);
 
-	    /*
-	     * Deal with issues of tildes being absolute.
-	     */
-
-#ifdef TCL_TILDE_EXPAND
-            if (Tcl_DStringValue(&dsTemp)[0] == '~') {
-		TclNewLiteralStringObj(tempPath, "./");
-		Tcl_AppendToObj(tempPath, Tcl_DStringValue(&dsTemp),
-			Tcl_DStringLength(&dsTemp));
-		Tcl_DStringFree(&dsTemp);
-	    } else {
-		tempPath = TclDStringToObj(&dsTemp);
-	    }
-#else
             tempPath = TclDStringToObj(&dsTemp);
-#endif /* TCL_TILDE_EXPAND */
             Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath);
 	    FindClose(handle);
 	}
-- 
cgit v0.12


From dc113d8f285f5b53a9fa035527abe05704027ab4 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Thu, 18 Aug 2022 20:16:05 +0000
Subject: TIP633 fconfigure -tolerantencoding: start command arguments

---
 generic/tclIO.c | 27 ++++++++++++++++++++++++++-
 generic/tclIO.h |  2 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5313eed..4e3e41c 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7905,7 +7905,20 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(1, "-translation")) {
+    if (len == 0 || HaveOpt(2, "-tolerantencoding")) {
+	if (len == 0) {
+	    Tcl_DStringAppendElement(dsPtr, "-tolerantencoding");
+	}
+	Tcl_DStringAppendElement(dsPtr,
+		(flags & CHANNEL_TOLERANT_ENCODING) ? "1" : "0");
+	if (len > 0) {
+	    return TCL_OK;
+	}
+	if (len > 0) {
+	    return TCL_OK;
+	}
+    }
+    if (len == 0 || HaveOpt(2, "-translation")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-translation");
 	}
@@ -8158,6 +8171,18 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
+    } else if (HaveOpt(2, "-tolerantencoding")) {
+	int newMode;
+
+	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
+	    return TCL_ERROR;
+	}
+	if (newMode) {
+	    statePtr->flags |= CHANNEL_TOLERANT_ENCODING;
+	} else {
+	    statePtr->flags &= ~CHANNEL_TOLERANT_ENCODING;
+	}
+	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
 
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 54aa5af..1d63c0b 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,6 +271,8 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
+#define CHANNEL_TOLERANT_ENCODING	(1<<17)	/* set if option -tolerantencoding
+					* is set to 1 */
 
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
-- 
cgit v0.12


From 9a1e8d3202a29dcc11dc8c54e01a02e1f6565fd1 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Thu, 18 Aug 2022 20:20:10 +0000
Subject: Correct option shortcut value

---
 generic/tclIO.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 4e3e41c..6d9798e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8183,7 +8183,7 @@ Tcl_SetChannelOption(
 	    statePtr->flags &= ~CHANNEL_TOLERANT_ENCODING;
 	}
 	return TCL_OK;
-    } else if (HaveOpt(1, "-translation")) {
+    } else if (HaveOpt(2, "-translation")) {
 	const char *readMode, *writeMode;
 
 	if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
-- 
cgit v0.12


From e52c7c3a41a6fb4a3deeade3447de39ee569f0fd Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 19 Aug 2022 16:52:07 +0000
Subject: Implement file tildeexpand

---
 generic/tclCmdAH.c   |  3 +-
 generic/tclFCmd.c    | 38 +++++++++++++++++++++++++
 generic/tclInt.h     |  5 ++--
 generic/tclPathObj.c | 80 +++++++++++++++++++++++++++++-----------------------
 tests/fCmd.test      | 79 +++++++++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 164 insertions(+), 41 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index eec3e0f..bf7a9cd 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -1045,7 +1045,7 @@ TclInitFileCmd(
 	{"executable",	FileAttrIsExecutableCmd, TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"exists",	FileAttrIsExistingCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"extension",	PathExtensionCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
-	{"home",	TclFileHomeCmd,		TclCompileBasic0Or1ArgCmd, NULL, NULL, 0},
+	{"home",	TclFileHomeCmd,		TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
 	{"isdirectory",	FileAttrIsDirectoryCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"isfile",	FileAttrIsFileCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"join",	PathJoinCmd,		TclCompileBasicMin1ArgCmd, NULL, NULL, 0},
@@ -1069,6 +1069,7 @@ TclInitFileCmd(
 	{"tail",	PathTailCmd,		TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"tempdir",	TclFileTempDirCmd,	TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
 	{"tempfile",	TclFileTemporaryCmd,	TclCompileBasic0To2ArgCmd, NULL, NULL, 1},
+	{"tildeexpand",	TclFileTildeExpandCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"type",	FileAttrTypeCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
 	{"volumes",	FilesystemVolumesCmd,	TclCompileBasic0ArgCmd, NULL, NULL, 1},
 	{"writable",	FileAttrIsWritableCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 1},
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index d7fa750..6bf34d8 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1680,6 +1680,44 @@ TclFileHomeCmd(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * TclFileTildeExpandCmd --
+ *
+ *	This function is invoked to process the "file tildeexpand" Tcl command.
+ *	See the user documentation for details on what it does.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclFileTildeExpandCmd(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int objc,
+    Tcl_Obj *const objv[])
+{
+    Tcl_Obj *expandedPathObj;
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "path");
+	return TCL_ERROR;
+    }
+    expandedPathObj = TclResolveTildePath(interp, objv[1]);
+    if (expandedPathObj == NULL) {
+	return TCL_ERROR;
+    }
+    Tcl_SetObjResult(interp, expandedPathObj);
+    return TCL_OK;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 51f7e75..183838d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2913,6 +2913,7 @@ MODULE_SCOPE Tcl_ObjCmdProc TclFileRenameCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileTempDirCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileTemporaryCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileHomeCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclFileTildeExpandCmd;
 MODULE_SCOPE void	TclCreateLateExitHandler(Tcl_ExitProc *proc,
 			    void *clientData);
 MODULE_SCOPE void	TclDeleteLateExitHandler(Tcl_ExitProc *proc,
@@ -3021,8 +3022,8 @@ MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
 MODULE_SCOPE Tcl_Obj *	TclJoinPath(size_t elements, Tcl_Obj * const objv[],
 			    int forceRelative);
-MODULE_SCOPE int	TclGetHomeDir(Tcl_Interp *interp, const char *user,
-			    Tcl_DString *dsPtr);
+MODULE_SCOPE int	MakeTildeRelativePath(Tcl_Interp *interp, const char *user,
+			    const char *subPath, Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *	TclGetHomeDirObj(Tcl_Interp *interp, const char *user);
 MODULE_SCOPE Tcl_Obj *	TclResolveTildePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathObj);
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 82b79f5..2fbeea3 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2422,11 +2422,17 @@ TclNativePathInFilesystem(
 /*
  *----------------------------------------------------------------------
  *
- * TclGetHomeDir --
+ * MakeTildeRelativePath --
  *
- *      Returns the home directory of a user.  Note there is a difference
- *	between not specifying a user and explicitly specifying the current
- *	user. This mimics Tcl8's tilde expansion.
+ *      Returns a path relative to the home directory of a user.
+ *      Note there is a difference between not specifying a user and
+ *	explicitly specifying the current user. This mimics Tcl8's tilde
+ *	expansion.
+ *
+ *	The subPath argument is joined to the expanded home directory
+ *	as in Tcl_JoinPath. This means if it is not relative, it will
+ *	returned as the result with the home directory only checked
+ *	for user name validity.
  *
  * Results:
  *	Returns TCL_OK on success with home directory path in *dsPtr
@@ -2435,22 +2441,23 @@ TclNativePathInFilesystem(
  *----------------------------------------------------------------------
  */
 int
-TclGetHomeDir(
-    Tcl_Interp *interp, /* May be NULL. Only used for error messages */
-    const char *user,   /* User name. NULL -> current user */
-    Tcl_DString *dsPtr) /* Output. Is initialized by the function. Must be
+MakeTildeRelativePath(
+    Tcl_Interp *interp,  /* May be NULL. Only used for error messages */
+    const char *user,    /* User name. NULL -> current user */
+    const char *subPath, /* Rest of path. May be NULL */
+    Tcl_DString *dsPtr)  /* Output. Is initialized by the function. Must be
                            freed on success */
 {
     const char *dir;
-    Tcl_DString nativeString;
+    Tcl_DString dirString;
 
     Tcl_DStringInit(dsPtr);
-    Tcl_DStringInit(&nativeString);
+    Tcl_DStringInit(&dirString);
 
     if (user == NULL || user[0] == 0) {
         /* No user name specified -> current user */
 
-	dir = TclGetEnv("HOME", &nativeString);
+	dir = TclGetEnv("HOME", &dirString);
 	if (dir == NULL) {
             if (interp) {
                 Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -2463,7 +2470,7 @@ TclGetHomeDir(
         }
     } else {
         /* User name specified - ~user */
-	dir = TclpGetUserHome(user, &nativeString);
+	dir = TclpGetUserHome(user, &dirString);
 	if (dir == NULL) {
 	    if (interp != NULL) {
                 Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -2474,7 +2481,16 @@ TclGetHomeDir(
             return TCL_ERROR;
 	}
     }
-    Tcl_JoinPath(1, &dir, dsPtr);
+    if (subPath) {
+	const char *parts[2];
+	parts[0] = dir;
+	parts[1] = subPath;
+	Tcl_JoinPath(2, parts, dsPtr);
+    } else {
+	Tcl_JoinPath(1, &dir, dsPtr);
+    }
+
+    Tcl_DStringFree(&dirString);
 
     return TCL_OK;
 }
@@ -2484,7 +2500,7 @@ TclGetHomeDir(
  *
  * TclGetHomeDirObj --
  *
- *	Wrapper around TclGetHomeDir. See that function.
+ *	Wrapper around MakeTildeRelativePath. See that function.
  *
  * Results:
  *      Returns a Tcl_Obj containing the home directory of a user
@@ -2499,7 +2515,7 @@ TclGetHomeDirObj(
 {
     Tcl_DString dirString;
 
-    if (TclGetHomeDir(interp, user, &dirString) != TCL_OK) {
+    if (MakeTildeRelativePath(interp, user, NULL, &dirString) != TCL_OK) {
 	return NULL;
     }
     return TclDStringToObj(&dirString);
@@ -2515,12 +2531,6 @@ TclGetHomeDirObj(
  *	component cannot be resolved, returns NULL. If the path does not
  *	begin with a tilde, returns as is.
  *
- *      The trailing components of the path are returned verbatim. No
- *	processing is done on them. Moreover, no assumptions should be
- *	made about the separators in the returned path. They may be /
- *	or native. Appropriate path manipulations functions should be
- *	used by caller if desired.
- *
  * Results:
  *      Returns a Tcl_Obj with resolved path. This may be a new Tcl_Obj
  *	with ref count 0 or that pathObj that was passed in without its
@@ -2537,9 +2547,8 @@ TclResolveTildePath(
 {
     const char *path;
     size_t len;
-    Tcl_Obj *resolvedObj;
-    Tcl_DString dirString;
     size_t split;
+    Tcl_DString resolvedPath;
 
     path = Tcl_GetStringFromObj(pathObj, &len);
     if (path[0] != '~') {
@@ -2556,12 +2565,13 @@ TclResolveTildePath(
 
     if (split == 1) {
         /* No user name specified -> current user */
-	if (TclGetHomeDir(interp, NULL, &dirString) != TCL_OK) {
+	if (MakeTildeRelativePath(
+		interp, NULL, path[1] ? 2 + path : NULL, &resolvedPath)
+	    != TCL_OK) {
 	    return NULL;
 	}
     } else {
         /* User name specified - ~user */
-
         const char *expandedUser;
         Tcl_DString userName;
 
@@ -2569,20 +2579,18 @@ TclResolveTildePath(
         Tcl_DStringAppend(&userName, path+1, split-1);
         expandedUser = Tcl_DStringValue(&userName);
 
-	if (TclGetHomeDir(interp, expandedUser, &dirString) != TCL_OK) {
-            Tcl_DStringFree(&userName);
+	/* path[split] is / or \0 */
+	if (MakeTildeRelativePath(interp,
+				  expandedUser,
+				  path[split] ? &path[split+1] : NULL,
+				  &resolvedPath)
+	    != TCL_OK) {
+	    Tcl_DStringFree(&userName);
 	    return NULL;
 	}
-        Tcl_DStringFree(&userName);
-    }
-    resolvedObj = TclDStringToObj(&dirString);
-
-    if (split < len) {
-        /* If any trailer, append it verbatim */
-        Tcl_AppendToObj(resolvedObj, split + path, len-split);
+	Tcl_DStringFree(&userName);
     }
-
-    return resolvedObj;
+    return TclDStringToObj(&resolvedPath);
 }
 
 /*
diff --git a/tests/fCmd.test b/tests/fCmd.test
index e9d7667..dbbc154 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -2699,13 +2699,88 @@ test fCmd-31.6 {file home USER} -body {
     # name, else not sure how to check
     file home $::tcl_platform(user)
 } -match glob -result "*$::tcl_platform(user)*"
-test fCmd-31.6 {file home UNKNOWNUSER} -body {
+test fCmd-31.7 {file home UNKNOWNUSER} -body {
     file home nosuchuser
 } -returnCodes error -result {user "nosuchuser" doesn't exist}
-test fCmd-31.7 {file home extra arg} -body {
+test fCmd-31.8 {file home extra arg} -body {
     file home $::tcl_platform(user) arg
 } -returnCodes error -result {wrong # args: should be "file home ?user?"}
 
+test fCmd-32.1 {file tildeexpand ~} -body {
+    file tildeexpand ~
+} -result [file join $::env(HOME)]
+test fCmd-32.2 {file tildeexpand ~ - obeys env} -setup {
+    set ::env(HOME) $::env(HOME)/xxx
+} -cleanup {
+    set ::env(HOME) [file dirname $::env(HOME)]
+} -body {
+    file tildeexpand ~
+} -result [file join $::env(HOME) xxx]
+test fCmd-32.3 {file tildeexpand ~ - error} -setup {
+    set saved $::env(HOME)
+    unset ::env(HOME)
+} -cleanup {
+    set ::env(HOME) $saved
+} -body {
+    file tildeexpand ~
+} -returnCodes error -result {couldn't find HOME environment variable to expand path}
+test fCmd-32.4 {
+    file tildeexpand ~ - relative path. Following 8.x ~ expansion behavior, relative
+    paths are not made absolute
+} -setup {
+    set saved $::env(HOME)
+    set ::env(HOME) relative/path
+} -cleanup {
+    set ::env(HOME) $saved
+} -body {
+    file tildeexpand ~
+} -result relative/path
+test fCmd-32.5 {file tildeexpand ~USER} -body {
+    # Note - as in 8.x this form does NOT necessarily give same result as
+    # env(HOME) even when user is current user. Assume result contains user
+    # name, else not sure how to check
+    file tildeexpand ~$::tcl_platform(user)
+} -match glob -result "*$::tcl_platform(user)*"
+test fCmd-32.6 {file tildeexpand ~UNKNOWNUSER} -body {
+    file tildeexpand ~nosuchuser
+} -returnCodes error -result {user "nosuchuser" doesn't exist}
+test fCmd-32.7 {file tildeexpand ~extra arg} -body {
+    file tildeexpand ~ arg
+} -returnCodes error -result {wrong # args: should be "file tildeexpand path"}
+test fCmd-32.8 {file tildeexpand ~/path} -body {
+    file tildeexpand ~/foo
+} -result [file join $::env(HOME)/foo]
+test fCmd-32.9 {file tildeexpand ~USER/bar} -body {
+    # Note - as in 8.x this form does NOT necessarily give same result as
+    # env(HOME) even when user is current user. Assume result contains user
+    # name, else not sure how to check
+    file tildeexpand ~$::tcl_platform(user)/bar
+} -match glob -result "*$::tcl_platform(user)*/bar"
+test fCmd-32.10 {file tildeexpand ~UNKNOWNUSER} -body {
+    file tildeexpand ~nosuchuser/foo
+} -returnCodes error -result {user "nosuchuser" doesn't exist}
+test fCmd-32.11 {file tildeexpand /~/path} -body {
+    file tildeexpand /~/foo
+} -result /~/foo
+test fCmd-32.12 {file tildeexpand /~user/path} -body {
+    file tildeexpand /~$::tcl_platform(user)/foo
+} -result /~$::tcl_platform(user)/foo
+test fCmd-32.13 {file tildeexpand ./~} -body {
+    file tildeexpand ./~
+} -result ./~
+test fCmd-32.14 {file tildeexpand relative/path} -body {
+    file tildeexpand relative/path
+} -result relative/path
+test fCmd-32.15 {file tildeexpand ~\\path} -body {
+    file tildeexpand ~\\foo
+} -constraints win -result [file join $::env(HOME)/foo]
+test fCmd-32.16 {file tildeexpand ~USER\\bar} -body {
+    # Note - as in 8.x this form does NOT necessarily give same result as
+    # env(HOME) even when user is current user. Assume result contains user
+    # name, else not sure how to check
+    file tildeexpand ~$::tcl_platform(user)\\bar
+} -constraints win -match glob -result "*$::tcl_platform(user)*/bar"
+
 
 # cleanup
 cleanup
-- 
cgit v0.12


From de7a5967d0f8c2bf87801e4ee9d95355997df774 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 19 Aug 2022 17:02:47 +0000
Subject: Do tilde expansion when initializing from TCLLIBPATH and TM env vars

---
 library/init.tcl | 10 +++++++++-
 library/tm.tcl   |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/library/init.tcl b/library/init.tcl
index 31139dd..d2e3624 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -47,7 +47,15 @@ package require -exact tcl 9.0a4
 
 if {![info exists auto_path]} {
     if {[info exists env(TCLLIBPATH)] && (![interp issafe])} {
-	set auto_path $env(TCLLIBPATH)
+        set auto_path [apply {{} {
+            lmap path $::env(TCLLIBPATH) {
+                # Paths relative to unresolvable home dirs are ignored
+                if {[catch {file tildeexpand $path} expanded_path]} {
+                    continue
+                }
+                set expanded_path
+            }
+        }}]
     } else {
 	set auto_path ""
     }
diff --git a/library/tm.tcl b/library/tm.tcl
index c1a8f8a..88ce4af 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -338,7 +338,10 @@ proc ::tcl::tm::Defaults {} {
         ] {
 	    if {![info exists env($ev)]} continue
 	    foreach p [split $env($ev) $sep] {
-		path add $p
+                # Paths relative to unresolvable home dirs are ignored
+                if {![catch {file tildeexpand $p} expanded_path]} {
+                    path add $expanded_path
+                }
 	    }
 	}
     }
-- 
cgit v0.12


From 6203b90b2add5d428b8e204ed930aad592d490c7 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 22 Aug 2022 04:24:08 +0000
Subject: Merge 8.7 winConsole fixes.

---
 win/tclWinConsole.c | 52 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 6956135..6296f89 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -19,8 +19,8 @@
 #include <ctype.h>
 
 /*
- * A general note on the design: The console channel driver differs from most
- * other drivers in the following respects:
+ * A general note on the design: The console channel driver differs from
+ * most other drivers in the following respects:
  *
  * - There can be at most 3 console handles at any time since Windows does
  *   support allocation of more than one console (with three handles
@@ -35,9 +35,10 @@
  *   std* channels are shared amongst threads which means there can be
  *   multiple Tcl channels corresponding to a single console handle.
  *
- * - Even with multiple threads, more than one file event handler is unlikely.
- *   It does not make sense for multiple threads to register handlers for
- *   stdin because the input would be randomly fragmented amongst the threads.
+ * - Even with multiple threads, more than one file event handler is
+ * unlikely. It does not make sense for multiple threads to register
+ * handlers for stdin because the input would be randomly fragmented amongst
+ * the threads.
  *
  * Various design factors are driven by the above, e.g. use of lists instead
  * of hash tables (at most 3 console handles) and use of global instead of
@@ -55,9 +56,9 @@
  * because an interpreter may (for example) turn off echo for passwords and
  * the read ahead would come in the way of that.
  *
- * If multiple threads are reading from stdin, the input is sprayed in random
- * fashion. This is not good application design and hence no plan to address
- * this (not clear what should be done even in theory)
+ * If multiple threads are reading from stdin, the input is sprayed in
+ * random fashion. This is not good application design and hence no plan to
+ * address this (not clear what should be done even in theory)
  *
  * For output, we do not restrict all output to the console writer threads.
  * See ConsoleOutputProc for the conditions.
@@ -152,7 +153,7 @@ typedef struct ConsoleHandleInfo {
  * only from the thread owning channel EXCEPT when a console traverses it
  * looking for a channel that is watching for events on the console. Even
  * in that case, no locking is required because that access is only under
- * the consoleLock lock which prevents the channel from being removed from
+ * the gConsoleLock lock which prevents the channel from being removed from
  * the gWatchingChannelList which in turn means it will not be deallocated
  * from under the console thread. Access to individual fields does not need
  * to be controlled because
@@ -1115,12 +1116,6 @@ ConsoleInputProc(
 	 * buffered data, we will pass it up.
 	 */
 	if (numRead != 0) {
-	    /* If console thread was blocked, awaken it */
-	    if (chanInfoPtr->flags & CONSOLE_ASYNC) {
-		/* Async channels always want read ahead */
-		handleInfoPtr->flags |= CONSOLE_DATA_AWAITED;
-		WakeConditionVariable(&handleInfoPtr->consoleThreadCV);
-	    }
 	    break;
 	}
 	/*
@@ -1211,7 +1206,9 @@ ConsoleInputProc(
 	/* Lock is reacquired, loop back to try again */
     }
 
-    if (chanInfoPtr->flags & CONSOLE_ASYNC) {
+    /* We read data. Ask for more if either async or watching for reads */
+    if ((chanInfoPtr->flags & CONSOLE_ASYNC)
+	|| (chanInfoPtr->watchMask & TCL_READABLE)) {
 	handleInfoPtr->flags |= CONSOLE_DATA_AWAITED;
 	WakeConditionVariable(&handleInfoPtr->consoleThreadCV);
     }
@@ -1345,7 +1342,7 @@ ConsoleOutputProc(
 	    }
 	}
 
-	/* Lock is reacquired. Continue loop */
+	/* Lock must have been reacquired before continuing loop */
     }
     WakeConditionVariable(&handleInfoPtr->consoleThreadCV);
     ReleaseSRWLockExclusive(&handleInfoPtr->lock);
@@ -1511,8 +1508,10 @@ ConsoleWatchProc(
 	    ConsoleHandleInfo *handleInfoPtr;
 	    handleInfoPtr = FindConsoleInfo(chanInfoPtr);
 	    if (handleInfoPtr) {
+		AcquireSRWLockExclusive(&handleInfoPtr->lock);
 		handleInfoPtr->flags |= CONSOLE_DATA_AWAITED;
 		WakeConditionVariable(&handleInfoPtr->consoleThreadCV);
+		ReleaseSRWLockExclusive(&handleInfoPtr->lock);
 	    }
 	    ReleaseSRWLockExclusive(&gConsoleLock);
 	}
@@ -1520,6 +1519,7 @@ ConsoleWatchProc(
     } else if (oldMask) {
 	/* Remove from list of watched channels */
 
+	AcquireSRWLockExclusive(&gConsoleLock);
 	for (nextPtrPtr = &gWatchingChannelList, ptr = *nextPtrPtr;
 		ptr != NULL;
 		nextPtrPtr = &ptr->nextWatchingChannelPtr, ptr = *nextPtrPtr) {
@@ -1528,6 +1528,7 @@ ConsoleWatchProc(
 		break;
 	    }
 	}
+	ReleaseSRWLockExclusive(&gConsoleLock);
     }
 }
 
@@ -1583,7 +1584,7 @@ ConsoleGetHandleProc(
  static int
  ConsoleDataAvailable (HANDLE consoleHandle)
 {
-    INPUT_RECORD input[5];
+    INPUT_RECORD input[10];
     DWORD count;
     DWORD i;
 
@@ -1595,11 +1596,17 @@ ConsoleGetHandleProc(
 	== FALSE) {
 	return -1;
     }
+    /*
+     * Even if windows size and mouse events are disabled, can still have
+     * events other than keyboard, like focus events. Look for at least one
+     * keydown event because a trailing LF keyup is always present from the
+     * last input. However, if our buffer is full, assume there is a key
+     * down somewhere in the unread buffer. I suppose we could expand the
+     * buffer but not worth...
+     */
+    if (count == (sizeof(input)/sizeof(input[0])))
+	return 1;
     for (i = 0; i < count; ++i) {
-	/*
-	 * Event must be a keydown because a trailing LF keyup event is always
-	 * present for line based input.
-	 */
 	if (input[i].EventType == KEY_EVENT
 	    && input[i].Event.KeyEvent.bKeyDown) {
 	    return 1;
@@ -1996,6 +2003,7 @@ AllocateConsoleHandleInfo(
 
 
     handleInfoPtr = (ConsoleHandleInfo *)Tcl_Alloc(sizeof(*handleInfoPtr));
+    memset(handleInfoPtr, 0, sizeof(*handleInfoPtr));
     handleInfoPtr->console = consoleHandle;
     InitializeSRWLock(&handleInfoPtr->lock);
     InitializeConditionVariable(&handleInfoPtr->consoleThreadCV);
-- 
cgit v0.12


From 529ef6feb2f0e3db14385328bb4f7a84cbef375d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 23 Aug 2022 07:03:31 +0000
Subject: Fix [d052d2a1b01ba2c8]: avoid leak in TestsetbytearraylengthObjCmd()

---
 generic/tclTest.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index ac0c210..919e020 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -5130,7 +5130,10 @@ TestsetbytearraylengthObjCmd(
 	obj = objv[1];
     }
     if (NULL == Tcl_SetByteArrayLength(obj, n)) {
-	Tcl_SetResult(interp, "expected bytes", TCL_STATIC);
+	if (Tcl_IsShared(objv[1])) {
+	    Tcl_DecrRefCount(obj);
+	}
+	Tcl_AppendResult(interp, "expected bytes", NULL);
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, obj);
-- 
cgit v0.12


From 29dd9092810a129dfa04b7f9b3f150e91ab12e98 Mon Sep 17 00:00:00 2001
From: sebres <sebres@users.sourceforge.net>
Date: Tue, 23 Aug 2022 10:22:25 +0000
Subject: small amend to [d052d2a1b01ba2c8], code review

---
 generic/tclTest.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 919e020..eb6b589 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -5124,13 +5124,12 @@ TestsetbytearraylengthObjCmd(
     if (TCL_OK != Tcl_GetIntFromObj(interp, objv[2], &n)) {
 	return TCL_ERROR;
     }
-    if (Tcl_IsShared(objv[1])) {
-	obj = Tcl_DuplicateObj(objv[1]);
-    } else {
-	obj = objv[1];
+    obj = objv[1];
+    if (Tcl_IsShared(obj)) {
+	obj = Tcl_DuplicateObj(obj);
     }
-    if (NULL == Tcl_SetByteArrayLength(obj, n)) {
-	if (Tcl_IsShared(objv[1])) {
+    if (Tcl_SetByteArrayLength(obj, n) == NULL) {
+	if (obj != objv[1]) {
 	    Tcl_DecrRefCount(obj);
 	}
 	Tcl_AppendResult(interp, "expected bytes", NULL);
-- 
cgit v0.12


From abe4d4223da114bb82cca35dc22618f25847668f Mon Sep 17 00:00:00 2001
From: bch <brad.harder@gmail.com>
Date: Tue, 23 Aug 2022 20:29:58 +0000
Subject: fix(?) stray ckalloc()/ckfree(); ref TIP 494.

---
 generic/tclBasic.c | 10 +++++-----
 generic/tclTrace.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 77756a4..eb3889d 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -2652,7 +2652,7 @@ static void cmdWrapperDeleteProc(void *clientData) {
 
     clientData = info->clientData;
     Tcl_CmdDeleteProc *deleteProc = info->deleteProc;
-    ckfree(info);
+    Tcl_Free(info);
     if (deleteProc != NULL) {
 	deleteProc(clientData);
     }
@@ -2675,7 +2675,7 @@ Tcl_CreateObjCommand2(
 				 * this command is deleted. */
 )
 {
-    CmdWrapperInfo *info = (CmdWrapperInfo *)ckalloc(sizeof(CmdWrapperInfo));
+    CmdWrapperInfo *info = (CmdWrapperInfo *)Tcl_Alloc(sizeof(CmdWrapperInfo));
     info->proc = proc;
     info->deleteProc = deleteProc;
     info->clientData = clientData;
@@ -8410,7 +8410,7 @@ int wrapperNRObjProc(
     CmdWrapperInfo *info = (CmdWrapperInfo *)clientData;
     clientData = info->clientData;
     Tcl_ObjCmdProc2 *proc = info->proc;
-    ckfree(info);
+    Tcl_Free(info);
     return proc(clientData, interp, objc, objv);
 }
 
@@ -8423,7 +8423,7 @@ Tcl_NRCallObjProc2(
     Tcl_Obj *const objv[])
 {
     NRE_callback *rootPtr = TOP_CB(interp);
-    CmdWrapperInfo *info = (CmdWrapperInfo *)ckalloc(sizeof(CmdWrapperInfo));
+    CmdWrapperInfo *info = (CmdWrapperInfo *)Tcl_Alloc(sizeof(CmdWrapperInfo));
     info->clientData = clientData;
     info->proc = objProc;
 
@@ -8489,7 +8489,7 @@ Tcl_NRCreateCommand2(
 				/* If not NULL, gives a function to call when
 				 * this command is deleted. */
 {
-    CmdWrapperInfo *info = (CmdWrapperInfo *)ckalloc(sizeof(CmdWrapperInfo));
+    CmdWrapperInfo *info = (CmdWrapperInfo *)Tcl_Alloc(sizeof(CmdWrapperInfo));
     info->proc = proc;
     info->nreProc = nreProc;
     info->deleteProc = deleteProc;
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index c837e92..f830a77 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -2152,7 +2152,7 @@ static void traceWrapperDelProc(void *clientData)
     if (info->delProc) {
 	info->delProc(clientData);
     }
-    ckfree(info);
+    Tcl_Free(info);
 }
 
 Tcl_Trace
@@ -2165,7 +2165,7 @@ Tcl_CreateObjTrace2(
     Tcl_CmdObjTraceDeleteProc *delProc)
 				/* Function to call when trace is deleted */
 {
-    TraceWrapperInfo *info = (TraceWrapperInfo *)ckalloc(sizeof(TraceWrapperInfo));
+    TraceWrapperInfo *info = (TraceWrapperInfo *)Tcl_Alloc(sizeof(TraceWrapperInfo));
     info->proc = proc;
     info->delProc = delProc;
     info->clientData = clientData;
-- 
cgit v0.12


From 2d455c75b957f96586b3ca1d1b83b4b9a3283c55 Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Wed, 24 Aug 2022 11:18:28 +0000
Subject: Start TIP #634 implementation using modified patch from ticket
 #2969488 by ferrieux.

---
 doc/upvar.n      |  6 ------
 generic/tclInt.h | 40 +++++++++++++++++++++++++++++-----------
 generic/tclVar.c |  9 +++++++++
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/doc/upvar.n b/doc/upvar.n
index 91defe6..6ad1237 100644
--- a/doc/upvar.n
+++ b/doc/upvar.n
@@ -97,12 +97,6 @@ set originalVar 1
 trace variable originalVar w \fItraceproc\fR
 \fIsetByUpvar\fR originalVar 2
 .CE
-.PP
-If \fIotherVar\fR refers to an element of an array, then variable
-traces set for the entire array will not be invoked when \fImyVar\fR
-is accessed (but traces on the particular element will still be
-invoked).  In particular, if the array is \fBenv\fR, then changes
-made to \fImyVar\fR will not be passed to subprocesses correctly.
 .SH EXAMPLE
 A \fBdecr\fR command that works like \fBincr\fR except it subtracts
 the value from the variable instead of adding it:
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 527572e..f5b25dc 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -215,15 +215,16 @@ typedef struct Tcl_Ensemble Tcl_Ensemble;
 typedef struct NamespacePathEntry NamespacePathEntry;
 
 /*
- * Special hashtable for variables: this is just a Tcl_HashTable with an nsPtr
- * field added at the end: in this way variables can find their namespace
- * without having to copy a pointer in their struct: they can access it via
- * their hPtr->tablePtr.
+ * Special hashtable for variables: this is just a Tcl_HashTable with nsPtr
+ * and arrayPtr fields added at the end: in this way variables can find their
+ * namespace and possibly containing array without having to copy a pointer in
+ * their struct: they can access them via their hPtr->tablePtr.
  */
 
 typedef struct TclVarHashTable {
     Tcl_HashTable table;
     struct Namespace *nsPtr;
+    struct Var *arrayPtr;
 } TclVarHashTable;
 
 /*
@@ -813,6 +814,14 @@ typedef struct VarInHash {
  * MODULE_SCOPE int	TclIsVarResolved(Var *varPtr);
  */
 
+#define TclVarFindHiddenArray(varPtr,arrayPtr)				\
+    do {								\
+        if ((arrayPtr == NULL) && TclIsVarInHash(varPtr) &&		\
+              (TclVarParentArray(varPtr) != NULL)) {			\
+            arrayPtr = TclVarParentArray(varPtr);			\
+        }								\
+    } while(0)
+
 #define TclIsVarScalar(varPtr) \
     !((varPtr)->flags & (VAR_ARRAY|VAR_LINK))
 
@@ -857,6 +866,9 @@ typedef struct VarInHash {
 	? ((TclVarHashTable *) ((((VarInHash *) (varPtr))->entry.tablePtr)))->nsPtr \
 	: NULL)
 
+#define TclVarParentArray(varPtr)					\
+    ((TclVarHashTable *) ((VarInHash *) (varPtr))->entry.tablePtr)->arrayPtr
+
 #define VarHashRefCount(varPtr) \
     ((VarInHash *) (varPtr))->refCount
 
@@ -864,19 +876,25 @@ typedef struct VarInHash {
  * Macros for direct variable access by TEBC.
  */
 
-#define TclIsVarDirectReadable(varPtr) \
-    (   !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_READ)) \
-    &&  (varPtr)->value.objPtr)
+#define TclIsVarTricky(varPtr,trickyFlags)				\
+    (   ((varPtr)->flags & (VAR_ARRAY|VAR_LINK|trickyFlags))		\
+          || (TclIsVarInHash(varPtr)					\
+                && (TclVarParentArray(varPtr) != NULL)			\
+                && (TclVarParentArray(varPtr)->flags & (trickyFlags))))
+
+#define TclIsVarDirectReadable(varPtr)					\
+    (   (!TclIsVarTricky(varPtr,VAR_TRACED_READ))			\
+          && (varPtr)->value.objPtr)
 
 #define TclIsVarDirectWritable(varPtr) \
-    !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_WRITE|VAR_DEAD_HASH))
+    (!TclIsVarTricky(varPtr,VAR_TRACED_WRITE|VAR_DEAD_HASH))
 
 #define TclIsVarDirectUnsettable(varPtr) \
-    !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_READ|VAR_TRACED_WRITE|VAR_TRACED_UNSET|VAR_DEAD_HASH))
+    (!TclIsVarTricky(varPtr,VAR_TRACED_READ|VAR_TRACED_WRITE|VAR_TRACED_UNSET|VAR_DEAD_HASH))
 
 #define TclIsVarDirectModifyable(varPtr) \
-    (   !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_READ|VAR_TRACED_WRITE)) \
-    &&  (varPtr)->value.objPtr)
+    (   (!TclIsVarTricky(varPtr,VAR_TRACED_READ|VAR_TRACED_WRITE))	\
+          &&  (varPtr)->value.objPtr)
 
 #define TclIsVarDirectReadable2(varPtr, arrayPtr) \
     (TclIsVarDirectReadable(varPtr) &&\
diff --git a/generic/tclVar.c b/generic/tclVar.c
index e0f46e7..c88144f 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -998,6 +998,7 @@ TclLookupSimpleVar(
 	    if (tablePtr == NULL) {
 		tablePtr = (TclVarHashTable *)Tcl_Alloc(sizeof(TclVarHashTable));
 		TclInitVarHashTable(tablePtr, NULL);
+		tablePtr->arrayPtr = varPtr;
 		varFramePtr->varTablePtr = tablePtr;
 	    }
 	    varPtr = VarHashCreateVar(tablePtr, varNamePtr, &isNew);
@@ -1390,6 +1391,8 @@ TclPtrGetVarIdx(
     Interp *iPtr = (Interp *) interp;
     const char *msg;
 
+    TclVarFindHiddenArray(varPtr, arrayPtr);
+
     /*
      * Invoke any read traces that have been set for the variable.
      */
@@ -1952,6 +1955,8 @@ TclPtrSetVarIdx(
 	goto earlyError;
     }
 
+    TclVarFindHiddenArray(varPtr, arrayPtr);
+
     /*
      * Invoke any read traces that have been set for the variable if it is
      * requested. This was done for INST_LAPPEND_* but that was inconsistent
@@ -2454,6 +2459,8 @@ TclPtrUnsetVarIdx(
 	VarHashRefCount(varPtr)++;
     }
 
+    TclVarFindHiddenArray(varPtr, arrayPtr);
+
     UnsetVarStruct(varPtr, arrayPtr, iPtr, part1Ptr, part2Ptr, flags, index);
 
     /*
@@ -6340,6 +6347,7 @@ TclInitVarHashTable(
     Tcl_InitCustomHashTable(&tablePtr->table,
 	    TCL_CUSTOM_TYPE_KEYS, &tclVarHashKeyType);
     tablePtr->nsPtr = nsPtr;
+    tablePtr->arrayPtr = NULL;
 }
 
 static Tcl_HashEntry *
@@ -6594,6 +6602,7 @@ TclInitArrayVar(
 
     arrayPtr->value.tablePtr = (TclVarHashTable *) tablePtr;
     TclInitVarHashTable(arrayPtr->value.tablePtr, TclGetVarNsPtr(arrayPtr));
+    arrayPtr->value.tablePtr->arrayPtr = arrayPtr;
 
     /*
      * Default value initialization.
-- 
cgit v0.12


From 42dd6088a6a1dd034174d0f9ec84f2f22c9a6e4d Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Wed, 24 Aug 2022 11:19:14 +0000
Subject: Add tests for the TIP #634 functionality.

---
 tests/upvar.test | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/tests/upvar.test b/tests/upvar.test
index c31eaa1..268bb17 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -207,6 +207,51 @@ test upvar-5.3 {traces involving upvars} {
     p1 foo bar
     set x
 } {{x1 {} u} x1}
+test upvar-5.4 {read trace on upvar array element} -body {
+    proc p1 {a b} {
+	array set foo {c 22 d 33}
+	trace add variable foo {read write unset} tproc
+	p2
+	trace remove variable foo {read write unset} tproc
+    }
+    proc p2 {} {
+	upvar foo(c) x1
+	set x1
+    }
+    set x ---
+    p1 foo bar
+    set x
+} -result {{x1 {} read} x1}
+test upvar-5.5 {write trace on upvar array element} -body {
+    proc p1 {a b} {
+	array set foo {c 22 d 33}
+	trace add variable foo {read write unset} tproc
+	p2
+	trace remove variable foo {read write unset} tproc
+    }
+    proc p2 {} {
+	upvar foo(c) x1
+	set x1 22
+    }
+    set x ---
+    p1 foo bar
+    set x
+} -result {{x1 {} write} x1}
+test upvar-5.6 {unset trace on upvar array element} -body {
+    proc p1 {a b} {
+	array set foo {c 22 d 33}
+	trace add variable foo {read write unset} tproc
+	p2
+	trace remove variable foo {read write unset} tproc
+    }
+    proc p2 {} {
+	upvar foo(c) x1
+	unset x1
+    }
+    set x ---
+    p1 foo bar
+    set x
+} -result {{x1 {} unset} x1}
 
 test upvar-6.1 {retargeting an upvar} {
     proc p1 {} {
-- 
cgit v0.12


From 10cc2ae8fdb18bd0408ff5d1a440cea2e85e55c4 Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Wed, 24 Aug 2022 11:28:19 +0000
Subject: Fix error message, so trace tests 16.2, 16.9, and 16.16 pass again.

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

diff --git a/generic/tclInt.h b/generic/tclInt.h
index f5b25dc..7599f8f 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -816,8 +816,8 @@ typedef struct VarInHash {
 
 #define TclVarFindHiddenArray(varPtr,arrayPtr)				\
     do {								\
-        if ((arrayPtr == NULL) && TclIsVarInHash(varPtr) &&		\
-              (TclVarParentArray(varPtr) != NULL)) {			\
+        if (!arrayPtr && !TclIsVarUndefined(varPtr) &&			\
+              TclIsVarInHash(varPtr) && TclVarParentArray(varPtr)) {	\
             arrayPtr = TclVarParentArray(varPtr);			\
         }								\
     } while(0)
-- 
cgit v0.12


From 66ebfaa06df00e3e2870e724a9e7adcb30d0a417 Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Wed, 24 Aug 2022 11:53:24 +0000
Subject: Fix env array access through upvar to a single element.

---
 generic/tclEnv.c | 23 +++++++++++++++++++++--
 tests/env.test   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 73a8b84..2c6f8e3 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -60,6 +60,10 @@ static struct {
 
 #define tNTL sizeof(techar)
 
+/* Copied from tclVar.c - should possibly be moved to tclInt.h */
+#define VarHashGetKey(varPtr) \
+    (((VarInHash *)(varPtr))->entry.key.objPtr)
+
 /*
  * Declarations for local functions defined in this file:
  */
@@ -644,11 +648,26 @@ EnvTraceProc(
     }
 
     /*
-     * If name2 is NULL, then return and do nothing.
+     * When an env array element is accessed via an upvar reference, there
+     * are two possibilities:
+     * 1. The upvar references the complete array. In this case name1 may be
+     *    something else than "env", but that doesn't affect anything. name2
+     *    will still be the correct name for the enviroment variable to use.
+     * 2. The upvar references a single element of the array. In this case
+     *    name2 will be NULL and name1 is the name of the alias. This alias
+     *    must be resolved to the actual key of the array element.
      */
 
     if (name2 == NULL) {
-	return NULL;
+	Var *varPtr, *arrayPtr;
+	Tcl_Obj *name;
+
+	name = Tcl_NewStringObj(name1, -1);
+        Tcl_IncrRefCount(name);
+	varPtr = TclObjLookupVarEx(interp, name, NULL, /*flags*/ 0,
+	  /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
+        Tcl_DecrRefCount(name);
+	name2 = Tcl_GetString(VarHashGetKey(varPtr));
     }
 
     /*
diff --git a/tests/env.test b/tests/env.test
index 9eacd5d..30d8319 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -411,6 +411,38 @@ test env-7.3 {
       return [info exists ::env(test7_3)]
     }}
 } -cleanup cleanup1 -result 1
+
+test env-7.4 {
+    get env variable through upvar
+} -setup setup1 -body {
+    apply {{} {
+	set ::env(test7_4) origvalue
+	upvar #0 env(test7_4) var
+	return $var
+    }}
+} -cleanup cleanup1 -result origvalue
+
+test env-7.5 {
+    set env variable through upvar
+} -setup setup1 -body {
+    apply {{} {
+	set ::env(test7_4) origvalue
+	upvar #0 env(test7_4) var
+	set var newvalue
+	return $::env(test7_4)
+    }}
+} -cleanup cleanup1 -result newvalue
+
+test env-7.6 {
+    unset env variable through upvar
+} -setup setup1 -body {
+    apply {{} {
+	set ::env(test7_4) origvalue
+	upvar #0 env(test7_4) var
+	unset var
+	return [array get env test7_4]
+    }}
+} -cleanup cleanup1 -result {}
 
 test env-8.0 {
     memory usage - valgrind does not report reachable memory
-- 
cgit v0.12


From 8b4623feb42e145800da55276ee6987cc2f892d9 Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Wed, 24 Aug 2022 12:03:08 +0000
Subject: Use whitespace consistent with the surrounding code.

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

diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 2c6f8e3..98d871a 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -663,10 +663,10 @@ EnvTraceProc(
 	Tcl_Obj *name;
 
 	name = Tcl_NewStringObj(name1, -1);
-        Tcl_IncrRefCount(name);
+	Tcl_IncrRefCount(name);
 	varPtr = TclObjLookupVarEx(interp, name, NULL, /*flags*/ 0,
 	  /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-        Tcl_DecrRefCount(name);
+	Tcl_DecrRefCount(name);
 	name2 = Tcl_GetString(VarHashGetKey(varPtr));
     }
 
-- 
cgit v0.12


From 688186d7268b10d38b7e93cfa719208ebc1f96b2 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Thu, 25 Aug 2022 20:07:29 +0000
Subject: TIP633 fconfigure -tolerantencoding: set tolerant 8.7 default value.

---
 generic/tclIO.c | 14 +++++++++++---
 generic/tclIO.h |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6d9798e..cf96559 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1703,6 +1703,14 @@ Tcl_CreateChannel(
     statePtr->outputEncodingFlags = TCL_ENCODING_START;
 
     /*
+     * Set encoding tolerant mode as default on 8.7.x and off on TCL9.x
+     */
+    
+    #if TCL_MAJOR_VERSION < 9
+    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
+    #endif
+
+    /*
      * Set the channel up initially in AUTO input translation mode to accept
      * "\n", "\r" and "\r\n". Output translation mode is set to a platform
      * specific default value. The eofChar is set to 0 for both input and
@@ -7910,7 +7918,7 @@ Tcl_GetChannelOption(
 	    Tcl_DStringAppendElement(dsPtr, "-tolerantencoding");
 	}
 	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_TOLERANT_ENCODING) ? "1" : "0");
+		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "1" : "0");
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8178,9 +8186,9 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    statePtr->flags |= CHANNEL_TOLERANT_ENCODING;
+	    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
 	} else {
-	    statePtr->flags &= ~CHANNEL_TOLERANT_ENCODING;
+	    statePtr->flags &= ~CHANNEL_ENCODING_NOCOMPLAIN;
 	}
 	return TCL_OK;
     } else if (HaveOpt(2, "-translation")) {
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 1d63c0b..58e0c0f 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,7 +271,7 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
-#define CHANNEL_TOLERANT_ENCODING	(1<<17)	/* set if option -tolerantencoding
+#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option -tolerantencoding
 					* is set to 1 */
 
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
-- 
cgit v0.12


From 2f0f646a076e6e374ff7a125957de91202178e07 Mon Sep 17 00:00:00 2001
From: bch <brad.harder@gmail.com>
Date: Fri, 26 Aug 2022 17:19:02 +0000
Subject: Tcl_GetVersion(3) - we just use int for components now, not
 Tcl_ReleaseType; Cleanup stray tag.

---
 doc/GetVersion.3 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/GetVersion.3 b/doc/GetVersion.3
index 3672382..b973044 100644
--- a/doc/GetVersion.3
+++ b/doc/GetVersion.3
@@ -15,14 +15,13 @@ Tcl_GetVersion \- get the version of the library at runtime
 .sp
 \fBTcl_GetVersion\fR(\fImajor, minor, patchLevel, type\fR)
 .SH ARGUMENTS
-.AS Tcl_ReleaseType *patchLevel out
 .AP int *major out
 Major version number of the Tcl library.
 .AP int *minor out
 Minor version number of the Tcl library.
 .AP int *patchLevel out
 The patch level of the Tcl library (or alpha or beta number).
-.AP Tcl_ReleaseType *type out
+.AP int *type out
 The type of release, also indicates the type of patch level. Can be
 one of \fBTCL_ALPHA_RELEASE\fR, \fBTCL_BETA_RELEASE\fR, or
 \fBTCL_FINAL_RELEASE\fR.
-- 
cgit v0.12


From 18da054782020f70383cf5764a17be7cf3b0b457 Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Sat, 27 Aug 2022 08:14:31 +0000
Subject: Alternative fix for the error messages by chw, which doesn't break
 traces on non-existing array elements.

---
 generic/tclInt.h |  4 ++--
 generic/tclVar.c |  8 +++++---
 tests/env.test   | 18 ++++++++++++++++++
 tests/upvar.test | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 7599f8f..f5b25dc 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -816,8 +816,8 @@ typedef struct VarInHash {
 
 #define TclVarFindHiddenArray(varPtr,arrayPtr)				\
     do {								\
-        if (!arrayPtr && !TclIsVarUndefined(varPtr) &&			\
-              TclIsVarInHash(varPtr) && TclVarParentArray(varPtr)) {	\
+        if ((arrayPtr == NULL) && TclIsVarInHash(varPtr) &&		\
+              (TclVarParentArray(varPtr) != NULL)) {			\
             arrayPtr = TclVarParentArray(varPtr);			\
         }								\
     } while(0)
diff --git a/generic/tclVar.c b/generic/tclVar.c
index c88144f..b38575b 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -1390,6 +1390,7 @@ TclPtrGetVarIdx(
 {
     Interp *iPtr = (Interp *) interp;
     const char *msg;
+    Var *initialArrayPtr = arrayPtr;
 
     TclVarFindHiddenArray(varPtr, arrayPtr);
 
@@ -1438,8 +1439,8 @@ TclPtrGetVarIdx(
     }
 
     if (flags & TCL_LEAVE_ERR_MSG) {
-	if (TclIsVarUndefined(varPtr) && arrayPtr
-		&& !TclIsVarUndefined(arrayPtr)) {
+	if (TclIsVarUndefined(varPtr) && initialArrayPtr
+		&& !TclIsVarUndefined(initialArrayPtr)) {
 	    msg = NOSUCHELEMENT;
 	} else if (TclIsVarArray(varPtr)) {
 	    msg = ISARRAY;
@@ -2447,6 +2448,7 @@ TclPtrUnsetVarIdx(
 {
     Interp *iPtr = (Interp *) interp;
     int result = (TclIsVarUndefined(varPtr)? TCL_ERROR : TCL_OK);
+    Var *initialArrayPtr = arrayPtr;
 
     /*
      * Keep the variable alive until we're done with it. We used to
@@ -2470,7 +2472,7 @@ TclPtrUnsetVarIdx(
     if (result != TCL_OK) {
 	if (flags & TCL_LEAVE_ERR_MSG) {
 	    TclObjVarErrMsg(interp, part1Ptr, part2Ptr, "unset",
-		    ((arrayPtr == NULL) ? NOSUCHVAR : NOSUCHELEMENT), index);
+              ((initialArrayPtr == NULL) ? NOSUCHVAR : NOSUCHELEMENT), index);
 	    Tcl_SetErrorCode(interp, "TCL", "UNSET", "VARNAME", NULL);
 	}
     }
diff --git a/tests/env.test b/tests/env.test
index 30d8319..fb8e22f 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -443,6 +443,24 @@ test env-7.6 {
 	return [array get env test7_4]
     }}
 } -cleanup cleanup1 -result {}
+
+test env-7.7 {
+    create new (unset) env variable through upvar
+} -setup setup1 -body {
+    apply {{} {
+	unset -nocomplain ::env(test7_7)
+	upvar #0 env(test7_7) var
+	interp create interp1
+	set var newvalue
+	set result [interp1 eval {info exists ::env(test7_7)}]
+	if {$result} {
+	    lappend result [interp1 eval {set ::env(test7_7)}]
+	}
+	interp delete interp1
+	return $result
+    }}
+} -cleanup cleanup1 -result {1 newvalue}
+
 
 test env-8.0 {
     memory usage - valgrind does not report reachable memory
diff --git a/tests/upvar.test b/tests/upvar.test
index 268bb17..3682521 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -252,6 +252,22 @@ test upvar-5.6 {unset trace on upvar array element} -body {
     p1 foo bar
     set x
 } -result {{x1 {} unset} x1}
+test upvar-5.7 {trace on non-existent upvar array element} -body {
+    proc p1 {a b} {
+	array set foo {}
+	trace add variable foo {read write unset} tproc
+	p2
+	trace remove variable foo {read write unset} tproc
+	return [array get foo]
+    }
+    proc p2 {} {
+	upvar foo(hi) x1
+	set x1 there
+    }
+    set x ---
+    lappend x [p1 foo bar]
+    set x
+} -result {{x1 {} write} x1 {hi there}}
 
 test upvar-6.1 {retargeting an upvar} {
     proc p1 {} {
-- 
cgit v0.12


From b437bfcd3ae2b4aeb6042d31504dae44fcd3c371 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 31 Aug 2022 09:12:57 +0000
Subject: Since numAfterRangeEnd (of type size_t) is always >= 0, those
 LIST_ASSERT's are useless

---
 generic/tclListObj.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index be1c02c..200ea5a 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -1488,7 +1488,6 @@ ListRepRange(
 	ListRepElements(srcRepPtr, numSrcElems, srcElems);
 	numAfterRangeEnd = numSrcElems - (rangeEnd + 1);
 	/* Assert: Because numSrcElems > rangeEnd earlier */
-	LIST_ASSERT(numAfterRangeEnd >= 0);
 	if (numAfterRangeEnd != 0) {
             /* T:listrep-1.{8,9} */
 	    ObjArrayDecrRefs(srcElems, rangeEnd + 1, numAfterRangeEnd);
@@ -1561,7 +1560,6 @@ ListRepRange(
 	/* Ditto for trailing */
 	numAfterRangeEnd = numSrcElems - (rangeEnd + 1);
 	/* Assert: Because numSrcElems > rangeEnd earlier */
-	LIST_ASSERT(numAfterRangeEnd >= 0);
 	if (numAfterRangeEnd != 0) {
             /* T:listrep-3.17 */
 	    ObjArrayDecrRefs(srcElems, rangeEnd + 1, numAfterRangeEnd);
-- 
cgit v0.12


From abf853d0bba19a6b5d8271bda9049f20c1c85bf5 Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Wed, 31 Aug 2022 11:06:38 +0000
Subject: Implement modification of the 'name2' trace callback argument.

---
 doc/trace.n        | 20 ++++++++++----------
 doc/upvar.n        |  4 ++++
 generic/tclEnv.c   | 23 ++---------------------
 generic/tclInt.h   |  3 +++
 generic/tclTrace.c | 23 +++++++++++++++++++----
 generic/tclVar.c   | 19 +++++++++++++++----
 tests/upvar.test   |  8 ++++----
 7 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/doc/trace.n b/doc/trace.n
index 570b263..959acc2 100644
--- a/doc/trace.n
+++ b/doc/trace.n
@@ -229,18 +229,18 @@ When the trace triggers, three arguments are appended to
 \fIcommandPrefix name1 name2 op\fR
 .CE
 .PP
-\fIName1\fR and \fIname2\fR give the name(s) for the variable
-being accessed:  if the variable is a scalar then \fIname1\fR
-gives the variable's name and \fIname2\fR is an empty string;
-if the variable is an array element then \fIname1\fR gives the
-name of the array and name2 gives the index into the array;
-if an entire array is being deleted and the trace was registered
+\fIName1\fR gives the name for the variable being accessed.
+This is not necessarily the same as the name used in the
+\fBtrace variable\fR command:  the \fBupvar\fR command allows a
+procedure to reference a variable under a different name.
+If the trace was originally set on an array or array element,
+\fIname2\fR provides which index into the array was affected.
+This information is present even when \fIname1\fR refers to a
+scalar, which may happen if the \fBupvar\fR command was used to
+create a reference to a single array element.
+If an entire array is being deleted and the trace was registered
 on the overall array, rather than a single element, then \fIname1\fR
 gives the array name and \fIname2\fR is an empty string.
-\fIName1\fR and \fIname2\fR are not necessarily the same as the
-name used in the \fBtrace variable\fR command:  the \fBupvar\fR
-command allows a procedure to reference a variable under a
-different name.
 \fIOp\fR indicates what operation is being performed on the
 variable, and is one of \fBread\fR, \fBwrite\fR, or \fBunset\fR as
 defined above.
diff --git a/doc/upvar.n b/doc/upvar.n
index 6ad1237..b0324b2 100644
--- a/doc/upvar.n
+++ b/doc/upvar.n
@@ -97,6 +97,10 @@ set originalVar 1
 trace variable originalVar w \fItraceproc\fR
 \fIsetByUpvar\fR originalVar 2
 .CE
+.PP
+If \fIotherVar\fR refers to an element of an array, then the element
+name is passed as the second argument to the trace procedure. This
+may be important information in case of traces set on an entire array.
 .SH EXAMPLE
 A \fBdecr\fR command that works like \fBincr\fR except it subtracts
 the value from the variable instead of adding it:
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 98d871a..73a8b84 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -60,10 +60,6 @@ static struct {
 
 #define tNTL sizeof(techar)
 
-/* Copied from tclVar.c - should possibly be moved to tclInt.h */
-#define VarHashGetKey(varPtr) \
-    (((VarInHash *)(varPtr))->entry.key.objPtr)
-
 /*
  * Declarations for local functions defined in this file:
  */
@@ -648,26 +644,11 @@ EnvTraceProc(
     }
 
     /*
-     * When an env array element is accessed via an upvar reference, there
-     * are two possibilities:
-     * 1. The upvar references the complete array. In this case name1 may be
-     *    something else than "env", but that doesn't affect anything. name2
-     *    will still be the correct name for the enviroment variable to use.
-     * 2. The upvar references a single element of the array. In this case
-     *    name2 will be NULL and name1 is the name of the alias. This alias
-     *    must be resolved to the actual key of the array element.
+     * If name2 is NULL, then return and do nothing.
      */
 
     if (name2 == NULL) {
-	Var *varPtr, *arrayPtr;
-	Tcl_Obj *name;
-
-	name = Tcl_NewStringObj(name1, -1);
-	Tcl_IncrRefCount(name);
-	varPtr = TclObjLookupVarEx(interp, name, NULL, /*flags*/ 0,
-	  /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-	Tcl_DecrRefCount(name);
-	name2 = Tcl_GetString(VarHashGetKey(varPtr));
+	return NULL;
     }
 
     /*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index f5b25dc..6657cef 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -872,6 +872,9 @@ typedef struct VarInHash {
 #define VarHashRefCount(varPtr) \
     ((VarInHash *) (varPtr))->refCount
 
+#define VarHashGetKey(varPtr) \
+    (((VarInHash *)(varPtr))->entry.key.objPtr)
+
 /*
  * Macros for direct variable access by TEBC.
  */
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index f830a77..8999858 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -2634,6 +2634,7 @@ TclCallVarTraces(
     Tcl_InterpState state = NULL;
     Tcl_HashEntry *hPtr;
     int traceflags = flags & VAR_ALL_TRACES;
+    const char *element;
 
     /*
      * If there are already similar trace functions active for the variable,
@@ -2685,6 +2686,20 @@ TclCallVarTraces(
 	}
     }
 
+    /* Keep the original pointer for possible use in an error message */
+    element = part2;
+    if (part2 == NULL) {
+        if (TclIsVarArrayElement(varPtr)) {
+            Tcl_Obj *keyObj = VarHashGetKey(varPtr);
+            part2 = Tcl_GetString(keyObj);
+        }
+    } else if ((flags & VAR_TRACED_UNSET) && !(flags & VAR_ARRAY_ELEMENT)) {
+        /* On unset traces, part2 has already been set by the caller, and
+         * the VAR_ARRAY_ELEMENT flag indicates whether the accessed
+         * variable actually has a second part, or is a scalar */
+        element = NULL;
+    }
+
     /*
      * Invoke traces on the array containing the variable, if relevant.
      */
@@ -2805,13 +2820,13 @@ TclCallVarTraces(
 
 	    Tcl_AppendObjToErrorInfo((Tcl_Interp *)iPtr, Tcl_ObjPrintf(
 		    "\n    (%s trace on \"%s%s%s%s\")", type, part1,
-		    (part2 ? "(" : ""), (part2 ? part2 : ""),
-		    (part2 ? ")" : "") ));
+		    (element ? "(" : ""), (element ? element : ""),
+		    (element ? ")" : "") ));
 	    if (disposeFlags & TCL_TRACE_RESULT_OBJECT) {
-		TclVarErrMsg((Tcl_Interp *) iPtr, part1, part2, verb,
+		TclVarErrMsg((Tcl_Interp *) iPtr, part1, element, verb,
 			TclGetString((Tcl_Obj *) result));
 	    } else {
-		TclVarErrMsg((Tcl_Interp *) iPtr, part1, part2, verb, result);
+		TclVarErrMsg((Tcl_Interp *) iPtr, part1, element, verb, result);
 	    }
 	    iPtr->flags &= ~(ERR_ALREADY_LOGGED);
 	    Tcl_DiscardInterpState(state);
diff --git a/generic/tclVar.c b/generic/tclVar.c
index b38575b..44645b5 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -108,9 +108,6 @@ VarHashNextVar(
     return VarHashGetValue(hPtr);
 }
 
-#define VarHashGetKey(varPtr) \
-    (((VarInHash *)(varPtr))->entry.key.objPtr)
-
 #define VarHashDeleteTable(tablePtr) \
     Tcl_DeleteHashTable(&(tablePtr)->table)
 
@@ -2580,9 +2577,23 @@ UnsetVarStruct(
 
 	if ((dummyVar.flags & VAR_TRACED_UNSET)
 		|| (arrayPtr && (arrayPtr->flags & VAR_TRACED_UNSET))) {
+
+            /*
+             * Pass the array element name to TclObjCallVarTraces(), because
+             * it cannot be determined from dummyVar. Alternatively, indicate
+             * via flags whether the variable involved in the code that caused
+             * the trace to be triggered was an array element, for the correct
+             * formatting of error messages.
+             */
+            if (part2Ptr) {
+                flags |= VAR_ARRAY_ELEMENT;
+            } else if (TclIsVarArrayElement(varPtr)) {
+                part2Ptr = VarHashGetKey(varPtr);
+            }
+
 	    dummyVar.flags &= ~VAR_TRACE_ACTIVE;
 	    TclObjCallVarTraces(iPtr, arrayPtr, &dummyVar, part1Ptr, part2Ptr,
-		    (flags & (TCL_GLOBAL_ONLY|TCL_NAMESPACE_ONLY))
+              (flags & (TCL_GLOBAL_ONLY|TCL_NAMESPACE_ONLY|VAR_ARRAY_ELEMENT))
 			    | TCL_TRACE_UNSETS,
 		    /* leaveErrMsg */ 0, index);
 
diff --git a/tests/upvar.test b/tests/upvar.test
index 3682521..6330fa6 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -221,7 +221,7 @@ test upvar-5.4 {read trace on upvar array element} -body {
     set x ---
     p1 foo bar
     set x
-} -result {{x1 {} read} x1}
+} -result {{x1 c read} x1}
 test upvar-5.5 {write trace on upvar array element} -body {
     proc p1 {a b} {
 	array set foo {c 22 d 33}
@@ -236,7 +236,7 @@ test upvar-5.5 {write trace on upvar array element} -body {
     set x ---
     p1 foo bar
     set x
-} -result {{x1 {} write} x1}
+} -result {{x1 c write} x1}
 test upvar-5.6 {unset trace on upvar array element} -body {
     proc p1 {a b} {
 	array set foo {c 22 d 33}
@@ -251,7 +251,7 @@ test upvar-5.6 {unset trace on upvar array element} -body {
     set x ---
     p1 foo bar
     set x
-} -result {{x1 {} unset} x1}
+} -result {{x1 c unset} x1}
 test upvar-5.7 {trace on non-existent upvar array element} -body {
     proc p1 {a b} {
 	array set foo {}
@@ -267,7 +267,7 @@ test upvar-5.7 {trace on non-existent upvar array element} -body {
     set x ---
     lappend x [p1 foo bar]
     set x
-} -result {{x1 {} write} x1 {hi there}}
+} -result {{x1 hi write} x1 {hi there}}
 
 test upvar-6.1 {retargeting an upvar} {
     proc p1 {} {
-- 
cgit v0.12


From 5f0c43664685bc2ee4df68984143d273a7d23ad6 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Wed, 31 Aug 2022 20:33:29 +0000
Subject: Corrections to doc/safe.n

---
 doc/safe.n | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/safe.n b/doc/safe.n
index b74f3c6..6dd4033 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -399,7 +399,7 @@ if \fB\-accessPath\fR is specified, then \fB\-autoPath\fR must also be
 specified, or else it will be set to {}.
 .PP
 The value of \fB\-autoPath\fR will be that required to access tclIndex
-and pkgIndex.txt files according to the same rules as an unsafe
+and pkgIndex.tcl files according to the same rules as an unsafe
 interpreter (see pkg_mkIndex(n) and library(n)).
 .PP
 With "Sync Mode" on, the option \fB\-autoPath\fR is undefined, and
@@ -408,7 +408,7 @@ access path. In addition to the directories present if "Safe Mode" is off,
 the ::auto_path includes the numerous subdirectories and module paths
 that belong to the access path.
 .SH SYNC MODE
-Before Tcl version 8.6.x, the Safe Base kept each safe interpreter's
+Before Tcl version 8.7, the Safe Base kept each safe interpreter's
 ::auto_path synchronized with a tokenized form of its access path.
 Limitations of Tcl 8.4 and earlier made this feature necessary.  This
 definition of ::auto_path did not conform its specification in library(n)
-- 
cgit v0.12


From e03ac7f9c6599697608bb897f3bdbc2e47cf0883 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Sep 2022 07:42:51 +0000
Subject: Some more (internal) ClientData -> void * changes

---
 macosx/tclMacOSXNotify.c | 20 ++++++++---------
 tools/tsdPerf.c          |  4 ++--
 unix/tclEpollNotfy.c     | 10 ++++-----
 unix/tclKqueueNotfy.c    | 10 ++++-----
 unix/tclSelectNotfy.c    |  4 ++--
 unix/tclUnixCompat.c     |  4 ++--
 unix/tclUnixPipe.c       |  2 +-
 unix/tclUnixTest.c       | 20 ++++++++---------
 unix/tclXtNotify.c       | 10 ++++-----
 unix/tclXtTest.c         |  2 +-
 win/tclWinConsole.c      | 56 ++++++++++++++++++++++++------------------------
 win/tclWinSock.c         | 38 ++++++++++++++++----------------
 win/tclWinTime.c         | 18 ++++++++--------
 13 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index 15a1cd5..36c3f59 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -311,7 +311,7 @@ typedef struct FileHandler {
 				 * for this file. */
     Tcl_FileProc *proc;		/* Function to call, in the style of
 				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
+    void *clientData;	/* Argument to pass to proc. */
     struct FileHandler *nextPtr;/* Next in list of all files we care about. */
 } FileHandler;
 
@@ -505,7 +505,7 @@ static CFStringRef tclEventsOnlyRunLoopMode = NULL;
  */
 
 static void		StartNotifierThread(void);
-static TCL_NORETURN void NotifierThreadProc(ClientData clientData);
+static TCL_NORETURN void NotifierThreadProc(void *clientData);
 static int		FileHandlerEventProc(Tcl_Event *evPtr, int flags);
 static void		TimerWakeUp(CFRunLoopTimerRef timer, void *info);
 static void		QueueFileEvents(void *info);
@@ -612,7 +612,7 @@ LookUpFileHandler(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpInitNotifier(void)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -868,7 +868,7 @@ StartNotifierThread(void)
 
 void
 TclpFinalizeNotifier(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -970,7 +970,7 @@ TclpFinalizeNotifier(
 
 void
 TclpAlertNotifier(
-    ClientData clientData)
+    void *clientData)
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
 
@@ -1047,7 +1047,7 @@ TclpSetTimer(
 static void
 TimerWakeUp(
     TCL_UNUSED(CFRunLoopTimerRef),
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
 }
 
@@ -1114,7 +1114,7 @@ TclpCreateFileHandler(
 				 * called. */
     Tcl_FileProc *proc,		/* Function to call for each selected
 				 * event. */
-    ClientData clientData)	/* Arbitrary data to pass to proc. */
+    void *clientData)	/* Arbitrary data to pass to proc. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     FileHandler *filePtr = LookUpFileHandler(tsdPtr, fd, NULL);
@@ -1334,7 +1334,7 @@ FileHandlerEventProc(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpNotifierData(void)
 {
     return NULL;
@@ -1908,7 +1908,7 @@ int
 TclAsyncNotifier(
     int sigNumber,		/* Signal number. */
     TCL_UNUSED(Tcl_ThreadId),	/* Target thread. */
-    TCL_UNUSED(ClientData),	/* Notifier data. */
+    TCL_UNUSED(void *),	/* Notifier data. */
     int *flagPtr,		/* Flag to mark. */
     int value)			/* Value of mark. */
 {
@@ -1967,7 +1967,7 @@ TclAsyncNotifier(
 
 static TCL_NORETURN void
 NotifierThreadProc(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     ThreadSpecificData *tsdPtr;
     fd_set readableMask, writableMask, exceptionalMask;
diff --git a/tools/tsdPerf.c b/tools/tsdPerf.c
index 4c96f28..0bcc11b 100644
--- a/tools/tsdPerf.c
+++ b/tools/tsdPerf.c
@@ -10,7 +10,7 @@ typedef struct {
 
 
 static int
-tsdPerfSetObjCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) {
+tsdPerfSetObjCmd(void *cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) {
     TsdPerf *perf = Tcl_GetThreadData(&key, sizeof(TsdPerf));
     Tcl_WideInt i;
 
@@ -29,7 +29,7 @@ tsdPerfSetObjCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const
 }
 
 static int
-tsdPerfGetObjCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) {
+tsdPerfGetObjCmd(void *cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv) {
     TsdPerf *perf = Tcl_GetThreadData(&key, sizeof(TsdPerf));
 
 
diff --git a/unix/tclEpollNotfy.c b/unix/tclEpollNotfy.c
index 3d6bcd5..659e659 100644
--- a/unix/tclEpollNotfy.c
+++ b/unix/tclEpollNotfy.c
@@ -42,7 +42,7 @@ typedef struct FileHandler {
 				 * for this file. */
     Tcl_FileProc *proc;		/* Function to call, in the style of
 				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
+    void *clientData;	/* Argument to pass to proc. */
     struct FileHandler *nextPtr;/* Next in list of all files we care about. */
     LIST_ENTRY(FileHandler) readyNode;
 				/* Next/previous in list of FileHandlers asso-
@@ -150,7 +150,7 @@ static int		PlatformEventsWait(struct epoll_event *events,
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpInitNotifier(void)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -275,7 +275,7 @@ PlatformEventsControl(
 
 void
 TclpFinalizeNotifier(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -513,7 +513,7 @@ TclpCreateFileHandler(
 				 * called. */
     Tcl_FileProc *proc,		/* Function to call for each selected
 				 * event. */
-    ClientData clientData)	/* Arbitrary data to pass to proc. */
+    void *clientData)	/* Arbitrary data to pass to proc. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     FileHandler *filePtr = LookUpFileHandler(tsdPtr, fd, NULL);
@@ -791,7 +791,7 @@ int
 TclAsyncNotifier(
     int sigNumber,		/* Signal number. */
     Tcl_ThreadId threadId,	/* Target thread. */
-    ClientData clientData,	/* Notifier data. */
+    void *clientData,	/* Notifier data. */
     int *flagPtr,		/* Flag to mark. */
     int value)			/* Value of mark. */
 {
diff --git a/unix/tclKqueueNotfy.c b/unix/tclKqueueNotfy.c
index 005abc5..487af9c 100644
--- a/unix/tclKqueueNotfy.c
+++ b/unix/tclKqueueNotfy.c
@@ -40,7 +40,7 @@ typedef struct FileHandler {
 				 * for this file. */
     Tcl_FileProc *proc;		/* Function to call, in the style of
 				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
+    void *clientData;	/* Argument to pass to proc. */
     struct FileHandler *nextPtr;/* Next in list of all files we care about. */
     LIST_ENTRY(FileHandler) readyNode;
 				/* Next/previous in list of FileHandlers asso-
@@ -274,7 +274,7 @@ PlatformEventsControl(
 
 void
 TclpFinalizeNotifier(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -330,7 +330,7 @@ TclpFinalizeNotifier(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpInitNotifier(void)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -518,7 +518,7 @@ TclpCreateFileHandler(
 				 * called. */
     Tcl_FileProc *proc,		/* Function to call for each selected
 				 * event. */
-    ClientData clientData)	/* Arbitrary data to pass to proc. */
+    void *clientData)	/* Arbitrary data to pass to proc. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     FileHandler *filePtr = LookUpFileHandler(tsdPtr, fd, NULL);
@@ -787,7 +787,7 @@ int
 TclAsyncNotifier(
     int sigNumber,		/* Signal number. */
     Tcl_ThreadId threadId,	/* Target thread. */
-    ClientData clientData,	/* Notifier data. */
+    void *clientData,	/* Notifier data. */
     int *flagPtr,		/* Flag to mark. */
     int value)			/* Value of mark. */
 {
diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c
index e7a53bf..862a0e3 100644
--- a/unix/tclSelectNotfy.c
+++ b/unix/tclSelectNotfy.c
@@ -921,7 +921,7 @@ int
 TclAsyncNotifier(
     int sigNumber,		/* Signal number. */
     TCL_UNUSED(Tcl_ThreadId),	/* Target thread. */
-    TCL_UNUSED(ClientData),	/* Notifier data. */
+    TCL_UNUSED(void *),	/* Notifier data. */
     int *flagPtr,		/* Flag to mark. */
     int value)			/* Value of mark. */
 {
@@ -986,7 +986,7 @@ TclAsyncNotifier(
 #if TCL_THREADS
 static TCL_NORETURN void
 NotifierThreadProc(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     ThreadSpecificData *tsdPtr;
     fd_set readableMask;
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 111a082..8aff976 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -116,10 +116,10 @@ static int		CopyString(const char *src, char *buf, int buflen);
 #endif
 
 #ifdef NEED_PW_CLEANER
-static void		FreePwBuf(ClientData dummy);
+static void		FreePwBuf(void *dummy);
 #endif
 #ifdef NEED_GR_CLEANER
-static void		FreeGrBuf(ClientData dummy);
+static void		FreeGrBuf(void *dummy);
 #endif
 #endif /* TCL_THREADS */
 
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index d9f8043..0692df5 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -1251,7 +1251,7 @@ Tcl_WaitPid(
 
 int
 Tcl_PidObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index 80e8081..ccb9105 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -129,7 +129,7 @@ TclplatformtestInit(
 
 static int
 TestfilehandlerCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -310,7 +310,7 @@ TestfilehandlerCmd(
 
 static void
 TestFileHandlerProc(
-    ClientData clientData,	/* Points to a Pipe structure. */
+    void *clientData,	/* Points to a Pipe structure. */
     int mask)			/* Indicates which events happened:
 				 * TCL_READABLE or TCL_WRITABLE. */
 {
@@ -343,7 +343,7 @@ TestFileHandlerProc(
 
 static int
 TestfilewaitCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -351,7 +351,7 @@ TestfilewaitCmd(
     int mask, result, timeout;
     Tcl_Channel channel;
     int fd;
-    ClientData data;
+    void *data;
 
     if (objc != 4) {
 	Tcl_WrongNumArgs(interp, 2, objv, "file readable|writable|both timeout");
@@ -374,7 +374,7 @@ TestfilewaitCmd(
     }
     if (Tcl_GetChannelHandle(channel,
 	    (mask & TCL_READABLE) ? TCL_READABLE : TCL_WRITABLE,
-	    (ClientData*) &data) != TCL_OK) {
+	    (void **) &data) != TCL_OK) {
 	Tcl_AppendResult(interp, "couldn't get channel file", NULL);
 	return TCL_ERROR;
     }
@@ -411,7 +411,7 @@ TestfilewaitCmd(
 
 static int
 TestfindexecutableCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -453,7 +453,7 @@ TestfindexecutableCmd(
 
 static int
 TestforkCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -499,7 +499,7 @@ TestforkCmd(
 
 static int
 TestalarmCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -577,7 +577,7 @@ AlarmHandler(
 
 static int
 TestgotsigCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     TCL_UNUSED(int) /*objc*/,
     TCL_UNUSED(Tcl_Obj *const *))
@@ -608,7 +608,7 @@ TestgotsigCmd(
 
 static int
 TestchmodCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,			/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)		/* Argument strings. */
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index b7a1ea8..ab1bfee 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -33,7 +33,7 @@ typedef struct FileHandler {
     XtInputId except;		/* Xt exception callback handle. */
     Tcl_FileProc *proc;		/* Procedure to call, in the style of
 				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
+    void *clientData;	/* Argument to pass to proc. */
     struct FileHandler *nextPtr;/* Next in list of all files we care about. */
 } FileHandler;
 
@@ -79,10 +79,10 @@ static int initialized = 0;
 static int		FileHandlerEventProc(Tcl_Event *evPtr, int flags);
 static void		FileProc(XtPointer clientData, int *source,
 			    XtInputId *id);
-static void		NotifierExitHandler(ClientData clientData);
+static void		NotifierExitHandler(void *clientData);
 static void		TimerProc(XtPointer clientData, XtIntervalId *id);
 static void		CreateFileHandler(int fd, int mask,
-			    Tcl_FileProc *proc, ClientData clientData);
+			    Tcl_FileProc *proc, void *clientData);
 static void		DeleteFileHandler(int fd);
 static void		SetTimer(const Tcl_Time * timePtr);
 static int		WaitForEvent(const Tcl_Time * timePtr);
@@ -229,7 +229,7 @@ InitNotifier(void)
 
 static void
 NotifierExitHandler(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     if (notifier.currentTimeout != 0) {
 	XtRemoveTimeOut(notifier.currentTimeout);
@@ -339,7 +339,7 @@ CreateFileHandler(
 				 * called. */
     Tcl_FileProc *proc,		/* Procedure to call for each selected
 				 * event. */
-    ClientData clientData)	/* Arbitrary data to pass to proc. */
+    void *clientData)	/* Arbitrary data to pass to proc. */
 {
     FileHandler *filePtr;
 
diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c
index 882f497..09b16c5 100644
--- a/unix/tclXtTest.c
+++ b/unix/tclXtTest.c
@@ -77,7 +77,7 @@ Tclxttest_Init(
 
 static int
 TesteventloopCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 90b3c90..8452cf1 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -210,29 +210,29 @@ typedef struct {
  * Declarations for functions used only in this file.
  */
 
-static int	ConsoleBlockModeProc(ClientData instanceData, int mode);
-static void	ConsoleCheckProc(ClientData clientData, int flags);
-static int	ConsoleCloseProc(ClientData instanceData,
+static int	ConsoleBlockModeProc(void *instanceData, int mode);
+static void	ConsoleCheckProc(void *clientData, int flags);
+static int	ConsoleCloseProc(void *instanceData,
 		    Tcl_Interp *interp, int flags);
 static int	ConsoleEventProc(Tcl_Event *evPtr, int flags);
-static void	ConsoleExitHandler(ClientData clientData);
-static int	ConsoleGetHandleProc(ClientData instanceData,
-		    int direction, ClientData *handlePtr);
-static int	ConsoleGetOptionProc(ClientData instanceData,
+static void	ConsoleExitHandler(void *clientData);
+static int	ConsoleGetHandleProc(void *instanceData,
+		    int direction, void **handlePtr);
+static int	ConsoleGetOptionProc(void *instanceData,
 		    Tcl_Interp *interp, const char *optionName,
 		    Tcl_DString *dsPtr);
 static void	ConsoleInit(void);
-static int	ConsoleInputProc(ClientData instanceData, char *buf,
+static int	ConsoleInputProc(void *instanceData, char *buf,
 		    int toRead, int *errorCode);
-static int	ConsoleOutputProc(ClientData instanceData,
+static int	ConsoleOutputProc(void *instanceData,
 		    const char *buf, int toWrite, int *errorCode);
-static int	ConsoleSetOptionProc(ClientData instanceData,
+static int	ConsoleSetOptionProc(void *instanceData,
 		    Tcl_Interp *interp, const char *optionName,
 		    const char *value);
-static void	ConsoleSetupProc(ClientData clientData, int flags);
-static void	ConsoleWatchProc(ClientData instanceData, int mask);
-static void	ProcExitHandler(ClientData clientData);
-static void	ConsoleThreadActionProc(ClientData instanceData, int action);
+static void	ConsoleSetupProc(void *clientData, int flags);
+static void	ConsoleWatchProc(void *instanceData, int mask);
+static void	ProcExitHandler(void *clientData);
+static void	ConsoleThreadActionProc(void *instanceData, int action);
 static DWORD	ReadConsoleChars(HANDLE hConsole, WCHAR *lpBuffer,
 		    RingSizeT nChars, RingSizeT *nCharsReadPtr);
 static DWORD	WriteConsoleChars(HANDLE hConsole,
@@ -670,7 +670,7 @@ ConsoleInit(void)
 
 static void
 ConsoleExitHandler(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     Tcl_DeleteEventSource(ConsoleSetupProc, ConsoleCheckProc, NULL);
 }
@@ -694,7 +694,7 @@ ConsoleExitHandler(
 
 static void
 ProcExitHandler(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     AcquireSRWLockExclusive(&gConsoleLock);
     gInitialized = 0;
@@ -759,7 +759,7 @@ void NudgeWatchers (HANDLE consoleHandle)
 
 void
 ConsoleSetupProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     ConsoleChannelInfo *chanInfoPtr;
@@ -824,7 +824,7 @@ ConsoleSetupProc(
 
 static void
 ConsoleCheckProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     ConsoleChannelInfo *chanInfoPtr;
@@ -924,7 +924,7 @@ ConsoleCheckProc(
 
 static int
 ConsoleBlockModeProc(
-    ClientData instanceData,	/* Instance data for channel. */
+    void *instanceData,	/* Instance data for channel. */
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
@@ -964,7 +964,7 @@ ConsoleBlockModeProc(
 
 static int
 ConsoleCloseProc(
-    ClientData instanceData,	/* Pointer to ConsoleChannelInfo structure. */
+    void *instanceData,	/* Pointer to ConsoleChannelInfo structure. */
     TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
@@ -1083,7 +1083,7 @@ ConsoleCloseProc(
  */
 static int
 ConsoleInputProc(
-    ClientData instanceData,	/* Console state. */
+    void *instanceData,	/* Console state. */
     char *bufPtr,		/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -1236,7 +1236,7 @@ ConsoleInputProc(
  */
 static int
 ConsoleOutputProc(
-    ClientData instanceData,	/* Console state. */
+    void *instanceData,	/* Console state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -1476,7 +1476,7 @@ ConsoleEventProc(
 
 static void
 ConsoleWatchProc(
-    ClientData instanceData,	/* Console state. */
+    void *instanceData,	/* Console state. */
     int newMask)		/* What events to watch for, one of
 				 * of TCL_READABLE, TCL_WRITABLE
 				 */
@@ -1552,9 +1552,9 @@ ConsoleWatchProc(
 
 static int
 ConsoleGetHandleProc(
-    ClientData instanceData,	/* The console state. */
+    void *instanceData,	/* The console state. */
     TCL_UNUSED(int) /*direction*/,
-    ClientData *handlePtr)	/* Where to store the handle. */
+    void **handlePtr)	/* Where to store the handle. */
 {
     ConsoleChannelInfo *chanInfoPtr = (ConsoleChannelInfo *)instanceData;
 
@@ -2223,7 +2223,7 @@ TclWinOpenConsoleChannel(
 
 static void
 ConsoleThreadActionProc(
-    ClientData instanceData,
+    void *instanceData,
     int action)
 {
     ConsoleChannelInfo *chanInfoPtr = (ConsoleChannelInfo *)instanceData;
@@ -2256,7 +2256,7 @@ ConsoleThreadActionProc(
  */
 static int
 ConsoleSetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Which option to set? */
     const char *value)		/* New value for option. */
@@ -2345,7 +2345,7 @@ ConsoleSetOptionProc(
 
 static int
 ConsoleGetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Option to get. */
     Tcl_DString *dsPtr)		/* Where to store value(s). */
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 06dce90..2261ee2 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -149,7 +149,7 @@ struct TcpState {
 				 * protected by semaphore */
     Tcl_TcpAcceptProc *acceptProc;
 				/* Proc to call on accept. */
-    ClientData acceptProcData;	/* The data for the accept proc. */
+    void *acceptProcData;	/* The data for the accept proc. */
 
     /*
      * Only needed for client sockets
@@ -245,7 +245,7 @@ static int		TcpConnect(Tcl_Interp *interp,
 			    TcpState *state);
 static void		InitSockets(void);
 static TcpState *	NewSocketInfo(SOCKET socket);
-static void		SocketExitHandler(ClientData clientData);
+static void		SocketExitHandler(void *clientData);
 static LRESULT CALLBACK	SocketProc(HWND hwnd, UINT message, WPARAM wParam,
 			    LPARAM lParam);
 static int		SocketsEnabled(void);
@@ -256,7 +256,7 @@ static int		WaitForSocketEvent(TcpState *statePtr, int events,
 static void		AddSocketInfoFd(TcpState *statePtr,  SOCKET socket);
 static int		FindFDInList(TcpState *statePtr, SOCKET socket);
 static DWORD WINAPI	SocketThread(LPVOID arg);
-static void		TcpThreadActionProc(ClientData instanceData,
+static void		TcpThreadActionProc(void *instanceData,
 			    int action);
 static int		TcpCloseProc(void *, Tcl_Interp *);
 
@@ -544,7 +544,7 @@ TclpFinalizeSockets(void)
 
 static int
 TcpBlockModeProc(
-    ClientData instanceData,	/* Socket state. */
+    void *instanceData,	/* Socket state. */
     int mode)			/* The mode to set. Can be one of
 				 * TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
@@ -775,7 +775,7 @@ WaitForConnect(
 
 static int
 TcpInputProc(
-    ClientData instanceData,	/* Socket state. */
+    void *instanceData,	/* Socket state. */
     char *buf,			/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -919,7 +919,7 @@ TcpInputProc(
 
 static int
 TcpOutputProc(
-    ClientData instanceData,	/* Socket state. */
+    void *instanceData,	/* Socket state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCodePtr)		/* Where to store error code. */
@@ -1034,7 +1034,7 @@ TcpOutputProc(
 
 static int
 TcpCloseProc(
-    ClientData instanceData,	/* The socket to close. */
+    void *instanceData,	/* The socket to close. */
     TCL_UNUSED(Tcl_Interp *))
 {
     TcpState *statePtr = (TcpState *)instanceData;
@@ -1128,7 +1128,7 @@ TcpCloseProc(
 
 static int
 TcpClose2Proc(
-    ClientData instanceData,	/* The socket to close. */
+    void *instanceData,	/* The socket to close. */
     Tcl_Interp *interp,		/* For error reporting. */
     int flags)			/* Flags that indicate which side to close. */
 {
@@ -1178,7 +1178,7 @@ TcpClose2Proc(
 
 static int
 TcpSetOptionProc(
-    ClientData instanceData,	/* Socket state. */
+    void *instanceData,	/* Socket state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Name of the option to set. */
     TCL_UNUSED(const char *) /*value*/)		/* New value for option. */
@@ -1283,7 +1283,7 @@ TcpSetOptionProc(
 
 static int
 TcpGetOptionProc(
-    ClientData instanceData,	/* Socket state. */
+    void *instanceData,	/* Socket state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Name of the option to retrieve the value
 				 * for, or NULL to get all options and their
@@ -1605,7 +1605,7 @@ TcpGetOptionProc(
 
 static void
 TcpWatchProc(
-    ClientData instanceData,	/* The socket state. */
+    void *instanceData,	/* The socket state. */
     int mask)			/* Events of interest; an OR-ed combination of
 				 * TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -1659,9 +1659,9 @@ TcpWatchProc(
 
 static int
 TcpGetHandleProc(
-    ClientData instanceData,	/* The socket state. */
+    void *instanceData,	/* The socket state. */
     TCL_UNUSED(int) /*direction*/,
-    ClientData *handlePtr)	/* Where to store the handle. */
+    void **handlePtr)	/* Where to store the handle. */
 {
     TcpState *statePtr = (TcpState *)instanceData;
 
@@ -2129,7 +2129,7 @@ Tcl_OpenTcpClient(
 
 Tcl_Channel
 Tcl_MakeTcpClientChannel(
-    ClientData sock)		/* The socket to wrap up into a channel. */
+    void *sock)		/* The socket to wrap up into a channel. */
 {
     TcpState *statePtr;
     char channelName[SOCK_CHAN_LENGTH];
@@ -2189,7 +2189,7 @@ Tcl_OpenTcpServerEx(
     Tcl_TcpAcceptProc *acceptProc,
 				/* Callback for accepting connections from new
 				 * clients. */
-    ClientData acceptProcData)	/* Data for the callback. */
+    void *acceptProcData)	/* Data for the callback. */
 {
     SOCKET sock = INVALID_SOCKET;
     unsigned short chosenport = 0;
@@ -2606,7 +2606,7 @@ SocketsEnabled(void)
 
 static void
 SocketExitHandler(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     Tcl_MutexLock(&socketMutex);
 
@@ -2640,7 +2640,7 @@ SocketExitHandler(
 
 void
 SocketSetupProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     TcpState *statePtr;
@@ -2685,7 +2685,7 @@ SocketSetupProc(
 
 static void
 SocketCheckProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     TcpState *statePtr;
@@ -3406,7 +3406,7 @@ FindFDInList(
 
 static void
 TcpThreadActionProc(
-    ClientData instanceData,
+    void *instanceData,
     int action)
 {
     ThreadSpecificData *tsdPtr;
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index 15d9117..1855c20 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -108,7 +108,7 @@ static struct {
  * Declarations for functions defined later in this file.
  */
 
-static void		StopCalibration(ClientData clientData);
+static void		StopCalibration(void *clientData);
 static DWORD WINAPI	CalibrationThread(LPVOID arg);
 static void 		UpdateTimeEachSecond(void);
 static void		ResetCounterSamples(unsigned long long fileTime,
@@ -116,10 +116,10 @@ static void		ResetCounterSamples(unsigned long long fileTime,
 static long long	AccumulateSample(long long perfCounter,
 			    unsigned long long fileTime);
 static void		NativeScaleTime(Tcl_Time* timebuf,
-			    ClientData clientData);
+			    void *clientData);
 static long long	NativeGetMicroseconds(void);
 static void		NativeGetTime(Tcl_Time* timebuf,
-			    ClientData clientData);
+			    void *clientData);
 
 /*
  * TIP #233 (Virtualized Time): Data for the time hooks, if any.
@@ -127,7 +127,7 @@ static void		NativeGetTime(Tcl_Time* timebuf,
 
 Tcl_GetTimeProc *tclGetTimeProcPtr = NativeGetTime;
 Tcl_ScaleTimeProc *tclScaleTimeProcPtr = NativeScaleTime;
-ClientData tclTimeClientData = NULL;
+void *tclTimeClientData = NULL;
 
 /*
  * Inlined version of Tcl_GetTime.
@@ -411,7 +411,7 @@ Tcl_GetTime(
 static void
 NativeScaleTime(
     TCL_UNUSED(Tcl_Time *),
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     /*
      * Native scale is 1:1. Nothing is done.
@@ -677,7 +677,7 @@ NativeGetMicroseconds(void)
 static void
 NativeGetTime(
     Tcl_Time *timePtr,
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     long long usecSincePosixEpoch;
 
@@ -724,7 +724,7 @@ void TclWinResetTimerResolution(void);
 
 static void
 StopCalibration(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     SetEvent(timeInfo.exitEvent);
 
@@ -1198,7 +1198,7 @@ void
 Tcl_SetTimeProc(
     Tcl_GetTimeProc *getProc,
     Tcl_ScaleTimeProc *scaleProc,
-    ClientData clientData)
+    void *clientData)
 {
     tclGetTimeProcPtr = getProc;
     tclScaleTimeProcPtr = scaleProc;
@@ -1225,7 +1225,7 @@ void
 Tcl_QueryTimeProc(
     Tcl_GetTimeProc **getProc,
     Tcl_ScaleTimeProc **scaleProc,
-    ClientData *clientData)
+    void **clientData)
 {
     if (getProc) {
 	*getProc = tclGetTimeProcPtr;
-- 
cgit v0.12


From 70d6ba87462da32e8515e346a38eae4c9c9ab83f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Sep 2022 10:17:44 +0000
Subject: Finish remaining part of TIP-627 for Tcl 9.0: Handle
 objProc2/objClientData2 fields correctly in Tcl_CmdInfo struct.

---
 generic/tclBasic.c    | 95 +++++++++++++++++++++++++++++++++++++++++++--------
 generic/tclIndexObj.c |  2 +-
 generic/tclTest.c     | 37 ++++++++++++--------
 3 files changed, 105 insertions(+), 29 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index eb3889d..379ab10 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -608,13 +608,13 @@ TclFinalizeEvaluation(void)
  */
 
 static int
-buildInfoObjCmd(
+buildInfoObjCmd2(
     void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    size_t objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    if (objc > 2) {
+    if (objc - 1 > 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?option?");
 	return TCL_ERROR;
     }
@@ -693,6 +693,16 @@ buildInfoObjCmd(
     return TCL_OK;
 }
 
+static int
+buildInfoObjCmd(
+    void *clientData,
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
+{
+    return buildInfoObjCmd2(clientData, interp, (size_t)objc, objv);
+}
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1234,9 +1244,13 @@ Tcl_CreateInterp(void)
 
     Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL, &tclStubs);
     Tcl_PkgProvideEx(interp, "tcl", TCL_PATCH_LEVEL, &tclStubs);
-    Tcl_CreateObjCommand(interp, "::tcl::build-info",
-	    buildInfoObjCmd, (void *)version, NULL);
-
+    Tcl_CmdInfo info2;
+    Tcl_Command buildInfoCmd = Tcl_CreateObjCommand2(interp, "::tcl::build-info",
+	    buildInfoObjCmd2, (void *)version, NULL);
+    Tcl_GetCommandInfoFromToken(buildInfoCmd, &info2);
+    info2.objProc = buildInfoObjCmd;
+    info2.objClientData = (void *)version;
+    Tcl_SetCommandInfoFromToken(buildInfoCmd, &info2);
 
     if (TclTommath_Init(interp) != TCL_OK) {
 	Tcl_Panic("%s", Tcl_GetStringResult(interp));
@@ -2631,10 +2645,11 @@ Tcl_CreateCommand(
  */
 
 typedef struct {
-    void *clientData; /* Arbitrary value to pass to object function. */
     Tcl_ObjCmdProc2 *proc;
-    Tcl_ObjCmdProc2 *nreProc;
+    void *clientData; /* Arbitrary value to pass to proc function. */
     Tcl_CmdDeleteProc *deleteProc;
+    void *deleteData; /* Arbitrary value to pass to deleteProc function. */
+    Tcl_ObjCmdProc2 *nreProc;
 } CmdWrapperInfo;
 
 
@@ -2650,7 +2665,7 @@ static int cmdWrapperProc(void *clientData,
 static void cmdWrapperDeleteProc(void *clientData) {
     CmdWrapperInfo *info = (CmdWrapperInfo *)clientData;
 
-    clientData = info->clientData;
+    clientData = info->deleteData;
     Tcl_CmdDeleteProc *deleteProc = info->deleteProc;
     Tcl_Free(info);
     if (deleteProc != NULL) {
@@ -2677,8 +2692,9 @@ Tcl_CreateObjCommand2(
 {
     CmdWrapperInfo *info = (CmdWrapperInfo *)Tcl_Alloc(sizeof(CmdWrapperInfo));
     info->proc = proc;
-    info->deleteProc = deleteProc;
     info->clientData = clientData;
+    info->deleteProc = deleteProc;
+    info->deleteData = clientData;
 
     return Tcl_CreateObjCommand(interp, cmdName,
 	    (proc ? cmdWrapperProc : NULL),
@@ -3265,6 +3281,28 @@ Tcl_SetCommandInfo(
  *----------------------------------------------------------------------
  */
 
+static int
+invokeObj2Command(
+    void *clientData,	/* Points to command's Command structure. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    size_t objc,		/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
+{
+    int result;
+    Command *cmdPtr = (Command *) clientData;
+
+    if (objc > INT_MAX) {
+	objc = TCL_INDEX_NONE;
+    }
+    if (cmdPtr->objProc != NULL) {
+	result = cmdPtr->objProc(cmdPtr->objClientData, interp, objc, objv);
+    } else {
+	result = Tcl_NRCallObjProc(interp, cmdPtr->nreProc,
+		cmdPtr->objClientData, objc, objv);
+    }
+    return result;
+}
+
 int
 Tcl_SetCommandInfoFromToken(
     Tcl_Command cmd,
@@ -3296,8 +3334,19 @@ Tcl_SetCommandInfoFromToken(
     }
     if (cmdPtr->deleteProc == cmdWrapperDeleteProc) {
 	CmdWrapperInfo *info = (CmdWrapperInfo *)cmdPtr->deleteData;
+	if (infoPtr->objProc2 == NULL) {
+	    info->proc = invokeObj2Command;
+	    info->clientData = cmdPtr;
+	   	info->nreProc = NULL;
+	} else {
+	    if (infoPtr->objProc2 != info->proc) {
+	   	info->nreProc = NULL;
+		info->proc = infoPtr->objProc2;
+	    }
+	    info->clientData = infoPtr->objClientData2;
+	}
 	info->deleteProc = infoPtr->deleteProc;
-	info->clientData = infoPtr->deleteData;
+	info->deleteData = infoPtr->deleteData;
     } else {
 	cmdPtr->deleteProc = infoPtr->deleteProc;
 	cmdPtr->deleteData = infoPtr->deleteData;
@@ -3355,6 +3404,15 @@ Tcl_GetCommandInfo(
  *----------------------------------------------------------------------
  */
 
+static int cmdWrapper2Proc(void *clientData,
+    Tcl_Interp *interp,
+    size_t objc,
+    Tcl_Obj *const objv[])
+{
+    Command *cmdPtr = (Command *)clientData;
+    return cmdPtr->objProc(cmdPtr->objClientData, interp, objc, objv);
+}
+
 int
 Tcl_GetCommandInfoFromToken(
     Tcl_Command cmd,
@@ -3368,7 +3426,8 @@ Tcl_GetCommandInfoFromToken(
 
     /*
      * Set isNativeObjectProc 1 if objProc was registered by a call to
-     * Tcl_CreateObjCommand. Otherwise set it to 0.
+     * Tcl_CreateObjCommand. Set isNativeObjectProc 2 if objProc was
+     * registered by a call to Tcl_CreateObjCommand. Otherwise set it to 0.
      */
 
     cmdPtr = (Command *) cmd;
@@ -3381,10 +3440,17 @@ Tcl_GetCommandInfoFromToken(
     if (cmdPtr->deleteProc == cmdWrapperDeleteProc) {
 	CmdWrapperInfo *info = (CmdWrapperInfo *)cmdPtr->deleteData;
 	infoPtr->deleteProc = info->deleteProc;
-	infoPtr->deleteData = info->clientData;
+	infoPtr->deleteData = info->deleteData;
+	infoPtr->objProc2 = info->proc;
+	infoPtr->objClientData2 = info->clientData;
+	if (cmdPtr->objProc == cmdWrapperProc) {
+	    infoPtr->isNativeObjectProc = 2;
+	}
     } else {
 	infoPtr->deleteProc = cmdPtr->deleteProc;
 	infoPtr->deleteData = cmdPtr->deleteData;
+	infoPtr->objProc2 = cmdWrapper2Proc;
+	infoPtr->objClientData2 = cmdPtr;
     }
     infoPtr->namespacePtr = (Tcl_Namespace *) cmdPtr->nsPtr;
     return 1;
@@ -8491,9 +8557,10 @@ Tcl_NRCreateCommand2(
 {
     CmdWrapperInfo *info = (CmdWrapperInfo *)Tcl_Alloc(sizeof(CmdWrapperInfo));
     info->proc = proc;
+    info->clientData = clientData;
     info->nreProc = nreProc;
     info->deleteProc = deleteProc;
-    info->clientData = clientData;
+    info->deleteData = clientData;
     return Tcl_NRCreateCommand(interp, cmdName,
 	    (proc ? cmdWrapperProc : NULL),
 	    (nreProc ? cmdWrapperNreProc : NULL),
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 78dd47e..763d661 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -944,7 +944,7 @@ Tcl_WrongNumArgs(
 	 * (either another element from objv, or the message string).
 	 */
 
-	if (i<objc-1 || message!=NULL) {
+	if (i + 1 < objc || message!=NULL) {
 	    Tcl_AppendStringsToObj(objPtr, " ", NULL);
 	}
     }
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 974e7c3..306f571 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -293,7 +293,7 @@ static Tcl_CmdProc	TestsetplatformCmd;
 static Tcl_CmdProc	TeststaticlibraryCmd;
 static Tcl_CmdProc	TesttranslatefilenameCmd;
 static Tcl_CmdProc	TestupvarCmd;
-static Tcl_ObjCmdProc	TestWrongNumArgsObjCmd;
+static Tcl_ObjCmdProc2	TestWrongNumArgsObjCmd;
 static Tcl_ObjCmdProc	TestGetIndexFromObjStructObjCmd;
 static Tcl_CmdProc	TestChannelCmd;
 static Tcl_CmdProc	TestChannelEventCmd;
@@ -555,6 +555,12 @@ Tcltest_Init(
     }
 
     if (Tcl_GetCommandInfo(interp, "::tcl::build-info", &info)) {
+#if TCL_MAJOR_VERSION > 8
+	if (info.isNativeObjectProc == 2) {
+	    Tcl_CreateObjCommand2(interp, "::tcl::test::build-info",
+		    info.objProc2, (void *)version, NULL);
+    } else
+#endif
 	Tcl_CreateObjCommand(interp, "::tcl::test::build-info",
 		info.objProc, (void *)version, NULL);
     }
@@ -573,7 +579,7 @@ Tcltest_Init(
     Tcl_CreateObjCommand(interp, "testsetbytearraylength", TestsetbytearraylengthObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "testbytestring", TestbytestringObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "teststringbytes", TeststringbytesObjCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testwrongnumargs", TestWrongNumArgsObjCmd,
+    Tcl_CreateObjCommand2(interp, "testwrongnumargs", TestWrongNumArgsObjCmd,
 	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testfilesystem", TestFilesystemObjCmd,
 	    NULL, NULL);
@@ -811,6 +817,12 @@ Tcltest_SafeInit(
 	return TCL_ERROR;
     }
     if (Tcl_GetCommandInfo(interp, "::tcl::build-info", &info)) {
+#if TCL_MAJOR_VERSION > 8
+	if (info.isNativeObjectProc == 2) {
+	    Tcl_CreateObjCommand2(interp, "::tcl::test::build-info",
+		    info.objProc2, (void *)version, NULL);
+    } else
+#endif
 	Tcl_CreateObjCommand(interp, "::tcl::test::build-info",
 		info.objProc, (void *)version, NULL);
     }
@@ -6508,22 +6520,18 @@ static int
 TestWrongNumArgsObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    size_t objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i, length;
+    Tcl_WideInt i;
+    size_t length;
     const char *msg;
 
-    if (objc < 3) {
-	/*
-	 * Don't use Tcl_WrongNumArgs here, as that is the function
-	 * we want to test!
-	 */
-	Tcl_AppendResult(interp, "insufficient arguments", NULL);
-	return TCL_ERROR;
+    if (objc + 1 < 4) {
+	goto insufArgs;
     }
 
-    if (Tcl_GetIntFromObj(interp, objv[1], &i) != TCL_OK) {
+    if (Tcl_GetWideIntFromObj(interp, objv[1], &i) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -6532,15 +6540,16 @@ TestWrongNumArgsObjCmd(
 	msg = NULL;
     }
 
-    if (i > objc - 3) {
+    if (i < 0 || (Tcl_WideUInt)i + 3 > (Tcl_WideUInt)objc) {
 	/*
 	 * Asked for more arguments than were given.
 	 */
+    insufArgs:
 	Tcl_AppendResult(interp, "insufficient arguments", NULL);
 	return TCL_ERROR;
     }
 
-    Tcl_WrongNumArgs(interp, i, &(objv[3]), msg);
+    Tcl_WrongNumArgs(interp, (size_t)i, &(objv[3]), msg);
     return TCL_OK;
 }
 
-- 
cgit v0.12


From 007dfc95a9870b057dda71b51dc84e856aa09a38 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Sep 2022 14:41:09 +0000
Subject: Some additional protection for objc < 0

---
 generic/tclBasic.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index b1b35e1..f474b5d 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -8480,7 +8480,10 @@ int wrapperNRObjProc(
     clientData = info->clientData;
     Tcl_ObjCmdProc2 *proc = info->proc;
     Tcl_Free(info);
-    return proc(clientData, interp, objc, objv);
+    if (objc < 0) {
+	objc = -1;
+    }
+    return proc(clientData, interp, (size_t)objc, objv);
 }
 
 int
@@ -8536,7 +8539,10 @@ static int cmdWrapperNreProc(
     Tcl_Obj *const objv[])
 {
     CmdWrapperInfo *info = (CmdWrapperInfo *)clientData;
-    return info->nreProc(info->clientData, interp, objc, objv);
+    if (objc < 0) {
+	objc = -1;
+    }
+    return info->nreProc(info->clientData, interp, (size_t)objc, objv);
 }
 
 Tcl_Command
-- 
cgit v0.12


From cd5e1b2e6cc18917b875413e8b7e40da7fb5002f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Sep 2022 22:41:50 +0000
Subject: Complete Tcl_SetCommandInfoFromToken() implementation, in case
 Tcl_CreateObjCommand() is used  to create the original Command, while
 objProc2 is filled later

---
 generic/tclBasic.c | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index f474b5d..b2ec58e 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -1245,11 +1245,11 @@ Tcl_CreateInterp(void)
     Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL, &tclStubs);
     Tcl_PkgProvideEx(interp, "tcl", TCL_PATCH_LEVEL, &tclStubs);
     Tcl_CmdInfo info2;
-    Tcl_Command buildInfoCmd = Tcl_CreateObjCommand2(interp, "::tcl::build-info",
-	    buildInfoObjCmd2, (void *)version, NULL);
+    Tcl_Command buildInfoCmd = Tcl_CreateObjCommand(interp, "::tcl::build-info",
+	    buildInfoObjCmd, (void *)version, NULL);
     Tcl_GetCommandInfoFromToken(buildInfoCmd, &info2);
-    info2.objProc = buildInfoObjCmd;
-    info2.objClientData = (void *)version;
+    info2.objProc2 = buildInfoObjCmd2;
+    info2.objClientData2 = (void *)version;
     Tcl_SetCommandInfoFromToken(buildInfoCmd, &info2);
 
     if (TclTommath_Init(interp) != TCL_OK) {
@@ -3306,6 +3306,15 @@ invokeObj2Command(
     return result;
 }
 
+static int cmdWrapper2Proc(void *clientData,
+    Tcl_Interp *interp,
+    size_t objc,
+    Tcl_Obj *const objv[])
+{
+    Command *cmdPtr = (Command *)clientData;
+    return cmdPtr->objProc(cmdPtr->objClientData, interp, objc, objv);
+}
+
 int
 Tcl_SetCommandInfoFromToken(
     Tcl_Command cmd,
@@ -3351,8 +3360,19 @@ Tcl_SetCommandInfoFromToken(
 	info->deleteProc = infoPtr->deleteProc;
 	info->deleteData = infoPtr->deleteData;
     } else {
-	cmdPtr->deleteProc = infoPtr->deleteProc;
-	cmdPtr->deleteData = infoPtr->deleteData;
+	if ((infoPtr->objProc2 != NULL) && (infoPtr->objProc2 != cmdWrapper2Proc)) {
+	    CmdWrapperInfo *info = (CmdWrapperInfo *)Tcl_Alloc(sizeof(CmdWrapperInfo));
+	    info->proc = infoPtr->objProc2;
+	    info->clientData = infoPtr->objClientData2;
+	    info->nreProc = NULL;
+	    info->deleteProc = infoPtr->deleteProc;
+	    info->deleteData = infoPtr->deleteData;
+	    cmdPtr->deleteProc = cmdWrapperDeleteProc;
+	    cmdPtr->deleteData = info;
+	} else {
+	    cmdPtr->deleteProc = infoPtr->deleteProc;
+	    cmdPtr->deleteData = infoPtr->deleteData;
+	}
     }
     return 1;
 }
@@ -3407,15 +3427,6 @@ Tcl_GetCommandInfo(
  *----------------------------------------------------------------------
  */
 
-static int cmdWrapper2Proc(void *clientData,
-    Tcl_Interp *interp,
-    size_t objc,
-    Tcl_Obj *const objv[])
-{
-    Command *cmdPtr = (Command *)clientData;
-    return cmdPtr->objProc(cmdPtr->objClientData, interp, objc, objv);
-}
-
 int
 Tcl_GetCommandInfoFromToken(
     Tcl_Command cmd,
-- 
cgit v0.12


From b9413619f69f8da7428dff21ac1fa1c9f85deea4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 3 Sep 2022 13:45:24 +0000
Subject: TIP #344 implementation

---
 doc/socket.n       |  15 +++++-
 tests/ioCmd.test   |   2 +-
 tests/socket.test  |   2 +-
 unix/tclUnixSock.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 win/tclWinSock.c   |  82 +++++++++++--------------------
 5 files changed, 176 insertions(+), 64 deletions(-)

diff --git a/doc/socket.n b/doc/socket.n
index 8836150..4506181 100644
--- a/doc/socket.n
+++ b/doc/socket.n
@@ -162,7 +162,8 @@ described below.
 .SH "CONFIGURATION OPTIONS"
 .PP
 The \fBchan configure\fR command can be used to query several readonly
-configuration options for socket channels:
+configuration options for socket channels or in some cases to set
+alternative properties on socket channels:
 .TP
 \fB\-error\fR
 .
@@ -204,6 +205,18 @@ list is identical to the address, its first element.
 \fB\-connecting\fR
 .
 This option is not supported by server sockets. For client sockets, this option returns 1 if an asyncroneous connect is still in progress, 0 otherwise.
+.TP
+\fB\-keepalive\fR
+.
+This options sets or queries the TCP keepalive option on the socket as 1 if
+keepalive is turned on, 0 otherwise.
+.TP
+\fB\-nagle\fR
+.
+This options sets or queries the TCP nodelay option (aka the Nagle algorithm)
+When 1 the Nagle algorithm is turned on, 0 otherwise. Caution: the logic is
+reversed here, i.e. when the option is 0, the underlying system call asserts
+the TCP_NODELAY setting.
 .PP
 .SH "EXAMPLES"
 .PP
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index dbca866..3aeeb61 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -306,7 +306,7 @@ test iocmd-8.15.1 {fconfigure command / tcp channel} -constraints {socket unixOr
     close $srv
     unset cli srv port
     rename iocmdSRV {}
-} -returnCodes error -result [expectedOpts "-blah" {-connecting -peername -sockname}]
+} -returnCodes error -result [expectedOpts "-blah" {-connecting -keepalive -peername -nagle -sockname}]
 test iocmd-8.16 {fconfigure command / tcp channel} -constraints socket -setup {
     set srv [socket -server iocmdSRV -myaddr 127.0.0.1 0]
     set port [lindex [fconfigure $srv -sockname] 2]
diff --git a/tests/socket.test b/tests/socket.test
index 4644e1d..7250cb8 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1071,7 +1071,7 @@ test socket_$af-7.3 {testing socket specific options} -constraints [list socket
     close $s
     update
     llength $l
-} -result 14
+} -result 18
 test socket_$af-7.4 {testing socket specific options} -constraints [list socket supported_$af] -setup {
     set timer [after 10000 "set x timed_out"]
     set l ""
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index d2068c3..e815d77 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -9,6 +9,7 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
+#include <netinet/tcp.h>
 #include "tclInt.h"
 
 /*
@@ -146,6 +147,9 @@ static int		TcpInputProc(void *instanceData, char *buf,
 			    int toRead, int *errorCode);
 static int		TcpOutputProc(void *instanceData,
 			    const char *buf, int toWrite, int *errorCode);
+static int		TcpSetOptionProc(void *instanceData,
+			    Tcl_Interp *interp, const char *optionName,
+			    const char *value);
 static void		TcpThreadActionProc(void *instanceData, int action);
 static void		TcpWatchProc(void *instanceData, int mask);
 static int		WaitForConnect(TcpState *statePtr, int *errorCodePtr);
@@ -167,7 +171,7 @@ static const Tcl_ChannelType tcpChannelType = {
     TcpInputProc,		/* Input proc. */
     TcpOutputProc,		/* Output proc. */
     NULL,			/* Seek proc. */
-    NULL,			/* Set option proc. */
+    TcpSetOptionProc,		/* Set option proc. */
     TcpGetOptionProc,		/* Get option proc. */
     TcpWatchProc,		/* Initialize notifier. */
     TcpGetHandleProc,		/* Get OS handles out of channel. */
@@ -434,7 +438,7 @@ TcpBlockModeProc(
  *
  * Side effects:
  *	Processes socket events off the system queue. May process
- *	asynchroneous connects.
+ *	asynchronous connects.
  *
  *----------------------------------------------------------------------
  */
@@ -815,6 +819,88 @@ TcpHostPortList(
 /*
  *----------------------------------------------------------------------
  *
+ * TcpSetOptionProc --
+ *
+ *	Sets TCP channel specific options.
+ *
+ * Results:
+ *	None, unless an error happens.
+ *
+ * Side effects:
+ *	Changes attributes of the socket at the system level.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+TcpSetOptionProc(
+    void *instanceData,		/* Socket state. */
+    Tcl_Interp *interp,		/* For error reporting - can be NULL. */
+    const char *optionName,	/* Name of the option to set. */
+    const char *value)		/* New value for option. */
+{
+    TcpState *statePtr = (TcpState *)instanceData;
+    size_t len = 0;
+
+    if (optionName != NULL) {
+	len = strlen(optionName);
+    }
+
+    if ((len > 1) && (optionName[1] == 'k') &&
+	    (strncmp(optionName, "-keepalive", len) == 0)) {
+	int val = 0, ret;
+
+	if (Tcl_GetBoolean(interp, value, &val) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+#if defined(SO_KEEPALIVE)
+	ret = setsockopt(statePtr->fds.fd, SOL_SOCKET, SO_KEEPALIVE,
+		(const char *) &val, sizeof(int));
+#else
+	ret = -1;
+	Tcl_SetErrno(ENOTSUP);
+#endif
+	if (ret < 0) {
+	    if (interp) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"couldn't set socket option: %s",
+			Tcl_PosixError(interp)));
+	    }
+	    return TCL_ERROR;
+	}
+	return TCL_OK;
+    }
+    if ((len > 1) && (optionName[1] == 'n') &&
+	    (strncmp(optionName, "-nagle", len) == 0)) {
+	int val = 0, ret;
+
+	if (Tcl_GetBoolean(interp, value, &val) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	val = !val;	/* Nagle ain't nodelay */
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
+	ret = setsockopt(statePtr->fds.fd, SOL_TCP, TCP_NODELAY,
+		(const char *) &val, sizeof(int));
+#else
+	ret = -1;
+	Tcl_SetErrno(ENOTSUP);
+#endif
+	if (ret < 0) {
+	    if (interp) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"couldn't set socket option: %s",
+			Tcl_PosixError(interp)));
+	    }
+	    return TCL_ERROR;
+	}
+	return TCL_OK;
+    }
+    return Tcl_BadChannelOption(interp, optionName, "keepalive nagle");
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TcpGetOptionProc --
  *
  *	Computes an option value for a TCP socket based channel, or a list of
@@ -835,7 +921,7 @@ TcpHostPortList(
 
 static int
 TcpGetOptionProc(
-    void *instanceData,	/* Socket state. */
+    void *instanceData,		/* Socket state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Name of the option to retrieve the value
 				 * for, or NULL to get all options and their
@@ -846,8 +932,6 @@ TcpGetOptionProc(
     TcpState *statePtr = (TcpState *)instanceData;
     size_t len = 0;
 
-    WaitForConnect(statePtr, NULL);
-
     if (optionName != NULL) {
 	len = strlen(optionName);
     }
@@ -856,6 +940,7 @@ TcpGetOptionProc(
 	    (strncmp(optionName, "-error", len) == 0)) {
 	socklen_t optlen = sizeof(int);
 
+	WaitForConnect(statePtr, NULL);
         if (GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT)) {
             /*
              * Suppress errors as long as we are not done.
@@ -880,6 +965,7 @@ TcpGetOptionProc(
 
     if ((len > 1) && (optionName[1] == 'c') &&
 	    (strncmp(optionName, "-connecting", len) == 0)) {
+	WaitForConnect(statePtr, NULL);
         Tcl_DStringAppend(dsPtr,
                 GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT) ? "1" : "0", TCL_INDEX_NONE);
         return TCL_OK;
@@ -890,6 +976,7 @@ TcpGetOptionProc(
         address peername;
         socklen_t size = sizeof(peername);
 
+	WaitForConnect(statePtr, NULL);
 	if (GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT)) {
 	    /*
 	     * In async connect output an empty string
@@ -941,6 +1028,7 @@ TcpGetOptionProc(
         socklen_t size;
 	int found = 0;
 
+	WaitForConnect(statePtr, NULL);
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-sockname");
 	    Tcl_DStringStartSublist(dsPtr);
@@ -974,9 +1062,46 @@ TcpGetOptionProc(
 	}
     }
 
+    if ((len == 0) || ((len > 1) && (optionName[1] == 'k') &&
+	    (strncmp(optionName, "-keepalive", len) == 0))) {
+        socklen_t size;
+	int opt = 0;
+
+	if (len == 0) {
+	    Tcl_DStringAppendElement(dsPtr, "-keepalive");
+	}
+#if defined(SO_KEEPALIVE)
+	getsockopt(statePtr->fds.fd, SOL_SOCKET, SO_KEEPALIVE,
+		(char *) &opt, &size);
+#endif
+	Tcl_DStringAppendElement(dsPtr, opt ? "1" : "0");
+	if (len > 0) {
+	    return TCL_OK;
+	}
+    }
+
+    if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
+	    (strncmp(optionName, "-nagle", len) == 0))) {
+        socklen_t size;
+	int opt = 0;
+
+	if (len == 0) {
+	    Tcl_DStringAppendElement(dsPtr, "-nagle");
+	}
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
+	getsockopt(statePtr->fds.fd, SOL_TCP, TCP_NODELAY,
+		(char *) &opt, &size);
+#endif
+	opt = !opt;	/* Nagle ain't nodelay */
+	Tcl_DStringAppendElement(dsPtr, opt ? "1" : "0");
+	if (len > 0) {
+	    return TCL_OK;
+	}
+    }
+
     if (len > 0) {
 	return Tcl_BadChannelOption(interp, optionName,
-                "connecting peername sockname");
+                "connecting keepalive nagle peername sockname");
     }
 
     return TCL_OK;
@@ -1351,7 +1476,7 @@ TcpConnect(
         }
 
         /*
-         * We need to forward the writable event that brought us here, bcasue
+         * We need to forward the writable event that brought us here, because
          * upon reading of getsockopt(SO_ERROR), at least some OSes clear the
          * writable state from the socket, and so a subsequent select() on
          * behalf of a script level [fileevent] would not fire. It doesn't
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index e806423..66d6b61 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -55,13 +55,6 @@
 #endif
 
 /*
- * Support for control over sockets' KEEPALIVE and NODELAY behavior is
- * currently disabled.
- */
-
-#undef TCL_FEATURE_KEEPALIVE_NAGLE
-
-/*
  * Helper macros to make parts of this file clearer. The macros do exactly
  * what they say on the tin. :-) They also only ever refer to their arguments
  * once, and so can be used without regard to side effects.
@@ -589,7 +582,7 @@ TcpBlockModeProc(
  *
  * Side effects:
  *	Processes socket events off the system queue. May process
- *	asynchroneous connect.
+ *	asynchronous connect.
  *
  *----------------------------------------------------------------------
  */
@@ -1185,14 +1178,15 @@ TcpSetOptionProc(
     ClientData instanceData,	/* Socket state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Name of the option to set. */
-    TCL_UNUSED(const char *) /*value*/)		/* New value for option. */
+    const char *value)		/* New value for option. */
 {
-#ifdef TCL_FEATURE_KEEPALIVE_NAGLE
-    TcpState *statePtr = instanceData;
+    TcpState *statePtr = (TcpState *)instanceData;
     SOCKET sock;
-#else
-    (void)instanceData;
-#endif /*TCL_FEATURE_KEEPALIVE_NAGLE*/
+    size_t len = 0;
+
+    if (optionName != NULL) {
+	len = strlen(optionName);
+    }
 
     /*
      * Check that WinSock is initialized; do not call it if not, to prevent
@@ -1208,20 +1202,17 @@ TcpSetOptionProc(
 	return TCL_ERROR;
     }
 
-#ifdef TCL_FEATURE_KEEPALIVE_NAGLE
-#error "TCL_FEATURE_KEEPALIVE_NAGLE not reviewed for whether to treat statePtr->sockets as single fd or list"
     sock = statePtr->sockets->fd;
 
-    if (!strcasecmp(optionName, "-keepalive")) {
-	BOOL val = FALSE;
+    if ((len > 1) && (optionName[1] == 'k') &&
+	    (strncmp(optionName, "-keepalive", len) == 0)) {
+	BOOL val;
 	int boolVar, rtn;
 
 	if (Tcl_GetBoolean(interp, value, &boolVar) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (boolVar) {
-	    val = TRUE;
-	}
+	val = boolVar ? TRUE : FALSE;
 	rtn = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
 		(const char *) &val, sizeof(BOOL));
 	if (rtn != 0) {
@@ -1234,16 +1225,16 @@ TcpSetOptionProc(
 	    return TCL_ERROR;
 	}
 	return TCL_OK;
-    } else if (!strcasecmp(optionName, "-nagle")) {
-	BOOL val = FALSE;
+    }
+    if ((len > 1) && (optionName[1] == 'n') &&
+	(strncmp(optionName, "-nagle", len) == 0)) {
+	BOOL val;
 	int boolVar, rtn;
 
 	if (Tcl_GetBoolean(interp, value, &boolVar) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (!boolVar) {
-	    val = TRUE;
-	}
+	val = boolVar ? FALSE : TRUE;
 	rtn = setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
 		(const char *) &val, sizeof(BOOL));
 	if (rtn != 0) {
@@ -1257,11 +1248,7 @@ TcpSetOptionProc(
 	}
 	return TCL_OK;
     }
-
     return Tcl_BadChannelOption(interp, optionName, "keepalive nagle");
-#else
-    return Tcl_BadChannelOption(interp, optionName, "");
-#endif /*TCL_FEATURE_KEEPALIVE_NAGLE*/
 }
 
 /*
@@ -1536,54 +1523,43 @@ TcpGetOptionProc(
 	}
     }
 
-#ifdef TCL_FEATURE_KEEPALIVE_NAGLE
-    if (len == 0 || !strncmp(optionName, "-keepalive", len)) {
+    if ((len == 0) || ((len > 1) && (optionName[1] == 'k') &&
+	    (strncmp(optionName, "-keepalive", len) == 0))) {
 	int optlen;
 	BOOL opt = FALSE;
 
 	if (len == 0) {
+	    sock = statePtr->sockets->fd;
 	    Tcl_DStringAppendElement(dsPtr, "-keepalive");
 	}
 	optlen = sizeof(BOOL);
 	getsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&opt, &optlen);
-	if (opt) {
-	    Tcl_DStringAppendElement(dsPtr, "1");
-	} else {
-	    Tcl_DStringAppendElement(dsPtr, "0");
-	}
+	Tcl_DStringAppendElement(dsPtr, opt ? "1" : "0");
 	if (len > 0) {
 	    return TCL_OK;
 	}
     }
 
-    if (len == 0 || !strncmp(optionName, "-nagle", len)) {
+    if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
+	    (strncmp(optionName, "-nagle", len) == 0))) {
 	int optlen;
 	BOOL opt = FALSE;
 
 	if (len == 0) {
+	    sock = statePtr->sockets->fd;
 	    Tcl_DStringAppendElement(dsPtr, "-nagle");
 	}
 	optlen = sizeof(BOOL);
 	getsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&opt, &optlen);
-	if (opt) {
-	    Tcl_DStringAppendElement(dsPtr, "0");
-	} else {
-	    Tcl_DStringAppendElement(dsPtr, "1");
-	}
+	Tcl_DStringAppendElement(dsPtr, opt ? "0" : "1");
 	if (len > 0) {
 	    return TCL_OK;
 	}
     }
-#endif /*TCL_FEATURE_KEEPALIVE_NAGLE*/
 
     if (len > 0) {
-#ifdef TCL_FEATURE_KEEPALIVE_NAGLE
-	return Tcl_BadChannelOption(interp, optionName,
-		"connecting peername sockname keepalive nagle");
-#else
 	return Tcl_BadChannelOption(interp, optionName,
-                "connecting peername sockname");
-#endif /*TCL_FEATURE_KEEPALIVE_NAGLE*/
+		"connecting keepalive nagle peername sockname");
     }
 
     return TCL_OK;
@@ -1672,8 +1648,6 @@ TcpGetHandleProc(
     *handlePtr = INT2PTR(statePtr->sockets->fd);
     return TCL_OK;
 }
-
-
 
 /*
  *----------------------------------------------------------------------
@@ -1810,7 +1784,7 @@ TcpConnect(
 	    }
 
 	    /*
-	     * For asynchroneous connect set the socket in nonblocking mode
+	     * For asynchronous connect set the socket in nonblocking mode
 	     * and activate connect notification
 	     */
 
@@ -1925,7 +1899,7 @@ TcpConnect(
 
 	    /*
 	     * Clear the tsd socket list pointer if we did not wait for
-	     * the FD_CONNECT asynchroneously
+	     * the FD_CONNECT asynchronously
 	     */
 
 	    tsdPtr->pendingTcpState = NULL;
-- 
cgit v0.12


From 15640f92409edd55e33844d0b7c298ebce907ca3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 4 Sep 2022 20:15:06 +0000
Subject: Fix testcase iocmd-8.15

---
 tests/ioCmd.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 3aeeb61..f911846 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -294,7 +294,7 @@ removeFile fconfigure.dummy
 test iocmd-8.14 {fconfigure command} {
     fconfigure stdin -buffers
 } 4096
-test iocmd-8.15.1 {fconfigure command / tcp channel} -constraints {socket unixOrWin} -setup {
+test iocmd-8.15 {fconfigure command / tcp channel} -constraints {socket unixOrWin} -setup {
     set srv [socket -server iocmdSRV -myaddr 127.0.0.1 0]
     set port [lindex [fconfigure $srv -sockname] 2]
     proc iocmdSRV {sock ip port} {close $sock}
@@ -306,7 +306,7 @@ test iocmd-8.15.1 {fconfigure command / tcp channel} -constraints {socket unixOr
     close $srv
     unset cli srv port
     rename iocmdSRV {}
-} -returnCodes error -result [expectedOpts "-blah" {-connecting -keepalive -peername -nagle -sockname}]
+} -returnCodes error -result [expectedOpts "-blah" {-connecting -keepalive -nagle -peername -sockname}]
 test iocmd-8.16 {fconfigure command / tcp channel} -constraints socket -setup {
     set srv [socket -server iocmdSRV -myaddr 127.0.0.1 0]
     set port [lindex [fconfigure $srv -sockname] 2]
-- 
cgit v0.12


From ad1c9644ec994dee42c667d8562d68227437737e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 6 Sep 2022 13:35:30 +0000
Subject: Correct Tcl_DriverWideSeekProc documentation, matching implementation

---
 doc/CrtChannel.3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/CrtChannel.3 b/doc/CrtChannel.3
index 968328c..e84c29a 100644
--- a/doc/CrtChannel.3
+++ b/doc/CrtChannel.3
@@ -530,9 +530,9 @@ operations will be applied. \fIWideSeekProc\fR must match the following
 prototype:
 .PP
 .CS
-typedef Tcl_WideInt \fBTcl_DriverWideSeekProc\fR(
+typedef long long \fBTcl_DriverWideSeekProc\fR(
         void *\fIinstanceData\fR,
-        Tcl_WideInt \fIoffset\fR,
+        long long \fIoffset\fR,
         int \fIseekMode\fR,
         int *\fIerrorCodePtr\fR);
 .CE
-- 
cgit v0.12


From cdecc6d50946d64936ade03c2384bf0361e9156e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 7 Sep 2022 11:45:29 +0000
Subject: Revive TIP #220 implementation: Escalate Privileges in VFS Close
 Callback

---
 doc/CrtChannel.3      |  15 +++++++
 generic/tcl.decls     |   5 +++
 generic/tclDecls.h    |   6 +++
 generic/tclIO.c       |  52 ++++++++++++++++++++++
 generic/tclIO.h       |   2 +
 generic/tclStubInit.c |   1 +
 generic/tclTest.c     |  39 +++++++++++++++++
 tests/io.test         | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 238 insertions(+)

diff --git a/doc/CrtChannel.3 b/doc/CrtChannel.3
index 02772e8..1496631 100644
--- a/doc/CrtChannel.3
+++ b/doc/CrtChannel.3
@@ -35,6 +35,11 @@ Tcl_ThreadId
 int
 \fBTcl_GetChannelMode\fR(\fIchannel\fR)
 .sp
+.VS 8.7
+int
+\fBTcl_RemoveChannelMode\fR(\fIinterp, channel, mode\fR)
+.VE 8.7
+.sp
 int
 \fBTcl_GetChannelBufferSize\fR(\fIchannel\fR)
 .sp
@@ -243,6 +248,16 @@ events to the correct event queue even for a multi-threaded core.
 and \fBTCL_WRITABLE\fR, indicating whether the channel is open for input
 and output.
 .PP
+.VS 8.7
+.PP
+\fBTcl_RemoveChannelMode\fR removes an access privilege from the
+channel, either \fBTCL_READABLE\fR or \fBTCL_WRITABLE\fR, and returns
+a regular Tcl result code, \fBTCL_OK\fR, or \fBTCL_ERROR\fR. The
+function throws an error if either an invalid mode is specified or the
+result of the removal would be an inaccessible channel. In that case
+an error message is left in the interp argument, if not NULL.
+.VE 8.7
+.PP
 \fBTcl_GetChannelBufferSize\fR returns the size, in bytes, of buffers
 allocated to store input or output in \fIchannel\fR. If the value was not set
 by a previous call to \fBTcl_SetChannelBufferSize\fR, described below, then
diff --git a/generic/tcl.decls b/generic/tcl.decls
index d08ba0a..c7c917f 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2524,6 +2524,11 @@ declare 679 {
 	    void *clientData, size_t objc, Tcl_Obj *const objv[])
 }
 
+# TIP #220.
+declare 680 {
+    int Tcl_RemoveChannelMode(Tcl_Interp *interp, Tcl_Channel chan, int mode)
+}
+
 # ----- BASELINE -- FOR -- 8.7.0 ----- #
 
 ##############################################################################
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 3917d0f..fc61249 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1996,6 +1996,9 @@ EXTERN Tcl_Command	Tcl_NRCreateCommand2(Tcl_Interp *interp,
 EXTERN int		Tcl_NRCallObjProc2(Tcl_Interp *interp,
 				Tcl_ObjCmdProc2 *objProc2, void *clientData,
 				size_t objc, Tcl_Obj *const objv[]);
+/* 680 */
+EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
+				Tcl_Channel chan, int mode);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2711,6 +2714,7 @@ typedef struct TclStubs {
     Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
     Tcl_Command (*tcl_NRCreateCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc, Tcl_ObjCmdProc2 *nreProc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 678 */
     int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, size_t objc, Tcl_Obj *const objv[]); /* 679 */
+    int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 680 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4099,6 +4103,8 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_NRCreateCommand2) /* 678 */
 #define Tcl_NRCallObjProc2 \
 	(tclStubsPtr->tcl_NRCallObjProc2) /* 679 */
+#define Tcl_RemoveChannelMode \
+	(tclStubsPtr->tcl_RemoveChannelMode) /* 680 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5313eed..532f758 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1681,6 +1681,7 @@ Tcl_CreateChannel(
     }
     statePtr->channelName = tmp;
     statePtr->flags = mask;
+    statePtr->maxPerms = mask; /* Save max privileges for close callback */
 
     /*
      * Set the channel to system default encoding.
@@ -2166,8 +2167,11 @@ Tcl_UnstackChannel(
 
 	/*
 	 * Close and free the channel driver state.
+	 * TIP #220: This is done with maximum privileges (as created).
 	 */
 
+	statePtr->flags &= ~(TCL_READABLE|TCL_WRITABLE);
+	statePtr->flags |= statePtr->maxPerms;
 	result = ChanClose(chanPtr, interp);
 	ChannelFree(chanPtr);
 
@@ -2447,6 +2451,54 @@ Tcl_GetChannelHandle(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_RemoveChannelMode --
+ *
+ *	Remove either read or write privileges from the channel.
+ *
+ * Results:
+ *	A standard Tcl result code.
+ *
+ * Side effects:
+ *	May change the access mode of the channel.
+ *	May leave an error message in the interp.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tcl_RemoveChannelMode(
+     Tcl_Interp* interp,        /* The interp for an error message. Allowed to be NULL. */
+     Tcl_Channel chan,		/* The channel which is modified. */
+     int         mode)          /* The access mode to drop from the channel */
+{
+    const char* emsg;
+    ChannelState *statePtr = ((Channel *) chan)->state;
+					/* State of actual channel. */
+
+    if ((mode != TCL_READABLE) && (mode != TCL_WRITABLE)) {
+        emsg = "Illegal mode value.";
+	goto error;
+    }
+    if (0 == (statePtr->flags & (TCL_READABLE | TCL_WRITABLE) & ~mode)) {
+        emsg = "Bad mode, would make channel inacessible";
+	goto error;
+    }
+
+    statePtr->flags &= ~mode;
+    return TCL_OK;
+
+ error:
+    if (interp != NULL) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"Tcl_RemoveChannelMode error: %s. Channel: \"%s\"",
+		emsg, Tcl_GetChannelName((Tcl_Channel) chan)));
+    }
+    return TCL_ERROR;
+}
+
+/*
  *---------------------------------------------------------------------------
  *
  * AllocChannelBuffer --
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 54aa5af..3d2b7be 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -216,6 +216,8 @@ typedef struct ChannelState {
 				 * companion to 'unreportedError'. */
     size_t epoch;		/* Used to test validity of stored channelname
 				 * lookup results. */
+    int maxPerms;		/* TIP #220: Max access privileges
+				 * the channel was created with. */
 } ChannelState;
 
 /*
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 87c9d0a..f31146c 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2042,6 +2042,7 @@ const TclStubs tclStubs = {
     Tcl_CreateObjTrace2, /* 677 */
     Tcl_NRCreateCommand2, /* 678 */
     Tcl_NRCallObjProc2, /* 679 */
+    Tcl_RemoveChannelMode, /* 680 */
 };
 
 /* !END!: Do not edit above this line. */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index d13b7ce..3d64992 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -6042,6 +6042,45 @@ TestChannelCmd(
 	return TCL_OK;
     }
 
+    if ((cmdName[0] == 'm') && (strncmp(cmdName, "maxmode", len) == 0)) {
+	if (argc != 3) {
+	    Tcl_AppendResult(interp, "channel name required", NULL);
+	    return TCL_ERROR;
+	}
+
+	if (statePtr->maxPerms & TCL_READABLE) {
+	    Tcl_AppendElement(interp, "read");
+	} else {
+	    Tcl_AppendElement(interp, "");
+	}
+	if (statePtr->maxPerms & TCL_WRITABLE) {
+	    Tcl_AppendElement(interp, "write");
+	} else {
+	    Tcl_AppendElement(interp, "");
+	}
+	return TCL_OK;
+    }
+
+    if ((cmdName[0] == 'm') && (strncmp(cmdName, "mremove-rd", len) == 0)) {
+        if (argc != 3) {
+            Tcl_AppendResult(interp, "channel name required",
+                    (char *) NULL);
+            return TCL_ERROR;
+        }
+
+	return Tcl_RemoveChannelMode(interp, chan, TCL_READABLE);
+    }
+
+    if ((cmdName[0] == 'm') && (strncmp(cmdName, "mremove-wr", len) == 0)) {
+        if (argc != 3) {
+            Tcl_AppendResult(interp, "channel name required",
+                    (char *) NULL);
+            return TCL_ERROR;
+        }
+
+	return Tcl_RemoveChannelMode(interp, chan, TCL_WRITABLE);
+    }
+
     if ((cmdName[0] == 'm') && (strncmp(cmdName, "mthread", len) == 0)) {
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "channel name required", NULL);
diff --git a/tests/io.test b/tests/io.test
index 6314ace..767c22e 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8954,6 +8954,124 @@ test io-74.1 {[104f2885bb] improper cache validity check} -setup {
 
 # ### ### ### ######### ######### #########
 
+
+
+test io-75.0 {channel modes} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r]
+} -constraints testchannel -body {
+    testchannel mode $f
+} -cleanup {
+    close $f
+    removeFile dummy
+} -result {read {}}
+
+test io-75.1 {channel modes} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile w]
+} -constraints testchannel -body {
+    testchannel mode $f
+} -cleanup {
+    close $f
+    removeFile dummy
+} -result {{} write}
+
+test io-75.2 {channel modes} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r+]
+} -constraints testchannel -body {
+    testchannel mode $f
+} -cleanup {
+    close $f
+    removeFile dummy
+} -result {read write}
+
+test io-75.3 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r]
+} -constraints testchannel -body {
+    testchannel mremove-wr $f
+    list [testchannel mode $f] [testchannel maxmode $f]
+} -cleanup {
+    close $f
+    removeFile dummy
+} -result {{read {}} {read {}}}
+
+test io-75.4 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r]
+} -constraints testchannel -body {
+    testchannel mremove-rd $f
+} -returnCodes error -cleanup {
+    close $f
+    removeFile dummy
+} -match glob -result {Tcl_RemoveChannelMode error: Bad mode, would make channel inacessible. Channel: "*"}
+
+test io-75.5 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile w]
+} -constraints testchannel -body {
+    testchannel mremove-rd $f
+    list [testchannel mode $f] [testchannel maxmode $f]
+} -cleanup {
+    close $f
+    removeFile dummy
+} -result {{{} write} {{} write}}
+
+test io-75.6 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile w]
+} -constraints testchannel -body {
+    testchannel mremove-wr $f
+} -returnCodes error -cleanup {
+    close $f
+    removeFile dummy
+} -match glob -result {Tcl_RemoveChannelMode error: Bad mode, would make channel inacessible. Channel: "*"}
+
+test io-75.7 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r+]
+} -constraints testchannel -body {
+    testchannel mremove-rd $f
+    list [testchannel mode $f] [testchannel maxmode $f]
+} -cleanup {
+    close $f
+    removeFile dummy
+} -result {{{} write} {read write}}
+
+test io-75.8 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r+]
+} -constraints testchannel -body {
+    testchannel mremove-wr $f
+    list [testchannel mode $f] [testchannel maxmode $f]
+} -cleanup {
+    close $f
+    removeFile dummy
+} -result {{read {}} {read write}}
+
+test io-75.9 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r+]
+} -constraints testchannel -body {
+    testchannel mremove-wr $f
+    testchannel mremove-rd $f
+} -returnCodes error -cleanup {
+    close $f
+    removeFile dummy
+} -match glob -result {Tcl_RemoveChannelMode error: Bad mode, would make channel inacessible. Channel: "*"}
+
+test io-75.10 {channel mode dropping} -setup {
+    set datafile [makeFile {some characters} dummy]
+    set f [open $datafile r+]
+} -constraints testchannel -body {
+    testchannel mremove-rd $f
+    testchannel mremove-wr $f
+} -returnCodes error -cleanup {
+    close $f
+    removeFile dummy
+} -match glob -result {Tcl_RemoveChannelMode error: Bad mode, would make channel inacessible. Channel: "*"}
+
 # cleanup
 foreach file [list fooBar longfile script script2 output test1 pipe my_script \
 	test2 test3 cat stdout kyrillic.txt utf8-fcopy.txt utf8-rp.txt] {
-- 
cgit v0.12


From d12caa5cd97a62ef81fab89e63cf5d006c628b46 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 7 Sep 2022 14:47:52 +0000
Subject: Tcl_Size -> size_t (twice)

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

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 183452e..4af38f3 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2450,7 +2450,7 @@ typedef struct ListStore {
     Tcl_Size firstUsed;    /* Index of first slot in use within slots[] */
     Tcl_Size numUsed;      /* Number of slots in use (starting firstUsed) */
     Tcl_Size numAllocated; /* Total number of slots[] array slots. */
-    Tcl_Size refCount;           /* Number of references to this instance */
+    size_t refCount;           /* Number of references to this instance */
     int flags;              /* LISTSTORE_* flags */
     Tcl_Obj *slots[TCLFLEXARRAY];      /* Variable size array. Grown as needed */
 } ListStore;
@@ -2474,7 +2474,7 @@ typedef struct ListStore {
 typedef struct ListSpan {
     Tcl_Size spanStart;    /* Starting index of the span */
     Tcl_Size spanLength;   /* Number of elements in the span */
-    Tcl_Size refCount;     /* Count of references to this span record */
+    size_t refCount;     /* Count of references to this span record */
 } ListSpan;
 #ifndef LIST_SPAN_THRESHOLD /* May be set on build line */
 #define LIST_SPAN_THRESHOLD 101
-- 
cgit v0.12


From 5c0c8a2c84ae92a60624623d05f43e3189a9653c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 7 Sep 2022 15:33:02 +0000
Subject: TIP #594 implementation: Modernize "file stat" interface

---
 doc/file.n         | 37 ++++++++++++++++++------------------
 generic/tclCmdAH.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------
 tests/cmdAH.test   | 18 ++++++++++++++----
 3 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/doc/file.n b/doc/file.n
index c5a5eed..b0ad4ca 100644
--- a/doc/file.n
+++ b/doc/file.n
@@ -251,14 +251,14 @@ symbolic and hard links (the latter for files only). Windows
 supports symbolic directory links and hard file links on NTFS drives.
 .RE
 .TP
-\fBfile lstat \fIname varName\fR
+\fBfile lstat \fIname ?varName?\fR
 .
 Same as \fBstat\fR option (see below) except uses the \fIlstat\fR
 kernel call instead of \fIstat\fR.  This means that if \fIname\fR
-refers to a symbolic link the information returned in \fIvarName\fR
-is for the link rather than the file it refers to.  On systems that
-do not support symbolic links this option behaves exactly the same
-as the \fBstat\fR option.
+refers to a symbolic link the information returned is for the link
+rather than the file it refers to.  On systems that do not support
+symbolic links this option behaves exactly the same as the
+\fBstat\fR option.
 .TP
 \fBfile mkdir\fR ?\fIdir\fR ...?
 .
@@ -393,19 +393,20 @@ that use the third component do not attempt to perform tilde
 substitution.
 .RE
 .TP
-\fBfile stat \fIname varName\fR
-.
-Invokes the \fBstat\fR kernel call on \fIname\fR, and uses the variable
-given by \fIvarName\fR to hold information returned from the kernel call.
-\fIVarName\fR is treated as an array variable, and the following elements
-of that variable are set: \fBatime\fR, \fBctime\fR, \fBdev\fR, \fBgid\fR,
-\fBino\fR, \fBmode\fR, \fBmtime\fR, \fBnlink\fR, \fBsize\fR, \fBtype\fR,
-\fBuid\fR.  Each element except \fBtype\fR is a decimal string with the
-value of the corresponding field from the \fBstat\fR return structure;
-see the manual entry for \fBstat\fR for details on the meanings of the
-values.  The \fBtype\fR element gives the type of the file in the same
-form returned by the command \fBfile type\fR.  This command returns an
-empty string.
+\fBfile stat \fIname ?varName?\fR
+.
+Invokes the \fBstat\fR kernel call on \fIname\fR, and returns a
+dictionary with the information returned from the kernel call. If
+\fIvarName\fR is given, it uses the variable to hold the information.
+\fIVarName\fR is treated as an array variable, and in such case the
+command returns the empty string. The following elements are set:
+\fBatime\fR, \fBctime\fR, \fBdev\fR, \fBgid\fR, \fBino\fR, \fBmode\fR,
+\fBmtime\fR, \fBnlink\fR, \fBsize\fR, \fBtype\fR, \fBuid\fR.  Each element
+except \fBtype\fR is a decimal string with the value of the corresponding
+field from the \fBstat\fR return structure; see the manual entry for
+\fBstat\fR for details on the meanings of the values.  The \fBtype\fR
+element gives the type of the file in the same form returned by the
+command \fBfile type\fR.
 .TP
 \fBfile system \fIname\fR
 .
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 28fc210..f0d6966 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -1409,14 +1409,18 @@ FileAttrLinkStatCmd(
 {
     Tcl_StatBuf buf;
 
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "name varName");
+    if (objc < 2 || objc > 3) {
+	Tcl_WrongNumArgs(interp, 1, objv, "name ?varName?");
 	return TCL_ERROR;
     }
     if (GetStatBuf(interp, objv[1], Tcl_FSLstat, &buf) != TCL_OK) {
 	return TCL_ERROR;
     }
-    return StoreStatData(interp, objv[2], &buf);
+    if (objc == 2) {
+	return StoreStatData(interp, NULL, &buf);
+    } else {
+	return StoreStatData(interp, objv[2], &buf);
+    }
 }
 
 /*
@@ -1445,14 +1449,18 @@ FileAttrStatCmd(
 {
     Tcl_StatBuf buf;
 
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "name varName");
+    if (objc < 2 || objc > 3) {
+	Tcl_WrongNumArgs(interp, 1, objv, "name ?varName?");
 	return TCL_ERROR;
     }
     if (GetStatBuf(interp, objv[1], Tcl_FSStat, &buf) != TCL_OK) {
 	return TCL_ERROR;
     }
-    return StoreStatData(interp, objv[2], &buf);
+    if (objc == 2) {
+	return StoreStatData(interp, NULL, &buf);
+    } else {
+	return StoreStatData(interp, objv[2], &buf);
+    }
 }
 
 /*
@@ -2352,7 +2360,7 @@ GetStatBuf(
  *
  *	This is a utility procedure that breaks out the fields of a "stat"
  *	structure and stores them in textual form into the elements of an
- *	associative array.
+ *	associative array (if given) or returns a dictionary.
  *
  * Results:
  *	Returns a standard Tcl return value. If an error occurs then a message
@@ -2372,9 +2380,40 @@ StoreStatData(
     Tcl_StatBuf *statPtr)	/* Pointer to buffer containing stat data to
 				 * store in varName. */
 {
-    Tcl_Obj *field, *value;
+    Tcl_Obj *field, *value, *result;
     unsigned short mode;
 
+    if (varName == NULL) {
+        result = Tcl_NewObj();
+        Tcl_IncrRefCount(result);
+#define DOBJPUT(key, objValue)                  \
+        Tcl_DictObjPut(NULL, result,            \
+            Tcl_NewStringObj((key), -1),        \
+            (objValue));
+        DOBJPUT("dev",	Tcl_NewWideIntObj((long)statPtr->st_dev));
+        DOBJPUT("ino",	Tcl_NewWideIntObj((Tcl_WideInt)statPtr->st_ino));
+        DOBJPUT("nlink",	Tcl_NewWideIntObj((long)statPtr->st_nlink));
+        DOBJPUT("uid",	Tcl_NewWideIntObj((long)statPtr->st_uid));
+        DOBJPUT("gid",	Tcl_NewWideIntObj((long)statPtr->st_gid));
+        DOBJPUT("size",	Tcl_NewWideIntObj((Tcl_WideInt)statPtr->st_size));
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
+        DOBJPUT("blocks",	Tcl_NewWideIntObj((Tcl_WideInt)statPtr->st_blocks));
+#endif
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
+        DOBJPUT("blksize", Tcl_NewWideIntObj((long)statPtr->st_blksize));
+#endif
+        DOBJPUT("atime",	Tcl_NewWideIntObj(Tcl_GetAccessTimeFromStat(statPtr)));
+        DOBJPUT("mtime",	Tcl_NewWideIntObj(Tcl_GetModificationTimeFromStat(statPtr)));
+        DOBJPUT("ctime",	Tcl_NewWideIntObj(Tcl_GetChangeTimeFromStat(statPtr)));
+        mode = (unsigned short) statPtr->st_mode;
+        DOBJPUT("mode",	Tcl_NewWideIntObj(mode));
+        DOBJPUT("type",	Tcl_NewStringObj(GetTypeFromMode(mode), -1));
+#undef DOBJPUT
+        Tcl_SetObjResult(interp, result);
+        Tcl_DecrRefCount(result);
+        return TCL_OK;
+    }
+
     /*
      * Assume Tcl_ObjSetVar2() does not keep a copy of the field name!
      *
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index ab1a8e6..1a79fa3 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -1527,14 +1527,14 @@ catch {file attributes $gorpfile -permissions 0o765}
 
 # stat
 test cmdAH-28.1 {Tcl_FileObjCmd: stat} -returnCodes error -body {
-    file stat _bogus_
-} -result {wrong # args: should be "file stat name varName"}
+    file stat
+} -result {wrong # args: should be "file stat name ?varName?"}
 test cmdAH-28.2 {Tcl_FileObjCmd: stat} -returnCodes error -body {
     file stat _bogus_ a b
-} -result {wrong # args: should be "file stat name varName"}
+} -result {wrong # args: should be "file stat name ?varName?"}
 test cmdAH-28.3 {Tcl_FileObjCmd: stat} -setup {
     unset -nocomplain stat
-    set stat(blocks) [set stat(blksize) {}]
+    array set stat {blocks {} blksize {}}
 } -body {
     file stat $gorpfile stat
     unset stat(blocks) stat(blksize); # Ignore these fields; not always set
@@ -1627,6 +1627,16 @@ test cmdAH-28.13.1 {Tcl_FileObjCmd: stat (built-in Windows names)} -constraints
     }
     set res
 } -result {0 0 -1 0 0 8630 0 0 0 characterSpecial 0}
+test cmdAH-28.14 {Tcl_FileObjCmd: stat} -setup {
+    unset -nocomplain stat
+} -body {
+    file stat $gorpfile stat
+    expr {
+		[lsort -stride 2 [array get stat]]
+		eq
+		[lsort -stride 2 [file stat $gorpfile]]
+	}
+} -result {1}
 unset -nocomplain stat
 
 # type
-- 
cgit v0.12


From 0eddd55ab6d8747fd749f24f769a4025e5863e8b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Sep 2022 13:01:43 +0000
Subject: Fix cmdAH-23.* testcases

---
 tests/cmdAH.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 1a79fa3..984100e 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -1194,10 +1194,10 @@ test cmdAH-22.3 {Tcl_FileObjCmd: isfile} {file isfile $dirfile} 0
 catch {file link -symbolic $linkfile $gorpfile}
 test cmdAH-23.1 {Tcl_FileObjCmd: lstat} -returnCodes error -body {
     file lstat a
-} -result {wrong # args: should be "file lstat name varName"}
+} -result {could not read "a": no such file or directory}
 test cmdAH-23.2 {Tcl_FileObjCmd: lstat} -returnCodes error -body {
     file lstat a b c
-} -result {wrong # args: should be "file lstat name varName"}
+} -result {wrong # args: should be "file lstat name ?varName?"}
 test cmdAH-23.3 {Tcl_FileObjCmd: lstat} -setup {
     unset -nocomplain stat
 } -constraints {unix nonPortable} -body {
-- 
cgit v0.12


From d6b88eb7975e3dc13b386679c53bb4a6f7f7f616 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 9 Sep 2022 12:42:04 +0000
Subject: Change 'skip' argument from int to size_t.  Should have been part of
 TIP #630 (TclOO commands > 2^31 (for 8.7))

---
 doc/Class.3          |  2 +-
 doc/Method.3         |  2 +-
 generic/tclOO.c      | 25 +++++++++++--------------
 generic/tclOO.decls  |  4 ++--
 generic/tclOODecls.h |  8 ++++----
 generic/tclOOInt.h   |  4 ++--
 6 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/doc/Class.3 b/doc/Class.3
index 0d50e95..c029595 100644
--- a/doc/Class.3
+++ b/doc/Class.3
@@ -85,7 +85,7 @@ already exist.
 The number of elements in the \fIobjv\fR array.
 .AP "Tcl_Obj *const" *objv in
 The arguments to the command to create the instance of the class.
-.AP int skip in
+.AP size_t skip in
 The number of arguments at the start of the argument array, \fIobjv\fR, that
 are not arguments to any constructors. This allows the generation of correct
 error messages even when complicated calling patterns are used (e.g., via the
diff --git a/doc/Method.3 b/doc/Method.3
index 9096734..c3a6b64 100644
--- a/doc/Method.3
+++ b/doc/Method.3
@@ -99,7 +99,7 @@ retain a reference to a context.
 The number of arguments to pass to the method implementation.
 .AP "Tcl_Obj *const" *objv in
 An array of arguments to pass to the method implementation.
-.AP int skip in
+.AP size_t skip in
 The number of arguments passed to the method implementation that do not
 represent "real" arguments.
 .BE
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 5385f08..0d9c7da 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -1667,16 +1667,15 @@ Tcl_NewObjectInstance(
     const char *nsNameStr,	/* Name of namespace to create inside object,
 				 * or NULL to ask the code to pick its own
 				 * unique name. */
-    size_t objc1,			/* Number of arguments. Negative value means
+    size_t objc,			/* Number of arguments. Negative value means
 				 * do not call constructor. */
     Tcl_Obj *const *objv,	/* Argument list. */
-    int skip)			/* Number of arguments to _not_ pass to the
+    size_t skip)			/* Number of arguments to _not_ pass to the
 				 * constructor. */
 {
     Class *classPtr = (Class *) cls;
     Object *oPtr;
     ClientData clientData[4];
-    int objc = objc1;
 
     oPtr = TclNewObjectInstanceCommon(interp, classPtr, nameStr, nsNameStr);
     if (oPtr == NULL) {
@@ -1688,7 +1687,7 @@ Tcl_NewObjectInstance(
      * used for object cloning only.
      */
 
-    if (objc >= 0) {
+    if (objc != TCL_INDEX_NONE) {
 	CallContext *contextPtr =
 		TclOOGetCallContext(oPtr, NULL, CONSTRUCTOR, NULL, NULL, NULL);
 
@@ -1736,10 +1735,10 @@ TclNRNewObjectInstance(
     const char *nsNameStr,	/* Name of namespace to create inside object,
 				 * or NULL to ask the code to pick its own
 				 * unique name. */
-    int objc,			/* Number of arguments. Negative value means
+    size_t objc,			/* Number of arguments. Negative value means
 				 * do not call constructor. */
     Tcl_Obj *const *objv,	/* Argument list. */
-    int skip,			/* Number of arguments to _not_ pass to the
+    size_t skip,			/* Number of arguments to _not_ pass to the
 				 * constructor. */
     Tcl_Object *objectPtr)	/* Place to write the object reference upon
 				 * successful allocation. */
@@ -1755,11 +1754,11 @@ TclNRNewObjectInstance(
     }
 
     /*
-     * Run constructors, except when objc < 0 (a special flag case used for
+     * Run constructors, except when objc == TCL_INDEX_NONE (a special flag case used for
      * object cloning only). If there aren't any constructors, we do nothing.
      */
 
-    if (objc < 0) {
+    if (objc == TCL_INDEX_NONE) {
 	*objectPtr = (Tcl_Object) oPtr;
 	return TCL_OK;
     }
@@ -2628,7 +2627,7 @@ int
 TclOOObjectCmdCore(
     Object *oPtr,		/* The object being invoked. */
     Tcl_Interp *interp,		/* The interpreter containing the object. */
-    size_t objc1,			/* How many arguments are being passed in. */
+    size_t objc,			/* How many arguments are being passed in. */
     Tcl_Obj *const *objv,	/* The array of arguments. */
     int flags,			/* Whether this is an invocation through the
 				 * public or the private command interface. */
@@ -2643,14 +2642,13 @@ TclOOObjectCmdCore(
     Object *callerObjPtr = NULL;
     Class *callerClsPtr = NULL;
     int result;
-    int objc = objc1;
 
     /*
      * If we've no method name, throw this directly into the unknown
      * processing.
      */
 
-    if (objc < 2) {
+    if (objc + 1 < 3) {
 	flags |= FORCE_UNKNOWN;
 	methodNamePtr = NULL;
 	goto noMapping;
@@ -2801,15 +2799,14 @@ int
 Tcl_ObjectContextInvokeNext(
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
-    size_t objc1,
+    size_t objc,
     Tcl_Obj *const *objv,
-    int skip)
+    size_t skip)
 {
     CallContext *contextPtr = (CallContext *) context;
     size_t savedIndex = contextPtr->index;
     size_t savedSkip = contextPtr->skip;
     int result;
-    int objc = objc1;
 
     if (contextPtr->index + 1 >= contextPtr->callPtr->numChain) {
 	/*
diff --git a/generic/tclOO.decls b/generic/tclOO.decls
index d9adb4d..3783adf 100644
--- a/generic/tclOO.decls
+++ b/generic/tclOO.decls
@@ -69,7 +69,7 @@ declare 12 {
 declare 13 {
     Tcl_Object Tcl_NewObjectInstance(Tcl_Interp *interp, Tcl_Class cls,
 	    const char *nameStr, const char *nsNameStr, size_t objc,
-	    Tcl_Obj *const *objv, int skip)
+	    Tcl_Obj *const *objv, size_t skip)
 }
 declare 14 {
     int Tcl_ObjectDeleted(Tcl_Object object)
@@ -105,7 +105,7 @@ declare 22 {
 declare 23 {
     int Tcl_ObjectContextInvokeNext(Tcl_Interp *interp,
 	    Tcl_ObjectContext context, size_t objc, Tcl_Obj *const *objv,
-	    int skip)
+	    size_t skip)
 }
 declare 24 {
     Tcl_ObjectMapMethodNameProc *Tcl_ObjectGetMethodNameMapper(
diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h
index 7cfa039..0c141fe 100644
--- a/generic/tclOODecls.h
+++ b/generic/tclOODecls.h
@@ -70,7 +70,7 @@ TCLAPI Tcl_Method	Tcl_NewMethod(Tcl_Interp *interp, Tcl_Class cls,
 TCLAPI Tcl_Object	Tcl_NewObjectInstance(Tcl_Interp *interp,
 				Tcl_Class cls, const char *nameStr,
 				const char *nsNameStr, size_t objc,
-				Tcl_Obj *const *objv, int skip);
+				Tcl_Obj *const *objv, size_t skip);
 /* 14 */
 TCLAPI int		Tcl_ObjectDeleted(Tcl_Object object);
 /* 15 */
@@ -100,7 +100,7 @@ TCLAPI void		Tcl_ObjectSetMetadata(Tcl_Object object,
 /* 23 */
 TCLAPI int		Tcl_ObjectContextInvokeNext(Tcl_Interp *interp,
 				Tcl_ObjectContext context, size_t objc,
-				Tcl_Obj *const *objv, int skip);
+				Tcl_Obj *const *objv, size_t skip);
 /* 24 */
 TCLAPI Tcl_ObjectMapMethodNameProc * Tcl_ObjectGetMethodNameMapper(
 				Tcl_Object object);
@@ -159,7 +159,7 @@ typedef struct TclOOStubs {
     Tcl_Obj * (*tcl_MethodName) (Tcl_Method method); /* 10 */
     Tcl_Method (*tcl_NewInstanceMethod) (Tcl_Interp *interp, Tcl_Object object, Tcl_Obj *nameObj, int flags, const Tcl_MethodType *typePtr, void *clientData); /* 11 */
     Tcl_Method (*tcl_NewMethod) (Tcl_Interp *interp, Tcl_Class cls, Tcl_Obj *nameObj, int flags, const Tcl_MethodType *typePtr, void *clientData); /* 12 */
-    Tcl_Object (*tcl_NewObjectInstance) (Tcl_Interp *interp, Tcl_Class cls, const char *nameStr, const char *nsNameStr, size_t objc, Tcl_Obj *const *objv, int skip); /* 13 */
+    Tcl_Object (*tcl_NewObjectInstance) (Tcl_Interp *interp, Tcl_Class cls, const char *nameStr, const char *nsNameStr, size_t objc, Tcl_Obj *const *objv, size_t skip); /* 13 */
     int (*tcl_ObjectDeleted) (Tcl_Object object); /* 14 */
     int (*tcl_ObjectContextIsFiltering) (Tcl_ObjectContext context); /* 15 */
     Tcl_Method (*tcl_ObjectContextMethod) (Tcl_ObjectContext context); /* 16 */
@@ -169,7 +169,7 @@ typedef struct TclOOStubs {
     void (*tcl_ClassSetMetadata) (Tcl_Class clazz, const Tcl_ObjectMetadataType *typePtr, void *metadata); /* 20 */
     void * (*tcl_ObjectGetMetadata) (Tcl_Object object, const Tcl_ObjectMetadataType *typePtr); /* 21 */
     void (*tcl_ObjectSetMetadata) (Tcl_Object object, const Tcl_ObjectMetadataType *typePtr, void *metadata); /* 22 */
-    int (*tcl_ObjectContextInvokeNext) (Tcl_Interp *interp, Tcl_ObjectContext context, size_t objc, Tcl_Obj *const *objv, int skip); /* 23 */
+    int (*tcl_ObjectContextInvokeNext) (Tcl_Interp *interp, Tcl_ObjectContext context, size_t objc, Tcl_Obj *const *objv, size_t skip); /* 23 */
     Tcl_ObjectMapMethodNameProc * (*tcl_ObjectGetMethodNameMapper) (Tcl_Object object); /* 24 */
     void (*tcl_ObjectSetMethodNameMapper) (Tcl_Object object, Tcl_ObjectMapMethodNameProc *mapMethodNameProc); /* 25 */
     void (*tcl_ClassSetConstructor) (Tcl_Interp *interp, Tcl_Class clazz, Tcl_Method method); /* 26 */
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index 2ef4752..b7fb34d 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -505,8 +505,8 @@ MODULE_SCOPE Tcl_Method TclNewMethod(Tcl_Interp *interp, Tcl_Class cls,
                         void *clientData);
 MODULE_SCOPE int	TclNRNewObjectInstance(Tcl_Interp *interp,
 			    Tcl_Class cls, const char *nameStr,
-			    const char *nsNameStr, int objc,
-			    Tcl_Obj *const *objv, int skip,
+			    const char *nsNameStr, size_t objc,
+			    Tcl_Obj *const *objv, size_t skip,
 			    Tcl_Object *objectPtr);
 MODULE_SCOPE Object *	TclNewObjectInstanceCommon(Tcl_Interp *interp,
 			    Class *classPtr,
-- 
cgit v0.12


From 8ad68e4ae6be99da8761d19c3755707dd0f08f95 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 9 Sep 2022 17:09:10 +0000
Subject: TIP633: fconfigure -tolerantencoding: correct/add command interface
 tests

---
 tests/io.test     | 15 +++++++++++++++
 tests/ioCmd.test  | 12 ++++++------
 tests/socket.test |  2 +-
 tests/zlib.test   |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index b6c4fb5..653c02b 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8985,6 +8985,21 @@ test io-75.2 {unrepresentable character write passes and is replaced by ?} -setu
 	removeFile io-75.2
 } -returnCodes ok -result "A?"
 
+test io-75.3 {check if -tolerantencoding option is saved} -setup {
+	set fn [makeFile {} io-75.3]
+    set f [open $fn w]
+} -body {
+	# the following command gets in result error in TCL 9.0
+    fconfigure $f -encoding iso8859-1 -tolerantencoding 0
+	lappend res [fconfigure $f -tolerantencoding]
+    fconfigure $f -encoding iso8859-1 -tolerantencoding 1
+	lappend res [fconfigure $f -tolerantencoding]
+} -cleanup {
+	close $f
+	removeFile io-75.3
+} -returnCodes ok -result "0 1"
+
+
 # ### ### ### ######### ######### #########
 
 # cleanup
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index dbca866..908ac5a 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -245,7 +245,7 @@ test iocmd-8.7 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -tolerantencoding 1 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
@@ -257,7 +257,7 @@ test iocmd-8.8 {fconfigure command} -setup {
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -tolerantencoding 1 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
@@ -267,7 +267,7 @@ test iocmd-8.9 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -1363,7 +1363,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -tolerantencoding 1 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1372,7 +1372,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -tolerantencoding 1 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1384,7 +1384,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -tolerantencoding 1 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/socket.test b/tests/socket.test
index 4644e1d..c354f46 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1071,7 +1071,7 @@ test socket_$af-7.3 {testing socket specific options} -constraints [list socket
     close $s
     update
     llength $l
-} -result 14
+} -result 16
 test socket_$af-7.4 {testing socket specific options} -constraints [list socket supported_$af] -setup {
     set timer [after 10000 "set x timed_out"]
     set l ""
diff --git a/tests/zlib.test b/tests/zlib.test
index 7de6d64..8c2d368 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 77334ba0ad75d22574c957a65fff91ea17e3bc8e Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Sun, 11 Sep 2022 08:24:21 +0000
Subject: TIP633 fconfigure -strctencoding: TCL 9 branch: prepare test cases
 with -strictencoding 0 and 1

---
 tests/io.test | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 74 insertions(+), 11 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index f65e221..8ff3972 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8952,9 +8952,7 @@ test io-74.1 {[104f2885bb] improper cache validity check} -setup {
     removeFile io-74.1
 } -returnCodes error -match glob -result {can not find channel named "*"}
 
-# Note: the following tests 75.1 to 75.3 are in preparation for TCL 9.0, where
-# those should result in an error result
-test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
+test io-75.1 {multibyte encoding error read results in raw bytes (-strictencoding 0)} -setup {
 	set fn [makeFile {} io-75.1]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -8963,24 +8961,29 @@ test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
 	puts -nonewline $f "A\xC0\x40"
 	flush $f
 	seek $f 0
-	fconfigure $f -encoding utf-8 -buffering none
-} -constraints knownBug -body {
+	fconfigure $f -encoding utf-8 -strictencoding 0 -buffering none
+} -body {
 	read $f
 } -cleanup {
 	close $f
 	removeFile io-75.1
-} -returnCodes error
+} -returnCodes ok -result "A\xC0\x40"
+# for TCL 9.0, the result is error
 
-test io-75.2 {unrepresentable character write passes and is replaced by ?} -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ? (-strictencoding 0)} -constraints deprecated -setup {
 	set fn [makeFile {} io-75.2]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1
-} -constraints knownBug -body {
+    fconfigure $f -encoding iso8859-1 -strictencoding 0
+} -body {
+	# the following command gets in result error in TCL 9.0
 	puts -nonewline $f "A\u2022"
+	flush $f
+	seek $f 0
+	read $f
 } -cleanup {
 	close $f
 	removeFile io-75.2
-} -returnCodes error
+} -returnCodes ok -result "A?"
 
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
@@ -8992,15 +8995,75 @@ test io-75.3 {incomplete multibyte encoding read is ignored} -setup {
 	puts -nonewline $f "A\xC0"
 	flush $f
 	seek $f 0
+	fconfigure $f -encoding utf-8 -buffering none -strictencoding 0
+} -body {
+	set d [read $f]
+	close $f
+	set d
+} -cleanup {
+	removeFile io-75.3
+} -returnCodes ok -result "A\xC0"
+
+test io-75.4 {multibyte encoding error read results in raw bytes (-strictencoding 1} -setup {
+	set fn [makeFile {} io-75.4]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+	# In UTF-8, a byte 0xCx starts a multibyte sequence and must be followed
+	# by a byte > 0x7F. This is violated to get an invalid sequence.
+	puts -nonewline $f "A\xC0\x40"
+	flush $f
+	seek $f 0
+	fconfigure $f -encoding utf-8 -buffering none
+} -constraints knownBug -body {
+	read $f
+} -cleanup {
+	close $f
+	removeFile io-75.4
+} -returnCodes error
+
+test io-75.5 {unrepresentable character write passes and is replaced by ? (-strictencoding 1} -setup {
+	set fn [makeFile {} io-75.5]
+    set f [open $fn w+]
+    fconfigure $f -encoding iso8859-1
+} -constraints knownBug -body {
+	puts -nonewline $f "A\u2022"
+} -cleanup {
+	close $f
+	removeFile io-75.5
+} -returnCodes error
+
+# Incomplete sequence test.
+# This error may IMHO only be detected with the close.
+# But the read already returns the incomplete sequence.
+test io-75.6 {incomplete multibyte encoding read is ignored (-strictencoding 1)} -setup {
+	set fn [makeFile {} io-75.6]
+	set f [open $fn w+]
+	fconfigure $f -encoding binary
+	puts -nonewline $f "A\xC0"
+	flush $f
+	seek $f 0
 	fconfigure $f -encoding utf-8 -buffering none
 } -constraints knownBug -body {
 	set d [read $f]
 	close $f
 	set d
 } -cleanup {
-	removeFile io-75.3
+	removeFile io-75.5
 } -returnCodes error
 
+test io-75.7 {check if -tolerantencoding option is saved} -setup {
+	set fn [makeFile {} io-75.7]
+    set f [open $fn w]
+} -body {
+    fconfigure $f -encoding iso8859-1 -strictencoding 0
+	lappend res [fconfigure $f -strictencoding]
+    fconfigure $f -encoding iso8859-1 -strictencoding 1
+	lappend res [fconfigure $f -strictencoding]
+} -cleanup {
+	close $f
+	removeFile io-75.7
+} -returnCodes ok -result "0 1"
+
 # ### ### ### ######### ######### #########
 
 # cleanup
-- 
cgit v0.12


From 370f7dfa406329d5dfbf91ef4da3d647230ee99c Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Sun, 11 Sep 2022 08:55:59 +0000
Subject: TIP633 fconfigure -strictencoding: change option name to
 "-strictencoding".

---
 generic/tclIO.c  | 12 ++++++------
 generic/tclIO.h  |  4 ++--
 tests/io.test    | 14 --------------
 tests/ioCmd.test | 12 ++++++------
 tests/zlib.test  |  4 ++--
 5 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index cf96559..0f5f9c0 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7913,12 +7913,12 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(2, "-tolerantencoding")) {
+    if (len == 0 || HaveOpt(2, "-strictencoding")) {
 	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-tolerantencoding");
+	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
 	}
 	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "1" : "0");
+		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "0" : "1");
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8179,16 +8179,16 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
-    } else if (HaveOpt(2, "-tolerantencoding")) {
+    } else if (HaveOpt(2, "-strictencoding")) {
 	int newMode;
 
 	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
-	} else {
 	    statePtr->flags &= ~CHANNEL_ENCODING_NOCOMPLAIN;
+	} else {
+	    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
 	}
 	return TCL_OK;
     } else if (HaveOpt(2, "-translation")) {
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 58e0c0f..54ffe0e 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,8 +271,8 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
-#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option -tolerantencoding
-					* is set to 1 */
+#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option -strictencoding
+					 * is set to 0 */
 
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
diff --git a/tests/io.test b/tests/io.test
index adb5620..5c45918 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9006,20 +9006,6 @@ test io-75.3 {incomplete multibyte encoding read is ignored} -setup {
 	removeFile io-75.3
 } -returnCodes ok -result "A\xC0"
 
-test io-75.4 {check if -tolerantencoding option is saved} -setup {
-	set fn [makeFile {} io-75.4]
-    set f [open $fn w]
-} -body {
-	# the following command gets in result error in TCL 9.0
-    fconfigure $f -encoding iso8859-1 -tolerantencoding 0
-	lappend res [fconfigure $f -tolerantencoding]
-    fconfigure $f -encoding iso8859-1 -tolerantencoding 1
-	lappend res [fconfigure $f -tolerantencoding]
-} -cleanup {
-	close $f
-	removeFile io-75.4
-} -returnCodes ok -result "0 1"
-
 # ### ### ### ######### ######### #########
 
 # cleanup
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 908ac5a..178b54a 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -245,7 +245,7 @@ test iocmd-8.7 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -tolerantencoding 1 -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
@@ -257,7 +257,7 @@ test iocmd-8.8 {fconfigure command} -setup {
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -tolerantencoding 1 -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
@@ -267,7 +267,7 @@ test iocmd-8.9 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -strictencoding 1 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -1363,7 +1363,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -tolerantencoding 1 -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1372,7 +1372,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -tolerantencoding 1 -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1384,7 +1384,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -tolerantencoding 1 -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/zlib.test b/tests/zlib.test
index 8c2d368..f848b58 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -tolerantencoding 1 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 330bdbdecea1f151f8d1f1bdb7648ce6161b795e Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Sun, 11 Sep 2022 09:27:10 +0000
Subject: TIP633 fconfigure -strictencoding: make only "-strictencoding 0"
 possible on TCL 8.7

---
 generic/tclIO.c  | 31 +++++++++++--------------------
 generic/tclIO.h  |  2 --
 tests/ioCmd.test | 19 +++++++++++++------
 tests/zlib.test  |  4 ++--
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 0f5f9c0..b801441 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1703,14 +1703,6 @@ Tcl_CreateChannel(
     statePtr->outputEncodingFlags = TCL_ENCODING_START;
 
     /*
-     * Set encoding tolerant mode as default on 8.7.x and off on TCL9.x
-     */
-    
-    #if TCL_MAJOR_VERSION < 9
-    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
-    #endif
-
-    /*
      * Set the channel up initially in AUTO input translation mode to accept
      * "\n", "\r" and "\r\n". Output translation mode is set to a platform
      * specific default value. The eofChar is set to 0 for both input and
@@ -7913,20 +7905,16 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(2, "-strictencoding")) {
+    if (len == 0 || HaveOpt(1, "-strictencoding")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
 	}
-	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "0" : "1");
-	if (len > 0) {
-	    return TCL_OK;
-	}
+	Tcl_DStringAppendElement(dsPtr,"0");
 	if (len > 0) {
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(2, "-translation")) {
+    if (len == 0 || HaveOpt(1, "-translation")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-translation");
 	}
@@ -8179,19 +8167,22 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
-    } else if (HaveOpt(2, "-strictencoding")) {
+    } else if (HaveOpt(1, "-strictencoding")) {
 	int newMode;
 
 	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    statePtr->flags &= ~CHANNEL_ENCODING_NOCOMPLAIN;
-	} else {
-	    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
+	    if (interp) {
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			"bad value for -strictencoding: only false allowed",
+			-1));
+	    }
+	    return TCL_ERROR;
 	}
 	return TCL_OK;
-    } else if (HaveOpt(2, "-translation")) {
+    } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
 
 	if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 54ffe0e..54aa5af 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,8 +271,6 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
-#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option -strictencoding
-					 * is set to 0 */
 
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 178b54a..ad4cd4e 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -245,7 +245,7 @@ test iocmd-8.7 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -strictencoding 0 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
@@ -257,7 +257,7 @@ test iocmd-8.8 {fconfigure command} -setup {
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -strictencoding 0 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
@@ -267,7 +267,7 @@ test iocmd-8.9 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -strictencoding 1 -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -strictencoding 0 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -369,6 +369,13 @@ test iocmd-8.20 {fconfigure command / win console channel} -constraints {nonPort
 } -returnCodes error -result [expectedOpts "-blah" {-inputmode}]
 # TODO: Test parsing of serial channel options (nonPortable, since requires an
 # open channel to work with).
+test iocmd-8.21 {fconfigure command / -strictencoding 1 error} -setup {
+    # I don't know how else to open the console, but this is non-portable
+    set console stdin
+} -body {
+    fconfigure $console -strictencoding 1
+} -returnCodes error -result "bad value for -strictencoding: only false allowed"
+
 
 test iocmd-9.1 {eof command} {
     list [catch {eof} msg] $msg $::errorCode
@@ -1363,7 +1370,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1372,7 +1379,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1384,7 +1391,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/zlib.test b/tests/zlib.test
index f848b58..a1c7aa4 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 14086d3b4aca32f2aa71c2799862593f2db4e0fd Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Sun, 11 Sep 2022 09:55:09 +0000
Subject: TIP633 fconfigure -strictencoding: TCL 9 command line implementation

---
 generic/tclIO.c  | 25 +++++++++++++++++++++++++
 generic/tclIO.h  |  2 ++
 tests/io.test    | 26 +++++++-------------------
 tests/ioCmd.test | 12 ++++++------
 tests/zlib.test  |  4 ++--
 5 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5317e30..d8a9760 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7869,6 +7869,19 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
+    if (len == 0 || HaveOpt(1, "-strictencoding")) {
+	if (len == 0) {
+	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
+	}
+	Tcl_DStringAppendElement(dsPtr,
+		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "0" : "1");
+	if (len > 0) {
+	    return TCL_OK;
+	}
+	if (len > 0) {
+	    return TCL_OK;
+	}
+    }
     if (len == 0 || HaveOpt(1, "-translation")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-translation");
@@ -8132,6 +8145,18 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
+    } else if (HaveOpt(1, "-strictencoding")) {
+	int newMode;
+
+	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
+	    return TCL_ERROR;
+	}
+	if (newMode) {
+	    statePtr->flags &= ~CHANNEL_ENCODING_NOCOMPLAIN;
+	} else {
+	    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
+	}
+	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
 
diff --git a/generic/tclIO.h b/generic/tclIO.h
index ca6a0ac..a4128bc 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,6 +271,8 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
+#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option -strictencoding
+					 * is set to 0 */
 
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
diff --git a/tests/io.test b/tests/io.test
index 8ff3972..eaec685 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8952,6 +8952,7 @@ test io-74.1 {[104f2885bb] improper cache validity check} -setup {
     removeFile io-74.1
 } -returnCodes error -match glob -result {can not find channel named "*"}
 
+
 test io-75.1 {multibyte encoding error read results in raw bytes (-strictencoding 0)} -setup {
 	set fn [makeFile {} io-75.1]
     set f [open $fn w+]
@@ -8963,14 +8964,14 @@ test io-75.1 {multibyte encoding error read results in raw bytes (-strictencodin
 	seek $f 0
 	fconfigure $f -encoding utf-8 -strictencoding 0 -buffering none
 } -body {
-	read $f
+	set d [read $f]
+	expr {$d eq "A\xC0\x40"}
 } -cleanup {
 	close $f
 	removeFile io-75.1
-} -returnCodes ok -result "A\xC0\x40"
-# for TCL 9.0, the result is error
+} -returnCodes ok -result 1
 
-test io-75.2 {unrepresentable character write passes and is replaced by ? (-strictencoding 0)} -constraints deprecated -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ? (-strictencoding 0)} -setup {
 	set fn [makeFile {} io-75.2]
     set f [open $fn w+]
     fconfigure $f -encoding iso8859-1 -strictencoding 0
@@ -9025,7 +9026,7 @@ test io-75.5 {unrepresentable character write passes and is replaced by ? (-stri
 	set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding iso8859-1
-} -constraints knownBug -body {
+} -body {
 	puts -nonewline $f "A\u2022"
 } -cleanup {
 	close $f
@@ -9043,7 +9044,7 @@ test io-75.6 {incomplete multibyte encoding read is ignored (-strictencoding 1)}
 	flush $f
 	seek $f 0
 	fconfigure $f -encoding utf-8 -buffering none
-} -constraints knownBug -body {
+} -body {
 	set d [read $f]
 	close $f
 	set d
@@ -9051,19 +9052,6 @@ test io-75.6 {incomplete multibyte encoding read is ignored (-strictencoding 1)}
 	removeFile io-75.5
 } -returnCodes error
 
-test io-75.7 {check if -tolerantencoding option is saved} -setup {
-	set fn [makeFile {} io-75.7]
-    set f [open $fn w]
-} -body {
-    fconfigure $f -encoding iso8859-1 -strictencoding 0
-	lappend res [fconfigure $f -strictencoding]
-    fconfigure $f -encoding iso8859-1 -strictencoding 1
-	lappend res [fconfigure $f -strictencoding]
-} -cleanup {
-	close $f
-	removeFile io-75.7
-} -returnCodes ok -result "0 1"
-
 # ### ### ### ######### ######### #########
 
 # cleanup
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index dbca866..178b54a 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -245,7 +245,7 @@ test iocmd-8.7 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
@@ -257,7 +257,7 @@ test iocmd-8.8 {fconfigure command} -setup {
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
@@ -267,7 +267,7 @@ test iocmd-8.9 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -strictencoding 1 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -1363,7 +1363,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1372,7 +1372,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1384,7 +1384,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/zlib.test b/tests/zlib.test
index 7de6d64..f848b58 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 32439d945eea3cc4754f2779090075c16256f18a Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Sun, 11 Sep 2022 13:45:04 +0000
Subject: Ticket [6978c01b65]: write not encodable character->report to script
 level Test io-75.5 now ok.

---
 generic/tclIO.c | 13 +++++++++++++
 tests/io.test   |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5317e30..732e103 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4356,6 +4356,19 @@ Write(
 
 	statePtr->outputEncodingFlags &= ~TCL_ENCODING_START;
 
+	/*
+	 * See io-75.2, TCL bug 6978c01b65.
+	 * Check, if an encoding error occured and should be reported to the
+	 * script level.
+	 * This happens, if a written character may not be represented by the
+	 * current output encoding and strict encoding is active.hao_	
+	 */
+	
+	if (result == TCL_CONVERT_UNKNOWN) {
+	    Tcl_SetErrno(EILSEQ);
+	    return -1;
+	}
+	
 	if ((result != TCL_OK) && (srcRead + dstWrote == 0)) {
 	    /*
 	     * We're reading from invalid/incomplete UTF-8.
diff --git a/tests/io.test b/tests/io.test
index 8b93317..9204208 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8977,7 +8977,7 @@ test io-75.5 {unrepresentable character write passes and is replaced by ?} -setu
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding iso8859-1
-} -constraints knownBug -body {
+} -body {
     puts -nonewline $f "A\u2022"
 } -body {
     puts -nonewline $f "A\u2022"
@@ -8987,7 +8987,7 @@ test io-75.5 {unrepresentable character write passes and is replaced by ?} -setu
 } -cleanup {
     close $f
     removeFile io-75.5
-} -returnCodes error
+} -returnCodes error -match glob -result {error writing "*": illegal byte sequence}
 
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
-- 
cgit v0.12


From 8f0f3b11657ba48eee382942394b7741af6b02cf Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 11 Sep 2022 20:48:49 +0000
Subject: Change io-75.5 to test for both written output and which exception is
 thrown. This shows the bug is not fixed yet .... :-(

---
 tests/io.test | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 9204208..3c7811a 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8977,17 +8977,17 @@ test io-75.5 {unrepresentable character write passes and is replaced by ?} -setu
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding iso8859-1
-} -body {
+} -constraints knownBug -body {
     puts -nonewline $f "A\u2022"
 } -body {
-    puts -nonewline $f "A\u2022"
+    catch {puts -nonewline $f "A\u2022"} msg
     flush $f
     seek $f 0
-    read $f
+    list [read $f] $msg
 } -cleanup {
     close $f
     removeFile io-75.5
-} -returnCodes error -match glob -result {error writing "*": illegal byte sequence}
+} -match glob -result [list {A} {error writing "*": illegal byte sequence}]
 
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
-- 
cgit v0.12


From f5846ef8f5f21d1aad31894ecee56c0c5cd5c3c1 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 12 Sep 2022 10:47:30 +0000
Subject: TIP633 fconfigure -strictencoding: implement write -strictencoding 0.

---
 generic/tclIO.c | 10 ++++++++++
 tests/io.test   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 37bef84..4715954 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4345,6 +4345,16 @@ Write(
 	}
 	dst = InsertPoint(bufPtr);
 	dstLen = SpaceLeft(bufPtr);
+	
+	/*
+	 * Transfer encoding strict option to the encoding flags
+	 */
+	
+	if (statePtr->flags & CHANNEL_ENCODING_NOCOMPLAIN) {
+	    statePtr->outputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
+	} else {
+	    statePtr->outputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
+	}
 
 	result = Tcl_UtfToExternal(NULL, encoding, src, srcLimit,
 		statePtr->outputEncodingFlags,
diff --git a/tests/io.test b/tests/io.test
index aeec781..dbb74f0 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9014,7 +9014,7 @@ test io-75.4 {multibyte encoding error read results in raw bytes (-strictencodin
 	flush $f
 	seek $f 0
 	fconfigure $f -encoding utf-8 -buffering none
-} -constraints knownBug -body {
+} -body {
 	read $f
 } -cleanup {
 	close $f
-- 
cgit v0.12


From c36fa478b248c2d1444e72ff0a27edc1fddbb208 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 12 Sep 2022 10:59:44 +0000
Subject: TIP633 fconfigure -strictencoding: move transfer over the loop. Adapt
 test suite to use hex results to prevent blocking on console output.

---
 generic/tclIO.c | 20 ++++++++++----------
 tests/io.test   | 10 ++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 4715954..c2f6add 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4308,6 +4308,16 @@ Write(
     }
 
     /*
+     * Transfer encoding strict option to the encoding flags
+     */
+
+    if (statePtr->flags & CHANNEL_ENCODING_NOCOMPLAIN) {
+	statePtr->outputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
+    } else {
+	statePtr->outputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
+    }
+
+    /*
      * Write the terminated escape sequence even if srcLen is 0.
      */
 
@@ -4346,16 +4356,6 @@ Write(
 	dst = InsertPoint(bufPtr);
 	dstLen = SpaceLeft(bufPtr);
 	
-	/*
-	 * Transfer encoding strict option to the encoding flags
-	 */
-	
-	if (statePtr->flags & CHANNEL_ENCODING_NOCOMPLAIN) {
-	    statePtr->outputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-	} else {
-	    statePtr->outputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
-	}
-
 	result = Tcl_UtfToExternal(NULL, encoding, src, srcLimit,
 		statePtr->outputEncodingFlags,
 		&statePtr->outputEncodingState, dst,
diff --git a/tests/io.test b/tests/io.test
index dbb74f0..479695d 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8964,11 +8964,12 @@ test io-75.1 {multibyte encoding error read results in raw bytes (-strictencodin
 	fconfigure $f -encoding utf-8 -strictencoding 0 -buffering none
 } -body {
 	set d [read $f]
-	expr {$d eq "A\xC0\x40"}
+	binary scan $d H* hd
+	set hd
 } -cleanup {
 	close $f
 	removeFile io-75.1
-} -returnCodes ok -result 1
+} -returnCodes ok -result "41C040"
 
 test io-75.2 {unrepresentable character write passes and is replaced by ? (-strictencoding 0)} -setup {
 	set fn [makeFile {} io-75.2]
@@ -8999,10 +9000,11 @@ test io-75.3 {incomplete multibyte encoding read is ignored} -setup {
 } -body {
 	set d [read $f]
 	close $f
-	set d
+	binary scan $d H* hd
+	set hd
 } -cleanup {
 	removeFile io-75.3
-} -returnCodes ok -result "A\xC0"
+} -returnCodes ok -result "41C0"
 
 test io-75.4 {multibyte encoding error read results in raw bytes (-strictencoding 1} -setup {
 	set fn [makeFile {} io-75.4]
-- 
cgit v0.12


From 393743bb7088f57b28cd5f98d2c9f70189807a2e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 12 Sep 2022 20:41:29 +0000
Subject: Start TIP #346 implementation: For now only \xC0\x80

---
 generic/tcl.h         |  1 +
 generic/tclCmdAH.c    | 22 ++++++++++++++++------
 generic/tclEncoding.c |  8 ++++++--
 tests/cmdAH.test      | 24 ++++++++++++------------
 tests/encoding.test   |  4 ++--
 tests/safe.test       |  8 ++++----
 6 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index f17d43e..acff803 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2118,6 +2118,7 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_CHAR_LIMIT		0x10
 #define TCL_ENCODING_MODIFIED		0x20
 #define TCL_ENCODING_NOCOMPLAIN		0x40
+#define TCL_ENCODING_STRICT			0x44
 
 /*
  * The following definitions are the error codes returned by the conversion
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 28fc210..572a995 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -564,8 +564,10 @@ EncodingConvertfromObjCmd(
      * 2) encoding data					-> objc = 3
      * 3) -nocomplain data				-> objc = 3
      * 4) -nocomplain encoding data			-> objc = 4
-     * 5) -failindex val data				-> objc = 4
-     * 6) -failindex val encoding data			-> objc = 5
+     * 5) -strict data				-> objc = 3
+     * 6) -strict encoding data			-> objc = 4
+     * 7) -failindex val data				-> objc = 4
+     * 8) -failindex val encoding data			-> objc = 5
      */
 
     if (objc == 2) {
@@ -579,6 +581,10 @@ EncodingConvertfromObjCmd(
 		&& !strncmp(bytesPtr, "-nocomplain", strlen(bytesPtr))) {
 	    flags = TCL_ENCODING_NOCOMPLAIN;
 	    objcUnprocessed--;
+	} else if (bytesPtr[0] == '-' && bytesPtr[1] == 's'
+		&& !strncmp(bytesPtr, "-strict", strlen(bytesPtr))) {
+	    flags = TCL_ENCODING_STRICT;
+	    objcUnprocessed--;
 	} else if (bytesPtr[0] == '-' && bytesPtr[1] == 'f'
 		&& !strncmp(bytesPtr, "-failindex", strlen(bytesPtr))) {
 	    /* at least two additional arguments needed */
@@ -603,7 +609,7 @@ EncodingConvertfromObjCmd(
 	}
     } else {
     encConvFromError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-strict? ?-failindex var? ?encoding? data");
 	return TCL_ERROR;
     }
 
@@ -621,7 +627,7 @@ EncodingConvertfromObjCmd(
     }
     result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length,
 	    flags, &ds);
-    if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != TCL_INDEX_NONE)) {
+    if ((!(flags & TCL_ENCODING_NOCOMPLAIN) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) && (result != TCL_INDEX_NONE)) {
 	if (failVarObj != NULL) {
 	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
 		return TCL_ERROR;
@@ -714,6 +720,10 @@ EncodingConverttoObjCmd(
 		&& !strncmp(stringPtr, "-nocomplain", strlen(stringPtr))) {
 	    flags = TCL_ENCODING_NOCOMPLAIN;
 	    objcUnprocessed--;
+	} else if (stringPtr[0] == '-' && stringPtr[1] == 's'
+		&& !strncmp(stringPtr, "-strict", strlen(stringPtr))) {
+	    flags = TCL_ENCODING_STRICT;
+	    objcUnprocessed--;
 	} else if (stringPtr[0] == '-' && stringPtr[1] == 'f'
 		&& !strncmp(stringPtr, "-failindex", strlen(stringPtr))) {
 	    /* at least two additional arguments needed */
@@ -738,7 +748,7 @@ EncodingConverttoObjCmd(
 	}
     } else {
     encConvToError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-strict? ?-failindex var? ?encoding? data");
 	return TCL_ERROR;
     }
 
@@ -749,7 +759,7 @@ EncodingConverttoObjCmd(
     stringPtr = TclGetStringFromObj(data, &length);
     result = Tcl_UtfToExternalDStringEx(encoding, stringPtr, length,
 	    flags, &ds);
-    if (!(flags & TCL_ENCODING_NOCOMPLAIN) && (result != TCL_INDEX_NONE)) {
+    if ((!(flags & TCL_ENCODING_NOCOMPLAIN) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) && (result != TCL_INDEX_NONE)) {
 	if (failVarObj != NULL) {
 	    /* I hope, wide int will cover size_t data type */
 	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 0ce75b4..9c4b5ce 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2288,7 +2288,7 @@ BinaryProc(
  */
 
 #if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
-#   define STOPONERROR !(flags & TCL_ENCODING_NOCOMPLAIN)
+#   define STOPONERROR (!(flags & TCL_ENCODING_NOCOMPLAIN) || (flags & TCL_ENCODING_STOPONERROR))
 #else
 #   define STOPONERROR (flags & TCL_ENCODING_STOPONERROR)
 #endif
@@ -2359,10 +2359,14 @@ UtfToUtfProc(
 
 	    *dst++ = *src++;
 	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-		&& (UCHAR(src[1]) == 0x80) && !(flags & TCL_ENCODING_MODIFIED)) {
+		&& (UCHAR(src[1]) == 0x80) && (!(flags & TCL_ENCODING_MODIFIED) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
 	    /*
 	     * Convert 0xC080 to real nulls when we are in output mode.
 	     */
+		if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+		result = TCL_CONVERT_UNKNOWN;
+		break;
+		}
 
 	    *dst++ = 0;
 	    src += 2;
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index ab1a8e6..64991af 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -178,7 +178,7 @@ test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
 } -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
 test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.4 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto foo bar
 } -result {unknown encoding "foo"}
@@ -200,7 +200,7 @@ test cmdAH-4.6 {Tcl_EncodingObjCmd} -setup {
 } -result 8C
 test cmdAH-4.7 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.8 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom foo bar
 } -result {unknown encoding "foo"}
@@ -237,10 +237,10 @@ test cmdAH-4.13 {Tcl_EncodingObjCmd} -setup {
 
 test cmdAH-4.14.1 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.14.2 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertto -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.15.1 {Syntax error, -failindex and -nocomplain, no encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain ABC
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
@@ -249,19 +249,19 @@ test cmdAH-4.15.2 {Syntax error, -failindex and -nocomplain, no encoding} -body
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
 test cmdAH-4.16.1 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.16.2 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertto -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.17.1 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.17.2 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertto -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.18.1 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertfrom -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertfrom -failindex ABC
@@ -269,12 +269,12 @@ test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.18.3 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertto -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertto -failindex ABC
@@ -282,7 +282,7 @@ test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.19.1 {convertrom -failindex with correct data} -body {
diff --git a/tests/encoding.test b/tests/encoding.test
index 6f11968..c8f409e 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -669,10 +669,10 @@ test encoding-24.21 {Parse with -nocomplain but without providing encoding} {
 } 1
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 
 file delete [file join [temporaryDirectory] iso2022.txt]
 
diff --git a/tests/safe.test b/tests/safe.test
index fc7c814..148215a 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1269,7 +1269,7 @@ test safe-11.7 {testing safe encoding} -setup {
     interp eval $i encoding convertfrom
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test safe-11.7.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1278,7 +1278,7 @@ test safe-11.7.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"
     while executing
 "encoding convertfrom"
     invoked from within
@@ -1291,7 +1291,7 @@ test safe-11.8 {testing safe encoding} -setup {
     interp eval $i encoding convertto
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test safe-11.8.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1300,7 +1300,7 @@ test safe-11.8.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"
     while executing
 "encoding convertto"
     invoked from within
-- 
cgit v0.12


From 2e97ff6575a090c476f6f9ca06e7f1c960f85222 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 13 Sep 2022 15:59:22 +0000
Subject: Mark 2 testcases as knownBug. Looks related to [6978c01b65]

---
 tests/io.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 03ed24d..012843c 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8967,7 +8967,7 @@ test io-75.6 {multibyte encoding error read results in raw bytes} -setup {
     flush $f
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none
-} -body {
+} -constraints knownBug -body {
     set d [read $f]
     binary scan $d H* hd
     set hd
@@ -9026,7 +9026,7 @@ test io-75.9 {shiftjis encoding error read results in raw bytes} -setup {
     flush $f
     seek $f 0
     fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf
-} -body {
+} -constraints knownBug -body {
     set d [read $f]
     binary scan $d H* hd
     set hd
-- 
cgit v0.12


From fd14473a4c83f51302ba81076ec2f9d3ce9be74b Mon Sep 17 00:00:00 2001
From: bch <brad.harder@gmail.com>
Date: Tue, 13 Sep 2022 21:50:17 +0000
Subject: fix logical-or markup in documentation

---
 doc/ListObj.3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ListObj.3 b/doc/ListObj.3
index 182f2fb..a0ed5c9 100644
--- a/doc/ListObj.3
+++ b/doc/ListObj.3
@@ -59,7 +59,7 @@ points to the Tcl value that will be appended to \fIlistPtr\fR.
 For \fBTcl_SetListObj\fR,
 this points to the Tcl value that will be converted to a list value
 containing the \fIobjc\fR elements of the array referenced by \fIobjv\fR.
-.AP size_t | int *objcPtr in
+.AP "size_t \&| int" *objcPtr in
 Points to location where \fBTcl_ListObjGetElements\fR
 stores the number of element values in \fIlistPtr\fR.
 .AP Tcl_Obj ***objvPtr out
@@ -76,7 +76,7 @@ An array of pointers to values.
 \fBTcl_NewListObj\fR will insert these values into a new list value
 and \fBTcl_ListObjReplace\fR will insert them into an existing \fIlistPtr\fR.
 Each value will become a separate list element.
-.AP size_t | int *lengthPtr out
+.AP "size_t \&| int" *lengthPtr out
 Points to location where \fBTcl_ListObjLength\fR
 stores the length of the list.
 .AP size_t index in
-- 
cgit v0.12


From a267b4feeba6903ec6b84d760f0dfa05812b79fe Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 14 Sep 2022 07:19:10 +0000
Subject: More logical-or markup fixes in documentation

---
 doc/ByteArrObj.3 | 2 +-
 doc/DictObj.3    | 2 +-
 doc/FileSystem.3 | 2 +-
 doc/ParseArgs.3  | 2 +-
 doc/SplitList.3  | 2 +-
 doc/SplitPath.3  | 2 +-
 doc/StringObj.3  | 2 +-
 generic/tclInt.h | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/ByteArrObj.3 b/doc/ByteArrObj.3
index ad1eb32..69f55d6 100644
--- a/doc/ByteArrObj.3
+++ b/doc/ByteArrObj.3
@@ -43,7 +43,7 @@ overwritten by a byte-array value.  For \fBTcl_GetBytesFromObj\fR,
 to the value from which to extract an array of bytes.
 .AP Tcl_Interp *interp in
 Interpreter to use for error reporting.
-.AP "size_t | int" *numBytesPtr out
+.AP "size_t \&| int" *numBytesPtr out
 Points to space where the number of bytes in the array may be written.
 Caller may pass NULL when it does not need this information.
 .BE
diff --git a/doc/DictObj.3 b/doc/DictObj.3
index c03d267..ebff7bf 100644
--- a/doc/DictObj.3
+++ b/doc/DictObj.3
@@ -70,7 +70,7 @@ Points to a variable that will have the value from a key/value pair
 placed within it.  For \fBTcl_DictObjFirst\fR and
 \fBTcl_DictObjNext\fR, this may be NULL to indicate that the caller is
 not interested in the value.
-.AP size_t | int *sizePtr out
+.AP "size_t \&| int" *sizePtr out
 Points to a variable that will have the number of key/value pairs
 contained within the dictionary placed within it.
 .AP Tcl_DictSearch *searchPtr in/out
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index 0975dbe..ae4f4b3 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -269,7 +269,7 @@ allowed for the \fImode\fR argument to the Tcl \fBopen\fR command.
 .AP int permissions in
 POSIX-style permission flags such as 0644. If a new file is created, these
 permissions will be set on the created file.
-.AP size_t | int *lenPtr out
+.AP "size_t \&| int" *lenPtr out
 If non-NULL, filled with the number of elements in the split path.
 .AP Tcl_Obj *basePtr in
 The base path on to which to join the given elements. May be NULL.
diff --git a/doc/ParseArgs.3 b/doc/ParseArgs.3
index 02b52d4..6a5184f 100644
--- a/doc/ParseArgs.3
+++ b/doc/ParseArgs.3
@@ -21,7 +21,7 @@ int
 Where to store error messages.
 .AP "const Tcl_ArgvInfo" *argTable in
 Pointer to array of option descriptors.
-.AP size_t | int *objcPtr in/out
+.AP "size_t \&| int" *objcPtr in/out
 A pointer to variable holding number of arguments in \fIobjv\fR. Will be
 modified to hold number of arguments left in the unprocessed argument list
 stored in \fIremObjv\fR.
diff --git a/doc/SplitList.3 b/doc/SplitList.3
index f56330b..6d9a9aa 100644
--- a/doc/SplitList.3
+++ b/doc/SplitList.3
@@ -38,7 +38,7 @@ Interpreter to use for error reporting.  If NULL, then no error message
 is left.
 .AP "const char" *list in
 Pointer to a string with proper list structure.
-.AP size_t | int *argcPtr out
+.AP "size_t \&| int" *argcPtr out
 Filled in with number of elements in \fIlist\fR.
 .AP "const char" ***argvPtr out
 \fI*argvPtr\fR will be filled in with the address of an array of
diff --git a/doc/SplitPath.3 b/doc/SplitPath.3
index ff16792..10e84f5 100644
--- a/doc/SplitPath.3
+++ b/doc/SplitPath.3
@@ -25,7 +25,7 @@ Tcl_PathType
 .AP "const char" *path in
 File path in a form appropriate for the current platform (see the
 \fBfilename\fR manual entry for acceptable forms for path names).
-.AP size_t | int *argcPtr out
+.AP "size_t \&| int" *argcPtr out
 Filled in with number of path elements in \fIpath\fR.
 .AP "const char" ***argvPtr out
 \fI*argvPtr\fR will be filled in with the address of an array of
diff --git a/doc/StringObj.3 b/doc/StringObj.3
index 4991f1c..14041c5 100644
--- a/doc/StringObj.3
+++ b/doc/StringObj.3
@@ -118,7 +118,7 @@ the last one available.
 Points to a value to manipulate.
 .AP Tcl_Obj *appendObjPtr in
 The value to append to \fIobjPtr\fR in \fBTcl_AppendObjToObj\fR.
-.AP size_t | int *lengthPtr out
+.AP "size_t \&| int" *lengthPtr out
 The location where \fBTcl_GetStringFromObj\fR will store the length
 of a value's string representation. May be (int *)NULL when not used.
 .AP "const char" *string in
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 1c1e797..768aedf 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4833,7 +4833,7 @@ MODULE_SCOPE const TclFileAttrProcs	tclpFileAttrProcs[];
  * of counting along a string of all one-byte characters.  The ANSI C
  * "prototype" for this macro is:
  *
- * MODULE_SCOPE void	TclNumUtfCharsM(int | size_t numChars, const char *bytes,
+ * MODULE_SCOPE void	TclNumUtfCharsM(size_t numChars, const char *bytes,
  *				size_t numBytes);
  *----------------------------------------------------------------
  */
-- 
cgit v0.12


From 184e43e860ab041daae004b1d500f0c231f3ef74 Mon Sep 17 00:00:00 2001
From: bch <brad.harder@gmail.com>
Date: Thu, 15 Sep 2022 04:49:33 +0000
Subject: doc - describe proper prototype -- even though they are identical
 signatures atm

---
 doc/CrtChnlHdlr.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/CrtChnlHdlr.3 b/doc/CrtChnlHdlr.3
index c9f4efe..ee8b411 100644
--- a/doc/CrtChnlHdlr.3
+++ b/doc/CrtChnlHdlr.3
@@ -29,7 +29,7 @@ Tcl channel such as returned by \fBTcl_CreateChannel\fR.
 Conditions under which \fIproc\fR should be called: OR-ed combination of
 \fBTCL_READABLE\fR, \fBTCL_WRITABLE\fR and \fBTCL_EXCEPTION\fR. Specify
 a zero value to temporarily disable an existing handler.
-.AP Tcl_FileProc *proc in
+.AP Tcl_ChannelProc *proc in
 Procedure to invoke whenever the channel indicated by \fIchannel\fR meets
 the conditions specified by \fImask\fR.
 .AP void *clientData in
-- 
cgit v0.12


From 7a073b3366cbaab135a569a1690eda1bcfe9b8c2 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 15 Sep 2022 11:48:56 +0000
Subject: Silence compiler warnings.

---
 generic/tclFCmd.c     | 2 +-
 generic/tclFileName.c | 2 --
 generic/tclPathObj.c  | 7 +++----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 6bf34d8..89550d9 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -871,7 +871,7 @@ FileForceOption(
 
 static Tcl_Obj *
 FileBasename(
-    Tcl_Interp *interp,		/* Interp, for error return. */
+    TCL_UNUSED(Tcl_Interp *),	/* Interp, for error return. */
     Tcl_Obj *pathPtr)		/* Path whose basename to extract. */
 {
     size_t objc;
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index d560710..476629a 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -26,8 +26,6 @@ TclPlatformType tclPlatform = TCL_PLATFORM_UNIX;
  * Prototypes for local procedures defined in this file:
  */
 
-static const char *	DoTildeSubst(Tcl_Interp *interp,
-			    const char *user, Tcl_DString *resultPtr);
 static const char *	ExtractWinRoot(const char *path,
 			    Tcl_DString *resultPtr, int offset,
 			    Tcl_PathType *typePtr);
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 2fbeea3..361fad5 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -540,7 +540,7 @@ TclFSGetPathType(
 
 Tcl_Obj *
 TclPathPart(
-    Tcl_Interp *interp,		/* Used for error reporting */
+    TCL_UNUSED(Tcl_Interp *),	/* Used for error reporting */
     Tcl_Obj *pathPtr,		/* Path to take dirname of */
     Tcl_PathPart portion)	/* Requested portion of name */
 {
@@ -2174,13 +2174,12 @@ Tcl_FSEqualPaths(
 
 static int
 SetFsPathFromAny(
-    Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
+    TCL_UNUSED(Tcl_Interp *),	/* Used for error reporting if not NULL. */
     Tcl_Obj *pathPtr)		/* The object to convert. */
 {
     size_t len;
     FsPath *fsPathPtr;
     Tcl_Obj *transPtr;
-    const char *name;
 
     if (TclHasInternalRep(pathPtr, &fsPathType)) {
 	return TCL_OK;
@@ -2200,7 +2199,7 @@ SetFsPathFromAny(
      * cmdAH.test exercise most of the code).
      */
 
-    name = Tcl_GetStringFromObj(pathPtr, &len);
+    Tcl_GetStringFromObj(pathPtr, &len); /* TODO: Is this needed? */
     transPtr = TclJoinPath(1, &pathPtr, 1);
 
     /*
-- 
cgit v0.12


From ddde6c7c506fc37df04bd8eea0ee4dbd3e3cae2d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 15 Sep 2022 11:55:46 +0000
Subject: Update test results

---
 tests/cmdAH.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 3c78842..b52d105 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -362,7 +362,7 @@ test cmdAH-5.1 {Tcl_FileObjCmd} -returnCodes error -body {
 } -result {wrong # args: should be "file subcommand ?arg ...?"}
 test cmdAH-5.2 {Tcl_FileObjCmd} -returnCodes error -body {
     file x
-} -result {unknown or ambiguous subcommand "x": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, home, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, type, volumes, or writable}
+} -result {unknown or ambiguous subcommand "x": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, home, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, tildeexpand, type, volumes, or writable}
 test cmdAH-5.3 {Tcl_FileObjCmd} -returnCodes error -body {
     file exists
 } -result {wrong # args: should be "file exists name"}
@@ -1669,7 +1669,7 @@ test cmdAH-29.6.1 {
 # Error conditions
 test cmdAH-30.1 {Tcl_FileObjCmd: error conditions} -returnCodes error -body {
     file gorp x
-} -result {unknown or ambiguous subcommand "gorp": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, home, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, type, volumes, or writable}
+} -result {unknown or ambiguous subcommand "gorp": must be atime, attributes, channels, copy, delete, dirname, executable, exists, extension, home, isdirectory, isfile, join, link, lstat, mkdir, mtime, nativename, normalize, owned, pathtype, readable, readlink, rename, rootname, separator, size, split, stat, system, tail, tempdir, tempfile, tildeexpand, type, volumes, or writable}
 test cmdAH-30.2 {Tcl_FileObjCmd: error conditions} -returnCodes error -body {
     file ex x
 } -match glob -result {unknown or ambiguous subcommand "ex": must be *}
-- 
cgit v0.12


From 4968ffa1ce26b16430b8237f14784242c1075a1b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 15 Sep 2022 15:59:11 +0000
Subject: [51d5f22997] Protect against passing negative size to Tcl_NewListObj.

---
 generic/tclProc.c | 2 +-
 tests/proc.test   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/generic/tclProc.c b/generic/tclProc.c
index b846269..4d421c7 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1431,7 +1431,7 @@ InitArgsAndLocals(
 
     varPtr->flags = 0;
     if (defPtr && defPtr->flags & VAR_IS_ARGS) {
-	Tcl_Obj *listPtr = Tcl_NewListObj(argCt-i, argObjs+i);
+	Tcl_Obj *listPtr = Tcl_NewListObj((argCt>i)? argCt-i : 0, argObjs+i);
 
 	varPtr->value.objPtr = listPtr;
 	Tcl_IncrRefCount(listPtr);	/* Local var is a reference. */
diff --git a/tests/proc.test b/tests/proc.test
index b87af57..118dca1 100644
--- a/tests/proc.test
+++ b/tests/proc.test
@@ -412,6 +412,13 @@ test proc-7.5 {[631b4c45df] Crash in argument processing} {
     unset -nocomplain val
 } {}
 
+test proc-7.6 {[51d5f22997] Crash in argument processing} -cleanup {
+    rename foo {}
+} -body {
+    proc foo {{x {}} {y {}} args} {}
+    foo
+} -result {}
+
 
 # cleanup
 catch {rename p ""}
-- 
cgit v0.12


From 7b28b969395da897dfabb2069ebe7c7406a6983a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 15 Sep 2022 16:45:20 +0000
Subject: Remove tilde expansion from docs. Fix comments that referenced the
 same.

---
 doc/Translate.3       |  8 ++++----
 doc/exec.n            |  2 +-
 doc/file.n            | 42 ++++++------------------------------------
 doc/filename.n        | 20 --------------------
 doc/glob.n            | 10 ----------
 generic/tclFileName.c | 28 ++++++++++------------------
 generic/tclPathObj.c  |  4 ----
 7 files changed, 21 insertions(+), 93 deletions(-)

diff --git a/doc/Translate.3 b/doc/Translate.3
index 38831d3..256baec 100644
--- a/doc/Translate.3
+++ b/doc/Translate.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_TranslateFileName \- convert file name to native form and replace tilde with home directory
+Tcl_TranslateFileName \- convert file name to native form
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -34,7 +34,7 @@ anything stored here.
 This utility procedure translates a file name to a platform-specific form
 which, after being converted to the appropriate encoding, is suitable for
 passing to the local operating system.  In particular, it converts
-network names into native form and does tilde substitution.
+network names into native form.
 .PP
 However, with the advent of the newer \fBTcl_FSGetNormalizedPath\fR and
 \fBTcl_FSGetNativePath\fR, there is no longer any need to use this
@@ -45,7 +45,7 @@ Finally \fBTcl_FSGetNativePath\fR does not require you to free anything
 afterwards.
 .PP
 If
-\fBTcl_TranslateFileName\fR has to do tilde substitution or translate
+\fBTcl_TranslateFileName\fR has to translate
 the name then it uses
 the dynamic string at \fI*bufferPtr\fR to hold the new string it
 generates.
@@ -68,4 +68,4 @@ has its default empty value when \fBTcl_TranslateFileName\fR is invoked.
 .SH "SEE ALSO"
 filename(n)
 .SH KEYWORDS
-file name, home directory, tilde, translate, user
+file name, home directory, translate, user
diff --git a/doc/exec.n b/doc/exec.n
index 3cfc29d..1f87818 100644
--- a/doc/exec.n
+++ b/doc/exec.n
@@ -198,7 +198,7 @@ the commands in the pipeline will go to the application's
 standard error file unless redirected.
 .PP
 The first word in each command is taken as the command name;
-tilde-substitution is performed on it, and if the result contains
+if the result contains
 no slashes then the directories
 in the PATH environment variable are searched for
 an executable by the given name.
diff --git a/doc/file.n b/doc/file.n
index daa0ad8..c168e50 100644
--- a/doc/file.n
+++ b/doc/file.n
@@ -16,12 +16,10 @@ file \- Manipulate file names and attributes
 .BE
 .SH DESCRIPTION
 .PP
-This command provides several operations on a file's name or attributes.
-\fIName\fR is the name of a file; if it starts with a tilde, then tilde
-substitution is done before executing the command (see the manual entry for
-\fBfilename\fR for details).  \fIOption\fR indicates what to do with the
-file name.  Any unique abbreviation for \fIoption\fR is acceptable.  The
-valid options are:
+This command provides several operations on a file's name or attributes.  The
+\fIname\fR argument is the name of a file in most cases. The \fIoption\fR
+argument indicates what to do with the file name.  Any unique abbreviation for
+\fIoption\fR is acceptable.  The valid options are:
 .TP
 \fBfile atime \fIname\fR ?\fItime\fR?
 .
@@ -145,21 +143,6 @@ returned.  For example,
 .CE
 .PP
 returns \fBc:/\fR.
-.PP
-Note that tilde substitution will only be
-performed if it is necessary to complete the command. For example,
-.PP
-.CS
-\fBfile dirname\fR ~/src/foo.c
-.CE
-.PP
-returns \fB~/src\fR, whereas
-.PP
-.CS
-\fBfile dirname\fR ~
-.CE
-.PP
-returns \fB/home\fR (or something similar).
 .RE
 .TP
 \fBfile executable \fIname\fR
@@ -397,19 +380,6 @@ Returns a list whose elements are the path components in \fIname\fR.  The
 first element of the list will have the same path type as \fIname\fR.
 All other elements will be relative.  Path separators will be discarded
 unless they are needed to ensure that an element is unambiguously relative.
-For example, under Unix
-.RS
-.PP
-.CS
-\fBfile split\fR /foo/~bar/baz
-.CE
-.PP
-returns
-.QW \fB/\0\0foo\0\0./~bar\0\0baz\fR
-to ensure that later commands
-that use the third component do not attempt to perform tilde
-substitution.
-.RE
 .TP
 \fBfile stat \fIname varName\fR
 .
@@ -506,11 +476,11 @@ native APIs and external programs that require a filename.
 Returns the result of performing tilde substitution on \fIname\fR. If the name
 begins with a tilde, then the file name will be interpreted as if the first
 element is replaced with the location of the home directory for the given user.
-If the tilde is followed immediately by a path separator, the \fBHOME\fR
+If the tilde is followed immediately by a path separator, the \fB$HOME\fR
 environment variable is substituted.  Otherwise the characters between the
 tilde and the next separator are taken as a user name, which is used to
 retrieve the user's home directory for substitution.  An error is raised if the
-\fBHOME\fR environment variable or user does not exist.
+\fB$HOME\fR environment variable or user does not exist.
 .RS
 .PP
 If the file name does not begin with a tilde, it is returned unmodified.
diff --git a/doc/filename.n b/doc/filename.n
index 7b9d6fa..1c49d02 100644
--- a/doc/filename.n
+++ b/doc/filename.n
@@ -118,26 +118,6 @@ Volume-relative path to a file \fBfoo\fR in the root directory of the current
 volume.  This is not a valid UNC path, so the assumption is that the
 extra backslashes are superfluous.
 .RE
-.SH "TILDE SUBSTITUTION"
-.PP
-In addition to the file name rules described above, Tcl also supports
-\fIcsh\fR-style tilde substitution.  If a file name starts with a tilde,
-then the file name will be interpreted as if the first element is
-replaced with the location of the home directory for the given user.  If
-the tilde is followed immediately by a separator, then the \fB$HOME\fR
-environment variable is substituted.  Otherwise the characters between
-the tilde and the next separator are taken as a user name, which is used
-to retrieve the user's home directory for substitution.  This works on
-Unix, MacOS X and Windows (except very old releases).
-.PP
-Old Windows platforms do not support tilde substitution when a user name
-follows the tilde.  On these platforms, attempts to use a tilde followed
-by a user name will generate an error that the user does not exist when
-Tcl attempts to interpret that part of the path or otherwise access the
-file.  The behaviour of these paths when not trying to interpret them is
-the same as on Unix.  File names that have a tilde without a user name
-will be correctly substituted using the \fB$HOME\fR environment
-variable, just like for Unix.
 .SH "PORTABILITY ISSUES"
 .PP
 Not all file systems are case sensitive, so scripts should avoid code
diff --git a/doc/glob.n b/doc/glob.n
index a2cbce2..8a3099e 100644
--- a/doc/glob.n
+++ b/doc/glob.n
@@ -185,16 +185,6 @@ command if you want the list sorted).
 Second, \fBglob\fR only returns the names of files that actually
 exist; in csh no check for existence is made unless a pattern
 contains a ?, *, or [] construct.
-.LP
-When the \fBglob\fR command returns relative paths whose filenames
-start with a tilde
-.QW ~
-(for example through \fBglob *\fR or \fBglob \-tails\fR, the returned
-list will not quote the tilde with
-.QW ./ .
-This means care must be taken if those names are later to
-be used with \fBfile join\fR, to avoid them being interpreted as
-absolute paths pointing to a given user's home directory.
 .SH "WINDOWS PORTABILITY ISSUES"
 .PP
 For Windows UNC names, the servername and sharename components of the path
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 476629a..74e4d7f 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -662,8 +662,7 @@ SplitUnixPath(
     }
 
     /*
-     * Split on slashes. Embedded elements that start with tilde will be
-     * prefixed with "./" so they are not affected by tilde substitution.
+     * Split on slashes.
      */
 
     for (;;) {
@@ -725,9 +724,7 @@ SplitWinPath(
     Tcl_DStringFree(&buf);
 
     /*
-     * Split on slashes. Embedded elements that start with tilde or a drive
-     * letter will be prefixed with "./" so they are not affected by tilde
-     * substitution.
+     * Split on slashes.
      */
 
     do {
@@ -836,7 +833,7 @@ TclpNativeJoinPath(
     start = Tcl_GetStringFromObj(prefix, &length);
 
     /*
-     * Remove the ./ from tilde prefixed elements, and drive-letter prefixed
+     * Remove the ./ from drive-letter prefixed
      * elements on Windows, unless it is the first component.
      */
 
@@ -999,19 +996,15 @@ Tcl_JoinPath(
  * Tcl_TranslateFileName --
  *
  *	Converts a file name into a form usable by the native system
- *	interfaces. If the name starts with a tilde, it will produce a name
- *	where the tilde and following characters have been replaced by the
- *	home directory location for the named user.
+ *	interfaces.
  *
  * Results:
- *	The return value is a pointer to a string containing the name after
- *	tilde substitution. If there was no tilde substitution, the return
- *	value is a pointer to a copy of the original string. If there was an
+ *	The return value is a pointer to a string containing the name.
+ *      This may either be the name pointer passed in or space allocated in
+ *      bufferPtr. In all cases, if the return value is not NULL, the caller
+ *	must call Tcl_DStringFree() to free the space. If there was an
  *	error in processing the name, then an error message is left in the
  *	interp's result (if interp was not NULL) and the return value is NULL.
- *	Space for the return value is allocated in bufferPtr; the caller must
- *	call Tcl_DStringFree() to free the space if the return value was not
- *	NULL.
  *
  * Side effects:
  *	None.
@@ -1028,7 +1021,7 @@ Tcl_TranslateFileName(
 				 * "~<user>" (to indicate any user's home
 				 * directory). */
     Tcl_DString *bufferPtr)	/* Uninitialized or free DString filled with
-				 * name after tilde substitution. */
+				 * name. */
 {
     Tcl_Obj *path = Tcl_NewStringObj(name, -1);
     Tcl_Obj *transPtr;
@@ -1607,8 +1600,7 @@ Tcl_GlobObjCmd(
  *
  * TclGlob --
  *
- *	Sets the separator string based on the platform, performs tilde
- *	substitution, and calls DoGlob.
+ *	Sets the separator string based on the platform	and calls DoGlob.
  *
  *	The interpreter's result, on entry to this function, must be a valid
  *	Tcl list (e.g. it could be empty), since we will lappend any new
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 361fad5..40955b1 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2159,10 +2159,6 @@ Tcl_FSEqualPaths(
  *	Attempt to convert the internal representation of pathPtr to
  *	fsPathType.
  *
- *	A tilde ("~") character at the beginnig of the filename indicates the
- *	current user's home directory, and "~<user>" indicates a particular
- *	user's directory.
- *
  * Results:
  *	Standard Tcl error code.
  *
-- 
cgit v0.12


From 0c5c7cc5eb0499b1b4f2b9000364ebe52186adf5 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 16 Sep 2022 07:29:15 +0000
Subject: Rename lsubst to ledit, add docs

---
 doc/interp.n        |  20 ++--
 doc/lappend.n       |   2 +-
 doc/lassign.n       |   2 +-
 doc/ledit.n         |  91 ++++++++++++++++++
 doc/lindex.n        |   2 +-
 doc/linsert.n       |   2 +-
 doc/list.n          |   2 +-
 doc/llength.n       |   2 +-
 doc/lmap.n          |   2 +-
 doc/lpop.n          |   2 +-
 doc/lrange.n        |   2 +-
 doc/lremove.n       |   2 +-
 doc/lrepeat.n       |   2 +-
 doc/lreplace.n      |   2 +-
 doc/lreverse.n      |   2 +-
 doc/lsearch.n       |   2 +-
 doc/lset.n          |   2 +-
 doc/lsort.n         |   2 +-
 generic/tclBasic.c  |   2 +-
 generic/tclCmdIL.c  |   8 +-
 generic/tclInt.h    |   6 +-
 tests/lreplace.test | 264 ++++++++++++++++++++++++++--------------------------
 22 files changed, 257 insertions(+), 166 deletions(-)
 create mode 100644 doc/ledit.n

diff --git a/doc/interp.n b/doc/interp.n
index 2943404..b3cc918 100644
--- a/doc/interp.n
+++ b/doc/interp.n
@@ -591,16 +591,16 @@ built-in commands:
 \fBflush\fR	\fBfor\fR	\fBforeach\fR	\fBformat\fR
 \fBgets\fR	\fBglobal\fR	\fBif\fR	\fBincr\fR
 \fBinfo\fR	\fBinterp\fR	\fBjoin\fR	\fBlappend\fR
-\fBlassign\fR	\fBlindex\fR	\fBlinsert\fR	\fBlist\fR
-\fBllength\fR	\fBlrange\fR	\fBlrepeat\fR	\fBlreplace\fR
-\fBlsearch\fR	\fBlset\fR	\fBlsort\fR	\fBnamespace\fR
-\fBpackage\fR	\fBpid\fR	\fBproc\fR	\fBputs\fR
-\fBread\fR	\fBregexp\fR	\fBregsub\fR	\fBrename\fR
-\fBreturn\fR	\fBscan\fR	\fBseek\fR	\fBset\fR
-\fBsplit\fR	\fBstring\fR	\fBsubst\fR	\fBswitch\fR
-\fBtell\fR	\fBtime\fR	\fBtrace\fR	\fBunset\fR
-\fBupdate\fR	\fBuplevel\fR	\fBupvar\fR	\fBvariable\fR
-\fBvwait\fR	\fBwhile\fR
+\fBlassign\fR	\fBledit\fR	\fBlindex\fR	\fBlinsert\fR
+\fBlist\fR	\fBllength\fR	\fBlrange\fR	\fBlrepeat\fR
+\fBlreplace\fR	\fBlsearch\fR	\fBlset\fR	\fBlsort\fR
+\fBnamespace\fR	\fBpackage\fR	\fBpid\fR	\fBproc\fR
+\fBputs\fR	\fBread\fR	\fBregexp\fR	\fBregsub\fR
+\fBrename\fR	\fBreturn\fR	\fBscan\fR	\fBseek\fR
+\fBset\fR	\fBsplit\fR	\fBstring\fR	\fBsubst\fR
+\fBswitch\fR	\fBtell\fR	\fBtime\fR	\fBtrace\fR
+\fBunset\fR	\fBupdate\fR	\fBuplevel\fR	\fBupvar\fR
+\fBvariable\fR	\fBvwait\fR	\fBwhile\fR
 .DE
 The following commands are hidden by \fBinterp create\fR when it
 creates a safe interpreter:
diff --git a/doc/lappend.n b/doc/lappend.n
index 89b6909..3ddb36c 100644
--- a/doc/lappend.n
+++ b/doc/lappend.n
@@ -49,7 +49,7 @@ Using \fBlappend\fR to build up a list of numbers.
 1 2 3 4 5
 .CE
 .SH "SEE ALSO"
-list(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/lassign.n b/doc/lassign.n
index 67048ba..ac53322 100644
--- a/doc/lassign.n
+++ b/doc/lassign.n
@@ -52,7 +52,7 @@ command in many shell languages like this:
 set ::argv [\fBlassign\fR $::argv argumentToReadOff]
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/ledit.n b/doc/ledit.n
new file mode 100644
index 0000000..f7704ed
--- /dev/null
+++ b/doc/ledit.n
@@ -0,0 +1,91 @@
+'\"
+'\" Copyright (c) 2022 Ashok P. Nadkarni <apnmbx-public@yahoo.com>.  All rights reserved.
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+'\"
+.TH ledit n 8.7 Tcl "Tcl Built-In Commands"
+.so man.macros
+.BS
+'\" Note:  do not modify the .SH NAME line immediately below!
+.SH NAME
+ledit \- Replace elements of a list stored in variable
+.SH SYNOPSIS
+\fBledit \fIlistVar first last \fR?\fIvalue value ...\fR?
+.BE
+.SH DESCRIPTION
+.PP
+The command fetches the list value in variable \fIlistVar\fR and replaces the
+elements in the range given by indices \fIfirst\fR to \fIlast\fR (inclusive)
+with the \fIvalue\fR arguments. The resulting list is then stored back in
+\fIlistVar\fR and returned as the result of the command. 
+.PP
+Arguments \fIfirst\fR and \fIlast\fR are index values specifying the first and
+last elements of the range to replace. They are interpreted
+the same as index values for the command \fBstring index\fR,
+supporting simple index arithmetic and indices relative to the
+end of the list. The index 0 refers to the first element of the
+list, and \fBend\fR refers to the last element of the list.
+.PP
+If either \fIfirst\fR or \fIlast\fR is less than zero, it is considered to
+refer to the position before the first element of the list. This allows
+elements to be prepended.
+.PP
+If either \fIfirst\fR or \fIlast\fR indicates a position greater than the
+index of the last element of the list, it is treated as if it is an
+index one greater than the last element. This allows elements to be appended.
+.PP
+If \fIlast\fR is less than \fIfirst\fR, then any specified elements
+will be inserted into the list before the element specified by \fIfirst\fR
+with no elements being deleted.
+.PP
+The \fIvalue\fR arguments specify zero or more new elements to
+be added to the list in place of those that were deleted.
+Each \fIvalue\fR argument will become a separate element of
+the list.  If no \fIvalue\fR arguments are specified, then the elements
+between \fIfirst\fR and \fIlast\fR are simply deleted.
+.SH EXAMPLES
+.PP
+Prepend to a list.
+.PP
+.CS
+% set lst {c d e f g}
+c d e f g
+% ledit lst -1 -1 a b
+a b c d e f g
+.CE
+.PP
+Append to the list.
+.PP
+.CS
+% ledit lst end+1 end+1 h i
+a b c d e f g h i
+.CE
+.PP
+Delete third and fourth elements.
+.PP
+.CS
+% ledit lst 2 3
+a b e f g h i
+.CE
+.PP
+Replace two elements with three.
+.PP
+.CS
+% ledit lst 2 3 x y z
+a b x y z g h i
+% set lst
+a b x y z g h i
+.CE
+.PP
+.SH "SEE ALSO"
+list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
+lreverse(n), lsearch(n), lset(n), lsort(n),
+string(n)
+.SH KEYWORDS
+element, list, replace
+.\" Local variables:
+.\" mode: nroff
+.\" fill-column: 78
+.\" End:
diff --git a/doc/lindex.n b/doc/lindex.n
index 75fe5e8..0ba30a4 100644
--- a/doc/lindex.n
+++ b/doc/lindex.n
@@ -115,7 +115,7 @@ set idx 3
       \fI\(-> f\fR
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n),
 string(n)
diff --git a/doc/linsert.n b/doc/linsert.n
index 3179256..685b563 100644
--- a/doc/linsert.n
+++ b/doc/linsert.n
@@ -45,7 +45,7 @@ set newList [\fBlinsert\fR $midList end-1 lazy]
 set newerList [\fBlinsert\fR [\fBlinsert\fR $oldList end-1 quick] 1 lazy]
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n),
 string(n)
diff --git a/doc/list.n b/doc/list.n
index 3fa1975..1792560 100644
--- a/doc/list.n
+++ b/doc/list.n
@@ -46,7 +46,7 @@ while \fBconcat\fR with the same arguments will return
 \fBa b c d e f {g h}\fR
 .CE
 .SH "SEE ALSO"
-lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/llength.n b/doc/llength.n
index 26824a0..7a3e6de 100644
--- a/doc/llength.n
+++ b/doc/llength.n
@@ -49,7 +49,7 @@ An empty list is not necessarily an empty string:
 1,0
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/lmap.n b/doc/lmap.n
index 026e9d0..29b1242 100644
--- a/doc/lmap.n
+++ b/doc/lmap.n
@@ -78,7 +78,7 @@ set prefix [\fBlmap\fR x $values {expr {
 .CE
 .SH "SEE ALSO"
 break(n), continue(n), for(n), foreach(n), while(n),
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/lpop.n b/doc/lpop.n
index 3d88638..0a156ee 100644
--- a/doc/lpop.n
+++ b/doc/lpop.n
@@ -86,7 +86,7 @@ The indicated value becomes the new value of \fIx\fR.
       \fI\(-> {{a b} {c d}} {{e f} h}\fR
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n),
 string(n)
diff --git a/doc/lrange.n b/doc/lrange.n
index 0d4b261..c0434bb 100644
--- a/doc/lrange.n
+++ b/doc/lrange.n
@@ -71,7 +71,7 @@ elements to
 {elements to}
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n),
 string(n)
diff --git a/doc/lremove.n b/doc/lremove.n
index 59d261b..e71f607 100644
--- a/doc/lremove.n
+++ b/doc/lremove.n
@@ -46,7 +46,7 @@ Removing the same element indicated in two different ways:
 a b d e
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/lrepeat.n b/doc/lrepeat.n
index 9a3fc88..de7ba54 100644
--- a/doc/lrepeat.n
+++ b/doc/lrepeat.n
@@ -32,7 +32,7 @@ is identical to \fBlist element ...\fR.
       \fI\(-> {a a} b c {a a} b c {a a} b c\fR
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/lreplace.n b/doc/lreplace.n
index bc9d7ca..6694ad7 100644
--- a/doc/lreplace.n
+++ b/doc/lreplace.n
@@ -95,7 +95,7 @@ a b c d e f g h i
 .CE
 .VE TIP505
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n),
 lreverse(n), lsearch(n), lset(n), lsort(n),
 string(n)
diff --git a/doc/lreverse.n b/doc/lreverse.n
index e2e3b69..0f0b6d6 100644
--- a/doc/lreverse.n
+++ b/doc/lreverse.n
@@ -25,7 +25,7 @@ input list, \fIlist\fR, except with the elements in the reverse order.
       \fI\(-> f e {c d} b a\fR
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
diff --git a/doc/lsearch.n b/doc/lsearch.n
index c5dc98f..85b8609 100644
--- a/doc/lsearch.n
+++ b/doc/lsearch.n
@@ -229,7 +229,7 @@ The same thing for a flattened list:
 .CE
 .SH "SEE ALSO"
 foreach(n),
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lset(n), lsort(n),
 string(n)
diff --git a/doc/lset.n b/doc/lset.n
index 4b97ed6..588a0a5 100644
--- a/doc/lset.n
+++ b/doc/lset.n
@@ -136,7 +136,7 @@ The indicated return value also becomes the new value of \fIx\fR.
       \fI\(-> {{a b} {c d}} {{e f} {j h}}\fR
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lsort(n)
 string(n)
diff --git a/doc/lsort.n b/doc/lsort.n
index 2018e30..ddf9ed1 100644
--- a/doc/lsort.n
+++ b/doc/lsort.n
@@ -264,7 +264,7 @@ More complex sorting using a comparison function:
 {1 dingo} {2 banana} {0x2 carrot} {3 apple}
 .CE
 .SH "SEE ALSO"
-list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
+list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n)
 .SH KEYWORDS
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index b013909..21503b4 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -324,7 +324,7 @@ static const CmdInfo builtInCmds[] = {
     {"lsearch",		Tcl_LsearchObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
     {"lset",		Tcl_LsetObjCmd,		TclCompileLsetCmd,	NULL,	CMD_IS_SAFE},
     {"lsort",		Tcl_LsortObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
-    {"lsubst",		Tcl_LsubstObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
+    {"ledit",		Tcl_LeditObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
     {"package",		Tcl_PackageObjCmd,	NULL,			TclNRPackageObjCmd,	CMD_IS_SAFE},
     {"proc",		Tcl_ProcObjCmd,		NULL,			NULL,	CMD_IS_SAFE},
     {"regexp",		Tcl_RegexpObjCmd,	TclCompileRegexpCmd,	NULL,	CMD_IS_SAFE},
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 7776c78..b2e3ac8 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -4486,9 +4486,9 @@ Tcl_LsortObjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_LsubstObjCmd --
+ * Tcl_LeditObjCmd --
  *
- *	This procedure is invoked to process the "lsubst" Tcl command. See the
+ *	This procedure is invoked to process the "ledit" Tcl command. See the
  *	user documentation for details on what it does.
  *
  * Results:
@@ -4501,7 +4501,7 @@ Tcl_LsortObjCmd(
  */
 
 int
-Tcl_LsubstObjCmd(
+Tcl_LeditObjCmd(
     TCL_UNUSED(ClientData),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -4529,7 +4529,7 @@ Tcl_LsubstObjCmd(
 
     /*
      * TODO - refactor the index extraction into a common function shared
-     * by Tcl_{Lrange,Lreplace,Lsubst}ObjCmd
+     * by Tcl_{Lrange,Lreplace,Ledit}ObjCmd
      */
 
     result = TclListObjLengthM(interp, listPtr, &listLen);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 155bb82..863251b 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3686,6 +3686,9 @@ MODULE_SCOPE int	Tcl_LappendObjCmd(void *clientData,
 MODULE_SCOPE int	Tcl_LassignObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
+MODULE_SCOPE int	Tcl_LeditObjCmd(ClientData clientData,
+			    Tcl_Interp *interp, int objc,
+			    Tcl_Obj *const objv[]);
 MODULE_SCOPE int	Tcl_LindexObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
@@ -3731,9 +3734,6 @@ MODULE_SCOPE int	Tcl_LsetObjCmd(void *clientData,
 MODULE_SCOPE int	Tcl_LsortObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LsubstObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
 MODULE_SCOPE Tcl_Command TclInitNamespaceCmd(Tcl_Interp *interp);
 MODULE_SCOPE int	TclNamespaceEnsembleCmd(void *dummy,
 			    Tcl_Interp *interp, int objc,
diff --git a/tests/lreplace.test b/tests/lreplace.test
index 4204c2f..2952899 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -236,272 +236,272 @@ apply {{} {
     }
 }}
 
-# Essentially same tests as above but for lsubst
-test lsubst-1.1 {lsubst command} {
+# Essentially same tests as above but for ledit
+test ledit-1.1 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 0 0 a] $l
+    list [ledit l 0 0 a] $l
 } {{a 2 3 4 5} {a 2 3 4 5}}
-test lsubst-1.2 {lsubst command} {
+test ledit-1.2 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 1 1 a] $l
+    list [ledit l 1 1 a] $l
 } {{1 a 3 4 5} {1 a 3 4 5}}
-test lsubst-1.3 {lsubst command} {
+test ledit-1.3 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 2 2 a] $l
+    list [ledit l 2 2 a] $l
 } {{1 2 a 4 5} {1 2 a 4 5}}
-test lsubst-1.4 {lsubst command} {
+test ledit-1.4 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 3 3 a] $l
+    list [ledit l 3 3 a] $l
 } {{1 2 3 a 5} {1 2 3 a 5}}
-test lsubst-1.5 {lsubst command} {
+test ledit-1.5 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 4 4 a] $l
+    list [ledit l 4 4 a] $l
 } {{1 2 3 4 a} {1 2 3 4 a}}
-test lsubst-1.6 {lsubst command} {
+test ledit-1.6 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 4 5 a] $l
+    list [ledit l 4 5 a] $l
 } {{1 2 3 4 a} {1 2 3 4 a}}
-test lsubst-1.7 {lsubst command} {
+test ledit-1.7 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l -1 -1 a] $l
+    list [ledit l -1 -1 a] $l
 } {{a 1 2 3 4 5} {a 1 2 3 4 5}}
-test lsubst-1.8 {lsubst command} {
+test ledit-1.8 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 2 end a b c d] $l
+    list [ledit l 2 end a b c d] $l
 } {{1 2 a b c d} {1 2 a b c d}}
-test lsubst-1.9 {lsubst command} {
+test ledit-1.9 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 0 3] $l
+    list [ledit l 0 3] $l
 } {5 5}
-test lsubst-1.10 {lsubst command} {
+test ledit-1.10 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 0 4] $l
+    list [ledit l 0 4] $l
 } {{} {}}
-test lsubst-1.11 {lsubst command} {
+test ledit-1.11 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 0 1] $l
+    list [ledit l 0 1] $l
 } {{3 4 5} {3 4 5}}
-test lsubst-1.12 {lsubst command} {
+test ledit-1.12 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 2 3] $l
+    list [ledit l 2 3] $l
 } {{1 2 5} {1 2 5}}
-test lsubst-1.13 {lsubst command} {
+test ledit-1.13 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l 3 end] $l
+    list [ledit l 3 end] $l
 } {{1 2 3} {1 2 3}}
-test lsubst-1.14 {lsubst command} {
+test ledit-1.14 {ledit command} {
     set l {1 2 3 4 5}
-    list [lsubst l -1 4 a b c] $l
+    list [ledit l -1 4 a b c] $l
 } {{a b c} {a b c}}
-test lsubst-1.15 {lsubst command} {
+test ledit-1.15 {ledit command} {
     set l {a b "c c" d e f}
-    list [lsubst l 3 3] $l
+    list [ledit l 3 3] $l
 } {{a b {c c} e f} {a b {c c} e f}}
-test lsubst-1.16 {lsubst command} {
+test ledit-1.16 {ledit command} {
     set l { 1 2 3 4 5}
-    list [lsubst l 0 0 a] $l
+    list [ledit l 0 0 a] $l
 } {{a 2 3 4 5} {a 2 3 4 5}}
-test lsubst-1.17 {lsubst command} {
+test ledit-1.17 {ledit command} {
     set l {1 2 3 4 "5 6"}
-    list [lsubst l 4 4 a] $l
+    list [ledit l 4 4 a] $l
 } {{1 2 3 4 a} {1 2 3 4 a}}
-test lsubst-1.18 {lsubst command} {
+test ledit-1.18 {ledit command} {
     set l {1 2 3 4 {5 6}}
-    list [lsubst l 4 4 a] $l
+    list [ledit l 4 4 a] $l
 } {{1 2 3 4 a} {1 2 3 4 a}}
-test lsubst-1.19 {lsubst command} {
+test ledit-1.19 {ledit command} {
     set l {1 2 3 4}
-    list [lsubst l 2 end x y z] $l
+    list [ledit l 2 end x y z] $l
 } {{1 2 x y z} {1 2 x y z}}
-test lsubst-1.20 {lsubst command} {
+test ledit-1.20 {ledit command} {
     set l {1 2 3 4}
-    list [lsubst l end end a] $l
+    list [ledit l end end a] $l
 } {{1 2 3 a} {1 2 3 a}}
-test lsubst-1.21 {lsubst command} {
+test ledit-1.21 {ledit command} {
     set l {1 2 3 4}
-    list [lsubst l end 3 a] $l
+    list [ledit l end 3 a] $l
 } {{1 2 3 a} {1 2 3 a}}
-test lsubst-1.22 {lsubst command} {
+test ledit-1.22 {ledit command} {
     set l {1 2 3 4}
-    list [lsubst l end end] $l
+    list [ledit l end end] $l
 } {{1 2 3} {1 2 3}}
-test lsubst-1.23 {lsubst command} {
+test ledit-1.23 {ledit command} {
     set l {1 2 3 4}
-    list [lsubst l 2 -1 xy] $l
+    list [ledit l 2 -1 xy] $l
 } {{1 2 xy 3 4} {1 2 xy 3 4}}
-test lsubst-1.24 {lsubst command} {
+test ledit-1.24 {ledit command} {
     set l {1 2 3 4}
-    list [lsubst l end -1 z] $l
+    list [ledit l end -1 z] $l
 } {{1 2 3 z 4} {1 2 3 z 4}}
-test lsubst-1.25 {lsubst command} {
+test ledit-1.25 {ledit command} {
     set l {\}\     hello}
-    concat \"[lsubst l end end]\" $l
+    concat \"[ledit l end end]\" $l
 } {"\}\ " \}\ }
-test lsubst-1.26 {lsubst command} {
+test ledit-1.26 {ledit command} {
     catch {unset foo}
     set foo {a b}
-    list [lsubst foo end end] $foo \
-        [lsubst foo end end] $foo \
-        [lsubst foo end end] $foo
+    list [ledit foo end end] $foo \
+        [ledit foo end end] $foo \
+        [ledit foo end end] $foo
 } {a a {} {} {} {}}
-test lsubst-1.27 {lsubset command} -body {
+test ledit-1.27 {lsubset command} -body {
     set l x
-    list [lsubst l 1 1] $l
+    list [ledit l 1 1] $l
 } -result {x x}
-test lsubst-1.28 {lsubst command} -body {
+test ledit-1.28 {ledit command} -body {
     set l x
-    list [lsubst l 1 1 y] $l
+    list [ledit l 1 1 y] $l
 } -result {{x y} {x y}}
-test lsubst-1.29 {lsubst command} -body {
+test ledit-1.29 {ledit command} -body {
     set l x
-    lsubst l 1 1 [error foo]
+    ledit l 1 1 [error foo]
 } -returnCodes 1 -result {foo}
-test lsubst-1.30 {lsubst command} -body {
+test ledit-1.30 {ledit command} -body {
     set l {not {}alist}
-    lsubst l 0 0 [error foo]
+    ledit l 0 0 [error foo]
 } -returnCodes 1 -result {foo}
-test lsubst-1.31 {lsubst command} -body {
+test ledit-1.31 {ledit command} -body {
     unset -nocomplain arr
     set arr(x) {a b}
-    list [lsubst arr(x) 0 0 c] $arr(x)
+    list [ledit arr(x) 0 0 c] $arr(x)
 } -result {{c b} {c b}}
 
-test lsubst-2.1 {lsubst errors} -body {
-    list [catch lsubst msg] $msg
-} -result {1 {wrong # args: should be "lsubst listVar first last ?element ...?"}}
-test lsubst-2.2 {lsubst errors} -body {
+test ledit-2.1 {ledit errors} -body {
+    list [catch ledit msg] $msg
+} -result {1 {wrong # args: should be "ledit listVar first last ?element ...?"}}
+test ledit-2.2 {ledit errors} -body {
     unset -nocomplain x
-    list [catch {lsubst l b} msg] $msg
-} -result {1 {wrong # args: should be "lsubst listVar first last ?element ...?"}}
-test lsubst-2.3 {lsubst errors} -body {
+    list [catch {ledit l b} msg] $msg
+} -result {1 {wrong # args: should be "ledit listVar first last ?element ...?"}}
+test ledit-2.3 {ledit errors} -body {
     set x {}
-    list [catch {lsubst x a 10} msg] $msg
+    list [catch {ledit x a 10} msg] $msg
 } -result {1 {bad index "a": must be integer?[+-]integer? or end?[+-]integer?}}
-test lsubst-2.4 {lsubst errors} -body {
+test ledit-2.4 {ledit errors} -body {
     set l {}
-    list [catch {lsubst l 10 x} msg] $msg
+    list [catch {ledit l 10 x} msg] $msg
 } -result {1 {bad index "x": must be integer?[+-]integer? or end?[+-]integer?}}
-test lsubst-2.5 {lsubst errors} -body {
+test ledit-2.5 {ledit errors} -body {
     set l {}
-    list [catch {lsubst l 10 1x} msg] $msg
+    list [catch {ledit l 10 1x} msg] $msg
 } -result {1 {bad index "1x": must be integer?[+-]integer? or end?[+-]integer?}}
-test lsubst-2.6 {lsubst errors} -body {
+test ledit-2.6 {ledit errors} -body {
     set l x
-    list [catch {lsubst l 3 2} msg] $msg
+    list [catch {ledit l 3 2} msg] $msg
 } -result {0 x}
-test lsubst-2.7 {lsubst errors} -body {
+test ledit-2.7 {ledit errors} -body {
     set l x
-    list [catch {lsubst l 2 2} msg] $msg
+    list [catch {ledit l 2 2} msg] $msg
 } -result {0 x}
-test lsubst-2.8 {lsubst errors} -body {
+test ledit-2.8 {ledit errors} -body {
     unset -nocomplain l
-    lsubst l 0 0 x
+    ledit l 0 0 x
 } -returnCodes error -result {can't read "l": no such variable}
-test lsubst-2.9 {lsubst errors} -body {
+test ledit-2.9 {ledit errors} -body {
     unset -nocomplain arr
-    lsubst arr(x) 0 0 x
+    ledit arr(x) 0 0 x
 } -returnCodes error -result {can't read "arr(x)": no such variable}
-test lsubst-2.10 {lsubst errors} -body {
+test ledit-2.10 {ledit errors} -body {
     unset -nocomplain arr
     set arr(y) y
-    lsubst arr(x) 0 0 x
+    ledit arr(x) 0 0 x
 } -returnCodes error -result {can't read "arr(x)": no such element in array}
 
-test lsubst-3.1 {lsubst won't modify shared argument objects} {
+test ledit-3.1 {ledit won't modify shared argument objects} {
     proc p {} {
         set l "a b c"
-        lsubst l 1 1 "x y"
+        ledit l 1 1 "x y"
         # The literal in locals table should be unmodified
         return [list "a b c" $l]
     }
     p
 } {{a b c} {a {x y} c}}
 
-# Following bugs were in lreplace. Make sure lsubst does not have them
-test lsubst-4.1 {Bug ccc2c2cc98: lreplace edge case} {
+# Following bugs were in lreplace. Make sure ledit does not have them
+test ledit-4.1 {Bug ccc2c2cc98: lreplace edge case} {
     set l {}
-    list [lsubst l 1 1] $l
+    list [ledit l 1 1] $l
 } {{} {}}
-test lsubst-4.2 {Bug ccc2c2cc98: lreplace edge case} {
+test ledit-4.2 {Bug ccc2c2cc98: lreplace edge case} {
     set l { }
-    list [lsubst l 1 1] $l
+    list [ledit l 1 1] $l
 } {{} {}}
-test lsubst-4.3 {lreplace edge case} {
+test ledit-4.3 {lreplace edge case} {
     set l {1 2 3}
-    lsubst l 2 0
+    ledit l 2 0
 } {1 2 3}
-test lsubst-4.4 {lsubst edge case} {
+test ledit-4.4 {ledit edge case} {
     set l {1 2 3 4 5}
-    list [lsubst l 3 1] $l
+    list [ledit l 3 1] $l
 } {{1 2 3 4 5} {1 2 3 4 5}}
 test lreplace-4.5 {lreplace edge case} {
     lreplace {1 2 3 4 5} 3 0 _
 } {1 2 3 _ 4 5}
-test lsubst-4.6 {lsubst end-x: bug a4cb3f06c4} {
+test ledit-4.6 {ledit end-x: bug a4cb3f06c4} {
     set l {0 1 2 3 4}
-    list [lsubst l 0 end-2] $l
+    list [ledit l 0 end-2] $l
 } {{3 4} {3 4}}
-test lsubst-4.6.1 {lsubst end-x: bug a4cb3f06c4} {
+test ledit-4.6.1 {ledit end-x: bug a4cb3f06c4} {
     set l {0 1 2 3 4}
-    list [lsubst l 0 end-2 a b c] $l
+    list [ledit l 0 end-2 a b c] $l
 } {{a b c 3 4} {a b c 3 4}}
-test lsubst-4.7 {lsubst with two end-indexes: increasing} {
+test ledit-4.7 {ledit with two end-indexes: increasing} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 end-1] $l
+    list [ledit l end-2 end-1] $l
 } {{0 1 4} {0 1 4}}
-test lsubst-4.7.1 {lsubst with two end-indexes: increasing} {
+test ledit-4.7.1 {ledit with two end-indexes: increasing} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 end-1 a b c] $l
+    list [ledit l end-2 end-1 a b c] $l
 } {{0 1 a b c 4} {0 1 a b c 4}}
-test lsubst-4.8 {lsubst with two end-indexes: equal} {
+test ledit-4.8 {ledit with two end-indexes: equal} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 end-2] $l
+    list [ledit l end-2 end-2] $l
 } {{0 1 3 4} {0 1 3 4}}
-test lsubst-4.8.1 {lsubst with two end-indexes: equal} {
+test ledit-4.8.1 {ledit with two end-indexes: equal} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 end-2 a b c] $l
+    list [ledit l end-2 end-2 a b c] $l
 } {{0 1 a b c 3 4} {0 1 a b c 3 4}}
-test lsubst-4.9 {lsubst with two end-indexes: decreasing} {
+test ledit-4.9 {ledit with two end-indexes: decreasing} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 end-3] $l
+    list [ledit l end-2 end-3] $l
 } {{0 1 2 3 4} {0 1 2 3 4}}
-test lsubst-4.9.1 {lsubst with two end-indexes: decreasing} {
+test ledit-4.9.1 {ledit with two end-indexes: decreasing} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 end-3 a b c] $l
+    list [ledit l end-2 end-3 a b c] $l
 } {{0 1 a b c 2 3 4} {0 1 a b c 2 3 4}}
-test lsubst-4.10 {lsubst with two equal indexes} {
+test ledit-4.10 {ledit with two equal indexes} {
     set l {0 1 2 3 4}
-    list [lsubst l 2 2] $l
+    list [ledit l 2 2] $l
 } {{0 1 3 4} {0 1 3 4}}
-test lsubst-4.10.1 {lsubst with two equal indexes} {
+test ledit-4.10.1 {ledit with two equal indexes} {
     set l {0 1 2 3 4}
-    list [lsubst l 2 2 a b c] $l
+    list [ledit l 2 2 a b c] $l
 } {{0 1 a b c 3 4} {0 1 a b c 3 4}}
-test lsubst-4.11 {lsubst end index first} {
+test ledit-4.11 {ledit end index first} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 1 a b c] $l
+    list [ledit l end-2 1 a b c] $l
 } {{0 1 a b c 2 3 4} {0 1 a b c 2 3 4}}
-test lsubst-4.12 {lsubst end index first} {
+test ledit-4.12 {ledit end index first} {
     set l {0 1 2 3 4}
-    list [lsubst l end-2 2 a b c] $l
+    list [ledit l end-2 2 a b c] $l
 } {{0 1 a b c 3 4} {0 1 a b c 3 4}}
-test lsubst-4.13 {lsubst empty list} {
+test ledit-4.13 {ledit empty list} {
     set l {}
-    list [lsubst l 1 1 1] $l
+    list [ledit l 1 1 1] $l
 } {1 1}
-test lsubst-4.14 {lsubst empty list} {
+test ledit-4.14 {ledit empty list} {
     set l {}
-    list [lsubst l 2 2 2] $l
+    list [ledit l 2 2 2] $l
 } {2 2}
 
-test lsubst-5.1 {compiled lreplace: Bug 47ac84309b} {
+test ledit-5.1 {compiled lreplace: Bug 47ac84309b} {
     apply {x {
-	lsubst x end 0
+	ledit x end 0
     }} {a b c}
 } {a b c}
-test lsubst-5.2 {compiled lreplace: Bug 47ac84309b} {
+test ledit-5.2 {compiled lreplace: Bug 47ac84309b} {
     apply {x {
-	lsubst x end 0 A
+	ledit x end 0 A
     }} {a b c}
 } {a b A c}
 
@@ -520,10 +520,10 @@ apply {{} {
 	    foreach b $idxs {
 		foreach i $ins {
 		    set expected [list [catch {$lreplace $ls $a $b {*}$i} m] $m]
-		    set tester [list lsubst ls $a $b {*}$i]
+		    set tester [list ledit ls $a $b {*}$i]
 		    set script [list catch $tester m]
 		    set script "list \[$script\] \$m"
-		    test lsubst-6.[incr n] {lsubst battery} -body \
+		    test ledit-6.[incr n] {ledit battery} -body \
 			[list apply [list {ls} $script] $ls] -result $expected
 		}
 	    }
-- 
cgit v0.12


From a312d4a759c7d925d22e4e4fc8cbbe2d23dc9f27 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Sep 2022 13:44:25 +0000
Subject: Add testcases, and fix a bug found by it

---
 generic/tclEncoding.c |  9 ++++++---
 tests/cmdAH.test      | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 9c4b5ce..3d5e474 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2361,13 +2361,16 @@ UtfToUtfProc(
 	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
 		&& (UCHAR(src[1]) == 0x80) && (!(flags & TCL_ENCODING_MODIFIED) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
 	    /*
-	     * Convert 0xC080 to real nulls when we are in output mode.
+	     * If in input mode, and -strict is specified: This is an error.
 	     */
-		if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+	    if (flags & TCL_ENCODING_MODIFIED) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
-		}
+	    }
 
+	    /*
+	     * Convert 0xC080 to real nulls when we are in output mode, with or without '-strict'.
+	     */
 	    *dst++ = 0;
 	    src += 2;
 	} else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 38ca521..69da6c2 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -21,6 +21,7 @@ catch [list package require -exact tcl::test [info patchlevel]]
 testConstraint testchmod       [llength [info commands testchmod]]
 testConstraint testsetplatform [llength [info commands testsetplatform]]
 testConstraint testvolumetype  [llength [info commands testvolumetype]]
+testConstraint testbytestring [llength [info commands testbytestring]]
 testConstraint time64bit [expr {
     $::tcl_platform(pointerSize) >= 8 ||
     [llength [info command testsize]] && [testsize st_mtime] >= 8
@@ -349,6 +350,25 @@ test cmdAH-4.21.2 {convertto -failindex with wrong character (byte compiled)} -s
 } -returnCodes 0 -result {41 1} -cleanup {
     rename encoding_test ""
 }
+test cmdAH-4.22 {convertfrom -strict} -body {
+    encoding convertfrom -strict utf-8 A\x00B
+} -result A\x00B
+
+test cmdAH-4.23 {convertfrom -strict} -body {
+    encoding convertfrom -strict utf-8 A\xC0\x80B
+} -returnCodes error -result {unexpected byte sequence starting at index 1: '\xC0'}
+
+test cmdAH-4.24 {convertto -strict} -body {
+    encoding convertto -strict utf-8 A\x00B
+} -result A\x00B
+
+test cmdAH-4.25 {convertfrom -strict} -constraints knownBug -body {
+    encoding convertfrom -strict utf-8 A\x80B
+} -returnCodes error -result {unexpected byte sequence starting at index 1: '\x80'}
+
+test cmdAH-4.26 {convertto -strict} -constraints {testbytestring knownBug} -body {
+    encoding convertto -strict utf-8 A[testbytestring \x80]B
+} -returnCodes error -result {unexpected byte sequence starting at index 1: '\x80'}
 
 test cmdAH-5.1 {Tcl_FileObjCmd} -returnCodes error -body {
     file
-- 
cgit v0.12


From 7b46c41c056ce57494a3dc67b3f17fdf344ce9fb Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 16 Sep 2022 14:59:14 +0000
Subject: remove obsolete comments

---
 generic/tcl.h | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index d74309f..1c330d8 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -354,25 +354,9 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 /*
  *----------------------------------------------------------------------------
  * Data structures defined opaquely in this module. The definitions below just
- * provide dummy types. A few fields are made visible in Tcl_Interp
- * structures, namely those used for returning a string result from commands.
- * Direct access to the result field is discouraged in Tcl 8.0. The
- * interpreter result is either an object or a string, and the two values are
- * kept consistent unless some C code sets interp->result directly.
- * Programmers should use either the function Tcl_GetObjResult() or
- * Tcl_GetStringResult() to read the interpreter's result. See the SetResult
- * man page for details.
- *
- * Note: any change to the Tcl_Interp definition below must be mirrored in the
- * "real" definition in tclInt.h.
- *
- * Note: Tcl_ObjCmdProc functions do not directly set result and freeProc.
- * Instead, they set a Tcl_Obj member in the "real" structure that can be
- * accessed with Tcl_GetObjResult() and Tcl_SetObjResult().
+ * provide dummy types. 
  */
 
-typedef struct Tcl_Interp Tcl_Interp;
-
 typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
 typedef struct Tcl_Channel_ *Tcl_Channel;
 typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
@@ -382,6 +366,7 @@ typedef struct Tcl_Dict_ *Tcl_Dict;
 typedef struct Tcl_EncodingState_ *Tcl_EncodingState;
 typedef struct Tcl_Encoding_ *Tcl_Encoding;
 typedef struct Tcl_Event Tcl_Event;
+typedef struct Tcl_Interp Tcl_Interp;
 typedef struct Tcl_InterpState_ *Tcl_InterpState;
 typedef struct Tcl_LoadHandle_ *Tcl_LoadHandle;
 typedef struct Tcl_Mutex_ *Tcl_Mutex;
-- 
cgit v0.12


From 260c5156ed0ec2b944268320a267cee9a57cd547 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sun, 18 Sep 2022 13:59:26 +0000
Subject: TIP implementation to add/use public routines Tcl_GetNumber(FromObj).

---
 generic/tcl.decls     |  8 ++++++++
 generic/tcl.h         | 14 ++++++++++++++
 generic/tclBasic.c    | 32 ++++++++++++++++----------------
 generic/tclDecls.h    | 14 ++++++++++++++
 generic/tclExecute.c  |  4 ++--
 generic/tclInt.h      | 18 ------------------
 generic/tclLink.c     |  2 +-
 generic/tclObj.c      | 40 ++++++++++++++++++++++++++++++++++++++--
 generic/tclStubInit.c |  2 ++
 generic/tclUtil.c     | 10 +++++-----
 10 files changed, 100 insertions(+), 44 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index d08ba0a..2bbad1c 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2523,6 +2523,14 @@ declare 679 {
     int Tcl_NRCallObjProc2(Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2,
 	    void *clientData, size_t objc, Tcl_Obj *const objv[])
 }
+declare 680 {
+    int Tcl_GetNumberFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+	    void **clientDataPtr, int *typePtr)
+}
+declare 681 {
+    int Tcl_GetNumber(Tcl_Interp *interp, const char *bytes, size_t numBytes,
+	    void **clientDataPtr, int *typePtr)
+}
 
 # ----- BASELINE -- FOR -- 8.7.0 ----- #
 
diff --git a/generic/tcl.h b/generic/tcl.h
index f17d43e..cd16ea9 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -974,6 +974,20 @@ typedef struct Tcl_DString {
 #define TCL_INTEGER_SPACE	(3*(int)sizeof(Tcl_WideInt))
 
 /*
+ *----------------------------------------------------------------------------
+ * Type values returned by Tcl_GetNumberFromObj
+ *	TCL_NUMBER_INT		Representation is a Tcl_WideInt
+ *	TCL_NUMBER_BIG		Representation is an mp_int
+ *	TCL_NUMBER_DOUBLE	Representation is a double
+ *	TCL_NUMBER_NAN		Value is NaN.
+ */
+
+#define TCL_NUMBER_INT          2
+#define TCL_NUMBER_BIG          3
+#define TCL_NUMBER_DOUBLE       4
+#define TCL_NUMBER_NAN          5
+
+/*
  * Flag values passed to Tcl_ConvertElement.
  * TCL_DONT_USE_BRACES forces it not to enclose the element in braces, but to
  *	use backslash quoting instead.
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index b806c33..d7afc14 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4133,7 +4133,7 @@ OldMathFuncProc(
 
     args = (Tcl_Value *)ckalloc(dataPtr->numArgs * sizeof(Tcl_Value));
     for (j = 1, k = 0; j < objc; ++j, ++k) {
-	/* TODO: Convert to TclGetNumberFromObj? */
+	/* TODO: Convert to Tcl_GetNumberFromObj? */
 	valuePtr = objv[j];
 	result = Tcl_GetDoubleFromObj(NULL, valuePtr, &d);
 #ifdef ACCEPT_NAN
@@ -7041,7 +7041,7 @@ Tcl_ExprLongObj(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, resultPtr, &internalPtr, &type)!=TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, resultPtr, &internalPtr, &type)!=TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -7087,7 +7087,7 @@ Tcl_ExprDoubleObj(
 	return TCL_ERROR;
     }
 
-    result = TclGetNumberFromObj(interp, resultPtr, &internalPtr, &type);
+    result = Tcl_GetNumberFromObj(interp, resultPtr, &internalPtr, &type);
     if (result == TCL_OK) {
 	switch (type) {
 	case TCL_NUMBER_NAN:
@@ -7808,7 +7808,7 @@ ExprIsqrtFunc(
      * Make sure that the arg is a number.
      */
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -8071,7 +8071,7 @@ ExprAbsFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -8226,7 +8226,7 @@ ExprIntFunc(
 	MathFuncWrongNumArgs(interp, 2, objc, objv);
 	return TCL_ERROR;
     }
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -8307,7 +8307,7 @@ ExprMaxMinFunc(
     }
     res = objv[1];
     for (i = 1; i < objc; i++) {
-        if (TclGetNumberFromObj(interp, objv[i], &ptr, &type) != TCL_OK) {
+        if (Tcl_GetNumberFromObj(interp, objv[i], &ptr, &type) != TCL_OK) {
             return TCL_ERROR;
         }
         if (type == TCL_NUMBER_NAN) {
@@ -8459,7 +8459,7 @@ ExprRoundFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -8727,7 +8727,7 @@ ExprIsFiniteFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type != TCL_NUMBER_NAN) {
@@ -8758,7 +8758,7 @@ ExprIsInfinityFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type != TCL_NUMBER_NAN) {
@@ -8788,7 +8788,7 @@ ExprIsNaNFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type != TCL_NUMBER_NAN) {
@@ -8818,7 +8818,7 @@ ExprIsNormalFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type != TCL_NUMBER_NAN) {
@@ -8848,7 +8848,7 @@ ExprIsSubnormalFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type != TCL_NUMBER_NAN) {
@@ -8878,7 +8878,7 @@ ExprIsUnorderedFunc(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type == TCL_NUMBER_NAN) {
@@ -8888,7 +8888,7 @@ ExprIsUnorderedFunc(
         result = (ClassifyDouble(d) == FP_NAN);
     }
 
-    if (TclGetNumberFromObj(interp, objv[2], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[2], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type == TCL_NUMBER_NAN) {
@@ -8920,7 +8920,7 @@ FloatClassifyObjCmd(
 	return TCL_ERROR;
     }
 
-    if (TclGetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
+    if (Tcl_GetNumberFromObj(interp, objv[1], &ptr, &type) != TCL_OK) {
         return TCL_ERROR;
     }
     if (type == TCL_NUMBER_NAN) {
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 3917d0f..82d592b 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1996,6 +1996,14 @@ EXTERN Tcl_Command	Tcl_NRCreateCommand2(Tcl_Interp *interp,
 EXTERN int		Tcl_NRCallObjProc2(Tcl_Interp *interp,
 				Tcl_ObjCmdProc2 *objProc2, void *clientData,
 				size_t objc, Tcl_Obj *const objv[]);
+/* 680 */
+EXTERN int		Tcl_GetNumberFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, void **clientDataPtr,
+				int *typePtr);
+/* 681 */
+EXTERN int		Tcl_GetNumber(Tcl_Interp *interp, const char *bytes,
+				size_t numBytes, void **clientDataPtr,
+				int *typePtr);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2711,6 +2719,8 @@ typedef struct TclStubs {
     Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
     Tcl_Command (*tcl_NRCreateCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc, Tcl_ObjCmdProc2 *nreProc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 678 */
     int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, size_t objc, Tcl_Obj *const objv[]); /* 679 */
+    int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
+    int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, size_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4099,6 +4109,10 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_NRCreateCommand2) /* 678 */
 #define Tcl_NRCallObjProc2 \
 	(tclStubsPtr->tcl_NRCallObjProc2) /* 679 */
+#define Tcl_GetNumberFromObj \
+	(tclStubsPtr->tcl_GetNumberFromObj) /* 680 */
+#define Tcl_GetNumber \
+	(tclStubsPtr->tcl_GetNumber) /* 681 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 8aa3bb2..dc5adc2 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -502,7 +502,7 @@ VarHashCreateVar(
 
 /*
  * Macro used in this file to save a function call for common uses of
- * TclGetNumberFromObj(). The ANSI C "prototype" is:
+ * Tcl_GetNumberFromObj(). The ANSI C "prototype" is:
  *
  * MODULE_SCOPE int GetNumberFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
  *			void **ptrPtr, int *tPtr);
@@ -521,7 +521,7 @@ VarHashCreateVar(
 		    (&((objPtr)->internalRep.doubleValue)), TCL_OK) :	\
     (((objPtr)->bytes != NULL) && ((objPtr)->length == 0))		\
 	? TCL_ERROR :			\
-    TclGetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr)))
+    Tcl_GetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr)))
 
 /*
  * Macro used to make the check for type overflow more mnemonic. This works by
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 09f22d3..9eba8c5 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2875,21 +2875,6 @@ typedef struct ProcessGlobalValue {
 				/* Reject underscore digit separator */
 
 /*
- *----------------------------------------------------------------------
- * Type values TclGetNumberFromObj
- *----------------------------------------------------------------------
- */
-
-#define TCL_NUMBER_INT		2
-#if !defined(TCL_NO_DEPRECATED)
-#   define TCL_NUMBER_LONG		1 /* deprecated, not used any more */
-#   define TCL_NUMBER_WIDE		TCL_NUMBER_INT /* deprecated */
-#endif
-#define TCL_NUMBER_BIG		3
-#define TCL_NUMBER_DOUBLE	4
-#define TCL_NUMBER_NAN		5
-
-/*
  *----------------------------------------------------------------
  * Variables shared among Tcl modules but not used by the outside world.
  *----------------------------------------------------------------
@@ -3199,9 +3184,6 @@ MODULE_SCOPE int	TclGetCompletionCodeFromObj(Tcl_Interp *interp,
 			    Tcl_Obj *value, int *code);
 MODULE_SCOPE Proc *	TclGetLambdaFromObj(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, Tcl_Obj **nsObjPtrPtr);
-MODULE_SCOPE int	TclGetNumberFromObj(Tcl_Interp *interp,
-			    Tcl_Obj *objPtr, void **clientDataPtr,
-			    int *typePtr);
 MODULE_SCOPE int	TclGetOpenModeEx(Tcl_Interp *interp,
 			    const char *modeString, int *seekFlagPtr,
 			    int *binaryPtr);
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 6bd65fa..0d57d44 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -530,7 +530,7 @@ GetUWide(
     void *clientData;
     int type, intValue;
 
-    if (TclGetNumberFromObj(NULL, objPtr, &clientData, &type) == TCL_OK) {
+    if (Tcl_GetNumberFromObj(NULL, objPtr, &clientData, &type) == TCL_OK) {
 	if (type == TCL_NUMBER_INT) {
 	    *widePtr = *((const Tcl_WideInt *) clientData);
 	    return (*widePtr < 0);
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 5726596..f9b5bd3 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3856,7 +3856,7 @@ TclSetBignumInternalRep(
 /*
  *----------------------------------------------------------------------
  *
- * TclGetNumberFromObj --
+ * Tcl_GetNumberFromObj --
  *
  *      Extracts a number (of any possible numeric type) from an object.
  *
@@ -3874,7 +3874,7 @@ TclSetBignumInternalRep(
  */
 
 int
-TclGetNumberFromObj(
+Tcl_GetNumberFromObj(
     Tcl_Interp *interp,
     Tcl_Obj *objPtr,
     ClientData *clientDataPtr,
@@ -3909,6 +3909,42 @@ TclGetNumberFromObj(
 	    TclParseNumber(interp, objPtr, "number", NULL, -1, NULL, 0));
     return TCL_ERROR;
 }
+
+int
+Tcl_GetNumber(
+    Tcl_Interp *interp,
+    const char *bytes,
+    size_t numBytes,
+    ClientData *clientDataPtr,
+    int *typePtr)
+{
+    static Tcl_ThreadDataKey numberCacheKey;
+    Tcl_Obj *objPtr = (Tcl_Obj *)Tcl_GetThreadData(&numberCacheKey,
+	    sizeof(Tcl_Obj));
+
+    Tcl_FreeInternalRep(objPtr);
+
+    if (bytes == NULL) {
+	bytes = &tclEmptyString;
+	numBytes = 0;
+    }
+    if (numBytes == (size_t)TCL_INDEX_NONE) {
+	numBytes = strlen(bytes);
+    }
+    if (numBytes > INT_MAX) {
+	if (interp) {
+            Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                    "max size for a Tcl value (%d bytes) exceeded", INT_MAX));
+	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+	}
+	return TCL_ERROR;
+    }
+
+    objPtr->bytes = (char *) bytes;
+    objPtr->length = numBytes;
+
+    return Tcl_GetNumberFromObj(interp, objPtr, clientDataPtr, typePtr);
+}
 
 /*
  *----------------------------------------------------------------------
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index ae00b04..4e6041e 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2043,6 +2043,8 @@ const TclStubs tclStubs = {
     Tcl_CreateObjTrace2, /* 677 */
     Tcl_NRCreateCommand2, /* 678 */
     Tcl_NRCallObjProc2, /* 679 */
+    Tcl_GetNumberFromObj, /* 680 */
+    Tcl_GetNumber, /* 681 */
 };
 
 /* !END!: Do not edit above this line. */
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 7ab6eae..742bded 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3644,7 +3644,7 @@ GetWideForIndex(
 {
     int numType;
     ClientData cd;
-    int code = TclGetNumberFromObj(NULL, objPtr, &cd, &numType);
+    int code = Tcl_GetNumberFromObj(NULL, objPtr, &cd, &numType);
 
     if (code == TCL_OK) {
 	if (numType == TCL_NUMBER_INT) {
@@ -3803,7 +3803,7 @@ GetEndOffsetFromObj(
 		    /* ... value continues with [-+] ... */
 
 		    /* Save first integer as wide if possible */
-		    TclGetNumberFromObj(NULL, objPtr, &cd, &t1);
+		    Tcl_GetNumberFromObj(NULL, objPtr, &cd, &t1);
 		    if (t1 == TCL_NUMBER_INT) {
 			w1 = (*(Tcl_WideInt *)cd);
 		    }
@@ -3813,7 +3813,7 @@ GetEndOffsetFromObj(
 			/* ... value concludes with second valid integer */
 
 			/* Save second integer as wide if possible */
-			TclGetNumberFromObj(NULL, objPtr, &cd, &t2);
+			Tcl_GetNumberFromObj(NULL, objPtr, &cd, &t2);
 			if (t2 == TCL_NUMBER_INT) {
 			    w2 = (*(Tcl_WideInt *)cd);
 			}
@@ -3866,7 +3866,7 @@ GetEndOffsetFromObj(
 			    Tcl_ExprObj(compute, objPtr, &sum);
 			    Tcl_DeleteInterp(compute);
 			}
-			TclGetNumberFromObj(NULL, sum, &cd, &numType);
+			Tcl_GetNumberFromObj(NULL, sum, &cd, &numType);
 
 			if (numType == TCL_NUMBER_INT) {
 			    /* sum holds an integer in the signed wide range */
@@ -3917,7 +3917,7 @@ GetEndOffsetFromObj(
 	    }
 
 	    /* Got an integer offset; pull it from where parser left it. */
-	    TclGetNumberFromObj(NULL, objPtr, &cd, &t);
+	    Tcl_GetNumberFromObj(NULL, objPtr, &cd, &t);
 
 	    if (t == TCL_NUMBER_BIG) {
 		/* Truncate to the signed wide range. */
-- 
cgit v0.12


From cc185b1d763af5b2a80b5fc5c25fb2f0c69d0661 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 19 Sep 2022 11:50:31 +0000
Subject: eliminate some compiler warnings

---
 generic/tclOODefineCmds.c | 28 ++++++++++++++--------------
 generic/tclOOInfo.c       |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c
index d360516..bac7c15 100644
--- a/generic/tclOODefineCmds.c
+++ b/generic/tclOODefineCmds.c
@@ -3131,10 +3131,10 @@ InstallReadableProps(
 	if (objc == 0) {
 	    ckfree(props->readable.list);
 	} else if (i) {
-	    props->readable.list = ckrealloc(props->readable.list,
+	    props->readable.list = (Tcl_Obj **)ckrealloc(props->readable.list,
 		    sizeof(Tcl_Obj *) * objc);
 	} else {
-	    props->readable.list = ckalloc(sizeof(Tcl_Obj *) * objc);
+	    props->readable.list = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * objc);
 	}
     }
     props->readable.num = 0;
@@ -3155,7 +3155,7 @@ InstallReadableProps(
 	 */
 
 	if (n != objc) {
-	    props->readable.list = ckrealloc(props->readable.list,
+	    props->readable.list = (Tcl_Obj **)ckrealloc(props->readable.list,
 		    sizeof(Tcl_Obj *) * n);
 	}
 	Tcl_DeleteHashTable(&uniqueTable);
@@ -3164,7 +3164,7 @@ InstallReadableProps(
 
 static int
 ClassRPropsGet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3198,7 +3198,7 @@ ClassRPropsGet(
 
 static int
 ClassRPropsSet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3234,7 +3234,7 @@ ClassRPropsSet(
 
 static int
 ObjRPropsGet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3263,7 +3263,7 @@ ObjRPropsGet(
 
 static int
 ObjRPropsSet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3327,10 +3327,10 @@ InstallWritableProps(
 	if (objc == 0) {
 	    ckfree(props->writable.list);
 	} else if (i) {
-	    props->writable.list = ckrealloc(props->writable.list,
+	    props->writable.list = (Tcl_Obj **)ckrealloc(props->writable.list,
 		    sizeof(Tcl_Obj *) * objc);
 	} else {
-	    props->writable.list = ckalloc(sizeof(Tcl_Obj *) * objc);
+	    props->writable.list = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * objc);
 	}
     }
     props->writable.num = 0;
@@ -3351,7 +3351,7 @@ InstallWritableProps(
 	 */
 
 	if (n != objc) {
-	    props->writable.list = ckrealloc(props->writable.list,
+	    props->writable.list = (Tcl_Obj **)ckrealloc(props->writable.list,
 		    sizeof(Tcl_Obj *) * n);
 	}
 	Tcl_DeleteHashTable(&uniqueTable);
@@ -3360,7 +3360,7 @@ InstallWritableProps(
 
 static int
 ClassWPropsGet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3394,7 +3394,7 @@ ClassWPropsGet(
 
 static int
 ClassWPropsSet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3430,7 +3430,7 @@ ClassWPropsSet(
 
 static int
 ObjWPropsGet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
@@ -3459,7 +3459,7 @@ ObjWPropsGet(
 
 static int
 ObjWPropsSet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     Tcl_ObjectContext context,
     int objc,
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index 81647b0..f7f5de1 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -1739,7 +1739,7 @@ static const char *const propOptNames[] = {
 
 static int
 InfoClassPropCmd(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1802,7 +1802,7 @@ InfoClassPropCmd(
 
 static int
 InfoObjectPropCmd(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
-- 
cgit v0.12


From 9d536c3831e542752097c755a299643a06782298 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 19 Sep 2022 17:40:28 +0000
Subject: TIP633 fconfigure -nocomplainencoding (TCL9): replace
 "-strictencoding 0" by "-nocomplainencoding 1".

---
 generic/tclIO.c  | 15 ++++++---------
 generic/tclIO.h  |  4 ++--
 tests/io.test    | 20 ++++++++++----------
 tests/ioCmd.test | 12 ++++++------
 tests/zlib.test  |  4 ++--
 5 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index c06ca5a..00327cb 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7928,15 +7928,12 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(1, "-strictencoding")) {
+    if (len == 0 || HaveOpt(1, "-nocomplainencoding")) {
 	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
+	    Tcl_DStringAppendElement(dsPtr, "-nocomplainencoding");
 	}
 	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "0" : "1");
-	if (len > 0) {
-	    return TCL_OK;
-	}
+		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "1" : "0");
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8204,16 +8201,16 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
-    } else if (HaveOpt(1, "-strictencoding")) {
+    } else if (HaveOpt(1, "-nocomplainencoding")) {
 	int newMode;
 
 	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    statePtr->flags &= ~CHANNEL_ENCODING_NOCOMPLAIN;
-	} else {
 	    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
+	} else {
+	    statePtr->flags &= ~CHANNEL_ENCODING_NOCOMPLAIN;
 	}
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
diff --git a/generic/tclIO.h b/generic/tclIO.h
index a4128bc..532dd62 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,8 +271,8 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
-#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option -strictencoding
-					 * is set to 0 */
+#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option
+					 * -nocomplainencoding is set to 1 */
 
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
diff --git a/tests/io.test b/tests/io.test
index b606c3e..dc61466 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8952,7 +8952,7 @@ test io-74.1 {[104f2885bb] improper cache validity check} -setup {
     removeFile io-74.1
 } -returnCodes error -match glob -result {can not find channel named "*"}
 
-test io-75.1 {multibyte encoding error read results in raw bytes (-strictencoding 0)} -setup {
+test io-75.1 {multibyte encoding error read results in raw bytes (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.1]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -8961,7 +8961,7 @@ test io-75.1 {multibyte encoding error read results in raw bytes (-strictencodin
     puts -nonewline $f "A\xC0\x40"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -strictencoding 0 -buffering none
+    fconfigure $f -encoding utf-8 -nocomplainencoding 1 -buffering none
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -8971,10 +8971,10 @@ test io-75.1 {multibyte encoding error read results in raw bytes (-strictencodin
     removeFile io-75.1
 } -result "41c040"
 
-test io-75.2 {unrepresentable character write passes and is replaced by ? (-strictencoding 0)} -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ? (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.2]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1 -strictencoding 0
+    fconfigure $f -encoding iso8859-1 -nocomplainencoding 1
 } -body {
     puts -nonewline $f "A\u2022"
     flush $f
@@ -8988,14 +8988,14 @@ test io-75.2 {unrepresentable character write passes and is replaced by ? (-stri
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
 # But the read already returns the incomplete sequence.
-test io-75.3 {incomplete multibyte encoding read is ignored (-strictencoding 0)} -setup {
+test io-75.3 {incomplete multibyte encoding read is ignored (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.3]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f "A\xC0"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -strictencoding 0
+    fconfigure $f -encoding utf-8 -buffering none -nocomplainencoding 1
 } -body {
     set d [read $f]
     close $f
@@ -9007,7 +9007,7 @@ test io-75.3 {incomplete multibyte encoding read is ignored (-strictencoding 0)}
 
 # As utf-8 has a special treatment in multi-byte decoding, also test another
 # one.
-test io-75.4 {shiftjis encoding error read results in raw bytes (-strictencoding 0)} -setup {
+test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.4]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9016,7 +9016,7 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-strictencoding
     puts -nonewline $f "A\x81\xFFA"
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 0
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -nocomplainencoding 1
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9026,7 +9026,7 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-strictencoding
     removeFile io-75.4
 } -result "4181ff41"
 
-test io-75.5 {incomplete shiftjis encoding read is ignored (-strictencoding 0)} -setup {
+test io-75.5 {incomplete shiftjis encoding read is ignored (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9034,7 +9034,7 @@ test io-75.5 {incomplete shiftjis encoding read is ignored (-strictencoding 0)}
     puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -nocomplainencoding 1
 } -body {
     set d [read $f]
     close $f
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 178b54a..92e96a2 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -245,7 +245,7 @@ test iocmd-8.7 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -nocomplainencoding 0 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
@@ -257,7 +257,7 @@ test iocmd-8.8 {fconfigure command} -setup {
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -strictencoding 1 -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -nocomplainencoding 0 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
@@ -267,7 +267,7 @@ test iocmd-8.9 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -strictencoding 1 -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -nocomplainencoding 0 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -1363,7 +1363,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 0 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1372,7 +1372,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 0 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1384,7 +1384,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 1 -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 0 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/zlib.test b/tests/zlib.test
index f848b58..d20011f 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 1 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 0 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 5d066cf1694f50526815d3b96301e4cf7f3007fd Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 19 Sep 2022 17:45:10 +0000
Subject: TIP633 fconfigure -nocomplainencoding (TCL8.7): replace
 "-strictencoding 0" by "-nocomplainencoding 1".

---
 generic/tclIO.c  | 12 ++++++------
 tests/ioCmd.test | 18 +++++++++---------
 tests/zlib.test  |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 71ad637..3c1d4b0 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7923,11 +7923,11 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(1, "-strictencoding")) {
+    if (len == 0 || HaveOpt(1, "-nocomplainencoding")) {
 	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
+	    Tcl_DStringAppendElement(dsPtr, "-nocomplainencoding");
 	}
-	Tcl_DStringAppendElement(dsPtr,"0");
+	Tcl_DStringAppendElement(dsPtr,"1");
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8185,16 +8185,16 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
-    } else if (HaveOpt(1, "-strictencoding")) {
+    } else if (HaveOpt(1, "-nocomplainencoding")) {
 	int newMode;
 
 	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
 	    return TCL_ERROR;
 	}
-	if (newMode) {
+	if (!newMode) {
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"bad value for -strictencoding: only false allowed",
+			"bad value for -nocomplainencoding: only true allowed",
 			-1));
 	    }
 	    return TCL_ERROR;
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index ad4cd4e..0af12ce 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -245,7 +245,7 @@ test iocmd-8.7 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -strictencoding 0 -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -nocomplainencoding 1 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
@@ -257,7 +257,7 @@ test iocmd-8.8 {fconfigure command} -setup {
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -strictencoding 0 -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -nocomplainencoding 1 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
@@ -267,7 +267,7 @@ test iocmd-8.9 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -strictencoding 0 -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -nocomplainencoding 1 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -369,12 +369,12 @@ test iocmd-8.20 {fconfigure command / win console channel} -constraints {nonPort
 } -returnCodes error -result [expectedOpts "-blah" {-inputmode}]
 # TODO: Test parsing of serial channel options (nonPortable, since requires an
 # open channel to work with).
-test iocmd-8.21 {fconfigure command / -strictencoding 1 error} -setup {
+test iocmd-8.21 {fconfigure command / -nocomplainencoding 0 error} -setup {
     # I don't know how else to open the console, but this is non-portable
     set console stdin
 } -body {
-    fconfigure $console -strictencoding 1
-} -returnCodes error -result "bad value for -strictencoding: only false allowed"
+    fconfigure $console -nocomplainencoding 0
+} -returnCodes error -result "bad value for -nocomplainencoding: only true allowed"
 
 
 test iocmd-9.1 {eof command} {
@@ -1370,7 +1370,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 1 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1379,7 +1379,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 1 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1391,7 +1391,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 1 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/zlib.test b/tests/zlib.test
index a1c7aa4..6d71a81 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 6a3c75c37fdb9e5ad6a19ad77d0be583468637e7 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 21 Sep 2022 14:59:40 +0000
Subject: Reduce chances for test conflicts.

---
 tests/env.test | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/env.test b/tests/env.test
index ebe7bc7..dcf5ab4 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -427,10 +427,10 @@ test env-7.5 {
     set env variable through upvar
 } -setup setup1 -body {
     apply {{} {
-	set ::env(test7_4) origvalue
-	upvar #0 env(test7_4) var
+	set ::env(test7_5) origvalue
+	upvar #0 env(test7_5) var
 	set var newvalue
-	return $::env(test7_4)
+	return $::env(test7_5)
     }}
 } -cleanup cleanup1 -result newvalue
 
@@ -438,10 +438,10 @@ test env-7.6 {
     unset env variable through upvar
 } -setup setup1 -body {
     apply {{} {
-	set ::env(test7_4) origvalue
-	upvar #0 env(test7_4) var
+	set ::env(test7_6) origvalue
+	upvar #0 env(test7_6) var
 	unset var
-	return [array get env test7_4]
+	return [array get env test7_6]
     }}
 } -cleanup cleanup1 -result {}
 
-- 
cgit v0.12


From ed4c583b0670380c6dacc6f7dce3bd2a791ae785 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 21 Sep 2022 15:25:25 +0000
Subject: TIP #640 implementation: Tcl_SaveResult reuse for Tcl 9.0

---
 generic/tcl.h      |  2 +-
 generic/tclDecls.h | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 1c330d8..36d175d 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -676,7 +676,7 @@ typedef struct Tcl_Obj {
  * is typically allocated on the stack.
  */
 
-typedef Tcl_Obj *Tcl_SavedResult;
+typedef Tcl_InterpState Tcl_SavedResult;
 
 /*
  *----------------------------------------------------------------------------
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index ad2480c..c1a7d88 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3882,18 +3882,14 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GetStringResult(interp) Tcl_GetString(Tcl_GetObjResult(interp))
 #define Tcl_SaveResult(interp, statePtr) \
 	do { \
-	    *(statePtr) = Tcl_GetObjResult(interp); \
-	    Tcl_IncrRefCount(*(statePtr)); \
-	    Tcl_SetObjResult(interp, Tcl_NewObj()); \
+	    *(statePtr) = Tcl_SaveInterpState(interp, TCL_ERROR); \
 	} while(0)
 #define Tcl_RestoreResult(interp, statePtr) \
 	do { \
-	    Tcl_ResetResult(interp); \
-   	    Tcl_SetObjResult(interp, *(statePtr)); \
-   	    Tcl_DecrRefCount(*(statePtr)); \
+   	    Tcl_RestoreInterpState(interp, *(statePtr)); \
 	} while(0)
 #define Tcl_DiscardResult(statePtr) \
-	Tcl_DecrRefCount(*(statePtr))
+	Tcl_DiscardInterpState(*(statePtr))
 #define Tcl_SetResult(interp, result, freeProc) \
 	do { \
 	    const char *__result = result; \
-- 
cgit v0.12


From 85c05d7a3d1760c35dcf594502b7816f35a443da Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 21 Sep 2022 15:39:02 +0000
Subject: Include TYPE_OPEN_PAREN in the comment.

---
 generic/tclParse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generic/tclParse.c b/generic/tclParse.c
index 18773a5..af507e9 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -33,6 +33,7 @@
  *			meaning in ParseTokens: backslash, dollar sign, or
  *			open bracket.
  * TYPE_QUOTE -		Character is a double quote.
+ * TYPE_OPEN_PAREN -	Character is a left parenthesis.
  * TYPE_CLOSE_PAREN -	Character is a right parenthesis.
  * TYPE_CLOSE_BRACK -	Character is a right square bracket.
  * TYPE_BRACE -		Character is a curly brace (either left or right).
-- 
cgit v0.12


From d00000e8162adf60a7f52d474d430d0cf3cfab6c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Sep 2022 10:56:56 +0000
Subject: fix testcase

---
 tests/socket.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/socket.test b/tests/socket.test
index 4644e1d..c354f46 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1071,7 +1071,7 @@ test socket_$af-7.3 {testing socket specific options} -constraints [list socket
     close $s
     update
     llength $l
-} -result 14
+} -result 16
 test socket_$af-7.4 {testing socket specific options} -constraints [list socket supported_$af] -setup {
     set timer [after 10000 "set x timed_out"]
     set l ""
-- 
cgit v0.12


From 606baf39a5ea4daea70730647a6c5e435db9df03 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Sep 2022 11:26:44 +0000
Subject: Add -strictencoding option to channels. Thanks to Harald Oehlman for
 his example (largely copied). No testcases yet

---
 generic/tclIO.c   | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 generic/tclIO.h   |  3 ++-
 tests/ioCmd.test  | 12 ++++++------
 tests/socket.test |  2 +-
 tests/zlib.test   |  4 ++--
 5 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index e00b99b..04c3b1b 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4342,6 +4342,14 @@ Write(
     }
 
     /*
+     * Transfer encoding strict option to the encoding flags
+     */
+
+    if (statePtr->flags & CHANNEL_ENCODING_STRICT) {
+	statePtr->outputEncodingFlags |= TCL_ENCODING_STRICT;
+    }
+
+    /*
      * Write the terminated escape sequence even if srcLen is 0.
      */
 
@@ -4657,6 +4665,14 @@ Tcl_GetsObj(
     }
 
     /*
+     * Transfer encoding strict option to the encoding flags
+     */
+
+    if (statePtr->flags & CHANNEL_ENCODING_STRICT) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+    }
+
+    /*
      * Object used by FilterInputBytes to keep track of how much data has been
      * consumed from the channel buffers.
      */
@@ -5412,6 +5428,15 @@ FilterInputBytes(
 	*gsPtr->dstPtr = dst;
     }
     gsPtr->state = statePtr->inputEncodingState;
+
+    /*
+     * Transfer encoding strict option to the encoding flags
+     */
+
+    if (statePtr->flags & CHANNEL_ENCODING_STRICT) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+    }
+
     result = Tcl_ExternalToUtf(NULL, gsPtr->encoding, raw, rawLen,
 	    statePtr->inputEncodingFlags | TCL_ENCODING_NO_TERMINATE,
 	    &statePtr->inputEncodingState, dst, spaceLeft, &gsPtr->rawRead,
@@ -6185,6 +6210,14 @@ ReadChars(
     }
 
     /*
+     * Transfer encoding strict option to the encoding flags
+     */
+
+    if (statePtr->flags & CHANNEL_ENCODING_STRICT) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+    }
+
+    /*
      * This routine is burdened with satisfying several constraints. It cannot
      * append more than 'charsToRead` chars onto objPtr. This is measured
      * after encoding and translation transformations are completed. There is
@@ -7920,6 +7953,16 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
+    if (len == 0 || HaveOpt(1, "-strictencoding")) {
+	if (len == 0) {
+	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
+	}
+	Tcl_DStringAppendElement(dsPtr,
+		(flags & CHANNEL_ENCODING_STRICT) ? "1" : "0");
+	if (len > 0) {
+	    return TCL_OK;
+	}
+    }
     if (len == 0 || HaveOpt(1, "-translation")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-translation");
@@ -8173,6 +8216,16 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
+    } else if (HaveOpt(1, "-strictencoding")) {
+	int newMode;
+
+	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
+	    return TCL_ERROR;
+	}
+	if (newMode) {
+	    statePtr->flags |= CHANNEL_ENCODING_STRICT;
+	}
+	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
 
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 54aa5af..7fbb19e 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,7 +271,8 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
-
+#define CHANNEL_ENCODING_STRICT	(1<<18)	/* set if option
+					 * -strictencoding is set to 1 */
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
 					 * usable, but it may not be closed
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index dbca866..4b61fff 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -245,7 +245,7 @@ test iocmd-8.7 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -strictencoding 0 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
@@ -257,7 +257,7 @@ test iocmd-8.8 {fconfigure command} -setup {
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -strictencoding 0 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
@@ -267,7 +267,7 @@ test iocmd-8.9 {fconfigure command} -setup {
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -strictencoding 0 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -1363,7 +1363,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1372,7 +1372,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1384,7 +1384,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -strictencoding 0 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/socket.test b/tests/socket.test
index 4644e1d..c354f46 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1071,7 +1071,7 @@ test socket_$af-7.3 {testing socket specific options} -constraints [list socket
     close $s
     update
     llength $l
-} -result 14
+} -result 16
 test socket_$af-7.4 {testing socket specific options} -constraints [list socket supported_$af] -setup {
     set timer [after 10000 "set x timed_out"]
     set l ""
diff --git a/tests/zlib.test b/tests/zlib.test
index 7de6d64..a1c7aa4 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -strictencoding 0 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From aca56ccb68a14a617153b07b8c272f8838d1f3f6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Sep 2022 15:32:59 +0000
Subject: Make TclObjInterpProc a macro (since it always should be used through
 TclGetObjInterpProc()) Add some unused stub entries. Add some more type-casts
 to tclProc.c

---
 generic/tcl.decls     |  2 +-
 generic/tclDecls.h    | 24 ++++++++++++++---
 generic/tclInt.decls  |  2 +-
 generic/tclIntDecls.h |  6 +++--
 generic/tclProc.c     | 75 +++++++++++++++++----------------------------------
 generic/tclStubInit.c | 11 ++++++--
 6 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 6b67e77..0c18c78 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2325,7 +2325,7 @@ declare 630 {
 
 # ----- BASELINE -- FOR -- 8.6.0 ----- #
 
-declare 675 {
+declare 681 {
     void TclUnusedStubEntry(void)
 }
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index f2eed87..8731144 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1859,7 +1859,13 @@ EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
 /* Slot 672 is reserved */
 /* Slot 673 is reserved */
 /* Slot 674 is reserved */
-/* 675 */
+/* Slot 675 is reserved */
+/* Slot 676 is reserved */
+/* Slot 677 is reserved */
+/* Slot 678 is reserved */
+/* Slot 679 is reserved */
+/* Slot 680 is reserved */
+/* 681 */
 EXTERN void		TclUnusedStubEntry(void);
 
 typedef struct {
@@ -2571,7 +2577,13 @@ typedef struct TclStubs {
     void (*reserved672)(void);
     void (*reserved673)(void);
     void (*reserved674)(void);
-    void (*tclUnusedStubEntry) (void); /* 675 */
+    void (*reserved675)(void);
+    void (*reserved676)(void);
+    void (*reserved677)(void);
+    void (*reserved678)(void);
+    void (*reserved679)(void);
+    void (*reserved680)(void);
+    void (*tclUnusedStubEntry) (void); /* 681 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -3908,8 +3920,14 @@ extern const TclStubs *tclStubsPtr;
 /* Slot 672 is reserved */
 /* Slot 673 is reserved */
 /* Slot 674 is reserved */
+/* Slot 675 is reserved */
+/* Slot 676 is reserved */
+/* Slot 677 is reserved */
+/* Slot 678 is reserved */
+/* Slot 679 is reserved */
+/* Slot 680 is reserved */
 #define TclUnusedStubEntry \
-	(tclStubsPtr->tclUnusedStubEntry) /* 675 */
+	(tclStubsPtr->tclUnusedStubEntry) /* 681 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 0e909a2..c2d8253 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -175,7 +175,7 @@ declare 38 {
 	    const char **simpleNamePtr)
 }
 declare 39 {
-    TclObjCmdProcType TclGetObjInterpProc(void)
+    Tcl_ObjCmdProc *TclGetObjInterpProc(void)
 }
 declare 40 {
     int TclGetOpenMode(Tcl_Interp *interp, const char *str, int *seekFlagPtr)
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 0282259..c524608 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -143,7 +143,7 @@ EXTERN int		TclGetNamespaceForQualName(Tcl_Interp *interp,
 				Namespace **actualCxtPtrPtr,
 				const char **simpleNamePtr);
 /* 39 */
-EXTERN TclObjCmdProcType TclGetObjInterpProc(void);
+EXTERN Tcl_ObjCmdProc *	 TclGetObjInterpProc(void);
 /* 40 */
 EXTERN int		TclGetOpenMode(Tcl_Interp *interp, const char *str,
 				int *seekFlagPtr);
@@ -692,7 +692,7 @@ typedef struct TclIntStubs {
     void (*reserved36)(void);
     int (*tclGetLoadedPackages) (Tcl_Interp *interp, const char *targetName); /* 37 */
     int (*tclGetNamespaceForQualName) (Tcl_Interp *interp, const char *qualName, Namespace *cxtNsPtr, int flags, Namespace **nsPtrPtr, Namespace **altNsPtrPtr, Namespace **actualCxtPtrPtr, const char **simpleNamePtr); /* 38 */
-    TclObjCmdProcType (*tclGetObjInterpProc) (void); /* 39 */
+    Tcl_ObjCmdProc * (*tclGetObjInterpProc) (void); /* 39 */
     int (*tclGetOpenMode) (Tcl_Interp *interp, const char *str, int *seekFlagPtr); /* 40 */
     Tcl_Command (*tclGetOriginalCommand) (Tcl_Command command); /* 41 */
     CONST86 char * (*tclpGetUserHome) (const char *name, Tcl_DString *bufferPtr); /* 42 */
@@ -1377,6 +1377,8 @@ extern const TclIntStubs *tclIntStubsPtr;
 #undef TclSetStartupScriptPath
 #undef TclBackgroundException
 #undef TclUnusedStubEntry
+#undef TclObjInterpProc
+#define TclObjInterpProc TclGetObjInterpProc()
 
 #if defined(USE_TCL_STUBS) && defined(TCL_NO_DEPRECATED)
 #   undef Tcl_SetStartupScript
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 7550bfa..97a32a6 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -163,8 +163,8 @@ Tcl_ProcObjCmd(
      * Create the data structure to represent the procedure.
      */
 
-    if (TclCreateProc(interp, nsPtr, simpleName, objv[2], objv[3],
-	    &procPtr) != TCL_OK) {
+    if (TclCreateProc(interp, nsPtr, simpleName, objv[2],
+	    objv[3], &procPtr) != TCL_OK) {
 	Tcl_AddErrorInfo(interp, "\n    (creating proc \"");
 	Tcl_AddErrorInfo(interp, simpleName);
 	Tcl_AddErrorInfo(interp, "\")");
@@ -200,7 +200,6 @@ Tcl_ProcObjCmd(
 	CmdFrame *contextPtr = (CmdFrame *)TclStackAlloc(interp, sizeof(CmdFrame));
 
 	*contextPtr = *iPtr->cmdFramePtr;
-
 	if (contextPtr->type == TCL_LOCATION_BC) {
 	    /*
 	     * Retrieve source information from the bytecode, if possible. If
@@ -255,7 +254,7 @@ Tcl_ProcObjCmd(
 		     * is able to trigger this situation.
 		     */
 
-		    CmdFrame *cfOldPtr = Tcl_GetHashValue(hePtr);
+		    CmdFrame *cfOldPtr = (CmdFrame *)Tcl_GetHashValue(hePtr);
 
 		    if (cfOldPtr->type == TCL_LOCATION_SOURCE) {
 			Tcl_DecrRefCount(cfOldPtr->data.eval.path);
@@ -541,7 +540,7 @@ TclCreateProc(
 	     * (its value was kept the same as pre VarReform to simplify
 	     * tbcload's processing of older byetcodes).
 	     *
-	     * The only other flag vlaue that is important to retrieve from
+	     * The only other flag value that is important to retrieve from
 	     * precompiled procs is VAR_TEMPORARY (also unchanged). It is
 	     * needed later when retrieving the variable names.
 	     */
@@ -861,7 +860,7 @@ Uplevel_Callback(
     Tcl_Interp *interp,
     int result)
 {
-    CallFrame *savedVarFramePtr = data[0];
+    CallFrame *savedVarFramePtr = (CallFrame *)data[0];
 
     if (result == TCL_ERROR) {
 	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
@@ -876,15 +875,14 @@ Uplevel_Callback(
     return result;
 }
 
-	/* ARGSUSED */
 int
 Tcl_UplevelObjCmd(
-    ClientData dummy,		/* Not used. */
+    ClientData clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    return Tcl_NRCallObjProc(interp, TclNRUplevelObjCmd, dummy, objc, objv);
+    return Tcl_NRCallObjProc(interp, TclNRUplevelObjCmd, clientData, objc, objv);
 }
 
 int
@@ -1045,7 +1043,7 @@ TclIsProc(
 	cmdPtr = (Command *) origCmd;
     }
     if (cmdPtr->deleteProc == TclProcDeleteProc) {
-	return cmdPtr->objClientData;
+	return (Proc *)cmdPtr->objClientData;
     }
     return NULL;
 }
@@ -1067,7 +1065,7 @@ ProcWrongNumArgs(
 
     numArgs = framePtr->procPtr->numArgs;
     desiredObjs = (Tcl_Obj **)TclStackAlloc(interp,
-	    (int) sizeof(Tcl_Obj *) * (numArgs+1));
+	    sizeof(Tcl_Obj *) * (numArgs+1));
 
     if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) {
 	desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", -1);
@@ -1318,7 +1316,7 @@ InitLocalCache(
     Var *varPtr;
     LocalCache *localCachePtr;
     CompiledLocal *localPtr;
-    int new;
+    int isNew;
 
     /*
      * Cache the names and initial values of local variables; store the
@@ -1339,7 +1337,7 @@ InitLocalCache(
 	} else {
 	    *namePtr = TclCreateLiteral(iPtr, localPtr->name,
 		    localPtr->nameLength, /* hash */ (unsigned int) -1,
-		    &new, /* nsPtr */ NULL, 0, NULL);
+		    &isNew, /* nsPtr */ NULL, 0, NULL);
 	    Tcl_IncrRefCount(*namePtr);
 	}
 
@@ -1414,7 +1412,7 @@ InitArgsAndLocals(
      * parameters.
      */
 
-    varPtr = TclStackAlloc(interp, localCt * sizeof(Var));
+    varPtr = (Var *)TclStackAlloc(interp, localCt * sizeof(Var));
     framePtr->compiledLocals = varPtr;
     framePtr->numCompiledLocals = localCt;
 
@@ -1552,7 +1550,7 @@ TclPushProcCallFrame(
     int isLambda)		/* 1 if this is a call by ApplyObjCmd: it
 				 * needs special rules for error msg */
 {
-    Proc *procPtr = clientData;
+    Proc *procPtr = (Proc *)clientData;
     Namespace *nsPtr = procPtr->cmdPtr->nsPtr;
     CallFrame *framePtr, **framePtrPtr;
     int result;
@@ -1635,6 +1633,7 @@ TclPushProcCallFrame(
  *----------------------------------------------------------------------
  */
 
+#undef TclObjInterpProc
 int
 TclObjInterpProc(
     ClientData clientData,	/* Record describing procedure to be
@@ -1795,7 +1794,7 @@ InterpProcNR2(
     Interp *iPtr = (Interp *) interp;
     Proc *procPtr = iPtr->varFramePtr->procPtr;
     CallFrame *freePtr;
-    Tcl_Obj *procNameObj = data[0];
+    Tcl_Obj *procNameObj = (Tcl_Obj *)data[0];
     ProcErrorProc *errorProc = (ProcErrorProc *)data[1];
 
     if (TCL_DTRACE_PROC_RETURN_ENABLED()) {
@@ -2033,7 +2032,7 @@ TclProcCompileProc(
 	 */
 
 	iPtr->invokeWord = 0;
-	iPtr->invokeCmdFramePtr = (hePtr ? Tcl_GetHashValue(hePtr) : NULL);
+	iPtr->invokeCmdFramePtr = hePtr ? (CmdFrame *)Tcl_GetHashValue(hePtr) : NULL;
 	TclSetByteCodeFromAny(interp, bodyPtr, NULL, NULL);
 	iPtr->invokeCmdFramePtr = NULL;
 	TclPopStackFrame(interp);
@@ -2108,7 +2107,7 @@ void
 TclProcDeleteProc(
     ClientData clientData)	/* Procedure to be deleted. */
 {
-    Proc *procPtr = clientData;
+    Proc *procPtr = (Proc *)clientData;
 
     if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
@@ -2190,7 +2189,7 @@ TclProcCleanupProc(
 	return;
     }
 
-    cfPtr = (CmdFrame *) Tcl_GetHashValue(hePtr);
+    cfPtr = (CmdFrame *)Tcl_GetHashValue(hePtr);
 
     if (cfPtr) {
 	if (cfPtr->type == TCL_LOCATION_SOURCE) {
@@ -2271,10 +2270,10 @@ TclUpdateReturnInfo(
  *----------------------------------------------------------------------
  */
 
-TclObjCmdProcType
+Tcl_ObjCmdProc *
 TclGetObjInterpProc(void)
 {
-    return (TclObjCmdProcType) TclObjInterpProc;
+    return TclObjInterpProc;
 }
 
 /*
@@ -2497,7 +2496,7 @@ SetLambdaFromAny(
      */
 
     if (iPtr->cmdFramePtr) {
-	CmdFrame *contextPtr = TclStackAlloc(interp, sizeof(CmdFrame));
+	CmdFrame *contextPtr = (CmdFrame *)TclStackAlloc(interp, sizeof(CmdFrame));
 
 	*contextPtr = *iPtr->cmdFramePtr;
 	if (contextPtr->type == TCL_LOCATION_BC) {
@@ -2616,12 +2615,12 @@ SetLambdaFromAny(
 
 int
 Tcl_ApplyObjCmd(
-    ClientData dummy,		/* Not used. */
+    ClientData clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    return Tcl_NRCallObjProc(interp, TclNRApplyObjCmd, dummy, objc, objv);
+    return Tcl_NRCallObjProc(interp, TclNRApplyObjCmd, clientData, objc, objv);
 }
 
 int
@@ -2653,30 +2652,6 @@ TclNRApplyObjCmd(
 	procPtr = lambdaPtr->internalRep.twoPtrValue.ptr1;
     }
 
-#define JOE_EXTENSION 0
-/*
- * Note: this code is NOT FUNCTIONAL due to the NR implementation; DO NOT
- * ENABLE! Leaving here as reminder to (a) TIP the suggestion, and (b) adapt
- * the code. (MS)
- */
-
-#if JOE_EXTENSION
-    else {
-	/*
-	 * Joe English's suggestion to allow cmdNames to function as lambdas.
-	 */
-
-	Tcl_Obj *elemPtr;
-	int numElem;
-
-	if ((lambdaPtr->typePtr == &tclCmdNameType) ||
-		(TclListObjGetElements(interp, lambdaPtr, &numElem,
-		&elemPtr) == TCL_OK && numElem == 1)) {
-	    return Tcl_EvalObjv(interp, objc-1, objv+1, 0);
-	}
-    }
-#endif
-
     if ((procPtr == NULL) || (procPtr->iPtr != iPtr)) {
 	result = SetLambdaFromAny(interp, lambdaPtr);
 	if (result != TCL_OK) {
@@ -2696,7 +2671,7 @@ TclNRApplyObjCmd(
 	return TCL_ERROR;
     }
 
-    extraPtr = TclStackAlloc(interp, sizeof(ApplyExtraData));
+    extraPtr = (ApplyExtraData *)TclStackAlloc(interp, sizeof(ApplyExtraData));
     memset(&extraPtr->cmd, 0, sizeof(Command));
     procPtr->cmdPtr = &extraPtr->cmd;
     extraPtr->cmd.nsPtr = (Namespace *) nsPtr;
@@ -2731,7 +2706,7 @@ ApplyNR2(
     Tcl_Interp *interp,
     int result)
 {
-    ApplyExtraData *extraPtr = data[0];
+    ApplyExtraData *extraPtr = (ApplyExtraData *)data[0];
 
     TclStackFree(interp, extraPtr);
     return result;
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 93efecd..7f21d83 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -54,6 +54,7 @@
 #undef TclBN_mp_tc_and
 #undef TclBN_mp_tc_or
 #undef TclBN_mp_tc_xor
+#undef TclObjInterpProc
 #define TclBN_mp_tc_and TclBN_mp_and
 #define TclBN_mp_tc_or TclBN_mp_or
 #define TclBN_mp_tc_xor TclBN_mp_xor
@@ -225,7 +226,7 @@ void *TclWinGetTclInstance()
 int
 TclpGetPid(Tcl_Pid pid)
 {
-    return (int) (size_t) pid;
+    return (int)(size_t)pid;
 }
 
 static void
@@ -1665,7 +1666,13 @@ const TclStubs tclStubs = {
     0, /* 672 */
     0, /* 673 */
     0, /* 674 */
-    TclUnusedStubEntry, /* 675 */
+    0, /* 675 */
+    0, /* 676 */
+    0, /* 677 */
+    0, /* 678 */
+    0, /* 679 */
+    0, /* 680 */
+    TclUnusedStubEntry, /* 681 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From 0eab000d0ed26d3e5a80a5a4a76bc58c8c5d3634 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Sep 2022 15:42:32 +0000
Subject: Do the "#undef TclObjInterpProc" slightly earlier

---
 generic/tclProc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/generic/tclProc.c b/generic/tclProc.c
index 97a32a6..bf24c83 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -114,7 +114,7 @@ const Tcl_ObjType tclLambdaType = {
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
+#undef TclObjInterpProc
 int
 Tcl_ProcObjCmd(
     ClientData dummy,		/* Not used. */
@@ -1633,7 +1633,6 @@ TclPushProcCallFrame(
  *----------------------------------------------------------------------
  */
 
-#undef TclObjInterpProc
 int
 TclObjInterpProc(
     ClientData clientData,	/* Record describing procedure to be
-- 
cgit v0.12


From 33195f9318b46186be7801d1a05bfee3f03c529b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 23 Sep 2022 09:56:25 +0000
Subject: Testcase stringObj-16.6 cannot run with -DTCL_NO_DEPRECATED=1. Merge
 8.6

---
 tests/stringObj.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/stringObj.test b/tests/stringObj.test
index 14ba79d..0c65cdc 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -497,7 +497,7 @@ test stringObj-16.5 {Tcl_GetRange: fist = last = -1} {testobj deprecated} {
     teststringobj set 1 abcde
     teststringobj range 1 -1 -1
 } abcde
-test stringObj-16.6 {Tcl_GetRange: old anomaly} testobj {
+test stringObj-16.6 {Tcl_GetRange: old anomaly} {testobj deprecated} {
     # Older implementations could return "cde"
     teststringobj set 1 abcde
     teststringobj range 1 2 0
-- 
cgit v0.12


From dda585be8bc4eb50870c491eb7cd1b29eb42cef1 Mon Sep 17 00:00:00 2001
From: griffin <briang42@easystreet.net>
Date: Sun, 25 Sep 2022 18:05:53 +0000
Subject: Fix out-of-bounds length bug.

---
 generic/tclArithSeries.c | 48 +++++++++++++++++++++++++++++++++++++-----------
 generic/tclArithSeries.h | 13 ++++++++-----
 generic/tclCmdIL.c       | 26 +++++++++++++++++++-------
 generic/tclExecute.c     |  6 +++++-
 generic/tclListObj.c     |  2 +-
 tests/lseq.test          | 19 +++++++++++++++++++
 6 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 93177a7..3974808 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -270,8 +270,16 @@ assignNumber(int useDoubles, Tcl_WideInt *intNumberPtr, double *dblNumberPtr, Tc
  * 	None.
  *----------------------------------------------------------------------
  */
-Tcl_Obj *
-TclNewArithSeriesObj(int useDoubles, Tcl_Obj *startObj, Tcl_Obj *endObj, Tcl_Obj *stepObj, Tcl_Obj *lenObj)
+int
+TclNewArithSeriesObj(
+    Tcl_Interp *interp,       /* For error reporting */
+    Tcl_Obj **arithSeriesObj, /* return value */
+    int useDoubles,           /* Flag indicates values start,
+			      ** end, step, are treated as doubles */
+    Tcl_Obj *startObj,        /* Starting value */
+    Tcl_Obj *endObj,          /* Ending limit */
+    Tcl_Obj *stepObj,         /* increment value */
+    Tcl_Obj *lenObj)          /* Number of elements */
 {
     double dstart, dend, dstep;
     Tcl_WideInt start, end, step, len;
@@ -290,7 +298,8 @@ TclNewArithSeriesObj(int useDoubles, Tcl_Obj *startObj, Tcl_Obj *endObj, Tcl_Obj
 	    dstep = step;
 	}
 	if (dstep == 0) {
-	    return Tcl_NewObj();
+	    *arithSeriesObj = Tcl_NewObj();
+	    return TCL_OK;
 	}
     }
     if (endObj) {
@@ -330,11 +339,20 @@ TclNewArithSeriesObj(int useDoubles, Tcl_Obj *startObj, Tcl_Obj *endObj, Tcl_Obj
 	}
     }
 
-    if (useDoubles) {
-	return TclNewArithSeriesDbl(dstart, dend, dstep, len);
-    } else {
-	return TclNewArithSeriesInt(start, end, step, len);
+    if (len > ListSizeT_MAX) {
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_NewStringObj("max length of a Tcl list exceeded", -1));
+	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+	return TCL_ERROR;
     }
+
+    if (arithSeriesObj) {
+	*arithSeriesObj = (useDoubles)
+	    ? TclNewArithSeriesDbl(dstart, dend, dstep, len)
+	    : TclNewArithSeriesInt(start, end, step, len);
+    }
+    return TCL_OK;
 }
 
 /*
@@ -684,6 +702,7 @@ TclArithSeriesObjCopy(
 
 Tcl_Obj *
 TclArithSeriesObjRange(
+    Tcl_Interp *interp,         /* For error message(s) */
     Tcl_Obj *arithSeriesPtr,	/* List object to take a range from. */
     int fromIdx,		/* Index of first element to include. */
     int toIdx)			/* Index of last element to include. */
@@ -711,8 +730,12 @@ TclArithSeriesObjRange(
 
     if (Tcl_IsShared(arithSeriesPtr) ||
 	    ((arithSeriesPtr->refCount > 1))) {
-	Tcl_Obj *newSlicePtr = TclNewArithSeriesObj(arithSeriesRepPtr->isDouble,
-	           startObj, endObj, stepObj, NULL);
+	Tcl_Obj *newSlicePtr;
+	if (TclNewArithSeriesObj(interp, &newSlicePtr,
+	        arithSeriesRepPtr->isDouble, startObj, endObj,
+		stepObj, NULL) != TCL_OK) {
+	    newSlicePtr = NULL;
+	}
 	Tcl_DecrRefCount(startObj);
 	Tcl_DecrRefCount(endObj);
 	Tcl_DecrRefCount(stepObj);
@@ -875,6 +898,7 @@ TclArithSeriesGetElements(
 
 Tcl_Obj *
 TclArithSeriesObjReverse(
+    Tcl_Interp *interp,         /* For error message(s) */
     Tcl_Obj *arithSeriesPtr)	/* List object to reverse. */
 {
     ArithSeries *arithSeriesRepPtr;
@@ -910,8 +934,10 @@ TclArithSeriesObjReverse(
     if (Tcl_IsShared(arithSeriesPtr) ||
 	    ((arithSeriesPtr->refCount > 1))) {
 	Tcl_Obj *lenObj = Tcl_NewWideIntObj(len);
-	resultObj = TclNewArithSeriesObj(isDouble,
-		        startObj, endObj, stepObj, lenObj);
+	if (TclNewArithSeriesObj(interp, &resultObj,
+		 isDouble, startObj, endObj, stepObj, lenObj) != TCL_OK) {
+	    resultObj = NULL;
+	}
 	Tcl_DecrRefCount(lenObj);
     } else {
 
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index f855c22..3ace052 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -40,9 +40,10 @@ MODULE_SCOPE int	TclArithSeriesObjStep(Tcl_Obj *arithSeriesPtr,
 MODULE_SCOPE int	TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr,
 			    Tcl_WideInt index, Tcl_Obj **elementObj);
 MODULE_SCOPE Tcl_WideInt TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
-MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Obj *arithSeriesPtr,
-			    int fromIdx, int toIdx);
-MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Obj *arithSeriesPtr);
+MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Interp *interp,
+			    Tcl_Obj *arithSeriesPtr, int fromIdx, int toIdx);
+MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Interp *interp,
+			    Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE int	TclArithSeriesGetElements(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, int *objcPtr, Tcl_Obj ***objvPtr);
 MODULE_SCOPE Tcl_Obj *	TclNewArithSeriesInt(Tcl_WideInt start,
@@ -50,5 +51,7 @@ MODULE_SCOPE Tcl_Obj *	TclNewArithSeriesInt(Tcl_WideInt start,
 			    Tcl_WideInt len);
 MODULE_SCOPE Tcl_Obj *	TclNewArithSeriesDbl(double start, double end,
 			    double step, Tcl_WideInt len);
-MODULE_SCOPE Tcl_Obj *	TclNewArithSeriesObj(int useDoubles, Tcl_Obj *startObj,
-			    Tcl_Obj *endObj, Tcl_Obj *stepObj, Tcl_Obj *lenObj);
+MODULE_SCOPE int 	TclNewArithSeriesObj(Tcl_Interp *interp,
+			    Tcl_Obj **arithSeriesObj, int useDoubles,
+			    Tcl_Obj *startObj, Tcl_Obj *endObj,
+			    Tcl_Obj *stepObj, Tcl_Obj *lenObj);
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 9430eb5..f9dcc0f 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2720,7 +2720,6 @@ Tcl_LrangeObjCmd(
 				/* Argument objects. */
 {
     int listLen, first, last, result;
-
     if (objc != 4) {
 	Tcl_WrongNumArgs(interp, 1, objv, "list first last");
 	return TCL_ERROR;
@@ -2744,7 +2743,13 @@ Tcl_LrangeObjCmd(
     }
 
     if (TclHasInternalRep(objv[1],&tclArithSeriesType)) {
-	Tcl_SetObjResult(interp, TclArithSeriesObjRange(objv[1], first, last));
+	Tcl_Obj *rangeObj;
+	rangeObj = TclArithSeriesObjRange(interp, objv[1], first, last);
+	if (rangeObj) {
+	    Tcl_SetObjResult(interp, rangeObj);
+	} else {
+	    return TCL_ERROR;
+	}
     } else {
 	Tcl_SetObjResult(interp, TclListObjRange(objv[1], first, last));
     }
@@ -3137,8 +3142,13 @@ Tcl_LreverseObjCmd(
      *  just to reverse it.
      */
     if (TclHasInternalRep(objv[1],&tclArithSeriesType)) {
-        Tcl_SetObjResult(interp, TclArithSeriesObjReverse(objv[1]));
-	return TCL_OK;
+	Tcl_Obj *resObj = TclArithSeriesObjReverse(interp, objv[1]);
+	if (resObj) {
+	    Tcl_SetObjResult(interp, resObj);
+	    return TCL_OK;
+	} else {
+	    return TCL_ERROR;
+	}
     } /* end ArithSeries */
 
     /* True List */
@@ -4422,10 +4432,12 @@ Tcl_LseqObjCmd(
     /*
      * Success!  Now lets create the series object.
      */
-    arithSeriesPtr = TclNewArithSeriesObj(useDoubles, start, end, step, elementCount);
+    status = TclNewArithSeriesObj(interp, &arithSeriesPtr,
+		  useDoubles, start, end, step, elementCount);
 
-    Tcl_SetObjResult(interp, arithSeriesPtr);
-    status = TCL_OK;
+    if (status == TCL_OK) {
+	Tcl_SetObjResult(interp, arithSeriesPtr);
+    }
 
  done:
     // Free number arguments.
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index f8d5493..5f29bfa 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5154,7 +5154,11 @@ TEBCresume(
 	fromIdx = TclIndexDecode(fromIdx, objc - 1);
 
 	if (TclHasInternalRep(valuePtr,&tclArithSeriesType)) {
-	    objResultPtr = TclArithSeriesObjRange(valuePtr, fromIdx, toIdx);
+	    objResultPtr = TclArithSeriesObjRange(interp, valuePtr, fromIdx, toIdx);
+	    if (objResultPtr == NULL) {
+		TRACE_ERROR(interp);
+		goto gotError;
+	    }
 	} else {
 	    objResultPtr = TclListObjRange(valuePtr, fromIdx, toIdx);
 	}
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 5034174..12b8386 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2632,7 +2632,7 @@ TclLindexFlat(
 
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
-	ListSizeT index, listLen = TclArithSeriesObjLength(listObj);
+	Tcl_WideInt index, listLen = TclArithSeriesObjLength(listObj);
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
 	    if (TclGetIntForIndexM(interp, indexArray[i], /*endValue*/ listLen-1,
diff --git a/tests/lseq.test b/tests/lseq.test
index ffb8a94..e05b32d 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -472,6 +472,25 @@ test lseq-4.3 {TIP examples} {
     set res
 } {{10 9 8 7 6 5 4 3 2 1} {1 2 3 4 5 6 7 8 9 10} {} {10 8 6 4 2} {5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0} {5.0 10.0 15.0 20.0 25.0} {} {25.0 20.0 15.0 10.0 5.0} {1 3 5 7 9} {25.0 20.0 15.0 10.0 5.0 0.0 -5.0 -10.0 -15.0 -20.0 -25.0} 5 5 5}
 
+#
+# Ticket 9933cc4d88697f05976accebd31c1e3ba6efe9c6 - lseq corner case
+test lseq-4.4 {lseq corner case} -body {
+    set tcmd {
+	set res {}
+	set s [catch {lindex [lseq 10 100] 0} e]
+	lappend res $s $e
+	set s [catch {lindex [lseq 10 9223372036854775000] 0} e]
+	lappend res $s $e
+	set s [catch {llength [lseq 10 9223372036854775000]} e]
+	lappend res $s $e
+	set s [catch {lindex [lseq 10 2147483647] 0} e]
+	lappend res $s $e
+	set s [catch {llength [lseq 10 2147483647]} e]
+	lappend res $s $e
+    }
+    eval $tcmd
+} -result {0 10 1 {max length of a Tcl list exceeded} 1 {max length of a Tcl list exceeded} 0 10 0 2147483638}
+
 
 # cleanup
 ::tcltest::cleanupTests
-- 
cgit v0.12


From 5257269714cc2a8444e2f5602e8232b1f9f3c594 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 26 Sep 2022 12:18:46 +0000
Subject: Add some more unused stub entries

---
 generic/tcl.decls     |  6 +++---
 generic/tclDecls.h    | 27 ++++++++++++++++++++++++---
 generic/tclStubInit.c |  9 ++++++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index e07ae5e..9716b32 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -5,8 +5,8 @@
 #	This file is used to generate the tclDecls.h, tclPlatDecls.h
 #	and tclStubInit.c files.
 #
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# Copyright (c) 2001, 2002 by Kevin B. Kenny.  All rights reserved.
+# Copyright (c) 1998-1999 Scriptics Corporation.
+# Copyright (c) 2001, 2002 Kevin B. Kenny.  All rights reserved.
 # Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -2111,7 +2111,7 @@ declare 579 {
 
 # ----- BASELINE -- FOR -- 8.5.0 ----- #
 
-declare 675 {
+declare 682 {
     void TclUnusedStubEntry(void)
 }
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 246e2c9..6d7a8a3 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3507,9 +3507,16 @@ EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
 /* Slot 672 is reserved */
 /* Slot 673 is reserved */
 /* Slot 674 is reserved */
+/* Slot 675 is reserved */
+/* Slot 676 is reserved */
+/* Slot 677 is reserved */
+/* Slot 678 is reserved */
+/* Slot 679 is reserved */
+/* Slot 680 is reserved */
+/* Slot 681 is reserved */
 #ifndef TclUnusedStubEntry_TCL_DECLARED
 #define TclUnusedStubEntry_TCL_DECLARED
-/* 675 */
+/* 682 */
 EXTERN void		TclUnusedStubEntry(void);
 #endif
 
@@ -4222,7 +4229,14 @@ typedef struct TclStubs {
     VOID *reserved672;
     VOID *reserved673;
     VOID *reserved674;
-    void (*tclUnusedStubEntry) (void); /* 675 */
+    VOID *reserved675;
+    VOID *reserved676;
+    VOID *reserved677;
+    VOID *reserved678;
+    VOID *reserved679;
+    VOID *reserved680;
+    VOID *reserved681;
+    void (*tclUnusedStubEntry) (void); /* 682 */
 } TclStubs;
 
 extern TclStubs *tclStubsPtr;
@@ -6670,9 +6684,16 @@ extern TclStubs *tclStubsPtr;
 /* Slot 672 is reserved */
 /* Slot 673 is reserved */
 /* Slot 674 is reserved */
+/* Slot 675 is reserved */
+/* Slot 676 is reserved */
+/* Slot 677 is reserved */
+/* Slot 678 is reserved */
+/* Slot 679 is reserved */
+/* Slot 680 is reserved */
+/* Slot 681 is reserved */
 #ifndef TclUnusedStubEntry
 #define TclUnusedStubEntry \
-	(tclStubsPtr->tclUnusedStubEntry) /* 675 */
+	(tclStubsPtr->tclUnusedStubEntry) /* 682 */
 #endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 0d2a3c2..f1cf6a2 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1474,7 +1474,14 @@ TclStubs tclStubs = {
     NULL, /* 672 */
     NULL, /* 673 */
     NULL, /* 674 */
-    TclUnusedStubEntry, /* 675 */
+    NULL, /* 675 */
+    NULL, /* 676 */
+    NULL, /* 677 */
+    NULL, /* 678 */
+    NULL, /* 679 */
+    NULL, /* 680 */
+    NULL, /* 681 */
+    TclUnusedStubEntry, /* 682 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From a5fc6492213184ed373920e0afb5dd2f569c8f84 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 26 Sep 2022 12:19:22 +0000
Subject: Update tzdata to 2022d

---
 library/tzdata/Asia/Gaza         | 310 +++++++++++++++++++--------------------
 library/tzdata/Asia/Hebron       | 310 +++++++++++++++++++--------------------
 library/tzdata/Europe/Uzhgorod   | 255 +-------------------------------
 library/tzdata/Europe/Zaporozhye | 254 +-------------------------------
 4 files changed, 316 insertions(+), 813 deletions(-)

diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index e819d87..1ceb680 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -126,159 +126,159 @@ set TZData(:Asia/Gaza) {
     {1616796000 10800 1 EEST}
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
-    {1666908000 7200 0 EET}
-    {1679781600 10800 1 EEST}
-    {1698357600 7200 0 EET}
-    {1711836000 10800 1 EEST}
-    {1729807200 7200 0 EET}
-    {1743285600 10800 1 EEST}
-    {1761256800 7200 0 EET}
-    {1774735200 10800 1 EEST}
-    {1792706400 7200 0 EET}
-    {1806184800 10800 1 EEST}
-    {1824760800 7200 0 EET}
-    {1837634400 10800 1 EEST}
-    {1856210400 7200 0 EET}
-    {1869084000 10800 1 EEST}
-    {1887660000 7200 0 EET}
-    {1901138400 10800 1 EEST}
-    {1919109600 7200 0 EET}
-    {1932588000 10800 1 EEST}
-    {1950559200 7200 0 EET}
-    {1964037600 10800 1 EEST}
-    {1982613600 7200 0 EET}
-    {1995487200 10800 1 EEST}
-    {2014063200 7200 0 EET}
-    {2026936800 10800 1 EEST}
-    {2045512800 7200 0 EET}
-    {2058386400 10800 1 EEST}
-    {2076962400 7200 0 EET}
-    {2090440800 10800 1 EEST}
-    {2108412000 7200 0 EET}
-    {2121890400 10800 1 EEST}
-    {2139861600 7200 0 EET}
-    {2153340000 10800 1 EEST}
-    {2171916000 7200 0 EET}
-    {2184789600 10800 1 EEST}
-    {2203365600 7200 0 EET}
-    {2216239200 10800 1 EEST}
-    {2234815200 7200 0 EET}
-    {2248293600 10800 1 EEST}
-    {2266264800 7200 0 EET}
-    {2279743200 10800 1 EEST}
-    {2297714400 7200 0 EET}
-    {2311192800 10800 1 EEST}
-    {2329164000 7200 0 EET}
-    {2342642400 10800 1 EEST}
-    {2361218400 7200 0 EET}
-    {2374092000 10800 1 EEST}
-    {2392668000 7200 0 EET}
-    {2405541600 10800 1 EEST}
-    {2424117600 7200 0 EET}
-    {2437596000 10800 1 EEST}
-    {2455567200 7200 0 EET}
-    {2469045600 10800 1 EEST}
-    {2487016800 7200 0 EET}
-    {2500495200 10800 1 EEST}
-    {2519071200 7200 0 EET}
-    {2531944800 10800 1 EEST}
-    {2550520800 7200 0 EET}
-    {2563394400 10800 1 EEST}
-    {2581970400 7200 0 EET}
-    {2595448800 10800 1 EEST}
-    {2613420000 7200 0 EET}
-    {2626898400 10800 1 EEST}
-    {2644869600 7200 0 EET}
-    {2658348000 10800 1 EEST}
-    {2676319200 7200 0 EET}
-    {2689797600 10800 1 EEST}
-    {2708373600 7200 0 EET}
-    {2721247200 10800 1 EEST}
-    {2739823200 7200 0 EET}
-    {2752696800 10800 1 EEST}
-    {2771272800 7200 0 EET}
-    {2784751200 10800 1 EEST}
-    {2802722400 7200 0 EET}
-    {2816200800 10800 1 EEST}
-    {2834172000 7200 0 EET}
-    {2847650400 10800 1 EEST}
-    {2866226400 7200 0 EET}
-    {2879100000 10800 1 EEST}
-    {2897676000 7200 0 EET}
-    {2910549600 10800 1 EEST}
-    {2929125600 7200 0 EET}
-    {2941999200 10800 1 EEST}
-    {2960575200 7200 0 EET}
-    {2974053600 10800 1 EEST}
-    {2992024800 7200 0 EET}
-    {3005503200 10800 1 EEST}
-    {3023474400 7200 0 EET}
-    {3036952800 10800 1 EEST}
-    {3055528800 7200 0 EET}
-    {3068402400 10800 1 EEST}
-    {3086978400 7200 0 EET}
-    {3099852000 10800 1 EEST}
-    {3118428000 7200 0 EET}
-    {3131906400 10800 1 EEST}
-    {3149877600 7200 0 EET}
-    {3163356000 10800 1 EEST}
-    {3181327200 7200 0 EET}
-    {3194805600 10800 1 EEST}
-    {3212776800 7200 0 EET}
-    {3226255200 10800 1 EEST}
-    {3244831200 7200 0 EET}
-    {3257704800 10800 1 EEST}
-    {3276280800 7200 0 EET}
-    {3289154400 10800 1 EEST}
-    {3307730400 7200 0 EET}
-    {3321208800 10800 1 EEST}
-    {3339180000 7200 0 EET}
-    {3352658400 10800 1 EEST}
-    {3370629600 7200 0 EET}
-    {3384108000 10800 1 EEST}
-    {3402684000 7200 0 EET}
-    {3415557600 10800 1 EEST}
-    {3434133600 7200 0 EET}
-    {3447007200 10800 1 EEST}
-    {3465583200 7200 0 EET}
-    {3479061600 10800 1 EEST}
-    {3497032800 7200 0 EET}
-    {3510511200 10800 1 EEST}
-    {3528482400 7200 0 EET}
-    {3541960800 10800 1 EEST}
-    {3559932000 7200 0 EET}
-    {3573410400 10800 1 EEST}
-    {3591986400 7200 0 EET}
-    {3604860000 10800 1 EEST}
-    {3623436000 7200 0 EET}
-    {3636309600 10800 1 EEST}
-    {3654885600 7200 0 EET}
-    {3668364000 10800 1 EEST}
-    {3686335200 7200 0 EET}
-    {3699813600 10800 1 EEST}
-    {3717784800 7200 0 EET}
-    {3731263200 10800 1 EEST}
-    {3749839200 7200 0 EET}
-    {3762712800 10800 1 EEST}
-    {3781288800 7200 0 EET}
-    {3794162400 10800 1 EEST}
-    {3812738400 7200 0 EET}
-    {3825612000 10800 1 EEST}
-    {3844188000 7200 0 EET}
-    {3857666400 10800 1 EEST}
-    {3875637600 7200 0 EET}
-    {3889116000 10800 1 EEST}
-    {3907087200 7200 0 EET}
-    {3920565600 10800 1 EEST}
-    {3939141600 7200 0 EET}
-    {3952015200 10800 1 EEST}
-    {3970591200 7200 0 EET}
-    {3983464800 10800 1 EEST}
-    {4002040800 7200 0 EET}
-    {4015519200 10800 1 EEST}
-    {4033490400 7200 0 EET}
-    {4046968800 10800 1 EEST}
-    {4064940000 7200 0 EET}
-    {4078418400 10800 1 EEST}
-    {4096389600 7200 0 EET}
+    {1666998000 7200 0 EET}
+    {1679702400 10800 1 EEST}
+    {1698447600 7200 0 EET}
+    {1711756800 10800 1 EEST}
+    {1729897200 7200 0 EET}
+    {1743206400 10800 1 EEST}
+    {1761346800 7200 0 EET}
+    {1774656000 10800 1 EEST}
+    {1792796400 7200 0 EET}
+    {1806105600 10800 1 EEST}
+    {1824850800 7200 0 EET}
+    {1837555200 10800 1 EEST}
+    {1856300400 7200 0 EET}
+    {1869004800 10800 1 EEST}
+    {1887750000 7200 0 EET}
+    {1901059200 10800 1 EEST}
+    {1919199600 7200 0 EET}
+    {1932508800 10800 1 EEST}
+    {1950649200 7200 0 EET}
+    {1963958400 10800 1 EEST}
+    {1982703600 7200 0 EET}
+    {1995408000 10800 1 EEST}
+    {2014153200 7200 0 EET}
+    {2026857600 10800 1 EEST}
+    {2045602800 7200 0 EET}
+    {2058307200 10800 1 EEST}
+    {2077052400 7200 0 EET}
+    {2090361600 10800 1 EEST}
+    {2108502000 7200 0 EET}
+    {2121811200 10800 1 EEST}
+    {2139951600 7200 0 EET}
+    {2153260800 10800 1 EEST}
+    {2172006000 7200 0 EET}
+    {2184710400 10800 1 EEST}
+    {2203455600 7200 0 EET}
+    {2216160000 10800 1 EEST}
+    {2234905200 7200 0 EET}
+    {2248214400 10800 1 EEST}
+    {2266354800 7200 0 EET}
+    {2279664000 10800 1 EEST}
+    {2297804400 7200 0 EET}
+    {2311113600 10800 1 EEST}
+    {2329254000 7200 0 EET}
+    {2342563200 10800 1 EEST}
+    {2361308400 7200 0 EET}
+    {2374012800 10800 1 EEST}
+    {2392758000 7200 0 EET}
+    {2405462400 10800 1 EEST}
+    {2424207600 7200 0 EET}
+    {2437516800 10800 1 EEST}
+    {2455657200 7200 0 EET}
+    {2468966400 10800 1 EEST}
+    {2487106800 7200 0 EET}
+    {2500416000 10800 1 EEST}
+    {2519161200 7200 0 EET}
+    {2531865600 10800 1 EEST}
+    {2550610800 7200 0 EET}
+    {2563315200 10800 1 EEST}
+    {2582060400 7200 0 EET}
+    {2595369600 10800 1 EEST}
+    {2613510000 7200 0 EET}
+    {2626819200 10800 1 EEST}
+    {2644959600 7200 0 EET}
+    {2658268800 10800 1 EEST}
+    {2676409200 7200 0 EET}
+    {2689718400 10800 1 EEST}
+    {2708463600 7200 0 EET}
+    {2721168000 10800 1 EEST}
+    {2739913200 7200 0 EET}
+    {2752617600 10800 1 EEST}
+    {2771362800 7200 0 EET}
+    {2784672000 10800 1 EEST}
+    {2802812400 7200 0 EET}
+    {2816121600 10800 1 EEST}
+    {2834262000 7200 0 EET}
+    {2847571200 10800 1 EEST}
+    {2866316400 7200 0 EET}
+    {2879020800 10800 1 EEST}
+    {2897766000 7200 0 EET}
+    {2910470400 10800 1 EEST}
+    {2929215600 7200 0 EET}
+    {2941920000 10800 1 EEST}
+    {2960665200 7200 0 EET}
+    {2973974400 10800 1 EEST}
+    {2992114800 7200 0 EET}
+    {3005424000 10800 1 EEST}
+    {3023564400 7200 0 EET}
+    {3036873600 10800 1 EEST}
+    {3055618800 7200 0 EET}
+    {3068323200 10800 1 EEST}
+    {3087068400 7200 0 EET}
+    {3099772800 10800 1 EEST}
+    {3118518000 7200 0 EET}
+    {3131827200 10800 1 EEST}
+    {3149967600 7200 0 EET}
+    {3163276800 10800 1 EEST}
+    {3181417200 7200 0 EET}
+    {3194726400 10800 1 EEST}
+    {3212866800 7200 0 EET}
+    {3226176000 10800 1 EEST}
+    {3244921200 7200 0 EET}
+    {3257625600 10800 1 EEST}
+    {3276370800 7200 0 EET}
+    {3289075200 10800 1 EEST}
+    {3307820400 7200 0 EET}
+    {3321129600 10800 1 EEST}
+    {3339270000 7200 0 EET}
+    {3352579200 10800 1 EEST}
+    {3370719600 7200 0 EET}
+    {3384028800 10800 1 EEST}
+    {3402774000 7200 0 EET}
+    {3415478400 10800 1 EEST}
+    {3434223600 7200 0 EET}
+    {3446928000 10800 1 EEST}
+    {3465673200 7200 0 EET}
+    {3478982400 10800 1 EEST}
+    {3497122800 7200 0 EET}
+    {3510432000 10800 1 EEST}
+    {3528572400 7200 0 EET}
+    {3541881600 10800 1 EEST}
+    {3560022000 7200 0 EET}
+    {3573331200 10800 1 EEST}
+    {3592076400 7200 0 EET}
+    {3604780800 10800 1 EEST}
+    {3623526000 7200 0 EET}
+    {3636230400 10800 1 EEST}
+    {3654975600 7200 0 EET}
+    {3668284800 10800 1 EEST}
+    {3686425200 7200 0 EET}
+    {3699734400 10800 1 EEST}
+    {3717874800 7200 0 EET}
+    {3731184000 10800 1 EEST}
+    {3749929200 7200 0 EET}
+    {3762633600 10800 1 EEST}
+    {3781378800 7200 0 EET}
+    {3794083200 10800 1 EEST}
+    {3812828400 7200 0 EET}
+    {3825532800 10800 1 EEST}
+    {3844278000 7200 0 EET}
+    {3857587200 10800 1 EEST}
+    {3875727600 7200 0 EET}
+    {3889036800 10800 1 EEST}
+    {3907177200 7200 0 EET}
+    {3920486400 10800 1 EEST}
+    {3939231600 7200 0 EET}
+    {3951936000 10800 1 EEST}
+    {3970681200 7200 0 EET}
+    {3983385600 10800 1 EEST}
+    {4002130800 7200 0 EET}
+    {4015440000 10800 1 EEST}
+    {4033580400 7200 0 EET}
+    {4046889600 10800 1 EEST}
+    {4065030000 7200 0 EET}
+    {4078339200 10800 1 EEST}
+    {4096479600 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index b484c6f..b92db8d 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -125,159 +125,159 @@ set TZData(:Asia/Hebron) {
     {1616796000 10800 1 EEST}
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
-    {1666908000 7200 0 EET}
-    {1679781600 10800 1 EEST}
-    {1698357600 7200 0 EET}
-    {1711836000 10800 1 EEST}
-    {1729807200 7200 0 EET}
-    {1743285600 10800 1 EEST}
-    {1761256800 7200 0 EET}
-    {1774735200 10800 1 EEST}
-    {1792706400 7200 0 EET}
-    {1806184800 10800 1 EEST}
-    {1824760800 7200 0 EET}
-    {1837634400 10800 1 EEST}
-    {1856210400 7200 0 EET}
-    {1869084000 10800 1 EEST}
-    {1887660000 7200 0 EET}
-    {1901138400 10800 1 EEST}
-    {1919109600 7200 0 EET}
-    {1932588000 10800 1 EEST}
-    {1950559200 7200 0 EET}
-    {1964037600 10800 1 EEST}
-    {1982613600 7200 0 EET}
-    {1995487200 10800 1 EEST}
-    {2014063200 7200 0 EET}
-    {2026936800 10800 1 EEST}
-    {2045512800 7200 0 EET}
-    {2058386400 10800 1 EEST}
-    {2076962400 7200 0 EET}
-    {2090440800 10800 1 EEST}
-    {2108412000 7200 0 EET}
-    {2121890400 10800 1 EEST}
-    {2139861600 7200 0 EET}
-    {2153340000 10800 1 EEST}
-    {2171916000 7200 0 EET}
-    {2184789600 10800 1 EEST}
-    {2203365600 7200 0 EET}
-    {2216239200 10800 1 EEST}
-    {2234815200 7200 0 EET}
-    {2248293600 10800 1 EEST}
-    {2266264800 7200 0 EET}
-    {2279743200 10800 1 EEST}
-    {2297714400 7200 0 EET}
-    {2311192800 10800 1 EEST}
-    {2329164000 7200 0 EET}
-    {2342642400 10800 1 EEST}
-    {2361218400 7200 0 EET}
-    {2374092000 10800 1 EEST}
-    {2392668000 7200 0 EET}
-    {2405541600 10800 1 EEST}
-    {2424117600 7200 0 EET}
-    {2437596000 10800 1 EEST}
-    {2455567200 7200 0 EET}
-    {2469045600 10800 1 EEST}
-    {2487016800 7200 0 EET}
-    {2500495200 10800 1 EEST}
-    {2519071200 7200 0 EET}
-    {2531944800 10800 1 EEST}
-    {2550520800 7200 0 EET}
-    {2563394400 10800 1 EEST}
-    {2581970400 7200 0 EET}
-    {2595448800 10800 1 EEST}
-    {2613420000 7200 0 EET}
-    {2626898400 10800 1 EEST}
-    {2644869600 7200 0 EET}
-    {2658348000 10800 1 EEST}
-    {2676319200 7200 0 EET}
-    {2689797600 10800 1 EEST}
-    {2708373600 7200 0 EET}
-    {2721247200 10800 1 EEST}
-    {2739823200 7200 0 EET}
-    {2752696800 10800 1 EEST}
-    {2771272800 7200 0 EET}
-    {2784751200 10800 1 EEST}
-    {2802722400 7200 0 EET}
-    {2816200800 10800 1 EEST}
-    {2834172000 7200 0 EET}
-    {2847650400 10800 1 EEST}
-    {2866226400 7200 0 EET}
-    {2879100000 10800 1 EEST}
-    {2897676000 7200 0 EET}
-    {2910549600 10800 1 EEST}
-    {2929125600 7200 0 EET}
-    {2941999200 10800 1 EEST}
-    {2960575200 7200 0 EET}
-    {2974053600 10800 1 EEST}
-    {2992024800 7200 0 EET}
-    {3005503200 10800 1 EEST}
-    {3023474400 7200 0 EET}
-    {3036952800 10800 1 EEST}
-    {3055528800 7200 0 EET}
-    {3068402400 10800 1 EEST}
-    {3086978400 7200 0 EET}
-    {3099852000 10800 1 EEST}
-    {3118428000 7200 0 EET}
-    {3131906400 10800 1 EEST}
-    {3149877600 7200 0 EET}
-    {3163356000 10800 1 EEST}
-    {3181327200 7200 0 EET}
-    {3194805600 10800 1 EEST}
-    {3212776800 7200 0 EET}
-    {3226255200 10800 1 EEST}
-    {3244831200 7200 0 EET}
-    {3257704800 10800 1 EEST}
-    {3276280800 7200 0 EET}
-    {3289154400 10800 1 EEST}
-    {3307730400 7200 0 EET}
-    {3321208800 10800 1 EEST}
-    {3339180000 7200 0 EET}
-    {3352658400 10800 1 EEST}
-    {3370629600 7200 0 EET}
-    {3384108000 10800 1 EEST}
-    {3402684000 7200 0 EET}
-    {3415557600 10800 1 EEST}
-    {3434133600 7200 0 EET}
-    {3447007200 10800 1 EEST}
-    {3465583200 7200 0 EET}
-    {3479061600 10800 1 EEST}
-    {3497032800 7200 0 EET}
-    {3510511200 10800 1 EEST}
-    {3528482400 7200 0 EET}
-    {3541960800 10800 1 EEST}
-    {3559932000 7200 0 EET}
-    {3573410400 10800 1 EEST}
-    {3591986400 7200 0 EET}
-    {3604860000 10800 1 EEST}
-    {3623436000 7200 0 EET}
-    {3636309600 10800 1 EEST}
-    {3654885600 7200 0 EET}
-    {3668364000 10800 1 EEST}
-    {3686335200 7200 0 EET}
-    {3699813600 10800 1 EEST}
-    {3717784800 7200 0 EET}
-    {3731263200 10800 1 EEST}
-    {3749839200 7200 0 EET}
-    {3762712800 10800 1 EEST}
-    {3781288800 7200 0 EET}
-    {3794162400 10800 1 EEST}
-    {3812738400 7200 0 EET}
-    {3825612000 10800 1 EEST}
-    {3844188000 7200 0 EET}
-    {3857666400 10800 1 EEST}
-    {3875637600 7200 0 EET}
-    {3889116000 10800 1 EEST}
-    {3907087200 7200 0 EET}
-    {3920565600 10800 1 EEST}
-    {3939141600 7200 0 EET}
-    {3952015200 10800 1 EEST}
-    {3970591200 7200 0 EET}
-    {3983464800 10800 1 EEST}
-    {4002040800 7200 0 EET}
-    {4015519200 10800 1 EEST}
-    {4033490400 7200 0 EET}
-    {4046968800 10800 1 EEST}
-    {4064940000 7200 0 EET}
-    {4078418400 10800 1 EEST}
-    {4096389600 7200 0 EET}
+    {1666998000 7200 0 EET}
+    {1679702400 10800 1 EEST}
+    {1698447600 7200 0 EET}
+    {1711756800 10800 1 EEST}
+    {1729897200 7200 0 EET}
+    {1743206400 10800 1 EEST}
+    {1761346800 7200 0 EET}
+    {1774656000 10800 1 EEST}
+    {1792796400 7200 0 EET}
+    {1806105600 10800 1 EEST}
+    {1824850800 7200 0 EET}
+    {1837555200 10800 1 EEST}
+    {1856300400 7200 0 EET}
+    {1869004800 10800 1 EEST}
+    {1887750000 7200 0 EET}
+    {1901059200 10800 1 EEST}
+    {1919199600 7200 0 EET}
+    {1932508800 10800 1 EEST}
+    {1950649200 7200 0 EET}
+    {1963958400 10800 1 EEST}
+    {1982703600 7200 0 EET}
+    {1995408000 10800 1 EEST}
+    {2014153200 7200 0 EET}
+    {2026857600 10800 1 EEST}
+    {2045602800 7200 0 EET}
+    {2058307200 10800 1 EEST}
+    {2077052400 7200 0 EET}
+    {2090361600 10800 1 EEST}
+    {2108502000 7200 0 EET}
+    {2121811200 10800 1 EEST}
+    {2139951600 7200 0 EET}
+    {2153260800 10800 1 EEST}
+    {2172006000 7200 0 EET}
+    {2184710400 10800 1 EEST}
+    {2203455600 7200 0 EET}
+    {2216160000 10800 1 EEST}
+    {2234905200 7200 0 EET}
+    {2248214400 10800 1 EEST}
+    {2266354800 7200 0 EET}
+    {2279664000 10800 1 EEST}
+    {2297804400 7200 0 EET}
+    {2311113600 10800 1 EEST}
+    {2329254000 7200 0 EET}
+    {2342563200 10800 1 EEST}
+    {2361308400 7200 0 EET}
+    {2374012800 10800 1 EEST}
+    {2392758000 7200 0 EET}
+    {2405462400 10800 1 EEST}
+    {2424207600 7200 0 EET}
+    {2437516800 10800 1 EEST}
+    {2455657200 7200 0 EET}
+    {2468966400 10800 1 EEST}
+    {2487106800 7200 0 EET}
+    {2500416000 10800 1 EEST}
+    {2519161200 7200 0 EET}
+    {2531865600 10800 1 EEST}
+    {2550610800 7200 0 EET}
+    {2563315200 10800 1 EEST}
+    {2582060400 7200 0 EET}
+    {2595369600 10800 1 EEST}
+    {2613510000 7200 0 EET}
+    {2626819200 10800 1 EEST}
+    {2644959600 7200 0 EET}
+    {2658268800 10800 1 EEST}
+    {2676409200 7200 0 EET}
+    {2689718400 10800 1 EEST}
+    {2708463600 7200 0 EET}
+    {2721168000 10800 1 EEST}
+    {2739913200 7200 0 EET}
+    {2752617600 10800 1 EEST}
+    {2771362800 7200 0 EET}
+    {2784672000 10800 1 EEST}
+    {2802812400 7200 0 EET}
+    {2816121600 10800 1 EEST}
+    {2834262000 7200 0 EET}
+    {2847571200 10800 1 EEST}
+    {2866316400 7200 0 EET}
+    {2879020800 10800 1 EEST}
+    {2897766000 7200 0 EET}
+    {2910470400 10800 1 EEST}
+    {2929215600 7200 0 EET}
+    {2941920000 10800 1 EEST}
+    {2960665200 7200 0 EET}
+    {2973974400 10800 1 EEST}
+    {2992114800 7200 0 EET}
+    {3005424000 10800 1 EEST}
+    {3023564400 7200 0 EET}
+    {3036873600 10800 1 EEST}
+    {3055618800 7200 0 EET}
+    {3068323200 10800 1 EEST}
+    {3087068400 7200 0 EET}
+    {3099772800 10800 1 EEST}
+    {3118518000 7200 0 EET}
+    {3131827200 10800 1 EEST}
+    {3149967600 7200 0 EET}
+    {3163276800 10800 1 EEST}
+    {3181417200 7200 0 EET}
+    {3194726400 10800 1 EEST}
+    {3212866800 7200 0 EET}
+    {3226176000 10800 1 EEST}
+    {3244921200 7200 0 EET}
+    {3257625600 10800 1 EEST}
+    {3276370800 7200 0 EET}
+    {3289075200 10800 1 EEST}
+    {3307820400 7200 0 EET}
+    {3321129600 10800 1 EEST}
+    {3339270000 7200 0 EET}
+    {3352579200 10800 1 EEST}
+    {3370719600 7200 0 EET}
+    {3384028800 10800 1 EEST}
+    {3402774000 7200 0 EET}
+    {3415478400 10800 1 EEST}
+    {3434223600 7200 0 EET}
+    {3446928000 10800 1 EEST}
+    {3465673200 7200 0 EET}
+    {3478982400 10800 1 EEST}
+    {3497122800 7200 0 EET}
+    {3510432000 10800 1 EEST}
+    {3528572400 7200 0 EET}
+    {3541881600 10800 1 EEST}
+    {3560022000 7200 0 EET}
+    {3573331200 10800 1 EEST}
+    {3592076400 7200 0 EET}
+    {3604780800 10800 1 EEST}
+    {3623526000 7200 0 EET}
+    {3636230400 10800 1 EEST}
+    {3654975600 7200 0 EET}
+    {3668284800 10800 1 EEST}
+    {3686425200 7200 0 EET}
+    {3699734400 10800 1 EEST}
+    {3717874800 7200 0 EET}
+    {3731184000 10800 1 EEST}
+    {3749929200 7200 0 EET}
+    {3762633600 10800 1 EEST}
+    {3781378800 7200 0 EET}
+    {3794083200 10800 1 EEST}
+    {3812828400 7200 0 EET}
+    {3825532800 10800 1 EEST}
+    {3844278000 7200 0 EET}
+    {3857587200 10800 1 EEST}
+    {3875727600 7200 0 EET}
+    {3889036800 10800 1 EEST}
+    {3907177200 7200 0 EET}
+    {3920486400 10800 1 EEST}
+    {3939231600 7200 0 EET}
+    {3951936000 10800 1 EEST}
+    {3970681200 7200 0 EET}
+    {3983385600 10800 1 EEST}
+    {4002130800 7200 0 EET}
+    {4015440000 10800 1 EEST}
+    {4033580400 7200 0 EET}
+    {4046889600 10800 1 EEST}
+    {4065030000 7200 0 EET}
+    {4078339200 10800 1 EEST}
+    {4096479600 7200 0 EET}
 }
diff --git a/library/tzdata/Europe/Uzhgorod b/library/tzdata/Europe/Uzhgorod
index 0a058db..2a0f450 100644
--- a/library/tzdata/Europe/Uzhgorod
+++ b/library/tzdata/Europe/Uzhgorod
@@ -1,254 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Europe/Uzhgorod) {
-    {-9223372036854775808 5352 0 LMT}
-    {-2500939752 3600 0 CET}
-    {-946774800 3600 0 CET}
-    {-938905200 7200 1 CEST}
-    {-857257200 3600 0 CET}
-    {-844556400 7200 1 CEST}
-    {-828226800 3600 0 CET}
-    {-812502000 7200 1 CEST}
-    {-796870800 7200 1 CEST}
-    {-794714400 3600 0 CET}
-    {-773456400 10800 0 MSD}
-    {354920400 14400 1 MSD}
-    {370728000 10800 0 MSK}
-    {386456400 14400 1 MSD}
-    {402264000 10800 0 MSK}
-    {417992400 14400 1 MSD}
-    {433800000 10800 0 MSK}
-    {449614800 14400 1 MSD}
-    {465346800 10800 0 MSK}
-    {481071600 14400 1 MSD}
-    {496796400 10800 0 MSK}
-    {512521200 14400 1 MSD}
-    {528246000 10800 0 MSK}
-    {543970800 14400 1 MSD}
-    {559695600 10800 0 MSK}
-    {575420400 14400 1 MSD}
-    {591145200 10800 0 MSK}
-    {606870000 14400 1 MSD}
-    {622594800 10800 0 MSK}
-    {631141200 10800 0 MSK}
-    {646786800 3600 0 CET}
-    {670384800 7200 0 EET}
-    {701042400 7200 0 EET}
-    {701827200 10800 1 EEST}
-    {717552000 7200 0 EET}
-    {733276800 10800 1 EEST}
-    {749001600 7200 0 EET}
-    {764726400 10800 1 EEST}
-    {780451200 7200 0 EET}
-    {796176000 10800 1 EEST}
-    {811900800 7200 0 EET}
-    {828230400 10800 1 EEST}
-    {831938400 10800 0 EEST}
-    {846378000 7200 0 EET}
-    {859683600 10800 1 EEST}
-    {877827600 7200 0 EET}
-    {891133200 10800 1 EEST}
-    {909277200 7200 0 EET}
-    {922582800 10800 1 EEST}
-    {941331600 7200 0 EET}
-    {954032400 10800 1 EEST}
-    {972781200 7200 0 EET}
-    {985482000 10800 1 EEST}
-    {1004230800 7200 0 EET}
-    {1017536400 10800 1 EEST}
-    {1035680400 7200 0 EET}
-    {1048986000 10800 1 EEST}
-    {1067130000 7200 0 EET}
-    {1080435600 10800 1 EEST}
-    {1099184400 7200 0 EET}
-    {1111885200 10800 1 EEST}
-    {1130634000 7200 0 EET}
-    {1143334800 10800 1 EEST}
-    {1162083600 7200 0 EET}
-    {1174784400 10800 1 EEST}
-    {1193533200 7200 0 EET}
-    {1206838800 10800 1 EEST}
-    {1224982800 7200 0 EET}
-    {1238288400 10800 1 EEST}
-    {1256432400 7200 0 EET}
-    {1269738000 10800 1 EEST}
-    {1288486800 7200 0 EET}
-    {1301187600 10800 1 EEST}
-    {1319936400 7200 0 EET}
-    {1332637200 10800 1 EEST}
-    {1351386000 7200 0 EET}
-    {1364691600 10800 1 EEST}
-    {1382835600 7200 0 EET}
-    {1396141200 10800 1 EEST}
-    {1414285200 7200 0 EET}
-    {1427590800 10800 1 EEST}
-    {1445734800 7200 0 EET}
-    {1459040400 10800 1 EEST}
-    {1477789200 7200 0 EET}
-    {1490490000 10800 1 EEST}
-    {1509238800 7200 0 EET}
-    {1521939600 10800 1 EEST}
-    {1540688400 7200 0 EET}
-    {1553994000 10800 1 EEST}
-    {1572138000 7200 0 EET}
-    {1585443600 10800 1 EEST}
-    {1603587600 7200 0 EET}
-    {1616893200 10800 1 EEST}
-    {1635642000 7200 0 EET}
-    {1648342800 10800 1 EEST}
-    {1667091600 7200 0 EET}
-    {1679792400 10800 1 EEST}
-    {1698541200 7200 0 EET}
-    {1711846800 10800 1 EEST}
-    {1729990800 7200 0 EET}
-    {1743296400 10800 1 EEST}
-    {1761440400 7200 0 EET}
-    {1774746000 10800 1 EEST}
-    {1792890000 7200 0 EET}
-    {1806195600 10800 1 EEST}
-    {1824944400 7200 0 EET}
-    {1837645200 10800 1 EEST}
-    {1856394000 7200 0 EET}
-    {1869094800 10800 1 EEST}
-    {1887843600 7200 0 EET}
-    {1901149200 10800 1 EEST}
-    {1919293200 7200 0 EET}
-    {1932598800 10800 1 EEST}
-    {1950742800 7200 0 EET}
-    {1964048400 10800 1 EEST}
-    {1982797200 7200 0 EET}
-    {1995498000 10800 1 EEST}
-    {2014246800 7200 0 EET}
-    {2026947600 10800 1 EEST}
-    {2045696400 7200 0 EET}
-    {2058397200 10800 1 EEST}
-    {2077146000 7200 0 EET}
-    {2090451600 10800 1 EEST}
-    {2108595600 7200 0 EET}
-    {2121901200 10800 1 EEST}
-    {2140045200 7200 0 EET}
-    {2153350800 10800 1 EEST}
-    {2172099600 7200 0 EET}
-    {2184800400 10800 1 EEST}
-    {2203549200 7200 0 EET}
-    {2216250000 10800 1 EEST}
-    {2234998800 7200 0 EET}
-    {2248304400 10800 1 EEST}
-    {2266448400 7200 0 EET}
-    {2279754000 10800 1 EEST}
-    {2297898000 7200 0 EET}
-    {2311203600 10800 1 EEST}
-    {2329347600 7200 0 EET}
-    {2342653200 10800 1 EEST}
-    {2361402000 7200 0 EET}
-    {2374102800 10800 1 EEST}
-    {2392851600 7200 0 EET}
-    {2405552400 10800 1 EEST}
-    {2424301200 7200 0 EET}
-    {2437606800 10800 1 EEST}
-    {2455750800 7200 0 EET}
-    {2469056400 10800 1 EEST}
-    {2487200400 7200 0 EET}
-    {2500506000 10800 1 EEST}
-    {2519254800 7200 0 EET}
-    {2531955600 10800 1 EEST}
-    {2550704400 7200 0 EET}
-    {2563405200 10800 1 EEST}
-    {2582154000 7200 0 EET}
-    {2595459600 10800 1 EEST}
-    {2613603600 7200 0 EET}
-    {2626909200 10800 1 EEST}
-    {2645053200 7200 0 EET}
-    {2658358800 10800 1 EEST}
-    {2676502800 7200 0 EET}
-    {2689808400 10800 1 EEST}
-    {2708557200 7200 0 EET}
-    {2721258000 10800 1 EEST}
-    {2740006800 7200 0 EET}
-    {2752707600 10800 1 EEST}
-    {2771456400 7200 0 EET}
-    {2784762000 10800 1 EEST}
-    {2802906000 7200 0 EET}
-    {2816211600 10800 1 EEST}
-    {2834355600 7200 0 EET}
-    {2847661200 10800 1 EEST}
-    {2866410000 7200 0 EET}
-    {2879110800 10800 1 EEST}
-    {2897859600 7200 0 EET}
-    {2910560400 10800 1 EEST}
-    {2929309200 7200 0 EET}
-    {2942010000 10800 1 EEST}
-    {2960758800 7200 0 EET}
-    {2974064400 10800 1 EEST}
-    {2992208400 7200 0 EET}
-    {3005514000 10800 1 EEST}
-    {3023658000 7200 0 EET}
-    {3036963600 10800 1 EEST}
-    {3055712400 7200 0 EET}
-    {3068413200 10800 1 EEST}
-    {3087162000 7200 0 EET}
-    {3099862800 10800 1 EEST}
-    {3118611600 7200 0 EET}
-    {3131917200 10800 1 EEST}
-    {3150061200 7200 0 EET}
-    {3163366800 10800 1 EEST}
-    {3181510800 7200 0 EET}
-    {3194816400 10800 1 EEST}
-    {3212960400 7200 0 EET}
-    {3226266000 10800 1 EEST}
-    {3245014800 7200 0 EET}
-    {3257715600 10800 1 EEST}
-    {3276464400 7200 0 EET}
-    {3289165200 10800 1 EEST}
-    {3307914000 7200 0 EET}
-    {3321219600 10800 1 EEST}
-    {3339363600 7200 0 EET}
-    {3352669200 10800 1 EEST}
-    {3370813200 7200 0 EET}
-    {3384118800 10800 1 EEST}
-    {3402867600 7200 0 EET}
-    {3415568400 10800 1 EEST}
-    {3434317200 7200 0 EET}
-    {3447018000 10800 1 EEST}
-    {3465766800 7200 0 EET}
-    {3479072400 10800 1 EEST}
-    {3497216400 7200 0 EET}
-    {3510522000 10800 1 EEST}
-    {3528666000 7200 0 EET}
-    {3541971600 10800 1 EEST}
-    {3560115600 7200 0 EET}
-    {3573421200 10800 1 EEST}
-    {3592170000 7200 0 EET}
-    {3604870800 10800 1 EEST}
-    {3623619600 7200 0 EET}
-    {3636320400 10800 1 EEST}
-    {3655069200 7200 0 EET}
-    {3668374800 10800 1 EEST}
-    {3686518800 7200 0 EET}
-    {3699824400 10800 1 EEST}
-    {3717968400 7200 0 EET}
-    {3731274000 10800 1 EEST}
-    {3750022800 7200 0 EET}
-    {3762723600 10800 1 EEST}
-    {3781472400 7200 0 EET}
-    {3794173200 10800 1 EEST}
-    {3812922000 7200 0 EET}
-    {3825622800 10800 1 EEST}
-    {3844371600 7200 0 EET}
-    {3857677200 10800 1 EEST}
-    {3875821200 7200 0 EET}
-    {3889126800 10800 1 EEST}
-    {3907270800 7200 0 EET}
-    {3920576400 10800 1 EEST}
-    {3939325200 7200 0 EET}
-    {3952026000 10800 1 EEST}
-    {3970774800 7200 0 EET}
-    {3983475600 10800 1 EEST}
-    {4002224400 7200 0 EET}
-    {4015530000 10800 1 EEST}
-    {4033674000 7200 0 EET}
-    {4046979600 10800 1 EEST}
-    {4065123600 7200 0 EET}
-    {4078429200 10800 1 EEST}
-    {4096573200 7200 0 EET}
+if {![info exists TZData(Europe/Kyiv)]} {
+    LoadTimeZoneFile Europe/Kyiv
 }
+set TZData(:Europe/Uzhgorod) $TZData(:Europe/Kyiv)
diff --git a/library/tzdata/Europe/Zaporozhye b/library/tzdata/Europe/Zaporozhye
index 8ae9604..385d862 100644
--- a/library/tzdata/Europe/Zaporozhye
+++ b/library/tzdata/Europe/Zaporozhye
@@ -1,253 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Europe/Zaporozhye) {
-    {-9223372036854775808 8440 0 LMT}
-    {-2840149240 8400 0 +0220}
-    {-1441160400 7200 0 EET}
-    {-1247536800 10800 0 MSK}
-    {-894769200 3600 0 CET}
-    {-857257200 3600 0 CET}
-    {-844556400 7200 1 CEST}
-    {-828226800 3600 0 CET}
-    {-826419600 10800 0 MSD}
-    {354920400 14400 1 MSD}
-    {370728000 10800 0 MSK}
-    {386456400 14400 1 MSD}
-    {402264000 10800 0 MSK}
-    {417992400 14400 1 MSD}
-    {433800000 10800 0 MSK}
-    {449614800 14400 1 MSD}
-    {465346800 10800 0 MSK}
-    {481071600 14400 1 MSD}
-    {496796400 10800 0 MSK}
-    {512521200 14400 1 MSD}
-    {528246000 10800 0 MSK}
-    {543970800 14400 1 MSD}
-    {559695600 10800 0 MSK}
-    {575420400 14400 1 MSD}
-    {591145200 10800 0 MSK}
-    {606870000 14400 1 MSD}
-    {622594800 10800 0 MSK}
-    {638319600 14400 1 MSD}
-    {654649200 10800 0 MSK}
-    {670374000 10800 0 EEST}
-    {686091600 7200 0 EET}
-    {701042400 7200 0 EET}
-    {701827200 10800 1 EEST}
-    {717552000 7200 0 EET}
-    {733276800 10800 1 EEST}
-    {749001600 7200 0 EET}
-    {764726400 10800 1 EEST}
-    {780451200 7200 0 EET}
-    {796176000 10800 1 EEST}
-    {811900800 7200 0 EET}
-    {828230400 10800 1 EEST}
-    {831938400 10800 0 EEST}
-    {846378000 7200 0 EET}
-    {859683600 10800 1 EEST}
-    {877827600 7200 0 EET}
-    {891133200 10800 1 EEST}
-    {909277200 7200 0 EET}
-    {922582800 10800 1 EEST}
-    {941331600 7200 0 EET}
-    {954032400 10800 1 EEST}
-    {972781200 7200 0 EET}
-    {985482000 10800 1 EEST}
-    {1004230800 7200 0 EET}
-    {1017536400 10800 1 EEST}
-    {1035680400 7200 0 EET}
-    {1048986000 10800 1 EEST}
-    {1067130000 7200 0 EET}
-    {1080435600 10800 1 EEST}
-    {1099184400 7200 0 EET}
-    {1111885200 10800 1 EEST}
-    {1130634000 7200 0 EET}
-    {1143334800 10800 1 EEST}
-    {1162083600 7200 0 EET}
-    {1174784400 10800 1 EEST}
-    {1193533200 7200 0 EET}
-    {1206838800 10800 1 EEST}
-    {1224982800 7200 0 EET}
-    {1238288400 10800 1 EEST}
-    {1256432400 7200 0 EET}
-    {1269738000 10800 1 EEST}
-    {1288486800 7200 0 EET}
-    {1301187600 10800 1 EEST}
-    {1319936400 7200 0 EET}
-    {1332637200 10800 1 EEST}
-    {1351386000 7200 0 EET}
-    {1364691600 10800 1 EEST}
-    {1382835600 7200 0 EET}
-    {1396141200 10800 1 EEST}
-    {1414285200 7200 0 EET}
-    {1427590800 10800 1 EEST}
-    {1445734800 7200 0 EET}
-    {1459040400 10800 1 EEST}
-    {1477789200 7200 0 EET}
-    {1490490000 10800 1 EEST}
-    {1509238800 7200 0 EET}
-    {1521939600 10800 1 EEST}
-    {1540688400 7200 0 EET}
-    {1553994000 10800 1 EEST}
-    {1572138000 7200 0 EET}
-    {1585443600 10800 1 EEST}
-    {1603587600 7200 0 EET}
-    {1616893200 10800 1 EEST}
-    {1635642000 7200 0 EET}
-    {1648342800 10800 1 EEST}
-    {1667091600 7200 0 EET}
-    {1679792400 10800 1 EEST}
-    {1698541200 7200 0 EET}
-    {1711846800 10800 1 EEST}
-    {1729990800 7200 0 EET}
-    {1743296400 10800 1 EEST}
-    {1761440400 7200 0 EET}
-    {1774746000 10800 1 EEST}
-    {1792890000 7200 0 EET}
-    {1806195600 10800 1 EEST}
-    {1824944400 7200 0 EET}
-    {1837645200 10800 1 EEST}
-    {1856394000 7200 0 EET}
-    {1869094800 10800 1 EEST}
-    {1887843600 7200 0 EET}
-    {1901149200 10800 1 EEST}
-    {1919293200 7200 0 EET}
-    {1932598800 10800 1 EEST}
-    {1950742800 7200 0 EET}
-    {1964048400 10800 1 EEST}
-    {1982797200 7200 0 EET}
-    {1995498000 10800 1 EEST}
-    {2014246800 7200 0 EET}
-    {2026947600 10800 1 EEST}
-    {2045696400 7200 0 EET}
-    {2058397200 10800 1 EEST}
-    {2077146000 7200 0 EET}
-    {2090451600 10800 1 EEST}
-    {2108595600 7200 0 EET}
-    {2121901200 10800 1 EEST}
-    {2140045200 7200 0 EET}
-    {2153350800 10800 1 EEST}
-    {2172099600 7200 0 EET}
-    {2184800400 10800 1 EEST}
-    {2203549200 7200 0 EET}
-    {2216250000 10800 1 EEST}
-    {2234998800 7200 0 EET}
-    {2248304400 10800 1 EEST}
-    {2266448400 7200 0 EET}
-    {2279754000 10800 1 EEST}
-    {2297898000 7200 0 EET}
-    {2311203600 10800 1 EEST}
-    {2329347600 7200 0 EET}
-    {2342653200 10800 1 EEST}
-    {2361402000 7200 0 EET}
-    {2374102800 10800 1 EEST}
-    {2392851600 7200 0 EET}
-    {2405552400 10800 1 EEST}
-    {2424301200 7200 0 EET}
-    {2437606800 10800 1 EEST}
-    {2455750800 7200 0 EET}
-    {2469056400 10800 1 EEST}
-    {2487200400 7200 0 EET}
-    {2500506000 10800 1 EEST}
-    {2519254800 7200 0 EET}
-    {2531955600 10800 1 EEST}
-    {2550704400 7200 0 EET}
-    {2563405200 10800 1 EEST}
-    {2582154000 7200 0 EET}
-    {2595459600 10800 1 EEST}
-    {2613603600 7200 0 EET}
-    {2626909200 10800 1 EEST}
-    {2645053200 7200 0 EET}
-    {2658358800 10800 1 EEST}
-    {2676502800 7200 0 EET}
-    {2689808400 10800 1 EEST}
-    {2708557200 7200 0 EET}
-    {2721258000 10800 1 EEST}
-    {2740006800 7200 0 EET}
-    {2752707600 10800 1 EEST}
-    {2771456400 7200 0 EET}
-    {2784762000 10800 1 EEST}
-    {2802906000 7200 0 EET}
-    {2816211600 10800 1 EEST}
-    {2834355600 7200 0 EET}
-    {2847661200 10800 1 EEST}
-    {2866410000 7200 0 EET}
-    {2879110800 10800 1 EEST}
-    {2897859600 7200 0 EET}
-    {2910560400 10800 1 EEST}
-    {2929309200 7200 0 EET}
-    {2942010000 10800 1 EEST}
-    {2960758800 7200 0 EET}
-    {2974064400 10800 1 EEST}
-    {2992208400 7200 0 EET}
-    {3005514000 10800 1 EEST}
-    {3023658000 7200 0 EET}
-    {3036963600 10800 1 EEST}
-    {3055712400 7200 0 EET}
-    {3068413200 10800 1 EEST}
-    {3087162000 7200 0 EET}
-    {3099862800 10800 1 EEST}
-    {3118611600 7200 0 EET}
-    {3131917200 10800 1 EEST}
-    {3150061200 7200 0 EET}
-    {3163366800 10800 1 EEST}
-    {3181510800 7200 0 EET}
-    {3194816400 10800 1 EEST}
-    {3212960400 7200 0 EET}
-    {3226266000 10800 1 EEST}
-    {3245014800 7200 0 EET}
-    {3257715600 10800 1 EEST}
-    {3276464400 7200 0 EET}
-    {3289165200 10800 1 EEST}
-    {3307914000 7200 0 EET}
-    {3321219600 10800 1 EEST}
-    {3339363600 7200 0 EET}
-    {3352669200 10800 1 EEST}
-    {3370813200 7200 0 EET}
-    {3384118800 10800 1 EEST}
-    {3402867600 7200 0 EET}
-    {3415568400 10800 1 EEST}
-    {3434317200 7200 0 EET}
-    {3447018000 10800 1 EEST}
-    {3465766800 7200 0 EET}
-    {3479072400 10800 1 EEST}
-    {3497216400 7200 0 EET}
-    {3510522000 10800 1 EEST}
-    {3528666000 7200 0 EET}
-    {3541971600 10800 1 EEST}
-    {3560115600 7200 0 EET}
-    {3573421200 10800 1 EEST}
-    {3592170000 7200 0 EET}
-    {3604870800 10800 1 EEST}
-    {3623619600 7200 0 EET}
-    {3636320400 10800 1 EEST}
-    {3655069200 7200 0 EET}
-    {3668374800 10800 1 EEST}
-    {3686518800 7200 0 EET}
-    {3699824400 10800 1 EEST}
-    {3717968400 7200 0 EET}
-    {3731274000 10800 1 EEST}
-    {3750022800 7200 0 EET}
-    {3762723600 10800 1 EEST}
-    {3781472400 7200 0 EET}
-    {3794173200 10800 1 EEST}
-    {3812922000 7200 0 EET}
-    {3825622800 10800 1 EEST}
-    {3844371600 7200 0 EET}
-    {3857677200 10800 1 EEST}
-    {3875821200 7200 0 EET}
-    {3889126800 10800 1 EEST}
-    {3907270800 7200 0 EET}
-    {3920576400 10800 1 EEST}
-    {3939325200 7200 0 EET}
-    {3952026000 10800 1 EEST}
-    {3970774800 7200 0 EET}
-    {3983475600 10800 1 EEST}
-    {4002224400 7200 0 EET}
-    {4015530000 10800 1 EEST}
-    {4033674000 7200 0 EET}
-    {4046979600 10800 1 EEST}
-    {4065123600 7200 0 EET}
-    {4078429200 10800 1 EEST}
-    {4096573200 7200 0 EET}
+if {![info exists TZData(Europe/Kyiv)]} {
+    LoadTimeZoneFile Europe/Kyiv
 }
+set TZData(:Europe/Zaporozhye) $TZData(:Europe/Kyiv)
-- 
cgit v0.12


From 3636d805fcf6da495f444297a7159347ff1ed3a0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 26 Sep 2022 15:51:20 +0000
Subject: Make Tcl_SaveResult() and friends _really_  deprecated, so make
 gcc/clang warn when it's used

---
 generic/tcl.decls  |  6 +++---
 generic/tclDecls.h | 25 ++++++++++++++++++-------
 generic/tclTest.c  |  9 +++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index aab5cb5..3b00f4a 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1043,7 +1043,7 @@ declare 288 {
 declare 289 {
     void Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc, void *clientData)
 }
-declare 290 {
+declare 290 {deprecated {Use Tcl_DiscardInterpState}} {
     void Tcl_DiscardResult(Tcl_SavedResult *statePtr)
 }
 declare 291 {
@@ -1126,10 +1126,10 @@ declare 313 {
     int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
 	    int charsToRead, int appendFlag)
 }
-declare 314 {
+declare 314 {deprecated {Use Tcl_RestoreInterpState}} {
     void Tcl_RestoreResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
 }
-declare 315 {
+declare 315 {deprecated {Use Tcl_SaveInterpState}} {
     void Tcl_SaveResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
 }
 declare 316 {
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 562ea1a..ea5c187 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -900,7 +900,8 @@ EXTERN void		Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc,
 EXTERN void		Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc,
 				void *clientData);
 /* 290 */
-EXTERN void		Tcl_DiscardResult(Tcl_SavedResult *statePtr);
+TCL_DEPRECATED("Use Tcl_DiscardInterpState")
+void			Tcl_DiscardResult(Tcl_SavedResult *statePtr);
 /* 291 */
 EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
 				int numBytes, int flags);
@@ -965,10 +966,12 @@ EXTERN int		Tcl_NumUtfChars(const char *src, int length);
 EXTERN int		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
 				int charsToRead, int appendFlag);
 /* 314 */
-EXTERN void		Tcl_RestoreResult(Tcl_Interp *interp,
+TCL_DEPRECATED("Use Tcl_RestoreInterpState")
+void			Tcl_RestoreResult(Tcl_Interp *interp,
 				Tcl_SavedResult *statePtr);
 /* 315 */
-EXTERN void		Tcl_SaveResult(Tcl_Interp *interp,
+TCL_DEPRECATED("Use Tcl_SaveInterpState")
+void			Tcl_SaveResult(Tcl_Interp *interp,
 				Tcl_SavedResult *statePtr);
 /* 316 */
 EXTERN int		Tcl_SetSystemEncoding(Tcl_Interp *interp,
@@ -2327,7 +2330,7 @@ typedef struct TclStubs {
     Tcl_Encoding (*tcl_CreateEncoding) (const Tcl_EncodingType *typePtr); /* 287 */
     void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 288 */
     void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 289 */
-    void (*tcl_DiscardResult) (Tcl_SavedResult *statePtr); /* 290 */
+    TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void (*tcl_DiscardResult) (Tcl_SavedResult *statePtr); /* 290 */
     int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, int numBytes, int flags); /* 291 */
     int (*tcl_EvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags); /* 292 */
     int (*tcl_EvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 293 */
@@ -2351,8 +2354,8 @@ typedef struct TclStubs {
     void (*tcl_ConditionWait) (Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr); /* 311 */
     int (*tcl_NumUtfChars) (const char *src, int length); /* 312 */
     int (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead, int appendFlag); /* 313 */
-    void (*tcl_RestoreResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 314 */
-    void (*tcl_SaveResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 315 */
+    TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void (*tcl_RestoreResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 314 */
+    TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void (*tcl_SaveResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 315 */
     int (*tcl_SetSystemEncoding) (Tcl_Interp *interp, const char *name); /* 316 */
     Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */
     void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
@@ -4228,22 +4231,30 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GlobalEval(interp, objPtr) \
 	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL)
 #undef Tcl_SaveResult
+inline TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {}
 #define Tcl_SaveResult(interp, statePtr) \
 	do { \
+	    Tcl_SaveResult_(); \
 	    (statePtr)->objResultPtr = Tcl_GetObjResult(interp); \
 	    Tcl_IncrRefCount((statePtr)->objResultPtr); \
 	    Tcl_SetObjResult(interp, Tcl_NewObj()); \
 	} while(0)
 #undef Tcl_RestoreResult
+inline TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {}
 #define Tcl_RestoreResult(interp, statePtr) \
 	do { \
+	    Tcl_RestoreResult_(); \
 	    Tcl_ResetResult(interp); \
    	    Tcl_SetObjResult(interp, (statePtr)->objResultPtr); \
    	    Tcl_DecrRefCount((statePtr)->objResultPtr); \
 	} while(0)
 #undef Tcl_DiscardResult
+inline TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {}
 #define Tcl_DiscardResult(statePtr) \
-	Tcl_DecrRefCount((statePtr)->objResultPtr)
+	do { \
+	    Tcl_DiscardResult_(); \
+	    Tcl_DecrRefCount((statePtr)->objResultPtr); \
+	} while(0)
 #undef Tcl_SetResult
 #define Tcl_SetResult(interp, result, freeProc) \
 	do { \
diff --git a/generic/tclTest.c b/generic/tclTest.c
index dcd86db..354ea9c 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -176,6 +176,15 @@ typedef struct TestChannel {
 
 static TestChannel *firstDetached;
 
+#ifdef __GNUC__
+/*
+ * The rest of this file shouldn't warn about deprecated functions; they're
+ * there because we intend them to be so and know that this file is OK to
+ * touch those fields.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 /*
  * Forward declarations for procedures defined later in this file:
  */
-- 
cgit v0.12


From 196a720845760665e592d261a61fd8111db2bc67 Mon Sep 17 00:00:00 2001
From: griffin <briang42@easystreet.net>
Date: Mon, 26 Sep 2022 16:27:01 +0000
Subject: Fix compile error.

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

diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 12b8386..623689b 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2632,7 +2632,8 @@ TclLindexFlat(
 
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
-	Tcl_WideInt index, listLen = TclArithSeriesObjLength(listObj);
+	Tcl_WideInt listLen = TclArithSeriesObjLength(listObj);
+	int index;
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
 	    if (TclGetIntForIndexM(interp, indexArray[i], /*endValue*/ listLen-1,
-- 
cgit v0.12


From 107106ad026b2a4ea8482a1ea74d7520fd64b36e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 26 Sep 2022 21:45:10 +0000
Subject: Adapt implementation to TIP: -nagle -> -nodelay (and invert some
 logic)

---
 doc/socket.n       | 10 ++++------
 tests/ioCmd.test   |  2 +-
 unix/tclUnixSock.c | 12 +++++-------
 win/tclWinSock.c   | 14 +++++++-------
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/doc/socket.n b/doc/socket.n
index 4506181..b7b3228 100644
--- a/doc/socket.n
+++ b/doc/socket.n
@@ -208,15 +208,13 @@ This option is not supported by server sockets. For client sockets, this option
 .TP
 \fB\-keepalive\fR
 .
-This options sets or queries the TCP keepalive option on the socket as 1 if
+This option sets or queries the TCP keepalive option on the socket as 1 if
 keepalive is turned on, 0 otherwise.
 .TP
-\fB\-nagle\fR
+\fB\-nodelay\fR
 .
-This options sets or queries the TCP nodelay option (aka the Nagle algorithm)
-When 1 the Nagle algorithm is turned on, 0 otherwise. Caution: the logic is
-reversed here, i.e. when the option is 0, the underlying system call asserts
-the TCP_NODELAY setting.
+This option sets or queries the TCP nodelay option on the socket as 1 if
+nodelay is turned on, 0 otherwise.
 .PP
 .SH "EXAMPLES"
 .PP
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index f911846..02a0428 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -306,7 +306,7 @@ test iocmd-8.15 {fconfigure command / tcp channel} -constraints {socket unixOrWi
     close $srv
     unset cli srv port
     rename iocmdSRV {}
-} -returnCodes error -result [expectedOpts "-blah" {-connecting -keepalive -nagle -peername -sockname}]
+} -returnCodes error -result [expectedOpts "-blah" {-connecting -keepalive -nodelay -peername -sockname}]
 test iocmd-8.16 {fconfigure command / tcp channel} -constraints socket -setup {
     set srv [socket -server iocmdSRV -myaddr 127.0.0.1 0]
     set port [lindex [fconfigure $srv -sockname] 2]
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 7f22796..e904cfd 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -864,13 +864,12 @@ TcpSetOptionProc(
 	return TCL_OK;
     }
     if ((len > 1) && (optionName[1] == 'n') &&
-	    (strncmp(optionName, "-nagle", len) == 0)) {
+	    (strncmp(optionName, "-nodelay", len) == 0)) {
 	int val = 0, ret;
 
 	if (Tcl_GetBoolean(interp, value, &val) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	val = !val;	/* Nagle ain't nodelay */
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
 	ret = setsockopt(statePtr->fds.fd, SOL_TCP, TCP_NODELAY,
 		(const char *) &val, sizeof(int));
@@ -888,7 +887,7 @@ TcpSetOptionProc(
 	}
 	return TCL_OK;
     }
-    return Tcl_BadChannelOption(interp, optionName, "keepalive nagle");
+    return Tcl_BadChannelOption(interp, optionName, "keepalive nodelay");
 }
 
 /*
@@ -1074,18 +1073,17 @@ TcpGetOptionProc(
     }
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
-	    (strncmp(optionName, "-nagle", len) == 0))) {
+	    (strncmp(optionName, "-nodelay", len) == 0))) {
         socklen_t size;
 	int opt = 0;
 
 	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-nagle");
+	    Tcl_DStringAppendElement(dsPtr, "-nodelay");
 	}
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
 	getsockopt(statePtr->fds.fd, SOL_TCP, TCP_NODELAY,
 		(char *) &opt, &size);
 #endif
-	opt = !opt;	/* Nagle ain't nodelay */
 	Tcl_DStringAppendElement(dsPtr, opt ? "1" : "0");
 	if (len > 0) {
 	    return TCL_OK;
@@ -1094,7 +1092,7 @@ TcpGetOptionProc(
 
     if (len > 0) {
 	return Tcl_BadChannelOption(interp, optionName,
-                "connecting keepalive nagle peername sockname");
+                "connecting keepalive nodelay peername sockname");
     }
 
     return TCL_OK;
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 8d16b5c..56d2ba4 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1220,14 +1220,14 @@ TcpSetOptionProc(
 	return TCL_OK;
     }
     if ((len > 1) && (optionName[1] == 'n') &&
-	(strncmp(optionName, "-nagle", len) == 0)) {
+	(strncmp(optionName, "-nodelay", len) == 0)) {
 	BOOL val;
 	int boolVar, rtn;
 
 	if (Tcl_GetBoolean(interp, value, &boolVar) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	val = boolVar ? FALSE : TRUE;
+	val = boolVar ? TRUE : FALSE;
 	rtn = setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
 		(const char *) &val, sizeof(BOOL));
 	if (rtn != 0) {
@@ -1241,7 +1241,7 @@ TcpSetOptionProc(
 	}
 	return TCL_OK;
     }
-    return Tcl_BadChannelOption(interp, optionName, "keepalive nagle");
+    return Tcl_BadChannelOption(interp, optionName, "keepalive nodelay");
 }
 
 /*
@@ -1533,17 +1533,17 @@ TcpGetOptionProc(
     }
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
-	    (strncmp(optionName, "-nagle", len) == 0))) {
+	    (strncmp(optionName, "-nodelay", len) == 0))) {
 	int optlen;
 	BOOL opt = FALSE;
 
 	if (len == 0) {
 	    sock = statePtr->sockets->fd;
-	    Tcl_DStringAppendElement(dsPtr, "-nagle");
+	    Tcl_DStringAppendElement(dsPtr, "-nodelay");
 	}
 	optlen = sizeof(BOOL);
 	getsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&opt, &optlen);
-	Tcl_DStringAppendElement(dsPtr, opt ? "0" : "1");
+	Tcl_DStringAppendElement(dsPtr, opt ? "1" : "0");
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -1551,7 +1551,7 @@ TcpGetOptionProc(
 
     if (len > 0) {
 	return Tcl_BadChannelOption(interp, optionName,
-		"connecting keepalive nagle peername sockname");
+		"connecting keepalive nodelay peername sockname");
     }
 
     return TCL_OK;
-- 
cgit v0.12


From f7d30cbf993a21d1a461c806ded05e3d3fd6ea50 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 27 Sep 2022 03:17:28 +0000
Subject: Add lseq to list command cross references

---
 doc/interp.n   | 16 ++++++++--------
 doc/lappend.n  |  2 +-
 doc/lassign.n  |  2 +-
 doc/ledit.n    |  2 +-
 doc/lindex.n   |  2 +-
 doc/linsert.n  |  2 +-
 doc/list.n     |  2 +-
 doc/llength.n  |  2 +-
 doc/lmap.n     |  2 +-
 doc/lpop.n     |  2 +-
 doc/lrange.n   |  2 +-
 doc/lremove.n  |  2 +-
 doc/lrepeat.n  |  2 +-
 doc/lreplace.n |  2 +-
 doc/lreverse.n |  2 +-
 doc/lsearch.n  |  2 +-
 doc/lseq.n     |  4 ++--
 doc/lset.n     |  2 +-
 doc/lsort.n    |  2 +-
 19 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/doc/interp.n b/doc/interp.n
index b3cc918..08bed1c 100644
--- a/doc/interp.n
+++ b/doc/interp.n
@@ -593,14 +593,14 @@ built-in commands:
 \fBinfo\fR	\fBinterp\fR	\fBjoin\fR	\fBlappend\fR
 \fBlassign\fR	\fBledit\fR	\fBlindex\fR	\fBlinsert\fR
 \fBlist\fR	\fBllength\fR	\fBlrange\fR	\fBlrepeat\fR
-\fBlreplace\fR	\fBlsearch\fR	\fBlset\fR	\fBlsort\fR
-\fBnamespace\fR	\fBpackage\fR	\fBpid\fR	\fBproc\fR
-\fBputs\fR	\fBread\fR	\fBregexp\fR	\fBregsub\fR
-\fBrename\fR	\fBreturn\fR	\fBscan\fR	\fBseek\fR
-\fBset\fR	\fBsplit\fR	\fBstring\fR	\fBsubst\fR
-\fBswitch\fR	\fBtell\fR	\fBtime\fR	\fBtrace\fR
-\fBunset\fR	\fBupdate\fR	\fBuplevel\fR	\fBupvar\fR
-\fBvariable\fR	\fBvwait\fR	\fBwhile\fR
+\fBlreplace\fR	\fBlsearch\fR	\fBlseq\fR      \fBlset\fR
+\fBlsort\fR     \fBnamespace\fR	\fBpackage\fR	\fBpid\fR
+\fBproc\fR      \fBputs\fR	\fBread\fR	\fBregexp\fR
+\fBregsub\fR	\fBrename\fR	\fBreturn\fR	\fBscan\fR
+\fBseek\fR	\fBset\fR	\fBsplit\fR	\fBstring\fR
+\fBsubst\fR	\fBswitch\fR	\fBtell\fR	\fBtime\fR
+\fBtrace\fR	\fBunset\fR	\fBupdate\fR	\fBuplevel\fR
+\fBupvar\fR	\fBvariable\fR	\fBvwait\fR	\fBwhile\fR
 .DE
 The following commands are hidden by \fBinterp create\fR when it
 creates a safe interpreter:
diff --git a/doc/lappend.n b/doc/lappend.n
index 3ddb36c..3fbda79 100644
--- a/doc/lappend.n
+++ b/doc/lappend.n
@@ -51,7 +51,7 @@ Using \fBlappend\fR to build up a list of numbers.
 .SH "SEE ALSO"
 list(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 append, element, list, variable
 .\" Local variables:
diff --git a/doc/lassign.n b/doc/lassign.n
index ac53322..d23509a 100644
--- a/doc/lassign.n
+++ b/doc/lassign.n
@@ -54,7 +54,7 @@ set ::argv [\fBlassign\fR $::argv argumentToReadOff]
 .SH "SEE ALSO"
 list(n), lappend(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 assign, element, list, multiple, set, variable
 '\"Local Variables:
diff --git a/doc/ledit.n b/doc/ledit.n
index f7704ed..48e6da5 100644
--- a/doc/ledit.n
+++ b/doc/ledit.n
@@ -81,7 +81,7 @@ a b x y z g h i
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n),
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n),
 string(n)
 .SH KEYWORDS
 element, list, replace
diff --git a/doc/lindex.n b/doc/lindex.n
index 0ba30a4..d4d845d 100644
--- a/doc/lindex.n
+++ b/doc/lindex.n
@@ -117,7 +117,7 @@ set idx 3
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n),
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n),
 string(n)
 .SH KEYWORDS
 element, index, list
diff --git a/doc/linsert.n b/doc/linsert.n
index 685b563..014f9cd 100644
--- a/doc/linsert.n
+++ b/doc/linsert.n
@@ -47,7 +47,7 @@ set newerList [\fBlinsert\fR [\fBlinsert\fR $oldList end-1 quick] 1 lazy]
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n),
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n),
 string(n)
 .SH KEYWORDS
 element, insert, list
diff --git a/doc/list.n b/doc/list.n
index 1792560..08a6fe7 100644
--- a/doc/list.n
+++ b/doc/list.n
@@ -48,7 +48,7 @@ while \fBconcat\fR with the same arguments will return
 .SH "SEE ALSO"
 lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 element, list, quoting
 '\"Local Variables:
diff --git a/doc/llength.n b/doc/llength.n
index 7a3e6de..574834f 100644
--- a/doc/llength.n
+++ b/doc/llength.n
@@ -51,7 +51,7 @@ An empty list is not necessarily an empty string:
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 element, list, length
 '\" Local Variables:
diff --git a/doc/lmap.n b/doc/lmap.n
index 29b1242..36a0c7c 100644
--- a/doc/lmap.n
+++ b/doc/lmap.n
@@ -80,7 +80,7 @@ set prefix [\fBlmap\fR x $values {expr {
 break(n), continue(n), for(n), foreach(n), while(n),
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 foreach, iteration, list, loop, map
 '\" Local Variables:
diff --git a/doc/lpop.n b/doc/lpop.n
index 0a156ee..2a464eb 100644
--- a/doc/lpop.n
+++ b/doc/lpop.n
@@ -88,7 +88,7 @@ The indicated value becomes the new value of \fIx\fR.
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n),
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n),
 string(n)
 .SH KEYWORDS
 element, index, list, remove, pop, stack, queue
diff --git a/doc/lrange.n b/doc/lrange.n
index c0434bb..38c4abf 100644
--- a/doc/lrange.n
+++ b/doc/lrange.n
@@ -73,7 +73,7 @@ elements to
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n),
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n),
 string(n)
 .SH KEYWORDS
 element, list, range, sublist
diff --git a/doc/lremove.n b/doc/lremove.n
index e71f607..8763ea6 100644
--- a/doc/lremove.n
+++ b/doc/lremove.n
@@ -48,7 +48,7 @@ a b d e
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 element, list, remove
 .\" Local variables:
diff --git a/doc/lrepeat.n b/doc/lrepeat.n
index de7ba54..cd672db 100644
--- a/doc/lrepeat.n
+++ b/doc/lrepeat.n
@@ -34,7 +34,7 @@ is identical to \fBlist element ...\fR.
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 element, index, list
 '\" Local Variables:
diff --git a/doc/lreplace.n b/doc/lreplace.n
index 6694ad7..47d33f9 100644
--- a/doc/lreplace.n
+++ b/doc/lreplace.n
@@ -97,7 +97,7 @@ a b c d e f g h i
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n),
-lreverse(n), lsearch(n), lset(n), lsort(n),
+lreverse(n), lsearch(n), lseq(n), lset(n), lsort(n),
 string(n)
 .SH KEYWORDS
 element, list, replace
diff --git a/doc/lreverse.n b/doc/lreverse.n
index 0f0b6d6..bb0703d 100644
--- a/doc/lreverse.n
+++ b/doc/lreverse.n
@@ -27,7 +27,7 @@ input list, \fIlist\fR, except with the elements in the reverse order.
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lsearch(n), lset(n), lsort(n)
+lsearch(n), lseq(n), lset(n), lsort(n)
 .SH KEYWORDS
 element, list, reverse
 '\" Local Variables:
diff --git a/doc/lsearch.n b/doc/lsearch.n
index 85b8609..dc6d1f7 100644
--- a/doc/lsearch.n
+++ b/doc/lsearch.n
@@ -231,7 +231,7 @@ The same thing for a flattened list:
 foreach(n),
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lset(n), lsort(n),
+lreverse(n), lseq(n), lset(n), lsort(n),
 string(n)
 .SH KEYWORDS
 binary search, linear search,
diff --git a/doc/lseq.n b/doc/lseq.n
index 5c7d03b..df8a8bc 100644
--- a/doc/lseq.n
+++ b/doc/lseq.n
@@ -81,8 +81,8 @@ must be numeric; a non-numeric string will result in an error.
 .\"
 .CE
 .SH "SEE ALSO"
-foreach(n), list(n), lappend(n), lassign(n), lindex(n), linsert(n), llength(n),
-lmap(n), lpop(n), lrange(n), lremove(n), lreplace(n),
+foreach(n), list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n),
+llength(n), lmap(n), lpop(n), lrange(n), lremove(n), lreplace(n),
 lreverse(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
 element, index, list
diff --git a/doc/lset.n b/doc/lset.n
index 588a0a5..e2e1590 100644
--- a/doc/lset.n
+++ b/doc/lset.n
@@ -138,7 +138,7 @@ The indicated return value also becomes the new value of \fIx\fR.
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lsort(n)
+lreverse(n), lsearch(n), lseq(n), lsort(n)
 string(n)
 .SH KEYWORDS
 element, index, list, replace, set
diff --git a/doc/lsort.n b/doc/lsort.n
index ddf9ed1..1695ea8 100644
--- a/doc/lsort.n
+++ b/doc/lsort.n
@@ -266,7 +266,7 @@ More complex sorting using a comparison function:
 .SH "SEE ALSO"
 list(n), lappend(n), lassign(n), ledit(n), lindex(n), linsert(n), llength(n),
 lmap(n), lpop(n), lrange(n), lremove(n), lrepeat(n), lreplace(n),
-lreverse(n), lsearch(n), lset(n)
+lreverse(n), lsearch(n), lseq(n), lset(n)
 .SH KEYWORDS
 element, list, order, sort
 '\" Local Variables:
-- 
cgit v0.12


From a0ee4e463ed283418dc94c826f9b65933fe5ba7d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 27 Sep 2022 08:52:31 +0000
Subject: Since 'inline' doesn't seem to work, use MODULE_SCOPE

---
 generic/tclDecls.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index ea5c187..5d6e184 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4231,7 +4231,7 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GlobalEval(interp, objPtr) \
 	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL)
 #undef Tcl_SaveResult
-inline TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {}
+MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {}
 #define Tcl_SaveResult(interp, statePtr) \
 	do { \
 	    Tcl_SaveResult_(); \
@@ -4240,7 +4240,7 @@ inline TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void)
 	    Tcl_SetObjResult(interp, Tcl_NewObj()); \
 	} while(0)
 #undef Tcl_RestoreResult
-inline TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {}
+MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {}
 #define Tcl_RestoreResult(interp, statePtr) \
 	do { \
 	    Tcl_RestoreResult_(); \
@@ -4249,7 +4249,7 @@ inline TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(
    	    Tcl_DecrRefCount((statePtr)->objResultPtr); \
 	} while(0)
 #undef Tcl_DiscardResult
-inline TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {}
+MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {}
 #define Tcl_DiscardResult(statePtr) \
 	do { \
 	    Tcl_DiscardResult_(); \
-- 
cgit v0.12


From 8b5a187d44e2ed11ef57b3a94e26e349a20ae2f0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Sep 2022 08:30:06 +0000
Subject: Still doesn't work. Use static in stead of MODULE_SCOPE

---
 generic/tclDecls.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 5d6e184..25adc95 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4231,7 +4231,7 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GlobalEval(interp, objPtr) \
 	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL)
 #undef Tcl_SaveResult
-MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {}
+static TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {}
 #define Tcl_SaveResult(interp, statePtr) \
 	do { \
 	    Tcl_SaveResult_(); \
@@ -4240,7 +4240,7 @@ MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(
 	    Tcl_SetObjResult(interp, Tcl_NewObj()); \
 	} while(0)
 #undef Tcl_RestoreResult
-MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {}
+static TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {}
 #define Tcl_RestoreResult(interp, statePtr) \
 	do { \
 	    Tcl_RestoreResult_(); \
@@ -4249,7 +4249,7 @@ MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreRe
    	    Tcl_DecrRefCount((statePtr)->objResultPtr); \
 	} while(0)
 #undef Tcl_DiscardResult
-MODULE_SCOPE TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {}
+static TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {}
 #define Tcl_DiscardResult(statePtr) \
 	do { \
 	    Tcl_DiscardResult_(); \
-- 
cgit v0.12


From 69ac37dbaeab806d67efd79d047215bcbfe1654c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Sep 2022 11:55:26 +0000
Subject: Don't worry deprecation warnings for Tcl_SaveResult: If TIP #640 is
 accepted it won't matter any more. Eliminate some compiler warnings Mark some
 lseq testcases as "knownBug", they still need to be fixed

---
 generic/tclArithSeries.c |  2 +-
 generic/tclDecls.h       | 10 +---------
 generic/tclListObj.c     |  2 +-
 tests/lseq.test          | 18 +++++++++---------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 023ba4a..d104995 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -339,7 +339,7 @@ TclNewArithSeriesObj(
 	}
     }
 
-    if (len > ListSizeT_MAX) {
+    if (len < 0 || (Tcl_WideUInt)len > ListSizeT_MAX) {
 	Tcl_SetObjResult(
 	    interp,
 	    Tcl_NewStringObj("max length of a Tcl list exceeded", -1));
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 910e67e..7ae6fc3 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3892,28 +3892,20 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GlobalEval(interp, objPtr) \
 	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL)
 #define Tcl_GetStringResult(interp) Tcl_GetString(Tcl_GetObjResult(interp))
-static TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {}
 #define Tcl_SaveResult(interp, statePtr) \
 	do { \
-	    Tcl_SaveResult_(); \
 	    *(statePtr) = Tcl_GetObjResult(interp); \
 	    Tcl_IncrRefCount(*(statePtr)); \
 	    Tcl_SetObjResult(interp, Tcl_NewObj()); \
 	} while(0)
-static TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {}
 #define Tcl_RestoreResult(interp, statePtr) \
 	do { \
-	    Tcl_RestoreResult_(); \
 	    Tcl_ResetResult(interp); \
    	    Tcl_SetObjResult(interp, *(statePtr)); \
    	    Tcl_DecrRefCount(*(statePtr)); \
 	} while(0)
-static TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {}
 #define Tcl_DiscardResult(statePtr) \
-	do { \
-	    Tcl_DiscardResult_(); \
-	    Tcl_DecrRefCount(*(statePtr)); \
-	} while(0)
+	Tcl_DecrRefCount(*(statePtr))
 #define Tcl_SetResult(interp, result, freeProc) \
 	do { \
 	    const char *__result = result; \
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 8349408..b870bca 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2628,7 +2628,7 @@ TclLindexFlat(
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
 	Tcl_WideInt listLen = TclArithSeriesObjLength(listObj);
-	int index;
+	ListSizeT index;
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
 	    if (TclGetIntForIndexM(interp, indexArray[i], /*endValue*/ listLen-1,
diff --git a/tests/lseq.test b/tests/lseq.test
index e05b32d..916229d 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -65,7 +65,7 @@ test lseq-1.10 {integer lseq with step} {
     lseq 1 to 10 by 2
 } {1 3 5 7 9}
 
-test lseq-1.11 {error case: increasing wrong step direction} {
+test lseq-1.11 {error case: increasing wrong step direction} knownBug {
     lseq 1 to 10 by -2
 } {}
 
@@ -113,7 +113,7 @@ test lseq-1.19 {too many arguments extra numeric value} -body {
     lseq 12 to 24 by 2 7
 } -returnCodes 1 -result {wrong # args: should be "lseq n ??op? n ??by? n??"}
 
-test lseq-1.20 {bug: wrong length computed} {
+test lseq-1.20 {bug: wrong length computed} knownBug {
     lseq 1 to 10 -1
 } {}
 
@@ -128,11 +128,11 @@ test lseq-1.22 {n n by -n} {
 #
 # Short-hand use cases
 #
-test lseq-2.2 {step magnitude} {
+test lseq-2.2 {step magnitude} knownBug {
     lseq 10 1 2 ;# this is an empty case since step has wrong sign
 } {}
 
-test lseq-2.3 {step wrong sign} arithSeriesDouble {
+test lseq-2.3 {step wrong sign} {arithSeriesDouble knownBug} {
     lseq 25. 5. 5 ;# ditto - empty list
 } {}
 
@@ -166,7 +166,7 @@ test lseq-2.10 {integer lseq with step} {
     lseq 1 10 2
 } {1 3 5 7 9}
 
-test lseq-2.11 {error case: increasing wrong step direction} {
+test lseq-2.11 {error case: increasing wrong step direction} knownBug {
     lseq 1 10 -2
 } {}
 
@@ -196,7 +196,7 @@ test lseq-2.17 {large numbers} arithSeriesDouble {
 
 # Covered: {10 1 2 } {1 10 2} {1 10 -2} {1 1 1} {1 1 1} {-5 17 3}
 # Missing: {- - +} {- - -} {- + -} {+ - -} {- - +} {+ + -}
-test lseq-2.18 {signs} {
+test lseq-2.18 {signs} knownBug {
     list [lseq -10 -1 2] \
 	[lseq -10 -1 -1] \
 	[lseq -10 1 -3] \
@@ -390,7 +390,7 @@ test lseq-3.28 {lreverse bug in ArithSeries} {} {
     list $r $rr [string equal $r [lreverse $rr]]
 } {{-5 -2 1 4 7 10 13 16} {16 13 10 7 4 1 -2 -5} 1}
 
-test lseq-3.29 {edge case: negative count} {
+test lseq-3.29 {edge case: negative count} knownBug {
     lseq -15
 } {}
 
@@ -425,7 +425,7 @@ test lseq-4.2 {start expressions} {
 ##	lseq 1 to 10 by -2
 ##	# -> lseq: invalid step = -2 with a = 1 and b = 10
 
-test lseq-4.3 {TIP examples} {
+test lseq-4.3 {TIP examples} knownBug {
     set examples {# Examples from TIP-629
 	# --- Begin ---
 	lseq 10 .. 1
@@ -474,7 +474,7 @@ test lseq-4.3 {TIP examples} {
 
 #
 # Ticket 9933cc4d88697f05976accebd31c1e3ba6efe9c6 - lseq corner case
-test lseq-4.4 {lseq corner case} -body {
+test lseq-4.4 {lseq corner case} -constraints knownBug -body {
     set tcmd {
 	set res {}
 	set s [catch {lindex [lseq 10 100] 0} e]
-- 
cgit v0.12


From 93e50d1448aba1ed4b5eb113ea5c9b5debee85dc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Sep 2022 12:58:58 +0000
Subject: int -> ListSizeT, and a few more simplifications

---
 generic/tclArithSeries.c | 10 ++++++----
 generic/tclListObj.c     |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 3974808..868ce74 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -106,8 +106,10 @@ ArithSeriesLen(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step)
 {
     Tcl_WideInt len;
 
-    if (step == 0) return 0;
-    len = (step ? (1 + (((end-start))/step)) : 0);
+    if (step == 0) {
+	return 0;
+    }
+    len = 1 + ((end-start)/step);
     return (len < 0) ? -1 : len;
 }
 
@@ -233,7 +235,7 @@ assignNumber(int useDoubles, Tcl_WideInt *intNumberPtr, double *dblNumberPtr, Tc
     } *number;
     int tcl_number_type;
 
-    if (TclGetNumberFromObj(NULL, numberObj, (ClientData*)&number, &tcl_number_type) != TCL_OK) {
+    if (TclGetNumberFromObj(NULL, numberObj, (void **)&number, &tcl_number_type) != TCL_OK) {
 	return;
     }
     if (useDoubles) {
@@ -818,7 +820,7 @@ TclArithSeriesGetElements(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
     Tcl_Obj *objPtr,		/* AbstractList object for which an element
 				 * array is to be returned. */
-    int *objcPtr,		/* Where to store the count of objects
+    ListSizeT *objcPtr,		/* Where to store the count of objects
 				 * referenced by objv. */
     Tcl_Obj ***objvPtr)		/* Where to store the pointer to an array of
 				 * pointers to the list's objects. */
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 623689b..d18ad59 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2633,7 +2633,7 @@ TclLindexFlat(
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
 	Tcl_WideInt listLen = TclArithSeriesObjLength(listObj);
-	int index;
+	ListSizeT index;
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
 	    if (TclGetIntForIndexM(interp, indexArray[i], /*endValue*/ listLen-1,
-- 
cgit v0.12


From 42bd6877bcc8794524e5be946458a4427994b7a6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Sep 2022 13:57:51 +0000
Subject: Fix wrong TclGetNumberFromObj() usage: this will crash if mp_int's
 are involved. Everywhere else in Tcl it is used correctly

---
 generic/tclArithSeries.c | 18 ++++++++----------
 generic/tclCmdIL.c       |  7 ++-----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 868ce74..61b4a9b 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -229,26 +229,24 @@ TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
 static void
 assignNumber(int useDoubles, Tcl_WideInt *intNumberPtr, double *dblNumberPtr, Tcl_Obj *numberObj)
 {
-    union {
-	double d;
-	Tcl_WideInt i;
-    } *number;
+    void *clientData;
     int tcl_number_type;
 
-    if (TclGetNumberFromObj(NULL, numberObj, (void **)&number, &tcl_number_type) != TCL_OK) {
+    if (TclGetNumberFromObj(NULL, numberObj, &clientData, &tcl_number_type) != TCL_OK
+	    || tcl_number_type == TCL_NUMBER_BIG) {
 	return;
     }
     if (useDoubles) {
-	if (tcl_number_type == TCL_NUMBER_DOUBLE) {
-	    *dblNumberPtr = number->d;
+	if (tcl_number_type != TCL_NUMBER_INT) {
+	    *dblNumberPtr = *(double *)clientData;
 	} else {
-	    *dblNumberPtr = (double)number->i;
+	    *dblNumberPtr = (double)*(Tcl_WideInt *)clientData;
 	}
     } else {
 	if (tcl_number_type == TCL_NUMBER_INT) {
-	    *intNumberPtr = number->i;
+	    *intNumberPtr = *(Tcl_WideInt *)clientData;
 	} else {
-	    *intNumberPtr = (Tcl_WideInt)number->d;
+	    *intNumberPtr = (Tcl_WideInt)*(double *)clientData;
 	}
     }
 }
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 5821a35..62ceeea 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -4077,12 +4077,9 @@ SequenceIdentifyArgument(
     int status;
     SequenceOperators opmode;
     SequenceByMode bymode;
-    union {
-	Tcl_WideInt i;
-	double d;
-    } nvalue;
+    void *clientData;
 
-    status = TclGetNumberFromObj(NULL, argPtr, (ClientData*)&nvalue, keywordIndexPtr);
+    status = TclGetNumberFromObj(NULL, argPtr, &clientData, keywordIndexPtr);
     if (status == TCL_OK) {
 	if (numValuePtr) {
 	    *numValuePtr = argPtr;
-- 
cgit v0.12


From 414f4c9f7c689e4c1cba2c4f568db0ff3b5df688 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 28 Sep 2022 18:41:42 +0000
Subject: WIP on documentation of proposed routines.

---
 doc/Number.3 | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 doc/Number.3

diff --git a/doc/Number.3 b/doc/Number.3
new file mode 100644
index 0000000..588171e
--- /dev/null
+++ b/doc/Number.3
@@ -0,0 +1,88 @@
+'\"
+'\" Contribution from Don Porter, NIST, 2022. (not subject to US copyright)
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+'\"
+.TH Tcl_GetNumber 3 8.7 Tcl "Tcl Library Procedures"
+.so man.macros
+.BS
+.SH NAME
+Tcl_GetNumber, Tcl_GetNumberFromObj \- get numeric value from Tcl value
+.SH SYNOPSIS
+.nf
+\fB#include <tcl.h>\fR
+.sp
+\fB#include <tclTomMath.h>\fR
+.sp
+int
+\fBTcl_GetNumber\fR(\fIinterp, bytes, numBytes, clientDataPtr, typePtr\fR)
+.sp
+int
+\fBTcl_GetNumberFromObj\fR(\fIinterp, objPtr, clientDataPtr, typePtr\fR)
+.SH ARGUMENTS
+.AS Tcl_Interp clientDataPtr out
+.AP Tcl_Interp *interp out
+When non-NULL, error information is recorded here when the value is not
+in any of the numeric formats recognized by Tcl.
+.AP "const char" *bytes in
+Points to first byte of the string value to be examined.
+.AP size_t numBytes in
+The number of bytes, starting at \fIbytes\fR, that should be examined.
+If the value \fBTCL_INDEX_NONE\fR is provided, then all bytes should
+be examined until the first \fBNUL\fR byte terminates examination.
+.AP "void *" *clientDataPtr out
+Points to space where a pointer value may be written through which a numeric
+value is available to read.
+.AP int *typePtr out
+Points to space where a value may be written reporting what type of
+numeric storage is available to read.
+.AP Tcl_Obj *objPtr in
+A Tcl value to be examined.
+.BE
+.SH DESCRIPTION
+.PP
+These procedures enable callers to retrieve a numeric value from a
+Tcl value in a numeric format recognized by Tcl.
+.PP
+Tcl recognizes many values as numbers.  Several examples include:
+\fB"0"\fR, \fB" +1"\fR, \fB"-2 "\fR, \fB" 3 "\fR, \fB"0xdad1"\fR, \fB"0d09"\fR,
+\fB"1_000_000"\fR, \fB"4.0"\fR, \fB"1e-7"\fR, \fB"NaN"\fR, or \fB"Inf"\fR.
+When built-in Tcl commands act on these values as numbers, they are converted
+to a numeric representation for efficient handling in C code.  Tcl makes
+use of three C types to store these representations: \fBdouble\fR, 
+\fBTcl_WideInt\fR, and \fBmp_int\fR.  The \fBdouble\fR type is provided by the
+C language standard.  The \fBTcl_WideInt\fR type is declared in the Tcl
+header file, \fBtcl.h\fR, and is equivalent to the C standard type
+\fBlong long\fR on most platforms. The \fBmp_int\fR type is declared in the
+header file \fBtclTomMath.h\fR, and implemented by the LibTomMath
+multiple-precision integer library, included with Tcl.
+
+The routines \fBTcl_GetNumber\fR and \fBTcl_GetNumberFromObj\fR perform
+the same function.  They differ only in how the arguments present the Tcl
+value to be examined.  \fBTcl_GetNumber\fR accepts a counted string
+value in the arguments \fIbytes\fR and \fInumBytes\fR (or a
+\fBNUL\fR-terminated string value when \fInumBytes\fR is
+\fBTCL_INDEX_NONE\fR).  \fBTcl_GetNumberFromObj\fR accepts the Tcl value
+in \fIobjPtr\fR.
+
+Both routines examine the Tcl value and determine whether Tcl recognizes
+it as a number.  If not, both routines return \fBTCL_ERROR\fR and (when
+\fIinterp\fR is not NULL) record an error message and error code
+in \fIinterp\fR.
+
+If the examined value is recognized as a number, both routines return
+\fBTCL_OK\fR, and use the pointer arguments \fIclientDataPtr\fR
+and \fItypePtr\fR (which may not be NULL) to report information the
+caller can use to retrieve the numeric representation.  In all cases,
+both routines write to *\fIclientDataPtr\fR a pointer to the internal
+storage location where Tcl holds the numeric value.  When that
+internal storage is of type \fBdouble\fR
+
+
+
+.SH "SEE ALSO"
+Tcl_GetDouble, Tcl_GetDoubleFromObj, Tcl_GetWideIntFromObj
+.SH KEYWORDS
+double, double value, double type, integer, integer value, integer type,
+internal representation, value, value type, string representation
-- 
cgit v0.12


From eea655f8511157d811dc0b7be61de559c52ab81a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 29 Sep 2022 06:45:20 +0000
Subject: Remove "unknown" constraint, since it now works

---
 tests/lseq.test | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/lseq.test b/tests/lseq.test
index 48adfa0..45e3cd3 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -65,7 +65,7 @@ test lseq-1.10 {integer lseq with step} {
     lseq 1 to 10 by 2
 } {1 3 5 7 9}
 
-test lseq-1.11 {error case: increasing wrong step direction} knownBug {
+test lseq-1.11 {error case: increasing wrong step direction} {
     lseq 1 to 10 by -2
 } {}
 
@@ -113,7 +113,7 @@ test lseq-1.19 {too many arguments extra numeric value} -body {
     lseq 12 to 24 by 2 7
 } -returnCodes 1 -result {wrong # args: should be "lseq n ??op? n ??by? n??"}
 
-test lseq-1.20 {bug: wrong length computed} knownBug {
+test lseq-1.20 {bug: wrong length computed} {
     lseq 1 to 10 -1
 } {}
 
@@ -128,11 +128,11 @@ test lseq-1.22 {n n by -n} {
 #
 # Short-hand use cases
 #
-test lseq-2.2 {step magnitude} knownBug {
+test lseq-2.2 {step magnitude} {
     lseq 10 1 2 ;# this is an empty case since step has wrong sign
 } {}
 
-test lseq-2.3 {step wrong sign} {arithSeriesDouble knownBug} {
+test lseq-2.3 {step wrong sign} arithSeriesDouble {
     lseq 25. 5. 5 ;# ditto - empty list
 } {}
 
@@ -166,7 +166,7 @@ test lseq-2.10 {integer lseq with step} {
     lseq 1 10 2
 } {1 3 5 7 9}
 
-test lseq-2.11 {error case: increasing wrong step direction} knownBug {
+test lseq-2.11 {error case: increasing wrong step direction} {
     lseq 1 10 -2
 } {}
 
@@ -196,7 +196,7 @@ test lseq-2.17 {large numbers} arithSeriesDouble {
 
 # Covered: {10 1 2 } {1 10 2} {1 10 -2} {1 1 1} {1 1 1} {-5 17 3}
 # Missing: {- - +} {- - -} {- + -} {+ - -} {- - +} {+ + -}
-test lseq-2.18 {signs} knownBug {
+test lseq-2.18 {signs} {
     list [lseq -10 -1 2] \
 	[lseq -10 -1 -1] \
 	[lseq -10 1 -3] \
@@ -390,7 +390,7 @@ test lseq-3.28 {lreverse bug in ArithSeries} {} {
     list $r $rr [string equal $r [lreverse $rr]]
 } {{-5 -2 1 4 7 10 13 16} {16 13 10 7 4 1 -2 -5} 1}
 
-test lseq-3.29 {edge case: negative count} knownBug {
+test lseq-3.29 {edge case: negative count} {
     lseq -15
 } {}
 
@@ -425,7 +425,7 @@ test lseq-4.2 {start expressions} {
 ##	lseq 1 to 10 by -2
 ##	# -> lseq: invalid step = -2 with a = 1 and b = 10
 
-test lseq-4.3 {TIP examples} knownBug {
+test lseq-4.3 {TIP examples} {
     set examples {# Examples from TIP-629
 	# --- Begin ---
 	lseq 10 .. 1
-- 
cgit v0.12


From bec96305308d0c234215d25b194f1ff8417dc8b4 Mon Sep 17 00:00:00 2001
From: griffin <briang42@easystreet.net>
Date: Thu, 29 Sep 2022 16:10:07 +0000
Subject: Fix bug-99e834bf33

---
 generic/tclExecute.c |  2 +-
 tests/lseq.test      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 5f29bfa..fa0dfa2 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4938,7 +4938,7 @@ TEBCresume(
 
 	    /* Decode end-offset index values. */
 
-	    index = TclIndexDecode(opnd, length);
+	    index = TclIndexDecode(opnd, length-1);
 
 	    /* Compute value @ index */
 	    if (index >= 0 && index < length) {
diff --git a/tests/lseq.test b/tests/lseq.test
index e05b32d..518a7bb 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -489,9 +489,19 @@ test lseq-4.4 {lseq corner case} -body {
 	lappend res $s $e
     }
     eval $tcmd
+} -cleanup {
+    unset res
 } -result {0 10 1 {max length of a Tcl list exceeded} 1 {max length of a Tcl list exceeded} 0 10 0 2147483638}
 
 
+# Ticket 99e834bf33 - lseq, lindex end off by one
+
+test lseq-4.5 {lindex off by one} -body {
+    lappend res [eval {lindex [lseq 1 4] end}]
+    lappend res [eval {lindex [lseq 1 4] end-1}]
+} -result {4 3}
+
+
 # cleanup
 ::tcltest::cleanupTests
 return
-- 
cgit v0.12


From 9e7c607db1c09acf473b8b10df55452b1e907499 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 29 Sep 2022 20:53:43 +0000
Subject: Complete documentation for the TIP 638 routines.

---
 doc/Number.3 | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/doc/Number.3 b/doc/Number.3
index 65a1332..f93d75d 100644
--- a/doc/Number.3
+++ b/doc/Number.3
@@ -57,7 +57,7 @@ header file, \fBtcl.h\fR, and is equivalent to the C standard type
 \fBlong long\fR on most platforms. The \fBmp_int\fR type is declared in the
 header file \fBtclTomMath.h\fR, and implemented by the LibTomMath
 multiple-precision integer library, included with Tcl.
-
+.PP
 The routines \fBTcl_GetNumber\fR and \fBTcl_GetNumberFromObj\fR perform
 the same function.  They differ only in how the arguments present the Tcl
 value to be examined.  \fBTcl_GetNumber\fR accepts a counted string
@@ -65,22 +65,57 @@ value in the arguments \fIbytes\fR and \fInumBytes\fR (or a
 \fBNUL\fR-terminated string value when \fInumBytes\fR is
 \fBTCL_INDEX_NONE\fR).  \fBTcl_GetNumberFromObj\fR accepts the Tcl value
 in \fIobjPtr\fR.
-
+.PP
 Both routines examine the Tcl value and determine whether Tcl recognizes
 it as a number.  If not, both routines return \fBTCL_ERROR\fR and (when
 \fIinterp\fR is not NULL) record an error message and error code
 in \fIinterp\fR.
-
-If the examined value is recognized as a number, both routines return
+.PP
+If Tcl does recognize the examined value as a number, both routines return
 \fBTCL_OK\fR, and use the pointer arguments \fIclientDataPtr\fR
 and \fItypePtr\fR (which may not be NULL) to report information the
 caller can use to retrieve the numeric representation.  Both routines
 write to *\fIclientDataPtr\fR a pointer to the internal storage location
-where Tcl holds the converted numeric value.  When that internal storage
-is of type \fBdouble\fR
-
-
-
+where Tcl holds the converted numeric value.  
+.PP
+When the converted numeric value is stored as a \fBdouble\fR,
+a call to math library routine \fBisnan\fR determines whether that
+value is not a number (NaN).  If so, both \fBTcl_GetNumber\fR and
+\fBTcl_GetNumberFromObj\fR write the value \fBTCL_NUMBER_NAN\fR
+to *\fItypePtr\fR. If not, both routines write the value
+\fBTCL_NUMBER_DOUBLE\fR to *\fItypePtr\fR.  These routines report
+different type values in these cases because \fBTcl_GetDoubleFromObj\fR
+raises an error on NaN values.  For both reported type values,
+the storage pointer may be cast to type \fBconst double *\fR and
+the \fBdouble\fR numeric value may be read through it.
+.PP
+When the converted numeric value is stored as a \fBTcl_WideInt\fR,
+both \fBTcl_GetNumber\fR and \fBTcl_GetNumberFromObj\fR write the
+value \fBTCL_NUMBER_INT\fR to *\fItypePtr\fR. 
+The storage pointer may be cast to type \fBconst Tcl_WideInt *\fR and
+the \fBTcl_WideInt\fR numeric value may be read through it.
+.PP
+When the converted numeric value is stored as an \fBmp_int\fR,
+both \fBTcl_GetNumber\fR and \fBTcl_GetNumberFromObj\fR write the
+value \fBTCL_NUMBER_BIG\fR to *\fItypePtr\fR. 
+The storage pointer may be cast to type \fBconst mp_int *\fR and
+the \fBmp_int\fR numeric value may be read through it.
+.PP
+Future releases of Tcl might expand or revise the recognition of
+values as numbers.  If additional storage representations are
+adopted, these routines will add new values to be written to
+*\fItypePtr\fR to identify them.  Callers should consider how
+they should react to unknown values written to *\fItypePtr\fR.
+.PP
+When callers of these routines read numeric values through the
+reported storage pointer, they are accessing memory that belongs
+to the Tcl library.  The Tcl library has the power to overwrite
+or free this memory.  The storage pointer reported by a call to
+\fBTcl_GetNumber\fR or \fBTcl_GetNumberFromObj\fR should not be
+used after the same thread has possibly returned control to the
+Tcl library.  If longer term access to the numeric value is needed,
+it should be copied into memory controlled by the caller.  Callers
+must not attempt to write through or free the storage pointer.
 .SH "SEE ALSO"
 Tcl_GetDouble, Tcl_GetDoubleFromObj, Tcl_GetWideIntFromObj
 .SH KEYWORDS
-- 
cgit v0.12


From b01f9536cb1fe19d6b97c9a81b4dac4fb98dd5dd Mon Sep 17 00:00:00 2001
From: griffin <briang42@easystreet.net>
Date: Fri, 30 Sep 2022 00:03:55 +0000
Subject: Fix various issues with refCounts.

---
 generic/tclArithSeries.c |  6 ++----
 generic/tclCmdAH.c       |  7 +++++++
 generic/tclListObj.c     |  2 --
 tests/lseq.test          | 14 ++++++++++++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 61b4a9b..ee201fa 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -392,6 +392,7 @@ TclArithSeriesObjStep(
     } else {
 	*stepObj = Tcl_NewWideIntObj(arithSeriesRepPtr->step);
     }
+    Tcl_IncrRefCount(*stepObj);
     return TCL_OK;
 }
 
@@ -436,6 +437,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
     } else {
 	*elementObj = Tcl_NewWideIntObj(ArithSeriesIndexM(arithSeriesRepPtr, index));
     }
+    Tcl_IncrRefCount(*elementObj);
     return TCL_OK;
 }
 
@@ -722,11 +724,8 @@ TclArithSeriesObjRange(
     }
 
     TclArithSeriesObjIndex(arithSeriesPtr, fromIdx, &startObj);
-    Tcl_IncrRefCount(startObj);
     TclArithSeriesObjIndex(arithSeriesPtr, toIdx, &endObj);
-    Tcl_IncrRefCount(endObj);
     TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
-    Tcl_IncrRefCount(stepObj);
 
     if (Tcl_IsShared(arithSeriesPtr) ||
 	    ((arithSeriesPtr->refCount > 1))) {
@@ -857,7 +856,6 @@ TclArithSeriesGetElements(
 			}
 			return TCL_ERROR;
 		    }
-		    Tcl_IncrRefCount(objv[i]);
 		}
 	    }
 	} else {
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 07541bd..3048e82 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -3027,6 +3027,13 @@ ForeachAssignments(
 	    varValuePtr = Tcl_ObjSetVar2(interp, statePtr->varvList[i][v],
 		    NULL, valuePtr, TCL_LEAVE_ERR_MSG);
 
+	    if (isarithseries) {
+		/* arith values have implicit reference
+		** Make sure value is cleaned up when var goes away
+		*/
+		Tcl_DecrRefCount(valuePtr);
+	    }
+
 	    if (varValuePtr == NULL) {
 		Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			"\n    (setting %s loop variable \"%s\")",
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index d18ad59..598ff6f 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2641,7 +2641,6 @@ TclLindexFlat(
 	    }
 	    if (i==0) {
 		TclArithSeriesObjIndex(listObj, index, &elemObj);
-		Tcl_IncrRefCount(elemObj);
 	    } else if (index > 0) {
 		Tcl_DecrRefCount(elemObj);
 		TclNewObj(elemObj);
@@ -3304,7 +3303,6 @@ SetListFromAny(
 	    if (TclArithSeriesObjIndex(objPtr, j, &elemPtrs[j]) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    Tcl_IncrRefCount(elemPtrs[j]);/* Since list now holds ref to it. */
 	}
 
     } else {
diff --git a/tests/lseq.test b/tests/lseq.test
index 518a7bb..7daa59c 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -223,6 +223,8 @@ test lseq-3.1 {experiement} {
     if {$ans eq {}} {
 	set ans OK
     }
+    unset factor
+    unset l
     set ans
 } {OK}
 
@@ -376,13 +378,18 @@ test lseq-3.26 {lsort shimmer} arithSeriesShimmer {
     list ${rep-before} $lexical_sort ${rep-after}
 } {arithseries {0 1 10 11 12 13 14 15 2 3 4 5 6 7 8 9} arithseries}
 
-test lseq-3.27 {lreplace shimmer} arithSeriesShimmer {
+test lseq-3.27 {lreplace shimmer} -constraints arithSeriesShimmer -body {
     set r [lseq 15 0]
     set rep-before [lindex [tcl::unsupported::representation $r] 3]
     set lexical_sort [lreplace $r 3 5 A B C]
     set rep-after [lindex [tcl::unsupported::representation $r] 3]
     list ${rep-before} $lexical_sort ${rep-after}
-} {arithseries {15 14 13 A B C 9 8 7 6 5 4 3 2 1 0} arithseries}
+} -cleanup {
+    unset r
+    unset rep-before
+    unset lexical_sort
+    unset rep-after
+} -result {arithseries {15 14 13 A B C 9 8 7 6 5 4 3 2 1 0} arithseries}
 
 test lseq-3.28 {lreverse bug in ArithSeries} {} {
     set r [lseq -5 17 3]
@@ -499,11 +506,14 @@ test lseq-4.4 {lseq corner case} -body {
 test lseq-4.5 {lindex off by one} -body {
     lappend res [eval {lindex [lseq 1 4] end}]
     lappend res [eval {lindex [lseq 1 4] end-1}]
+} -cleanup {
+    unset res
 } -result {4 3}
 
 
 # cleanup
 ::tcltest::cleanupTests
+
 return
 
 # Local Variables:
-- 
cgit v0.12


From f9753a5e4109e31176bc1da885ff5ec23839662b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 30 Sep 2022 11:30:11 +0000
Subject: Replace incorrect use of TclGetNumberFromObj

---
 generic/tclArithSeries.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 1302780..51f27b2 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -307,12 +307,9 @@ TclNewArithSeriesObj(
 	assignNumber(useDoubles, &end, &dend, endObj);
     }
     if (lenObj) {
-	int tcl_number_type;
-	Tcl_WideInt *valuePtr;
-	if (TclGetNumberFromObj(interp, lenObj, (ClientData*)&valuePtr, &tcl_number_type) != TCL_OK) {
+	if (TCL_OK != Tcl_GetWideIntFromObj(interp, lenObj, &len)) {
 	    return TCL_ERROR;
 	}
-	len = *valuePtr;
     }
 
     if (startObj && endObj) {
-- 
cgit v0.12


From 2d5ed059a0d65242470b8ef41870bbadaa67e927 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 4 Oct 2022 15:52:13 +0000
Subject: TIP #641 implementation: Let Tcl_GetBoolean(FromObj) handle (C99)
 bool

---
 doc/BoolObj.3        | 12 ++++++------
 generic/tclDecls.h   | 14 ++++++++++++++
 generic/tclTest.c    | 50 +++++++++++++++++++++++++++-----------------------
 generic/tclTestObj.c | 15 ++++++++-------
 win/tclWinSock.c     | 18 ++++++------------
 5 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/doc/BoolObj.3 b/doc/BoolObj.3
index 47a2189..71580af 100644
--- a/doc/BoolObj.3
+++ b/doc/BoolObj.3
@@ -20,7 +20,7 @@ Tcl_Obj *
 \fBTcl_SetBooleanObj\fR(\fIobjPtr, intValue\fR)
 .sp
 int
-\fBTcl_GetBooleanFromObj\fR(\fIinterp, objPtr, intPtr\fR)
+\fBTcl_GetBooleanFromObj\fR(\fIinterp, objPtr, boolPtr\fR)
 .sp
 int
 \fBTcl_GetBoolFromObj\fR(\fIinterp, objPtr, flags. charPtr\fR)
@@ -35,7 +35,7 @@ retrieve a boolean value.
 If a boolean value cannot be retrieved,
 an error message is left in the interpreter's result value
 unless \fIinterp\fR is NULL.
-.AP int *intPtr out
+.AP "bool \&| int" *boolPtr out
 Points to place where \fBTcl_GetBooleanFromObj\fR
 stores the boolean value (0 or 1) obtained from \fIobjPtr\fR.
 .AP char *charPtr out
@@ -71,13 +71,13 @@ any former value stored in \fI*objPtr\fR.
 from the value stored in \fI*objPtr\fR.
 If \fIobjPtr\fR holds a string value recognized by \fBTcl_GetBoolean\fR,
 then the recognized boolean value is written at the address given
-by \fIintPtr\fR.
+by \fIboolPtr\fR.
 If \fIobjPtr\fR holds any value recognized as
 a number by Tcl, then if that value is zero a 0 is written at
-the address given by \fIintPtr\fR and if that
-value is non-zero a 1 is written at the address given by \fIintPtr\fR.
+the address given by \fIboolPtr\fR and if that
+value is non-zero a 1 is written at the address given by \fIboolPtr\fR.
 In all cases where a value is written at the address given
-by \fIintPtr\fR, \fBTcl_GetBooleanFromObj\fR returns \fBTCL_OK\fR.
+by \fIboolPtr\fR, \fBTcl_GetBooleanFromObj\fR returns \fBTCL_OK\fR.
 If the value of \fIobjPtr\fR does not meet any of the conditions
 above, then \fBTCL_ERROR\fR is returned and an error message is
 left in the interpreter's result unless \fIinterp\fR is NULL.
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 2d18bcc..74c74db 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4344,6 +4344,8 @@ static TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(
 	Tcl_GetUnicodeFromObj(objPtr, (int *)NULL)
 #undef Tcl_GetBytesFromObj
 #undef Tcl_GetIndexFromObjStruct
+#undef Tcl_GetBooleanFromObj
+#undef Tcl_GetBoolean
 #ifdef TCL_NO_DEPRECATED
 #undef Tcl_GetStringFromObj
 #undef Tcl_GetUnicodeFromObj
@@ -4354,6 +4356,12 @@ static TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
+	((sizeof(*(boolPtr)) == sizeof(char)) ? Tcl_GetBoolFromObj(interp, objPtr, 0, (char *)(boolPtr)) : (Tcl_Panic("Wrong bool var for %s", "Tcl_GetBooleanFromObj"), TCL_ERROR)))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? tclStubsPtr->tcl_GetBoolean(interp, src, (int *)(boolPtr)) : \
+	((sizeof(*(boolPtr)) == sizeof(char)) ? Tcl_GetBool(interp, src, 0, (char *)(boolPtr)) : (Tcl_Panic("Wrong bool var for %s", "Tcl_GetBoolean"), TCL_ERROR)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (size_t *)(sizePtr)))
@@ -4367,6 +4375,12 @@ static TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(
 	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
+#define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? Tcl_GetBooleanFromObj(interp, objPtr, (int *)(boolPtr)) : \
+	((sizeof(*(boolPtr)) == sizeof(char)) ? Tcl_GetBoolFromObj(interp, objPtr, 0, (char *)(boolPtr)) : (Tcl_Panic("Wrong bool var for %s", "Tcl_GetBooleanFromObj"), TCL_ERROR)))
+#define Tcl_GetBoolean(interp, src, boolPtr) \
+	(sizeof(*(boolPtr)) == sizeof(int) ? Tcl_GetBoolean(interp, src, (int *)(boolPtr)) : \
+	((sizeof(*(boolPtr)) == sizeof(char)) ? Tcl_GetBool(interp, src, 0, (char *)(boolPtr)) : (Tcl_Panic("Wrong bool var for %s", "Tcl_GetBoolean"), TCL_ERROR)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
 	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (size_t *)(sizePtr)))
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 8218a33..30ea4e5 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -33,6 +33,7 @@
 #endif
 #include "tclOO.h"
 #include <math.h>
+#include <stdbool.h>
 
 /*
  * Required for Testregexp*Cmd
@@ -2326,7 +2327,7 @@ TesteventProc(
     Tcl_Obj *command = ev->command;
     int result = Tcl_EvalObjEx(interp, command,
 	    TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
-    char retval;
+    bool retval;
 
     if (result != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
@@ -2334,8 +2335,8 @@ TesteventProc(
 	Tcl_BackgroundException(interp, TCL_ERROR);
 	return 1;		/* Avoid looping on errors */
     }
-    if (Tcl_GetBoolFromObj(interp, Tcl_GetObjResult(interp),
-	    0, &retval) != TCL_OK) {
+    if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
+	    &retval) != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
 		"    (return value from \"testevent\" callback)");
 	Tcl_BackgroundException(interp, TCL_ERROR);
@@ -2898,7 +2899,8 @@ TestlinkCmd(
     static Tcl_WideUInt uwideVar = 123;
     static int created = 0;
     char buffer[2*TCL_DOUBLE_SPACE];
-    int writable, flag;
+    bool writable;
+    int flag;
     Tcl_Obj *tmp;
 
     if (argc < 2) {
@@ -2935,7 +2937,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[2], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "int", &intVar,
 		TCL_LINK_INT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2943,7 +2945,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[3], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "real", &realVar,
 		TCL_LINK_DOUBLE | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2951,7 +2953,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[4], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "bool", &boolVar,
 		TCL_LINK_BOOLEAN | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2959,7 +2961,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[5], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "string", &stringVar,
 		TCL_LINK_STRING | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2967,7 +2969,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[6], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "wide", &wideVar,
 			TCL_LINK_WIDE_INT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2975,7 +2977,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[7], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "char", &charVar,
 		TCL_LINK_CHAR | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2983,7 +2985,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[8], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "uchar", &ucharVar,
 		TCL_LINK_UCHAR | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2991,7 +2993,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[9], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "short", &shortVar,
 		TCL_LINK_SHORT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2999,7 +3001,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[10], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "ushort", &ushortVar,
 		TCL_LINK_USHORT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3007,7 +3009,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[11], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "uint", &uintVar,
 		TCL_LINK_UINT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3015,7 +3017,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[12], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "long", &longVar,
 		TCL_LINK_LONG | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3023,7 +3025,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[13], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "ulong", &ulongVar,
 		TCL_LINK_ULONG | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3031,7 +3033,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[14], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "float", &floatVar,
 		TCL_LINK_FLOAT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3039,7 +3041,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[15], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "uwide", &uwideVar,
 		TCL_LINK_WIDE_UINT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -5531,7 +5533,7 @@ TestsaveresultCmd(
 {
     Interp* iPtr = (Interp*) interp;
     int result, index;
-    char discard;
+    bool discard;
     Tcl_SavedResult state;
     Tcl_Obj *objPtr;
     static const char *const optionStrings[] = {
@@ -5553,7 +5555,7 @@ TestsaveresultCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (Tcl_GetBoolFromObj(interp, objv[3], 0, &discard) != TCL_OK) {
+    if (Tcl_GetBooleanFromObj(interp, objv[3], &discard) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -6515,7 +6517,7 @@ TestSocketCmd(
     if ((cmdName[0] == 't') && (strncmp(cmdName, "testflags", len) == 0)) {
         Tcl_Channel hChannel;
         int modePtr;
-        int testMode;
+        bool testMode;
         TcpState *statePtr;
         /* Set test value in the socket driver
          */
@@ -6739,7 +6741,8 @@ TestFilesystemObjCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    int res, boolVal;
+    int res;
+    bool boolVal;
     const char *msg;
 
     if (objc != 2) {
@@ -7110,7 +7113,8 @@ TestSimpleFilesystemObjCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    int res, boolVal;
+    int res;
+    bool boolVal;
     const char *msg;
 
     if (objc != 2) {
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index a03a60a..6c9d04b 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -24,6 +24,7 @@
 #   include "tclTomMath.h"
 #endif
 #include "tclStringRep.h"
+#include <stdbool.h>
 
 #ifdef __GNUC__
 /*
@@ -292,9 +293,9 @@ TestbignumobjCmd(
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetWideIntObj(varPtr[varIndex], mp_iszero(&bignumValue));
+	    Tcl_SetBooleanObj(varPtr[varIndex], mp_iszero(&bignumValue));
 	} else {
-	    SetVarToObj(varPtr, varIndex, Tcl_NewWideIntObj(mp_iszero(&bignumValue)));
+	    SetVarToObj(varPtr, varIndex, Tcl_NewBooleanObj(mp_iszero(&bignumValue)));
 	}
 	mp_clear(&bignumValue);
 	break;
@@ -353,7 +354,7 @@ TestbooleanobjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     size_t varIndex;
-    int boolValue;
+    bool boolValue;
     const char *subCmd;
     Tcl_Obj **varPtr;
 
@@ -387,9 +388,9 @@ TestbooleanobjCmd(
 	 */
 
 	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetWideIntObj(varPtr[varIndex], boolValue != 0);
+	    Tcl_SetWideIntObj(varPtr[varIndex], boolValue);
 	} else {
-	    SetVarToObj(varPtr, varIndex, Tcl_NewWideIntObj(boolValue != 0));
+	    SetVarToObj(varPtr, varIndex, Tcl_NewBooleanObj(boolValue));
 	}
 	Tcl_SetObjResult(interp, varPtr[varIndex]);
     } else if (strcmp(subCmd, "get") == 0) {
@@ -412,9 +413,9 @@ TestbooleanobjCmd(
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetWideIntObj(varPtr[varIndex], boolValue == 0);
+	    Tcl_SetBooleanObj(varPtr[varIndex], !boolValue);
 	} else {
-	    SetVarToObj(varPtr, varIndex, Tcl_NewWideIntObj(boolValue == 0));
+	    SetVarToObj(varPtr, varIndex, Tcl_NewBooleanObj(!boolValue));
 	}
 	Tcl_SetObjResult(interp, varPtr[varIndex]);
     } else {
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index f1a6a5e..3962859 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1206,15 +1206,12 @@ TcpSetOptionProc(
     sock = statePtr->sockets->fd;
 
     if (!strcasecmp(optionName, "-keepalive")) {
-	BOOL val = FALSE;
-	int boolVar, rtn;
+	BOOL val;
+	int rtn;
 
-	if (Tcl_GetBoolean(interp, value, &boolVar) != TCL_OK) {
+	if (Tcl_GetBoolean(interp, value, &val) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (boolVar) {
-	    val = TRUE;
-	}
 	rtn = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
 		(const char *) &val, sizeof(BOOL));
 	if (rtn != 0) {
@@ -1228,15 +1225,12 @@ TcpSetOptionProc(
 	}
 	return TCL_OK;
     } else if (!strcasecmp(optionName, "-nagle")) {
-	BOOL val = FALSE;
-	int boolVar, rtn;
+	BOOL val;
+	int rtn;
 
-	if (Tcl_GetBoolean(interp, value, &boolVar) != TCL_OK) {
+	if (Tcl_GetBoolean(interp, value, &val) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (!boolVar) {
-	    val = TRUE;
-	}
 	rtn = setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
 		(const char *) &val, sizeof(BOOL));
 	if (rtn != 0) {
-- 
cgit v0.12


From 3f371a5084c05daba396645abd9a25deb3d023d1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 4 Oct 2022 15:56:08 +0000
Subject: =?UTF-8?q?Fix=20g++=20warning:=20tclEvent.c:1519:10:=20warning:?=
 =?UTF-8?q?=20declaration=20of=20=E2=80=98enum=20Tcl=5FVwaitObjCmd(void*,?=
 =?UTF-8?q?=20Tcl=5FInterp*,=20int,=20Tcl=5FObj*=20const*)::options?=
 =?UTF-8?q?=E2=80=99=20shadows=20a=20previous=20local=20[-Wshadow]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 183ac82..1e2e7bf 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1511,12 +1511,12 @@ Tcl_VwaitObjCmd(
     Tcl_Channel chan;
     Tcl_WideInt diff = -1;
     VwaitItem localItems[32], *vwaitItems = localItems;
-    static const char *const options[] = {
+    static const char *const vWaitOptionStrings[] = {
 	"-all",	"-extended", "-nofileevents", "-noidleevents",
 	"-notimerevents", "-nowindowevents", "-readable",
 	"-timeout", "-variable", "-writable", "--", NULL
     };
-    enum options {
+    enum vWaitOptions {
 	OPT_ALL, OPT_EXTD, OPT_NO_FEVTS, OPT_NO_IEVTS,
 	OPT_NO_TEVTS, OPT_NO_WEVTS, OPT_READABLE,
 	OPT_TIMEOUT, OPT_VARIABLE, OPT_WRITABLE, OPT_LAST
@@ -1541,7 +1541,7 @@ Tcl_VwaitObjCmd(
 	if (name[0] != '-') {
 	    break;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
+	if (Tcl_GetIndexFromObj(interp, objv[i], vWaitOptionStrings, "option", 0,
 		&index) != TCL_OK) {
 	    result = TCL_ERROR;
 	    goto done;
@@ -1570,7 +1570,7 @@ Tcl_VwaitObjCmd(
 	needArg:
 		Tcl_ResetResult(interp);
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"argument required for \"%s\"", options[index]));
+			"argument required for \"%s\"", vWaitOptionStrings[index]));
 		Tcl_SetErrorCode(interp, "TCL", "EVENT", "ARGUMENT", NULL);
 		result = TCL_ERROR;
 		goto done;
-- 
cgit v0.12


From dfa6b32e11082614f40cc86e0aab004b8e7aad83 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 4 Oct 2022 18:25:18 +0000
Subject: silence compiler warning

---
 generic/tclParse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclParse.c b/generic/tclParse.c
index 95458ea..df218a7 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -1480,7 +1480,7 @@ Tcl_ParseVarName(
 		    TCL_SUBST_ALL, parsePtr)) {
 		goto error;
 	    }
-	    if ((parsePtr->term == src+numBytes)){
+	    if (parsePtr->term == src+numBytes){
 		if (parsePtr->interp != NULL) {
 		    Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
 			    "missing )", -1));
-- 
cgit v0.12


From 00199ad335823ec6b18983d1188f70b0b065b25e Mon Sep 17 00:00:00 2001
From: griffin <briang42@easystreet.net>
Date: Tue, 4 Oct 2022 20:15:38 +0000
Subject: Fix some bugs in lseq

---
 generic/tclArithSeries.c |  9 +++++++--
 generic/tclCmdAH.c       | 17 +++++------------
 generic/tclExecute.c     |  7 ++++++-
 generic/tclListObj.c     |  8 ++++----
 tests/lseq.test          |  2 +-
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index ee201fa..6a02caa 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -392,7 +392,6 @@ TclArithSeriesObjStep(
     } else {
 	*stepObj = Tcl_NewWideIntObj(arithSeriesRepPtr->step);
     }
-    Tcl_IncrRefCount(*stepObj);
     return TCL_OK;
 }
 
@@ -437,7 +436,6 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
     } else {
 	*elementObj = Tcl_NewWideIntObj(ArithSeriesIndexM(arithSeriesRepPtr, index));
     }
-    Tcl_IncrRefCount(*elementObj);
     return TCL_OK;
 }
 
@@ -724,8 +722,11 @@ TclArithSeriesObjRange(
     }
 
     TclArithSeriesObjIndex(arithSeriesPtr, fromIdx, &startObj);
+    Tcl_IncrRefCount(startObj);
     TclArithSeriesObjIndex(arithSeriesPtr, toIdx, &endObj);
+    Tcl_IncrRefCount(endObj);
     TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
+    Tcl_IncrRefCount(stepObj);
 
     if (Tcl_IsShared(arithSeriesPtr) ||
 	    ((arithSeriesPtr->refCount > 1))) {
@@ -856,6 +857,7 @@ TclArithSeriesGetElements(
 			}
 			return TCL_ERROR;
 		    }
+		    Tcl_IncrRefCount(objv[i]);
 		}
 	    }
 	} else {
@@ -912,8 +914,11 @@ TclArithSeriesObjReverse(
     len = arithSeriesRepPtr->len;
 
     TclArithSeriesObjIndex(arithSeriesPtr, (len-1), &startObj);
+    Tcl_IncrRefCount(startObj);
     TclArithSeriesObjIndex(arithSeriesPtr, 0, &endObj);
+    Tcl_IncrRefCount(endObj);
     TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
+    Tcl_IncrRefCount(stepObj);
 
     if (isDouble) {
 	Tcl_GetDoubleFromObj(NULL, startObj, &dstart);
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 3048e82..a5c5330 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -2866,13 +2866,13 @@ EachloopCmd(
 	/* Values */
 	if (TclHasInternalRep(objv[2+i*2],&tclArithSeriesType)) {
 	    /* Special case for Arith Series */
-	    statePtr->vCopyList[i] = TclArithSeriesObjCopy(interp, objv[2+i*2]);
-	    if (statePtr->vCopyList[i] == NULL) {
+	    statePtr->aCopyList[i] = TclArithSeriesObjCopy(interp, objv[2+i*2]);
+	    if (statePtr->aCopyList[i] == NULL) {
 		result = TCL_ERROR;
 		goto done;
 	    }
 	    /* Don't compute values here, wait until the last momement */
-	    statePtr->argcList[i] = TclArithSeriesObjLength(statePtr->vCopyList[i]);
+	    statePtr->argcList[i] = TclArithSeriesObjLength(statePtr->aCopyList[i]);
 	} else {
 	    /* List values */
 	    statePtr->aCopyList[i] = TclListObjCopy(interp, objv[2+i*2]);
@@ -3005,12 +3005,12 @@ ForeachAssignments(
     Tcl_Obj *valuePtr, *varValuePtr;
 
     for (i=0 ; i<statePtr->numLists ; i++) {
-	int isarithseries = TclHasInternalRep(statePtr->vCopyList[i],&tclArithSeriesType);
+	int isarithseries = TclHasInternalRep(statePtr->aCopyList[i],&tclArithSeriesType);
 	for (v=0 ; v<statePtr->varcList[i] ; v++) {
 	    k = statePtr->index[i]++;
 	    if (k < statePtr->argcList[i]) {
 		if (isarithseries) {
-		    if (TclArithSeriesObjIndex(statePtr->vCopyList[i], k, &valuePtr) != TCL_OK) {
+		    if (TclArithSeriesObjIndex(statePtr->aCopyList[i], k, &valuePtr) != TCL_OK) {
 			Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			"\n    (setting %s loop variable \"%s\")",
 			(statePtr->resultList != NULL ? "lmap" : "foreach"),
@@ -3027,13 +3027,6 @@ ForeachAssignments(
 	    varValuePtr = Tcl_ObjSetVar2(interp, statePtr->varvList[i][v],
 		    NULL, valuePtr, TCL_LEAVE_ERR_MSG);
 
-	    if (isarithseries) {
-		/* arith values have implicit reference
-		** Make sure value is cleaned up when var goes away
-		*/
-		Tcl_DecrRefCount(valuePtr);
-	    }
-
 	    if (varValuePtr == NULL) {
 		Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			"\n    (setting %s loop variable \"%s\")",
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index fa0dfa2..7c7bbfd 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4883,6 +4883,7 @@ TEBCresume(
 		TRACE_ERROR(interp);
 		goto gotError;
 	    }
+	    Tcl_IncrRefCount(objResultPtr); // reference held here
 	    goto lindexDone;
 	}
 
@@ -5187,7 +5188,11 @@ TEBCresume(
 	     */
 
 	    do {
-		Tcl_ListObjIndex(NULL, value2Ptr, i, &o);
+		if (isArithSeries) {
+		    TclArithSeriesObjIndex(value2Ptr, i, &o);
+		} else {
+		    Tcl_ListObjIndex(NULL, value2Ptr, i, &o);
+		}
 		if (o != NULL) {
 		    s2 = TclGetStringFromObj(o, &s2len);
 		} else {
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 598ff6f..62bc162 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -1369,6 +1369,9 @@ TclListObjCopy(
     Tcl_Obj *copyObj;
 
     if (!TclHasInternalRep(listObj, &tclListType)) {
+	if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
+	    return TclArithSeriesObjCopy(interp, listObj);
+	}
 	if (SetListFromAny(interp, listObj) != TCL_OK) {
 	    return NULL;
 	}
@@ -1943,10 +1946,6 @@ Tcl_ListObjIndex(
     Tcl_Obj **elemObjs;
     ListSizeT numElems;
 
-    if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
-	return TclArithSeriesObjIndex(listObj, index, objPtrPtr);
-    }
-
     /*
      * TODO
      * Unlike the original list code, this does not optimize for lindex'ing
@@ -2642,6 +2641,7 @@ TclLindexFlat(
 	    if (i==0) {
 		TclArithSeriesObjIndex(listObj, index, &elemObj);
 	    } else if (index > 0) {
+		/* ArithSeries cannot be a list of lists */
 		Tcl_DecrRefCount(elemObj);
 		TclNewObj(elemObj);
 		Tcl_IncrRefCount(elemObj);
diff --git a/tests/lseq.test b/tests/lseq.test
index 7daa59c..2e5d7e1 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -16,7 +16,7 @@ if {"::tcltest" ni [namespace children]} {
 
 testConstraint arithSeriesDouble 1
 testConstraint arithSeriesShimmer 1
-testConstraint arithSeriesShimmerOk 0
+testConstraint arithSeriesShimmerOk 1
 
 ## Arg errors
 test lseq-1.1 {error cases} -body {
-- 
cgit v0.12


From 4b1d6e9ae2d95e94f8d3c2113e43a9dbc45f4597 Mon Sep 17 00:00:00 2001
From: griffin <briang42@easystreet.net>
Date: Tue, 4 Oct 2022 22:05:19 +0000
Subject: Fix some bugs in lseq

---
 generic/tclCmdAH.c | 10 +++++-----
 tests/lseq.test    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 6a45a0b..d1756de 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -2720,13 +2720,13 @@ EachloopCmd(
 	/* Values */
 	if (TclHasInternalRep(objv[2+i*2],&tclArithSeriesType)) {
 	    /* Special case for Arith Series */
-	    statePtr->vCopyList[i] = TclArithSeriesObjCopy(interp, objv[2+i*2]);
-	    if (statePtr->vCopyList[i] == NULL) {
+	    statePtr->aCopyList[i] = TclArithSeriesObjCopy(interp, objv[2+i*2]);
+	    if (statePtr->aCopyList[i] == NULL) {
 		result = TCL_ERROR;
 		goto done;
 	    }
 	    /* Don't compute values here, wait until the last momement */
-	    statePtr->argcList[i] = TclArithSeriesObjLength(statePtr->vCopyList[i]);
+	    statePtr->argcList[i] = TclArithSeriesObjLength(statePtr->aCopyList[i]);
 	} else {
 	    /* List values */
 	    statePtr->aCopyList[i] = TclListObjCopy(interp, objv[2+i*2]);
@@ -2860,12 +2860,12 @@ ForeachAssignments(
     Tcl_Obj *valuePtr, *varValuePtr;
 
     for (i=0 ; i<statePtr->numLists ; i++) {
-	int isarithseries = TclHasInternalRep(statePtr->vCopyList[i],&tclArithSeriesType);
+	int isarithseries = TclHasInternalRep(statePtr->aCopyList[i],&tclArithSeriesType);
 	for (v=0 ; v<statePtr->varcList[i] ; v++) {
 	    k = statePtr->index[i]++;
 	    if (k < statePtr->argcList[i]) {
 		if (isarithseries) {
-		    if (TclArithSeriesObjIndex(statePtr->vCopyList[i], k, &valuePtr) != TCL_OK) {
+		    if (TclArithSeriesObjIndex(statePtr->aCopyList[i], k, &valuePtr) != TCL_OK) {
 			Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			"\n    (setting %s loop variable \"%s\")",
 			(statePtr->resultList != NULL ? "lmap" : "foreach"),
diff --git a/tests/lseq.test b/tests/lseq.test
index 8bd8114..19ae348 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -16,7 +16,7 @@ if {"::tcltest" ni [namespace children]} {
 
 testConstraint arithSeriesDouble 1
 testConstraint arithSeriesShimmer 1
-testConstraint arithSeriesShimmerOk 0
+testConstraint arithSeriesShimmerOk 1
 
 ## Arg errors
 test lseq-1.1 {error cases} -body {
-- 
cgit v0.12


From 3cb6c489a3c0515c7b3aade0aaa139e637400559 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 5 Oct 2022 06:41:28 +0000
Subject: Missing error-check in Tcl_GetWideIntFromObj (backported from 9.0,
 was already fixed there)

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

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 6a02caa..11a4254 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -306,7 +306,9 @@ TclNewArithSeriesObj(
 	assignNumber(useDoubles, &end, &dend, endObj);
     }
     if (lenObj) {
-	Tcl_GetWideIntFromObj(NULL, lenObj, &len);
+	if (TCL_OK != Tcl_GetWideIntFromObj(interp, lenObj, &len)) {
+	    return TCL_ERROR;
+	}
     }
 
     if (startObj && endObj) {
@@ -339,7 +341,7 @@ TclNewArithSeriesObj(
 	}
     }
 
-    if (len > ListSizeT_MAX) {
+    if (TCL_MAJOR_VERSION < 9 && len > ListSizeT_MAX) {
 	Tcl_SetObjResult(
 	    interp,
 	    Tcl_NewStringObj("max length of a Tcl list exceeded", -1));
-- 
cgit v0.12


From 4721ffe64fe11287997ec892d58c375a73e3876d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 5 Oct 2022 15:31:31 +0000
Subject: Fix [1599352cca] and related issues

---
 generic/tclDictObj.c | 51 ++++++++++++++++++++++++++-------------------------
 generic/tclInt.h     |  2 +-
 generic/tclListObj.c |  7 ++++---
 generic/tclUtil.c    | 13 +++++++------
 4 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index ba9ab98..3fe1800 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -265,7 +265,7 @@ DeleteChainTable(
     ChainEntry *cPtr;
 
     for (cPtr=dict->entryChainHead ; cPtr!=NULL ; cPtr=cPtr->nextPtr) {
-	Tcl_Obj *valuePtr = Tcl_GetHashValue(&cPtr->entry);
+	Tcl_Obj *valuePtr = (Tcl_Obj *)Tcl_GetHashValue(&cPtr->entry);
 
 	TclDecrRefCount(valuePtr);
     }
@@ -312,7 +312,7 @@ DeleteChainEntry(
     if (cPtr == NULL) {
 	return 0;
     } else {
-	Tcl_Obj *valuePtr = Tcl_GetHashValue(&cPtr->entry);
+	Tcl_Obj *valuePtr = (Tcl_Obj *)Tcl_GetHashValue(&cPtr->entry);
 
 	TclDecrRefCount(valuePtr);
     }
@@ -364,7 +364,7 @@ DupDictInternalRep(
     Tcl_Obj *copyPtr)
 {
     Dict *oldDict = DICT(srcPtr);
-    Dict *newDict = ckalloc(sizeof(Dict));
+    Dict *newDict = (Dict *)ckalloc(sizeof(Dict));
     ChainEntry *cPtr;
 
     /*
@@ -373,8 +373,8 @@ DupDictInternalRep(
 
     InitChainTable(newDict);
     for (cPtr=oldDict->entryChainHead ; cPtr!=NULL ; cPtr=cPtr->nextPtr) {
-	Tcl_Obj *key = Tcl_GetHashKey(&oldDict->table, &cPtr->entry);
-	Tcl_Obj *valuePtr = Tcl_GetHashValue(&cPtr->entry);
+	Tcl_Obj *key = (Tcl_Obj *)Tcl_GetHashKey(&oldDict->table, &cPtr->entry);
+	Tcl_Obj *valuePtr = (Tcl_Obj *)Tcl_GetHashValue(&cPtr->entry);
 	int n;
 	Tcl_HashEntry *hPtr = CreateChainEntry(newDict, key, &n);
 
@@ -492,7 +492,8 @@ UpdateStringOfDict(
     Dict *dict = DICT(dictPtr);
     ChainEntry *cPtr;
     Tcl_Obj *keyPtr, *valuePtr;
-    int i, length, bytesNeeded = 0;
+    int i, length;
+    unsigned int bytesNeeded = 0;
     const char *elem;
     char *dst;
 
@@ -517,7 +518,7 @@ UpdateStringOfDict(
     if (numElems <= LOCAL_SIZE) {
 	flagPtr = localFlags;
     } else {
-	flagPtr = ckalloc(numElems);
+	flagPtr = (char *)ckalloc(numElems);
     }
     for (i=0,cPtr=dict->entryChainHead; i<numElems; i+=2,cPtr=cPtr->nextPtr) {
 	/*
@@ -526,22 +527,22 @@ UpdateStringOfDict(
 	 */
 
 	flagPtr[i] = ( i ? TCL_DONT_QUOTE_HASH : 0 );
-	keyPtr = Tcl_GetHashKey(&dict->table, &cPtr->entry);
+	keyPtr = (Tcl_Obj *)Tcl_GetHashKey(&dict->table, &cPtr->entry);
 	elem = TclGetStringFromObj(keyPtr, &length);
 	bytesNeeded += TclScanElement(elem, length, flagPtr+i);
-	if (bytesNeeded < 0) {
+	if (bytesNeeded > INT_MAX) {
 	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
 	}
 
 	flagPtr[i+1] = TCL_DONT_QUOTE_HASH;
-	valuePtr = Tcl_GetHashValue(&cPtr->entry);
+	valuePtr = (Tcl_Obj *)Tcl_GetHashValue(&cPtr->entry);
 	elem = TclGetStringFromObj(valuePtr, &length);
 	bytesNeeded += TclScanElement(elem, length, flagPtr+i+1);
-	if (bytesNeeded < 0) {
+	if (bytesNeeded > INT_MAX) {
 	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
 	}
     }
-    if (bytesNeeded > INT_MAX - numElems + 1) {
+    if (bytesNeeded + numElems > INT_MAX + 1U) {
 	Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
     }
     bytesNeeded += numElems;
@@ -555,13 +556,13 @@ UpdateStringOfDict(
     dst = dictPtr->bytes;
     for (i=0,cPtr=dict->entryChainHead; i<numElems; i+=2,cPtr=cPtr->nextPtr) {
 	flagPtr[i] |= ( i ? TCL_DONT_QUOTE_HASH : 0 );
-	keyPtr = Tcl_GetHashKey(&dict->table, &cPtr->entry);
+	keyPtr = (Tcl_Obj *)Tcl_GetHashKey(&dict->table, &cPtr->entry);
 	elem = TclGetStringFromObj(keyPtr, &length);
 	dst += TclConvertElement(elem, length, dst, flagPtr[i]);
 	*dst++ = ' ';
 
 	flagPtr[i+1] |= TCL_DONT_QUOTE_HASH;
-	valuePtr = Tcl_GetHashValue(&cPtr->entry);
+	valuePtr = (Tcl_Obj *)Tcl_GetHashValue(&cPtr->entry);
 	elem = TclGetStringFromObj(valuePtr, &length);
 	dst += TclConvertElement(elem, length, dst, flagPtr[i+1]);
 	*dst++ = ' ';
@@ -600,7 +601,7 @@ SetDictFromAny(
 {
     Tcl_HashEntry *hPtr;
     int isNew;
-    Dict *dict = ckalloc(sizeof(Dict));
+    Dict *dict = (Dict *)ckalloc(sizeof(Dict));
 
     InitChainTable(dict);
 
@@ -625,7 +626,7 @@ SetDictFromAny(
 	    /* Store key and value in the hash table we're building. */
 	    hPtr = CreateChainEntry(dict, objv[i], &isNew);
 	    if (!isNew) {
-		Tcl_Obj *discardedValue = Tcl_GetHashValue(hPtr);
+		Tcl_Obj *discardedValue = (Tcl_Obj *)Tcl_GetHashValue(hPtr);
 
 		/*
 		 * Not really a well-formed dictionary as there are duplicate
@@ -690,7 +691,7 @@ SetDictFromAny(
 	    /* Store key and value in the hash table we're building. */
 	    hPtr = CreateChainEntry(dict, keyPtr, &isNew);
 	    if (!isNew) {
-		Tcl_Obj *discardedValue = Tcl_GetHashValue(hPtr);
+		Tcl_Obj *discardedValue = (Tcl_Obj *)Tcl_GetHashValue(hPtr);
 
 		TclDecrRefCount(keyPtr);
 		TclDecrRefCount(discardedValue);
@@ -809,7 +810,7 @@ TclTraceDictPath(
 	    Tcl_IncrRefCount(tmpObj);
 	    Tcl_SetHashValue(hPtr, tmpObj);
 	} else {
-	    tmpObj = Tcl_GetHashValue(hPtr);
+	    tmpObj = (Tcl_Obj *)Tcl_GetHashValue(hPtr);
 	    if (tmpObj->typePtr != &tclDictType
 		    && SetDictFromAny(interp, tmpObj) != TCL_OK) {
 		return NULL;
@@ -919,7 +920,7 @@ Tcl_DictObjPut(
     hPtr = CreateChainEntry(dict, keyPtr, &isNew);
     Tcl_IncrRefCount(valuePtr);
     if (!isNew) {
-	Tcl_Obj *oldValuePtr = Tcl_GetHashValue(hPtr);
+	Tcl_Obj *oldValuePtr = (Tcl_Obj *)Tcl_GetHashValue(hPtr);
 
 	TclDecrRefCount(oldValuePtr);
     }
@@ -969,7 +970,7 @@ Tcl_DictObjGet(
     if (hPtr == NULL) {
 	*valuePtrPtr = NULL;
     } else {
-	*valuePtrPtr = Tcl_GetHashValue(hPtr);
+	*valuePtrPtr = (Tcl_Obj *)Tcl_GetHashValue(hPtr);
     }
     return TCL_OK;
 }
@@ -1115,10 +1116,10 @@ Tcl_DictObjFirst(
 	searchPtr->next = cPtr->nextPtr;
 	dict->refCount++;
 	if (keyPtrPtr != NULL) {
-	    *keyPtrPtr = Tcl_GetHashKey(&dict->table, &cPtr->entry);
+	    *keyPtrPtr = (Tcl_Obj *)Tcl_GetHashKey(&dict->table, &cPtr->entry);
 	}
 	if (valuePtrPtr != NULL) {
-	    *valuePtrPtr = Tcl_GetHashValue(&cPtr->entry);
+	    *valuePtrPtr = (Tcl_Obj *)Tcl_GetHashValue(&cPtr->entry);
 	}
     }
     return TCL_OK;
@@ -1181,7 +1182,7 @@ Tcl_DictObjNext(
 	Tcl_Panic("concurrent dictionary modification and search");
     }
 
-    cPtr = searchPtr->next;
+    cPtr = (ChainEntry *)searchPtr->next;
     if (cPtr == NULL) {
 	Tcl_DictObjDone(searchPtr);
 	*donePtr = 1;
@@ -1191,11 +1192,11 @@ Tcl_DictObjNext(
     searchPtr->next = cPtr->nextPtr;
     *donePtr = 0;
     if (keyPtrPtr != NULL) {
-	*keyPtrPtr = Tcl_GetHashKey(
+	*keyPtrPtr = (Tcl_Obj *)Tcl_GetHashKey(
 		&((Dict *)searchPtr->dictionaryPtr)->table, &cPtr->entry);
     }
     if (valuePtrPtr != NULL) {
-	*valuePtrPtr = Tcl_GetHashValue(&cPtr->entry);
+	*valuePtrPtr = (Tcl_Obj *)Tcl_GetHashValue(&cPtr->entry);
     }
 }
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 63fcf62..8c3efb5 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3146,7 +3146,7 @@ MODULE_SCOPE void	TclRemoveScriptLimitCallbacks(Tcl_Interp *interp);
 MODULE_SCOPE int	TclReToGlob(Tcl_Interp *interp, const char *reStr,
 			    int reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
 			    int *quantifiersFoundPtr);
-MODULE_SCOPE int	TclScanElement(const char *string, int length,
+MODULE_SCOPE unsigned int TclScanElement(const char *string, int length,
 			    char *flagPtr);
 MODULE_SCOPE void	TclSetBgErrorHandler(Tcl_Interp *interp,
 			    Tcl_Obj *cmdPrefix);
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 88a332f..a994fd7 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -1945,7 +1945,8 @@ UpdateStringOfList(
     char localFlags[LOCAL_SIZE], *flagPtr = NULL;
     List *listRepPtr = ListRepPtr(listPtr);
     int numElems = listRepPtr->elemCount;
-    int i, length, bytesNeeded = 0;
+    int i, length;
+    unsigned int bytesNeeded = 0;
     const char *elem;
     char *dst;
     Tcl_Obj **elemPtrs;
@@ -1986,11 +1987,11 @@ UpdateStringOfList(
 	flagPtr[i] = (i ? TCL_DONT_QUOTE_HASH : 0);
 	elem = TclGetStringFromObj(elemPtrs[i], &length);
 	bytesNeeded += TclScanElement(elem, length, flagPtr+i);
-	if (bytesNeeded < 0) {
+	if (bytesNeeded > INT_MAX) {
 	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
 	}
     }
-    if (bytesNeeded > INT_MAX - numElems + 1) {
+    if (bytesNeeded + numElems > INT_MAX + 1U) {
 	Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
     }
     bytesNeeded += numElems;
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 8d2347b..cacd23e 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1010,7 +1010,7 @@ Tcl_ScanCountedElement(
  *----------------------------------------------------------------------
  */
 
-int
+unsigned int
 TclScanElement(
     const char *src,		/* String to convert to Tcl list element. */
     int length,			/* Number of bytes in src, or -1. */
@@ -1026,7 +1026,7 @@ TclScanElement(
     int extra = 0;		/* Count of number of extra bytes needed for
 				 * formatted element, assuming we use escape
 				 * sequences in formatting. */
-    int bytesNeeded;		/* Buffer length computed to complete the
+    unsigned int bytesNeeded;		/* Buffer length computed to complete the
 				 * element formatting in the selected mode. */
 #if COMPAT
     int preferEscape = 0;	/* Use preferences to track whether to use */
@@ -1290,7 +1290,7 @@ TclScanElement(
     *flagPtr = CONVERT_NONE;
 
   overflowCheck:
-    if (bytesNeeded < 0) {
+    if (bytesNeeded > INT_MAX) {
 	Tcl_Panic("TclScanElement: string length overflow");
     }
     return bytesNeeded;
@@ -1568,7 +1568,8 @@ Tcl_Merge(
 {
 #define LOCAL_SIZE 64
     char localFlags[LOCAL_SIZE], *flagPtr = NULL;
-    int i, bytesNeeded = 0;
+    int i;
+    unsigned int bytesNeeded = 0;
     char *result, *dst;
 
     /*
@@ -1594,11 +1595,11 @@ Tcl_Merge(
     for (i = 0; i < argc; i++) {
 	flagPtr[i] = ( i ? TCL_DONT_QUOTE_HASH : 0 );
 	bytesNeeded += TclScanElement(argv[i], -1, &flagPtr[i]);
-	if (bytesNeeded < 0) {
+	if (bytesNeeded > INT_MAX) {
 	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
 	}
     }
-    if (bytesNeeded > INT_MAX - argc + 1) {
+    if (bytesNeeded + argc > INT_MAX + 1U) {
 	Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
     }
     bytesNeeded += argc;
-- 
cgit v0.12


From 9dd5a63f35590c88db321bf5f70429c61ed5a3b5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 6 Oct 2022 13:12:11 +0000
Subject: TIP #640: Remove Tcl_SaveResult (in Tcl 8.7 it's only removed when
 compiled with -DTCL_NO_DEPRECATED)

---
 doc/SaveInterpState.3                | 85 ++++++++++++++++++++++++++++++++++++
 doc/SaveResult.3                     | 85 ------------------------------------
 generic/tcl.h                        |  2 +
 generic/tclDecls.h                   | 29 +++---------
 generic/tclTest.c                    |  8 ++++
 macosx/Tcl.xcodeproj/project.pbxproj |  4 +-
 win/tcl.dsp                          |  2 +-
 7 files changed, 105 insertions(+), 110 deletions(-)
 create mode 100644 doc/SaveInterpState.3
 delete mode 100644 doc/SaveResult.3

diff --git a/doc/SaveInterpState.3 b/doc/SaveInterpState.3
new file mode 100644
index 0000000..804f9ec
--- /dev/null
+++ b/doc/SaveInterpState.3
@@ -0,0 +1,85 @@
+'\"
+'\" Copyright (c) 1997 Sun Microsystems, Inc.
+'\" Contributions from Don Porter, NIST, 2004. (not subject to US copyright)
+'\" Copyright (c) 2018 Nathan Coulter.
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+'\"
+.TH Tcl_SaveResult 3 8.1 Tcl "Tcl Library Procedures"
+.so man.macros
+.BS
+.SH NAME
+Tcl_SaveInterpState, Tcl_RestoreInterpState, Tcl_DiscardInterpState,
+Tcl_SaveResult, Tcl_RestoreResult, Tcl_DiscardResult \- Save and restore the
+state of an an interpreter.
+.SH SYNOPSIS
+.nf
+\fB#include <tcl.h>\fR
+.sp
+Tcl_InterpState
+\fBTcl_SaveInterpState\fR(\fIinterp, status\fR)
+.sp
+int
+\fBTcl_RestoreInterpState\fR(\fIinterp, state\fR)
+.sp
+\fBTcl_DiscardInterpState\fR(\fIstate\fR)
+.sp
+\fBTcl_SaveResult\fR(\fIinterp, savedPtr\fR)
+.sp
+\fBTcl_RestoreResult\fR(\fIinterp, savedPtr\fR)
+.sp
+\fBTcl_DiscardResult\fR(\fIsavedPtr\fR)
+.SH ARGUMENTS
+.AS Tcl_InterpState savedPtr
+.AP Tcl_Interp *interp in
+The interpreter for the operation.
+.AP int status in
+The return code for the state.
+.AP Tcl_InterpState state in
+A token for saved state.
+.AP Tcl_SavedResult *savedPtr in
+A pointer to storage for saved state.
+.BE
+.SH DESCRIPTION
+.PP
+These routines save the state of an interpreter before a call to a routine such
+as \fBTcl_Eval\fR, and restore the state afterwards.
+.PP
+\fBTcl_SaveInterpState\fR saves the parts of \fIinterp\fR that comprise the
+result of a script, including the resulting value, the return code passed as
+\fIstatus\fR, and any options such as \fB\-errorinfo\fR and \fB\-errorcode\fR.
+It returns a token for the saved state.  The interpreter result is not reset
+and no interpreter state is changed.
+.PP
+\fBTcl_RestoreInterpState\fR restores the state indicated by \fIstate\fR and
+returns the \fIstatus\fR originally passed in the corresponding call to
+\fBTcl_SaveInterpState\fR.
+.PP
+If a saved state is not restored, \fBTcl_DiscardInterpState\fR must be called
+to release it.  A token used to discard or restore state must not be used
+again.
+.PP
+\fBTcl_SaveResult\fR, \fBTcl_RestoreResult\fR, and \fBTcl_DiscardResult\fR are
+deprecated.  Instead use \fBTcl_SaveInterpState\fR,
+\fBTcl_RestoreInterpState\fR, and \fBTcl_DiscardInterpState\fR, which are more
+capable.
+.PP
+\fBTcl_SaveResult\fR moves the result of \fIinterp\fR to the location
+\fIstatePtr\fR points to and returns the interpreter result to its initial
+state.  It does not save options such as \fB\-errorcode\fR or
+\fB\-errorinfo\fR.
+.PP
+\fBTcl_RestoreResult\fR clears any existing result or error in \fIinterp\fR and
+moves the result from \fIstatePtr\fR back to \fIinterp\fR.  \fIstatePtr\fR is
+then in an undefined state and must not be used until passed again to
+\fBTcl_SaveResult\fR.
+.PP
+\fBTcl_DiscardResult\fR releases the state stored at \fBstatePtr\fR, which is
+then in an undefined state and must not be used until passed again to
+\fBTcl_SaveResult\fR.
+.PP
+If a saved result is not restored, \fBTcl_DiscardResult\fR must be called to
+release it.
+.SH KEYWORDS
+result, state, interp
diff --git a/doc/SaveResult.3 b/doc/SaveResult.3
deleted file mode 100644
index 804f9ec..0000000
--- a/doc/SaveResult.3
+++ /dev/null
@@ -1,85 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\" Contributions from Don Porter, NIST, 2004. (not subject to US copyright)
-'\" Copyright (c) 2018 Nathan Coulter.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-.TH Tcl_SaveResult 3 8.1 Tcl "Tcl Library Procedures"
-.so man.macros
-.BS
-.SH NAME
-Tcl_SaveInterpState, Tcl_RestoreInterpState, Tcl_DiscardInterpState,
-Tcl_SaveResult, Tcl_RestoreResult, Tcl_DiscardResult \- Save and restore the
-state of an an interpreter.
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_InterpState
-\fBTcl_SaveInterpState\fR(\fIinterp, status\fR)
-.sp
-int
-\fBTcl_RestoreInterpState\fR(\fIinterp, state\fR)
-.sp
-\fBTcl_DiscardInterpState\fR(\fIstate\fR)
-.sp
-\fBTcl_SaveResult\fR(\fIinterp, savedPtr\fR)
-.sp
-\fBTcl_RestoreResult\fR(\fIinterp, savedPtr\fR)
-.sp
-\fBTcl_DiscardResult\fR(\fIsavedPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_InterpState savedPtr
-.AP Tcl_Interp *interp in
-The interpreter for the operation.
-.AP int status in
-The return code for the state.
-.AP Tcl_InterpState state in
-A token for saved state.
-.AP Tcl_SavedResult *savedPtr in
-A pointer to storage for saved state.
-.BE
-.SH DESCRIPTION
-.PP
-These routines save the state of an interpreter before a call to a routine such
-as \fBTcl_Eval\fR, and restore the state afterwards.
-.PP
-\fBTcl_SaveInterpState\fR saves the parts of \fIinterp\fR that comprise the
-result of a script, including the resulting value, the return code passed as
-\fIstatus\fR, and any options such as \fB\-errorinfo\fR and \fB\-errorcode\fR.
-It returns a token for the saved state.  The interpreter result is not reset
-and no interpreter state is changed.
-.PP
-\fBTcl_RestoreInterpState\fR restores the state indicated by \fIstate\fR and
-returns the \fIstatus\fR originally passed in the corresponding call to
-\fBTcl_SaveInterpState\fR.
-.PP
-If a saved state is not restored, \fBTcl_DiscardInterpState\fR must be called
-to release it.  A token used to discard or restore state must not be used
-again.
-.PP
-\fBTcl_SaveResult\fR, \fBTcl_RestoreResult\fR, and \fBTcl_DiscardResult\fR are
-deprecated.  Instead use \fBTcl_SaveInterpState\fR,
-\fBTcl_RestoreInterpState\fR, and \fBTcl_DiscardInterpState\fR, which are more
-capable.
-.PP
-\fBTcl_SaveResult\fR moves the result of \fIinterp\fR to the location
-\fIstatePtr\fR points to and returns the interpreter result to its initial
-state.  It does not save options such as \fB\-errorcode\fR or
-\fB\-errorinfo\fR.
-.PP
-\fBTcl_RestoreResult\fR clears any existing result or error in \fIinterp\fR and
-moves the result from \fIstatePtr\fR back to \fIinterp\fR.  \fIstatePtr\fR is
-then in an undefined state and must not be used until passed again to
-\fBTcl_SaveResult\fR.
-.PP
-\fBTcl_DiscardResult\fR releases the state stored at \fBstatePtr\fR, which is
-then in an undefined state and must not be used until passed again to
-\fBTcl_SaveResult\fR.
-.PP
-If a saved result is not restored, \fBTcl_DiscardResult\fR must be called to
-release it.
-.SH KEYWORDS
-result, state, interp
diff --git a/generic/tcl.h b/generic/tcl.h
index f17d43e..c8a76c5 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -817,6 +817,7 @@ typedef struct Tcl_Obj {
  * typically allocated on the stack.
  */
 
+#ifndef TCL_NO_DEPRECATED
 typedef struct Tcl_SavedResult {
     char *result;
     Tcl_FreeProc *freeProc;
@@ -826,6 +827,7 @@ typedef struct Tcl_SavedResult {
     int appendUsed;
     char resultSpace[200+1];
 } Tcl_SavedResult;
+#endif
 
 /*
  *----------------------------------------------------------------------------
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 25adc95..62b9604 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -14,6 +14,10 @@
 
 #include <stddef.h> /* for size_t */
 
+#ifdef TCL_NO_DEPRECATED
+#   define Tcl_SavedResult void
+#endif /* TCL_NO_DEPRECATED */
+
 #undef TCL_STORAGE_CLASS
 #ifdef BUILD_tcl
 #   define TCL_STORAGE_CLASS DLLEXPORT
@@ -4231,30 +4235,8 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GlobalEval(interp, objPtr) \
 	Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL)
 #undef Tcl_SaveResult
-static TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {}
-#define Tcl_SaveResult(interp, statePtr) \
-	do { \
-	    Tcl_SaveResult_(); \
-	    (statePtr)->objResultPtr = Tcl_GetObjResult(interp); \
-	    Tcl_IncrRefCount((statePtr)->objResultPtr); \
-	    Tcl_SetObjResult(interp, Tcl_NewObj()); \
-	} while(0)
 #undef Tcl_RestoreResult
-static TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {}
-#define Tcl_RestoreResult(interp, statePtr) \
-	do { \
-	    Tcl_RestoreResult_(); \
-	    Tcl_ResetResult(interp); \
-   	    Tcl_SetObjResult(interp, (statePtr)->objResultPtr); \
-   	    Tcl_DecrRefCount((statePtr)->objResultPtr); \
-	} while(0)
 #undef Tcl_DiscardResult
-static TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {}
-#define Tcl_DiscardResult(statePtr) \
-	do { \
-	    Tcl_DiscardResult_(); \
-	    Tcl_DecrRefCount((statePtr)->objResultPtr); \
-	} while(0)
 #undef Tcl_SetResult
 #define Tcl_SetResult(interp, result, freeProc) \
 	do { \
@@ -4492,6 +4474,9 @@ static TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(
  * Deprecated Tcl procedures:
  */
 
+#ifdef TCL_NO_DEPRECATED
+#   undef Tcl_SavedResult
+#endif /* TCL_NO_DEPRECATED */
 #undef Tcl_EvalObj
 #define Tcl_EvalObj(interp, objPtr) \
     Tcl_EvalObjEx(interp, objPtr, 0)
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 354ea9c..95f4d2f 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -145,7 +145,9 @@ typedef struct {
  * was called for a result.
  */
 
+#ifndef TCL_NO_DEPRECATED
 static int freeCount;
+#endif /* TCL_NO_DEPRECATED */
 
 /*
  * Boolean flag used by the "testsetmainloop" and "testexitmainloop" commands.
@@ -297,8 +299,10 @@ static Tcl_ObjCmdProc	TestregexpObjCmd;
 static Tcl_ObjCmdProc	TestreturnObjCmd;
 static void		TestregexpXflags(const char *string,
 			    int length, int *cflagsPtr, int *eflagsPtr);
+#ifndef TCL_NO_DEPRECATED
 static Tcl_ObjCmdProc	TestsaveresultCmd;
 static void		TestsaveresultFree(char *blockPtr);
+#endif /* TCL_NO_DEPRECATED */
 static Tcl_CmdProc	TestsetassocdataCmd;
 static Tcl_CmdProc	TestsetCmd;
 static Tcl_CmdProc	Testset2Cmd;
@@ -690,8 +694,10 @@ Tcltest_Init(
 	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testreturn", TestreturnObjCmd,
 	    NULL, NULL);
+#ifndef TCL_NO_DEPRECATED
     Tcl_CreateObjCommand(interp, "testsaveresult", TestsaveresultCmd,
 	    NULL, NULL);
+#endif
     Tcl_CreateCommand(interp, "testservicemode", TestServiceModeCmd,
 	    NULL, NULL);
     Tcl_CreateCommand(interp, "testsetassocdata", TestsetassocdataCmd,
@@ -5522,6 +5528,7 @@ Testset2Cmd(
  *----------------------------------------------------------------------
  */
 
+#ifndef TCL_NO_DEPRECATED
 static int
 TestsaveresultCmd(
     TCL_UNUSED(void *),
@@ -5635,6 +5642,7 @@ TestsaveresultFree(
 {
     freeCount++;
 }
+#endif /* TCL_NO_DEPRECATED */
 
 /*
  *----------------------------------------------------------------------
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 90896e2..4143128 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -376,7 +376,7 @@
 		F96D3E9108F272A6004A47F5 /* rename.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = rename.n; sourceTree = "<group>"; };
 		F96D3E9208F272A6004A47F5 /* return.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = return.n; sourceTree = "<group>"; };
 		F96D3E9308F272A6004A47F5 /* safe.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = safe.n; sourceTree = "<group>"; };
-		F96D3E9408F272A6004A47F5 /* SaveResult.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = SaveResult.3; sourceTree = "<group>"; };
+		F96D3E9408F272A6004A47F5 /* SaveInterpState.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = SaveInterpState.3; sourceTree = "<group>"; };
 		F96D3E9508F272A6004A47F5 /* scan.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = scan.n; sourceTree = "<group>"; };
 		F96D3E9608F272A6004A47F5 /* seek.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = seek.n; sourceTree = "<group>"; };
 		F96D3E9708F272A6004A47F5 /* set.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = set.n; sourceTree = "<group>"; };
@@ -1123,7 +1123,7 @@
 				F96D3E9108F272A6004A47F5 /* rename.n */,
 				F96D3E9208F272A6004A47F5 /* return.n */,
 				F96D3E9308F272A6004A47F5 /* safe.n */,
-				F96D3E9408F272A6004A47F5 /* SaveResult.3 */,
+				F96D3E9408F272A6004A47F5 /* SaveInterpState.3 */,
 				F96D3E9508F272A6004A47F5 /* scan.n */,
 				F96D3E9608F272A6004A47F5 /* seek.n */,
 				F93599D80DF1F98300E04F67 /* self.n */,
diff --git a/win/tcl.dsp b/win/tcl.dsp
index cc9d173..aff1000 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -760,7 +760,7 @@ SOURCE=..\doc\safe.n
 # End Source File
 # Begin Source File
 
-SOURCE=..\doc\SaveResult.3
+SOURCE=..\doc\SaveInterpState.3
 # End Source File
 # Begin Source File
 
-- 
cgit v0.12


From 6f2284ab12177714d29ad979fa1f1420e61f836b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 7 Oct 2022 10:18:33 +0000
Subject: Follow-up to [1599352cca]: Tcl_Merge(): out-of-bounds write, more
 signed integer overflow. Better panic message when argc < 0.

---
 generic/tclUtil.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index cacd23e..a8bf795 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1577,7 +1577,10 @@ Tcl_Merge(
      * simpler.
      */
 
-    if (argc == 0) {
+    if (argc <= 0) {
+	if (argc < 0) {
+	    Tcl_Panic("Tcl_Merge called with negative argc (%d)", argc);
+	}
 	result = (char *)ckalloc(1);
 	result[0] = '\0';
 	return result;
-- 
cgit v0.12


From 948f556e5200e88aa563402d1f0ad7019d0c291b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 7 Oct 2022 11:02:05 +0000
Subject: More -1 -> TCL_INDEX_NONE

---
 generic/tclUtil.c | 131 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 2b1305c..f10187b 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -375,10 +375,10 @@ static const Tcl_ObjType endOffsetType = {
  *
  *	Given 'bytes' pointing to 'numBytes' bytes, scan through them and
  *	count the number of whitespace runs that could be list element
- *	separators. If 'numBytes' is -1, scan to the terminating '\0'. Not a
- *	full list parser. Typically used to get a quick and dirty overestimate
- *	of length size in order to allocate space for an actual list parser to
- *	operate with.
+ *	separators. If 'numBytes' is TCL_INDEX_NONE, scan to the terminating
+ *	'\0'. Not a full list parser. Typically used to get a quick and dirty
+ *	overestimate of length size in order to allocate space for an actual
+ *	list parser to operate with.
  *
  * Results:
  *	Returns the largest number of list elements that could possibly be in
@@ -399,7 +399,7 @@ TclMaxListLength(
 {
     int count = 0;
 
-    if ((numBytes == 0) || ((numBytes == -1) && (*bytes == '\0'))) {
+    if ((numBytes == 0) || ((numBytes == TCL_INDEX_NONE) && (*bytes == '\0'))) {
 	/* Empty string case - quick exit */
 	goto done;
     }
@@ -415,7 +415,7 @@ TclMaxListLength(
      */
 
     while (numBytes) {
-	if ((numBytes == -1) && (*bytes == '\0')) {
+	if ((numBytes == TCL_INDEX_NONE) && (*bytes == '\0')) {
 	    break;
 	}
 	if (TclIsSpaceProcM(*bytes)) {
@@ -426,9 +426,9 @@ TclMaxListLength(
 	    count++;
 	    do {
 		bytes++;
-		numBytes -= (numBytes != -1);
+		numBytes -= (numBytes != TCL_INDEX_NONE);
 	    } while (numBytes && TclIsSpaceProcM(*bytes));
-	    if ((numBytes == 0) || ((numBytes == -1) && (*bytes == '\0'))) {
+	    if ((numBytes == 0) || ((numBytes == TCL_INDEX_NONE) && (*bytes == '\0'))) {
 		break;
 	    }
 
@@ -437,7 +437,7 @@ TclMaxListLength(
 	     */
 	}
 	bytes++;
-	numBytes -= (numBytes != -1);
+	numBytes -= (numBytes != TCL_INDEX_NONE);
     }
 
     /*
@@ -874,7 +874,7 @@ Tcl_SplitList(
      * string gets re-purposed to hold '\0' characters in the argv array.
      */
 
-    size = TclMaxListLength(list, -1, &end) + 1;
+    size = TclMaxListLength(list, TCL_INDEX_NONE, &end) + 1;
     length = end - list;
     argv = (const char **)ckalloc((size * sizeof(char *)) + length + 1);
 
@@ -897,7 +897,7 @@ Tcl_SplitList(
 	    ckfree(argv);
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"internal error in Tcl_SplitList", -1));
+			"internal error in Tcl_SplitList", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "INTERNAL", "Tcl_SplitList",
 			NULL);
 	    }
@@ -945,9 +945,9 @@ int
 Tcl_ScanElement(
     const char *src,	/* String to convert to list element. */
     int *flagPtr)	/* Where to store information to guide
-				 * Tcl_ConvertCountedElement. */
+			 * Tcl_ConvertCountedElement. */
 {
-    return Tcl_ScanCountedElement(src, -1, flagPtr);
+    return Tcl_ScanCountedElement(src, TCL_INDEX_NONE, flagPtr);
 }
 
 /*
@@ -958,8 +958,8 @@ Tcl_ScanElement(
  *	This function is a companion function to Tcl_ConvertCountedElement. It
  *	scans a string to see what needs to be done to it (e.g. add
  *	backslashes or enclosing braces) to make the string into a valid Tcl
- *	list element. If length is -1, then the string is scanned from src up
- *	to the first null byte.
+ *	list element. If length is TCL_INDEX_NONE, then the string is scanned
+ *	from src up to the first null byte.
  *
  * Results:
  *	The return value is an overestimate of the number of bytes that will
@@ -976,7 +976,7 @@ Tcl_ScanElement(
 int
 Tcl_ScanCountedElement(
     const char *src,		/* String to convert to Tcl list element. */
-    int length,			/* Number of bytes in src, or -1. */
+    int length,			/* Number of bytes in src, or TCL_INDEX_NONE. */
     int *flagPtr)		/* Where to store information to guide
 				 * Tcl_ConvertElement. */
 {
@@ -995,7 +995,7 @@ Tcl_ScanCountedElement(
  *	This function is a companion function to TclConvertElement. It scans a
  *	string to see what needs to be done to it (e.g. add backslashes or
  *	enclosing braces) to make the string into a valid Tcl list element. If
- *	length is -1, then the string is scanned from src up to the first null
+ *	length is TCL_INDEX_NONE, then the string is scanned from src up to the first null
  *	byte. A NULL value for src is treated as an empty string. The incoming
  *	value of *flagPtr is a report from the caller what additional flags it
  *	will pass to TclConvertElement().
@@ -1017,10 +1017,10 @@ Tcl_ScanCountedElement(
  *----------------------------------------------------------------------
  */
 
-unsigned int
+TCL_HASH_TYPE
 TclScanElement(
     const char *src,		/* String to convert to Tcl list element. */
-    int length,			/* Number of bytes in src, or -1. */
+    int length,			/* Number of bytes in src, or TCL_INDEX_NONE. */
     char *flagPtr)		/* Where to store information to guide
 				 * Tcl_ConvertElement. */
 {
@@ -1033,7 +1033,7 @@ TclScanElement(
     int extra = 0;		/* Count of number of extra bytes needed for
 				 * formatted element, assuming we use escape
 				 * sequences in formatting. */
-    unsigned int bytesNeeded;		/* Buffer length computed to complete the
+    TCL_HASH_TYPE bytesNeeded;		/* Buffer length computed to complete the
 				 * element formatting in the selected mode. */
 #if COMPAT
     int preferEscape = 0;	/* Use preferences to track whether to use */
@@ -1041,7 +1041,7 @@ TclScanElement(
     int braceCount = 0;		/* Count of all braces '{' '}' seen. */
 #endif /* COMPAT */
 
-    if ((p == NULL) || (length == 0) || ((*p == '\0') && (length == -1))) {
+    if ((p == NULL) || (length == 0) || ((*p == '\0') && (length == TCL_INDEX_NONE))) {
 	/*
 	 * Empty string element must be brace quoted.
 	 */
@@ -1124,7 +1124,7 @@ TclScanElement(
 	    break;
 	case '\\':	/* TYPE_SUBS */
 	    extra++;				/* Escape '\' => '\\' */
-	    if ((length == 1) || ((length == -1) && (p[1] == '\0'))) {
+	    if ((length == 1) || ((length == TCL_INDEX_NONE) && (p[1] == '\0'))) {
 		/*
 		 * Final backslash. Cannot format with brace quoting.
 		 */
@@ -1155,7 +1155,7 @@ TclScanElement(
 #endif /* COMPAT */
 	    break;
 	case '\0':	/* TYPE_SUBS */
-	    if (length == -1) {
+	    if (length == TCL_INDEX_NONE) {
 		goto endOfString;
 	    }
 	    /* TODO: Panic on improper encoding? */
@@ -1330,7 +1330,7 @@ Tcl_ConvertElement(
     char *dst,		/* Place to put list-ified element. */
     int flags)		/* Flags produced by Tcl_ScanElement. */
 {
-    return Tcl_ConvertCountedElement(src, -1, dst, flags);
+    return Tcl_ConvertCountedElement(src, TCL_INDEX_NONE, dst, flags);
 }
 
 /*
@@ -1357,7 +1357,7 @@ Tcl_ConvertElement(
 int
 Tcl_ConvertCountedElement(
     const char *src,	/* Source information for list element. */
-    int length,			/* Number of bytes in src, or -1. */
+    int length,			/* Number of bytes in src, or TCL_INDEX_NONE. */
     char *dst,			/* Place to put list-ified element. */
     int flags)			/* Flags produced by Tcl_ScanElement. */
 {
@@ -1390,7 +1390,7 @@ Tcl_ConvertCountedElement(
 int
 TclConvertElement(
     const char *src,	/* Source information for list element. */
-    int length,			/* Number of bytes in src, or -1. */
+    int length,			/* Number of bytes in src, or TCL_INDEX_NONE. */
     char *dst,			/* Place to put list-ified element. */
     int flags)			/* Flags produced by Tcl_ScanElement. */
 {
@@ -1409,7 +1409,7 @@ TclConvertElement(
      * No matter what the caller demands, empty string must be braced!
      */
 
-    if ((src == NULL) || (length == 0) || (*src == '\0' && length == -1)) {
+    if ((src == NULL) || (length == 0) || (*src == '\0' && length == TCL_INDEX_NONE)) {
 	p[0] = '{';
 	p[1] = '}';
 	return 2;
@@ -1436,7 +1436,7 @@ TclConvertElement(
      */
 
     if (conversion == CONVERT_NONE) {
-	if (length == -1) {
+	if (length == TCL_INDEX_NONE) {
 	    /* TODO: INT_MAX overflow? */
 	    while (*src) {
 		*p++ = *src++;
@@ -1455,7 +1455,7 @@ TclConvertElement(
     if (conversion == CONVERT_BRACE) {
 	*p = '{';
 	p++;
-	if (length == -1) {
+	if (length == TCL_INDEX_NONE) {
 	    /* TODO: INT_MAX overflow? */
 	    while (*src) {
 		*p++ = *src++;
@@ -1528,7 +1528,7 @@ TclConvertElement(
 	    p++;
 	    continue;
 	case '\0':
-	    if (length == -1) {
+	    if (length == TCL_INDEX_NONE) {
 		return p - dst;
 	    }
 
@@ -1604,7 +1604,7 @@ Tcl_Merge(
     }
     for (i = 0; i < argc; i++) {
 	flagPtr[i] = ( i ? TCL_DONT_QUOTE_HASH : 0 );
-	bytesNeeded += TclScanElement(argv[i], -1, &flagPtr[i]);
+	bytesNeeded += TclScanElement(argv[i], TCL_INDEX_NONE, &flagPtr[i]);
 	if (bytesNeeded > INT_MAX) {
 	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
 	}
@@ -1622,7 +1622,7 @@ Tcl_Merge(
     dst = result;
     for (i = 0; i < argc; i++) {
 	flagPtr[i] |= ( i ? TCL_DONT_QUOTE_HASH : 0 );
-	dst += TclConvertElement(argv[i], -1, dst, flagPtr[i]);
+	dst += TclConvertElement(argv[i], TCL_INDEX_NONE, dst, flagPtr[i]);
 	*dst = ' ';
 	dst++;
     }
@@ -2665,8 +2665,8 @@ Tcl_DStringInit(
 char *
 Tcl_DStringAppend(
     Tcl_DString *dsPtr,		/* Structure describing dynamic string. */
-    const char *bytes,		/* String to append. If length is -1 then this
-				 * must be null-terminated. */
+    const char *bytes,		/* String to append. If length is
+				 * < 0 then this must be null-terminated. */
     int length)			/* Number of bytes from "bytes" to append. If
 				 * < 0, then append all of bytes, up to null
 				 * at end. */
@@ -2692,18 +2692,18 @@ Tcl_DStringAppend(
 	    memcpy(newString, dsPtr->string, dsPtr->length);
 	    dsPtr->string = newString;
 	} else {
-	    int offset = -1;
+	    int index = TCL_INDEX_NONE;
 
 	    /* See [16896d49fd] */
 	    if (bytes >= dsPtr->string
 		    && bytes <= dsPtr->string + dsPtr->length) {
-		offset = bytes - dsPtr->string;
+		index = bytes - dsPtr->string;
 	    }
 
 	    dsPtr->string = (char *)ckrealloc(dsPtr->string, dsPtr->spaceAvl);
 
-	    if (offset >= 0) {
-		bytes = dsPtr->string + offset;
+	    if (index >= 0) {
+		bytes = dsPtr->string + index;
 	    }
 	}
     }
@@ -2802,7 +2802,7 @@ Tcl_DStringAppendElement(
     if (!quoteHash) {
 	flags |= TCL_DONT_QUOTE_HASH;
     }
-    newSize = dsPtr->length + needSpace + TclScanElement(element, -1, &flags);
+    newSize = dsPtr->length + needSpace + TclScanElement(element, TCL_INDEX_NONE, &flags);
     if (!quoteHash) {
 	flags |= TCL_DONT_QUOTE_HASH;
     }
@@ -2851,7 +2851,7 @@ Tcl_DStringAppendElement(
 	dsPtr->length++;
     }
 
-    dsPtr->length += TclConvertElement(element, -1, dst, flags);
+    dsPtr->length += TclConvertElement(element, TCL_INDEX_NONE, dst, flags);
     dsPtr->string[dsPtr->length] = '\0';
     return dsPtr->string;
 }
@@ -3263,7 +3263,7 @@ Tcl_PrintDouble(
      */
 
     if (*precisionPtr == 0) {
-	digits = TclDoubleDigits(value, -1, TCL_DD_SHORTEST,
+	digits = TclDoubleDigits(value, TCL_INDEX_NONE, TCL_DD_SHORTEST,
 		&exponent, &signum, &end);
     } else {
 	/*
@@ -3637,11 +3637,11 @@ TclFormatInt(
 static int
 GetWideForIndex(
     Tcl_Interp *interp,         /* Interpreter to use for error reporting. If
-                                 * NULL, then no error message is left after
-                                 * errors. */
+				 * NULL, then no error message is left after
+				 * errors. */
     Tcl_Obj *objPtr,            /* Points to the value to be parsed */
     size_t endValue,            /* The value to be stored at *widePtr if
-                                 * objPtr holds "end".
+				 * objPtr holds "end".
                                  * NOTE: this value may be TCL_INDEX_NONE. */
     Tcl_WideInt *widePtr)       /* Location filled in with a wide integer
                                  * representing an index. */
@@ -3673,21 +3673,26 @@ GetWideForIndex(
  *
  * Tcl_GetIntForIndex --
  *
- *	This function returns an integer corresponding to the list index held
- *	in a Tcl object. The Tcl object's value is expected to be in the
- *	format integer([+-]integer)? or the format end([+-]integer)?.
+ *	Provides an integer corresponding to the list index held in a Tcl
+ *	object. The string value 'objPtr' is expected have the format
+ *	integer([+-]integer)? or end([+-]integer)?.
  *
- * Results:
- *	The return value is normally TCL_OK, which means that the index was
- *	successfully stored into the location referenced by "indexPtr". If the
- *	Tcl object referenced by "objPtr" has the value "end", the value
- *	stored is "endValue". If "objPtr"s values is not of one of the
- *	expected formats, TCL_ERROR is returned and, if "interp" is non-NULL,
- *	an error message is left in the interpreter's result object.
+ * Value
+ * 	TCL_OK
  *
- * Side effects:
- *	The object referenced by "objPtr" might be converted to an integer,
- *	wide integer, or end-based-index object.
+ * 	    The index is stored at the address given by by 'indexPtr'. If
+ * 	    'objPtr' has the value "end", the value stored is 'endValue'.
+ *
+ * 	TCL_ERROR
+ *
+ * 	    The value of 'objPtr' does not have one of the expected formats. If
+ * 	    'interp' is non-NULL, an error message is left in the interpreter's
+ * 	    result object.
+ *
+ * Effect
+ *
+ * 	The object referenced by 'objPtr' is converted, as needed, to an
+ * 	integer, wide integer, or end-based-index object.
  *
  *----------------------------------------------------------------------
  */
@@ -3711,7 +3716,7 @@ Tcl_GetIntForIndex(
     }
     if (indexPtr != NULL) {
 	if ((wide < 0) && (endValue >= 0)) {
-	    *indexPtr = -1;
+	    *indexPtr = TCL_INDEX_NONE;
 	} else if (wide > INT_MAX) {
 	    *indexPtr = INT_MAX;
 	} else if (wide < INT_MIN) {
@@ -3788,7 +3793,7 @@ GetEndOffsetFromObj(
 	     * Quick scan to see if multi-value list is even possible.
 	     * This relies on TclGetString() returning a NUL-terminated string.
 	     */
-	    if ((TclMaxListLength(bytes, -1, NULL) > 1)
+	    if ((TclMaxListLength(bytes, TCL_INDEX_NONE, NULL) > 1)
 
 		    /* If it's possible, do the full list parse. */
 	            && (TCL_OK == TclListObjLengthM(NULL, objPtr, &length))
@@ -3797,7 +3802,7 @@ GetEndOffsetFromObj(
 	    }
 
 	    /* Passed the list screen, so parse for index arithmetic expression */
-	    if (TCL_OK == TclParseNumber(NULL, objPtr, NULL, NULL, -1, &opPtr,
+	    if (TCL_OK == TclParseNumber(NULL, objPtr, NULL, NULL, TCL_INDEX_NONE, &opPtr,
 	            TCL_PARSE_INTEGER_ONLY)) {
 		Tcl_WideInt w1=0, w2=0;
 
@@ -3813,7 +3818,7 @@ GetEndOffsetFromObj(
 		    }
 
 		    if (TCL_OK == TclParseNumber(NULL, objPtr, NULL, opPtr + 1,
-			    -1, NULL, TCL_PARSE_INTEGER_ONLY)) {
+			    TCL_INDEX_NONE, NULL, TCL_PARSE_INTEGER_ONLY)) {
 			/* ... value concludes with second valid integer */
 
 			/* Save second integer as wide if possible */
@@ -4172,7 +4177,7 @@ TclCheckBadOctal(
 		 */
 
 		Tcl_AppendToObj(Tcl_GetObjResult(interp),
-			" (looks like invalid octal number)", -1);
+			" (looks like invalid octal number)", TCL_INDEX_NONE);
 	    }
 	    return 1;
 	}
@@ -4794,7 +4799,7 @@ TclReToGlob(
 
   invalidGlob:
     if (interp != NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "RE2GLOB", code, NULL);
     }
     Tcl_DStringFree(dsPtr);
-- 
cgit v0.12


From a9fba66be576e55d089b69f8531d514cdc05c61e Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 7 Oct 2022 11:23:18 +0000
Subject: Add memory leak/refcount tests for lists, spans and lseq

---
 generic/tclTestObj.c | 323 ++++++++++++++++++++++++++++++++++-----------------
 tests/listObj.test   |  68 +++++++++++
 2 files changed, 284 insertions(+), 107 deletions(-)

diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index a03a60a..93af3c0 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -841,6 +841,35 @@ TestintobjCmd(
  *	test a few possible corner cases in list object manipulation from
  *	C code that cannot occur at the Tcl level.
  *
+ *      Following new commands are added for 8.7 as regression tests for
+ *      memory leaks and use-after-free. Unlike 8.6, 8.7 has multiple internal
+ *      representations for lists.  It has to be ensured that corresponding
+ *      implementations obey the invariants of the C list API. The script
+ *      level tests do not suffice as Tcl list commands do not execute
+ *      the same exact code path as the exported C API.
+ *
+ *      Note these new commands are only useful when Tcl is compiled with 
+ *      TCL_MEM_DEBUG defined.
+ *
+ *	indexmemcheck - loops calling Tcl_ListObjIndex on each element. This
+ *	is to test that abstract lists returning elements do not depend
+ *	on caller to free them. The test case should check allocated counts
+ *      with the following sequence:
+ *            set before <get memory counts>
+ *            testobj set VARINDEX [list a b c] (or lseq etc.)
+ *            testlistobj indexnoop VARINDEX
+ *            testobj unset VARINDEX
+ *            set after <get memory counts>
+ *      after calling this command AND freeing the passed list. The targeted
+ *      bug is if Tcl_LOI returns a ephemeral Tcl_Obj with no other reference
+ *      resulting in a memory leak. Conversely, the command also checks
+ *      that the Tcl_Obj returned by Tcl_LOI does not have a zero reference
+ *      count since it is supposed to have at least one reference held
+ *      by the list implementation. Returns a message in interp otherwise.
+ *
+ *      getelementsmemcheck - as above but for Tcl_ListObjGetElements
+
+ *
  * Results:
  *	A standard Tcl object result.
  *
@@ -861,25 +890,36 @@ TestlistobjCmd(
     const char* subcommands[] = {
 	"set",
 	"get",
-	"replace"
+	"replace",
+	"indexmemcheck",
+	"getelementsmemcheck",
+	NULL
     };
     enum listobjCmdIndex {
 	LISTOBJ_SET,
 	LISTOBJ_GET,
-	LISTOBJ_REPLACE
+	LISTOBJ_REPLACE,
+	LISTOBJ_INDEXMEMCHECK,
+	LISTOBJ_GETELEMENTSMEMCHECK,
     } cmdIndex;
 
     size_t varIndex;		/* Variable number converted to binary */
     Tcl_WideInt first;			/* First index in the list */
     Tcl_WideInt count;			/* Count of elements in a list */
     Tcl_Obj **varPtr;
+    int i;
+#if TCL_VERSION_MAJOR < 9
+    int len;
+#else
+    size_t len;
+#endif
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg...?");
 	return TCL_ERROR;
     }
     varPtr = GetVarPtr(interp);
-	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
+    if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
 	return TCL_ERROR;
     }
     if (Tcl_GetIndexFromObj(interp, objv[1], subcommands, "command",
@@ -923,6 +963,58 @@ TestlistobjCmd(
 	Tcl_ResetResult(interp);
 	return Tcl_ListObjReplace(interp, varPtr[varIndex], first, count,
 				  objc-5, objv+5);
+
+    case LISTOBJ_INDEXMEMCHECK:
+	if (objc != 3) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "varIndex");
+	    return TCL_ERROR;
+	}
+	if (CheckIfVarUnset(interp, varPtr, varIndex)) {
+	    return TCL_ERROR;
+	}
+	if (Tcl_ListObjLength(interp, varPtr[varIndex], &len) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	for (i = 0; i < len; ++i) {
+	    Tcl_Obj *objP;
+	    if (Tcl_ListObjIndex(interp, varPtr[varIndex], i, &objP)
+		!= TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    if (objP->refCount <= 0) {
+		Tcl_SetResult(
+		    interp,
+		    "Tcl_ListObjIndex returned object with ref count <= 0",
+		    TCL_STATIC);
+		/* Keep looping since we are also looping for leaks */
+	    }
+	}
+	break;
+
+    case LISTOBJ_GETELEMENTSMEMCHECK:
+	if (objc != 3) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "varIndex");
+	    return TCL_ERROR;
+	}
+	if (CheckIfVarUnset(interp, varPtr, varIndex)) {
+	    return TCL_ERROR;
+	} else {
+	    Tcl_Obj **elems;
+	    if (Tcl_ListObjGetElements(interp, varPtr[varIndex], &len, &elems)
+		!= TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    for (i = 0; i < len; ++i) {
+		if (elems[i]->refCount <= 0) {
+		    Tcl_SetResult(
+			interp,
+			"Tcl_ListObjGetElements element has ref count <= 0",
+			TCL_STATIC);
+		    break;
+		}
+	    }
+	}
+	break;
     }
     return TCL_OK;
 }
@@ -953,9 +1045,21 @@ TestobjCmd(
 {
     size_t varIndex, destIndex;
     int i;
-    const char *subCmd;
     const Tcl_ObjType *targetType;
     Tcl_Obj **varPtr;
+    const char *subcommands[] = {
+	"freeallvars", "bug3598580", "types",
+	"objtype", "newobj", "set",
+	"assign", "convert", "duplicate",
+	"invalidateStringRep", "refcount", "type",
+	NULL
+    };
+    enum testobjCmdIndex {
+	TESTOBJ_FREEALLVARS, TESTOBJ_BUG3598580, TESTOBJ_TYPES,
+	TESTOBJ_OBJTYPE, TESTOBJ_NEWOBJ, TESTOBJ_SET,
+	TESTOBJ_ASSIGN, TESTOBJ_CONVERT, TESTOBJ_DUPLICATE,
+	TESTOBJ_INVALIDATESTRINGREP, TESTOBJ_REFCOUNT, TESTOBJ_TYPE,
+    } cmdIndex;
 
     if (objc < 2) {
 	wrongNumArgs:
@@ -964,142 +1068,159 @@ TestobjCmd(
     }
 
     varPtr = GetVarPtr(interp);
-    subCmd = Tcl_GetString(objv[1]);
-    if (strcmp(subCmd, "assign") == 0) {
-	if (objc != 4) {
+    if (Tcl_GetIndexFromObj(
+	    interp, objv[1], subcommands, "command", 0, &cmdIndex)
+	!= TCL_OK) {
+	return TCL_ERROR;
+    }
+    switch (cmdIndex) {
+    case TESTOBJ_FREEALLVARS:
+	if (objc != 2) {
 	    goto wrongNumArgs;
 	}
-	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
-	    return TCL_ERROR;
+	for (i = 0;  i < NUMBER_OF_OBJECT_VARS;  i++) {
+	    if (varPtr[i] != NULL) {
+		Tcl_DecrRefCount(varPtr[i]);
+		varPtr[i] = NULL;
+	    }
 	}
-	if (GetVariableIndex(interp, objv[3], &destIndex) != TCL_OK) {
-	    return TCL_ERROR;
+	return TCL_OK;
+    case TESTOBJ_BUG3598580:
+	if (objc != 2) {
+	    goto wrongNumArgs;
+	} else {
+	    Tcl_Obj *listObjPtr, *elemObjPtr;
+	    elemObjPtr = Tcl_NewWideIntObj(123);
+	    listObjPtr = Tcl_NewListObj(1, &elemObjPtr);
+	    /* Replace the single list element through itself, nonsense but
+	     * legal. */
+	    Tcl_ListObjReplace(interp, listObjPtr, 0, 1, 1, &elemObjPtr);
+	    Tcl_SetObjResult(interp, listObjPtr);
 	}
-	SetVarToObj(varPtr, destIndex, varPtr[varIndex]);
-	Tcl_SetObjResult(interp, varPtr[destIndex]);
-    } else if (strcmp(subCmd, "bug3598580") == 0) {
-	Tcl_Obj *listObjPtr, *elemObjPtr;
+	return TCL_OK;
+    case TESTOBJ_TYPES:
 	if (objc != 2) {
 	    goto wrongNumArgs;
+	} else {
+	    Tcl_Obj *typesObj = Tcl_NewListObj(0, NULL);
+	    Tcl_AppendAllObjTypes(interp, typesObj);
+	    Tcl_SetObjResult(interp, typesObj);
 	}
-	elemObjPtr = Tcl_NewWideIntObj(123);
-	listObjPtr = Tcl_NewListObj(1, &elemObjPtr);
-	/* Replace the single list element through itself, nonsense but legal. */
-	Tcl_ListObjReplace(interp, listObjPtr, 0, 1, 1, &elemObjPtr);
-	Tcl_SetObjResult(interp, listObjPtr);
 	return TCL_OK;
-    } else if (strcmp(subCmd, "convert") == 0) {
+    case TESTOBJ_OBJTYPE:
+	/*
+	 * Return an object containing the name of the argument's type of
+	 * internal rep. If none exists, return "none".
+	 */
 
-	if (objc != 4) {
+	if (objc != 3) {
 	    goto wrongNumArgs;
+	} else {
+	    const char *typeName;
+
+	    if (objv[2]->typePtr == NULL) {
+		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
+	    }
+	    else {
+		typeName = objv[2]->typePtr->name;
+		if (!strcmp(typeName, "utf32string"))
+		    typeName = "string";
+#ifndef TCL_WIDE_INT_IS_LONG
+	    else if (!strcmp(typeName, "wideInt")) typeName = "int";
+#endif
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, -1));
+	    }
 	}
-	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
-	    return TCL_ERROR;
-	}
-	if ((targetType = Tcl_GetObjType(Tcl_GetString(objv[3]))) == NULL) {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "no type ", Tcl_GetString(objv[3]), " found", NULL);
-	    return TCL_ERROR;
+	return TCL_OK;
+    case TESTOBJ_NEWOBJ:
+	if (objc != 3) {
+	    goto wrongNumArgs;
 	}
-	if (Tcl_ConvertToType(interp, varPtr[varIndex], targetType)
-		!= TCL_OK) {
+	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
+	SetVarToObj(varPtr, varIndex, Tcl_NewObj());
 	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "duplicate") == 0) {
+	return TCL_OK;
+    case TESTOBJ_SET:
 	if (objc != 4) {
 	    goto wrongNumArgs;
 	}
 	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
-	    return TCL_ERROR;
+	SetVarToObj(varPtr, varIndex, objv[3]);
+	return TCL_OK;
+
+    default:
+	break;
+    }
+
+    /* All further commands expect an occupied varindex argument */
+    if (objc < 3) {
+	goto wrongNumArgs;
+    }
+
+    if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    if (CheckIfVarUnset(interp, varPtr, varIndex)) {
+	return TCL_ERROR;
+    }
+
+    switch (cmdIndex) {
+    case TESTOBJ_ASSIGN:
+	if (objc != 4) {
+	    goto wrongNumArgs;
 	}
 	if (GetVariableIndex(interp, objv[3], &destIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	SetVarToObj(varPtr, destIndex, Tcl_DuplicateObj(varPtr[varIndex]));
+	SetVarToObj(varPtr, destIndex, varPtr[varIndex]);
 	Tcl_SetObjResult(interp, varPtr[destIndex]);
-    } else if (strcmp(subCmd, "freeallvars") == 0) {
-	if (objc != 2) {
-	    goto wrongNumArgs;
-	}
-	for (i = 0;  i < NUMBER_OF_OBJECT_VARS;  i++) {
-	    if (varPtr[i] != NULL) {
-		Tcl_DecrRefCount(varPtr[i]);
-		varPtr[i] = NULL;
-	    }
-	}
-    } else if (strcmp(subCmd, "invalidateStringRep") == 0) {
-	if (objc != 3) {
+	break;
+    case TESTOBJ_CONVERT:
+	if (objc != 4) {
 	    goto wrongNumArgs;
 	}
-	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
+	if ((targetType = Tcl_GetObjType(Tcl_GetString(objv[3]))) == NULL) {
+	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+		    "no type ", Tcl_GetString(objv[3]), " found", NULL);
 	    return TCL_ERROR;
 	}
-	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
+	if (Tcl_ConvertToType(interp, varPtr[varIndex], targetType)
+		!= TCL_OK) {
 	    return TCL_ERROR;
 	}
-	Tcl_InvalidateStringRep(varPtr[varIndex]);
 	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "newobj") == 0) {
-	if (objc != 3) {
+	break;
+    case TESTOBJ_DUPLICATE:
+	if (objc != 4) {
 	    goto wrongNumArgs;
 	}
-	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
+	if (GetVariableIndex(interp, objv[3], &destIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	SetVarToObj(varPtr, varIndex, Tcl_NewObj());
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "objtype") == 0) {
-	const char *typeName;
-
-	/*
-	 * Return an object containing the name of the argument's type of
-	 * internal rep. If none exists, return "none".
-	 */
-
+	SetVarToObj(varPtr, destIndex, Tcl_DuplicateObj(varPtr[varIndex]));
+	Tcl_SetObjResult(interp, varPtr[destIndex]);
+	break;
+    case TESTOBJ_INVALIDATESTRINGREP:
 	if (objc != 3) {
 	    goto wrongNumArgs;
 	}
-	if (objv[2]->typePtr == NULL) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
-	} else {
-	    typeName = objv[2]->typePtr->name;
-	    if (!strcmp(typeName, "utf32string")) typeName = "string";
-#ifndef TCL_WIDE_INT_IS_LONG
-	    else if (!strcmp(typeName, "wideInt")) typeName = "int";
-#endif
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, -1));
-	}
-    } else if (strcmp(subCmd, "refcount") == 0) {
+	Tcl_InvalidateStringRep(varPtr[varIndex]);
+	Tcl_SetObjResult(interp, varPtr[varIndex]);
+	break;
+    case TESTOBJ_REFCOUNT:
 	if (objc != 3) {
 	    goto wrongNumArgs;
 	}
-	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
-	    return TCL_ERROR;
-	}
 	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(varPtr[varIndex]->refCount));
-    } else if (strcmp(subCmd, "type") == 0) {
+	break;
+    case TESTOBJ_TYPE:
 	if (objc != 3) {
 	    goto wrongNumArgs;
 	}
-	if (GetVariableIndex(interp, objv[2], &varIndex) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
-	    return TCL_ERROR;
-	}
 	if (varPtr[varIndex]->typePtr == NULL) { /* a string! */
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", -1);
 #ifndef TCL_WIDE_INT_IS_LONG
@@ -1111,21 +1232,9 @@ TestobjCmd(
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
 		    varPtr[varIndex]->typePtr->name, -1);
 	}
-    } else if (strcmp(subCmd, "types") == 0) {
-	if (objc != 2) {
-	    goto wrongNumArgs;
-	}
-	if (Tcl_AppendAllObjTypes(interp,
-		Tcl_GetObjResult(interp)) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    } else {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"bad option \"", Tcl_GetString(objv[1]),
-		"\": must be assign, convert, duplicate, freeallvars, "
-		"newobj, objcount, objtype, refcount, type, or types", NULL);
-	return TCL_ERROR;
+	break;
     }
+
     return TCL_OK;
 }
 
diff --git a/tests/listObj.test b/tests/listObj.test
index 0b64635..0f43648 100644
--- a/tests/listObj.test
+++ b/tests/listObj.test
@@ -20,6 +20,7 @@ if {"::tcltest" ni [namespace children]} {
 catch [list package require -exact tcl::test [info patchlevel]]
 
 testConstraint testobj [llength [info commands testobj]]
+testConstraint memory [llength [info commands memory]]
 
 catch {unset x}
 test listobj-1.1 {Tcl_GetListObjType} emptyTest {
@@ -210,6 +211,73 @@ test listobj-11.1 {Bug 3598580: Tcl_ListObjReplace refcount management} testobj
     testobj bug3598580
 } 123
 
+# Stolen from dict.test
+proc listobjmemcheck script {
+    set end [lindex [split [memory info] \n] 3 3]
+    for {set i 0} {$i < 5} {incr i} {
+        uplevel 1 $script
+        set tmp $end
+        set end [lindex [split [memory info] \n] 3 3]
+    }
+    expr {$end - $tmp}
+}
+
+test listobj-12.1 {Tcl_ListObjIndex memory leaks for native lists} -constraints {
+    testobj memory
+} -body {
+    list [listobjmemcheck {
+        testobj set 1 [lrepeat 1000 x]
+        set errorMessage [testlistobj indexmemcheck 1]
+        testobj freeallvars
+    }] $errorMessage
+} -result {0 {}}
+test listobj-12.2 {Tcl_ListObjIndex memory leaks for native lists with spans} -constraints {
+    testobj memory
+} -body {
+    list [listobjmemcheck {
+        testobj set 1 [testlistrep new 1000 100 100]
+        set errorMessage [testlistobj indexmemcheck 1]
+        testobj freeallvars
+    }] $errorMessage
+} -result {0 {}}
+test listobj-12.3 {Tcl_ListObjIndex memory leaks for lseq} -constraints {
+    testobj memory
+} -body {
+    list [listobjmemcheck {
+        testobj set 1 [lseq 1000]
+        set errorMessage [testlistobj indexmemcheck 1]
+        testobj freeallvars
+    }] $errorMessage
+} -result {0 {}}
+
+test listobj-13.1 {Tcl_ListObjGetElements memory leaks for native lists} -constraints {
+    testobj memory
+} -body {
+    list [listobjmemcheck {
+        testobj set 1 [lrepeat 1000 x]
+        set errorMessage [testlistobj getelementsmemcheck 1]
+        testobj freeallvars
+    }] $errorMessage
+} -result {0 {}}
+test listobj-13.2 {Tcl_ListObjElements memory leaks for native lists with spans} -constraints {
+    testobj memory
+} -body {
+    list [listobjmemcheck {
+        testobj set 1 [testlistrep new 1000 100 100]
+        set errorMessage [testlistobj getelementsmemcheck 1]
+        testobj freeallvars
+    }] $errorMessage
+} -result {0 {}}
+test listobj-13.3 {Tcl_ListObjElements memory leaks for lseq} -constraints {
+    testobj memory
+} -body {
+    list [listobjmemcheck {
+        testobj set 1 [lseq 1000]
+        set errorMessage [testlistobj getelementsmemcheck 1]
+        testobj freeallvars
+    }] $errorMessage
+} -result {0 {}}
+
 # cleanup
 ::tcltest::cleanupTests
 return
-- 
cgit v0.12


From 4b6d8abfe47494263e6fde30cbb9e9d9f880086e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 7 Oct 2022 15:18:36 +0000
Subject: Use GotFlag/SetFlag/ResetFlag macro's wherever appropriate

---
 generic/tclIO.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5dff604..408a1d3 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1478,7 +1478,7 @@ Tcl_GetChannel(
     chanPtr = (Channel *)Tcl_GetHashValue(hPtr);
     chanPtr = chanPtr->state->bottomChanPtr;
     if (modePtr != NULL) {
-	*modePtr = chanPtr->state->flags & (TCL_READABLE|TCL_WRITABLE);
+	*modePtr = GotFlag(chanPtr->state, TCL_READABLE|TCL_WRITABLE);
     }
 
     return (Tcl_Channel) chanPtr;
@@ -1572,7 +1572,7 @@ TclGetChannelFromObj(
     *channelPtr = (Tcl_Channel) statePtr->bottomChanPtr;
 
     if (modePtr != NULL) {
-	*modePtr = statePtr->flags & (TCL_READABLE|TCL_WRITABLE);
+	*modePtr = GotFlag(statePtr, TCL_READABLE|TCL_WRITABLE);
     }
 
     return TCL_OK;
@@ -1877,7 +1877,7 @@ Tcl_StackChannel(
      *	--+---+---+---+----+
      */
 
-    if ((mask & (statePtr->flags & (TCL_READABLE | TCL_WRITABLE))) == 0) {
+    if ((mask & GotFlag(statePtr, TCL_READABLE|TCL_WRITABLE)) == 0) {
 	if (interp) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "reading and writing both disallowed for channel \"%s\"",
@@ -2170,8 +2170,8 @@ Tcl_UnstackChannel(
 	 * TIP #220: This is done with maximum privileges (as created).
 	 */
 
-	statePtr->flags &= ~(TCL_READABLE|TCL_WRITABLE);
-	statePtr->flags |= statePtr->maxPerms;
+	ResetFlag(statePtr, TCL_READABLE|TCL_WRITABLE);
+	SetFlag(statePtr, statePtr->maxPerms);
 	result = ChanClose(chanPtr, interp);
 	ChannelFree(chanPtr);
 
@@ -2378,7 +2378,7 @@ Tcl_GetChannelMode(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of actual channel. */
 
-    return (statePtr->flags & (TCL_READABLE | TCL_WRITABLE));
+    return GotFlag(statePtr, TCL_READABLE|TCL_WRITABLE);
 }
 
 /*
@@ -2481,12 +2481,12 @@ Tcl_RemoveChannelMode(
         emsg = "Illegal mode value.";
 	goto error;
     }
-    if (0 == (statePtr->flags & (TCL_READABLE | TCL_WRITABLE) & ~mode)) {
+    if (0 == (GotFlag(statePtr, TCL_READABLE|TCL_WRITABLE) & ~mode)) {
         emsg = "Bad mode, would make channel inacessible";
 	goto error;
     }
 
-    statePtr->flags &= ~mode;
+    ResetFlag(statePtr, mode);
     return TCL_OK;
 
  error:
@@ -3706,7 +3706,7 @@ Tcl_CloseEx(
      * opened for that direction).
      */
 
-    if (!(statePtr->flags & (TCL_READABLE | TCL_WRITABLE) & flags)) {
+    if (!(GotFlag(statePtr, TCL_READABLE|TCL_WRITABLE) & flags)) {
 	const char *msg;
 
 	if (flags & TCL_CLOSE_READ) {
@@ -6416,7 +6416,7 @@ ReadChars(
 		    return 1;
 		}
 
-	    } else if (statePtr->flags & CHANNEL_EOF) {
+	    } else if (GotFlag(statePtr, CHANNEL_EOF)) {
 		/*
 		 * The bare \r is the only char and we will never read a
 		 * subsequent char to make the determination.
@@ -6682,7 +6682,7 @@ TranslateInputEOL(
 	char *dst = dstStart;
 	int lesser;
 
-	if ((statePtr->flags & INPUT_SAW_CR) && srcLen) {
+	if (GotFlag(statePtr, INPUT_SAW_CR) && srcLen) {
 	    if (*src == '\n') { src++; srcLen--; }
 	    ResetFlag(statePtr, INPUT_SAW_CR);
 	}
@@ -7452,7 +7452,7 @@ CheckChannelErrors(
      * Fail if the channel is not opened for desired operation.
      */
 
-    if ((statePtr->flags & direction) == 0) {
+    if (GotFlag(statePtr, direction) == 0) {
 	Tcl_SetErrno(EACCES);
 	return -1;
     }
@@ -9138,7 +9138,7 @@ Tcl_FileEventObjCmd(
     }
     chanPtr = (Channel *) chan;
     statePtr = chanPtr->state;
-    if ((statePtr->flags & mask) == 0) {
+    if (GotFlag(statePtr, mask) == 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("channel is not %s",
 		(mask == TCL_READABLE) ? "readable" : "writable"));
 	return TCL_ERROR;
@@ -9305,8 +9305,8 @@ TclCopyChannel(
      * Make sure the output side is unbuffered.
      */
 
-    outStatePtr->flags = (outStatePtr->flags & ~CHANNEL_LINEBUFFERED)
-	    | CHANNEL_UNBUFFERED;
+    ResetFlag(outStatePtr, CHANNEL_LINEBUFFERED);
+    SetFlag(outStatePtr, CHANNEL_UNBUFFERED);
 
     /*
      * Test for conditions where we know we can just move bytes from input
@@ -10085,7 +10085,7 @@ DoRead(
 		 * There's no more buffered data...
 		 */
 
-		if (statePtr->flags & CHANNEL_EOF) {
+		if (GotFlag(statePtr, CHANNEL_EOF)) {
 		    /*
 		     * ...and there never will be.
 		     */
@@ -10093,7 +10093,7 @@ DoRead(
 		    *p++ = '\r';
 		    bytesToRead--;
 		    bufPtr->nextRemoved++;
-		} else if (statePtr->flags & CHANNEL_BLOCKED) {
+		} else if (GotFlag(statePtr, CHANNEL_BLOCKED)) {
 		    /*
 		     * ...and we cannot get more now.
 		     */
@@ -10226,20 +10226,20 @@ StopCopy(
      */
 
     nonBlocking = csPtr->readFlags & CHANNEL_NONBLOCKING;
-    if (nonBlocking != (inStatePtr->flags & CHANNEL_NONBLOCKING)) {
+    if (nonBlocking != GotFlag(inStatePtr, CHANNEL_NONBLOCKING)) {
 	SetBlockMode(NULL, csPtr->readPtr,
 		nonBlocking ? TCL_MODE_NONBLOCKING : TCL_MODE_BLOCKING);
     }
     if (csPtr->readPtr != csPtr->writePtr) {
 	nonBlocking = csPtr->writeFlags & CHANNEL_NONBLOCKING;
-	if (nonBlocking != (outStatePtr->flags & CHANNEL_NONBLOCKING)) {
+	if (nonBlocking != GotFlag(outStatePtr, CHANNEL_NONBLOCKING)) {
 	    SetBlockMode(NULL, csPtr->writePtr,
 		    nonBlocking ? TCL_MODE_NONBLOCKING : TCL_MODE_BLOCKING);
 	}
     }
     ResetFlag(outStatePtr, CHANNEL_LINEBUFFERED | CHANNEL_UNBUFFERED);
-    outStatePtr->flags |=
-	    csPtr->writeFlags & (CHANNEL_LINEBUFFERED | CHANNEL_UNBUFFERED);
+    SetFlag(outStatePtr,
+	    csPtr->writeFlags & (CHANNEL_LINEBUFFERED | CHANNEL_UNBUFFERED));
 
     if (csPtr->cmdPtr) {
 	Tcl_DeleteChannelHandler(inChan, CopyEventProc, csPtr);
-- 
cgit v0.12


From 12f23af5456f4a87b8bc4d58f9dcfc0edf2c9676 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 7 Oct 2022 15:19:36 +0000
Subject: On Windows, env(HOME) should be handled case-insensitive in fCmd.test

---
 tests/fCmd.test | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/fCmd.test b/tests/fCmd.test
index 73118f4..8c9f799 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -2598,8 +2598,8 @@ test fCmd-31.6 {file home USER} -body {
     # Note - as in 8.x this form does NOT necessarily give same result as
     # env(HOME) even when user is current user. Assume result contains user
     # name, else not sure how to check
-    file home $::tcl_platform(user)
-} -match glob -result "*$::tcl_platform(user)*"
+    string tolower [file home $::tcl_platform(user)]
+} -match glob -result [string tolower "*$::tcl_platform(user)*"]
 test fCmd-31.7 {file home UNKNOWNUSER} -body {
     file home nosuchuser
 } -returnCodes error -result {user "nosuchuser" doesn't exist}
@@ -2640,8 +2640,8 @@ test fCmd-32.5 {file tildeexpand ~USER} -body {
     # Note - as in 8.x this form does NOT necessarily give same result as
     # env(HOME) even when user is current user. Assume result contains user
     # name, else not sure how to check
-    file tildeexpand ~$::tcl_platform(user)
-} -match glob -result "*$::tcl_platform(user)*"
+    string tolower [file tildeexpand ~$::tcl_platform(user)]
+} -match glob -result [string tolower "*$::tcl_platform(user)*"]
 test fCmd-32.6 {file tildeexpand ~UNKNOWNUSER} -body {
     file tildeexpand ~nosuchuser
 } -returnCodes error -result {user "nosuchuser" doesn't exist}
@@ -2655,8 +2655,8 @@ test fCmd-32.9 {file tildeexpand ~USER/bar} -body {
     # Note - as in 8.x this form does NOT necessarily give same result as
     # env(HOME) even when user is current user. Assume result contains user
     # name, else not sure how to check
-    file tildeexpand ~$::tcl_platform(user)/bar
-} -match glob -result "*$::tcl_platform(user)*/bar"
+    string tolower [file tildeexpand ~$::tcl_platform(user)/bar]
+} -match glob -result [string tolower "*$::tcl_platform(user)*/bar"]
 test fCmd-32.10 {file tildeexpand ~UNKNOWNUSER} -body {
     file tildeexpand ~nosuchuser/foo
 } -returnCodes error -result {user "nosuchuser" doesn't exist}
@@ -2679,8 +2679,8 @@ test fCmd-32.16 {file tildeexpand ~USER\\bar} -body {
     # Note - as in 8.x this form does NOT necessarily give same result as
     # env(HOME) even when user is current user. Assume result contains user
     # name, else not sure how to check
-    file tildeexpand ~$::tcl_platform(user)\\bar
-} -constraints win -match glob -result "*$::tcl_platform(user)*/bar"
+    string tolower [file tildeexpand ~$::tcl_platform(user)\\bar]
+} -constraints win -match glob -result [string tolower "*$::tcl_platform(user)*/bar"]
 
 
 # cleanup
-- 
cgit v0.12


From 5e4013330a16bddc87cd9179fce996982e333f20 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 8 Oct 2022 00:10:13 +0000
Subject: -nocomplainencoding and -strictencoding are incompatible

---
 generic/tclIO.c | 23 +++++++++++++++++++++--
 generic/tclIO.h |  2 ++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 85067f2..ca12d63 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8009,7 +8009,8 @@ Tcl_GetChannelOption(
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-nocomplainencoding");
 	}
-	Tcl_DStringAppendElement(dsPtr,"1");
+	Tcl_DStringAppendElement(dsPtr,
+		(flags & CHANNEL_ENCODING_STRICT) ? "0" : "1");
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8283,7 +8284,17 @@ Tcl_SetChannelOption(
 	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
 	    return TCL_ERROR;
 	}
-	if (!newMode) {
+	if (newMode) {
+	    if (statePtr->flags & CHANNEL_ENCODING_STRICT) {
+		if (interp) {
+		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			    "-nocomplainencoding cannot be used with -strictencoding",
+			    -1));
+		}
+		return TCL_ERROR;
+	    }
+	    statePtr->flags |= CHANNEL_ENCODING_NOCOMPLAIN;
+	} else {
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"bad value for -nocomplainencoding: only true allowed",
@@ -8299,6 +8310,14 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
+	    if (statePtr->flags & CHANNEL_ENCODING_NOCOMPLAIN) {
+		if (interp) {
+		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			    "-strictencoding cannot be used with -nocomplainencoding",
+			    -1));
+		}
+		return TCL_ERROR;
+	    }
 	    statePtr->flags |= CHANNEL_ENCODING_STRICT;
 	}
 	return TCL_OK;
diff --git a/generic/tclIO.h b/generic/tclIO.h
index b86dc1d..e8d2736 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -273,6 +273,8 @@ typedef struct ChannelState {
 					 * changes. */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
+#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option
+					 * -nocomplaincoding is set to 1 */
 #define CHANNEL_ENCODING_STRICT	(1<<18)	/* set if option
 					 * -strictencoding is set to 1 */
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
-- 
cgit v0.12


From bd8e0ee8b7e71085e6e3ff9a22dbc8b2b28a77f7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 8 Oct 2022 17:01:35 +0000
Subject: TIP #346 bugfix: -strictencoding should be resetable too

---
 generic/tclIO.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 42c9e18..a13f32c 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4399,6 +4399,8 @@ Write(
 
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->outputEncodingFlags |= TCL_ENCODING_STRICT;
+    } else {
+	statePtr->outputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
 
     /*
@@ -4722,6 +4724,8 @@ Tcl_GetsObj(
 
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+    } else {
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
 
     /*
@@ -5487,6 +5491,8 @@ FilterInputBytes(
 
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+    } else {
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
 
     result = Tcl_ExternalToUtf(NULL, gsPtr->encoding, raw, rawLen,
@@ -6267,6 +6273,8 @@ ReadChars(
 
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
+    } else {
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
 
     /*
@@ -8276,6 +8284,8 @@ Tcl_SetChannelOption(
 	}
 	if (newMode) {
 	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
+	} else {
+	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	}
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
-- 
cgit v0.12


From 6def8b0f5838db2823d34a3210e018e1a59faee7 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 9 Oct 2022 18:11:44 +0000
Subject: TIP 643 code. Docs, tests pending

---
 generic/tcl.decls     |  5 +++++
 generic/tclDecls.h    |  5 +++++
 generic/tclEncoding.c | 27 +++++++++++++++++++++++++++
 generic/tclStubInit.c |  1 +
 generic/tclTest.c     | 24 ++++++++++++++++++++++--
 5 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 95cecdf..cbafa6d 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2541,6 +2541,11 @@ declare 682 {
 
 # ----- BASELINE -- FOR -- 8.7.0 ----- #
 
+# TIP 643
+declare 683 {
+   int Tcl_GetEncodingNulLength(Tcl_Encoding encoding)
+}
+
 ##############################################################################
 
 # Define the platform specific public Tcl interface. These functions are only
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 80131e8..849a596 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -2013,6 +2013,8 @@ EXTERN int		Tcl_NRCallObjProc2(Tcl_Interp *interp,
 /* 682 */
 EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
 				Tcl_Channel chan, int mode);
+/* 683 */
+EXTERN int		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2731,6 +2733,7 @@ typedef struct TclStubs {
     void (*reserved680)(void);
     void (*reserved681)(void);
     int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
+    int (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4125,6 +4128,8 @@ extern const TclStubs *tclStubsPtr;
 /* Slot 681 is reserved */
 #define Tcl_RemoveChannelMode \
 	(tclStubsPtr->tcl_RemoveChannelMode) /* 682 */
+#define Tcl_GetEncodingNulLength \
+	(tclStubsPtr->tcl_GetEncodingNulLength) /* 683 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 52b02fc..efe4b43 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -983,6 +983,33 @@ Tcl_GetEncodingNames(
 }
 
 /*
+ *-------------------------------------------------------------------------
+ *
+ * Tcl_GetEncodingNulLength --
+ *
+ *	Given an encoding, return the number of nul bytes used for the
+ *      string termination.
+ *
+ * Results:
+ *	The name of the encoding.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+int
+Tcl_GetEncodingNulLength(
+    Tcl_Encoding encoding)
+{
+    if (encoding == NULL) {
+	encoding = systemEncoding;
+    }
+
+    return ((Encoding *) encoding)->nullSize;
+}
+
+/*
  *------------------------------------------------------------------------
  *
  * Tcl_SetSystemEncoding --
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index c7f178f..17254b8 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2048,6 +2048,7 @@ const TclStubs tclStubs = {
     0, /* 680 */
     0, /* 681 */
     Tcl_RemoveChannelMode, /* 682 */
+    Tcl_GetEncodingNulLength, /* 683 */
 };
 
 /* !END!: Do not edit above this line. */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 95f4d2f..ae765aa 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1996,12 +1996,17 @@ TestencodingObjCmd(
     const char *string;
     TclEncoding *encodingPtr;
     static const char *const optionStrings[] = {
-	"create",	"delete",	NULL
+	"create", "delete", "nullength", NULL
     };
     enum options {
-	ENC_CREATE,	ENC_DELETE
+	ENC_CREATE, ENC_DELETE, ENC_NULLENGTH
     };
 
+    if (objc < 2) {
+	Tcl_WrongNumArgs(interp, 2, objv, "?encoding?");
+	return TCL_ERROR;
+    }
+
     if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
@@ -2012,6 +2017,7 @@ TestencodingObjCmd(
 	Tcl_EncodingType type;
 
 	if (objc != 5) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "name toutfcmd fromutfcmd");
 	    return TCL_ERROR;
 	}
 	encodingPtr = (TclEncoding*)ckalloc(sizeof(TclEncoding));
@@ -2048,6 +2054,20 @@ TestencodingObjCmd(
 	Tcl_FreeEncoding(encoding);	/* Free to match CREATE */
 	TclFreeInternalRep(objv[2]);		/* Free the cached ref */
 	break;
+
+    case ENC_NULLENGTH:
+	if (objc > 3) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "?encoding?");
+	    return TCL_ERROR;
+	}
+	encoding =
+	    Tcl_GetEncoding(interp, objc == 2 ? NULL : Tcl_GetString(objv[2]));
+	if (encoding == NULL) {
+	    return TCL_ERROR;
+	}
+	Tcl_SetObjResult(interp,
+			 Tcl_NewIntObj(Tcl_GetEncodingNulLength(encoding)));
+	Tcl_FreeEncoding(encoding);
     }
     return TCL_OK;
 }
-- 
cgit v0.12


From a2b119cac88f2853439b6781404687c40acae4d2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 9 Oct 2022 20:57:30 +0000
Subject: Tcl_NewWideIntObj -> Tcl_NewBooleanObj where appropriate

---
 generic/tclTest.c            | 28 ++++++++++++++--------------
 generic/tclTestObj.c         | 12 ++++++------
 generic/tclTestProcBodyObj.c |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 95f4d2f..539c90f 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2941,7 +2941,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[2], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "int", &intVar,
 		TCL_LINK_INT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2949,7 +2949,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[3], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "real", &realVar,
 		TCL_LINK_DOUBLE | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2957,7 +2957,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[4], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "bool", &boolVar,
 		TCL_LINK_BOOLEAN | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2965,7 +2965,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[5], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "string", &stringVar,
 		TCL_LINK_STRING | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2973,7 +2973,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[6], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "wide", &wideVar,
 			TCL_LINK_WIDE_INT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2981,7 +2981,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[7], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "char", &charVar,
 		TCL_LINK_CHAR | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2989,7 +2989,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[8], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "uchar", &ucharVar,
 		TCL_LINK_UCHAR | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -2997,7 +2997,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[9], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "short", &shortVar,
 		TCL_LINK_SHORT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3005,7 +3005,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[10], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "ushort", &ushortVar,
 		TCL_LINK_USHORT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3013,7 +3013,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[11], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "uint", &uintVar,
 		TCL_LINK_UINT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3021,7 +3021,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[12], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "long", &longVar,
 		TCL_LINK_LONG | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3029,7 +3029,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[13], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "ulong", &ulongVar,
 		TCL_LINK_ULONG | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3037,7 +3037,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[14], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "float", &floatVar,
 		TCL_LINK_FLOAT | flag) != TCL_OK) {
 	    return TCL_ERROR;
@@ -3045,7 +3045,7 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[15], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
 	if (Tcl_LinkVar(interp, "uwide", &uwideVar,
 		TCL_LINK_WIDE_UINT | flag) != TCL_OK) {
 	    return TCL_ERROR;
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 721237b..c9a910a 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -292,9 +292,9 @@ TestbignumobjCmd(
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetWideIntObj(varPtr[varIndex], mp_iszero(&bignumValue));
+	    Tcl_SetBooleanObj(varPtr[varIndex], mp_iszero(&bignumValue));
 	} else {
-	    SetVarToObj(varPtr, varIndex, Tcl_NewWideIntObj(mp_iszero(&bignumValue)));
+	    SetVarToObj(varPtr, varIndex, Tcl_NewBooleanObj(mp_iszero(&bignumValue)));
 	}
 	mp_clear(&bignumValue);
 	break;
@@ -387,9 +387,9 @@ TestbooleanobjCmd(
 	 */
 
 	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetWideIntObj(varPtr[varIndex], boolValue != 0);
+	    Tcl_SetBooleanObj(varPtr[varIndex], boolValue);
 	} else {
-	    SetVarToObj(varPtr, varIndex, Tcl_NewWideIntObj(boolValue != 0));
+	    SetVarToObj(varPtr, varIndex, Tcl_NewBooleanObj(boolValue));
 	}
 	Tcl_SetObjResult(interp, varPtr[varIndex]);
     } else if (strcmp(subCmd, "get") == 0) {
@@ -412,9 +412,9 @@ TestbooleanobjCmd(
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetWideIntObj(varPtr[varIndex], boolValue == 0);
+	    Tcl_SetBooleanObj(varPtr[varIndex], !boolValue);
 	} else {
-	    SetVarToObj(varPtr, varIndex, Tcl_NewWideIntObj(boolValue == 0));
+	    SetVarToObj(varPtr, varIndex, Tcl_NewBooleanObj(!boolValue));
 	}
 	Tcl_SetObjResult(interp, varPtr[varIndex]);
     } else {
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index 38cfaaa..844ff1b 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -340,7 +340,7 @@ ProcBodyTestCheckObjCmd(
     }
 
     version = Tcl_PkgPresent(interp, packageName, packageVersion, 1);
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(
+    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
 	    strcmp(version, packageVersion) == 0));
     return TCL_OK;
 }
-- 
cgit v0.12


From 3f7f7c5584f701f2fee77dc372b824b15b1a7739 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 10 Oct 2022 11:08:38 +0000
Subject: Slight improvement to TIP #346/#633 combination: Now -strictencoding
 1 automatically sets -nocomplainencoding to 0, while -nocomplainencoding 1
 automatically sets strictencoding to 0. This way, they can never both be set.

---
 generic/tclIO.c | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 407b586..6a9c306 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8320,25 +8320,20 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-		if (interp) {
-		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "-nocomplainencoding cannot be used with -strictencoding",
-			    -1));
-		}
-		return TCL_ERROR;
-	    }
+	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	    SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	} else {
 #ifdef TCL_NO_DEPRECATED
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 #else
-	    if (interp) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"bad value for -nocomplainencoding: only true allowed",
-			-1));
+	    if (SetFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
+		if (interp) {
+		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			    "bad value for -nocomplainencoding: only true allowed",
+			    TCL_INDEX_NONE));
+		}
+		return TCL_ERROR;
 	    }
-	    return TCL_ERROR;
 #endif
 	}
 	return TCL_OK;
@@ -8349,14 +8344,7 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-		if (interp) {
-		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "-strictencoding cannot be used with -nocomplainencoding",
-			    -1));
-		}
-		return TCL_ERROR;
-	    }
+	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-- 
cgit v0.12


From 23900950d5ad3b15b790aacb18f9e0220836b132 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 10 Oct 2022 13:52:29 +0000
Subject: Tests and docs for Tcl_GetEncodingNulLength

---
 doc/Encoding.3      |  6 ++++++
 generic/tclTest.c   |  2 +-
 tests/encoding.test | 11 +++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 86c5a78..c183b73 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -52,6 +52,9 @@ const char *
 \fBTcl_GetEncodingName\fR(\fIencoding\fR)
 .sp
 int
+\fBTcl_GetEncodingNulLength\fR(\fIencoding\fR)
+.sp
+int
 \fBTcl_SetSystemEncoding\fR(\fIinterp, name\fR)
 .sp
 const char *
@@ -292,6 +295,9 @@ was used to create the encoding.  The string returned by
 \fBTcl_GetEncodingName\fR is only guaranteed to persist until the
 \fIencoding\fR is deleted.  The caller must not modify this string.
 .PP
+\fBTcl_GetEncodingNulLength\fR returns the length of the terminating
+nul byte sequence for strings in the specified encoding.
+.PP
 \fBTcl_SetSystemEncoding\fR sets the default encoding that should be used
 whenever the user passes a NULL value for the \fIencoding\fR argument to
 any of the other encoding functions.  If \fIname\fR is NULL, the system
diff --git a/generic/tclTest.c b/generic/tclTest.c
index ae765aa..2764ced 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2003,7 +2003,7 @@ TestencodingObjCmd(
     };
 
     if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 2, objv, "?encoding?");
+	Tcl_WrongNumArgs(interp, 1, objv, "command ?args?");
 	return TCL_ERROR;
     }
 
diff --git a/tests/encoding.test b/tests/encoding.test
index c8f409e..8e529af 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -841,6 +841,17 @@ runtests
 
 }
 
+test encoding-29.0 {get encoding nul terminator lengths} -constraints {
+    testencoding
+} -body {
+    list \
+        [testencoding nullength ascii] \
+        [testencoding nullength utf-16] \
+        [testencoding nullength utf-32] \
+        [testencoding nullength gb12345] \
+        [testencoding nullength ksc5601]
+} -result {1 2 4 2 2}
+
 # cleanup
 namespace delete ::tcl::test::encoding
 ::tcltest::cleanupTests
-- 
cgit v0.12


From f2b3bc2aa5ebb89635fdb896e9ec4f67bbff445c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 10 Oct 2022 15:19:59 +0000
Subject: Use Tcl_ObjCmdProc in stead of full signature

---
 generic/tclClock.c           |  64 +++---
 generic/tclExecute.c         |   4 +-
 generic/tclIndexObj.c        |  12 +-
 generic/tclInt.h             | 452 +++++++++++--------------------------------
 generic/tclProcess.c         |  24 +--
 generic/tclTestProcBodyObj.c |   6 +-
 generic/tclThreadTest.c      |   4 +-
 generic/tclVar.c             |  54 +++---
 8 files changed, 178 insertions(+), 442 deletions(-)

diff --git a/generic/tclClock.c b/generic/tclClock.c
index 86eed73..a9ba70c 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -160,39 +160,19 @@ static void		GetJulianDayFromEraYearWeekDay(TclDateFields *, int);
 static void		GetJulianDayFromEraYearMonthDay(TclDateFields *, int);
 static int		IsGregorianLeapYear(TclDateFields *);
 static int		WeekdayOnOrBefore(int, int);
-static int		ClockClicksObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockConvertlocaltoutcObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockGetdatefieldsObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockGetjuliandayfromerayearmonthdayObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockGetjuliandayfromerayearweekdayObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockGetenvObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockMicrosecondsObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockMillisecondsObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockParseformatargsObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		ClockSecondsObjCmd(
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc ClockClicksObjCmd;
+static Tcl_ObjCmdProc ClockConvertlocaltoutcObjCmd;
+static Tcl_ObjCmdProc ClockGetdatefieldsObjCmd;
+static Tcl_ObjCmdProc ClockGetjuliandayfromerayearmonthdayObjCmd;
+static Tcl_ObjCmdProc ClockGetjuliandayfromerayearweekdayObjCmd;
+static Tcl_ObjCmdProc ClockGetenvObjCmd;
+static Tcl_ObjCmdProc ClockMicrosecondsObjCmd;
+static Tcl_ObjCmdProc ClockMillisecondsObjCmd;
+static Tcl_ObjCmdProc ClockParseformatargsObjCmd;
+static Tcl_ObjCmdProc ClockSecondsObjCmd;
 static struct tm *	ThreadSafeLocalTime(const time_t *);
 static void		TzsetIfNecessary(void);
-static void		ClockDeleteCmdProc(ClientData);
+static void		ClockDeleteCmdProc(void *);
 
 /*
  * Structure containing description of "native" clock commands to create.
@@ -331,7 +311,7 @@ TclClockInit(
 
 static int
 ClockConvertlocaltoutcObjCmd(
-    ClientData clientData,	/* Client data */
+    void *clientData,	/* Client data */
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter vector */
@@ -423,7 +403,7 @@ ClockConvertlocaltoutcObjCmd(
 
 int
 ClockGetdatefieldsObjCmd(
-    ClientData clientData,	/* Opaque pointer to literal pool, etc. */
+    void *clientData,	/* Opaque pointer to literal pool, etc. */
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter vector */
@@ -577,7 +557,7 @@ FetchIntField(
 
 static int
 ClockGetjuliandayfromerayearmonthdayObjCmd(
-    ClientData clientData,	/* Opaque pointer to literal pool, etc. */
+    void *clientData,	/* Opaque pointer to literal pool, etc. */
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter vector */
@@ -661,7 +641,7 @@ ClockGetjuliandayfromerayearmonthdayObjCmd(
 
 static int
 ClockGetjuliandayfromerayearweekdayObjCmd(
-    ClientData clientData,	/* Opaque pointer to literal pool, etc. */
+    void *clientData,	/* Opaque pointer to literal pool, etc. */
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter vector */
@@ -1645,7 +1625,7 @@ WeekdayOnOrBefore(
 
 int
 ClockGetenvObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -1748,7 +1728,7 @@ ThreadSafeLocalTime(
 
 int
 ClockClicksObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter values */
@@ -1818,7 +1798,7 @@ ClockClicksObjCmd(
 
 int
 ClockMillisecondsObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter values */
@@ -1855,7 +1835,7 @@ ClockMillisecondsObjCmd(
 
 int
 ClockMicrosecondsObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter values */
@@ -1888,7 +1868,7 @@ ClockMicrosecondsObjCmd(
 
 static int
 ClockParseformatargsObjCmd(
-    ClientData clientData,	/* Client data containing literal pool */
+    void *clientData,	/* Client data containing literal pool */
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const objv[])	/* Parameter vector */
@@ -2006,7 +1986,7 @@ ClockParseformatargsObjCmd(
 
 int
 ClockSecondsObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Tcl interpreter */
     int objc,			/* Parameter count */
     Tcl_Obj *const *objv)	/* Parameter values */
@@ -2106,7 +2086,7 @@ TzsetIfNecessary(void)
 
 static void
 ClockDeleteCmdProc(
-    ClientData clientData)	/* Opaque pointer to the client data */
+    void *clientData)	/* Opaque pointer to the client data */
 {
     ClockClientData *data = (ClockClientData *)clientData;
     int i;
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 7c7bbfd..a063aae 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -670,9 +670,7 @@ static const size_t Exp64ValueSize = sizeof(Exp64Value) / sizeof(Tcl_WideInt);
  */
 
 #ifdef TCL_COMPILE_STATS
-static int		EvalStatsCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc EvalStatsCmd;
 #endif /* TCL_COMPILE_STATS */
 #ifdef TCL_COMPILE_DEBUG
 static const char *	GetOpcodeName(const unsigned char *pc);
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 70c50cd..79be731 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -25,15 +25,9 @@ static int		GetIndexFromObjList(Tcl_Interp *interp,
 static void		UpdateStringOfIndex(Tcl_Obj *objPtr);
 static void		DupIndex(Tcl_Obj *srcPtr, Tcl_Obj *dupPtr);
 static void		FreeIndex(Tcl_Obj *objPtr);
-static int		PrefixAllObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		PrefixLongestObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		PrefixMatchObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc PrefixAllObjCmd;
+static Tcl_ObjCmdProc PrefixLongestObjCmd;
+static Tcl_ObjCmdProc PrefixMatchObjCmd;
 static void		PrintUsage(Tcl_Interp *interp,
 			    const Tcl_ArgvInfo *argTable);
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index e43e627..471892b 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3223,17 +3223,12 @@ MODULE_SCOPE int	TclIncrObj(Tcl_Interp *interp, Tcl_Obj *valuePtr,
 			    Tcl_Obj *incrPtr);
 MODULE_SCOPE Tcl_Obj *	TclIncrObjVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 			    Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr, int flags);
-MODULE_SCOPE int	TclInfoExistsCmd(void *dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclInfoCoroutineCmd(void *dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclInfoExistsCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclInfoCoroutineCmd;
 MODULE_SCOPE Tcl_Obj *	TclInfoFrame(Tcl_Interp *interp, CmdFrame *framePtr);
-MODULE_SCOPE int	TclInfoGlobalsCmd(void *dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclInfoLocalsCmd(void *dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclInfoVarsCmd(void *dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclInfoGlobalsCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclInfoLocalsCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclInfoVarsCmd;
 MODULE_SCOPE void	TclInitAlloc(void);
 MODULE_SCOPE void	TclInitDbCkalloc(void);
 MODULE_SCOPE void	TclInitDoubleConversion(void);
@@ -3544,61 +3539,31 @@ MODULE_SCOPE int	TclIsSpaceProc(int byte);
  *----------------------------------------------------------------
  */
 
-MODULE_SCOPE int	Tcl_AfterObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_AppendObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ApplyObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_AfterObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_AppendObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ApplyObjCmd;
 MODULE_SCOPE Tcl_Command TclInitArrayCmd(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Command TclInitBinaryCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	Tcl_BreakObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_BreakObjCmd;
 #if !defined(TCL_NO_DEPRECATED)
-MODULE_SCOPE int	Tcl_CaseObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_CaseObjCmd;
 #endif
-MODULE_SCOPE int	Tcl_CatchObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_CdObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_CatchObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_CdObjCmd;
 MODULE_SCOPE Tcl_Command TclInitChanCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	TclChanCreateObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclChanPostEventObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclChanPopObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclChanPushObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclChanCreateObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclChanPostEventObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclChanPopObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclChanPushObjCmd;
 MODULE_SCOPE void	TclClockInit(Tcl_Interp *interp);
-MODULE_SCOPE int	TclClockOldscanObjCmd(
-			    void *clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_CloseObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ConcatObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ContinueObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclClockOldscanObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_CloseObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ConcatObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ContinueObjCmd;
 MODULE_SCOPE Tcl_TimerToken TclCreateAbsoluteTimerHandler(
 			    Tcl_Time *timePtr, Tcl_TimerProc *proc,
 			    void *clientData);
-MODULE_SCOPE int	TclDefaultBgErrorHandlerObjCmd(
-			    void *clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclDefaultBgErrorHandlerObjCmd;
 MODULE_SCOPE Tcl_Command TclInitDictCmd(Tcl_Interp *interp);
 MODULE_SCOPE int	TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
 			    Var *arrayPtr, Tcl_Obj *part1Ptr,
@@ -3606,244 +3571,91 @@ MODULE_SCOPE int	TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
 			    Tcl_Obj *const pathv[], Tcl_Obj *keysPtr);
 MODULE_SCOPE Tcl_Obj *	TclDictWithInit(Tcl_Interp *interp, Tcl_Obj *dictPtr,
 			    int pathc, Tcl_Obj *const pathv[]);
-MODULE_SCOPE int	Tcl_DisassembleObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_DisassembleObjCmd;
 
 /* Assemble command function */
-MODULE_SCOPE int	Tcl_AssembleObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	TclNRAssembleObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_AssembleObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc TclNRAssembleObjCmd;
 MODULE_SCOPE Tcl_Command TclInitEncodingCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	Tcl_EofObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ErrorObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_EvalObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ExecObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ExitObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ExprObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_FblockedObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_FconfigureObjCmd(
-			    void *clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_FcopyObjCmd(void *dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_EofObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ErrorObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_EvalObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ExecObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ExitObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ExprObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_FblockedObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_FconfigureObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_FcopyObjCmd;
 MODULE_SCOPE Tcl_Command TclInitFileCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	Tcl_FileEventObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_FlushObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ForObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ForeachObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_FormatObjCmd(void *dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_GetsObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_GlobalObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_GlobObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_IfObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_IncrObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_FileEventObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_FlushObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ForObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ForeachObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_FormatObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_GetsObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_GlobalObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_GlobObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_IfObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_IncrObjCmd;
 MODULE_SCOPE Tcl_Command TclInitInfoCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	Tcl_InterpObjCmd(void *clientData,
-			    Tcl_Interp *interp, int argc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_JoinObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LappendObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LassignObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LeditObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LindexObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LinsertObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LlengthObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ListObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LmapObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LoadObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LpopObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LrangeObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LremoveObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LrepeatObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LreplaceObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LreverseObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LsearchObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LseqObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LsetObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_LsortObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_InterpObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_JoinObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LappendObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LassignObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LeditObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LindexObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LinsertObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LlengthObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ListObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LmapObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LoadObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LpopObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LrangeObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LremoveObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LrepeatObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LreplaceObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LreverseObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LsearchObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LseqObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LsetObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_LsortObjCmd;
 MODULE_SCOPE Tcl_Command TclInitNamespaceCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	TclNamespaceEnsembleCmd(void *dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_OpenObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_PackageObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_PidObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclNamespaceEnsembleCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_OpenObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_PackageObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_PidObjCmd;
 MODULE_SCOPE Tcl_Command TclInitPrefixCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	Tcl_PutsObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_PwdObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ReadObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_RegexpObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_RegsubObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_RenameObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_RepresentationCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ReturnObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ScanObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_SeekObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_SetObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_SplitObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_SocketObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_SourceObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_PutsObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_PwdObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ReadObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_RegexpObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_RegsubObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_RenameObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_RepresentationCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ReturnObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ScanObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_SeekObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_SetObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_SplitObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_SocketObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_SourceObjCmd;
 MODULE_SCOPE Tcl_Command TclInitStringCmd(Tcl_Interp *interp);
-MODULE_SCOPE int	Tcl_SubstObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_SwitchObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_TellObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_ThrowObjCmd(void *dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_TimeObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_TimeRateObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_TraceObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_TryObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_UnloadObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_UnsetObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_UpdateObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_UplevelObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_UpvarObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_VariableObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_VwaitObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-MODULE_SCOPE int	Tcl_WhileObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_SubstObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_SwitchObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_TellObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_ThrowObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_TimeObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_TimeRateObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_TraceObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_TryObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_UnloadObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_UnsetObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_UpdateObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_UplevelObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_UpvarObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_VariableObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_VwaitObjCmd;
+MODULE_SCOPE Tcl_ObjCmdProc Tcl_WhileObjCmd;
 
 /*
  *----------------------------------------------------------------
@@ -4173,105 +3985,71 @@ MODULE_SCOPE int	TclCompileBasicMin2ArgCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
 
-MODULE_SCOPE int	TclInvertOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclInvertOpCmd;
 MODULE_SCOPE int	TclCompileInvertOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclNotOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclNotOpCmd;
 MODULE_SCOPE int	TclCompileNotOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclAddOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclAddOpCmd;
 MODULE_SCOPE int	TclCompileAddOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclMulOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclMulOpCmd;
 MODULE_SCOPE int	TclCompileMulOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclAndOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclAndOpCmd;
 MODULE_SCOPE int	TclCompileAndOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclOrOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclOrOpCmd;
 MODULE_SCOPE int	TclCompileOrOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclXorOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclXorOpCmd;
 MODULE_SCOPE int	TclCompileXorOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclPowOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclPowOpCmd;
 MODULE_SCOPE int	TclCompilePowOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclLshiftOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclLshiftOpCmd;
 MODULE_SCOPE int	TclCompileLshiftOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclRshiftOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclRshiftOpCmd;
 MODULE_SCOPE int	TclCompileRshiftOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclModOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclModOpCmd;
 MODULE_SCOPE int	TclCompileModOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclNeqOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclNeqOpCmd;
 MODULE_SCOPE int	TclCompileNeqOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclStrneqOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclStrneqOpCmd;
 MODULE_SCOPE int	TclCompileStrneqOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclInOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclInOpCmd;
 MODULE_SCOPE int	TclCompileInOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclNiOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclNiOpCmd;
 MODULE_SCOPE int	TclCompileNiOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclMinusOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclMinusOpCmd;
 MODULE_SCOPE int	TclCompileMinusOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclDivOpCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+MODULE_SCOPE Tcl_ObjCmdProc TclDivOpCmd;
 MODULE_SCOPE int	TclCompileDivOpCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
diff --git a/generic/tclProcess.c b/generic/tclProcess.c
index 65c087c..aec8c0a 100644
--- a/generic/tclProcess.c
+++ b/generic/tclProcess.c
@@ -51,18 +51,10 @@ static TclProcessWaitStatus WaitProcessStatus(Tcl_Pid pid, int resolvedPid,
 			    int options, int *codePtr, Tcl_Obj **msgPtr,
 			    Tcl_Obj **errorObjPtr);
 static Tcl_Obj *	BuildProcessStatusObj(ProcessInfo *info);
-static int		ProcessListObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		ProcessStatusObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		ProcessPurgeObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		ProcessAutopurgeObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc ProcessListObjCmd;
+static Tcl_ObjCmdProc ProcessStatusObjCmd;
+static Tcl_ObjCmdProc ProcessPurgeObjCmd;
+static Tcl_ObjCmdProc ProcessAutopurgeObjCmd;
 
 /*
  *----------------------------------------------------------------------
@@ -402,7 +394,7 @@ BuildProcessStatusObj(
 
 static int
 ProcessListObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -453,7 +445,7 @@ ProcessListObjCmd(
 
 static int
 ProcessStatusObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -601,7 +593,7 @@ ProcessStatusObjCmd(
 
 static int
 ProcessPurgeObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -701,7 +693,7 @@ ProcessPurgeObjCmd(
 
 static int
 ProcessAutopurgeObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index 844ff1b..9b6aa1d 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -45,10 +45,8 @@ typedef struct CmdTable {
  * Declarations for functions defined in this file.
  */
 
-static int	ProcBodyTestProcObjCmd(void *dummy,
-			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
-static int	ProcBodyTestCheckObjCmd(void *dummy,
-			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc ProcBodyTestProcObjCmd;
+static Tcl_ObjCmdProc ProcBodyTestCheckObjCmd;
 static int	ProcBodyTestInitInternal(Tcl_Interp *interp, int isSafe);
 static int	RegisterCommand(Tcl_Interp* interp,
 			const char *namesp, const CmdTable *cmdTablePtr);
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index cf9d0da..03446c2 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -119,9 +119,7 @@ static char *errorProcString;
 
 TCL_DECLARE_MUTEX(threadMutex)
 
-static int		ThreadObjCmd(void *clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc ThreadObjCmd;
 static int		ThreadCreate(Tcl_Interp *interp, const char *script,
 			    int joinable);
 static int		ThreadList(Tcl_Interp *interp);
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 2ef51b2..2a96fb6 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -212,9 +212,7 @@ static void		UnsetVarStruct(Var *varPtr, Var *arrayPtr,
  * TIP #508: [array default]
  */
 
-static int		ArrayDefaultCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc ArrayDefaultCmd;
 static void		DeleteArrayVar(Var *arrayPtr);
 static void		SetArrayDefault(Var *arrayPtr, Tcl_Obj *defaultObj);
 
@@ -1524,7 +1522,7 @@ TclPtrGetVarIdx(
 
 int
 Tcl_SetObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2818,7 +2816,7 @@ UnsetVarStruct(
 
 int
 Tcl_UnsetObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2885,7 +2883,7 @@ Tcl_UnsetObjCmd(
 
 int
 Tcl_AppendObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2950,7 +2948,7 @@ Tcl_AppendObjCmd(
 
 int
 Tcl_LappendObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3156,7 +3154,7 @@ ArrayObjNext(
 
 static int
 ArrayForObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3166,7 +3164,7 @@ ArrayForObjCmd(
 
 static int
 ArrayForNRCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -3237,7 +3235,7 @@ ArrayForNRCmd(
 
 static int
 ArrayForLoopCallback(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -3395,7 +3393,7 @@ ArrayPopulateSearch(
 
 static int
 ArrayStartSearchCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -3490,7 +3488,7 @@ ArrayDoneSearch(
 
 static int
 ArrayAnyMoreCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -3568,7 +3566,7 @@ ArrayAnyMoreCmd(
 
 static int
 ArrayNextElementCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -3648,7 +3646,7 @@ ArrayNextElementCmd(
 
 static int
 ArrayDoneSearchCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -3708,7 +3706,7 @@ ArrayDoneSearchCmd(
 
 static int
 ArrayExistsCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -3748,7 +3746,7 @@ ArrayExistsCmd(
 
 static int
 ArrayGetCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -3907,7 +3905,7 @@ ArrayGetCmd(
 
 static int
 ArrayNamesCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -4074,7 +4072,7 @@ TclFindArrayPtrElements(
 
 static int
 ArraySetCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -4249,7 +4247,7 @@ ArraySetCmd(
 
 static int
 ArraySizeCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -4308,7 +4306,7 @@ ArraySizeCmd(
 
 static int
 ArrayStatsCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -4362,7 +4360,7 @@ ArrayStatsCmd(
 
 static int
 ArrayUnsetCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -4987,7 +4985,7 @@ Tcl_GetVariableFullName(
 
 int
 Tcl_GlobalObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -5091,7 +5089,7 @@ Tcl_GlobalObjCmd(
 
 int
 Tcl_VariableObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -5224,7 +5222,7 @@ Tcl_VariableObjCmd(
 
 int
 Tcl_UpvarObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -6036,7 +6034,7 @@ ObjFindNamespaceVar(
 
 int
 TclInfoVarsCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -6227,7 +6225,7 @@ TclInfoVarsCmd(
 
 int
 TclInfoGlobalsCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -6320,7 +6318,7 @@ TclInfoGlobalsCmd(
 
 int
 TclInfoLocalsCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -6625,7 +6623,7 @@ CompareVarKeys(
 
 static int
 ArrayDefaultCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
-- 
cgit v0.12


From 763c581edb801f34c61cce8eadcf7d8904b3cce9 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 10 Oct 2022 15:37:23 +0000
Subject: Bugfix library/http/http.tcl for connection request header -
 tcllib/websocket ticket [d01de3281f].  Revise header order in 3 tests.

---
 library/http/http.tcl | 37 ++++++++++++++++++++++++++++++-------
 tests/http.test       |  6 +++---
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 326aede..88685ec 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1260,6 +1260,7 @@ proc http::CreateToken {url args} {
 			   [GetFieldValue $state(-headers) Upgrade]]
     set state(upgradeRequest) [expr {    "upgrade" in $connectionValues
 				      && [llength $upgradeValues] >= 1}]
+    set state(connectionValues) $connectionValues
 
     if {$isQuery || $isQueryChannel} {
 	# It's a POST.
@@ -2104,24 +2105,25 @@ proc http::Connected {token proto phost srvurl} {
 	if {($state(-protocol) > 1.0) && $state(-keepalive)} {
 	    # Send this header, because a 1.1 server is not compelled to treat
 	    # this as the default.
-	    SendHeader $token Connection keep-alive
-	}
-	if {($state(-protocol) > 1.0) && !$state(-keepalive)} {
-	    SendHeader $token Connection close ;# RFC2616 sec 8.1.2.1
-	}
-	if {($state(-protocol) < 1.1)} {
+	    set ConnVal keep-alive
+	} elseif {($state(-protocol) > 1.0)} {
+	    # RFC2616 sec 8.1.2.1
+	    set ConnVal close
+	} else {
+	    # ($state(-protocol) <= 1.0)
 	    # RFC7230 A.1
 	    # Some server implementations of HTTP/1.0 have a faulty
 	    # implementation of RFC 2068 Keep-Alive.
 	    # Don't leave this to chance.
 	    # For HTTP/1.0 we have already "set state(connection) close"
 	    # and "state(-keepalive) 0".
-	    SendHeader $token Connection close
+	    set ConnVal close
 	}
 	# RFC7230 A.1 - "clients are encouraged not to send the
 	# Proxy-Connection header field in any requests"
 	set accept_encoding_seen 0
 	set content_type_seen 0
+	set connection_seen 0
 	foreach {key value} $state(-headers) {
 	    set value [string map [list \n "" \r ""] $value]
 	    set key [string map {" " -} [string trim $key]]
@@ -2141,6 +2143,24 @@ proc http::Connected {token proto phost srvurl} {
 		set contDone 1
 		set state(querylength) $value
 	    }
+	    if {[string equal -nocase $key "connection"]} {
+		# Remove "close" or "keep-alive" and use our own value.
+		# In an upgrade request, the upgrade is not guaranteed.
+		# Value "close" or "keep-alive" tells the server what to do
+		# if it refuses the upgrade.  We send a single "Connection"
+		# header because some websocket servers, e.g. civetweb, reject
+		# multiple headers. Bug [d01de3281f] of tcllib/websocket.
+		set connection_seen 1
+		set listVal $state(connectionValues)
+		if {[set pos [lsearch $listVal close]] != -1} {
+		    set listVal [lreplace $listVal $pos $pos]
+		}
+		if {[set pos [lsearch $listVal keep-alive]] != -1} {
+		    set listVal [lreplace $listVal $pos $pos]
+		}
+		lappend listVal $ConnVal
+		set value [join $listVal {, }]
+	    }
 	    if {[string length $key]} {
 		SendHeader $token $key $value
 	    }
@@ -2159,6 +2179,9 @@ proc http::Connected {token proto phost srvurl} {
 	    SendHeader $token Accept-Encoding identity
 	} else {
 	}
+	if {!$connection_seen} {
+	    SendHeader $token Connection $ConnVal
+	}
 	if {$isQueryChannel && ($state(querylength) == 0)} {
 	    # Try to determine size of data in channel. If we cannot seek, the
 	    # surrounding catch will trap us
diff --git a/tests/http.test b/tests/http.test
index e88210a..1218536 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -409,10 +409,10 @@ test http-3.27 {http::geturl: -headers override -type} -body {
     http::cleanup $token
 } -match regexp -result {(?n)Host .*
 User-Agent .*
-Connection close
 Content-Type {text/plain;charset=utf-8}
 Accept \*/\*
 Accept-Encoding .*
+Connection close
 Content-Length 5}
 test http-3.28 {http::geturl: -headers override -type default} -body {
     set token [http::geturl $url/headers -query dummy \
@@ -422,10 +422,10 @@ test http-3.28 {http::geturl: -headers override -type default} -body {
     http::cleanup $token
 } -match regexp -result {(?n)Host .*
 User-Agent .*
-Connection close
 Content-Type {text/plain;charset=utf-8}
 Accept \*/\*
 Accept-Encoding .*
+Connection close
 Content-Length 5}
 test http-3.29 {http::geturl IPv6 address} -body {
     # We only want to see if the URL gets parsed correctly. This is
@@ -462,9 +462,9 @@ test http-3.32 {http::geturl: -headers override -accept default} -body {
     http::cleanup $token
 } -match regexp -result {(?n)Host .*
 User-Agent .*
-Connection close
 Accept text/plain,application/tcl-test-value
 Accept-Encoding .*
+Connection close
 Content-Type application/x-www-form-urlencoded
 Content-Length 5}
 # Bug 838e99a76d
-- 
cgit v0.12


From b17bb4724c7bee03cf081b87436b936da78681c5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Oct 2022 06:22:10 +0000
Subject: Making a start fixing [6978c01b65]: Channel encoding difference 8.6
 <-> 9.0

---
 generic/tclIO.c | 12 +++++++++++-
 generic/tclIO.h |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6a9c306..097b6ee 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4466,7 +4466,7 @@ Write(
 	 * current output encoding and strict encoding is active.
 	 */
 
-	if (result == TCL_CONVERT_UNKNOWN) {
+	if (result == TCL_CONVERT_UNKNOWN || result == TCL_CONVERT_SYNTAX) {
 	    encodingError = 1;
 	    result = TCL_OK;
 	}
@@ -5516,6 +5516,11 @@ FilterInputBytes(
 	    &statePtr->inputEncodingState, dst, spaceLeft, &gsPtr->rawRead,
 	    &gsPtr->bytesWrote, &gsPtr->charsWrote);
 
+	if (result == TCL_CONVERT_UNKNOWN || result == TCL_CONVERT_SYNTAX) {
+		SetFlag(statePtr, CHANNEL_ENCODING_ERROR);
+		result = TCL_OK;
+	}
+
     /*
      * Make sure that if we go through 'gets', that we reset the
      * TCL_ENCODING_START flag still. [Bug #523988]
@@ -6344,6 +6349,11 @@ ReadChars(
 		flags, &statePtr->inputEncodingState,
 		dst, dstLimit, &srcRead, &dstDecoded, &numChars);
 
+	if (code == TCL_CONVERT_UNKNOWN || code == TCL_CONVERT_SYNTAX) {
+		SetFlag(statePtr, CHANNEL_ENCODING_ERROR);
+	    code = TCL_OK;
+	}
+
 	/*
 	 * Perform the translation transformation in place.  Read no more than
 	 * the dstDecoded bytes the encoding transformation actually produced.
diff --git a/generic/tclIO.h b/generic/tclIO.h
index e8d2736..8f30cf0 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -271,6 +271,8 @@ typedef struct ChannelState {
 					 * delivered for buffered data until
 					 * the state of the channel
 					 * changes. */
+#define CHANNEL_ENCODING_ERROR	(1<<15)	/* set if channel
+					 * encountered an encoding error */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
 #define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option
-- 
cgit v0.12


From 0d0cf6602a9b466d777c22736156422c586c8c94 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Oct 2022 06:26:44 +0000
Subject: There's a duplicate set of io-75.* testcases, so renumber one of them

---
 tests/io.test | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 96abadd..f928cd3 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9052,7 +9052,7 @@ test io-75.5 {incomplete shiftjis encoding read is ignored} -setup {
 
 
 
-test io-75.0 {channel modes} -setup {
+test io-76.0 {channel modes} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r]
 } -constraints testchannel -body {
@@ -9062,7 +9062,7 @@ test io-75.0 {channel modes} -setup {
     removeFile dummy
 } -result {read {}}
 
-test io-75.1 {channel modes} -setup {
+test io-76.1 {channel modes} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile w]
 } -constraints testchannel -body {
@@ -9072,7 +9072,7 @@ test io-75.1 {channel modes} -setup {
     removeFile dummy
 } -result {{} write}
 
-test io-75.2 {channel modes} -setup {
+test io-76.2 {channel modes} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r+]
 } -constraints testchannel -body {
@@ -9082,7 +9082,7 @@ test io-75.2 {channel modes} -setup {
     removeFile dummy
 } -result {read write}
 
-test io-75.3 {channel mode dropping} -setup {
+test io-76.3 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r]
 } -constraints testchannel -body {
@@ -9093,7 +9093,7 @@ test io-75.3 {channel mode dropping} -setup {
     removeFile dummy
 } -result {{read {}} {read {}}}
 
-test io-75.4 {channel mode dropping} -setup {
+test io-76.4 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r]
 } -constraints testchannel -body {
@@ -9103,7 +9103,7 @@ test io-75.4 {channel mode dropping} -setup {
     removeFile dummy
 } -match glob -result {Tcl_RemoveChannelMode error: Bad mode, would make channel inacessible. Channel: "*"}
 
-test io-75.5 {channel mode dropping} -setup {
+test io-76.5 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile w]
 } -constraints testchannel -body {
@@ -9114,7 +9114,7 @@ test io-75.5 {channel mode dropping} -setup {
     removeFile dummy
 } -result {{{} write} {{} write}}
 
-test io-75.6 {channel mode dropping} -setup {
+test io-76.6 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile w]
 } -constraints testchannel -body {
@@ -9124,7 +9124,7 @@ test io-75.6 {channel mode dropping} -setup {
     removeFile dummy
 } -match glob -result {Tcl_RemoveChannelMode error: Bad mode, would make channel inacessible. Channel: "*"}
 
-test io-75.7 {channel mode dropping} -setup {
+test io-76.7 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r+]
 } -constraints testchannel -body {
@@ -9135,7 +9135,7 @@ test io-75.7 {channel mode dropping} -setup {
     removeFile dummy
 } -result {{{} write} {read write}}
 
-test io-75.8 {channel mode dropping} -setup {
+test io-76.8 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r+]
 } -constraints testchannel -body {
@@ -9146,7 +9146,7 @@ test io-75.8 {channel mode dropping} -setup {
     removeFile dummy
 } -result {{read {}} {read write}}
 
-test io-75.9 {channel mode dropping} -setup {
+test io-76.9 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r+]
 } -constraints testchannel -body {
@@ -9157,7 +9157,7 @@ test io-75.9 {channel mode dropping} -setup {
     removeFile dummy
 } -match glob -result {Tcl_RemoveChannelMode error: Bad mode, would make channel inacessible. Channel: "*"}
 
-test io-75.10 {channel mode dropping} -setup {
+test io-76.10 {channel mode dropping} -setup {
     set datafile [makeFile {some characters} dummy]
     set f [open $datafile r+]
 } -constraints testchannel -body {
-- 
cgit v0.12


From 6b05e4086f08a1a91dc39467e9421a011ba91768 Mon Sep 17 00:00:00 2001
From: sbron <tclcore@tclcode.com>
Date: Tue, 11 Oct 2022 10:37:03 +0000
Subject: Update Tcl_TraceVar manual page.

---
 doc/TraceVar.3 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/TraceVar.3 b/doc/TraceVar.3
index 649565a..2a3c58d 100644
--- a/doc/TraceVar.3
+++ b/doc/TraceVar.3
@@ -137,9 +137,11 @@ trace was created.
 \fIclientData\fR typically points to an application-specific
 data structure that describes what to do when \fIproc\fR
 is invoked.
-\fIName1\fR and \fIname2\fR give the name of the traced variable
-in the normal two-part form (see the description of \fBTcl_TraceVar2\fR
-below for details).
+\fIName1\fR and \fIname2\fR give the name of the variable that
+triggered the callback in the normal two-part form (see the description
+of \fBTcl_TraceVar2\fR below for details).  In case \fIname1\fR is an
+alias to an array element (created through facilities such as \fBupvar\fR),
+\fIname2\fR holds the index of the array element, rather than NULL.
 \fIFlags\fR is an OR-ed combination of bits providing several
 pieces of information.
 One of the bits \fBTCL_TRACE_READS\fR, \fBTCL_TRACE_WRITES\fR,
-- 
cgit v0.12


From 75ba8ac33bf8e8e9c0dfed189d177ebb6710dd15 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Oct 2022 11:02:45 +0000
Subject: Format errors in vwait.n

---
 doc/vwait.n | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/vwait.n b/doc/vwait.n
index 5f240d6..d67c16d 100644
--- a/doc/vwait.n
+++ b/doc/vwait.n
@@ -13,7 +13,7 @@ vwait \- Process events until a variable is written
 .SH SYNOPSIS
 \fBvwait\fR \fIvarName\fR
 .PP
-\fBvwait\fR ?\Ioptions\fR? ?\fIvarName ...\fR?
+\fBvwait\fR ?\fIoptions\fR? ?\fIvarName ...\fR?
 .BE
 .SH DESCRIPTION
 .PP
@@ -66,7 +66,7 @@ Events of the windowing system are not handled during the wait operation.
 \fIChannel\fR must name a Tcl channel open for reading. If \fIchannel\fR
 is or becomes readable the wait operation completes.
 .TP
-\fB\-timeout\fR milliseconds\fR
+\fB\-timeout\fR \fImilliseconds\fR
 .
 The wait operation is constrained to \fImilliseconds\fR.
 .TP
-- 
cgit v0.12


From d4c0a2c2ae26239197650eaaf6388d7ccdc51e48 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Oct 2022 14:22:17 +0000
Subject: Few more formatting errors

---
 doc/http.n  | 6 +-----
 doc/vwait.n | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/doc/http.n b/doc/http.n
index c08d221..59f15b6 100644
--- a/doc/http.n
+++ b/doc/http.n
@@ -613,13 +613,11 @@ The "request line" is the first line of a HTTP client request, and has three
 elements separated by spaces: the HTTP method, the URL relative to the server,
 and the HTTP version. Examples:
 .PP
-.DS
 .RS
 GET / HTTP/1.1
 GET /introduction.html?subject=plumbing HTTP/1.1
 POST /forms/order.html HTTP/1.1
 .RE
-.DE
 .TP
 \fB::http::requestHeaders\fR \fItoken\fR ?\fIheaderName\fR?
 .
@@ -650,12 +648,10 @@ elements separated by spaces: the HTTP version, a three-digit numerical
 "status code", and a "reason phrase".  Only the reason phrase may contain
 spaces.  Examples:
 .PP
-.DS
 .RS
 HTTP/1.1 200 OK
 HTTP/1.0 404 Not Found
 .RE
-.DE
 .RS
 The "status code" is a three-digit number in the range 100 to 599.
 A value of 200 is the normal return from a GET request, and its matching
@@ -1589,7 +1585,7 @@ that \fB::tls::socketCmd\fR has this value, it replaces it with the value
 i.e. if the script or the Tcl installation has replaced the value "::socket"
 with the name of a different command, then http does not change the value.
 The script or installation that modified \fB::tls::socketCmd\fR is responsible
-for integrating \fR::http::socket\fR into its own replacement command.
+for integrating \fB::http::socket\fR into its own replacement command.
 .PP
 .SS "WITH A CHILD INTERPRETER"
 .PP
diff --git a/doc/vwait.n b/doc/vwait.n
index d67c16d..e595a74 100644
--- a/doc/vwait.n
+++ b/doc/vwait.n
@@ -12,7 +12,7 @@
 vwait \- Process events until a variable is written
 .SH SYNOPSIS
 \fBvwait\fR \fIvarName\fR
-.PP
+.sp
 \fBvwait\fR ?\fIoptions\fR? ?\fIvarName ...\fR?
 .BE
 .SH DESCRIPTION
-- 
cgit v0.12


From 4391b633d94f7d36fc07107753bac88a29504488 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 11 Oct 2022 15:07:33 +0000
Subject: TIP 644 - Make Tcl_ObjType extensible

---
 generic/tcl.h            |  5 +++++
 generic/tclArithSeries.c |  3 ++-
 generic/tclAssembly.c    |  3 ++-
 generic/tclBinary.c      |  3 ++-
 generic/tclCompile.c     |  4 +++-
 generic/tclDictObj.c     |  3 ++-
 generic/tclDisassemble.c |  1 +
 generic/tclEncoding.c    |  8 +++++++-
 generic/tclEnsemble.c    |  3 ++-
 generic/tclExecute.c     |  5 +++--
 generic/tclIO.c          |  3 ++-
 generic/tclIndexObj.c    |  3 ++-
 generic/tclLink.c        |  3 ++-
 generic/tclListObj.c     |  3 ++-
 generic/tclNamesp.c      |  3 ++-
 generic/tclOOCall.c      |  3 ++-
 generic/tclObj.c         | 15 ++++++++++-----
 generic/tclPathObj.c     |  3 ++-
 generic/tclProc.c        |  8 +++++---
 generic/tclRegexp.c      |  3 ++-
 generic/tclStringObj.c   |  3 ++-
 generic/tclUtil.c        |  3 ++-
 generic/tclVar.c         |  4 ++--
 23 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 80494f3..f1d27ef 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -616,7 +616,12 @@ typedef struct Tcl_ObjType {
 				/* Called to convert the object's internal rep
 				 * to this type. Frees the internal rep of the
 				 * old type. Returns TCL_ERROR on failure. */
+    unsigned char version;
 } Tcl_ObjType;
+#define TCL_OBJTYPE_V0 0 /* Pre-Tcl 9. Set to 0 so compiler will auto-init 
+			  * when existing code that does not init this field
+			  * is compiled with Tcl9 headers */
+#define TCL_OBJTYPE_CURRENT TCL_OBJTYPE_V0
 
 /*
  * The following structure stores an internal representation (internalrep) for
diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index d88c8ed..65807c3 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -75,7 +75,8 @@ const Tcl_ObjType tclArithSeriesType = {
     FreeArithSeriesInternalRep,		/* freeIntRepProc */
     DupArithSeriesInternalRep,		/* dupIntRepProc */
     UpdateStringOfArithSeries,		/* updateStringProc */
-    SetArithSeriesFromAny		/* setFromAnyProc */
+    SetArithSeriesFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index b7bfd2d..9448162 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -325,7 +325,8 @@ static const Tcl_ObjType assembleCodeType = {
     FreeAssembleCodeInternalRep, /* freeIntRepProc */
     DupAssembleCodeInternalRep,	 /* dupIntRepProc */
     NULL,			 /* updateStringProc */
-    NULL			 /* setFromAnyProc */
+    NULL,			 /* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index a7d6617..7e2634c 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -162,7 +162,8 @@ static const Tcl_ObjType properByteArrayType = {
     FreeProperByteArrayInternalRep,
     DupProperByteArrayInternalRep,
     UpdateStringOfByteArray,
-    NULL
+    NULL,
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index a57743c..fc2b6b7 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -708,7 +708,8 @@ const Tcl_ObjType tclByteCodeType = {
     FreeByteCodeInternalRep,	/* freeIntRepProc */
     DupByteCodeInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetByteCodeFromAny		/* setFromAnyProc */
+    SetByteCodeFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
@@ -722,6 +723,7 @@ static const Tcl_ObjType substCodeType = {
     DupByteCodeInternalRep,	/* dupIntRepProc - shared with bytecode */
     NULL,			/* updateStringProc */
     NULL,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 #define SubstFlags(objPtr) (objPtr)->internalRep.twoPtrValue.ptr2
 
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index ca2501c..26f98e1 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -146,7 +146,8 @@ const Tcl_ObjType tclDictType = {
     FreeDictInternalRep,		/* freeIntRepProc */
     DupDictInternalRep,			/* dupIntRepProc */
     UpdateStringOfDict,			/* updateStringProc */
-    SetDictFromAny			/* setFromAnyProc */
+    SetDictFromAny,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 #define DictSetInternalRep(objPtr, dictRepPtr)				\
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 8fd90a3..9670b84 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -42,6 +42,7 @@ static const Tcl_ObjType instNameType = {
     NULL,			/* dupIntRepProc */
     UpdateStringOfInstName,	/* updateStringProc */
     NULL,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0,
 };
 
 #define InstNameSetInternalRep(objPtr, inst)				\
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index e366904..7e7c1a6 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -236,8 +236,14 @@ static Tcl_EncodingConvertProc	Iso88591ToUtfProc;
  */
 
 static const Tcl_ObjType encodingType = {
-    "encoding", FreeEncodingInternalRep, DupEncodingInternalRep, NULL, NULL
+    "encoding",
+    FreeEncodingInternalRep,
+    DupEncodingInternalRep,
+    NULL,
+    NULL,
+    TCL_OBJTYPE_V0,
 };
+
 #define EncodingSetInternalRep(objPtr, encoding)				\
     do {								\
 	Tcl_ObjInternalRep ir;						\
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 8bb90da..44179cf 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -81,7 +81,8 @@ static const Tcl_ObjType ensembleCmdType = {
     FreeEnsembleCmdRep,		/* freeIntRepProc */
     DupEnsembleCmdRep,		/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    NULL			/* setFromAnyProc */
+    NULL,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 #define ECRSetInternalRep(objPtr, ecRepPtr)					\
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 4b9ed0d..2ec0337 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -663,7 +663,8 @@ static const Tcl_ObjType exprCodeType = {
     FreeExprCodeInternalRep,	/* freeIntRepProc */
     DupExprCodeInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    NULL			/* setFromAnyProc */
+    NULL,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
@@ -674,7 +675,7 @@ static const Tcl_ObjType exprCodeType = {
 static const Tcl_ObjType dictIteratorType = {
     "dictIterator",
     ReleaseDictIterator,
-    NULL, NULL, NULL
+    NULL, NULL, NULL, TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5f831c9..8d54045 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -332,7 +332,8 @@ static const Tcl_ObjType chanObjType = {
     FreeChannelInternalRep,		/* freeIntRepProc */
     DupChannelInternalRep,		/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    NULL			/* setFromAnyProc */
+    NULL,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 #define ChanSetInternalRep(objPtr, resPtr)					\
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index aab7820..58bcc04 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -41,7 +41,8 @@ static const Tcl_ObjType indexType = {
     FreeIndex,			/* freeIntRepProc */
     DupIndex,			/* dupIntRepProc */
     UpdateStringOfIndex,	/* updateStringProc */
-    NULL			/* setFromAnyProc */
+    NULL,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 2649d12..d184700 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -114,7 +114,8 @@ static Tcl_ObjType invalidRealType = {
     NULL,				/* freeIntRepProc */
     NULL,				/* dupIntRepProc */
     NULL,				/* updateStringProc */
-    NULL				/* setFromAnyProc */
+    NULL,				/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 14f6132..06a316f 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -155,7 +155,8 @@ const Tcl_ObjType tclListType = {
     FreeListInternalRep,	/* freeIntRepProc */
     DupListInternalRep,		/* dupIntRepProc */
     UpdateStringOfList,		/* updateStringProc */
-    SetListFromAny		/* setFromAnyProc */
+    SetListFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /* Macros to manipulate the List internal rep */
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 979426c..1882e0a 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -130,7 +130,8 @@ static const Tcl_ObjType nsNameType = {
     FreeNsNameInternalRep,	/* freeIntRepProc */
     DupNsNameInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetNsNameFromAny		/* setFromAnyProc */
+    SetNsNameFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 #define NsNameSetInternalRep(objPtr, nnPtr)					\
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 912c368..450fc9f 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -150,7 +150,8 @@ static const Tcl_ObjType methodNameType = {
     FreeMethodNameRep,
     DupMethodNameRep,
     NULL,
-    NULL
+    NULL,
+    TCL_OBJTYPE_V0
 };
 
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 5e55784..eeaa727 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -230,28 +230,32 @@ const Tcl_ObjType tclBooleanType = {
     NULL,			/* freeIntRepProc */
     NULL,			/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    TclSetBooleanFromAny		/* setFromAnyProc */
+    TclSetBooleanFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 const Tcl_ObjType tclDoubleType = {
     "double",			/* name */
     NULL,			/* freeIntRepProc */
     NULL,			/* dupIntRepProc */
     UpdateStringOfDouble,	/* updateStringProc */
-    SetDoubleFromAny		/* setFromAnyProc */
+    SetDoubleFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 const Tcl_ObjType tclIntType = {
     "int",			/* name */
     NULL,			/* freeIntRepProc */
     NULL,			/* dupIntRepProc */
     UpdateStringOfInt,		/* updateStringProc */
-    SetIntFromAny		/* setFromAnyProc */
+    SetIntFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 const Tcl_ObjType tclBignumType = {
     "bignum",			/* name */
     FreeBignum,			/* freeIntRepProc */
     DupBignum,			/* dupIntRepProc */
     UpdateStringOfBignum,	/* updateStringProc */
-    NULL			/* setFromAnyProc */
+    NULL,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
@@ -295,7 +299,8 @@ Tcl_ObjType tclCmdNameType = {
     FreeCmdNameInternalRep,	/* freeIntRepProc */
     DupCmdNameInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetCmdNameFromAny		/* setFromAnyProc */
+    SetCmdNameFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 40955b1..17bbc46 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -41,7 +41,8 @@ static const Tcl_ObjType fsPathType = {
     FreeFsPathInternalRep,		/* freeIntRepProc */
     DupFsPathInternalRep,		/* dupIntRepProc */
     UpdateStringOfFsPath,		/* updateStringProc */
-    SetFsPathFromAny			/* setFromAnyProc */
+    SetFsPathFromAny,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclProc.c b/generic/tclProc.c
index acb520c..a9baba2 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -63,8 +63,9 @@ const Tcl_ObjType tclProcBodyType = {
     NULL,			/* UpdateString function; Tcl_GetString and
 				 * Tcl_GetStringFromObj should panic
 				 * instead. */
-    NULL			/* SetFromAny function; Tcl_ConvertToType
+    NULL,			/* SetFromAny function; Tcl_ConvertToType
 				 * should panic instead. */
+    TCL_OBJTYPE_V0
 };
 
 #define ProcSetIntRep(objPtr, procPtr)					\
@@ -93,7 +94,7 @@ const Tcl_ObjType tclProcBodyType = {
 
 static const Tcl_ObjType levelReferenceType = {
     "levelReference",
-    NULL, NULL, NULL, NULL
+    NULL, NULL, NULL, NULL, TCL_OBJTYPE_V0
 };
 
 /*
@@ -110,7 +111,8 @@ static const Tcl_ObjType lambdaType = {
     FreeLambdaInternalRep,	/* freeIntRepProc */
     DupLambdaInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetLambdaFromAny		/* setFromAnyProc */
+    SetLambdaFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 #define LambdaSetIntRep(objPtr, procPtr, nsObjPtr)			\
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 5fe5412..259e3f7 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -106,7 +106,8 @@ const Tcl_ObjType tclRegexpType = {
     FreeRegexpInternalRep,		/* freeIntRepProc */
     DupRegexpInternalRep,		/* dupIntRepProc */
     NULL,				/* updateStringProc */
-    SetRegexpFromAny			/* setFromAnyProc */
+    SetRegexpFromAny,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 #define RegexpSetInternalRep(objPtr, rePtr)					\
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index cf23aab..fb7e45a 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -90,7 +90,8 @@ const Tcl_ObjType tclStringType = {
     FreeStringInternalRep,	/* freeIntRepPro */
     DupStringInternalRep,	/* dupIntRepProc */
     UpdateStringOfString,	/* updateStringProc */
-    SetStringFromAny		/* setFromAnyProc */
+    SetStringFromAny,		/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 5870781..cdaa242 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -127,7 +127,8 @@ static const Tcl_ObjType endOffsetType = {
     NULL,				/* freeIntRepProc */
     NULL,				/* dupIntRepProc */
     NULL,				/* updateStringProc */
-    NULL				/* setFromAnyProc */
+    NULL,				/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 /*
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 337f923..6226e1e 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -245,7 +245,7 @@ static Tcl_DupInternalRepProc	DupParsedVarName;
 
 static const Tcl_ObjType localVarNameType = {
     "localVarName",
-    FreeLocalVarName, DupLocalVarName, NULL, NULL
+    FreeLocalVarName, DupLocalVarName, NULL, NULL, TCL_OBJTYPE_V0
 };
 
 #define LocalSetInternalRep(objPtr, index, namePtr)				\
@@ -268,7 +268,7 @@ static const Tcl_ObjType localVarNameType = {
 
 static const Tcl_ObjType parsedVarNameType = {
     "parsedVarName",
-    FreeParsedVarName, DupParsedVarName, NULL, NULL
+    FreeParsedVarName, DupParsedVarName, NULL, NULL, TCL_OBJTYPE_V0
 };
 
 #define ParsedSetInternalRep(objPtr, arrayPtr, elem)				\
-- 
cgit v0.12


From 7a961752a9d930a7eb51f6f813df3e4570026bb1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Oct 2022 15:48:43 +0000
Subject: Make TCL_ENCODING_STRICT and TCL_ENCODING_NOCOMPLAIN work independant
 from each other (suggested by Harald Oehlmann)

---
 generic/tcl.h         |  4 +++-
 generic/tclEncoding.c |  2 +-
 generic/tclIO.c       | 34 +++++++++++++++++++++-------------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 80494f3..1d2c5be 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -1890,6 +1890,8 @@ typedef struct Tcl_EncodingType {
  *				reset to an initial state. If the source
  *				buffer contains the entire input stream to be
  *				converted, this flag should be set.
+ * TCL_ENCODING_STRICT -	Be more strict in accepting what
+ *				is considered a 'invalid byte sequence'.
  * TCL_ENCODING_STOPONERROR -	Not used any more.
  * TCL_ENCODING_NO_TERMINATE - 	If set, Tcl_ExternalToUtf does not append a
  *				terminating NUL byte.  Since it does not need
@@ -1921,12 +1923,12 @@ typedef struct Tcl_EncodingType {
 
 #define TCL_ENCODING_START		0x01
 #define TCL_ENCODING_END		0x02
+#define TCL_ENCODING_STRICT			0x04
 #define TCL_ENCODING_STOPONERROR	0x0 /* Not used any more */
 #define TCL_ENCODING_NO_TERMINATE	0x08
 #define TCL_ENCODING_CHAR_LIMIT		0x10
 #define TCL_ENCODING_MODIFIED		0x20
 #define TCL_ENCODING_NOCOMPLAIN		0x40
-#define TCL_ENCODING_STRICT			0x44
 
 /*
  * The following definitions are the error codes returned by the conversion
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index e366904..cd6aacb 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2222,7 +2222,7 @@ BinaryProc(
  *-------------------------------------------------------------------------
  */
 
-#define STOPONERROR ((flags & TCL_ENCODING_STRICT) != TCL_ENCODING_NOCOMPLAIN)
+#define STOPONERROR (!(flags & TCL_ENCODING_NOCOMPLAIN))
 
 static int
 UtfToUtfProc(
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5f831c9..48aa18d 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4360,14 +4360,16 @@ Write(
     }
 
     /*
-     * Transfer encoding strict/nocomplain option to the encoding flags
+     * Transfer encoding nocomplain/strict option to the encoding flags
      */
 
+    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
+	statePtr->outputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
+    } else {
+	statePtr->outputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
+    }
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->outputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->outputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->outputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
     } else {
 	statePtr->outputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
@@ -4693,11 +4695,13 @@ Tcl_GetsObj(
      * Transfer encoding nocomplain/strict option to the encoding flags
      */
 
+    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
+    } else {
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
+    }
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
     } else {
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
@@ -5464,11 +5468,13 @@ FilterInputBytes(
      * Transfer encoding nocomplain/strict option to the encoding flags
      */
 
+    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
+    } else {
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
+    }
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
     } else {
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
@@ -6250,11 +6256,13 @@ ReadChars(
      * Transfer encoding nocomplain/strict option to the encoding flags
      */
 
+    if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
+    } else {
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_NOCOMPLAIN;
+    }
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
 	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
     } else {
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
     }
-- 
cgit v0.12


From b758c501cf323af7a0fddb806260e84ad03c68e5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Oct 2022 15:51:42 +0000
Subject: Document TCL_ENCODING_STRICT flag

---
 doc/Encoding.3 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 86c5a78..553cc21 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -114,7 +114,9 @@ byte is converted and then to reset to an initial state.
 \fBTCL_ENCODING_STOPONERROR\fR signifies that the conversion routine should
 return immediately upon reading a source character that does not exist in
 the target encoding; otherwise a default fallback character will
-automatically be substituted. The flag \fBTCL_ENCODING_NOCOMPLAIN\fR has
+automatically be substituted. The flag \fBTCL_ENCODING_STRICT\fR makes the
+encoder/decoder more strict in what it considers to be an invalid byte
+sequence. The flag \fBTCL_ENCODING_NOCOMPLAIN\fR has
 no effect, it is reserved for Tcl 9.0. The flag \fBTCL_ENCODING_MODIFIED\fR makes
 \fBTcl_UtfToExternalDStringEx\fR and \fBTcl_UtfToExternal\fR produce the
 byte sequence \exC0\ex80 in stead of \ex00, for the utf-8/cesu-8 encoders.
-- 
cgit v0.12


From 01b1e3aadf2bece4ca5fe2711ee9d6b06bf351ed Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Oct 2022 11:25:28 +0000
Subject: TIP #344 bugfix: on some platforms, <netinet/tcp.h> needs <stdint.h>
 to be included first

---
 unix/tclUnixSock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index e904cfd..abd7fa6 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -9,8 +9,8 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include <netinet/tcp.h>
 #include "tclInt.h"
+#include <netinet/tcp.h>
 
 /*
  * Helper macros to make parts of this file clearer. The macros do exactly
-- 
cgit v0.12


From 4addfd1f1e4fe9475c50be231c97bea3ffb086f1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Oct 2022 16:04:12 +0000
Subject: Extract TIP #637 implementation from "novem" branch

---
 doc/glob.n            |  4 +--
 generic/tclFileName.c | 54 +++++++++++---------------------------
 generic/tclInt.h      | 13 ----------
 library/package.tcl   |  3 +++
 tests/fCmd.test       |  8 +++---
 tests/fileName.test   | 72 +++++++++++++++++++++++++--------------------------
 tests/winFile.test    |  2 +-
 7 files changed, 61 insertions(+), 95 deletions(-)

diff --git a/doc/glob.n b/doc/glob.n
index 8a3099e..80610f7 100644
--- a/doc/glob.n
+++ b/doc/glob.n
@@ -46,8 +46,8 @@ separators.
 .TP
 \fB\-nocomplain\fR
 .
-Allows an empty list to be returned without error; without this
-switch an error is returned if the result list would be empty.
+Allows an empty list to be returned without error; This is the
+default behavior in Tcl 9.0, so this switch has no effect any more.
 .TP
 \fB\-path\fR \fIpathPrefix\fR
 .
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 408d295..040f0fd 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -35,6 +35,14 @@ static Tcl_Obj *	SplitUnixPath(const char *path);
 static int		DoGlob(Tcl_Interp *interp, Tcl_Obj *resultPtr,
 			    const char *separators, Tcl_Obj *pathPtr, int flags,
 			    char *pattern, Tcl_GlobTypeData *types);
+static int		TclGlob(Tcl_Interp *interp, char *pattern,
+			    Tcl_Obj *pathPrefix, int globFlags,
+			    Tcl_GlobTypeData *types);
+
+/* Flag values used by TclGlob() */
+
+#define TCL_GLOBMODE_DIR	4
+#define TCL_GLOBMODE_TAILS	8
 
 /*
  * When there is no support for getting the block size of a file in a stat()
@@ -1132,8 +1140,8 @@ Tcl_GlobObjCmd(
     dir = PATH_NONE;
     typePtr = NULL;
     for (i = 1; i < objc; i++) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObj(interp, objv[i], options,
+		"option", 0, &index) != TCL_OK) {
 	    string = TclGetString(objv[i]);
 	    if (string[0] == '-') {
 		/*
@@ -1155,7 +1163,10 @@ Tcl_GlobObjCmd(
 
 	switch (index) {
 	case GLOB_NOCOMPLAIN:			/* -nocomplain */
-	    globFlags |= TCL_GLOBMODE_NO_COMPLAIN;
+	    /*
+	     * Do nothing; This is normal operations in Tcl 9.
+	     * Keep accepting as a no-op option to accommodate old scripts.
+	     */
 	    break;
 	case GLOB_DIR:				/* -dir */
 	    if (i == (objc-1)) {
@@ -1513,41 +1524,6 @@ Tcl_GlobObjCmd(
 	}
     }
 
-    if ((globFlags & TCL_GLOBMODE_NO_COMPLAIN) == 0) {
-	if (TclListObjLengthM(interp, Tcl_GetObjResult(interp),
-		&length) != TCL_OK) {
-	    /*
-	     * This should never happen. Maybe we should be more dramatic.
-	     */
-
-	    result = TCL_ERROR;
-	    goto endOfGlob;
-	}
-
-	if (length == 0) {
-	    Tcl_Obj *errorMsg =
-		    Tcl_ObjPrintf("no files matched glob pattern%s \"",
-			    (join || (objc == 1)) ? "" : "s");
-
-	    if (join) {
-		Tcl_AppendToObj(errorMsg, Tcl_DStringValue(&prefix), -1);
-	    } else {
-		const char *sep = "";
-
-		for (i = 0; i < objc; i++) {
-		    Tcl_AppendPrintfToObj(errorMsg, "%s%s",
-			    sep, TclGetString(objv[i]));
-		    sep = " ";
-		}
-	    }
-	    Tcl_AppendToObj(errorMsg, "\"", -1);
-	    Tcl_SetObjResult(interp, errorMsg);
-	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "NOMATCH",
-		    NULL);
-	    result = TCL_ERROR;
-	}
-    }
-
   endOfGlob:
     if (join || (dir == PATH_GENERAL)) {
 	Tcl_DStringFree(&prefix);
@@ -1595,7 +1571,7 @@ Tcl_GlobObjCmd(
  *----------------------------------------------------------------------
  */
 
-int
+static int
 TclGlob(
     Tcl_Interp *interp,		/* Interpreter for returning error message or
 				 * appending list of matching file names. */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a02650a..a876f37 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2767,16 +2767,6 @@ typedef struct TclFileAttrProcs {
 
 typedef struct TclFile_ *TclFile;
 
-/*
- * The "globParameters" argument of the function TclGlob is an or'ed
- * combination of the following values:
- */
-
-#define TCL_GLOBMODE_NO_COMPLAIN	1
-#define TCL_GLOBMODE_JOIN		2
-#define TCL_GLOBMODE_DIR		4
-#define TCL_GLOBMODE_TAILS		8
-
 typedef enum Tcl_PathPart {
     TCL_PATH_DIRNAME,
     TCL_PATH_TAIL,
@@ -3188,9 +3178,6 @@ MODULE_SCOPE int	TclGetLoadedLibraries(Tcl_Interp *interp,
 				const char *packageName);
 MODULE_SCOPE int	TclGetWideBitsFromObj(Tcl_Interp *, Tcl_Obj *,
 				Tcl_WideInt *);
-MODULE_SCOPE int	TclGlob(Tcl_Interp *interp, char *pattern,
-			    Tcl_Obj *unquotedPrefix, int globFlags,
-			    Tcl_GlobTypeData *types);
 MODULE_SCOPE int	TclIncrObj(Tcl_Interp *interp, Tcl_Obj *valuePtr,
 			    Tcl_Obj *incrPtr);
 MODULE_SCOPE Tcl_Obj *	TclIncrObjVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
diff --git a/library/package.tcl b/library/package.tcl
index 5f0795f..0c4aa29 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -137,6 +137,9 @@ proc pkg_mkIndex {args} {
     } on error {msg opt} {
 	return -options $opt $msg
     }
+    if {[llength $fileList] == 0} {
+	return -code error "no files matched glob pattern \"$patternList\""
+    }
     foreach file $fileList {
 	# For each file, figure out what commands and packages it provides.
 	# To do this, create a child interpreter, load the file into the
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 811beb3..93793d1 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -829,12 +829,12 @@ test fCmd-7.4 {FileForceOption: bad option} -constraints {notRoot} -setup {
 } -result {bad option "-tf1": must be -force or --}
 test fCmd-7.5 {FileForceOption: multiple times through loop} -setup {
     cleanup
-} -constraints {notRoot} -returnCodes error -body {
+} -constraints {notRoot} -body {
     createfile --
     createfile -force
     file delete -force -force -- -- -force
     glob -- -- -force
-} -result {no files matched glob patterns "-- -force"}
+} -result {}
 
 test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
     -constraints {unix notRoot knownBug tildeexpansion} -body {
@@ -994,9 +994,9 @@ test fCmd-9.10 {file rename: comprehensive: file to new name and dir} -setup {
     testchmod 0o444 tf2
     file rename tf1 [file join td1 tf3]
     file rename tf2 [file join td1 tf4]
-    list [catch {glob tf*}] [lsort [glob -directory td1 t*]] \
+    list [glob tf*] [lsort [glob -directory td1 t*]] \
     [file writable [file join td1 tf3]] [file writable [file join td1 tf4]]
-} -result [subst {1 {[file join td1 tf3] [file join td1 tf4]} 1 0}]
+} -result [subst {{} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
 test fCmd-9.11 {file rename: comprehensive: dir to new name and dir} -setup {
     cleanup
 } -constraints {notRoot testchmod} -body {
diff --git a/tests/fileName.test b/tests/fileName.test
index c4735cb..416c419 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -701,9 +701,9 @@ test filename-10.24 {Tcl_TranslateFileName} -body {
     testtranslatefilename ~ouster/foo
 } -result {/home/ouster/foo} -constraints {nonPortable testtranslatefilename}
 
-test filename-11.1 {Tcl_GlobCmd} -returnCodes error -body {
+test filename-11.1 {Tcl_GlobCmd} -body {
     glob
-} -result {no files matched glob patterns ""}
+} -result {}
 test filename-11.2 {Tcl_GlobCmd} -returnCodes error -body {
     glob -gorp
 } -result {bad option "-gorp": must be -directory, -join, -nocomplain, -path, -tails, -types, or --}
@@ -717,19 +717,19 @@ test filename-11.5 {Tcl_GlobCmd} -body {
     # Should not error out because of ~
     catch {glob -nocomplain * ~xyqrszzz}
 } -result 0
-test filename-11.6 {Tcl_GlobCmd} -returnCodes error -body {
+test filename-11.6 {Tcl_GlobCmd} -body {
     glob ~xyqrszzz
-} -result {no files matched glob pattern "~xyqrszzz"}
-test filename-11.7 {Tcl_GlobCmd} -returnCodes error -body {
+} -result {}
+test filename-11.7 {Tcl_GlobCmd} -body {
     glob -- -nocomplain
-} -result {no files matched glob pattern "-nocomplain"}
+} -result {}
 test filename-11.8 {Tcl_GlobCmd} -body {
     glob -nocomplain -- -nocomplain
 } -result {}
 test filename-11.9 {Tcl_GlobCmd} -constraints {testsetplatform} -body {
     testsetplatform unix
     glob ~\\xyqrszzz/bar
-} -returnCodes error -result {no files matched glob pattern "~\xyqrszzz/bar"}
+} -result {}
 test filename-11.10 {Tcl_GlobCmd} -constraints {testsetplatform} -body {
     testsetplatform unix
     glob -nocomplain ~\\xyqrszzz/bar
@@ -737,22 +737,22 @@ test filename-11.10 {Tcl_GlobCmd} -constraints {testsetplatform} -body {
 test filename-11.11 {Tcl_GlobCmd} -constraints {testsetplatform} -body {
     testsetplatform unix
     glob ~xyqrszzz\\/\\bar
-} -returnCodes error -result {no files matched glob pattern "~xyqrszzz\/\bar"}
+} -result {}
 test filename-11.12 {Tcl_GlobCmd} -constraints {testsetplatform} -setup {
     testsetplatform unix
     set home $env(HOME)
 } -body {
     unset env(HOME)
     glob ~/*
-} -returnCodes error -cleanup {
+} -cleanup {
     set env(HOME) $home
-} -result {no files matched glob pattern "~/*"}
+} -result {}
 if {[testConstraint testsetplatform]} {
     testsetplatform $platform
 }
 test filename-11.13 {Tcl_GlobCmd} -body {
     file join [lindex [glob ~] 0]
-} -returnCodes error -result {no files matched glob pattern "~"}
+} -result {}
 set oldpwd [pwd]
 set oldhome $env(HOME)
 catch {cd [makeDirectory tcl[pid]]}
@@ -772,10 +772,10 @@ touch globTest/.1
 touch globTest/x,z1.c
 test filename-11.14 {Tcl_GlobCmd} -body {
     glob ~/globTest
-} -returnCodes error -result {no files matched glob pattern "~/globTest"}
+} -result {}
 test filename-11.15 {Tcl_GlobCmd} -body {
     glob ~\\/globTest
-} -returnCodes error -result {no files matched glob pattern "~\/globTest"}
+} -result {}
 test filename-11.16 {Tcl_GlobCmd} {
     glob globTest
 } {globTest}
@@ -1098,42 +1098,42 @@ file delete -force $tildeglobname
 set globname globTest
 unset horribleglobname tildeglobname
 
-test filename-12.1 {simple globbing} {unixOrWin} {
+test filename-12.1 {simple globbing} -constraints {unixOrWin} -body {
     glob {}
-} {.}
+} -result {.}
 test filename-12.1.1 {simple globbing} -constraints {unixOrWin} -body {
     glob -types f {}
-} -returnCodes error -result {no files matched glob pattern ""}
-test filename-12.1.2 {simple globbing} {unixOrWin} {
+} -result {}
+test filename-12.1.2 {simple globbing} -constraints {unixOrWin} -body {
     glob -types d {}
-} {.}
-test filename-12.1.3 {simple globbing} {unix} {
+} -result {.}
+test filename-12.1.3 {simple globbing} -constraints {unix} -body {
     glob -types hidden {}
-} {.}
+} -result {.}
 test filename-12.1.4 {simple globbing} -constraints {win} -body {
     glob -types hidden {}
-} -returnCodes error -result {no files matched glob pattern ""}
+} -result {}
 test filename-12.1.5 {simple globbing} -constraints {win} -body {
     glob -types hidden c:/
-} -returnCodes error -result {no files matched glob pattern "c:/"}
-test filename-12.1.6 {simple globbing} {win} {
+} -result {}
+test filename-12.1.6 {simple globbing} -constraints {win} -body {
     glob c:/
-} {c:/}
-test filename-12.3 {simple globbing} {
+} -result {c:/}
+test filename-12.3 {simple globbing} -body {
     glob -nocomplain \{a1,a2\}
-} {}
+} -result {}
 set globPreResult globTest/
 set x1 x1.c
 set y1 y1.c
-test filename-12.4 {simple globbing} {unixOrWin} {
+test filename-12.4 {simple globbing} -constraints {unixOrWin} -body {
     lsort [glob globTest/x1.c globTest/y1.c globTest/foo]
-} "$globPreResult$x1 $globPreResult$y1"
-test filename-12.5 {simple globbing} {
+} -result "$globPreResult$x1 $globPreResult$y1"
+test filename-12.5 {simple globbing} -body {
     glob globTest\\/x1.c
-} "$globPreResult$x1"
-test filename-12.6 {simple globbing} {
+} -result "$globPreResult$x1"
+test filename-12.6 {simple globbing} -body {
     glob globTest\\/\\x1.c
-} "$globPreResult$x1"
+} -result "$globPreResult$x1"
 test filename-12.7 {globbing at filesystem root} -constraints {unix} -body {
     list [glob -nocomplain /*] [glob -path / *]
 } -match compareWords -result equal
@@ -1265,10 +1265,10 @@ test filename-14.20 {asterisks, question marks, and brackets} {
 } {}
 test filename-14.21 {asterisks, question marks, and brackets} -body {
     glob globTest/*/gorp
-} -returnCodes error -result {no files matched glob pattern "globTest/*/gorp"}
+} -result {}
 test filename-14.22 {asterisks, question marks, and brackets} -body {
     glob goo/* x*z foo?q
-} -returnCodes error -result {no files matched glob patterns "goo/* x*z foo?q"}
+} -result {}
 test filename-14.23 {slash globbing} {unix} {
     glob /
 } /
@@ -1368,7 +1368,7 @@ test filename-15.5 {unix specific globbing} {unix nonPortable} {
 # supported, the test was meaningless
 test filename-15.7 {glob tilde} -body {
     glob ~
-} -returnCodes error -result {no files matched glob pattern "~"}
+} -result {}
 test filename-15.8 {win and unix specific globbing} -constraints {unixOrWin} -setup {
     global env
     set temp $env(HOME)
@@ -1379,7 +1379,7 @@ test filename-15.8 {win and unix specific globbing} -constraints {unixOrWin} -se
 } -cleanup {
     set env(HOME) $temp
     catch {file delete -force $env(HOME)/globTest/anyname}
-} -returnCodes error -result {no files matched glob pattern "~"}
+} -result {}
 
 # The following tests are only valid for Windows systems.
 set oldDir [pwd]
diff --git a/tests/winFile.test b/tests/winFile.test
index 38f6954..231fb3f 100644
--- a/tests/winFile.test
+++ b/tests/winFile.test
@@ -28,7 +28,7 @@ testConstraint notWine [expr {![info exists ::env(CI_USING_WINE)]}]
 
 test winFile-1.1 {TclpGetUserHome} -constraints {win} -body {
     glob ~nosuchuser
-} -returnCodes error -result {no files matched glob pattern "~nosuchuser"}
+} -result {}
 test winFile-1.2 {TclpGetUserHome} -constraints {win nonPortable} -body {
     # The administrator account should always exist.
     glob ~administrator
-- 
cgit v0.12


From cbd41f6910eac83dfe47c930b5d9ab50c503596a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Oct 2022 09:07:22 +0000
Subject: Fix socket_*-7.3 testcase (since 2 socket options were added)

---
 tests/socket.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/socket.test b/tests/socket.test
index 7250cb8..7fdb09d 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1071,7 +1071,7 @@ test socket_$af-7.3 {testing socket specific options} -constraints [list socket
     close $s
     update
     llength $l
-} -result 18
+} -result 22
 test socket_$af-7.4 {testing socket specific options} -constraints [list socket supported_$af] -setup {
     set timer [after 10000 "set x timed_out"]
     set l ""
-- 
cgit v0.12


From 0f77e154ab45515b9f12a97807769db1fdf35f96 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Oct 2022 14:56:20 +0000
Subject: More progress in handling rules.vc

---
 win/rules.vc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index 6e06943..abb8b2c 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change
 # the major version.
 RULES_VERSION_MAJOR = 1
-RULES_VERSION_MINOR = 10
+RULES_VERSION_MINOR = 11
 
 # The PROJECT macro must be defined by parent makefile.
 !if "$(PROJECT)" == ""
@@ -880,6 +880,7 @@ USE_THREAD_ALLOC= 0
 !if [nmakehlp -f $(OPTS) "tcl8"]
 !message *** Build for Tcl8
 TCL_MAJOR_VERSION = 8
+TCL_BUILD_FOR = 8
 !endif
 
 !if $(TCL_MAJOR_VERSION) == 8
@@ -1171,7 +1172,7 @@ TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
 
-!if $(TCL_MAJOR_VERSION) == 8
+!if $(TCL_MAJOR_VERSION) == 8 && "$(TCL_BUILD_FOR)" != "8"
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
 !else
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib
@@ -1195,7 +1196,7 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 !if !exist($(TCLSH))
 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
-!if $(TCL_MAJOR_VERSION) == 8
+!if $(TCL_MAJOR_VERSION) == 8 && "$(TCL_BUILD_FOR)" != "8"
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
 !else
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib
@@ -1215,7 +1216,11 @@ TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 
 !endif # TCLINSTALL
 
+!if !$(STATIC_BUILD)
+tcllibs = "$(TCLSTUBLIB)"
+!else
 tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"
+!endif
 
 !endif # $(DOING_TCL)
 
-- 
cgit v0.12


From f685c98a417dcab25fd035553cd16b61fbdeb74d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Oct 2022 20:17:44 +0000
Subject: Make TclGlob() a static function

---
 generic/tclFileName.c | 13 ++++++++++++-
 generic/tclInt.h      | 13 ++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index b553621..3cdd52f 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -37,6 +37,17 @@ static Tcl_Obj *	SplitUnixPath(const char *path);
 static int		DoGlob(Tcl_Interp *interp, Tcl_Obj *resultPtr,
 			    const char *separators, Tcl_Obj *pathPtr, int flags,
 			    char *pattern, Tcl_GlobTypeData *types);
+static int		TclGlob(Tcl_Interp *interp, char *pattern,
+			    Tcl_Obj *pathPrefix, int globFlags,
+			    Tcl_GlobTypeData *types);
+
+/* Flag values used by TclGlob() */
+
+#ifdef TCL_NO_DEPRECATED
+#   define TCL_GLOBMODE_NO_COMPLAIN	1
+#   define TCL_GLOBMODE_DIR	4
+#   define TCL_GLOBMODE_TAILS	8
+#endif
 
 /*
  * When there is no support for getting the block size of a file in a stat()
@@ -1688,7 +1699,7 @@ Tcl_GlobObjCmd(
  *----------------------------------------------------------------------
  */
 
-int
+static int
 TclGlob(
     Tcl_Interp *interp,		/* Interpreter for returning error message or
 				 * appending list of matching file names. */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 471892b..c15293a 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2781,10 +2781,12 @@ typedef struct TclFile_ *TclFile;
  * combination of the following values:
  */
 
-#define TCL_GLOBMODE_NO_COMPLAIN	1
-#define TCL_GLOBMODE_JOIN		2
-#define TCL_GLOBMODE_DIR		4
-#define TCL_GLOBMODE_TAILS		8
+#ifndef TCL_NO_DEPRECATED
+#   define TCL_GLOBMODE_NO_COMPLAIN	1
+#   define TCL_GLOBMODE_JOIN		2
+#   define TCL_GLOBMODE_DIR		4
+#   define TCL_GLOBMODE_TAILS		8
+#endif
 
 typedef enum Tcl_PathPart {
     TCL_PATH_DIRNAME,
@@ -3216,9 +3218,6 @@ MODULE_SCOPE int	TclGetLoadedLibraries(Tcl_Interp *interp,
 				const char *packageName);
 MODULE_SCOPE int	TclGetWideBitsFromObj(Tcl_Interp *, Tcl_Obj *,
 				Tcl_WideInt *);
-MODULE_SCOPE int	TclGlob(Tcl_Interp *interp, char *pattern,
-			    Tcl_Obj *unquotedPrefix, int globFlags,
-			    Tcl_GlobTypeData *types);
 MODULE_SCOPE int	TclIncrObj(Tcl_Interp *interp, Tcl_Obj *valuePtr,
 			    Tcl_Obj *incrPtr);
 MODULE_SCOPE Tcl_Obj *	TclIncrObjVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
-- 
cgit v0.12


From e7e044e96841e4bdbbf931d03658b12d8315af19 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Oct 2022 11:22:20 +0000
Subject: Build-fix

---
 win/rules.vc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index abb8b2c..89a72ce 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -879,7 +879,6 @@ USE_THREAD_ALLOC= 0
 
 !if [nmakehlp -f $(OPTS) "tcl8"]
 !message *** Build for Tcl8
-TCL_MAJOR_VERSION = 8
 TCL_BUILD_FOR = 8
 !endif
 
@@ -1172,7 +1171,7 @@ TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
 
-!if $(TCL_MAJOR_VERSION) == 8 && "$(TCL_BUILD_FOR)" != "8"
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
 !else
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib
@@ -1196,7 +1195,7 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 !if !exist($(TCLSH))
 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
-!if $(TCL_MAJOR_VERSION) == 8 && "$(TCL_BUILD_FOR)" != "8"
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
 !else
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib
@@ -1216,7 +1215,7 @@ TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 
 !endif # TCLINSTALL
 
-!if !$(STATIC_BUILD)
+!if !$(STATIC_BUILD) && "$(TCL_BUILD_FOR)" == "8"
 tcllibs = "$(TCLSTUBLIB)"
 !else
 tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"
@@ -1240,7 +1239,7 @@ WISHNAMEPREFIX = wish
 WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe
 TKLIBNAME8	= tk$(TK_VERSION)$(SUFX).$(EXT)
 TKLIBNAME9	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
-!if $(TCL_MAJOR_VERSION) == 8
+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"
 TKLIBNAME	= tk$(TK_VERSION)$(SUFX).$(EXT)
 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib
 !else
@@ -1297,7 +1296,7 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
 PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
 PRJLIBNAME8	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 PRJLIBNAME9	= tcl9$(PROJECT)$(VERSION)$(SUFX).$(EXT)
-!if $(TCL_MAJOR_VERSION) == 8
+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"
 PRJLIBNAME	= $(PRJLIBNAME8)
 !else
 PRJLIBNAME	= $(PRJLIBNAME9)
@@ -1455,7 +1454,7 @@ COMPILERFLAGS  = /D_ATL_XP_TARGETING
 !if "$(TCL_UTF_MAX)" == "3"
 OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3
 !endif
-!if $(TCL_MAJOR_VERSION) == 8
+!if "$(TCL_BUILD_FOR)" == "8"
 OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
 !endif
 
-- 
cgit v0.12


From e960c97fadd45f3b9a938716d996ff5588c28558 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Oct 2022 13:36:25 +0000
Subject: Fix [7505fac5bd]: new iocmd.test failures

---
 tests/ioCmd.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 70f6b5c..6fc4de0 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -2914,7 +2914,7 @@ test iocmd.tf-25.1 {chan configure, cgetall, standard options} -match glob -body
     rename foo {}
     set res
 } -constraints {testchannel thread} \
-    -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+    -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} * -translation {auto *}}}
 test iocmd.tf-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -2927,7 +2927,7 @@ test iocmd.tf-25.2 {chan configure, cgetall, no options} -match glob -body {
     rename foo {}
     set res
 } -constraints {testchannel thread} \
-    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *}}}
+    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} * -translation {auto *}}}
 test iocmd.tf-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -2943,7 +2943,7 @@ test iocmd.tf-25.3 {chan configure, cgetall, regular result} -match glob -body {
     rename foo {}
     set res
 } -constraints {testchannel thread} \
-    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -translation {auto *} -bar foo -snarf x}}
+    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} * -translation {auto *} -bar foo -snarf x}}
 test iocmd.tf-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
-- 
cgit v0.12


From 20af6b5bdd79037a7dc053dcc37c183262ed8018 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Oct 2022 14:40:27 +0000
Subject: typo

---
 doc/expr.n | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/expr.n b/doc/expr.n
index 490217c..d003a30 100644
--- a/doc/expr.n
+++ b/doc/expr.n
@@ -50,7 +50,7 @@ the end of the expression, whichever comes first.
 .PP
 An expression consists of a combination of operands, operators, parentheses and
 commas, possibly with whitespace between any of these elements, which is
-ignored.  Each operand is intepreted as a numeric value if at all possible.
+ignored.  Each operand is interpreted as a numeric value if at all possible.
 .PP
 Each operand has one of the following forms:
 .RS
-- 
cgit v0.12


From 6d004906276da0cdf24745a523dd66c46e8e0e17 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Oct 2022 15:51:05 +0000
Subject: Improve error-message "cannot use xxxx as operand ....."

---
 generic/tclExecute.c    |  85 ++++++++++-----------
 tests/assemble.test     |   2 +-
 tests/compExpr-old.test |  25 ++++---
 tests/execute.test      |  22 +++---
 tests/expr-old.test     |  65 ++++++++--------
 tests/expr.test         |  56 +++++++-------
 tests/mathop.test       | 194 ++++++++++++++++++++++++------------------------
 tests/while-old.test    |   2 +-
 tests/while.test        |   4 +-
 9 files changed, 229 insertions(+), 226 deletions(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index a063aae..47cb5e6 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -167,7 +167,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 */
 				/* -----------------------------------------*/
     Tcl_Obj **catchTop;		/* These fields are used on return TO this */
@@ -2446,8 +2446,8 @@ TEBCresume(
 	    if (traceInstructions) {
 		TRACE_APPEND(("YIELD...\n"));
 	    } else {
-		fprintf(stdout, "%d: (%u) yielding value \"%.30s\"\n",
-			iPtr->numLevels, (unsigned)(pc - codePtr->codeStart),
+		fprintf(stdout, "%d: (%" TCL_Z_MODIFIER "u) yielding value \"%.30s\"\n",
+			iPtr->numLevels, (size_t)(pc - codePtr->codeStart),
 			Tcl_GetString(OBJ_AT_TOS));
 	    }
 	    fflush(stdout);
@@ -2489,8 +2489,8 @@ TEBCresume(
 		TRACE(("[%.30s] => YIELD...\n", O2S(valuePtr)));
 	    } else {
 		/* FIXME: What is the right thing to trace? */
-		fprintf(stdout, "%d: (%u) yielding to [%.30s]\n",
-			iPtr->numLevels, (unsigned)(pc - codePtr->codeStart),
+		fprintf(stdout, "%d: (%" TCL_Z_MODIFIER "u) yielding to [%.30s]\n",
+			iPtr->numLevels, (size_t)(pc - codePtr->codeStart),
 			TclGetString(valuePtr));
 	    }
 	    fflush(stdout);
@@ -2851,8 +2851,8 @@ TEBCresume(
 		strncpy(cmdNameBuf, TclGetString(objv[0]), 20);
 		TRACE(("%u => call ", objc));
 	    } else {
-		fprintf(stdout, "%d: (%u) invoking ", iPtr->numLevels,
-			(unsigned)(pc - codePtr->codeStart));
+		fprintf(stdout, "%d: (%" TCL_Z_MODIFIER "u) invoking ", iPtr->numLevels,
+			(size_t)(pc - codePtr->codeStart));
 	    }
 	    for (i = 0;  i < objc;  i++) {
 		TclPrintObject(stdout, objv[i], 15);
@@ -2984,8 +2984,8 @@ TEBCresume(
 		TRACE(("%u => call (implementation %s) ", objc, O2S(objPtr)));
 	    } else {
 		fprintf(stdout,
-			"%d: (%u) invoking (using implementation %s) ",
-			iPtr->numLevels, (unsigned)(pc - codePtr->codeStart),
+			"%d: (%" TCL_Z_MODIFIER "u) invoking (using implementation %s) ",
+			iPtr->numLevels, (size_t)(pc - codePtr->codeStart),
 			O2S(objPtr));
 	    }
 	    for (i = 0;  i < objc;  i++) {
@@ -4308,15 +4308,15 @@ TEBCresume(
 
     case INST_JUMP1:
 	opnd = TclGetInt1AtPtr(pc+1);
-	TRACE(("%d => new pc %u\n", opnd,
-		(unsigned)(pc + opnd - codePtr->codeStart)));
+	TRACE(("%d => new pc %" TCL_Z_MODIFIER "u\n", opnd,
+		(size_t)(pc + opnd - codePtr->codeStart)));
 	NEXT_INST_F(opnd, 0, 0);
     break;
 
     case INST_JUMP4:
 	opnd = TclGetInt4AtPtr(pc+1);
-	TRACE(("%d => new pc %u\n", opnd,
-		(unsigned)(pc + opnd - codePtr->codeStart)));
+	TRACE(("%d => new pc %" TCL_Z_MODIFIER "u\n", opnd,
+		(size_t)(pc + opnd - codePtr->codeStart)));
 	NEXT_INST_F(opnd, 0, 0);
 
     {
@@ -4358,8 +4358,8 @@ TEBCresume(
 #ifdef TCL_COMPILE_DEBUG
 	if (b) {
 	    if ((*pc == INST_JUMP_TRUE1) || (*pc == INST_JUMP_TRUE4)) {
-		TRACE_APPEND(("%.20s true, new pc %u\n", O2S(valuePtr),
-			(unsigned)(pc + jmpOffset[1] - codePtr->codeStart)));
+		TRACE_APPEND(("%.20s true, new pc %" TCL_Z_MODIFIER "u\n", O2S(valuePtr),
+			(size_t)(pc + jmpOffset[1] - codePtr->codeStart)));
 	    } else {
 		TRACE_APPEND(("%.20s true\n", O2S(valuePtr)));
 	    }
@@ -4367,8 +4367,8 @@ TEBCresume(
 	    if ((*pc == INST_JUMP_TRUE1) || (*pc == INST_JUMP_TRUE4)) {
 		TRACE_APPEND(("%.20s false\n", O2S(valuePtr)));
 	    } else {
-		TRACE_APPEND(("%.20s false, new pc %u\n", O2S(valuePtr),
-			(unsigned)(pc + jmpOffset[0] - codePtr->codeStart)));
+		TRACE_APPEND(("%.20s false, new pc %" TCL_Z_MODIFIER "u\n", O2S(valuePtr),
+			(size_t)(pc + jmpOffset[0] - codePtr->codeStart)));
 	    }
 	}
 #endif
@@ -4392,8 +4392,8 @@ TEBCresume(
 	if (hPtr != NULL) {
 	    int jumpOffset = PTR2INT(Tcl_GetHashValue(hPtr));
 
-	    TRACE_APPEND(("found in table, new pc %u\n",
-		    (unsigned)(pc - codePtr->codeStart + jumpOffset)));
+	    TRACE_APPEND(("found in table, new pc %" TCL_Z_MODIFIER "u\n",
+		    (size_t)(pc - codePtr->codeStart + jumpOffset)));
 	    NEXT_INST_F(jumpOffset, 1, 0);
 	} else {
 	    TRACE_APPEND(("not found in table\n"));
@@ -4638,9 +4638,9 @@ TEBCresume(
 			if (traceInstructions) {
 			    strncpy(cmdNameBuf, TclGetString(objv[0]), 20);
 			} else {
-			    fprintf(stdout, "%d: (%u) invoking ",
+			    fprintf(stdout, "%d: (%" TCL_Z_MODIFIER "u) invoking ",
 				    iPtr->numLevels,
-				    (unsigned)(pc - codePtr->codeStart));
+				    (size_t)(pc - codePtr->codeStart));
 			}
 			for (i = 0;  i < opnd;  i++) {
 			    TclPrintObject(stdout, objv[i], 15);
@@ -4664,7 +4664,7 @@ TEBCresume(
 
 	    TRACE_APPEND(("ERROR: \"%.30s\" not on reachable chain\n",
 		    O2S(valuePtr)));
-	    for (i = contextPtr->index ; i >= 0 ; i--) {
+	    for (i = contextPtr->index ; i != TCL_INDEX_NONE ; i--) {
 		miPtr = contextPtr->callPtr->chain + i;
 		if (miPtr->isFilter
 			|| miPtr->mPtr->declaringClassPtr != classPtr) {
@@ -4740,8 +4740,8 @@ TEBCresume(
 	    if (traceInstructions) {
 		strncpy(cmdNameBuf, TclGetString(objv[0]), 20);
 	    } else {
-		fprintf(stdout, "%d: (%u) invoking ",
-			iPtr->numLevels, (unsigned)(pc - codePtr->codeStart));
+		fprintf(stdout, "%d: (%" TCL_Z_MODIFIER "u) invoking ",
+			iPtr->numLevels, (size_t)(pc - codePtr->codeStart));
 	    }
 	    for (i = 0;  i < opnd;  i++) {
 		TclPrintObject(stdout, objv[i], 15);
@@ -7585,7 +7585,7 @@ TEBCresume(
 	{			/* Read the wall clock */
 	    Tcl_WideInt wval;
 	    Tcl_Time now;
-	    switch(TclGetUInt1AtPtr(pc+1)) {
+	    switch (TclGetUInt1AtPtr(pc+1)) {
 	    case 0:		/* clicks */
 #ifdef TCL_WIDE_CLICKS
 		wval = TclpGetWideClicks();
@@ -7682,7 +7682,7 @@ TEBCresume(
 			rangePtr->codeOffset, rangePtr->breakOffset));
 		NEXT_INST_F(0, 0, 0);
 	    }
-	    if (rangePtr->continueOffset == -1) {
+	    if (rangePtr->continueOffset == TCL_INDEX_NONE) {
 		TRACE_APPEND(("%s, loop w/o continue, checking for catch\n",
 			StringForResultCode(result)));
 		goto checkForCatch;
@@ -9124,7 +9124,6 @@ PrintByteCodeInfo(
     fprintf(stdout, "\nExecuting ByteCode 0x%p, refCt %" TCL_Z_MODIFIER "u, epoch %u, interp 0x%p (epoch %u)\n",
 	    codePtr, (size_t)codePtr->refCount, codePtr->compileEpoch, iPtr,
 	    iPtr->compileEpoch);
-
     fprintf(stdout, "  Source: ");
     TclPrintSource(stdout, codePtr->source, 60);
 
@@ -9139,13 +9138,13 @@ PrintByteCodeInfo(
 	    0.0);
 
 #ifdef TCL_COMPILE_STATS
-    fprintf(stdout, "  Code %lu = header %lu+inst %d+litObj %lu+exc %lu+aux %lu+cmdMap %d\n",
+    fprintf(stdout, "  Code %lu = header %" TCL_Z_MODIFIER "u+inst %d+litObj %" TCL_Z_MODIFIER "u+exc %" TCL_Z_MODIFIER "u+aux %" TCL_Z_MODIFIER "u+cmdMap %d\n",
 	    (unsigned long) codePtr->structureSize,
-	    (unsigned long) offsetof(ByteCode, localCachePtr),
+	    offsetof(ByteCode, localCachePtr),
 	    codePtr->numCodeBytes,
-	    (unsigned long) (codePtr->numLitObjects * sizeof(Tcl_Obj *)),
-	    (unsigned long) (codePtr->numExceptRanges*sizeof(ExceptionRange)),
-	    (unsigned long) (codePtr->numAuxDataItems * sizeof(AuxData)),
+	    codePtr->numLitObjects * sizeof(Tcl_Obj *),
+	    codePtr->numExceptRanges*sizeof(ExceptionRange),
+	    codePtr->numAuxDataItems * sizeof(AuxData),
 	    codePtr->numCmdLocBytes);
 #endif /* TCL_COMPILE_STATS */
     if (procPtr != NULL) {
@@ -9289,7 +9288,8 @@ IllegalExprOperandType(
     }
 
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-	    "can't use %s as operand of \"%s\"", description, op));
+	    "can't use %s \"%s\" as operand of \"%s\"", description,
+	    TclGetString(opndPtr), op));
     Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", description, NULL);
 }
 
@@ -9366,7 +9366,8 @@ TclGetSrcInfoForPc(
 
 	ExtCmdLoc *eclPtr;
 	ECL *locPtr = NULL;
-	int srcOffset, i;
+	int srcOffset;
+	int i;
 	Interp *iPtr = (Interp *) *codePtr->interpHandle;
 	Tcl_HashEntry *hePtr =
 		Tcl_FindHashEntry(iPtr->lineBCPtr, codePtr);
@@ -9601,7 +9602,7 @@ GetExceptRangeForPc(
 	    if (searchMode == TCL_BREAK) {
 		return rangePtr;
 	    }
-	    if (searchMode == TCL_CONTINUE && rangePtr->continueOffset != -1){
+	    if (searchMode == TCL_CONTINUE && rangePtr->continueOffset != TCL_INDEX_NONE){
 		return rangePtr;
 	    }
 	}
@@ -9799,8 +9800,8 @@ EvalStatsCmd(
 
     Tcl_AppendPrintfToObj(objPtr, "\n----------------------------------------------------------------\n");
     Tcl_AppendPrintfToObj(objPtr,
-	    "Compilation and execution statistics for interpreter %#" TCL_Z_MODIFIER "x\n",
-	    (size_t)iPtr);
+	    "Compilation and execution statistics for interpreter %p\n",
+	    iPtr);
 
     Tcl_AppendPrintfToObj(objPtr, "\nNumber ByteCodes executed\t%" TCL_Z_MODIFIER "u\n",
 	    statsPtr->numExecutions);
@@ -9847,11 +9848,11 @@ EvalStatsCmd(
 	    statsPtr->currentByteCodeBytes);
     Tcl_AppendPrintfToObj(objPtr, "    Literal bytes\t\t%.6g\n",
 	    currentLiteralBytes);
-    Tcl_AppendPrintfToObj(objPtr, "      table %lu + bkts %lu + entries %lu + objects %lu + strings %.6g\n",
-	    (unsigned long) sizeof(LiteralTable),
-	    (unsigned long) (iPtr->literalTable.numBuckets * sizeof(LiteralEntry *)),
-	    (unsigned long) (iPtr->literalTable.numEntries * sizeof(LiteralEntry)),
-	    (unsigned long) (iPtr->literalTable.numEntries * sizeof(Tcl_Obj)),
+    Tcl_AppendPrintfToObj(objPtr, "      table %" TCL_Z_MODIFIER "u + bkts %" TCL_Z_MODIFIER "u + entries %" TCL_Z_MODIFIER "u + objects %" TCL_Z_MODIFIER "u + strings %.6g\n",
+	    sizeof(LiteralTable),
+	    iPtr->literalTable.numBuckets * sizeof(LiteralEntry *),
+	    iPtr->literalTable.numEntries * sizeof(LiteralEntry),
+	    iPtr->literalTable.numEntries * sizeof(Tcl_Obj),
 	    statsPtr->currentLitStringBytes);
     Tcl_AppendPrintfToObj(objPtr, "  Mean code/source\t\t%.1f\n",
 	    currentCodeBytes / statsPtr->currentSrcBytes);
diff --git a/tests/assemble.test b/tests/assemble.test
index 55124d0..b656894 100644
--- a/tests/assemble.test
+++ b/tests/assemble.test
@@ -781,7 +781,7 @@ test assemble-7.43 {uplus} {
 	}
     }
     -returnCodes error
-    -result {can't use non-numeric floating-point value as operand of "+"}
+    -result {can't use non-numeric floating-point value "NaN" as operand of "+"}
 }
 test assemble-7.43.1 {tryCvtToNumeric} {
     -body {
diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
index b70e65c..40dea76 100644
--- a/tests/compExpr-old.test
+++ b/tests/compExpr-old.test
@@ -280,10 +280,10 @@ test compExpr-old-6.8 {CompileBitXorExpr: error compiling bitxor arm} -body {
 } -returnCodes error -match glob -result *
 test compExpr-old-6.9 {CompileBitXorExpr: runtime error in bitxor arm} {
     list [catch {expr {24.0^3}} msg] $msg
-} {1 {can't use floating-point value as operand of "^"}}
+} {1 {can't use floating-point value "24.0" as operand of "^"}}
 test compExpr-old-6.10 {CompileBitXorExpr: runtime error in bitxor arm} {
     list [catch {expr {"a"^"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "^"}}
+} {1 {can't use non-numeric string "a" as operand of "^"}}
 
 test compExpr-old-7.1 {CompileBitAndExpr: just equality expr} {expr 3==2} 0
 test compExpr-old-7.2 {CompileBitAndExpr: just equality expr} {expr 2.0==2} 1
@@ -304,10 +304,10 @@ test compExpr-old-7.11 {CompileBitAndExpr: error compiling bitand arm} -body {
 } -returnCodes error -match glob -result *
 test compExpr-old-7.12 {CompileBitAndExpr: runtime error in bitand arm} {
     list [catch {expr {24.0&3}} msg] $msg
-} {1 {can't use floating-point value as operand of "&"}}
+} {1 {can't use floating-point value "24.0" as operand of "&"}}
 test compExpr-old-7.13 {CompileBitAndExpr: runtime error in bitand arm} {
     list [catch {expr {"a"&"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "&"}}
+} {1 {can't use non-numeric string "a" as operand of "&"}}
 
 test compExpr-old-8.1 {CompileEqualityExpr: just relational expr} {expr 3>=2} 1
 test compExpr-old-8.2 {CompileEqualityExpr: just relational expr} {expr 2<=2.1} 1
@@ -365,10 +365,10 @@ test compExpr-old-10.9 {CompileShiftExpr: error compiling shift arm} -body {
 } -returnCodes error -match glob -result *
 test compExpr-old-10.10 {CompileShiftExpr: runtime error} {
     list [catch {expr {24.0>>43}} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
+} {1 {can't use floating-point value "24.0" as operand of ">>"}}
 test compExpr-old-10.11 {CompileShiftExpr: runtime error} {
     list [catch {expr {"a"<<"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "<<"}}
+} {1 {can't use non-numeric string "a" as operand of "<<"}}
 
 test compExpr-old-11.1 {CompileAddExpr: just multiply expr} {expr 4*-2} -8
 test compExpr-old-11.2 {CompileAddExpr: just multiply expr} {expr 0xff%2} 1
@@ -387,10 +387,10 @@ test compExpr-old-11.9 {CompileAddExpr: error compiling add arm} -body {
 } -returnCodes error -match glob -result *
 test compExpr-old-11.10 {CompileAddExpr: runtime error} {
     list [catch {expr {24.0+"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "xx" as operand of "+"}}
 test compExpr-old-11.11 {CompileAddExpr: runtime error} {
     list [catch {expr {"a"-"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
+} {1 {can't use non-numeric string "a" as operand of "-"}}
 test compExpr-old-11.12 {CompileAddExpr: runtime error} {
     list [catch {expr {3/0}} msg] $msg
 } {1 {divide by zero}}
@@ -418,10 +418,10 @@ test compExpr-old-12.9 {CompileMultiplyExpr: error compiling multiply arm} -body
 } -returnCodes error -match glob -result *
 test compExpr-old-12.10 {CompileMultiplyExpr: runtime error} {
     list [catch {expr {24.0*"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
+} {1 {can't use non-numeric string "xx" as operand of "*"}}
 test compExpr-old-12.11 {CompileMultiplyExpr: runtime error} {
     list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
+} {1 {can't use non-numeric string "a" as operand of "/"}}
 
 test compExpr-old-13.1 {CompileUnaryExpr: unary exprs} {expr -0xff} -255
 test compExpr-old-13.2 {CompileUnaryExpr: unary exprs} {expr +0o00123} 83
@@ -439,10 +439,10 @@ test compExpr-old-13.9 {CompileUnaryExpr: error compiling unary expr} -body {
 } -returnCodes error -match glob -result *
 test compExpr-old-13.10 {CompileUnaryExpr: runtime error} {
     list [catch {expr {~"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "~"}}
+} {1 {can't use non-numeric string "xx" as operand of "~"}}
 test compExpr-old-13.11 {CompileUnaryExpr: runtime error} {
     list [catch {expr ~4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "~"}}
+} {1 {can't use floating-point value "4.0" as operand of "~"}}
 test compExpr-old-13.12 {CompileUnaryExpr: just primary expr} {expr 0x123} 291
 test compExpr-old-13.13 {CompileUnaryExpr: just primary expr} {
     set a 27
@@ -590,6 +590,7 @@ test compExpr-old-15.5 {CompileMathFuncCall: not enough arguments} -body {
 test compExpr-old-15.6 {CompileMathFuncCall: missing ')'} -body {
     expr sin(1
 } -returnCodes error -match glob -result *
+
 test compExpr-old-16.1 {GetToken: checks whether integer token starting with "0x" (e.g., "0x$") is invalid} {
     catch {unset a}
     set a(VALUE) ff15
diff --git a/tests/execute.test b/tests/execute.test
index d86ad0e..8702de6 100644
--- a/tests/execute.test
+++ b/tests/execute.test
@@ -179,7 +179,7 @@ test execute-3.5 {TclExecuteByteCode, INST_ADD, op1 is string double} {testobj}
 test execute-3.6 {TclExecuteByteCode, INST_ADD, op1 is non-numeric} {testobj} {
     set x [teststringobj set 0 foo]
     list [catch {expr {$x + 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "foo" as operand of "+"}}
 test execute-3.7 {TclExecuteByteCode, INST_ADD, op2 is int} {testobj} {
     set x [testintobj set 0 1]
     expr {1 + $x}
@@ -204,7 +204,7 @@ test execute-3.11 {TclExecuteByteCode, INST_ADD, op2 is string double} {testobj}
 test execute-3.12 {TclExecuteByteCode, INST_ADD, op2 is non-numeric} {testobj} {
     set x [teststringobj set 0 foo]
     list [catch {expr {1 + $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "foo" as operand of "+"}}
 
 # INST_SUB is partially tested:
 test execute-3.13 {TclExecuteByteCode, INST_SUB, op1 is int} {testobj} {
@@ -231,7 +231,7 @@ test execute-3.17 {TclExecuteByteCode, INST_SUB, op1 is string double} {testobj}
 test execute-3.18 {TclExecuteByteCode, INST_SUB, op1 is non-numeric} {testobj} {
     set x [teststringobj set 0 foo]
     list [catch {expr {$x - 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
+} {1 {can't use non-numeric string "foo" as operand of "-"}}
 test execute-3.19 {TclExecuteByteCode, INST_SUB, op2 is int} {testobj} {
     set x [testintobj set 0 1]
     expr {1 - $x}
@@ -256,7 +256,7 @@ test execute-3.23 {TclExecuteByteCode, INST_SUB, op2 is string double} {testobj}
 test execute-3.24 {TclExecuteByteCode, INST_SUB, op2 is non-numeric} {testobj} {
     set x [teststringobj set 0 foo]
     list [catch {expr {1 - $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
+} {1 {can't use non-numeric string "foo" as operand of "-"}}
 
 # INST_MULT is partially tested:
 test execute-3.25 {TclExecuteByteCode, INST_MULT, op1 is int} {testobj} {
@@ -283,7 +283,7 @@ test execute-3.29 {TclExecuteByteCode, INST_MULT, op1 is string double} {testobj
 test execute-3.30 {TclExecuteByteCode, INST_MULT, op1 is non-numeric} {testobj} {
     set x [teststringobj set 1 foo]
     list [catch {expr {$x * 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
+} {1 {can't use non-numeric string "foo" as operand of "*"}}
 test execute-3.31 {TclExecuteByteCode, INST_MULT, op2 is int} {testobj} {
     set x [testintobj set 1 1]
     expr {1 * $x}
@@ -308,7 +308,7 @@ test execute-3.35 {TclExecuteByteCode, INST_MULT, op2 is string double} {testobj
 test execute-3.36 {TclExecuteByteCode, INST_MULT, op2 is non-numeric} {testobj} {
     set x [teststringobj set 1 foo]
     list [catch {expr {1 * $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
+} {1 {can't use non-numeric string "foo" as operand of "*"}}
 
 # INST_DIV is partially tested:
 test execute-3.37 {TclExecuteByteCode, INST_DIV, op1 is int} {testobj} {
@@ -335,7 +335,7 @@ test execute-3.41 {TclExecuteByteCode, INST_DIV, op1 is string double} {testobj}
 test execute-3.42 {TclExecuteByteCode, INST_DIV, op1 is non-numeric} {testobj} {
     set x [teststringobj set 1 foo]
     list [catch {expr {$x / 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
+} {1 {can't use non-numeric string "foo" as operand of "/"}}
 test execute-3.43 {TclExecuteByteCode, INST_DIV, op2 is int} {testobj} {
     set x [testintobj set 1 1]
     expr {2 / $x}
@@ -360,7 +360,7 @@ test execute-3.47 {TclExecuteByteCode, INST_DIV, op2 is string double} {testobj}
 test execute-3.48 {TclExecuteByteCode, INST_DIV, op2 is non-numeric} {testobj} {
     set x [teststringobj set 1 foo]
     list [catch {expr {1 / $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
+} {1 {can't use non-numeric string "foo" as operand of "/"}}
 
 # INST_UPLUS is partially tested:
 test execute-3.49 {TclExecuteByteCode, INST_UPLUS, op is int} {testobj} {
@@ -387,7 +387,7 @@ test execute-3.53 {TclExecuteByteCode, INST_UPLUS, op is string double} {testobj
 test execute-3.54 {TclExecuteByteCode, INST_UPLUS, op is non-numeric} {testobj} {
     set x [teststringobj set 1 foo]
     list [catch {expr {+ $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "foo" as operand of "+"}}
 
 # INST_UMINUS is partially tested:
 test execute-3.55 {TclExecuteByteCode, INST_UMINUS, op is int} {testobj} {
@@ -414,7 +414,7 @@ test execute-3.59 {TclExecuteByteCode, INST_UMINUS, op is string double} {testob
 test execute-3.60 {TclExecuteByteCode, INST_UMINUS, op is non-numeric} {testobj} {
     set x [teststringobj set 1 foo]
     list [catch {expr {- $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
+} {1 {can't use non-numeric string "foo" as operand of "-"}}
 
 # INST_LNOT is partially tested:
 test execute-3.61 {TclExecuteByteCode, INST_LNOT, op is int} {testobj} {
@@ -462,7 +462,7 @@ test execute-3.70 {TclExecuteByteCode, INST_LNOT, op is string double} {testobj}
 test execute-3.71 {TclExecuteByteCode, INST_LNOT, op is non-numeric} {testobj} {
     set x [teststringobj set 1 foo]
     list [catch {expr {! $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "!"}}
+} {1 {can't use non-numeric string "foo" as operand of "!"}}
 
 # INST_BITNOT not tested
 # INST_CALL_BUILTIN_FUNC1 not tested
diff --git a/tests/expr-old.test b/tests/expr-old.test
index 676443a..2401bd4 100644
--- a/tests/expr-old.test
+++ b/tests/expr-old.test
@@ -194,34 +194,34 @@ test expr-old-2.38 {floating-point operators} {
 
 test expr-old-3.1 {illegal floating-point operations} {
     list [catch {expr ~4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "~"}}
+} {1 {can't use floating-point value "4.0" as operand of "~"}}
 test expr-old-3.2 {illegal floating-point operations} {
     list [catch {expr 27%4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "%"}}
+} {1 {can't use floating-point value "4.0" as operand of "%"}}
 test expr-old-3.3 {illegal floating-point operations} {
     list [catch {expr 27.0%4} msg] $msg
-} {1 {can't use floating-point value as operand of "%"}}
+} {1 {can't use floating-point value "27.0" as operand of "%"}}
 test expr-old-3.4 {illegal floating-point operations} {
     list [catch {expr 1.0<<3} msg] $msg
-} {1 {can't use floating-point value as operand of "<<"}}
+} {1 {can't use floating-point value "1.0" as operand of "<<"}}
 test expr-old-3.5 {illegal floating-point operations} {
     list [catch {expr 3<<1.0} msg] $msg
-} {1 {can't use floating-point value as operand of "<<"}}
+} {1 {can't use floating-point value "1.0" as operand of "<<"}}
 test expr-old-3.6 {illegal floating-point operations} {
     list [catch {expr 24.0>>3} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
+} {1 {can't use floating-point value "24.0" as operand of ">>"}}
 test expr-old-3.7 {illegal floating-point operations} {
     list [catch {expr 24>>3.0} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
+} {1 {can't use floating-point value "3.0" as operand of ">>"}}
 test expr-old-3.8 {illegal floating-point operations} {
     list [catch {expr 24&3.0} msg] $msg
-} {1 {can't use floating-point value as operand of "&"}}
+} {1 {can't use floating-point value "3.0" as operand of "&"}}
 test expr-old-3.9 {illegal floating-point operations} {
     list [catch {expr 24.0|3} msg] $msg
-} {1 {can't use floating-point value as operand of "|"}}
+} {1 {can't use floating-point value "24.0" as operand of "|"}}
 test expr-old-3.10 {illegal floating-point operations} {
     list [catch {expr 24.0^3} msg] $msg
-} {1 {can't use floating-point value as operand of "^"}}
+} {1 {can't use floating-point value "24.0" as operand of "^"}}
 
 # Check the string operators individually.
 
@@ -262,46 +262,46 @@ test expr-old-4.32 {string operators} {expr {0?"foo":"bar"}} bar
 
 test expr-old-5.1 {illegal string operations} {
     list [catch {expr {-"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
+} {1 {can't use non-numeric string "a" as operand of "-"}}
 test expr-old-5.2 {illegal string operations} {
     list [catch {expr {+"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "a" as operand of "+"}}
 test expr-old-5.3 {illegal string operations} {
     list [catch {expr {~"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "~"}}
+} {1 {can't use non-numeric string "a" as operand of "~"}}
 test expr-old-5.4 {illegal string operations} {
     list [catch {expr {!"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "!"}}
+} {1 {can't use non-numeric string "a" as operand of "!"}}
 test expr-old-5.5 {illegal string operations} {
     list [catch {expr {"a"*"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
+} {1 {can't use non-numeric string "a" as operand of "*"}}
 test expr-old-5.6 {illegal string operations} {
     list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
+} {1 {can't use non-numeric string "a" as operand of "/"}}
 test expr-old-5.7 {illegal string operations} {
     list [catch {expr {"a"%"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "%"}}
+} {1 {can't use non-numeric string "a" as operand of "%"}}
 test expr-old-5.8 {illegal string operations} {
     list [catch {expr {"a"+"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "a" as operand of "+"}}
 test expr-old-5.9 {illegal string operations} {
     list [catch {expr {"a"-"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
+} {1 {can't use non-numeric string "a" as operand of "-"}}
 test expr-old-5.10 {illegal string operations} {
     list [catch {expr {"a"<<"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "<<"}}
+} {1 {can't use non-numeric string "a" as operand of "<<"}}
 test expr-old-5.11 {illegal string operations} {
     list [catch {expr {"a">>"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of ">>"}}
+} {1 {can't use non-numeric string "a" as operand of ">>"}}
 test expr-old-5.12 {illegal string operations} {
     list [catch {expr {"a"&"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "&"}}
+} {1 {can't use non-numeric string "a" as operand of "&"}}
 test expr-old-5.13 {illegal string operations} {
     list [catch {expr {"a"^"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "^"}}
+} {1 {can't use non-numeric string "a" as operand of "^"}}
 test expr-old-5.14 {illegal string operations} {
     list [catch {expr {"a"|"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "|"}}
+} {1 {can't use non-numeric string "a" as operand of "|"}}
 test expr-old-5.15 {illegal string operations} {
     list [catch {expr {"a"&&"b"}} msg] $msg
 } {1 {expected boolean value but got "a"}}
@@ -490,7 +490,7 @@ test expr-old-25.20 {type conversions} {expr 10.0} 10.0
 
 test expr-old-26.1 {error conditions} {
     list [catch {expr 2+"a"} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "a" as operand of "+"}}
 test expr-old-26.2 {error conditions} -body {
     expr 2+4*
 } -returnCodes error -match glob -result *
@@ -504,10 +504,10 @@ test expr-old-26.4 {error conditions} {
 set a xx
 test expr-old-26.5 {error conditions} {
     list [catch {expr {2+$a}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "xx" as operand of "+"}}
 test expr-old-26.6 {error conditions} {
     list [catch {expr {2+[set a]}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "xx" as operand of "+"}}
 test expr-old-26.7 {error conditions} -body {
     expr {2+(4}
 } -returnCodes error -match glob -result *
@@ -531,7 +531,7 @@ test expr-old-26.12 {error conditions} -body {
 } -returnCodes error -match glob -result *
 test expr-old-26.13 {error conditions} {
     list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
+} {1 {can't use non-numeric string "a" as operand of "/"}}
 test expr-old-26.14 {error conditions} -body {
     expr 2:3
 } -returnCodes error -match glob -result *
@@ -943,13 +943,14 @@ test expr-old-34.15 {errors in math functions} {
 test expr-old-34.16 {errors in math functions} {
     expr round(-1.0e30)
 } -1000000000000000019884624838656
+
 test expr-old-36.1 {ExprLooksLikeInt procedure} -body {
     expr 0o289
 } -returnCodes error -match glob -result {*invalid octal number*}
 test expr-old-36.2 {ExprLooksLikeInt procedure} {
     set x 0o289
     list [catch {expr {$x+1}} msg] $msg
-} {1 {can't use invalid octal number as operand of "+"}}
+} {1 {can't use invalid octal number "0o289" as operand of "+"}}
 test expr-old-36.3 {ExprLooksLikeInt procedure} {
     list [catch {expr 0289.1} msg] $msg
 } {0 289.1}
@@ -989,11 +990,11 @@ test expr-old-36.11 {ExprLooksLikeInt procedure} {
 test expr-old-36.12 {ExprLooksLikeInt procedure} {
     set x "10;"
     list [catch {expr {$x+1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "10;" as operand of "+"}}
 test expr-old-36.13 {ExprLooksLikeInt procedure} {
     set x " +"
     list [catch {expr {$x+1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string " +" as operand of "+"}}
 test expr-old-36.14 {ExprLooksLikeInt procedure} {
     set x "123456789012345678901234567890 "
     expr {$x+1}
@@ -1001,7 +1002,7 @@ test expr-old-36.14 {ExprLooksLikeInt procedure} {
 test expr-old-36.15 {ExprLooksLikeInt procedure} {
     set x "0o99 "
     list [catch {expr {$x+1}} msg] $msg
-} {1 {can't use invalid octal number as operand of "+"}}
+} {1 {can't use invalid octal number "0o99 " as operand of "+"}}
 test expr-old-36.16 {ExprLooksLikeInt procedure} {
     set x " 0xffffffffffffffffffffffffffffffffffffff  "
     expr {$x+1}
diff --git a/tests/expr.test b/tests/expr.test
index 32706d9..25a02e3 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -138,9 +138,9 @@ proc do_twelve_days {} {
 
 catch {unset a b i x}
 
-test expr-1.1 {TclCompileExprCmd: no expression} {
-    list [catch {expr  } msg] $msg
-} {1 {wrong # args: should be "expr arg ?arg ...?"}}
+test expr-1.1 {TclCompileExprCmd: no expression} -body {
+    expr
+} -returnCodes error -result {wrong # args: should be "expr arg ?arg ...?"}
 test expr-1.2 {TclCompileExprCmd: one expression word} {
     expr -25
 } -25
@@ -187,12 +187,12 @@ test expr-1.13 {TclCompileExprCmd: second level of substitutions in expr not in
 } foo
 test expr-1.14 {TclCompileExprCmd: second level of substitutions in expr with comparison as top-level operator} {
     set a xxx
-    set x 2;  set b {$x};  set a [expr $b == 2]
+    set x 2;  set b {$x};  set a [expr $b==2]
     set a
 } 1
 test expr-1.15 {TclCompileExprCmd: second level of substitutions in expr with comparison as top-level operator} {
     set a xxx
-    set x 2;  set b {$x};  set a [expr $b eq 2]
+    set x 2;  set b {$x};  set a [expr "$b eq 2"]
     set a
 } 1
 
@@ -252,7 +252,7 @@ test expr-4.9 {CompileLorExpr: long lor arm} {
 } 1
 test expr-4.10 {CompileLorExpr: error compiling ! operand} {
     list [catch {expr {!"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "!"}}
+} {1 {can't use non-numeric string "a" as operand of "!"}}
 test expr-4.11 {CompileLorExpr: error compiling land arms} {
     list [catch {expr {"a"||0}} msg] $msg
 } {1 {expected boolean value but got "a"}}
@@ -299,10 +299,10 @@ test expr-6.8 {CompileBitXorExpr: error compiling bitxor arm} -body {
 } -returnCodes error -match glob -result *
 test expr-6.9 {CompileBitXorExpr: runtime error in bitxor arm} {
     list [catch {expr {24.0^3}} msg] $msg
-} {1 {can't use floating-point value as operand of "^"}}
+} {1 {can't use floating-point value "24.0" as operand of "^"}}
 test expr-6.10 {CompileBitXorExpr: runtime error in bitxor arm} {
     list [catch {expr {"a"^"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "^"}}
+} {1 {can't use non-numeric string "a" as operand of "^"}}
 
 test expr-7.1 {CompileBitAndExpr: just equality expr} {expr 3==2} 0
 test expr-7.2 {CompileBitAndExpr: just equality expr} {expr 2.0==2} 1
@@ -323,10 +323,10 @@ test expr-7.11 {CompileBitAndExpr: error compiling bitand arm} -body {
 } -returnCodes error -match glob -result *
 test expr-7.12 {CompileBitAndExpr: runtime error in bitand arm} {
     list [catch {expr {24.0&3}} msg] $msg
-} {1 {can't use floating-point value as operand of "&"}}
+} {1 {can't use floating-point value "24.0" as operand of "&"}}
 test expr-7.13 {CompileBitAndExpr: runtime error in bitand arm} {
     list [catch {expr {"a"&"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "&"}}
+} {1 {can't use non-numeric string "a" as operand of "&"}}
 test expr-7.14 {CompileBitAndExpr: equality expr} {expr 3eq2} 0
 test expr-7.18 {CompileBitAndExpr: equality expr} {expr {"abc" eq "abd"}} 0
 test expr-7.20 {CompileBitAndExpr: error in equality expr} -body {
@@ -468,10 +468,10 @@ test expr-10.9 {CompileShiftExpr: error compiling shift arm} -body {
 } -returnCodes error -match glob -result *
 test expr-10.10 {CompileShiftExpr: runtime error} {
     list [catch {expr {24.0>>43}} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
+} {1 {can't use floating-point value "24.0" as operand of ">>"}}
 test expr-10.11 {CompileShiftExpr: runtime error} {
     list [catch {expr {"a"<<"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "<<"}}
+} {1 {can't use non-numeric string "a" as operand of "<<"}}
 
 test expr-11.1 {CompileAddExpr: just multiply expr} {expr 4*-2} -8
 test expr-11.2 {CompileAddExpr: just multiply expr} {expr 0xff%2} 1
@@ -490,10 +490,10 @@ test expr-11.9 {CompileAddExpr: error compiling add arm} -body {
 } -returnCodes error -match glob -result *
 test expr-11.10 {CompileAddExpr: runtime error} {
     list [catch {expr {24.0+"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "xx" as operand of "+"}}
 test expr-11.11 {CompileAddExpr: runtime error} {
     list [catch {expr {"a"-"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
+} {1 {can't use non-numeric string "a" as operand of "-"}}
 test expr-11.12 {CompileAddExpr: runtime error} {
     list [catch {expr {3/0}} msg] $msg
 } {1 {divide by zero}}
@@ -521,10 +521,10 @@ test expr-12.9 {CompileMultiplyExpr: error compiling multiply arm} -body {
 } -returnCodes error -match glob -result *
 test expr-12.10 {CompileMultiplyExpr: runtime error} {
     list [catch {expr {24.0*"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
+} {1 {can't use non-numeric string "xx" as operand of "*"}}
 test expr-12.11 {CompileMultiplyExpr: runtime error} {
     list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
+} {1 {can't use non-numeric string "a" as operand of "/"}}
 
 test expr-13.1 {CompileUnaryExpr: unary exprs} {expr -0xff} -255
 test expr-13.2 {CompileUnaryExpr: unary exprs} {expr +0o00123} 83
@@ -541,10 +541,10 @@ test expr-13.9 {CompileUnaryExpr: error compiling unary expr} -body {
 } -returnCodes error -match glob -result *
 test expr-13.10 {CompileUnaryExpr: runtime error} {
     list [catch {expr {~"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "~"}}
+} {1 {can't use non-numeric string "xx" as operand of "~"}}
 test expr-13.11 {CompileUnaryExpr: runtime error} {
     list [catch {expr ~4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "~"}}
+} {1 {can't use floating-point value "4.0" as operand of "~"}}
 test expr-13.12 {CompileUnaryExpr: just primary expr} {expr 0x123} 291
 test expr-13.13 {CompileUnaryExpr: just primary expr} {
     set a 27
@@ -821,15 +821,15 @@ test expr-21.13 {non-numeric boolean literals} -body {
 } -returnCodes error -match glob -result *
 test expr-21.14 {non-numeric boolean literals} {
     list [catch {expr !"truef"} err] $err
-} {1 {can't use non-numeric string as operand of "!"}}
+} {1 {can't use non-numeric string "truef" as operand of "!"}}
 test expr-21.15 {non-numeric boolean variables} {
     set v truef
     list [catch {expr {!$v}} err] $err
-} {1 {can't use non-numeric string as operand of "!"}}
+} {1 {can't use non-numeric string "truef" as operand of "!"}}
 test expr-21.16 {non-numeric boolean variables} {
     set v "true "
     list [catch {expr {!$v}} err] $err
-} {1 {can't use non-numeric string as operand of "!"}}
+} {1 {can't use non-numeric string "true " as operand of "!"}}
 test expr-21.17 {non-numeric boolean variables} {
     set v "tru"
     list [catch {expr {!$v}} err] $err
@@ -849,23 +849,23 @@ test expr-21.20 {non-numeric boolean variables} {
 test expr-21.21 {non-numeric boolean variables} {
     set v "o"
     list [catch {expr {!$v}} err] $err
-} {1 {can't use non-numeric string as operand of "!"}}
+} {1 {can't use non-numeric string "o" as operand of "!"}}
 test expr-21.22 {non-numeric boolean variables} {
     set v ""
     list [catch {expr {!$v}} err] $err
-} {1 {can't use empty string as operand of "!"}}
+} {1 {can't use empty string "" as operand of "!"}}
 
 # Test for non-numeric float handling.
 test expr-22.1 {non-numeric floats} {
     list [catch {expr {NaN + 1}} msg] $msg
-} {1 {can't use non-numeric floating-point value as operand of "+"}}
+} {1 {can't use non-numeric floating-point value "NaN" as operand of "+"}}
 test expr-22.2 {non-numeric floats} !ieeeFloatingPoint {
     list [catch {expr {Inf + 1}} msg] $msg
 } {1 {can't use infinite floating-point value as operand of "+"}}
 test expr-22.3 {non-numeric floats} {
     set nan NaN
     list [catch {expr {$nan + 1}} msg] $msg
-} {1 {can't use non-numeric floating-point value as operand of "+"}}
+} {1 {can't use non-numeric floating-point value "NaN" as operand of "+"}}
 test expr-22.4 {non-numeric floats} !ieeeFloatingPoint {
     set inf Inf
     list [catch {expr {$inf + 1}} msg] $msg
@@ -878,7 +878,7 @@ test expr-22.6 {non-numeric floats} !ieeeFloatingPoint {
 } {1 {floating-point value too large to represent}}
 test expr-22.7 {non-numeric floats} {
     list [catch {expr {1 / NaN}} msg] $msg
-} {1 {can't use non-numeric floating-point value as operand of "/"}}
+} {1 {can't use non-numeric floating-point value "NaN" as operand of "/"}}
 test expr-22.8 {non-numeric floats} !ieeeFloatingPoint {
     list [catch {expr {1 / Inf}} msg] $msg
 } {1 {can't use infinite floating-point value as operand of "/"}}
@@ -914,10 +914,10 @@ test expr-23.8 {CompileExponentialExpr: error compiling expo arm} -body {
 } -returnCodes error -match glob -result *
 test expr-23.9 {CompileExponentialExpr: runtime error} {
     list [catch {expr {24.0**"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "**"}}
+} {1 {can't use non-numeric string "xx" as operand of "**"}}
 test expr-23.10 {CompileExponentialExpr: runtime error} {
     list [catch {expr {"a"**2}} msg] $msg
-} {1 {can't use non-numeric string as operand of "**"}}
+} {1 {can't use non-numeric string "a" as operand of "**"}}
 test expr-23.11 {CompileExponentialExpr: runtime error} {
     list [catch {expr {0**-1}} msg] $msg
 } {1 {exponentiation of zero by negative power}}
diff --git a/tests/mathop.test b/tests/mathop.test
index e38001d..13a0543 100644
--- a/tests/mathop.test
+++ b/tests/mathop.test
@@ -114,22 +114,22 @@ namespace eval ::testmathop {
     test mathop-1.10 {compiled +} { + 1 2 3000000000000000000000 } 3000000000000000000003
     test mathop-1.11 {compiled +: errors} -returnCodes error -body {
 	+ x 0
-    } -result {can't use non-numeric string as operand of "+"}
+    } -result {can't use non-numeric string "x" as operand of "+"}
     test mathop-1.12 {compiled +: errors} -returnCodes error -body {
 	+ nan 0
-    } -result {can't use non-numeric floating-point value as operand of "+"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "+"}
     test mathop-1.13 {compiled +: errors} -returnCodes error -body {
 	+ 0 x
-    } -result {can't use non-numeric string as operand of "+"}
+    } -result {can't use non-numeric string "x" as operand of "+"}
     test mathop-1.14 {compiled +: errors} -returnCodes error -body {
 	+ 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "+"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "+"}
     test mathop-1.15 {compiled +: errors} -returnCodes error -body {
 	+ 0o8 0
-    } -result {can't use invalid octal number as operand of "+"}
+    } -result {can't use invalid octal number "0o8" as operand of "+"}
     test mathop-1.16 {compiled +: errors} -returnCodes error -body {
 	+ 0 0o8
-    } -result {can't use invalid octal number as operand of "+"}
+    } -result {can't use invalid octal number "0o8" as operand of "+"}
     test mathop-1.17 {compiled +: errors} -returnCodes error -body {
 	+ 0 [error expectedError]
     } -result expectedError
@@ -152,22 +152,22 @@ namespace eval ::testmathop {
     test mathop-1.28 {interpreted +} { $op 1 2 3000000000000000000000 } 3000000000000000000003
     test mathop-1.29 {interpreted +: errors} -returnCodes error -body {
 	$op x 0
-    } -result {can't use non-numeric string as operand of "+"}
+    } -result {can't use non-numeric string "x" as operand of "+"}
     test mathop-1.30 {interpreted +: errors} -returnCodes error -body {
 	$op nan 0
-    } -result {can't use non-numeric floating-point value as operand of "+"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "+"}
     test mathop-1.31 {interpreted +: errors} -returnCodes error -body {
 	$op 0 x
-    } -result {can't use non-numeric string as operand of "+"}
+    } -result {can't use non-numeric string "x" as operand of "+"}
     test mathop-1.32 {interpreted +: errors} -returnCodes error -body {
 	$op 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "+"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "+"}
     test mathop-1.33 {interpreted +: errors} -returnCodes error -body {
 	$op 0o8 0
-    } -result {can't use invalid octal number as operand of "+"}
+    } -result {can't use invalid octal number "0o8" as operand of "+"}
     test mathop-1.34 {interpreted +: errors} -returnCodes error -body {
 	$op 0 0o8
-    } -result {can't use invalid octal number as operand of "+"}
+    } -result {can't use invalid octal number "0o8" as operand of "+"}
     test mathop-1.35 {interpreted +: errors} -returnCodes error -body {
 	$op 0 [error expectedError]
     } -result expectedError
@@ -189,22 +189,22 @@ namespace eval ::testmathop {
     test mathop-2.10 {compiled *} { * 1 2 3000000000000000000000 } 6000000000000000000000
     test mathop-2.11 {compiled *: errors} -returnCodes error -body {
 	* x 0
-    } -result {can't use non-numeric string as operand of "*"}
+    } -result {can't use non-numeric string "x" as operand of "*"}
     test mathop-2.12 {compiled *: errors} -returnCodes error -body {
 	* nan 0
-    } -result {can't use non-numeric floating-point value as operand of "*"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "*"}
     test mathop-2.13 {compiled *: errors} -returnCodes error -body {
 	* 0 x
-    } -result {can't use non-numeric string as operand of "*"}
+    } -result {can't use non-numeric string "x" as operand of "*"}
     test mathop-2.14 {compiled *: errors} -returnCodes error -body {
 	* 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "*"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "*"}
     test mathop-2.15 {compiled *: errors} -returnCodes error -body {
 	* 0o8 0
-    } -result {can't use invalid octal number as operand of "*"}
+    } -result {can't use invalid octal number "0o8" as operand of "*"}
     test mathop-2.16 {compiled *: errors} -returnCodes error -body {
 	* 0 0o8
-    } -result {can't use invalid octal number as operand of "*"}
+    } -result {can't use invalid octal number "0o8" as operand of "*"}
     test mathop-2.17 {compiled *: errors} -returnCodes error -body {
 	* 0 [error expectedError]
     } -result expectedError
@@ -227,22 +227,22 @@ namespace eval ::testmathop {
     test mathop-2.28 {interpreted *} { $op 1 2 3000000000000000000000 } 6000000000000000000000
     test mathop-2.29 {interpreted *: errors} -returnCodes error -body {
 	$op x 0
-    } -result {can't use non-numeric string as operand of "*"}
+    } -result {can't use non-numeric string "x" as operand of "*"}
     test mathop-2.30 {interpreted *: errors} -returnCodes error -body {
 	$op nan 0
-    } -result {can't use non-numeric floating-point value as operand of "*"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "*"}
     test mathop-2.31 {interpreted *: errors} -returnCodes error -body {
 	$op 0 x
-    } -result {can't use non-numeric string as operand of "*"}
+    } -result {can't use non-numeric string "x" as operand of "*"}
     test mathop-2.32 {interpreted *: errors} -returnCodes error -body {
 	$op 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "*"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "*"}
     test mathop-2.33 {interpreted *: errors} -returnCodes error -body {
 	$op 0o8 0
-    } -result {can't use invalid octal number as operand of "*"}
+    } -result {can't use invalid octal number "0o8" as operand of "*"}
     test mathop-2.34 {interpreted *: errors} -returnCodes error -body {
 	$op 0 0o8
-    } -result {can't use invalid octal number as operand of "*"}
+    } -result {can't use invalid octal number "0o8" as operand of "*"}
     test mathop-2.35 {interpreted *: errors} -returnCodes error -body {
 	$op 0 [error expectedError]
     } -result expectedError
@@ -261,7 +261,7 @@ namespace eval ::testmathop {
     test mathop-3.7 {compiled !} {! 10000000000000000000000000} 0
     test mathop-3.8 {compiled !: errors} -body {
 	! foobar
-    } -returnCodes error -result {can't use non-numeric string as operand of "!"}
+    } -returnCodes error -result {can't use non-numeric string "foobar" as operand of "!"}
     test mathop-3.9 {compiled !: errors} -body {
 	! 0 0
     } -returnCodes error -result "wrong # args: should be \"! boolean\""
@@ -278,7 +278,7 @@ namespace eval ::testmathop {
     test mathop-3.17 {interpreted !} {$op 10000000000000000000000000} 0
     test mathop-3.18 {interpreted !: errors} -body {
 	$op foobar
-    } -returnCodes error -result {can't use non-numeric string as operand of "!"}
+    } -returnCodes error -result {can't use non-numeric string "foobar" as operand of "!"}
     test mathop-3.19 {interpreted !: errors} -body {
 	$op 0 0
     } -returnCodes error -result "wrong # args: should be \"! boolean\""
@@ -287,10 +287,10 @@ namespace eval ::testmathop {
     } -returnCodes error -result "wrong # args: should be \"! boolean\""
     test mathop-3.21 {compiled !: error} -returnCodes error -body {
 	! NaN
-    } -result {can't use non-numeric floating-point value as operand of "!"}
+    } -result {can't use non-numeric floating-point value "NaN" as operand of "!"}
     test mathop-3.22 {interpreted !: error} -returnCodes error -body {
 	$op NaN
-    } -result {can't use non-numeric floating-point value as operand of "!"}
+    } -result {can't use non-numeric floating-point value "NaN" as operand of "!"}
 
     test mathop-4.1 {compiled ~} {~ 0} -1
     test mathop-4.2 {compiled ~} {~ 1} -2
@@ -301,7 +301,7 @@ namespace eval ::testmathop {
     test mathop-4.7 {compiled ~} {~ 10000000000000000000000000} -10000000000000000000000001
     test mathop-4.8 {compiled ~: errors} -body {
 	~ foobar
-    } -returnCodes error -result {can't use non-numeric string as operand of "~"}
+    } -returnCodes error -result {can't use non-numeric string "foobar" as operand of "~"}
     test mathop-4.9 {compiled ~: errors} -body {
 	~ 0 0
     } -returnCodes error -result "wrong # args: should be \"~ integer\""
@@ -310,10 +310,10 @@ namespace eval ::testmathop {
     } -returnCodes error -result "wrong # args: should be \"~ integer\""
     test mathop-4.11 {compiled ~: errors} -returnCodes error -body {
 	~ 0.0
-    } -result {can't use floating-point value as operand of "~"}
+    } -result {can't use floating-point value "0.0" as operand of "~"}
     test mathop-4.12 {compiled ~: errors} -returnCodes error -body {
 	~ NaN
-    } -result {can't use non-numeric floating-point value as operand of "~"}
+    } -result {can't use non-numeric floating-point value "NaN" as operand of "~"}
     set op ~
     test mathop-4.13 {interpreted ~} {$op 0} -1
     test mathop-4.14 {interpreted ~} {$op 1} -2
@@ -324,7 +324,7 @@ namespace eval ::testmathop {
     test mathop-4.19 {interpreted ~} {$op 10000000000000000000000000} -10000000000000000000000001
     test mathop-4.20 {interpreted ~: errors} -body {
 	$op foobar
-    } -returnCodes error -result {can't use non-numeric string as operand of "~"}
+    } -returnCodes error -result {can't use non-numeric string "foobar" as operand of "~"}
     test mathop-4.21 {interpreted ~: errors} -body {
 	$op 0 0
     } -returnCodes error -result "wrong # args: should be \"~ integer\""
@@ -333,10 +333,10 @@ namespace eval ::testmathop {
     } -returnCodes error -result "wrong # args: should be \"~ integer\""
     test mathop-4.23 {interpreted ~: errors} -returnCodes error -body {
 	$op 0.0
-    } -result {can't use floating-point value as operand of "~"}
+    } -result {can't use floating-point value "0.0" as operand of "~"}
     test mathop-4.24 {interpreted ~: errors} -returnCodes error -body {
 	$op NaN
-    } -result {can't use non-numeric floating-point value as operand of "~"}
+    } -result {can't use non-numeric floating-point value "NaN" as operand of "~"}
 
     test mathop-5.1 {compiled eq} {eq {} a} 0
     test mathop-5.2 {compiled eq} {eq a a} 1
@@ -377,32 +377,32 @@ namespace eval ::testmathop {
     test mathop-6.4 {compiled &} { & 3 7 6 } 2
     test mathop-6.5 {compiled &} -returnCodes error -body {
 	& 1.0 2 3
-    } -result {can't use floating-point value as operand of "&"}
+    } -result {can't use floating-point value "1.0" as operand of "&"}
     test mathop-6.6 {compiled &} -returnCodes error -body {
 	& 1 2 3.0
-    } -result {can't use floating-point value as operand of "&"}
+    } -result {can't use floating-point value "3.0" as operand of "&"}
     test mathop-6.7 {compiled &} { & 100000000002 18 -126 } 2
     test mathop-6.8 {compiled &} { & 0xff 0o377 333333333333 } 85
     test mathop-6.9 {compiled &} { & 1000000000000000000002 18 -126 } 2
     test mathop-6.10 {compiled &} { & 0xff 0o377 3333333333333333333333 } 85
     test mathop-6.11 {compiled &: errors} -returnCodes error -body {
 	& x 0
-    } -result {can't use non-numeric string as operand of "&"}
+    } -result {can't use non-numeric string "x" as operand of "&"}
     test mathop-6.12 {compiled &: errors} -returnCodes error -body {
 	& nan 0
-    } -result {can't use non-numeric floating-point value as operand of "&"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "&"}
     test mathop-6.13 {compiled &: errors} -returnCodes error -body {
 	& 0 x
-    } -result {can't use non-numeric string as operand of "&"}
+    } -result {can't use non-numeric string "x" as operand of "&"}
     test mathop-6.14 {compiled &: errors} -returnCodes error -body {
 	& 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "&"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "&"}
     test mathop-6.15 {compiled &: errors} -returnCodes error -body {
 	& 0o8 0
-    } -result {can't use invalid octal number as operand of "&"}
+    } -result {can't use invalid octal number "0o8" as operand of "&"}
     test mathop-6.16 {compiled &: errors} -returnCodes error -body {
 	& 0 0o8
-    } -result {can't use invalid octal number as operand of "&"}
+    } -result {can't use invalid octal number "0o8" as operand of "&"}
     test mathop-6.17 {compiled &: errors} -returnCodes error -body {
 	& 0 [error expectedError]
     } -result expectedError
@@ -419,32 +419,32 @@ namespace eval ::testmathop {
     test mathop-6.22 {interpreted &} { $op 3 7 6 } 2
     test mathop-6.23 {interpreted &} -returnCodes error -body {
 	$op 1.0 2 3
-    } -result {can't use floating-point value as operand of "&"}
+    } -result {can't use floating-point value "1.0" as operand of "&"}
     test mathop-6.24 {interpreted &} -returnCodes error -body {
 	$op 1 2 3.0
-    } -result {can't use floating-point value as operand of "&"}
+    } -result {can't use floating-point value "3.0" as operand of "&"}
     test mathop-6.25 {interpreted &} { $op 100000000002 18 -126 } 2
     test mathop-6.26 {interpreted &} { $op 0xff 0o377 333333333333 } 85
     test mathop-6.27 {interpreted &} { $op 1000000000000000000002 18 -126 } 2
     test mathop-6.28 {interpreted &} { $op 0xff 0o377 3333333333333333333333 } 85
     test mathop-6.29 {interpreted &: errors} -returnCodes error -body {
 	$op x 0
-    } -result {can't use non-numeric string as operand of "&"}
+    } -result {can't use non-numeric string "x" as operand of "&"}
     test mathop-6.30 {interpreted &: errors} -returnCodes error -body {
 	$op nan 0
-    } -result {can't use non-numeric floating-point value as operand of "&"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "&"}
     test mathop-6.31 {interpreted &: errors} -returnCodes error -body {
 	$op 0 x
-    } -result {can't use non-numeric string as operand of "&"}
+    } -result {can't use non-numeric string "x" as operand of "&"}
     test mathop-6.32 {interpreted &: errors} -returnCodes error -body {
 	$op 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "&"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "&"}
     test mathop-6.33 {interpreted &: errors} -returnCodes error -body {
 	$op 0o8 0
-    } -result {can't use invalid octal number as operand of "&"}
+    } -result {can't use invalid octal number "0o8" as operand of "&"}
     test mathop-6.34 {interpreted &: errors} -returnCodes error -body {
 	$op 0 0o8
-    } -result {can't use invalid octal number as operand of "&"}
+    } -result {can't use invalid octal number "0o8" as operand of "&"}
     test mathop-6.35 {interpreted &: errors} -returnCodes error -body {
 	$op 0 [error expectedError]
     } -result expectedError
@@ -487,32 +487,32 @@ namespace eval ::testmathop {
     test mathop-7.4 {compiled |} { | 3 7 6 } 7
     test mathop-7.5 {compiled |} -returnCodes error -body {
 	| 1.0 2 3
-    } -result {can't use floating-point value as operand of "|"}
+    } -result {can't use floating-point value "1.0" as operand of "|"}
     test mathop-7.6 {compiled |} -returnCodes error -body {
 	| 1 2 3.0
-    } -result {can't use floating-point value as operand of "|"}
+    } -result {can't use floating-point value "3.0" as operand of "|"}
     test mathop-7.7 {compiled |} { | 100000000002 18 -126 } -110
     test mathop-7.8 {compiled |} { | 0xff 0o377 333333333333 } 333333333503
     test mathop-7.9 {compiled |} { | 1000000000000000000002 18 -126 } -110
     test mathop-7.10 {compiled |} { | 0xff 0o377 3333333333333333333333 } 3333333333333333333503
     test mathop-7.11 {compiled |: errors} -returnCodes error -body {
 	| x 0
-    } -result {can't use non-numeric string as operand of "|"}
+    } -result {can't use non-numeric string "x" as operand of "|"}
     test mathop-7.12 {compiled |: errors} -returnCodes error -body {
 	| nan 0
-    } -result {can't use non-numeric floating-point value as operand of "|"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "|"}
     test mathop-7.13 {compiled |: errors} -returnCodes error -body {
 	| 0 x
-    } -result {can't use non-numeric string as operand of "|"}
+    } -result {can't use non-numeric string "x" as operand of "|"}
     test mathop-7.14 {compiled |: errors} -returnCodes error -body {
 	| 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "|"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "|"}
     test mathop-7.15 {compiled |: errors} -returnCodes error -body {
 	| 0o8 0
-    } -result {can't use invalid octal number as operand of "|"}
+    } -result {can't use invalid octal number "0o8" as operand of "|"}
     test mathop-7.16 {compiled |: errors} -returnCodes error -body {
 	| 0 0o8
-    } -result {can't use invalid octal number as operand of "|"}
+    } -result {can't use invalid octal number "0o8" as operand of "|"}
     test mathop-7.17 {compiled |: errors} -returnCodes error -body {
 	| 0 [error expectedError]
     } -result expectedError
@@ -529,32 +529,32 @@ namespace eval ::testmathop {
     test mathop-7.22 {interpreted |} { $op 3 7 6 } 7
     test mathop-7.23 {interpreted |} -returnCodes error -body {
 	$op 1.0 2 3
-    } -result {can't use floating-point value as operand of "|"}
+    } -result {can't use floating-point value "1.0" as operand of "|"}
     test mathop-7.24 {interpreted |} -returnCodes error -body {
 	$op 1 2 3.0
-    } -result {can't use floating-point value as operand of "|"}
+    } -result {can't use floating-point value "3.0" as operand of "|"}
     test mathop-7.25 {interpreted |} { $op 100000000002 18 -126 } -110
     test mathop-7.26 {interpreted |} { $op 0xff 0o377 333333333333 } 333333333503
     test mathop-7.27 {interpreted |} { $op 1000000000000000000002 18 -126 } -110
     test mathop-7.28 {interpreted |} { $op 0xff 0o377 3333333333333333333333 } 3333333333333333333503
     test mathop-7.29 {interpreted |: errors} -returnCodes error -body {
 	$op x 0
-    } -result {can't use non-numeric string as operand of "|"}
+    } -result {can't use non-numeric string "x" as operand of "|"}
     test mathop-7.30 {interpreted |: errors} -returnCodes error -body {
 	$op nan 0
-    } -result {can't use non-numeric floating-point value as operand of "|"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "|"}
     test mathop-7.31 {interpreted |: errors} -returnCodes error -body {
 	$op 0 x
-    } -result {can't use non-numeric string as operand of "|"}
+    } -result {can't use non-numeric string "x" as operand of "|"}
     test mathop-7.32 {interpreted |: errors} -returnCodes error -body {
 	$op 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "|"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "|"}
     test mathop-7.33 {interpreted |: errors} -returnCodes error -body {
 	$op 0o8 0
-    } -result {can't use invalid octal number as operand of "|"}
+    } -result {can't use invalid octal number "0o8" as operand of "|"}
     test mathop-7.34 {interpreted |: errors} -returnCodes error -body {
 	$op 0 0o8
-    } -result {can't use invalid octal number as operand of "|"}
+    } -result {can't use invalid octal number "0o8" as operand of "|"}
     test mathop-7.35 {interpreted |: errors} -returnCodes error -body {
 	$op 0 [error expectedError]
     } -result expectedError
@@ -597,32 +597,32 @@ namespace eval ::testmathop {
     test mathop-8.4 {compiled ^} { ^ 3 7 6 } 2
     test mathop-8.5 {compiled ^} -returnCodes error -body {
 	^ 1.0 2 3
-    } -result {can't use floating-point value as operand of "^"}
+    } -result {can't use floating-point value "1.0" as operand of "^"}
     test mathop-8.6 {compiled ^} -returnCodes error -body {
 	^ 1 2 3.0
-    } -result {can't use floating-point value as operand of "^"}
+    } -result {can't use floating-point value "3.0" as operand of "^"}
     test mathop-8.7 {compiled ^} { ^ 100000000002 18 -126 } -100000000110
     test mathop-8.8 {compiled ^} { ^ 0xff 0o377 333333333333 } 333333333333
     test mathop-8.9 {compiled ^} { ^ 1000000000000000000002 18 -126 } -1000000000000000000110
     test mathop-8.10 {compiled ^} { ^ 0xff 0o377 3333333333333333333333 } 3333333333333333333333
     test mathop-8.11 {compiled ^: errors} -returnCodes error -body {
 	^ x 0
-    } -result {can't use non-numeric string as operand of "^"}
+    } -result {can't use non-numeric string "x" as operand of "^"}
     test mathop-8.12 {compiled ^: errors} -returnCodes error -body {
 	^ nan 0
-    } -result {can't use non-numeric floating-point value as operand of "^"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "^"}
     test mathop-8.13 {compiled ^: errors} -returnCodes error -body {
 	^ 0 x
-    } -result {can't use non-numeric string as operand of "^"}
+    } -result {can't use non-numeric string "x" as operand of "^"}
     test mathop-8.14 {compiled ^: errors} -returnCodes error -body {
 	^ 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "^"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "^"}
     test mathop-8.15 {compiled ^: errors} -returnCodes error -body {
 	^ 0o8 0
-    } -result {can't use invalid octal number as operand of "^"}
+    } -result {can't use invalid octal number "0o8" as operand of "^"}
     test mathop-8.16 {compiled ^: errors} -returnCodes error -body {
 	^ 0 0o8
-    } -result {can't use invalid octal number as operand of "^"}
+    } -result {can't use invalid octal number "0o8" as operand of "^"}
     test mathop-8.17 {compiled ^: errors} -returnCodes error -body {
 	^ 0 [error expectedError]
     } -result expectedError
@@ -639,32 +639,32 @@ namespace eval ::testmathop {
     test mathop-8.22 {interpreted ^} { $op 3 7 6 } 2
     test mathop-8.23 {interpreted ^} -returnCodes error -body {
 	$op 1.0 2 3
-    } -result {can't use floating-point value as operand of "^"}
+    } -result {can't use floating-point value "1.0" as operand of "^"}
     test mathop-8.24 {interpreted ^} -returnCodes error -body {
 	$op 1 2 3.0
-    } -result {can't use floating-point value as operand of "^"}
+    } -result {can't use floating-point value "3.0" as operand of "^"}
     test mathop-8.25 {interpreted ^} { $op 100000000002 18 -126 } -100000000110
     test mathop-8.26 {interpreted ^} { $op 0xff 0o377 333333333333 } 333333333333
     test mathop-8.27 {interpreted ^} { $op 1000000000000000000002 18 -126 } -1000000000000000000110
     test mathop-8.28 {interpreted ^} { $op 0xff 0o377 3333333333333333333333 } 3333333333333333333333
     test mathop-8.29 {interpreted ^: errors} -returnCodes error -body {
 	$op x 0
-    } -result {can't use non-numeric string as operand of "^"}
+    } -result {can't use non-numeric string "x" as operand of "^"}
     test mathop-8.30 {interpreted ^: errors} -returnCodes error -body {
 	$op nan 0
-    } -result {can't use non-numeric floating-point value as operand of "^"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "^"}
     test mathop-8.31 {interpreted ^: errors} -returnCodes error -body {
 	$op 0 x
-    } -result {can't use non-numeric string as operand of "^"}
+    } -result {can't use non-numeric string "x" as operand of "^"}
     test mathop-8.32 {interpreted ^: errors} -returnCodes error -body {
 	$op 0 nan
-    } -result {can't use non-numeric floating-point value as operand of "^"}
+    } -result {can't use non-numeric floating-point value "nan" as operand of "^"}
     test mathop-8.33 {interpreted ^: errors} -returnCodes error -body {
 	$op 0o8 0
-    } -result {can't use invalid octal number as operand of "^"}
+    } -result {can't use invalid octal number "0o8" as operand of "^"}
     test mathop-8.34 {interpreted ^: errors} -returnCodes error -body {
 	$op 0 0o8
-    } -result {can't use invalid octal number as operand of "^"}
+    } -result {can't use invalid octal number "0o8" as operand of "^"}
     test mathop-8.35 {interpreted ^: errors} -returnCodes error -body {
 	$op 0 [error expectedError]
     } -result expectedError
@@ -775,13 +775,13 @@ test mathop-20.6 { one arg, error } {
         # skipping - for now, knownbug...
         foreach op {+ * / & | ^ **} {
             lappend res [TestOp $op {*}$vals]
-            lappend exp "can't use non-numeric string as operand of \"$op\"\
+            lappend exp "can't use non-numeric string \"x\" as operand of \"$op\"\
 		ARITH DOMAIN {non-numeric string}"
         }
     }
     foreach op {+ * / & | ^ **} {
 	lappend res [TestOp $op NaN 1]
-	lappend exp "can't use non-numeric floating-point value as operand of \"$op\"\
+	lappend exp "can't use non-numeric floating-point value \"NaN\" as operand of \"$op\"\
 	    ARITH DOMAIN {non-numeric floating-point value}"
     }
     expr {$res eq $exp ? 0 : $res}
@@ -850,15 +850,15 @@ test mathop-21.5 { unary ops, bad values } {
     set res {}
     set exp {}
     lappend res [TestOp / x]
-    lappend exp "can't use non-numeric string as operand of \"/\" ARITH DOMAIN {non-numeric string}"
+    lappend exp "can't use non-numeric string \"x\" as operand of \"/\" ARITH DOMAIN {non-numeric string}"
     lappend res [TestOp - x]
-    lappend exp "can't use non-numeric string as operand of \"-\" ARITH DOMAIN {non-numeric string}"
+    lappend exp "can't use non-numeric string \"x\" as operand of \"-\" ARITH DOMAIN {non-numeric string}"
     lappend res [TestOp ~ x]
-    lappend exp "can't use non-numeric string as operand of \"~\" ARITH DOMAIN {non-numeric string}"
+    lappend exp "can't use non-numeric string \"x\" as operand of \"~\" ARITH DOMAIN {non-numeric string}"
     lappend res [TestOp ! x]
-    lappend exp "can't use non-numeric string as operand of \"!\" ARITH DOMAIN {non-numeric string}"
+    lappend exp "can't use non-numeric string \"x\" as operand of \"!\" ARITH DOMAIN {non-numeric string}"
     lappend res [TestOp ~ 5.0]
-    lappend exp "can't use floating-point value as operand of \"~\" ARITH DOMAIN {floating-point value}"
+    lappend exp "can't use floating-point value \"5.0\" as operand of \"~\" ARITH DOMAIN {floating-point value}"
     expr {$res eq $exp ? 0 : $res}
 } 0
 test mathop-21.6 { unary ops, too many } {
@@ -965,9 +965,9 @@ test mathop-22.4 { unary ops, bad values } {
     set exp {}
     foreach op {& | ^} {
         lappend res [TestOp $op x 5]
-        lappend exp "can't use non-numeric string as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
+        lappend exp "can't use non-numeric string \"x\" as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
         lappend res [TestOp $op 5 x]
-        lappend exp "can't use non-numeric string as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
+        lappend exp "can't use non-numeric string \"x\" as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
     }
     expr {$res eq $exp ? 0 : $res}
 } 0
@@ -1080,15 +1080,15 @@ test mathop-24.3 { binary ops, bad values } {
     set exp {}
     foreach op {% << >>} {
         lappend res [TestOp $op x 1]
-        lappend exp "can't use non-numeric string as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
+        lappend exp "can't use non-numeric string \"x\" as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
         lappend res [TestOp $op 1 x]
-        lappend exp "can't use non-numeric string as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
+        lappend exp "can't use non-numeric string \"x\" as operand of \"$op\" ARITH DOMAIN {non-numeric string}"
     }
     foreach op {% << >>} {
         lappend res [TestOp $op 5.0 1]
-        lappend exp "can't use floating-point value as operand of \"$op\" ARITH DOMAIN {floating-point value}"
+        lappend exp "can't use floating-point value \"5.0\" as operand of \"$op\" ARITH DOMAIN {floating-point value}"
         lappend res [TestOp $op 1 5.0]
-        lappend exp "can't use floating-point value as operand of \"$op\" ARITH DOMAIN {floating-point value}"
+        lappend exp "can't use floating-point value \"5.0\" as operand of \"$op\" ARITH DOMAIN {floating-point value}"
     }
     foreach op {in ni} {
         lappend res [TestOp $op 5 "a b \{ c"]
@@ -1266,9 +1266,9 @@ test mathop-25.41 { exp operator errors } {
     lappend res [TestOp ** $huge 2.1]
     lappend exp "Inf"
     lappend res [TestOp ** 2 foo]
-    lappend exp "can't use non-numeric string as operand of \"**\" ARITH DOMAIN {non-numeric string}"
+    lappend exp "can't use non-numeric string \"foo\" as operand of \"**\" ARITH DOMAIN {non-numeric string}"
     lappend res [TestOp ** foo 2]
-    lappend exp "can't use non-numeric string as operand of \"**\" ARITH DOMAIN {non-numeric string}"
+    lappend exp "can't use non-numeric string \"foo\" as operand of \"**\" ARITH DOMAIN {non-numeric string}"
 
     expr {$res eq $exp ? 0 : $res}
 } 0
diff --git a/tests/while-old.test b/tests/while-old.test
index 9c8cacc..b5b69dc 100644
--- a/tests/while-old.test
+++ b/tests/while-old.test
@@ -92,7 +92,7 @@ test while-old-4.3 {errors in while loops} {
 test while-old-4.4 {errors in while loops} {
     set err [catch {while {"a"+"b"} {error "loop aborted"}} msg]
     list $err $msg
-} {1 {can't use non-numeric string as operand of "+"}}
+} {1 {can't use non-numeric string "a" as operand of "+"}}
 test while-old-4.5 {errors in while loops} {
     catch {unset x}
     set x 1
diff --git a/tests/while.test b/tests/while.test
index 6ea8548..2bfab2a 100644
--- a/tests/while.test
+++ b/tests/while.test
@@ -32,7 +32,7 @@ test while-1.2 {TclCompileWhileCmd: error in test expression} -body {
 } -match glob -result {*"while {$i<} break"}
 test while-1.3 {TclCompileWhileCmd: error in test expression} -body {
     while {"a"+"b"} {error "loop aborted"}
-} -returnCodes error -result {can't use non-numeric string as operand of "+"}
+} -returnCodes error -result {can't use non-numeric string "a" as operand of "+"}
 test while-1.4 {TclCompileWhileCmd: multiline test expr} -body {
     set value 1
     while {($tcl_platform(platform) != "foobar1") && \
@@ -343,7 +343,7 @@ test while-4.3 {while (not compiled): error in test expression} -body {
 test while-4.4 {while (not compiled): error in test expression} -body {
     set z while
     $z {"a"+"b"} {error "loop aborted"}
-} -returnCodes error -result {can't use non-numeric string as operand of "+"}
+} -returnCodes error -result {can't use non-numeric string "a" as operand of "+"}
 test while-4.5 {while (not compiled): multiline test expr} -body {
     set value 1
     set z while
-- 
cgit v0.12


From 3f9307ffc1520edb1932e7b342b67ecd49c4dcf5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Oct 2022 22:24:36 +0000
Subject: Update tzdata to 2022e

---
 library/tzdata/America/Bahia_Banderas |   2 +-
 library/tzdata/America/Chihuahua      |   2 +-
 library/tzdata/America/Hermosillo     |   2 +-
 library/tzdata/America/Matamoros      |   2 +-
 library/tzdata/America/Mazatlan       |   2 +-
 library/tzdata/America/Mexico_City    |   2 +-
 library/tzdata/America/Ojinaga        |   2 +-
 library/tzdata/America/Tijuana        |   2 +-
 library/tzdata/Asia/Amman             | 156 +---------------------------------
 library/tzdata/Asia/Damascus          | 156 +---------------------------------
 10 files changed, 10 insertions(+), 318 deletions(-)

diff --git a/library/tzdata/America/Bahia_Banderas b/library/tzdata/America/Bahia_Banderas
index 8c40a0e..f06141e 100644
--- a/library/tzdata/America/Bahia_Banderas
+++ b/library/tzdata/America/Bahia_Banderas
@@ -5,7 +5,7 @@ set TZData(:America/Bahia_Banderas) {
     {-1514739600 -25200 0 MST}
     {-1343066400 -21600 0 CST}
     {-1234807200 -25200 0 MST}
-    {-1220292000 -21600 0 CST}
+    {-1220292000 -21600 1 MDT}
     {-1207159200 -25200 0 MST}
     {-1191344400 -21600 0 CST}
     {-873828000 -25200 0 MST}
diff --git a/library/tzdata/America/Chihuahua b/library/tzdata/America/Chihuahua
index 5444930..fc38542 100644
--- a/library/tzdata/America/Chihuahua
+++ b/library/tzdata/America/Chihuahua
@@ -5,7 +5,7 @@ set TZData(:America/Chihuahua) {
     {-1514739600 -25200 0 MST}
     {-1343066400 -21600 0 CST}
     {-1234807200 -25200 0 MST}
-    {-1220292000 -21600 0 CST}
+    {-1220292000 -21600 1 MDT}
     {-1207159200 -25200 0 MST}
     {-1191344400 -21600 0 CST}
     {820476000 -21600 0 CST}
diff --git a/library/tzdata/America/Hermosillo b/library/tzdata/America/Hermosillo
index 779020e..6576ad1 100644
--- a/library/tzdata/America/Hermosillo
+++ b/library/tzdata/America/Hermosillo
@@ -5,7 +5,7 @@ set TZData(:America/Hermosillo) {
     {-1514739600 -25200 0 MST}
     {-1343066400 -21600 0 CST}
     {-1234807200 -25200 0 MST}
-    {-1220292000 -21600 0 CST}
+    {-1220292000 -21600 1 MDT}
     {-1207159200 -25200 0 MST}
     {-1191344400 -21600 0 CST}
     {-873828000 -25200 0 MST}
diff --git a/library/tzdata/America/Matamoros b/library/tzdata/America/Matamoros
index 2b98652..6ae2fb9 100644
--- a/library/tzdata/America/Matamoros
+++ b/library/tzdata/America/Matamoros
@@ -1,7 +1,7 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Matamoros) {
-    {-9223372036854775808 -24000 0 LMT}
+    {-9223372036854775808 -23400 0 LMT}
     {-1514743200 -21600 0 CST}
     {568015200 -21600 0 CST}
     {576057600 -18000 1 CDT}
diff --git a/library/tzdata/America/Mazatlan b/library/tzdata/America/Mazatlan
index e56d7d0..5547d3f 100644
--- a/library/tzdata/America/Mazatlan
+++ b/library/tzdata/America/Mazatlan
@@ -5,7 +5,7 @@ set TZData(:America/Mazatlan) {
     {-1514739600 -25200 0 MST}
     {-1343066400 -21600 0 CST}
     {-1234807200 -25200 0 MST}
-    {-1220292000 -21600 0 CST}
+    {-1220292000 -21600 1 MDT}
     {-1207159200 -25200 0 MST}
     {-1191344400 -21600 0 CST}
     {-873828000 -25200 0 MST}
diff --git a/library/tzdata/America/Mexico_City b/library/tzdata/America/Mexico_City
index 48462e4..66e273f 100644
--- a/library/tzdata/America/Mexico_City
+++ b/library/tzdata/America/Mexico_City
@@ -5,7 +5,7 @@ set TZData(:America/Mexico_City) {
     {-1514739600 -25200 0 MST}
     {-1343066400 -21600 0 CST}
     {-1234807200 -25200 0 MST}
-    {-1220292000 -21600 0 CST}
+    {-1220292000 -21600 1 MDT}
     {-1207159200 -25200 0 MST}
     {-1191344400 -21600 0 CST}
     {-975261600 -18000 1 CDT}
diff --git a/library/tzdata/America/Ojinaga b/library/tzdata/America/Ojinaga
index 1172708..c01cfde 100644
--- a/library/tzdata/America/Ojinaga
+++ b/library/tzdata/America/Ojinaga
@@ -5,7 +5,7 @@ set TZData(:America/Ojinaga) {
     {-1514739600 -25200 0 MST}
     {-1343066400 -21600 0 CST}
     {-1234807200 -25200 0 MST}
-    {-1220292000 -21600 0 CST}
+    {-1220292000 -21600 1 MDT}
     {-1207159200 -25200 0 MST}
     {-1191344400 -21600 0 CST}
     {820476000 -21600 0 CST}
diff --git a/library/tzdata/America/Tijuana b/library/tzdata/America/Tijuana
index 4b7ebe7..186fe7d 100644
--- a/library/tzdata/America/Tijuana
+++ b/library/tzdata/America/Tijuana
@@ -2,7 +2,7 @@
 
 set TZData(:America/Tijuana) {
     {-9223372036854775808 -28084 0 LMT}
-    {-1514736000 -25200 0 MST}
+    {-1514739600 -25200 0 MST}
     {-1451667600 -28800 0 PST}
     {-1343062800 -25200 0 MST}
     {-1234803600 -28800 0 PST}
diff --git a/library/tzdata/Asia/Amman b/library/tzdata/Asia/Amman
index 242a0c5..05cba69 100644
--- a/library/tzdata/Asia/Amman
+++ b/library/tzdata/Asia/Amman
@@ -88,159 +88,5 @@ set TZData(:Asia/Amman) {
     {1616709600 10800 1 EEST}
     {1635458400 7200 0 EET}
     {1645740000 10800 1 EEST}
-    {1666908000 7200 0 EET}
-    {1677189600 10800 1 EEST}
-    {1698357600 7200 0 EET}
-    {1709244000 10800 1 EEST}
-    {1729807200 7200 0 EET}
-    {1740693600 10800 1 EEST}
-    {1761861600 7200 0 EET}
-    {1772143200 10800 1 EEST}
-    {1793311200 7200 0 EET}
-    {1803592800 10800 1 EEST}
-    {1824760800 7200 0 EET}
-    {1835042400 10800 1 EEST}
-    {1856210400 7200 0 EET}
-    {1866492000 10800 1 EEST}
-    {1887660000 7200 0 EET}
-    {1898546400 10800 1 EEST}
-    {1919109600 7200 0 EET}
-    {1929996000 10800 1 EEST}
-    {1951164000 7200 0 EET}
-    {1961445600 10800 1 EEST}
-    {1982613600 7200 0 EET}
-    {1992895200 10800 1 EEST}
-    {2014063200 7200 0 EET}
-    {2024344800 10800 1 EEST}
-    {2045512800 7200 0 EET}
-    {2055794400 10800 1 EEST}
-    {2076962400 7200 0 EET}
-    {2087848800 10800 1 EEST}
-    {2109016800 7200 0 EET}
-    {2119298400 10800 1 EEST}
-    {2140466400 7200 0 EET}
-    {2150748000 10800 1 EEST}
-    {2171916000 7200 0 EET}
-    {2182197600 10800 1 EEST}
-    {2203365600 7200 0 EET}
-    {2213647200 10800 1 EEST}
-    {2234815200 7200 0 EET}
-    {2245701600 10800 1 EEST}
-    {2266264800 7200 0 EET}
-    {2277151200 10800 1 EEST}
-    {2298319200 7200 0 EET}
-    {2308600800 10800 1 EEST}
-    {2329768800 7200 0 EET}
-    {2340050400 10800 1 EEST}
-    {2361218400 7200 0 EET}
-    {2371500000 10800 1 EEST}
-    {2392668000 7200 0 EET}
-    {2402949600 10800 1 EEST}
-    {2424117600 7200 0 EET}
-    {2435004000 10800 1 EEST}
-    {2455567200 7200 0 EET}
-    {2466453600 10800 1 EEST}
-    {2487621600 7200 0 EET}
-    {2497903200 10800 1 EEST}
-    {2519071200 7200 0 EET}
-    {2529352800 10800 1 EEST}
-    {2550520800 7200 0 EET}
-    {2560802400 10800 1 EEST}
-    {2581970400 7200 0 EET}
-    {2592856800 10800 1 EEST}
-    {2613420000 7200 0 EET}
-    {2624306400 10800 1 EEST}
-    {2645474400 7200 0 EET}
-    {2655756000 10800 1 EEST}
-    {2676924000 7200 0 EET}
-    {2687205600 10800 1 EEST}
-    {2708373600 7200 0 EET}
-    {2718655200 10800 1 EEST}
-    {2739823200 7200 0 EET}
-    {2750104800 10800 1 EEST}
-    {2771272800 7200 0 EET}
-    {2782159200 10800 1 EEST}
-    {2802722400 7200 0 EET}
-    {2813608800 10800 1 EEST}
-    {2834776800 7200 0 EET}
-    {2845058400 10800 1 EEST}
-    {2866226400 7200 0 EET}
-    {2876508000 10800 1 EEST}
-    {2897676000 7200 0 EET}
-    {2907957600 10800 1 EEST}
-    {2929125600 7200 0 EET}
-    {2939407200 10800 1 EEST}
-    {2960575200 7200 0 EET}
-    {2971461600 10800 1 EEST}
-    {2992629600 7200 0 EET}
-    {3002911200 10800 1 EEST}
-    {3024079200 7200 0 EET}
-    {3034360800 10800 1 EEST}
-    {3055528800 7200 0 EET}
-    {3065810400 10800 1 EEST}
-    {3086978400 7200 0 EET}
-    {3097260000 10800 1 EEST}
-    {3118428000 7200 0 EET}
-    {3129314400 10800 1 EEST}
-    {3149877600 7200 0 EET}
-    {3160764000 10800 1 EEST}
-    {3181932000 7200 0 EET}
-    {3192213600 10800 1 EEST}
-    {3213381600 7200 0 EET}
-    {3223663200 10800 1 EEST}
-    {3244831200 7200 0 EET}
-    {3255112800 10800 1 EEST}
-    {3276280800 7200 0 EET}
-    {3286562400 10800 1 EEST}
-    {3307730400 7200 0 EET}
-    {3318616800 10800 1 EEST}
-    {3339180000 7200 0 EET}
-    {3350066400 10800 1 EEST}
-    {3371234400 7200 0 EET}
-    {3381516000 10800 1 EEST}
-    {3402684000 7200 0 EET}
-    {3412965600 10800 1 EEST}
-    {3434133600 7200 0 EET}
-    {3444415200 10800 1 EEST}
-    {3465583200 7200 0 EET}
-    {3476469600 10800 1 EEST}
-    {3497032800 7200 0 EET}
-    {3507919200 10800 1 EEST}
-    {3529087200 7200 0 EET}
-    {3539368800 10800 1 EEST}
-    {3560536800 7200 0 EET}
-    {3570818400 10800 1 EEST}
-    {3591986400 7200 0 EET}
-    {3602268000 10800 1 EEST}
-    {3623436000 7200 0 EET}
-    {3633717600 10800 1 EEST}
-    {3654885600 7200 0 EET}
-    {3665772000 10800 1 EEST}
-    {3686335200 7200 0 EET}
-    {3697221600 10800 1 EEST}
-    {3718389600 7200 0 EET}
-    {3728671200 10800 1 EEST}
-    {3749839200 7200 0 EET}
-    {3760120800 10800 1 EEST}
-    {3781288800 7200 0 EET}
-    {3791570400 10800 1 EEST}
-    {3812738400 7200 0 EET}
-    {3823020000 10800 1 EEST}
-    {3844188000 7200 0 EET}
-    {3855074400 10800 1 EEST}
-    {3876242400 7200 0 EET}
-    {3886524000 10800 1 EEST}
-    {3907692000 7200 0 EET}
-    {3917973600 10800 1 EEST}
-    {3939141600 7200 0 EET}
-    {3949423200 10800 1 EEST}
-    {3970591200 7200 0 EET}
-    {3980872800 10800 1 EEST}
-    {4002040800 7200 0 EET}
-    {4012927200 10800 1 EEST}
-    {4033490400 7200 0 EET}
-    {4044376800 10800 1 EEST}
-    {4065544800 7200 0 EET}
-    {4075826400 10800 1 EEST}
-    {4096994400 7200 0 EET}
+    {1666908000 10800 0 +03}
 }
diff --git a/library/tzdata/Asia/Damascus b/library/tzdata/Asia/Damascus
index fafef49..92ac4f5 100644
--- a/library/tzdata/Asia/Damascus
+++ b/library/tzdata/Asia/Damascus
@@ -122,159 +122,5 @@ set TZData(:Asia/Damascus) {
     {1616709600 10800 1 EEST}
     {1635454800 7200 0 EET}
     {1648159200 10800 1 EEST}
-    {1666904400 7200 0 EET}
-    {1680213600 10800 1 EEST}
-    {1698354000 7200 0 EET}
-    {1711663200 10800 1 EEST}
-    {1729803600 7200 0 EET}
-    {1743112800 10800 1 EEST}
-    {1761858000 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1793307600 7200 0 EET}
-    {1806012000 10800 1 EEST}
-    {1824757200 7200 0 EET}
-    {1838066400 10800 1 EEST}
-    {1856206800 7200 0 EET}
-    {1869516000 10800 1 EEST}
-    {1887656400 7200 0 EET}
-    {1900965600 10800 1 EEST}
-    {1919106000 7200 0 EET}
-    {1932415200 10800 1 EEST}
-    {1951160400 7200 0 EET}
-    {1963864800 10800 1 EEST}
-    {1982610000 7200 0 EET}
-    {1995314400 10800 1 EEST}
-    {2014059600 7200 0 EET}
-    {2027368800 10800 1 EEST}
-    {2045509200 7200 0 EET}
-    {2058818400 10800 1 EEST}
-    {2076958800 7200 0 EET}
-    {2090268000 10800 1 EEST}
-    {2109013200 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2140462800 7200 0 EET}
-    {2153167200 10800 1 EEST}
-    {2171912400 7200 0 EET}
-    {2184616800 10800 1 EEST}
-    {2203362000 7200 0 EET}
-    {2216671200 10800 1 EEST}
-    {2234811600 7200 0 EET}
-    {2248120800 10800 1 EEST}
-    {2266261200 7200 0 EET}
-    {2279570400 10800 1 EEST}
-    {2298315600 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2329765200 7200 0 EET}
-    {2342469600 10800 1 EEST}
-    {2361214800 7200 0 EET}
-    {2374524000 10800 1 EEST}
-    {2392664400 7200 0 EET}
-    {2405973600 10800 1 EEST}
-    {2424114000 7200 0 EET}
-    {2437423200 10800 1 EEST}
-    {2455563600 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2487618000 7200 0 EET}
-    {2500322400 10800 1 EEST}
-    {2519067600 7200 0 EET}
-    {2531772000 10800 1 EEST}
-    {2550517200 7200 0 EET}
-    {2563826400 10800 1 EEST}
-    {2581966800 7200 0 EET}
-    {2595276000 10800 1 EEST}
-    {2613416400 7200 0 EET}
-    {2626725600 10800 1 EEST}
-    {2645470800 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2676920400 7200 0 EET}
-    {2689624800 10800 1 EEST}
-    {2708370000 7200 0 EET}
-    {2721679200 10800 1 EEST}
-    {2739819600 7200 0 EET}
-    {2753128800 10800 1 EEST}
-    {2771269200 7200 0 EET}
-    {2784578400 10800 1 EEST}
-    {2802718800 7200 0 EET}
-    {2816028000 10800 1 EEST}
-    {2834773200 7200 0 EET}
-    {2847477600 10800 1 EEST}
-    {2866222800 7200 0 EET}
-    {2878927200 10800 1 EEST}
-    {2897672400 7200 0 EET}
-    {2910981600 10800 1 EEST}
-    {2929122000 7200 0 EET}
-    {2942431200 10800 1 EEST}
-    {2960571600 7200 0 EET}
-    {2973880800 10800 1 EEST}
-    {2992626000 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3024075600 7200 0 EET}
-    {3036780000 10800 1 EEST}
-    {3055525200 7200 0 EET}
-    {3068229600 10800 1 EEST}
-    {3086974800 7200 0 EET}
-    {3100284000 10800 1 EEST}
-    {3118424400 7200 0 EET}
-    {3131733600 10800 1 EEST}
-    {3149874000 7200 0 EET}
-    {3163183200 10800 1 EEST}
-    {3181928400 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3213378000 7200 0 EET}
-    {3226082400 10800 1 EEST}
-    {3244827600 7200 0 EET}
-    {3258136800 10800 1 EEST}
-    {3276277200 7200 0 EET}
-    {3289586400 10800 1 EEST}
-    {3307726800 7200 0 EET}
-    {3321036000 10800 1 EEST}
-    {3339176400 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3371230800 7200 0 EET}
-    {3383935200 10800 1 EEST}
-    {3402680400 7200 0 EET}
-    {3415384800 10800 1 EEST}
-    {3434130000 7200 0 EET}
-    {3447439200 10800 1 EEST}
-    {3465579600 7200 0 EET}
-    {3478888800 10800 1 EEST}
-    {3497029200 7200 0 EET}
-    {3510338400 10800 1 EEST}
-    {3529083600 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3560533200 7200 0 EET}
-    {3573237600 10800 1 EEST}
-    {3591982800 7200 0 EET}
-    {3605292000 10800 1 EEST}
-    {3623432400 7200 0 EET}
-    {3636741600 10800 1 EEST}
-    {3654882000 7200 0 EET}
-    {3668191200 10800 1 EEST}
-    {3686331600 7200 0 EET}
-    {3699640800 10800 1 EEST}
-    {3718386000 7200 0 EET}
-    {3731090400 10800 1 EEST}
-    {3749835600 7200 0 EET}
-    {3762540000 10800 1 EEST}
-    {3781285200 7200 0 EET}
-    {3794594400 10800 1 EEST}
-    {3812734800 7200 0 EET}
-    {3826044000 10800 1 EEST}
-    {3844184400 7200 0 EET}
-    {3857493600 10800 1 EEST}
-    {3876238800 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3907688400 7200 0 EET}
-    {3920392800 10800 1 EEST}
-    {3939138000 7200 0 EET}
-    {3951842400 10800 1 EEST}
-    {3970587600 7200 0 EET}
-    {3983896800 10800 1 EEST}
-    {4002037200 7200 0 EET}
-    {4015346400 10800 1 EEST}
-    {4033486800 7200 0 EET}
-    {4046796000 10800 1 EEST}
-    {4065541200 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4096990800 7200 0 EET}
+    {1666908000 10800 0 +03}
 }
-- 
cgit v0.12


From 6cda753ae057b0c4e0b485b64262b5d61de28334 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 16 Oct 2022 11:10:36 +0000
Subject: new TIP about -eofchar handling

---
 generic/tclIO.c   | 74 ++++++-------------------------------------------------
 generic/tclIO.h   |  4 ++-
 tests/chan.test   |  2 +-
 tests/chanio.test | 22 ++++++++---------
 tests/io.test     | 26 +++++++++----------
 tests/ioCmd.test  |  6 ++---
 6 files changed, 39 insertions(+), 95 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 48aa18d..2e821a7 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1688,7 +1688,6 @@ Tcl_CreateChannel(
     statePtr->inputTranslation	= TCL_TRANSLATE_AUTO;
     statePtr->outputTranslation	= TCL_PLATFORM_TRANSLATION;
     statePtr->inEofChar		= 0;
-    statePtr->outEofChar	= 0;
 
     statePtr->unreportedError	= 0;
     statePtr->refCount		= 0;
@@ -3077,18 +3076,6 @@ CloseChannel(
     }
 
     /*
-     * If the EOF character is set in the channel, append that to the output
-     * device.
-     */
-
-    if ((statePtr->outEofChar != 0) && GotFlag(statePtr, TCL_WRITABLE)) {
-	int dummy;
-	char c = (char) statePtr->outEofChar;
-
-	(void) ChanWrite(chanPtr, &c, 1, &dummy);
-    }
-
-    /*
      * TIP #219, Tcl Channel Reflection API.
      * Move a leftover error message in the channel bypass into the
      * interpreter bypass. Just clear it if there is no interpreter.
@@ -3853,18 +3840,6 @@ CloseChannelPart(
 	}
 
 	/*
-	 * If the EOF character is set in the channel, append that to the
-	 * output device.
-	 */
-
-	if ((statePtr->outEofChar != 0) && GotFlag(statePtr, TCL_WRITABLE)) {
-	    int dummy;
-	    char c = (char) statePtr->outEofChar;
-
-	    (void) ChanWrite(chanPtr, &c, 1, &dummy);
-	}
-
-	/*
 	 * TIP #219, Tcl Channel Reflection API.
 	 * Move a leftover error message in the channel bypass into the
 	 * interpreter bypass. Just clear it if there is no interpreter.
@@ -7958,40 +7933,13 @@ Tcl_GetChannelOption(
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-eofchar");
 	}
-	if (((flags & (TCL_READABLE|TCL_WRITABLE)) ==
-		(TCL_READABLE|TCL_WRITABLE)) && (len == 0)) {
-	    Tcl_DStringStartSublist(dsPtr);
-	}
-	if (flags & TCL_READABLE) {
-	    if (statePtr->inEofChar == 0) {
-		Tcl_DStringAppendElement(dsPtr, "");
-	    } else {
-		char buf[4];
-
-		sprintf(buf, "%c", statePtr->inEofChar);
-		Tcl_DStringAppendElement(dsPtr, buf);
-	    }
-	}
-	if (flags & TCL_WRITABLE) {
-	    if (statePtr->outEofChar == 0) {
-		Tcl_DStringAppendElement(dsPtr, "");
-	    } else {
-		char buf[4];
-
-		sprintf(buf, "%c", statePtr->outEofChar);
-		Tcl_DStringAppendElement(dsPtr, buf);
-	    }
-	}
-	if (!(flags & (TCL_READABLE|TCL_WRITABLE))) {
-	    /*
-	     * Not readable or writable (e.g. server socket)
-	     */
-
+	if (!(flags & TCL_READABLE) || (statePtr->inEofChar == 0)) {
 	    Tcl_DStringAppendElement(dsPtr, "");
-	}
-	if (((flags & (TCL_READABLE|TCL_WRITABLE)) ==
-		(TCL_READABLE|TCL_WRITABLE)) && (len == 0)) {
-	    Tcl_DStringEndSublist(dsPtr);
+	} else {
+	    char buf[4];
+
+	    sprintf(buf, "%c", statePtr->inEofChar);
+	    Tcl_DStringAppendElement(dsPtr, buf);
 	}
 	if (len > 0) {
 	    return TCL_OK;
@@ -8234,13 +8182,11 @@ Tcl_SetChannelOption(
 	}
 	if (argc == 0) {
 	    statePtr->inEofChar = 0;
-	    statePtr->outEofChar = 0;
 	} else if (argc == 1 || argc == 2) {
-	    int outIndex = (argc - 1);
 	    int inValue = (int) argv[0][0];
-	    int outValue = (int) argv[outIndex][0];
+	    int outValue = (argc == 2) ? (int) argv[1][0] : 0;
 
-	    if (inValue & 0x80 || outValue & 0x80) {
+	    if (inValue & 0x80 || outValue) {
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                             "bad value for -eofchar: must be non-NUL ASCII"
@@ -8252,9 +8198,6 @@ Tcl_SetChannelOption(
 	    if (GotFlag(statePtr, TCL_READABLE)) {
 		statePtr->inEofChar = inValue;
 	    }
-	    if (GotFlag(statePtr, TCL_WRITABLE)) {
-		statePtr->outEofChar = outValue;
-	    }
 	} else {
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -8387,7 +8330,6 @@ Tcl_SetChannelOption(
 		    statePtr->outputTranslation = TCL_PLATFORM_TRANSLATION;
 		}
 	    } else if (strcmp(writeMode, "binary") == 0) {
-		statePtr->outEofChar = 0;
 		statePtr->outputTranslation = TCL_TRANSLATE_LF;
 		Tcl_FreeEncoding(statePtr->encoding);
 		statePtr->encoding = NULL;
diff --git a/generic/tclIO.h b/generic/tclIO.h
index a4cc602..490f26c 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -158,8 +158,10 @@ typedef struct ChannelState {
 				 * of line sequences in output? */
     int inEofChar;		/* If nonzero, use this as a signal of EOF on
 				 * input. */
+#if TCL_MAJOR_VERSION < 9
     int outEofChar;		/* If nonzero, append this to the channel when
-				 * it is closed if it is open for writing. */
+				 * it is closed if it is open for writing. For Tcl 8.x only */
+#endif
     int unreportedError;	/* Non-zero if an error report was deferred
 				 * because it happened in the background. The
 				 * value is the POSIX error code. */
diff --git a/tests/chan.test b/tests/chan.test
index 4155c36..280783f 100644
--- a/tests/chan.test
+++ b/tests/chan.test
@@ -61,7 +61,7 @@ test chan-4.5 {chan command: check valid inValue, invalid outValue} -body {
 } -returnCodes error -match glob -result {bad value for -eofchar:*}
 test chan-4.6 {chan command: check no inValue, valid outValue} -body {
     chan configure stdout -eofchar [list {} \x27]
-} -result {} -cleanup {chan configure stdout -eofchar [list {} {}]}
+} -returnCodes error -result {bad value for -eofchar: must be non-NUL ASCII character} -cleanup {chan configure stdout -eofchar [list {} {}]}
 
 test chan-5.1 {chan command: copy subcommand} -body {
     chan copy foo
diff --git a/tests/chanio.test b/tests/chanio.test
index c1085f4..f9d272a 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -1895,7 +1895,7 @@ test chan-io-20.3 {Tcl_CreateChannel: initial settings} -constraints {unix} -bod
     list [chan configure $f -eofchar] [chan configure $f -translation]
 } -cleanup {
     chan close $f
-} -result {{{} {}} {auto lf}}
+} -result {{{}} {auto lf}}
 test chan-io-20.5 {Tcl_CreateChannel: install channel in empty slot} -setup {
     set path(stdout) [makeFile {} stdout]
 } -constraints {stdio notWinCI} -body {
@@ -4657,7 +4657,7 @@ test chan-io-35.6 {Tcl_Eof, eof char, lf write, auto read} -setup {
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
-} -result {9 8 1}
+} -result {8 8 1}
 test chan-io-35.7 {Tcl_Eof, eof char, lf write, lf read} -setup {
     file delete $path(test1)
 } -body {
@@ -4671,7 +4671,7 @@ test chan-io-35.7 {Tcl_Eof, eof char, lf write, lf read} -setup {
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
-} -result {9 8 1}
+} -result {8 8 1}
 test chan-io-35.8 {Tcl_Eof, eof char, cr write, auto read} -setup {
     file delete $path(test1)
 } -body {
@@ -4685,7 +4685,7 @@ test chan-io-35.8 {Tcl_Eof, eof char, cr write, auto read} -setup {
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
-} -result {9 8 1}
+} -result {8 8 1}
 test chan-io-35.9 {Tcl_Eof, eof char, cr write, cr read} -setup {
     file delete $path(test1)
 } -body {
@@ -4699,7 +4699,7 @@ test chan-io-35.9 {Tcl_Eof, eof char, cr write, cr read} -setup {
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
-} -result {9 8 1}
+} -result {8 8 1}
 test chan-io-35.10 {Tcl_Eof, eof char, crlf write, auto read} -setup {
     file delete $path(test1)
 } -body {
@@ -4713,7 +4713,7 @@ test chan-io-35.10 {Tcl_Eof, eof char, crlf write, auto read} -setup {
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
-} -result {11 8 1}
+} -result {10 8 1}
 test chan-io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} -setup {
     file delete $path(test1)
 } -body {
@@ -4727,7 +4727,7 @@ test chan-io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} -setup {
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
-} -result {11 8 1}
+} -result {10 8 1}
 test chan-io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} -setup {
     file delete $path(test1)
 } -body {
@@ -5288,26 +5288,26 @@ test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
 } -constraints {unix} -body {
     set f1 [open $path(test1) w+]
     lappend l [chan configure $f1 -eofchar]
-    chan configure $f1 -eofchar {ON GO}
+    chan configure $f1 -eofchar {ON {}}
     lappend l [chan configure $f1 -eofchar]
     chan configure $f1 -eofchar D
     lappend l [chan configure $f1 -eofchar]
 } -cleanup {
     chan close $f1
-} -result {{{} {}} {O G} {D D}}
+} -result {{{}} O D}
 test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
     file delete $path(test1)
     set l [list]
 } -body {
     set f1 [open $path(test1) w+]
-    chan configure $f1 -eofchar {ON GO}
+    chan configure $f1 -eofchar {ON {}}
     lappend l [chan configure $f1 -eofchar]
     chan configure $f1 -eofchar D
     lappend l [chan configure $f1 -eofchar]
     lappend l [list [catch {chan configure $f1 -eofchar {1 2 3}} msg] $msg]
 } -cleanup {
     chan close $f1
-} -result {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
+} -result {O D {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
 test chan-io-39.23 {Tcl_GetChannelOption, server socket is not readable or\
         writeable, it should still have valid -eofchar and -translation options} -setup {
     set l [list]
diff --git a/tests/io.test b/tests/io.test
index 3241625..15ce577 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -2099,7 +2099,7 @@ test io-20.3 {Tcl_CreateChannel: initial settings} {unix} {
     set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
     close $f
     set x
-} {{{} {}} {auto lf}}
+} {{{}} {auto lf}}
 set path(stdout) [makeFile {} stdout]
 test io-20.5 {Tcl_CreateChannel: install channel in empty slot} stdio {
     set f [open $path(script) w]
@@ -5038,7 +5038,7 @@ test io-35.6 {Tcl_Eof, eof char, lf write, auto read} {
     set e [eof $f]
     close $f
     list $s $l $e
-} {9 8 1}
+} {8 8 1}
 test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5052,7 +5052,7 @@ test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
     set e [eof $f]
     close $f
     list $s $l $e
-} {9 8 1}
+} {8 8 1}
 test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5066,7 +5066,7 @@ test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
     set e [eof $f]
     close $f
     list $s $l $e
-} {9 8 1}
+} {8 8 1}
 test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5080,7 +5080,7 @@ test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
     set e [eof $f]
     close $f
     list $s $l $e
-} {9 8 1}
+} {8 8 1}
 test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5094,7 +5094,7 @@ test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
     set e [eof $f]
     close $f
     list $s $l $e
-} {11 8 1}
+} {10 8 1}
 test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5108,7 +5108,7 @@ test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} {
     set e [eof $f]
     close $f
     list $s $l $e
-} {11 8 1}
+} {10 8 1}
 test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5226,7 +5226,7 @@ test io-35.18a {Tcl_Eof, eof char, cr write, crlf read} -body {
     set e [eof $f]
     close $f
     list $s $l $e [scan [string index $in end] %c]
-} -result {9 8 1 13}
+} -result {8 8 1 13}
 test io-35.18b {Tcl_Eof, eof char, cr write, crlf read} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5240,7 +5240,7 @@ test io-35.18b {Tcl_Eof, eof char, cr write, crlf read} -body {
     set e [eof $f]
     close $f
     list $s $l $e [scan [string index $in end] %c]
-} -result {2 1 1 13}
+} -result {1 1 1 13}
 test io-35.18c {Tcl_Eof, eof char, cr write, crlf read} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -5761,25 +5761,25 @@ test io-39.22 {Tcl_SetChannelOption, invariance} {unix} {
     set f1 [open $path(test1) w+]
     set l ""
     lappend l [fconfigure $f1 -eofchar]
-    fconfigure $f1 -eofchar {ON GO}
+    fconfigure $f1 -eofchar {ON {}}
     lappend l [fconfigure $f1 -eofchar]
     fconfigure $f1 -eofchar D
     lappend l [fconfigure $f1 -eofchar]
     close $f1
     set l
-} {{{} {}} {O G} {D D}}
+} {{{}} O D}
 test io-39.22a {Tcl_SetChannelOption, invariance} {
     file delete $path(test1)
     set f1 [open $path(test1) w+]
     set l [list]
-    fconfigure $f1 -eofchar {ON GO}
+    fconfigure $f1 -eofchar {ON {}}
     lappend l [fconfigure $f1 -eofchar]
     fconfigure $f1 -eofchar D
     lappend l [fconfigure $f1 -eofchar]
     lappend l [list [catch {fconfigure $f1 -eofchar {1 2 3}} msg] $msg]
     close $f1
     set l
-} {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
+} {O D {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
 test io-39.23 {Tcl_GetChannelOption, server socket is not readable or
         writeable, it should still have valid -eofchar and -translation options } {
     set l [list]
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 20418f3..c8daa96 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -1363,7 +1363,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 0 -strictencoding 0 -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1372,7 +1372,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 0 -strictencoding 0 -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1384,7 +1384,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding 0 -strictencoding 0 -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} -nocomplainencoding 0 -strictencoding 0 -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
-- 
cgit v0.12


From 7593fce2300c45d321ff47f31909d0fafe03bf68 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 16 Oct 2022 16:57:29 +0000
Subject: Prevent warning: tclUnixSock.c:1079:19: warning: unused variable
 'size' [-Wunused-variable]

---
 unix/tclUnixSock.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index abd7fa6..43303f8 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1016,8 +1016,8 @@ TcpGetOptionProc(
     if ((len == 0) || ((len > 1) && (optionName[1] == 's') &&
 	    (strncmp(optionName, "-sockname", len) == 0))) {
 	TcpFdList *fds;
-        address sockname;
-        socklen_t size;
+	address sockname;
+	socklen_t size;
 	int found = 0;
 
 	WaitForConnect(statePtr, NULL);
@@ -1056,7 +1056,9 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'k') &&
 	    (strncmp(optionName, "-keepalive", len) == 0))) {
-        socklen_t size;
+#if defined(SO_KEEPALIVE)
+	socklen_t size;
+#endif
 	int opt = 0;
 
 	if (len == 0) {
@@ -1074,7 +1076,9 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
 	    (strncmp(optionName, "-nodelay", len) == 0))) {
-        socklen_t size;
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
+	socklen_t size;
+#endif
 	int opt = 0;
 
 	if (len == 0) {
-- 
cgit v0.12


From 3c0ca659784b51136017dd079a4716fdf2355524 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 16 Oct 2022 17:56:23 +0000
Subject: Minor change to -eofchar handling

---
 doc/chan.n        |   9 ++--
 generic/tclIO.c   |   3 +-
 tests/chanio.test | 116 ++++++++++++++++++++++++-------------------------
 tests/io.test     | 128 +++++++++++++++++++++++++++---------------------------
 4 files changed, 127 insertions(+), 129 deletions(-)

diff --git a/doc/chan.n b/doc/chan.n
index 9589f98..71db309 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -142,17 +142,16 @@ which returns the platform- and locale-dependent system encoding used to
 interface with the operating system,
 .RE
 .TP
-\fB\-eofchar\fR \fIchar\fR
+\fB\-eofchar\fR \fIinChar\fR
 .TP
 \fB\-eofchar\fR \fB{\fIinChar outChar\fB}\fR
 .
-\fIchar\fR signals the end of the data when it is encountered in the input.
-For output, the character is added when the channel is closed.  If \fIchar\fR
+\fIinChar\fR signals the end of the data when it is encountered in the input.
+For output, the character is added when the channel is closed.  If \fIinChar\fR
 is the empty string, there is no special character that marks the end of the
 data.  For read-write channels, one end-of-file character for input and another
 for output may be given.  When only one end-of-file character is given it is
-applied to both input and output.  For a read-write channel two values are
-returned even if they are are identical.
+applied to input only.
 
 The default value is the empty string, except that under Windows the default
 value for reading is Control-z (\ex1A).  The acceptable range is \ex01 -
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6a9c306..32a03b0 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8269,9 +8269,8 @@ Tcl_SetChannelOption(
 	    statePtr->inEofChar = 0;
 	    statePtr->outEofChar = 0;
 	} else if (argc == 1 || argc == 2) {
-	    int outIndex = (argc - 1);
 	    int inValue = (int) argv[0][0];
-	    int outValue = (int) argv[outIndex][0];
+	    int outValue = (argc == 2) ? (int) argv[1][0] : 0;
 
 	    if (inValue & 0x80 || outValue & 0x80) {
 		if (interp) {
diff --git a/tests/chanio.test b/tests/chanio.test
index 8d922a2..7d9c3e5 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -80,7 +80,7 @@ namespace eval ::tcl::test::io {
 	if {$argv != ""} {
 	    set f [open [lindex $argv 0]]
 	}
-	chan configure $f -encoding binary -translation lf -blocking 0 -eofchar \x1A
+	chan configure $f -encoding binary -translation lf -blocking 0 -eofchar "\x1A \x1A"
 	chan configure stdout -encoding binary -translation lf -buffering none
 	chan event $f readable "foo $f"
 	proc foo {f} {
@@ -481,7 +481,7 @@ test chan-io-6.8 {Tcl_GetsObj: remember if EOF is seen} -body {
     chan puts $f "abcdef\x1Aghijk\nwombat"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1A
+    chan configure $f -eofchar "\x1A \x1A"
     list [chan gets $f line] $line [chan gets $f line] $line
 } -cleanup {
     chan close $f
@@ -491,7 +491,7 @@ test chan-io-6.9 {Tcl_GetsObj: remember if EOF is seen} -body {
     chan puts $f "abcdefghijk\nwom\x1Abat"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1A
+    chan configure $f -eofchar "\x1A \x1A"
     list [chan gets $f line] $line [chan gets $f line] $line
 } -cleanup {
     chan close $f
@@ -999,7 +999,7 @@ test chan-io-6.52 {Tcl_GetsObj: saw EOF character} -constraints {testchannel} -b
     chan puts -nonewline $f "123456\x1Ak9012345\r"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1A
+    chan configure $f -eofchar "\x1A \x1A"
     list [chan gets $f] [testchannel queuedcr $f] [chan tell $f] [chan gets $f]
 } -cleanup {
     chan close $f
@@ -3105,7 +3105,7 @@ test chan-io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} -setup {
     chan puts -nonewline $f hello\nthere\nand\rhere\n\x1A
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan read $f
 } -cleanup {
     chan close $f
@@ -3118,11 +3118,11 @@ test chan-io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} -setup {
     file delete $path(test1)
 } -constraints {win} -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f hello\nthere\nand\rhere
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan read $f
 } -cleanup {
     chan close $f
@@ -3140,7 +3140,7 @@ test chan-io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $s
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3161,7 +3161,7 @@ test chan-io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} -setup {
     chan puts $f $s
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3239,7 +3239,7 @@ test chan-io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f [format abc\ndef\n%cqrs\ntuv 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3253,7 +3253,7 @@ test chan-io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3267,7 +3267,7 @@ test chan-io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3281,7 +3281,7 @@ test chan-io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3295,7 +3295,7 @@ test chan-io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3309,7 +3309,7 @@ test chan-io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3660,7 +3660,7 @@ test chan-io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} -setup {
     chan puts $f [format "hello\nthere\nand\rhere\n\%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3676,11 +3676,11 @@ test chan-io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} -setup {
     set l ""
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f hello\nthere\nand\rhere
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3700,7 +3700,7 @@ test chan-io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3718,7 +3718,7 @@ test chan-io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar}
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3802,7 +3802,7 @@ test chan-io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3820,7 +3820,7 @@ test chan-io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3838,7 +3838,7 @@ test chan-io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3856,7 +3856,7 @@ test chan-io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3874,7 +3874,7 @@ test chan-io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3892,7 +3892,7 @@ test chan-io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -4648,12 +4648,12 @@ test chan-io-35.6 {Tcl_Eof, eof char, lf write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4662,12 +4662,12 @@ test chan-io-35.7 {Tcl_Eof, eof char, lf write, lf read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4676,12 +4676,12 @@ test chan-io-35.8 {Tcl_Eof, eof char, cr write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4690,12 +4690,12 @@ test chan-io-35.9 {Tcl_Eof, eof char, cr write, cr read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4704,12 +4704,12 @@ test chan-io-35.10 {Tcl_Eof, eof char, crlf write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4718,12 +4718,12 @@ test chan-io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4737,7 +4737,7 @@ test chan-io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4751,7 +4751,7 @@ test chan-io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4765,7 +4765,7 @@ test chan-io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4779,7 +4779,7 @@ test chan-io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4793,7 +4793,7 @@ test chan-io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4807,7 +4807,7 @@ test chan-io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -5290,7 +5290,7 @@ test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
     lappend l [chan configure $f1 -eofchar]
     chan configure $f1 -eofchar {ON GO}
     lappend l [chan configure $f1 -eofchar]
-    chan configure $f1 -eofchar D
+    chan configure $f1 -eofchar {D D}
     lappend l [chan configure $f1 -eofchar]
 } -cleanup {
     chan close $f1
@@ -5302,7 +5302,7 @@ test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
     set f1 [open $path(test1) w+]
     chan configure $f1 -eofchar {ON GO}
     lappend l [chan configure $f1 -eofchar]
-    chan configure $f1 -eofchar D
+    chan configure $f1 -eofchar {D D}
     lappend l [chan configure $f1 -eofchar]
     lappend l [list [catch {chan configure $f1 -eofchar {1 2 3}} msg] $msg]
 } -cleanup {
@@ -6047,7 +6047,7 @@ test chan-io-48.4 {lf write, testing readability, ^Z termination, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6071,7 +6071,7 @@ test chan-io-48.5 {lf write, testing readability, ^Z in middle, auto read mode}
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6095,7 +6095,7 @@ test chan-io-48.6 {cr write, testing readability, ^Z termination, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6119,7 +6119,7 @@ test chan-io-48.7 {cr write, testing readability, ^Z in middle, auto read mode}
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6143,7 +6143,7 @@ test chan-io-48.8 {crlf write, testing readability, ^Z termination, auto read mo
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6167,7 +6167,7 @@ test chan-io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1A
+    chan configure $f -translation auto -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6191,7 +6191,7 @@ test chan-io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6215,7 +6215,7 @@ test chan-io-48.11 {lf write, testing readability, ^Z termination, lf read mode}
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1A
+    chan configure $f -translation lf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6239,7 +6239,7 @@ test chan-io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6263,7 +6263,7 @@ test chan-io-48.13 {cr write, testing readability, ^Z termination, cr read mode}
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1A
+    chan configure $f -translation cr -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6287,7 +6287,7 @@ test chan-io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mod
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6311,7 +6311,7 @@ test chan-io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1A
+    chan configure $f -translation crlf -eofchar "\x1A \x1A"
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
diff --git a/tests/io.test b/tests/io.test
index f928cd3..a80e94e 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -77,7 +77,7 @@ set path(cat) [makeFile {
     if {$argv != ""} {
 	set f [open [lindex $argv 0]]
     }
-    fconfigure $f -encoding binary -translation lf -blocking 0 -eofchar \x1A
+    fconfigure $f -encoding binary -translation lf -blocking 0 -eofchar "\x1A \x1A"
     fconfigure stdout -encoding binary -translation lf -buffering none
     fileevent $f readable "foo $f"
     proc foo {f} {
@@ -517,7 +517,7 @@ test io-6.8 {Tcl_GetsObj: remember if EOF is seen} {
     puts $f "abcdef\x1Aghijk\nwombat"
     close $f
     set f [open $path(test1)]
-    fconfigure $f -eofchar \x1A
+    fconfigure $f -eofchar "\x1A \x1A"
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
     set x
@@ -527,7 +527,7 @@ test io-6.9 {Tcl_GetsObj: remember if EOF is seen} {
     puts $f "abcdefghijk\nwom\x1Abat"
     close $f
     set f [open $path(test1)]
-    fconfigure $f -eofchar \x1A
+    fconfigure $f -eofchar "\x1A \x1A"
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
     set x
@@ -1036,7 +1036,7 @@ test io-6.52 {Tcl_GetsObj: saw EOF character} {testchannel} {
     puts -nonewline $f "123456\x1Ak9012345\r"
     close $f
     set f [open $path(test1)]
-    fconfigure $f -eofchar \x1A
+    fconfigure $f -eofchar "\x1A \x1A"
     set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
     close $f
     set x
@@ -3382,7 +3382,7 @@ test io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} {
     puts -nonewline $f hello\nthere\nand\rhere\n\x1A
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [read $f]
     close $f
     set c
@@ -3394,11 +3394,11 @@ here
 test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {win} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f hello\nthere\nand\rhere
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [read $f]
     close $f
     set c
@@ -3415,7 +3415,7 @@ test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3435,7 +3435,7 @@ test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3513,7 +3513,7 @@ test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3527,7 +3527,7 @@ test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3541,7 +3541,7 @@ test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3555,7 +3555,7 @@ test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3569,7 +3569,7 @@ test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3583,7 +3583,7 @@ test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} {
     puts $f $c
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set c [string length [read $f]]
     set e [eof $f]
     close $f
@@ -3916,7 +3916,7 @@ test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3931,11 +3931,11 @@ test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} {
 test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f hello\nthere\nand\rhere
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3955,7 +3955,7 @@ test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3973,7 +3973,7 @@ test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4057,7 +4057,7 @@ test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4075,7 +4075,7 @@ test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4093,7 +4093,7 @@ test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4111,7 +4111,7 @@ test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4129,7 +4129,7 @@ test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -4147,7 +4147,7 @@ test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} {
     puts $f $s
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -5028,12 +5028,12 @@ test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} stdio {
 test io-35.6 {Tcl_Eof, eof char, lf write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5042,12 +5042,12 @@ test io-35.6 {Tcl_Eof, eof char, lf write, auto read} {
 test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5056,12 +5056,12 @@ test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
 test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5070,12 +5070,12 @@ test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
 test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5084,12 +5084,12 @@ test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
 test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5098,12 +5098,12 @@ test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
 test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5118,7 +5118,7 @@ test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5133,7 +5133,7 @@ test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5148,7 +5148,7 @@ test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5163,7 +5163,7 @@ test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5178,7 +5178,7 @@ test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5193,7 +5193,7 @@ test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [read $f]]
     set e [eof $f]
     close $f
@@ -5216,12 +5216,12 @@ test io-35.18 {Tcl_Eof, eof char, cr write, crlf read} -body {
 test io-35.18a {Tcl_Eof, eof char, cr write, crlf read} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f abc\ndef
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5230,12 +5230,12 @@ test io-35.18a {Tcl_Eof, eof char, cr write, crlf read} -body {
 test io-35.18b {Tcl_Eof, eof char, cr write, crlf read} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     puts $f {}
     close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5264,7 +5264,7 @@ test io-35.19 {Tcl_Eof, eof char in middle, cr write, crlf read} -body {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5279,7 +5279,7 @@ test io-35.20 {Tcl_Eof, eof char in middle, cr write, crlf read} {
     close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     set l [string length [set in [read $f]]]
     set e [eof $f]
     close $f
@@ -5763,7 +5763,7 @@ test io-39.22 {Tcl_SetChannelOption, invariance} {unix} {
     lappend l [fconfigure $f1 -eofchar]
     fconfigure $f1 -eofchar {ON GO}
     lappend l [fconfigure $f1 -eofchar]
-    fconfigure $f1 -eofchar D
+    fconfigure $f1 -eofchar {D D}
     lappend l [fconfigure $f1 -eofchar]
     close $f1
     set l
@@ -5774,7 +5774,7 @@ test io-39.22a {Tcl_SetChannelOption, invariance} {
     set l [list]
     fconfigure $f1 -eofchar {ON GO}
     lappend l [fconfigure $f1 -eofchar]
-    fconfigure $f1 -eofchar D
+    fconfigure $f1 -eofchar {D D}
     lappend l [fconfigure $f1 -eofchar]
     lappend l [list [catch {fconfigure $f1 -eofchar {1 2 3}} msg] $msg]
     close $f1
@@ -6539,7 +6539,7 @@ test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} {fi
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6567,7 +6567,7 @@ test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} {file
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6595,7 +6595,7 @@ test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} {fi
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6623,7 +6623,7 @@ test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} {file
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6651,7 +6651,7 @@ test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} {
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6679,7 +6679,7 @@ test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} {fi
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation auto -eofchar \x1A
+    fconfigure $f -translation auto -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6707,7 +6707,7 @@ test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} {filee
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6735,7 +6735,7 @@ test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} {fil
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation lf -eofchar \x1A
+    fconfigure $f -translation lf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6763,7 +6763,7 @@ test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} {filee
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6791,7 +6791,7 @@ test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} {fil
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation cr -eofchar \x1A
+    fconfigure $f -translation cr -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6819,7 +6819,7 @@ test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} {f
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
@@ -6847,7 +6847,7 @@ test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} {filee
     set c 0
     set l ""
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf -eofchar \x1A
+    fconfigure $f -translation crlf -eofchar "\x1A \x1A"
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-- 
cgit v0.12


From 4656afb575cda58ec7b6ce77f0a96b98173ca36d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 17 Oct 2022 19:44:08 +0000
Subject: More octal -> hex usage

---
 doc/Eval.3            |  6 ++--
 doc/FileSystem.3      |  6 ++--
 doc/Number.3          |  8 ++---
 doc/source.n          |  4 +--
 doc/tclsh.1           |  8 ++---
 generic/regc_lex.c    |  4 +--
 generic/regc_locale.c | 86 +++++++++++++++++++++++++--------------------------
 generic/tclObj.c      |  6 ++--
 library/auto.tcl      |  4 +--
 library/init.tcl      |  2 +-
 library/safe.tcl      |  2 +-
 tools/genStubs.tcl    |  2 +-
 12 files changed, 64 insertions(+), 74 deletions(-)

diff --git a/doc/Eval.3 b/doc/Eval.3
index 3ae0bce..02a8da5 100644
--- a/doc/Eval.3
+++ b/doc/Eval.3
@@ -99,13 +99,11 @@ its contents as a Tcl script.  It returns the same information as
 If the file could not be read then a Tcl error is returned to describe
 why the file could not be read.
 The eofchar for files is
-.QW \e32
+.QW \ex1A
 (^Z) for all platforms. If you require a
 .QW ^Z
 in code for string comparison, you can use
-.QW \e032
-or
-.QW \eu001a ,
+.QW \ex1A ,
 which will be safely substituted by the Tcl interpreter into
 .QW ^Z .
 .PP
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index 4951ec5..e7cc4ab 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -425,14 +425,12 @@ reading the file contents.
 If the file could not be read then a Tcl error is returned to describe
 why the file could not be read.
 The eofchar for files is
-.QW \e32
+.QW \ex1A
 (^Z) for all platforms.
 If you require a
 .QW ^Z
 in code for string comparison, you can use
-.QW \e032
-or
-.QW \eu001a ,
+.QW \ex1A ,
 which will be safely substituted by the Tcl interpreter into
 .QW ^Z .
 \fBTcl_FSEvalFile\fR is a simpler version of
diff --git a/doc/Number.3 b/doc/Number.3
index f93d75d..f405060 100644
--- a/doc/Number.3
+++ b/doc/Number.3
@@ -50,7 +50,7 @@ Tcl recognizes many values as numbers.  Several examples include:
 \fB"1_000_000"\fR, \fB"4.0"\fR, \fB"1e-7"\fR, \fB"NaN"\fR, or \fB"Inf"\fR.
 When built-in Tcl commands act on these values as numbers, they are converted
 to a numeric representation for efficient handling in C code.  Tcl makes
-use of three C types to store these representations: \fBdouble\fR, 
+use of three C types to store these representations: \fBdouble\fR,
 \fBTcl_WideInt\fR, and \fBmp_int\fR.  The \fBdouble\fR type is provided by the
 C language standard.  The \fBTcl_WideInt\fR type is declared in the Tcl
 header file, \fBtcl.h\fR, and is equivalent to the C standard type
@@ -76,7 +76,7 @@ If Tcl does recognize the examined value as a number, both routines return
 and \fItypePtr\fR (which may not be NULL) to report information the
 caller can use to retrieve the numeric representation.  Both routines
 write to *\fIclientDataPtr\fR a pointer to the internal storage location
-where Tcl holds the converted numeric value.  
+where Tcl holds the converted numeric value.
 .PP
 When the converted numeric value is stored as a \fBdouble\fR,
 a call to math library routine \fBisnan\fR determines whether that
@@ -91,13 +91,13 @@ the \fBdouble\fR numeric value may be read through it.
 .PP
 When the converted numeric value is stored as a \fBTcl_WideInt\fR,
 both \fBTcl_GetNumber\fR and \fBTcl_GetNumberFromObj\fR write the
-value \fBTCL_NUMBER_INT\fR to *\fItypePtr\fR. 
+value \fBTCL_NUMBER_INT\fR to *\fItypePtr\fR.
 The storage pointer may be cast to type \fBconst Tcl_WideInt *\fR and
 the \fBTcl_WideInt\fR numeric value may be read through it.
 .PP
 When the converted numeric value is stored as an \fBmp_int\fR,
 both \fBTcl_GetNumber\fR and \fBTcl_GetNumberFromObj\fR write the
-value \fBTCL_NUMBER_BIG\fR to *\fItypePtr\fR. 
+value \fBTCL_NUMBER_BIG\fR to *\fItypePtr\fR.
 The storage pointer may be cast to type \fBconst mp_int *\fR and
 the \fBmp_int\fR numeric value may be read through it.
 .PP
diff --git a/doc/source.n b/doc/source.n
index 8757cb8..cee1312 100644
--- a/doc/source.n
+++ b/doc/source.n
@@ -37,9 +37,7 @@ allowing for files containing code and data segments (scripted documents).
 If you require a
 .QW ^Z
 in code for string comparison, you can use
-.QW \e032
-or
-.QW \eu001a ,
+.QW \ex1A ,
 which will be safely substituted by the Tcl interpreter into
 .QW ^Z .
 .PP
diff --git a/doc/tclsh.1 b/doc/tclsh.1
index 8dbacc0..3a78737 100644
--- a/doc/tclsh.1
+++ b/doc/tclsh.1
@@ -38,15 +38,11 @@ read Tcl commands from the named file;  \fBtclsh\fR will exit
 when it reaches the end of the file.
 The end of the file may be marked either by the physical end of
 the medium, or by the character,
-.QW \e032
-.PQ \eu001a ", control-Z" .
+.PQ \ex1A ", control-Z" .
 If this character is present in the file, the \fBtclsh\fR application
 will read text up to but not including the character.  An application
 that requires this character in the file may safely encode it as
-.QW \e032 ,
-.QW \ex1A ,
-or
-.QW \eu001a ;
+.QW \ex1A ;
 or may generate it by use of commands such as \fBformat\fR or \fBbinary\fR.
 There is no automatic evaluation of \fB.tclshrc\fR when the name
 of a script file is presented on the \fBtclsh\fR command
diff --git a/generic/regc_lex.c b/generic/regc_lex.c
index bad91ce..eb068b4 100644
--- a/generic/regc_lex.c
+++ b/generic/regc_lex.c
@@ -775,7 +775,7 @@ lexescape(
     NOTE(REG_UNONPOSIX);
     switch (c) {
     case CHR('a'):
-	RETV(PLAIN, chrnamed(v, alert, ENDOF(alert), CHR('\007')));
+	RETV(PLAIN, chrnamed(v, alert, ENDOF(alert), CHR('\x07')));
 	break;
     case CHR('A'):
 	RETV(SBEGIN, 0);
@@ -803,7 +803,7 @@ lexescape(
 	break;
     case CHR('e'):
 	NOTE(REG_UUNPORT);
-	RETV(PLAIN, chrnamed(v, esc, ENDOF(esc), CHR('\033')));
+	RETV(PLAIN, chrnamed(v, esc, ENDOF(esc), CHR('\x1B')));
 	break;
     case CHR('f'):
 	RETV(PLAIN, CHR('\f'));
diff --git a/generic/regc_locale.c b/generic/regc_locale.c
index e74b147..1ac04ef 100644
--- a/generic/regc_locale.c
+++ b/generic/regc_locale.c
@@ -16,49 +16,49 @@ static const struct cname {
     const char *name;
     const char code;
 } cnames[] = {
-    {"NUL",		'\0'},
-    {"SOH",		'\001'},
-    {"STX",		'\002'},
-    {"ETX",		'\003'},
-    {"EOT",		'\004'},
-    {"ENQ",		'\005'},
-    {"ACK",		'\006'},
-    {"BEL",		'\007'},
-    {"alert",		'\007'},
-    {"BS",		'\010'},
-    {"backspace",	'\b'},
-    {"HT",		'\011'},
-    {"tab",		'\t'},
-    {"LF",		'\012'},
-    {"newline",		'\n'},
-    {"VT",		'\013'},
-    {"vertical-tab",	'\v'},
-    {"FF",		'\014'},
-    {"form-feed",	'\f'},
-    {"CR",		'\015'},
-    {"carriage-return",	'\r'},
-    {"SO",		'\016'},
-    {"SI",		'\017'},
-    {"DLE",		'\020'},
-    {"DC1",		'\021'},
-    {"DC2",		'\022'},
-    {"DC3",		'\023'},
-    {"DC4",		'\024'},
-    {"NAK",		'\025'},
-    {"SYN",		'\026'},
-    {"ETB",		'\027'},
-    {"CAN",		'\030'},
-    {"EM",		'\031'},
-    {"SUB",		'\032'},
-    {"ESC",		'\033'},
-    {"IS4",		'\034'},
-    {"FS",		'\034'},
-    {"IS3",		'\035'},
-    {"GS",		'\035'},
-    {"IS2",		'\036'},
-    {"RS",		'\036'},
-    {"IS1",		'\037'},
-    {"US",		'\037'},
+    {"NUL",		'\x00'},
+    {"SOH",		'\x01'},
+    {"STX",		'\x02'},
+    {"ETX",		'\x03'},
+    {"EOT",		'\x04'},
+    {"ENQ",		'\x05'},
+    {"ACK",		'\x06'},
+    {"BEL",		'\x07'},
+    {"alert",		'\x07'},
+    {"BS",		'\x08'},
+    {"backspace",	'\x08'},
+    {"HT",		'\x09'},
+    {"tab",		'\x09'},
+    {"LF",		'\x0A'},
+    {"newline",		'\x0A'},
+    {"VT",		'\x0B'},
+    {"vertical-tab",	'\x0B'},
+    {"FF",		'\x0C'},
+    {"form-feed",	'\x0C'},
+    {"CR",		'\x0D'},
+    {"carriage-return",	'\x0D'},
+    {"SO",		'\x0E'},
+    {"SI",		'\x0F'},
+    {"DLE",		'\x10'},
+    {"DC1",		'\x11'},
+    {"DC2",		'\x12'},
+    {"DC3",		'\x13'},
+    {"DC4",		'\x14'},
+    {"NAK",		'\x15'},
+    {"SYN",		'\x16'},
+    {"ETB",		'\x17'},
+    {"CAN",		'\x18'},
+    {"EM",		'\x19'},
+    {"SUB",		'\x1A'},
+    {"ESC",		'\x1B'},
+    {"IS4",		'\x1C'},
+    {"FS",		'\x1C'},
+    {"IS3",		'\x1D'},
+    {"GS",		'\x1D'},
+    {"IS2",		'\x1E'},
+    {"RS",		'\x1E'},
+    {"IS1",		'\x1F'},
+    {"US",		'\x1F'},
     {"space",		' '},
     {"exclamation-mark",'!'},
     {"quotation-mark",	'"'},
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 8970ab0..4a660b2 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -785,7 +785,7 @@ TclContinuationsGet(
 
 static void
 TclThreadFinalizeContLines(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     /*
      * Release the hashtable tracking invisible continuation lines.
@@ -3956,7 +3956,7 @@ Tcl_GetNumber(
     Tcl_Interp *interp,
     const char *bytes,
     size_t numBytes,
-    ClientData *clientDataPtr,
+    void **clientDataPtr,
     int *typePtr)
 {
     static Tcl_ThreadDataKey numberCacheKey;
@@ -4851,7 +4851,7 @@ SetCmdNameFromAny(
 
 int
 Tcl_RepresentationCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
diff --git a/library/auto.tcl b/library/auto.tcl
index dc37328..3b1bb05 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -302,7 +302,7 @@ proc auto_mkindex_old {dir args} {
 	set f ""
 	set error [catch {
 	    set f [open $file]
-	    fconfigure $f -encoding utf-8 -eofchar "\032 {}"
+	    fconfigure $f -encoding utf-8 -eofchar "\x1A {}"
 	    while {[gets $f line] >= 0} {
 		if {[regexp {^proc[ 	]+([^ 	]*)} $line match procName]} {
 		    set procName [lindex [auto_qualify $procName "::"] 0]
@@ -414,7 +414,7 @@ proc auto_mkindex_parser::mkindex {file} {
     set scriptFile $file
 
     set fid [open $file]
-    fconfigure $fid -encoding utf-8 -eofchar "\032 {}"
+    fconfigure $fid -encoding utf-8 -eofchar "\x1A {}"
     set contents [read $fid]
     close $fid
 
diff --git a/library/init.tcl b/library/init.tcl
index a879fe5..bbff158 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -442,7 +442,7 @@ proc auto_load_index {} {
 	    continue
 	} else {
 	    set error [catch {
-		fconfigure $f -encoding utf-8 -eofchar "\032 {}"
+		fconfigure $f -encoding utf-8 -eofchar "\x1A {}"
 		set id [gets $f]
 		if {$id eq "# Tcl autoload index file, version 2.0"} {
 		    eval [read $f]
diff --git a/library/safe.tcl b/library/safe.tcl
index 2e04f8e..9050880 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -980,7 +980,7 @@ proc ::safe::AliasSource {child args} {
     set replacementMsg "script error"
     set code [catch {
 	set f [open $realfile]
-	fconfigure $f -encoding $encoding -eofchar "\032 {}"
+	fconfigure $f -encoding $encoding -eofchar "\x1A {}"
 	set contents [read $f]
 	close $f
 	::interp eval $child [list info script $file]
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 282abcc..89e4ccc 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -257,7 +257,7 @@ proc genStubs::rewriteFile {file text} {
 	return
     }
     set in [open ${file} r]
-    fconfigure $in -eofchar "\032 {}" -encoding utf-8
+    fconfigure $in -eofchar "\x1A {}" -encoding utf-8
     set out [open ${file}.new w]
     fconfigure $out -translation lf -encoding utf-8
 
-- 
cgit v0.12


From 39c9836950691a1ae7c2735760a80af66f8edc4a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 18 Oct 2022 10:12:51 +0000
Subject: Allow any single character for -eofchar, even if it's not a valid
 list

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

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 23b860a..374f770 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8061,7 +8061,7 @@ Tcl_SetChannelOption(
 				/* State info for channel */
     size_t len;			/* Length of optionName string. */
     size_t argc;
-    const char **argv;
+    const char **argv = NULL;
 
     /*
      * If the channel is in the middle of a background copy, fail.
@@ -8177,10 +8177,13 @@ Tcl_SetChannelOption(
 	UpdateInterest(chanPtr);
 	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
-	if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
+	if (!newValue[0] || (!(newValue[0] & 0x80) && !newValue[1])) {
+	    if (GotFlag(statePtr, TCL_READABLE)) {
+		statePtr->inEofChar = newValue[0];
+	    }
+	} else if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
 	    return TCL_ERROR;
-	}
-	if (argc == 0) {
+	} else if (argc == 0) {
 	    statePtr->inEofChar = 0;
 	} else if (argc == 1 || argc == 2) {
 	    int inValue = (int) argv[0][0];
-- 
cgit v0.12


From 842fb667f5a79b8f11cac96c4a029b509ed5ed22 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 18 Oct 2022 10:25:35 +0000
Subject: Allow any single character for -eofchar, even if it's not a valid
 list

---
 generic/tclIO.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 32a03b0..4002934 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4655,7 +4655,8 @@ Tcl_GetsObj(
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
     ChannelBuffer *bufPtr;
-    int inEofChar, skip, copiedTotal, oldLength, oldFlags, oldRemoved;
+    int inEofChar, skip, copiedTotal, oldFlags, oldRemoved;
+    int oldLength;
     Tcl_Encoding encoding;
     char *dst, *dstEnd, *eol, *eof;
     Tcl_EncodingState oldState;
@@ -8156,7 +8157,7 @@ Tcl_SetChannelOption(
 				/* State info for channel */
     size_t len;			/* Length of optionName string. */
     int argc;
-    const char **argv;
+    const char **argv = NULL;
 
     /*
      * If the channel is in the middle of a background copy, fail.
@@ -8262,10 +8263,14 @@ Tcl_SetChannelOption(
 	UpdateInterest(chanPtr);
 	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
-	if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
+	if (!newValue[0] || (!(newValue[0] & 0x80) && !newValue[1])) {
+	    if (GotFlag(statePtr, TCL_READABLE)) {
+		statePtr->inEofChar = newValue[0];
+	    }
+	    statePtr->outEofChar = 0;
+	} else if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
 	    return TCL_ERROR;
-	}
-	if (argc == 0) {
+	} else if (argc == 0) {
 	    statePtr->inEofChar = 0;
 	    statePtr->outEofChar = 0;
 	} else if (argc == 1 || argc == 2) {
-- 
cgit v0.12


From 59dd8794c5be3c6fd398c50a80526921947220ef Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 18 Oct 2022 13:35:53 +0000
Subject: Change the default for AutoPathSync in Tcl 9.0 (as described in TIP
 #579)

---
 library/safe.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 0c09aa4..ab97b8f 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -1419,7 +1419,7 @@ namespace eval ::safe {
     # Set to 1 for "traditional" behavior: a child's entire access path and
     # module path are copied to its ::auto_path, which is updated whenever
     # the user calls ::safe::interpAddToAccessPath to add to the access path.
-    variable AutoPathSync 1
+    variable AutoPathSync 0
 
     # Log command, set via 'setLogCmd'. Logging is disabled when empty.
     variable Log {}
-- 
cgit v0.12


From c0b6a93d8fe6016ad657a4dfce0bbeffa0b7f86a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 18 Oct 2022 14:42:27 +0000
Subject: Fix [20157fbd14]: Failed tests safe-9.[67], since "-autoPath" is
 added

---
 tests/safe.test | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index a128f3e..a4f8df0 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -734,10 +734,10 @@ test safe-9.6 {interpConfigure widget like behaviour} -body {
 	 safe::interpConfigure $i]
 } -cleanup {
     safe::interpDelete $i
-} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}}\
-        {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}}\
-        {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}}\
-        {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
+} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar} -autoPath *}\
+	{-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}}\
+	{-accessPath * -statics 1 -nested 1 -deleteHook {foo bar} -autoPath *}\
+	{-accessPath * -statics 0 -nested 0 -deleteHook toto -autoPath *}}
 test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
    # this test shall work, believed equivalent to 9.6
     set i [safe::interpCreate \
@@ -759,10 +759,10 @@ test safe-9.7 {interpConfigure widget like behaviour (demystified)} -body {
 } -cleanup {
     safe::interpDelete $i
     unset -nocomplain a b c d e f g i
-} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar}}\
-        {-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}}\
-        {-accessPath * -statics 1 -nested 1 -deleteHook {foo bar}}\
-        {-accessPath * -statics 0 -nested 0 -deleteHook toto}}
+} -match glob -result {{-accessPath * -statics 0 -nested 1 -deleteHook {foo bar} -autoPath *}\
+	{-accessPath *} {-nested 1} {-statics 0} {-deleteHook {foo bar}}\
+	{-accessPath * -statics 1 -nested 1 -deleteHook {foo bar} -autoPath *}\
+	{-accessPath * -statics 0 -nested 0 -deleteHook toto -autoPath *}}
 test safe-9.8 {autoloading commands indexed in tclIndex files, Sync Mode on} -setup {
     set SyncExists [expr {[info commands ::safe::setSyncMode] ne {}}]
     if {$SyncExists} {
-- 
cgit v0.12


From c84fb00aedcd917b0e97548c3c1060d3f945420c Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 18 Oct 2022 19:37:44 +0000
Subject: Draft updates to changes file for 8.6.13 release.

---
 changes | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/changes b/changes
index fba75e3..6d2392f 100644
--- a/changes
+++ b/changes
@@ -9116,3 +9116,54 @@ See RFC 2045
 2021-10-27 tzdata updated to Olson's tzdata2021e (nijtmans)
 
 - Released 8.6.12, Nov 5, 2021 - details at https://core.tcl-lang.org/tcl/ -
+
+2021-12-08 (update) tcltest package to version 2.5.4
+
+2022-01-13 (bug)[26f132] Crash when sizeof(int) < sizeof(void *) (Plan 9 port)
+
+2022-01-19 (TIP 623)[e9a271] Tcl_GetRange index args < 0 (petasis,nijtmans)
+
+2022-03-08 (bug) test string-5.22 (porter)
+
+2022-03-11 (bug)[8a7ec8] fat binary compile on Mac M1 (davis, nijtmans)
+
+2022-04-04 (bug)[e5ed1b] numeric IPv6 in URLs (nijtmans)
+=> http 2.9.6
+
+2022-04-26 (bug)[27520c] test error-9.6 (goth,sebres)
+
+2022-05-04 (bug)[8eb64b] http package support for Content-encoding: br
+
+2022-05-11 (bug)[6898f9] http package failed detection of shiftjis charset
+
+2022-05-25 (bug)[76ad7a] tests string-6.13[23] (mistachkin, nijtmans)
+
+2022-06-20 (bug)[55bf73] Avoid connection reuse after response code 101.
+=> http 2.9.8
+
+2022-07-22 (bug)[713653] FP rounding exposed by x86 musl (rubicon,sebres)
+
+2022-07-22 More portable notation of microseconds in verbose output (sebres)
+=> tcltest 2.5.5
+
+2022-07-27 (bug)[b3977d] Process CR-LF split across packets (nadkarni,sebres)
+
+2022-07-29 (bug)[4eb3a1] crash due to undetected bytecode invalidity (nadkarni)
+
+2022-08-23 (new)[371080] Portability to CHERI-enabled Morello processor (jrtc27)
+
+2022-09-06 (bug)[55a02f] Fallback init env(HOME) from USERPROFILE (nadkarni)
+
+2022-09-13 (bug)[1073da] crash writing invalid utf-8 (nijtmans)
+
+2022-09-14 (new) Update to Unicode-15 (nijtmans)
+
+2022-10-14 tzdata updated to Olson's tzdata2022e (nijtmans)
+
+Update bundled zlib to 1.2.12
+
+Update bundled libtommath
+
+Many code fixes to avoid overflow or undefined behavior.  Thanks chrstphrchvz.
+
+- Released 8.6.13, Oct 28, 2022 - details at https://core.tcl-lang.org/tcl/ -
-- 
cgit v0.12


From 6a9dc785dc6069702330f2a6ec66b1717afbfbd7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 18 Oct 2022 20:24:43 +0000
Subject: Update to zlib-1.2.13

---
 compat/zlib/CMakeLists.txt                         |  42 +---
 compat/zlib/ChangeLog                              |  24 ++-
 compat/zlib/Makefile.in                            |  20 +-
 compat/zlib/README                                 |   4 +-
 compat/zlib/compress.c                             |   6 +-
 compat/zlib/configure                              |  94 ++++----
 compat/zlib/contrib/README.contrib                 |   2 +-
 compat/zlib/contrib/delphi/ZLib.pas                |   2 +-
 compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs   |   2 +-
 compat/zlib/contrib/infback9/inftree9.c            |   4 +-
 compat/zlib/contrib/infback9/inftree9.h            |   2 +-
 compat/zlib/contrib/minizip/configure.ac           |   2 +-
 compat/zlib/contrib/minizip/crypt.h                |   2 +-
 compat/zlib/contrib/minizip/ioapi.c                |  28 ++-
 compat/zlib/contrib/minizip/ioapi.h                |   2 +-
 compat/zlib/contrib/minizip/miniunz.c              |   2 +-
 compat/zlib/contrib/minizip/unzip.c                |   4 +-
 compat/zlib/contrib/minizip/zip.c                  |   7 +-
 compat/zlib/contrib/pascal/zlibpas.pas             |   2 +-
 compat/zlib/contrib/puff/README                    |   2 +-
 compat/zlib/contrib/puff/puff.c                    |   4 +-
 compat/zlib/contrib/puff/pufftest.c                |   2 +-
 compat/zlib/contrib/vstudio/readme.txt             |   5 +-
 .../contrib/vstudio/vc10/miniunz.vcxproj.filters   |   2 +-
 .../contrib/vstudio/vc10/minizip.vcxproj.filters   |   2 +-
 compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj  |  24 +--
 .../contrib/vstudio/vc10/testzlib.vcxproj.filters  |   5 +-
 .../vstudio/vc10/testzlibdll.vcxproj.filters       |   2 +-
 compat/zlib/contrib/vstudio/vc10/zlib.rc           |   6 +-
 compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj  |  50 ++---
 .../contrib/vstudio/vc10/zlibstat.vcxproj.filters  |   3 -
 compat/zlib/contrib/vstudio/vc10/zlibvc.sln        |   2 +-
 compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj    |  58 ++---
 .../contrib/vstudio/vc10/zlibvc.vcxproj.filters    |   3 -
 compat/zlib/contrib/vstudio/vc11/testzlib.vcxproj  |  24 +--
 compat/zlib/contrib/vstudio/vc11/zlib.rc           |   6 +-
 compat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj  |  34 ++-
 compat/zlib/contrib/vstudio/vc11/zlibvc.sln        |   2 +-
 compat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj    |  58 ++---
 compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj  |  24 +--
 compat/zlib/contrib/vstudio/vc12/zlib.rc           |   6 +-
 compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj  |  34 ++-
 compat/zlib/contrib/vstudio/vc12/zlibvc.sln        | 238 ++++++++++-----------
 compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj    |  58 ++---
 compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj  |  24 +--
 compat/zlib/contrib/vstudio/vc14/zlib.rc           |   6 +-
 compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj  |  34 ++-
 compat/zlib/contrib/vstudio/vc14/zlibvc.sln        | 238 ++++++++++-----------
 compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj    |  58 ++---
 compat/zlib/contrib/vstudio/vc9/miniunz.vcproj     |   2 +-
 compat/zlib/contrib/vstudio/vc9/minizip.vcproj     |   2 +-
 compat/zlib/contrib/vstudio/vc9/testzlib.vcproj    |  66 +-----
 compat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj |   2 +-
 compat/zlib/contrib/vstudio/vc9/zlib.rc            |   6 +-
 compat/zlib/contrib/vstudio/vc9/zlibstat.vcproj    |  76 +------
 compat/zlib/contrib/vstudio/vc9/zlibvc.sln         |   2 +-
 compat/zlib/contrib/vstudio/vc9/zlibvc.vcproj      |  82 ++-----
 compat/zlib/crc32.c                                |  25 ++-
 compat/zlib/deflate.c                              | 218 ++++++++++---------
 compat/zlib/examples/enough.c                      |   2 +-
 compat/zlib/examples/fitblk.c                      |   4 +-
 compat/zlib/examples/gun.c                         |   2 +-
 compat/zlib/examples/gzappend.c                    |   4 +-
 compat/zlib/examples/gzlog.h                       |   2 +-
 compat/zlib/examples/zran.c                        |   2 +-
 compat/zlib/gzlib.c                                |   2 +-
 compat/zlib/gzread.c                               |   8 +-
 compat/zlib/gzwrite.c                              |   2 +-
 compat/zlib/infback.c                              |  17 +-
 compat/zlib/inflate.c                              |   7 +-
 compat/zlib/inftrees.c                             |   4 +-
 compat/zlib/inftrees.h                             |   2 +-
 compat/zlib/make_vms.com                           |   4 +-
 compat/zlib/os400/README400                        |   6 +-
 compat/zlib/os400/bndsrc                           |   8 +
 compat/zlib/os400/zlib.inc                         |   6 +-
 compat/zlib/qnx/package.qpg                        |  10 +-
 compat/zlib/test/example.c                         |   3 +-
 compat/zlib/test/minigzip.c                        |   2 +-
 compat/zlib/treebuild.xml                          |   4 +-
 compat/zlib/trees.c                                | 117 +++++-----
 compat/zlib/uncompr.c                              |   4 +-
 compat/zlib/win32/README-WIN32.txt                 |   4 +-
 compat/zlib/win32/zlib1.rc                         |   2 +-
 compat/zlib/zconf.h                                |  19 +-
 compat/zlib/zconf.h.cmakein                        |  19 +-
 compat/zlib/zconf.h.in                             |  19 +-
 compat/zlib/zlib.3                                 |   4 +-
 compat/zlib/zlib.3.pdf                             | Bin 8848 -> 19366 bytes
 compat/zlib/zlib.h                                 |  20 +-
 compat/zlib/zlib2ansi                              |   4 +-
 compat/zlib/zutil.c                                |  16 +-
 compat/zlib/zutil.h                                |   1 +
 93 files changed, 874 insertions(+), 1202 deletions(-)

diff --git a/compat/zlib/CMakeLists.txt b/compat/zlib/CMakeLists.txt
index e6fbb37..b412dc7 100644
--- a/compat/zlib/CMakeLists.txt
+++ b/compat/zlib/CMakeLists.txt
@@ -3,10 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.2.12")
-
-option(ASM686 "Enable building i686 assembly implementation")
-option(AMD64 "Enable building amd64 assembly implementation")
+set(VERSION "1.2.13")
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@@ -129,39 +126,6 @@ if(NOT MINGW)
     )
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC)
-    if(ASM686)
-        set(ZLIB_ASMS contrib/asm686/match.S)
-    elseif (AMD64)
-        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
-    endif ()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV)
-		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-	endif()
-endif()
-
-if(MSVC)
-    if(ASM686)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx86/inffas32.asm
-			contrib/masmx86/match686.asm
-		)
-    elseif (AMD64)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx64/gvmat64.asm
-			contrib/masmx64/inffasx64.asm
-		)
-    endif()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV -DASMINF)
-	endif()
-endif()
-
 # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
 string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
@@ -183,8 +147,8 @@ if(MINGW)
     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
 endif(MINGW)
 
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 set_target_properties(zlib PROPERTIES SOVERSION 1)
 
diff --git a/compat/zlib/ChangeLog b/compat/zlib/ChangeLog
index f0b0e61..457526b 100644
--- a/compat/zlib/ChangeLog
+++ b/compat/zlib/ChangeLog
@@ -1,6 +1,18 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.13 (13 Oct 2022)
+- Fix configure issue that discarded provided CC definition
+- Correct incorrect inputs provided to the CRC functions
+- Repair prototypes and exporting of new CRC functions
+- Fix inflateBack to detect invalid input with distances too far
+- Have infback() deliver all of the available output up to any error
+- Fix a bug when getting a gzip header extra field with inflate()
+- Fix bug in block type selection when Z_FIXED used
+- Tighten deflateBound bounds
+- Remove deleted assembler code references
+- Various portability and appearance improvements
+
 Changes in 1.2.12 (27 Mar 2022)
 - Cygwin does not have _wopen(), so do not create gzopen_w() there
 - Permit a deflateParams() parameter change as soon as possible
@@ -159,7 +171,7 @@ Changes in 1.2.7.1 (24 Mar 2013)
 - Fix types in contrib/minizip to match result of get_crc_table()
 - Simplify contrib/vstudio/vc10 with 'd' suffix
 - Add TOP support to win32/Makefile.msc
-- Suport i686 and amd64 assembler builds in CMakeLists.txt
+- Support i686 and amd64 assembler builds in CMakeLists.txt
 - Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
 - Add vc11 and vc12 build files to contrib/vstudio
 - Add gzvprintf() as an undocumented function in zlib
@@ -359,14 +371,14 @@ Changes in 1.2.5.1 (10 Sep 2011)
 - Use u4 type for crc_table to avoid conversion warnings
 - Apply casts in zlib.h to avoid conversion warnings
 - Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
-- Improve inflateSync() documentation to note indeterminancy
+- Improve inflateSync() documentation to note indeterminacy
 - Add deflatePending() function to return the amount of pending output
 - Correct the spelling of "specification" in FAQ [Randers-Pehrson]
 - Add a check in configure for stdarg.h, use for gzprintf()
 - Check that pointers fit in ints when gzprint() compiled old style
 - Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
 - Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
-- Add debug records in assmebler code [Londer]
+- Add debug records in assembler code [Londer]
 - Update RFC references to use http://tools.ietf.org/html/... [Li]
 - Add --archs option, use of libtool to configure for Mac OS X [Borstel]
 
@@ -1033,7 +1045,7 @@ Changes in 1.2.0.1 (17 March 2003)
     - Include additional header file on VMS for off_t typedef
 - Try to use _vsnprintf where it supplants vsprintf [Vollant]
 - Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
+- Enhance comments in zlib.h on what happens if gzprintf() tries to
   write more than 4095 bytes before compression
 - Remove unused state from inflateBackEnd()
 - Remove exit(0) from minigzip.c, example.c
@@ -1211,7 +1223,7 @@ Changes in 1.0.9 (17 Feb 1998)
 - Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
 - in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
 - in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-  the declaration of FAR (Gilles VOllant)
+  the declaration of FAR (Gilles Vollant)
 - install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
 - read_buf buf parameter of type Bytef* instead of charf*
 - zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
@@ -1567,7 +1579,7 @@ Changes in 0.4:
 - renamed deflateOptions as deflateInit2, call one or the other but not both
 - added the method parameter for deflateInit2
 - added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
+- simplified considerably deflateInit and inflateInit by not supporting
   user-provided history buffer. This is supported only in deflateInit2
   and inflateInit2
 
diff --git a/compat/zlib/Makefile.in b/compat/zlib/Makefile.in
index 3d858aa..7d2713f 100644
--- a/compat/zlib/Makefile.in
+++ b/compat/zlib/Makefile.in
@@ -7,10 +7,6 @@
 # Normally configure builds both a static and a shared library.
 # If you want to build just a static library, use: ./configure --static
 
-# To use the asm code, type:
-#    cp contrib/asm?86/match.S ./match.S
-#    make LOC=-DASMV OBJA=match.o
-
 # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
 #    make install
 # To install in $HOME instead of /usr/local, use:
@@ -26,13 +22,13 @@ CFLAGS=-O
 
 SFLAGS=-O
 LDFLAGS=
-TEST_LDFLAGS=-L. libz.a
+TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
 LDSHARED=$(CC)
 CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.12
+SHAREDLIBV=libz.so.1.2.13
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
@@ -87,7 +83,7 @@ test: all teststatic testshared
 
 teststatic: static
 	@TMPST=tmpst_$$; \
-	if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
+	if echo hello world | ${QEMU_RUN} ./minigzip | ${QEMU_RUN} ./minigzip -d && ${QEMU_RUN} ./example $$TMPST ; then \
 	  echo '		*** zlib test OK ***'; \
 	else \
 	  echo '		*** zlib test FAILED ***'; false; \
@@ -100,7 +96,7 @@ testshared: shared
 	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
 	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
 	TMPSH=tmpsh_$$; \
-	if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
+	if echo hello world | ${QEMU_RUN} ./minigzipsh | ${QEMU_RUN} ./minigzipsh -d && ${QEMU_RUN} ./examplesh $$TMPSH; then \
 	  echo '		*** zlib shared test OK ***'; \
 	else \
 	  echo '		*** zlib shared test FAILED ***'; false; \
@@ -109,7 +105,7 @@ testshared: shared
 
 test64: all64
 	@TMP64=tmp64_$$; \
-	if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
+	if echo hello world | ${QEMU_RUN} ./minigzip64 | ${QEMU_RUN} ./minigzip64 -d && ${QEMU_RUN} ./example64 $$TMP64; then \
 	  echo '		*** zlib 64-bit test OK ***'; \
 	else \
 	  echo '		*** zlib 64-bit test FAILED ***'; false; \
@@ -124,7 +120,7 @@ infcover: infcover.o libz.a
 
 cover: infcover
 	rm -f *.gcda
-	./infcover
+	${QEMU_RUN} ./infcover
 	gcov inf*.c
 
 libz.a: $(OBJS)
@@ -292,10 +288,10 @@ minigzip$(EXE): minigzip.o $(STATICLIB)
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
 
 examplesh$(EXE): example.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
 
 minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
 
 example64$(EXE): example64.o $(STATICLIB)
 	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
diff --git a/compat/zlib/README b/compat/zlib/README
index 024b79d..ba34d18 100644
--- a/compat/zlib/README
+++ b/compat/zlib/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.12 is a general purpose data compression library.  All the code is
+zlib 1.2.13 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.12 are documented in the file ChangeLog.
+The changes made in version 1.2.13 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
diff --git a/compat/zlib/compress.c b/compat/zlib/compress.c
index e2db404..2ad5326 100644
--- a/compat/zlib/compress.c
+++ b/compat/zlib/compress.c
@@ -19,7 +19,7 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
@@ -65,7 +65,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 
 /* ===========================================================================
  */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
+int ZEXPORT compress(dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
@@ -78,7 +78,7 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
      If the default memLevel or windowBits for deflateInit() is changed, then
    this function needs to be updated.
  */
-uLong ZEXPORT compressBound (sourceLen)
+uLong ZEXPORT compressBound(sourceLen)
     uLong sourceLen;
 {
     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
diff --git a/compat/zlib/configure b/compat/zlib/configure
index 3fa3e86..fa4d5da 100755
--- a/compat/zlib/configure
+++ b/compat/zlib/configure
@@ -32,8 +32,11 @@ fi
 
 # set command prefix for cross-compilation
 if [ -n "${CHOST}" ]; then
-    uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
+    uname=${CHOST}
+    mname=${CHOST}
     CROSS_PREFIX="${CHOST}-"
+else
+    mname=`(uname -a || echo unknown) 2>/dev/null`
 fi
 
 # destination name for static library
@@ -178,8 +181,6 @@ else
   cc=${CC}
 fi
 
-cflags=${CFLAGS-"-O3"}
-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
 case "$cc" in
   *gcc*) gcc=1 ;;
   *clang*) gcc=1 ;;
@@ -205,13 +206,13 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
   fi
   if test "$warn" -eq 1; then
     if test "$zconst" -eq 1; then
-      CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST"
+      CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -DZLIB_CONST"
     else
-      CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
+      CFLAGS="${CFLAGS} -Wall -Wextra"
     fi
   fi
   if test $sanitize -eq 1; then
-    CFLAGS="${CFLAGS} -fsanitize=address"
+    CFLAGS="${CFLAGS} -g -fsanitize=address"
   fi
   if test $debug -eq 1; then
     CFLAGS="${CFLAGS} -DZLIB_DEBUG"
@@ -221,47 +222,52 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
     uname=`(uname -s || echo unknown) 2>/dev/null`
   fi
   case "$uname" in
-  Linux* | linux* | GNU | GNU/* | solaris*)
+  Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
+        case "$mname" in
+        *sparc*)
+            LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;;
+        esac
         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
   *BSD | *bsd* | DragonFly)
         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
         LDCONFIG="ldconfig -m" ;;
-  CYGWIN* | Cygwin* | cygwin* | OS/2*)
+  CYGWIN* | Cygwin* | cygwin* | *-cygwin* | OS/2*)
         EXE='.exe' ;;
-  MINGW* | mingw*)
-# temporary bypass
+  MINGW* | mingw* | *-mingw*)
         rm -f $test.[co] $test $test$shared_ext
-        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
-        leave 1
+        echo "If this doesn't work for you, try win32/Makefile.gcc." | tee -a configure.log
         LDSHARED=${LDSHARED-"$cc -shared"}
         LDSHAREDLIBC=""
         EXE='.exe' ;;
-  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
-         # (alain.bonnefoy@icbt.com)
-                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
+  QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
+        # (alain.bonnefoy@icbt.com)
+        LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
   HP-UX*)
-         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
-         case `(uname -m || echo unknown) 2>/dev/null` in
-         ia64)
-                 shared_ext='.so'
-                 SHAREDLIB='libz.so' ;;
-         *)
-                 shared_ext='.sl'
-                 SHAREDLIB='libz.sl' ;;
-         esac ;;
-  Darwin* | darwin*)
-             shared_ext='.dylib'
-             SHAREDLIB=libz$shared_ext
-             SHAREDLIBV=libz.$VER$shared_ext
-             SHAREDLIBM=libz.$VER1$shared_ext
-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
-             if libtool -V 2>&1 | grep Apple > /dev/null; then
-                 AR="libtool"
-             else
-                 AR="/usr/bin/libtool"
-             fi
-             ARFLAGS="-o" ;;
-  *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
+        LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
+        case `(uname -m || echo unknown) 2>/dev/null` in
+        ia64)
+            shared_ext='.so'
+            SHAREDLIB='libz.so' ;;
+        *)
+            shared_ext='.sl'
+            SHAREDLIB='libz.sl' ;;
+        esac ;;
+  AIX*)
+        LDFLAGS="${LDFLAGS} -Wl,-brtl" ;;
+  Darwin* | darwin* | *-darwin*)
+        shared_ext='.dylib'
+        SHAREDLIB=libz$shared_ext
+        SHAREDLIBV=libz.$VER$shared_ext
+        SHAREDLIBM=libz.$VER1$shared_ext
+        LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
+        if libtool -V 2>&1 | grep Apple > /dev/null; then
+            AR="libtool"
+        else
+            AR="/usr/bin/libtool"
+        fi
+        ARFLAGS="-o" ;;
+  *)
+        LDSHARED=${LDSHARED-"$cc -shared"} ;;
   esac
 else
   # find system name and corresponding cc options
@@ -453,20 +459,6 @@ else
   TEST="all teststatic testshared"
 fi
 
-# check for underscores in external names for use by assembler code
-CPP=${CPP-"$CC -E"}
-case $CFLAGS in
-  *ASMV*)
-    echo >> configure.log
-    show "$NM $test.o | grep _hello"
-    if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
-      CPP="$CPP -DNO_UNDERLINE"
-      echo Checking for underline in external names... No. | tee -a configure.log
-    else
-      echo Checking for underline in external names... Yes. | tee -a configure.log
-    fi ;;
-esac
-
 echo >> configure.log
 
 # check for size_t
diff --git a/compat/zlib/contrib/README.contrib b/compat/zlib/contrib/README.contrib
index 335e435..5e5f950 100644
--- a/compat/zlib/contrib/README.contrib
+++ b/compat/zlib/contrib/README.contrib
@@ -1,4 +1,4 @@
-All files under this contrib directory are UNSUPPORTED. There were
+All files under this contrib directory are UNSUPPORTED. They were
 provided by users of zlib and were not tested by the authors of zlib.
 Use at your own risk. Please contact the authors of the contributions
 for help about these, not the zlib authors. Thanks.
diff --git a/compat/zlib/contrib/delphi/ZLib.pas b/compat/zlib/contrib/delphi/ZLib.pas
index d40dad8..8be5fa2 100644
--- a/compat/zlib/contrib/delphi/ZLib.pas
+++ b/compat/zlib/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
   const OutBuf: Pointer; BufSize: Integer);
 
 const
-  zlib_version = '1.2.12';
+  zlib_version = '1.2.13';
 
 type
   EZlibError = class(Exception);
diff --git a/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
index 865c802..16a0ebb 100644
--- a/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
         public void Info_Version()
         {
             Info info = new Info();
-            Assert.AreEqual("1.2.12", Info.Version);
+            Assert.AreEqual("1.2.13", Info.Version);
             Assert.AreEqual(32, info.SizeOfUInt);
             Assert.AreEqual(32, info.SizeOfULong);
             Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/compat/zlib/contrib/infback9/inftree9.c b/compat/zlib/contrib/infback9/inftree9.c
index 2175bde..10827a6 100644
--- a/compat/zlib/contrib/infback9/inftree9.c
+++ b/compat/zlib/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate9_copyright[] =
-   " inflate9 1.2.12 Copyright 1995-2022 Mark Adler ";
+   " inflate9 1.2.13 Copyright 1995-2022 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 76, 202};
+        133, 133, 133, 133, 144, 194, 65};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/compat/zlib/contrib/infback9/inftree9.h b/compat/zlib/contrib/infback9/inftree9.h
index 5ab21f0..3b39497 100644
--- a/compat/zlib/contrib/infback9/inftree9.h
+++ b/compat/zlib/contrib/infback9/inftree9.h
@@ -38,7 +38,7 @@ typedef struct {
 /* Maximum size of the dynamic table.  The maximum number of code structures is
    1446, which is the sum of 852 for literal/length codes and 594 for distance
    codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
+   examples/enough.c found in the zlib distribution.  The arguments to that
    program are the number of symbols, the initial root table size, and the
    maximum bit length of a code.  "enough 286 9 15" for literal/length codes
    returns returns 852, and "enough 32 6 15" for distance codes returns 594.
diff --git a/compat/zlib/contrib/minizip/configure.ac b/compat/zlib/contrib/minizip/configure.ac
index 6409abc..bff300b 100644
--- a/compat/zlib/contrib/minizip/configure.ac
+++ b/compat/zlib/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.2.12], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.13], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
diff --git a/compat/zlib/contrib/minizip/crypt.h b/compat/zlib/contrib/minizip/crypt.h
index 9da1537..1cc41f1 100644
--- a/compat/zlib/contrib/minizip/crypt.h
+++ b/compat/zlib/contrib/minizip/crypt.h
@@ -85,7 +85,7 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcr
 #define RAND_HEAD_LEN  12
    /* "last resort" source for second part of crypt seed pattern */
 #  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654L       /* use PI as default pattern */
+#    define ZCR_SEED2 3141592654UL      /* use PI as default pattern */
 #  endif
 
 static unsigned crypthead(const char* passwd,       /* password string */
diff --git a/compat/zlib/contrib/minizip/ioapi.c b/compat/zlib/contrib/minizip/ioapi.c
index ffcb937..814a6fd 100644
--- a/compat/zlib/contrib/minizip/ioapi.c
+++ b/compat/zlib/contrib/minizip/ioapi.c
@@ -14,11 +14,7 @@
         #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(_WIN32)
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) _ftelli64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) _fseeki64(stream, offset, origin)
-#elif defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(IOAPI_NO_64)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
@@ -98,9 +94,9 @@ static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
 
 static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
 {
-    (void)opaque;
     FILE* file = NULL;
     const char* mode_fopen = NULL;
+    (void)opaque;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = "rb";
     else
@@ -117,9 +113,9 @@ static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, in
 
 static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
 {
-    (void)opaque;
     FILE* file = NULL;
     const char* mode_fopen = NULL;
+    (void)opaque;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = "rb";
     else
@@ -137,24 +133,24 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,
 
 static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
 {
-    (void)opaque;
     uLong ret;
+    (void)opaque;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
 static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
 {
-    (void)opaque;
     uLong ret;
+    (void)opaque;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
 static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 {
-    (void)opaque;
     long ret;
+    (void)opaque;
     ret = ftell((FILE *)stream);
     return ret;
 }
@@ -162,17 +158,17 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 
 static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
 {
-    (void)opaque;
     ZPOS64_T ret;
+    (void)opaque;
     ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
     return ret;
 }
 
 static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
 {
-    (void)opaque;
     int fseek_origin=0;
     long ret;
+    (void)opaque;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
@@ -194,9 +190,9 @@ static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offs
 
 static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
 {
-    (void)opaque;
     int fseek_origin=0;
     long ret;
+    (void)opaque;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
@@ -212,7 +208,7 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
     }
     ret = 0;
 
-    if(FSEEKO_FUNC((FILE *)stream, (long)offset, fseek_origin) != 0)
+    if(FSEEKO_FUNC((FILE *)stream, (z_off_t)offset, fseek_origin) != 0)
                         ret = -1;
 
     return ret;
@@ -221,16 +217,16 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
 
 static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 {
-    (void)opaque;
     int ret;
+    (void)opaque;
     ret = fclose((FILE *)stream);
     return ret;
 }
 
 static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
 {
-    (void)opaque;
     int ret;
+    (void)opaque;
     ret = ferror((FILE *)stream);
     return ret;
 }
diff --git a/compat/zlib/contrib/minizip/ioapi.h b/compat/zlib/contrib/minizip/ioapi.h
index 114bfab..ae9ca7e 100644
--- a/compat/zlib/contrib/minizip/ioapi.h
+++ b/compat/zlib/contrib/minizip/ioapi.h
@@ -50,7 +50,7 @@
 #define ftello64 ftell
 #define fseeko64 fseek
 #else
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #define fopen64 fopen
 #define ftello64 ftello
 #define fseeko64 fseeko
diff --git a/compat/zlib/contrib/minizip/miniunz.c b/compat/zlib/contrib/minizip/miniunz.c
index f103815..0dc9b50 100644
--- a/compat/zlib/contrib/minizip/miniunz.c
+++ b/compat/zlib/contrib/minizip/miniunz.c
@@ -564,7 +564,7 @@ int main(argc,argv)
 
                 while ((*p)!='\0')
                 {
-                    char c=*(p++);;
+                    char c=*(p++);
                     if ((c=='l') || (c=='L'))
                         opt_do_list = 1;
                     if ((c=='v') || (c=='V'))
diff --git a/compat/zlib/contrib/minizip/unzip.c b/compat/zlib/contrib/minizip/unzip.c
index 5e12e47..3036b47 100644
--- a/compat/zlib/contrib/minizip/unzip.c
+++ b/compat/zlib/contrib/minizip/unzip.c
@@ -112,7 +112,7 @@
 # define ALLOC(size) (malloc(size))
 #endif
 #ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
+# define TRYFREE(p) { free(p);}
 #endif
 
 #define SIZECENTRALDIRITEM (0x2e)
@@ -1566,6 +1566,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
         pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
       else
       {
+        TRYFREE(pfile_in_zip_read_info->read_buffer);
         TRYFREE(pfile_in_zip_read_info);
         return err;
       }
@@ -1586,6 +1587,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
         pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
       else
       {
+        TRYFREE(pfile_in_zip_read_info->read_buffer);
         TRYFREE(pfile_in_zip_read_info);
         return err;
       }
diff --git a/compat/zlib/contrib/minizip/zip.c b/compat/zlib/contrib/minizip/zip.c
index 4e611e1..66d693f 100644
--- a/compat/zlib/contrib/minizip/zip.c
+++ b/compat/zlib/contrib/minizip/zip.c
@@ -1471,11 +1471,6 @@ extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned in
           {
               uLong uTotalOutBefore = zi->ci.stream.total_out;
               err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
-              if(uTotalOutBefore > zi->ci.stream.total_out)
-              {
-                int bBreak = 0;
-                bBreak++;
-              }
 
               zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
           }
@@ -1959,7 +1954,7 @@ extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHe
 
   int retVal = ZIP_OK;
 
-  if(pData == NULL || *dataLen < 4)
+  if(pData == NULL || dataLen == NULL || *dataLen < 4)
     return ZIP_PARAMERROR;
 
   pNewHeader = (char*)ALLOC((unsigned)*dataLen);
diff --git a/compat/zlib/contrib/pascal/zlibpas.pas b/compat/zlib/contrib/pascal/zlibpas.pas
index adb5cd6..bf3fff6 100644
--- a/compat/zlib/contrib/pascal/zlibpas.pas
+++ b/compat/zlib/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
 interface
 
 const
-  ZLIB_VERSION = '1.2.12';
+  ZLIB_VERSION = '1.2.13';
   ZLIB_VERNUM  = $12a0;
 
 type
diff --git a/compat/zlib/contrib/puff/README b/compat/zlib/contrib/puff/README
index bbc4cb5..d8192c7 100644
--- a/compat/zlib/contrib/puff/README
+++ b/compat/zlib/contrib/puff/README
@@ -38,7 +38,7 @@ Then you can call puff() to decompress a deflate stream that is in memory in
 its entirety at source, to a sufficiently sized block of memory for the
 decompressed data at dest.  puff() is the only external symbol in puff.c  The
 only C library functions that puff.c needs are setjmp() and longjmp(), which
-are used to simplify error checking in the code to improve readabilty.  puff.c
+are used to simplify error checking in the code to improve readability.  puff.c
 does no memory allocation, and uses less than 2K bytes off of the stack.
 
 If destlen is not enough space for the uncompressed data, then inflate will
diff --git a/compat/zlib/contrib/puff/puff.c b/compat/zlib/contrib/puff/puff.c
index c6c90d7..6737ff6 100644
--- a/compat/zlib/contrib/puff/puff.c
+++ b/compat/zlib/contrib/puff/puff.c
@@ -43,7 +43,7 @@
  *                      - Use pointers instead of long to specify source and
  *                        destination sizes to avoid arbitrary 4 GB limits
  * 1.2  17 Mar 2002     - Add faster version of decode(), doubles speed (!),
- *                        but leave simple version for readabilty
+ *                        but leave simple version for readability
  *                      - Make sure invalid distances detected if pointers
  *                        are 16 bits
  *                      - Fix fixed codes table error
@@ -624,7 +624,7 @@ local int fixed(struct state *s)
  *   are themselves compressed using Huffman codes and run-length encoding.  In
  *   the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
  *   that length, and the symbols 16, 17, and 18 are run-length instructions.
- *   Each of 16, 17, and 18 are follwed by extra bits to define the length of
+ *   Each of 16, 17, and 18 are followed by extra bits to define the length of
  *   the run.  16 copies the last length 3 to 6 times.  17 represents 3 to 10
  *   zero lengths, and 18 represents 11 to 138 zero lengths.  Unused symbols
  *   are common, hence the special coding for zero lengths.
diff --git a/compat/zlib/contrib/puff/pufftest.c b/compat/zlib/contrib/puff/pufftest.c
index 7764814..5f72ecc 100644
--- a/compat/zlib/contrib/puff/pufftest.c
+++ b/compat/zlib/contrib/puff/pufftest.c
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
                                      len - sourcelen);
     }
 
-    /* if requested, inflate again and write decompressd data to stdout */
+    /* if requested, inflate again and write decompressed data to stdout */
     if (put && ret == 0) {
         if (fail)
             destlen >>= 1;
diff --git a/compat/zlib/contrib/vstudio/readme.txt b/compat/zlib/contrib/vstudio/readme.txt
index d396d43..17e693f 100644
--- a/compat/zlib/contrib/vstudio/readme.txt
+++ b/compat/zlib/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.2.12
+Building instructions for the DLL versions of Zlib 1.2.13
 ========================================================
 
 This directory contains projects that build zlib and minizip using
@@ -17,9 +17,6 @@ More information can be found at this site.
 Build instructions for Visual Studio 2008 (32 bits or 64 bits)
 --------------------------------------------------------------
 - Decompress current zlib, including all contrib/* files
-- Compile assembly code (with Visual Studio Command Prompt) by running:
-   bld_ml64.bat (in contrib\masmx64)
-   bld_ml32.bat (in contrib\masmx86)
 - Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
 - Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
 
diff --git a/compat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters b/compat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
index 0b2a3de..e53556a 100644
--- a/compat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
+++ b/compat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
@@ -3,7 +3,7 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>
diff --git a/compat/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters b/compat/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
index dd73cd3..bd18d71 100644
--- a/compat/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
+++ b/compat/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
@@ -3,7 +3,7 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>
diff --git a/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj b/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj
index 9088d17..0e668f7 100644
--- a/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj
@@ -181,7 +181,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -194,7 +194,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -241,7 +241,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -254,7 +254,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -269,14 +269,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -352,14 +352,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -398,14 +398,6 @@
     <ClCompile Include="..\..\..\crc32.c" />
     <ClCompile Include="..\..\..\deflate.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters b/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
index 249daa8..3cf52ee 100644
--- a/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
+++ b/compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
@@ -3,7 +3,7 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
@@ -30,9 +30,6 @@
     <ClCompile Include="..\..\..\infback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
index 53a8693..aeb550e 100644
--- a/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+++ b/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
@@ -3,7 +3,7 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>
diff --git a/compat/zlib/contrib/vstudio/vc10/zlib.rc b/compat/zlib/contrib/vstudio/vc10/zlib.rc
index 8ad25f1..8760274 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlib.rc
+++ b/compat/zlib/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 12, 0
-  PRODUCTVERSION 1, 2, 12, 0
+  FILEVERSION	 1, 2, 13, 0
+  PRODUCTVERSION 1, 2, 13, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.12\0"
+      VALUE "FileVersion",	"1.2.13\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj b/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
index b9f2bbe..c7ed09e 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
@@ -160,7 +160,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -182,16 +182,12 @@
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -210,19 +206,15 @@ bld_ml32.bat</Command>
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -252,7 +244,7 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -274,10 +266,6 @@ bld_ml32.bat</Command>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
     <Midl>
@@ -285,7 +273,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -314,8 +302,8 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -334,14 +322,10 @@ bld_ml64.bat</Command>
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
     <Midl>
@@ -349,7 +333,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -379,7 +363,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -409,7 +393,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -443,14 +427,6 @@ bld_ml64.bat</Command>
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
index c8c7f7e..ba7e23d 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
+++ b/compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
@@ -33,9 +33,6 @@
     <ClCompile Include="..\..\..\infback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/compat/zlib/contrib/vstudio/vc10/zlibvc.sln b/compat/zlib/contrib/vstudio/vc10/zlibvc.sln
index 6953136..6f6ffd5 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlibvc.sln
+++ b/compat/zlib/contrib/vstudio/vc10/zlibvc.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
diff --git a/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
index 6ff9ddb..19dfc35 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -197,8 +197,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -219,7 +219,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -229,10 +229,6 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <Midl>
@@ -244,7 +240,7 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -288,8 +284,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -312,7 +308,7 @@ bld_ml32.bat</Command>
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -322,10 +318,6 @@ bld_ml32.bat</Command>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -337,8 +329,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -358,7 +350,7 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -366,10 +358,6 @@ bld_ml32.bat</Command>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
     <Midl>
@@ -381,7 +369,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -424,7 +412,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -465,7 +453,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -510,8 +498,8 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -533,7 +521,7 @@ bld_ml64.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -541,10 +529,6 @@ bld_ml64.bat</Command>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
     <Midl>
@@ -556,7 +540,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -601,14 +585,6 @@ bld_ml64.bat</Command>
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
index 180b71c..67c444a 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
+++ b/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
@@ -42,9 +42,6 @@
     <ClCompile Include="..\..\..\infback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/compat/zlib/contrib/vstudio/vc11/testzlib.vcxproj b/compat/zlib/contrib/vstudio/vc11/testzlib.vcxproj
index 6d55954..c6198c1 100644
--- a/compat/zlib/contrib/vstudio/vc11/testzlib.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc11/testzlib.vcxproj
@@ -187,7 +187,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -200,7 +200,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -247,7 +247,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -260,7 +260,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -275,14 +275,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -358,14 +358,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -404,14 +404,6 @@
     <ClCompile Include="..\..\..\crc32.c" />
     <ClCompile Include="..\..\..\deflate.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc11/zlib.rc b/compat/zlib/contrib/vstudio/vc11/zlib.rc
index 8ad25f1..8760274 100644
--- a/compat/zlib/contrib/vstudio/vc11/zlib.rc
+++ b/compat/zlib/contrib/vstudio/vc11/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 12, 0
-  PRODUCTVERSION 1, 2, 12, 0
+  FILEVERSION	 1, 2, 13, 0
+  PRODUCTVERSION 1, 2, 13, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.12\0"
+      VALUE "FileVersion",	"1.2.13\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/compat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj b/compat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
index 806b76a..86fb1c8 100644
--- a/compat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
@@ -167,7 +167,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -193,8 +193,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -213,7 +213,7 @@
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
@@ -221,7 +221,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -251,7 +251,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -280,7 +280,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -309,8 +309,8 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -329,7 +329,7 @@
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
@@ -340,7 +340,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -370,7 +370,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -400,7 +400,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -434,14 +434,6 @@
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc11/zlibvc.sln b/compat/zlib/contrib/vstudio/vc11/zlibvc.sln
index 7e340e6..9fcbafd 100644
--- a/compat/zlib/contrib/vstudio/vc11/zlibvc.sln
+++ b/compat/zlib/contrib/vstudio/vc11/zlibvc.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
diff --git a/compat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj b/compat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
index c65b95f..fc8cd9c 100644
--- a/compat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
@@ -204,8 +204,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -226,7 +226,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -240,10 +240,6 @@
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <Midl>
@@ -255,7 +251,7 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -303,8 +299,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -327,7 +323,7 @@ bld_ml32.bat</Command>
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -341,10 +337,6 @@ bld_ml32.bat</Command>
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -356,8 +348,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -377,7 +369,7 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -389,10 +381,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
     <Midl>
@@ -404,7 +392,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -447,7 +435,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -492,7 +480,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -537,8 +525,8 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -560,7 +548,7 @@ bld_ml64.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -572,10 +560,6 @@ bld_ml64.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
     <Midl>
@@ -587,7 +571,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -632,14 +616,6 @@ bld_ml64.bat</Command>
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj b/compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj
index 64b2cbe..41303c0 100644
--- a/compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj
@@ -190,7 +190,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -203,7 +203,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -250,7 +250,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -263,7 +263,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -279,14 +279,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -362,14 +362,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -408,14 +408,6 @@
     <ClCompile Include="..\..\..\crc32.c" />
     <ClCompile Include="..\..\..\deflate.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc12/zlib.rc b/compat/zlib/contrib/vstudio/vc12/zlib.rc
index 9475873..cdd7985 100644
--- a/compat/zlib/contrib/vstudio/vc12/zlib.rc
+++ b/compat/zlib/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 12, 0
-  PRODUCTVERSION 1, 2, 12, 0
+  FILEVERSION	 1, 2, 13, 0
+  PRODUCTVERSION 1, 2, 13, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.12\0"
+      VALUE "FileVersion",	"1.2.13\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj b/compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
index 3fdee7c..6629d8e 100644
--- a/compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
@@ -170,7 +170,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -196,8 +196,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -216,7 +216,7 @@
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
@@ -224,7 +224,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -254,7 +254,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -283,7 +283,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -312,8 +312,8 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -332,7 +332,7 @@
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
@@ -343,7 +343,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -373,7 +373,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -403,7 +403,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -437,14 +437,6 @@
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc12/zlibvc.sln b/compat/zlib/contrib/vstudio/vc12/zlibvc.sln
index 93b13c1..dcda229 100644
--- a/compat/zlib/contrib/vstudio/vc12/zlibvc.sln
+++ b/compat/zlib/contrib/vstudio/vc12/zlibvc.sln
@@ -1,119 +1,119 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Itanium = Debug|Itanium
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Itanium = Release|Itanium
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
+		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
+		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj b/compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
index ab2b6c3..4e0de69 100644
--- a/compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
@@ -207,8 +207,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -229,7 +229,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -243,10 +243,6 @@
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <Midl>
@@ -258,7 +254,7 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -306,8 +302,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -330,7 +326,7 @@ bld_ml32.bat</Command>
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -345,10 +341,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -360,8 +352,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -381,7 +373,7 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -393,10 +385,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
     <Midl>
@@ -408,7 +396,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -451,7 +439,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -496,7 +484,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -541,8 +529,8 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -564,7 +552,7 @@ bld_ml64.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -576,10 +564,6 @@ bld_ml64.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
     <Midl>
@@ -591,7 +575,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -636,14 +620,6 @@ bld_ml64.bat</Command>
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj b/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj
index 2c37125..5452049 100644
--- a/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj
@@ -190,7 +190,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -203,7 +203,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -250,7 +250,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -263,7 +263,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)testzlib.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -279,14 +279,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -362,14 +362,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -408,14 +408,6 @@
     <ClCompile Include="..\..\..\crc32.c" />
     <ClCompile Include="..\..\..\deflate.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc14/zlib.rc b/compat/zlib/contrib/vstudio/vc14/zlib.rc
index 9475873..cdd7985 100644
--- a/compat/zlib/contrib/vstudio/vc14/zlib.rc
+++ b/compat/zlib/contrib/vstudio/vc14/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 12, 0
-  PRODUCTVERSION 1, 2, 12, 0
+  FILEVERSION	 1, 2, 13, 0
+  PRODUCTVERSION 1, 2, 13, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.12\0"
+      VALUE "FileVersion",	"1.2.13\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj b/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
index 3e4b986..85c1e89 100644
--- a/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
@@ -170,7 +170,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -196,8 +196,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -216,7 +216,7 @@
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
@@ -224,7 +224,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -254,7 +254,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -283,7 +283,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -312,8 +312,8 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -332,7 +332,7 @@
     </ResourceCompile>
     <Lib>
       <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
@@ -343,7 +343,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -373,7 +373,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -403,7 +403,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -437,14 +437,6 @@
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc14/zlibvc.sln b/compat/zlib/contrib/vstudio/vc14/zlibvc.sln
index 0f29237..6f4a107 100644
--- a/compat/zlib/contrib/vstudio/vc14/zlibvc.sln
+++ b/compat/zlib/contrib/vstudio/vc14/zlibvc.sln
@@ -1,119 +1,119 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Itanium = Debug|Itanium
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Itanium = Release|Itanium
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
+		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
+		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
+		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
+		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
index f8f673c..424ff55 100644
--- a/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
@@ -207,8 +207,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -229,7 +229,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -243,10 +243,6 @@
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
     <Midl>
@@ -258,7 +254,7 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -306,8 +302,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -330,7 +326,7 @@ bld_ml32.bat</Command>
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -345,10 +341,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -360,8 +352,8 @@ bld_ml32.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -381,7 +373,7 @@ bld_ml32.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -393,10 +385,6 @@ bld_ml32.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
     <Midl>
@@ -408,7 +396,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -451,7 +439,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -496,7 +484,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -541,8 +529,8 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -564,7 +552,7 @@ bld_ml64.bat</Command>
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -576,10 +564,6 @@ bld_ml64.bat</Command>
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
     <Midl>
@@ -591,7 +575,7 @@ bld_ml64.bat</Command>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -636,14 +620,6 @@ bld_ml64.bat</Command>
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />
     <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/compat/zlib/contrib/vstudio/vc9/miniunz.vcproj b/compat/zlib/contrib/vstudio/vc9/miniunz.vcproj
index 7da32b9..cc3d13a 100644
--- a/compat/zlib/contrib/vstudio/vc9/miniunz.vcproj
+++ b/compat/zlib/contrib/vstudio/vc9/miniunz.vcproj
@@ -542,7 +542,7 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath="..\..\minizip\miniunz.c"
diff --git a/compat/zlib/contrib/vstudio/vc9/minizip.vcproj b/compat/zlib/contrib/vstudio/vc9/minizip.vcproj
index e57e07d..fecd9dd 100644
--- a/compat/zlib/contrib/vstudio/vc9/minizip.vcproj
+++ b/compat/zlib/contrib/vstudio/vc9/minizip.vcproj
@@ -539,7 +539,7 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath="..\..\minizip\minizip.c"
diff --git a/compat/zlib/contrib/vstudio/vc9/testzlib.vcproj b/compat/zlib/contrib/vstudio/vc9/testzlib.vcproj
index 9cb0bf8..ff69640 100644
--- a/compat/zlib/contrib/vstudio/vc9/testzlib.vcproj
+++ b/compat/zlib/contrib/vstudio/vc9/testzlib.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
@@ -71,7 +71,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
 				OutputFile="$(OutDir)/testzlib.exe"
 				LinkIncremental="2"
 				GenerateManifest="false"
@@ -128,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="false"
@@ -145,7 +144,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
 				GenerateManifest="false"
 			/>
 			<Tool
@@ -517,7 +515,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
@@ -540,7 +538,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
 				OutputFile="$(OutDir)/testzlib.exe"
 				LinkIncremental="1"
 				GenerateManifest="false"
@@ -600,7 +597,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -617,7 +614,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
 				GenerateManifest="false"
 			/>
 			<Tool
@@ -733,7 +729,7 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath="..\..\..\adler32.c"
@@ -756,58 +752,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\..\inffast.c"
 				>
 			</File>
diff --git a/compat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj b/compat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
index b1ddde0..6448b49 100644
--- a/compat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
+++ b/compat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
@@ -542,7 +542,7 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath="..\..\testzlib\testzlib.c"
diff --git a/compat/zlib/contrib/vstudio/vc9/zlib.rc b/compat/zlib/contrib/vstudio/vc9/zlib.rc
index 8ad25f1..8760274 100644
--- a/compat/zlib/contrib/vstudio/vc9/zlib.rc
+++ b/compat/zlib/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 12, 0
-  PRODUCTVERSION 1, 2, 12, 0
+  FILEVERSION	 1, 2, 13, 0
+  PRODUCTVERSION 1, 2, 13, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.12\0"
+      VALUE "FileVersion",	"1.2.13\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/compat/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/compat/zlib/contrib/vstudio/vc9/zlibstat.vcproj
index 61c76c7..1bf1563 100644
--- a/compat/zlib/contrib/vstudio/vc9/zlibstat.vcproj
+++ b/compat/zlib/contrib/vstudio/vc9/zlibstat.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				ExceptionHandling="0"
 				RuntimeLibrary="1"
@@ -121,7 +121,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
 				ExceptionHandling="0"
 				RuntimeLibrary="3"
@@ -195,7 +195,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
 				ExceptionHandling="0"
 				RuntimeLibrary="3"
@@ -268,8 +268,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
@@ -295,7 +295,6 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
 				OutputFile="$(OutDir)\zlibstat.lib"
 				SuppressStartupBanner="true"
 			/>
@@ -343,8 +342,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
@@ -370,7 +369,6 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
 				OutputFile="$(OutDir)\zlibstat.lib"
 				SuppressStartupBanner="true"
 			/>
@@ -418,7 +416,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -491,7 +489,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -565,7 +563,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -639,7 +637,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -733,58 +731,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\..\inffast.c"
 				>
 			</File>
diff --git a/compat/zlib/contrib/vstudio/vc9/zlibvc.sln b/compat/zlib/contrib/vstudio/vc9/zlibvc.sln
index 20568fa..b482967 100644
--- a/compat/zlib/contrib/vstudio/vc9/zlibvc.sln
+++ b/compat/zlib/contrib/vstudio/vc9/zlibvc.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
diff --git a/compat/zlib/contrib/vstudio/vc9/zlibvc.vcproj b/compat/zlib/contrib/vstudio/vc9/zlibvc.vcproj
index c9a8947..f11dd1f 100644
--- a/compat/zlib/contrib/vstudio/vc9/zlibvc.vcproj
+++ b/compat/zlib/contrib/vstudio/vc9/zlibvc.vcproj
@@ -53,8 +53,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
 				ExceptionHandling="0"
 				RuntimeLibrary="1"
 				BufferSecurityCheck="false"
@@ -81,7 +81,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
 				OutputFile="$(OutDir)\zlibwapi.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -150,8 +149,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
 				ExceptionHandling="0"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="false"
@@ -177,7 +176,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
 				OutputFile="$(OutDir)\zlibwapi.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -245,7 +243,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
 				ExceptionHandling="0"
 				RuntimeLibrary="3"
@@ -340,7 +338,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -440,7 +438,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -538,7 +536,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -636,8 +634,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
@@ -666,7 +664,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
 				OutputFile="$(OutDir)\zlibwapi.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -737,8 +734,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
+				AdditionalIncludeDirectories="..\..\.."
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
@@ -766,7 +763,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
 				OutputFile="$(OutDir)\zlibwapi.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -836,7 +832,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+				AdditionalIncludeDirectories="..\..\.."
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -950,58 +946,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\..\inffast.c"
 				>
 			</File>
diff --git a/compat/zlib/crc32.c b/compat/zlib/crc32.c
index 451887b..f8357b0 100644
--- a/compat/zlib/crc32.c
+++ b/compat/zlib/crc32.c
@@ -98,13 +98,22 @@
 #  endif
 #endif
 
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
+#  define ARMCRC32
+#endif
+
 /* Local functions. */
 local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
 local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
 
-/* If available, use the ARM processor CRC32 instruction. */
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
-#  define ARMCRC32
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+    local z_word_t byte_swap OF((z_word_t word));
+#endif
+
+#if defined(W) && !defined(ARMCRC32)
+    local z_crc_t crc_word OF((z_word_t data));
+    local z_word_t crc_word_big OF((z_word_t data));
 #endif
 
 #if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
@@ -645,8 +654,8 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
     len &= 7;
 
     /* Do three interleaved CRCs to realize the throughput of one crc32x
-       instruction per cycle. Each CRC is calcuated on Z_BATCH words. The three
-       CRCs are combined into a single CRC after each set of batches. */
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
     while (num >= 3 * Z_BATCH) {
         crc1 = 0;
         crc2 = 0;
@@ -1086,7 +1095,7 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2)
     uLong crc2;
     z_off_t len2;
 {
-    return crc32_combine64(crc1, crc2, len2);
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
 }
 
 /* ========================================================================= */
@@ -1103,11 +1112,11 @@ uLong ZEXPORT crc32_combine_gen64(len2)
 uLong ZEXPORT crc32_combine_gen(len2)
     z_off_t len2;
 {
-    return crc32_combine_gen64(len2);
+    return crc32_combine_gen64((z_off64_t)len2);
 }
 
 /* ========================================================================= */
-uLong crc32_combine_op(crc1, crc2, op)
+uLong ZEXPORT crc32_combine_op(crc1, crc2, op)
     uLong crc1;
     uLong crc2;
     uLong op;
diff --git a/compat/zlib/deflate.c b/compat/zlib/deflate.c
index 799fb93..4a689db 100644
--- a/compat/zlib/deflate.c
+++ b/compat/zlib/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.12 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.13 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -87,13 +87,7 @@ local void lm_init        OF((deflate_state *s));
 local void putShortMSB    OF((deflate_state *s, uInt b));
 local void flush_pending  OF((z_streamp strm));
 local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
 local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
 
 #ifdef ZLIB_DEBUG
 local  void check_match OF((deflate_state *s, IPos start, IPos match,
@@ -160,7 +154,7 @@ local const config configuration_table[10] = {
  *    characters, so that a running hash key can be computed from the previous
  *    key instead of complete recalculation each time.
  */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask)
 
 
 /* ===========================================================================
@@ -191,9 +185,9 @@ local const config configuration_table[10] = {
  */
 #define CLEAR_HASH(s) \
     do { \
-        s->head[s->hash_size-1] = NIL; \
+        s->head[s->hash_size - 1] = NIL; \
         zmemzero((Bytef *)s->head, \
-                 (unsigned)(s->hash_size-1)*sizeof(*s->head)); \
+                 (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
     } while (0)
 
 /* ===========================================================================
@@ -285,6 +279,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     if (windowBits < 0) { /* suppress zlib wrapper */
         wrap = 0;
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         windowBits = -windowBits;
     }
 #ifdef GZIP
@@ -314,7 +310,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     s->hash_bits = (uInt)memLevel + 7;
     s->hash_size = 1 << s->hash_bits;
     s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+    s->hash_shift =  ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH);
 
     s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
@@ -340,11 +336,11 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
      * sym_buf value to read moves forward three bytes. From that symbol, up to
      * 31 bits are written to pending_buf. The closest the written pending_buf
      * bits gets to the next sym_buf symbol to read is just before the last
-     * code is written. At that time, 31*(n-2) bits have been written, just
-     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
-     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
+     * code is written. At that time, 31*(n - 2) bits have been written, just
+     * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at
+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1
      * symbols are written.) The closest the writing gets to what is unread is
-     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
+     * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and
      * can range from 128 to 32768.
      *
      * Therefore, at a minimum, there are 142 bits of space between what is
@@ -390,7 +386,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 /* =========================================================================
  * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
  */
-local int deflateStateCheck (strm)
+local int deflateStateCheck(strm)
     z_streamp strm;
 {
     deflate_state *s;
@@ -413,7 +409,7 @@ local int deflateStateCheck (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+int ZEXPORT deflateSetDictionary(strm, dictionary, dictLength)
     z_streamp strm;
     const Bytef *dictionary;
     uInt  dictLength;
@@ -482,7 +478,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
+int ZEXPORT deflateGetDictionary(strm, dictionary, dictLength)
     z_streamp strm;
     Bytef *dictionary;
     uInt  *dictLength;
@@ -504,7 +500,7 @@ int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
+int ZEXPORT deflateResetKeep(strm)
     z_streamp strm;
 {
     deflate_state *s;
@@ -542,7 +538,7 @@ int ZEXPORT deflateResetKeep (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
+int ZEXPORT deflateReset(strm)
     z_streamp strm;
 {
     int ret;
@@ -554,7 +550,7 @@ int ZEXPORT deflateReset (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
+int ZEXPORT deflateSetHeader(strm, head)
     z_streamp strm;
     gz_headerp head;
 {
@@ -565,7 +561,7 @@ int ZEXPORT deflateSetHeader (strm, head)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
+int ZEXPORT deflatePending(strm, pending, bits)
     unsigned *pending;
     int *bits;
     z_streamp strm;
@@ -579,7 +575,7 @@ int ZEXPORT deflatePending (strm, pending, bits)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
+int ZEXPORT deflatePrime(strm, bits, value)
     z_streamp strm;
     int bits;
     int value;
@@ -674,36 +670,50 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
 }
 
 /* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
+ * For the default windowBits of 15 and memLevel of 8, this function returns a
+ * close to exact, as well as small, upper bound on the compressed size. This
+ * is an expansion of ~0.03%, plus a small constant.
+ *
+ * For any setting other than those defaults for windowBits and memLevel, one
+ * of two worst case bounds is returned. This is at most an expansion of ~4% or
+ * ~13%, plus a small constant.
  *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
+ * Both the 0.03% and 4% derive from the overhead of stored blocks. The first
+ * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second
+ * is for stored blocks of 127 bytes (the worst case memLevel == 1). The
+ * expansion results from five bytes of header for each stored block.
  *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
+ * The larger expansion of 13% results from a window size less than or equal to
+ * the symbols buffer size (windowBits <= memLevel + 7). In that case some of
+ * the data being compressed may have slid out of the sliding window, impeding
+ * a stored block from being emitted. Then the only choice is a fixed or
+ * dynamic block, where a fixed block limits the maximum expansion to 9 bits
+ * per 8-bit byte, plus 10 bits for every block. The smallest block size for
+ * which this can occur is 255 (memLevel == 2).
+ *
+ * Shifts are used to approximate divisions, for speed.
  */
 uLong ZEXPORT deflateBound(strm, sourceLen)
     z_streamp strm;
     uLong sourceLen;
 {
     deflate_state *s;
-    uLong complen, wraplen;
+    uLong fixedlen, storelen, wraplen;
+
+    /* upper bound for fixed blocks with 9-bit literals and length 255
+       (memLevel == 2, which is the lowest that may not use stored blocks) --
+       ~13% overhead plus a small constant */
+    fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
+               (sourceLen >> 9) + 4;
 
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+    /* upper bound for stored blocks with length 127 (memLevel == 1) --
+       ~4% overhead plus a small constant */
+    storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
+               (sourceLen >> 11) + 7;
 
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    /* if can't get parameters, return larger bound plus a zlib wrapper */
     if (deflateStateCheck(strm))
-        return complen + 6;
+        return (fixedlen > storelen ? fixedlen : storelen) + 6;
 
     /* compute wrapper length */
     s = strm->state;
@@ -740,11 +750,12 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
         wraplen = 6;
     }
 
-    /* if not default parameters, return conservative bound */
+    /* if not default parameters, return one of the conservative bounds */
     if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
+        return (s->w_bits <= s->hash_bits ? fixedlen : storelen) + wraplen;
 
-    /* default settings: return tight bound for that case */
+    /* default settings: return tight bound for that case -- ~0.03% overhead
+       plus a small constant */
     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
            (sourceLen >> 25) + 13 - 6 + wraplen;
 }
@@ -754,7 +765,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */
-local void putShortMSB (s, b)
+local void putShortMSB(s, b)
     deflate_state *s;
     uInt b;
 {
@@ -801,7 +812,7 @@ local void flush_pending(strm)
     } while (0)
 
 /* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
+int ZEXPORT deflate(strm, flush)
     z_streamp strm;
     int flush;
 {
@@ -856,7 +867,7 @@ int ZEXPORT deflate (strm, flush)
         s->status = BUSY_STATE;
     if (s->status == INIT_STATE) {
         /* zlib header */
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+        uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
         uInt level_flags;
 
         if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
@@ -1116,7 +1127,7 @@ int ZEXPORT deflate (strm, flush)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
+int ZEXPORT deflateEnd(strm)
     z_streamp strm;
 {
     int status;
@@ -1142,7 +1153,7 @@ int ZEXPORT deflateEnd (strm)
  * To simplify the source, this is not supported for 16-bit MSDOS (which
  * doesn't have enough memory anyway to duplicate compression states).
  */
-int ZEXPORT deflateCopy (dest, source)
+int ZEXPORT deflateCopy(dest, source)
     z_streamp dest;
     z_streamp source;
 {
@@ -1231,7 +1242,7 @@ local unsigned read_buf(strm, buf, size)
 /* ===========================================================================
  * Initialize the "longest match" routines for a new zlib stream
  */
-local void lm_init (s)
+local void lm_init(s)
     deflate_state *s;
 {
     s->window_size = (ulg)2L*s->w_size;
@@ -1252,11 +1263,6 @@ local void lm_init (s)
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
 }
 
 #ifndef FASTEST
@@ -1269,10 +1275,6 @@ local void lm_init (s)
  *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
  * OUT assertion: the match length is not greater than s->lookahead.
  */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
 local uInt longest_match(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
@@ -1297,10 +1299,10 @@ local uInt longest_match(s, cur_match)
      */
     register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
     register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
+    register ush scan_end   = *(ushf*)(scan + best_len - 1);
 #else
     register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end1  = scan[best_len - 1];
     register Byte scan_end   = scan[best_len];
 #endif
 
@@ -1318,7 +1320,8 @@ local uInt longest_match(s, cur_match)
      */
     if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     do {
         Assert(cur_match < s->strstart, "no future");
@@ -1336,43 +1339,44 @@ local uInt longest_match(s, cur_match)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
          * UNALIGNED_OK if your compiler uses a different size.
          */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
+        if (*(ushf*)(match + best_len - 1) != scan_end ||
             *(ushf*)match != scan_start) continue;
 
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
          * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * strstart + 3, + 5, up to strstart + 257. We check for insufficient
          * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * at strstart + 257. If MAX_MATCH-2 is not a multiple of 8, it is
          * necessary to put more guard bytes at the end of the window, or
          * to check more often for insufficient lookahead.
          */
         Assert(scan[2] == match[2], "scan[2]?");
         scan++, match++;
         do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+        } while (*(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
                  scan < strend);
         /* The funny "do {}" generates better code on most compilers */
 
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        /* Here, scan <= window + strstart + 257 */
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
         if (*scan == *match) scan++;
 
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        len = (MAX_MATCH - 1) - (int)(strend - scan);
         scan = strend - (MAX_MATCH-1);
 
 #else /* UNALIGNED_OK */
 
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
+        if (match[best_len]     != scan_end  ||
+            match[best_len - 1] != scan_end1 ||
+            *match              != *scan     ||
+            *++match            != scan[1])      continue;
 
-        /* The check at best_len-1 can be removed because it will be made
+        /* The check at best_len - 1 can be removed because it will be made
          * again later. (This heuristic is not always a win.)
          * It is not necessary to compare scan[2] and match[2] since they
          * are always equal when the other bytes match, given that
@@ -1382,7 +1386,7 @@ local uInt longest_match(s, cur_match)
         Assert(*scan == *match, "match[2]?");
 
         /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
+         * the 256th check will be made at strstart + 258.
          */
         do {
         } while (*++scan == *++match && *++scan == *++match &&
@@ -1391,7 +1395,8 @@ local uInt longest_match(s, cur_match)
                  *++scan == *++match && *++scan == *++match &&
                  scan < strend);
 
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
 
         len = MAX_MATCH - (int)(strend - scan);
         scan = strend - MAX_MATCH;
@@ -1403,9 +1408,9 @@ local uInt longest_match(s, cur_match)
             best_len = len;
             if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
+            scan_end = *(ushf*)(scan + best_len - 1);
 #else
-            scan_end1  = scan[best_len-1];
+            scan_end1  = scan[best_len - 1];
             scan_end   = scan[best_len];
 #endif
         }
@@ -1415,7 +1420,6 @@ local uInt longest_match(s, cur_match)
     if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
     return s->lookahead;
 }
-#endif /* ASMV */
 
 #else /* FASTEST */
 
@@ -1436,7 +1440,8 @@ local uInt longest_match(s, cur_match)
      */
     Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     Assert(cur_match < s->strstart, "no future");
 
@@ -1446,7 +1451,7 @@ local uInt longest_match(s, cur_match)
      */
     if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
 
-    /* The check at best_len-1 can be removed because it will be made
+    /* The check at best_len - 1 can be removed because it will be made
      * again later. (This heuristic is not always a win.)
      * It is not necessary to compare scan[2] and match[2] since they
      * are always equal when the other bytes match, given that
@@ -1456,7 +1461,7 @@ local uInt longest_match(s, cur_match)
     Assert(*scan == *match, "match[2]?");
 
     /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
+     * the 256th check will be made at strstart + 258.
      */
     do {
     } while (*++scan == *++match && *++scan == *++match &&
@@ -1465,7 +1470,7 @@ local uInt longest_match(s, cur_match)
              *++scan == *++match && *++scan == *++match &&
              scan < strend);
 
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+    Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
 
     len = MAX_MATCH - (int)(strend - scan);
 
@@ -1501,7 +1506,7 @@ local void check_match(s, start, match, length)
         z_error("invalid match");
     }
     if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        fprintf(stderr,"\\[%d,%d]", start - match, length);
         do { putc(s->window[start++], stderr); } while (--length != 0);
     }
 }
@@ -1547,9 +1552,9 @@ local void fill_window(s)
         /* If the window is almost full and there is insufficient lookahead,
          * move the upper half to the lower one to make room in the upper half.
          */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
+        if (s->strstart >= wsize + MAX_DIST(s)) {
 
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
+            zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more);
             s->match_start -= wsize;
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
             s->block_start -= (long) wsize;
@@ -1680,7 +1685,7 @@ local void fill_window(s)
  *
  * deflate_stored() is written to minimize the number of times an input byte is
  * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
+ * maximizes the opportunities to have a single copy from next_in to next_out.
  */
 local block_state deflate_stored(s, flush)
     deflate_state *s;
@@ -1890,7 +1895,7 @@ local block_state deflate_fast(s, flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -1938,7 +1943,7 @@ local block_state deflate_fast(s, flush)
                 s->strstart += s->match_length;
                 s->match_length = 0;
                 s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
 #if MIN_MATCH != 3
                 Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
@@ -1949,7 +1954,7 @@ local block_state deflate_fast(s, flush)
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -1993,7 +1998,7 @@ local block_state deflate_slow(s, flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -2035,17 +2040,17 @@ local block_state deflate_slow(s, flush)
             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
             /* Do not insert strings in hash table beyond this. */
 
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+            check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
 
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+            _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
                            s->prev_length - MIN_MATCH, bflush);
 
             /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
+             * strstart - 1 and strstart are already inserted. If there is not
              * enough lookahead, the last two strings are not inserted in
              * the hash table.
              */
-            s->lookahead -= s->prev_length-1;
+            s->lookahead -= s->prev_length - 1;
             s->prev_length -= 2;
             do {
                 if (++s->strstart <= max_insert) {
@@ -2063,8 +2068,8 @@ local block_state deflate_slow(s, flush)
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+            _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
             if (bflush) {
                 FLUSH_BLOCK_ONLY(s, 0);
             }
@@ -2082,8 +2087,8 @@ local block_state deflate_slow(s, flush)
     }
     Assert (flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+        _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
         s->match_available = 0;
     }
     s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
@@ -2140,7 +2145,8 @@ local block_state deflate_rle(s, flush)
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+            Assert(scan <= s->window + (uInt)(s->window_size - 1),
+                   "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -2155,7 +2161,7 @@ local block_state deflate_rle(s, flush)
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -2195,7 +2201,7 @@ local block_state deflate_huff(s, flush)
         /* Output a literal byte */
         s->match_length = 0;
         Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        _tr_tally_lit(s, s->window[s->strstart], bflush);
         s->lookahead--;
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
diff --git a/compat/zlib/examples/enough.c b/compat/zlib/examples/enough.c
index 19cf08c..8a3cade 100644
--- a/compat/zlib/examples/enough.c
+++ b/compat/zlib/examples/enough.c
@@ -486,7 +486,7 @@ local void enough(int syms) {
 // are 286, 9, and 15 respectively, for the deflate literal/length code. The
 // possible codes are counted for each number of coded symbols from two to the
 // maximum. The counts for each of those and the total number of codes are
-// shown. The maximum number of inflate table entires is then calculated across
+// shown. The maximum number of inflate table entries is then calculated across
 // all possible codes. Each new maximum number of table entries and the
 // associated sub-code (starting at root + 1 == 10 bits) is shown.
 //
diff --git a/compat/zlib/examples/fitblk.c b/compat/zlib/examples/fitblk.c
index c61de5c..68f5680 100644
--- a/compat/zlib/examples/fitblk.c
+++ b/compat/zlib/examples/fitblk.c
@@ -17,7 +17,7 @@
    data in order to determine how much of that input will compress to
    nearly the requested output block size.  The first pass generates
    enough deflate blocks to produce output to fill the requested
-   output size plus a specfied excess amount (see the EXCESS define
+   output size plus a specified excess amount (see the EXCESS define
    below).  The last deflate block may go quite a bit past that, but
    is discarded.  The second pass decompresses and recompresses just
    the compressed data that fit in the requested plus excess sized
@@ -109,7 +109,7 @@ local int recompress(z_streamp inf, z_streamp def)
         if (ret == Z_MEM_ERROR)
             return ret;
 
-        /* compress what was decompresed until done or no room */
+        /* compress what was decompressed until done or no room */
         def->avail_in = RAWLEN - inf->avail_out;
         def->next_in = raw;
         if (inf->avail_out != 0)
diff --git a/compat/zlib/examples/gun.c b/compat/zlib/examples/gun.c
index be44fa5..bea5497 100644
--- a/compat/zlib/examples/gun.c
+++ b/compat/zlib/examples/gun.c
@@ -43,7 +43,7 @@
    gun will also decompress files made by Unix compress, which uses LZW
    compression.  These files are automatically detected by virtue of their
    magic header bytes.  Since the end of Unix compress stream is marked by the
-   end-of-file, they cannot be concantenated.  If a Unix compress stream is
+   end-of-file, they cannot be concatenated.  If a Unix compress stream is
    encountered in an input file, it is the last stream in that file.
 
    Like gunzip and uncompress, the file attributes of the original compressed
diff --git a/compat/zlib/examples/gzappend.c b/compat/zlib/examples/gzappend.c
index d7eea3e..23e93cf 100644
--- a/compat/zlib/examples/gzappend.c
+++ b/compat/zlib/examples/gzappend.c
@@ -33,7 +33,7 @@
  *                      - Add L to constants in lseek() calls
  *                      - Remove some debugging information in error messages
  *                      - Use new data_type definition for zlib 1.2.1
- *                      - Simplfy and unify file operations
+ *                      - Simplify and unify file operations
  *                      - Finish off gzip file in gztack()
  *                      - Use deflatePrime() instead of adding empty blocks
  *                      - Keep gzip file clean on appended file read errors
@@ -54,7 +54,7 @@
    block boundary to facilitate locating and modifying the last block bit at
    the start of the final deflate block.  Also whether using Z_BLOCK or not,
    another required feature of zlib 1.2.x is that inflate() now provides the
-   number of unusued bits in the last input byte used.  gzappend will not work
+   number of unused bits in the last input byte used.  gzappend will not work
    with versions of zlib earlier than 1.2.1.
 
    gzappend first decompresses the gzip file internally, discarding all but
diff --git a/compat/zlib/examples/gzlog.h b/compat/zlib/examples/gzlog.h
index 86f0cec..4f05109 100644
--- a/compat/zlib/examples/gzlog.h
+++ b/compat/zlib/examples/gzlog.h
@@ -40,7 +40,7 @@
    its new size at that time.  After each write operation, the log file is a
    valid gzip file that can decompressed to recover what was written.
 
-   The gzlog operations can be interupted at any point due to an application or
+   The gzlog operations can be interrupted at any point due to an application or
    system crash, and the log file will be recovered the next time the log is
    opened with gzlog_open().
  */
diff --git a/compat/zlib/examples/zran.c b/compat/zlib/examples/zran.c
index f279db7..879c47c 100644
--- a/compat/zlib/examples/zran.c
+++ b/compat/zlib/examples/zran.c
@@ -21,7 +21,7 @@
    An access point can be created at the start of any deflate block, by saving
    the starting file offset and bit of that block, and the 32K bytes of
    uncompressed data that precede that block.  Also the uncompressed offset of
-   that block is saved to provide a referece for locating a desired starting
+   that block is saved to provide a reference for locating a desired starting
    point in the uncompressed stream.  deflate_index_build() works by
    decompressing the input zlib or gzip stream a block at a time, and at the
    end of each block deciding if enough uncompressed data has gone by to
diff --git a/compat/zlib/gzlib.c b/compat/zlib/gzlib.c
index dddaf26..55da46a 100644
--- a/compat/zlib/gzlib.c
+++ b/compat/zlib/gzlib.c
@@ -30,7 +30,7 @@ local gzFile gz_open OF((const void *, int, const char *));
 
    The gz_strwinerror function does not change the current setting of
    GetLastError. */
-char ZLIB_INTERNAL *gz_strwinerror (error)
+char ZLIB_INTERNAL *gz_strwinerror(error)
      DWORD error;
 {
     static char buf[1024];
diff --git a/compat/zlib/gzread.c b/compat/zlib/gzread.c
index 884c9bf..dd77381 100644
--- a/compat/zlib/gzread.c
+++ b/compat/zlib/gzread.c
@@ -157,11 +157,9 @@ local int gz_look(state)
        the output buffer is larger than the input buffer, which also assures
        space for gzungetc() */
     state->x.next = state->out;
-    if (strm->avail_in) {
-        memcpy(state->x.next, strm->next_in, strm->avail_in);
-        state->x.have = strm->avail_in;
-        strm->avail_in = 0;
-    }
+    memcpy(state->x.next, strm->next_in, strm->avail_in);
+    state->x.have = strm->avail_in;
+    strm->avail_in = 0;
     state->how = COPY;
     state->direct = 1;
     return 0;
diff --git a/compat/zlib/gzwrite.c b/compat/zlib/gzwrite.c
index a8ffc8f..eb8a0e5 100644
--- a/compat/zlib/gzwrite.c
+++ b/compat/zlib/gzwrite.c
@@ -474,7 +474,7 @@ int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
 #else /* !STDC && !Z_HAVE_STDARG_H */
 
 /* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+int ZEXPORTVA gzprintf(file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
                        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
     gzFile file;
     const char *format;
diff --git a/compat/zlib/infback.c b/compat/zlib/infback.c
index a390c58..babeaf1 100644
--- a/compat/zlib/infback.c
+++ b/compat/zlib/infback.c
@@ -66,6 +66,7 @@ int stream_size;
     state->window = window;
     state->wnext = 0;
     state->whave = 0;
+    state->sane = 1;
     return Z_OK;
 }
 
@@ -605,25 +606,27 @@ void FAR *out_desc;
             break;
 
         case DONE:
-            /* inflate stream terminated properly -- write leftover output */
+            /* inflate stream terminated properly */
             ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
             goto inf_leave;
 
         case BAD:
             ret = Z_DATA_ERROR;
             goto inf_leave;
 
-        default:                /* can't happen, but makes compilers happy */
+        default:
+            /* can't happen, but makes compilers happy */
             ret = Z_STREAM_ERROR;
             goto inf_leave;
         }
 
-    /* Return unused input */
+    /* Write leftover output and return unused input */
   inf_leave:
+    if (left < state->wsize) {
+        if (out(out_desc, state->window, state->wsize - left) &&
+            ret == Z_STREAM_END)
+            ret = Z_BUF_ERROR;
+    }
     strm->next_in = next;
     strm->avail_in = have;
     return ret;
diff --git a/compat/zlib/inflate.c b/compat/zlib/inflate.c
index 7be8c63..8acbef4 100644
--- a/compat/zlib/inflate.c
+++ b/compat/zlib/inflate.c
@@ -168,6 +168,8 @@ int windowBits;
 
     /* extract wrap request from windowBits parameter */
     if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         wrap = 0;
         windowBits = -windowBits;
     }
@@ -764,8 +766,9 @@ int flush;
                 if (copy > have) copy = have;
                 if (copy) {
                     if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
                         zmemcpy(state->head->extra + len, next,
                                 len + copy > state->head->extra_max ?
                                 state->head->extra_max - len : copy);
diff --git a/compat/zlib/inftrees.c b/compat/zlib/inftrees.c
index a2f386c..57d2793 100644
--- a/compat/zlib/inftrees.c
+++ b/compat/zlib/inftrees.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.12 Copyright 1995-2022 Mark Adler ";
+   " inflate 1.2.13 Copyright 1995-2022 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 76, 202};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 194, 65};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/compat/zlib/inftrees.h b/compat/zlib/inftrees.h
index baa53a0..f536653 100644
--- a/compat/zlib/inftrees.h
+++ b/compat/zlib/inftrees.h
@@ -38,7 +38,7 @@ typedef struct {
 /* Maximum size of the dynamic table.  The maximum number of code structures is
    1444, which is the sum of 852 for literal/length codes and 592 for distance
    codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
+   examples/enough.c found in the zlib distribution.  The arguments to that
    program are the number of symbols, the initial root table size, and the
    maximum bit length of a code.  "enough 286 9 15" for literal/length codes
    returns returns 852, and "enough 30 6 15" for distance codes returns 592.
diff --git a/compat/zlib/make_vms.com b/compat/zlib/make_vms.com
index 65e9d0c..4dc8a89 100644
--- a/compat/zlib/make_vms.com
+++ b/compat/zlib/make_vms.com
@@ -14,9 +14,9 @@ $! 0.02 20061008 Adapt to new Makefile.in
 $! 0.03 20091224 Add support for large file check
 $! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
 $! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
-$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples
+$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new examples
 $!               subdir path, update module search in makefile.in
-$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned
+$! 0.07 20120115 Triggered by work done by Alexey Chupahin completely redesigned
 $!               shared image creation
 $! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
 $!               image
diff --git a/compat/zlib/os400/README400 b/compat/zlib/os400/README400
index 10f6c9d..c06fa84 100644
--- a/compat/zlib/os400/README400
+++ b/compat/zlib/os400/README400
@@ -1,9 +1,9 @@
-        ZLIB version 1.2.12 for OS/400 installation instructions
+        ZLIB version 1.2.13 for OS/400 installation instructions
 
 1) Download and unpack the zlib tarball to some IFS directory.
    (i.e.: /path/to/the/zlib/ifs/source/directory)
 
-   If the installed IFS command suppors gzip format, this is straightforward,
+   If the installed IFS command supports gzip format, this is straightforward,
 else you have to unpack first to some directory on a system supporting it,
 then move the whole directory to the IFS via the network (via SMB or FTP).
 
@@ -43,6 +43,6 @@ Notes:  For OS/400 ILE RPG programmers, a /copy member defining the ZLIB
 
         Remember that most foreign textual data are ASCII coded: this
                 implementation does not handle conversion from/to ASCII, so
-                text data code conversions must be done explicitely.
+                text data code conversions must be done explicitly.
 
         Mainly for the reason above, always open zipped files in binary mode.
diff --git a/compat/zlib/os400/bndsrc b/compat/zlib/os400/bndsrc
index 5e6e0a2..9f92bb1 100644
--- a/compat/zlib/os400/bndsrc
+++ b/compat/zlib/os400/bndsrc
@@ -116,4 +116,12 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
   EXPORT SYMBOL("inflateValidate")
   EXPORT SYMBOL("uncompress2")
 
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.12 additional entry points.                        */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+  EXPORT SYMBOL("crc32_combine_gen64")
+  EXPORT SYMBOL("crc32_combine_gen")
+  EXPORT SYMBOL("crc32_combine_op")
+
 ENDPGMEXP
diff --git a/compat/zlib/os400/zlib.inc b/compat/zlib/os400/zlib.inc
index fda156b..c273c86 100644
--- a/compat/zlib/os400/zlib.inc
+++ b/compat/zlib/os400/zlib.inc
@@ -1,7 +1,7 @@
       *  ZLIB.INC - Interface to the general purpose compression library
       *
       *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.12
+      *  Version 1.2.13
       *
       *
       *  WARNING:
@@ -22,12 +22,12 @@
       *
       *  Versioning information.
       *
-     D ZLIB_VERSION    C                   '1.2.12'
+     D ZLIB_VERSION    C                   '1.2.13'
      D ZLIB_VERNUM     C                   X'12a0'
      D ZLIB_VER_MAJOR  C                   1
      D ZLIB_VER_MINOR  C                   2
      D ZLIB_VER_REVISION...
-     D                 C                   12
+     D                 C                   13
      D ZLIB_VER_SUBREVISION...
      D                 C                   0
       *
diff --git a/compat/zlib/qnx/package.qpg b/compat/zlib/qnx/package.qpg
index badd1d5..ba2f1a2 100644
--- a/compat/zlib/qnx/package.qpg
+++ b/compat/zlib/qnx/package.qpg
@@ -25,10 +25,10 @@
       <QPG:Files>
          <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
          <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.2.12" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.12"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.12"/>
-         <QPG:Add file="../libz.so.1.2.12" install="/opt/lib/" component="slib"/>
+         <QPG:Add file="../libz.so.1.2.13" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.13"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.13"/>
+         <QPG:Add file="../libz.so.1.2.13" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.12</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.13</QPM:ReleaseVersion>
                <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
                <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
                <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/compat/zlib/test/example.c b/compat/zlib/test/example.c
index 949f4f6..1470bc8 100644
--- a/compat/zlib/test/example.c
+++ b/compat/zlib/test/example.c
@@ -555,7 +555,8 @@ int main(argc, argv)
         exit(1);
 
     } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
-        fprintf(stderr, "warning: different zlib version\n");
+        fprintf(stderr, "warning: different zlib version linked: %s\n",
+                zlibVersion());
     }
 
     printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
diff --git a/compat/zlib/test/minigzip.c b/compat/zlib/test/minigzip.c
index e22fb08..a649d2b 100644
--- a/compat/zlib/test/minigzip.c
+++ b/compat/zlib/test/minigzip.c
@@ -500,7 +500,7 @@ void file_uncompress(file)
     char *infile, *outfile;
     FILE  *out;
     gzFile in;
-    unsigned len = strlen(file);
+    z_size_t len = strlen(file);
 
     if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
         fprintf(stderr, "%s: filename too long\n", prog);
diff --git a/compat/zlib/treebuild.xml b/compat/zlib/treebuild.xml
index 781b4c9..0017a45 100644
--- a/compat/zlib/treebuild.xml
+++ b/compat/zlib/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.12">
-    <library name="zlib" dlversion="1.2.12" dlname="z">
+<package name="zlib" version="1.2.13">
+    <library name="zlib" dlversion="1.2.13" dlname="z">
 	<property name="description"> zip compression library </property>
 	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
 
diff --git a/compat/zlib/trees.c b/compat/zlib/trees.c
index 8b438cc..5f305c4 100644
--- a/compat/zlib/trees.c
+++ b/compat/zlib/trees.c
@@ -193,7 +193,7 @@ local void send_bits(s, value, length)
     s->bits_sent += (ulg)length;
 
     /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
@@ -256,7 +256,7 @@ local void tr_static_init()
     length = 0;
     for (code = 0; code < LENGTH_CODES-1; code++) {
         base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
             _length_code[length++] = (uch)code;
         }
     }
@@ -265,13 +265,13 @@ local void tr_static_init()
      * in two different ways: code 284 + 5 bits or code 285, so we
      * overwrite length_code[255] to use the best encoding:
      */
-    _length_code[length-1] = (uch)code;
+    _length_code[length - 1] = (uch)code;
 
     /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
     dist = 0;
     for (code = 0 ; code < 16; code++) {
         base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
             _dist_code[dist++] = (uch)code;
         }
     }
@@ -279,11 +279,11 @@ local void tr_static_init()
     dist >>= 7; /* from now on, all distances are divided by 128 */
     for ( ; code < D_CODES; code++) {
         base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+        for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
             _dist_code[256 + dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+    Assert (dist == 256, "tr_static_init: 256 + dist != 512");
 
     /* Construct the codes of the static literal tree */
     for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -312,7 +312,7 @@ local void tr_static_init()
 }
 
 /* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Generate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
 #  ifndef ZLIB_DEBUG
@@ -321,7 +321,7 @@ local void tr_static_init()
 
 #  define SEPARATOR(i, last, width) \
       ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+       ((i) % (width) == (width) - 1 ? ",\n" : ", "))
 
 void gen_trees_header()
 {
@@ -458,7 +458,7 @@ local void pqdownheap(s, tree, k)
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
@@ -507,7 +507,7 @@ local void gen_bitlen(s, desc)
      */
     tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
         n = s->heap[h];
         bits = tree[tree[n].Dad].Len + 1;
         if (bits > max_length) bits = max_length, overflow++;
@@ -518,7 +518,7 @@ local void gen_bitlen(s, desc)
 
         s->bl_count[bits]++;
         xbits = 0;
-        if (n >= base) xbits = extra[n-base];
+        if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
         s->opt_len += (ulg)f * (unsigned)(bits + xbits);
         if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
@@ -530,10 +530,10 @@ local void gen_bitlen(s, desc)
 
     /* Find the first bit length which could increase: */
     do {
-        bits = max_length-1;
+        bits = max_length - 1;
         while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[bits]--;        /* move one leaf down the tree */
+        s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
         s->bl_count[max_length]--;
         /* The brother of the overflow item also moves one step up,
          * but this does not affect bl_count[max_length]
@@ -569,7 +569,7 @@ local void gen_bitlen(s, desc)
  * OUT assertion: the field code is set for all tree elements of non
  *     zero code length.
  */
-local void gen_codes (tree, max_code, bl_count)
+local void gen_codes(tree, max_code, bl_count)
     ct_data *tree;             /* the tree to decorate */
     int max_code;              /* largest code with non zero frequency */
     ushf *bl_count;            /* number of codes at each bit length */
@@ -583,13 +583,13 @@ local void gen_codes (tree, max_code, bl_count)
      * without bit reversal.
      */
     for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
+        code = (code + bl_count[bits - 1]) << 1;
         next_code[bits] = (ush)code;
     }
     /* Check that the bit counts in bl_count are consistent. The last code
      * must be all ones.
      */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+    Assert (code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
             "inconsistent bit counts");
     Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
 
@@ -600,7 +600,7 @@ local void gen_codes (tree, max_code, bl_count)
         tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
 
         Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+            n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
     }
 }
 
@@ -624,7 +624,7 @@ local void build_tree(s, desc)
     int node;          /* new node being created */
 
     /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n + 1].
      * heap[0] is not used.
      */
     s->heap_len = 0, s->heap_max = HEAP_SIZE;
@@ -652,7 +652,7 @@ local void build_tree(s, desc)
     }
     desc->max_code = max_code;
 
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+    /* The elements heap[heap_len/2 + 1 .. heap_len] are leaves of the tree,
      * establish sub-heaps of increasing lengths:
      */
     for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
@@ -700,7 +700,7 @@ local void build_tree(s, desc)
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */
-local void scan_tree (s, tree, max_code)
+local void scan_tree(s, tree, max_code)
     deflate_state *s;
     ct_data *tree;   /* the tree to be scanned */
     int max_code;    /* and its largest code of non zero frequency */
@@ -714,10 +714,10 @@ local void scan_tree (s, tree, max_code)
     int min_count = 4;         /* min repeat count */
 
     if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -745,7 +745,7 @@ local void scan_tree (s, tree, max_code)
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */
-local void send_tree (s, tree, max_code)
+local void send_tree(s, tree, max_code)
     deflate_state *s;
     ct_data *tree; /* the tree to be scanned */
     int max_code;       /* and its largest code of non zero frequency */
@@ -758,11 +758,11 @@ local void send_tree (s, tree, max_code)
     int max_count = 7;         /* max repeat count */
     int min_count = 4;         /* min repeat count */
 
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    /* tree[max_code + 1].Len = -1; */  /* guard already set */
     if (nextlen == 0) max_count = 138, min_count = 3;
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -773,13 +773,13 @@ local void send_tree (s, tree, max_code)
                 send_code(s, curlen, s->bl_tree); count--;
             }
             Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count - 3, 2);
 
         } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count - 3, 3);
 
         } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
         }
         count = 0; prevlen = curlen;
         if (nextlen == 0) {
@@ -807,8 +807,8 @@ local int build_bl_tree(s)
 
     /* Build the bit length tree: */
     build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+    /* opt_len now includes the length of the tree representations, except the
+     * lengths of the bit lengths codes and the 5 + 5 + 4 bits for the counts.
      */
 
     /* Determine the number of bit length codes to send. The pkzip format
@@ -819,7 +819,7 @@ local int build_bl_tree(s)
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
+    s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -841,19 +841,19 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
     Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
             "too many codes");
     Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    send_bits(s, lcodes - 257, 5);  /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes - 1,   5);
+    send_bits(s, blcodes - 4,  4);  /* not -3 as stated in appnote.txt */
     for (rank = 0; rank < blcodes; rank++) {
         Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
         send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
     }
     Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1);  /* literal tree */
     Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
     Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
@@ -866,7 +866,7 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     ulg stored_len;   /* length of input block */
     int last;         /* one if this is the last block for a file */
 {
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+    send_bits(s, (STORED_BLOCK<<1) + last, 3);  /* send block type */
     bi_windup(s);        /* align on byte boundary */
     put_short(s, (ush)stored_len);
     put_short(s, (ush)~stored_len);
@@ -877,7 +877,7 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
     s->bits_sent += 2*16;
-    s->bits_sent += stored_len<<3;
+    s->bits_sent += stored_len << 3;
 #endif
 }
 
@@ -943,14 +943,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         max_blindex = build_bl_tree(s);
 
         /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
+        opt_lenb = (s->opt_len + 3 + 7) >> 3;
+        static_lenb = (s->static_len + 3 + 7) >> 3;
 
         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
                 s->sym_next / 3));
 
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+#ifndef FORCE_STATIC
+        if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+            opt_lenb = static_lenb;
 
     } else {
         Assert(buf != (char*)0, "lost buf");
@@ -960,7 +963,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #ifdef FORCE_STORED
     if (buf != (char*)0) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+    if (stored_len + 4 <= opt_lenb && buf != (char*)0) {
                        /* 4: two words for the lengths */
 #endif
         /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -971,21 +974,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
          */
         _tr_stored_block(s, buf, stored_len, last);
 
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
+    } else if (static_lenb == opt_lenb) {
+        send_bits(s, (STATIC_TREES<<1) + last, 3);
         compress_block(s, (const ct_data *)static_ltree,
                        (const ct_data *)static_dtree);
 #ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
+        send_bits(s, (DYN_TREES<<1) + last, 3);
+        send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+                       max_blindex + 1);
         compress_block(s, (const ct_data *)s->dyn_ltree,
                        (const ct_data *)s->dyn_dtree);
 #ifdef ZLIB_DEBUG
@@ -1004,18 +1003,18 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+           s->compressed_len - 7*last));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+int ZLIB_INTERNAL _tr_tally(s, dist, lc)
     deflate_state *s;
     unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+    unsigned lc;    /* match length - MIN_MATCH or unmatched char (dist==0) */
 {
     s->sym_buf[s->sym_next++] = (uch)dist;
     s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
@@ -1031,7 +1030,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
                (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
                (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
     }
     return (s->sym_next == s->sym_end);
@@ -1061,7 +1060,7 @@ local void compress_block(s, ltree, dtree)
         } else {
             /* Here, lc is the match length - MIN_MATCH */
             code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            send_code(s, code + LITERALS + 1, ltree);   /* send length code */
             extra = extra_lbits[code];
             if (extra != 0) {
                 lc -= base_length[code];
@@ -1177,6 +1176,6 @@ local void bi_windup(s)
     s->bi_buf = 0;
     s->bi_valid = 0;
 #ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
+    s->bits_sent = (s->bits_sent + 7) & ~7;
 #endif
 }
diff --git a/compat/zlib/uncompr.c b/compat/zlib/uncompr.c
index f03a1a8..f9532f4 100644
--- a/compat/zlib/uncompr.c
+++ b/compat/zlib/uncompr.c
@@ -24,7 +24,7 @@
    Z_DATA_ERROR if the input data was corrupted, including if the input data is
    an incomplete zlib stream.
 */
-int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
+int ZEXPORT uncompress2(dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
@@ -83,7 +83,7 @@ int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
            err;
 }
 
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+int ZEXPORT uncompress(dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
diff --git a/compat/zlib/win32/README-WIN32.txt b/compat/zlib/win32/README-WIN32.txt
index 536cfec..050197d 100644
--- a/compat/zlib/win32/README-WIN32.txt
+++ b/compat/zlib/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.12 is a general purpose data compression library.  All the code is
+zlib 1.2.13 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
 
 Manifest:
 
-The package zlib-1.2.12-win32-x86.zip will contain the following files:
+The package zlib-1.2.13-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
diff --git a/compat/zlib/win32/zlib1.rc b/compat/zlib/win32/zlib1.rc
index 234e641..ceb4ee5 100644
--- a/compat/zlib/win32/zlib1.rc
+++ b/compat/zlib/win32/zlib1.rc
@@ -26,7 +26,7 @@ BEGIN
       VALUE "FileDescription",	"zlib data compression library\0"
       VALUE "FileVersion",	ZLIB_VERSION "\0"
       VALUE "InternalName",	"zlib1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright",	"(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename",	"zlib1.dll\0"
       VALUE "ProductName",	"zlib\0"
       VALUE "ProductVersion",	ZLIB_VERSION "\0"
diff --git a/compat/zlib/zconf.h b/compat/zlib/zconf.h
index 5e1d68a..bf977d3 100644
--- a/compat/zlib/zconf.h
+++ b/compat/zlib/zconf.h
@@ -38,6 +38,9 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
@@ -349,6 +352,9 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -467,11 +473,18 @@ typedef uLong FAR uLongf;
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
diff --git a/compat/zlib/zconf.h.cmakein b/compat/zlib/zconf.h.cmakein
index a7f24cc..247ba24 100644
--- a/compat/zlib/zconf.h.cmakein
+++ b/compat/zlib/zconf.h.cmakein
@@ -40,6 +40,9 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
@@ -351,6 +354,9 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -469,11 +475,18 @@ typedef uLong FAR uLongf;
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
diff --git a/compat/zlib/zconf.h.in b/compat/zlib/zconf.h.in
index 5e1d68a..bf977d3 100644
--- a/compat/zlib/zconf.h.in
+++ b/compat/zlib/zconf.h.in
@@ -38,6 +38,9 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
@@ -349,6 +352,9 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -467,11 +473,18 @@ typedef uLong FAR uLongf;
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
diff --git a/compat/zlib/zlib.3 b/compat/zlib/zlib.3
index bcaebd9..6f6e914 100644
--- a/compat/zlib/zlib.3
+++ b/compat/zlib/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "27 Mar 2022"
+.TH ZLIB 3 "13 Oct 2022"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -105,7 +105,7 @@ before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
 .SH AUTHORS AND LICENSE
-Version 1.2.12
+Version 1.2.13
 .LP
 Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 .LP
diff --git a/compat/zlib/zlib.3.pdf b/compat/zlib/zlib.3.pdf
index 54d677a..8132d84 100644
Binary files a/compat/zlib/zlib.3.pdf and b/compat/zlib/zlib.3.pdf differ
diff --git a/compat/zlib/zlib.h b/compat/zlib/zlib.h
index 4a98e38..953cb50 100644
--- a/compat/zlib/zlib.h
+++ b/compat/zlib/zlib.h
@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.12, March 11th, 2022
+  version 1.2.13, October 13th, 2022
 
   Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.12"
-#define ZLIB_VERNUM 0x12c0
+#define ZLIB_VERSION "1.2.13"
+#define ZLIB_VERNUM 0x12d0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 12
+#define ZLIB_VER_REVISION 13
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -276,7 +276,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
   buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
+  which can be used if desired to determine whether or not there is more output
   in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
@@ -660,7 +660,7 @@ ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If deflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      deflateGetDictionary() may return a length less than the window size, even
    when more than the window size in input has been provided. It may return up
@@ -915,7 +915,7 @@ ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If inflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
    stream state is inconsistent.
@@ -1437,12 +1437,12 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
 
      In the event that the end of file is reached and only a partial item is
    available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevetheless read into buf
+   multiple of size, then the final partial item is nevertheless read into buf
    and the end-of-file flag is set.  The length of the partial item read is not
    provided, but could be inferred from the result of gztell().  This behavior
    is the same as the behavior of fread() implementations in common libraries,
    but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
+   file, resetting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file, voidpc buf, unsigned len));
@@ -1913,7 +1913,7 @@ ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
 #if defined(_WIN32) && !defined(Z_SOLO)
diff --git a/compat/zlib/zlib2ansi b/compat/zlib/zlib2ansi
index 15e3e16..23b2a1d 100755
--- a/compat/zlib/zlib2ansi
+++ b/compat/zlib/zlib2ansi
@@ -8,7 +8,7 @@
 
 # TODO
 #
-# Asumes no function pointer parameters. unless they are typedefed.
+# Assumes no function pointer parameters. unless they are typedefed.
 # Assumes no literal strings that look like function definitions
 # Assumes functions start at the beginning of a line
 
@@ -104,7 +104,7 @@ sub StripComments
 
   no warnings;
 
-  # Strip C & C++ coments
+  # Strip C & C++ comments
   # From the perlfaq
   $_[0] =~
 
diff --git a/compat/zlib/zutil.c b/compat/zlib/zutil.c
index dcab28a..9543ae8 100644
--- a/compat/zlib/zutil.c
+++ b/compat/zlib/zutil.c
@@ -61,9 +61,11 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
+    /*
 #if defined(ASMV) || defined(ASMINF)
     flags += 1 << 9;
 #endif
+     */
 #ifdef ZLIB_WINAPI
     flags += 1 << 10;
 #endif
@@ -119,7 +121,7 @@ uLong ZEXPORT zlibCompileFlags()
 #  endif
 int ZLIB_INTERNAL z_verbose = verbose;
 
-void ZLIB_INTERNAL z_error (m)
+void ZLIB_INTERNAL z_error(m)
     char *m;
 {
     fprintf(stderr, "%s\n", m);
@@ -214,7 +216,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
 {
     voidpf buf;
     ulg bsize = (ulg)items*size;
@@ -240,7 +242,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 {
     int n;
 
@@ -277,13 +279,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
 {
     (void)opaque;
     return _halloc((long)items, size);
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 {
     (void)opaque;
     _hfree(ptr);
@@ -302,7 +304,7 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+voidpf ZLIB_INTERNAL zcalloc(opaque, items, size)
     voidpf opaque;
     unsigned items;
     unsigned size;
@@ -312,7 +314,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
                               (voidpf)calloc(items, size);
 }
 
-void ZLIB_INTERNAL zcfree (opaque, ptr)
+void ZLIB_INTERNAL zcfree(opaque, ptr)
     voidpf opaque;
     voidpf ptr;
 {
diff --git a/compat/zlib/zutil.h b/compat/zlib/zutil.h
index d9a20ae..0bc7f4e 100644
--- a/compat/zlib/zutil.h
+++ b/compat/zlib/zutil.h
@@ -193,6 +193,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
 #endif
 
         /* common defaults */
-- 
cgit v0.12


From f1c94fa67e7f4a99e9bbb00223c9beb83f69fab2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 19 Oct 2022 07:28:18 +0000
Subject: Make minizip/ioapi.c work (again) on win32. Build zlib1.dll for
 win64-arm

---
 compat/zlib/contrib/minizip/ioapi.c |   6 +++++-
 compat/zlib/win64-arm/zlib1.dll     | Bin 95232 -> 95232 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/compat/zlib/contrib/minizip/ioapi.c b/compat/zlib/contrib/minizip/ioapi.c
index 814a6fd..9370ae2 100644
--- a/compat/zlib/contrib/minizip/ioapi.c
+++ b/compat/zlib/contrib/minizip/ioapi.c
@@ -14,7 +14,11 @@
         #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(_WIN32)
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) _ftelli64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) _fseeki64(stream, offset, origin)
+#elif defined(__APPLE__) || defined(IOAPI_NO_64)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
diff --git a/compat/zlib/win64-arm/zlib1.dll b/compat/zlib/win64-arm/zlib1.dll
index 9025467..32d70b4 100755
Binary files a/compat/zlib/win64-arm/zlib1.dll and b/compat/zlib/win64-arm/zlib1.dll differ
-- 
cgit v0.12


From dd1a24d32d14cc98d847387e1d79d925a12bc717 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 19 Oct 2022 08:30:20 +0000
Subject: Re-build zlib1 1.2.13 for win32/win64

---
 compat/zlib/win32/zlib1.dll | Bin 122880 -> 123904 bytes
 compat/zlib/win64/zlib1.dll | Bin 134144 -> 134656 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/compat/zlib/win32/zlib1.dll b/compat/zlib/win32/zlib1.dll
index e87de8c..8a24ded 100755
Binary files a/compat/zlib/win32/zlib1.dll and b/compat/zlib/win32/zlib1.dll differ
diff --git a/compat/zlib/win64/zlib1.dll b/compat/zlib/win64/zlib1.dll
index 9e38c08..35ed527 100755
Binary files a/compat/zlib/win64/zlib1.dll and b/compat/zlib/win64/zlib1.dll differ
-- 
cgit v0.12


From a344103b2df59b2fbd11188bb6b16293aa44c8ca Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 19 Oct 2022 20:05:52 +0000
Subject: Re-build win64/zlib1.dll (with ucrt support)

---
 compat/zlib/win64/zlib1.dll | Bin 102400 -> 102400 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/compat/zlib/win64/zlib1.dll b/compat/zlib/win64/zlib1.dll
index c822c70..3e88520 100755
Binary files a/compat/zlib/win64/zlib1.dll and b/compat/zlib/win64/zlib1.dll differ
-- 
cgit v0.12


From 50abb43dbe760b723114adb2d75e9697c9c5ce8e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 20 Oct 2022 15:28:10 +0000
Subject: Fix [af65af3655]: clock.n: unbalanced parenthesis

---
 doc/clock.n | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/clock.n b/doc/clock.n
index c46b797..3c408fc 100644
--- a/doc/clock.n
+++ b/doc/clock.n
@@ -188,9 +188,9 @@ Surprising results
 may be obtained when crossing a point at which a leap second is
 inserted or removed; the \fBclock add\fR command simply ignores
 leap seconds and therefore assumes that times come in sequence,
-23:59:58, 23:59:59, 00:00:00.  (This assumption is handled by
+23:59:58, 23:59:59, 00:00:00.  This assumption is handled by
 the fact that Tcl's model of time reacts to leap seconds by speeding
-or slowing the clock by a minuscule amount until Tcl's time
+or slowing the clock by a miniscule amount until Tcl's time
 is back in step with the world.
 .PP
 The fact that adding and subtracting hours is defined in terms of
-- 
cgit v0.12


From 5a7f45638f425ed4e56942f1ca3df6705bfd5d4a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 20 Oct 2022 15:31:47 +0000
Subject: =?UTF-8?q?Fix=20[d554e5554e]:=20fix=20typo=20=E2=80=9Cdefintion?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 generic/tclAssembly.c   |   2 +-
 generic/tclCompCmds.c   |  62 ++++++++++++++---------------
 generic/tclCompCmdsGR.c |  68 ++++++++++++++++----------------
 generic/tclCompCmdsSZ.c | 102 ++++++++++++++++++++++++------------------------
 generic/tclCompile.c    |   2 +-
 generic/tclEnsemble.c   |  28 ++++++-------
 generic/tclFileSystem.h |   2 +-
 7 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index 42c0c47..e69348c 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -949,7 +949,7 @@ TclCompileAssembleCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 0f52338..306334b 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -134,7 +134,7 @@ TclCompileAppendCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -260,7 +260,7 @@ TclCompileArrayExistsCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -292,7 +292,7 @@ TclCompileArraySetCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -465,7 +465,7 @@ TclCompileArrayUnsetCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -525,7 +525,7 @@ TclCompileBreakCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -583,7 +583,7 @@ TclCompileCatchCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -766,7 +766,7 @@ TclCompileClockClicksCmd(
     Tcl_Interp* interp,		/* Tcl interpreter */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -830,7 +830,7 @@ TclCompileClockReadingCmd(
     Tcl_Interp* interp,		/* Tcl interpreter */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -866,7 +866,7 @@ TclCompileConcatCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -953,7 +953,7 @@ TclCompileContinueCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1016,7 +1016,7 @@ TclCompileDictSetCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1069,7 +1069,7 @@ TclCompileDictIncrCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1141,7 +1141,7 @@ TclCompileDictGetCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1178,7 +1178,7 @@ TclCompileDictExistsCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1215,7 +1215,7 @@ TclCompileDictUnsetCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1268,7 +1268,7 @@ TclCompileDictCreateCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1361,7 +1361,7 @@ TclCompileDictMergeCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1475,7 +1475,7 @@ TclCompileDictForCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1488,7 +1488,7 @@ TclCompileDictMapCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1501,7 +1501,7 @@ CompileDictEachCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr,		/* Holds resulting instructions. */
     int collect)		/* Flag == TCL_EACH_COLLECT to collect and
@@ -1730,7 +1730,7 @@ TclCompileDictUpdateCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1881,7 +1881,7 @@ TclCompileDictAppendCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1936,7 +1936,7 @@ TclCompileDictLappendCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1981,7 +1981,7 @@ TclCompileDictWithCmd(
     Tcl_Interp *interp,		/* Used for looking up stuff. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2332,7 +2332,7 @@ TclCompileErrorCmd(
     Tcl_Interp *interp,		/* Used for context. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2406,7 +2406,7 @@ TclCompileExprCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2451,7 +2451,7 @@ TclCompileForCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2600,7 +2600,7 @@ TclCompileForeachCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2631,7 +2631,7 @@ TclCompileLmapCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2662,7 +2662,7 @@ CompileEachloopCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr,		/* Holds resulting instructions. */
     int collect)		/* Select collecting or accumulating mode
@@ -3133,7 +3133,7 @@ TclCompileFormatCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index a324706..4328ace 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -88,7 +88,7 @@ TclCompileGlobalCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -167,7 +167,7 @@ TclCompileIfCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -470,7 +470,7 @@ TclCompileIncrCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -581,7 +581,7 @@ TclCompileInfoCommandsCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -642,7 +642,7 @@ TclCompileInfoCoroutineCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -667,7 +667,7 @@ TclCompileInfoExistsCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -716,7 +716,7 @@ TclCompileInfoLevelCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -751,7 +751,7 @@ TclCompileInfoObjectClassCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -771,7 +771,7 @@ TclCompileInfoObjectIsACmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -807,7 +807,7 @@ TclCompileInfoObjectNamespaceCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -845,7 +845,7 @@ TclCompileLappendCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -961,7 +961,7 @@ TclCompileLassignCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1065,7 +1065,7 @@ TclCompileLindexCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1156,7 +1156,7 @@ TclCompileListCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1270,7 +1270,7 @@ TclCompileLlengthCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1303,7 +1303,7 @@ TclCompileLrangeCmd(
     Tcl_Interp *interp,		/* Tcl interpreter for context. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the
 				 * command. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
@@ -1364,7 +1364,7 @@ TclCompileLinsertCmd(
     Tcl_Interp *interp,		/* Tcl interpreter for context. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the
 				 * command. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
@@ -1467,7 +1467,7 @@ TclCompileLreplaceCmd(
     Tcl_Interp *interp,		/* Tcl interpreter for context. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the
 				 * command. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
@@ -1631,7 +1631,7 @@ TclCompileLsetCmd(
     Tcl_Interp *interp,		/* Tcl interpreter for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the
 				 * command. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
@@ -1778,7 +1778,7 @@ TclCompileNamespaceCurrentCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1803,7 +1803,7 @@ TclCompileNamespaceCodeCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1853,7 +1853,7 @@ TclCompileNamespaceOriginCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1875,7 +1875,7 @@ TclCompileNamespaceQualifiersCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1911,7 +1911,7 @@ TclCompileNamespaceTailCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1948,7 +1948,7 @@ TclCompileNamespaceUpvarCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2009,7 +2009,7 @@ TclCompileNamespaceWhichCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2073,7 +2073,7 @@ TclCompileRegexpCmd(
     Tcl_Interp *interp,		/* Tcl interpreter for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the
 				 * command. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
@@ -2238,7 +2238,7 @@ TclCompileRegsubCmd(
     Tcl_Interp *interp,		/* Tcl interpreter for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the
 				 * command. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
@@ -2413,7 +2413,7 @@ TclCompileReturnCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2665,7 +2665,7 @@ TclCompileUpvarCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2772,7 +2772,7 @@ TclCompileVariableCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2946,7 +2946,7 @@ TclCompileObjectNextCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2971,7 +2971,7 @@ TclCompileObjectNextToCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2996,7 +2996,7 @@ TclCompileObjectSelfCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index bfa1957..70d8909 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -131,7 +131,7 @@ TclCompileSetCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -225,7 +225,7 @@ TclCompileStringCatCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -297,7 +297,7 @@ TclCompileStringCmpCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -329,7 +329,7 @@ TclCompileStringEqualCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -361,7 +361,7 @@ TclCompileStringFirstCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -393,7 +393,7 @@ TclCompileStringLastCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -425,7 +425,7 @@ TclCompileStringIndexCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -453,7 +453,7 @@ TclCompileStringIsCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -732,7 +732,7 @@ TclCompileStringMatchCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -813,7 +813,7 @@ TclCompileStringLenCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -853,7 +853,7 @@ TclCompileStringMapCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -916,7 +916,7 @@ TclCompileStringRangeCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -992,7 +992,7 @@ TclCompileStringReplaceCmd(
     Tcl_Interp *interp,		/* Tcl interpreter for context. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the
 				 * command. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
@@ -1194,7 +1194,7 @@ TclCompileStringTrimLCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1222,7 +1222,7 @@ TclCompileStringTrimRCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1250,7 +1250,7 @@ TclCompileStringTrimCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1278,7 +1278,7 @@ TclCompileStringToUpperCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1300,7 +1300,7 @@ TclCompileStringToLowerCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1322,7 +1322,7 @@ TclCompileStringToTitleCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1399,7 +1399,7 @@ TclCompileSubstCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -1732,7 +1732,7 @@ TclCompileSwitchCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2610,7 +2610,7 @@ TclCompileTailcallCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2657,7 +2657,7 @@ TclCompileThrowCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -2761,7 +2761,7 @@ TclCompileTryCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3574,7 +3574,7 @@ TclCompileUnsetCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3713,7 +3713,7 @@ TclCompileWhileCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3891,7 +3891,7 @@ TclCompileYieldCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3934,7 +3934,7 @@ TclCompileYieldToCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -4184,7 +4184,7 @@ int
 TclCompileInvertOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4195,7 +4195,7 @@ int
 TclCompileNotOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4206,7 +4206,7 @@ int
 TclCompileAddOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4218,7 +4218,7 @@ int
 TclCompileMulOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4230,7 +4230,7 @@ int
 TclCompileAndOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4242,7 +4242,7 @@ int
 TclCompileOrOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4254,7 +4254,7 @@ int
 TclCompileXorOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4266,7 +4266,7 @@ int
 TclCompilePowOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4297,7 +4297,7 @@ int
 TclCompileLshiftOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4308,7 +4308,7 @@ int
 TclCompileRshiftOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4319,7 +4319,7 @@ int
 TclCompileModOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4330,7 +4330,7 @@ int
 TclCompileNeqOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4341,7 +4341,7 @@ int
 TclCompileStrneqOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4352,7 +4352,7 @@ int
 TclCompileInOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4363,7 +4363,7 @@ int
 TclCompileNiOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4375,7 +4375,7 @@ int
 TclCompileLessOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4386,7 +4386,7 @@ int
 TclCompileLeqOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4397,7 +4397,7 @@ int
 TclCompileGreaterOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4408,7 +4408,7 @@ int
 TclCompileGeqOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4419,7 +4419,7 @@ int
 TclCompileEqOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4430,7 +4430,7 @@ int
 TclCompileStreqOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4441,7 +4441,7 @@ int
 TclCompileMinusOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
@@ -4487,7 +4487,7 @@ int
 TclCompileDivOpCmd(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)
 {
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 9a59b71..bffe7f8 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2700,7 +2700,7 @@ TclCompileNoOp(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 5e0a9e2..3b80a21 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -2906,7 +2906,7 @@ TclCompileEnsemble(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3460,7 +3460,7 @@ CompileBasicNArgCommand(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3480,7 +3480,7 @@ TclCompileBasic0ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3502,7 +3502,7 @@ TclCompileBasic1ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3524,7 +3524,7 @@ TclCompileBasic2ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3546,7 +3546,7 @@ TclCompileBasic3ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3568,7 +3568,7 @@ TclCompileBasic0Or1ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3590,7 +3590,7 @@ TclCompileBasic1Or2ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3612,7 +3612,7 @@ TclCompileBasic2Or3ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3634,7 +3634,7 @@ TclCompileBasic0To2ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3656,7 +3656,7 @@ TclCompileBasic1To3ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3678,7 +3678,7 @@ TclCompileBasicMin0ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3700,7 +3700,7 @@ TclCompileBasicMin1ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
@@ -3722,7 +3722,7 @@ TclCompileBasicMin2ArgCmd(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tcl_Parse *parsePtr,	/* Points to a parse structure for the command
 				 * created by Tcl_ParseCommand. */
-    Command *cmdPtr,		/* Points to defintion of command being
+    Command *cmdPtr,		/* Points to definition of command being
 				 * compiled. */
     CompileEnv *envPtr)		/* Holds resulting instructions. */
 {
diff --git a/generic/tclFileSystem.h b/generic/tclFileSystem.h
index 1eec7ff..e5dcffb 100644
--- a/generic/tclFileSystem.h
+++ b/generic/tclFileSystem.h
@@ -1,7 +1,7 @@
 /*
  * tclFileSystem.h --
  *
- *	This file contains the common defintions and prototypes for use by
+ *	This file contains the common definitions and prototypes for use by
  *	Tcl's filesystem and path handling layers.
  *
  * Copyright (c) 2003 Vince Darley.
-- 
cgit v0.12


From c8a85bbc05960b91123999e18cdf1c872896dec7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 21 Oct 2022 09:01:36 +0000
Subject: Change version field to Tcl_ObjTypeVersion

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

diff --git a/generic/tcl.h b/generic/tcl.h
index 4def1b3..3f54c6d 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -360,6 +360,7 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
 typedef struct Tcl_Channel_ *Tcl_Channel;
 typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
+typedef struct Tcl_ObjTypeVersion_ *Tcl_ObjTypeVersion;
 typedef struct Tcl_Command_ *Tcl_Command;
 typedef struct Tcl_Condition_ *Tcl_Condition;
 typedef struct Tcl_Dict_ *Tcl_Dict;
@@ -616,11 +617,11 @@ typedef struct Tcl_ObjType {
 				/* Called to convert the object's internal rep
 				 * to this type. Frees the internal rep of the
 				 * old type. Returns TCL_ERROR on failure. */
-    unsigned char version;
+    Tcl_ObjTypeVersion version;
 } Tcl_ObjType;
-#define TCL_OBJTYPE_V0 0 /* Pre-Tcl 9. Set to 0 so compiler will auto-init 
-			  * when existing code that does not init this field
-			  * is compiled with Tcl9 headers */
+#define TCL_OBJTYPE_V0 ((Tcl_ObjTypeVersion)0) /* Pre-Tcl 9. Set to 0 so
+			  * compiler will auto-init  when existing code that does
+			  * not init this field is compiled with Tcl9 headers */
 #define TCL_OBJTYPE_CURRENT TCL_OBJTYPE_V0
 
 /*
-- 
cgit v0.12


From c08af43916648199e4e782f3d1d4fa937619eb3c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 21 Oct 2022 14:58:54 +0000
Subject: Don't bother _MSC_VER < 1900 any more

---
 win/tclWinTime.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index a7e8474..e8401a5 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -791,14 +791,14 @@ TclpGetDate(
 {
     struct tm *tmPtr;
     time_t time;
-#if defined(_WIN64) || (defined(_USE_64BIT_TIME_T) || (defined(_MSC_VER) && _MSC_VER < 1400))
+#if defined(_WIN64) || defined(_USE_64BIT_TIME_T)
 #   define t2 *t		/* no need to cripple time to 32-bit */
 #else
     time_t t2 = *(__time32_t *) t;
 #endif
 
     if (!useGMT) {
-#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#if defined(_MSC_VER)
 #	undef timezone /* prevent conflict with timezone() function */
 	long timezone = 0;
 #endif
@@ -815,7 +815,7 @@ TclpGetDate(
 	    return TclpLocaltime(&t2);
 	}
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#if defined(_MSC_VER)
 	_get_timezone(&timezone);
 #endif
 
@@ -1451,11 +1451,11 @@ TclpGmtime(
      * Posix gmtime_r function.
      */
 
-#if defined(_WIN64) || defined(_USE_64BIT_TIME_T) || (defined(_MSC_VER) && _MSC_VER < 1400)
+#if defined(_WIN64) || defined(_USE_64BIT_TIME_T)
     return gmtime(timePtr);
 #else
     return _gmtime32((const __time32_t *) timePtr);
-#endif /* _WIN64 || _USE_64BIT_TIME_T || _MSC_VER < 1400 */
+#endif /* _WIN64 || _USE_64BIT_TIME_T */
 }
 
 /*
@@ -1486,11 +1486,11 @@ TclpLocaltime(
      * provide a Posix localtime_r function.
      */
 
-#if defined(_WIN64) || defined(_USE_64BIT_TIME_T) || (defined(_MSC_VER) && _MSC_VER < 1400)
+#if defined(_WIN64) || defined(_USE_64BIT_TIME_T)
     return localtime(timePtr);
 #else
     return _localtime32((const __time32_t *) timePtr);
-#endif /* _WIN64 || _USE_64BIT_TIME_T || _MSC_VER < 1400 */
+#endif /* _WIN64 || _USE_64BIT_TIME_T */
 }
 #endif /* TCL_NO_DEPRECATED */
 
-- 
cgit v0.12


From 500e1529f18c04152dbf1a395c6c7a61f08f63b3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 21 Oct 2022 15:00:03 +0000
Subject: typedef Tcl_Size as int (which is the Tcl 8.7 part of TIP #628)

---
 generic/tcl.decls        | 226 +++++++++++-----------
 generic/tcl.h            | 193 ++++++++++---------
 generic/tclArithSeries.c |   2 +-
 generic/tclCompile.h     | 186 +++++++++----------
 generic/tclDecls.h       | 473 ++++++++++++++++++++++++-----------------------
 generic/tclIO.h          |  16 +-
 generic/tclInt.h         | 246 ++++++++++++------------
 generic/tclListObj.c     | 174 ++++++++---------
 generic/tclPlatDecls.h   |   4 +-
 generic/tclTest.c        |   4 +-
 10 files changed, 766 insertions(+), 758 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 268fe33..209fb9a 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -86,10 +86,10 @@ declare 15 {
     void Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...)
 }
 declare 16 {
-    void Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes, int length)
+    void Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes, Tcl_Size length)
 }
 declare 17 {
-    Tcl_Obj *Tcl_ConcatObj(int objc, Tcl_Obj *const objv[])
+    Tcl_Obj *Tcl_ConcatObj(Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 18 {
     int Tcl_ConvertToType(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -109,14 +109,14 @@ declare 22 {deprecated {No longer in use, changed to macro}} {
 }
 declare 23 {
     Tcl_Obj *Tcl_DbNewByteArrayObj(const unsigned char *bytes,
-	    int numBytes, const char *file, int line)
+	    Tcl_Size numBytes, const char *file, int line)
 }
 declare 24 {
     Tcl_Obj *Tcl_DbNewDoubleObj(double doubleValue, const char *file,
 	    int line)
 }
 declare 25 {
-    Tcl_Obj *Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
+    Tcl_Obj *Tcl_DbNewListObj(Tcl_Size objc, Tcl_Obj *const *objv,
 	    const char *file, int line)
 }
 declare 26 {deprecated {No longer in use, changed to macro}} {
@@ -126,7 +126,7 @@ declare 27 {
     Tcl_Obj *Tcl_DbNewObj(const char *file, int line)
 }
 declare 28 {
-    Tcl_Obj *Tcl_DbNewStringObj(const char *bytes, int length,
+    Tcl_Obj *Tcl_DbNewStringObj(const char *bytes, Tcl_Size length,
 	    const char *file, int line)
 }
 declare 29 {
@@ -188,7 +188,7 @@ declare 45 {
 	    int *objcPtr, Tcl_Obj ***objvPtr)
 }
 declare 46 {
-    int Tcl_ListObjIndex(Tcl_Interp *interp, Tcl_Obj *listPtr, int index,
+    int Tcl_ListObjIndex(Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size index,
 	    Tcl_Obj **objPtrPtr)
 }
 declare 47 {
@@ -196,14 +196,14 @@ declare 47 {
 	    int *lengthPtr)
 }
 declare 48 {
-    int Tcl_ListObjReplace(Tcl_Interp *interp, Tcl_Obj *listPtr, int first,
-	    int count, int objc, Tcl_Obj *const objv[])
+    int Tcl_ListObjReplace(Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size first,
+	    Tcl_Size count, Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 49 {deprecated {No longer in use, changed to macro}} {
     Tcl_Obj *Tcl_NewBooleanObj(int intValue)
 }
 declare 50 {
-    Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char *bytes, int numBytes)
+    Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char *bytes, Tcl_Size numBytes)
 }
 declare 51 {
     Tcl_Obj *Tcl_NewDoubleObj(double doubleValue)
@@ -212,7 +212,7 @@ declare 52 {deprecated {No longer in use, changed to macro}} {
     Tcl_Obj *Tcl_NewIntObj(int intValue)
 }
 declare 53 {
-    Tcl_Obj *Tcl_NewListObj(int objc, Tcl_Obj *const objv[])
+    Tcl_Obj *Tcl_NewListObj(Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 54 {deprecated {No longer in use, changed to macro}} {
     Tcl_Obj *Tcl_NewLongObj(long longValue)
@@ -221,17 +221,17 @@ declare 55 {
     Tcl_Obj *Tcl_NewObj(void)
 }
 declare 56 {
-    Tcl_Obj *Tcl_NewStringObj(const char *bytes, int length)
+    Tcl_Obj *Tcl_NewStringObj(const char *bytes, Tcl_Size length)
 }
 declare 57 {deprecated {No longer in use, changed to macro}} {
     void Tcl_SetBooleanObj(Tcl_Obj *objPtr, int intValue)
 }
 declare 58 {
-    unsigned char *Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int numBytes)
+    unsigned char *Tcl_SetByteArrayLength(Tcl_Obj *objPtr, Tcl_Size numBytes)
 }
 declare 59 {
     void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, const unsigned char *bytes,
-	    int numBytes)
+	    Tcl_Size numBytes)
 }
 declare 60 {
     void Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue)
@@ -240,16 +240,16 @@ declare 61 {deprecated {No longer in use, changed to macro}} {
     void Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue)
 }
 declare 62 {
-    void Tcl_SetListObj(Tcl_Obj *objPtr, int objc, Tcl_Obj *const objv[])
+    void Tcl_SetListObj(Tcl_Obj *objPtr, Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 63 {deprecated {No longer in use, changed to macro}} {
     void Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue)
 }
 declare 64 {
-    void Tcl_SetObjLength(Tcl_Obj *objPtr, int length)
+    void Tcl_SetObjLength(Tcl_Obj *objPtr, Tcl_Size length)
 }
 declare 65 {
-    void Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes, int length)
+    void Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes, Tcl_Size length)
 }
 declare 66 {deprecated {No longer in use, changed to macro}} {
     void Tcl_AddErrorInfo(Tcl_Interp *interp, const char *message)
@@ -308,23 +308,23 @@ declare 82 {
     int Tcl_CommandComplete(const char *cmd)
 }
 declare 83 {
-    char *Tcl_Concat(int argc, const char *const *argv)
+    char *Tcl_Concat(Tcl_Size argc, const char *const *argv)
 }
 declare 84 {
-    int Tcl_ConvertElement(const char *src, char *dst, int flags)
+    Tcl_Size Tcl_ConvertElement(const char *src, char *dst, int flags)
 }
 declare 85 {
-    int Tcl_ConvertCountedElement(const char *src, int length, char *dst,
+    Tcl_Size Tcl_ConvertCountedElement(const char *src, Tcl_Size length, char *dst,
 	    int flags)
 }
 declare 86 {
     int Tcl_CreateAlias(Tcl_Interp *childInterp, const char *childCmd,
-	    Tcl_Interp *target, const char *targetCmd, int argc,
+	    Tcl_Interp *target, const char *targetCmd, Tcl_Size argc,
 	    const char *const *argv)
 }
 declare 87 {
     int Tcl_CreateAliasObj(Tcl_Interp *childInterp, const char *childCmd,
-	    Tcl_Interp *target, const char *targetCmd, int objc,
+	    Tcl_Interp *target, const char *targetCmd, Tcl_Size objc,
 	    Tcl_Obj *const objv[])
 }
 declare 88 {
@@ -414,7 +414,7 @@ declare 110 {
     void Tcl_DeleteInterp(Tcl_Interp *interp)
 }
 declare 111 {
-    void Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr)
+    void Tcl_DetachPids(Tcl_Size numPids, Tcl_Pid *pidPtr)
 }
 declare 112 {
     void Tcl_DeleteTimerHandler(Tcl_TimerToken token)
@@ -433,7 +433,7 @@ declare 116 {
     void Tcl_DoWhenIdle(Tcl_IdleProc *proc, void *clientData)
 }
 declare 117 {
-    char *Tcl_DStringAppend(Tcl_DString *dsPtr, const char *bytes, int length)
+    char *Tcl_DStringAppend(Tcl_DString *dsPtr, const char *bytes, Tcl_Size length)
 }
 declare 118 {
     char *Tcl_DStringAppendElement(Tcl_DString *dsPtr, const char *element)
@@ -454,7 +454,7 @@ declare 123 {
     void Tcl_DStringResult(Tcl_Interp *interp, Tcl_DString *dsPtr)
 }
 declare 124 {
-    void Tcl_DStringSetLength(Tcl_DString *dsPtr, int length)
+    void Tcl_DStringSetLength(Tcl_DString *dsPtr, Tcl_Size length)
 }
 declare 125 {
     void Tcl_DStringStartSublist(Tcl_DString *dsPtr)
@@ -547,7 +547,7 @@ declare 151 {
 	    int *modePtr)
 }
 declare 152 {
-    int Tcl_GetChannelBufferSize(Tcl_Channel chan)
+    Tcl_Size Tcl_GetChannelBufferSize(Tcl_Channel chan)
 }
 declare 153 {
     int Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
@@ -609,10 +609,10 @@ declare 168 {
     Tcl_PathType Tcl_GetPathType(const char *path)
 }
 declare 169 {
-    int Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr)
+    Tcl_Size Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr)
 }
 declare 170 {
-    int Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr)
+    Tcl_Size Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr)
 }
 declare 171 {
     int Tcl_GetServiceMode(void)
@@ -664,7 +664,7 @@ declare 185 {
 }
 # Obsolete, use Tcl_FSJoinPath
 declare 186 {
-    char *Tcl_JoinPath(int argc, const char *const *argv,
+    char *Tcl_JoinPath(Tcl_Size argc, const char *const *argv,
 	    Tcl_DString *resultPtr)
 }
 declare 187 {
@@ -687,7 +687,7 @@ declare 191 {
     Tcl_Channel Tcl_MakeTcpClientChannel(void *tcpSocket)
 }
 declare 192 {
-    char *Tcl_Merge(int argc, const char *const *argv)
+    char *Tcl_Merge(Tcl_Size argc, const char *const *argv)
 }
 declare 193 {
     Tcl_HashEntry *Tcl_NextHashEntry(Tcl_HashSearch *searchPtr)
@@ -704,7 +704,7 @@ declare 196 {
 	    Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags)
 }
 declare 197 {
-    Tcl_Channel Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
+    Tcl_Channel Tcl_OpenCommandChannel(Tcl_Interp *interp, Tcl_Size argc,
 	    const char **argv, int flags)
 }
 # This is obsolete, use Tcl_FSOpenFileChannel
@@ -737,7 +737,7 @@ declare 205 {
     void Tcl_QueueEvent(Tcl_Event *evPtr, int position)
 }
 declare 206 {
-    int Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead)
+    Tcl_Size Tcl_Read(Tcl_Channel chan, char *bufPtr, Tcl_Size toRead)
 }
 declare 207 {
     void Tcl_ReapDetachedProcs(void)
@@ -766,7 +766,7 @@ declare 214 {
 	    const char *pattern)
 }
 declare 215 {
-    void Tcl_RegExpRange(Tcl_RegExp regexp, int index,
+    void Tcl_RegExpRange(Tcl_RegExp regexp, Tcl_Size index,
 	    const char **startPtr, const char **endPtr)
 }
 declare 216 {
@@ -776,10 +776,10 @@ declare 217 {
     void Tcl_ResetResult(Tcl_Interp *interp)
 }
 declare 218 {
-    int Tcl_ScanElement(const char *src, int *flagPtr)
+    Tcl_Size Tcl_ScanElement(const char *src, int *flagPtr)
 }
 declare 219 {
-    int Tcl_ScanCountedElement(const char *src, int length, int *flagPtr)
+    Tcl_Size Tcl_ScanCountedElement(const char *src, Tcl_Size length, int *flagPtr)
 }
 declare 220 {deprecated {}} {
     int Tcl_SeekOld(Tcl_Channel chan, int offset, int mode)
@@ -795,7 +795,7 @@ declare 223 {
 	    Tcl_InterpDeleteProc *proc, void *clientData)
 }
 declare 224 {
-    void Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz)
+    void Tcl_SetChannelBufferSize(Tcl_Channel chan, Tcl_Size sz)
 }
 declare 225 {
     int Tcl_SetChannelOption(Tcl_Interp *interp, Tcl_Channel chan,
@@ -818,7 +818,7 @@ declare 230 {nostub {Don't use this function in a stub-enabled extension}} {
     const char *Tcl_SetPanicProc(TCL_NORETURN1 Tcl_PanicProc *panicProc)
 }
 declare 231 {
-    int Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth)
+    Tcl_Size Tcl_SetRecursionLimit(Tcl_Interp *interp, Tcl_Size depth)
 }
 declare 232 {
     void Tcl_SetResult(Tcl_Interp *interp, char *result,
@@ -884,7 +884,7 @@ declare 249 {
 	    Tcl_DString *bufferPtr)
 }
 declare 250 {
-    int Tcl_Ungets(Tcl_Channel chan, const char *str, int len, int atHead)
+    Tcl_Size Tcl_Ungets(Tcl_Channel chan, const char *str, Tcl_Size len, int atHead)
 }
 declare 251 {
     void Tcl_UnlinkVar(Tcl_Interp *interp, const char *varName)
@@ -932,10 +932,10 @@ declare 262 {
 	    void *prevClientData)
 }
 declare 263 {
-    int Tcl_Write(Tcl_Channel chan, const char *s, int slen)
+    Tcl_Size Tcl_Write(Tcl_Channel chan, const char *s, Tcl_Size slen)
 }
 declare 264 {
-    void Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
+    void Tcl_WrongNumArgs(Tcl_Interp *interp, Tcl_Size objc,
 	    Tcl_Obj *const objv[], const char *message)
 }
 declare 265 {
@@ -1047,11 +1047,11 @@ declare 290 {deprecated {Use Tcl_DiscardInterpState}} {
     void Tcl_DiscardResult(Tcl_SavedResult *statePtr)
 }
 declare 291 {
-    int Tcl_EvalEx(Tcl_Interp *interp, const char *script, int numBytes,
+    int Tcl_EvalEx(Tcl_Interp *interp, const char *script, Tcl_Size numBytes,
 	    int flags)
 }
 declare 292 {
-    int Tcl_EvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
+    int Tcl_EvalObjv(Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[],
 	    int flags)
 }
 declare 293 {
@@ -1062,13 +1062,13 @@ declare 294 {
 }
 declare 295 {
     int Tcl_ExternalToUtf(Tcl_Interp *interp, Tcl_Encoding encoding,
-	    const char *src, int srcLen, int flags,
-	    Tcl_EncodingState *statePtr, char *dst, int dstLen,
+	    const char *src, Tcl_Size srcLen, int flags,
+	    Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen,
 	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
 }
 declare 296 {
     char *Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
-	    const char *src, int srcLen, Tcl_DString *dsPtr)
+	    const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr)
 }
 declare 297 {
     void Tcl_FinalizeThread(void)
@@ -1093,11 +1093,11 @@ declare 303 {
 }
 declare 304 {
     int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    const void *tablePtr, int offset, const char *msg, int flags,
+	    const void *tablePtr, Tcl_Size offset, const char *msg, int flags,
 	    void *indexPtr)
 }
 declare 305 {
-    void *Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, int size)
+    void *Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, Tcl_Size size)
 }
 declare 306 {
     Tcl_Obj *Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
@@ -1120,11 +1120,11 @@ declare 311 {
 	    const Tcl_Time *timePtr)
 }
 declare 312 {
-    int Tcl_NumUtfChars(const char *src, int length)
+    Tcl_Size Tcl_NumUtfChars(const char *src, Tcl_Size length)
 }
 declare 313 {
-    int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
-	    int charsToRead, int appendFlag)
+    Tcl_Size Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+	    Tcl_Size charsToRead, int appendFlag)
 }
 declare 314 {deprecated {Use Tcl_RestoreInterpState}} {
     void Tcl_RestoreResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
@@ -1147,7 +1147,7 @@ declare 319 {
 	    int position)
 }
 declare 320 {
-    int Tcl_UniCharAtIndex(const char *src, int index)
+    int Tcl_UniCharAtIndex(const char *src, Tcl_Size index)
 }
 declare 321 {
     int Tcl_UniCharToLower(int ch)
@@ -1162,13 +1162,13 @@ declare 324 {
     int Tcl_UniCharToUtf(int ch, char *buf)
 }
 declare 325 {
-    const char *Tcl_UtfAtIndex(const char *src, int index)
+    const char *Tcl_UtfAtIndex(const char *src, Tcl_Size index)
 }
 declare 326 {
-    int TclUtfCharComplete(const char *src, int length)
+    int TclUtfCharComplete(const char *src, Tcl_Size length)
 }
 declare 327 {
-    int Tcl_UtfBackslash(const char *src, int *readPtr, char *dst)
+    Tcl_Size Tcl_UtfBackslash(const char *src, int *readPtr, char *dst)
 }
 declare 328 {
     const char *Tcl_UtfFindFirst(const char *src, int ch)
@@ -1184,13 +1184,13 @@ declare 331 {
 }
 declare 332 {
     int Tcl_UtfToExternal(Tcl_Interp *interp, Tcl_Encoding encoding,
-	    const char *src, int srcLen, int flags,
-	    Tcl_EncodingState *statePtr, char *dst, int dstLen,
+	    const char *src, Tcl_Size srcLen, int flags,
+	    Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen,
 	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
 }
 declare 333 {
     char *Tcl_UtfToExternalDString(Tcl_Encoding encoding,
-	    const char *src, int srcLen, Tcl_DString *dsPtr)
+	    const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr)
 }
 declare 334 {
     int Tcl_UtfToLower(char *src)
@@ -1205,10 +1205,10 @@ declare 337 {
     int Tcl_UtfToUpper(char *src)
 }
 declare 338 {
-    int Tcl_WriteChars(Tcl_Channel chan, const char *src, int srcLen)
+    Tcl_Size Tcl_WriteChars(Tcl_Channel chan, const char *src, Tcl_Size srcLen)
 }
 declare 339 {
-    int Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr)
+    Tcl_Size Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr)
 }
 declare 340 {
     char *Tcl_GetString(Tcl_Obj *objPtr)
@@ -1247,7 +1247,7 @@ declare 351 {
     int Tcl_UniCharIsWordChar(int ch)
 }
 declare 352 {
-    int Tcl_Char16Len(const unsigned short *uniStr)
+    Tcl_Size Tcl_Char16Len(const unsigned short *uniStr)
 }
 declare 353 {deprecated {Use Tcl_UtfNcmp}} {
     int Tcl_UniCharNcmp(const unsigned short *ucs, const unsigned short *uct,
@@ -1255,11 +1255,11 @@ declare 353 {deprecated {Use Tcl_UtfNcmp}} {
 }
 declare 354 {
     char *Tcl_Char16ToUtfDString(const unsigned short *uniStr,
-	    int uniLength, Tcl_DString *dsPtr)
+	    Tcl_Size uniLength, Tcl_DString *dsPtr)
 }
 declare 355 {
     unsigned short *Tcl_UtfToChar16DString(const char *src,
-	    int length, Tcl_DString *dsPtr)
+	    Tcl_Size length, Tcl_DString *dsPtr)
 }
 declare 356 {
     Tcl_RegExp Tcl_GetRegExpFromObj(Tcl_Interp *interp, Tcl_Obj *patObj,
@@ -1274,29 +1274,29 @@ declare 358 {
 }
 declare 359 {
     void Tcl_LogCommandInfo(Tcl_Interp *interp, const char *script,
-	    const char *command, int length)
+	    const char *command, Tcl_Size length)
 }
 declare 360 {
     int Tcl_ParseBraces(Tcl_Interp *interp, const char *start,
-	    int numBytes, Tcl_Parse *parsePtr, int append,
+	    Tcl_Size numBytes, Tcl_Parse *parsePtr, int append,
 	    const char **termPtr)
 }
 declare 361 {
     int Tcl_ParseCommand(Tcl_Interp *interp, const char *start,
-	    int numBytes, int nested, Tcl_Parse *parsePtr)
+	    Tcl_Size numBytes, int nested, Tcl_Parse *parsePtr)
 }
 declare 362 {
     int Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
-	    int numBytes, Tcl_Parse *parsePtr)
+	    Tcl_Size numBytes, Tcl_Parse *parsePtr)
 }
 declare 363 {
     int Tcl_ParseQuotedString(Tcl_Interp *interp, const char *start,
-	    int numBytes, Tcl_Parse *parsePtr, int append,
+	    Tcl_Size numBytes, Tcl_Parse *parsePtr, int append,
 	    const char **termPtr)
 }
 declare 364 {
     int Tcl_ParseVarName(Tcl_Interp *interp, const char *start,
-	    int numBytes, Tcl_Parse *parsePtr, int append)
+	    Tcl_Size numBytes, Tcl_Parse *parsePtr, int append)
 }
 # These 4 functions are obsolete, use Tcl_FSGetCwd, Tcl_FSChdir,
 # Tcl_FSAccess and Tcl_FSStat
@@ -1335,33 +1335,33 @@ declare 375 {
 }
 declare 376 {
     int Tcl_RegExpExecObj(Tcl_Interp *interp, Tcl_RegExp regexp,
-	    Tcl_Obj *textObj, int offset, int nmatches, int flags)
+	    Tcl_Obj *textObj, Tcl_Size offset, Tcl_Size nmatches, int flags)
 }
 declare 377 {
     void Tcl_RegExpGetInfo(Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr)
 }
 declare 378 {
-    Tcl_Obj *Tcl_NewUnicodeObj(const unsigned short *unicode, int numChars)
+    Tcl_Obj *Tcl_NewUnicodeObj(const unsigned short *unicode, Tcl_Size numChars)
 }
 declare 379 {
     void Tcl_SetUnicodeObj(Tcl_Obj *objPtr, const unsigned short *unicode,
-	    int numChars)
+	    Tcl_Size numChars)
 }
 declare 380 {
-    int Tcl_GetCharLength(Tcl_Obj *objPtr)
+    Tcl_Size Tcl_GetCharLength(Tcl_Obj *objPtr)
 }
 declare 381 {
-    int Tcl_GetUniChar(Tcl_Obj *objPtr, int index)
+    int Tcl_GetUniChar(Tcl_Obj *objPtr, Tcl_Size index)
 }
 declare 382 {deprecated {No longer in use, changed to macro}} {
     unsigned short *Tcl_GetUnicode(Tcl_Obj *objPtr)
 }
 declare 383 {
-    Tcl_Obj *Tcl_GetRange(Tcl_Obj *objPtr, int first, int last)
+    Tcl_Obj *Tcl_GetRange(Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last)
 }
 declare 384 {
     void Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr, const unsigned short *unicode,
-	    int length)
+	    Tcl_Size length)
 }
 declare 385 {
     int Tcl_RegExpMatchObj(Tcl_Interp *interp, Tcl_Obj *textObj,
@@ -1381,7 +1381,7 @@ declare 389 {
 }
 declare 390 {
     int Tcl_ProcObjCmd(void *clientData, Tcl_Interp *interp,
-	    int objc, Tcl_Obj *const objv[])
+	    Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 391 {
     void Tcl_ConditionFinalize(Tcl_Condition *condPtr)
@@ -1391,15 +1391,15 @@ declare 392 {
 }
 declare 393 {
     int Tcl_CreateThread(Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc,
-	    void *clientData, int stackSize, int flags)
+	    void *clientData, Tcl_Size stackSize, int flags)
 }
 
 # Introduced in 8.3.2
 declare 394 {
-    int Tcl_ReadRaw(Tcl_Channel chan, char *dst, int bytesToRead)
+    Tcl_Size Tcl_ReadRaw(Tcl_Channel chan, char *dst, Tcl_Size bytesToRead)
 }
 declare 395 {
-    int Tcl_WriteRaw(Tcl_Channel chan, const char *src, int srcLen)
+    Tcl_Size Tcl_WriteRaw(Tcl_Channel chan, const char *src, Tcl_Size srcLen)
 }
 declare 396 {
     Tcl_Channel Tcl_GetTopChannel(Tcl_Channel chan)
@@ -1534,7 +1534,7 @@ declare 431 {
 	    const char *file, int line)
 }
 declare 432 {
-    int Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length)
+    int Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, Tcl_Size length)
 }
 
 # TIP#10 (thread-aware channels) akupries
@@ -1640,7 +1640,7 @@ declare 459 {
     int Tcl_FSConvertToPathType(Tcl_Interp *interp, Tcl_Obj *pathPtr)
 }
 declare 460 {
-    Tcl_Obj *Tcl_FSJoinPath(Tcl_Obj *listObj, int elements)
+    Tcl_Obj *Tcl_FSJoinPath(Tcl_Obj *listObj, Tcl_Size elements)
 }
 declare 461 {
     Tcl_Obj *Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr)
@@ -1652,7 +1652,7 @@ declare 463 {
     Tcl_Obj *Tcl_FSGetNormalizedPath(Tcl_Interp *interp, Tcl_Obj *pathPtr)
 }
 declare 464 {
-    Tcl_Obj *Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc,
+    Tcl_Obj *Tcl_FSJoinToPath(Tcl_Obj *pathPtr, Tcl_Size objc,
 	    Tcl_Obj *const objv[])
 }
 declare 465 {
@@ -1712,7 +1712,7 @@ declare 480 {
 # TIP#56 (evaluate a parsed script) msofer
 declare 481 {
     int Tcl_EvalTokensStandard(Tcl_Interp *interp, Tcl_Token *tokenPtr,
-	    int count)
+	    Tcl_Size count)
 }
 
 # TIP#73 (access to current time) kbk
@@ -1798,11 +1798,11 @@ declare 500 {
 }
 declare 501 {
     int Tcl_DictObjPutKeyList(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-	    int keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr)
+	    Tcl_Size keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr)
 }
 declare 502 {
     int Tcl_DictObjRemoveKeyList(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-	    int keyc, Tcl_Obj *const *keyv)
+	    Tcl_Size keyc, Tcl_Obj *const *keyv)
 }
 declare 503 {
     Tcl_Obj *Tcl_NewDictObj(void)
@@ -1895,7 +1895,7 @@ declare 524 {
     int Tcl_LimitExceeded(Tcl_Interp *interp)
 }
 declare 525 {
-    void Tcl_LimitSetCommands(Tcl_Interp *interp, int commandLimit)
+    void Tcl_LimitSetCommands(Tcl_Interp *interp, Tcl_Size commandLimit)
 }
 declare 526 {
     void Tcl_LimitSetTime(Tcl_Interp *interp, Tcl_Time *timeLimitPtr)
@@ -2084,7 +2084,7 @@ declare 572 {
 # TIP#268 (extended version numbers and requirements) akupries
 declare 573 {
     int Tcl_PkgRequireProc(Tcl_Interp *interp, const char *name,
-	    int objc, Tcl_Obj *const objv[], void *clientDataPtr)
+	    Tcl_Size objc, Tcl_Obj *const objv[], void *clientDataPtr)
 }
 
 # TIP#270 (utility C routines for string formatting) dgp
@@ -2093,15 +2093,15 @@ declare 574 {
 }
 declare 575 {
     void Tcl_AppendLimitedToObj(Tcl_Obj *objPtr, const char *bytes,
-	    int length, int limit, const char *ellipsis)
+	    Tcl_Size length, Tcl_Size limit, const char *ellipsis)
 }
 declare 576 {
-    Tcl_Obj *Tcl_Format(Tcl_Interp *interp, const char *format, int objc,
+    Tcl_Obj *Tcl_Format(Tcl_Interp *interp, const char *format, Tcl_Size objc,
 	    Tcl_Obj *const objv[])
 }
 declare 577 {
     int Tcl_AppendFormatToObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    const char *format, int objc, Tcl_Obj *const objv[])
+	    const char *format, Tcl_Size objc, Tcl_Obj *const objv[])
 }
 declare 578 {
     Tcl_Obj *Tcl_ObjPrintf(const char *format, ...)
@@ -2138,11 +2138,11 @@ declare 584 {
     int Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)
 }
 declare 585 {
-    int Tcl_NREvalObjv(Tcl_Interp *interp, int objc,
+    int Tcl_NREvalObjv(Tcl_Interp *interp, Tcl_Size objc,
 	    Tcl_Obj *const objv[], int flags)
 }
 declare 586 {
-    int Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd, int objc,
+    int Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd, Tcl_Size objc,
 	    Tcl_Obj *const objv[], int flags)
 }
 declare 587 {
@@ -2154,7 +2154,7 @@ declare 587 {
 # classic objProc
 declare 588 {
     int Tcl_NRCallObjProc(Tcl_Interp *interp, Tcl_ObjCmdProc *objProc,
-	    void *clientData, int objc, Tcl_Obj *const objv[])
+	    void *clientData, Tcl_Size objc, Tcl_Obj *const objv[])
 }
 
 # TIP#316 (Tcl_StatBuf reader functions) dkf
@@ -2245,15 +2245,15 @@ declare 610 {
 }
 declare 611 {
     int Tcl_ZlibInflate(Tcl_Interp *interp, int format, Tcl_Obj *data,
-	    int buffersize, Tcl_Obj *gzipHeaderDictObj)
+	    Tcl_Size buffersize, Tcl_Obj *gzipHeaderDictObj)
 }
 declare 612 {
     unsigned int Tcl_ZlibCRC32(unsigned int crc, const unsigned char *buf,
-	    int len)
+	    Tcl_Size len)
 }
 declare 613 {
     unsigned int Tcl_ZlibAdler32(unsigned int adler, const unsigned char *buf,
-	    int len)
+	    Tcl_Size len)
 }
 declare 614 {
     int Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode, int format,
@@ -2273,7 +2273,7 @@ declare 618 {
 }
 declare 619 {
     int Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle, Tcl_Obj *data,
-	    int count)
+	    Tcl_Size count)
 }
 declare 620 {
     int Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle)
@@ -2385,12 +2385,12 @@ declare 643 {
 # TIP#312 New Tcl_LinkArray() function
 declare 644 {
     int Tcl_LinkArray(Tcl_Interp *interp, const char *varName, void *addr,
-	    int type, int size)
+	    int type, Tcl_Size size)
 }
 
 declare 645 {
     int Tcl_GetIntForIndex(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    int endValue, int *indexPtr)
+	    Tcl_Size endValue, Tcl_Size *indexPtr)
 }
 
 # TIP #548
@@ -2399,11 +2399,11 @@ declare 646 {
 }
 declare 647 {
     char *Tcl_UniCharToUtfDString(const int *uniStr,
-	    int uniLength, Tcl_DString *dsPtr)
+	    Tcl_Size uniLength, Tcl_DString *dsPtr)
 }
 declare 648 {
     int *Tcl_UtfToUniCharDString(const char *src,
-	    int length, Tcl_DString *dsPtr)
+	    Tcl_Size length, Tcl_DString *dsPtr)
 }
 
 # TIP #568
@@ -2430,7 +2430,7 @@ declare 653 {
 
 # TIP #575
 declare 654 {
-    int Tcl_UtfCharComplete(const char *src, int length)
+    int Tcl_UtfCharComplete(const char *src, Tcl_Size length)
 }
 declare 655 {
     const char *Tcl_UtfNext(const char *src)
@@ -2442,12 +2442,12 @@ declare 657 {
     int Tcl_UniCharIsUnicode(int ch)
 }
 declare 658 {
-    int Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
-	    const char *src, int srcLen, int flags, Tcl_DString *dsPtr)
+    Tcl_Size Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
+	    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr)
 }
 declare 659 {
-    int Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
-	    const char *src, int srcLen, int flags, Tcl_DString *dsPtr)
+    Tcl_Size Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
+	    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr)
 }
 
 # TIP #511
@@ -2484,22 +2484,22 @@ declare 667 {
 
 # TIP #617
 declare 668 {
-    int Tcl_UniCharLen(const int *uniStr)
+    Tcl_Size Tcl_UniCharLen(const int *uniStr)
 }
 declare 669 {
-    int TclNumUtfChars(const char *src, int length)
+    Tcl_Size TclNumUtfChars(const char *src, Tcl_Size length)
 }
 declare 670 {
-    int TclGetCharLength(Tcl_Obj *objPtr)
+    Tcl_Size TclGetCharLength(Tcl_Obj *objPtr)
 }
 declare 671 {
-    const char *TclUtfAtIndex(const char *src, int index)
+    const char *TclUtfAtIndex(const char *src, Tcl_Size index)
 }
 declare 672 {
-    Tcl_Obj *TclGetRange(Tcl_Obj *objPtr, int first, int last)
+    Tcl_Obj *TclGetRange(Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last)
 }
 declare 673 {
-    int TclGetUniChar(Tcl_Obj *objPtr, int index)
+    int TclGetUniChar(Tcl_Obj *objPtr, Tcl_Size index)
 }
 
 declare 674 {
@@ -2586,7 +2586,7 @@ declare 0 macosx {
 declare 1 macosx {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, const char *bundleVersion,
-	    int hasResourceFile, int maxPathLen, char *libraryPath)
+	    int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath)
 }
 declare 2 macosx {
     void Tcl_MacOSXNotifierAddRunLoopMode(const void *runLoopMode)
@@ -2600,7 +2600,7 @@ export {
     void Tcl_Main(int argc, char **argv, Tcl_AppInitProc *appInitProc)
 }
 export {
-    void Tcl_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc,
+    void Tcl_MainEx(Tcl_Size argc, char **argv, Tcl_AppInitProc *appInitProc,
     Tcl_Interp *interp)
 }
 export {
diff --git a/generic/tcl.h b/generic/tcl.h
index 849278b..3560481 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -48,10 +48,10 @@ extern "C" {
  */
 
 #if !defined(TCL_MAJOR_VERSION)
-#define TCL_MAJOR_VERSION   8
+#   define TCL_MAJOR_VERSION   8
 #endif
 #if TCL_MAJOR_VERSION != 8
-#error "This header-file is for Tcl 8 only"
+#   error "This header-file is for Tcl 8 only"
 #endif
 #define TCL_MINOR_VERSION   7
 #define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
@@ -156,13 +156,8 @@ extern "C" {
 #   endif
 #else
 #   define TCL_FORMAT_PRINTF(a,b)
-#   if defined(_MSC_VER) && (_MSC_VER >= 1310)
-#	define TCL_NORETURN _declspec(noreturn)
-#	define TCL_NOINLINE __declspec(noinline)
-#   else
-#	define TCL_NORETURN /* nothing */
-#	define TCL_NOINLINE /* nothing */
-#   endif
+#   define TCL_NORETURN _declspec(noreturn)
+#   define TCL_NOINLINE __declspec(noinline)
 #   define TCL_NORETURN1 /* nothing */
 #endif
 
@@ -410,11 +405,11 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #ifdef _WIN32
 #   if defined(_WIN64) || defined(_USE_64BIT_TIME_T)
 	typedef struct __stat64 Tcl_StatBuf;
-#   elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIME_T)
+#   elif defined(_USE_32BIT_TIME_T)
 	typedef struct _stati64	Tcl_StatBuf;
 #   else
 	typedef struct _stat32i64 Tcl_StatBuf;
-#   endif /* _MSC_VER < 1400 */
+#   endif
 #elif defined(__CYGWIN__)
     typedef struct {
 	dev_t st_dev;
@@ -499,9 +494,9 @@ typedef struct Tcl_ZLibStream_ *Tcl_ZlibStream;
  */
 
 #if defined _WIN32
-typedef unsigned (__stdcall Tcl_ThreadCreateProc) (ClientData clientData);
+typedef unsigned (__stdcall Tcl_ThreadCreateProc) (void *clientData);
 #else
-typedef void (Tcl_ThreadCreateProc) (ClientData clientData);
+typedef void (Tcl_ThreadCreateProc) (void *clientData);
 #endif
 
 /*
@@ -665,67 +660,67 @@ struct Tcl_Obj;
  */
 
 typedef int (Tcl_AppInitProc) (Tcl_Interp *interp);
-typedef int (Tcl_AsyncProc) (ClientData clientData, Tcl_Interp *interp,
+typedef int (Tcl_AsyncProc) (void *clientData, Tcl_Interp *interp,
 	int code);
-typedef void (Tcl_ChannelProc) (ClientData clientData, int mask);
-typedef void (Tcl_CloseProc) (ClientData data);
-typedef void (Tcl_CmdDeleteProc) (ClientData clientData);
-typedef int (Tcl_CmdProc) (ClientData clientData, Tcl_Interp *interp,
+typedef void (Tcl_ChannelProc) (void *clientData, int mask);
+typedef void (Tcl_CloseProc) (void *data);
+typedef void (Tcl_CmdDeleteProc) (void *clientData);
+typedef int (Tcl_CmdProc) (void *clientData, Tcl_Interp *interp,
 	int argc, const char *argv[]);
-typedef void (Tcl_CmdTraceProc) (ClientData clientData, Tcl_Interp *interp,
+typedef void (Tcl_CmdTraceProc) (void *clientData, Tcl_Interp *interp,
 	int level, char *command, Tcl_CmdProc *proc,
-	ClientData cmdClientData, int argc, const char *argv[]);
-typedef int (Tcl_CmdObjTraceProc) (ClientData clientData, Tcl_Interp *interp,
+	void *cmdClientData, int argc, const char *argv[]);
+typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp,
 	int level, const char *command, Tcl_Command commandInfo, int objc,
 	struct Tcl_Obj *const *objv);
 typedef int (Tcl_CmdObjTraceProc2) (void *clientData, Tcl_Interp *interp,
 	int level, const char *command, Tcl_Command commandInfo, size_t objc,
 	struct Tcl_Obj *const *objv);
-typedef void (Tcl_CmdObjTraceDeleteProc) (ClientData clientData);
+typedef void (Tcl_CmdObjTraceDeleteProc) (void *clientData);
 typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
 	struct Tcl_Obj *dupPtr);
-typedef int (Tcl_EncodingConvertProc) (ClientData clientData, const char *src,
+typedef int (Tcl_EncodingConvertProc) (void *clientData, const char *src,
 	int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst,
 	int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
-typedef void (Tcl_EncodingFreeProc) (ClientData clientData);
+typedef void (Tcl_EncodingFreeProc) (void *clientData);
 typedef int (Tcl_EventProc) (Tcl_Event *evPtr, int flags);
-typedef void (Tcl_EventCheckProc) (ClientData clientData, int flags);
-typedef int (Tcl_EventDeleteProc) (Tcl_Event *evPtr, ClientData clientData);
-typedef void (Tcl_EventSetupProc) (ClientData clientData, int flags);
-typedef void (Tcl_ExitProc) (ClientData clientData);
-typedef void (Tcl_FileProc) (ClientData clientData, int mask);
-typedef void (Tcl_FileFreeProc) (ClientData clientData);
+typedef void (Tcl_EventCheckProc) (void *clientData, int flags);
+typedef int (Tcl_EventDeleteProc) (Tcl_Event *evPtr, void *clientData);
+typedef void (Tcl_EventSetupProc) (void *clientData, int flags);
+typedef void (Tcl_ExitProc) (void *clientData);
+typedef void (Tcl_FileProc) (void *clientData, int mask);
+typedef void (Tcl_FileFreeProc) (void *clientData);
 typedef void (Tcl_FreeInternalRepProc) (struct Tcl_Obj *objPtr);
 typedef void (Tcl_FreeProc) (char *blockPtr);
-typedef void (Tcl_IdleProc) (ClientData clientData);
-typedef void (Tcl_InterpDeleteProc) (ClientData clientData,
+typedef void (Tcl_IdleProc) (void *clientData);
+typedef void (Tcl_InterpDeleteProc) (void *clientData,
 	Tcl_Interp *interp);
-typedef int (Tcl_MathProc) (ClientData clientData, Tcl_Interp *interp,
+typedef int (Tcl_MathProc) (void *clientData, Tcl_Interp *interp,
 	Tcl_Value *args, Tcl_Value *resultPtr);
-typedef void (Tcl_NamespaceDeleteProc) (ClientData clientData);
-typedef int (Tcl_ObjCmdProc) (ClientData clientData, Tcl_Interp *interp,
+typedef void (Tcl_NamespaceDeleteProc) (void *clientData);
+typedef int (Tcl_ObjCmdProc) (void *clientData, Tcl_Interp *interp,
 	int objc, struct Tcl_Obj *const *objv);
 typedef int (Tcl_ObjCmdProc2) (void *clientData, Tcl_Interp *interp,
 	size_t objc, struct Tcl_Obj *const *objv);
 typedef int (Tcl_LibraryInitProc) (Tcl_Interp *interp);
 typedef int (Tcl_LibraryUnloadProc) (Tcl_Interp *interp, int flags);
 typedef void (Tcl_PanicProc) (const char *format, ...);
-typedef void (Tcl_TcpAcceptProc) (ClientData callbackData, Tcl_Channel chan,
+typedef void (Tcl_TcpAcceptProc) (void *callbackData, Tcl_Channel chan,
 	char *address, int port);
-typedef void (Tcl_TimerProc) (ClientData clientData);
+typedef void (Tcl_TimerProc) (void *clientData);
 typedef int (Tcl_SetFromAnyProc) (Tcl_Interp *interp, struct Tcl_Obj *objPtr);
 typedef void (Tcl_UpdateStringProc) (struct Tcl_Obj *objPtr);
-typedef char * (Tcl_VarTraceProc) (ClientData clientData, Tcl_Interp *interp,
+typedef char * (Tcl_VarTraceProc) (void *clientData, Tcl_Interp *interp,
 	const char *part1, const char *part2, int flags);
-typedef void (Tcl_CommandTraceProc) (ClientData clientData, Tcl_Interp *interp,
+typedef void (Tcl_CommandTraceProc) (void *clientData, Tcl_Interp *interp,
 	const char *oldName, const char *newName, int flags);
 typedef void (Tcl_CreateFileHandlerProc) (int fd, int mask, Tcl_FileProc *proc,
-	ClientData clientData);
+	void *clientData);
 typedef void (Tcl_DeleteFileHandlerProc) (int fd);
-typedef void (Tcl_AlertNotifierProc) (ClientData clientData);
+typedef void (Tcl_AlertNotifierProc) (void *clientData);
 typedef void (Tcl_ServiceModeHookProc) (int mode);
-typedef ClientData (Tcl_InitNotifierProc) (void);
-typedef void (Tcl_FinalizeNotifierProc) (ClientData clientData);
+typedef void *(Tcl_InitNotifierProc) (void);
+typedef void (Tcl_FinalizeNotifierProc) (void *clientData);
 typedef void (Tcl_MainLoopProc) (void);
 
 #ifndef TCL_NO_DEPRECATED
@@ -786,9 +781,11 @@ typedef union Tcl_ObjInternalRep {	/* The internal representation: */
  * An object stores a value as either a string, some internal representation,
  * or both.
  */
+#define Tcl_Size int
+
 
 typedef struct Tcl_Obj {
-    int refCount;		/* When 0 the object will be freed. */
+    Tcl_Size refCount;		/* When 0 the object will be freed. */
     char *bytes;		/* This points to the first byte of the
 				 * object's string representation. The array
 				 * must be followed by a null byte (i.e., at
@@ -800,7 +797,7 @@ typedef struct Tcl_Obj {
 				 * should use Tcl_GetStringFromObj or
 				 * Tcl_GetString to get a pointer to the byte
 				 * array as a readonly value. */
-    int length;			/* The number of bytes at *bytes, not
+    Tcl_Size length;			/* The number of bytes at *bytes, not
 				 * including the terminating null. */
     const Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
 				 * corresponds to the type of the object's
@@ -843,7 +840,7 @@ typedef struct Tcl_Namespace {
 				 * is an synonym. */
     char *fullName;		/* The namespace's fully qualified name. This
 				 * starts with ::. */
-    ClientData clientData;	/* Arbitrary value associated with this
+    void *clientData;	/* Arbitrary value associated with this
 				 * namespace. */
     Tcl_NamespaceDeleteProc *deleteProc;
 				/* Function invoked when deleting the
@@ -880,14 +877,14 @@ typedef struct Tcl_Namespace {
 typedef struct Tcl_CallFrame {
     Tcl_Namespace *nsPtr;
     int dummy1;
-    int dummy2;
+    Tcl_Size dummy2;
     void *dummy3;
     void *dummy4;
     void *dummy5;
-    int dummy6;
+    Tcl_Size dummy6;
     void *dummy7;
     void *dummy8;
-    int dummy9;
+    Tcl_Size dummy9;
     void *dummy10;
     void *dummy11;
     void *dummy12;
@@ -943,9 +940,9 @@ typedef struct Tcl_CmdInfo {
 typedef struct Tcl_DString {
     char *string;		/* Points to beginning of string: either
 				 * staticSpace below or a malloced array. */
-    int length;			/* Number of non-NULL characters in the
+    Tcl_Size length;		/* Number of non-NULL characters in the
 				 * string. */
-    int spaceAvl;		/* Total number of bytes available for the
+    Tcl_Size spaceAvl;		/* Total number of bytes available for the
 				 * string and its terminating NULL char. */
     char staticSpace[TCL_DSTRING_STATIC_SIZE];
 				/* Space to use in common case where string is
@@ -1175,7 +1172,7 @@ struct Tcl_HashEntry {
     void *hash;			/* Hash value, stored as pointer to ensure
 				 * that the offsets of the fields in this
 				 * structure are not changed. */
-    ClientData clientData;	/* Application stores something here with
+    void *clientData;	/* Application stores something here with
 				 * Tcl_SetHashValue. */
     union {			/* Key has one of these forms: */
 	char *oneWordValue;	/* One-word value for key. */
@@ -1263,11 +1260,11 @@ struct Tcl_HashTable {
     Tcl_HashEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
 				/* Bucket array used for small tables (to
 				 * avoid mallocs and frees). */
-    int numBuckets;		/* Total number of buckets allocated at
+    Tcl_Size numBuckets;		/* Total number of buckets allocated at
 				 * **bucketPtr. */
-    int numEntries;		/* Total number of entries present in
+    Tcl_Size numEntries;		/* Total number of entries present in
 				 * table. */
-    int rebuildSize;		/* Enlarge table when numEntries gets to be
+    Tcl_Size rebuildSize;		/* Enlarge table when numEntries gets to be
 				 * this large. */
     int downShift;		/* Shift count used in hashing function.
 				 * Designed to use high-order bits of
@@ -1293,7 +1290,7 @@ struct Tcl_HashTable {
 
 typedef struct Tcl_HashSearch {
     Tcl_HashTable *tablePtr;	/* Table being searched. */
-    int nextIndex;		/* Index of next bucket to be enumerated after
+    Tcl_Size nextIndex;		/* Index of next bucket to be enumerated after
 				 * present one. */
     Tcl_HashEntry *nextEntryPtr;/* Next entry to be enumerated in the current
 				 * bucket. */
@@ -1401,8 +1398,8 @@ typedef int (Tcl_WaitForEventProc) (CONST86 Tcl_Time *timePtr);
  * TIP #233 (Virtualized Time)
  */
 
-typedef void (Tcl_GetTimeProc)   (Tcl_Time *timebuf, ClientData clientData);
-typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, ClientData clientData);
+typedef void (Tcl_GetTimeProc)   (Tcl_Time *timebuf, void *clientData);
+typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, void *clientData);
 
 /*
  *----------------------------------------------------------------------------
@@ -1463,35 +1460,35 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, ClientData clientData);
  * Typedefs for the various operations in a channel type:
  */
 
-typedef int	(Tcl_DriverBlockModeProc) (ClientData instanceData, int mode);
-typedef int	(Tcl_DriverCloseProc) (ClientData instanceData,
+typedef int	(Tcl_DriverBlockModeProc) (void *instanceData, int mode);
+typedef int	(Tcl_DriverCloseProc) (void *instanceData,
 			Tcl_Interp *interp);
-typedef int	(Tcl_DriverClose2Proc) (ClientData instanceData,
+typedef int	(Tcl_DriverClose2Proc) (void *instanceData,
 			Tcl_Interp *interp, int flags);
-typedef int	(Tcl_DriverInputProc) (ClientData instanceData, char *buf,
+typedef int	(Tcl_DriverInputProc) (void *instanceData, char *buf,
 			int toRead, int *errorCodePtr);
-typedef int	(Tcl_DriverOutputProc) (ClientData instanceData,
+typedef int	(Tcl_DriverOutputProc) (void *instanceData,
 			const char *buf, int toWrite, int *errorCodePtr);
-typedef int	(Tcl_DriverSeekProc) (ClientData instanceData, long offset,
+typedef int	(Tcl_DriverSeekProc) (void *instanceData, long offset,
 			int mode, int *errorCodePtr);
-typedef int	(Tcl_DriverSetOptionProc) (ClientData instanceData,
+typedef int	(Tcl_DriverSetOptionProc) (void *instanceData,
 			Tcl_Interp *interp, const char *optionName,
 			const char *value);
-typedef int	(Tcl_DriverGetOptionProc) (ClientData instanceData,
+typedef int	(Tcl_DriverGetOptionProc) (void *instanceData,
 			Tcl_Interp *interp, const char *optionName,
 			Tcl_DString *dsPtr);
-typedef void	(Tcl_DriverWatchProc) (ClientData instanceData, int mask);
-typedef int	(Tcl_DriverGetHandleProc) (ClientData instanceData,
-			int direction, ClientData *handlePtr);
-typedef int	(Tcl_DriverFlushProc) (ClientData instanceData);
-typedef int	(Tcl_DriverHandlerProc) (ClientData instanceData,
+typedef void	(Tcl_DriverWatchProc) (void *instanceData, int mask);
+typedef int	(Tcl_DriverGetHandleProc) (void *instanceData,
+			int direction, void **handlePtr);
+typedef int	(Tcl_DriverFlushProc) (void *instanceData);
+typedef int	(Tcl_DriverHandlerProc) (void *instanceData,
 			int interestMask);
-typedef long long (Tcl_DriverWideSeekProc) (ClientData instanceData,
+typedef long long (Tcl_DriverWideSeekProc) (void *instanceData,
 			long long offset, int mode, int *errorCodePtr);
 /*
  * TIP #218, Channel Thread Actions
  */
-typedef void	(Tcl_DriverThreadActionProc) (ClientData instanceData,
+typedef void	(Tcl_DriverThreadActionProc) (void *instanceData,
 			int action);
 /*
  * TIP #208, File Truncation (etc.)
@@ -1678,13 +1675,13 @@ typedef Tcl_Obj * (Tcl_FSLinkProc) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
 typedef int (Tcl_FSLoadFileProc) (Tcl_Interp *interp, Tcl_Obj *pathPtr,
 	Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr);
 typedef int (Tcl_FSPathInFilesystemProc) (Tcl_Obj *pathPtr,
-	ClientData *clientDataPtr);
+	void **clientDataPtr);
 typedef Tcl_Obj * (Tcl_FSFilesystemPathTypeProc) (Tcl_Obj *pathPtr);
 typedef Tcl_Obj * (Tcl_FSFilesystemSeparatorProc) (Tcl_Obj *pathPtr);
-typedef void (Tcl_FSFreeInternalRepProc) (ClientData clientData);
-typedef ClientData (Tcl_FSDupInternalRepProc) (ClientData clientData);
-typedef Tcl_Obj * (Tcl_FSInternalToNormalizedProc) (ClientData clientData);
-typedef ClientData (Tcl_FSCreateInternalRepProc) (Tcl_Obj *pathPtr);
+typedef void (Tcl_FSFreeInternalRepProc) (void *clientData);
+typedef void *(Tcl_FSDupInternalRepProc) (void *clientData);
+typedef Tcl_Obj * (Tcl_FSInternalToNormalizedProc) (void *clientData);
+typedef void *(Tcl_FSCreateInternalRepProc) (Tcl_Obj *pathPtr);
 
 typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
 
@@ -1714,7 +1711,7 @@ typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
 
 typedef struct Tcl_Filesystem {
     const char *typeName;	/* The name of the filesystem. */
-    int structureLength;	/* Length of this structure, so future binary
+    Tcl_Size structureLength;	/* Length of this structure, so future binary
 				 * compatibility can be assured. */
     Tcl_FSVersion version;	/* Version of the filesystem type. */
     Tcl_FSPathInFilesystemProc *pathInFilesystemProc;
@@ -1876,8 +1873,8 @@ typedef struct Tcl_Token {
     int type;			/* Type of token, such as TCL_TOKEN_WORD; see
 				 * below for valid types. */
     const char *start;		/* First character in token. */
-    int size;			/* Number of bytes in token. */
-    int numComponents;		/* If this token is composed of other tokens,
+    Tcl_Size size;			/* Number of bytes in token. */
+    Tcl_Size numComponents;		/* If this token is composed of other tokens,
 				 * this field tells how many of them there are
 				 * (including components of components, etc.).
 				 * The component tokens immediately follow
@@ -1991,25 +1988,25 @@ typedef struct Tcl_Token {
 typedef struct Tcl_Parse {
     const char *commentStart;	/* Pointer to # that begins the first of one
 				 * or more comments preceding the command. */
-    int commentSize;		/* Number of bytes in comments (up through
+    Tcl_Size commentSize;		/* Number of bytes in comments (up through
 				 * newline character that terminates the last
 				 * comment). If there were no comments, this
 				 * field is 0. */
     const char *commandStart;	/* First character in first word of
 				 * command. */
-    int commandSize;		/* Number of bytes in command, including first
+    Tcl_Size commandSize;		/* Number of bytes in command, including first
 				 * character of first word, up through the
 				 * terminating newline, close bracket, or
 				 * semicolon. */
-    int numWords;		/* Total number of words in command. May be
+    Tcl_Size numWords;		/* Total number of words in command. May be
 				 * 0. */
     Tcl_Token *tokenPtr;	/* Pointer to first token representing the
 				 * words of the command. Initially points to
 				 * staticTokens, but may change to point to
 				 * malloc-ed space if command exceeds space in
 				 * staticTokens. */
-    int numTokens;		/* Total number of tokens in command. */
-    int tokensAvailable;	/* Total number of tokens available at
+    Tcl_Size numTokens;		/* Total number of tokens in command. */
+    Tcl_Size tokensAvailable;	/* Total number of tokens available at
 				 * *tokenPtr. */
     int errorType;		/* One of the parsing error types defined
 				 * above. */
@@ -2062,7 +2059,7 @@ typedef struct Tcl_EncodingType {
     Tcl_EncodingFreeProc *freeProc;
 				/* If non-NULL, function to call when this
 				 * encoding is deleted. */
-    ClientData clientData;	/* Arbitrary value associated with encoding
+    void *clientData;	/* Arbitrary value associated with encoding
 				 * type. Passed to conversion functions. */
     int nullSize;		/* Number of zero bytes that signify
 				 * end-of-string in this encoding. This number
@@ -2229,8 +2226,8 @@ typedef struct Tcl_Config {
  * command- or time-limit is exceeded by an interpreter.
  */
 
-typedef void (Tcl_LimitHandlerProc) (ClientData clientData, Tcl_Interp *interp);
-typedef void (Tcl_LimitHandlerDeleteProc) (ClientData clientData);
+typedef void (Tcl_LimitHandlerProc) (void *clientData, Tcl_Interp *interp);
+typedef void (Tcl_LimitHandlerDeleteProc) (void *clientData);
 
 #if 0
 /*
@@ -2268,7 +2265,7 @@ typedef struct {
 				 * depends on type.*/
     const char *helpStr;	/* Documentation message describing this
 				 * option. */
-    ClientData clientData;	/* Word to pass to function callbacks. */
+    void *clientData;	/* Word to pass to function callbacks. */
 } Tcl_ArgvInfo;
 
 /*
@@ -2291,9 +2288,9 @@ typedef struct {
  * argument types:
  */
 
-typedef int (Tcl_ArgvFuncProc)(ClientData clientData, Tcl_Obj *objPtr,
+typedef int (Tcl_ArgvFuncProc)(void *clientData, Tcl_Obj *objPtr,
 	void *dstPtr);
-typedef int (Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
+typedef int (Tcl_ArgvGenFuncProc)(void *clientData, Tcl_Interp *interp,
 	int objc, Tcl_Obj *const *objv, void *dstPtr);
 
 /*
@@ -2366,19 +2363,19 @@ typedef int (Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
 #define TCL_TCPSERVER_REUSEPORT (1<<1)
 
 /*
- * Constants for special int-typed values, see TIP #494
+ * Constants for special Tcl_Size-typed values, see TIP #494
  */
 
-#define TCL_IO_FAILURE	(-1)
-#define TCL_AUTO_LENGTH	(-1)
-#define TCL_INDEX_NONE	(-1)
+#define TCL_IO_FAILURE	((Tcl_Size)-1)
+#define TCL_AUTO_LENGTH	((Tcl_Size)-1)
+#define TCL_INDEX_NONE  ((Tcl_Size)-1)
 
 /*
  *----------------------------------------------------------------------------
  * Single public declaration for NRE.
  */
 
-typedef int (Tcl_NRPostProc) (ClientData data[], Tcl_Interp *interp,
+typedef int (Tcl_NRPostProc) (void *data[], Tcl_Interp *interp,
 				int result);
 
 /*
@@ -2437,7 +2434,7 @@ const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
 
 #define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
 	    ((Tcl_SetPanicProc(Tcl_ConsolePanic), Tcl_CreateInterp)()))
-EXTERN void		Tcl_MainEx(int argc, char **argv,
+EXTERN void		Tcl_MainEx(Tcl_Size argc, char **argv,
 			    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
 			    const char *version, int exact);
diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index b6f33a8..c3c44f3 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -820,7 +820,7 @@ TclArithSeriesGetElements(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
     Tcl_Obj *objPtr,		/* AbstractList object for which an element
 				 * array is to be returned. */
-    ListSizeT *objcPtr,		/* Where to store the count of objects
+    Tcl_Size *objcPtr,		/* Where to store the count of objects
 				 * referenced by objv. */
     Tcl_Obj ***objvPtr)		/* Where to store the pointer to an array of
 				 * pointers to the list's objects. */
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index b3f1c78..7e062f0 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -87,22 +87,22 @@ 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
+    Tcl_Size nestingLevel;		/* Static depth of the exception range. Used
 				 * to find the most deeply-nested range
 				 * surrounding a PC at runtime. */
-    int codeOffset;		/* Offset of the first instruction byte of the
+    Tcl_Size codeOffset;		/* Offset of the first instruction byte of the
 				 * code range. */
-    int numCodeBytes;		/* Number of bytes in the code range. */
-    int breakOffset;		/* If LOOP_EXCEPTION_RANGE, the target PC
+    Tcl_Size numCodeBytes;		/* Number of bytes in the code range. */
+    Tcl_Size breakOffset;		/* If LOOP_EXCEPTION_RANGE, the target PC
 				 * offset for a break command in the range. */
-    int continueOffset;		/* If LOOP_EXCEPTION_RANGE and not TCL_INDEX_NONE, the
+    Tcl_Size continueOffset;		/* If LOOP_EXCEPTION_RANGE and not TCL_INDEX_NONE, the
 				 * target PC offset for a continue command in
 				 * the code range. Otherwise, ignore this
 				 * range when processing a continue
 				 * command. */
-    int catchOffset;		/* If a CATCH_EXCEPTION_RANGE, the target PC
+    Tcl_Size catchOffset;		/* If a CATCH_EXCEPTION_RANGE, the target PC
 				 * offset for any "exception" in range. */
 } ExceptionRange;
 
@@ -118,21 +118,21 @@ typedef struct ExceptionAux {
 				 * one (see [for] next-clause) then we must
 				 * not pick up the range when scanning for a
 				 * target to continue to. */
-    int stackDepth;		/* The stack depth at the point where the
+    Tcl_Size stackDepth;		/* The stack depth at the point where the
 				 * exception range was created. This is used
 				 * to calculate the number of POPs required to
 				 * restore the stack to its prior state. */
-    int expandTarget;		/* The number of expansions expected on the
+    Tcl_Size expandTarget;		/* The number of expansions expected on the
 				 * auxData stack at the time the loop starts;
 				 * we can't currently discard them except by
 				 * doing INST_INVOKE_EXPANDED; this is a known
 				 * problem. */
-    int expandTargetDepth;	/* The stack depth expected at the outermost
+    Tcl_Size expandTargetDepth;	/* The stack depth expected at the outermost
 				 * expansion within the loop. Not meaningful
 				 * if there are no open expansions between the
 				 * looping level and the point of jump
 				 * issue. */
-    int numBreakTargets;	/* The number of [break]s that want to be
+    Tcl_Size numBreakTargets;	/* The number of [break]s that want to be
 				 * targeted to the place where this loop
 				 * exception will be bound to. */
     TCL_HASH_TYPE *breakTargets;	/* The offsets of the INST_JUMP4 instructions
@@ -141,8 +141,8 @@ typedef struct ExceptionAux {
 				 * TclFixupForwardJump) can cause the contents
 				 * of this array to be updated. When
 				 * numBreakTargets==0, this is NULL. */
-    int allocBreakTargets;	/* The size of the breakTargets array. */
-    int numContinueTargets;	/* The number of [continue]s that want to be
+    Tcl_Size allocBreakTargets;	/* The size of the breakTargets array. */
+    Tcl_Size numContinueTargets;	/* The number of [continue]s that want to be
 				 * targeted to the place where this loop
 				 * exception will be bound to. */
     TCL_HASH_TYPE *continueTargets; /* The offsets of the INST_JUMP4 instructions
@@ -151,7 +151,7 @@ typedef struct ExceptionAux {
 				 * TclFixupForwardJump) can cause the contents
 				 * of this array to be updated. When
 				 * numContinueTargets==0, this is NULL. */
-    int allocContinueTargets;	/* The size of the continueTargets array. */
+    Tcl_Size allocContinueTargets;	/* The size of the continueTargets array. */
 } ExceptionAux;
 
 /*
@@ -162,11 +162,11 @@ typedef struct ExceptionAux {
  * source offset is not monotonic.
  */
 
-typedef struct CmdLocation {
-    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. */
-    int numSrcBytes;		/* Number of command source chars. */
+typedef struct {
+    Tcl_Size codeOffset;		/* Offset of first byte of command code. */
+    Tcl_Size numCodeBytes;		/* Number of bytes for command's code. */
+    Tcl_Size srcOffset;		/* Offset of first char of the command. */
+    Tcl_Size numSrcBytes;		/* Number of command source chars. */
 } CmdLocation;
 
 /*
@@ -180,9 +180,9 @@ typedef struct CmdLocation {
  * frame and associated information, like the path of a sourced file.
  */
 
-typedef struct ECL {
-    int srcOffset;		/* Command location to find the entry. */
-    int nline;			/* Number of words in the command */
+typedef struct {
+    Tcl_Size srcOffset;		/* Command location to find the entry. */
+    Tcl_Size nline;			/* Number of words in the command */
     int *line;			/* Line information for all words in the
 				 * command. */
     int **next;			/* Transient information used by the compiler
@@ -190,7 +190,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
@@ -198,8 +198,8 @@ typedef struct ExtCmdLoc {
     Tcl_Obj *path;		/* Path of the sourced file the command is
 				 * in. */
     ECL *loc;			/* Command word locations (lines). */
-    int nloc;			/* Number of allocated entries in 'loc'. */
-    int nuloc;			/* Number of used entries in 'loc'. */
+    Tcl_Size nloc;			/* Number of allocated entries in 'loc'. */
+    Tcl_Size nuloc;			/* Number of used entries in 'loc'. */
 } ExtCmdLoc;
 
 /*
@@ -290,21 +290,21 @@ typedef struct CompileEnv {
 				 * SetByteCodeFromAny. This pointer is not
 				 * owned by the CompileEnv and must not be
 				 * freed or changed by it. */
-    int numSrcBytes;		/* Number of bytes in source. */
+    Tcl_Size numSrcBytes;		/* Number of bytes in source. */
     Proc *procPtr;		/* If a procedure is being compiled, a pointer
 				 * to its Proc structure; otherwise NULL. Used
 				 * to compile local variables. Set from
 				 * information provided by ObjInterpProc in
 				 * tclProc.c. */
-    int numCommands;		/* Number of commands compiled. */
-    int exceptDepth;		/* Current exception range nesting level; TCL_INDEX_NONE
+    Tcl_Size numCommands;		/* Number of commands compiled. */
+    Tcl_Size exceptDepth;		/* Current exception range nesting level; TCL_INDEX_NONE
 				 * if not in any range currently. */
-    int maxExceptDepth;		/* Max nesting level of exception ranges; TCL_INDEX_NONE
+    Tcl_Size maxExceptDepth;		/* Max nesting level of exception ranges; TCL_INDEX_NONE
 				 * if no ranges have been compiled. */
-    int maxStackDepth;		/* Maximum number of stack elements needed to
+    Tcl_Size maxStackDepth;		/* Maximum number of stack elements needed to
 				 * execute the code. Set by compilation
 				 * procedures before returning. */
-    int currStackDepth;		/* Current stack depth. */
+    Tcl_Size currStackDepth;		/* Current stack depth. */
     LiteralTable localLitTable;	/* Contains LiteralEntry's describing all Tcl
 				 * objects referenced by this compiled code.
 				 * Indexed by the string representations of
@@ -318,18 +318,18 @@ typedef struct CompileEnv {
 				 * codeStart points into the heap.*/
     LiteralEntry *literalArrayPtr;
     				/* Points to start of LiteralEntry array. */
-    int literalArrayNext;	/* Index of next free object array entry. */
-    int literalArrayEnd;	/* Index just after last obj array entry. */
+    Tcl_Size literalArrayNext;	/* Index of next free object array entry. */
+    Tcl_Size literalArrayEnd;	/* Index just after last obj array entry. */
     int mallocedLiteralArray;	/* 1 if object array was expanded and objArray
 				 * points into the heap, else 0. */
     ExceptionRange *exceptArrayPtr;
     				/* Points to start of the ExceptionRange
 				 * array. */
-    int exceptArrayNext;	/* Next free ExceptionRange array index.
+    Tcl_Size exceptArrayNext;	/* Next free ExceptionRange array index.
 				 * exceptArrayNext is the number of ranges and
 				 * (exceptArrayNext-1) is the index of the
 				 * current range's array entry. */
-    int exceptArrayEnd;		/* Index after the last ExceptionRange array
+    Tcl_Size exceptArrayEnd;		/* Index after the last ExceptionRange array
 				 * entry. */
     int mallocedExceptArray;	/* 1 if ExceptionRange array was expanded and
 				 * exceptArrayPtr points in heap, else 0. */
@@ -342,15 +342,15 @@ typedef struct CompileEnv {
 				 * numCommands is the index of the next entry
 				 * to use; (numCommands-1) is the entry index
 				 * for the last command. */
-    int cmdMapEnd;		/* Index after last CmdLocation entry. */
+    Tcl_Size cmdMapEnd;		/* Index after last CmdLocation entry. */
     int mallocedCmdMap;		/* 1 if command map array was expanded and
 				 * cmdMapPtr points in the heap, else 0. */
     AuxData *auxDataArrayPtr;	/* Points to auxiliary data array start. */
-    int auxDataArrayNext;	/* Next free compile aux data array index.
+    Tcl_Size auxDataArrayNext;	/* Next free compile aux data array index.
 				 * auxDataArrayNext is the number of aux data
 				 * items and (auxDataArrayNext-1) is index of
 				 * current aux data array entry. */
-    int auxDataArrayEnd;	/* Index after last aux data array entry. */
+    Tcl_Size auxDataArrayEnd;	/* Index after last aux data array entry. */
     int mallocedAuxDataArray;	/* 1 if aux data array was expanded and
 				 * auxDataArrayPtr points in heap else 0. */
     unsigned char staticCodeSpace[COMPILEENV_INIT_CODE_BYTES];
@@ -369,7 +369,7 @@ typedef struct CompileEnv {
     /* TIP #280 */
     ExtCmdLoc *extCmdMapPtr;	/* Extended command location information for
 				 * 'info frame'. */
-    int line;			/* First line of the script, based on the
+    Tcl_Size line;			/* First line of the script, based on the
 				 * invoking context, then the line of the
 				 * command currently compiled. */
     int atCmdStart;		/* Flag to say whether an INST_START_CMD
@@ -378,7 +378,7 @@ typedef struct CompileEnv {
 				 * inefficient. If set to 2, that instruction
 				 * should not be issued at all (by the generic
 				 * part of the command compiler). */
-    int expandCount;		/* Number of INST_EXPAND_START instructions
+    Tcl_Size expandCount;		/* Number of INST_EXPAND_START instructions
 				 * encountered that have not yet been paired
 				 * with a corresponding
 				 * INST_INVOKE_EXPANDED. */
@@ -417,7 +417,7 @@ typedef struct ByteCode {
 				 * procs are specific to an interpreter so the
 				 * code emitted will depend on the
 				 * interpreter. */
-    int compileEpoch;		/* Value of iPtr->compileEpoch when this
+    Tcl_Size compileEpoch;		/* Value of iPtr->compileEpoch when this
 				 * ByteCode was compiled. Used to invalidate
 				 * code when, e.g., commands with compile
 				 * procs are redefined. */
@@ -425,11 +425,11 @@ typedef struct ByteCode {
 				 * compiled. If the code is executed if a
 				 * different namespace, it must be
 				 * recompiled. */
-    int nsEpoch;		/* Value of nsPtr->resolverEpoch when this
+    Tcl_Size nsEpoch;		/* Value of nsPtr->resolverEpoch when this
 				 * ByteCode was compiled. Used to invalidate
 				 * code when new namespace resolution rules
 				 * are put into effect. */
-    int refCount;		/* Reference count: set 1 when created plus 1
+    Tcl_Size refCount;		/* Reference count: set 1 when created plus 1
 				 * for each execution of the code currently
 				 * active. This structure can be freed when
 				 * refCount becomes zero. */
@@ -449,17 +449,17 @@ typedef struct ByteCode {
 				 * itself. Does not include heap space for
 				 * literal Tcl objects or storage referenced
 				 * by AuxData entries. */
-    int numCommands;		/* Number of commands compiled. */
-    int numSrcBytes;		/* Number of source bytes compiled. */
-    int numCodeBytes;		/* Number of code bytes. */
-    int numLitObjects;		/* Number of objects in literal array. */
-    int numExceptRanges;	/* Number of ExceptionRange array elems. */
-    int numAuxDataItems;	/* Number of AuxData items. */
-    int numCmdLocBytes;		/* Number of bytes needed for encoded command
+    Tcl_Size numCommands;		/* Number of commands compiled. */
+    Tcl_Size numSrcBytes;		/* Number of source bytes compiled. */
+    Tcl_Size numCodeBytes;		/* Number of code bytes. */
+    Tcl_Size numLitObjects;		/* Number of objects in literal array. */
+    Tcl_Size numExceptRanges;	/* Number of ExceptionRange array elems. */
+    Tcl_Size numAuxDataItems;	/* Number of AuxData items. */
+    Tcl_Size numCmdLocBytes;		/* Number of bytes needed for encoded command
 				 * location information. */
-    int maxExceptDepth;		/* Maximum nesting level of ExceptionRanges;
+    Tcl_Size maxExceptDepth;		/* Maximum nesting level of ExceptionRanges;
 				 * TCL_INDEX_NONE if no ranges were compiled. */
-    int maxStackDepth;		/* Maximum number of stack elements needed to
+    Tcl_Size maxStackDepth;		/* Maximum number of stack elements needed to
 				 * execute the code. */
     unsigned char *codeStart;	/* Points to the first byte of the code. This
 				 * is just after the final ByteCode member
@@ -536,7 +536,7 @@ typedef struct ByteCode {
  * Opcodes for the Tcl bytecode instructions. These must correspond to the
  * entries in the table of instruction descriptions, tclInstructionTable, in
  * tclCompile.c. Also, the order and number of the expression opcodes (e.g.,
- * INST_LOR) must match the entries in the array operatorStrings in
+ * INST_BITOR) must match the entries in the array operatorStrings in
  * tclExecute.c.
  */
 
@@ -887,7 +887,7 @@ typedef enum InstOperandType {
 
 typedef struct InstructionDesc {
     const char *name;		/* Name of instruction. */
-    int numBytes;		/* Total number of bytes for instruction. */
+    Tcl_Size numBytes;		/* Total number of bytes for instruction. */
     int stackEffect;		/* The worst-case balance stack effect of the
 				 * instruction, used for stack requirements
 				 * computations. The value INT_MIN signals
@@ -975,8 +975,8 @@ typedef struct JumpFixup {
 
 typedef struct JumpFixupArray {
     JumpFixup *fixup;		/* Points to start of jump fixup array. */
-    int next;			/* Index of next free array entry. */
-    int end;			/* Index of last usable entry in array. */
+    Tcl_Size next;			/* Index of next free array entry. */
+    Tcl_Size end;			/* Index of last usable entry in array. */
     int mallocedArray;		/* 1 if array was expanded and fixups points
 				 * into the heap, else 0. */
     JumpFixup staticFixupSpace[JUMPFIXUP_INIT_ENTRIES];
@@ -991,8 +991,8 @@ typedef struct JumpFixupArray {
  */
 
 typedef struct ForeachVarList {
-    int numVars;		/* The number of variables in the list. */
-    int varIndexes[TCLFLEXARRAY];/* An array of the indexes ("slot numbers")
+    Tcl_Size numVars;		/* The number of variables in the list. */
+    Tcl_Size varIndexes[TCLFLEXARRAY];/* An array of the indexes ("slot numbers")
 				 * for each variable in the procedure's array
 				 * of local variables. Only scalar variables
 				 * are supported. The actual size of this
@@ -1008,11 +1008,11 @@ typedef struct ForeachVarList {
  */
 
 typedef struct ForeachInfo {
-    int numLists;		/* The number of both the variable and value
+    Tcl_Size numLists;		/* The number of both the variable and value
 				 * lists of the foreach command. */
-    int firstValueTemp;		/* Index of the first temp var in a proc frame
+    Tcl_Size firstValueTemp;		/* Index of the first temp var in a proc frame
 				 * used to point to a value list. */
-    int loopCtTemp;		/* Index of temp var in a proc frame holding
+    Tcl_Size loopCtTemp;		/* Index of temp var in a proc frame holding
 				 * the loop's iteration count. Used to
 				 * determine next value list element to assign
 				 * each loop var. */
@@ -1046,8 +1046,8 @@ MODULE_SCOPE const AuxDataType tclJumptableInfoType;
  */
 
 typedef struct {
-    int length;			/* Size of array */
-    int varIndices[TCLFLEXARRAY];		/* Array of variable indices to manage when
+    Tcl_Size length;		/* Size of array */
+    Tcl_Size varIndices[TCLFLEXARRAY];		/* Array of variable indices to manage when
 				 * processing the start and end of a [dict
 				 * update]. There is really more than one
 				 * entry, and the structure is allocated to
@@ -1093,38 +1093,38 @@ MODULE_SCOPE ByteCode *	TclCompileObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
  */
 
 MODULE_SCOPE int	TclAttemptCompileProc(Tcl_Interp *interp,
-			    Tcl_Parse *parsePtr, int depth, Command *cmdPtr,
+			    Tcl_Parse *parsePtr, Tcl_Size depth, Command *cmdPtr,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCleanupStackForBreakContinue(CompileEnv *envPtr,
 			    ExceptionAux *auxPtr);
 MODULE_SCOPE void	TclCompileCmdWord(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, int count,
+			    Tcl_Token *tokenPtr, Tcl_Size count,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileExpr(Tcl_Interp *interp, const char *script,
-			    int numBytes, CompileEnv *envPtr, int optimize);
+			    Tcl_Size numBytes, CompileEnv *envPtr, int optimize);
 MODULE_SCOPE void	TclCompileExprWords(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, int numWords,
+			    Tcl_Token *tokenPtr, Tcl_Size numWords,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileInvocation(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Obj *cmdObj, int numWords,
+			    Tcl_Token *tokenPtr, Tcl_Obj *cmdObj, Tcl_Size numWords,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileScript(Tcl_Interp *interp,
-			    const char *script, int numBytes,
+			    const char *script, Tcl_Size numBytes,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileSyntaxError(Tcl_Interp *interp,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileTokens(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, int count,
+			    Tcl_Token *tokenPtr, Tcl_Size count,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileVarSubst(Tcl_Interp *interp,
 			    Tcl_Token *tokenPtr, CompileEnv *envPtr);
-MODULE_SCOPE int	TclCreateAuxData(void *clientData,
+MODULE_SCOPE Tcl_Size	TclCreateAuxData(void *clientData,
 			    const AuxDataType *typePtr, CompileEnv *envPtr);
-MODULE_SCOPE int	TclCreateExceptRange(ExceptionRangeType type,
+MODULE_SCOPE Tcl_Size	TclCreateExceptRange(ExceptionRangeType type,
 			    CompileEnv *envPtr);
-MODULE_SCOPE ExecEnv *	TclCreateExecEnv(Tcl_Interp *interp, int size);
+MODULE_SCOPE ExecEnv *	TclCreateExecEnv(Tcl_Interp *interp, Tcl_Size size);
 MODULE_SCOPE Tcl_Obj *	TclCreateLiteral(Interp *iPtr, const char *bytes,
-			    int length, TCL_HASH_TYPE hash, int *newPtr,
+			    Tcl_Size length, TCL_HASH_TYPE hash, int *newPtr,
 			    Namespace *nsPtr, int flags,
 			    LiteralEntry **globalPtrPtr);
 MODULE_SCOPE void	TclDeleteExecEnv(ExecEnv *eePtr);
@@ -1139,7 +1139,7 @@ MODULE_SCOPE void	TclExpandJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE int	TclNRExecuteByteCode(Tcl_Interp *interp,
 			    ByteCode *codePtr);
 MODULE_SCOPE Tcl_Obj *	TclFetchLiteral(CompileEnv *envPtr, TCL_HASH_TYPE index);
-MODULE_SCOPE int	TclFindCompiledLocal(const char *name, int nameChars,
+MODULE_SCOPE Tcl_Size	TclFindCompiledLocal(const char *name, Tcl_Size nameChars,
 			    int create, CompileEnv *envPtr);
 MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 			    JumpFixup *jumpFixupPtr, int jumpDist,
@@ -1147,13 +1147,13 @@ MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 MODULE_SCOPE void	TclFreeCompileEnv(CompileEnv *envPtr);
 MODULE_SCOPE void	TclFreeJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE int	TclGetIndexFromToken(Tcl_Token *tokenPtr,
-			    int before, int after, int *indexPtr);
+			    Tcl_Size before, Tcl_Size after, int *indexPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCode(CompileEnv *envPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCodeObj(Tcl_Obj *objPtr,
 			    const Tcl_ObjType *typePtr, CompileEnv *envPtr);
 MODULE_SCOPE void	TclInitCompileEnv(Tcl_Interp *interp,
 			    CompileEnv *envPtr, const char *string,
-			    int numBytes, const CmdFrame *invoker, int word);
+			    Tcl_Size numBytes, const CmdFrame *invoker, int word);
 MODULE_SCOPE void	TclInitJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE void	TclInitLiteralTable(LiteralTable *tablePtr);
 MODULE_SCOPE ExceptionRange *TclGetInnermostExceptionRange(CompileEnv *envPtr,
@@ -1168,9 +1168,9 @@ MODULE_SCOPE void	TclFinalizeLoopExceptionRange(CompileEnv *envPtr,
 MODULE_SCOPE char *	TclLiteralStats(LiteralTable *tablePtr);
 MODULE_SCOPE int	TclLog2(int value);
 #endif
-MODULE_SCOPE int	TclLocalScalar(const char *bytes, int numBytes,
+MODULE_SCOPE Tcl_Size	TclLocalScalar(const char *bytes, Tcl_Size numBytes,
 			    CompileEnv *envPtr);
-MODULE_SCOPE int	TclLocalScalarFromToken(Tcl_Token *tokenPtr,
+MODULE_SCOPE Tcl_Size	TclLocalScalarFromToken(Tcl_Token *tokenPtr,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclOptimizeBytecode(void *envPtr);
 #ifdef TCL_COMPILE_DEBUG
@@ -1180,9 +1180,9 @@ MODULE_SCOPE void	TclPrintByteCodeObj(Tcl_Interp *interp,
 MODULE_SCOPE int	TclPrintInstruction(ByteCode *codePtr,
 			    const unsigned char *pc);
 MODULE_SCOPE void	TclPrintObject(FILE *outFile,
-			    Tcl_Obj *objPtr, int maxChars);
+			    Tcl_Obj *objPtr, Tcl_Size maxChars);
 MODULE_SCOPE void	TclPrintSource(FILE *outFile,
-			    const char *string, int maxChars);
+			    const char *string, Tcl_Size maxChars);
 MODULE_SCOPE void	TclPushVarName(Tcl_Interp *interp,
 			    Tcl_Token *varTokenPtr, CompileEnv *envPtr,
 			    int flags, int *localIndexPtr,
@@ -1204,13 +1204,13 @@ MODULE_SCOPE int	TclWordKnownAtCompileTime(Tcl_Token *tokenPtr,
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE void	TclLogCommandInfo(Tcl_Interp *interp,
 			    const char *script, const char *command,
-			    int length, const unsigned char *pc,
+			    Tcl_Size length, const unsigned char *pc,
 			    Tcl_Obj **tosPtr);
 MODULE_SCOPE Tcl_Obj	*TclGetInnerContext(Tcl_Interp *interp,
 			    const unsigned char *pc, Tcl_Obj **tosPtr);
 MODULE_SCOPE Tcl_Obj	*TclNewInstNameObj(unsigned char inst);
 MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
-			    Tcl_Interp *interp, int objc,
+			    Tcl_Interp *interp, Tcl_Size objc,
 			    Tcl_Obj *const objv[], int isLambda);
 
 
@@ -1505,7 +1505,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 		     (*((p)+3))))
 
 /*
- * Macros used to compute the minimum and maximum of two integers. The ANSI C
+ * Macros used to compute the minimum and maximum of two values. The ANSI C
  * "prototypes" for these macros are:
  *
  * int TclMin(int i, int j);
@@ -1543,7 +1543,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
  * these macros are:
  *
  * static void		PushLiteral(CompileEnv *envPtr,
- *			    const char *string, int length);
+ *			    const char *string, Tcl_Size length);
  * static void		PushStringLiteral(CompileEnv *envPtr,
  *			    const char *string);
  */
@@ -1551,7 +1551,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 #define PushLiteral(envPtr, string, length) \
     TclEmitPush(TclRegisterLiteral((envPtr), (string), (length), 0), (envPtr))
 #define PushStringLiteral(envPtr, string) \
-    PushLiteral((envPtr), (string), (int) (sizeof(string "") - 1))
+    PushLiteral((envPtr), (string), sizeof(string "") - 1)
 
 /*
  * Macro to advance to the next token; it is more mnemonic than the address
@@ -1567,7 +1567,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
  * Macro to get the offset to the next instruction to be issued. The ANSI C
  * "prototype" for this macro is:
  *
- * static int	CurrentOffset(CompileEnv *envPtr);
+ * static ptrdiff_t	CurrentOffset(CompileEnv *envPtr);
  */
 
 #define CurrentOffset(envPtr) \
@@ -1580,9 +1580,9 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
  * of LOOP ranges is an interesting datum for debugging purposes, and that is
  * what we compute now.
  *
- * static int	ExceptionRangeStarts(CompileEnv *envPtr, int index);
- * static void	ExceptionRangeEnds(CompileEnv *envPtr, int index);
- * static void	ExceptionRangeTarget(CompileEnv *envPtr, int index, LABEL);
+ * static int	ExceptionRangeStarts(CompileEnv *envPtr, Tcl_Size index);
+ * static void	ExceptionRangeEnds(CompileEnv *envPtr, Tcl_Size index);
+ * static void	ExceptionRangeTarget(CompileEnv *envPtr, Tcl_Size index, LABEL);
  */
 
 #define ExceptionRangeStarts(envPtr, index) \
@@ -1641,7 +1641,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 
 #define DefineLineInformation \
     ExtCmdLoc *mapPtr = envPtr->extCmdMapPtr;				\
-    int eclIndex = mapPtr->nuloc - 1
+    Tcl_Size eclIndex = mapPtr->nuloc - 1
 
 #define SetLineInformation(word) \
     envPtr->line = mapPtr->loc[eclIndex].line[(word)];			\
@@ -1819,8 +1819,8 @@ MODULE_SCOPE void TclDTraceInfo(Tcl_Obj *info, const char **args, int *argsi);
     FILE *tclDTraceDebugLog = NULL;				\
     void TclDTraceOpenDebugLog(void) {				\
 	char n[35];						\
-	sprintf(n, "/tmp/tclDTraceDebug-%lu.log",		\
-		(unsigned long) getpid());			\
+	sprintf(n, "/tmp/tclDTraceDebug-%" TCL_Z_MODIFIER "u.log", \
+		(size_t) getpid());			\
 	tclDTraceDebugLog = fopen(n, "a");			\
     }
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index e54ea2c..ef1904f 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -109,9 +109,9 @@ EXTERN int		Tcl_AppendAllObjTypes(Tcl_Interp *interp,
 EXTERN void		Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...);
 /* 16 */
 EXTERN void		Tcl_AppendToObj(Tcl_Obj *objPtr, const char *bytes,
-				int length);
+				Tcl_Size length);
 /* 17 */
-EXTERN Tcl_Obj *	Tcl_ConcatObj(int objc, Tcl_Obj *const objv[]);
+EXTERN Tcl_Obj *	Tcl_ConcatObj(Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 18 */
 EXTERN int		Tcl_ConvertToType(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const Tcl_ObjType *typePtr);
@@ -130,12 +130,13 @@ Tcl_Obj *		Tcl_DbNewBooleanObj(int intValue, const char *file,
 				int line);
 /* 23 */
 EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj(const unsigned char *bytes,
-				int numBytes, const char *file, int line);
+				Tcl_Size numBytes, const char *file,
+				int line);
 /* 24 */
 EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj(double doubleValue,
 				const char *file, int line);
 /* 25 */
-EXTERN Tcl_Obj *	Tcl_DbNewListObj(int objc, Tcl_Obj *const *objv,
+EXTERN Tcl_Obj *	Tcl_DbNewListObj(Tcl_Size objc, Tcl_Obj *const *objv,
 				const char *file, int line);
 /* 26 */
 TCL_DEPRECATED("No longer in use, changed to macro")
@@ -144,8 +145,8 @@ Tcl_Obj *		Tcl_DbNewLongObj(long longValue, const char *file,
 /* 27 */
 EXTERN Tcl_Obj *	Tcl_DbNewObj(const char *file, int line);
 /* 28 */
-EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes, int length,
-				const char *file, int line);
+EXTERN Tcl_Obj *	Tcl_DbNewStringObj(const char *bytes,
+				Tcl_Size length, const char *file, int line);
 /* 29 */
 EXTERN Tcl_Obj *	Tcl_DuplicateObj(Tcl_Obj *objPtr);
 /* 30 */
@@ -197,59 +198,62 @@ EXTERN int		Tcl_ListObjGetElements(Tcl_Interp *interp,
 				Tcl_Obj ***objvPtr);
 /* 46 */
 EXTERN int		Tcl_ListObjIndex(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, int index,
+				Tcl_Obj *listPtr, Tcl_Size index,
 				Tcl_Obj **objPtrPtr);
 /* 47 */
 EXTERN int		Tcl_ListObjLength(Tcl_Interp *interp,
 				Tcl_Obj *listPtr, int *lengthPtr);
 /* 48 */
 EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, int first, int count,
-				int objc, Tcl_Obj *const objv[]);
+				Tcl_Obj *listPtr, Tcl_Size first,
+				Tcl_Size count, Tcl_Size objc,
+				Tcl_Obj *const objv[]);
 /* 49 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 Tcl_Obj *		Tcl_NewBooleanObj(int intValue);
 /* 50 */
 EXTERN Tcl_Obj *	Tcl_NewByteArrayObj(const unsigned char *bytes,
-				int numBytes);
+				Tcl_Size numBytes);
 /* 51 */
 EXTERN Tcl_Obj *	Tcl_NewDoubleObj(double doubleValue);
 /* 52 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 Tcl_Obj *		Tcl_NewIntObj(int intValue);
 /* 53 */
-EXTERN Tcl_Obj *	Tcl_NewListObj(int objc, Tcl_Obj *const objv[]);
+EXTERN Tcl_Obj *	Tcl_NewListObj(Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 54 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 Tcl_Obj *		Tcl_NewLongObj(long longValue);
 /* 55 */
 EXTERN Tcl_Obj *	Tcl_NewObj(void);
 /* 56 */
-EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, int length);
+EXTERN Tcl_Obj *	Tcl_NewStringObj(const char *bytes, Tcl_Size length);
 /* 57 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 void			Tcl_SetBooleanObj(Tcl_Obj *objPtr, int intValue);
 /* 58 */
-EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int numBytes);
+EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr,
+				Tcl_Size numBytes);
 /* 59 */
 EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
-				const unsigned char *bytes, int numBytes);
+				const unsigned char *bytes,
+				Tcl_Size numBytes);
 /* 60 */
 EXTERN void		Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue);
 /* 61 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 void			Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue);
 /* 62 */
-EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, int objc,
+EXTERN void		Tcl_SetListObj(Tcl_Obj *objPtr, Tcl_Size objc,
 				Tcl_Obj *const objv[]);
 /* 63 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 void			Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue);
 /* 64 */
-EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, int length);
+EXTERN void		Tcl_SetObjLength(Tcl_Obj *objPtr, Tcl_Size length);
 /* 65 */
 EXTERN void		Tcl_SetStringObj(Tcl_Obj *objPtr, const char *bytes,
-				int length);
+				Tcl_Size length);
 /* 66 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 void			Tcl_AddErrorInfo(Tcl_Interp *interp,
@@ -297,22 +301,22 @@ EXTERN int		Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan);
 /* 82 */
 EXTERN int		Tcl_CommandComplete(const char *cmd);
 /* 83 */
-EXTERN char *		Tcl_Concat(int argc, const char *const *argv);
+EXTERN char *		Tcl_Concat(Tcl_Size argc, const char *const *argv);
 /* 84 */
-EXTERN int		Tcl_ConvertElement(const char *src, char *dst,
+EXTERN Tcl_Size		Tcl_ConvertElement(const char *src, char *dst,
 				int flags);
 /* 85 */
-EXTERN int		Tcl_ConvertCountedElement(const char *src,
-				int length, char *dst, int flags);
+EXTERN Tcl_Size		Tcl_ConvertCountedElement(const char *src,
+				Tcl_Size length, char *dst, int flags);
 /* 86 */
 EXTERN int		Tcl_CreateAlias(Tcl_Interp *childInterp,
 				const char *childCmd, Tcl_Interp *target,
-				const char *targetCmd, int argc,
+				const char *targetCmd, Tcl_Size argc,
 				const char *const *argv);
 /* 87 */
 EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *childInterp,
 				const char *childCmd, Tcl_Interp *target,
-				const char *targetCmd, int objc,
+				const char *targetCmd, Tcl_Size objc,
 				Tcl_Obj *const objv[]);
 /* 88 */
 EXTERN Tcl_Channel	Tcl_CreateChannel(const Tcl_ChannelType *typePtr,
@@ -390,7 +394,7 @@ EXTERN void		Tcl_DeleteHashTable(Tcl_HashTable *tablePtr);
 /* 110 */
 EXTERN void		Tcl_DeleteInterp(Tcl_Interp *interp);
 /* 111 */
-EXTERN void		Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr);
+EXTERN void		Tcl_DetachPids(Tcl_Size numPids, Tcl_Pid *pidPtr);
 /* 112 */
 EXTERN void		Tcl_DeleteTimerHandler(Tcl_TimerToken token);
 /* 113 */
@@ -404,7 +408,7 @@ EXTERN int		Tcl_DoOneEvent(int flags);
 EXTERN void		Tcl_DoWhenIdle(Tcl_IdleProc *proc, void *clientData);
 /* 117 */
 EXTERN char *		Tcl_DStringAppend(Tcl_DString *dsPtr,
-				const char *bytes, int length);
+				const char *bytes, Tcl_Size length);
 /* 118 */
 EXTERN char *		Tcl_DStringAppendElement(Tcl_DString *dsPtr,
 				const char *element);
@@ -421,7 +425,8 @@ EXTERN void		Tcl_DStringInit(Tcl_DString *dsPtr);
 EXTERN void		Tcl_DStringResult(Tcl_Interp *interp,
 				Tcl_DString *dsPtr);
 /* 124 */
-EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr, int length);
+EXTERN void		Tcl_DStringSetLength(Tcl_DString *dsPtr,
+				Tcl_Size length);
 /* 125 */
 EXTERN void		Tcl_DStringStartSublist(Tcl_DString *dsPtr);
 /* 126 */
@@ -502,7 +507,7 @@ EXTERN void *		Tcl_GetAssocData(Tcl_Interp *interp,
 EXTERN Tcl_Channel	Tcl_GetChannel(Tcl_Interp *interp,
 				const char *chanName, int *modePtr);
 /* 152 */
-EXTERN int		Tcl_GetChannelBufferSize(Tcl_Channel chan);
+EXTERN Tcl_Size		Tcl_GetChannelBufferSize(Tcl_Channel chan);
 /* 153 */
 EXTERN int		Tcl_GetChannelHandle(Tcl_Channel chan, int direction,
 				void **handlePtr);
@@ -552,9 +557,9 @@ EXTERN int		Tcl_GetOpenFile(Tcl_Interp *interp,
 /* 168 */
 EXTERN Tcl_PathType	Tcl_GetPathType(const char *path);
 /* 169 */
-EXTERN int		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
+EXTERN Tcl_Size		Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr);
 /* 170 */
-EXTERN int		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+EXTERN Tcl_Size		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 171 */
 EXTERN int		Tcl_GetServiceMode(void);
 /* 172 */
@@ -595,7 +600,7 @@ EXTERN int		Tcl_InterpDeleted(Tcl_Interp *interp);
 /* 185 */
 EXTERN int		Tcl_IsSafe(Tcl_Interp *interp);
 /* 186 */
-EXTERN char *		Tcl_JoinPath(int argc, const char *const *argv,
+EXTERN char *		Tcl_JoinPath(Tcl_Size argc, const char *const *argv,
 				Tcl_DString *resultPtr);
 /* 187 */
 EXTERN int		Tcl_LinkVar(Tcl_Interp *interp, const char *varName,
@@ -609,7 +614,7 @@ int			Tcl_MakeSafe(Tcl_Interp *interp);
 /* 191 */
 EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel(void *tcpSocket);
 /* 192 */
-EXTERN char *		Tcl_Merge(int argc, const char *const *argv);
+EXTERN char *		Tcl_Merge(Tcl_Size argc, const char *const *argv);
 /* 193 */
 EXTERN Tcl_HashEntry *	Tcl_NextHashEntry(Tcl_HashSearch *searchPtr);
 /* 194 */
@@ -622,8 +627,8 @@ EXTERN Tcl_Obj *	Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 				Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
 				int flags);
 /* 197 */
-EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc,
-				const char **argv, int flags);
+EXTERN Tcl_Channel	Tcl_OpenCommandChannel(Tcl_Interp *interp,
+				Tcl_Size argc, const char **argv, int flags);
 /* 198 */
 EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
 				const char *fileName, const char *modeString,
@@ -649,7 +654,8 @@ EXTERN const char *	Tcl_PosixError(Tcl_Interp *interp);
 /* 205 */
 EXTERN void		Tcl_QueueEvent(Tcl_Event *evPtr, int position);
 /* 206 */
-EXTERN int		Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead);
+EXTERN Tcl_Size		Tcl_Read(Tcl_Channel chan, char *bufPtr,
+				Tcl_Size toRead);
 /* 207 */
 EXTERN void		Tcl_ReapDetachedProcs(void);
 /* 208 */
@@ -673,17 +679,17 @@ EXTERN int		Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp,
 EXTERN int		Tcl_RegExpMatch(Tcl_Interp *interp, const char *text,
 				const char *pattern);
 /* 215 */
-EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, int index,
+EXTERN void		Tcl_RegExpRange(Tcl_RegExp regexp, Tcl_Size index,
 				const char **startPtr, const char **endPtr);
 /* 216 */
 EXTERN void		Tcl_Release(void *clientData);
 /* 217 */
 EXTERN void		Tcl_ResetResult(Tcl_Interp *interp);
 /* 218 */
-EXTERN int		Tcl_ScanElement(const char *src, int *flagPtr);
+EXTERN Tcl_Size		Tcl_ScanElement(const char *src, int *flagPtr);
 /* 219 */
-EXTERN int		Tcl_ScanCountedElement(const char *src, int length,
-				int *flagPtr);
+EXTERN Tcl_Size		Tcl_ScanCountedElement(const char *src,
+				Tcl_Size length, int *flagPtr);
 /* 220 */
 TCL_DEPRECATED("")
 int			Tcl_SeekOld(Tcl_Channel chan, int offset, int mode);
@@ -696,7 +702,8 @@ EXTERN void		Tcl_SetAssocData(Tcl_Interp *interp,
 				const char *name, Tcl_InterpDeleteProc *proc,
 				void *clientData);
 /* 224 */
-EXTERN void		Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz);
+EXTERN void		Tcl_SetChannelBufferSize(Tcl_Channel chan,
+				Tcl_Size sz);
 /* 225 */
 EXTERN int		Tcl_SetChannelOption(Tcl_Interp *interp,
 				Tcl_Channel chan, const char *optionName,
@@ -715,7 +722,8 @@ EXTERN void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
 EXTERN const char *	Tcl_SetPanicProc(
 				TCL_NORETURN1 Tcl_PanicProc *panicProc);
 /* 231 */
-EXTERN int		Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth);
+EXTERN Tcl_Size		Tcl_SetRecursionLimit(Tcl_Interp *interp,
+				Tcl_Size depth);
 /* 232 */
 EXTERN void		Tcl_SetResult(Tcl_Interp *interp, char *result,
 				Tcl_FreeProc *freeProc);
@@ -774,8 +782,8 @@ EXTERN int		Tcl_TraceVar2(Tcl_Interp *interp, const char *part1,
 EXTERN char *		Tcl_TranslateFileName(Tcl_Interp *interp,
 				const char *name, Tcl_DString *bufferPtr);
 /* 250 */
-EXTERN int		Tcl_Ungets(Tcl_Channel chan, const char *str,
-				int len, int atHead);
+EXTERN Tcl_Size		Tcl_Ungets(Tcl_Channel chan, const char *str,
+				Tcl_Size len, int atHead);
 /* 251 */
 EXTERN void		Tcl_UnlinkVar(Tcl_Interp *interp,
 				const char *varName);
@@ -825,9 +833,10 @@ EXTERN void *		Tcl_VarTraceInfo2(Tcl_Interp *interp,
 				int flags, Tcl_VarTraceProc *procPtr,
 				void *prevClientData);
 /* 263 */
-EXTERN int		Tcl_Write(Tcl_Channel chan, const char *s, int slen);
+EXTERN Tcl_Size		Tcl_Write(Tcl_Channel chan, const char *s,
+				Tcl_Size slen);
 /* 264 */
-EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, int objc,
+EXTERN void		Tcl_WrongNumArgs(Tcl_Interp *interp, Tcl_Size objc,
 				Tcl_Obj *const objv[], const char *message);
 /* 265 */
 EXTERN int		Tcl_DumpActiveMemory(const char *fileName);
@@ -908,9 +917,9 @@ TCL_DEPRECATED("Use Tcl_DiscardInterpState")
 void			Tcl_DiscardResult(Tcl_SavedResult *statePtr);
 /* 291 */
 EXTERN int		Tcl_EvalEx(Tcl_Interp *interp, const char *script,
-				int numBytes, int flags);
+				Tcl_Size numBytes, int flags);
 /* 292 */
-EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, int objc,
+EXTERN int		Tcl_EvalObjv(Tcl_Interp *interp, Tcl_Size objc,
 				Tcl_Obj *const objv[], int flags);
 /* 293 */
 EXTERN int		Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -920,13 +929,13 @@ EXTERN TCL_NORETURN void Tcl_ExitThread(int status);
 /* 295 */
 EXTERN int		Tcl_ExternalToUtf(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
-				int srcLen, int flags,
+				Tcl_Size srcLen, int flags,
 				Tcl_EncodingState *statePtr, char *dst,
-				int dstLen, int *srcReadPtr,
+				Tcl_Size dstLen, int *srcReadPtr,
 				int *dstWrotePtr, int *dstCharsPtr);
 /* 296 */
 EXTERN char *		Tcl_ExternalToUtfDString(Tcl_Encoding encoding,
-				const char *src, int srcLen,
+				const char *src, Tcl_Size srcLen,
 				Tcl_DString *dsPtr);
 /* 297 */
 EXTERN void		Tcl_FinalizeThread(void);
@@ -945,11 +954,11 @@ EXTERN void		Tcl_GetEncodingNames(Tcl_Interp *interp);
 /* 304 */
 EXTERN int		Tcl_GetIndexFromObjStruct(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const void *tablePtr,
-				int offset, const char *msg, int flags,
+				Tcl_Size offset, const char *msg, int flags,
 				void *indexPtr);
 /* 305 */
 EXTERN void *		Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr,
-				int size);
+				Tcl_Size size);
 /* 306 */
 EXTERN Tcl_Obj *	Tcl_GetVar2Ex(Tcl_Interp *interp, const char *part1,
 				const char *part2, int flags);
@@ -965,10 +974,10 @@ EXTERN void		Tcl_ConditionNotify(Tcl_Condition *condPtr);
 EXTERN void		Tcl_ConditionWait(Tcl_Condition *condPtr,
 				Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr);
 /* 312 */
-EXTERN int		Tcl_NumUtfChars(const char *src, int length);
+EXTERN Tcl_Size		Tcl_NumUtfChars(const char *src, Tcl_Size length);
 /* 313 */
-EXTERN int		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
-				int charsToRead, int appendFlag);
+EXTERN Tcl_Size		Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+				Tcl_Size charsToRead, int appendFlag);
 /* 314 */
 TCL_DEPRECATED("Use Tcl_RestoreInterpState")
 void			Tcl_RestoreResult(Tcl_Interp *interp,
@@ -990,7 +999,7 @@ EXTERN void		Tcl_ThreadAlert(Tcl_ThreadId threadId);
 EXTERN void		Tcl_ThreadQueueEvent(Tcl_ThreadId threadId,
 				Tcl_Event *evPtr, int position);
 /* 320 */
-EXTERN int		Tcl_UniCharAtIndex(const char *src, int index);
+EXTERN int		Tcl_UniCharAtIndex(const char *src, Tcl_Size index);
 /* 321 */
 EXTERN int		Tcl_UniCharToLower(int ch);
 /* 322 */
@@ -1000,11 +1009,11 @@ EXTERN int		Tcl_UniCharToUpper(int ch);
 /* 324 */
 EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
 /* 325 */
-EXTERN const char *	Tcl_UtfAtIndex(const char *src, int index);
+EXTERN const char *	Tcl_UtfAtIndex(const char *src, Tcl_Size index);
 /* 326 */
-EXTERN int		TclUtfCharComplete(const char *src, int length);
+EXTERN int		TclUtfCharComplete(const char *src, Tcl_Size length);
 /* 327 */
-EXTERN int		Tcl_UtfBackslash(const char *src, int *readPtr,
+EXTERN Tcl_Size		Tcl_UtfBackslash(const char *src, int *readPtr,
 				char *dst);
 /* 328 */
 EXTERN const char *	Tcl_UtfFindFirst(const char *src, int ch);
@@ -1017,13 +1026,13 @@ EXTERN const char *	TclUtfPrev(const char *src, const char *start);
 /* 332 */
 EXTERN int		Tcl_UtfToExternal(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
-				int srcLen, int flags,
+				Tcl_Size srcLen, int flags,
 				Tcl_EncodingState *statePtr, char *dst,
-				int dstLen, int *srcReadPtr,
+				Tcl_Size dstLen, int *srcReadPtr,
 				int *dstWrotePtr, int *dstCharsPtr);
 /* 333 */
 EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
-				const char *src, int srcLen,
+				const char *src, Tcl_Size srcLen,
 				Tcl_DString *dsPtr);
 /* 334 */
 EXTERN int		Tcl_UtfToLower(char *src);
@@ -1035,10 +1044,10 @@ EXTERN int		Tcl_UtfToChar16(const char *src,
 /* 337 */
 EXTERN int		Tcl_UtfToUpper(char *src);
 /* 338 */
-EXTERN int		Tcl_WriteChars(Tcl_Channel chan, const char *src,
-				int srcLen);
+EXTERN Tcl_Size		Tcl_WriteChars(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
 /* 339 */
-EXTERN int		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
+EXTERN Tcl_Size		Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 340 */
 EXTERN char *		Tcl_GetString(Tcl_Obj *objPtr);
 /* 341 */
@@ -1066,7 +1075,7 @@ EXTERN int		Tcl_UniCharIsUpper(int ch);
 /* 351 */
 EXTERN int		Tcl_UniCharIsWordChar(int ch);
 /* 352 */
-EXTERN int		Tcl_Char16Len(const unsigned short *uniStr);
+EXTERN Tcl_Size		Tcl_Char16Len(const unsigned short *uniStr);
 /* 353 */
 TCL_DEPRECATED("Use Tcl_UtfNcmp")
 int			Tcl_UniCharNcmp(const unsigned short *ucs,
@@ -1074,10 +1083,10 @@ int			Tcl_UniCharNcmp(const unsigned short *ucs,
 				unsigned long numChars);
 /* 354 */
 EXTERN char *		Tcl_Char16ToUtfDString(const unsigned short *uniStr,
-				int uniLength, Tcl_DString *dsPtr);
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
 /* 355 */
-EXTERN unsigned short *	 Tcl_UtfToChar16DString(const char *src, int length,
-				Tcl_DString *dsPtr);
+EXTERN unsigned short *	 Tcl_UtfToChar16DString(const char *src,
+				Tcl_Size length, Tcl_DString *dsPtr);
 /* 356 */
 EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp,
 				Tcl_Obj *patObj, int flags);
@@ -1090,27 +1099,27 @@ EXTERN void		Tcl_FreeParse(Tcl_Parse *parsePtr);
 /* 359 */
 EXTERN void		Tcl_LogCommandInfo(Tcl_Interp *interp,
 				const char *script, const char *command,
-				int length);
+				Tcl_Size length);
 /* 360 */
 EXTERN int		Tcl_ParseBraces(Tcl_Interp *interp,
-				const char *start, int numBytes,
+				const char *start, Tcl_Size numBytes,
 				Tcl_Parse *parsePtr, int append,
 				const char **termPtr);
 /* 361 */
 EXTERN int		Tcl_ParseCommand(Tcl_Interp *interp,
-				const char *start, int numBytes, int nested,
-				Tcl_Parse *parsePtr);
+				const char *start, Tcl_Size numBytes,
+				int nested, Tcl_Parse *parsePtr);
 /* 362 */
 EXTERN int		Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
-				int numBytes, Tcl_Parse *parsePtr);
+				Tcl_Size numBytes, Tcl_Parse *parsePtr);
 /* 363 */
 EXTERN int		Tcl_ParseQuotedString(Tcl_Interp *interp,
-				const char *start, int numBytes,
+				const char *start, Tcl_Size numBytes,
 				Tcl_Parse *parsePtr, int append,
 				const char **termPtr);
 /* 364 */
 EXTERN int		Tcl_ParseVarName(Tcl_Interp *interp,
-				const char *start, int numBytes,
+				const char *start, Tcl_Size numBytes,
 				Tcl_Parse *parsePtr, int append);
 /* 365 */
 EXTERN char *		Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr);
@@ -1140,28 +1149,32 @@ EXTERN int		Tcl_UniCharIsPunct(int ch);
 /* 376 */
 EXTERN int		Tcl_RegExpExecObj(Tcl_Interp *interp,
 				Tcl_RegExp regexp, Tcl_Obj *textObj,
-				int offset, int nmatches, int flags);
+				Tcl_Size offset, Tcl_Size nmatches,
+				int flags);
 /* 377 */
 EXTERN void		Tcl_RegExpGetInfo(Tcl_RegExp regexp,
 				Tcl_RegExpInfo *infoPtr);
 /* 378 */
 EXTERN Tcl_Obj *	Tcl_NewUnicodeObj(const unsigned short *unicode,
-				int numChars);
+				Tcl_Size numChars);
 /* 379 */
 EXTERN void		Tcl_SetUnicodeObj(Tcl_Obj *objPtr,
-				const unsigned short *unicode, int numChars);
+				const unsigned short *unicode,
+				Tcl_Size numChars);
 /* 380 */
-EXTERN int		Tcl_GetCharLength(Tcl_Obj *objPtr);
+EXTERN Tcl_Size		Tcl_GetCharLength(Tcl_Obj *objPtr);
 /* 381 */
-EXTERN int		Tcl_GetUniChar(Tcl_Obj *objPtr, int index);
+EXTERN int		Tcl_GetUniChar(Tcl_Obj *objPtr, Tcl_Size index);
 /* 382 */
 TCL_DEPRECATED("No longer in use, changed to macro")
 unsigned short *	Tcl_GetUnicode(Tcl_Obj *objPtr);
 /* 383 */
-EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, int first, int last);
+EXTERN Tcl_Obj *	Tcl_GetRange(Tcl_Obj *objPtr, Tcl_Size first,
+				Tcl_Size last);
 /* 384 */
 EXTERN void		Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr,
-				const unsigned short *unicode, int length);
+				const unsigned short *unicode,
+				Tcl_Size length);
 /* 385 */
 EXTERN int		Tcl_RegExpMatchObj(Tcl_Interp *interp,
 				Tcl_Obj *textObj, Tcl_Obj *patternObj);
@@ -1177,7 +1190,7 @@ EXTERN int		Tcl_GetChannelNamesEx(Tcl_Interp *interp,
 				const char *pattern);
 /* 390 */
 EXTERN int		Tcl_ProcObjCmd(void *clientData, Tcl_Interp *interp,
-				int objc, Tcl_Obj *const objv[]);
+				Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 391 */
 EXTERN void		Tcl_ConditionFinalize(Tcl_Condition *condPtr);
 /* 392 */
@@ -1185,13 +1198,13 @@ EXTERN void		Tcl_MutexFinalize(Tcl_Mutex *mutex);
 /* 393 */
 EXTERN int		Tcl_CreateThread(Tcl_ThreadId *idPtr,
 				Tcl_ThreadCreateProc *proc, void *clientData,
-				int stackSize, int flags);
+				Tcl_Size stackSize, int flags);
 /* 394 */
-EXTERN int		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
-				int bytesToRead);
+EXTERN Tcl_Size		Tcl_ReadRaw(Tcl_Channel chan, char *dst,
+				Tcl_Size bytesToRead);
 /* 395 */
-EXTERN int		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
-				int srcLen);
+EXTERN Tcl_Size		Tcl_WriteRaw(Tcl_Channel chan, const char *src,
+				Tcl_Size srcLen);
 /* 396 */
 EXTERN Tcl_Channel	Tcl_GetTopChannel(Tcl_Channel chan);
 /* 397 */
@@ -1298,7 +1311,8 @@ EXTERN char *		Tcl_AttemptRealloc(char *ptr, TCL_HASH_TYPE size);
 EXTERN char *		Tcl_AttemptDbCkrealloc(char *ptr, TCL_HASH_TYPE size,
 				const char *file, int line);
 /* 432 */
-EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length);
+EXTERN int		Tcl_AttemptSetObjLength(Tcl_Obj *objPtr,
+				Tcl_Size length);
 /* 433 */
 EXTERN Tcl_ThreadId	Tcl_GetChannelThread(Tcl_Channel channel);
 /* 434 */
@@ -1381,7 +1395,7 @@ EXTERN int		Tcl_FSChdir(Tcl_Obj *pathPtr);
 EXTERN int		Tcl_FSConvertToPathType(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr);
 /* 460 */
-EXTERN Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, int elements);
+EXTERN Tcl_Obj *	Tcl_FSJoinPath(Tcl_Obj *listObj, Tcl_Size elements);
 /* 461 */
 EXTERN Tcl_Obj *	Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
 /* 462 */
@@ -1391,7 +1405,7 @@ EXTERN int		Tcl_FSEqualPaths(Tcl_Obj *firstPtr,
 EXTERN Tcl_Obj *	Tcl_FSGetNormalizedPath(Tcl_Interp *interp,
 				Tcl_Obj *pathPtr);
 /* 464 */
-EXTERN Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc,
+EXTERN Tcl_Obj *	Tcl_FSJoinToPath(Tcl_Obj *pathPtr, Tcl_Size objc,
 				Tcl_Obj *const objv[]);
 /* 465 */
 EXTERN void *		Tcl_FSGetInternalRep(Tcl_Obj *pathPtr,
@@ -1433,7 +1447,7 @@ EXTERN int		Tcl_OutputBuffered(Tcl_Channel chan);
 EXTERN void		Tcl_FSMountsChanged(const Tcl_Filesystem *fsPtr);
 /* 481 */
 EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
-				Tcl_Token *tokenPtr, int count);
+				Tcl_Token *tokenPtr, Tcl_Size count);
 /* 482 */
 EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
 /* 483 */
@@ -1493,11 +1507,11 @@ EXTERN void		Tcl_DictObjNext(Tcl_DictSearch *searchPtr,
 EXTERN void		Tcl_DictObjDone(Tcl_DictSearch *searchPtr);
 /* 501 */
 EXTERN int		Tcl_DictObjPutKeyList(Tcl_Interp *interp,
-				Tcl_Obj *dictPtr, int keyc,
+				Tcl_Obj *dictPtr, Tcl_Size keyc,
 				Tcl_Obj *const *keyv, Tcl_Obj *valuePtr);
 /* 502 */
 EXTERN int		Tcl_DictObjRemoveKeyList(Tcl_Interp *interp,
-				Tcl_Obj *dictPtr, int keyc,
+				Tcl_Obj *dictPtr, Tcl_Size keyc,
 				Tcl_Obj *const *keyv);
 /* 503 */
 EXTERN Tcl_Obj *	Tcl_NewDictObj(void);
@@ -1565,7 +1579,7 @@ EXTERN int		Tcl_LimitCheck(Tcl_Interp *interp);
 EXTERN int		Tcl_LimitExceeded(Tcl_Interp *interp);
 /* 525 */
 EXTERN void		Tcl_LimitSetCommands(Tcl_Interp *interp,
-				int commandLimit);
+				Tcl_Size commandLimit);
 /* 526 */
 EXTERN void		Tcl_LimitSetTime(Tcl_Interp *interp,
 				Tcl_Time *timeLimitPtr);
@@ -1697,22 +1711,22 @@ EXTERN const char *	Tcl_GetEncodingNameFromEnvironment(
 				Tcl_DString *bufPtr);
 /* 573 */
 EXTERN int		Tcl_PkgRequireProc(Tcl_Interp *interp,
-				const char *name, int objc,
+				const char *name, Tcl_Size objc,
 				Tcl_Obj *const objv[], void *clientDataPtr);
 /* 574 */
 EXTERN void		Tcl_AppendObjToErrorInfo(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
 /* 575 */
 EXTERN void		Tcl_AppendLimitedToObj(Tcl_Obj *objPtr,
-				const char *bytes, int length, int limit,
-				const char *ellipsis);
+				const char *bytes, Tcl_Size length,
+				Tcl_Size limit, const char *ellipsis);
 /* 576 */
 EXTERN Tcl_Obj *	Tcl_Format(Tcl_Interp *interp, const char *format,
-				int objc, Tcl_Obj *const objv[]);
+				Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 577 */
 EXTERN int		Tcl_AppendFormatToObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, const char *format,
-				int objc, Tcl_Obj *const objv[]);
+				Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 578 */
 EXTERN Tcl_Obj *	Tcl_ObjPrintf(const char *format, ...) TCL_FORMAT_PRINTF(1, 2);
 /* 579 */
@@ -1737,11 +1751,12 @@ EXTERN Tcl_Command	Tcl_NRCreateCommand(Tcl_Interp *interp,
 EXTERN int		Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 				int flags);
 /* 585 */
-EXTERN int		Tcl_NREvalObjv(Tcl_Interp *interp, int objc,
+EXTERN int		Tcl_NREvalObjv(Tcl_Interp *interp, Tcl_Size objc,
 				Tcl_Obj *const objv[], int flags);
 /* 586 */
 EXTERN int		Tcl_NRCmdSwap(Tcl_Interp *interp, Tcl_Command cmd,
-				int objc, Tcl_Obj *const objv[], int flags);
+				Tcl_Size objc, Tcl_Obj *const objv[],
+				int flags);
 /* 587 */
 EXTERN void		Tcl_NRAddCallback(Tcl_Interp *interp,
 				Tcl_NRPostProc *postProcPtr, void *data0,
@@ -1749,7 +1764,7 @@ EXTERN void		Tcl_NRAddCallback(Tcl_Interp *interp,
 /* 588 */
 EXTERN int		Tcl_NRCallObjProc(Tcl_Interp *interp,
 				Tcl_ObjCmdProc *objProc, void *clientData,
-				int objc, Tcl_Obj *const objv[]);
+				Tcl_Size objc, Tcl_Obj *const objv[]);
 /* 589 */
 EXTERN unsigned		Tcl_GetFSDeviceFromStat(const Tcl_StatBuf *statPtr);
 /* 590 */
@@ -1804,14 +1819,14 @@ EXTERN int		Tcl_ZlibDeflate(Tcl_Interp *interp, int format,
 				Tcl_Obj *gzipHeaderDictObj);
 /* 611 */
 EXTERN int		Tcl_ZlibInflate(Tcl_Interp *interp, int format,
-				Tcl_Obj *data, int buffersize,
+				Tcl_Obj *data, Tcl_Size buffersize,
 				Tcl_Obj *gzipHeaderDictObj);
 /* 612 */
 EXTERN unsigned int	Tcl_ZlibCRC32(unsigned int crc,
-				const unsigned char *buf, int len);
+				const unsigned char *buf, Tcl_Size len);
 /* 613 */
 EXTERN unsigned int	Tcl_ZlibAdler32(unsigned int adler,
-				const unsigned char *buf, int len);
+				const unsigned char *buf, Tcl_Size len);
 /* 614 */
 EXTERN int		Tcl_ZlibStreamInit(Tcl_Interp *interp, int mode,
 				int format, int level, Tcl_Obj *dictObj,
@@ -1827,7 +1842,7 @@ EXTERN int		Tcl_ZlibStreamPut(Tcl_ZlibStream zshandle,
 				Tcl_Obj *data, int flush);
 /* 619 */
 EXTERN int		Tcl_ZlibStreamGet(Tcl_ZlibStream zshandle,
-				Tcl_Obj *data, int count);
+				Tcl_Obj *data, Tcl_Size count);
 /* 620 */
 EXTERN int		Tcl_ZlibStreamClose(Tcl_ZlibStream zshandle);
 /* 621 */
@@ -1902,18 +1917,19 @@ EXTERN int		Tcl_IsShared(Tcl_Obj *objPtr);
 /* 644 */
 EXTERN int		Tcl_LinkArray(Tcl_Interp *interp,
 				const char *varName, void *addr, int type,
-				int size);
+				Tcl_Size size);
 /* 645 */
 EXTERN int		Tcl_GetIntForIndex(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int endValue, int *indexPtr);
+				Tcl_Obj *objPtr, Tcl_Size endValue,
+				Tcl_Size *indexPtr);
 /* 646 */
 EXTERN int		Tcl_UtfToUniChar(const char *src, int *chPtr);
 /* 647 */
 EXTERN char *		Tcl_UniCharToUtfDString(const int *uniStr,
-				int uniLength, Tcl_DString *dsPtr);
+				Tcl_Size uniLength, Tcl_DString *dsPtr);
 /* 648 */
-EXTERN int *		Tcl_UtfToUniCharDString(const char *src, int length,
-				Tcl_DString *dsPtr);
+EXTERN int *		Tcl_UtfToUniCharDString(const char *src,
+				Tcl_Size length, Tcl_DString *dsPtr);
 /* 649 */
 EXTERN unsigned char *	TclGetBytesFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *numBytesPtr);
@@ -1930,7 +1946,7 @@ EXTERN unsigned short *	 TclGetUnicodeFromObj(Tcl_Obj *objPtr,
 EXTERN unsigned char *	TclGetByteArrayFromObj(Tcl_Obj *objPtr,
 				size_t *numBytesPtr);
 /* 654 */
-EXTERN int		Tcl_UtfCharComplete(const char *src, int length);
+EXTERN int		Tcl_UtfCharComplete(const char *src, Tcl_Size length);
 /* 655 */
 EXTERN const char *	Tcl_UtfNext(const char *src);
 /* 656 */
@@ -1938,12 +1954,12 @@ EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
 /* 657 */
 EXTERN int		Tcl_UniCharIsUnicode(int ch);
 /* 658 */
-EXTERN int		Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
-				const char *src, int srcLen, int flags,
+EXTERN Tcl_Size		Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
+				const char *src, Tcl_Size srcLen, int flags,
 				Tcl_DString *dsPtr);
 /* 659 */
-EXTERN int		Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
-				const char *src, int srcLen, int flags,
+EXTERN Tcl_Size		Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
+				const char *src, Tcl_Size srcLen, int flags,
 				Tcl_DString *dsPtr);
 /* 660 */
 EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
@@ -1972,17 +1988,18 @@ EXTERN int		TclParseArgsObjv(Tcl_Interp *interp,
 				size_t *objcPtr, Tcl_Obj *const *objv,
 				Tcl_Obj ***remObjv);
 /* 668 */
-EXTERN int		Tcl_UniCharLen(const int *uniStr);
+EXTERN Tcl_Size		Tcl_UniCharLen(const int *uniStr);
 /* 669 */
-EXTERN int		TclNumUtfChars(const char *src, int length);
+EXTERN Tcl_Size		TclNumUtfChars(const char *src, Tcl_Size length);
 /* 670 */
-EXTERN int		TclGetCharLength(Tcl_Obj *objPtr);
+EXTERN Tcl_Size		TclGetCharLength(Tcl_Obj *objPtr);
 /* 671 */
-EXTERN const char *	TclUtfAtIndex(const char *src, int index);
+EXTERN const char *	TclUtfAtIndex(const char *src, Tcl_Size index);
 /* 672 */
-EXTERN Tcl_Obj *	TclGetRange(Tcl_Obj *objPtr, int first, int last);
+EXTERN Tcl_Obj *	TclGetRange(Tcl_Obj *objPtr, Tcl_Size first,
+				Tcl_Size last);
 /* 673 */
-EXTERN int		TclGetUniChar(Tcl_Obj *objPtr, int index);
+EXTERN int		TclGetUniChar(Tcl_Obj *objPtr, Tcl_Size index);
 /* 674 */
 EXTERN int		Tcl_GetBool(Tcl_Interp *interp, const char *src,
 				int flags, char *charPtr);
@@ -2062,19 +2079,19 @@ typedef struct TclStubs {
     int (*tcl_WaitForEvent) (const Tcl_Time *timePtr); /* 13 */
     int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */
     void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */
-    void (*tcl_AppendToObj) (Tcl_Obj *objPtr, const char *bytes, int length); /* 16 */
-    Tcl_Obj * (*tcl_ConcatObj) (int objc, Tcl_Obj *const objv[]); /* 17 */
+    void (*tcl_AppendToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 16 */
+    Tcl_Obj * (*tcl_ConcatObj) (Tcl_Size objc, Tcl_Obj *const objv[]); /* 17 */
     int (*tcl_ConvertToType) (Tcl_Interp *interp, Tcl_Obj *objPtr, const Tcl_ObjType *typePtr); /* 18 */
     void (*tcl_DbDecrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 19 */
     void (*tcl_DbIncrRefCount) (Tcl_Obj *objPtr, const char *file, int line); /* 20 */
     int (*tcl_DbIsShared) (Tcl_Obj *objPtr, const char *file, int line); /* 21 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_DbNewBooleanObj) (int intValue, const char *file, int line); /* 22 */
-    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char *bytes, int numBytes, const char *file, int line); /* 23 */
+    Tcl_Obj * (*tcl_DbNewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes, const char *file, int line); /* 23 */
     Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, const char *file, int line); /* 24 */
-    Tcl_Obj * (*tcl_DbNewListObj) (int objc, Tcl_Obj *const *objv, const char *file, int line); /* 25 */
+    Tcl_Obj * (*tcl_DbNewListObj) (Tcl_Size objc, Tcl_Obj *const *objv, const char *file, int line); /* 25 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_DbNewLongObj) (long longValue, const char *file, int line); /* 26 */
     Tcl_Obj * (*tcl_DbNewObj) (const char *file, int line); /* 27 */
-    Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, int length, const char *file, int line); /* 28 */
+    Tcl_Obj * (*tcl_DbNewStringObj) (const char *bytes, Tcl_Size length, const char *file, int line); /* 28 */
     Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
     void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
     int (*tcl_GetBoolean) (Tcl_Interp *interp, const char *src, int *intPtr); /* 31 */
@@ -2092,26 +2109,26 @@ typedef struct TclStubs {
     int (*tcl_ListObjAppendList) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *elemListPtr); /* 43 */
     int (*tcl_ListObjAppendElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *objPtr); /* 44 */
     int (*tcl_ListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *objcPtr, Tcl_Obj ***objvPtr); /* 45 */
-    int (*tcl_ListObjIndex) (Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj **objPtrPtr); /* 46 */
+    int (*tcl_ListObjIndex) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size index, Tcl_Obj **objPtrPtr); /* 46 */
     int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr); /* 47 */
-    int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, int first, int count, int objc, Tcl_Obj *const objv[]); /* 48 */
+    int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size first, Tcl_Size count, Tcl_Size objc, Tcl_Obj *const objv[]); /* 48 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_NewBooleanObj) (int intValue); /* 49 */
-    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, int numBytes); /* 50 */
+    Tcl_Obj * (*tcl_NewByteArrayObj) (const unsigned char *bytes, Tcl_Size numBytes); /* 50 */
     Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_NewIntObj) (int intValue); /* 52 */
-    Tcl_Obj * (*tcl_NewListObj) (int objc, Tcl_Obj *const objv[]); /* 53 */
+    Tcl_Obj * (*tcl_NewListObj) (Tcl_Size objc, Tcl_Obj *const objv[]); /* 53 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") Tcl_Obj * (*tcl_NewLongObj) (long longValue); /* 54 */
     Tcl_Obj * (*tcl_NewObj) (void); /* 55 */
-    Tcl_Obj * (*tcl_NewStringObj) (const char *bytes, int length); /* 56 */
+    Tcl_Obj * (*tcl_NewStringObj) (const char *bytes, Tcl_Size length); /* 56 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_SetBooleanObj) (Tcl_Obj *objPtr, int intValue); /* 57 */
-    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, int numBytes); /* 58 */
-    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, const unsigned char *bytes, int numBytes); /* 59 */
+    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, Tcl_Size numBytes); /* 58 */
+    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, const unsigned char *bytes, Tcl_Size numBytes); /* 59 */
     void (*tcl_SetDoubleObj) (Tcl_Obj *objPtr, double doubleValue); /* 60 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_SetIntObj) (Tcl_Obj *objPtr, int intValue); /* 61 */
-    void (*tcl_SetListObj) (Tcl_Obj *objPtr, int objc, Tcl_Obj *const objv[]); /* 62 */
+    void (*tcl_SetListObj) (Tcl_Obj *objPtr, Tcl_Size objc, Tcl_Obj *const objv[]); /* 62 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_SetLongObj) (Tcl_Obj *objPtr, long longValue); /* 63 */
-    void (*tcl_SetObjLength) (Tcl_Obj *objPtr, int length); /* 64 */
-    void (*tcl_SetStringObj) (Tcl_Obj *objPtr, const char *bytes, int length); /* 65 */
+    void (*tcl_SetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 64 */
+    void (*tcl_SetStringObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length); /* 65 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_AddErrorInfo) (Tcl_Interp *interp, const char *message); /* 66 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") void (*tcl_AddObjErrorInfo) (Tcl_Interp *interp, const char *message, int length); /* 67 */
     void (*tcl_AllowExceptions) (Tcl_Interp *interp); /* 68 */
@@ -2129,11 +2146,11 @@ typedef struct TclStubs {
     void (*tcl_CancelIdleCall) (Tcl_IdleProc *idleProc, void *clientData); /* 80 */
     int (*tcl_Close) (Tcl_Interp *interp, Tcl_Channel chan); /* 81 */
     int (*tcl_CommandComplete) (const char *cmd); /* 82 */
-    char * (*tcl_Concat) (int argc, const char *const *argv); /* 83 */
-    int (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
-    int (*tcl_ConvertCountedElement) (const char *src, int length, char *dst, int flags); /* 85 */
-    int (*tcl_CreateAlias) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, int argc, const char *const *argv); /* 86 */
-    int (*tcl_CreateAliasObj) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, int objc, Tcl_Obj *const objv[]); /* 87 */
+    char * (*tcl_Concat) (Tcl_Size argc, const char *const *argv); /* 83 */
+    Tcl_Size (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
+    Tcl_Size (*tcl_ConvertCountedElement) (const char *src, Tcl_Size length, char *dst, int flags); /* 85 */
+    int (*tcl_CreateAlias) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, Tcl_Size argc, const char *const *argv); /* 86 */
+    int (*tcl_CreateAliasObj) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, Tcl_Size objc, Tcl_Obj *const objv[]); /* 87 */
     Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType *typePtr, const char *chanName, void *instanceData, int mask); /* 88 */
     void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, void *clientData); /* 89 */
     void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, void *clientData); /* 90 */
@@ -2157,20 +2174,20 @@ typedef struct TclStubs {
     void (*tcl_DeleteHashEntry) (Tcl_HashEntry *entryPtr); /* 108 */
     void (*tcl_DeleteHashTable) (Tcl_HashTable *tablePtr); /* 109 */
     void (*tcl_DeleteInterp) (Tcl_Interp *interp); /* 110 */
-    void (*tcl_DetachPids) (int numPids, Tcl_Pid *pidPtr); /* 111 */
+    void (*tcl_DetachPids) (Tcl_Size numPids, Tcl_Pid *pidPtr); /* 111 */
     void (*tcl_DeleteTimerHandler) (Tcl_TimerToken token); /* 112 */
     void (*tcl_DeleteTrace) (Tcl_Interp *interp, Tcl_Trace trace); /* 113 */
     void (*tcl_DontCallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, void *clientData); /* 114 */
     int (*tcl_DoOneEvent) (int flags); /* 115 */
     void (*tcl_DoWhenIdle) (Tcl_IdleProc *proc, void *clientData); /* 116 */
-    char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, const char *bytes, int length); /* 117 */
+    char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, const char *bytes, Tcl_Size length); /* 117 */
     char * (*tcl_DStringAppendElement) (Tcl_DString *dsPtr, const char *element); /* 118 */
     void (*tcl_DStringEndSublist) (Tcl_DString *dsPtr); /* 119 */
     void (*tcl_DStringFree) (Tcl_DString *dsPtr); /* 120 */
     void (*tcl_DStringGetResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 121 */
     void (*tcl_DStringInit) (Tcl_DString *dsPtr); /* 122 */
     void (*tcl_DStringResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 123 */
-    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, int length); /* 124 */
+    void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, Tcl_Size length); /* 124 */
     void (*tcl_DStringStartSublist) (Tcl_DString *dsPtr); /* 125 */
     int (*tcl_Eof) (Tcl_Channel chan); /* 126 */
     const char * (*tcl_ErrnoId) (void); /* 127 */
@@ -2198,7 +2215,7 @@ typedef struct TclStubs {
     int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */
     void * (*tcl_GetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */
     Tcl_Channel (*tcl_GetChannel) (Tcl_Interp *interp, const char *chanName, int *modePtr); /* 151 */
-    int (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */
+    Tcl_Size (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */
     int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, void **handlePtr); /* 153 */
     void * (*tcl_GetChannelInstanceData) (Tcl_Channel chan); /* 154 */
     int (*tcl_GetChannelMode) (Tcl_Channel chan); /* 155 */
@@ -2223,8 +2240,8 @@ typedef struct TclStubs {
     int (*tcl_GetOpenFile) (Tcl_Interp *interp, const char *chanID, int forWriting, int checkUsage, void **filePtr); /* 167 */
 #endif /* MACOSX */
     Tcl_PathType (*tcl_GetPathType) (const char *path); /* 168 */
-    int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
-    int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
+    Tcl_Size (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
+    Tcl_Size (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
     int (*tcl_GetServiceMode) (void); /* 171 */
     Tcl_Interp * (*tcl_GetChild) (Tcl_Interp *interp, const char *name); /* 172 */
     Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
@@ -2240,18 +2257,18 @@ typedef struct TclStubs {
     int (*tcl_InputBuffered) (Tcl_Channel chan); /* 183 */
     int (*tcl_InterpDeleted) (Tcl_Interp *interp); /* 184 */
     int (*tcl_IsSafe) (Tcl_Interp *interp); /* 185 */
-    char * (*tcl_JoinPath) (int argc, const char *const *argv, Tcl_DString *resultPtr); /* 186 */
+    char * (*tcl_JoinPath) (Tcl_Size argc, const char *const *argv, Tcl_DString *resultPtr); /* 186 */
     int (*tcl_LinkVar) (Tcl_Interp *interp, const char *varName, void *addr, int type); /* 187 */
     void (*reserved188)(void);
     Tcl_Channel (*tcl_MakeFileChannel) (void *handle, int mode); /* 189 */
     TCL_DEPRECATED_API("") int (*tcl_MakeSafe) (Tcl_Interp *interp); /* 190 */
     Tcl_Channel (*tcl_MakeTcpClientChannel) (void *tcpSocket); /* 191 */
-    char * (*tcl_Merge) (int argc, const char *const *argv); /* 192 */
+    char * (*tcl_Merge) (Tcl_Size argc, const char *const *argv); /* 192 */
     Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch *searchPtr); /* 193 */
     void (*tcl_NotifyChannel) (Tcl_Channel channel, int mask); /* 194 */
     Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 195 */
     Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */
-    Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, int argc, const char **argv, int flags); /* 197 */
+    Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, Tcl_Size argc, const char **argv, int flags); /* 197 */
     Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, const char *fileName, const char *modeString, int permissions); /* 198 */
     Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, const char *address, const char *myaddr, int myport, int async); /* 199 */
     Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, const char *host, Tcl_TcpAcceptProc *acceptProc, void *callbackData); /* 200 */
@@ -2260,7 +2277,7 @@ typedef struct TclStubs {
     int (*tcl_PutEnv) (const char *assignment); /* 203 */
     const char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */
     void (*tcl_QueueEvent) (Tcl_Event *evPtr, int position); /* 205 */
-    int (*tcl_Read) (Tcl_Channel chan, char *bufPtr, int toRead); /* 206 */
+    Tcl_Size (*tcl_Read) (Tcl_Channel chan, char *bufPtr, Tcl_Size toRead); /* 206 */
     void (*tcl_ReapDetachedProcs) (void); /* 207 */
     int (*tcl_RecordAndEval) (Tcl_Interp *interp, const char *cmd, int flags); /* 208 */
     int (*tcl_RecordAndEvalObj) (Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags); /* 209 */
@@ -2269,23 +2286,23 @@ typedef struct TclStubs {
     Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp *interp, const char *pattern); /* 212 */
     int (*tcl_RegExpExec) (Tcl_Interp *interp, Tcl_RegExp regexp, const char *text, const char *start); /* 213 */
     int (*tcl_RegExpMatch) (Tcl_Interp *interp, const char *text, const char *pattern); /* 214 */
-    void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, const char **startPtr, const char **endPtr); /* 215 */
+    void (*tcl_RegExpRange) (Tcl_RegExp regexp, Tcl_Size index, const char **startPtr, const char **endPtr); /* 215 */
     void (*tcl_Release) (void *clientData); /* 216 */
     void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */
-    int (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
-    int (*tcl_ScanCountedElement) (const char *src, int length, int *flagPtr); /* 219 */
+    Tcl_Size (*tcl_ScanElement) (const char *src, int *flagPtr); /* 218 */
+    Tcl_Size (*tcl_ScanCountedElement) (const char *src, Tcl_Size length, int *flagPtr); /* 219 */
     TCL_DEPRECATED_API("") int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */
     int (*tcl_ServiceAll) (void); /* 221 */
     int (*tcl_ServiceEvent) (int flags); /* 222 */
     void (*tcl_SetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc *proc, void *clientData); /* 223 */
-    void (*tcl_SetChannelBufferSize) (Tcl_Channel chan, int sz); /* 224 */
+    void (*tcl_SetChannelBufferSize) (Tcl_Channel chan, Tcl_Size sz); /* 224 */
     int (*tcl_SetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, const char *optionName, const char *newValue); /* 225 */
     int (*tcl_SetCommandInfo) (Tcl_Interp *interp, const char *cmdName, const Tcl_CmdInfo *infoPtr); /* 226 */
     void (*tcl_SetErrno) (int err); /* 227 */
     void (*tcl_SetErrorCode) (Tcl_Interp *interp, ...); /* 228 */
     void (*tcl_SetMaxBlockTime) (const Tcl_Time *timePtr); /* 229 */
     TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") const char * (*tcl_SetPanicProc) (TCL_NORETURN1 Tcl_PanicProc *panicProc); /* 230 */
-    int (*tcl_SetRecursionLimit) (Tcl_Interp *interp, int depth); /* 231 */
+    Tcl_Size (*tcl_SetRecursionLimit) (Tcl_Interp *interp, Tcl_Size depth); /* 231 */
     void (*tcl_SetResult) (Tcl_Interp *interp, char *result, Tcl_FreeProc *freeProc); /* 232 */
     int (*tcl_SetServiceMode) (int mode); /* 233 */
     void (*tcl_SetObjErrorCode) (Tcl_Interp *interp, Tcl_Obj *errorObjPtr); /* 234 */
@@ -2304,7 +2321,7 @@ typedef struct TclStubs {
     TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_TraceVar) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 247 */
     int (*tcl_TraceVar2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *proc, void *clientData); /* 248 */
     char * (*tcl_TranslateFileName) (Tcl_Interp *interp, const char *name, Tcl_DString *bufferPtr); /* 249 */
-    int (*tcl_Ungets) (Tcl_Channel chan, const char *str, int len, int atHead); /* 250 */
+    Tcl_Size (*tcl_Ungets) (Tcl_Channel chan, const char *str, Tcl_Size len, int atHead); /* 250 */
     void (*tcl_UnlinkVar) (Tcl_Interp *interp, const char *varName); /* 251 */
     int (*tcl_UnregisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 252 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") int (*tcl_UnsetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 253 */
@@ -2317,8 +2334,8 @@ typedef struct TclStubs {
     int (*tcl_VarEval) (Tcl_Interp *interp, ...); /* 260 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") void * (*tcl_VarTraceInfo) (Tcl_Interp *interp, const char *varName, int flags, Tcl_VarTraceProc *procPtr, void *prevClientData); /* 261 */
     void * (*tcl_VarTraceInfo2) (Tcl_Interp *interp, const char *part1, const char *part2, int flags, Tcl_VarTraceProc *procPtr, void *prevClientData); /* 262 */
-    int (*tcl_Write) (Tcl_Channel chan, const char *s, int slen); /* 263 */
-    void (*tcl_WrongNumArgs) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], const char *message); /* 264 */
+    Tcl_Size (*tcl_Write) (Tcl_Channel chan, const char *s, Tcl_Size slen); /* 263 */
+    void (*tcl_WrongNumArgs) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], const char *message); /* 264 */
     int (*tcl_DumpActiveMemory) (const char *fileName); /* 265 */
     void (*tcl_ValidateAllMemory) (const char *file, int line); /* 266 */
     TCL_DEPRECATED_API("see TIP #422") void (*tcl_AppendResultVA) (Tcl_Interp *interp, va_list argList); /* 267 */
@@ -2345,12 +2362,12 @@ typedef struct TclStubs {
     void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 288 */
     void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 289 */
     TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void (*tcl_DiscardResult) (Tcl_SavedResult *statePtr); /* 290 */
-    int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, int numBytes, int flags); /* 291 */
-    int (*tcl_EvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags); /* 292 */
+    int (*tcl_EvalEx) (Tcl_Interp *interp, const char *script, Tcl_Size numBytes, int flags); /* 291 */
+    int (*tcl_EvalObjv) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 292 */
     int (*tcl_EvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 293 */
     TCL_NORETURN1 void (*tcl_ExitThread) (int status); /* 294 */
-    int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */
-    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char *src, int srcLen, Tcl_DString *dsPtr); /* 296 */
+    int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */
+    char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 296 */
     void (*tcl_FinalizeThread) (void); /* 297 */
     void (*tcl_FinalizeNotifier) (void *clientData); /* 298 */
     void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */
@@ -2358,42 +2375,42 @@ typedef struct TclStubs {
     Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp *interp, const char *name); /* 301 */
     const char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */
     void (*tcl_GetEncodingNames) (Tcl_Interp *interp); /* 303 */
-    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, int offset, const char *msg, int flags, void *indexPtr); /* 304 */
-    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, int size); /* 305 */
+    int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, const void *tablePtr, Tcl_Size offset, const char *msg, int flags, void *indexPtr); /* 304 */
+    void * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, Tcl_Size size); /* 305 */
     Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, int flags); /* 306 */
     void * (*tcl_InitNotifier) (void); /* 307 */
     void (*tcl_MutexLock) (Tcl_Mutex *mutexPtr); /* 308 */
     void (*tcl_MutexUnlock) (Tcl_Mutex *mutexPtr); /* 309 */
     void (*tcl_ConditionNotify) (Tcl_Condition *condPtr); /* 310 */
     void (*tcl_ConditionWait) (Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, const Tcl_Time *timePtr); /* 311 */
-    int (*tcl_NumUtfChars) (const char *src, int length); /* 312 */
-    int (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead, int appendFlag); /* 313 */
+    Tcl_Size (*tcl_NumUtfChars) (const char *src, Tcl_Size length); /* 312 */
+    Tcl_Size (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, Tcl_Size charsToRead, int appendFlag); /* 313 */
     TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void (*tcl_RestoreResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 314 */
     TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void (*tcl_SaveResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 315 */
     int (*tcl_SetSystemEncoding) (Tcl_Interp *interp, const char *name); /* 316 */
     Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, const char *part1, const char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */
     void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */
     void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event *evPtr, int position); /* 319 */
-    int (*tcl_UniCharAtIndex) (const char *src, int index); /* 320 */
+    int (*tcl_UniCharAtIndex) (const char *src, Tcl_Size index); /* 320 */
     int (*tcl_UniCharToLower) (int ch); /* 321 */
     int (*tcl_UniCharToTitle) (int ch); /* 322 */
     int (*tcl_UniCharToUpper) (int ch); /* 323 */
     int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
-    const char * (*tcl_UtfAtIndex) (const char *src, int index); /* 325 */
-    int (*tclUtfCharComplete) (const char *src, int length); /* 326 */
-    int (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
+    const char * (*tcl_UtfAtIndex) (const char *src, Tcl_Size index); /* 325 */
+    int (*tclUtfCharComplete) (const char *src, Tcl_Size length); /* 326 */
+    Tcl_Size (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
     const char * (*tcl_UtfFindFirst) (const char *src, int ch); /* 328 */
     const char * (*tcl_UtfFindLast) (const char *src, int ch); /* 329 */
     const char * (*tclUtfNext) (const char *src); /* 330 */
     const char * (*tclUtfPrev) (const char *src, const char *start); /* 331 */
-    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
-    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, int srcLen, Tcl_DString *dsPtr); /* 333 */
+    int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
+    char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 333 */
     int (*tcl_UtfToLower) (char *src); /* 334 */
     int (*tcl_UtfToTitle) (char *src); /* 335 */
     int (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
     int (*tcl_UtfToUpper) (char *src); /* 337 */
-    int (*tcl_WriteChars) (Tcl_Channel chan, const char *src, int srcLen); /* 338 */
-    int (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
+    Tcl_Size (*tcl_WriteChars) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 338 */
+    Tcl_Size (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
     char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
     TCL_DEPRECATED_API("Use Tcl_GetEncodingSearchPath") const char * (*tcl_GetDefaultEncodingDir) (void); /* 341 */
     TCL_DEPRECATED_API("Use Tcl_SetEncodingSearchPath") void (*tcl_SetDefaultEncodingDir) (const char *path); /* 342 */
@@ -2406,19 +2423,19 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsSpace) (int ch); /* 349 */
     int (*tcl_UniCharIsUpper) (int ch); /* 350 */
     int (*tcl_UniCharIsWordChar) (int ch); /* 351 */
-    int (*tcl_Char16Len) (const unsigned short *uniStr); /* 352 */
+    Tcl_Size (*tcl_Char16Len) (const unsigned short *uniStr); /* 352 */
     TCL_DEPRECATED_API("Use Tcl_UtfNcmp") int (*tcl_UniCharNcmp) (const unsigned short *ucs, const unsigned short *uct, unsigned long numChars); /* 353 */
-    char * (*tcl_Char16ToUtfDString) (const unsigned short *uniStr, int uniLength, Tcl_DString *dsPtr); /* 354 */
-    unsigned short * (*tcl_UtfToChar16DString) (const char *src, int length, Tcl_DString *dsPtr); /* 355 */
+    char * (*tcl_Char16ToUtfDString) (const unsigned short *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 354 */
+    unsigned short * (*tcl_UtfToChar16DString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 355 */
     Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp *interp, Tcl_Obj *patObj, int flags); /* 356 */
     TCL_DEPRECATED_API("Use Tcl_EvalTokensStandard") Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 357 */
     void (*tcl_FreeParse) (Tcl_Parse *parsePtr); /* 358 */
-    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, int length); /* 359 */
-    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 360 */
-    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, int numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
-    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr); /* 362 */
-    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 363 */
-    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, int numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
+    void (*tcl_LogCommandInfo) (Tcl_Interp *interp, const char *script, const char *command, Tcl_Size length); /* 359 */
+    int (*tcl_ParseBraces) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 360 */
+    int (*tcl_ParseCommand) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */
+    int (*tcl_ParseExpr) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr); /* 362 */
+    int (*tcl_ParseQuotedString) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append, const char **termPtr); /* 363 */
+    int (*tcl_ParseVarName) (Tcl_Interp *interp, const char *start, Tcl_Size numBytes, Tcl_Parse *parsePtr, int append); /* 364 */
     char * (*tcl_GetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 365 */
     int (*tcl_Chdir) (const char *dirName); /* 366 */
     int (*tcl_Access) (const char *path, int mode); /* 367 */
@@ -2430,26 +2447,26 @@ typedef struct TclStubs {
     int (*tcl_UniCharIsGraph) (int ch); /* 373 */
     int (*tcl_UniCharIsPrint) (int ch); /* 374 */
     int (*tcl_UniCharIsPunct) (int ch); /* 375 */
-    int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, int offset, int nmatches, int flags); /* 376 */
+    int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, Tcl_Size offset, Tcl_Size nmatches, int flags); /* 376 */
     void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr); /* 377 */
-    Tcl_Obj * (*tcl_NewUnicodeObj) (const unsigned short *unicode, int numChars); /* 378 */
-    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const unsigned short *unicode, int numChars); /* 379 */
-    int (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
-    int (*tcl_GetUniChar) (Tcl_Obj *objPtr, int index); /* 381 */
+    Tcl_Obj * (*tcl_NewUnicodeObj) (const unsigned short *unicode, Tcl_Size numChars); /* 378 */
+    void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, const unsigned short *unicode, Tcl_Size numChars); /* 379 */
+    Tcl_Size (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */
+    int (*tcl_GetUniChar) (Tcl_Obj *objPtr, Tcl_Size index); /* 381 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") unsigned short * (*tcl_GetUnicode) (Tcl_Obj *objPtr); /* 382 */
-    Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, int first, int last); /* 383 */
-    void (*tcl_AppendUnicodeToObj) (Tcl_Obj *objPtr, const unsigned short *unicode, int length); /* 384 */
+    Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last); /* 383 */
+    void (*tcl_AppendUnicodeToObj) (Tcl_Obj *objPtr, const unsigned short *unicode, Tcl_Size length); /* 384 */
     int (*tcl_RegExpMatchObj) (Tcl_Interp *interp, Tcl_Obj *textObj, Tcl_Obj *patternObj); /* 385 */
     void (*tcl_SetNotifier) (const Tcl_NotifierProcs *notifierProcPtr); /* 386 */
     Tcl_Mutex * (*tcl_GetAllocMutex) (void); /* 387 */
     int (*tcl_GetChannelNames) (Tcl_Interp *interp); /* 388 */
     int (*tcl_GetChannelNamesEx) (Tcl_Interp *interp, const char *pattern); /* 389 */
-    int (*tcl_ProcObjCmd) (void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 390 */
+    int (*tcl_ProcObjCmd) (void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); /* 390 */
     void (*tcl_ConditionFinalize) (Tcl_Condition *condPtr); /* 391 */
     void (*tcl_MutexFinalize) (Tcl_Mutex *mutex); /* 392 */
-    int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc, void *clientData, int stackSize, int flags); /* 393 */
-    int (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, int bytesToRead); /* 394 */
-    int (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, int srcLen); /* 395 */
+    int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc *proc, void *clientData, Tcl_Size stackSize, int flags); /* 393 */
+    Tcl_Size (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, Tcl_Size bytesToRead); /* 394 */
+    Tcl_Size (*tcl_WriteRaw) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 395 */
     Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */
     int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */
     const char * (*tcl_ChannelName) (const Tcl_ChannelType *chanTypePtr); /* 398 */
@@ -2486,7 +2503,7 @@ typedef struct TclStubs {
     char * (*tcl_AttemptDbCkalloc) (TCL_HASH_TYPE size, const char *file, int line); /* 429 */
     char * (*tcl_AttemptRealloc) (char *ptr, TCL_HASH_TYPE size); /* 430 */
     char * (*tcl_AttemptDbCkrealloc) (char *ptr, TCL_HASH_TYPE size, const char *file, int line); /* 431 */
-    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, int length); /* 432 */
+    int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, Tcl_Size length); /* 432 */
     Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */
     unsigned short * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */
     TCL_DEPRECATED_API("") int (*tcl_GetMathFuncInfo) (Tcl_Interp *interp, const char *name, int *numArgsPtr, Tcl_ValueType **argTypesPtr, Tcl_MathProc **procPtr, void **clientDataPtr); /* 435 */
@@ -2514,11 +2531,11 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_FSGetCwd) (Tcl_Interp *interp); /* 457 */
     int (*tcl_FSChdir) (Tcl_Obj *pathPtr); /* 458 */
     int (*tcl_FSConvertToPathType) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 459 */
-    Tcl_Obj * (*tcl_FSJoinPath) (Tcl_Obj *listObj, int elements); /* 460 */
+    Tcl_Obj * (*tcl_FSJoinPath) (Tcl_Obj *listObj, Tcl_Size elements); /* 460 */
     Tcl_Obj * (*tcl_FSSplitPath) (Tcl_Obj *pathPtr, int *lenPtr); /* 461 */
     int (*tcl_FSEqualPaths) (Tcl_Obj *firstPtr, Tcl_Obj *secondPtr); /* 462 */
     Tcl_Obj * (*tcl_FSGetNormalizedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 463 */
-    Tcl_Obj * (*tcl_FSJoinToPath) (Tcl_Obj *pathPtr, int objc, Tcl_Obj *const objv[]); /* 464 */
+    Tcl_Obj * (*tcl_FSJoinToPath) (Tcl_Obj *pathPtr, Tcl_Size objc, Tcl_Obj *const objv[]); /* 464 */
     void * (*tcl_FSGetInternalRep) (Tcl_Obj *pathPtr, const Tcl_Filesystem *fsPtr); /* 465 */
     Tcl_Obj * (*tcl_FSGetTranslatedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 466 */
     int (*tcl_FSEvalFile) (Tcl_Interp *interp, Tcl_Obj *fileName); /* 467 */
@@ -2535,7 +2552,7 @@ typedef struct TclStubs {
     Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj *pathPtr); /* 478 */
     int (*tcl_OutputBuffered) (Tcl_Channel chan); /* 479 */
     void (*tcl_FSMountsChanged) (const Tcl_Filesystem *fsPtr); /* 480 */
-    int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 481 */
+    int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Size count); /* 481 */
     void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */
     Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
     int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */
@@ -2555,8 +2572,8 @@ typedef struct TclStubs {
     int (*tcl_DictObjFirst) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 498 */
     void (*tcl_DictObjNext) (Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 499 */
     void (*tcl_DictObjDone) (Tcl_DictSearch *searchPtr); /* 500 */
-    int (*tcl_DictObjPutKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr); /* 501 */
-    int (*tcl_DictObjRemoveKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int keyc, Tcl_Obj *const *keyv); /* 502 */
+    int (*tcl_DictObjPutKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size keyc, Tcl_Obj *const *keyv, Tcl_Obj *valuePtr); /* 501 */
+    int (*tcl_DictObjRemoveKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size keyc, Tcl_Obj *const *keyv); /* 502 */
     Tcl_Obj * (*tcl_NewDictObj) (void); /* 503 */
     Tcl_Obj * (*tcl_DbNewDictObj) (const char *file, int line); /* 504 */
     void (*tcl_RegisterConfig) (Tcl_Interp *interp, const char *pkgName, const Tcl_Config *configuration, const char *valEncoding); /* 505 */
@@ -2579,7 +2596,7 @@ typedef struct TclStubs {
     int (*tcl_LimitReady) (Tcl_Interp *interp); /* 522 */
     int (*tcl_LimitCheck) (Tcl_Interp *interp); /* 523 */
     int (*tcl_LimitExceeded) (Tcl_Interp *interp); /* 524 */
-    void (*tcl_LimitSetCommands) (Tcl_Interp *interp, int commandLimit); /* 525 */
+    void (*tcl_LimitSetCommands) (Tcl_Interp *interp, Tcl_Size commandLimit); /* 525 */
     void (*tcl_LimitSetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 526 */
     void (*tcl_LimitSetGranularity) (Tcl_Interp *interp, int type, int granularity); /* 527 */
     int (*tcl_LimitTypeEnabled) (Tcl_Interp *interp, int type); /* 528 */
@@ -2627,11 +2644,11 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_GetEncodingSearchPath) (void); /* 570 */
     int (*tcl_SetEncodingSearchPath) (Tcl_Obj *searchPath); /* 571 */
     const char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString *bufPtr); /* 572 */
-    int (*tcl_PkgRequireProc) (Tcl_Interp *interp, const char *name, int objc, Tcl_Obj *const objv[], void *clientDataPtr); /* 573 */
+    int (*tcl_PkgRequireProc) (Tcl_Interp *interp, const char *name, Tcl_Size objc, Tcl_Obj *const objv[], void *clientDataPtr); /* 573 */
     void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */
-    void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, const char *bytes, int length, int limit, const char *ellipsis); /* 575 */
-    Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, const char *format, int objc, Tcl_Obj *const objv[]); /* 576 */
-    int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *format, int objc, Tcl_Obj *const objv[]); /* 577 */
+    void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, const char *bytes, Tcl_Size length, Tcl_Size limit, const char *ellipsis); /* 575 */
+    Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, const char *format, Tcl_Size objc, Tcl_Obj *const objv[]); /* 576 */
+    int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, const char *format, Tcl_Size objc, Tcl_Obj *const objv[]); /* 577 */
     Tcl_Obj * (*tcl_ObjPrintf) (const char *format, ...) TCL_FORMAT_PRINTF(1, 2); /* 578 */
     void (*tcl_AppendPrintfToObj) (Tcl_Obj *objPtr, const char *format, ...) TCL_FORMAT_PRINTF(2, 3); /* 579 */
     int (*tcl_CancelEval) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr, void *clientData, int flags); /* 580 */
@@ -2639,10 +2656,10 @@ typedef struct TclStubs {
     int (*tcl_CreatePipe) (Tcl_Interp *interp, Tcl_Channel *rchan, Tcl_Channel *wchan, int flags); /* 582 */
     Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, Tcl_ObjCmdProc *nreProc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 583 */
     int (*tcl_NREvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 584 */
-    int (*tcl_NREvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags); /* 585 */
-    int (*tcl_NRCmdSwap) (Tcl_Interp *interp, Tcl_Command cmd, int objc, Tcl_Obj *const objv[], int flags); /* 586 */
+    int (*tcl_NREvalObjv) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 585 */
+    int (*tcl_NRCmdSwap) (Tcl_Interp *interp, Tcl_Command cmd, Tcl_Size objc, Tcl_Obj *const objv[], int flags); /* 586 */
     void (*tcl_NRAddCallback) (Tcl_Interp *interp, Tcl_NRPostProc *postProcPtr, void *data0, void *data1, void *data2, void *data3); /* 587 */
-    int (*tcl_NRCallObjProc) (Tcl_Interp *interp, Tcl_ObjCmdProc *objProc, void *clientData, int objc, Tcl_Obj *const objv[]); /* 588 */
+    int (*tcl_NRCallObjProc) (Tcl_Interp *interp, Tcl_ObjCmdProc *objProc, void *clientData, Tcl_Size objc, Tcl_Obj *const objv[]); /* 588 */
     unsigned (*tcl_GetFSDeviceFromStat) (const Tcl_StatBuf *statPtr); /* 589 */
     unsigned (*tcl_GetFSInodeFromStat) (const Tcl_StatBuf *statPtr); /* 590 */
     unsigned (*tcl_GetModeFromStat) (const Tcl_StatBuf *statPtr); /* 591 */
@@ -2665,15 +2682,15 @@ typedef struct TclStubs {
     int (*tcl_InterpActive) (Tcl_Interp *interp); /* 608 */
     void (*tcl_BackgroundException) (Tcl_Interp *interp, int code); /* 609 */
     int (*tcl_ZlibDeflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, int level, Tcl_Obj *gzipHeaderDictObj); /* 610 */
-    int (*tcl_ZlibInflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, int buffersize, Tcl_Obj *gzipHeaderDictObj); /* 611 */
-    unsigned int (*tcl_ZlibCRC32) (unsigned int crc, const unsigned char *buf, int len); /* 612 */
-    unsigned int (*tcl_ZlibAdler32) (unsigned int adler, const unsigned char *buf, int len); /* 613 */
+    int (*tcl_ZlibInflate) (Tcl_Interp *interp, int format, Tcl_Obj *data, Tcl_Size buffersize, Tcl_Obj *gzipHeaderDictObj); /* 611 */
+    unsigned int (*tcl_ZlibCRC32) (unsigned int crc, const unsigned char *buf, Tcl_Size len); /* 612 */
+    unsigned int (*tcl_ZlibAdler32) (unsigned int adler, const unsigned char *buf, Tcl_Size len); /* 613 */
     int (*tcl_ZlibStreamInit) (Tcl_Interp *interp, int mode, int format, int level, Tcl_Obj *dictObj, Tcl_ZlibStream *zshandle); /* 614 */
     Tcl_Obj * (*tcl_ZlibStreamGetCommandName) (Tcl_ZlibStream zshandle); /* 615 */
     int (*tcl_ZlibStreamEof) (Tcl_ZlibStream zshandle); /* 616 */
     int (*tcl_ZlibStreamChecksum) (Tcl_ZlibStream zshandle); /* 617 */
     int (*tcl_ZlibStreamPut) (Tcl_ZlibStream zshandle, Tcl_Obj *data, int flush); /* 618 */
-    int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj *data, int count); /* 619 */
+    int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj *data, Tcl_Size count); /* 619 */
     int (*tcl_ZlibStreamClose) (Tcl_ZlibStream zshandle); /* 620 */
     int (*tcl_ZlibStreamReset) (Tcl_ZlibStream zshandle); /* 621 */
     void (*tcl_SetStartupScript) (Tcl_Obj *path, const char *encoding); /* 622 */
@@ -2698,22 +2715,22 @@ typedef struct TclStubs {
     void (*tcl_IncrRefCount) (Tcl_Obj *objPtr); /* 641 */
     void (*tcl_DecrRefCount) (Tcl_Obj *objPtr); /* 642 */
     int (*tcl_IsShared) (Tcl_Obj *objPtr); /* 643 */
-    int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, int size); /* 644 */
-    int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, int endValue, int *indexPtr); /* 645 */
+    int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, Tcl_Size size); /* 644 */
+    int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size endValue, Tcl_Size *indexPtr); /* 645 */
     int (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
-    char * (*tcl_UniCharToUtfDString) (const int *uniStr, int uniLength, Tcl_DString *dsPtr); /* 647 */
-    int * (*tcl_UtfToUniCharDString) (const char *src, int length, Tcl_DString *dsPtr); /* 648 */
+    char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
+    int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
     unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
     unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, size_t *numBytesPtr); /* 650 */
     char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */
     unsigned short * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */
     unsigned char * (*tclGetByteArrayFromObj) (Tcl_Obj *objPtr, size_t *numBytesPtr); /* 653 */
-    int (*tcl_UtfCharComplete) (const char *src, int length); /* 654 */
+    int (*tcl_UtfCharComplete) (const char *src, Tcl_Size length); /* 654 */
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
     int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
-    int (*tcl_ExternalToUtfDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 658 */
-    int (*tcl_UtfToExternalDStringEx) (Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr); /* 659 */
+    Tcl_Size (*tcl_ExternalToUtfDStringEx) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr); /* 658 */
+    Tcl_Size (*tcl_UtfToExternalDStringEx) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr); /* 659 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
     int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
     int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *lengthPtr); /* 662 */
@@ -2722,12 +2739,12 @@ typedef struct TclStubs {
     void (*tclSplitPath) (const char *path, size_t *argcPtr, const char ***argvPtr); /* 665 */
     Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, size_t *lenPtr); /* 666 */
     int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, size_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
-    int (*tcl_UniCharLen) (const int *uniStr); /* 668 */
-    int (*tclNumUtfChars) (const char *src, int length); /* 669 */
-    int (*tclGetCharLength) (Tcl_Obj *objPtr); /* 670 */
-    const char * (*tclUtfAtIndex) (const char *src, int index); /* 671 */
-    Tcl_Obj * (*tclGetRange) (Tcl_Obj *objPtr, int first, int last); /* 672 */
-    int (*tclGetUniChar) (Tcl_Obj *objPtr, int index); /* 673 */
+    Tcl_Size (*tcl_UniCharLen) (const int *uniStr); /* 668 */
+    Tcl_Size (*tclNumUtfChars) (const char *src, Tcl_Size length); /* 669 */
+    Tcl_Size (*tclGetCharLength) (Tcl_Obj *objPtr); /* 670 */
+    const char * (*tclUtfAtIndex) (const char *src, Tcl_Size index); /* 671 */
+    Tcl_Obj * (*tclGetRange) (Tcl_Obj *objPtr, Tcl_Size first, Tcl_Size last); /* 672 */
+    int (*tclGetUniChar) (Tcl_Obj *objPtr, Tcl_Size index); /* 673 */
     int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *charPtr); /* 674 */
     int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *charPtr); /* 675 */
     Tcl_Command (*tcl_CreateObjCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 676 */
diff --git a/generic/tclIO.h b/generic/tclIO.h
index e8d2736..1da8478 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -36,12 +36,12 @@
  */
 
 typedef struct ChannelBuffer {
-    int refCount;		/* Current uses count */
-    int nextAdded;		/* The next position into which a character
+    Tcl_Size refCount;		/* Current uses count */
+    Tcl_Size nextAdded;		/* The next position into which a character
 				 * will be put in the buffer. */
-    int nextRemoved;		/* Position of next byte to be removed from
+    Tcl_Size nextRemoved;		/* Position of next byte to be removed from
 				 * the buffer. */
-    int bufLength;		/* How big is the buffer? */
+    Tcl_Size bufLength;		/* How big is the buffer? */
     struct ChannelBuffer *nextPtr;
     				/* Next buffer in chain. */
     char buf[TCLFLEXARRAY];		/* Placeholder for real buffer. The real
@@ -113,7 +113,7 @@ typedef struct Channel {
     ChannelBuffer *inQueueHead;	/* Points at first buffer in input queue. */
     ChannelBuffer *inQueueTail;	/* Points at last buffer in input queue. */
 
-    int refCount;
+    Tcl_Size refCount;
 } Channel;
 
 /*
@@ -163,7 +163,7 @@ typedef struct ChannelState {
     int unreportedError;	/* Non-zero if an error report was deferred
 				 * because it happened in the background. The
 				 * value is the POSIX error code. */
-    int refCount;		/* How many interpreters hold references to
+    Tcl_Size refCount;		/* How many interpreters hold references to
 				 * this IO channel? */
     struct CloseCallback *closeCbPtr;
 				/* Callbacks registered to be called when the
@@ -186,7 +186,7 @@ typedef struct ChannelState {
     EventScriptRecord *scriptRecordPtr;
 				/* Chain of all scripts registered for event
 				 * handlers ("fileevent") on this channel. */
-    int bufSize;		/* What size buffers to allocate? */
+    Tcl_Size bufSize;		/* What size buffers to allocate? */
     Tcl_TimerToken timer;	/* Handle to wakeup timer for this channel. */
     struct CopyState *csPtrR;	/* State of background copy for which channel
 				 * is input, or NULL. */
@@ -274,7 +274,7 @@ typedef struct ChannelState {
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
 #define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option
-					 * -nocomplaincoding is set to 1 */
+					 * -nocomplainencoding is set to 1 */
 #define CHANNEL_ENCODING_STRICT	(1<<18)	/* set if option
 					 * -strictencoding is set to 1 */
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 0092322..45a41ab 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -184,7 +184,7 @@ typedef struct Tcl_ResolvedVarInfo {
 } Tcl_ResolvedVarInfo;
 
 typedef int (Tcl_ResolveCompiledVarProc)(Tcl_Interp *interp,
-	const char *name, int length, Tcl_Namespace *context,
+	const char *name, Tcl_Size length, Tcl_Namespace *context,
 	Tcl_ResolvedVarInfo **rPtr);
 
 typedef int (Tcl_ResolveVarProc)(Tcl_Interp *interp, const char *name,
@@ -294,11 +294,11 @@ typedef struct Namespace {
 				 * namespace. */
     int flags;			/* OR-ed combination of the namespace status
 				 * flags NS_DYING and NS_DEAD listed below. */
-    int activationCount;	/* Number of "activations" or active call
+    Tcl_Size activationCount;	/* Number of "activations" or active call
 				 * frames for this namespace that are on the
 				 * Tcl call stack. The namespace won't be
 				 * freed until activationCount becomes zero. */
-    int refCount;		/* Count of references by namespaceName
+    Tcl_Size refCount;		/* Count of references by namespaceName
 				 * objects. The namespace can't be freed until
 				 * refCount becomes zero. */
     Tcl_HashTable cmdTable;	/* Contains all the commands currently
@@ -319,16 +319,16 @@ typedef struct Namespace {
 				 * commands; however, no namespace qualifiers
 				 * are allowed. NULL if no export patterns are
 				 * registered. */
-    int numExportPatterns;	/* Number of export patterns currently
+    Tcl_Size numExportPatterns;	/* Number of export patterns currently
 				 * registered using "namespace export". */
-    int maxExportPatterns;	/* Mumber of export patterns for which space
+    Tcl_Size maxExportPatterns;	/* Number of export patterns for which space
 				 * is currently allocated. */
-    int cmdRefEpoch;		/* Incremented if a newly added command
+    Tcl_Size cmdRefEpoch;		/* Incremented if a newly added command
 				 * shadows a command for which this namespace
 				 * has already cached a Command* pointer; this
 				 * causes all its cached Command* pointers to
 				 * be invalidated. */
-    int resolverEpoch;		/* Incremented whenever (a) the name
+    Tcl_Size resolverEpoch;		/* Incremented whenever (a) the name
 				 * resolution rules change for this namespace
 				 * or (b) a newly added command shadows a
 				 * command that is compiled to bytecodes. This
@@ -355,7 +355,7 @@ typedef struct Namespace {
 				 * LookupCompiledLocal to resolve variable
 				 * references within the namespace at compile
 				 * time. */
-    int exportLookupEpoch;	/* Incremented whenever a command is added to
+    Tcl_Size exportLookupEpoch;	/* Incremented whenever a command is added to
 				 * a namespace, removed from a namespace or
 				 * the exports of a namespace are changed.
 				 * Allows TIP#112-driven command lists to be
@@ -366,7 +366,7 @@ typedef struct Namespace {
     Tcl_Obj *unknownHandlerPtr;	/* A script fragment to be used when command
 				 * resolution in this namespace fails. TIP
 				 * 181. */
-    int commandPathLength;	/* The length of the explicit path. */
+    Tcl_Size commandPathLength;	/* The length of the explicit path. */
     NamespacePathEntry *commandPathArray;
 				/* The explicit path of the namespace as an
 				 * array. */
@@ -455,7 +455,7 @@ typedef struct EnsembleConfig {
 				 * if the command has been deleted (or never
 				 * existed; the global namespace never has an
 				 * ensemble command.) */
-    int epoch;			/* The epoch at which this ensemble's table of
+    Tcl_Size epoch;			/* The epoch at which this ensemble's table of
 				 * exported commands is valid. */
     char **subcommandArrayPtr;	/* Array of ensemble subcommand names. At all
 				 * consistent points, this will have the same
@@ -512,7 +512,7 @@ typedef struct EnsembleConfig {
 				 * core, presumably because the ensemble
 				 * itself has been updated. */
     Tcl_Obj *parameterList;	/* List of ensemble parameter names. */
-    int numParameters;		/* Cached number of parameters. This is either
+    Tcl_Size numParameters;		/* Cached number of parameters. This is either
 				 * 0 (if the parameterList field is NULL) or
 				 * the length of the list in the parameterList
 				 * field. */
@@ -568,7 +568,7 @@ typedef struct CommandTrace {
     struct CommandTrace *nextPtr;
 				/* Next in list of traces associated with a
 				 * particular command. */
-    int refCount;		/* Used to ensure this structure is not
+    Tcl_Size refCount;		/* Used to ensure this structure is not
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
@@ -641,7 +641,7 @@ typedef struct Var {
 
 typedef struct VarInHash {
     Var var;
-    int refCount;		/* Counts number of active uses of this
+    Tcl_Size refCount;		/* Counts number of active uses of this
 				 * variable: 1 for the entry in the hash
 				 * table, 1 for each additional variable whose
 				 * linkPtr points here, 1 for each nested
@@ -946,9 +946,9 @@ typedef struct CompiledLocal {
 				/* Next compiler-recognized local variable for
 				 * this procedure, or NULL if this is the last
 				 * local. */
-    int nameLength;		/* The number of bytes in local variable's name.
+    Tcl_Size nameLength;		/* The number of bytes in local variable's name.
 				 * Among others used to speed up var lookups. */
-    int frameIndex;		/* Index in the array of compiler-assigned
+    Tcl_Size frameIndex;		/* Index in the array of compiler-assigned
 				 * variables in the procedure call frame. */
     int flags;			/* Flag bits for the local variable. Same as
 				 * the flags for the Var structure above,
@@ -980,7 +980,7 @@ typedef struct CompiledLocal {
 typedef struct Proc {
     struct Interp *iPtr;	/* Interpreter for which this command is
 				 * defined. */
-    int refCount;		/* Reference count: 1 if still present in
+    Tcl_Size refCount;		/* Reference count: 1 if still present in
 				 * command table plus 1 for each call to the
 				 * procedure that is currently active. This
 				 * structure can be freed when refCount
@@ -991,8 +991,8 @@ typedef struct Proc {
 				 * procedure. */
     Tcl_Obj *bodyPtr;		/* Points to the ByteCode object for
 				 * procedure's body command. */
-    int numArgs;		/* Number of formal parameters. */
-    int numCompiledLocals;	/* Count of local variables recognized by the
+    Tcl_Size numArgs;		/* Number of formal parameters. */
+    Tcl_Size numCompiledLocals;	/* Count of local variables recognized by the
 				 * compiler including arguments and
 				 * temporaries. */
     CompiledLocal *firstLocalPtr;
@@ -1097,8 +1097,8 @@ typedef struct AssocData {
  */
 
 typedef struct LocalCache {
-    int refCount;
-    int numVars;
+    Tcl_Size refCount;
+    Tcl_Size numVars;
     Tcl_Obj *varName0;
 } LocalCache;
 
@@ -1118,7 +1118,7 @@ typedef struct CallFrame {
 				 * If FRAME_IS_PROC is set, the frame was
 				 * pushed to execute a Tcl procedure and may
 				 * have local vars. */
-    int objc;			/* This and objv below describe the arguments
+    Tcl_Size objc;			/* This and objv below describe the arguments
 				 * for this procedure call. */
     Tcl_Obj *const *objv;	/* Array of argument objects. */
     struct CallFrame *callerPtr;
@@ -1132,7 +1132,7 @@ typedef struct CallFrame {
 				 * callerPtr unless an "uplevel" command or
 				 * something equivalent was active in the
 				 * caller). */
-    int level;			/* Level of this procedure, for "uplevel"
+    Tcl_Size level;			/* Level of this procedure, for "uplevel"
 				 * purposes (i.e. corresponds to nesting of
 				 * callerVarPtr's, not callerPtr's). 1 for
 				 * outermost procedure, 0 for top-level. */
@@ -1146,8 +1146,8 @@ typedef struct CallFrame {
 				 * recognized by the compiler, or created at
 				 * execution time through, e.g., upvar.
 				 * Initially NULL and created if needed. */
-    int numCompiledLocals;	/* Count of local variables recognized by the
-				 * compiler including arguments. */
+    Tcl_Size numCompiledLocals;	/* Count of local variables recognized
+				 * by the compiler including arguments. */
     Var *compiledLocals;	/* Points to the array of local variables
 				 * recognized by the compiler. The compiler
 				 * emits code that refers to these variables
@@ -1208,7 +1208,7 @@ typedef struct CmdFrame {
     int level;			/* Number of frames in stack, prevent O(n)
 				 * scan of list. */
     int *line;			/* Lines the words of the command start on. */
-    int nline;
+    Tcl_Size nline;
     CallFrame *framePtr;	/* Procedure activation record, may be
 				 * NULL. */
     struct CmdFrame *nextPtr;	/* Link to calling frame. */
@@ -1252,7 +1252,7 @@ typedef struct CmdFrame {
     } data;
     Tcl_Obj *cmdObj;
     const char *cmd;		/* The executed command, if possible... */
-    int len;			/* ... and its length. */
+    Tcl_Size len;			/* ... and its length. */
     const struct CFWordBC *litarg;
 				/* Link to set of literal arguments which have
 				 * ben pushed on the lineLABCPtr stack by
@@ -1262,16 +1262,16 @@ typedef struct CmdFrame {
 
 typedef struct CFWord {
     CmdFrame *framePtr;		/* CmdFrame to access. */
-    int word;			/* Index of the word in the command. */
-    int refCount;		/* Number of times the word is on the
+    Tcl_Size word;			/* Index of the word in the command. */
+    Tcl_Size refCount;		/* Number of times the word is on the
 				 * stack. */
 } CFWord;
 
 typedef struct CFWordBC {
     CmdFrame *framePtr;		/* CmdFrame to access. */
-    int pc;			/* Instruction pointer of a command in
+    Tcl_Size pc;			/* Instruction pointer of a command in
 				 * ExtCmdLoc.loc[.] */
-    int word;			/* Index of word in
+    Tcl_Size word;			/* Index of word in
 				 * ExtCmdLoc.loc[cmd]->line[.] */
     struct CFWordBC *prevPtr;	/* Previous entry in stack for same Tcl_Obj. */
     struct CFWordBC *nextPtr;	/* Next entry for same command call. See
@@ -1300,7 +1300,7 @@ typedef struct CFWordBC {
 #define CLL_END		(-1)
 
 typedef struct ContLineLoc {
-    int num;			/* Number of entries in loc, not counting the
+    Tcl_Size num;			/* Number of entries in loc, not counting the
 				 * final -1 marker entry. */
     int loc[TCLFLEXARRAY];/* Table of locations, as character offsets.
 				 * The table is allocated as part of the
@@ -1350,7 +1350,7 @@ typedef struct {
 				 * proc field is NULL. */
 } ExtraFrameInfoField;
 typedef struct {
-    int length;			/* Length of array. */
+    Tcl_Size length;			/* Length of array. */
     ExtraFrameInfoField fields[2];
 				/* Really as long as necessary, but this is
 				 * long enough for nearly anything. */
@@ -1481,7 +1481,7 @@ typedef struct CoroutineData {
     CorContext running;
     Tcl_HashTable *lineLABCPtr;    /* See Interp.lineLABCPtr */
     void *stackLevel;
-    int auxNumLevels;		/* While the coroutine is running the
+    Tcl_Size auxNumLevels;		/* While the coroutine is running the
 				 * numLevels of the create/resume command is
 				 * stored here; for suspended coroutines it
 				 * holds the nesting numLevels at yield. */
@@ -1531,7 +1531,7 @@ typedef struct LiteralEntry {
 				 * NULL if end of chain. */
     Tcl_Obj *objPtr;		/* Points to Tcl object that holds the
 				 * literal's bytes and length. */
-    int refCount;		/* If in an interpreter's global literal
+    Tcl_Size refCount;		/* If in an interpreter's global literal
 				 * table, the number of ByteCode structures
 				 * that share the literal object; the literal
 				 * entry can be freed when refCount drops to
@@ -1673,12 +1673,12 @@ typedef struct Command {
 				 * recreated). */
     Namespace *nsPtr;		/* Points to the namespace containing this
 				 * command. */
-    int refCount;		/* 1 if in command hashtable plus 1 for each
+    Tcl_Size refCount;		/* 1 if in command hashtable plus 1 for each
 				 * reference from a CmdName Tcl object
 				 * representing a command's name in a ByteCode
 				 * instruction sequence. This structure can be
 				 * freed when refCount becomes zero. */
-    int cmdEpoch;		/* Incremented to invalidate any references
+    Tcl_Size cmdEpoch;		/* Incremented to invalidate any references
 				 * that point to this command when it is
 				 * renamed, deleted, hidden, or exposed. */
     CompileProc *compileProc;	/* Procedure called to compile command. NULL
@@ -1730,7 +1730,9 @@ typedef struct Command {
  */
 
 #define CMD_DYING		    0x01
-#define CMD_IS_DELETED		    0x01 /* Same as CMD_DYING (Deprecated) */
+#ifndef TCL_NO_DEPRECATED
+#   define CMD_IS_DELETED		    0x01 /* Same as CMD_DYING */
+#endif
 #define CMD_TRACE_ACTIVE	    0x02
 #define CMD_HAS_EXEC_TRACES	    0x04
 #define CMD_COMPILES_EXPANDED	    0x08
@@ -1875,12 +1877,12 @@ typedef struct Interp {
      * tclVar.c for usage.
      */
 
-    int numLevels;		/* Keeps track of how many nested calls to
+    Tcl_Size numLevels;		/* Keeps track of how many nested calls to
 				 * Tcl_Eval are in progress for this
 				 * interpreter. It's used to delay deletion of
 				 * the table until all Tcl_Eval invocations
 				 * are completed. */
-    int maxNestingDepth;	/* If numLevels exceeds this value then Tcl
+    Tcl_Size maxNestingDepth;	/* If numLevels exceeds this value then Tcl
 				 * assumes that infinite recursion has
 				 * occurred and it generates an error. */
     CallFrame *framePtr;	/* Points to top-most in stack of all nested
@@ -1933,7 +1935,7 @@ typedef struct Interp {
      * Miscellaneous information:
      */
 
-    int cmdCount;		/* Total number of times a command procedure
+    Tcl_Size cmdCount;		/* Total number of times a command procedure
 				 * has been called for this interpreter. */
     int evalFlags;		/* Flags to control next call to Tcl_Eval.
 				 * Normally zero, but may be set before
@@ -1945,7 +1947,7 @@ typedef struct Interp {
 				 * compiled by the interpreter. Indexed by the
 				 * string representations of literals. Used to
 				 * avoid creating duplicate objects. */
-    int compileEpoch;		/* Holds the current "compilation epoch" for
+    Tcl_Size compileEpoch;		/* Holds the current "compilation epoch" for
 				 * this interpreter. This is incremented to
 				 * invalidate existing ByteCodes when, e.g., a
 				 * command with a compile procedure is
@@ -1995,7 +1997,7 @@ typedef struct Interp {
 				/* First in list of active traces for interp,
 				 * or NULL if no active traces. */
 
-    int tracesForbiddingInline;	/* Count of traces (in the list headed by
+    Tcl_Size tracesForbiddingInline;	/* Count of traces (in the list headed by
 				 * tracePtr) that forbid inline bytecode
 				 * compilation. */
 
@@ -2025,7 +2027,7 @@ typedef struct Interp {
 				 * as flag values the same as the 'active'
 				 * field. */
 
-	int cmdCount;		/* Limit for how many commands to execute in
+	Tcl_Size cmdCount;		/* Limit for how many commands to execute in
 				 * the interpreter. */
 	LimitHandler *cmdHandlers;
 				/* Handlers to execute when the limit is
@@ -2061,9 +2063,9 @@ typedef struct Interp {
 				 * *root* ensemble command? (Nested ensembles
 				 * don't rewrite this.) NULL if we're not
 				 * processing an ensemble. */
-	int numRemovedObjs;	/* How many arguments have been stripped off
+	Tcl_Size numRemovedObjs;	/* How many arguments have been stripped off
 				 * because of ensemble processing. */
-	int numInsertedObjs;	/* How many of the current arguments were
+	Tcl_Size numInsertedObjs;	/* How many of the current arguments were
 				 * inserted by an ensemble. */
     } ensembleRewrite;
 
@@ -2392,7 +2394,7 @@ struct TclMaxAlignment {
  */
 
 #define TclOOM(ptr, size) \
-	((size) && ((ptr)||(Tcl_Panic("unable to alloc %u bytes", (size)),1)))
+	((size) && ((ptr)||(Tcl_Panic("unable to alloc %" TCL_Z_MODIFIER "u bytes", (size_t)(size)),1)))
 
 /*
  * The following enum values are used to specify the runtime platform setting
@@ -2436,23 +2438,16 @@ typedef enum TclEolTranslation {
 #define TCL_INVOKE_NO_UNKNOWN	(1<<1)
 #define TCL_INVOKE_NO_TRACEBACK	(1<<2)
 
-/*
- * ListSizeT is the type for holding list element counts. It's defined
- * simplify sharing source between Tcl8 and Tcl9.
- */
 #if TCL_MAJOR_VERSION > 8
 
-typedef size_t ListSizeT;
-
 /*
  * SSIZE_MAX, NOT SIZE_MAX as negative differences need to be expressed
- * between values of the ListSizeT type so limit the range to signed
+ * between values of the Tcl_Size type so limit the range to signed
  */
-#define ListSizeT_MAX ((ListSizeT)PTRDIFF_MAX)
+#define ListSizeT_MAX ((Tcl_Size)PTRDIFF_MAX)
 
 #else
 
-typedef int ListSizeT;
 #define ListSizeT_MAX INT_MAX
 
 #endif
@@ -2483,9 +2478,9 @@ typedef int ListSizeT;
  *
  */
 typedef struct ListStore {
-    ListSizeT firstUsed;    /* Index of first slot in use within slots[] */
-    ListSizeT numUsed;      /* Number of slots in use (starting firstUsed) */
-    ListSizeT numAllocated; /* Total number of slots[] array slots. */
+    Tcl_Size firstUsed;    /* Index of first slot in use within slots[] */
+    Tcl_Size numUsed;      /* Number of slots in use (starting firstUsed) */
+    Tcl_Size numAllocated; /* Total number of slots[] array slots. */
     size_t refCount;           /* Number of references to this instance */
     int flags;              /* LISTSTORE_* flags */
     Tcl_Obj *slots[TCLFLEXARRAY];      /* Variable size array. Grown as needed */
@@ -2497,7 +2492,7 @@ typedef struct ListStore {
 
 /* Max number of elements that can be contained in a list */
 #define LIST_MAX                                               \
-    ((ListSizeT)(((size_t)ListSizeT_MAX - offsetof(ListStore, slots)) \
+    ((Tcl_Size)(((size_t)ListSizeT_MAX - offsetof(ListStore, slots)) \
 		   / sizeof(Tcl_Obj *)))
 /* Memory size needed for a ListStore to hold numSlots_ elements */
 #define LIST_SIZE(numSlots_) \
@@ -2508,8 +2503,8 @@ typedef struct ListStore {
  * See comments above for ListStore
  */
 typedef struct ListSpan {
-    ListSizeT spanStart;    /* Starting index of the span */
-    ListSizeT spanLength;   /* Number of elements in the span */
+    Tcl_Size spanStart;    /* Starting index of the span */
+    Tcl_Size spanLength;   /* Number of elements in the span */
     size_t refCount;     /* Count of references to this span record */
 } ListSpan;
 #ifndef LIST_SPAN_THRESHOLD /* May be set on build line */
@@ -2835,7 +2830,7 @@ typedef void (TclInitProcessGlobalValueProc)(char **valuePtr, TCL_HASH_TYPE *len
  */
 
 typedef struct ProcessGlobalValue {
-    int epoch;			/* Epoch counter to detect changes in the
+    Tcl_Size epoch;			/* Epoch counter to detect changes in the
 				 * global value. */
     TCL_HASH_TYPE numBytes;	/* Length of the global string. */
     char *value;		/* The global string value. */
@@ -3009,7 +3004,7 @@ typedef struct ForIterData {
     Tcl_Obj *body;		/* Loop body. */
     Tcl_Obj *next;		/* Loop step script, NULL for 'while'. */
     const char *msg;		/* Error message part. */
-    int word;			/* Index of the body script in the command */
+    Tcl_Size word;			/* Index of the body script in the command */
 } ForIterData;
 
 /* TIP #357 - Structure doing the bookkeeping of handles for Tcl_LoadFile
@@ -3054,12 +3049,12 @@ struct Tcl_LoadHandle_ {
  */
 
 MODULE_SCOPE void	TclAppendBytesToByteArray(Tcl_Obj *objPtr,
-			    const unsigned char *bytes, int len);
+			    const unsigned char *bytes, Tcl_Size len);
 MODULE_SCOPE int	TclNREvalCmd(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    int flags);
-MODULE_SCOPE void	TclAdvanceContinuations(int *line, int **next,
+MODULE_SCOPE void	TclAdvanceContinuations(Tcl_Size *line, int **next,
 			    int loc);
-MODULE_SCOPE void	TclAdvanceLines(int *line, const char *start,
+MODULE_SCOPE void	TclAdvanceLines(Tcl_Size *line, const char *start,
 			    const char *end);
 MODULE_SCOPE void	TclArgumentEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc, CmdFrame *cf);
@@ -3067,7 +3062,7 @@ MODULE_SCOPE void	TclArgumentRelease(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc);
 MODULE_SCOPE void	TclArgumentBCEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc,
-			    void *codePtr, CmdFrame *cfPtr, int cmd, int pc);
+			    void *codePtr, CmdFrame *cfPtr, int cmd, Tcl_Size pc);
 MODULE_SCOPE void	TclArgumentBCRelease(Tcl_Interp *interp,
 			    CmdFrame *cfPtr);
 MODULE_SCOPE void	TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj,
@@ -3077,8 +3072,8 @@ MODULE_SCOPE int	TclAsyncNotifier(int sigNumber, Tcl_ThreadId threadId,
 MODULE_SCOPE void	TclAsyncMarkFromNotifier(void);
 MODULE_SCOPE double	TclBignumToDouble(const void *bignum);
 MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
-			    int strLen, const unsigned char *pattern,
-			    int ptnLen, int flags);
+			    Tcl_Size strLen, const unsigned char *pattern,
+			    Tcl_Size ptnLen, int flags);
 MODULE_SCOPE double	TclCeil(const void *a);
 MODULE_SCOPE void	TclChannelPreserve(Tcl_Channel chan);
 MODULE_SCOPE void	TclChannelRelease(Tcl_Channel chan);
@@ -3093,14 +3088,14 @@ MODULE_SCOPE Tcl_ObjCmdProc TclChannelNamesCmd;
 MODULE_SCOPE Tcl_NRPostProc TclClearRootEnsemble;
 MODULE_SCOPE int	TclCompareTwoNumbers(Tcl_Obj *valuePtr,
 			    Tcl_Obj *value2Ptr);
-MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, int num,
+MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, Tcl_Size num,
 			    int *loc);
 MODULE_SCOPE void	TclContinuationsEnterDerived(Tcl_Obj *objPtr,
 			    int start, int *clNext);
 MODULE_SCOPE ContLineLoc *TclContinuationsGet(Tcl_Obj *objPtr);
 MODULE_SCOPE void	TclContinuationsCopy(Tcl_Obj *objPtr,
 			    Tcl_Obj *originObjPtr);
-MODULE_SCOPE int	TclConvertElement(const char *src, int length,
+MODULE_SCOPE Tcl_Size	TclConvertElement(const char *src, Tcl_Size length,
 			    char *dst, int flags);
 MODULE_SCOPE Tcl_Command TclCreateObjCommandInNs(Tcl_Interp *interp,
 			    const char *cmdName, Tcl_Namespace *nsPtr,
@@ -3112,12 +3107,12 @@ MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(Tcl_Interp *interp,
 MODULE_SCOPE void	TclDeleteNamespaceVars(Namespace *nsPtr);
 MODULE_SCOPE void	TclDeleteNamespaceChildren(Namespace *nsPtr);
 MODULE_SCOPE int	TclFindDictElement(Tcl_Interp *interp,
-			    const char *dict, int dictLength,
+			    const char *dict, Tcl_Size dictLength,
 			    const char **elementPtr, const char **nextPtr,
-			    int *sizePtr, int *literalPtr);
+			    Tcl_Size *sizePtr, int *literalPtr);
 /* TIP #280 - Modified token based evaluation, with line information. */
 MODULE_SCOPE int	TclEvalEx(Tcl_Interp *interp, const char *script,
-			    int numBytes, int flags, int line,
+			    Tcl_Size numBytes, int flags, Tcl_Size line,
 			    int *clNextOuter, const char *outerScript);
 MODULE_SCOPE Tcl_ObjCmdProc TclFileAttrsCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileCopyCmd;
@@ -3140,7 +3135,7 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 			    Tcl_DString *toAppendPtr);
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *TclFetchEnsembleRoot(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, int objc, int *objcPtr);
+			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size *objcPtr);
 MODULE_SCOPE Tcl_Obj *const *TclEnsembleGetRewriteValues(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Namespace *TclEnsureNamespace(Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
@@ -3224,39 +3219,38 @@ MODULE_SCOPE void	TclInitObjSubsystem(void);
 MODULE_SCOPE int	TclInterpReady(Tcl_Interp *interp);
 MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
-MODULE_SCOPE Tcl_Obj *	TclJoinPath(int elements, Tcl_Obj * const objv[],
+MODULE_SCOPE Tcl_Obj *	TclJoinPath(Tcl_Size elements, Tcl_Obj * const objv[],
 			    int forceRelative);
 MODULE_SCOPE int	MakeTildeRelativePath(Tcl_Interp *interp, const char *user,
 			    const char *subPath, Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *	TclGetHomeDirObj(Tcl_Interp *interp, const char *user);
 MODULE_SCOPE Tcl_Obj *	TclResolveTildePath(Tcl_Interp *interp,
-                                            Tcl_Obj *pathObj);
+			    Tcl_Obj *pathObj);
 MODULE_SCOPE Tcl_Obj *	TclResolveTildePathList(Tcl_Obj *pathsObj);
 MODULE_SCOPE int	TclJoinThread(Tcl_ThreadId id, int *result);
 MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Obj *	TclLindexList(Tcl_Interp *interp,
 			    Tcl_Obj *listPtr, Tcl_Obj *argPtr);
 MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    int indexCount, Tcl_Obj *const indexArray[]);
+			    Tcl_Size indexCount, Tcl_Obj *const indexArray[]);
 /* TIP #280 */
-MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, int line, int n,
+MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, Tcl_Size line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
-MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, int fromIdx,
-			    int toIdx);
 MODULE_SCOPE int	TclListObjAppendElements(Tcl_Interp *interp,
-			    Tcl_Obj *toObj, int elemCount,
+			    Tcl_Obj *toObj, Tcl_Size elemCount,
 			    Tcl_Obj *const elemObjv[]);
+MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, Tcl_Size fromIdx,
+			    Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    int indexCount, Tcl_Obj *const indexArray[],
+			    Tcl_Size indexCount, Tcl_Obj *const indexArray[],
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Command TclMakeEnsemble(Tcl_Interp *interp, const char *name,
 			    const EnsembleImplMap map[]);
 MODULE_SCOPE int TclMakeSafe(Tcl_Interp *interp);
-
-MODULE_SCOPE int	TclMaxListLength(const char *bytes, int numBytes,
+MODULE_SCOPE int	TclMaxListLength(const char *bytes, Tcl_Size numBytes,
 			    const char **endPtr);
 MODULE_SCOPE int	TclMergeReturnOptions(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr,
@@ -3274,15 +3268,15 @@ MODULE_SCOPE int	TclObjInvokeNamespace(Tcl_Interp *interp,
 MODULE_SCOPE int	TclObjUnsetVar2(Tcl_Interp *interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags);
 MODULE_SCOPE int	TclParseBackslash(const char *src,
-			    int numBytes, int *readPtr, char *dst);
-MODULE_SCOPE int	TclParseHex(const char *src, int numBytes,
+			    Tcl_Size numBytes, Tcl_Size *readPtr, char *dst);
+MODULE_SCOPE int	TclParseHex(const char *src, Tcl_Size numBytes,
 			    int *resultPtr);
 MODULE_SCOPE int	TclParseNumber(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    const char *expected, const char *bytes,
-			    int numBytes, const char **endPtrPtr, int flags);
+			    Tcl_Size numBytes, const char **endPtrPtr, int flags);
 MODULE_SCOPE void	TclParseInit(Tcl_Interp *interp, const char *string,
-			    int numBytes, Tcl_Parse *parsePtr);
-MODULE_SCOPE int	TclParseAllWhiteSpace(const char *src, int numBytes);
+			    Tcl_Size numBytes, Tcl_Parse *parsePtr);
+MODULE_SCOPE Tcl_Size	TclParseAllWhiteSpace(const char *src, Tcl_Size numBytes);
 MODULE_SCOPE int	TclProcessReturn(Tcl_Interp *interp,
 			    int code, int level, Tcl_Obj *returnOpts);
 MODULE_SCOPE int	TclpObjLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
@@ -3290,7 +3284,7 @@ MODULE_SCOPE Tcl_Obj *	TclpTempFileName(void);
 MODULE_SCOPE Tcl_Obj *  TclpTempFileNameForLibrary(Tcl_Interp *interp,
 			    Tcl_Obj* pathPtr);
 MODULE_SCOPE Tcl_Obj *	TclNewFSPathObj(Tcl_Obj *dirPtr, const char *addStrRep,
-			    int len);
+			    Tcl_Size len);
 MODULE_SCOPE void	TclpAlertNotifier(void *clientData);
 MODULE_SCOPE void *TclpNotifierData(void);
 MODULE_SCOPE void	TclpServiceModeHook(int mode);
@@ -3311,8 +3305,8 @@ MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    const char **errorMsgPtr);
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, void *clientData,
-			    int stackSize, int flags);
-MODULE_SCOPE int	TclpFindVariable(const char *name, int *lengthPtr);
+			    Tcl_Size stackSize, int flags);
+MODULE_SCOPE Tcl_Size	TclpFindVariable(const char *name, Tcl_Size *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
 			    TCL_HASH_TYPE *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
@@ -3327,9 +3321,9 @@ MODULE_SCOPE int	TclpMatchFiles(Tcl_Interp *interp, char *separators,
 MODULE_SCOPE int	TclpObjNormalizePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathPtr, int nextCheckpoint);
 MODULE_SCOPE void	TclpNativeJoinPath(Tcl_Obj *prefix, const char *joining);
-MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
+MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, Tcl_Size *lenPtr);
 MODULE_SCOPE Tcl_PathType TclpGetNativePathType(Tcl_Obj *pathPtr,
-			    int *driveNameLengthPtr, Tcl_Obj **driveNameRef);
+			    Tcl_Size *driveNameLengthPtr, Tcl_Obj **driveNameRef);
 MODULE_SCOPE int	TclCrossFilesystemCopy(Tcl_Interp *interp,
 			    Tcl_Obj *source, Tcl_Obj *target);
 MODULE_SCOPE int	TclpMatchInDirectory(Tcl_Interp *interp,
@@ -3360,9 +3354,9 @@ MODULE_SCOPE void	TclRememberJoinableThread(Tcl_ThreadId id);
 MODULE_SCOPE void	TclRememberMutex(Tcl_Mutex *mutex);
 MODULE_SCOPE void	TclRemoveScriptLimitCallbacks(Tcl_Interp *interp);
 MODULE_SCOPE int	TclReToGlob(Tcl_Interp *interp, const char *reStr,
-			    int reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
+			    Tcl_Size reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
 			    int *quantifiersFoundPtr);
-MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, int length,
+MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, Tcl_Size length,
 			    char *flagPtr);
 MODULE_SCOPE void	TclSetBgErrorHandler(Tcl_Interp *interp,
 			    Tcl_Obj *cmdPrefix);
@@ -3377,44 +3371,44 @@ MODULE_SCOPE void	TclSetProcessGlobalValue(ProcessGlobalValue *pgvPtr,
 			    Tcl_Obj *newValue, Tcl_Encoding encoding);
 MODULE_SCOPE void	TclSignalExitThread(Tcl_ThreadId id, int result);
 MODULE_SCOPE void	TclSpellFix(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, int objc, int subIdx,
+			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size subIdx,
 			    Tcl_Obj *bad, Tcl_Obj *fix);
 MODULE_SCOPE void *	TclStackRealloc(Tcl_Interp *interp, void *ptr,
-			    int numBytes);
+			    Tcl_Size numBytes);
 typedef int (*memCmpFn_t)(const void*, const void*, size_t);
 MODULE_SCOPE int	TclStringCmp(Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr,
-			    int checkEq, int nocase, int reqlength);
+			    int checkEq, int nocase, Tcl_Size reqlength);
 MODULE_SCOPE int	TclStringCmpOpts(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int *nocase,
 			    int *reqlength);
-MODULE_SCOPE int	TclStringMatch(const char *str, int strLen,
+MODULE_SCOPE int	TclStringMatch(const char *str, Tcl_Size strLen,
 			    const char *pattern, int ptnLen, int flags);
 MODULE_SCOPE int	TclStringMatchObj(Tcl_Obj *stringObj,
 			    Tcl_Obj *patternObj, int flags);
 MODULE_SCOPE void	TclSubstCompile(Tcl_Interp *interp, const char *bytes,
-			    int numBytes, int flags, int line,
+			    Tcl_Size numBytes, int flags, Tcl_Size line,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, int numOpts,
+MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, Tcl_Size numOpts,
 			    Tcl_Obj *const opts[], int *flagPtr);
 MODULE_SCOPE void	TclSubstParse(Tcl_Interp *interp, const char *bytes,
-			    int numBytes, int flags, Tcl_Parse *parsePtr,
+			    Tcl_Size numBytes, int flags, Tcl_Parse *parsePtr,
 			    Tcl_InterpState *statePtr);
 MODULE_SCOPE int	TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
-			    int count, int *tokensLeftPtr, int line,
+			    Tcl_Size count, int *tokensLeftPtr, Tcl_Size line,
 			    int *clNextOuter, const char *outerScript);
-MODULE_SCOPE int	TclTrim(const char *bytes, int numBytes,
-			    const char *trim, int numTrim, int *trimRight);
-MODULE_SCOPE int	TclTrimLeft(const char *bytes, int numBytes,
-			    const char *trim, int numTrim);
-MODULE_SCOPE int	TclTrimRight(const char *bytes, int numBytes,
-			    const char *trim, int numTrim);
+MODULE_SCOPE Tcl_Size	TclTrim(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim, Tcl_Size *trimRight);
+MODULE_SCOPE Tcl_Size	TclTrimLeft(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim);
+MODULE_SCOPE Tcl_Size	TclTrimRight(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim);
 MODULE_SCOPE const char*TclGetCommandTypeName(Tcl_Command command);
 MODULE_SCOPE void	TclRegisterCommandTypeName(
 			    Tcl_ObjCmdProc *implementationProc,
 			    const char *nameStr);
 MODULE_SCOPE int	TclUtfCmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCasecmp(const char *cs, const char *ct);
-MODULE_SCOPE int	TclUtfCount(int ch);
+MODULE_SCOPE Tcl_Size	TclUtfCount(int ch);
 #if TCL_UTF_MAX > 3
 #   define TclUtfToUCS4 Tcl_UtfToUniChar
 #   define TclUniCharToUCS4(src, ptr) (*ptr = *(src),1)
@@ -3461,7 +3455,7 @@ MODULE_SCOPE void	TclpThreadDeleteKey(void *keyPtr);
 MODULE_SCOPE void	TclpThreadSetGlobalTSD(void *tsdKeyPtr, void *ptr);
 MODULE_SCOPE void *	TclpThreadGetGlobalTSD(void *tsdKeyPtr);
 MODULE_SCOPE void	TclErrorStackResetIf(Tcl_Interp *interp,
-			    const char *msg, int length);
+			    const char *msg, Tcl_Size length);
 /* Tip 430 */
 MODULE_SCOPE int    TclZipfs_Init(Tcl_Interp *interp);
 
@@ -3551,7 +3545,7 @@ MODULE_SCOPE int	TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
 			    Tcl_Obj *part2Ptr, int index, int pathc,
 			    Tcl_Obj *const pathv[], Tcl_Obj *keysPtr);
 MODULE_SCOPE Tcl_Obj *	TclDictWithInit(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-			    int pathc, Tcl_Obj *const pathv[]);
+			    Tcl_Size pathc, Tcl_Obj *const pathv[]);
 MODULE_SCOPE Tcl_ObjCmdProc Tcl_DisassembleObjCmd;
 
 /* Assemble command function */
@@ -4077,13 +4071,13 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
 MODULE_SCOPE Tcl_Obj *	TclStringCat(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    int start);
+			    Tcl_Size start);
 MODULE_SCOPE Tcl_Obj *	TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    int last);
+			    Tcl_Size last);
 MODULE_SCOPE Tcl_Obj *	TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int count, int flags);
+			    Tcl_Size count, int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReplace(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int first, int count, Tcl_Obj *insertPtr,
+			    Tcl_Size first, Tcl_Size count, Tcl_Obj *insertPtr,
 			    int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReverse(Tcl_Obj *objPtr, int flags);
 
@@ -4197,12 +4191,12 @@ MODULE_SCOPE Tcl_Obj *	TclGetArrayDefault(Var *arrayPtr);
  */
 
 MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int before, int after, int *indexPtr);
-MODULE_SCOPE int	TclIndexDecode(int encoded, int endValue);
+			    Tcl_Size before, Tcl_Size after, int *indexPtr);
+MODULE_SCOPE Tcl_Size	TclIndexDecode(int encoded, Tcl_Size endValue);
 
 /* Constants used in index value encoding routines. */
-#define TCL_INDEX_END           (-2)
-#define TCL_INDEX_START         (0)
+#define TCL_INDEX_END           ((Tcl_Size)-2)
+#define TCL_INDEX_START         ((Tcl_Size)0)
 
 /*
  *----------------------------------------------------------------------
@@ -4474,7 +4468,7 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
  *
  * The ANSI C "prototype" for this macro is:
  *
- * MODULE_SCOPE void TclInitStringRep(Tcl_Obj *objPtr, char *bytePtr, int len);
+ * MODULE_SCOPE void TclInitStringRep(Tcl_Obj *objPtr, char *bytePtr, size_t len);
  *
  *----------------------------------------------------------------
  */
@@ -4840,7 +4834,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
  *
  * MODULE_SCOPE void	TclNewIntObj(Tcl_Obj *objPtr, Tcl_WideInt w);
  * MODULE_SCOPE void	TclNewDoubleObj(Tcl_Obj *objPtr, double d);
- * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, int len);
+ * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, Tcl_Size len);
  * MODULE_SCOPE void	TclNewLiteralStringObj(Tcl_Obj*objPtr, const char *sLiteral);
  *
  *----------------------------------------------------------------
@@ -5186,8 +5180,8 @@ typedef struct NRE_callback {
  * Other externals.
  */
 
-MODULE_SCOPE size_t TclEnvEpoch; /* Epoch of the tcl environment
-                                         * (if changed with tcl-env). */
+MODULE_SCOPE size_t TclEnvEpoch;	/* Epoch of the tcl environment
+					 * (if changed with tcl-env). */
 
 #endif /* _TCLINT */
 
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 78eb8a7..a1d080c 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -48,13 +48,13 @@
  */
 #define LIST_INDEX_ASSERT(idxarg_)                                 \
     do {                                                           \
-	ListSizeT idx_ = (idxarg_); /* To guard against ++ etc. */ \
+	Tcl_Size idx_ = (idxarg_); /* To guard against ++ etc. */ \
 	LIST_ASSERT(idx_ >= 0 && idx_ < LIST_MAX);                 \
     } while (0)
 /* Ditto for counts except upper limit is different */
 #define LIST_COUNT_ASSERT(countarg_)                                   \
     do {                                                               \
-	ListSizeT count_ = (countarg_); /* To guard against ++ etc. */ \
+	Tcl_Size count_ = (countarg_); /* To guard against ++ etc. */ \
 	LIST_ASSERT(count_ >= 0 && count_ <= LIST_MAX);                \
     } while (0)
 
@@ -121,21 +121,21 @@
  */
 static int	MemoryAllocationError(Tcl_Interp *, size_t size);
 static int	ListLimitExceededError(Tcl_Interp *);
-static ListStore *ListStoreNew(ListSizeT objc, Tcl_Obj *const objv[], int flags);
-static int	ListRepInit(ListSizeT objc, Tcl_Obj *const objv[], int flags, ListRep *);
+static ListStore *ListStoreNew(Tcl_Size objc, Tcl_Obj *const objv[], int flags);
+static int	ListRepInit(Tcl_Size objc, Tcl_Obj *const objv[], int flags, ListRep *);
 static int	ListRepInitAttempt(Tcl_Interp *,
-		    ListSizeT objc,
+		    Tcl_Size objc,
 		    Tcl_Obj *const objv[],
 		    ListRep *);
 static void	ListRepClone(ListRep *fromRepPtr, ListRep *toRepPtr, int flags);
 static void	ListRepUnsharedFreeUnreferenced(const ListRep *repPtr);
 static int	TclListObjGetRep(Tcl_Interp *, Tcl_Obj *listPtr, ListRep *repPtr);
 static void	ListRepRange(ListRep *srcRepPtr,
-		    ListSizeT rangeStart,
-		    ListSizeT rangeEnd,
+		    Tcl_Size rangeStart,
+		    Tcl_Size rangeEnd,
 		    int preserveSrcRep,
 		    ListRep *rangeRepPtr);
-static ListStore *ListStoreReallocate(ListStore *storePtr, ListSizeT numSlots);
+static ListStore *ListStoreReallocate(ListStore *storePtr, Tcl_Size numSlots);
 static void	ListRepValidate(const ListRep *repPtr, const char *file,
 		    int lineNum);
 static void	DupListInternalRep(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
@@ -237,8 +237,8 @@ const Tcl_ObjType tclListType = {
  */
 static inline ListSpan *
 ListSpanNew(
-    ListSizeT firstSlot, /* Starting slot index of the span */
-    ListSizeT numSlots)  /* Number of slots covered by the span */
+    Tcl_Size firstSlot, /* Starting slot index of the span */
+    Tcl_Size numSlots)  /* Number of slots covered by the span */
 {
     ListSpan *spanPtr = (ListSpan *) ckalloc(sizeof(*spanPtr));
     spanPtr->refCount = 0;
@@ -295,9 +295,9 @@ ListSpanDecrRefs(ListSpan *spanPtr)
  */
 static inline int
 ListSpanMerited(
-    ListSizeT length,                 /* Length of the proposed span */
-    ListSizeT usedStorageLength,      /* Number of slots currently in used */
-    ListSizeT allocatedStorageLength) /* Length of the currently allocation */
+    Tcl_Size length,                 /* Length of the proposed span */
+    Tcl_Size usedStorageLength,      /* Number of slots currently in used */
+    Tcl_Size allocatedStorageLength) /* Length of the currently allocation */
 {
     /*
      TODO
@@ -338,8 +338,8 @@ ListSpanMerited(
  *
  *------------------------------------------------------------------------
  */
-static inline ListSizeT
-ListStoreUpSize(ListSizeT numSlotsRequested) {
+static inline Tcl_Size
+ListStoreUpSize(Tcl_Size numSlotsRequested) {
     /* TODO -how much extra? May be double only for smaller requests? */
     return numSlotsRequested < (LIST_MAX / 2) ? 2 * numSlotsRequested
 						 : LIST_MAX;
@@ -391,8 +391,8 @@ ListRepFreeUnreferenced(const ListRep *repPtr)
 static inline void
 ObjArrayIncrRefs(
     Tcl_Obj * const *objv,  /* Pointer to the array */
-    ListSizeT startIdx,     /* Starting index of subarray within objv */
-    ListSizeT count)        /* Number of elements in the subarray */
+    Tcl_Size startIdx,     /* Starting index of subarray within objv */
+    Tcl_Size count)        /* Number of elements in the subarray */
 {
     Tcl_Obj * const *end;
     LIST_INDEX_ASSERT(startIdx);
@@ -423,8 +423,8 @@ ObjArrayIncrRefs(
 static inline void
 ObjArrayDecrRefs(
     Tcl_Obj * const *objv, /* Pointer to the array */
-    ListSizeT startIdx,    /* Starting index of subarray within objv */
-    ListSizeT count)       /* Number of elements in the subarray */
+    Tcl_Size startIdx,    /* Starting index of subarray within objv */
+    Tcl_Size count)       /* Number of elements in the subarray */
 {
     Tcl_Obj * const *end;
     LIST_INDEX_ASSERT(startIdx);
@@ -455,7 +455,7 @@ ObjArrayDecrRefs(
 static inline void
 ObjArrayCopy(
     Tcl_Obj **to,          /* Destination */
-    ListSizeT count,       /* Number of pointers to copy */
+    Tcl_Size count,       /* Number of pointers to copy */
     Tcl_Obj *const from[]) /* Source array of Tcl_Obj* */
 {
     Tcl_Obj **end;
@@ -547,7 +547,7 @@ ListLimitExceededError(Tcl_Interp *interp)
  *------------------------------------------------------------------------
  */
 static inline void
-ListRepUnsharedShiftDown(ListRep *repPtr, ListSizeT shiftCount)
+ListRepUnsharedShiftDown(ListRep *repPtr, Tcl_Size shiftCount)
 {
     ListStore *storePtr;
 
@@ -602,7 +602,7 @@ ListRepUnsharedShiftDown(ListRep *repPtr, ListSizeT shiftCount)
  */
 #if 0
 static inline void
-ListRepUnsharedShiftUp(ListRep *repPtr, ListSizeT shiftCount)
+ListRepUnsharedShiftUp(ListRep *repPtr, Tcl_Size shiftCount)
 {
     ListStore *storePtr;
 
@@ -750,12 +750,12 @@ TclListObjValidate(Tcl_Interp *interp, Tcl_Obj *listObj)
  */
 static ListStore *
 ListStoreNew(
-    ListSizeT objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[],
     int flags)
 {
     ListStore *storePtr;
-    ListSizeT capacity;
+    Tcl_Size capacity;
 
     /*
      * First check to see if we'd overflow and try to allocate an object
@@ -793,7 +793,7 @@ ListStoreNew(
     if (capacity == objc) {
 	storePtr->firstUsed = 0;
     } else {
-	ListSizeT extra = capacity - objc;
+	Tcl_Size extra = capacity - objc;
 	int spaceFlags = flags & LISTREP_SPACE_FLAGS;
 	if (spaceFlags == LISTREP_SPACE_ONLY_BACK) {
 	    storePtr->firstUsed = 0;
@@ -840,9 +840,9 @@ ListStoreNew(
  *------------------------------------------------------------------------
  */
 ListStore *
-ListStoreReallocate (ListStore *storePtr, ListSizeT numSlots)
+ListStoreReallocate (ListStore *storePtr, Tcl_Size numSlots)
 {
-    ListSizeT newCapacity;
+    Tcl_Size newCapacity;
     ListStore *newStorePtr;
 
     newCapacity = ListStoreUpSize(numSlots);
@@ -893,7 +893,7 @@ ListStoreReallocate (ListStore *storePtr, ListSizeT numSlots)
  */
 static int
 ListRepInit(
-    ListSizeT objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[],
     int flags,
     ListRep *repPtr
@@ -949,7 +949,7 @@ ListRepInit(
 static int
 ListRepInitAttempt(
     Tcl_Interp *interp,
-    ListSizeT objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[],
     ListRep *repPtr)
 {
@@ -990,7 +990,7 @@ static void
 ListRepClone(ListRep *fromRepPtr, ListRep *toRepPtr, int flags)
 {
     Tcl_Obj **fromObjs;
-    ListSizeT numFrom;
+    Tcl_Size numFrom;
 
     ListRepElements(fromRepPtr, numFrom, fromObjs);
     ListRepInit(numFrom, fromObjs, flags | LISTREP_PANIC_ON_FAIL, toRepPtr);
@@ -1018,7 +1018,7 @@ ListRepClone(ListRep *fromRepPtr, ListRep *toRepPtr, int flags)
  */
 static void ListRepUnsharedFreeUnreferenced(const ListRep *repPtr)
 {
-    ListSizeT count;
+    Tcl_Size count;
     ListStore *storePtr;
     ListSpan *spanPtr;
 
@@ -1091,7 +1091,7 @@ static void ListRepUnsharedFreeUnreferenced(const ListRep *repPtr)
 
 Tcl_Obj *
 Tcl_NewListObj(
-    ListSizeT objc,		/* Count of objects referenced by objv. */
+    Tcl_Size objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
     return Tcl_DbNewListObj(objc, objv, "unknown", 0);
@@ -1101,7 +1101,7 @@ Tcl_NewListObj(
 
 Tcl_Obj *
 Tcl_NewListObj(
-    ListSizeT objc,		/* Count of objects referenced by objv. */
+    Tcl_Size objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
     ListRep listRep;
@@ -1153,7 +1153,7 @@ Tcl_NewListObj(
 
 Tcl_Obj *
 Tcl_DbNewListObj(
-    ListSizeT objc,		/* Count of objects referenced by objv. */
+    Tcl_Size objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[],	/* An array of pointers to Tcl objects. */
     const char *file,		/* The name of the source file calling this
 				 * function; used for debugging. */
@@ -1179,7 +1179,7 @@ Tcl_DbNewListObj(
 
 Tcl_Obj *
 Tcl_DbNewListObj(
-    ListSizeT objc,		/* Count of objects referenced by objv. */
+    Tcl_Size objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[],	/* An array of pointers to Tcl objects. */
     TCL_UNUSED(const char *) /*file*/,
     TCL_UNUSED(int) /*line*/)
@@ -1209,15 +1209,15 @@ Tcl_DbNewListObj(
  */
 Tcl_Obj *
 TclNewListObj2(
-    ListSizeT objc1,		/* Count of objects referenced by objv1. */
+    Tcl_Size objc1,		/* Count of objects referenced by objv1. */
     Tcl_Obj *const objv1[],	/* First array of pointers to Tcl objects. */
-    ListSizeT objc2,		/* Count of objects referenced by objv2. */
+    Tcl_Size objc2,		/* Count of objects referenced by objv2. */
     Tcl_Obj *const objv2[]	/* Second array of pointers to Tcl objects. */
 )
 {
     Tcl_Obj *listObj;
     ListStore *storePtr;
-    ListSizeT objc = objc1 + objc2;
+    Tcl_Size objc = objc1 + objc2;
 
     listObj = Tcl_NewListObj(objc, NULL);
     if (objc == 0) {
@@ -1313,7 +1313,7 @@ TclListObjGetRep(
 void
 Tcl_SetListObj(
     Tcl_Obj *objPtr,		/* Object whose internal rep to init. */
-    ListSizeT objc,		/* Count of objects referenced by objv. */
+    Tcl_Size objc,		/* Count of objects referenced by objv. */
     Tcl_Obj *const objv[])	/* An array of pointers to Tcl objects. */
 {
     if (Tcl_IsShared(objPtr)) {
@@ -1413,17 +1413,17 @@ TclListObjCopy(
 static void
 ListRepRange(
     ListRep *srcRepPtr,    /* Contains source of the range */
-    ListSizeT rangeStart,  /* Index of first element to include */
-    ListSizeT rangeEnd,    /* Index of last element to include */
+    Tcl_Size rangeStart,  /* Index of first element to include */
+    Tcl_Size rangeEnd,    /* Index of last element to include */
     int preserveSrcRep,    /* If true, srcRepPtr contents must not be
 			      modified (generally because a shared Tcl_Obj
 			      references it) */
     ListRep *rangeRepPtr)  /* Output. Must NOT be == srcRepPtr */
 {
     Tcl_Obj **srcElems;
-    ListSizeT numSrcElems = ListRepLength(srcRepPtr);
-    ListSizeT rangeLen;
-    ListSizeT numAfterRangeEnd;
+    Tcl_Size numSrcElems = ListRepLength(srcRepPtr);
+    Tcl_Size rangeLen;
+    Tcl_Size numAfterRangeEnd;
 
     LISTREP_CHECK(srcRepPtr);
 
@@ -1490,7 +1490,7 @@ ListRepRange(
 			       srcRepPtr->storePtr->numUsed,
 			       srcRepPtr->storePtr->numAllocated)) {
 	/* Option 2 - because span would be most efficient */
-	ListSizeT spanStart = ListRepStart(srcRepPtr) + rangeStart;
+	Tcl_Size spanStart = ListRepStart(srcRepPtr) + rangeStart;
 	if (!preserveSrcRep && srcRepPtr->spanPtr
 	    && srcRepPtr->spanPtr->refCount <= 1) {
 	    /* If span is not shared reuse it */
@@ -1602,8 +1602,8 @@ ListRepRange(
 Tcl_Obj *
 TclListObjRange(
     Tcl_Obj *listObj,		/* List object to take a range from. */
-    ListSizeT rangeStart,	/* Index of first element to include. */
-    ListSizeT rangeEnd)		/* Index of last element to include. */
+    Tcl_Size rangeStart,	/* Index of first element to include. */
+    Tcl_Size rangeEnd)		/* Index of last element to include. */
 {
     ListRep listRep;
     ListRep resultRep;
@@ -1660,7 +1660,7 @@ Tcl_ListObjGetElements(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
     Tcl_Obj *objPtr,		/* List object for which an element array is
 				 * to be returned. */
-    ListSizeT *objcPtr,		/* Where to store the count of objects
+    Tcl_Size *objcPtr,		/* Where to store the count of objects
 				 * referenced by objv. */
     Tcl_Obj ***objvPtr)		/* Where to store the pointer to an array of
 				 * pointers to the list's objects. */
@@ -1705,7 +1705,7 @@ Tcl_ListObjAppendList(
     Tcl_Obj *toObj,		/* List object to append elements to. */
     Tcl_Obj *fromObj)		/* List obj with elements to append. */
 {
-    ListSizeT objc;
+    Tcl_Size objc;
     Tcl_Obj **objv;
 
     if (Tcl_IsShared(toObj)) {
@@ -1749,13 +1749,13 @@ Tcl_ListObjAppendList(
  int TclListObjAppendElements (
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
     Tcl_Obj *toObj,		/* List object to append */
-    ListSizeT elemCount,        /* Number of elements in elemObjs[] */
+    Tcl_Size elemCount,        /* Number of elements in elemObjs[] */
     Tcl_Obj * const elemObjv[])	/* Objects to append to toObj's list. */
 {
     ListRep listRep;
     Tcl_Obj **toObjv;
-    ListSizeT toLen;
-    ListSizeT finalLen;
+    Tcl_Size toLen;
+    Tcl_Size finalLen;
 
     if (Tcl_IsShared(toObj)) {
 	Tcl_Panic("%s called with shared object", "TclListObjAppendElements");
@@ -1780,7 +1780,7 @@ Tcl_ListObjAppendList(
 	 * reference counts on the elements which is a substantial cost
 	 * if the list is not small.
 	 */
-	ListSizeT numTailFree;
+	Tcl_Size numTailFree;
 
 	ListRepFreeUnreferenced(&listRep); /* Collect garbage before checking room */
 
@@ -1812,7 +1812,7 @@ Tcl_ListObjAppendList(
 	if (numTailFree < elemCount) {
 	    /* Not enough room at back. Move some to front */
             /* T:listrep-3.5 */
-	    ListSizeT shiftCount = elemCount - numTailFree;
+	    Tcl_Size shiftCount = elemCount - numTailFree;
 	    /* Divide remaining space between front and back */
 	    shiftCount += (listRep.storePtr->numAllocated - finalLen) / 2;
 	    LIST_ASSERT(shiftCount <= listRep.storePtr->firstUsed);
@@ -1940,11 +1940,11 @@ int
 Tcl_ListObjIndex(
     Tcl_Interp *interp,  /* Used to report errors if not NULL. */
     Tcl_Obj *listObj,    /* List object to index into. */
-    ListSizeT index,           /* Index of element to return. */
+    Tcl_Size index,           /* Index of element to return. */
     Tcl_Obj **objPtrPtr) /* The resulting Tcl_Obj* is stored here. */
 {
     Tcl_Obj **elemObjs;
-    ListSizeT numElems;
+    Tcl_Size numElems;
 
     /*
      * TODO
@@ -1993,7 +1993,7 @@ int
 Tcl_ListObjLength(
     Tcl_Interp *interp,	/* Used to report errors if not NULL. */
     Tcl_Obj *listObj,	/* List object whose #elements to return. */
-    ListSizeT *lenPtr)	/* The resulting int is stored here. */
+    Tcl_Size *lenPtr)	/* The resulting int is stored here. */
 {
     ListRep listRep;
 
@@ -2057,17 +2057,17 @@ int
 Tcl_ListObjReplace(
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
     Tcl_Obj *listObj,		/* List object whose elements to replace. */
-    ListSizeT first,		/* Index of first element to replace. */
-    ListSizeT numToDelete,	/* Number of elements to replace. */
-    ListSizeT numToInsert,	/* Number of objects to insert. */
+    Tcl_Size first,		/* Index of first element to replace. */
+    Tcl_Size numToDelete,	/* Number of elements to replace. */
+    Tcl_Size numToInsert,	/* Number of objects to insert. */
     Tcl_Obj *const insertObjs[])/* Tcl objects to insert */
 {
     ListRep listRep;
-    ListSizeT origListLen;
+    Tcl_Size origListLen;
     int lenChange;
     int leadSegmentLen;
     int tailSegmentLen;
-    ListSizeT numFreeSlots;
+    Tcl_Size numFreeSlots;
     int leadShift;
     int tailShift;
     Tcl_Obj **listObjs;
@@ -2186,7 +2186,7 @@ Tcl_ListObjReplace(
 	    ListRepStart(&listRep) == listRep.storePtr->firstUsed && /* (ii) */
 	    numToInsert <= listRep.storePtr->firstUsed               /* (iii) */
 	) {
-	    ListSizeT newLen;
+	    Tcl_Size newLen;
 	    LIST_ASSERT(numToInsert); /* Else would have returned above */
 	    listRep.storePtr->firstUsed -= numToInsert;
 	    ObjArrayCopy(&listRep.storePtr->slots[listRep.storePtr->firstUsed],
@@ -2393,7 +2393,7 @@ Tcl_ListObjReplace(
 	    if (finalFreeSpace > 1 && (tailSpace == 0 || tailSegmentLen == 0)) {
 		int postShiftLeadSpace = leadSpace - lenChange;
 		if (postShiftLeadSpace > (finalFreeSpace/2)) {
-		    ListSizeT extraShift = postShiftLeadSpace - (finalFreeSpace / 2);
+		    Tcl_Size extraShift = postShiftLeadSpace - (finalFreeSpace / 2);
 		    leadShift -= extraShift;
 		    tailShift = -extraShift; /* Move tail to the front as well */
 		}
@@ -2411,7 +2411,7 @@ Tcl_ListObjReplace(
 		int postShiftTailSpace = tailSpace - lenChange;
 		if (postShiftTailSpace > (finalFreeSpace/2)) {
 		    /* T:listrep-1.{1,3,14,18,21},3.{2,3,26,27} */
-		    ListSizeT extraShift = postShiftTailSpace - (finalFreeSpace / 2);
+		    Tcl_Size extraShift = postShiftTailSpace - (finalFreeSpace / 2);
 		    tailShift += extraShift;
 		    leadShift = extraShift; /* Move head to the back as well */
 		}
@@ -2456,7 +2456,7 @@ Tcl_ListObjReplace(
 	/* Will happen when we have to make room at bottom */
 	if (tailShift != 0 && tailSegmentLen != 0) {
             /* T:listrep-1.{1,3,14,18},3.{2,3,26,27} */
-	    ListSizeT tailStart = leadSegmentLen + numToDelete;
+	    Tcl_Size tailStart = leadSegmentLen + numToDelete;
 	    memmove(&listObjs[tailStart + tailShift],
 		    &listObjs[tailStart],
 		    tailSegmentLen * sizeof(Tcl_Obj *));
@@ -2476,7 +2476,7 @@ Tcl_ListObjReplace(
 	}
 	if (tailShift != 0 && tailSegmentLen != 0) {
             /* T:listrep-1.{7,17},3.{8:11,13,14,21,22,35,37,39:41} */
-	    ListSizeT tailStart = leadSegmentLen + numToDelete;
+	    Tcl_Size tailStart = leadSegmentLen + numToDelete;
 	    memmove(&listObjs[tailStart + tailShift],
 		    &listObjs[tailStart],
 		    tailSegmentLen * sizeof(Tcl_Obj *));
@@ -2546,10 +2546,10 @@ TclLindexList(
     Tcl_Obj *listObj,		/* List being unpacked. */
     Tcl_Obj *argObj)		/* Index or index list. */
 {
-    ListSizeT index;			/* Index into the list. */
+    Tcl_Size index;			/* Index into the list. */
     Tcl_Obj *indexListCopy;
     Tcl_Obj **indexObjs;
-    ListSizeT numIndexObjs;
+    Tcl_Size numIndexObjs;
 
     /*
      * Determine whether argPtr designates a list or a single index. We have
@@ -2623,16 +2623,16 @@ Tcl_Obj *
 TclLindexFlat(
     Tcl_Interp *interp,		/* Tcl interpreter. */
     Tcl_Obj *listObj,		/* Tcl object representing the list. */
-    ListSizeT indexCount,		/* Count of indices. */
+    Tcl_Size indexCount,		/* Count of indices. */
     Tcl_Obj *const indexArray[])/* Array of pointers to Tcl objects that
 				 * represent the indices in the list. */
 {
-    ListSizeT i;
+    Tcl_Size i;
 
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
 	Tcl_WideInt listLen = TclArithSeriesObjLength(listObj);
-	ListSizeT index;
+	Tcl_Size index;
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
 	    if (TclGetIntForIndexM(interp, indexArray[i], /*endValue*/ listLen-1,
@@ -2654,7 +2654,7 @@ TclLindexFlat(
     Tcl_IncrRefCount(listObj);
 
     for (i=0 ; i<indexCount && listObj ; i++) {
-	ListSizeT index, listLen = 0;
+	Tcl_Size index, listLen = 0;
 	Tcl_Obj **elemPtrs = NULL, *sublistCopy;
 
 	/*
@@ -2736,10 +2736,10 @@ TclLsetList(
     Tcl_Obj *indexArgObj,	/* Index or index-list arg to 'lset'. */
     Tcl_Obj *valueObj)		/* Value arg to 'lset' or NULL to 'lpop'. */
 {
-    ListSizeT indexCount = 0;   /* Number of indices in the index list. */
+    Tcl_Size indexCount = 0;   /* Number of indices in the index list. */
     Tcl_Obj **indices = NULL;	/* Vector of indices in the index list. */
     Tcl_Obj *retValueObj;	/* Pointer to the list to be returned. */
-    ListSizeT index;            /* Current index in the list - discarded. */
+    Tcl_Size index;            /* Current index in the list - discarded. */
     Tcl_Obj *indexListCopy;
 
     /*
@@ -2817,17 +2817,17 @@ Tcl_Obj *
 TclLsetFlat(
     Tcl_Interp *interp,		/* Tcl interpreter. */
     Tcl_Obj *listObj,		/* Pointer to the list being modified. */
-    ListSizeT indexCount,		/* Number of index args. */
+    Tcl_Size indexCount,		/* Number of index args. */
     Tcl_Obj *const indexArray[],
 				/* Index args. */
     Tcl_Obj *valueObj)		/* Value arg to 'lset' or NULL to 'lpop'. */
 {
-    ListSizeT index, len;
+    Tcl_Size index, len;
     int result;
     Tcl_Obj *subListObj, *retValueObj;
     Tcl_Obj *pendingInvalidates[10];
     Tcl_Obj **pendingInvalidatesPtr = pendingInvalidates;
-    ListSizeT numPendingInvalidates = 0;
+    Tcl_Size numPendingInvalidates = 0;
 
     /*
      * If there are no indices, simply return the new value.  (Without
@@ -2876,7 +2876,7 @@ TclLsetFlat(
      */
 
     do {
-	ListSizeT elemCount;
+	Tcl_Size elemCount;
 	Tcl_Obj *parentList, **elemPtrs;
 
 	/*
@@ -3080,13 +3080,13 @@ TclListObjSetElement(
 				 * if not NULL. */
     Tcl_Obj *listObj,		/* List object in which element should be
 				 * stored. */
-    ListSizeT index,		/* Index of element to store. */
+    Tcl_Size index,		/* Index of element to store. */
     Tcl_Obj *valueObj)		/* Tcl object to store in the designated list
 				 * element. */
 {
     ListRep listRep;
     Tcl_Obj **elemPtrs;         /* Pointers to elements of the list. */
-    ListSizeT elemCount;		/* Number of elements in the list. */
+    Tcl_Size elemCount;		/* Number of elements in the list. */
 
     /* Ensure that the listObj parameter designates an unshared list. */
 
@@ -3242,7 +3242,7 @@ SetListFromAny(
 	Tcl_Obj *keyPtr, *valuePtr;
 	Tcl_DictSearch search;
 	int done;
-	ListSizeT size;
+	Tcl_Size size;
 
 	/*
 	 * Create the new list representation. Note that we do not need to do
@@ -3284,7 +3284,7 @@ SetListFromAny(
 	 * because it can be done an order of magnitude faster
 	 * and may occur frequently.
 	 */
-        ListSizeT j, size = TclArithSeriesObjLength(objPtr);
+        Tcl_Size j, size = TclArithSeriesObjLength(objPtr);
 
 	/* TODO - leave space in front and/or back? */
 	if (ListRepInitAttempt(
@@ -3306,7 +3306,7 @@ SetListFromAny(
 	}
 
     } else {
-	ListSizeT estCount, length;
+	Tcl_Size estCount, length;
 	const char *limit, *nextElem = TclGetStringFromObj(objPtr, &length);
 
 	/*
@@ -3333,7 +3333,7 @@ SetListFromAny(
 	while (nextElem < limit) {
 	    const char *elemStart;
 	    char *check;
-	    ListSizeT elemSize;
+	    Tcl_Size elemSize;
 	    int literal;
 
 	    if (TCL_OK != TclFindElement(interp, nextElem, limit - nextElem,
@@ -3417,7 +3417,7 @@ UpdateStringOfList(
 {
 #   define LOCAL_SIZE 64
     char localFlags[LOCAL_SIZE], *flagPtr = NULL;
-    ListSizeT numElems, i, length;
+    Tcl_Size numElems, i, length;
     TCL_HASH_TYPE bytesNeeded = 0;
     const char *elem, *start;
     char *dst;
@@ -3524,7 +3524,7 @@ TclListTestObj (int length, int leadingSpace, int endSpace)
 	endSpace = 0;
 
     ListRep listRep;
-    ListSizeT capacity;
+    Tcl_Size capacity;
     Tcl_Obj *listObj;
 
     TclNewObj(listObj);
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index f2bc0da..659c3e6 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -78,7 +78,7 @@ EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
 EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				Tcl_Interp *interp, const char *bundleName,
 				const char *bundleVersion,
-				int hasResourceFile, int maxPathLen,
+				int hasResourceFile, Tcl_Size maxPathLen,
 				char *libraryPath);
 /* 2 */
 EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
@@ -97,7 +97,7 @@ typedef struct TclPlatStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
     int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
-    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
     void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
 #endif /* MACOSX */
 } TclPlatStubs;
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 539c90f..ee6062b 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -552,7 +552,7 @@ Tcltest_Init(
 {
     Tcl_CmdInfo info;
     Tcl_Obj **objv, *objPtr;
-    size_t objc;
+    Tcl_Size objc;
     int index;
     static const char *const specialOptions[] = {
 	"-appinitprocerror", "-appinitprocdeleteinterp",
@@ -3539,7 +3539,7 @@ TestlistrepCmd(
 	    return TCL_ERROR;
 	} else {
 	    Tcl_Obj **objs;
-	    ListSizeT nobjs;
+	    Tcl_Size nobjs;
 	    ListRep listRep;
 	    Tcl_Obj *listRepObjs[4];
 
-- 
cgit v0.12


From 12d41d9775ba943e85a44f58c5930463712eca1f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 23 Oct 2022 10:44:39 +0000
Subject: Update rules.vc to version 11 (with TIP #628 support)

---
 win/rules.vc | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index fdc68e0..89a72ce 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change
 # the major version.
 RULES_VERSION_MAJOR = 1
-RULES_VERSION_MINOR = 10
+RULES_VERSION_MINOR = 11
 
 # The PROJECT macro must be defined by parent makefile.
 !if "$(PROJECT)" == ""
@@ -877,6 +877,11 @@ TCL_THREADS = 0
 USE_THREAD_ALLOC= 0
 !endif
 
+!if [nmakehlp -f $(OPTS) "tcl8"]
+!message *** Build for Tcl8
+TCL_BUILD_FOR = 8
+!endif
+
 !if $(TCL_MAJOR_VERSION) == 8
 !if [nmakehlp -f $(OPTS) "time64bit"]
 !message *** Force 64-bit time_t
@@ -1146,7 +1151,11 @@ TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
 TCLSCRIPTZIP    = $(OUT_DIR)\$(TCLSCRIPTZIPNAME)
 
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
+!else
+TCLSTUBLIBNAME	= $(STUBPREFIX).lib
+!endif
 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)
 TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"
 
@@ -1162,7 +1171,11 @@ TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
 
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
+!else
+TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib
+!endif
 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib
 # When building extensions, may be linking against Tcl that does not add
 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
@@ -1182,7 +1195,11 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 !if !exist($(TCLSH))
 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
 !endif
+!if $(TCL_MAJOR_VERSION) == 8
 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
+!else
+TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib
+!endif
 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib
 # When building extensions, may be linking against Tcl that does not add
 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
@@ -1198,7 +1215,11 @@ TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 
 !endif # TCLINSTALL
 
+!if !$(STATIC_BUILD) && "$(TCL_BUILD_FOR)" == "8"
+tcllibs = "$(TCLSTUBLIB)"
+!else
 tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"
+!endif
 
 !endif # $(DOING_TCL)
 
@@ -1218,7 +1239,7 @@ WISHNAMEPREFIX = wish
 WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe
 TKLIBNAME8	= tk$(TK_VERSION)$(SUFX).$(EXT)
 TKLIBNAME9	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
-!if $(TCL_MAJOR_VERSION) == 8
+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"
 TKLIBNAME	= tk$(TK_VERSION)$(SUFX).$(EXT)
 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib
 !else
@@ -1275,14 +1296,18 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
 PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
 PRJLIBNAME8	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 PRJLIBNAME9	= tcl9$(PROJECT)$(VERSION)$(SUFX).$(EXT)
-!if $(TCL_MAJOR_VERSION) == 8
+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"
 PRJLIBNAME	= $(PRJLIBNAME8)
 !else
 PRJLIBNAME	= $(PRJLIBNAME9)
 !endif
 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)
 
+!if $(TCL_MAJOR_VERSION) == 8
 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
+!else
+PRJSTUBLIBNAME	= $(STUBPREFIX).lib
+!endif
 PRJSTUBLIB	= $(OUT_DIR)\$(PRJSTUBLIBNAME)
 
 # If extension parent makefile has not defined a resource definition file,
@@ -1429,6 +1454,9 @@ COMPILERFLAGS  = /D_ATL_XP_TARGETING
 !if "$(TCL_UTF_MAX)" == "3"
 OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3
 !endif
+!if "$(TCL_BUILD_FOR)" == "8"
+OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
+!endif
 
 # Like the TEA system only set this non empty for non-Tk extensions
 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME
-- 
cgit v0.12


From 649be23ea62274f8e19a6019d3ec476470fb9206 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 23 Oct 2022 14:08:49 +0000
Subject: Change back some Tcl_Size usage to size_t (e.g. in MODULE_SCOPE
 definitions, which are not supported by TIP #628)

---
 generic/tcl.decls      |   2 +-
 generic/tclCompile.h   |  42 +++++++++--------
 generic/tclInt.h       | 122 +++++++++++++++++++++++++------------------------
 generic/tclPlatDecls.h |   4 +-
 4 files changed, 87 insertions(+), 83 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 23b9b0c..690fcfd 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2630,7 +2630,7 @@ interface tclPlat
 declare 1 {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, const char *bundleVersion,
-	    int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath)
+	    int hasResourceFile, size_t maxPathLen, char *libraryPath)
 }
 declare 2 {
     void Tcl_MacOSXNotifierAddRunLoopMode(const void *runLoopMode)
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index d86faef..b88fa4c 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1062,6 +1062,7 @@ typedef struct {
  *----------------------------------------------------------------
  */
 
+#if TCL_MAJOR_VERSION > 8
 MODULE_SCOPE Tcl_ObjCmdProc	TclNRInterpCoroutine;
 
 /*
@@ -1081,38 +1082,38 @@ MODULE_SCOPE ByteCode *	TclCompileObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
  */
 
 MODULE_SCOPE int	TclAttemptCompileProc(Tcl_Interp *interp,
-			    Tcl_Parse *parsePtr, Tcl_Size depth, Command *cmdPtr,
+			    Tcl_Parse *parsePtr, size_t depth, Command *cmdPtr,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCleanupStackForBreakContinue(CompileEnv *envPtr,
 			    ExceptionAux *auxPtr);
 MODULE_SCOPE void	TclCompileCmdWord(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Size count,
+			    Tcl_Token *tokenPtr, size_t count,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileExpr(Tcl_Interp *interp, const char *script,
-			    Tcl_Size numBytes, CompileEnv *envPtr, int optimize);
+			    size_t numBytes, CompileEnv *envPtr, int optimize);
 MODULE_SCOPE void	TclCompileExprWords(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Size numWords,
+			    Tcl_Token *tokenPtr, size_t numWords,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileInvocation(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Obj *cmdObj, Tcl_Size numWords,
+			    Tcl_Token *tokenPtr, Tcl_Obj *cmdObj, size_t numWords,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileScript(Tcl_Interp *interp,
-			    const char *script, Tcl_Size numBytes,
+			    const char *script, size_t numBytes,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileSyntaxError(Tcl_Interp *interp,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileTokens(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Size count,
+			    Tcl_Token *tokenPtr, size_t count,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileVarSubst(Tcl_Interp *interp,
 			    Tcl_Token *tokenPtr, CompileEnv *envPtr);
-MODULE_SCOPE Tcl_Size	TclCreateAuxData(void *clientData,
+MODULE_SCOPE size_t	TclCreateAuxData(void *clientData,
 			    const AuxDataType *typePtr, CompileEnv *envPtr);
-MODULE_SCOPE Tcl_Size	TclCreateExceptRange(ExceptionRangeType type,
+MODULE_SCOPE size_t	TclCreateExceptRange(ExceptionRangeType type,
 			    CompileEnv *envPtr);
-MODULE_SCOPE ExecEnv *	TclCreateExecEnv(Tcl_Interp *interp, Tcl_Size size);
+MODULE_SCOPE ExecEnv *	TclCreateExecEnv(Tcl_Interp *interp, size_t size);
 MODULE_SCOPE Tcl_Obj *	TclCreateLiteral(Interp *iPtr, const char *bytes,
-			    Tcl_Size length, TCL_HASH_TYPE hash, int *newPtr,
+			    size_t length, TCL_HASH_TYPE hash, int *newPtr,
 			    Namespace *nsPtr, int flags,
 			    LiteralEntry **globalPtrPtr);
 MODULE_SCOPE void	TclDeleteExecEnv(ExecEnv *eePtr);
@@ -1127,7 +1128,7 @@ MODULE_SCOPE void	TclExpandJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE int	TclNRExecuteByteCode(Tcl_Interp *interp,
 			    ByteCode *codePtr);
 MODULE_SCOPE Tcl_Obj *	TclFetchLiteral(CompileEnv *envPtr, TCL_HASH_TYPE index);
-MODULE_SCOPE Tcl_Size	TclFindCompiledLocal(const char *name, Tcl_Size nameChars,
+MODULE_SCOPE size_t	TclFindCompiledLocal(const char *name, size_t nameChars,
 			    int create, CompileEnv *envPtr);
 MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 			    JumpFixup *jumpFixupPtr, int jumpDist,
@@ -1135,13 +1136,13 @@ MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 MODULE_SCOPE void	TclFreeCompileEnv(CompileEnv *envPtr);
 MODULE_SCOPE void	TclFreeJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE int	TclGetIndexFromToken(Tcl_Token *tokenPtr,
-			    Tcl_Size before, Tcl_Size after, int *indexPtr);
+			    size_t before, size_t after, int *indexPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCode(CompileEnv *envPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCodeObj(Tcl_Obj *objPtr,
 			    const Tcl_ObjType *typePtr, CompileEnv *envPtr);
 MODULE_SCOPE void	TclInitCompileEnv(Tcl_Interp *interp,
 			    CompileEnv *envPtr, const char *string,
-			    Tcl_Size numBytes, const CmdFrame *invoker, int word);
+			    size_t numBytes, const CmdFrame *invoker, int word);
 MODULE_SCOPE void	TclInitJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE void	TclInitLiteralTable(LiteralTable *tablePtr);
 MODULE_SCOPE ExceptionRange *TclGetInnermostExceptionRange(CompileEnv *envPtr,
@@ -1156,9 +1157,9 @@ MODULE_SCOPE void	TclFinalizeLoopExceptionRange(CompileEnv *envPtr,
 MODULE_SCOPE char *	TclLiteralStats(LiteralTable *tablePtr);
 MODULE_SCOPE int	TclLog2(int value);
 #endif
-MODULE_SCOPE Tcl_Size	TclLocalScalar(const char *bytes, Tcl_Size numBytes,
+MODULE_SCOPE size_t	TclLocalScalar(const char *bytes, size_t numBytes,
 			    CompileEnv *envPtr);
-MODULE_SCOPE Tcl_Size	TclLocalScalarFromToken(Tcl_Token *tokenPtr,
+MODULE_SCOPE size_t	TclLocalScalarFromToken(Tcl_Token *tokenPtr,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclOptimizeBytecode(void *envPtr);
 #ifdef TCL_COMPILE_DEBUG
@@ -1168,9 +1169,9 @@ MODULE_SCOPE void	TclPrintByteCodeObj(Tcl_Interp *interp,
 MODULE_SCOPE int	TclPrintInstruction(ByteCode *codePtr,
 			    const unsigned char *pc);
 MODULE_SCOPE void	TclPrintObject(FILE *outFile,
-			    Tcl_Obj *objPtr, Tcl_Size maxChars);
+			    Tcl_Obj *objPtr, size_t maxChars);
 MODULE_SCOPE void	TclPrintSource(FILE *outFile,
-			    const char *string, Tcl_Size maxChars);
+			    const char *string, size_t maxChars);
 MODULE_SCOPE void	TclPushVarName(Tcl_Interp *interp,
 			    Tcl_Token *varTokenPtr, CompileEnv *envPtr,
 			    int flags, int *localIndexPtr,
@@ -1192,14 +1193,15 @@ MODULE_SCOPE int	TclWordKnownAtCompileTime(Tcl_Token *tokenPtr,
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE void	TclLogCommandInfo(Tcl_Interp *interp,
 			    const char *script, const char *command,
-			    Tcl_Size length, const unsigned char *pc,
+			    size_t length, const unsigned char *pc,
 			    Tcl_Obj **tosPtr);
 MODULE_SCOPE Tcl_Obj	*TclGetInnerContext(Tcl_Interp *interp,
 			    const unsigned char *pc, Tcl_Obj **tosPtr);
 MODULE_SCOPE Tcl_Obj	*TclNewInstNameObj(unsigned char inst);
 MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
-			    Tcl_Interp *interp, Tcl_Size objc,
+			    Tcl_Interp *interp, size_t objc,
 			    Tcl_Obj *const objv[], int isLambda);
+#endif /* TCL_MAJOR_VERSION > 8 */
 
 
 /*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 3bbbf39..5cdd9b4 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3017,13 +3017,14 @@ struct Tcl_LoadHandle_ {
  *----------------------------------------------------------------
  */
 
+#if TCL_MAJOR_VERSION > 8
 MODULE_SCOPE void	TclAppendBytesToByteArray(Tcl_Obj *objPtr,
-			    const unsigned char *bytes, Tcl_Size len);
+			    const unsigned char *bytes, size_t len);
 MODULE_SCOPE int	TclNREvalCmd(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    int flags);
-MODULE_SCOPE void	TclAdvanceContinuations(Tcl_Size *line, int **next,
+MODULE_SCOPE void	TclAdvanceContinuations(size_t *line, int **next,
 			    int loc);
-MODULE_SCOPE void	TclAdvanceLines(Tcl_Size *line, const char *start,
+MODULE_SCOPE void	TclAdvanceLines(size_t *line, const char *start,
 			    const char *end);
 MODULE_SCOPE void	TclArgumentEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc, CmdFrame *cf);
@@ -3031,7 +3032,7 @@ MODULE_SCOPE void	TclArgumentRelease(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc);
 MODULE_SCOPE void	TclArgumentBCEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc,
-			    void *codePtr, CmdFrame *cfPtr, int cmd, Tcl_Size pc);
+			    void *codePtr, CmdFrame *cfPtr, int cmd, size_t pc);
 MODULE_SCOPE void	TclArgumentBCRelease(Tcl_Interp *interp,
 			    CmdFrame *cfPtr);
 MODULE_SCOPE void	TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj,
@@ -3041,8 +3042,8 @@ MODULE_SCOPE int	TclAsyncNotifier(int sigNumber, Tcl_ThreadId threadId,
 MODULE_SCOPE void	TclAsyncMarkFromNotifier(void);
 MODULE_SCOPE double	TclBignumToDouble(const void *bignum);
 MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
-			    Tcl_Size strLen, const unsigned char *pattern,
-			    Tcl_Size ptnLen, int flags);
+			    size_t strLen, const unsigned char *pattern,
+			    size_t ptnLen, int flags);
 MODULE_SCOPE double	TclCeil(const void *a);
 MODULE_SCOPE void	TclChannelPreserve(Tcl_Channel chan);
 MODULE_SCOPE void	TclChannelRelease(Tcl_Channel chan);
@@ -3055,14 +3056,14 @@ MODULE_SCOPE Tcl_ObjCmdProc TclChannelNamesCmd;
 MODULE_SCOPE Tcl_NRPostProc TclClearRootEnsemble;
 MODULE_SCOPE int	TclCompareTwoNumbers(Tcl_Obj *valuePtr,
 			    Tcl_Obj *value2Ptr);
-MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, Tcl_Size num,
+MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, size_t num,
 			    int *loc);
 MODULE_SCOPE void	TclContinuationsEnterDerived(Tcl_Obj *objPtr,
 			    int start, int *clNext);
 MODULE_SCOPE ContLineLoc *TclContinuationsGet(Tcl_Obj *objPtr);
 MODULE_SCOPE void	TclContinuationsCopy(Tcl_Obj *objPtr,
 			    Tcl_Obj *originObjPtr);
-MODULE_SCOPE Tcl_Size	TclConvertElement(const char *src, Tcl_Size length,
+MODULE_SCOPE size_t	TclConvertElement(const char *src, size_t length,
 			    char *dst, int flags);
 MODULE_SCOPE Tcl_Command TclCreateObjCommandInNs(Tcl_Interp *interp,
 			    const char *cmdName, Tcl_Namespace *nsPtr,
@@ -3074,12 +3075,12 @@ MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(Tcl_Interp *interp,
 MODULE_SCOPE void	TclDeleteNamespaceVars(Namespace *nsPtr);
 MODULE_SCOPE void	TclDeleteNamespaceChildren(Namespace *nsPtr);
 MODULE_SCOPE int	TclFindDictElement(Tcl_Interp *interp,
-			    const char *dict, Tcl_Size dictLength,
+			    const char *dict, size_t dictLength,
 			    const char **elementPtr, const char **nextPtr,
-			    Tcl_Size *sizePtr, int *literalPtr);
+			    size_t *sizePtr, int *literalPtr);
 /* TIP #280 - Modified token based evaluation, with line information. */
 MODULE_SCOPE int	TclEvalEx(Tcl_Interp *interp, const char *script,
-			    Tcl_Size numBytes, int flags, Tcl_Size line,
+			    size_t numBytes, int flags, size_t line,
 			    int *clNextOuter, const char *outerScript);
 MODULE_SCOPE Tcl_ObjCmdProc TclFileAttrsCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileCopyCmd;
@@ -3102,7 +3103,7 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 			    Tcl_DString *toAppendPtr);
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *TclFetchEnsembleRoot(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size *objcPtr);
+			    Tcl_Obj *const *objv, size_t objc, size_t *objcPtr);
 MODULE_SCOPE Tcl_Obj *const *TclEnsembleGetRewriteValues(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Namespace *TclEnsureNamespace(Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
@@ -3186,7 +3187,7 @@ MODULE_SCOPE void	TclInitObjSubsystem(void);
 MODULE_SCOPE int	TclInterpReady(Tcl_Interp *interp);
 MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
-MODULE_SCOPE Tcl_Obj *	TclJoinPath(Tcl_Size elements, Tcl_Obj * const objv[],
+MODULE_SCOPE Tcl_Obj *	TclJoinPath(size_t elements, Tcl_Obj * const objv[],
 			    int forceRelative);
 MODULE_SCOPE int	MakeTildeRelativePath(Tcl_Interp *interp, const char *user,
 			    const char *subPath, Tcl_DString *dsPtr);
@@ -3199,25 +3200,25 @@ MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Obj *	TclLindexList(Tcl_Interp *interp,
 			    Tcl_Obj *listPtr, Tcl_Obj *argPtr);
 MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    Tcl_Size indexCount, Tcl_Obj *const indexArray[]);
+			    size_t indexCount, Tcl_Obj *const indexArray[]);
 /* TIP #280 */
-MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, Tcl_Size line, int n,
+MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, size_t line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
 MODULE_SCOPE int	TclListObjAppendElements(Tcl_Interp *interp,
-			    Tcl_Obj *toObj, Tcl_Size elemCount,
+			    Tcl_Obj *toObj, size_t elemCount,
 			    Tcl_Obj *const elemObjv[]);
-MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, Tcl_Size fromIdx,
-			    Tcl_Size toIdx);
+MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, size_t fromIdx,
+			    size_t toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    Tcl_Size indexCount, Tcl_Obj *const indexArray[],
+			    size_t indexCount, Tcl_Obj *const indexArray[],
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Command TclMakeEnsemble(Tcl_Interp *interp, const char *name,
 			    const EnsembleImplMap map[]);
 MODULE_SCOPE int TclMakeSafe(Tcl_Interp *interp);
-MODULE_SCOPE int	TclMaxListLength(const char *bytes, Tcl_Size numBytes,
+MODULE_SCOPE int	TclMaxListLength(const char *bytes, size_t numBytes,
 			    const char **endPtr);
 MODULE_SCOPE int	TclMergeReturnOptions(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr,
@@ -3236,15 +3237,15 @@ MODULE_SCOPE int	TclObjInvokeNamespace(Tcl_Interp *interp,
 MODULE_SCOPE int	TclObjUnsetVar2(Tcl_Interp *interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags);
 MODULE_SCOPE int	TclParseBackslash(const char *src,
-			    Tcl_Size numBytes, Tcl_Size *readPtr, char *dst);
-MODULE_SCOPE int	TclParseHex(const char *src, Tcl_Size numBytes,
+			    size_t numBytes, size_t *readPtr, char *dst);
+MODULE_SCOPE int	TclParseHex(const char *src, size_t numBytes,
 			    int *resultPtr);
 MODULE_SCOPE int	TclParseNumber(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    const char *expected, const char *bytes,
-			    Tcl_Size numBytes, const char **endPtrPtr, int flags);
+			    size_t numBytes, const char **endPtrPtr, int flags);
 MODULE_SCOPE void	TclParseInit(Tcl_Interp *interp, const char *string,
-			    Tcl_Size numBytes, Tcl_Parse *parsePtr);
-MODULE_SCOPE Tcl_Size	TclParseAllWhiteSpace(const char *src, Tcl_Size numBytes);
+			    size_t numBytes, Tcl_Parse *parsePtr);
+MODULE_SCOPE size_t	TclParseAllWhiteSpace(const char *src, size_t numBytes);
 MODULE_SCOPE int	TclProcessReturn(Tcl_Interp *interp,
 			    int code, int level, Tcl_Obj *returnOpts);
 MODULE_SCOPE int	TclpObjLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
@@ -3252,7 +3253,7 @@ MODULE_SCOPE Tcl_Obj *	TclpTempFileName(void);
 MODULE_SCOPE Tcl_Obj *  TclpTempFileNameForLibrary(Tcl_Interp *interp,
 			    Tcl_Obj* pathPtr);
 MODULE_SCOPE Tcl_Obj *	TclNewFSPathObj(Tcl_Obj *dirPtr, const char *addStrRep,
-			    Tcl_Size len);
+			    size_t len);
 MODULE_SCOPE void	TclpAlertNotifier(void *clientData);
 MODULE_SCOPE void *TclpNotifierData(void);
 MODULE_SCOPE void	TclpServiceModeHook(int mode);
@@ -3273,8 +3274,8 @@ MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    const char **errorMsgPtr);
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, void *clientData,
-			    Tcl_Size stackSize, int flags);
-MODULE_SCOPE Tcl_Size	TclpFindVariable(const char *name, Tcl_Size *lengthPtr);
+			    size_t stackSize, int flags);
+MODULE_SCOPE size_t	TclpFindVariable(const char *name, size_t *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
 			    TCL_HASH_TYPE *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
@@ -3289,9 +3290,9 @@ MODULE_SCOPE int	TclpMatchFiles(Tcl_Interp *interp, char *separators,
 MODULE_SCOPE int	TclpObjNormalizePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathPtr, int nextCheckpoint);
 MODULE_SCOPE void	TclpNativeJoinPath(Tcl_Obj *prefix, const char *joining);
-MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, Tcl_Size *lenPtr);
+MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr);
 MODULE_SCOPE Tcl_PathType TclpGetNativePathType(Tcl_Obj *pathPtr,
-			    Tcl_Size *driveNameLengthPtr, Tcl_Obj **driveNameRef);
+			    size_t *driveNameLengthPtr, Tcl_Obj **driveNameRef);
 MODULE_SCOPE int	TclCrossFilesystemCopy(Tcl_Interp *interp,
 			    Tcl_Obj *source, Tcl_Obj *target);
 MODULE_SCOPE int	TclpMatchInDirectory(Tcl_Interp *interp,
@@ -3322,9 +3323,9 @@ MODULE_SCOPE void	TclRememberJoinableThread(Tcl_ThreadId id);
 MODULE_SCOPE void	TclRememberMutex(Tcl_Mutex *mutex);
 MODULE_SCOPE void	TclRemoveScriptLimitCallbacks(Tcl_Interp *interp);
 MODULE_SCOPE int	TclReToGlob(Tcl_Interp *interp, const char *reStr,
-			    Tcl_Size reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
+			    size_t reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
 			    int *quantifiersFoundPtr);
-MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, Tcl_Size length,
+MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, size_t length,
 			    char *flagPtr);
 MODULE_SCOPE void	TclSetBgErrorHandler(Tcl_Interp *interp,
 			    Tcl_Obj *cmdPrefix);
@@ -3339,44 +3340,44 @@ MODULE_SCOPE void	TclSetProcessGlobalValue(ProcessGlobalValue *pgvPtr,
 			    Tcl_Obj *newValue, Tcl_Encoding encoding);
 MODULE_SCOPE void	TclSignalExitThread(Tcl_ThreadId id, int result);
 MODULE_SCOPE void	TclSpellFix(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size subIdx,
+			    Tcl_Obj *const *objv, size_t objc, size_t subIdx,
 			    Tcl_Obj *bad, Tcl_Obj *fix);
 MODULE_SCOPE void *	TclStackRealloc(Tcl_Interp *interp, void *ptr,
-			    Tcl_Size numBytes);
+			    size_t numBytes);
 typedef int (*memCmpFn_t)(const void*, const void*, size_t);
 MODULE_SCOPE int	TclStringCmp(Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr,
-			    int checkEq, int nocase, Tcl_Size reqlength);
+			    int checkEq, int nocase, size_t reqlength);
 MODULE_SCOPE int	TclStringCmpOpts(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int *nocase,
 			    int *reqlength);
-MODULE_SCOPE int	TclStringMatch(const char *str, Tcl_Size strLen,
+MODULE_SCOPE int	TclStringMatch(const char *str, size_t strLen,
 			    const char *pattern, int ptnLen, int flags);
 MODULE_SCOPE int	TclStringMatchObj(Tcl_Obj *stringObj,
 			    Tcl_Obj *patternObj, int flags);
 MODULE_SCOPE void	TclSubstCompile(Tcl_Interp *interp, const char *bytes,
-			    Tcl_Size numBytes, int flags, Tcl_Size line,
+			    size_t numBytes, int flags, size_t line,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, Tcl_Size numOpts,
+MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, size_t numOpts,
 			    Tcl_Obj *const opts[], int *flagPtr);
 MODULE_SCOPE void	TclSubstParse(Tcl_Interp *interp, const char *bytes,
-			    Tcl_Size numBytes, int flags, Tcl_Parse *parsePtr,
+			    size_t numBytes, int flags, Tcl_Parse *parsePtr,
 			    Tcl_InterpState *statePtr);
 MODULE_SCOPE int	TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
-			    Tcl_Size count, int *tokensLeftPtr, Tcl_Size line,
+			    size_t count, int *tokensLeftPtr, size_t line,
 			    int *clNextOuter, const char *outerScript);
-MODULE_SCOPE Tcl_Size	TclTrim(const char *bytes, Tcl_Size numBytes,
-			    const char *trim, Tcl_Size numTrim, Tcl_Size *trimRight);
-MODULE_SCOPE Tcl_Size	TclTrimLeft(const char *bytes, Tcl_Size numBytes,
-			    const char *trim, Tcl_Size numTrim);
-MODULE_SCOPE Tcl_Size	TclTrimRight(const char *bytes, Tcl_Size numBytes,
-			    const char *trim, Tcl_Size numTrim);
+MODULE_SCOPE size_t	TclTrim(const char *bytes, size_t numBytes,
+			    const char *trim, size_t numTrim, size_t *trimRight);
+MODULE_SCOPE size_t	TclTrimLeft(const char *bytes, size_t numBytes,
+			    const char *trim, size_t numTrim);
+MODULE_SCOPE size_t	TclTrimRight(const char *bytes, size_t numBytes,
+			    const char *trim, size_t numTrim);
 MODULE_SCOPE const char*TclGetCommandTypeName(Tcl_Command command);
 MODULE_SCOPE void	TclRegisterCommandTypeName(
 			    Tcl_ObjCmdProc *implementationProc,
 			    const char *nameStr);
 MODULE_SCOPE int	TclUtfCmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCasecmp(const char *cs, const char *ct);
-MODULE_SCOPE Tcl_Size	TclUtfCount(int ch);
+MODULE_SCOPE size_t	TclUtfCount(int ch);
 #if TCL_UTF_MAX > 3
 #   define TclUtfToUCS4 Tcl_UtfToUniChar
 #   define TclUniCharToUCS4(src, ptr) (*ptr = *(src),1)
@@ -3423,7 +3424,7 @@ MODULE_SCOPE void	TclpThreadDeleteKey(void *keyPtr);
 MODULE_SCOPE void	TclpThreadSetGlobalTSD(void *tsdKeyPtr, void *ptr);
 MODULE_SCOPE void *	TclpThreadGetGlobalTSD(void *tsdKeyPtr);
 MODULE_SCOPE void	TclErrorStackResetIf(Tcl_Interp *interp,
-			    const char *msg, Tcl_Size length);
+			    const char *msg, size_t length);
 /* Tip 430 */
 MODULE_SCOPE int    TclZipfs_Init(Tcl_Interp *interp);
 
@@ -3472,7 +3473,7 @@ MODULE_SCOPE int	TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
 			    Tcl_Obj *part2Ptr, int index, int pathc,
 			    Tcl_Obj *const pathv[], Tcl_Obj *keysPtr);
 MODULE_SCOPE Tcl_Obj *	TclDictWithInit(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-			    Tcl_Size pathc, Tcl_Obj *const pathv[]);
+			    size_t pathc, Tcl_Obj *const pathv[]);
 MODULE_SCOPE Tcl_ObjCmdProc Tcl_DisassembleObjCmd;
 
 /* Assemble command function */
@@ -3998,13 +3999,13 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
 MODULE_SCOPE Tcl_Obj *	TclStringCat(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    Tcl_Size start);
+			    size_t start);
 MODULE_SCOPE Tcl_Obj *	TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    Tcl_Size last);
+			    size_t last);
 MODULE_SCOPE Tcl_Obj *	TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    Tcl_Size count, int flags);
+			    size_t count, int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReplace(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    Tcl_Size first, Tcl_Size count, Tcl_Obj *insertPtr,
+			    size_t first, size_t count, Tcl_Obj *insertPtr,
 			    int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReverse(Tcl_Obj *objPtr, int flags);
 
@@ -4072,11 +4073,11 @@ MODULE_SCOPE int	TclFullFinalizationRequested(void);
  * TIP #542
  */
 
-MODULE_SCOPE Tcl_Size TclUniCharLen(const Tcl_UniChar *uniStr);
+MODULE_SCOPE size_t TclUniCharLen(const Tcl_UniChar *uniStr);
 MODULE_SCOPE int TclUniCharNcmp(const Tcl_UniChar *ucs,
-				const Tcl_UniChar *uct, Tcl_Size numChars);
+				const Tcl_UniChar *uct, size_t numChars);
 MODULE_SCOPE int TclUniCharNcasecmp(const Tcl_UniChar *ucs,
-				const Tcl_UniChar *uct, Tcl_Size numChars);
+				const Tcl_UniChar *uct, size_t numChars);
 MODULE_SCOPE int TclUniCharCaseMatch(const Tcl_UniChar *uniStr,
 				const Tcl_UniChar *uniPattern, int nocase);
 
@@ -4131,8 +4132,9 @@ MODULE_SCOPE Tcl_Obj *	TclGetArrayDefault(Var *arrayPtr);
  */
 
 MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    Tcl_Size before, Tcl_Size after, int *indexPtr);
-MODULE_SCOPE Tcl_Size	TclIndexDecode(int encoded, Tcl_Size endValue);
+			    size_t before, size_t after, int *indexPtr);
+MODULE_SCOPE size_t	TclIndexDecode(int encoded, size_t endValue);
+#endif /* TCL_MAJOR_VERSION > 8 */
 
 /* Constants used in index value encoding routines. */
 #define TCL_INDEX_END           ((Tcl_Size)-2)
@@ -4408,7 +4410,7 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
  *
  * The ANSI C "prototype" for this macro is:
  *
- * MODULE_SCOPE void TclInitStringRep(Tcl_Obj *objPtr, char *bytePtr, Tcl_Size len);
+ * MODULE_SCOPE void TclInitStringRep(Tcl_Obj *objPtr, char *bytePtr, size_t len);
  *
  *----------------------------------------------------------------
  */
@@ -4769,7 +4771,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
  *
  * MODULE_SCOPE void	TclNewIntObj(Tcl_Obj *objPtr, Tcl_WideInt w);
  * MODULE_SCOPE void	TclNewDoubleObj(Tcl_Obj *objPtr, double d);
- * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, Tcl_Size len);
+ * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, size_t len);
  * MODULE_SCOPE void	TclNewLiteralStringObj(Tcl_Obj*objPtr, const char *sLiteral);
  *
  *----------------------------------------------------------------
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 1c60bf8..10d3094 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -151,7 +151,7 @@ extern "C" {
 EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				Tcl_Interp *interp, const char *bundleName,
 				const char *bundleVersion,
-				int hasResourceFile, Tcl_Size maxPathLen,
+				int hasResourceFile, size_t maxPathLen,
 				char *libraryPath);
 /* 2 */
 EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
@@ -164,7 +164,7 @@ typedef struct TclPlatStubs {
     void *hooks;
 
     void (*reserved0)(void);
-    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, size_t maxPathLen, char *libraryPath); /* 1 */
     void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
     void (*tcl_WinConvertError) (unsigned errCode); /* 3 */
 } TclPlatStubs;
-- 
cgit v0.12


From 1f58beed10dd10570b37d1f8e54391bcf1fb7f7c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 23 Oct 2022 14:32:54 +0000
Subject: Change back some Tcl_Size usages to int (e.g. in MODULE_SCOPE
 definitions)

---
 generic/tcl.decls      |   4 +-
 generic/tclCompile.h   |  52 +++++++++----------
 generic/tclInt.h       | 133 ++++++++++++++++++++++++-------------------------
 generic/tclPlatDecls.h |   4 +-
 4 files changed, 94 insertions(+), 99 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 49f2b2c..a85c723 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2591,7 +2591,7 @@ declare 0 macosx {
 declare 1 macosx {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, const char *bundleVersion,
-	    int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath)
+	    int hasResourceFile, int maxPathLen, char *libraryPath)
 }
 declare 2 macosx {
     void Tcl_MacOSXNotifierAddRunLoopMode(const void *runLoopMode)
@@ -2602,7 +2602,7 @@ declare 2 macosx {
 # Public functions that are not accessible via the stubs table.
 
 export {
-    void Tcl_Main(int argc, char **argv, Tcl_AppInitProc *appInitProc)
+    void Tcl_Main(Tcl_Size argc, char **argv, Tcl_AppInitProc *appInitProc)
 }
 export {
     void Tcl_MainEx(Tcl_Size argc, char **argv, Tcl_AppInitProc *appInitProc,
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 7e062f0..2843ef5 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -217,7 +217,7 @@ typedef struct {
  * the AuxData structure.
  */
 
-typedef void      *(AuxDataDupProc)  (void *clientData);
+typedef void *(AuxDataDupProc)  (void *clientData);
 typedef void	   (AuxDataFreeProc) (void *clientData);
 typedef void	   (AuxDataPrintProc)(void *clientData,
 			    Tcl_Obj *appendObj, struct ByteCode *codePtr,
@@ -1093,38 +1093,38 @@ MODULE_SCOPE ByteCode *	TclCompileObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
  */
 
 MODULE_SCOPE int	TclAttemptCompileProc(Tcl_Interp *interp,
-			    Tcl_Parse *parsePtr, Tcl_Size depth, Command *cmdPtr,
+			    Tcl_Parse *parsePtr, int depth, Command *cmdPtr,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCleanupStackForBreakContinue(CompileEnv *envPtr,
 			    ExceptionAux *auxPtr);
 MODULE_SCOPE void	TclCompileCmdWord(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Size count,
+			    Tcl_Token *tokenPtr, int count,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileExpr(Tcl_Interp *interp, const char *script,
-			    Tcl_Size numBytes, CompileEnv *envPtr, int optimize);
+			    int numBytes, CompileEnv *envPtr, int optimize);
 MODULE_SCOPE void	TclCompileExprWords(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Size numWords,
+			    Tcl_Token *tokenPtr, int numWords,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileInvocation(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Obj *cmdObj, Tcl_Size numWords,
+			    Tcl_Token *tokenPtr, Tcl_Obj *cmdObj, int numWords,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileScript(Tcl_Interp *interp,
-			    const char *script, Tcl_Size numBytes,
+			    const char *script, int numBytes,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileSyntaxError(Tcl_Interp *interp,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileTokens(Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, Tcl_Size count,
+			    Tcl_Token *tokenPtr, int count,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclCompileVarSubst(Tcl_Interp *interp,
 			    Tcl_Token *tokenPtr, CompileEnv *envPtr);
-MODULE_SCOPE Tcl_Size	TclCreateAuxData(void *clientData,
+MODULE_SCOPE int	TclCreateAuxData(void *clientData,
 			    const AuxDataType *typePtr, CompileEnv *envPtr);
-MODULE_SCOPE Tcl_Size	TclCreateExceptRange(ExceptionRangeType type,
+MODULE_SCOPE int	TclCreateExceptRange(ExceptionRangeType type,
 			    CompileEnv *envPtr);
-MODULE_SCOPE ExecEnv *	TclCreateExecEnv(Tcl_Interp *interp, Tcl_Size size);
+MODULE_SCOPE ExecEnv *	TclCreateExecEnv(Tcl_Interp *interp, int size);
 MODULE_SCOPE Tcl_Obj *	TclCreateLiteral(Interp *iPtr, const char *bytes,
-			    Tcl_Size length, TCL_HASH_TYPE hash, int *newPtr,
+			    int length, TCL_HASH_TYPE hash, int *newPtr,
 			    Namespace *nsPtr, int flags,
 			    LiteralEntry **globalPtrPtr);
 MODULE_SCOPE void	TclDeleteExecEnv(ExecEnv *eePtr);
@@ -1139,7 +1139,7 @@ MODULE_SCOPE void	TclExpandJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE int	TclNRExecuteByteCode(Tcl_Interp *interp,
 			    ByteCode *codePtr);
 MODULE_SCOPE Tcl_Obj *	TclFetchLiteral(CompileEnv *envPtr, TCL_HASH_TYPE index);
-MODULE_SCOPE Tcl_Size	TclFindCompiledLocal(const char *name, Tcl_Size nameChars,
+MODULE_SCOPE int	TclFindCompiledLocal(const char *name, int nameChars,
 			    int create, CompileEnv *envPtr);
 MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 			    JumpFixup *jumpFixupPtr, int jumpDist,
@@ -1147,13 +1147,13 @@ MODULE_SCOPE int	TclFixupForwardJump(CompileEnv *envPtr,
 MODULE_SCOPE void	TclFreeCompileEnv(CompileEnv *envPtr);
 MODULE_SCOPE void	TclFreeJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE int	TclGetIndexFromToken(Tcl_Token *tokenPtr,
-			    Tcl_Size before, Tcl_Size after, int *indexPtr);
+			    int before, int after, int *indexPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCode(CompileEnv *envPtr);
 MODULE_SCOPE ByteCode *	TclInitByteCodeObj(Tcl_Obj *objPtr,
 			    const Tcl_ObjType *typePtr, CompileEnv *envPtr);
 MODULE_SCOPE void	TclInitCompileEnv(Tcl_Interp *interp,
 			    CompileEnv *envPtr, const char *string,
-			    Tcl_Size numBytes, const CmdFrame *invoker, int word);
+			    int numBytes, const CmdFrame *invoker, int word);
 MODULE_SCOPE void	TclInitJumpFixupArray(JumpFixupArray *fixupArrayPtr);
 MODULE_SCOPE void	TclInitLiteralTable(LiteralTable *tablePtr);
 MODULE_SCOPE ExceptionRange *TclGetInnermostExceptionRange(CompileEnv *envPtr,
@@ -1168,9 +1168,9 @@ MODULE_SCOPE void	TclFinalizeLoopExceptionRange(CompileEnv *envPtr,
 MODULE_SCOPE char *	TclLiteralStats(LiteralTable *tablePtr);
 MODULE_SCOPE int	TclLog2(int value);
 #endif
-MODULE_SCOPE Tcl_Size	TclLocalScalar(const char *bytes, Tcl_Size numBytes,
+MODULE_SCOPE int	TclLocalScalar(const char *bytes, int numBytes,
 			    CompileEnv *envPtr);
-MODULE_SCOPE Tcl_Size	TclLocalScalarFromToken(Tcl_Token *tokenPtr,
+MODULE_SCOPE int	TclLocalScalarFromToken(Tcl_Token *tokenPtr,
 			    CompileEnv *envPtr);
 MODULE_SCOPE void	TclOptimizeBytecode(void *envPtr);
 #ifdef TCL_COMPILE_DEBUG
@@ -1180,9 +1180,9 @@ MODULE_SCOPE void	TclPrintByteCodeObj(Tcl_Interp *interp,
 MODULE_SCOPE int	TclPrintInstruction(ByteCode *codePtr,
 			    const unsigned char *pc);
 MODULE_SCOPE void	TclPrintObject(FILE *outFile,
-			    Tcl_Obj *objPtr, Tcl_Size maxChars);
+			    Tcl_Obj *objPtr, int maxChars);
 MODULE_SCOPE void	TclPrintSource(FILE *outFile,
-			    const char *string, Tcl_Size maxChars);
+			    const char *string, int maxChars);
 MODULE_SCOPE void	TclPushVarName(Tcl_Interp *interp,
 			    Tcl_Token *varTokenPtr, CompileEnv *envPtr,
 			    int flags, int *localIndexPtr,
@@ -1204,13 +1204,13 @@ MODULE_SCOPE int	TclWordKnownAtCompileTime(Tcl_Token *tokenPtr,
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE void	TclLogCommandInfo(Tcl_Interp *interp,
 			    const char *script, const char *command,
-			    Tcl_Size length, const unsigned char *pc,
+			    int length, const unsigned char *pc,
 			    Tcl_Obj **tosPtr);
 MODULE_SCOPE Tcl_Obj	*TclGetInnerContext(Tcl_Interp *interp,
 			    const unsigned char *pc, Tcl_Obj **tosPtr);
 MODULE_SCOPE Tcl_Obj	*TclNewInstNameObj(unsigned char inst);
 MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
-			    Tcl_Interp *interp, Tcl_Size objc,
+			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int isLambda);
 
 
@@ -1543,7 +1543,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
  * these macros are:
  *
  * static void		PushLiteral(CompileEnv *envPtr,
- *			    const char *string, Tcl_Size length);
+ *			    const char *string, int length);
  * static void		PushStringLiteral(CompileEnv *envPtr,
  *			    const char *string);
  */
@@ -1580,9 +1580,9 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
  * of LOOP ranges is an interesting datum for debugging purposes, and that is
  * what we compute now.
  *
- * static int	ExceptionRangeStarts(CompileEnv *envPtr, Tcl_Size index);
- * static void	ExceptionRangeEnds(CompileEnv *envPtr, Tcl_Size index);
- * static void	ExceptionRangeTarget(CompileEnv *envPtr, Tcl_Size index, LABEL);
+ * static int	ExceptionRangeStarts(CompileEnv *envPtr, int index);
+ * static void	ExceptionRangeEnds(CompileEnv *envPtr, int index);
+ * static void	ExceptionRangeTarget(CompileEnv *envPtr, int index, LABEL);
  */
 
 #define ExceptionRangeStarts(envPtr, index) \
@@ -1641,7 +1641,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 
 #define DefineLineInformation \
     ExtCmdLoc *mapPtr = envPtr->extCmdMapPtr;				\
-    Tcl_Size eclIndex = mapPtr->nuloc - 1
+    int eclIndex = mapPtr->nuloc - 1
 
 #define SetLineInformation(word) \
     envPtr->line = mapPtr->loc[eclIndex].line[(word)];			\
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 45a41ab..40cf10c 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -290,7 +290,7 @@ typedef struct Namespace {
 				 * NULL, there are no children. */
 #endif
     unsigned long nsId;		/* Unique id for the namespace. */
-    Tcl_Interp *interp;		/* The interpreter containing this
+    Tcl_Interp *interp;	/* The interpreter containing this
 				 * namespace. */
     int flags;			/* OR-ed combination of the namespace status
 				 * flags NS_DYING and NS_DEAD listed below. */
@@ -1485,9 +1485,9 @@ typedef struct CoroutineData {
 				 * numLevels of the create/resume command is
 				 * stored here; for suspended coroutines it
 				 * holds the nesting numLevels at yield. */
-    int nargs;                  /* Number of args required for resuming this
-				 * coroutine; -2 means "0 or 1" (default), -1
-				 * means "any" */
+    Tcl_Size nargs;                  /* Number of args required for resuming this
+				 * coroutine; COROUTINE_ARGUMENTS_SINGLE_OPTIONAL means "0 or 1"
+				 * (default), COROUTINE_ARGUMENTS_ARBITRARY means "any" */
     Tcl_Obj *yieldPtr;		/* The command to yield to.  Stored here in
 				 * order to reset splice point in
 				 * TclNRCoroutineActivateCallback if the
@@ -1871,7 +1871,6 @@ typedef struct Interp {
 				 * contains one optimizer, which can be
 				 * selectively overridden by extensions. */
     } extra;
-
     /*
      * Information related to procedures and variables. See tclProc.c and
      * tclVar.c for usage.
@@ -2439,17 +2438,13 @@ typedef enum TclEolTranslation {
 #define TCL_INVOKE_NO_TRACEBACK	(1<<2)
 
 #if TCL_MAJOR_VERSION > 8
-
 /*
  * SSIZE_MAX, NOT SIZE_MAX as negative differences need to be expressed
  * between values of the Tcl_Size type so limit the range to signed
  */
-#define ListSizeT_MAX ((Tcl_Size)PTRDIFF_MAX)
-
+#   define ListSizeT_MAX ((Tcl_Size)PTRDIFF_MAX)
 #else
-
-#define ListSizeT_MAX INT_MAX
-
+#   define ListSizeT_MAX INT_MAX
 #endif
 
 /*
@@ -3049,12 +3044,12 @@ struct Tcl_LoadHandle_ {
  */
 
 MODULE_SCOPE void	TclAppendBytesToByteArray(Tcl_Obj *objPtr,
-			    const unsigned char *bytes, Tcl_Size len);
+			    const unsigned char *bytes, int len);
 MODULE_SCOPE int	TclNREvalCmd(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    int flags);
-MODULE_SCOPE void	TclAdvanceContinuations(Tcl_Size *line, int **next,
+MODULE_SCOPE void	TclAdvanceContinuations(int *line, int **next,
 			    int loc);
-MODULE_SCOPE void	TclAdvanceLines(Tcl_Size *line, const char *start,
+MODULE_SCOPE void	TclAdvanceLines(int *line, const char *start,
 			    const char *end);
 MODULE_SCOPE void	TclArgumentEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc, CmdFrame *cf);
@@ -3062,7 +3057,7 @@ MODULE_SCOPE void	TclArgumentRelease(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc);
 MODULE_SCOPE void	TclArgumentBCEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc,
-			    void *codePtr, CmdFrame *cfPtr, int cmd, Tcl_Size pc);
+			    void *codePtr, CmdFrame *cfPtr, int cmd, int pc);
 MODULE_SCOPE void	TclArgumentBCRelease(Tcl_Interp *interp,
 			    CmdFrame *cfPtr);
 MODULE_SCOPE void	TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj,
@@ -3072,8 +3067,8 @@ MODULE_SCOPE int	TclAsyncNotifier(int sigNumber, Tcl_ThreadId threadId,
 MODULE_SCOPE void	TclAsyncMarkFromNotifier(void);
 MODULE_SCOPE double	TclBignumToDouble(const void *bignum);
 MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
-			    Tcl_Size strLen, const unsigned char *pattern,
-			    Tcl_Size ptnLen, int flags);
+			    int strLen, const unsigned char *pattern,
+			    int ptnLen, int flags);
 MODULE_SCOPE double	TclCeil(const void *a);
 MODULE_SCOPE void	TclChannelPreserve(Tcl_Channel chan);
 MODULE_SCOPE void	TclChannelRelease(Tcl_Channel chan);
@@ -3088,14 +3083,14 @@ MODULE_SCOPE Tcl_ObjCmdProc TclChannelNamesCmd;
 MODULE_SCOPE Tcl_NRPostProc TclClearRootEnsemble;
 MODULE_SCOPE int	TclCompareTwoNumbers(Tcl_Obj *valuePtr,
 			    Tcl_Obj *value2Ptr);
-MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, Tcl_Size num,
+MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, int num,
 			    int *loc);
 MODULE_SCOPE void	TclContinuationsEnterDerived(Tcl_Obj *objPtr,
 			    int start, int *clNext);
 MODULE_SCOPE ContLineLoc *TclContinuationsGet(Tcl_Obj *objPtr);
 MODULE_SCOPE void	TclContinuationsCopy(Tcl_Obj *objPtr,
 			    Tcl_Obj *originObjPtr);
-MODULE_SCOPE Tcl_Size	TclConvertElement(const char *src, Tcl_Size length,
+MODULE_SCOPE int	TclConvertElement(const char *src, int length,
 			    char *dst, int flags);
 MODULE_SCOPE Tcl_Command TclCreateObjCommandInNs(Tcl_Interp *interp,
 			    const char *cmdName, Tcl_Namespace *nsPtr,
@@ -3107,12 +3102,12 @@ MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(Tcl_Interp *interp,
 MODULE_SCOPE void	TclDeleteNamespaceVars(Namespace *nsPtr);
 MODULE_SCOPE void	TclDeleteNamespaceChildren(Namespace *nsPtr);
 MODULE_SCOPE int	TclFindDictElement(Tcl_Interp *interp,
-			    const char *dict, Tcl_Size dictLength,
+			    const char *dict, int dictLength,
 			    const char **elementPtr, const char **nextPtr,
-			    Tcl_Size *sizePtr, int *literalPtr);
+			    int *sizePtr, int *literalPtr);
 /* TIP #280 - Modified token based evaluation, with line information. */
 MODULE_SCOPE int	TclEvalEx(Tcl_Interp *interp, const char *script,
-			    Tcl_Size numBytes, int flags, Tcl_Size line,
+			    int numBytes, int flags, int line,
 			    int *clNextOuter, const char *outerScript);
 MODULE_SCOPE Tcl_ObjCmdProc TclFileAttrsCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileCopyCmd;
@@ -3135,7 +3130,7 @@ MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 			    Tcl_DString *toAppendPtr);
 MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *TclFetchEnsembleRoot(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size *objcPtr);
+			    Tcl_Obj *const *objv, int objc, int *objcPtr);
 MODULE_SCOPE Tcl_Obj *const *TclEnsembleGetRewriteValues(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Namespace *TclEnsureNamespace(Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
@@ -3219,7 +3214,7 @@ MODULE_SCOPE void	TclInitObjSubsystem(void);
 MODULE_SCOPE int	TclInterpReady(Tcl_Interp *interp);
 MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
-MODULE_SCOPE Tcl_Obj *	TclJoinPath(Tcl_Size elements, Tcl_Obj * const objv[],
+MODULE_SCOPE Tcl_Obj *	TclJoinPath(int elements, Tcl_Obj * const objv[],
 			    int forceRelative);
 MODULE_SCOPE int	MakeTildeRelativePath(Tcl_Interp *interp, const char *user,
 			    const char *subPath, Tcl_DString *dsPtr);
@@ -3232,25 +3227,25 @@ MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Obj *	TclLindexList(Tcl_Interp *interp,
 			    Tcl_Obj *listPtr, Tcl_Obj *argPtr);
 MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    Tcl_Size indexCount, Tcl_Obj *const indexArray[]);
+			    int indexCount, Tcl_Obj *const indexArray[]);
 /* TIP #280 */
-MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, Tcl_Size line, int n,
+MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, int line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
 MODULE_SCOPE int	TclListObjAppendElements(Tcl_Interp *interp,
-			    Tcl_Obj *toObj, Tcl_Size elemCount,
+			    Tcl_Obj *toObj, int elemCount,
 			    Tcl_Obj *const elemObjv[]);
-MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, Tcl_Size fromIdx,
-			    Tcl_Size toIdx);
+MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, int fromIdx,
+			    int toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    Tcl_Size indexCount, Tcl_Obj *const indexArray[],
+			    int indexCount, Tcl_Obj *const indexArray[],
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Command TclMakeEnsemble(Tcl_Interp *interp, const char *name,
 			    const EnsembleImplMap map[]);
 MODULE_SCOPE int TclMakeSafe(Tcl_Interp *interp);
-MODULE_SCOPE int	TclMaxListLength(const char *bytes, Tcl_Size numBytes,
+MODULE_SCOPE int	TclMaxListLength(const char *bytes, int numBytes,
 			    const char **endPtr);
 MODULE_SCOPE int	TclMergeReturnOptions(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr,
@@ -3268,15 +3263,15 @@ MODULE_SCOPE int	TclObjInvokeNamespace(Tcl_Interp *interp,
 MODULE_SCOPE int	TclObjUnsetVar2(Tcl_Interp *interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags);
 MODULE_SCOPE int	TclParseBackslash(const char *src,
-			    Tcl_Size numBytes, Tcl_Size *readPtr, char *dst);
-MODULE_SCOPE int	TclParseHex(const char *src, Tcl_Size numBytes,
+			    int numBytes, int *readPtr, char *dst);
+MODULE_SCOPE int	TclParseHex(const char *src, int numBytes,
 			    int *resultPtr);
 MODULE_SCOPE int	TclParseNumber(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    const char *expected, const char *bytes,
-			    Tcl_Size numBytes, const char **endPtrPtr, int flags);
+			    int numBytes, const char **endPtrPtr, int flags);
 MODULE_SCOPE void	TclParseInit(Tcl_Interp *interp, const char *string,
-			    Tcl_Size numBytes, Tcl_Parse *parsePtr);
-MODULE_SCOPE Tcl_Size	TclParseAllWhiteSpace(const char *src, Tcl_Size numBytes);
+			    int numBytes, Tcl_Parse *parsePtr);
+MODULE_SCOPE int	TclParseAllWhiteSpace(const char *src, int numBytes);
 MODULE_SCOPE int	TclProcessReturn(Tcl_Interp *interp,
 			    int code, int level, Tcl_Obj *returnOpts);
 MODULE_SCOPE int	TclpObjLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
@@ -3284,7 +3279,7 @@ MODULE_SCOPE Tcl_Obj *	TclpTempFileName(void);
 MODULE_SCOPE Tcl_Obj *  TclpTempFileNameForLibrary(Tcl_Interp *interp,
 			    Tcl_Obj* pathPtr);
 MODULE_SCOPE Tcl_Obj *	TclNewFSPathObj(Tcl_Obj *dirPtr, const char *addStrRep,
-			    Tcl_Size len);
+			    int len);
 MODULE_SCOPE void	TclpAlertNotifier(void *clientData);
 MODULE_SCOPE void *TclpNotifierData(void);
 MODULE_SCOPE void	TclpServiceModeHook(int mode);
@@ -3305,8 +3300,8 @@ MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    const char **errorMsgPtr);
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, void *clientData,
-			    Tcl_Size stackSize, int flags);
-MODULE_SCOPE Tcl_Size	TclpFindVariable(const char *name, Tcl_Size *lengthPtr);
+			    int stackSize, int flags);
+MODULE_SCOPE int	TclpFindVariable(const char *name, int *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
 			    TCL_HASH_TYPE *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
@@ -3321,9 +3316,9 @@ MODULE_SCOPE int	TclpMatchFiles(Tcl_Interp *interp, char *separators,
 MODULE_SCOPE int	TclpObjNormalizePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathPtr, int nextCheckpoint);
 MODULE_SCOPE void	TclpNativeJoinPath(Tcl_Obj *prefix, const char *joining);
-MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, Tcl_Size *lenPtr);
+MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
 MODULE_SCOPE Tcl_PathType TclpGetNativePathType(Tcl_Obj *pathPtr,
-			    Tcl_Size *driveNameLengthPtr, Tcl_Obj **driveNameRef);
+			    int *driveNameLengthPtr, Tcl_Obj **driveNameRef);
 MODULE_SCOPE int	TclCrossFilesystemCopy(Tcl_Interp *interp,
 			    Tcl_Obj *source, Tcl_Obj *target);
 MODULE_SCOPE int	TclpMatchInDirectory(Tcl_Interp *interp,
@@ -3354,9 +3349,9 @@ MODULE_SCOPE void	TclRememberJoinableThread(Tcl_ThreadId id);
 MODULE_SCOPE void	TclRememberMutex(Tcl_Mutex *mutex);
 MODULE_SCOPE void	TclRemoveScriptLimitCallbacks(Tcl_Interp *interp);
 MODULE_SCOPE int	TclReToGlob(Tcl_Interp *interp, const char *reStr,
-			    Tcl_Size reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
+			    int reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
 			    int *quantifiersFoundPtr);
-MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, Tcl_Size length,
+MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, int length,
 			    char *flagPtr);
 MODULE_SCOPE void	TclSetBgErrorHandler(Tcl_Interp *interp,
 			    Tcl_Obj *cmdPrefix);
@@ -3371,44 +3366,44 @@ MODULE_SCOPE void	TclSetProcessGlobalValue(ProcessGlobalValue *pgvPtr,
 			    Tcl_Obj *newValue, Tcl_Encoding encoding);
 MODULE_SCOPE void	TclSignalExitThread(Tcl_ThreadId id, int result);
 MODULE_SCOPE void	TclSpellFix(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size subIdx,
+			    Tcl_Obj *const *objv, int objc, int subIdx,
 			    Tcl_Obj *bad, Tcl_Obj *fix);
 MODULE_SCOPE void *	TclStackRealloc(Tcl_Interp *interp, void *ptr,
-			    Tcl_Size numBytes);
+			    int numBytes);
 typedef int (*memCmpFn_t)(const void*, const void*, size_t);
 MODULE_SCOPE int	TclStringCmp(Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr,
-			    int checkEq, int nocase, Tcl_Size reqlength);
+			    int checkEq, int nocase, int reqlength);
 MODULE_SCOPE int	TclStringCmpOpts(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int *nocase,
 			    int *reqlength);
-MODULE_SCOPE int	TclStringMatch(const char *str, Tcl_Size strLen,
+MODULE_SCOPE int	TclStringMatch(const char *str, int strLen,
 			    const char *pattern, int ptnLen, int flags);
 MODULE_SCOPE int	TclStringMatchObj(Tcl_Obj *stringObj,
 			    Tcl_Obj *patternObj, int flags);
 MODULE_SCOPE void	TclSubstCompile(Tcl_Interp *interp, const char *bytes,
-			    Tcl_Size numBytes, int flags, Tcl_Size line,
+			    int numBytes, int flags, int line,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, Tcl_Size numOpts,
+MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, int numOpts,
 			    Tcl_Obj *const opts[], int *flagPtr);
 MODULE_SCOPE void	TclSubstParse(Tcl_Interp *interp, const char *bytes,
-			    Tcl_Size numBytes, int flags, Tcl_Parse *parsePtr,
+			    int numBytes, int flags, Tcl_Parse *parsePtr,
 			    Tcl_InterpState *statePtr);
 MODULE_SCOPE int	TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
-			    Tcl_Size count, int *tokensLeftPtr, Tcl_Size line,
+			    int count, int *tokensLeftPtr, int line,
 			    int *clNextOuter, const char *outerScript);
-MODULE_SCOPE Tcl_Size	TclTrim(const char *bytes, Tcl_Size numBytes,
-			    const char *trim, Tcl_Size numTrim, Tcl_Size *trimRight);
-MODULE_SCOPE Tcl_Size	TclTrimLeft(const char *bytes, Tcl_Size numBytes,
-			    const char *trim, Tcl_Size numTrim);
-MODULE_SCOPE Tcl_Size	TclTrimRight(const char *bytes, Tcl_Size numBytes,
-			    const char *trim, Tcl_Size numTrim);
+MODULE_SCOPE int	TclTrim(const char *bytes, int numBytes,
+			    const char *trim, int numTrim, int *trimRight);
+MODULE_SCOPE int	TclTrimLeft(const char *bytes, int numBytes,
+			    const char *trim, int numTrim);
+MODULE_SCOPE int	TclTrimRight(const char *bytes, int numBytes,
+			    const char *trim, int numTrim);
 MODULE_SCOPE const char*TclGetCommandTypeName(Tcl_Command command);
 MODULE_SCOPE void	TclRegisterCommandTypeName(
 			    Tcl_ObjCmdProc *implementationProc,
 			    const char *nameStr);
 MODULE_SCOPE int	TclUtfCmp(const char *cs, const char *ct);
 MODULE_SCOPE int	TclUtfCasecmp(const char *cs, const char *ct);
-MODULE_SCOPE Tcl_Size	TclUtfCount(int ch);
+MODULE_SCOPE int	TclUtfCount(int ch);
 #if TCL_UTF_MAX > 3
 #   define TclUtfToUCS4 Tcl_UtfToUniChar
 #   define TclUniCharToUCS4(src, ptr) (*ptr = *(src),1)
@@ -3455,7 +3450,7 @@ MODULE_SCOPE void	TclpThreadDeleteKey(void *keyPtr);
 MODULE_SCOPE void	TclpThreadSetGlobalTSD(void *tsdKeyPtr, void *ptr);
 MODULE_SCOPE void *	TclpThreadGetGlobalTSD(void *tsdKeyPtr);
 MODULE_SCOPE void	TclErrorStackResetIf(Tcl_Interp *interp,
-			    const char *msg, Tcl_Size length);
+			    const char *msg, int length);
 /* Tip 430 */
 MODULE_SCOPE int    TclZipfs_Init(Tcl_Interp *interp);
 
@@ -3545,7 +3540,7 @@ MODULE_SCOPE int	TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
 			    Tcl_Obj *part2Ptr, int index, int pathc,
 			    Tcl_Obj *const pathv[], Tcl_Obj *keysPtr);
 MODULE_SCOPE Tcl_Obj *	TclDictWithInit(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-			    Tcl_Size pathc, Tcl_Obj *const pathv[]);
+			    int pathc, Tcl_Obj *const pathv[]);
 MODULE_SCOPE Tcl_ObjCmdProc Tcl_DisassembleObjCmd;
 
 /* Assemble command function */
@@ -4071,13 +4066,13 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
 MODULE_SCOPE Tcl_Obj *	TclStringCat(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    Tcl_Size start);
+			    int start);
 MODULE_SCOPE Tcl_Obj *	TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    Tcl_Size last);
+			    int last);
 MODULE_SCOPE Tcl_Obj *	TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    Tcl_Size count, int flags);
+			    int count, int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReplace(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    Tcl_Size first, Tcl_Size count, Tcl_Obj *insertPtr,
+			    int first, int count, Tcl_Obj *insertPtr,
 			    int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReverse(Tcl_Obj *objPtr, int flags);
 
@@ -4191,12 +4186,12 @@ MODULE_SCOPE Tcl_Obj *	TclGetArrayDefault(Var *arrayPtr);
  */
 
 MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    Tcl_Size before, Tcl_Size after, int *indexPtr);
-MODULE_SCOPE Tcl_Size	TclIndexDecode(int encoded, Tcl_Size endValue);
+			    int before, int after, int *indexPtr);
+MODULE_SCOPE int	TclIndexDecode(int encoded, int endValue);
 
 /* Constants used in index value encoding routines. */
-#define TCL_INDEX_END           ((Tcl_Size)-2)
-#define TCL_INDEX_START         ((Tcl_Size)0)
+#define TCL_INDEX_END           (-2)
+#define TCL_INDEX_START         (0)
 
 /*
  *----------------------------------------------------------------------
@@ -4834,7 +4829,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
  *
  * MODULE_SCOPE void	TclNewIntObj(Tcl_Obj *objPtr, Tcl_WideInt w);
  * MODULE_SCOPE void	TclNewDoubleObj(Tcl_Obj *objPtr, double d);
- * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, Tcl_Size len);
+ * MODULE_SCOPE void	TclNewStringObj(Tcl_Obj *objPtr, const char *s, int len);
  * MODULE_SCOPE void	TclNewLiteralStringObj(Tcl_Obj*objPtr, const char *sLiteral);
  *
  *----------------------------------------------------------------
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 659c3e6..f2bc0da 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -78,7 +78,7 @@ EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
 EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				Tcl_Interp *interp, const char *bundleName,
 				const char *bundleVersion,
-				int hasResourceFile, Tcl_Size maxPathLen,
+				int hasResourceFile, int maxPathLen,
 				char *libraryPath);
 /* 2 */
 EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
@@ -97,7 +97,7 @@ typedef struct TclPlatStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
     int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
-    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */
     void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
 #endif /* MACOSX */
 } TclPlatStubs;
-- 
cgit v0.12


From 5a60ace74d3eabbb41d24ce1801f1f5e0358bd1e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 23 Oct 2022 14:46:44 +0000
Subject: off-by-one in TCL_MAJOR_VERSION check

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

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 9ddc2a1..33f244d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -224,9 +224,9 @@ typedef struct NamespacePathEntry NamespacePathEntry;
 typedef struct TclVarHashTable {
     Tcl_HashTable table;
     struct Namespace *nsPtr;
-#if TCL_MAJOR_VERSION > 9
+#if TCL_MAJOR_VERSION > 8
     struct Var *arrayPtr;
-#endif /* TCL_MAJOR_VERSION > 9 */
+#endif /* TCL_MAJOR_VERSION > 8 */
 } TclVarHashTable;
 
 /*
-- 
cgit v0.12


From 4288b3bee9191cd1a30c663d565e352ff6866a68 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 23 Oct 2022 20:40:32 +0000
Subject: Add support for macOS Ventura

---
 library/platform/pkgIndex.tcl |  2 +-
 library/platform/platform.tcl | 13 ++++++++++++-
 unix/Makefile.in              |  4 ++--
 win/Makefile.in               |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index de28fd1..e7029d0 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
-package ifneeded platform        1.0.18 [list source [file join $dir platform.tcl]]
+package ifneeded platform        1.0.19 [list source [file join $dir platform.tcl]]
 package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]]
 
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index 752f069..00eef1c 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -364,6 +364,17 @@ proc ::platform::patterns {id} {
 		    foreach {major minor} [split $v .] break
 
 		    set res {}
+		    if {$major eq 13} {
+			# Add 13.0 to 13.minor to patterns.
+			for {set j $minor} {$j >= 0} {incr j -1} {
+			    lappend res macosx${major}.${j}-${cpu}
+			    foreach a $alt {
+				lappend res macosx${major}.${j}-$a
+			    }
+			}
+			set major 12
+			set minor 6
+		    }
 		    if {$major eq 12} {
 			# Add 12.0 to 12.minor to patterns.
 			for {set j $minor} {$j >= 0} {incr j -1} {
@@ -420,7 +431,7 @@ proc ::platform::patterns {id} {
 # ### ### ### ######### ######### #########
 ## Ready
 
-package provide platform 1.0.18
+package provide platform 1.0.19
 
 # ### ### ### ######### ######### #########
 ## Demo application
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 316ec22..340edbf 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -963,9 +963,9 @@ install-libraries: libraries
 	@echo "Installing package tcltest 2.5.5 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
 		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm"
-	@echo "Installing package platform 1.0.18 as a Tcl Module"
+	@echo "Installing package platform 1.0.19 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
-		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm"
+		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm"
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
 		"$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
diff --git a/win/Makefile.in b/win/Makefile.in
index 73387e3..8e15849 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -746,8 +746,8 @@ install-libraries: libraries install-tzdata install-msgs
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm";
 	@echo "Installing package tcltest 2.5.5 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm";
-	@echo "Installing package platform 1.0.18 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm";
+	@echo "Installing package platform 1.0.19 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm";
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm";
 	@echo "Installing encodings";
-- 
cgit v0.12


From 2c5609394cbdbe7c6d63b310293830a496bc979d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 24 Oct 2022 11:54:10 +0000
Subject: Fix env-2.1, env-2.2, env-2.1, env-2.3, env-2.4, env-3.1, env-4.1,
 env-4.3, env-4.4, env-4.5 testcases on win32

---
 tests/env.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/env.test b/tests/env.test
index 25367c3..ff111e9 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -104,8 +104,8 @@ variable keep {
     __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM
     CommonProgramFiles CommonProgramFiles(x86) ProgramFiles
     ProgramFiles(x86) CommonProgramW6432 ProgramW6432
-    WINECONFIGDIR WINEDATADIR WINEDLLDIR0 WINEHOMEDIR PROCESSOR_ARCHITECTURE
-    USERPROFILE
+    PROCESSOR_ARCHITECTURE PROCESSOR_ARCHITEW6432 USERPROFILE
+    WINECONFIGDIR WINEDATADIR WINEDLLDIR0 WINEHOMEDIR
 }
 
 variable printenvScript [makeFile [string map [list @keep@ [list $keep]] {
-- 
cgit v0.12


From df727328685d1279729add16629922fdd29d3279 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 25 Oct 2022 06:12:11 +0000
Subject: Since MacOS 12.6 reports as 12.5 ....

---
 library/platform/platform.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index 00eef1c..acaebf2 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -373,7 +373,7 @@ proc ::platform::patterns {id} {
 			    }
 			}
 			set major 12
-			set minor 6
+			set minor 5
 		    }
 		    if {$major eq 12} {
 			# Add 12.0 to 12.minor to patterns.
-- 
cgit v0.12

-- 
cgit v0.12


From d33fc57550e1921bfadb8fe4b90d7e55bf23e6f5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 25 Oct 2022 12:23:26 +0000
Subject: Some more int -> Tcl_Size conversions, making the diff with the Tcl
 9.0 header-files smaller

---
 generic/tclArithSeries.h |  4 ++--
 generic/tclCompile.h     | 17 ++++++++---------
 generic/tclDecls.h       | 28 ++++++++++++++--------------
 generic/tclInt.h         |  6 +++---
 generic/tclStringRep.h   | 19 ++++++++++++-------
 win/tclWinPort.h         |  3 +++
 6 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index 3ace052..af4777c 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -41,11 +41,11 @@ MODULE_SCOPE int	TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr,
 			    Tcl_WideInt index, Tcl_Obj **elementObj);
 MODULE_SCOPE Tcl_WideInt TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Interp *interp,
-			    Tcl_Obj *arithSeriesPtr, int fromIdx, int toIdx);
+			    Tcl_Obj *arithSeriesPtr, Tcl_Size fromIdx, Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE int	TclArithSeriesGetElements(Tcl_Interp *interp,
-			    Tcl_Obj *objPtr, int *objcPtr, Tcl_Obj ***objvPtr);
+			    Tcl_Obj *objPtr, Tcl_Size *objcPtr, Tcl_Obj ***objvPtr);
 MODULE_SCOPE Tcl_Obj *	TclNewArithSeriesInt(Tcl_WideInt start,
 			    Tcl_WideInt end, Tcl_WideInt step,
 			    Tcl_WideInt len);
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 2843ef5..b21ed7d 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1212,7 +1212,6 @@ MODULE_SCOPE Tcl_Obj	*TclNewInstNameObj(unsigned char inst);
 MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int isLambda);
-
 
 /*
  *----------------------------------------------------------------
@@ -1260,10 +1259,10 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 
 #define TclCheckStackDepth(depth, envPtr)				\
     do {								\
-	int _dd = (depth);						\
-	if (_dd != (envPtr)->currStackDepth) {				\
-	    Tcl_Panic("bad stack depth computations: is %i, should be %i", \
-		    (envPtr)->currStackDepth, _dd);		\
+	size_t _dd = (depth);						\
+	if (_dd != (size_t)(envPtr)->currStackDepth) {				\
+	    Tcl_Panic("bad stack depth computations: is %" TCL_Z_MODIFIER "u, should be %" TCL_Z_MODIFIER "u", \
+		    (size_t)(envPtr)->currStackDepth, _dd);		\
 	}								\
     } while (0)
 
@@ -1580,9 +1579,9 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
  * of LOOP ranges is an interesting datum for debugging purposes, and that is
  * what we compute now.
  *
- * static int	ExceptionRangeStarts(CompileEnv *envPtr, int index);
- * static void	ExceptionRangeEnds(CompileEnv *envPtr, int index);
- * static void	ExceptionRangeTarget(CompileEnv *envPtr, int index, LABEL);
+ * static int	ExceptionRangeStarts(CompileEnv *envPtr, Tcl_Size index);
+ * static void	ExceptionRangeEnds(CompileEnv *envPtr, Tcl_Size index);
+ * static void	ExceptionRangeTarget(CompileEnv *envPtr, Tcl_Size index, LABEL);
  */
 
 #define ExceptionRangeStarts(envPtr, index) \
@@ -1641,7 +1640,7 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 
 #define DefineLineInformation \
     ExtCmdLoc *mapPtr = envPtr->extCmdMapPtr;				\
-    int eclIndex = mapPtr->nuloc - 1
+    Tcl_Size eclIndex = mapPtr->nuloc - 1
 
 #define SetLineInformation(word) \
     envPtr->line = mapPtr->loc[eclIndex].line[(word)];			\
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 0736b73..d1af7be 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4351,9 +4351,9 @@ extern const TclStubs *tclStubsPtr;
 #undef Tcl_GetString
 #undef Tcl_GetUnicode
 #define Tcl_GetString(objPtr) \
-	Tcl_GetStringFromObj(objPtr, (int *)NULL)
+	Tcl_GetStringFromObj(objPtr, (Tcl_Size *)NULL)
 #define Tcl_GetUnicode(objPtr) \
-	Tcl_GetUnicodeFromObj(objPtr, (int *)NULL)
+	Tcl_GetUnicodeFromObj(objPtr, (Tcl_Size *)NULL)
 #undef Tcl_GetBytesFromObj
 #undef Tcl_GetIndexFromObjStruct
 #undef Tcl_GetBooleanFromObj
@@ -4441,17 +4441,17 @@ extern const TclStubs *tclStubsPtr;
 #endif
 #if defined(USE_TCL_STUBS)
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
-		? (char *(*)(const wchar_t *, int, Tcl_DString *))tclStubsPtr->tcl_UniCharToUtfDString \
-		: (char *(*)(const wchar_t *, int, Tcl_DString *))Tcl_Char16ToUtfDString)
+		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))tclStubsPtr->tcl_UniCharToUtfDString \
+		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
 #   define Tcl_UtfToWCharDString (sizeof(wchar_t) != sizeof(short) \
-		? (wchar_t *(*)(const char *, int, Tcl_DString *))tclStubsPtr->tcl_UtfToUniCharDString \
-		: (wchar_t *(*)(const char *, int, Tcl_DString *))Tcl_UtfToChar16DString)
+		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))tclStubsPtr->tcl_UtfToUniCharDString \
+		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
 #   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
 		? (int (*)(const char *, wchar_t *))tclStubsPtr->tcl_UtfToUniChar \
 		: (int (*)(const char *, wchar_t *))Tcl_UtfToChar16)
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
-		? (int (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
-		: (int (*)(wchar_t *))Tcl_Char16Len)
+		? (Tcl_Size (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
+		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
 #ifdef TCL_NO_DEPRECATED
 #   undef Tcl_ListObjGetElements
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
@@ -4484,17 +4484,17 @@ extern const TclStubs *tclStubsPtr;
 #endif /* TCL_NO_DEPRECATED */
 #else
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
-		? (char *(*)(const wchar_t *, int, Tcl_DString *))Tcl_UniCharToUtfDString \
-		: (char *(*)(const wchar_t *, int, Tcl_DString *))Tcl_Char16ToUtfDString)
+		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
+		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
 #   define Tcl_UtfToWCharDString (sizeof(wchar_t) != sizeof(short) \
-		? (wchar_t *(*)(const char *, int, Tcl_DString *))Tcl_UtfToUniCharDString \
-		: (wchar_t *(*)(const char *, int, Tcl_DString *))Tcl_UtfToChar16DString)
+		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToUniCharDString \
+		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
 #   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
 		? (int (*)(const char *, wchar_t *))Tcl_UtfToUniChar \
 		: (int (*)(const char *, wchar_t *))Tcl_UtfToChar16)
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
-		? (int (*)(wchar_t *))Tcl_UniCharLen \
-		: (int (*)(wchar_t *))Tcl_Char16Len)
+		? (Tcl_Size (*)(wchar_t *))Tcl_UniCharLen \
+		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
 #ifdef TCL_NO_DEPRECATED
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? (Tcl_ListObjGetElements)((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 40cf10c..6af0991 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4190,8 +4190,8 @@ MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
 MODULE_SCOPE int	TclIndexDecode(int encoded, int endValue);
 
 /* Constants used in index value encoding routines. */
-#define TCL_INDEX_END           (-2)
-#define TCL_INDEX_START         (0)
+#define TCL_INDEX_END           ((Tcl_Size)-2)
+#define TCL_INDEX_START         ((Tcl_Size)0)
 
 /*
  *----------------------------------------------------------------------
@@ -4697,7 +4697,7 @@ MODULE_SCOPE const TclFileAttrProcs	tclpFileAttrProcs[];
  * of counting along a string of all one-byte characters.  The ANSI C
  * "prototype" for this macro is:
  *
- * MODULE_SCOPE void	TclNumUtfChars(int numChars, const char *bytes,
+ * MODULE_SCOPE void	TclNumUtfCharsM(int numChars, const char *bytes,
  *				int numBytes);
  *----------------------------------------------------------------
  */
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index faa2c2c..bce9092 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -31,6 +31,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
+
+#ifndef _TCLSTRINGREP
+#define _TCLSTRINGREP
+
 
 /*
  * The following structure is the internal rep for a String object. It keeps
@@ -42,15 +46,15 @@
  */
 
 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
-				 * that the number of UTF bytes == the number
-				 * of chars. */
-    int allocated;		/* The amount of space actually allocated for
+    Tcl_Size numChars;		/* The number of chars in the string.
+				 * TCL_INDEX_NONE means this value has not been
+				 * calculated. Any other means that there is a valid
+				 * Unicode rep, or that the number of UTF bytes ==
+				 * the number of chars. */
+    Tcl_Size allocated;		/* The amount of space actually allocated for
 				 * the UTF string (minus 1 byte for the
 				 * termination char). */
-    int maxChars;		/* Max number of chars that can fit in the
+    Tcl_Size maxChars;		/* Max number of chars that can fit in the
 				 * space allocated for the unicode array. */
     int hasUnicode;		/* Boolean determining whether the string has
 				 * a Unicode representation. */
@@ -84,6 +88,7 @@ typedef struct {
     ((objPtr)->internalRep.twoPtrValue.ptr2 = NULL),			\
     ((objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (stringPtr))
 
+#endif /*  _TCLSTRINGREP */
 /*
  * Local Variables:
  * mode: c
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index b61e481..d7d60a4 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -461,6 +461,9 @@ typedef DWORD_PTR * PDWORD_PTR;
 #   pragma warning(disable:4090) /* see: https://developercommunity.visualstudio.com/t/c-compiler-incorrect-propagation-of-const-qualifie/390711 */
 #   pragma warning(disable:4146)
 #   pragma warning(disable:4244)
+#if !defined(_WIN64)
+#   pragma warning(disable:4305)
+#endif
 #   pragma warning(disable:4267)
 #   pragma warning(disable:4996)
 #endif
-- 
cgit v0.12


From ba62d5de6e8d0818da84501ef2dd6cd9a635b27b Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Tue, 25 Oct 2022 16:23:54 +0000
Subject: Fix bug 1173760 (proxy server for https).  Add http::config options
 -proxynot, -proxyauth.

---
 doc/http.n                              |  51 +++-
 library/http/http.tcl                   | 335 ++++++++++++++++++++---
 tests/http.test                         |   6 +-
 tests/httpProxy.test                    | 456 ++++++++++++++++++++++++++++++++
 tests/httpProxySquidConfigForEL8.tar.gz | Bin 0 -> 2266 bytes
 5 files changed, 801 insertions(+), 47 deletions(-)
 create mode 100644 tests/httpProxy.test
 create mode 100644 tests/httpProxySquidConfigForEL8.tar.gz

diff --git a/doc/http.n b/doc/http.n
index 59f15b6..ff2307e 100644
--- a/doc/http.n
+++ b/doc/http.n
@@ -172,14 +172,15 @@ fresh socket, overriding the \fB\-keepalive\fR option of
 command \fBhttp::geturl\fR.  See the \fBPERSISTENT SOCKETS\fR section for
 details. The default is 0.
 .TP
-\fB\-proxyhost\fR \fIhostname\fR
-.
-The name of the proxy host, if any.  If this value is the
-empty string, the URL host is contacted directly.
-.TP
-\fB\-proxyport\fR \fInumber\fR
+\fB\-proxyauth\fR \fIstring\fR
 .
-The proxy port number.
+If non-empty, the string is supplied to the proxy server as the value of the
+request header Proxy-Authorization.  This option can be used for HTTP Basic
+Authentication.  If the proxy server requires authentication by another
+technique, e.g. Digest Authentication, the \fB\-proxyauth\fR option is not
+useful.  In that case the caller must expect a 407 response from the proxy,
+compute the authentication value to be supplied, and use the \fB\-headers\fR
+option to supply it as the value of the Proxy-Authorization header.
 .TP
 \fB\-proxyfilter\fR \fIcommand\fR
 .
@@ -188,18 +189,46 @@ The command is a callback that is made during
 to determine if a proxy is required for a given host.  One argument, a
 host name, is added to \fIcommand\fR when it is invoked.  If a proxy
 is required, the callback should return a two-element list containing
-the proxy server and proxy port.  Otherwise the filter should return
-an empty list.  The default filter returns the values of the
-\fB\-proxyhost\fR and \fB\-proxyport\fR settings if they are
-non-empty.
+the proxy server and proxy port.  Otherwise the filter command should return
+an empty list.
 .RS
 .PP
+The default value of \fB\-proxyfilter\fR is \fBhttp::ProxyRequired\fR, and
+this command returns the values of the \fB\-proxyhost\fR and
+\fB\-proxyport\fR settings if they are non-empty.  The options
+\fB\-proxyhost\fR, \fB\-proxyport\fR, and \fB\-proxynot\fR are used only
+by \fBhttp::ProxyRequired\fR, and nowhere else in \fB::http::geturl\fR.
+A user-supplied \fB\-proxyfilter\fR command may use these options, or
+alternatively it may obtain values from elsewhere in the calling script.
+In the latter case, any values provided for \fB\-proxyhost\fR,
+\fB\-proxyport\fR, and \fB\-proxynot\fR are unused.
+.PP
 The \fB::http::geturl\fR command runs the \fB\-proxyfilter\fR callback inside
 a \fBcatch\fR command.  Therefore an error in the callback command does
 not call the \fBbgerror\fR handler.  See the \fBERRORS\fR section for
 details.
 .RE
 .TP
+\fB\-proxyhost\fR \fIhostname\fR
+.
+The host name or IP address of the proxy server, if any.  If this value is
+the empty string, the URL host is contacted directly.  See
+\fB\-proxyfilter\fR for how the value is used.
+.TP
+\fB\-proxynot\fR \fIlist\fR
+.
+A Tcl list of domain names and IP addresses that should be accessed directly,
+not through the proxy server.  The target hostname is compared with each list
+element using a case-insensitive \fBstring match\fR.  It is often convenient
+to use the wildcard "*" at the start of a domain name (e.g. *.example.com) or
+at the end of an IP address (e.g. 192.168.0.*).  See \fB\-proxyfilter\fR for
+how the value is used.
+.TP
+\fB\-proxyport\fR \fInumber\fR
+.
+The port number of the proxy server.  See \fB\-proxyfilter\fR for how the
+value is used.
+.TP
 \fB\-repost\fR \fIboolean\fR
 .
 Specifies what to do if a POST request over a persistent connection fails
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 88685ec..fcb03e1 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -26,6 +26,8 @@ namespace eval http {
 	    -proxyhost {}
 	    -proxyport {}
 	    -proxyfilter http::ProxyRequired
+	    -proxynot {}
+	    -proxyauth {}
 	    -repost 0
 	    -threadlevel 0
 	    -urlencoding utf-8
@@ -470,7 +472,9 @@ proc http::Finish {token {errormsg ""} {skipCB 0}} {
     if {[info exists state(-command)] && (!$skipCB)
 	    && (![info exists state(done-command-cb)])} {
 	set state(done-command-cb) yes
-	if {[catch {namespace eval :: $state(-command) $token} err] && $errormsg eq ""} {
+	if {    [catch {namespace eval :: $state(-command) $token} err]
+	     && ($errormsg eq "")
+	} {
 	    set state(error) [list $err $errorInfo $errorCode]
 	    set state(status) error
 	}
@@ -886,20 +890,22 @@ proc http::reset {token {why reset}} {
 proc http::geturl {url args} {
     variable urlTypes
 
-    # The value is set in the namespace header of this file.  If the file has
-    # not been modified the value is "::http::socket".
-    set socketCmd [lindex $urlTypes(http) 1]
-
     # - If ::tls::socketCmd has its default value "::socket", change it to the
-    #   new value $socketCmd.
+    #   new value ::http::socketForTls.
     # - If the old value is different, then it has been modified either by the
     #   script or by the Tcl installation, and replaced by a new command.  The
     #   script or installation that modified ::tls::socketCmd is also
-    #   responsible for integrating ::http::socket into its own "new" command,
-    #   if it wishes to do so.
+    #   responsible for integrating ::http::socketForTls into its own "new"
+    #   command, if it wishes to do so.
+    # - Commands that open a socket:
+    #   - ::socket             - basic
+    #   - ::http::socket       - can use a thread to avoid blockage by slow DNS
+    #                            lookup.  See http::config option -threadlevel.
+    #   - ::http::socketForTls - as ::http::socket, but can also open a socket
+    #                            for HTTPS/TLS through a proxy.
 
     if {[info exists ::tls::socketCmd] && ($::tls::socketCmd eq {::socket})} {
-        set ::tls::socketCmd $socketCmd
+        set ::tls::socketCmd ::http::socketForTls
     }
 
     set token [CreateToken $url {*}$args]
@@ -1023,6 +1029,7 @@ proc http::CreateToken {url args} {
 	requestHeaders  {}
 	requestLine     {}
 	transfer        {}
+	proxyUsed       none
     }
     set state(-keepalive) $defaultKeepalive
     set state(-strict) $strict
@@ -1299,11 +1306,16 @@ proc http::CreateToken {url args} {
 	set state(-keepalive) 0
     }
 
-    # If we are using the proxy, we must pass in the full URL that includes
-    # the server name.
-    if {$phost ne ""} {
+    # Handle proxy requests here for http:// but not for https://
+    # The proxying for https is done in the ::http::socketForTls command.
+    # A proxy request for http:// needs the full URL in the HTTP request line,
+    # including the server name.
+    # The *tls* test below attempts to describe protocols in addition to
+    # "https on port 443" that use HTTP over TLS.
+    if {($phost ne "") && (![string match -nocase *tls* $defcmd])} {
 	set srvurl $url
 	set targetAddr [list $phost $pport]
+	set state(proxyUsed) HttpProxy
     } else {
 	set targetAddr [list $host $port]
     }
@@ -1316,7 +1328,7 @@ proc http::CreateToken {url args} {
     }
 
     set state(connArgs) [list $proto $phost $srvurl]
-    set state(openCmd) [list {*}$defcmd {*}$sockopts {*}$targetAddr]
+    set state(openCmd) [list {*}$defcmd {*}$sockopts -type $token {*}$targetAddr]
 
     # See if we are supposed to use a previously opened channel.
     # - In principle, ANY call to http::geturl could use a previously opened
@@ -1663,12 +1675,14 @@ proc http::OpenSocket {token DoLater} {
 	    ##Log pre socket opened, - token $token
 	    ##Log $state(openCmd) - token $token
 	    set sock [namespace eval :: $state(openCmd)]
-
+	    set state(sock) $sock
 	    # Normal return from $state(openCmd) always returns a valid socket.
+	    # A TLS proxy connection with 407 or other failure from the
+	    # proxy server raises an error.
+
 	    # Initialisation of a new socket.
 	    ##Log post socket opened, - token $token
 	    ##Log socket opened, now fconfigure - token $token
-	    set state(sock) $sock
 	    set delay [expr {[clock milliseconds] - $pre}]
 	    if {$delay > 3000} {
 		Log socket delay $delay - token $token
@@ -1684,7 +1698,15 @@ proc http::OpenSocket {token DoLater} {
         # Code above has set state(sock) $sock
         ConfigureNewSocket $token $sockOld $DoLater
     } result errdict]} {
-        Finish $token $result
+        if {[string range $result 0 20] eq {proxy connect failed:}} {
+            # The socket can be persistent: if so it is identified with
+            # the https target host, and will be kept open.
+            # Results of the failed proxy CONNECT have been copied to $token and
+            # are available to the caller.
+            Eot $token
+        } else {
+            Finish $token $result
+        }
     }
     ##Log Leaving http::OpenSocket coroutine [info coroutine] - token $token
     return
@@ -1715,7 +1737,8 @@ proc http::OpenSocket {token DoLater} {
 #
 # Arguments:
 # token         - connection token (name of an array)
-# sockOld       - handle or placeholder used for a socket before the call to OpenSocket
+# sockOld       - handle or placeholder used for a socket before the call to
+#                 OpenSocket
 # DoLater       - dictionary of boolean values listing unfinished tasks
 #
 # Return Value: none
@@ -2083,9 +2106,15 @@ proc http::Connected {token proto phost srvurl} {
     Log ^B$tk begin sending request - token $token
 
     if {[catch {
-	set state(method) $how
-	set state(requestHeaders) {}
-	set state(requestLine) "$how $srvurl HTTP/$state(-protocol)"
+	if {[info exists state(bypass)]} {
+	    set state(method) [lindex [split $state(bypass) { }] 0]
+	    set state(requestHeaders) {}
+	    set state(requestLine) $state(bypass)
+	} else {
+	    set state(method) $how
+	    set state(requestHeaders) {}
+	    set state(requestLine) "$how $srvurl HTTP/$state(-protocol)"
+	}
 	puts $sock $state(requestLine)
 	set hostValue [GetFieldValue $state(-headers) Host]
 	if {$hostValue ne {}} {
@@ -2119,6 +2148,11 @@ proc http::Connected {token proto phost srvurl} {
 	    # and "state(-keepalive) 0".
 	    set ConnVal close
 	}
+        # Proxy authorisation (cf. mod by Anders Ramdahl to autoproxy by
+        # Pat Thoyts).
+        if {($http(-proxyauth) ne {}) && ($state(proxyUsed) eq {HttpProxy})} {
+	    SendHeader $token Proxy-Authorization $http(-proxyauth)
+        }
 	# RFC7230 A.1 - "clients are encouraged not to send the
 	# Proxy-Connection header field in any requests"
 	set accept_encoding_seen 0
@@ -2143,7 +2177,12 @@ proc http::Connected {token proto phost srvurl} {
 		set contDone 1
 		set state(querylength) $value
 	    }
-	    if {[string equal -nocase $key "connection"]} {
+	    if {    [string equal -nocase $key "connection"]
+	         && [info exists state(bypass)]
+	    } {
+		# Value supplied in -headers overrides $ConnVal.
+		set connection_seen 1
+	    } elseif {[string equal -nocase $key "connection"]} {
 		# Remove "close" or "keep-alive" and use our own value.
 		# In an upgrade request, the upgrade is not guaranteed.
 		# Value "close" or "keep-alive" tells the server what to do
@@ -3121,6 +3160,7 @@ proc http::responseInfo {token} {
         currentPost           STATE  queryoffset
         totalSize             STATE  totalsize
         currentSize           STATE  currentsize
+        proxyUsed             STATE  proxyUsed
     } {
         if {$origin eq {STATE}} {
             if {[info exists state($name)]} {
@@ -3604,6 +3644,45 @@ proc http::Event {sock token} {
 		    set state(state) complete
 		    Eot $token
 		    return
+		} elseif {
+			($state(method) eq {CONNECT})
+		     && [string is integer -strict $state(responseCode)]
+		     && ($state(responseCode) >= 200)
+		     && ($state(responseCode) < 300)
+		} {
+		    # A successful CONNECT response has no body.
+		    # (An unsuccessful CONNECT has headers and body.)
+		    # The code below is abstracted from Eot/Finish, but
+		    # keeps the socket open.
+		    catch {fileevent $state(sock) readable {}}
+		    catch {fileevent $state(sock) writable {}}
+		    set state(state) complete
+		    set state(status) ok
+		    if {[info commands ${token}--EventCoroutine] ne {}} {
+			rename ${token}--EventCoroutine {}
+		    }
+		    if {[info commands ${token}--SocketCoroutine] ne {}} {
+			rename ${token}--SocketCoroutine {}
+		    }
+		    if {[info exists state(socketcoro)]} {
+		        Log $token Cancel socket after-idle event (Finish)
+		        after cancel $state(socketcoro)
+		        unset state(socketcoro)
+		    }
+		    if {[info exists state(after)]} {
+			after cancel $state(after)
+			unset state(after)
+		    }
+		    if {    [info exists state(-command)]
+			 && (![info exists state(done-command-cb)])
+		    } {
+			set state(done-command-cb) yes
+			if {[catch {namespace eval :: $state(-command) $token} err]} {
+			    set state(error) [list $err $errorInfo $errorCode]
+			    set state(status) error
+			}
+		    }
+		    return
 		} else {
 		}
 
@@ -4305,7 +4384,7 @@ proc http::CopyDone {token count {error {}}} {
 #	reason	- "eof" means premature EOF (not EOF as the natural end of
 #		  the response)
 #		- "" means completion of response, with or without EOF
-#		- anything else describes an error confition other than
+#		- anything else describes an error condition other than
 #		  premature EOF.
 #
 # Side Effects
@@ -4537,17 +4616,23 @@ proc http::quoteString {string} {
 
 proc http::ProxyRequired {host} {
     variable http
-    if {[info exists http(-proxyhost)] && [string length $http(-proxyhost)]} {
-	if {
-	    ![info exists http(-proxyport)] ||
-	    ![string length $http(-proxyport)]
-	} {
-	    set http(-proxyport) 8080
-	}
-	return [list $http(-proxyhost) $http(-proxyport)]
+    if {(![info exists http(-proxyhost)]) || ($http(-proxyhost) eq {})} {
+        return
+    }
+    if {![info exists http(-proxyport)] || ($http(-proxyport) eq {})} {
+	set port 8080
     } else {
-	return
+	set port $http(-proxyport)
+    }
+
+    # Simple test (cf. autoproxy) for hosts that must be accessed directly,
+    # not through the proxy server.
+    foreach domain $http(-proxynot) {
+        if {[string match -nocase $domain $host]} {
+            return {}
+        }
     }
+    return [list $http(-proxyhost) $port]
 }
 
 # http::CharsetToEncoding --
@@ -4730,6 +4815,190 @@ interp alias {} http::meta {} http::responseHeaders
 interp alias {} http::metaValue {} http::responseHeaderValue
 interp alias {} http::ncode {} http::responseCode
 
+
+# ------------------------------------------------------------------------------
+#  Proc http::socketForTls
+# ------------------------------------------------------------------------------
+# Command to use in place of ::socket as the value of ::tls::socketCmd.
+# This command does the same as http::socket, and also handles https connections
+# through a proxy server.
+#
+# Notes.
+# - The proxy server works differently for https and http.  This implementation
+#   is for https.  The proxy for http is implemented in http::CreateToken (in
+#   code that was previously part of http::geturl).
+# - This code implicitly uses the tls options set for https in a call to
+#   http::register, and does not need to call commands tls::*.  This simple
+#   implementation is possible because tls uses a callback to ::socket that can
+#   be redirected by changing the value of ::tls::socketCmd.
+#
+# Arguments:
+# args        - as for ::socket
+#
+# Return Value: a socket identifier
+# ------------------------------------------------------------------------------
+
+proc http::socketForTls {args} {
+    variable http
+    set host [lindex $args end-1]
+    set port [lindex $args end]
+    if {    ($http(-proxyfilter) ne {})
+         && (![catch {$http(-proxyfilter) $host} proxy])
+    } {
+        set phost [lindex $proxy 0]
+        set pport [lindex $proxy 1]
+    } else {
+        set phost {}
+        set pport {}
+    }
+    if {$phost eq ""} {
+        set sock [::http::socket {*}$args]
+    } else {
+        set sock [::http::SecureProxyConnect {*}$args $phost $pport]
+    }
+    return $sock
+}
+
+
+# ------------------------------------------------------------------------------
+#  Proc http::SecureProxyConnect
+# ------------------------------------------------------------------------------
+# Command to open a socket through a proxy server to a remote server for use by
+# tls. The caller must perform the tls handshake.
+#
+# Notes
+# - Based on patch supplied by Melissa Chawla in ticket 1173760, and
+#   Proxy-Authorization header cf. autoproxy by Pat Thoyts.
+# - Rewritten as a call to http::geturl, because response headers and body are
+#   needed if the CONNECT request fails.  CONNECT is implemented for this case
+#   only, by state(bypass).
+# - FUTURE WORK: give http::geturl a -connect option for a general CONNECT.
+# - The request header Proxy-Connection is discouraged in RFC 7230 (June 2014),
+#   RFC 9112 (June 2022).
+#
+# Arguments:
+# args        - as for ::socket, ending in host, port; with proxy host, proxy
+#               port appended.
+#
+# Return Value: a socket identifier
+# ------------------------------------------------------------------------------
+proc http::AllDone {varName args} {
+    set $varName done
+    return
+}
+
+proc http::SecureProxyConnect {args} {
+    variable http
+    variable ConnectVar
+    variable ConnectCounter
+    set varName ::http::ConnectVar([incr ConnectCounter])
+
+    # Extract (non-proxy) target from args.
+    set host [lindex $args end-3]
+    set port [lindex $args end-2]
+    set args [lremove $args end-3 end-2]
+
+    # Proxy server URL for connection.
+    # This determines where the socket is opened.
+    set phost [lindex $args end-1]
+    set pport [lindex $args end]
+    if {[string first : $phost] != -1} {
+        # IPv6 address, wrap it in [] so we can append :pport
+        set phost "\[${phost}\]"
+    }
+    set url http://${phost}:${pport}
+    # Elements of args other than host and port are not used when
+    # AsyncTransaction opens a socket.  Those elements are -async and the
+    # -type $tokenName for the https transaction.  Option -async is used by
+    # AsyncTransaction anyway, and -type $tokenName should not be propagated:
+    # the proxy request adds its own -type value.
+
+    set targ [lsearch -exact $args -type]
+    if {$targ != -1} {
+        # Record in the token that this is a proxy call.
+        set token [lindex $args $targ+1]
+        upvar 0 ${token} state
+        set state(proxyUsed) SecureProxy
+        set tim $state(-timeout)
+    } else {
+        set tim 0
+    }
+    if {$tim == 0} {
+        # Do not use infinite timeout for the proxy.
+        set tim 30000
+    }
+
+    # Prepare and send a CONNECT request to the proxy, using
+    # code similar to http::geturl.
+    set requestHeaders [list Host $host]
+    lappend requestHeaders Connection keep-alive
+    if {$http(-proxyauth) != {}} {
+        lappend requestHeaders Proxy-Authorization $http(-proxyauth)
+    }
+
+    set token2 [CreateToken $url -keepalive 0 -timeout $tim \
+            -headers $requestHeaders -command [list http::AllDone $varName]]
+    variable $token2
+    upvar 0 $token2 state2
+
+    # Setting this variable overrides the HTTP request line and allows
+    # -headers to override the Connection: header set by -keepalive.
+    set state2(bypass) "CONNECT $host:$port HTTP/1.1"
+
+    AsyncTransaction $token2
+
+    if {[info coroutine] ne {}} {
+        # All callers in the http package are coroutines launched by
+        # the event loop.
+        # The cwait command requires a coroutine because it yields
+        # to the caller; $varName is traced and the coroutine resumes
+        # when the variable is written.
+        cwait $varName
+    } else {
+        return -code error {code must run in a coroutine}
+        # For testing with a non-coroutine caller outside the http package.
+        # vwait $varName
+    }
+    unset $varName
+
+    set sock $state2(sock)
+    set code $state2(responseCode)
+    if {[string is integer -strict $code] && ($code >= 200) && ($code < 300)} {
+        # All OK.  The caller in tls will now call "tls::import $sock".
+        # Do not use Finish, which will close (sock).
+        # Other tidying done in http::Event.
+        array unset state2
+    } elseif {$targ != -1} {
+        # Bad HTTP status code; token is known.
+        # Copy from state2 to state, including (sock).
+        foreach name [array names state2] {
+            set state($name) $state2($name)
+        }
+        set state(proxyUsed) SecureProxy
+        set state(proxyFail) failed
+
+        # Do not use Finish, which will close (sock).
+        # Other tidying done in http::Event.
+        array unset state2
+
+        # Error message detected by http::OpenSocket.
+        return -code error "proxy connect failed: $code"
+    } else {
+        # Bad HTTP status code; token is not known because option -type
+        # (cf. targ) was not passed through tcltls, and so the script
+        # cannot write to state(*).
+        # Do not use Finish, which will close (sock).
+        # Other tidying done in http::Event.
+        array unset state2
+
+        # Error message detected by http::OpenSocket.
+        return -code error "proxy connect failed: $code\n$block"
+    }
+
+    return $sock
+}
+
+
 # ------------------------------------------------------------------------------
 #  Proc http::socket
 # ------------------------------------------------------------------------------
@@ -4767,7 +5036,7 @@ proc http::socket {args} {
 
     LoadThreadIfNeeded
 
-    set targ [lsearch -exact $args -token]
+    set targ [lsearch -exact $args -type]
     if {$targ != -1} {
         set token [lindex $args $targ+1]
         set args [lreplace $args $targ $targ+1]
@@ -4831,7 +5100,7 @@ proc http::socket {args} {
 }
 
 # The commands below are dependencies of http::socket and
-# are not used elsewhere.
+# http::SecureProxyConnect and are not used elsewhere.
 
 # ------------------------------------------------------------------------------
 #  Proc http::LoadThreadIfNeeded
diff --git a/tests/http.test b/tests/http.test
index 1218536..18850d9 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -89,7 +89,7 @@ http::config -threadlevel $ThreadLevel
 test http-1.1 {http::config} {
     http::config -useragent UserAgent
     http::config
-} [list -accept */* -cookiejar {} -pipeline 1 -postfresh 0 -proxyfilter http::ProxyRequired -proxyhost {} -proxyport {} -repost 0 -threadlevel $ThreadLevel -urlencoding utf-8 -useragent UserAgent -zip 1]
+} [list -accept */* -cookiejar {} -pipeline 1 -postfresh 0 -proxyauth {} -proxyfilter http::ProxyRequired -proxyhost {} -proxynot {} -proxyport {} -repost 0 -threadlevel $ThreadLevel -urlencoding utf-8 -useragent UserAgent -zip 1]
 test http-1.2 {http::config} {
     http::config -proxyfilter
 } http::ProxyRequired
@@ -104,10 +104,10 @@ test http-1.4 {http::config} {
     set x [http::config]
     http::config {*}$savedconf
     set x
-} [list -accept */* -cookiejar {} -pipeline 1 -postfresh 0 -proxyfilter myFilter -proxyhost nowhere.come -proxyport 8080 -repost 0 -threadlevel $ThreadLevel -urlencoding iso8859-1 -useragent {Tcl Test Suite} -zip 1]
+} [list -accept */* -cookiejar {} -pipeline 1 -postfresh 0 -proxyauth {} -proxyfilter myFilter -proxyhost nowhere.come -proxynot {} -proxyport 8080 -repost 0 -threadlevel $ThreadLevel -urlencoding iso8859-1 -useragent {Tcl Test Suite} -zip 1]
 test http-1.5 {http::config} -returnCodes error -body {
     http::config -proxyhost {} -junk 8080
-} -result {Unknown option -junk, must be: -accept, -cookiejar, -pipeline, -postfresh, -proxyfilter, -proxyhost, -proxyport, -repost, -threadlevel, -urlencoding, -useragent, -zip}
+} -result {Unknown option -junk, must be: -accept, -cookiejar, -pipeline, -postfresh, -proxyauth, -proxyfilter, -proxyhost, -proxynot, -proxyport, -repost, -threadlevel, -urlencoding, -useragent, -zip}
 test http-1.6 {http::config} -setup {
     set oldenc [http::config -urlencoding]
 } -body {
diff --git a/tests/httpProxy.test b/tests/httpProxy.test
new file mode 100644
index 0000000..2d0bea2
--- /dev/null
+++ b/tests/httpProxy.test
@@ -0,0 +1,456 @@
+# Commands covered: http::geturl when using a proxy server.
+#
+# This file contains a collection of tests for the http script library.
+# Sourcing this file into Tcl runs the tests and generates output for errors.
+# No output means no errors were found.
+#
+# Copyright © 1991-1993 The Regents of the University of California.
+# Copyright © 1994-1996 Sun Microsystems, Inc.
+# Copyright © 1998-2000 Ajuba Solutions.
+# Copyright © 2022      Keith Nash.
+#
+# See the file "license.terms" for information on usage and redistribution of
+# this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
+
+package require http 2.10
+
+proc bgerror {args} {
+    global errorInfo
+    puts stderr "httpProxy.test bgerror"
+    puts stderr [join $args]
+    puts stderr $errorInfo
+}
+
+if {![info exists ThreadLevel]} {
+    if {[catch {package require Thread}] == 0} {
+        set ValueRange {0 1 2}
+    } else {
+        set ValueRange {0 1}
+    }
+
+    # For each value of ThreadLevel, source this file recursively in the
+    # same interpreter.
+    foreach ThreadLevel $ValueRange {
+        source [info script]
+    }
+    catch {unset ThreadLevel}
+    catch {unset ValueRange}
+    return
+}
+
+catch {puts "==== Test with ThreadLevel $ThreadLevel ===="}
+http::config -threadlevel $ThreadLevel
+
+
+#testConstraint needsSquid 1
+#testConstraint needsTls 1
+
+if {[testConstraint needsTls]} {
+    package require tls
+    http::register https 443 [list ::tls::socket -ssl2 0 -ssl3 0 \
+            -tls1 0 -tls1.1 0 -tls1.2 1 -tls1.3 0 -autoservername 1]
+}
+
+# Testing with Squid
+# - Example Squid configuration for Enterprise Linux 8 (Red Hat, Oracle, Rocky,
+#   Alma, ...) is in file tests/httpProxySquidConfigForEL8.tar.gz.
+# - Two instances of Squid are launched, one that needs authentication and one
+#   that does not.
+# - Each instance of Squid listens on IPv4 and IPv6, on different ports.
+
+# Instance of Squid that does not need authentication.
+set n4host 127.0.0.1
+set n6host ::1
+set n4port 3128
+set n6port 3130
+
+# Instance of Squid that needs authentication.
+set a4host 127.0.0.1
+set a6host ::1
+set a4port 3129
+set a6port 3131
+
+# concat Basic [base64::encode alice:alicia]
+set aliceCreds {Basic YWxpY2U6YWxpY2lh}
+
+# concat Basic [base64::encode intruder:intruder]
+set badCreds {Basic aW50cnVkZXI6aW50cnVkZXI=}
+
+test httpProxy-1.1 {squid is running - ipv4 noauth} -constraints {needsSquid} -setup {
+} -body {
+    set token [http::geturl http://$n4host:$n4port/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 400 none} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+}
+
+test httpProxy-1.2 {squid is running - ipv6 noauth} -constraints {needsSquid} -setup {
+} -body {
+    set token [http::geturl http://\[$n6host\]:$n6port/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 400 none} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+}
+
+test httpProxy-1.3 {squid is running - ipv4 auth} -constraints {needsSquid} -setup {
+} -body {
+    set token [http::geturl http://$a4host:$a4port/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 400 none} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+}
+
+test httpProxy-1.4 {squid is running - ipv6 auth} -constraints {needsSquid} -setup {
+} -body {
+    set token [http::geturl http://\[$a6host\]:$a6port/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 400 none} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+}
+
+test httpProxy-2.1 {http no-proxy no-auth} -constraints {needsSquid} -setup {
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 200 none} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+}
+
+test httpProxy-2.2 {https no-proxy no-auth} -constraints {needsSquid needsTls} -setup {
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 200 none} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+}
+
+test httpProxy-2.3 {http with-proxy ipv4 no-auth} -constraints {needsSquid} -setup {
+   http::config -proxyhost $n4host -proxyport $n4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 200 HttpProxy} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+    http::config -proxyhost {} -proxyport {} -proxynot {}
+}
+
+test httpProxy-2.4 {https with-proxy ipv4 no-auth} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $n4host -proxyport $n4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 200 SecureProxy} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+    http::config -proxyhost {} -proxyport {} -proxynot {}
+}
+
+test httpProxy-2.5 {http with-proxy ipv6 no-auth} -constraints {needsSquid} -setup {
+   http::config -proxyhost $n6host -proxyport $n6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 200 HttpProxy} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+    http::config -proxyhost {} -proxyport {} -proxynot {}
+}
+
+test httpProxy-2.6 {https with-proxy ipv6 no-auth} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $n6host -proxyport $n6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
+} -result {complete ok 200 SecureProxy} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res
+    http::config -proxyhost {} -proxyport {} -proxynot {}
+}
+
+test httpProxy-3.1 {http no-proxy with-auth valid-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 none 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.2 {https no-proxy with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 none 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.3 {http with-proxy ipv4 with-auth valid-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 HttpProxy 1 1} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.4 {https with-proxy ipv4 with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 SecureProxy 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.5 {http with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 HttpProxy 1 1} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.6 {https with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 SecureProxy 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.1 {http no-proxy with-auth no-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 none 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.2 {https no-proxy with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 none 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.3 {http with-proxy ipv4 with-auth no-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 HttpProxy 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.4 {https with-proxy ipv4 with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 SecureProxy 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.5 {http with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 HttpProxy 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.6 {https with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 SecureProxy 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.1 {http no-proxy with-auth bad-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 none 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.2 {https no-proxy with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 200 none 0 0} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.3 {http with-proxy ipv4 with-auth bad-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 HttpProxy 1 1} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.4 {https with-proxy ipv4 with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 SecureProxy 1 1} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.5 {http with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid} -setup {
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set token [http::geturl http://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 HttpProxy 1 1} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.6 {https with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set token [http::geturl https://www.google.com/]
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
+} -result {complete ok 407 SecureProxy 1 1} -cleanup {
+    http::cleanup $token
+    unset -nocomplain ri res pos1 pos2
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+# cleanup
+unset -nocomplain n4host n6host n4port n6port a4host a6host a4port a6port
+
+rename bgerror {}
+
+::tcltest::cleanupTests
+
+# Local variables:
+# mode: tcl
+# End:
+
diff --git a/tests/httpProxySquidConfigForEL8.tar.gz b/tests/httpProxySquidConfigForEL8.tar.gz
new file mode 100644
index 0000000..a94dbdb
Binary files /dev/null and b/tests/httpProxySquidConfigForEL8.tar.gz differ
-- 
cgit v0.12


From 27f09fdb5ced601cb23ffc86b882c29a3ee7dd21 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Oct 2022 09:43:48 +0000
Subject: www.tcl-tk.org -> www.tcl-lang.org

---
 unix/README    | 4 ++--
 unix/tcl.pc.in | 3 ++-
 win/rules.vc   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/unix/README b/unix/README
index b43a260..a3180c9 100644
--- a/unix/README
+++ b/unix/README
@@ -8,11 +8,11 @@ MacOSX platform too, but they all depend on UNIX (POSIX/ANSI C) interfaces and
 some of them only make sense under UNIX.
 
 Updated forms of the information found in this file is available at:
-	https://www.tcl-tk.org/doc/howto/compile.html#unix
+	https://www.tcl-lang.org/doc/howto/compile.html#unix
 
 For information on platforms where Tcl is known to compile, along with any
 porting notes for getting it to work on those platforms, see:
-	https://www.tcl-tk.org/software/tcltk/platforms.html
+	https://www.tcl-lang.org/software/tcltk/platforms.html
 
 The rest of this file contains instructions on how to do this. The release
 should compile and run either "out of the box" or with trivial changes on any
diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
index 84754c6..93b5e69 100644
--- a/unix/tcl.pc.in
+++ b/unix/tcl.pc.in
@@ -4,10 +4,11 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+libfile=@TCL_LIB_FILE@
 
 Name: Tool Command Language
 Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
-URL: https://www.tcl-tk.org/
+URL: https://www.tcl-lang.org/
 Version: @TCL_VERSION@@TCL_PATCH_LEVEL@
 Requires.private: zlib >= 1.2.3
 Libs: -L${libdir} @TCL_LIB_FLAG@ @TCL_STUB_LIB_FLAG@
diff --git a/win/rules.vc b/win/rules.vc
index fdc68e0..8d28b10 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -707,7 +707,7 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 
 !if defined(_TK_H)
 !if [echo TK_MAJOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
+   && [nmakehlp -V $(_TK_H) "define TK_MAJOR_VERSION" >> versions.vc]
 !endif
 !if [echo TK_MINOR_VERSION = \>> versions.vc] \
    && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
-- 
cgit v0.12


From 2ecf92f50b4fad000f8cf4b368ce47c6035bdf4c Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Wed, 26 Oct 2022 11:28:29 +0000
Subject: Minor changes to http tests.

---
 tests/http.test      | 5 ++++-
 tests/httpProxy.test | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index 18850d9..6826448 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -631,7 +631,10 @@ test http-4.14 {http::Event} -body {
 test http-4.15 {http::Event} -body {
     # This test may fail if you use a proxy server. That is to be
     # expected and is not a problem with Tcl.
-    set token [http::geturl //not_a_host.tcl.tk -timeout 3000 -command \#]
+    # With http::config -threadlevel 1 or 2, the script enters the event loop
+    # during the DNS lookup, and has the opportunity to time out.
+    # Increase -timeout from 3000 to 10000 to prevent this.
+    set token [http::geturl //not_a_host.tcl.tk -timeout 10000 -command \#]
     http::wait $token
     set result "[http::status $token] -- [lindex [http::error $token] 0]"
     # error codes vary among platforms.
diff --git a/tests/httpProxy.test b/tests/httpProxy.test
index 2d0bea2..42ad574 100644
--- a/tests/httpProxy.test
+++ b/tests/httpProxy.test
@@ -444,7 +444,7 @@ test httpProxy-5.6 {https with-proxy ipv6 with-auth bad-creds-provided} -constra
 }
 
 # cleanup
-unset -nocomplain n4host n6host n4port n6port a4host a6host a4port a6port
+unset -nocomplain n4host n6host n4port n6port a4host a6host a4port a6port aliceCreds badCreds
 
 rename bgerror {}
 
-- 
cgit v0.12


From 2a8ceac88856d04e3da9842fa65cf1982733bf72 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Oct 2022 13:33:10 +0000
Subject: Fix [8e2d10698b]: ioCmd.test tests need updates for -eofchar changes

---
 tests/ioCmd.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index c8daa96..9e53201 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -2905,7 +2905,7 @@ test iocmd.tf-25.1 {chan configure, cgetall, standard options} -match glob -body
     rename foo {}
     set res
 } -constraints {testchannel thread} \
-    -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} * -translation {auto *}}}
+    -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} * -translation {auto *}}}
 test iocmd.tf-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -2918,7 +2918,7 @@ test iocmd.tf-25.2 {chan configure, cgetall, no options} -match glob -body {
     rename foo {}
     set res
 } -constraints {testchannel thread} \
-    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} * -translation {auto *}}}
+    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} * -translation {auto *}}}
 test iocmd.tf-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -2934,7 +2934,7 @@ test iocmd.tf-25.3 {chan configure, cgetall, regular result} -match glob -body {
     rename foo {}
     set res
 } -constraints {testchannel thread} \
-    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} * -translation {auto *} -bar foo -snarf x}}
+    -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {} * -translation {auto *} -bar foo -snarf x}}
 test iocmd.tf-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
-- 
cgit v0.12


From 4a0240f1539380862fa46bac023272dcc8557053 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 27 Oct 2022 13:48:34 +0000
Subject: In a -singleproc 1 test run, [info loaded] can report libraries
 brought in by other test files.  Protect the tests that care about that.

---
 tests/load.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/load.test b/tests/load.test
index 728fad9..bc964a1 100644
--- a/tests/load.test
+++ b/tests/load.test
@@ -202,13 +202,13 @@ test load-8.1 {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loa
 test load-8.2 {TclGetLoadedPackages procedure} -constraints {teststaticpkg_8.x} -body {
     info loaded gorp
 } -returnCodes error -result {could not find interpreter "gorp"}
-test load-8.3a {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loaded] {
+test load-8.3a {TclGetLoadedPackages procedure} [list !singleTestInterp teststaticpkg_8.x $dll $loaded] {
     lsort -index 1 [info loaded {}]
 } [lsort -index 1 [list {{} Double} {{} More} {{} Another} {{} Test} [list [file join $testDir pkga$ext] Pkga] [list [file join $testDir pkgb$ext] Pkgb] {*}$alreadyLoaded]]
 test load-8.3b {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loaded] {
     lsort -index 1 [info loaded child]
 } [lsort -index 1 [list {{} Test} [list [file join $testDir pkgb$ext] Pkgb]]]
-test load-8.4 {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loaded] {
+test load-8.4 {TclGetLoadedPackages procedure} [list !singleTestInterp teststaticpkg_8.x $dll $loaded] {
     load [file join $testDir pkgb$ext] Pkgb
     list [lsort -index 1 [info loaded {}]] [lsort [info commands pkgb_*]]
 } [list [lsort -index 1 [concat [list [list [file join $testDir pkgb$ext] Pkgb] {{} Double} {{} More} {{} Another} {{} Test} [list [file join $testDir pkga$ext] Pkga]] $alreadyLoaded]] {pkgb_demo pkgb_sub pkgb_unsafe}]
-- 
cgit v0.12


From 6de2b2c1d639ec54c557ae563819bbcaf9ebd81e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Oct 2022 14:01:17 +0000
Subject: Handle TCL_ENCODING_STRICT and TCL_CLOSE2PROC correctly, when
 building in --with-tcl8 mode

---
 generic/tcl.h | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 419929c..cb781a6 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -1294,7 +1294,11 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, void *clientData);
  * interface.
  */
 
-#define TCL_CLOSE2PROC		NULL
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_CLOSE2PROC		NULL
+#else
+#   define TCL_CLOSE2PROC		((void *) 1)
+#endif
 
 /*
  * Channel version tag. This was introduced in 8.3.2/8.4.
@@ -1960,8 +1964,13 @@ typedef struct Tcl_EncodingType {
 
 #define TCL_ENCODING_START		0x01
 #define TCL_ENCODING_END		0x02
-#define TCL_ENCODING_STRICT			0x04
-#define TCL_ENCODING_STOPONERROR	0x0 /* Not used any more */
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_ENCODING_STRICT			0x04
+#   define TCL_ENCODING_STOPONERROR	0x0 /* Not used any more */
+#else
+#   define TCL_ENCODING_STRICT			0x44
+#   define TCL_ENCODING_STOPONERROR	0x04
+#endif
 #define TCL_ENCODING_NO_TERMINATE	0x08
 #define TCL_ENCODING_CHAR_LIMIT		0x10
 #define TCL_ENCODING_MODIFIED		0x20
@@ -2339,7 +2348,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
 #define Tcl_SetPreInitScript(string) \
 	((const char *(*)(const char *))TclStubCall((void *)9))(string)
 #endif
-
+
 /*
  *----------------------------------------------------------------------------
  * Include the public function declarations that are accessible via the stubs
@@ -2469,7 +2478,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
  */
 
 #define Tcl_GetHashValue(h) ((h)->clientData)
-#define Tcl_SetHashValue(h, value) ((h)->clientData = (void *) (value))
+#define Tcl_SetHashValue(h, value) ((h)->clientData = (void *)(value))
 #define Tcl_GetHashKey(tablePtr, h) \
 	((void *) (((tablePtr)->keyType == TCL_ONE_WORD_KEYS || \
 		    (tablePtr)->keyType == TCL_CUSTOM_PTR_KEYS) \
@@ -2481,8 +2490,10 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
  * hash tables:
  */
 
+#undef  Tcl_FindHashEntry
 #define Tcl_FindHashEntry(tablePtr, key) \
 	(*((tablePtr)->findProc))(tablePtr, (const char *)(key))
+#undef  Tcl_CreateHashEntry
 #define Tcl_CreateHashEntry(tablePtr, key, newPtr) \
 	(*((tablePtr)->createProc))(tablePtr, (const char *)(key), newPtr)
 
-- 
cgit v0.12


From a7a483bf2a2a585bf2f1e2befbd465dea8a310b1 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 27 Oct 2022 14:35:12 +0000
Subject: Revised fix to the -singleproc 1 issue in load.test

---
 tests/load.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/load.test b/tests/load.test
index bc964a1..78087bc 100644
--- a/tests/load.test
+++ b/tests/load.test
@@ -31,7 +31,7 @@ testConstraint $dll [file readable $x]
 
 # Tests also require that this DLL has not already been loaded.
 set loaded "[file tail $x]Loaded"
-set alreadyLoaded [info loaded]
+set alreadyLoaded [info loaded {}]
 testConstraint $loaded [expr {![string match *pkga* $alreadyLoaded]}]
 
 set alreadyTotalLoaded [info loaded]
@@ -202,13 +202,13 @@ test load-8.1 {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loa
 test load-8.2 {TclGetLoadedPackages procedure} -constraints {teststaticpkg_8.x} -body {
     info loaded gorp
 } -returnCodes error -result {could not find interpreter "gorp"}
-test load-8.3a {TclGetLoadedPackages procedure} [list !singleTestInterp teststaticpkg_8.x $dll $loaded] {
+test load-8.3a {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loaded] {
     lsort -index 1 [info loaded {}]
 } [lsort -index 1 [list {{} Double} {{} More} {{} Another} {{} Test} [list [file join $testDir pkga$ext] Pkga] [list [file join $testDir pkgb$ext] Pkgb] {*}$alreadyLoaded]]
 test load-8.3b {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loaded] {
     lsort -index 1 [info loaded child]
 } [lsort -index 1 [list {{} Test} [list [file join $testDir pkgb$ext] Pkgb]]]
-test load-8.4 {TclGetLoadedPackages procedure} [list !singleTestInterp teststaticpkg_8.x $dll $loaded] {
+test load-8.4 {TclGetLoadedPackages procedure} [list teststaticpkg_8.x $dll $loaded] {
     load [file join $testDir pkgb$ext] Pkgb
     list [lsort -index 1 [info loaded {}]] [lsort [info commands pkgb_*]]
 } [list [lsort -index 1 [concat [list [list [file join $testDir pkgb$ext] Pkgb] {{} Double} {{} More} {{} Another} {{} Test} [list [file join $testDir pkga$ext] Pkga]] $alreadyLoaded]] {pkgb_demo pkgb_sub pkgb_unsafe}]
-- 
cgit v0.12


From d74dc7638ccf0c79a057c87ef0f05b7fd6974588 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 27 Oct 2022 17:10:04 +0000
Subject: Test hygiene.  This was creating one more thread than it destroyed.
 In a -singleproc 1 test run, this caused tests in later test files to fail
 because the stray thread causes test results to be different.

---
 tests/http.test | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index 6826448..eb2bf29 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -47,6 +47,7 @@ if {![file exists $httpdFile]} {
 catch {package require Thread 2.7-}
 if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
     set httpthread [thread::create -preserved]
+    lappend threadStack [list thread::release $httpthread]
     thread::send $httpthread [list source $httpdFile]
     thread::send $httpthread [list set bindata $bindata]
     thread::send $httpthread {httpd_init 0; set port} port
@@ -64,6 +65,7 @@ if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
 	catch {unset port}
 	return
     }
+    set threadStack {}
 }
 
 if {![info exists ThreadLevel]} {
@@ -78,6 +80,7 @@ if {![info exists ThreadLevel]} {
     foreach ThreadLevel $ValueRange {
         source [info script]
     }
+    try [lpop threadStack]
     catch {unset ThreadLevel}
     catch {unset ValueRange}
     return
@@ -1168,8 +1171,8 @@ catch {unset url}
 catch {unset badurl}
 catch {unset port}
 catch {unset data}
-if {[info exists httpthread]} {
-    thread::release $httpthread
+if {[llength $threadStack]} {
+    try [lpop threadStack]
 } else {
     close $listen
 }
-- 
cgit v0.12


From c74a13788aa580ddc5a191f22096fb0a2758d41d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 27 Oct 2022 18:38:55 +0000
Subject: duplicate test names

---
 tests/binary.test   |  2 +-
 tests/http11.test   | 96 ++++++++++++++++++++++++++---------------------------
 tests/lreplace.test |  2 +-
 tests/scan.test     |  2 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/tests/binary.test b/tests/binary.test
index a43fb49..151659a 100644
--- a/tests/binary.test
+++ b/tests/binary.test
@@ -767,7 +767,7 @@ test binary-21.13 {Tcl_BinaryObjCmd: scan} -setup {
 } -body {
     list [binary scan "abc def \x00  " C* arg1] $arg1
 } -result {1 {abc def }}
-test binary-21.12 {Tcl_BinaryObjCmd: scan} -setup {
+test binary-21.14 {Tcl_BinaryObjCmd: scan} -setup {
     unset -nocomplain arg1
 } -body {
     list [binary scan "abc def \x00ghi" C* arg1] $arg1
diff --git a/tests/http11.test b/tests/http11.test
index 71ef4c7..ef1f40c 100644
--- a/tests/http11.test
+++ b/tests/http11.test
@@ -108,7 +108,7 @@ http::config -threadlevel $ThreadLevel
 
 # -------------------------------------------------------------------------
 
-test http11-1.0 "normal request for document " -setup {
+test http11-1.0.$ThreadLevel "normal request for document " -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html -timeout 10000]
@@ -119,7 +119,7 @@ test http11-1.0 "normal request for document " -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close}
 
-test http11-1.1 "normal,gzip,non-chunked" -setup {
+test http11-1.1.$ThreadLevel "normal,gzip,non-chunked" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \
@@ -133,7 +133,7 @@ test http11-1.1 "normal,gzip,non-chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok gzip {} {content-encoding gzip} {}}
 
-test http11-1.2 "normal,deflated,non-chunked" -setup {
+test http11-1.2.$ThreadLevel "normal,deflated,non-chunked" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \
@@ -146,7 +146,7 @@ test http11-1.2 "normal,deflated,non-chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok deflate {}}
 
-test http11-1.2.1 "normal,deflated,non-chunked,msdeflate" -setup {
+test http11-1.2.1.$ThreadLevel "normal,deflated,non-chunked,msdeflate" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1&msdeflate=1 \
@@ -159,7 +159,7 @@ test http11-1.2.1 "normal,deflated,non-chunked,msdeflate" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok deflate {}}
 
-test http11-1.3 "normal,compressed,non-chunked" -constraints badCompress -setup {
+test http11-1.3.$ThreadLevel "normal,compressed,non-chunked" -constraints badCompress -setup {
     # The Tcl "compress" algorithm appears to be incorrect and has been removed.
     # Bug [a13b9d0ce1].
     variable httpd [create_httpd]
@@ -174,7 +174,7 @@ test http11-1.3 "normal,compressed,non-chunked" -constraints badCompress -setup
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok compress {}}
 
-test http11-1.4 "normal,identity,non-chunked" -setup {
+test http11-1.4.$ThreadLevel "normal,identity,non-chunked" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \
@@ -187,7 +187,7 @@ test http11-1.4 "normal,identity,non-chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {} {}}
 
-test http11-1.5 "normal request for document, unsupported coding" -setup {
+test http11-1.5.$ThreadLevel "normal request for document, unsupported coding" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
@@ -200,7 +200,7 @@ test http11-1.5 "normal request for document, unsupported coding" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {}}
 
-test http11-1.6 "normal, specify 1.1 " -setup {
+test http11-1.6.$ThreadLevel "normal, specify 1.1 " -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
@@ -214,7 +214,7 @@ test http11-1.6 "normal, specify 1.1 " -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close chunked {connection close} {transfer-encoding chunked}}
 
-test http11-1.7 "normal, 1.1 and keepalive " -setup {
+test http11-1.7.$ThreadLevel "normal, 1.1 and keepalive " -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
@@ -227,7 +227,7 @@ test http11-1.7 "normal, 1.1 and keepalive " -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {} chunked}
 
-test http11-1.8 "normal, 1.1 and keepalive, server close" -setup {
+test http11-1.8.$ThreadLevel "normal, 1.1 and keepalive, server close" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \
@@ -240,7 +240,7 @@ test http11-1.8 "normal, 1.1 and keepalive, server close" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close {}}
 
-test http11-1.9 "normal,gzip,chunked" -setup {
+test http11-1.9.$ThreadLevel "normal,gzip,chunked" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
@@ -253,7 +253,7 @@ test http11-1.9 "normal,gzip,chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok gzip chunked}
 
-test http11-1.10 "normal,deflate,chunked" -setup {
+test http11-1.10.$ThreadLevel "normal,deflate,chunked" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
@@ -266,7 +266,7 @@ test http11-1.10 "normal,deflate,chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok deflate chunked}
 
-test http11-1.10.1 "normal,deflate,chunked,msdeflate" -setup {
+test http11-1.10.1.$ThreadLevel "normal,deflate,chunked,msdeflate" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html?msdeflate=1 \
@@ -279,7 +279,7 @@ test http11-1.10.1 "normal,deflate,chunked,msdeflate" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok deflate chunked}
 
-test http11-1.11 "normal,compress,chunked" -constraints badCompress -setup {
+test http11-1.11.$ThreadLevel "normal,compress,chunked" -constraints badCompress -setup {
     # The Tcl "compress" algorithm appears to be incorrect and has been removed.
     # Bug [a13b9d0ce1].
     variable httpd [create_httpd]
@@ -294,7 +294,7 @@ test http11-1.11 "normal,compress,chunked" -constraints badCompress -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok compress chunked}
 
-test http11-1.12 "normal,identity,chunked" -setup {
+test http11-1.12.$ThreadLevel "normal,identity,chunked" -setup {
     variable httpd [create_httpd]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
@@ -307,7 +307,7 @@ test http11-1.12 "normal,identity,chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {} chunked}
 
-test http11-1.13 "normal, 1.1 and keepalive as server default, no zip" -setup {
+test http11-1.13.$ThreadLevel "normal, 1.1 and keepalive as server default, no zip" -setup {
     variable httpd [create_httpd]
     set zipTmp [http::config -zip]
     http::config -zip 0
@@ -346,7 +346,7 @@ proc progressPause {var token total current} {
     return
 }
 
-test http11-2.0 "-channel" -setup {
+test http11-2.0.$ThreadLevel "-channel" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -364,7 +364,7 @@ test http11-2.0 "-channel" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close chunked}
 
-test http11-2.1 "-channel, encoding gzip" -setup {
+test http11-2.1.$ThreadLevel "-channel, encoding gzip" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -387,7 +387,7 @@ test http11-2.1 "-channel, encoding gzip" -setup {
 # Cf. Bug [3610253] "CopyChunk does not drain decompressor(s)"
 # This test failed before the bugfix.
 # The pass/fail depended on file size.
-test http11-2.1.1 "-channel, encoding gzip" -setup {
+test http11-2.1.1.$ThreadLevel "-channel, encoding gzip" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
     set fileName largedoc.html
@@ -408,7 +408,7 @@ test http11-2.1.1 "-channel, encoding gzip" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close gzip chunked -- 0 bytes lost}
 
-test http11-2.2 "-channel, encoding deflate" -setup {
+test http11-2.2.$ThreadLevel "-channel, encoding deflate" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -427,7 +427,7 @@ test http11-2.2 "-channel, encoding deflate" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close deflate chunked}
 
-test http11-2.2.1 "-channel, encoding deflate,msdeflate" -setup {
+test http11-2.2.1.$ThreadLevel "-channel, encoding deflate,msdeflate" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -446,7 +446,7 @@ test http11-2.2.1 "-channel, encoding deflate,msdeflate" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close deflate chunked}
 
-test http11-2.3 "-channel,encoding compress" -constraints badCompress -setup {
+test http11-2.3.$ThreadLevel "-channel,encoding compress" -constraints badCompress -setup {
     # The Tcl "compress" algorithm appears to be incorrect and has been removed.
     # Bug [a13b9d0ce1].
     variable httpd [create_httpd]
@@ -468,7 +468,7 @@ test http11-2.3 "-channel,encoding compress" -constraints badCompress -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close compress chunked}
 
-test http11-2.4 "-channel,encoding identity" -setup {
+test http11-2.4.$ThreadLevel "-channel,encoding identity" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -488,7 +488,7 @@ test http11-2.4 "-channel,encoding identity" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close {} chunked}
 
-test http11-2.4.1 "-channel,encoding identity with -progress" -setup {
+test http11-2.4.1.$ThreadLevel "-channel,encoding identity with -progress" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
     set logdata ""
@@ -514,7 +514,7 @@ test http11-2.4.1 "-channel,encoding identity with -progress" -setup {
     unset -nocomplain logdata data
 } -result {ok {HTTP/1.1 200 OK} ok close {} chunked 0 0}
 
-test http11-2.4.2 "-channel,encoding identity with -progress progressPause enters event loop" -constraints knownBug -setup {
+test http11-2.4.2.$ThreadLevel "-channel,encoding identity with -progress progressPause enters event loop" -constraints knownBug -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
     set logdata ""
@@ -540,7 +540,7 @@ test http11-2.4.2 "-channel,encoding identity with -progress progressPause enter
     unset -nocomplain logdata data ::WaitHere
 } -result {ok {HTTP/1.1 200 OK} ok close {} chunked 0 0}
 
-test http11-2.5 "-channel,encoding unsupported" -setup {
+test http11-2.5.$ThreadLevel "-channel,encoding unsupported" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -560,7 +560,7 @@ test http11-2.5 "-channel,encoding unsupported" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close {} chunked}
 
-test http11-2.6 "-channel,encoding gzip,non-chunked" -setup {
+test http11-2.6.$ThreadLevel "-channel,encoding gzip,non-chunked" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -580,7 +580,7 @@ test http11-2.6 "-channel,encoding gzip,non-chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close gzip {} 0}
 
-test http11-2.7 "-channel,encoding deflate,non-chunked" -setup {
+test http11-2.7.$ThreadLevel "-channel,encoding deflate,non-chunked" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -600,7 +600,7 @@ test http11-2.7 "-channel,encoding deflate,non-chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close deflate {} 0}
 
-test http11-2.7.1 "-channel,encoding deflate,non-chunked,msdeflate" -constraints knownBug -setup {
+test http11-2.7.1.$ThreadLevel "-channel,encoding deflate,non-chunked,msdeflate" -constraints knownBug -setup {
     # Test fails because a -channel can only try one un-deflate algorithm, and the
     # compliant "decompress" is tried, not the non-compliant "inflate" of
     # the MS browser implementation.
@@ -623,7 +623,7 @@ test http11-2.7.1 "-channel,encoding deflate,non-chunked,msdeflate" -constraints
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close deflate {} 0}
 
-test http11-2.8 "-channel,encoding compress,non-chunked" -constraints badCompress -setup {
+test http11-2.8.$ThreadLevel "-channel,encoding compress,non-chunked" -constraints badCompress -setup {
     # The Tcl "compress" algorithm appears to be incorrect and has been removed.
     # Bug [a13b9d0ce1].
     variable httpd [create_httpd]
@@ -645,7 +645,7 @@ test http11-2.8 "-channel,encoding compress,non-chunked" -constraints badCompres
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close compress {} 0}
 
-test http11-2.9 "-channel,encoding identity,non-chunked" -setup {
+test http11-2.9.$ThreadLevel "-channel,encoding identity,non-chunked" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -665,7 +665,7 @@ test http11-2.9 "-channel,encoding identity,non-chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close {} {} 0}
 
-test http11-2.10 "-channel,deflate,keepalive" -setup {
+test http11-2.10.$ThreadLevel "-channel,deflate,keepalive" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -686,7 +686,7 @@ test http11-2.10 "-channel,deflate,keepalive" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {} deflate chunked 0}
 
-test http11-2.10.1 "-channel,deflate,keepalive,msdeflate" -setup {
+test http11-2.10.1.$ThreadLevel "-channel,deflate,keepalive,msdeflate" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -707,7 +707,7 @@ test http11-2.10.1 "-channel,deflate,keepalive,msdeflate" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {} deflate chunked 0}
 
-test http11-2.11 "-channel,identity,keepalive" -setup {
+test http11-2.11.$ThreadLevel "-channel,identity,keepalive" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -727,7 +727,7 @@ test http11-2.11 "-channel,identity,keepalive" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {} {} chunked}
 
-test http11-2.12 "-channel,negotiate,keepalive" -setup {
+test http11-2.12.$ThreadLevel "-channel,negotiate,keepalive" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
@@ -775,7 +775,7 @@ proc handlerPause {var sock token} {
     return [string length $chunk]
 }
 
-test http11-3.0 "-handler,close,identity" -setup {
+test http11-3.0.$ThreadLevel "-handler,close,identity" -setup {
     variable httpd [create_httpd]
     set testdata ""
 } -body {
@@ -792,7 +792,7 @@ test http11-3.0 "-handler,close,identity" -setup {
     halt_httpd
 } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0}
 
-test http11-3.1 "-handler,protocol1.0" -setup {
+test http11-3.1.$ThreadLevel "-handler,protocol1.0" -setup {
     variable httpd [create_httpd]
     set testdata ""
 } -body {
@@ -810,7 +810,7 @@ test http11-3.1 "-handler,protocol1.0" -setup {
     halt_httpd
 } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0}
 
-test http11-3.2 "-handler,close,chunked" -setup {
+test http11-3.2.$ThreadLevel "-handler,close,chunked" -setup {
     variable httpd [create_httpd]
     set testdata ""
 } -body {
@@ -828,7 +828,7 @@ test http11-3.2 "-handler,close,chunked" -setup {
     halt_httpd
 } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0}
 
-test http11-3.3 "-handler,keepalive,chunked" -setup {
+test http11-3.3.$ThreadLevel "-handler,keepalive,chunked" -setup {
     variable httpd [create_httpd]
     set testdata ""
 } -body {
@@ -856,7 +856,7 @@ test http11-3.3 "-handler,keepalive,chunked" -setup {
 # "Connection: keep-alive", i.e. the server will keep the connection
 # open.  In HTTP/1.0 this is not the case, and this is a test that
 # the Tcl client assumes "Connection: close" by default in HTTP/1.0.
-test http11-3.4 "-handler,close,identity; HTTP/1.0 server does not send Connection: close header or Content-Length" -setup {
+test http11-3.4.$ThreadLevel "-handler,close,identity; HTTP/1.0 server does not send Connection: close header or Content-Length" -setup {
     variable httpd [create_httpd]
     set testdata ""
 } -body {
@@ -874,7 +874,7 @@ test http11-3.4 "-handler,close,identity; HTTP/1.0 server does not send Connecti
 } -result {ok {HTTP/1.0 200 OK} ok {} {} {} 0}
 
 # It is not forbidden for a handler to enter the event loop.
-test http11-3.5 "-handler,close,identity as http11-3.0 but handlerPause enters event loop" -setup {
+test http11-3.5.$ThreadLevel "-handler,close,identity as http11-3.0 but handlerPause enters event loop" -setup {
     variable httpd [create_httpd]
     set testdata ""
 } -body {
@@ -891,7 +891,7 @@ test http11-3.5 "-handler,close,identity as http11-3.0 but handlerPause enters e
     halt_httpd
 } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0}
 
-test http11-3.6 "-handler,close,identity as http11-3.0 but with -progress" -setup {
+test http11-3.6.$ThreadLevel "-handler,close,identity as http11-3.0 but with -progress" -setup {
     variable httpd [create_httpd]
     set testdata ""
     set logdata ""
@@ -912,7 +912,7 @@ test http11-3.6 "-handler,close,identity as http11-3.0 but with -progress" -setu
     halt_httpd
 } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0 0 0}
 
-test http11-3.7 "-handler,close,identity as http11-3.0 but with -progress progressPause enters event loop" -setup {
+test http11-3.7.$ThreadLevel "-handler,close,identity as http11-3.0 but with -progress progressPause enters event loop" -setup {
     variable httpd [create_httpd]
     set testdata ""
     set logdata ""
@@ -933,7 +933,7 @@ test http11-3.7 "-handler,close,identity as http11-3.0 but with -progress progre
     halt_httpd
 } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0 0 0}
 
-test http11-3.8 "close,identity no -handler but with -progress" -setup {
+test http11-3.8.$ThreadLevel "close,identity no -handler but with -progress" -setup {
     variable httpd [create_httpd]
     set logdata ""
 } -body {
@@ -975,7 +975,7 @@ test http11-3.9 "close,identity no -handler but with -progress progressPause ent
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close {} {} 0 0 0}
 
-test http11-4.0 "normal post request" -setup {
+test http11-4.0.$ThreadLevel "normal post request" -setup {
     variable httpd [create_httpd]
 } -body {
     set query [http::formatQuery q 1 z 2]
@@ -991,7 +991,7 @@ test http11-4.0 "normal post request" -setup {
     halt_httpd
 } -result {status ok code {HTTP/1.1 200 OK} crc ok connection close query-length 7}
 
-test http11-4.1 "normal post request, check query length" -setup {
+test http11-4.1.$ThreadLevel "normal post request, check query length" -setup {
     variable httpd [create_httpd]
 } -body {
     set query [http::formatQuery q 1 z 2]
@@ -1008,7 +1008,7 @@ test http11-4.1 "normal post request, check query length" -setup {
     halt_httpd
 } -result {status ok code {HTTP/1.1 200 OK} crc ok connection close query-length 7}
 
-test http11-4.2 "normal post request, check long query length" -setup {
+test http11-4.2.$ThreadLevel "normal post request, check long query length" -setup {
     variable httpd [create_httpd]
 } -body {
     set query [string repeat a 24576]
@@ -1025,7 +1025,7 @@ test http11-4.2 "normal post request, check long query length" -setup {
     halt_httpd
 } -result {status ok code {HTTP/1.1 200 OK} crc ok connection close query-length 24576}
 
-test http11-4.3 "normal post request, check channel query length" -setup {
+test http11-4.3.$ThreadLevel "normal post request, check channel query length" -setup {
     variable httpd [create_httpd]
     set chan [open [makeFile {} testfile.tmp] wb+]
     puts -nonewline $chan [string repeat [encoding convertto utf-8 "This is a test\n"] 8192]
diff --git a/tests/lreplace.test b/tests/lreplace.test
index 2952899..009170e 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -434,7 +434,7 @@ test ledit-4.4 {ledit edge case} {
     set l {1 2 3 4 5}
     list [ledit l 3 1] $l
 } {{1 2 3 4 5} {1 2 3 4 5}}
-test lreplace-4.5 {lreplace edge case} {
+test ledit-4.5 {ledit edge case} {
     lreplace {1 2 3 4 5} 3 0 _
 } {1 2 3 _ 4 5}
 test ledit-4.6 {ledit end-x: bug a4cb3f06c4} {
diff --git a/tests/scan.test b/tests/scan.test
index c6e7922..03a5b46 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -605,7 +605,7 @@ test scan-6.8 {floating-point scanning} -setup {
 } -body {
     list [scan "4.6 5.2" "%f %f %f %f" a b c d] $a $b $c $d
 } -result {2 4.6 5.2 {} {}}
-test scan-6.8 {disallow diget separator in floating-point} -setup {
+test scan-6.9 {disallow diget separator in floating-point} -setup {
     set a {}; set b {}; set c {};
 } -body {
     list [scan "3.14_2.35_98.6" %f_%f_%f a b c ] $a $b $c
-- 
cgit v0.12


From f87e100731a2d67fcbac3fa297934bbba91b7889 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Oct 2022 21:19:36 +0000
Subject: try -> catch

---
 tests/http.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/http.test b/tests/http.test
index eb2bf29..1ff570e 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -80,7 +80,7 @@ if {![info exists ThreadLevel]} {
     foreach ThreadLevel $ValueRange {
         source [info script]
     }
-    try [lpop threadStack]
+    catch {lpop threadStack}
     catch {unset ThreadLevel}
     catch {unset ValueRange}
     return
-- 
cgit v0.12


From c0cffed37f1950c005805fe0b43a8993dad46f49 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Oct 2022 21:58:38 +0000
Subject: backout [95cb836c8c]: "try [lpop threadStack]", that cannot be right

---
 tests/http.test | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index 1ff570e..6826448 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -47,7 +47,6 @@ if {![file exists $httpdFile]} {
 catch {package require Thread 2.7-}
 if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
     set httpthread [thread::create -preserved]
-    lappend threadStack [list thread::release $httpthread]
     thread::send $httpthread [list source $httpdFile]
     thread::send $httpthread [list set bindata $bindata]
     thread::send $httpthread {httpd_init 0; set port} port
@@ -65,7 +64,6 @@ if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
 	catch {unset port}
 	return
     }
-    set threadStack {}
 }
 
 if {![info exists ThreadLevel]} {
@@ -80,7 +78,6 @@ if {![info exists ThreadLevel]} {
     foreach ThreadLevel $ValueRange {
         source [info script]
     }
-    catch {lpop threadStack}
     catch {unset ThreadLevel}
     catch {unset ValueRange}
     return
@@ -1171,8 +1168,8 @@ catch {unset url}
 catch {unset badurl}
 catch {unset port}
 catch {unset data}
-if {[llength $threadStack]} {
-    try [lpop threadStack]
+if {[info exists httpthread]} {
+    thread::release $httpthread
 } else {
     close $listen
 }
-- 
cgit v0.12


From 18fb3780723b2613640a274c1b76831ebceadfeb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 28 Oct 2022 11:18:53 +0000
Subject: TIP #646 correction: let "fconfigure $chan -eofchar" return a single
 character, not a list element

---
 ChangeLog.2000          |  2 +-
 changes                 |  2 +-
 generic/regc_locale.c   |  2 +-
 generic/tclIO.c         | 16 ++++++++--------
 generic/tclIOUtil.c     | 12 ++++++------
 library/install.tcl     |  6 +++---
 tests/chan.test         | 12 +++++++-----
 tests/chanio.test       | 14 +++++++-------
 tests/io.test           | 16 ++++++++--------
 tools/regexpTestLib.tcl |  4 ++--
 10 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/ChangeLog.2000 b/ChangeLog.2000
index 7e78c19..8abe6c2 100644
--- a/ChangeLog.2000
+++ b/ChangeLog.2000
@@ -1356,7 +1356,7 @@
 	* doc/source.n:
 	* doc/Eval.3:
 	* tests/source.test:
-	* generic/tclIOUtil.c (Tcl_EvalFile): added explicit \32 (^Z) eofchar
+	* generic/tclIOUtil.c (Tcl_EvalFile): added explicit \x1A (^Z) eofchar
 	(affects Tcl_EvalFile in C, "source" in Tcl). This was implicit on
 	Windows already, and is now cross-platform to allow for scripted
 	documents.
diff --git a/changes b/changes
index 286f30b..d6347f1 100644
--- a/changes
+++ b/changes
@@ -4976,7 +4976,7 @@ msgcat package (duperval, krone, nelson)
 	trace {add|remove|list} {variable|command} name ops command
 (darley, melski)
 
-2000-09-06 (cross-platform feature) Set ^Z (\32) as default EOF char. (hobbs)
+2000-09-06 (cross-platform feature) Set ^Z (\x1A) as default EOF char. (hobbs)
 
 2000-09-07 partial fix for bug 2460 to prevent exec mem leak on Windows for the
 common case (gravereaux)
diff --git a/generic/regc_locale.c b/generic/regc_locale.c
index 7252b88..7d182e4 100644
--- a/generic/regc_locale.c
+++ b/generic/regc_locale.c
@@ -110,7 +110,7 @@ static const struct cname {
     {"right-brace",	'}'},
     {"right-curly-bracket", '}'},
     {"tilde",		'~'},
-    {"DEL",		'\177'},
+    {"DEL",		'\x7F'},
     {NULL,		0}
 };
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 374f770..b3b62ed 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7930,20 +7930,18 @@ Tcl_GetChannelOption(
 	}
     }
     if (len == 0 || HaveOpt(2, "-eofchar")) {
+	char buf[4] = "";
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-eofchar");
 	}
-	if (!(flags & TCL_READABLE) || (statePtr->inEofChar == 0)) {
-	    Tcl_DStringAppendElement(dsPtr, "");
-	} else {
-	    char buf[4];
-
+	if ((flags & TCL_READABLE) && (statePtr->inEofChar != 0)) {
 	    sprintf(buf, "%c", statePtr->inEofChar);
-	    Tcl_DStringAppendElement(dsPtr, buf);
 	}
 	if (len > 0) {
+		Tcl_DStringAppend(dsPtr, buf, TCL_INDEX_NONE);
 	    return TCL_OK;
 	}
+	Tcl_DStringAppendElement(dsPtr, buf);
     }
     if (len == 0 || HaveOpt(1, "-nocomplainencoding")) {
 	if (len == 0) {
@@ -8181,6 +8179,7 @@ Tcl_SetChannelOption(
 	    if (GotFlag(statePtr, TCL_READABLE)) {
 		statePtr->inEofChar = newValue[0];
 	    }
+#ifndef TCL_NO_DEPRECATED
 	} else if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
 	    return TCL_ERROR;
 	} else if (argc == 0) {
@@ -8201,11 +8200,12 @@ Tcl_SetChannelOption(
 	    if (GotFlag(statePtr, TCL_READABLE)) {
 		statePtr->inEofChar = inValue;
 	    }
+#endif
 	} else {
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"bad value for -eofchar: should be a list of zero,"
-			" one, or two elements", -1));
+			"bad value for -eofchar: must be non-NUL ASCII"
+			" character", -1));
 	    }
 	    Tcl_Free((void *)argv);
 	    return TCL_ERROR;
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index aa92754..470977e 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1715,11 +1715,11 @@ Tcl_FSEvalFileEx(
     }
 
     /*
-     * The eof character is \32 (^Z). This is standard on Windows, and Tcl
-     * uses it on every platform to allow for scripted documents. [Bug: 2040]
+     * The eof character is \x1A (^Z). Tcl uses it on every platform to allow
+     * for scripted documents. [Bug: 2040]
      */
 
-    Tcl_SetChannelOption(interp, chan, "-eofchar", "\32 {}");
+    Tcl_SetChannelOption(interp, chan, "-eofchar", "\x1A");
 
     /*
      * If the encoding is specified, set the channel to that encoding.
@@ -1851,11 +1851,11 @@ TclNREvalFile(
     TclPkgFileSeen(interp, TclGetString(pathPtr));
 
     /*
-     * The eof character is \32 (^Z). This is standard on Windows, and Tcl
-     * uses it on every platform to allow for scripted documents. [Bug: 2040]
+     * The eof character is \x1A (^Z). Tcl uses it on every platform to allow
+     * for scripted documents. [Bug: 2040]
      */
 
-    Tcl_SetChannelOption(interp, chan, "-eofchar", "\32 {}");
+    Tcl_SetChannelOption(interp, chan, "-eofchar", "\x1A");
 
     /*
      * If the encoding is specified, set the channel to that encoding.
diff --git a/library/install.tcl b/library/install.tcl
index 50e40df..4abdead 100644
--- a/library/install.tcl
+++ b/library/install.tcl
@@ -35,7 +35,7 @@ proc ::practcl::_pkgindex_directory {path} {
       # Read the file, and override assumptions as needed
       ###
       set fin [open $file r]
-      fconfigure $fin -encoding utf-8 -eofchar "\x1A {}"
+      fconfigure $fin -encoding utf-8 -eofchar \x1A
       set dat [read $fin]
       close $fin
       # Look for a teapot style Package statement
@@ -59,7 +59,7 @@ proc ::practcl::_pkgindex_directory {path} {
     foreach file [glob -nocomplain $path/*.tcl] {
       if { [file tail $file] == "version_info.tcl" } continue
       set fin [open $file r]
-      fconfigure $fin -encoding utf-8 -eofchar "\x1A {}"
+      fconfigure $fin -encoding utf-8 -eofchar \x1A
       set dat [read $fin]
       close $fin
       if {![regexp "package provide" $dat]} continue
@@ -79,7 +79,7 @@ proc ::practcl::_pkgindex_directory {path} {
     return $buffer
   }
   set fin [open $pkgidxfile r]
-  fconfigure $fin -encoding utf-8 -eofchar "\x1A {}"
+  fconfigure $fin -encoding utf-8 -eofchar \x1A
   set dat [read $fin]
   close $fin
   set trace 0
diff --git a/tests/chan.test b/tests/chan.test
index 280783f..946e424 100644
--- a/tests/chan.test
+++ b/tests/chan.test
@@ -12,6 +12,8 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
+package require tcltests
+
 #
 # Note: The tests for the chan methods "create" and "postevent"
 # currently reside in the file "ioCmd.test".
@@ -49,19 +51,19 @@ test chan-4.1 {chan command: configure subcommand} -body {
 } -returnCodes error -result "wrong # args: should be \"chan configure channelId ?-option value ...?\""
 test chan-4.2 {chan command: [Bug 800753]} -body {
     chan configure stdout -eofchar Ā
-} -returnCodes error -match glob -result {bad value*}
+} -returnCodes error -result {bad value for -eofchar: must be non-NUL ASCII character}
 test chan-4.3 {chan command: [Bug 800753]} -body {
     chan configure stdout -eofchar \x00
-} -returnCodes error -match glob -result {bad value*}
-test chan-4.4 {chan command: check valid inValue, no outValue} -body {
+} -returnCodes error -result {bad value for -eofchar: must be non-NUL ASCII character}
+test chan-4.4 {chan command: check valid inValue, no outValue} -constraints deprecated -body {
     chan configure stdout -eofchar [list \x27 {}]
 } -result {}
 test chan-4.5 {chan command: check valid inValue, invalid outValue} -body {
     chan configure stdout -eofchar [list \x27 \x80]
-} -returnCodes error -match glob -result {bad value for -eofchar:*}
+} -returnCodes error -result {bad value for -eofchar: must be non-NUL ASCII character}
 test chan-4.6 {chan command: check no inValue, valid outValue} -body {
     chan configure stdout -eofchar [list {} \x27]
-} -returnCodes error -result {bad value for -eofchar: must be non-NUL ASCII character} -cleanup {chan configure stdout -eofchar [list {} {}]}
+} -returnCodes error -result {bad value for -eofchar: must be non-NUL ASCII character} -cleanup {chan configure stdout -eofchar {}}
 
 test chan-5.1 {chan command: copy subcommand} -body {
     chan copy foo
diff --git a/tests/chanio.test b/tests/chanio.test
index c7cde60..91cfcd4 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -1889,13 +1889,13 @@ test chan-io-20.2 {Tcl_CreateChannel: initial settings} -constraints {win} -body
     list [chan configure $f -eofchar] [chan configure $f -translation]
 } -cleanup {
     chan close $f
-} -result {{{}} {auto crlf}}
+} -result {{} {auto crlf}}
 test chan-io-20.3 {Tcl_CreateChannel: initial settings} -constraints {unix} -body {
     set f [open $path(test1) w+]
     list [chan configure $f -eofchar] [chan configure $f -translation]
 } -cleanup {
     chan close $f
-} -result {{{}} {auto lf}}
+} -result {{} {auto lf}}
 test chan-io-20.5 {Tcl_CreateChannel: install channel in empty slot} -setup {
     set path(stdout) [makeFile {} stdout]
 } -constraints {stdio notWinCI} -body {
@@ -5285,7 +5285,7 @@ test chan-io-39.21 {Tcl_SetChannelOption, setting read mode independently} \
 test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
     file delete $path(test1)
     set l ""
-} -constraints {unix} -body {
+} -constraints {unix deprecated} -body {
     set f1 [open $path(test1) w+]
     lappend l [chan configure $f1 -eofchar]
     chan configure $f1 -eofchar {O {}}
@@ -5298,7 +5298,7 @@ test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
 test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
     file delete $path(test1)
     set l [list]
-} -body {
+} -constraints deprecated -body {
     set f1 [open $path(test1) w+]
     chan configure $f1 -eofchar {O {}}
     lappend l [chan configure $f1 -eofchar]
@@ -5307,7 +5307,7 @@ test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
     lappend l [list [catch {chan configure $f1 -eofchar {1 2 3}} msg] $msg]
 } -cleanup {
     chan close $f1
-} -result {O D {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
+} -result {O D {1 {bad value for -eofchar: must be non-NUL ASCII character}}}
 test chan-io-39.23 {Tcl_GetChannelOption, server socket is not readable or\
         writeable, it should still have valid -eofchar and -translation options} -setup {
     set l [list]
@@ -5317,7 +5317,7 @@ test chan-io-39.23 {Tcl_GetChannelOption, server socket is not readable or\
 	[chan configure $sock -translation]
 } -cleanup {
     chan close $sock
-} -result {{{}} auto}
+} -result {{} auto}
 test chan-io-39.24 {Tcl_SetChannelOption, server socket is not readable or\
         writable so we can't change -eofchar or -translation} -setup {
     set l [list]
@@ -5328,7 +5328,7 @@ test chan-io-39.24 {Tcl_SetChannelOption, server socket is not readable or\
 	[chan configure $sock -translation]
 } -cleanup {
     chan close $sock
-} -result {{{}} auto}
+} -result {{} auto}
 
 test chan-io-40.1 {POSIX open access modes: RDWR} -setup {
     file delete $path(test3)
diff --git a/tests/io.test b/tests/io.test
index 0db2e9a..04c9cd2 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -2093,13 +2093,13 @@ test io-20.2 {Tcl_CreateChannel: initial settings} {win} {
     set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
     close $f
     set x
-} {{{}} {auto crlf}}
+} {{} {auto crlf}}
 test io-20.3 {Tcl_CreateChannel: initial settings} {unix} {
     set f [open $path(test1) w+]
     set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
     close $f
     set x
-} {{{}} {auto lf}}
+} {{} {auto lf}}
 set path(stdout) [makeFile {} stdout]
 test io-20.5 {Tcl_CreateChannel: install channel in empty slot} stdio {
     set f [open $path(script) w]
@@ -5756,7 +5756,7 @@ test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \
     close $s2
     set modes
 } {auto crlf}
-test io-39.22 {Tcl_SetChannelOption, invariance} {unix} {
+test io-39.22 {Tcl_SetChannelOption, invariance} {unix deprecated} {
     file delete $path(test1)
     set f1 [open $path(test1) w+]
     set l ""
@@ -5767,8 +5767,8 @@ test io-39.22 {Tcl_SetChannelOption, invariance} {unix} {
     lappend l [fconfigure $f1 -eofchar]
     close $f1
     set l
-} {{{}} O D}
-test io-39.22a {Tcl_SetChannelOption, invariance} {
+} {{} O D}
+test io-39.22a {Tcl_SetChannelOption, invariance} deprecated {
     file delete $path(test1)
     set f1 [open $path(test1) w+]
     set l [list]
@@ -5779,7 +5779,7 @@ test io-39.22a {Tcl_SetChannelOption, invariance} {
     lappend l [list [catch {fconfigure $f1 -eofchar {1 2 3}} msg] $msg]
     close $f1
     set l
-} {O D {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
+} {O D {1 {bad value for -eofchar: must be non-NUL ASCII character}}}
 test io-39.23 {Tcl_GetChannelOption, server socket is not readable or
         writeable, it should still have valid -eofchar and -translation options } {
     set l [list]
@@ -5787,7 +5787,7 @@ test io-39.23 {Tcl_GetChannelOption, server socket is not readable or
     lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation]
     close $sock
     set l
-} {{{}} auto}
+} {{} auto}
 test io-39.24 {Tcl_SetChannelOption, server socket is not readable or
         writable so we can't change -eofchar or -translation } {
     set l [list]
@@ -5796,7 +5796,7 @@ test io-39.24 {Tcl_SetChannelOption, server socket is not readable or
     lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation]
     close $sock
     set l
-} {{{}} auto}
+} {{} auto}
 
 test io-40.1 {POSIX open access modes: RDWR} {
     file delete $path(test3)
diff --git a/tools/regexpTestLib.tcl b/tools/regexpTestLib.tcl
index 454a4e8..2687e67 100644
--- a/tools/regexpTestLib.tcl
+++ b/tools/regexpTestLib.tcl
@@ -183,9 +183,9 @@ proc convertTestLine {currentLine len lineNum srcLineNum} {
     set noBraces 0
     if {[regexp {=|>} $flags] == 1} {
 	regsub -all {_} $currentLine {\\ } currentLine
-	regsub -all {A} $currentLine {\\007} currentLine
+	regsub -all {A} $currentLine {\\x07} currentLine
 	regsub -all {B} $currentLine {\\b} currentLine
-	regsub -all {E} $currentLine {\\033} currentLine
+	regsub -all {E} $currentLine {\\x1B} currentLine
 	regsub -all {F} $currentLine {\\f} currentLine
 	regsub -all {N} $currentLine {\\n} currentLine
 
-- 
cgit v0.12


From 0b20d5aff1c281bc34289c99f781cf54817a60f8 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 28 Oct 2022 12:55:40 +0000
Subject: Restore test suite fix.  If [try] is too confusing, then I will use
 [eval]. The stack is a stack of commands.

Test hygiene.  This was creating one more thread than it destroyed.
In a -singleproc 1 test run, this caused tests in later test files to fail
because the stray thread causes test results to be different.
---
 tests/http.test | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index 6826448..b422b2a 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -47,6 +47,7 @@ if {![file exists $httpdFile]} {
 catch {package require Thread 2.7-}
 if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
     set httpthread [thread::create -preserved]
+    lappend threadStack [list thread::release $httpthread]
     thread::send $httpthread [list source $httpdFile]
     thread::send $httpthread [list set bindata $bindata]
     thread::send $httpthread {httpd_init 0; set port} port
@@ -64,6 +65,7 @@ if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
 	catch {unset port}
 	return
     }
+    set threadStack {}
 }
 
 if {![info exists ThreadLevel]} {
@@ -78,6 +80,7 @@ if {![info exists ThreadLevel]} {
     foreach ThreadLevel $ValueRange {
         source [info script]
     }
+    eval [lpop threadStack]
     catch {unset ThreadLevel}
     catch {unset ValueRange}
     return
@@ -1168,8 +1171,8 @@ catch {unset url}
 catch {unset badurl}
 catch {unset port}
 catch {unset data}
-if {[info exists httpthread]} {
-    thread::release $httpthread
+if {[llength $threadStack]} {
+    eval [lpop threadStack]
 } else {
     close $listen
 }
-- 
cgit v0.12


From 8fb4c52383acfa9fd7d0863185935cabf3614511 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 13:18:55 +0000
Subject: TIP 633 and TIP 346: add man page entry for fconfigure

---
 doc/fconfigure.n | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 617e82d..836bb5a 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -113,6 +113,34 @@ The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7F;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
 generate an error.
 .TP
+.VS "TCL9.0 TIP633"
+\fB\-nocomplainencoding\fR \fIbool\fR
+.
+Reporting mode of encoding errors.
+If set to a \fItrue\fR value, encoding errors are resolved by a replacement
+character (output) or verbatim bytes (input). No error is thrown.
+If set to a \fIfalse\fR value, errors are thrown in case of encoding errors.
+.RS
+.PP
+The default value is \fIfalse\fR starting from TCL 9.0 and \fItrue\fR on TCL 8.7.
+This option was introduced with TCL 8.7 and has the fix value \fItrue\fR.
+.TP
+See the \fI\-nocomplain\fR option of the \fBencoding\fR command for more information.
+.RE
+.TP
+.VE "TCL9.0 TIP633"
+.TP
+.VS "TCL9.0 TIP346"
+\fB\-strictencoding\fR \fIbool\fR
+.
+Activate additional stricter encoding application rules.
+Default value is \fIfalse\fR.
+.RS
+.PP
+See the \fI\-strict\fR option of the \fBencoding\fR command for more information.
+.VE "TCL9.0 TIP346"
+.RE
+.TP
 \fB\-translation\fR \fImode\fR
 .TP
 \fB\-translation\fR \fB{\fIinMode outMode\fB}\fR
@@ -268,10 +296,10 @@ set data [read $f $numDataBytes]
 close $f
 .CE
 .SH "SEE ALSO"
-close(n), flush(n), gets(n), open(n), puts(n), read(n), socket(n),
+close(n), encoding(n), flush(n), gets(n), open(n), puts(n), read(n), socket(n),
 Tcl_StandardChannels(3)
 .SH KEYWORDS
-blocking, buffering, carriage return, end of line, flushing, linemode,
+blocking, buffering, carriage return, end of line, encoding, flushing, linemode,
 newline, nonblocking, platform, translation, encoding, filter, byte array,
 binary
 '\" Local Variables:
-- 
cgit v0.12


From d48c9ac13ee11d125c6b3739de5fec48ffbfa994 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 13:33:55 +0000
Subject: TIP 633 and TIP 346: add man page entry for fconfigure (TCL 8.7)

---
 doc/fconfigure.n | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 4bb9fc6..5b3de3d 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -123,6 +123,32 @@ The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7F;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
 generate an error.
 .TP
+.VS "TCL8.7 TIP633"
+\fB\-nocomplainencoding\fR \fIbool\fR
+.
+Reporting mode of encoding errors.
+If set to a \fItrue\fR value, encoding errors are resolved by a replacement
+character (output) or verbatim bytes (input). No error is thrown.
+This is the only available mode in Tcl 8.7.
+.RS
+.PP
+Starting from TCL 9.0, this value may be set to a \fIfalse\fR value to throw errors
+in case of encoding errors.
+.RE
+.TP
+.VE "TCL8.7 TIP633"
+.TP
+.VS "TCL8.7 TIP346"
+\fB\-strictencoding\fR \fIbool\fR
+.
+Activate additional stricter encoding application rules.
+Default value is \fIfalse\fR.
+.RS
+.PP
+See the \fI\-strict\fR option of the \fBencoding\fR command for more information.
+.VE "TCL8.7 TIP346"
+.RE
+.TP
 \fB\-translation\fR \fImode\fR
 .TP
 \fB\-translation\fR \fB{\fIinMode outMode\fB}\fR
-- 
cgit v0.12


From 008d15c04ecfdcf081d5476266626b4c62874205 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 13:36:21 +0000
Subject: fconfigure man: correct chapter syntax

---
 doc/fconfigure.n | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 836bb5a..0e8b4a7 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -124,7 +124,7 @@ If set to a \fIfalse\fR value, errors are thrown in case of encoding errors.
 .PP
 The default value is \fIfalse\fR starting from TCL 9.0 and \fItrue\fR on TCL 8.7.
 This option was introduced with TCL 8.7 and has the fix value \fItrue\fR.
-.TP
+.PP
 See the \fI\-nocomplain\fR option of the \fBencoding\fR command for more information.
 .RE
 .TP
-- 
cgit v0.12


From 9d428d86eb4c38c8a0d3c8e56ead50c81a1c9d77 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 13:50:46 +0000
Subject: Resolve tcltk-man2html.tcl errors in fconfigure.n

---
 doc/fconfigure.n | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 0e8b4a7..47906cf 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -112,8 +112,8 @@ string.
 The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7F;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
 generate an error.
-.TP
 .VS "TCL9.0 TIP633"
+.TP
 \fB\-nocomplainencoding\fR \fIbool\fR
 .
 Reporting mode of encoding errors.
@@ -127,10 +127,9 @@ This option was introduced with TCL 8.7 and has the fix value \fItrue\fR.
 .PP
 See the \fI\-nocomplain\fR option of the \fBencoding\fR command for more information.
 .RE
-.TP
 .VE "TCL9.0 TIP633"
-.TP
 .VS "TCL9.0 TIP346"
+.TP
 \fB\-strictencoding\fR \fIbool\fR
 .
 Activate additional stricter encoding application rules.
-- 
cgit v0.12


From 1f207f9a0d45f5de980a8058e79c38a618e2e874 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 13:51:18 +0000
Subject: Resolve tcltk-man2html.tcl errors in fconfigure.n

---
 doc/fconfigure.n | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 5b3de3d..9061161 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -122,8 +122,8 @@ reading and the empty string for writing.
 The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7F;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
 generate an error.
-.TP
 .VS "TCL8.7 TIP633"
+.TP
 \fB\-nocomplainencoding\fR \fIbool\fR
 .
 Reporting mode of encoding errors.
@@ -135,10 +135,9 @@ This is the only available mode in Tcl 8.7.
 Starting from TCL 9.0, this value may be set to a \fIfalse\fR value to throw errors
 in case of encoding errors.
 .RE
-.TP
 .VE "TCL8.7 TIP633"
-.TP
 .VS "TCL8.7 TIP346"
+.TP
 \fB\-strictencoding\fR \fIbool\fR
 .
 Activate additional stricter encoding application rules.
-- 
cgit v0.12


From 6db74fe6eb42e7f214f0c62038102374a22106be Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 28 Oct 2022 14:37:56 +0000
Subject: The file $(builddir)/tclUuid.h is not part of the source code
 distribution. The `make distclean` target should delete it.

---
 unix/Makefile.in | 2 +-
 win/Makefile.in  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 340edbf..0a99998 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -765,7 +765,7 @@ clean: clean-packages
 
 distclean: distclean-packages clean
 	rm -rf Makefile config.status config.cache config.log tclConfig.sh \
-		tclConfig.h *.plist Tcl.framework tcl.pc
+		tclConfig.h *.plist Tcl.framework tcl.pc tclUuid.h
 	(cd dltest ; $(MAKE) distclean)
 
 depend:
diff --git a/win/Makefile.in b/win/Makefile.in
index 8e15849..7d444a7 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -830,7 +830,7 @@ clean: cleanhelp clean-packages
 
 distclean: distclean-packages clean
 	$(RM) Makefile config.status config.cache config.log tclConfig.sh \
-		tcl.hpj config.status.lineno tclsh.exe.manifest
+		tcl.hpj config.status.lineno tclsh.exe.manifest tclUuid.h
 
 #
 # Bundled package targets
-- 
cgit v0.12


From a333cf0f8e86a36b3c58dbff9936baffd90ac68b Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 14:58:52 +0000
Subject: Correct issues in safe.n reported by tcltk-man2html.tcl

---
 doc/safe.n | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/safe.n b/doc/safe.n
index 6dd4033..6e0d948 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -468,7 +468,7 @@ Examples of use with "Sync Mode" off: any of these commands will set the
  safe::interpConfigure foo -accessPath {}
 .CE
 .RE
-.TP
+.PP
 Example of use with "Sync Mode" off: when initializing a safe interpreter
 with a non-empty access path, the ::auto_path will be set to {} unless its
 own value is also specified:
@@ -506,7 +506,7 @@ own value is also specified:
  }
 .CE
 .RE
-.TP
+.PP
 Example of use with "Sync Mode" off: the command
 \fBsafe::interpAddToAccessPath\fR does not change the safe interpreter's
 ::auto_path, and so any necessary change must be made by the script:
@@ -520,7 +520,6 @@ Example of use with "Sync Mode" off: the command
  safe::interpConfigure foo -autoPath $childAutoPath
 .CE
 .RE
-.TP
 .SH "SEE ALSO"
 interp(n), library(n), load(n), package(n), pkg_mkIndex(n), source(n),
 tm(n), unknown(n)
-- 
cgit v0.12


From 78241e0ee73910886647c69a7fbc43cb7812f18c Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 15:53:09 +0000
Subject: TIP346, TIP607, TIP601: document encoding command

---
 doc/encoding.n | 102 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 36 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index c1dbf27..eff4a13 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -28,30 +28,37 @@ formats.
 Performs one of several encoding related operations, depending on
 \fIoption\fR.  The legal \fIoption\fRs are:
 .TP
-\fBencoding convertfrom\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR?
-?\fIencoding\fR? \fIdata\fR
+\fBencoding convertfrom\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR? ?\fB-strict\fR? ?\fIencoding\fR? \fIdata\fR
 .
 Convert \fIdata\fR to a Unicode string from the specified \fIencoding\fR.  The
 characters in \fIdata\fR are 8 bit binary data.  The resulting
 sequence of bytes is a string created by applying the given \fIencoding\fR
 to the data. If \fIencoding\fR is not specified, the current
 system encoding is used.
-.
-The call fails on convertion errors, like an incomplete utf-8 sequence.
-The option \fB-failindex\fR is followed by a variable name. The variable
-is set to \fI-1\fR if no conversion error occured. It is set to the
-first error location in \fIdata\fR in case of a conversion error. All data
-until this error location is transformed and retured. This option may not
-be used together with \fB-nocomplain\fR.
-.
-The call does not fail on conversion errors, if the option
-\fB-nocomplain\fR is given. In this case, any error locations are replaced
-by \fB?\fR. Incomplete sequences are written verbatim to the output string.
-The purpose of this switch is to gain compatibility to prior versions of TCL.
-It is not recommended for any other usage.
+.VS "TCL8.7 TIP346, TIP607, TIP601"
+.PP
+.RS
+If the option \fB-nocomplain\fR is given, the command does not fail on
+encoding errors.  Instead, any not convertable bytes (like incomplete UTF-8
+ sequences, see example below) are put as byte values into the output stream.
+If the option \fB-nocomplain\fR is not given, the command will fail with an
+appropriate error message.
+.PP
+If the option \fB-failindex\fR with a variable name is given, the error reporting
+is changed in the following manner:
+in case of a conversion error, the position of the input byte causing the error
+is returned in the given variable.  The return value of the command are the
+converted characters until the first error position. No error condition is raised.
+In case of no error, the value \fI-1\fR is written to the variable.  This option
+may not be used together with \fB-nocomplain\fR.
+.PP
+The \fB-strict\fR option followes more strict rules in conversion.  Currently, only
+the sequence \fB\\xC0\\x80\fR in \fButf-8\fR encoding is disallowed.  Additional rules
+may follow.
+.VE "TCL8.7 TIP346, TIP607, TIP601"
+.RE
 .TP
-\fBencoding convertto\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR?
-?\fIencoding\fR? \fIstring\fR
+\fBencoding convertto\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR? ?\fB-strict\fR? ?\fIencoding\fR? \fIstring\fR
 .
 Convert \fIstring\fR from Unicode to the specified \fIencoding\fR.
 The result is a sequence of bytes that represents the converted
@@ -59,21 +66,28 @@ string.  Each byte is stored in the lower 8-bits of a Unicode
 character (indeed, the resulting string is a binary string as far as
 Tcl is concerned, at least initially).  If \fIencoding\fR is not
 specified, the current system encoding is used.
-.
-The call fails on convertion errors, like a Unicode character not representable
-in the given \fIencoding\fR.
-.
-The option \fB-failindex\fR is followed by a variable name. The variable
-is set to \fI-1\fR if no conversion error occured. It is set to the
-first error location in \fIdata\fR in case of a conversion error. All data
-until this error location is transformed and retured. This option may not
-be used together with \fB-nocomplain\fR.
-.
-The call does not fail on conversion errors, if the option
-\fB-nocomplain\fR is given. In this case, any error locations are replaced
-by \fB?\fR. Incomplete sequences are written verbatim to the output string.
-The purpose of this switch is to gain compatibility to prior versions of TCL.
-It is not recommended for any other usage.
+.VS "TCL8.7 TIP346, TIP607, TIP601"
+.PP
+.RS
+If the option \fB-nocomplain\fR is given, the command does not fail on
+encoding errors.  Instead, the replacement character \fB?\fR is output
+for any not representable character (like the dot \fB\\U2022\fR
+in \fBiso-8859-1\fI encoding, see example below).
+If the option \fB-nocomplain\fR is not given, the command will fail with an
+appropriate error message.
+.PP
+If the option \fB-failindex\fR with a variable name is given, the error reporting
+is changed in the following manner:
+in case of a conversion error, the position of the input character causing the error
+is returned in the given variable.  The return value of the command are the
+converted bytes until the first error position. No error condition is raised.
+In case of no error, the value \fI-1\fR is written to the variable.  This option
+may not be used together with \fB-nocomplain\fR.
+.PP
+The \fB-strict\fR option followes more strict rules in conversion.  Currently, it has
+no effect but may be used in future to add additional encoding checks.
+.VE "TCL8.7 TIP346, TIP607, TIP601"
+.RE
 .TP
 \fBencoding dirs\fR ?\fIdirectoryList\fR?
 .
@@ -104,7 +118,7 @@ omitted then the command returns the current system encoding.  The
 system encoding is used whenever Tcl passes strings to system calls.
 .SH EXAMPLE
 .PP
-The following example converts a byte sequence in Japanese euc-jp encoding to a TCL string:
+Example 1: convert a byte sequence in Japanese euc-jp encoding to a TCL string:
 .PP
 .CS
 set s [\fBencoding convertfrom\fR euc-jp "\exA4\exCF"]
@@ -113,8 +127,9 @@ set s [\fBencoding convertfrom\fR euc-jp "\exA4\exCF"]
 The result is the unicode codepoint:
 .QW "\eu306F" ,
 which is the Hiragana letter HA.
+.VS "TCL8.7 TIP346, TIP607, TIP601"
 .PP
-The following example detects the error location in an incomplete UTF-8 sequence:
+Example 2: detect the error location in an incomplete UTF-8 sequence:
 .PP
 .CS
 % set s [\fBencoding convertfrom\fR -failindex i utf-8 "A\exC3"]
@@ -123,7 +138,14 @@ A
 1
 .CE
 .PP
-The following example detects the error location while transforming to ISO8859-1
+Example 3: return the incomplete UTF-8 sequence by raw bytes:
+.PP
+.CS
+% set s [\fBencoding convertfrom\fR -nocomplain utf-8 "A\exC3"]
+.CE
+The result is "A" followed by the byte \exC3.
+.PP
+Example 4: detect the error location while transforming to ISO8859-1
 (ISO-Latin 1):
 .PP
 .CS
@@ -133,8 +155,16 @@ A
 1
 .CE
 .PP
+Example 5: replace a not representable character by the replacement character:
+.PP
+.CS
+% set s [\fBencoding convertto\fR -nocomplain utf-8 "A\eu0141"]
+A?
+.CE
+.VE "TCL8.7 TIP346, TIP607, TIP601"
+.PP
 .SH "SEE ALSO"
-Tcl_GetEncoding(3)
+Tcl_GetEncoding(3), fconfigure(n)
 .SH KEYWORDS
 encoding, unicode
 .\" Local Variables:
-- 
cgit v0.12


From 5ba7f2ce37c985a7db5220baafb301007fecadd6 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 28 Oct 2022 16:10:17 +0000
Subject: Document TCL 8.7 behaviour of TIP601 and TIP607.

---
 doc/encoding.n | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index eff4a13..bbe197d 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -38,20 +38,22 @@ system encoding is used.
 .VS "TCL8.7 TIP346, TIP607, TIP601"
 .PP
 .RS
-If the option \fB-nocomplain\fR is given, the command does not fail on
-encoding errors.  Instead, any not convertable bytes (like incomplete UTF-8
- sequences, see example below) are put as byte values into the output stream.
-If the option \fB-nocomplain\fR is not given, the command will fail with an
-appropriate error message.
+The command does not fail on encoding errors.  Instead, any not convertable bytes
+(like incomplete UTF-8  sequences, see example below) are put as byte values into
+the output stream.
 .PP
 If the option \fB-failindex\fR with a variable name is given, the error reporting
 is changed in the following manner:
 in case of a conversion error, the position of the input byte causing the error
 is returned in the given variable.  The return value of the command are the
-converted characters until the first error position. No error condition is raised.
+converted characters until the first error position.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
 may not be used together with \fB-nocomplain\fR.
 .PP
+The option \fB-nocomplain\fR has no effect and is available for compatibility with
+TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
+This switch restores the TCL8.7 behaviour.
+.PP
 The \fB-strict\fR option followes more strict rules in conversion.  Currently, only
 the sequence \fB\\xC0\\x80\fR in \fButf-8\fR encoding is disallowed.  Additional rules
 may follow.
@@ -69,12 +71,9 @@ specified, the current system encoding is used.
 .VS "TCL8.7 TIP346, TIP607, TIP601"
 .PP
 .RS
-If the option \fB-nocomplain\fR is given, the command does not fail on
-encoding errors.  Instead, the replacement character \fB?\fR is output
-for any not representable character (like the dot \fB\\U2022\fR
-in \fBiso-8859-1\fI encoding, see example below).
-If the option \fB-nocomplain\fR is not given, the command will fail with an
-appropriate error message.
+The command does not fail on encoding errors.  Instead, the replacement character
+\fB?\fR is output for any not representable character (like the dot \fB\\U2022\fR
+in \fBiso-8859-1\fR encoding, see example below).
 .PP
 If the option \fB-failindex\fR with a variable name is given, the error reporting
 is changed in the following manner:
@@ -84,6 +83,10 @@ converted bytes until the first error position. No error condition is raised.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
 may not be used together with \fB-nocomplain\fR.
 .PP
+The option \fB-nocomplain\fR has no effect and is available for compatibility with
+TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
+This switch restores the TCL8.7 behaviour.
+.PP
 The \fB-strict\fR option followes more strict rules in conversion.  Currently, it has
 no effect but may be used in future to add additional encoding checks.
 .VE "TCL8.7 TIP346, TIP607, TIP601"
@@ -143,7 +146,8 @@ Example 3: return the incomplete UTF-8 sequence by raw bytes:
 .CS
 % set s [\fBencoding convertfrom\fR -nocomplain utf-8 "A\exC3"]
 .CE
-The result is "A" followed by the byte \exC3.
+The result is "A" followed by the byte \exC3.  The option \fB-nocomplain\fR
+has no effect, but assures to get the same result with TCL9.
 .PP
 Example 4: detect the error location while transforming to ISO8859-1
 (ISO-Latin 1):
@@ -161,6 +165,8 @@ Example 5: replace a not representable character by the replacement character:
 % set s [\fBencoding convertto\fR -nocomplain utf-8 "A\eu0141"]
 A?
 .CE
+The option \fB-nocomplain\fR has no effect, but assures to get the same result
+with TCL9.
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .PP
 .SH "SEE ALSO"
-- 
cgit v0.12


From f8f170cfd384b83be557bde3f4dff1f974b09048 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 28 Oct 2022 16:18:29 +0000
Subject: Duplicate test names

---
 tests/http.test         | 352 ++++++++++++++++++++++++------------------------
 tests/http11.test       |   2 +-
 tests/httpPipeline.test |   2 +-
 tests/httpProxy.test    |  56 ++++----
 4 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index b422b2a..742ff1c 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -89,17 +89,17 @@ if {![info exists ThreadLevel]} {
 catch {puts "==== Test with ThreadLevel $ThreadLevel ===="}
 http::config -threadlevel $ThreadLevel
 
-test http-1.1 {http::config} {
+test http-1.1.$ThreadLevel {http::config} {
     http::config -useragent UserAgent
     http::config
 } [list -accept */* -cookiejar {} -pipeline 1 -postfresh 0 -proxyauth {} -proxyfilter http::ProxyRequired -proxyhost {} -proxynot {} -proxyport {} -repost 0 -threadlevel $ThreadLevel -urlencoding utf-8 -useragent UserAgent -zip 1]
-test http-1.2 {http::config} {
+test http-1.2.$ThreadLevel {http::config} {
     http::config -proxyfilter
 } http::ProxyRequired
-test http-1.3 {http::config} {
+test http-1.3.$ThreadLevel {http::config} {
     catch {http::config -junk}
 } 1
-test http-1.4 {http::config} {
+test http-1.4.$ThreadLevel {http::config} {
     set savedconf [http::config]
     http::config -proxyhost nowhere.come -proxyport 8080 \
 	-proxyfilter myFilter -useragent "Tcl Test Suite" \
@@ -108,10 +108,10 @@ test http-1.4 {http::config} {
     http::config {*}$savedconf
     set x
 } [list -accept */* -cookiejar {} -pipeline 1 -postfresh 0 -proxyauth {} -proxyfilter myFilter -proxyhost nowhere.come -proxynot {} -proxyport 8080 -repost 0 -threadlevel $ThreadLevel -urlencoding iso8859-1 -useragent {Tcl Test Suite} -zip 1]
-test http-1.5 {http::config} -returnCodes error -body {
+test http-1.5.$ThreadLevel {http::config} -returnCodes error -body {
     http::config -proxyhost {} -junk 8080
 } -result {Unknown option -junk, must be: -accept, -cookiejar, -pipeline, -postfresh, -proxyauth, -proxyfilter, -proxyhost, -proxynot, -proxyport, -repost, -threadlevel, -urlencoding, -useragent, -zip}
-test http-1.6 {http::config} -setup {
+test http-1.6.$ThreadLevel {http::config} -setup {
     set oldenc [http::config -urlencoding]
 } -body {
     set enc [list [http::config -urlencoding]]
@@ -121,42 +121,42 @@ test http-1.6 {http::config} -setup {
     http::config -urlencoding $oldenc
 } -result {utf-8 iso8859-1}
 
-test http-2.1 {http::reset} {
+test http-2.1.$ThreadLevel {http::reset} {
     catch {http::reset http#1}
 } 0
-test http-2.2 {http::CharsetToEncoding} {
+test http-2.2.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding iso-8859-11
 } iso8859-11
-test http-2.3 {http::CharsetToEncoding} {
+test http-2.3.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding iso-2022-kr
 } iso2022-kr
-test http-2.4 {http::CharsetToEncoding} {
+test http-2.4.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding shift-jis
 } shiftjis
-test http-2.5 {http::CharsetToEncoding} {
+test http-2.5.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding windows-437
 } cp437
-test http-2.6 {http::CharsetToEncoding} {
+test http-2.6.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding latin5
 } iso8859-9
-test http-2.7 {http::CharsetToEncoding} {
+test http-2.7.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding latin1
 } iso8859-1
-test http-2.8 {http::CharsetToEncoding} {
+test http-2.8.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding latin4
 } binary
 
-test http-3.1 {http::geturl} -returnCodes error -body {
+test http-3.1.$ThreadLevel {http::geturl} -returnCodes error -body {
     http::geturl -bogus flag
 } -result {Unknown option flag, can be: -binary, -blocksize, -channel, -command, -guesstype, -handler, -headers, -keepalive, -method, -myaddr, -progress, -protocol, -query, -queryblocksize, -querychannel, -queryprogress, -strict, -timeout, -type, -validate}
 
-test http-3.2 {http::geturl} -returnCodes error -body {
+test http-3.2.$ThreadLevel {http::geturl} -returnCodes error -body {
     http::geturl http:junk
 } -result {Unsupported URL: http:junk}
 
 set url //${::HOST}:$port
 set badurl //${::HOST}:[expr {$port+1}]
-test http-3.3 {http::geturl} -body {
+test http-3.3.$ThreadLevel {http::geturl} -body {
     set token [http::geturl $url]
     http::data $token
 } -cleanup {
@@ -176,7 +176,7 @@ set badposturl //${::HOST}:$port/droppost
 set authorityurl //${::HOST}:$port
 set ipv6url http://\[::1\]:$port/
 
-test http-3.4 {http::geturl} -body {
+test http-3.4.$ThreadLevel {http::geturl} -body {
     set token [http::geturl $url]
     http::data $token
 } -cleanup {
@@ -189,7 +189,7 @@ proc selfproxy {host} {
     global port
     return [list ${::HOST} $port]
 }
-test http-3.5 {http::geturl} -body {
+test http-3.5.$ThreadLevel {http::geturl} -body {
     http::config -proxyfilter selfproxy
     set token [http::geturl $url]
     http::data $token
@@ -200,7 +200,7 @@ test http-3.5 {http::geturl} -body {
 <h1>Hello, World!</h1>
 <h2>GET http:$url</h2>
 </body></html>"
-test http-3.6 {http::geturl} -body {
+test http-3.6.$ThreadLevel {http::geturl} -body {
     http::config -proxyfilter bogus
     set token [http::geturl $url]
     http::data $token
@@ -211,7 +211,7 @@ test http-3.6 {http::geturl} -body {
 <h1>Hello, World!</h1>
 <h2>GET $tail</h2>
 </body></html>"
-test http-3.7 {http::geturl} -body {
+test http-3.7.$ThreadLevel {http::geturl} -body {
     set token [http::geturl $url -headers {Pragma no-cache}]
     http::data $token
 } -cleanup {
@@ -220,7 +220,7 @@ test http-3.7 {http::geturl} -body {
 <h1>Hello, World!</h1>
 <h2>GET $tail</h2>
 </body></html>"
-test http-3.8 {http::geturl} -body {
+test http-3.8.$ThreadLevel {http::geturl} -body {
     set token [http::geturl $url -query Name=Value&Foo=Bar -timeout 3000]
     http::data $token
 } -cleanup {
@@ -234,13 +234,13 @@ test http-3.8 {http::geturl} -body {
 <dt>Foo<dd>Bar
 </dl>
 </body></html>"
-test http-3.9 {http::geturl} -body {
+test http-3.9.$ThreadLevel {http::geturl} -body {
     set token [http::geturl $url -validate 1]
     http::code $token
 } -cleanup {
     http::cleanup $token
 } -result "HTTP/1.0 200 OK"
-test http-3.10 {http::geturl queryprogress} -setup {
+test http-3.10.$ThreadLevel {http::geturl queryprogress} -setup {
     set query foo=bar
     set sep ""
     set i 0
@@ -263,7 +263,7 @@ test http-3.10 {http::geturl queryprogress} -setup {
 } -cleanup {
     http::cleanup $t
 } -result {ok 122879 {16384 32768 49152 65536 81920 98304 114688 122879} {Got 122879 bytes}}
-test http-3.11 {http::geturl querychannel with -command} -setup {
+test http-3.11.$ThreadLevel {http::geturl querychannel with -command} -setup {
     set query foo=bar
     set sep ""
     set i 0
@@ -302,7 +302,7 @@ test http-3.11 {http::geturl querychannel with -command} -setup {
 # The status is "eof".
 # On Windows, the http::wait procedure gets a "connection reset by peer" error
 # while reading the reply.
-test http-3.12 {http::geturl querychannel with aborted request} -setup {
+test http-3.12.$ThreadLevel {http::geturl querychannel with aborted request} -setup {
     set query foo=bar
     set sep ""
     set i 0
@@ -340,7 +340,7 @@ test http-3.12 {http::geturl querychannel with aborted request} -setup {
     removeFile outdata
     http::cleanup $t
 } -result {ok {HTTP/1.0 200 Data follows}}
-test http-3.13 {http::geturl socket leak test} {
+test http-3.13.$ThreadLevel {http::geturl socket leak test} {
     set chanCount [llength [file channels]]
     for {set i 0} {$i < 3} {incr i} {
 	catch {http::geturl $badurl -timeout 5000}
@@ -348,43 +348,43 @@ test http-3.13 {http::geturl socket leak test} {
     # No extra channels should be taken
     expr {[llength [file channels]] == $chanCount}
 } 1
-test http-3.14 "http::geturl $fullurl" -body {
+test http-3.14.$ThreadLevel "http::geturl $fullurl" -body {
     set token [http::geturl $fullurl -validate 1]
     http::code $token
 } -cleanup {
     http::cleanup $token
 } -result "HTTP/1.0 200 OK"
-test http-3.15 {http::geturl parse failures} -body {
+test http-3.15.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl "{invalid}:url"
 } -returnCodes error -result {Unsupported URL: {invalid}:url}
-test http-3.16 {http::geturl parse failures} -body {
+test http-3.16.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http:relative/url
 } -returnCodes error -result {Unsupported URL: http:relative/url}
-test http-3.17 {http::geturl parse failures} -body {
+test http-3.17.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl /absolute/url
 } -returnCodes error -result {Missing host part: /absolute/url}
-test http-3.18 {http::geturl parse failures} -body {
+test http-3.18.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http://somewhere:123456789/
 } -returnCodes error -result {Invalid port number: 123456789}
-test http-3.19 {http::geturl parse failures} -body {
+test http-3.19.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http://{user}@somewhere
 } -returnCodes error -result {Illegal characters in URL user}
-test http-3.20 {http::geturl parse failures} -body {
+test http-3.20.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http://%user@somewhere
 } -returnCodes error -result {Illegal encoding character usage "%us" in URL user}
-test http-3.21 {http::geturl parse failures} -body {
+test http-3.21.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http://somewhere/{path}
 } -returnCodes error -result {Illegal characters in URL path}
-test http-3.22 {http::geturl parse failures} -body {
+test http-3.22.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http://somewhere/%path
 } -returnCodes error -result {Illegal encoding character usage "%pa" in URL path}
-test http-3.23 {http::geturl parse failures} -body {
+test http-3.23.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http://somewhere/path?{query}?
 } -returnCodes error -result {Illegal characters in URL path}
-test http-3.24 {http::geturl parse failures} -body {
+test http-3.24.$ThreadLevel {http::geturl parse failures} -body {
     http::geturl http://somewhere/path?%query
 } -returnCodes error -result {Illegal encoding character usage "%qu" in URL path}
-test http-3.25 {http::meta} -setup {
+test http-3.25.$ThreadLevel {http::meta} -setup {
     unset -nocomplain m token
 } -body {
     set token [http::geturl $url -timeout 3000]
@@ -394,7 +394,7 @@ test http-3.25 {http::meta} -setup {
     http::cleanup $token
     unset -nocomplain m token
 } -result {content-length content-type date}
-test http-3.26 {http::meta} -setup {
+test http-3.26.$ThreadLevel {http::meta} -setup {
     unset -nocomplain m token
 } -body {
     set token [http::geturl $url -headers {X-Check 1} -timeout 3000]
@@ -404,7 +404,7 @@ test http-3.26 {http::meta} -setup {
     http::cleanup $token
     unset -nocomplain m token
 } -result {content-length content-type date x-check}
-test http-3.27 {http::geturl: -headers override -type} -body {
+test http-3.27.$ThreadLevel {http::geturl: -headers override -type} -body {
     set token [http::geturl $url/headers -type "text/plain" -query dummy \
 	    -headers [list "Content-Type" "text/plain;charset=utf-8"]]
     http::data $token
@@ -417,7 +417,7 @@ Accept \*/\*
 Accept-Encoding .*
 Connection close
 Content-Length 5}
-test http-3.28 {http::geturl: -headers override -type default} -body {
+test http-3.28.$ThreadLevel {http::geturl: -headers override -type default} -body {
     set token [http::geturl $url/headers -query dummy \
 	    -headers [list "Content-Type" "text/plain;charset=utf-8"]]
     http::data $token
@@ -430,7 +430,7 @@ Accept \*/\*
 Accept-Encoding .*
 Connection close
 Content-Length 5}
-test http-3.29 {http::geturl IPv6 address} -body {
+test http-3.29.$ThreadLevel {http::geturl IPv6 address} -body {
     # We only want to see if the URL gets parsed correctly. This is
     # the case if http::geturl succeeds or returns a socket related
     # error. If the parsing is wrong, we'll get a parse error.
@@ -444,20 +444,20 @@ test http-3.29 {http::geturl IPv6 address} -body {
 } -cleanup {
     catch { http::cleanup $token }
 } -result 0
-test http-3.30 {http::geturl query without path} -body {
+test http-3.30.$ThreadLevel {http::geturl query without path} -body {
     set token [http::geturl $authorityurl?var=val]
     http::ncode $token
 } -cleanup {
     catch { http::cleanup $token }
 } -result 200
-test http-3.31 {http::geturl fragment without path} -body {
+test http-3.31.$ThreadLevel {http::geturl fragment without path} -body {
     set token [http::geturl "$authorityurl#fragment42"]
     http::ncode $token
 } -cleanup {
     catch { http::cleanup $token }
 } -result 200
 # Bug c11a51c482
-test http-3.32 {http::geturl: -headers override -accept default} -body {
+test http-3.32.$ThreadLevel {http::geturl: -headers override -accept default} -body {
     set token [http::geturl $url/headers -query dummy \
 	    -headers [list "Accept" "text/plain,application/tcl-test-value"]]
     http::data $token
@@ -471,20 +471,20 @@ Connection close
 Content-Type application/x-www-form-urlencoded
 Content-Length 5}
 # Bug 838e99a76d
-test http-3.33 {http::geturl application/xml is text} -body {
+test http-3.33.$ThreadLevel {http::geturl application/xml is text} -body {
     set token [http::geturl "$xmlurl"]
     scan [http::data $token] "<%\[^>]>%c<%\[^>]>"
 } -cleanup {
     catch { http::cleanup $token }
 } -result {test 4660 /test}
-test http-3.34 {http::geturl -headers not a list} -returnCodes error -body {
+test http-3.34.$ThreadLevel {http::geturl -headers not a list} -returnCodes error -body {
     http::geturl http://test/t -headers \"
 } -result {Bad value for -headers ("), must be list}
-test http-3.35 {http::geturl -headers not even number of elements} -returnCodes error -body {
+test http-3.35.$ThreadLevel {http::geturl -headers not even number of elements} -returnCodes error -body {
     http::geturl http://test/t -headers {List Length 3}
 } -result {Bad value for -headers (List Length 3), number of list elements must be even}
 
-test http-4.1 {http::Event} -body {
+test http-4.1.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url -keepalive 0]
     upvar #0 $token data
     array set meta $data(meta)
@@ -492,7 +492,7 @@ test http-4.1 {http::Event} -body {
 } -cleanup {
     http::cleanup $token
 } -result 1
-test http-4.2 {http::Event} -body {
+test http-4.2.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url]
     upvar #0 $token data
     array set meta $data(meta)
@@ -500,13 +500,13 @@ test http-4.2 {http::Event} -body {
 } -cleanup {
     http::cleanup $token
 } -result 0
-test http-4.3 {http::Event} -body {
+test http-4.3.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url]
     http::code $token
 } -cleanup {
     http::cleanup $token
 } -result {HTTP/1.0 200 Data follows}
-test http-4.4 {http::Event} -setup {
+test http-4.4.$ThreadLevel {http::Event} -setup {
     set testfile [makeFile "" testfile]
 } -body {
     set out [open $testfile w]
@@ -523,7 +523,7 @@ test http-4.4 {http::Event} -setup {
 <h1>Hello, World!</h1>
 <h2>GET $tail</h2>
 </body></html>"
-test http-4.5 {http::Event} -setup {
+test http-4.5.$ThreadLevel {http::Event} -setup {
     set testfile [makeFile "" testfile]
 } -body {
     set out [open $testfile w]
@@ -536,7 +536,7 @@ test http-4.5 {http::Event} -setup {
     removeFile $testfile
     http::cleanup $token
 } -result 1
-test http-4.6 {http::Event} -setup {
+test http-4.6.$ThreadLevel {http::Event} -setup {
     set testfile [makeFile "" testfile]
 } -body {
     set out [open $testfile w]
@@ -558,29 +558,29 @@ proc myProgress {token total current} {
     }
     set progress [list $total $current]
 }
-test http-4.6.1 {http::Event} knownBug {
+test http-4.6.1.$ThreadLevel {http::Event} knownBug {
     set token [http::geturl $url -blocksize 50 -progress myProgress]
     return $progress
 } {111 111}
-test http-4.7 {http::Event} -body {
+test http-4.7.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url -keepalive 0 -progress myProgress]
     return $progress
 } -cleanup {
     http::cleanup $token
 } -result {111 111}
-test http-4.8 {http::Event} -body {
+test http-4.8.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url]
     http::status $token
 } -cleanup {
     http::cleanup $token
 } -result {ok}
-test http-4.9 {http::Event} -body {
+test http-4.9.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url -progress myProgress]
     http::code $token
 } -cleanup {
     http::cleanup $token
 } -result {HTTP/1.0 200 Data follows}
-test http-4.10 {http::Event} -body {
+test http-4.10.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url -progress myProgress]
     http::size $token
 } -cleanup {
@@ -590,7 +590,7 @@ test http-4.10 {http::Event} -body {
 # Timeout cases
 #	Short timeout to working server (the test server). This lets us try a
 #	reset during the connection.
-test http-4.11 {http::Event} -body {
+test http-4.11.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url -timeout 1 -keepalive 0 -command \#]
     http::reset $token
     http::status $token
@@ -599,7 +599,7 @@ test http-4.11 {http::Event} -body {
 } -result {reset}
 
 #	Longer timeout with reset.
-test http-4.12 {http::Event} -body {
+test http-4.12.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url/?timeout=10 -keepalive 0 -command \#]
     http::reset $token
     http::status $token
@@ -609,7 +609,7 @@ test http-4.12 {http::Event} -body {
 
 #	Medium timeout to working server that waits even longer. The timeout
 #	hits while waiting for a reply.
-test http-4.13 {http::Event} -body {
+test http-4.13.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url?timeout=30 -keepalive 0 -timeout 10 -command \#]
     http::wait $token
     http::status $token
@@ -619,7 +619,7 @@ test http-4.13 {http::Event} -body {
 
 #	Longer timeout to good host, bad port, gets an error after the
 #	connection "completes" but the socket is bad.
-test http-4.14 {http::Event} -body {
+test http-4.14.$ThreadLevel {http::Event} -body {
     set token [http::geturl $badurl/?timeout=10 -timeout 10000 -command \#]
     if {$token eq ""} {
 	error "bogus return from http::geturl"
@@ -631,7 +631,7 @@ test http-4.14 {http::Event} -body {
 } -result {connect failed connection refused}
 
 # Bogus host
-test http-4.15 {http::Event} -body {
+test http-4.15.$ThreadLevel {http::Event} -body {
     # This test may fail if you use a proxy server. That is to be
     # expected and is not a problem with Tcl.
     # With http::config -threadlevel 1 or 2, the script enters the event loop
@@ -645,7 +645,7 @@ test http-4.15 {http::Event} -body {
     catch {http::cleanup $token}
 } -match glob -result "error -- couldn't open socket*"
 
-test http-4.16 {Leak with Close vs Keepalive (bug [6ca52aec14]} -setup {
+test http-4.16.$ThreadLevel {Leak with Close vs Keepalive (bug [6ca52aec14]} -setup {
     proc list-difference {l1 l2} {
 	lmap item $l2 {if {$item in $l1} continue; set item}
     }
@@ -660,17 +660,17 @@ test http-4.16 {Leak with Close vs Keepalive (bug [6ca52aec14]} -setup {
     rename list-difference {}
 } -result {}
 
-test http-5.1 {http::formatQuery} {
+test http-5.1.$ThreadLevel {http::formatQuery} {
     http::formatQuery name1 value1 name2 "value two"
 } {name1=value1&name2=value%20two}
 # test http-5.2 obsoleted by 5.4 and 5.5 with http 2.5
-test http-5.3 {http::formatQuery} {
+test http-5.3.$ThreadLevel {http::formatQuery} {
     http::formatQuery lines "line1\nline2\nline3"
 } {lines=line1%0D%0Aline2%0D%0Aline3}
-test http-5.4 {http::formatQuery} {
+test http-5.4.$ThreadLevel {http::formatQuery} {
     http::formatQuery name1 ~bwelch name2 ¡¢¢
 } {name1=~bwelch&name2=%C2%A1%C2%A2%C2%A2}
-test http-5.5 {http::formatQuery} {
+test http-5.5.$ThreadLevel {http::formatQuery} {
     set enc [http::config -urlencoding]
     http::config -urlencoding iso8859-1
     set res [http::formatQuery name1 ~bwelch name2 ¡¢¢]
@@ -678,7 +678,7 @@ test http-5.5 {http::formatQuery} {
     set res
 } {name1=~bwelch&name2=%A1%A2%A2}
 
-test http-6.1 {http::ProxyRequired} -body {
+test http-6.1.$ThreadLevel {http::ProxyRequired} -body {
     http::config -proxyhost ${::HOST} -proxyport $port
     set token [http::geturl $url]
     http::wait $token
@@ -692,15 +692,15 @@ test http-6.1 {http::ProxyRequired} -body {
 <h2>GET http:$url</h2>
 </body></html>"
 
-test http-7.1 {http::mapReply} {
+test http-7.1.$ThreadLevel {http::mapReply} {
     http::mapReply "abc\$\[\]\"\\()\}\{"
 } {abc%24%5B%5D%22%5C%28%29%7D%7B}
-test http-7.2 {http::mapReply} {
+test http-7.2.$ThreadLevel {http::mapReply} {
     # RFC 2718 specifies that we pass urlencoding on utf-8 chars by default,
     # so make sure this gets converted to utf-8 then urlencoded.
     http::mapReply "∈"
 } {%E2%88%88}
-test http-7.3 {http::formatQuery} -setup {
+test http-7.3.$ThreadLevel {http::formatQuery} -setup {
     set enc [http::config -urlencoding]
 } -returnCodes error -body {
     # -urlencoding "" no longer supported. Use "iso8859-1".
@@ -709,7 +709,7 @@ test http-7.3 {http::formatQuery} -setup {
 } -cleanup {
     http::config -urlencoding $enc
 } -result {unknown encoding ""}
-test http-7.4 {http::formatQuery} -constraints deprecated -setup {
+test http-7.4.$ThreadLevel {http::formatQuery} -constraints deprecated -setup {
     set enc [http::config -urlencoding]
 } -body {
     # this would be reverting to http <=2.4 behavior w/o errors
@@ -723,113 +723,113 @@ test http-7.4 {http::formatQuery} -constraints deprecated -setup {
 
 package require tcl::idna 1.0
 
-test http-idna-1.1 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.1.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna
 } -result {wrong # args: should be "::tcl::idna subcommand ?arg ...?"}
-test http-idna-1.2 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.2.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna ?
 } -result {unknown or ambiguous subcommand "?": must be decode, encode, puny, or version}
-test http-idna-1.3 {IDNA package: basics} -body {
+test http-idna-1.3.$ThreadLevel {IDNA package: basics} -body {
     ::tcl::idna version
 } -result 1.0.1
-test http-idna-1.4 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.4.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna version what
 } -result {wrong # args: should be "::tcl::idna version"}
-test http-idna-1.5 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.5.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny
 } -result {wrong # args: should be "::tcl::idna puny subcommand ?arg ...?"}
-test http-idna-1.6 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.6.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny ?
 } -result {unknown or ambiguous subcommand "?": must be decode, or encode}
-test http-idna-1.7 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.7.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny encode
 } -result {wrong # args: should be "::tcl::idna puny encode string ?case?"}
-test http-idna-1.8 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.8.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny encode a b c
 } -result {wrong # args: should be "::tcl::idna puny encode string ?case?"}
-test http-idna-1.9 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.9.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny decode
 } -result {wrong # args: should be "::tcl::idna puny decode string ?case?"}
-test http-idna-1.10 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.10.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna puny decode a b c
 } -result {wrong # args: should be "::tcl::idna puny decode string ?case?"}
-test http-idna-1.11 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.11.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna decode
 } -result {wrong # args: should be "::tcl::idna decode hostname"}
-test http-idna-1.12 {IDNA package: basics} -returnCodes error -body {
+test http-idna-1.12.$ThreadLevel {IDNA package: basics} -returnCodes error -body {
     ::tcl::idna encode
 } -result {wrong # args: should be "::tcl::idna encode hostname"}
 
-test http-idna-2.1 {puny encode: functional test} {
+test http-idna-2.1.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode abc
 } abc-
-test http-idna-2.2 {puny encode: functional test} {
+test http-idna-2.2.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode a€b€c
 } abc-k50ab
-test http-idna-2.3 {puny encode: functional test} {
+test http-idna-2.3.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode ABC
 } ABC-
-test http-idna-2.4 {puny encode: functional test} {
+test http-idna-2.4.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode A€B€C
 } ABC-k50ab
-test http-idna-2.5 {puny encode: functional test} {
+test http-idna-2.5.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode ABC 0
 } abc-
-test http-idna-2.6 {puny encode: functional test} {
+test http-idna-2.6.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode A€B€C 0
 } abc-k50ab
-test http-idna-2.7 {puny encode: functional test} {
+test http-idna-2.7.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode ABC 1
 } ABC-
-test http-idna-2.8 {puny encode: functional test} {
+test http-idna-2.8.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode A€B€C 1
 } ABC-k50ab
-test http-idna-2.9 {puny encode: functional test} {
+test http-idna-2.9.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode abc 0
 } abc-
-test http-idna-2.10 {puny encode: functional test} {
+test http-idna-2.10.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode a€b€c 0
 } abc-k50ab
-test http-idna-2.11 {puny encode: functional test} {
+test http-idna-2.11.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode abc 1
 } ABC-
-test http-idna-2.12 {puny encode: functional test} {
+test http-idna-2.12.$ThreadLevel {puny encode: functional test} {
     ::tcl::idna puny encode a€b€c 1
 } ABC-k50ab
-test http-idna-2.13 {puny encode: edge cases} {
+test http-idna-2.13.$ThreadLevel {puny encode: edge cases} {
     ::tcl::idna puny encode ""
 } ""
-test http-idna-2.14-A {puny encode: examples from RFC 3492} {
+test http-idna-2.14-A.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+0644 u+064A u+0647 u+0645 u+0627 u+0628 u+062A u+0643 u+0644
 	u+0645 u+0648 u+0634 u+0639 u+0631 u+0628 u+064A u+061F
     }]] ""]
 } egbpdaj6bu4bxfgehfvwxn
-test http-idna-2.14-B {puny encode: examples from RFC 3492} {
+test http-idna-2.14-B.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+4ED6 u+4EEC u+4E3A u+4EC0 u+4E48 u+4E0D u+8BF4 u+4E2D u+6587
     }]] ""]
 } ihqwcrb4cv8a8dqg056pqjye
-test http-idna-2.14-C {puny encode: examples from RFC 3492} {
+test http-idna-2.14-C.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+4ED6 u+5011 u+7232 u+4EC0 u+9EBD u+4E0D u+8AAA u+4E2D u+6587
     }]] ""]
 } ihqwctvzc91f659drss3x8bo0yb
-test http-idna-2.14-D {puny encode: examples from RFC 3492} {
+test http-idna-2.14-D.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+0050 u+0072 u+006F u+010D u+0070 u+0072 u+006F u+0073 u+0074
 	u+011B u+006E u+0065 u+006D u+006C u+0075 u+0076 u+00ED u+010D
 	u+0065 u+0073 u+006B u+0079
     }]] ""]
 } Proprostnemluvesky-uyb24dma41a
-test http-idna-2.14-E {puny encode: examples from RFC 3492} {
+test http-idna-2.14-E.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+05DC u+05DE u+05D4 u+05D4 u+05DD u+05E4 u+05E9 u+05D5 u+05D8
 	u+05DC u+05D0 u+05DE u+05D3 u+05D1 u+05E8 u+05D9 u+05DD u+05E2
 	u+05D1 u+05E8 u+05D9 u+05EA
     }]] ""]
 } 4dbcagdahymbxekheh6e0a7fei0b
-test http-idna-2.14-F {puny encode: examples from RFC 3492} {
+test http-idna-2.14-F.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+092F u+0939 u+0932 u+094B u+0917 u+0939 u+093F u+0928 u+094D
 	u+0926 u+0940 u+0915 u+094D u+092F u+094B u+0902 u+0928 u+0939
@@ -837,20 +837,20 @@ test http-idna-2.14-F {puny encode: examples from RFC 3492} {
 	u+0939 u+0948 u+0902
     }]] ""]
 } i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd
-test http-idna-2.14-G {puny encode: examples from RFC 3492} {
+test http-idna-2.14-G.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+306A u+305C u+307F u+3093 u+306A u+65E5 u+672C u+8A9E u+3092
 	u+8A71 u+3057 u+3066 u+304F u+308C u+306A u+3044 u+306E u+304B
     }]] ""]
 } n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa
-test http-idna-2.14-H {puny encode: examples from RFC 3492} {
+test http-idna-2.14-H.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+C138 u+ACC4 u+C758 u+BAA8 u+B4E0 u+C0AC u+B78C u+B4E4 u+C774
 	u+D55C u+AD6D u+C5B4 u+B97C u+C774 u+D574 u+D55C u+B2E4 u+BA74
 	u+C5BC u+B9C8 u+B098 u+C88B u+C744 u+AE4C
     }]] ""]
 } 989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c
-test http-idna-2.14-I {puny encode: examples from RFC 3492} {
+test http-idna-2.14-I.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+043F u+043E u+0447 u+0435 u+043C u+0443 u+0436 u+0435 u+043E
 	u+043D u+0438 u+043D u+0435 u+0433 u+043E u+0432 u+043E u+0440
@@ -858,7 +858,7 @@ test http-idna-2.14-I {puny encode: examples from RFC 3492} {
 	u+0438
     }]] ""]
 } b1abfaaepdrnnbgefbadotcwatmq2g4l
-test http-idna-2.14-J {puny encode: examples from RFC 3492} {
+test http-idna-2.14-J.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+0050 u+006F u+0072 u+0071 u+0075 u+00E9 u+006E u+006F u+0070
 	u+0075 u+0065 u+0064 u+0065 u+006E u+0073 u+0069 u+006D u+0070
@@ -867,7 +867,7 @@ test http-idna-2.14-J {puny encode: examples from RFC 3492} {
 	u+0061 u+00F1 u+006F u+006C
     }]] ""]
 } PorqunopuedensimplementehablarenEspaol-fmd56a
-test http-idna-2.14-K {puny encode: examples from RFC 3492} {
+test http-idna-2.14-K.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+0054 u+1EA1 u+0069 u+0073 u+0061 u+006F u+0068 u+1ECD u+006B
 	u+0068 u+00F4 u+006E u+0067 u+0074 u+0068 u+1EC3 u+0063 u+0068
@@ -875,135 +875,135 @@ test http-idna-2.14-K {puny encode: examples from RFC 3492} {
 	u+0056 u+0069 u+1EC7 u+0074
     }]] ""]
 } TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g
-test http-idna-2.14-L {puny encode: examples from RFC 3492} {
+test http-idna-2.14-L.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+0033 u+5E74 u+0042 u+7D44 u+91D1 u+516B u+5148 u+751F
     }]] ""]
 } 3B-ww4c5e180e575a65lsy2b
-test http-idna-2.14-M {puny encode: examples from RFC 3492} {
+test http-idna-2.14-M.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+5B89 u+5BA4 u+5948 u+7F8E u+6075 u+002D u+0077 u+0069 u+0074
 	u+0068 u+002D u+0053 u+0055 u+0050 u+0045 u+0052 u+002D u+004D
 	u+004F u+004E u+004B u+0045 u+0059 u+0053
     }]] ""]
 } -with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n
-test http-idna-2.14-N {puny encode: examples from RFC 3492} {
+test http-idna-2.14-N.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+0048 u+0065 u+006C u+006C u+006F u+002D u+0041 u+006E u+006F
 	u+0074 u+0068 u+0065 u+0072 u+002D u+0057 u+0061 u+0079 u+002D
 	u+305D u+308C u+305E u+308C u+306E u+5834 u+6240
     }]] ""]
 } Hello-Another-Way--fc4qua05auwb3674vfr0b
-test http-idna-2.14-O {puny encode: examples from RFC 3492} {
+test http-idna-2.14-O.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+3072 u+3068 u+3064 u+5C4B u+6839 u+306E u+4E0B u+0032
     }]] ""]
 } 2-u9tlzr9756bt3uc0v
-test http-idna-2.14-P {puny encode: examples from RFC 3492} {
+test http-idna-2.14-P.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+004D u+0061 u+006A u+0069 u+3067 u+004B u+006F u+0069 u+3059
 	u+308B u+0035 u+79D2 u+524D
     }]] ""]
 } MajiKoi5-783gue6qz075azm5e
-test http-idna-2.14-Q {puny encode: examples from RFC 3492} {
+test http-idna-2.14-Q.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+30D1 u+30D5 u+30A3 u+30FC u+0064 u+0065 u+30EB u+30F3 u+30D0
     }]] ""]
 } de-jg4avhby1noc0d
-test http-idna-2.14-R {puny encode: examples from RFC 3492} {
+test http-idna-2.14-R.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode [join [subst [string map {u+ \\u} {
 	u+305D u+306E u+30B9 u+30D4 u+30FC u+30C9 u+3067
     }]] ""]
 } d9juau41awczczp
-test http-idna-2.14-S {puny encode: examples from RFC 3492} {
+test http-idna-2.14-S.$ThreadLevel {puny encode: examples from RFC 3492} {
     ::tcl::idna puny encode {-> $1.00 <-}
 } {-> $1.00 <--}
 
-test http-idna-3.1 {puny decode: functional test} {
+test http-idna-3.1.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode abc-
 } abc
-test http-idna-3.2 {puny decode: functional test} {
+test http-idna-3.2.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode abc-k50ab
 } a€b€c
-test http-idna-3.3 {puny decode: functional test} {
+test http-idna-3.3.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode ABC-
 } ABC
-test http-idna-3.4 {puny decode: functional test} {
+test http-idna-3.4.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode ABC-k50ab
 } A€B€C
-test http-idna-3.5 {puny decode: functional test} {
+test http-idna-3.5.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode ABC-K50AB
 } A€B€C
-test http-idna-3.6 {puny decode: functional test} {
+test http-idna-3.6.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode abc-K50AB
 } a€b€c
-test http-idna-3.7 {puny decode: functional test} {
+test http-idna-3.7.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode ABC- 0
 } abc
-test http-idna-3.8 {puny decode: functional test} {
+test http-idna-3.8.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode ABC-K50AB 0
 } a€b€c
-test http-idna-3.9 {puny decode: functional test} {
+test http-idna-3.9.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode ABC- 1
 } ABC
-test http-idna-3.10 {puny decode: functional test} {
+test http-idna-3.10.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode ABC-K50AB 1
 } A€B€C
-test http-idna-3.11 {puny decode: functional test} {
+test http-idna-3.11.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode abc- 0
 } abc
-test http-idna-3.12 {puny decode: functional test} {
+test http-idna-3.12.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode abc-k50ab 0
 } a€b€c
-test http-idna-3.13 {puny decode: functional test} {
+test http-idna-3.13.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode abc- 1
 } ABC
-test http-idna-3.14 {puny decode: functional test} {
+test http-idna-3.14.$ThreadLevel {puny decode: functional test} {
     ::tcl::idna puny decode abc-k50ab 1
 } A€B€C
-test http-idna-3.15 {puny decode: edge cases and errors} {
+test http-idna-3.15.$ThreadLevel {puny decode: edge cases and errors} {
     # Is this case actually correct?
     binary encode hex [encoding convertto utf-8 [::tcl::idna puny decode abc]]
 } c282c281c280
-test http-idna-3.16 {puny decode: edge cases and errors} -returnCodes error -body {
+test http-idna-3.16.$ThreadLevel {puny decode: edge cases and errors} -returnCodes error -body {
     ::tcl::idna puny decode abc!
 } -result {bad decode character "!"}
-test http-idna-3.17 {puny decode: edge cases and errors} {
+test http-idna-3.17.$ThreadLevel {puny decode: edge cases and errors} {
     catch {::tcl::idna puny decode abc!} -> opt
     dict get $opt -errorcode
 } {PUNYCODE BAD_INPUT CHAR}
-test http-idna-3.18 {puny decode: edge cases and errors} {
+test http-idna-3.18.$ThreadLevel {puny decode: edge cases and errors} {
     ::tcl::idna puny decode ""
 } {}
 # A helper so we don't get lots of crap in failures
 proc hexify s {lmap c [split $s ""] {format u+%04X [scan $c %c]}}
-test http-idna-3.19-A {puny decode: examples from RFC 3492} {
+test http-idna-3.19-A.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode egbpdaj6bu4bxfgehfvwxn]
 } [list {*}{
     u+0644 u+064A u+0647 u+0645 u+0627 u+0628 u+062A u+0643 u+0644
     u+0645 u+0648 u+0634 u+0639 u+0631 u+0628 u+064A u+061F
 }]
-test http-idna-3.19-B {puny decode: examples from RFC 3492} {
+test http-idna-3.19-B.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode ihqwcrb4cv8a8dqg056pqjye]
 } {u+4ED6 u+4EEC u+4E3A u+4EC0 u+4E48 u+4E0D u+8BF4 u+4E2D u+6587}
-test http-idna-3.19-C {puny decode: examples from RFC 3492} {
+test http-idna-3.19-C.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode ihqwctvzc91f659drss3x8bo0yb]
 } {u+4ED6 u+5011 u+7232 u+4EC0 u+9EBD u+4E0D u+8AAA u+4E2D u+6587}
-test http-idna-3.19-D {puny decode: examples from RFC 3492} {
+test http-idna-3.19-D.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode Proprostnemluvesky-uyb24dma41a]
 } [list {*}{
     u+0050 u+0072 u+006F u+010D u+0070 u+0072 u+006F u+0073 u+0074
     u+011B u+006E u+0065 u+006D u+006C u+0075 u+0076 u+00ED u+010D
     u+0065 u+0073 u+006B u+0079
 }]
-test http-idna-3.19-E {puny decode: examples from RFC 3492} {
+test http-idna-3.19-E.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode 4dbcagdahymbxekheh6e0a7fei0b]
 } [list {*}{
     u+05DC u+05DE u+05D4 u+05D4 u+05DD u+05E4 u+05E9 u+05D5 u+05D8
     u+05DC u+05D0 u+05DE u+05D3 u+05D1 u+05E8 u+05D9 u+05DD u+05E2
     u+05D1 u+05E8 u+05D9 u+05EA
 }]
-test http-idna-3.19-F {puny decode: examples from RFC 3492} {
+test http-idna-3.19-F.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode \
 	i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd]
 } [list {*}{
@@ -1012,13 +1012,13 @@ test http-idna-3.19-F {puny decode: examples from RFC 3492} {
     u+0940 u+0902 u+092C u+094B u+0932 u+0938 u+0915 u+0924 u+0947
     u+0939 u+0948 u+0902
 }]
-test http-idna-3.19-G {puny decode: examples from RFC 3492} {
+test http-idna-3.19-G.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa]
 } [list {*}{
     u+306A u+305C u+307F u+3093 u+306A u+65E5 u+672C u+8A9E u+3092
     u+8A71 u+3057 u+3066 u+304F u+308C u+306A u+3044 u+306E u+304B
 }]
-test http-idna-3.19-H {puny decode: examples from RFC 3492} {
+test http-idna-3.19-H.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode \
 	989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c]
 } [list {*}{
@@ -1026,7 +1026,7 @@ test http-idna-3.19-H {puny decode: examples from RFC 3492} {
     u+D55C u+AD6D u+C5B4 u+B97C u+C774 u+D574 u+D55C u+B2E4 u+BA74
     u+C5BC u+B9C8 u+B098 u+C88B u+C744 u+AE4C
 }]
-test http-idna-3.19-I {puny decode: examples from RFC 3492} {
+test http-idna-3.19-I.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode b1abfaaepdrnnbgefbadotcwatmq2g4l]
 } [list {*}{
     u+043F u+043E u+0447 u+0435 u+043C u+0443 u+0436 u+0435 u+043E
@@ -1034,7 +1034,7 @@ test http-idna-3.19-I {puny decode: examples from RFC 3492} {
     u+044F u+0442 u+043F u+043E u+0440 u+0443 u+0441 u+0441 u+043A
     u+0438
 }]
-test http-idna-3.19-J {puny decode: examples from RFC 3492} {
+test http-idna-3.19-J.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode \
 	PorqunopuedensimplementehablarenEspaol-fmd56a]
 } [list {*}{
@@ -1044,7 +1044,7 @@ test http-idna-3.19-J {puny decode: examples from RFC 3492} {
     u+0062 u+006C u+0061 u+0072 u+0065 u+006E u+0045 u+0073 u+0070
     u+0061 u+00F1 u+006F u+006C
 }]
-test http-idna-3.19-K {puny decode: examples from RFC 3492} {
+test http-idna-3.19-K.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode \
 	TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g]
 } [list {*}{
@@ -1053,70 +1053,70 @@ test http-idna-3.19-K {puny decode: examples from RFC 3492} {
     u+1EC9 u+006E u+00F3 u+0069 u+0074 u+0069 u+1EBF u+006E u+0067
     u+0056 u+0069 u+1EC7 u+0074
 }]
-test http-idna-3.19-L {puny decode: examples from RFC 3492} {
+test http-idna-3.19-L.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode 3B-ww4c5e180e575a65lsy2b]
 } {u+0033 u+5E74 u+0042 u+7D44 u+91D1 u+516B u+5148 u+751F}
-test http-idna-3.19-M {puny decode: examples from RFC 3492} {
+test http-idna-3.19-M.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode -with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n]
 } [list {*}{
     u+5B89 u+5BA4 u+5948 u+7F8E u+6075 u+002D u+0077 u+0069 u+0074
     u+0068 u+002D u+0053 u+0055 u+0050 u+0045 u+0052 u+002D u+004D
     u+004F u+004E u+004B u+0045 u+0059 u+0053
 }]
-test http-idna-3.19-N {puny decode: examples from RFC 3492} {
+test http-idna-3.19-N.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode Hello-Another-Way--fc4qua05auwb3674vfr0b]
 } [list {*}{
     u+0048 u+0065 u+006C u+006C u+006F u+002D u+0041 u+006E u+006F
     u+0074 u+0068 u+0065 u+0072 u+002D u+0057 u+0061 u+0079 u+002D
     u+305D u+308C u+305E u+308C u+306E u+5834 u+6240
 }]
-test http-idna-3.19-O {puny decode: examples from RFC 3492} {
+test http-idna-3.19-O.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode 2-u9tlzr9756bt3uc0v]
 } {u+3072 u+3068 u+3064 u+5C4B u+6839 u+306E u+4E0B u+0032}
-test http-idna-3.19-P {puny decode: examples from RFC 3492} {
+test http-idna-3.19-P.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode MajiKoi5-783gue6qz075azm5e]
 } [list {*}{
     u+004D u+0061 u+006A u+0069 u+3067 u+004B u+006F u+0069 u+3059
     u+308B u+0035 u+79D2 u+524D
 }]
-test http-idna-3.19-Q {puny decode: examples from RFC 3492} {
+test http-idna-3.19-Q.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode de-jg4avhby1noc0d]
 } {u+30D1 u+30D5 u+30A3 u+30FC u+0064 u+0065 u+30EB u+30F3 u+30D0}
-test http-idna-3.19-R {puny decode: examples from RFC 3492} {
+test http-idna-3.19-R.$ThreadLevel {puny decode: examples from RFC 3492} {
     hexify [::tcl::idna puny decode d9juau41awczczp]
 } {u+305D u+306E u+30B9 u+30D4 u+30FC u+30C9 u+3067}
-test http-idna-3.19-S {puny decode: examples from RFC 3492} {
+test http-idna-3.19-S.$ThreadLevel {puny decode: examples from RFC 3492} {
     ::tcl::idna puny decode {-> $1.00 <--}
 } {-> $1.00 <-}
 rename hexify ""
 
-test http-idna-4.1 {IDNA encoding} {
+test http-idna-4.1.$ThreadLevel {IDNA encoding} {
     ::tcl::idna encode abc.def
 } abc.def
-test http-idna-4.2 {IDNA encoding} {
+test http-idna-4.2.$ThreadLevel {IDNA encoding} {
     ::tcl::idna encode a€b€c.def
 } xn--abc-k50ab.def
-test http-idna-4.3 {IDNA encoding} {
+test http-idna-4.3.$ThreadLevel {IDNA encoding} {
     ::tcl::idna encode def.a€b€c
 } def.xn--abc-k50ab
-test http-idna-4.4 {IDNA encoding} {
+test http-idna-4.4.$ThreadLevel {IDNA encoding} {
     ::tcl::idna encode ABC.DEF
 } ABC.DEF
-test http-idna-4.5 {IDNA encoding} {
+test http-idna-4.5.$ThreadLevel {IDNA encoding} {
     ::tcl::idna encode A€B€C.def
 } xn--ABC-k50ab.def
-test http-idna-4.6 {IDNA encoding: invalid edge case} {
+test http-idna-4.6.$ThreadLevel {IDNA encoding: invalid edge case} {
     # Should this be an error?
     ::tcl::idna encode abc..def
 } abc..def
-test http-idna-4.7 {IDNA encoding: invalid char} -returnCodes error -body {
+test http-idna-4.7.$ThreadLevel {IDNA encoding: invalid char} -returnCodes error -body {
     ::tcl::idna encode abc.$.def
 } -result {bad character "$" in DNS name}
-test http-idna-4.7.1 {IDNA encoding: invalid char} {
+test http-idna-4.7.1.$ThreadLevel {IDNA encoding: invalid char} {
     catch {::tcl::idna encode abc.$.def} -> opt
     dict get $opt -errorcode
 } {IDNA INVALID_NAME_CHARACTER {$}}
-test http-idna-4.8 {IDNA encoding: empty} {
+test http-idna-4.8.$ThreadLevel {IDNA encoding: empty} {
     ::tcl::idna encode ""
 } {}
 set overlong www.[join [subst [string map {u+ \\u} {
@@ -1124,44 +1124,44 @@ set overlong www.[join [subst [string map {u+ \\u} {
     u+D55C u+AD6D u+C5B4 u+B97C u+C774 u+D574 u+D55C u+B2E4 u+BA74
     u+C5BC u+B9C8 u+B098 u+C88B u+C744 u+AE4C
 }]] ""].com
-test http-idna-4.9 {IDNA encoding: max lengths from RFC 5890} -body {
+test http-idna-4.9.$ThreadLevel {IDNA encoding: max lengths from RFC 5890} -body {
     ::tcl::idna encode $overlong
 } -returnCodes error -result "hostname part too long"
-test http-idna-4.9.1 {IDNA encoding: max lengths from RFC 5890} {
+test http-idna-4.9.1.$ThreadLevel {IDNA encoding: max lengths from RFC 5890} {
     catch {::tcl::idna encode $overlong} -> opt
     dict get $opt -errorcode
 } {IDNA OVERLONG_PART xn--989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c}
 unset overlong
-test http-idna-4.10 {IDNA encoding: edge cases} {
+test http-idna-4.10.$ThreadLevel {IDNA encoding: edge cases} {
     ::tcl::idna encode passé.example.com
 } xn--pass-epa.example.com
 
-test http-idna-5.1 {IDNA decoding} {
+test http-idna-5.1.$ThreadLevel {IDNA decoding} {
     ::tcl::idna decode abc.def
 } abc.def
-test http-idna-5.2 {IDNA decoding} {
+test http-idna-5.2.$ThreadLevel {IDNA decoding} {
     # Invalid entry that's just a wrapper
     ::tcl::idna decode xn--abc-.def
 } abc.def
-test http-idna-5.3 {IDNA decoding} {
+test http-idna-5.3.$ThreadLevel {IDNA decoding} {
     # Invalid entry that's just a wrapper
     ::tcl::idna decode xn--abc-.xn--def-
 } abc.def
-test http-idna-5.4 {IDNA decoding} {
+test http-idna-5.4.$ThreadLevel {IDNA decoding} {
     # Invalid entry that's just a wrapper
     ::tcl::idna decode XN--abc-.XN--def-
 } abc.def
-test http-idna-5.5 {IDNA decoding: error cases} -returnCodes error -body {
+test http-idna-5.5.$ThreadLevel {IDNA decoding: error cases} -returnCodes error -body {
     ::tcl::idna decode xn--$$$.example.com
 } -result {bad decode character "$"}
-test http-idna-5.5.1 {IDNA decoding: error cases} {
+test http-idna-5.5.1.$ThreadLevel {IDNA decoding: error cases} {
     catch {::tcl::idna decode xn--$$$.example.com} -> opt
     dict get $opt -errorcode
 } {PUNYCODE BAD_INPUT CHAR}
-test http-idna-5.6 {IDNA decoding: error cases} -returnCodes error -body {
+test http-idna-5.6.$ThreadLevel {IDNA decoding: error cases} -returnCodes error -body {
     ::tcl::idna decode xn--a-zzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.def
 } -result {exceeded input data}
-test http-idna-5.6.1 {IDNA decoding: error cases} {
+test http-idna-5.6.1.$ThreadLevel {IDNA decoding: error cases} {
     catch {::tcl::idna decode xn--a-zzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.def} -> opt
     dict get $opt -errorcode
 } {PUNYCODE BAD_INPUT LENGTH}
diff --git a/tests/http11.test b/tests/http11.test
index ef1f40c..55e7d39 100644
--- a/tests/http11.test
+++ b/tests/http11.test
@@ -954,7 +954,7 @@ test http11-3.8.$ThreadLevel "close,identity no -handler but with -progress" -se
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok close {} {} 0 0 0}
 
-test http11-3.9 "close,identity no -handler but with -progress progressPause enters event loop" -setup {
+test http11-3.9.$ThreadLevel "close,identity no -handler but with -progress progressPause enters event loop" -setup {
     variable httpd [create_httpd]
     set logdata ""
 } -body {
diff --git a/tests/httpPipeline.test b/tests/httpPipeline.test
index 161519f..491aae0 100644
--- a/tests/httpPipeline.test
+++ b/tests/httpPipeline.test
@@ -839,7 +839,7 @@ for {set header 1} {$header <= 4} {incr header} {
 
 
 	    # Here's the test:
-            test httpPipeline-${header}.${footer}${label}-${tag} $name \
+            test httpPipeline-${header}.${footer}${label}-${tag}-$ThreadLevel $name \
             -constraints $cons \
             -setup [string map [list TE $te] {
 		# Restore default values for tests:
diff --git a/tests/httpProxy.test b/tests/httpProxy.test
index 42ad574..90fe828 100644
--- a/tests/httpProxy.test
+++ b/tests/httpProxy.test
@@ -81,7 +81,7 @@ set aliceCreds {Basic YWxpY2U6YWxpY2lh}
 # concat Basic [base64::encode intruder:intruder]
 set badCreds {Basic aW50cnVkZXI6aW50cnVkZXI=}
 
-test httpProxy-1.1 {squid is running - ipv4 noauth} -constraints {needsSquid} -setup {
+test httpProxy-1.1.$ThreadLevel {squid is running - ipv4 noauth} -constraints {needsSquid} -setup {
 } -body {
     set token [http::geturl http://$n4host:$n4port/]
     set ri [http::responseInfo $token]
@@ -91,7 +91,7 @@ test httpProxy-1.1 {squid is running - ipv4 noauth} -constraints {needsSquid} -s
     unset -nocomplain ri res
 }
 
-test httpProxy-1.2 {squid is running - ipv6 noauth} -constraints {needsSquid} -setup {
+test httpProxy-1.2.$ThreadLevel {squid is running - ipv6 noauth} -constraints {needsSquid} -setup {
 } -body {
     set token [http::geturl http://\[$n6host\]:$n6port/]
     set ri [http::responseInfo $token]
@@ -101,7 +101,7 @@ test httpProxy-1.2 {squid is running - ipv6 noauth} -constraints {needsSquid} -s
     unset -nocomplain ri res
 }
 
-test httpProxy-1.3 {squid is running - ipv4 auth} -constraints {needsSquid} -setup {
+test httpProxy-1.3.$ThreadLevel {squid is running - ipv4 auth} -constraints {needsSquid} -setup {
 } -body {
     set token [http::geturl http://$a4host:$a4port/]
     set ri [http::responseInfo $token]
@@ -111,7 +111,7 @@ test httpProxy-1.3 {squid is running - ipv4 auth} -constraints {needsSquid} -set
     unset -nocomplain ri res
 }
 
-test httpProxy-1.4 {squid is running - ipv6 auth} -constraints {needsSquid} -setup {
+test httpProxy-1.4.$ThreadLevel {squid is running - ipv6 auth} -constraints {needsSquid} -setup {
 } -body {
     set token [http::geturl http://\[$a6host\]:$a6port/]
     set ri [http::responseInfo $token]
@@ -121,7 +121,7 @@ test httpProxy-1.4 {squid is running - ipv6 auth} -constraints {needsSquid} -set
     unset -nocomplain ri res
 }
 
-test httpProxy-2.1 {http no-proxy no-auth} -constraints {needsSquid} -setup {
+test httpProxy-2.1.$ThreadLevel {http no-proxy no-auth} -constraints {needsSquid} -setup {
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -132,7 +132,7 @@ test httpProxy-2.1 {http no-proxy no-auth} -constraints {needsSquid} -setup {
     unset -nocomplain ri res
 }
 
-test httpProxy-2.2 {https no-proxy no-auth} -constraints {needsSquid needsTls} -setup {
+test httpProxy-2.2.$ThreadLevel {https no-proxy no-auth} -constraints {needsSquid needsTls} -setup {
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -143,7 +143,7 @@ test httpProxy-2.2 {https no-proxy no-auth} -constraints {needsSquid needsTls} -
     unset -nocomplain ri res
 }
 
-test httpProxy-2.3 {http with-proxy ipv4 no-auth} -constraints {needsSquid} -setup {
+test httpProxy-2.3.$ThreadLevel {http with-proxy ipv4 no-auth} -constraints {needsSquid} -setup {
    http::config -proxyhost $n4host -proxyport $n4port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -155,7 +155,7 @@ test httpProxy-2.3 {http with-proxy ipv4 no-auth} -constraints {needsSquid} -set
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
-test httpProxy-2.4 {https with-proxy ipv4 no-auth} -constraints {needsSquid needsTls} -setup {
+test httpProxy-2.4.$ThreadLevel {https with-proxy ipv4 no-auth} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $n4host -proxyport $n4port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -167,7 +167,7 @@ test httpProxy-2.4 {https with-proxy ipv4 no-auth} -constraints {needsSquid need
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
-test httpProxy-2.5 {http with-proxy ipv6 no-auth} -constraints {needsSquid} -setup {
+test httpProxy-2.5.$ThreadLevel {http with-proxy ipv6 no-auth} -constraints {needsSquid} -setup {
    http::config -proxyhost $n6host -proxyport $n6port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -179,7 +179,7 @@ test httpProxy-2.5 {http with-proxy ipv6 no-auth} -constraints {needsSquid} -set
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
-test httpProxy-2.6 {https with-proxy ipv6 no-auth} -constraints {needsSquid needsTls} -setup {
+test httpProxy-2.6.$ThreadLevel {https with-proxy ipv6 no-auth} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $n6host -proxyport $n6port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -191,7 +191,7 @@ test httpProxy-2.6 {https with-proxy ipv6 no-auth} -constraints {needsSquid need
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
-test httpProxy-3.1 {http no-proxy with-auth valid-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-3.1.$ThreadLevel {http no-proxy with-auth valid-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -205,7 +205,7 @@ test httpProxy-3.1 {http no-proxy with-auth valid-creds-provided} -constraints {
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-3.2 {https no-proxy with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-3.2.$ThreadLevel {https no-proxy with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -219,7 +219,7 @@ test httpProxy-3.2 {https no-proxy with-auth valid-creds-provided} -constraints
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-3.3 {http with-proxy ipv4 with-auth valid-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-3.3.$ThreadLevel {http with-proxy ipv4 with-auth valid-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -233,7 +233,7 @@ test httpProxy-3.3 {http with-proxy ipv4 with-auth valid-creds-provided} -constr
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-3.4 {https with-proxy ipv4 with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-3.4.$ThreadLevel {https with-proxy ipv4 with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -247,7 +247,7 @@ test httpProxy-3.4 {https with-proxy ipv4 with-auth valid-creds-provided} -const
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-3.5 {http with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-3.5.$ThreadLevel {http with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -261,7 +261,7 @@ test httpProxy-3.5 {http with-proxy ipv6 with-auth valid-creds-provided} -constr
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-3.6 {https with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-3.6.$ThreadLevel {https with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -275,7 +275,7 @@ test httpProxy-3.6 {https with-proxy ipv6 with-auth valid-creds-provided} -const
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-4.1 {http no-proxy with-auth no-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-4.1.$ThreadLevel {http no-proxy with-auth no-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -289,7 +289,7 @@ test httpProxy-4.1 {http no-proxy with-auth no-creds-provided} -constraints {nee
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-4.2 {https no-proxy with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-4.2.$ThreadLevel {https no-proxy with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -303,7 +303,7 @@ test httpProxy-4.2 {https no-proxy with-auth no-creds-provided} -constraints {ne
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-4.3 {http with-proxy ipv4 with-auth no-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-4.3.$ThreadLevel {http with-proxy ipv4 with-auth no-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -317,7 +317,7 @@ test httpProxy-4.3 {http with-proxy ipv4 with-auth no-creds-provided} -constrain
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-4.4 {https with-proxy ipv4 with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-4.4.$ThreadLevel {https with-proxy ipv4 with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -331,7 +331,7 @@ test httpProxy-4.4 {https with-proxy ipv4 with-auth no-creds-provided} -constrai
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-4.5 {http with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-4.5.$ThreadLevel {http with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -345,7 +345,7 @@ test httpProxy-4.5 {http with-proxy ipv6 with-auth no-creds-provided} -constrain
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-4.6 {https with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-4.6.$ThreadLevel {https with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -359,7 +359,7 @@ test httpProxy-4.6 {https with-proxy ipv6 with-auth no-creds-provided} -constrai
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-5.1 {http no-proxy with-auth bad-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-5.1.$ThreadLevel {http no-proxy with-auth bad-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -373,7 +373,7 @@ test httpProxy-5.1 {http no-proxy with-auth bad-creds-provided} -constraints {ne
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-5.2 {https no-proxy with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-5.2.$ThreadLevel {https no-proxy with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -387,7 +387,7 @@ test httpProxy-5.2 {https no-proxy with-auth bad-creds-provided} -constraints {n
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-5.3 {http with-proxy ipv4 with-auth bad-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-5.3.$ThreadLevel {http with-proxy ipv4 with-auth bad-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -401,7 +401,7 @@ test httpProxy-5.3 {http with-proxy ipv4 with-auth bad-creds-provided} -constrai
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-5.4 {https with-proxy ipv4 with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-5.4.$ThreadLevel {https with-proxy ipv4 with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl https://www.google.com/]
@@ -415,7 +415,7 @@ test httpProxy-5.4 {https with-proxy ipv4 with-auth bad-creds-provided} -constra
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-5.5 {http with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid} -setup {
+test httpProxy-5.5.$ThreadLevel {http with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl http://www.google.com/]
@@ -429,7 +429,7 @@ test httpProxy-5.5 {http with-proxy ipv6 with-auth bad-creds-provided} -constrai
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-test httpProxy-5.6 {https with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
+test httpProxy-5.6.$ThreadLevel {https with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
    http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl https://www.google.com/]
-- 
cgit v0.12


From f27f0773c49d7e8ebf1d5f69d16bcb80906c659d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 28 Oct 2022 17:50:50 +0000
Subject: Update test result

---
 tests/chanio.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index 91cfcd4..41c0ef7 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -5294,7 +5294,7 @@ test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
     lappend l [chan configure $f1 -eofchar]
 } -cleanup {
     chan close $f1
-} -result {{{}} O D}
+} -result {{} O D}
 test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
     file delete $path(test1)
     set l [list]
-- 
cgit v0.12


From 41c34da9dabc6763d9e66c7329841dfcac77127d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 29 Oct 2022 14:08:52 +0000
Subject: Simplify -eofchar parsing (just check for " {}" at the end, in stead
 of full list parsing)

---
 generic/tclIO.c | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index b3b62ed..bf3f543 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8175,32 +8175,14 @@ Tcl_SetChannelOption(
 	UpdateInterest(chanPtr);
 	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
-	if (!newValue[0] || (!(newValue[0] & 0x80) && !newValue[1])) {
-	    if (GotFlag(statePtr, TCL_READABLE)) {
-		statePtr->inEofChar = newValue[0];
-	    }
+	if (!newValue[0] || (!(newValue[0] & 0x80) && (!newValue[1]
 #ifndef TCL_NO_DEPRECATED
-	} else if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
-	    return TCL_ERROR;
-	} else if (argc == 0) {
-	    statePtr->inEofChar = 0;
-	} else if (argc == 1 || argc == 2) {
-	    int inValue = (int) argv[0][0];
-	    int outValue = (argc == 2) ? (int) argv[1][0] : 0;
-
-	    if (inValue & 0x80 || (inValue && argv[0][1]) || outValue) {
-		if (interp) {
-		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                            "bad value for -eofchar: must be non-NUL ASCII"
-                            " character", -1));
-		}
-		Tcl_Free((void *)argv);
-		return TCL_ERROR;
-	    }
+		|| !strcmp(newValue+1, " {}")
+#endif
+		))) {
 	    if (GotFlag(statePtr, TCL_READABLE)) {
-		statePtr->inEofChar = inValue;
+		statePtr->inEofChar = newValue[0];
 	    }
-#endif
 	} else {
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-- 
cgit v0.12


From 60da2df16ccc0c150d362cf5d0eda5d0b83a0869 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sat, 29 Oct 2022 16:35:11 +0000
Subject: [c7f3977380] Balance stack operations in the mode with no Thread
 package.

---
 tests/http.test | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/http.test b/tests/http.test
index 742ff1c..08195a6 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -80,7 +80,9 @@ if {![info exists ThreadLevel]} {
     foreach ThreadLevel $ValueRange {
         source [info script]
     }
-    eval [lpop threadStack]
+    if {[llength $threadStack]} {
+	eval [lpop threadStack]
+    }
     catch {unset ThreadLevel}
     catch {unset ValueRange}
     return
-- 
cgit v0.12


From 61814ba324f4652c444ecb2776f2cf8eb799dac7 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 30 Oct 2022 03:04:11 +0000
Subject: Implement lreplace4 BCC instruction

---
 generic/tclBasic.c      |  1 +
 generic/tclCompCmdsGR.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++
 generic/tclCompile.c    |  2 ++
 generic/tclCompile.h    |  6 +++--
 generic/tclExecute.c    | 66 ++++++++++++++++++++++++++++++++++++++++++----
 generic/tclInt.h        |  3 +++
 6 files changed, 140 insertions(+), 7 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 13715f8..c9697d2 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -312,6 +312,7 @@ static const CmdInfo builtInCmds[] = {
     {"lassign",		Tcl_LassignObjCmd,	TclCompileLassignCmd,	NULL,	CMD_IS_SAFE},
     {"lindex",		Tcl_LindexObjCmd,	TclCompileLindexCmd,	NULL,	CMD_IS_SAFE},
     {"linsert",		Tcl_LinsertObjCmd,	TclCompileLinsertCmd,	NULL,	CMD_IS_SAFE},
+    {"xx",		Tcl_LinsertObjCmd,	TclCompileXxCmd,	NULL,	CMD_IS_SAFE},
     {"list",		Tcl_ListObjCmd,		TclCompileListCmd,	NULL,	CMD_IS_SAFE|CMD_COMPILES_EXPANDED},
     {"llength",		Tcl_LlengthObjCmd,	TclCompileLlengthCmd,	NULL,	CMD_IS_SAFE},
     {"lmap",		Tcl_LmapObjCmd,		TclCompileLmapCmd,	TclNRLmapCmd,	CMD_IS_SAFE},
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index bce71dc..4aa454b 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -3024,6 +3024,75 @@ TclCompileObjectSelfCmd(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * TclCompileXxCmd --
+ *
+ *	How to compile the "linsert2" command. We only bother with the case
+ *	where the index is constant.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclCompileXxCmd(
+    Tcl_Interp *interp,		/* Tcl interpreter for context. */
+    Tcl_Parse *parsePtr,	/* Points to a parse structure for the
+				 * command. */
+    TCL_UNUSED(Command *),
+    CompileEnv *envPtr)		/* Holds the resulting instructions. */
+{
+    DefineLineInformation;	/* TIP #280 */
+    Tcl_Token *tokenPtr, *listTokenPtr;
+    int idx, i;
+
+    if (parsePtr->numWords < 3) {
+	return TCL_ERROR;
+    }
+    listTokenPtr = TokenAfter(parsePtr->tokenPtr);
+
+    /*
+     * Parse the index. Will only compile if it is constant and not an
+     * _integer_ less than zero (since we reserve negative indices here for
+     * end-relative indexing) or an end-based index greater than 'end' itself.
+     */
+
+    tokenPtr = TokenAfter(listTokenPtr);
+
+    /*
+     * NOTE: This command treats all inserts at indices before the list
+     * the same as inserts at the start of the list, and all inserts
+     * after the list the same as inserts at the end of the list. We
+     * make that transformation here so we can use the optimized bytecode
+     * as much as possible.
+     */
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_END,
+	    &idx) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    /*
+     * There are four main cases. If there are no values to insert, this is
+     * just a confirm-listiness check. If the index is '0', this is a prepend.
+     * If the index is 'end' (== TCL_INDEX_END), this is an append. Otherwise,
+     * this is a splice (== split, insert values as list, concat-3).
+     */
+
+    CompileWord(envPtr, listTokenPtr, interp, 1);
+
+    for (i=3 ; i<parsePtr->numWords ; i++) {
+	tokenPtr = TokenAfter(tokenPtr);
+	CompileWord(envPtr, tokenPtr, interp, i);
+    }
+
+    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 2, envPtr);
+    TclEmitInt4(idx, envPtr);
+    TclEmitInt4(idx-1, envPtr);
+
+    return TCL_OK;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 2d22dc1..2535167 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -675,6 +675,8 @@ InstructionDesc const tclInstructionTable[] = {
 	/* String Less or equal:	push (stknext <= stktop) */
     {"strge",		  1,   -1,         0,	{OPERAND_NONE}},
 	/* String Greater or equal:	push (stknext >= stktop) */
+    {"lreplace4",	  13,   INT_MIN,    3,	{OPERAND_UINT4, OPERAND_INT4, OPERAND_INT4}},
+	/* Stack: ... listobj num_elems first last new1 ... newN => ... newlistobj */
 
     {NULL, 0, 0, 0, {OPERAND_NONE}}
 };
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 2843ef5..c82dc6e 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -848,8 +848,10 @@ typedef struct ByteCode {
 #define INST_STR_LE			193
 #define INST_STR_GE			194
 
+#define INST_LREPLACE4                   195
+
 /* The last opcode */
-#define LAST_INST_OPCODE		194
+#define LAST_INST_OPCODE		195
 
 /*
  * Table describing the Tcl bytecode instructions: their name (for displaying
@@ -860,7 +862,7 @@ typedef struct ByteCode {
  * instruction.
  */
 
-#define MAX_INSTRUCTION_OPERANDS 2
+#define MAX_INSTRUCTION_OPERANDS 3
 
 typedef enum InstOperandType {
     OPERAND_NONE,
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 408032b..629df59 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5244,11 +5244,67 @@ TEBCresume(
 	    NEXT_INST_F(1, 1, 0);
 	}
 
-    /*
-     *	   End of INST_LIST and related instructions.
-     * -----------------------------------------------------------------
-     *	   Start of string-related instructions.
-     */
+    case INST_LREPLACE4:
+	{
+	    int firstIdx, lastIdx, numToDelete, numNewElems;
+	    opnd = TclGetInt4AtPtr(pc + 1);
+	    firstIdx = TclGetInt4AtPtr(pc + 5); /* First delete position */
+	    lastIdx = TclGetInt4AtPtr(pc + 9);  /* Last delete position */
+	    numNewElems = opnd - 1;
+	    valuePtr = OBJ_AT_DEPTH(numNewElems);
+	    if (Tcl_ListObjLength(interp, valuePtr, &length) != TCL_OK) {
+		TRACE_ERROR(interp);
+		goto gotError;
+	    }
+	    firstIdx = TclIndexDecode(firstIdx, length-1);
+	    if (firstIdx == TCL_INDEX_NONE) {
+		firstIdx = 0;
+	    } else if (firstIdx > length) {
+		firstIdx = length;
+	    }
+	    numToDelete = 0;
+	    if (lastIdx != TCL_INDEX_NONE) {
+		lastIdx = TclIndexDecode(lastIdx, length - 1);
+		if (lastIdx >= firstIdx) {
+		    numToDelete = lastIdx - firstIdx + 1;
+		}
+	    }
+	    if (Tcl_IsShared(valuePtr)) {
+		objResultPtr = Tcl_DuplicateObj(valuePtr);
+		if (Tcl_ListObjReplace(interp,
+				       objResultPtr,
+				       firstIdx,
+				       numToDelete,
+				       numNewElems,
+				       &OBJ_AT_DEPTH(numNewElems-1))
+		    != TCL_OK) {
+		    TRACE_ERROR(interp);
+		    Tcl_DecrRefCount(objResultPtr);
+		    goto gotError;
+		}
+		TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
+		NEXT_INST_V(13, opnd, 1);
+	    } else {
+		if (Tcl_ListObjReplace(interp,
+				       valuePtr,
+				       firstIdx,
+				       numToDelete,
+				       numNewElems,
+				       &OBJ_AT_DEPTH(numNewElems-1))
+		    != TCL_OK) {
+		    TRACE_ERROR(interp);
+		    goto gotError;
+		}
+		TRACE_APPEND(("\"%.30s\"\n", O2S(valuePtr)));
+		NEXT_INST_V(13, opnd-1, 0);
+	    }
+	}
+
+	/*
+	 *	   End of INST_LIST and related instructions.
+	 * -----------------------------------------------------------------
+	 *	   Start of string-related instructions.
+	 */
 
     case INST_STR_EQ:
     case INST_STR_NEQ:		/* String (in)equality check */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 40cf10c..a67c8f9 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3954,6 +3954,9 @@ MODULE_SCOPE int	TclCompileBasicMin1ArgCmd(Tcl_Interp *interp,
 MODULE_SCOPE int	TclCompileBasicMin2ArgCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
+MODULE_SCOPE int	TclCompileXxCmd(Tcl_Interp *interp,
+			    Tcl_Parse *parsePtr, Command *cmdPtr,
+			    struct CompileEnv *envPtr);
 
 MODULE_SCOPE Tcl_ObjCmdProc TclInvertOpCmd;
 MODULE_SCOPE int	TclCompileInvertOpCmd(Tcl_Interp *interp,
-- 
cgit v0.12


From 5da6b8e3c356a3786e96336ea19a8c4fabcb17fa Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 30 Oct 2022 04:27:03 +0000
Subject: New bytecode for linsert

---
 generic/tclCompCmdsGR.c | 41 +++++------------------------------------
 generic/tclCompile.c    |  8 ++++++--
 generic/tclCompile.h    |  2 +-
 generic/tclExecute.c    | 15 ++++++++-------
 4 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 4aa454b..ddb9746 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1391,48 +1391,16 @@ TclCompileLinsertCmd(
      */
 
     CompileWord(envPtr, listTokenPtr, interp, 1);
-    if (parsePtr->numWords == 3) {
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
-	TclEmitInt4(			(int)TCL_INDEX_END,		envPtr);
-	return TCL_OK;
-    }
 
     for (i=3 ; i<parsePtr->numWords ; i++) {
 	tokenPtr = TokenAfter(tokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, i);
     }
-    TclEmitInstInt4(		INST_LIST, i - 3,		envPtr);
 
-    if (idx == (int)TCL_INDEX_START) {
-	TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
-	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    } else if (idx == (int)TCL_INDEX_END) {
-	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    } else {
-	/*
-	 * Here we handle two ranges for idx. First when idx > 0, we
-	 * want the first half of the split to end at index idx-1 and
-	 * the second half to start at index idx.
-	 * Second when idx < TCL_INDEX_END, indicating "end-N" indexing,
-	 * we want the first half of the split to end at index end-N and
-	 * the second half to start at index end-N+1. We accomplish this
-	 * with a pre-adjustment of the end-N value.
-	 * The root of this is that the commands [lrange] and [linsert]
-	 * differ in their interpretation of the "end" index.
-	 */
-
-	if (idx < (int)TCL_INDEX_END) {
-	    idx++;
-	}
-	TclEmitInstInt4(	INST_OVER, 1,			envPtr);
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
-	TclEmitInt4(			idx - 1,		envPtr);
-	TclEmitInstInt4(	INST_REVERSE, 3,		envPtr);
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, idx,	envPtr);
-	TclEmitInt4(			(int)TCL_INDEX_END,		envPtr);
-	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-	TclEmitOpcode(		INST_LIST_CONCAT,		envPtr);
-    }
+    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 2, envPtr);
+    TclEmitInt4(0, envPtr);
+    TclEmitInt4(idx, envPtr);
+    TclEmitInt4(idx-1, envPtr);
 
     return TCL_OK;
 }
@@ -3086,6 +3054,7 @@ TclCompileXxCmd(
     }
 
     TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 2, envPtr);
+    TclEmitInt4(0, envPtr);
     TclEmitInt4(idx, envPtr);
     TclEmitInt4(idx-1, envPtr);
 
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 2535167..c01ddb8 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -675,8 +675,12 @@ InstructionDesc const tclInstructionTable[] = {
 	/* String Less or equal:	push (stknext <= stktop) */
     {"strge",		  1,   -1,         0,	{OPERAND_NONE}},
 	/* String Greater or equal:	push (stknext >= stktop) */
-    {"lreplace4",	  13,   INT_MIN,    3,	{OPERAND_UINT4, OPERAND_INT4, OPERAND_INT4}},
-	/* Stack: ... listobj num_elems first last new1 ... newN => ... newlistobj */
+    {"lreplace4",	  17,   INT_MIN,    4,	{OPERAND_UINT4, OPERAND_UINT4, OPERAND_INT4, OPERAND_INT4}},
+	/* Operands: number of arguments, end_indicator, firstIdx, lastIdx
+	 * end_indicator: 0 if "end" is treated as index of last element, 
+	 *                1 if "end" is position after last element
+	 * firstIdx,lastIdx: range of elements to delete
+	 * Stack: ... listobj new1 ... newN => ... newlistobj */
 
     {NULL, 0, 0, 0, {OPERAND_NONE}}
 };
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index c82dc6e..9633050 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -862,7 +862,7 @@ typedef struct ByteCode {
  * instruction.
  */
 
-#define MAX_INSTRUCTION_OPERANDS 3
+#define MAX_INSTRUCTION_OPERANDS 4
 
 typedef enum InstOperandType {
     OPERAND_NONE,
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 629df59..2713093 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5246,17 +5246,18 @@ TEBCresume(
 
     case INST_LREPLACE4:
 	{
-	    int firstIdx, lastIdx, numToDelete, numNewElems;
+	    int firstIdx, lastIdx, numToDelete, numNewElems, end_indicator;
 	    opnd = TclGetInt4AtPtr(pc + 1);
-	    firstIdx = TclGetInt4AtPtr(pc + 5); /* First delete position */
-	    lastIdx = TclGetInt4AtPtr(pc + 9);  /* Last delete position */
+	    end_indicator = TclGetInt4AtPtr(pc + 5);
+	    firstIdx = TclGetInt4AtPtr(pc + 9);
+	    lastIdx = TclGetInt4AtPtr(pc + 13);
 	    numNewElems = opnd - 1;
 	    valuePtr = OBJ_AT_DEPTH(numNewElems);
 	    if (Tcl_ListObjLength(interp, valuePtr, &length) != TCL_OK) {
 		TRACE_ERROR(interp);
 		goto gotError;
 	    }
-	    firstIdx = TclIndexDecode(firstIdx, length-1);
+	    firstIdx = TclIndexDecode(firstIdx, length-end_indicator);
 	    if (firstIdx == TCL_INDEX_NONE) {
 		firstIdx = 0;
 	    } else if (firstIdx > length) {
@@ -5264,7 +5265,7 @@ TEBCresume(
 	    }
 	    numToDelete = 0;
 	    if (lastIdx != TCL_INDEX_NONE) {
-		lastIdx = TclIndexDecode(lastIdx, length - 1);
+		lastIdx = TclIndexDecode(lastIdx, length - end_indicator);
 		if (lastIdx >= firstIdx) {
 		    numToDelete = lastIdx - firstIdx + 1;
 		}
@@ -5283,7 +5284,7 @@ TEBCresume(
 		    goto gotError;
 		}
 		TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
-		NEXT_INST_V(13, opnd, 1);
+		NEXT_INST_V(17, opnd, 1);
 	    } else {
 		if (Tcl_ListObjReplace(interp,
 				       valuePtr,
@@ -5296,7 +5297,7 @@ TEBCresume(
 		    goto gotError;
 		}
 		TRACE_APPEND(("\"%.30s\"\n", O2S(valuePtr)));
-		NEXT_INST_V(13, opnd-1, 0);
+		NEXT_INST_V(17, opnd-1, 0);
 	    }
 	}
 
-- 
cgit v0.12


From b2223e8eaf55dad117f1f99bc23ead87a30a7db3 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 30 Oct 2022 10:43:58 +0000
Subject: New bytecode implementation for lreplace

---
 generic/tclCompCmdsGR.c | 191 ++++++++++++++----------------------------------
 generic/tclCompile.c    |   4 +-
 2 files changed, 55 insertions(+), 140 deletions(-)

diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index ddb9746..72716a4 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1363,33 +1363,21 @@ TclCompileLinsertCmd(
     }
     listTokenPtr = TokenAfter(parsePtr->tokenPtr);
 
-    /*
-     * Parse the index. Will only compile if it is constant and not an
-     * _integer_ less than zero (since we reserve negative indices here for
-     * end-relative indexing) or an end-based index greater than 'end' itself.
-     */
-
     tokenPtr = TokenAfter(listTokenPtr);
 
     /*
-     * NOTE: This command treats all inserts at indices before the list
+     * This command treats all inserts at indices before the list
      * the same as inserts at the start of the list, and all inserts
      * after the list the same as inserts at the end of the list. We
      * make that transformation here so we can use the optimized bytecode
      * as much as possible.
      */
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_END,
-	    &idx) != TCL_OK) {
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_END, &idx)
+	!= TCL_OK) {
+	/* Not a constant index. */
 	return TCL_ERROR;
     }
 
-    /*
-     * There are four main cases. If there are no values to insert, this is
-     * just a confirm-listiness check. If the index is '0', this is a prepend.
-     * If the index is 'end' (== TCL_INDEX_END), this is an append. Otherwise,
-     * this is a splice (== split, insert values as list, concat-3).
-     */
-
     CompileWord(envPtr, listTokenPtr, interp, 1);
 
     for (i=3 ; i<parsePtr->numWords ; i++) {
@@ -1397,10 +1385,12 @@ TclCompileLinsertCmd(
 	CompileWord(envPtr, tokenPtr, interp, i);
     }
 
+    /* First operand is count of new elements */
     TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 2, envPtr);
-    TclEmitInt4(0, envPtr);
-    TclEmitInt4(idx, envPtr);
-    TclEmitInt4(idx-1, envPtr);
+    TclEmitInt4(0, envPtr); /* "end" refers to position AFTER last element */
+    TclEmitInt4(idx, envPtr);/* Insertion point (also start of range to delete) */
+    TclEmitInt4(TCL_INDEX_NONE, envPtr); /* End of range to delete.
+					    TCL_INDEX_NONE => no deletions */
 
     return TCL_OK;
 }
@@ -1426,8 +1416,7 @@ TclCompileLreplaceCmd(
 {
     DefineLineInformation;	/* TIP #280 */
     Tcl_Token *tokenPtr, *listTokenPtr;
-    int idx1, idx2, i;
-    int emptyPrefix=1, suffixStart = 0;
+    int first, last, i, end_indicator;
 
     if (parsePtr->numWords < 4) {
 	return TCL_ERROR;
@@ -1436,108 +1425,35 @@ TclCompileLreplaceCmd(
 
     tokenPtr = TokenAfter(listTokenPtr);
     if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_NONE,
-	    &idx1) != TCL_OK) {
+	    &first) != TCL_OK) {
 	return TCL_ERROR;
     }
 
     tokenPtr = TokenAfter(tokenPtr);
     if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_NONE, TCL_INDEX_END,
-	    &idx2) != TCL_OK) {
+	    &last) != TCL_OK) {
 	return TCL_ERROR;
     }
-
-    /*
-     * General structure of the [lreplace] result is
-     *		prefix replacement suffix
-     * In a few cases we can predict various parts will be empty and
-     * take advantage.
-     *
-     * The proper suffix begins with the greater of indices idx1 or
-     * idx2 + 1. If we cannot tell at compile time which is greater,
-     * we must defer to direct evaluation.
-     */
-
-    if (idx1 == (int)TCL_INDEX_NONE) {
-	suffixStart = (int)TCL_INDEX_NONE;
-    } else if (idx2 == (int)TCL_INDEX_NONE) {
-	suffixStart = idx1;
-    } else if (idx2 == (int)TCL_INDEX_END) {
-	suffixStart = (int)TCL_INDEX_NONE;
-    } else if (((idx2 < (int)TCL_INDEX_END) && (idx1 <= (int)TCL_INDEX_END))
-	    || ((idx2 >= (int)TCL_INDEX_START) && (idx1 >= (int)TCL_INDEX_START))) {
-	suffixStart = (idx1 > idx2 + 1) ? idx1 : idx2 + 1;
-    } else {
-	return TCL_ERROR;
+    end_indicator = 1; /* "end" means last element by default */
+    if (first == (int)TCL_INDEX_NONE) {
+	/* Special case: first == TCL_INDEX_NONE => Range after last element. */
+	first = TCL_INDEX_END; /* Insert at end where ... */
+	end_indicator = 0;     /* ... end means AFTER last element */
+	last = TCL_INDEX_NONE; /* Informs lreplace, nothing to replace */
     }
 
-    /* All paths start with computing/pushing the original value. */
     CompileWord(envPtr, listTokenPtr, interp, 1);
 
-    /*
-     * Push all the replacement values next so any errors raised in
-     * creating them get raised first.
-     */
-    if (parsePtr->numWords > 4) {
-	/* Push the replacement arguments */
+    for (i=4 ; i<parsePtr->numWords ; i++) {
 	tokenPtr = TokenAfter(tokenPtr);
-	for (i=4 ; i<parsePtr->numWords ; i++) {
-	    CompileWord(envPtr, tokenPtr, interp, i);
-	    tokenPtr = TokenAfter(tokenPtr);
-	}
-
-	/* Make a list of them... */
-	TclEmitInstInt4(	INST_LIST, i - 4,		envPtr);
-
-	emptyPrefix = 0;
-    }
-
-    if ((idx1 == suffixStart) && (parsePtr->numWords == 4)) {
-	/*
-	 * This is a "no-op". Example: [lreplace {a b c} 2 0]
-	 * We still do a list operation to get list-verification
-	 * and canonicalization side effects.
-	 */
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
-	TclEmitInt4(			(int)TCL_INDEX_END,		envPtr);
-	return TCL_OK;
-    }
-
-    if (idx1 != (int)TCL_INDEX_START) {
-	/* Prefix may not be empty; generate bytecode to push it */
-	if (emptyPrefix) {
-	    TclEmitOpcode(	INST_DUP,			envPtr);
-	} else {
-	    TclEmitInstInt4(	INST_OVER, 1,			envPtr);
-	}
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, 0,		envPtr);
-	TclEmitInt4(			idx1 - 1,		envPtr);
-	if (!emptyPrefix) {
-	    TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
-	    TclEmitOpcode(	INST_LIST_CONCAT,		envPtr);
-	}
-	emptyPrefix = 0;
-    }
-
-    if (!emptyPrefix) {
-	TclEmitInstInt4(	INST_REVERSE, 2,		envPtr);
-    }
-
-    if (suffixStart == (int)TCL_INDEX_NONE) {
-	TclEmitOpcode(		INST_POP,			envPtr);
-	if (emptyPrefix) {
-	    PushStringLiteral(envPtr, "");
-	}
-    } else {
-	/* Suffix may not be empty; generate bytecode to push it */
-	TclEmitInstInt4(	INST_LIST_RANGE_IMM, suffixStart, envPtr);
-	TclEmitInt4(			(int)TCL_INDEX_END,		envPtr);
-	if (!emptyPrefix) {
-	    TclEmitOpcode(	INST_LIST_CONCAT,		envPtr);
-	}
+	CompileWord(envPtr, tokenPtr, interp, i);
     }
 
-    return TCL_OK;
-}
+    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 3, envPtr);
+    TclEmitInt4(end_indicator, envPtr);
+    TclEmitInt4(first, envPtr);
+    TclEmitInt4(last, envPtr);
+    return TCL_OK;}
 
 /*
  *----------------------------------------------------------------------
@@ -3012,52 +2928,51 @@ TclCompileXxCmd(
 {
     DefineLineInformation;	/* TIP #280 */
     Tcl_Token *tokenPtr, *listTokenPtr;
-    int idx, i;
+    int first, last, i, end_indicator;
 
-    if (parsePtr->numWords < 3) {
+    if (parsePtr->numWords < 4) {
 	return TCL_ERROR;
     }
     listTokenPtr = TokenAfter(parsePtr->tokenPtr);
 
-    /*
-     * Parse the index. Will only compile if it is constant and not an
-     * _integer_ less than zero (since we reserve negative indices here for
-     * end-relative indexing) or an end-based index greater than 'end' itself.
-     */
-
     tokenPtr = TokenAfter(listTokenPtr);
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_NONE,
+	    &first) != TCL_OK) {
+	return TCL_ERROR;
+    }
 
-    /*
-     * NOTE: This command treats all inserts at indices before the list
-     * the same as inserts at the start of the list, and all inserts
-     * after the list the same as inserts at the end of the list. We
-     * make that transformation here so we can use the optimized bytecode
-     * as much as possible.
-     */
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_END,
-	    &idx) != TCL_OK) {
+    tokenPtr = TokenAfter(tokenPtr);
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_NONE, TCL_INDEX_END,
+	    &last) != TCL_OK) {
 	return TCL_ERROR;
     }
+    end_indicator = 1; /* "end" means last element by default */
+    if (first == (int)TCL_INDEX_NONE) {
+	/* first == TCL_INDEX_NONE => Range after last element. */
+	first = TCL_INDEX_END; /* Insert at end where ... */
+	end_indicator = 0;     /* ... end means AFTER last element */
+	last = TCL_INDEX_NONE; /* Informs lreplace, nothing to replace */
+    } else if (last == TCL_INDEX_NONE) {
+	/*
+	 * last == TCL_INDEX_NONE => last precedes first element
+	 * lreplace4 will treat this as nothing to delete
+	 * Nought to do, just here for clarity, will be optimized away
+	 */
+    } else {
 
-    /*
-     * There are four main cases. If there are no values to insert, this is
-     * just a confirm-listiness check. If the index is '0', this is a prepend.
-     * If the index is 'end' (== TCL_INDEX_END), this is an append. Otherwise,
-     * this is a splice (== split, insert values as list, concat-3).
-     */
+    }
 
     CompileWord(envPtr, listTokenPtr, interp, 1);
 
-    for (i=3 ; i<parsePtr->numWords ; i++) {
+    for (i=4 ; i<parsePtr->numWords ; i++) {
 	tokenPtr = TokenAfter(tokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, i);
     }
 
-    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 2, envPtr);
-    TclEmitInt4(0, envPtr);
-    TclEmitInt4(idx, envPtr);
-    TclEmitInt4(idx-1, envPtr);
-
+    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 3, envPtr);
+    TclEmitInt4(end_indicator, envPtr);
+    TclEmitInt4(first, envPtr);
+    TclEmitInt4(last, envPtr);
     return TCL_OK;
 }
 
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index c01ddb8..57e2d71 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -677,8 +677,8 @@ InstructionDesc const tclInstructionTable[] = {
 	/* String Greater or equal:	push (stknext >= stktop) */
     {"lreplace4",	  17,   INT_MIN,    4,	{OPERAND_UINT4, OPERAND_UINT4, OPERAND_INT4, OPERAND_INT4}},
 	/* Operands: number of arguments, end_indicator, firstIdx, lastIdx
-	 * end_indicator: 0 if "end" is treated as index of last element, 
-	 *                1 if "end" is position after last element
+	 * end_indicator: 1 if "end" is treated as index of last element, 
+	 *                0 if "end" is position after last element
 	 * firstIdx,lastIdx: range of elements to delete
 	 * Stack: ... listobj new1 ... newN => ... newlistobj */
 
-- 
cgit v0.12


From e2ee6601c9ae82a358e3e6e46d4b594a403d4468 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 30 Oct 2022 12:51:57 +0000
Subject: One more unused stub entry

---
 generic/tcl.decls      | 52 ++++++++++++++++++++++--------------------
 generic/tclDecls.h     | 61 ++++++++++++++++++++++++++------------------------
 generic/tclPlatDecls.h | 13 +++++++++++
 generic/tclStubInit.c  |  5 ++++-
 4 files changed, 77 insertions(+), 54 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 9716b32..a933d95 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -136,11 +136,11 @@ declare 30 {
     void TclFreeObj(Tcl_Obj *objPtr)
 }
 declare 31 {
-    int Tcl_GetBoolean(Tcl_Interp *interp, const char *src, int *boolPtr)
+    int Tcl_GetBoolean(Tcl_Interp *interp, const char *src, int *intPtr)
 }
 declare 32 {
     int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    int *boolPtr)
+	    int *intPtr)
 }
 declare 33 {
     unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, int *lengthPtr)
@@ -199,7 +199,7 @@ declare 48 {
 	    int count, int objc, Tcl_Obj *const objv[])
 }
 declare 49 {
-    Tcl_Obj *Tcl_NewBooleanObj(int boolValue)
+    Tcl_Obj *Tcl_NewBooleanObj(int intValue)
 }
 declare 50 {
     Tcl_Obj *Tcl_NewByteArrayObj(const unsigned char *bytes, int length)
@@ -223,14 +223,14 @@ declare 56 {
     Tcl_Obj *Tcl_NewStringObj(const char *bytes, int length)
 }
 declare 57 {
-    void Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue)
+    void Tcl_SetBooleanObj(Tcl_Obj *objPtr, int intValue)
 }
 declare 58 {
-    unsigned char *Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length)
+    unsigned char *Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int numBytes)
 }
 declare 59 {
     void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, const unsigned char *bytes,
-	    int length)
+	    int numBytes)
 }
 declare 60 {
     void Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue)
@@ -316,12 +316,12 @@ declare 85 {
 	    int flags)
 }
 declare 86 {
-    int Tcl_CreateAlias(Tcl_Interp *slave, const char *slaveCmd,
+    int Tcl_CreateAlias(Tcl_Interp *childInterp, const char *childCmd,
 	    Tcl_Interp *target, const char *targetCmd, int argc,
 	    CONST84 char *const *argv)
 }
 declare 87 {
-    int Tcl_CreateAliasObj(Tcl_Interp *slave, const char *slaveCmd,
+    int Tcl_CreateAliasObj(Tcl_Interp *childInterp, const char *childCmd,
 	    Tcl_Interp *target, const char *targetCmd, int objc,
 	    Tcl_Obj *const objv[])
 }
@@ -364,7 +364,7 @@ declare 96 {
 	    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 97 {
-    Tcl_Interp *Tcl_CreateSlave(Tcl_Interp *interp, const char *slaveName,
+    Tcl_Interp *Tcl_CreateSlave(Tcl_Interp *interp, const char *name,
 	    int isSafe)
 }
 declare 98 {
@@ -582,7 +582,7 @@ declare 162 {
     CONST84_RETURN char *Tcl_GetHostName(void)
 }
 declare 163 {
-    int Tcl_GetInterpPath(Tcl_Interp *askInterp, Tcl_Interp *slaveInterp)
+    int Tcl_GetInterpPath(Tcl_Interp *interp, Tcl_Interp *childInterp)
 }
 declare 164 {
     Tcl_Interp *Tcl_GetMaster(Tcl_Interp *interp)
@@ -712,7 +712,7 @@ declare 198 {
 }
 declare 199 {
     Tcl_Channel Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
-	    const char *address, const char *myaddr, int myport, int async)
+	    const char *address, const char *myaddr, int myport, int flags)
 }
 declare 200 {
     Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
@@ -1123,8 +1123,8 @@ declare 312 {
     int Tcl_NumUtfChars(const char *src, int length)
 }
 declare 313 {
-    int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead,
-	    int appendFlag)
+    int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr,
+	    int charsToRead, int appendFlag)
 }
 declare 314 {
     void Tcl_RestoreResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
@@ -1277,16 +1277,17 @@ declare 359 {
 	    const char *command, int length)
 }
 declare 360 {
-    int Tcl_ParseBraces(Tcl_Interp *interp, const char *start, int numBytes,
-	    Tcl_Parse *parsePtr, int append, CONST84 char **termPtr)
+    int Tcl_ParseBraces(Tcl_Interp *interp, const char *start,
+	    int numBytes, Tcl_Parse *parsePtr, int append,
+	    CONST84 char **termPtr)
 }
 declare 361 {
-    int Tcl_ParseCommand(Tcl_Interp *interp, const char *start, int numBytes,
-	    int nested, Tcl_Parse *parsePtr)
+    int Tcl_ParseCommand(Tcl_Interp *interp, const char *start,
+	    int numBytes, int nested, Tcl_Parse *parsePtr)
 }
 declare 362 {
-    int Tcl_ParseExpr(Tcl_Interp *interp, const char *start, int numBytes,
-	    Tcl_Parse *parsePtr)
+    int Tcl_ParseExpr(Tcl_Interp *interp, const char *start,
+	    int numBytes, Tcl_Parse *parsePtr)
 }
 declare 363 {
     int Tcl_ParseQuotedString(Tcl_Interp *interp, const char *start,
@@ -1294,8 +1295,8 @@ declare 363 {
 	    CONST84 char **termPtr)
 }
 declare 364 {
-    int Tcl_ParseVarName(Tcl_Interp *interp, const char *start, int numBytes,
-	    Tcl_Parse *parsePtr, int append)
+    int Tcl_ParseVarName(Tcl_Interp *interp, const char *start,
+	    int numBytes, Tcl_Parse *parsePtr, int append)
 }
 # These 4 functions are obsolete, use Tcl_FSGetCwd, Tcl_FSChdir,
 # Tcl_FSAccess and Tcl_FSStat
@@ -2091,8 +2092,8 @@ declare 574 {
     void Tcl_AppendObjToErrorInfo(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
 declare 575 {
-    void Tcl_AppendLimitedToObj(Tcl_Obj *objPtr, const char *bytes, int length,
-	    int limit, const char *ellipsis)
+    void Tcl_AppendLimitedToObj(Tcl_Obj *objPtr, const char *bytes,
+	    int length, int limit, const char *ellipsis)
 }
 declare 576 {
     Tcl_Obj *Tcl_Format(Tcl_Interp *interp, const char *format, int objc,
@@ -2111,7 +2112,7 @@ declare 579 {
 
 # ----- BASELINE -- FOR -- 8.5.0 ----- #
 
-declare 682 {
+declare 683 {
     void TclUnusedStubEntry(void)
 }
 
@@ -2137,6 +2138,9 @@ declare 0 win {
 declare 1 win {
     char *Tcl_WinTCharToUtf(const TCHAR *str, int len, Tcl_DString *dsPtr)
 }
+declare 3 win {
+    void TclUnusedStubEntry(void)
+}
 
 ################################
 # Mac OS X specific functions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 6d7a8a3..d8ec374 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -236,13 +236,13 @@ EXTERN void		TclFreeObj(Tcl_Obj *objPtr);
 #define Tcl_GetBoolean_TCL_DECLARED
 /* 31 */
 EXTERN int		Tcl_GetBoolean(Tcl_Interp *interp, CONST char *src,
-				int *boolPtr);
+				int *intPtr);
 #endif
 #ifndef Tcl_GetBooleanFromObj_TCL_DECLARED
 #define Tcl_GetBooleanFromObj_TCL_DECLARED
 /* 32 */
 EXTERN int		Tcl_GetBooleanFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int *boolPtr);
+				Tcl_Obj *objPtr, int *intPtr);
 #endif
 #ifndef Tcl_GetByteArrayFromObj_TCL_DECLARED
 #define Tcl_GetByteArrayFromObj_TCL_DECLARED
@@ -344,7 +344,7 @@ EXTERN int		Tcl_ListObjReplace(Tcl_Interp *interp,
 #ifndef Tcl_NewBooleanObj_TCL_DECLARED
 #define Tcl_NewBooleanObj_TCL_DECLARED
 /* 49 */
-EXTERN Tcl_Obj *	Tcl_NewBooleanObj(int boolValue);
+EXTERN Tcl_Obj *	Tcl_NewBooleanObj(int intValue);
 #endif
 #ifndef Tcl_NewByteArrayObj_TCL_DECLARED
 #define Tcl_NewByteArrayObj_TCL_DECLARED
@@ -385,18 +385,18 @@ EXTERN Tcl_Obj *	Tcl_NewStringObj(CONST char *bytes, int length);
 #ifndef Tcl_SetBooleanObj_TCL_DECLARED
 #define Tcl_SetBooleanObj_TCL_DECLARED
 /* 57 */
-EXTERN void		Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue);
+EXTERN void		Tcl_SetBooleanObj(Tcl_Obj *objPtr, int intValue);
 #endif
 #ifndef Tcl_SetByteArrayLength_TCL_DECLARED
 #define Tcl_SetByteArrayLength_TCL_DECLARED
 /* 58 */
-EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length);
+EXTERN unsigned char *	Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int numBytes);
 #endif
 #ifndef Tcl_SetByteArrayObj_TCL_DECLARED
 #define Tcl_SetByteArrayObj_TCL_DECLARED
 /* 59 */
 EXTERN void		Tcl_SetByteArrayObj(Tcl_Obj *objPtr,
-				CONST unsigned char *bytes, int length);
+				CONST unsigned char *bytes, int numBytes);
 #endif
 #ifndef Tcl_SetDoubleObj_TCL_DECLARED
 #define Tcl_SetDoubleObj_TCL_DECLARED
@@ -544,16 +544,16 @@ EXTERN int		Tcl_ConvertCountedElement(CONST char *src,
 #ifndef Tcl_CreateAlias_TCL_DECLARED
 #define Tcl_CreateAlias_TCL_DECLARED
 /* 86 */
-EXTERN int		Tcl_CreateAlias(Tcl_Interp *slave,
-				CONST char *slaveCmd, Tcl_Interp *target,
+EXTERN int		Tcl_CreateAlias(Tcl_Interp *childInterp,
+				CONST char *childCmd, Tcl_Interp *target,
 				CONST char *targetCmd, int argc,
 				CONST84 char *CONST *argv);
 #endif
 #ifndef Tcl_CreateAliasObj_TCL_DECLARED
 #define Tcl_CreateAliasObj_TCL_DECLARED
 /* 87 */
-EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *slave,
-				CONST char *slaveCmd, Tcl_Interp *target,
+EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *childInterp,
+				CONST char *childCmd, Tcl_Interp *target,
 				CONST char *targetCmd, int objc,
 				Tcl_Obj *CONST objv[]);
 #endif
@@ -621,8 +621,8 @@ EXTERN Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
 #ifndef Tcl_CreateSlave_TCL_DECLARED
 #define Tcl_CreateSlave_TCL_DECLARED
 /* 97 */
-EXTERN Tcl_Interp *	Tcl_CreateSlave(Tcl_Interp *interp,
-				CONST char *slaveName, int isSafe);
+EXTERN Tcl_Interp *	Tcl_CreateSlave(Tcl_Interp *interp, CONST char *name,
+				int isSafe);
 #endif
 #ifndef Tcl_CreateTimerHandler_TCL_DECLARED
 #define Tcl_CreateTimerHandler_TCL_DECLARED
@@ -999,8 +999,8 @@ EXTERN CONST84_RETURN char * Tcl_GetHostName(void);
 #ifndef Tcl_GetInterpPath_TCL_DECLARED
 #define Tcl_GetInterpPath_TCL_DECLARED
 /* 163 */
-EXTERN int		Tcl_GetInterpPath(Tcl_Interp *askInterp,
-				Tcl_Interp *slaveInterp);
+EXTERN int		Tcl_GetInterpPath(Tcl_Interp *interp,
+				Tcl_Interp *childInterp);
 #endif
 #ifndef Tcl_GetMaster_TCL_DECLARED
 #define Tcl_GetMaster_TCL_DECLARED
@@ -1208,7 +1208,7 @@ EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
 /* 199 */
 EXTERN Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
 				CONST char *address, CONST char *myaddr,
-				int myport, int async);
+				int myport, int flags);
 #endif
 #ifndef Tcl_OpenTcpServer_TCL_DECLARED
 #define Tcl_OpenTcpServer_TCL_DECLARED
@@ -3514,9 +3514,10 @@ EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
 /* Slot 679 is reserved */
 /* Slot 680 is reserved */
 /* Slot 681 is reserved */
+/* Slot 682 is reserved */
 #ifndef TclUnusedStubEntry_TCL_DECLARED
 #define TclUnusedStubEntry_TCL_DECLARED
-/* 682 */
+/* 683 */
 EXTERN void		TclUnusedStubEntry(void);
 #endif
 
@@ -3577,8 +3578,8 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_DbNewStringObj) (CONST char *bytes, int length, CONST char *file, int line); /* 28 */
     Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */
     void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */
-    int (*tcl_GetBoolean) (Tcl_Interp *interp, CONST char *src, int *boolPtr); /* 31 */
-    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *boolPtr); /* 32 */
+    int (*tcl_GetBoolean) (Tcl_Interp *interp, CONST char *src, int *intPtr); /* 31 */
+    int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 32 */
     unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 33 */
     int (*tcl_GetDouble) (Tcl_Interp *interp, CONST char *src, double *doublePtr); /* 34 */
     int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */
@@ -3595,7 +3596,7 @@ typedef struct TclStubs {
     int (*tcl_ListObjIndex) (Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj **objPtrPtr); /* 46 */
     int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr); /* 47 */
     int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[]); /* 48 */
-    Tcl_Obj * (*tcl_NewBooleanObj) (int boolValue); /* 49 */
+    Tcl_Obj * (*tcl_NewBooleanObj) (int intValue); /* 49 */
     Tcl_Obj * (*tcl_NewByteArrayObj) (CONST unsigned char *bytes, int length); /* 50 */
     Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */
     Tcl_Obj * (*tcl_NewIntObj) (int intValue); /* 52 */
@@ -3603,9 +3604,9 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_NewLongObj) (long longValue); /* 54 */
     Tcl_Obj * (*tcl_NewObj) (void); /* 55 */
     Tcl_Obj * (*tcl_NewStringObj) (CONST char *bytes, int length); /* 56 */
-    void (*tcl_SetBooleanObj) (Tcl_Obj *objPtr, int boolValue); /* 57 */
-    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, int length); /* 58 */
-    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, CONST unsigned char *bytes, int length); /* 59 */
+    void (*tcl_SetBooleanObj) (Tcl_Obj *objPtr, int intValue); /* 57 */
+    unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, int numBytes); /* 58 */
+    void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, CONST unsigned char *bytes, int numBytes); /* 59 */
     void (*tcl_SetDoubleObj) (Tcl_Obj *objPtr, double doubleValue); /* 60 */
     void (*tcl_SetIntObj) (Tcl_Obj *objPtr, int intValue); /* 61 */
     void (*tcl_SetListObj) (Tcl_Obj *objPtr, int objc, Tcl_Obj *CONST objv[]); /* 62 */
@@ -3632,8 +3633,8 @@ typedef struct TclStubs {
     char * (*tcl_Concat) (int argc, CONST84 char *CONST *argv); /* 83 */
     int (*tcl_ConvertElement) (CONST char *src, char *dst, int flags); /* 84 */
     int (*tcl_ConvertCountedElement) (CONST char *src, int length, char *dst, int flags); /* 85 */
-    int (*tcl_CreateAlias) (Tcl_Interp *slave, CONST char *slaveCmd, Tcl_Interp *target, CONST char *targetCmd, int argc, CONST84 char *CONST *argv); /* 86 */
-    int (*tcl_CreateAliasObj) (Tcl_Interp *slave, CONST char *slaveCmd, Tcl_Interp *target, CONST char *targetCmd, int objc, Tcl_Obj *CONST objv[]); /* 87 */
+    int (*tcl_CreateAlias) (Tcl_Interp *childInterp, CONST char *childCmd, Tcl_Interp *target, CONST char *targetCmd, int argc, CONST84 char *CONST *argv); /* 86 */
+    int (*tcl_CreateAliasObj) (Tcl_Interp *childInterp, CONST char *childCmd, Tcl_Interp *target, CONST char *targetCmd, int objc, Tcl_Obj *CONST objv[]); /* 87 */
     Tcl_Channel (*tcl_CreateChannel) (Tcl_ChannelType *typePtr, CONST char *chanName, ClientData instanceData, int mask); /* 88 */
     void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, ClientData clientData); /* 89 */
     void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, ClientData clientData); /* 90 */
@@ -3643,7 +3644,7 @@ typedef struct TclStubs {
     Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */
     void (*tcl_CreateMathFunc) (Tcl_Interp *interp, CONST char *name, int numArgs, Tcl_ValueType *argTypes, Tcl_MathProc *proc, ClientData clientData); /* 95 */
     Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, CONST char *cmdName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
-    Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp *interp, CONST char *slaveName, int isSafe); /* 97 */
+    Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp *interp, CONST char *name, int isSafe); /* 97 */
     Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, ClientData clientData); /* 98 */
     Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, int level, Tcl_CmdTraceProc *proc, ClientData clientData); /* 99 */
     void (*tcl_DeleteAssocData) (Tcl_Interp *interp, CONST char *name); /* 100 */
@@ -3709,7 +3710,7 @@ typedef struct TclStubs {
     CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Command command); /* 160 */
     int (*tcl_GetErrno) (void); /* 161 */
     CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */
-    int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInterp); /* 163 */
+    int (*tcl_GetInterpPath) (Tcl_Interp *interp, Tcl_Interp *childInterp); /* 163 */
     Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */
     CONST char * (*tcl_GetNameOfExecutable) (void); /* 165 */
     Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */
@@ -3753,7 +3754,7 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */
     Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, int argc, CONST84 char **argv, int flags); /* 197 */
     Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, CONST char *fileName, CONST char *modeString, int permissions); /* 198 */
-    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, CONST char *address, CONST char *myaddr, int myport, int async); /* 199 */
+    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, CONST char *address, CONST char *myaddr, int myport, int flags); /* 199 */
     Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, CONST char *host, Tcl_TcpAcceptProc *acceptProc, ClientData callbackData); /* 200 */
     void (*tcl_Preserve) (ClientData data); /* 201 */
     void (*tcl_PrintDouble) (Tcl_Interp *interp, double value, char *dst); /* 202 */
@@ -4236,7 +4237,8 @@ typedef struct TclStubs {
     VOID *reserved679;
     VOID *reserved680;
     VOID *reserved681;
-    void (*tclUnusedStubEntry) (void); /* 682 */
+    VOID *reserved682;
+    void (*tclUnusedStubEntry) (void); /* 683 */
 } TclStubs;
 
 extern TclStubs *tclStubsPtr;
@@ -6691,9 +6693,10 @@ extern TclStubs *tclStubsPtr;
 /* Slot 679 is reserved */
 /* Slot 680 is reserved */
 /* Slot 681 is reserved */
+/* Slot 682 is reserved */
 #ifndef TclUnusedStubEntry
 #define TclUnusedStubEntry \
-	(tclStubsPtr->tclUnusedStubEntry) /* 682 */
+	(tclStubsPtr->tclUnusedStubEntry) /* 683 */
 #endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index 16e8af0..e8dde22 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -57,6 +57,12 @@ EXTERN TCHAR *		Tcl_WinUtfToTChar(CONST char *str, int len,
 EXTERN char *		Tcl_WinTCharToUtf(CONST TCHAR *str, int len,
 				Tcl_DString *dsPtr);
 #endif
+/* Slot 2 is reserved */
+#ifndef TclUnusedStubEntry_TCL_DECLARED
+#define TclUnusedStubEntry_TCL_DECLARED
+/* 3 */
+EXTERN void		TclUnusedStubEntry(void);
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #ifndef Tcl_MacOSXOpenBundleResources_TCL_DECLARED
@@ -89,6 +95,8 @@ typedef struct TclPlatStubs {
 #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     TCHAR * (*tcl_WinUtfToTChar) (CONST char *str, int len, Tcl_DString *dsPtr); /* 0 */
     char * (*tcl_WinTCharToUtf) (CONST TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */
+    VOID *reserved2;
+    void (*tclUnusedStubEntry) (void); /* 3 */
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
     int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, CONST char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
@@ -118,6 +126,11 @@ extern TclPlatStubs *tclPlatStubsPtr;
 #define Tcl_WinTCharToUtf \
 	(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */
 #endif
+/* Slot 2 is reserved */
+#ifndef TclUnusedStubEntry
+#define TclUnusedStubEntry \
+	(tclPlatStubsPtr->tclUnusedStubEntry) /* 3 */
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #ifndef Tcl_MacOSXOpenBundleResources
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index f1cf6a2..9502ba2 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -672,6 +672,8 @@ TclPlatStubs tclPlatStubs = {
 #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     Tcl_WinUtfToTChar, /* 0 */
     Tcl_WinTCharToUtf, /* 1 */
+    NULL, /* 2 */
+    TclUnusedStubEntry, /* 3 */
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
     Tcl_MacOSXOpenBundleResources, /* 0 */
@@ -1481,7 +1483,8 @@ TclStubs tclStubs = {
     NULL, /* 679 */
     NULL, /* 680 */
     NULL, /* 681 */
-    TclUnusedStubEntry, /* 682 */
+    NULL, /* 682 */
+    TclUnusedStubEntry, /* 683 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From 1e2cce6389bfdb6ed696f3fdd427fc971485c967 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 30 Oct 2022 12:52:39 +0000
Subject: Update to tzdata 2022f

---
 library/tzdata/America/Bahia_Banderas | 154 -------------------
 library/tzdata/America/Chihuahua      | 156 +------------------
 library/tzdata/America/Mazatlan       | 154 -------------------
 library/tzdata/America/Merida         | 154 -------------------
 library/tzdata/America/Mexico_City    | 154 -------------------
 library/tzdata/America/Monterrey      | 154 -------------------
 library/tzdata/America/Nipigon        | 265 +--------------------------------
 library/tzdata/America/Ojinaga        | 156 +------------------
 library/tzdata/America/Rainy_River    | 265 +--------------------------------
 library/tzdata/America/Thunder_Bay    | 273 +---------------------------------
 library/tzdata/Pacific/Fiji           | 155 -------------------
 11 files changed, 11 insertions(+), 2029 deletions(-)

diff --git a/library/tzdata/America/Bahia_Banderas b/library/tzdata/America/Bahia_Banderas
index f06141e..cdcc4b3 100644
--- a/library/tzdata/America/Bahia_Banderas
+++ b/library/tzdata/America/Bahia_Banderas
@@ -65,158 +65,4 @@ set TZData(:America/Bahia_Banderas) {
     {1635663600 -21600 0 CST}
     {1648972800 -18000 1 CDT}
     {1667113200 -21600 0 CST}
-    {1680422400 -18000 1 CDT}
-    {1698562800 -21600 0 CST}
-    {1712476800 -18000 1 CDT}
-    {1730012400 -21600 0 CST}
-    {1743926400 -18000 1 CDT}
-    {1761462000 -21600 0 CST}
-    {1775376000 -18000 1 CDT}
-    {1792911600 -21600 0 CST}
-    {1806825600 -18000 1 CDT}
-    {1824966000 -21600 0 CST}
-    {1838275200 -18000 1 CDT}
-    {1856415600 -21600 0 CST}
-    {1869724800 -18000 1 CDT}
-    {1887865200 -21600 0 CST}
-    {1901779200 -18000 1 CDT}
-    {1919314800 -21600 0 CST}
-    {1933228800 -18000 1 CDT}
-    {1950764400 -21600 0 CST}
-    {1964678400 -18000 1 CDT}
-    {1982818800 -21600 0 CST}
-    {1996128000 -18000 1 CDT}
-    {2014268400 -21600 0 CST}
-    {2027577600 -18000 1 CDT}
-    {2045718000 -21600 0 CST}
-    {2059027200 -18000 1 CDT}
-    {2077167600 -21600 0 CST}
-    {2091081600 -18000 1 CDT}
-    {2108617200 -21600 0 CST}
-    {2122531200 -18000 1 CDT}
-    {2140066800 -21600 0 CST}
-    {2153980800 -18000 1 CDT}
-    {2172121200 -21600 0 CST}
-    {2185430400 -18000 1 CDT}
-    {2203570800 -21600 0 CST}
-    {2216880000 -18000 1 CDT}
-    {2235020400 -21600 0 CST}
-    {2248934400 -18000 1 CDT}
-    {2266470000 -21600 0 CST}
-    {2280384000 -18000 1 CDT}
-    {2297919600 -21600 0 CST}
-    {2311833600 -18000 1 CDT}
-    {2329369200 -21600 0 CST}
-    {2343283200 -18000 1 CDT}
-    {2361423600 -21600 0 CST}
-    {2374732800 -18000 1 CDT}
-    {2392873200 -21600 0 CST}
-    {2406182400 -18000 1 CDT}
-    {2424322800 -21600 0 CST}
-    {2438236800 -18000 1 CDT}
-    {2455772400 -21600 0 CST}
-    {2469686400 -18000 1 CDT}
-    {2487222000 -21600 0 CST}
-    {2501136000 -18000 1 CDT}
-    {2519276400 -21600 0 CST}
-    {2532585600 -18000 1 CDT}
-    {2550726000 -21600 0 CST}
-    {2564035200 -18000 1 CDT}
-    {2582175600 -21600 0 CST}
-    {2596089600 -18000 1 CDT}
-    {2613625200 -21600 0 CST}
-    {2627539200 -18000 1 CDT}
-    {2645074800 -21600 0 CST}
-    {2658988800 -18000 1 CDT}
-    {2676524400 -21600 0 CST}
-    {2690438400 -18000 1 CDT}
-    {2708578800 -21600 0 CST}
-    {2721888000 -18000 1 CDT}
-    {2740028400 -21600 0 CST}
-    {2753337600 -18000 1 CDT}
-    {2771478000 -21600 0 CST}
-    {2785392000 -18000 1 CDT}
-    {2802927600 -21600 0 CST}
-    {2816841600 -18000 1 CDT}
-    {2834377200 -21600 0 CST}
-    {2848291200 -18000 1 CDT}
-    {2866431600 -21600 0 CST}
-    {2879740800 -18000 1 CDT}
-    {2897881200 -21600 0 CST}
-    {2911190400 -18000 1 CDT}
-    {2929330800 -21600 0 CST}
-    {2942640000 -18000 1 CDT}
-    {2960780400 -21600 0 CST}
-    {2974694400 -18000 1 CDT}
-    {2992230000 -21600 0 CST}
-    {3006144000 -18000 1 CDT}
-    {3023679600 -21600 0 CST}
-    {3037593600 -18000 1 CDT}
-    {3055734000 -21600 0 CST}
-    {3069043200 -18000 1 CDT}
-    {3087183600 -21600 0 CST}
-    {3100492800 -18000 1 CDT}
-    {3118633200 -21600 0 CST}
-    {3132547200 -18000 1 CDT}
-    {3150082800 -21600 0 CST}
-    {3163996800 -18000 1 CDT}
-    {3181532400 -21600 0 CST}
-    {3195446400 -18000 1 CDT}
-    {3212982000 -21600 0 CST}
-    {3226896000 -18000 1 CDT}
-    {3245036400 -21600 0 CST}
-    {3258345600 -18000 1 CDT}
-    {3276486000 -21600 0 CST}
-    {3289795200 -18000 1 CDT}
-    {3307935600 -21600 0 CST}
-    {3321849600 -18000 1 CDT}
-    {3339385200 -21600 0 CST}
-    {3353299200 -18000 1 CDT}
-    {3370834800 -21600 0 CST}
-    {3384748800 -18000 1 CDT}
-    {3402889200 -21600 0 CST}
-    {3416198400 -18000 1 CDT}
-    {3434338800 -21600 0 CST}
-    {3447648000 -18000 1 CDT}
-    {3465788400 -21600 0 CST}
-    {3479702400 -18000 1 CDT}
-    {3497238000 -21600 0 CST}
-    {3511152000 -18000 1 CDT}
-    {3528687600 -21600 0 CST}
-    {3542601600 -18000 1 CDT}
-    {3560137200 -21600 0 CST}
-    {3574051200 -18000 1 CDT}
-    {3592191600 -21600 0 CST}
-    {3605500800 -18000 1 CDT}
-    {3623641200 -21600 0 CST}
-    {3636950400 -18000 1 CDT}
-    {3655090800 -21600 0 CST}
-    {3669004800 -18000 1 CDT}
-    {3686540400 -21600 0 CST}
-    {3700454400 -18000 1 CDT}
-    {3717990000 -21600 0 CST}
-    {3731904000 -18000 1 CDT}
-    {3750044400 -21600 0 CST}
-    {3763353600 -18000 1 CDT}
-    {3781494000 -21600 0 CST}
-    {3794803200 -18000 1 CDT}
-    {3812943600 -21600 0 CST}
-    {3826252800 -18000 1 CDT}
-    {3844393200 -21600 0 CST}
-    {3858307200 -18000 1 CDT}
-    {3875842800 -21600 0 CST}
-    {3889756800 -18000 1 CDT}
-    {3907292400 -21600 0 CST}
-    {3921206400 -18000 1 CDT}
-    {3939346800 -21600 0 CST}
-    {3952656000 -18000 1 CDT}
-    {3970796400 -21600 0 CST}
-    {3984105600 -18000 1 CDT}
-    {4002246000 -21600 0 CST}
-    {4016160000 -18000 1 CDT}
-    {4033695600 -21600 0 CST}
-    {4047609600 -18000 1 CDT}
-    {4065145200 -21600 0 CST}
-    {4079059200 -18000 1 CDT}
-    {4096594800 -21600 0 CST}
 }
diff --git a/library/tzdata/America/Chihuahua b/library/tzdata/America/Chihuahua
index fc38542..50cb9de 100644
--- a/library/tzdata/America/Chihuahua
+++ b/library/tzdata/America/Chihuahua
@@ -63,159 +63,5 @@ set TZData(:America/Chihuahua) {
     {1617526800 -21600 1 MDT}
     {1635667200 -25200 0 MST}
     {1648976400 -21600 1 MDT}
-    {1667116800 -25200 0 MST}
-    {1680426000 -21600 1 MDT}
-    {1698566400 -25200 0 MST}
-    {1712480400 -21600 1 MDT}
-    {1730016000 -25200 0 MST}
-    {1743930000 -21600 1 MDT}
-    {1761465600 -25200 0 MST}
-    {1775379600 -21600 1 MDT}
-    {1792915200 -25200 0 MST}
-    {1806829200 -21600 1 MDT}
-    {1824969600 -25200 0 MST}
-    {1838278800 -21600 1 MDT}
-    {1856419200 -25200 0 MST}
-    {1869728400 -21600 1 MDT}
-    {1887868800 -25200 0 MST}
-    {1901782800 -21600 1 MDT}
-    {1919318400 -25200 0 MST}
-    {1933232400 -21600 1 MDT}
-    {1950768000 -25200 0 MST}
-    {1964682000 -21600 1 MDT}
-    {1982822400 -25200 0 MST}
-    {1996131600 -21600 1 MDT}
-    {2014272000 -25200 0 MST}
-    {2027581200 -21600 1 MDT}
-    {2045721600 -25200 0 MST}
-    {2059030800 -21600 1 MDT}
-    {2077171200 -25200 0 MST}
-    {2091085200 -21600 1 MDT}
-    {2108620800 -25200 0 MST}
-    {2122534800 -21600 1 MDT}
-    {2140070400 -25200 0 MST}
-    {2153984400 -21600 1 MDT}
-    {2172124800 -25200 0 MST}
-    {2185434000 -21600 1 MDT}
-    {2203574400 -25200 0 MST}
-    {2216883600 -21600 1 MDT}
-    {2235024000 -25200 0 MST}
-    {2248938000 -21600 1 MDT}
-    {2266473600 -25200 0 MST}
-    {2280387600 -21600 1 MDT}
-    {2297923200 -25200 0 MST}
-    {2311837200 -21600 1 MDT}
-    {2329372800 -25200 0 MST}
-    {2343286800 -21600 1 MDT}
-    {2361427200 -25200 0 MST}
-    {2374736400 -21600 1 MDT}
-    {2392876800 -25200 0 MST}
-    {2406186000 -21600 1 MDT}
-    {2424326400 -25200 0 MST}
-    {2438240400 -21600 1 MDT}
-    {2455776000 -25200 0 MST}
-    {2469690000 -21600 1 MDT}
-    {2487225600 -25200 0 MST}
-    {2501139600 -21600 1 MDT}
-    {2519280000 -25200 0 MST}
-    {2532589200 -21600 1 MDT}
-    {2550729600 -25200 0 MST}
-    {2564038800 -21600 1 MDT}
-    {2582179200 -25200 0 MST}
-    {2596093200 -21600 1 MDT}
-    {2613628800 -25200 0 MST}
-    {2627542800 -21600 1 MDT}
-    {2645078400 -25200 0 MST}
-    {2658992400 -21600 1 MDT}
-    {2676528000 -25200 0 MST}
-    {2690442000 -21600 1 MDT}
-    {2708582400 -25200 0 MST}
-    {2721891600 -21600 1 MDT}
-    {2740032000 -25200 0 MST}
-    {2753341200 -21600 1 MDT}
-    {2771481600 -25200 0 MST}
-    {2785395600 -21600 1 MDT}
-    {2802931200 -25200 0 MST}
-    {2816845200 -21600 1 MDT}
-    {2834380800 -25200 0 MST}
-    {2848294800 -21600 1 MDT}
-    {2866435200 -25200 0 MST}
-    {2879744400 -21600 1 MDT}
-    {2897884800 -25200 0 MST}
-    {2911194000 -21600 1 MDT}
-    {2929334400 -25200 0 MST}
-    {2942643600 -21600 1 MDT}
-    {2960784000 -25200 0 MST}
-    {2974698000 -21600 1 MDT}
-    {2992233600 -25200 0 MST}
-    {3006147600 -21600 1 MDT}
-    {3023683200 -25200 0 MST}
-    {3037597200 -21600 1 MDT}
-    {3055737600 -25200 0 MST}
-    {3069046800 -21600 1 MDT}
-    {3087187200 -25200 0 MST}
-    {3100496400 -21600 1 MDT}
-    {3118636800 -25200 0 MST}
-    {3132550800 -21600 1 MDT}
-    {3150086400 -25200 0 MST}
-    {3164000400 -21600 1 MDT}
-    {3181536000 -25200 0 MST}
-    {3195450000 -21600 1 MDT}
-    {3212985600 -25200 0 MST}
-    {3226899600 -21600 1 MDT}
-    {3245040000 -25200 0 MST}
-    {3258349200 -21600 1 MDT}
-    {3276489600 -25200 0 MST}
-    {3289798800 -21600 1 MDT}
-    {3307939200 -25200 0 MST}
-    {3321853200 -21600 1 MDT}
-    {3339388800 -25200 0 MST}
-    {3353302800 -21600 1 MDT}
-    {3370838400 -25200 0 MST}
-    {3384752400 -21600 1 MDT}
-    {3402892800 -25200 0 MST}
-    {3416202000 -21600 1 MDT}
-    {3434342400 -25200 0 MST}
-    {3447651600 -21600 1 MDT}
-    {3465792000 -25200 0 MST}
-    {3479706000 -21600 1 MDT}
-    {3497241600 -25200 0 MST}
-    {3511155600 -21600 1 MDT}
-    {3528691200 -25200 0 MST}
-    {3542605200 -21600 1 MDT}
-    {3560140800 -25200 0 MST}
-    {3574054800 -21600 1 MDT}
-    {3592195200 -25200 0 MST}
-    {3605504400 -21600 1 MDT}
-    {3623644800 -25200 0 MST}
-    {3636954000 -21600 1 MDT}
-    {3655094400 -25200 0 MST}
-    {3669008400 -21600 1 MDT}
-    {3686544000 -25200 0 MST}
-    {3700458000 -21600 1 MDT}
-    {3717993600 -25200 0 MST}
-    {3731907600 -21600 1 MDT}
-    {3750048000 -25200 0 MST}
-    {3763357200 -21600 1 MDT}
-    {3781497600 -25200 0 MST}
-    {3794806800 -21600 1 MDT}
-    {3812947200 -25200 0 MST}
-    {3826256400 -21600 1 MDT}
-    {3844396800 -25200 0 MST}
-    {3858310800 -21600 1 MDT}
-    {3875846400 -25200 0 MST}
-    {3889760400 -21600 1 MDT}
-    {3907296000 -25200 0 MST}
-    {3921210000 -21600 1 MDT}
-    {3939350400 -25200 0 MST}
-    {3952659600 -21600 1 MDT}
-    {3970800000 -25200 0 MST}
-    {3984109200 -21600 1 MDT}
-    {4002249600 -25200 0 MST}
-    {4016163600 -21600 1 MDT}
-    {4033699200 -25200 0 MST}
-    {4047613200 -21600 1 MDT}
-    {4065148800 -25200 0 MST}
-    {4079062800 -21600 1 MDT}
-    {4096598400 -25200 0 MST}
+    {1667120400 -21600 0 CST}
 }
diff --git a/library/tzdata/America/Mazatlan b/library/tzdata/America/Mazatlan
index 5547d3f..d9da09f 100644
--- a/library/tzdata/America/Mazatlan
+++ b/library/tzdata/America/Mazatlan
@@ -65,158 +65,4 @@ set TZData(:America/Mazatlan) {
     {1635667200 -25200 0 MST}
     {1648976400 -21600 1 MDT}
     {1667116800 -25200 0 MST}
-    {1680426000 -21600 1 MDT}
-    {1698566400 -25200 0 MST}
-    {1712480400 -21600 1 MDT}
-    {1730016000 -25200 0 MST}
-    {1743930000 -21600 1 MDT}
-    {1761465600 -25200 0 MST}
-    {1775379600 -21600 1 MDT}
-    {1792915200 -25200 0 MST}
-    {1806829200 -21600 1 MDT}
-    {1824969600 -25200 0 MST}
-    {1838278800 -21600 1 MDT}
-    {1856419200 -25200 0 MST}
-    {1869728400 -21600 1 MDT}
-    {1887868800 -25200 0 MST}
-    {1901782800 -21600 1 MDT}
-    {1919318400 -25200 0 MST}
-    {1933232400 -21600 1 MDT}
-    {1950768000 -25200 0 MST}
-    {1964682000 -21600 1 MDT}
-    {1982822400 -25200 0 MST}
-    {1996131600 -21600 1 MDT}
-    {2014272000 -25200 0 MST}
-    {2027581200 -21600 1 MDT}
-    {2045721600 -25200 0 MST}
-    {2059030800 -21600 1 MDT}
-    {2077171200 -25200 0 MST}
-    {2091085200 -21600 1 MDT}
-    {2108620800 -25200 0 MST}
-    {2122534800 -21600 1 MDT}
-    {2140070400 -25200 0 MST}
-    {2153984400 -21600 1 MDT}
-    {2172124800 -25200 0 MST}
-    {2185434000 -21600 1 MDT}
-    {2203574400 -25200 0 MST}
-    {2216883600 -21600 1 MDT}
-    {2235024000 -25200 0 MST}
-    {2248938000 -21600 1 MDT}
-    {2266473600 -25200 0 MST}
-    {2280387600 -21600 1 MDT}
-    {2297923200 -25200 0 MST}
-    {2311837200 -21600 1 MDT}
-    {2329372800 -25200 0 MST}
-    {2343286800 -21600 1 MDT}
-    {2361427200 -25200 0 MST}
-    {2374736400 -21600 1 MDT}
-    {2392876800 -25200 0 MST}
-    {2406186000 -21600 1 MDT}
-    {2424326400 -25200 0 MST}
-    {2438240400 -21600 1 MDT}
-    {2455776000 -25200 0 MST}
-    {2469690000 -21600 1 MDT}
-    {2487225600 -25200 0 MST}
-    {2501139600 -21600 1 MDT}
-    {2519280000 -25200 0 MST}
-    {2532589200 -21600 1 MDT}
-    {2550729600 -25200 0 MST}
-    {2564038800 -21600 1 MDT}
-    {2582179200 -25200 0 MST}
-    {2596093200 -21600 1 MDT}
-    {2613628800 -25200 0 MST}
-    {2627542800 -21600 1 MDT}
-    {2645078400 -25200 0 MST}
-    {2658992400 -21600 1 MDT}
-    {2676528000 -25200 0 MST}
-    {2690442000 -21600 1 MDT}
-    {2708582400 -25200 0 MST}
-    {2721891600 -21600 1 MDT}
-    {2740032000 -25200 0 MST}
-    {2753341200 -21600 1 MDT}
-    {2771481600 -25200 0 MST}
-    {2785395600 -21600 1 MDT}
-    {2802931200 -25200 0 MST}
-    {2816845200 -21600 1 MDT}
-    {2834380800 -25200 0 MST}
-    {2848294800 -21600 1 MDT}
-    {2866435200 -25200 0 MST}
-    {2879744400 -21600 1 MDT}
-    {2897884800 -25200 0 MST}
-    {2911194000 -21600 1 MDT}
-    {2929334400 -25200 0 MST}
-    {2942643600 -21600 1 MDT}
-    {2960784000 -25200 0 MST}
-    {2974698000 -21600 1 MDT}
-    {2992233600 -25200 0 MST}
-    {3006147600 -21600 1 MDT}
-    {3023683200 -25200 0 MST}
-    {3037597200 -21600 1 MDT}
-    {3055737600 -25200 0 MST}
-    {3069046800 -21600 1 MDT}
-    {3087187200 -25200 0 MST}
-    {3100496400 -21600 1 MDT}
-    {3118636800 -25200 0 MST}
-    {3132550800 -21600 1 MDT}
-    {3150086400 -25200 0 MST}
-    {3164000400 -21600 1 MDT}
-    {3181536000 -25200 0 MST}
-    {3195450000 -21600 1 MDT}
-    {3212985600 -25200 0 MST}
-    {3226899600 -21600 1 MDT}
-    {3245040000 -25200 0 MST}
-    {3258349200 -21600 1 MDT}
-    {3276489600 -25200 0 MST}
-    {3289798800 -21600 1 MDT}
-    {3307939200 -25200 0 MST}
-    {3321853200 -21600 1 MDT}
-    {3339388800 -25200 0 MST}
-    {3353302800 -21600 1 MDT}
-    {3370838400 -25200 0 MST}
-    {3384752400 -21600 1 MDT}
-    {3402892800 -25200 0 MST}
-    {3416202000 -21600 1 MDT}
-    {3434342400 -25200 0 MST}
-    {3447651600 -21600 1 MDT}
-    {3465792000 -25200 0 MST}
-    {3479706000 -21600 1 MDT}
-    {3497241600 -25200 0 MST}
-    {3511155600 -21600 1 MDT}
-    {3528691200 -25200 0 MST}
-    {3542605200 -21600 1 MDT}
-    {3560140800 -25200 0 MST}
-    {3574054800 -21600 1 MDT}
-    {3592195200 -25200 0 MST}
-    {3605504400 -21600 1 MDT}
-    {3623644800 -25200 0 MST}
-    {3636954000 -21600 1 MDT}
-    {3655094400 -25200 0 MST}
-    {3669008400 -21600 1 MDT}
-    {3686544000 -25200 0 MST}
-    {3700458000 -21600 1 MDT}
-    {3717993600 -25200 0 MST}
-    {3731907600 -21600 1 MDT}
-    {3750048000 -25200 0 MST}
-    {3763357200 -21600 1 MDT}
-    {3781497600 -25200 0 MST}
-    {3794806800 -21600 1 MDT}
-    {3812947200 -25200 0 MST}
-    {3826256400 -21600 1 MDT}
-    {3844396800 -25200 0 MST}
-    {3858310800 -21600 1 MDT}
-    {3875846400 -25200 0 MST}
-    {3889760400 -21600 1 MDT}
-    {3907296000 -25200 0 MST}
-    {3921210000 -21600 1 MDT}
-    {3939350400 -25200 0 MST}
-    {3952659600 -21600 1 MDT}
-    {3970800000 -25200 0 MST}
-    {3984109200 -21600 1 MDT}
-    {4002249600 -25200 0 MST}
-    {4016163600 -21600 1 MDT}
-    {4033699200 -25200 0 MST}
-    {4047613200 -21600 1 MDT}
-    {4065148800 -25200 0 MST}
-    {4079062800 -21600 1 MDT}
-    {4096598400 -25200 0 MST}
 }
diff --git a/library/tzdata/America/Merida b/library/tzdata/America/Merida
index ebf5927..d17431d 100644
--- a/library/tzdata/America/Merida
+++ b/library/tzdata/America/Merida
@@ -59,158 +59,4 @@ set TZData(:America/Merida) {
     {1635663600 -21600 0 CST}
     {1648972800 -18000 1 CDT}
     {1667113200 -21600 0 CST}
-    {1680422400 -18000 1 CDT}
-    {1698562800 -21600 0 CST}
-    {1712476800 -18000 1 CDT}
-    {1730012400 -21600 0 CST}
-    {1743926400 -18000 1 CDT}
-    {1761462000 -21600 0 CST}
-    {1775376000 -18000 1 CDT}
-    {1792911600 -21600 0 CST}
-    {1806825600 -18000 1 CDT}
-    {1824966000 -21600 0 CST}
-    {1838275200 -18000 1 CDT}
-    {1856415600 -21600 0 CST}
-    {1869724800 -18000 1 CDT}
-    {1887865200 -21600 0 CST}
-    {1901779200 -18000 1 CDT}
-    {1919314800 -21600 0 CST}
-    {1933228800 -18000 1 CDT}
-    {1950764400 -21600 0 CST}
-    {1964678400 -18000 1 CDT}
-    {1982818800 -21600 0 CST}
-    {1996128000 -18000 1 CDT}
-    {2014268400 -21600 0 CST}
-    {2027577600 -18000 1 CDT}
-    {2045718000 -21600 0 CST}
-    {2059027200 -18000 1 CDT}
-    {2077167600 -21600 0 CST}
-    {2091081600 -18000 1 CDT}
-    {2108617200 -21600 0 CST}
-    {2122531200 -18000 1 CDT}
-    {2140066800 -21600 0 CST}
-    {2153980800 -18000 1 CDT}
-    {2172121200 -21600 0 CST}
-    {2185430400 -18000 1 CDT}
-    {2203570800 -21600 0 CST}
-    {2216880000 -18000 1 CDT}
-    {2235020400 -21600 0 CST}
-    {2248934400 -18000 1 CDT}
-    {2266470000 -21600 0 CST}
-    {2280384000 -18000 1 CDT}
-    {2297919600 -21600 0 CST}
-    {2311833600 -18000 1 CDT}
-    {2329369200 -21600 0 CST}
-    {2343283200 -18000 1 CDT}
-    {2361423600 -21600 0 CST}
-    {2374732800 -18000 1 CDT}
-    {2392873200 -21600 0 CST}
-    {2406182400 -18000 1 CDT}
-    {2424322800 -21600 0 CST}
-    {2438236800 -18000 1 CDT}
-    {2455772400 -21600 0 CST}
-    {2469686400 -18000 1 CDT}
-    {2487222000 -21600 0 CST}
-    {2501136000 -18000 1 CDT}
-    {2519276400 -21600 0 CST}
-    {2532585600 -18000 1 CDT}
-    {2550726000 -21600 0 CST}
-    {2564035200 -18000 1 CDT}
-    {2582175600 -21600 0 CST}
-    {2596089600 -18000 1 CDT}
-    {2613625200 -21600 0 CST}
-    {2627539200 -18000 1 CDT}
-    {2645074800 -21600 0 CST}
-    {2658988800 -18000 1 CDT}
-    {2676524400 -21600 0 CST}
-    {2690438400 -18000 1 CDT}
-    {2708578800 -21600 0 CST}
-    {2721888000 -18000 1 CDT}
-    {2740028400 -21600 0 CST}
-    {2753337600 -18000 1 CDT}
-    {2771478000 -21600 0 CST}
-    {2785392000 -18000 1 CDT}
-    {2802927600 -21600 0 CST}
-    {2816841600 -18000 1 CDT}
-    {2834377200 -21600 0 CST}
-    {2848291200 -18000 1 CDT}
-    {2866431600 -21600 0 CST}
-    {2879740800 -18000 1 CDT}
-    {2897881200 -21600 0 CST}
-    {2911190400 -18000 1 CDT}
-    {2929330800 -21600 0 CST}
-    {2942640000 -18000 1 CDT}
-    {2960780400 -21600 0 CST}
-    {2974694400 -18000 1 CDT}
-    {2992230000 -21600 0 CST}
-    {3006144000 -18000 1 CDT}
-    {3023679600 -21600 0 CST}
-    {3037593600 -18000 1 CDT}
-    {3055734000 -21600 0 CST}
-    {3069043200 -18000 1 CDT}
-    {3087183600 -21600 0 CST}
-    {3100492800 -18000 1 CDT}
-    {3118633200 -21600 0 CST}
-    {3132547200 -18000 1 CDT}
-    {3150082800 -21600 0 CST}
-    {3163996800 -18000 1 CDT}
-    {3181532400 -21600 0 CST}
-    {3195446400 -18000 1 CDT}
-    {3212982000 -21600 0 CST}
-    {3226896000 -18000 1 CDT}
-    {3245036400 -21600 0 CST}
-    {3258345600 -18000 1 CDT}
-    {3276486000 -21600 0 CST}
-    {3289795200 -18000 1 CDT}
-    {3307935600 -21600 0 CST}
-    {3321849600 -18000 1 CDT}
-    {3339385200 -21600 0 CST}
-    {3353299200 -18000 1 CDT}
-    {3370834800 -21600 0 CST}
-    {3384748800 -18000 1 CDT}
-    {3402889200 -21600 0 CST}
-    {3416198400 -18000 1 CDT}
-    {3434338800 -21600 0 CST}
-    {3447648000 -18000 1 CDT}
-    {3465788400 -21600 0 CST}
-    {3479702400 -18000 1 CDT}
-    {3497238000 -21600 0 CST}
-    {3511152000 -18000 1 CDT}
-    {3528687600 -21600 0 CST}
-    {3542601600 -18000 1 CDT}
-    {3560137200 -21600 0 CST}
-    {3574051200 -18000 1 CDT}
-    {3592191600 -21600 0 CST}
-    {3605500800 -18000 1 CDT}
-    {3623641200 -21600 0 CST}
-    {3636950400 -18000 1 CDT}
-    {3655090800 -21600 0 CST}
-    {3669004800 -18000 1 CDT}
-    {3686540400 -21600 0 CST}
-    {3700454400 -18000 1 CDT}
-    {3717990000 -21600 0 CST}
-    {3731904000 -18000 1 CDT}
-    {3750044400 -21600 0 CST}
-    {3763353600 -18000 1 CDT}
-    {3781494000 -21600 0 CST}
-    {3794803200 -18000 1 CDT}
-    {3812943600 -21600 0 CST}
-    {3826252800 -18000 1 CDT}
-    {3844393200 -21600 0 CST}
-    {3858307200 -18000 1 CDT}
-    {3875842800 -21600 0 CST}
-    {3889756800 -18000 1 CDT}
-    {3907292400 -21600 0 CST}
-    {3921206400 -18000 1 CDT}
-    {3939346800 -21600 0 CST}
-    {3952656000 -18000 1 CDT}
-    {3970796400 -21600 0 CST}
-    {3984105600 -18000 1 CDT}
-    {4002246000 -21600 0 CST}
-    {4016160000 -18000 1 CDT}
-    {4033695600 -21600 0 CST}
-    {4047609600 -18000 1 CDT}
-    {4065145200 -21600 0 CST}
-    {4079059200 -18000 1 CDT}
-    {4096594800 -21600 0 CST}
 }
diff --git a/library/tzdata/America/Mexico_City b/library/tzdata/America/Mexico_City
index 66e273f..2a0a5a8 100644
--- a/library/tzdata/America/Mexico_City
+++ b/library/tzdata/America/Mexico_City
@@ -71,158 +71,4 @@ set TZData(:America/Mexico_City) {
     {1635663600 -21600 0 CST}
     {1648972800 -18000 1 CDT}
     {1667113200 -21600 0 CST}
-    {1680422400 -18000 1 CDT}
-    {1698562800 -21600 0 CST}
-    {1712476800 -18000 1 CDT}
-    {1730012400 -21600 0 CST}
-    {1743926400 -18000 1 CDT}
-    {1761462000 -21600 0 CST}
-    {1775376000 -18000 1 CDT}
-    {1792911600 -21600 0 CST}
-    {1806825600 -18000 1 CDT}
-    {1824966000 -21600 0 CST}
-    {1838275200 -18000 1 CDT}
-    {1856415600 -21600 0 CST}
-    {1869724800 -18000 1 CDT}
-    {1887865200 -21600 0 CST}
-    {1901779200 -18000 1 CDT}
-    {1919314800 -21600 0 CST}
-    {1933228800 -18000 1 CDT}
-    {1950764400 -21600 0 CST}
-    {1964678400 -18000 1 CDT}
-    {1982818800 -21600 0 CST}
-    {1996128000 -18000 1 CDT}
-    {2014268400 -21600 0 CST}
-    {2027577600 -18000 1 CDT}
-    {2045718000 -21600 0 CST}
-    {2059027200 -18000 1 CDT}
-    {2077167600 -21600 0 CST}
-    {2091081600 -18000 1 CDT}
-    {2108617200 -21600 0 CST}
-    {2122531200 -18000 1 CDT}
-    {2140066800 -21600 0 CST}
-    {2153980800 -18000 1 CDT}
-    {2172121200 -21600 0 CST}
-    {2185430400 -18000 1 CDT}
-    {2203570800 -21600 0 CST}
-    {2216880000 -18000 1 CDT}
-    {2235020400 -21600 0 CST}
-    {2248934400 -18000 1 CDT}
-    {2266470000 -21600 0 CST}
-    {2280384000 -18000 1 CDT}
-    {2297919600 -21600 0 CST}
-    {2311833600 -18000 1 CDT}
-    {2329369200 -21600 0 CST}
-    {2343283200 -18000 1 CDT}
-    {2361423600 -21600 0 CST}
-    {2374732800 -18000 1 CDT}
-    {2392873200 -21600 0 CST}
-    {2406182400 -18000 1 CDT}
-    {2424322800 -21600 0 CST}
-    {2438236800 -18000 1 CDT}
-    {2455772400 -21600 0 CST}
-    {2469686400 -18000 1 CDT}
-    {2487222000 -21600 0 CST}
-    {2501136000 -18000 1 CDT}
-    {2519276400 -21600 0 CST}
-    {2532585600 -18000 1 CDT}
-    {2550726000 -21600 0 CST}
-    {2564035200 -18000 1 CDT}
-    {2582175600 -21600 0 CST}
-    {2596089600 -18000 1 CDT}
-    {2613625200 -21600 0 CST}
-    {2627539200 -18000 1 CDT}
-    {2645074800 -21600 0 CST}
-    {2658988800 -18000 1 CDT}
-    {2676524400 -21600 0 CST}
-    {2690438400 -18000 1 CDT}
-    {2708578800 -21600 0 CST}
-    {2721888000 -18000 1 CDT}
-    {2740028400 -21600 0 CST}
-    {2753337600 -18000 1 CDT}
-    {2771478000 -21600 0 CST}
-    {2785392000 -18000 1 CDT}
-    {2802927600 -21600 0 CST}
-    {2816841600 -18000 1 CDT}
-    {2834377200 -21600 0 CST}
-    {2848291200 -18000 1 CDT}
-    {2866431600 -21600 0 CST}
-    {2879740800 -18000 1 CDT}
-    {2897881200 -21600 0 CST}
-    {2911190400 -18000 1 CDT}
-    {2929330800 -21600 0 CST}
-    {2942640000 -18000 1 CDT}
-    {2960780400 -21600 0 CST}
-    {2974694400 -18000 1 CDT}
-    {2992230000 -21600 0 CST}
-    {3006144000 -18000 1 CDT}
-    {3023679600 -21600 0 CST}
-    {3037593600 -18000 1 CDT}
-    {3055734000 -21600 0 CST}
-    {3069043200 -18000 1 CDT}
-    {3087183600 -21600 0 CST}
-    {3100492800 -18000 1 CDT}
-    {3118633200 -21600 0 CST}
-    {3132547200 -18000 1 CDT}
-    {3150082800 -21600 0 CST}
-    {3163996800 -18000 1 CDT}
-    {3181532400 -21600 0 CST}
-    {3195446400 -18000 1 CDT}
-    {3212982000 -21600 0 CST}
-    {3226896000 -18000 1 CDT}
-    {3245036400 -21600 0 CST}
-    {3258345600 -18000 1 CDT}
-    {3276486000 -21600 0 CST}
-    {3289795200 -18000 1 CDT}
-    {3307935600 -21600 0 CST}
-    {3321849600 -18000 1 CDT}
-    {3339385200 -21600 0 CST}
-    {3353299200 -18000 1 CDT}
-    {3370834800 -21600 0 CST}
-    {3384748800 -18000 1 CDT}
-    {3402889200 -21600 0 CST}
-    {3416198400 -18000 1 CDT}
-    {3434338800 -21600 0 CST}
-    {3447648000 -18000 1 CDT}
-    {3465788400 -21600 0 CST}
-    {3479702400 -18000 1 CDT}
-    {3497238000 -21600 0 CST}
-    {3511152000 -18000 1 CDT}
-    {3528687600 -21600 0 CST}
-    {3542601600 -18000 1 CDT}
-    {3560137200 -21600 0 CST}
-    {3574051200 -18000 1 CDT}
-    {3592191600 -21600 0 CST}
-    {3605500800 -18000 1 CDT}
-    {3623641200 -21600 0 CST}
-    {3636950400 -18000 1 CDT}
-    {3655090800 -21600 0 CST}
-    {3669004800 -18000 1 CDT}
-    {3686540400 -21600 0 CST}
-    {3700454400 -18000 1 CDT}
-    {3717990000 -21600 0 CST}
-    {3731904000 -18000 1 CDT}
-    {3750044400 -21600 0 CST}
-    {3763353600 -18000 1 CDT}
-    {3781494000 -21600 0 CST}
-    {3794803200 -18000 1 CDT}
-    {3812943600 -21600 0 CST}
-    {3826252800 -18000 1 CDT}
-    {3844393200 -21600 0 CST}
-    {3858307200 -18000 1 CDT}
-    {3875842800 -21600 0 CST}
-    {3889756800 -18000 1 CDT}
-    {3907292400 -21600 0 CST}
-    {3921206400 -18000 1 CDT}
-    {3939346800 -21600 0 CST}
-    {3952656000 -18000 1 CDT}
-    {3970796400 -21600 0 CST}
-    {3984105600 -18000 1 CDT}
-    {4002246000 -21600 0 CST}
-    {4016160000 -18000 1 CDT}
-    {4033695600 -21600 0 CST}
-    {4047609600 -18000 1 CDT}
-    {4065145200 -21600 0 CST}
-    {4079059200 -18000 1 CDT}
-    {4096594800 -21600 0 CST}
 }
diff --git a/library/tzdata/America/Monterrey b/library/tzdata/America/Monterrey
index 4135884..7471c6a 100644
--- a/library/tzdata/America/Monterrey
+++ b/library/tzdata/America/Monterrey
@@ -61,158 +61,4 @@ set TZData(:America/Monterrey) {
     {1635663600 -21600 0 CST}
     {1648972800 -18000 1 CDT}
     {1667113200 -21600 0 CST}
-    {1680422400 -18000 1 CDT}
-    {1698562800 -21600 0 CST}
-    {1712476800 -18000 1 CDT}
-    {1730012400 -21600 0 CST}
-    {1743926400 -18000 1 CDT}
-    {1761462000 -21600 0 CST}
-    {1775376000 -18000 1 CDT}
-    {1792911600 -21600 0 CST}
-    {1806825600 -18000 1 CDT}
-    {1824966000 -21600 0 CST}
-    {1838275200 -18000 1 CDT}
-    {1856415600 -21600 0 CST}
-    {1869724800 -18000 1 CDT}
-    {1887865200 -21600 0 CST}
-    {1901779200 -18000 1 CDT}
-    {1919314800 -21600 0 CST}
-    {1933228800 -18000 1 CDT}
-    {1950764400 -21600 0 CST}
-    {1964678400 -18000 1 CDT}
-    {1982818800 -21600 0 CST}
-    {1996128000 -18000 1 CDT}
-    {2014268400 -21600 0 CST}
-    {2027577600 -18000 1 CDT}
-    {2045718000 -21600 0 CST}
-    {2059027200 -18000 1 CDT}
-    {2077167600 -21600 0 CST}
-    {2091081600 -18000 1 CDT}
-    {2108617200 -21600 0 CST}
-    {2122531200 -18000 1 CDT}
-    {2140066800 -21600 0 CST}
-    {2153980800 -18000 1 CDT}
-    {2172121200 -21600 0 CST}
-    {2185430400 -18000 1 CDT}
-    {2203570800 -21600 0 CST}
-    {2216880000 -18000 1 CDT}
-    {2235020400 -21600 0 CST}
-    {2248934400 -18000 1 CDT}
-    {2266470000 -21600 0 CST}
-    {2280384000 -18000 1 CDT}
-    {2297919600 -21600 0 CST}
-    {2311833600 -18000 1 CDT}
-    {2329369200 -21600 0 CST}
-    {2343283200 -18000 1 CDT}
-    {2361423600 -21600 0 CST}
-    {2374732800 -18000 1 CDT}
-    {2392873200 -21600 0 CST}
-    {2406182400 -18000 1 CDT}
-    {2424322800 -21600 0 CST}
-    {2438236800 -18000 1 CDT}
-    {2455772400 -21600 0 CST}
-    {2469686400 -18000 1 CDT}
-    {2487222000 -21600 0 CST}
-    {2501136000 -18000 1 CDT}
-    {2519276400 -21600 0 CST}
-    {2532585600 -18000 1 CDT}
-    {2550726000 -21600 0 CST}
-    {2564035200 -18000 1 CDT}
-    {2582175600 -21600 0 CST}
-    {2596089600 -18000 1 CDT}
-    {2613625200 -21600 0 CST}
-    {2627539200 -18000 1 CDT}
-    {2645074800 -21600 0 CST}
-    {2658988800 -18000 1 CDT}
-    {2676524400 -21600 0 CST}
-    {2690438400 -18000 1 CDT}
-    {2708578800 -21600 0 CST}
-    {2721888000 -18000 1 CDT}
-    {2740028400 -21600 0 CST}
-    {2753337600 -18000 1 CDT}
-    {2771478000 -21600 0 CST}
-    {2785392000 -18000 1 CDT}
-    {2802927600 -21600 0 CST}
-    {2816841600 -18000 1 CDT}
-    {2834377200 -21600 0 CST}
-    {2848291200 -18000 1 CDT}
-    {2866431600 -21600 0 CST}
-    {2879740800 -18000 1 CDT}
-    {2897881200 -21600 0 CST}
-    {2911190400 -18000 1 CDT}
-    {2929330800 -21600 0 CST}
-    {2942640000 -18000 1 CDT}
-    {2960780400 -21600 0 CST}
-    {2974694400 -18000 1 CDT}
-    {2992230000 -21600 0 CST}
-    {3006144000 -18000 1 CDT}
-    {3023679600 -21600 0 CST}
-    {3037593600 -18000 1 CDT}
-    {3055734000 -21600 0 CST}
-    {3069043200 -18000 1 CDT}
-    {3087183600 -21600 0 CST}
-    {3100492800 -18000 1 CDT}
-    {3118633200 -21600 0 CST}
-    {3132547200 -18000 1 CDT}
-    {3150082800 -21600 0 CST}
-    {3163996800 -18000 1 CDT}
-    {3181532400 -21600 0 CST}
-    {3195446400 -18000 1 CDT}
-    {3212982000 -21600 0 CST}
-    {3226896000 -18000 1 CDT}
-    {3245036400 -21600 0 CST}
-    {3258345600 -18000 1 CDT}
-    {3276486000 -21600 0 CST}
-    {3289795200 -18000 1 CDT}
-    {3307935600 -21600 0 CST}
-    {3321849600 -18000 1 CDT}
-    {3339385200 -21600 0 CST}
-    {3353299200 -18000 1 CDT}
-    {3370834800 -21600 0 CST}
-    {3384748800 -18000 1 CDT}
-    {3402889200 -21600 0 CST}
-    {3416198400 -18000 1 CDT}
-    {3434338800 -21600 0 CST}
-    {3447648000 -18000 1 CDT}
-    {3465788400 -21600 0 CST}
-    {3479702400 -18000 1 CDT}
-    {3497238000 -21600 0 CST}
-    {3511152000 -18000 1 CDT}
-    {3528687600 -21600 0 CST}
-    {3542601600 -18000 1 CDT}
-    {3560137200 -21600 0 CST}
-    {3574051200 -18000 1 CDT}
-    {3592191600 -21600 0 CST}
-    {3605500800 -18000 1 CDT}
-    {3623641200 -21600 0 CST}
-    {3636950400 -18000 1 CDT}
-    {3655090800 -21600 0 CST}
-    {3669004800 -18000 1 CDT}
-    {3686540400 -21600 0 CST}
-    {3700454400 -18000 1 CDT}
-    {3717990000 -21600 0 CST}
-    {3731904000 -18000 1 CDT}
-    {3750044400 -21600 0 CST}
-    {3763353600 -18000 1 CDT}
-    {3781494000 -21600 0 CST}
-    {3794803200 -18000 1 CDT}
-    {3812943600 -21600 0 CST}
-    {3826252800 -18000 1 CDT}
-    {3844393200 -21600 0 CST}
-    {3858307200 -18000 1 CDT}
-    {3875842800 -21600 0 CST}
-    {3889756800 -18000 1 CDT}
-    {3907292400 -21600 0 CST}
-    {3921206400 -18000 1 CDT}
-    {3939346800 -21600 0 CST}
-    {3952656000 -18000 1 CDT}
-    {3970796400 -21600 0 CST}
-    {3984105600 -18000 1 CDT}
-    {4002246000 -21600 0 CST}
-    {4016160000 -18000 1 CDT}
-    {4033695600 -21600 0 CST}
-    {4047609600 -18000 1 CDT}
-    {4065145200 -21600 0 CST}
-    {4079059200 -18000 1 CDT}
-    {4096594800 -21600 0 CST}
 }
diff --git a/library/tzdata/America/Nipigon b/library/tzdata/America/Nipigon
index 30690aa..785a3a3 100644
--- a/library/tzdata/America/Nipigon
+++ b/library/tzdata/America/Nipigon
@@ -1,264 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Nipigon) {
-    {-9223372036854775808 -21184 0 LMT}
-    {-2366734016 -18000 0 EST}
-    {-1632070800 -14400 1 EDT}
-    {-1615140000 -18000 0 EST}
-    {-923252400 -14400 1 EDT}
-    {-880218000 -14400 0 EWT}
-    {-769395600 -14400 1 EPT}
-    {-765396000 -18000 0 EST}
-    {136364400 -14400 1 EDT}
-    {152085600 -18000 0 EST}
-    {167814000 -14400 1 EDT}
-    {183535200 -18000 0 EST}
-    {199263600 -14400 1 EDT}
-    {215589600 -18000 0 EST}
-    {230713200 -14400 1 EDT}
-    {247039200 -18000 0 EST}
-    {262767600 -14400 1 EDT}
-    {278488800 -18000 0 EST}
-    {294217200 -14400 1 EDT}
-    {309938400 -18000 0 EST}
-    {325666800 -14400 1 EDT}
-    {341388000 -18000 0 EST}
-    {357116400 -14400 1 EDT}
-    {372837600 -18000 0 EST}
-    {388566000 -14400 1 EDT}
-    {404892000 -18000 0 EST}
-    {420015600 -14400 1 EDT}
-    {436341600 -18000 0 EST}
-    {452070000 -14400 1 EDT}
-    {467791200 -18000 0 EST}
-    {483519600 -14400 1 EDT}
-    {499240800 -18000 0 EST}
-    {514969200 -14400 1 EDT}
-    {530690400 -18000 0 EST}
-    {544604400 -14400 1 EDT}
-    {562140000 -18000 0 EST}
-    {576054000 -14400 1 EDT}
-    {594194400 -18000 0 EST}
-    {607503600 -14400 1 EDT}
-    {625644000 -18000 0 EST}
-    {638953200 -14400 1 EDT}
-    {657093600 -18000 0 EST}
-    {671007600 -14400 1 EDT}
-    {688543200 -18000 0 EST}
-    {702457200 -14400 1 EDT}
-    {719992800 -18000 0 EST}
-    {733906800 -14400 1 EDT}
-    {752047200 -18000 0 EST}
-    {765356400 -14400 1 EDT}
-    {783496800 -18000 0 EST}
-    {796806000 -14400 1 EDT}
-    {814946400 -18000 0 EST}
-    {828860400 -14400 1 EDT}
-    {846396000 -18000 0 EST}
-    {860310000 -14400 1 EDT}
-    {877845600 -18000 0 EST}
-    {891759600 -14400 1 EDT}
-    {909295200 -18000 0 EST}
-    {923209200 -14400 1 EDT}
-    {941349600 -18000 0 EST}
-    {954658800 -14400 1 EDT}
-    {972799200 -18000 0 EST}
-    {986108400 -14400 1 EDT}
-    {1004248800 -18000 0 EST}
-    {1018162800 -14400 1 EDT}
-    {1035698400 -18000 0 EST}
-    {1049612400 -14400 1 EDT}
-    {1067148000 -18000 0 EST}
-    {1081062000 -14400 1 EDT}
-    {1099202400 -18000 0 EST}
-    {1112511600 -14400 1 EDT}
-    {1130652000 -18000 0 EST}
-    {1143961200 -14400 1 EDT}
-    {1162101600 -18000 0 EST}
-    {1173596400 -14400 1 EDT}
-    {1194156000 -18000 0 EST}
-    {1205046000 -14400 1 EDT}
-    {1225605600 -18000 0 EST}
-    {1236495600 -14400 1 EDT}
-    {1257055200 -18000 0 EST}
-    {1268550000 -14400 1 EDT}
-    {1289109600 -18000 0 EST}
-    {1299999600 -14400 1 EDT}
-    {1320559200 -18000 0 EST}
-    {1331449200 -14400 1 EDT}
-    {1352008800 -18000 0 EST}
-    {1362898800 -14400 1 EDT}
-    {1383458400 -18000 0 EST}
-    {1394348400 -14400 1 EDT}
-    {1414908000 -18000 0 EST}
-    {1425798000 -14400 1 EDT}
-    {1446357600 -18000 0 EST}
-    {1457852400 -14400 1 EDT}
-    {1478412000 -18000 0 EST}
-    {1489302000 -14400 1 EDT}
-    {1509861600 -18000 0 EST}
-    {1520751600 -14400 1 EDT}
-    {1541311200 -18000 0 EST}
-    {1552201200 -14400 1 EDT}
-    {1572760800 -18000 0 EST}
-    {1583650800 -14400 1 EDT}
-    {1604210400 -18000 0 EST}
-    {1615705200 -14400 1 EDT}
-    {1636264800 -18000 0 EST}
-    {1647154800 -14400 1 EDT}
-    {1667714400 -18000 0 EST}
-    {1678604400 -14400 1 EDT}
-    {1699164000 -18000 0 EST}
-    {1710054000 -14400 1 EDT}
-    {1730613600 -18000 0 EST}
-    {1741503600 -14400 1 EDT}
-    {1762063200 -18000 0 EST}
-    {1772953200 -14400 1 EDT}
-    {1793512800 -18000 0 EST}
-    {1805007600 -14400 1 EDT}
-    {1825567200 -18000 0 EST}
-    {1836457200 -14400 1 EDT}
-    {1857016800 -18000 0 EST}
-    {1867906800 -14400 1 EDT}
-    {1888466400 -18000 0 EST}
-    {1899356400 -14400 1 EDT}
-    {1919916000 -18000 0 EST}
-    {1930806000 -14400 1 EDT}
-    {1951365600 -18000 0 EST}
-    {1962860400 -14400 1 EDT}
-    {1983420000 -18000 0 EST}
-    {1994310000 -14400 1 EDT}
-    {2014869600 -18000 0 EST}
-    {2025759600 -14400 1 EDT}
-    {2046319200 -18000 0 EST}
-    {2057209200 -14400 1 EDT}
-    {2077768800 -18000 0 EST}
-    {2088658800 -14400 1 EDT}
-    {2109218400 -18000 0 EST}
-    {2120108400 -14400 1 EDT}
-    {2140668000 -18000 0 EST}
-    {2152162800 -14400 1 EDT}
-    {2172722400 -18000 0 EST}
-    {2183612400 -14400 1 EDT}
-    {2204172000 -18000 0 EST}
-    {2215062000 -14400 1 EDT}
-    {2235621600 -18000 0 EST}
-    {2246511600 -14400 1 EDT}
-    {2267071200 -18000 0 EST}
-    {2277961200 -14400 1 EDT}
-    {2298520800 -18000 0 EST}
-    {2309410800 -14400 1 EDT}
-    {2329970400 -18000 0 EST}
-    {2341465200 -14400 1 EDT}
-    {2362024800 -18000 0 EST}
-    {2372914800 -14400 1 EDT}
-    {2393474400 -18000 0 EST}
-    {2404364400 -14400 1 EDT}
-    {2424924000 -18000 0 EST}
-    {2435814000 -14400 1 EDT}
-    {2456373600 -18000 0 EST}
-    {2467263600 -14400 1 EDT}
-    {2487823200 -18000 0 EST}
-    {2499318000 -14400 1 EDT}
-    {2519877600 -18000 0 EST}
-    {2530767600 -14400 1 EDT}
-    {2551327200 -18000 0 EST}
-    {2562217200 -14400 1 EDT}
-    {2582776800 -18000 0 EST}
-    {2593666800 -14400 1 EDT}
-    {2614226400 -18000 0 EST}
-    {2625116400 -14400 1 EDT}
-    {2645676000 -18000 0 EST}
-    {2656566000 -14400 1 EDT}
-    {2677125600 -18000 0 EST}
-    {2688620400 -14400 1 EDT}
-    {2709180000 -18000 0 EST}
-    {2720070000 -14400 1 EDT}
-    {2740629600 -18000 0 EST}
-    {2751519600 -14400 1 EDT}
-    {2772079200 -18000 0 EST}
-    {2782969200 -14400 1 EDT}
-    {2803528800 -18000 0 EST}
-    {2814418800 -14400 1 EDT}
-    {2834978400 -18000 0 EST}
-    {2846473200 -14400 1 EDT}
-    {2867032800 -18000 0 EST}
-    {2877922800 -14400 1 EDT}
-    {2898482400 -18000 0 EST}
-    {2909372400 -14400 1 EDT}
-    {2929932000 -18000 0 EST}
-    {2940822000 -14400 1 EDT}
-    {2961381600 -18000 0 EST}
-    {2972271600 -14400 1 EDT}
-    {2992831200 -18000 0 EST}
-    {3003721200 -14400 1 EDT}
-    {3024280800 -18000 0 EST}
-    {3035775600 -14400 1 EDT}
-    {3056335200 -18000 0 EST}
-    {3067225200 -14400 1 EDT}
-    {3087784800 -18000 0 EST}
-    {3098674800 -14400 1 EDT}
-    {3119234400 -18000 0 EST}
-    {3130124400 -14400 1 EDT}
-    {3150684000 -18000 0 EST}
-    {3161574000 -14400 1 EDT}
-    {3182133600 -18000 0 EST}
-    {3193023600 -14400 1 EDT}
-    {3213583200 -18000 0 EST}
-    {3225078000 -14400 1 EDT}
-    {3245637600 -18000 0 EST}
-    {3256527600 -14400 1 EDT}
-    {3277087200 -18000 0 EST}
-    {3287977200 -14400 1 EDT}
-    {3308536800 -18000 0 EST}
-    {3319426800 -14400 1 EDT}
-    {3339986400 -18000 0 EST}
-    {3350876400 -14400 1 EDT}
-    {3371436000 -18000 0 EST}
-    {3382930800 -14400 1 EDT}
-    {3403490400 -18000 0 EST}
-    {3414380400 -14400 1 EDT}
-    {3434940000 -18000 0 EST}
-    {3445830000 -14400 1 EDT}
-    {3466389600 -18000 0 EST}
-    {3477279600 -14400 1 EDT}
-    {3497839200 -18000 0 EST}
-    {3508729200 -14400 1 EDT}
-    {3529288800 -18000 0 EST}
-    {3540178800 -14400 1 EDT}
-    {3560738400 -18000 0 EST}
-    {3572233200 -14400 1 EDT}
-    {3592792800 -18000 0 EST}
-    {3603682800 -14400 1 EDT}
-    {3624242400 -18000 0 EST}
-    {3635132400 -14400 1 EDT}
-    {3655692000 -18000 0 EST}
-    {3666582000 -14400 1 EDT}
-    {3687141600 -18000 0 EST}
-    {3698031600 -14400 1 EDT}
-    {3718591200 -18000 0 EST}
-    {3730086000 -14400 1 EDT}
-    {3750645600 -18000 0 EST}
-    {3761535600 -14400 1 EDT}
-    {3782095200 -18000 0 EST}
-    {3792985200 -14400 1 EDT}
-    {3813544800 -18000 0 EST}
-    {3824434800 -14400 1 EDT}
-    {3844994400 -18000 0 EST}
-    {3855884400 -14400 1 EDT}
-    {3876444000 -18000 0 EST}
-    {3887334000 -14400 1 EDT}
-    {3907893600 -18000 0 EST}
-    {3919388400 -14400 1 EDT}
-    {3939948000 -18000 0 EST}
-    {3950838000 -14400 1 EDT}
-    {3971397600 -18000 0 EST}
-    {3982287600 -14400 1 EDT}
-    {4002847200 -18000 0 EST}
-    {4013737200 -14400 1 EDT}
-    {4034296800 -18000 0 EST}
-    {4045186800 -14400 1 EDT}
-    {4065746400 -18000 0 EST}
-    {4076636400 -14400 1 EDT}
-    {4097196000 -18000 0 EST}
+if {![info exists TZData(America/Toronto)]} {
+    LoadTimeZoneFile America/Toronto
 }
+set TZData(:America/Nipigon) $TZData(:America/Toronto)
diff --git a/library/tzdata/America/Ojinaga b/library/tzdata/America/Ojinaga
index c01cfde..7102f73 100644
--- a/library/tzdata/America/Ojinaga
+++ b/library/tzdata/America/Ojinaga
@@ -64,159 +64,5 @@ set TZData(:America/Ojinaga) {
     {1615712400 -21600 1 MDT}
     {1636272000 -25200 0 MST}
     {1647162000 -21600 1 MDT}
-    {1667721600 -25200 0 MST}
-    {1678611600 -21600 1 MDT}
-    {1699171200 -25200 0 MST}
-    {1710061200 -21600 1 MDT}
-    {1730620800 -25200 0 MST}
-    {1741510800 -21600 1 MDT}
-    {1762070400 -25200 0 MST}
-    {1772960400 -21600 1 MDT}
-    {1793520000 -25200 0 MST}
-    {1805014800 -21600 1 MDT}
-    {1825574400 -25200 0 MST}
-    {1836464400 -21600 1 MDT}
-    {1857024000 -25200 0 MST}
-    {1867914000 -21600 1 MDT}
-    {1888473600 -25200 0 MST}
-    {1899363600 -21600 1 MDT}
-    {1919923200 -25200 0 MST}
-    {1930813200 -21600 1 MDT}
-    {1951372800 -25200 0 MST}
-    {1962867600 -21600 1 MDT}
-    {1983427200 -25200 0 MST}
-    {1994317200 -21600 1 MDT}
-    {2014876800 -25200 0 MST}
-    {2025766800 -21600 1 MDT}
-    {2046326400 -25200 0 MST}
-    {2057216400 -21600 1 MDT}
-    {2077776000 -25200 0 MST}
-    {2088666000 -21600 1 MDT}
-    {2109225600 -25200 0 MST}
-    {2120115600 -21600 1 MDT}
-    {2140675200 -25200 0 MST}
-    {2152170000 -21600 1 MDT}
-    {2172729600 -25200 0 MST}
-    {2183619600 -21600 1 MDT}
-    {2204179200 -25200 0 MST}
-    {2215069200 -21600 1 MDT}
-    {2235628800 -25200 0 MST}
-    {2246518800 -21600 1 MDT}
-    {2267078400 -25200 0 MST}
-    {2277968400 -21600 1 MDT}
-    {2298528000 -25200 0 MST}
-    {2309418000 -21600 1 MDT}
-    {2329977600 -25200 0 MST}
-    {2341472400 -21600 1 MDT}
-    {2362032000 -25200 0 MST}
-    {2372922000 -21600 1 MDT}
-    {2393481600 -25200 0 MST}
-    {2404371600 -21600 1 MDT}
-    {2424931200 -25200 0 MST}
-    {2435821200 -21600 1 MDT}
-    {2456380800 -25200 0 MST}
-    {2467270800 -21600 1 MDT}
-    {2487830400 -25200 0 MST}
-    {2499325200 -21600 1 MDT}
-    {2519884800 -25200 0 MST}
-    {2530774800 -21600 1 MDT}
-    {2551334400 -25200 0 MST}
-    {2562224400 -21600 1 MDT}
-    {2582784000 -25200 0 MST}
-    {2593674000 -21600 1 MDT}
-    {2614233600 -25200 0 MST}
-    {2625123600 -21600 1 MDT}
-    {2645683200 -25200 0 MST}
-    {2656573200 -21600 1 MDT}
-    {2677132800 -25200 0 MST}
-    {2688627600 -21600 1 MDT}
-    {2709187200 -25200 0 MST}
-    {2720077200 -21600 1 MDT}
-    {2740636800 -25200 0 MST}
-    {2751526800 -21600 1 MDT}
-    {2772086400 -25200 0 MST}
-    {2782976400 -21600 1 MDT}
-    {2803536000 -25200 0 MST}
-    {2814426000 -21600 1 MDT}
-    {2834985600 -25200 0 MST}
-    {2846480400 -21600 1 MDT}
-    {2867040000 -25200 0 MST}
-    {2877930000 -21600 1 MDT}
-    {2898489600 -25200 0 MST}
-    {2909379600 -21600 1 MDT}
-    {2929939200 -25200 0 MST}
-    {2940829200 -21600 1 MDT}
-    {2961388800 -25200 0 MST}
-    {2972278800 -21600 1 MDT}
-    {2992838400 -25200 0 MST}
-    {3003728400 -21600 1 MDT}
-    {3024288000 -25200 0 MST}
-    {3035782800 -21600 1 MDT}
-    {3056342400 -25200 0 MST}
-    {3067232400 -21600 1 MDT}
-    {3087792000 -25200 0 MST}
-    {3098682000 -21600 1 MDT}
-    {3119241600 -25200 0 MST}
-    {3130131600 -21600 1 MDT}
-    {3150691200 -25200 0 MST}
-    {3161581200 -21600 1 MDT}
-    {3182140800 -25200 0 MST}
-    {3193030800 -21600 1 MDT}
-    {3213590400 -25200 0 MST}
-    {3225085200 -21600 1 MDT}
-    {3245644800 -25200 0 MST}
-    {3256534800 -21600 1 MDT}
-    {3277094400 -25200 0 MST}
-    {3287984400 -21600 1 MDT}
-    {3308544000 -25200 0 MST}
-    {3319434000 -21600 1 MDT}
-    {3339993600 -25200 0 MST}
-    {3350883600 -21600 1 MDT}
-    {3371443200 -25200 0 MST}
-    {3382938000 -21600 1 MDT}
-    {3403497600 -25200 0 MST}
-    {3414387600 -21600 1 MDT}
-    {3434947200 -25200 0 MST}
-    {3445837200 -21600 1 MDT}
-    {3466396800 -25200 0 MST}
-    {3477286800 -21600 1 MDT}
-    {3497846400 -25200 0 MST}
-    {3508736400 -21600 1 MDT}
-    {3529296000 -25200 0 MST}
-    {3540186000 -21600 1 MDT}
-    {3560745600 -25200 0 MST}
-    {3572240400 -21600 1 MDT}
-    {3592800000 -25200 0 MST}
-    {3603690000 -21600 1 MDT}
-    {3624249600 -25200 0 MST}
-    {3635139600 -21600 1 MDT}
-    {3655699200 -25200 0 MST}
-    {3666589200 -21600 1 MDT}
-    {3687148800 -25200 0 MST}
-    {3698038800 -21600 1 MDT}
-    {3718598400 -25200 0 MST}
-    {3730093200 -21600 1 MDT}
-    {3750652800 -25200 0 MST}
-    {3761542800 -21600 1 MDT}
-    {3782102400 -25200 0 MST}
-    {3792992400 -21600 1 MDT}
-    {3813552000 -25200 0 MST}
-    {3824442000 -21600 1 MDT}
-    {3845001600 -25200 0 MST}
-    {3855891600 -21600 1 MDT}
-    {3876451200 -25200 0 MST}
-    {3887341200 -21600 1 MDT}
-    {3907900800 -25200 0 MST}
-    {3919395600 -21600 1 MDT}
-    {3939955200 -25200 0 MST}
-    {3950845200 -21600 1 MDT}
-    {3971404800 -25200 0 MST}
-    {3982294800 -21600 1 MDT}
-    {4002854400 -25200 0 MST}
-    {4013744400 -21600 1 MDT}
-    {4034304000 -25200 0 MST}
-    {4045194000 -21600 1 MDT}
-    {4065753600 -25200 0 MST}
-    {4076643600 -21600 1 MDT}
-    {4097203200 -25200 0 MST}
+    {1667120400 -21600 0 CST}
 }
diff --git a/library/tzdata/America/Rainy_River b/library/tzdata/America/Rainy_River
index a2b11aa..17fccb4 100644
--- a/library/tzdata/America/Rainy_River
+++ b/library/tzdata/America/Rainy_River
@@ -1,264 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Rainy_River) {
-    {-9223372036854775808 -22696 0 LMT}
-    {-2366732504 -21600 0 CST}
-    {-1632067200 -18000 1 CDT}
-    {-1615136400 -21600 0 CST}
-    {-923248800 -18000 1 CDT}
-    {-880214400 -18000 0 CWT}
-    {-769395600 -18000 1 CPT}
-    {-765392400 -21600 0 CST}
-    {136368000 -18000 1 CDT}
-    {152089200 -21600 0 CST}
-    {167817600 -18000 1 CDT}
-    {183538800 -21600 0 CST}
-    {199267200 -18000 1 CDT}
-    {215593200 -21600 0 CST}
-    {230716800 -18000 1 CDT}
-    {247042800 -21600 0 CST}
-    {262771200 -18000 1 CDT}
-    {278492400 -21600 0 CST}
-    {294220800 -18000 1 CDT}
-    {309942000 -21600 0 CST}
-    {325670400 -18000 1 CDT}
-    {341391600 -21600 0 CST}
-    {357120000 -18000 1 CDT}
-    {372841200 -21600 0 CST}
-    {388569600 -18000 1 CDT}
-    {404895600 -21600 0 CST}
-    {420019200 -18000 1 CDT}
-    {436345200 -21600 0 CST}
-    {452073600 -18000 1 CDT}
-    {467794800 -21600 0 CST}
-    {483523200 -18000 1 CDT}
-    {499244400 -21600 0 CST}
-    {514972800 -18000 1 CDT}
-    {530694000 -21600 0 CST}
-    {544608000 -18000 1 CDT}
-    {562143600 -21600 0 CST}
-    {576057600 -18000 1 CDT}
-    {594198000 -21600 0 CST}
-    {607507200 -18000 1 CDT}
-    {625647600 -21600 0 CST}
-    {638956800 -18000 1 CDT}
-    {657097200 -21600 0 CST}
-    {671011200 -18000 1 CDT}
-    {688546800 -21600 0 CST}
-    {702460800 -18000 1 CDT}
-    {719996400 -21600 0 CST}
-    {733910400 -18000 1 CDT}
-    {752050800 -21600 0 CST}
-    {765360000 -18000 1 CDT}
-    {783500400 -21600 0 CST}
-    {796809600 -18000 1 CDT}
-    {814950000 -21600 0 CST}
-    {828864000 -18000 1 CDT}
-    {846399600 -21600 0 CST}
-    {860313600 -18000 1 CDT}
-    {877849200 -21600 0 CST}
-    {891763200 -18000 1 CDT}
-    {909298800 -21600 0 CST}
-    {923212800 -18000 1 CDT}
-    {941353200 -21600 0 CST}
-    {954662400 -18000 1 CDT}
-    {972802800 -21600 0 CST}
-    {986112000 -18000 1 CDT}
-    {1004252400 -21600 0 CST}
-    {1018166400 -18000 1 CDT}
-    {1035702000 -21600 0 CST}
-    {1049616000 -18000 1 CDT}
-    {1067151600 -21600 0 CST}
-    {1081065600 -18000 1 CDT}
-    {1099206000 -21600 0 CST}
-    {1112515200 -18000 1 CDT}
-    {1130655600 -21600 0 CST}
-    {1143964800 -18000 1 CDT}
-    {1162105200 -21600 0 CST}
-    {1173600000 -18000 1 CDT}
-    {1194159600 -21600 0 CST}
-    {1205049600 -18000 1 CDT}
-    {1225609200 -21600 0 CST}
-    {1236499200 -18000 1 CDT}
-    {1257058800 -21600 0 CST}
-    {1268553600 -18000 1 CDT}
-    {1289113200 -21600 0 CST}
-    {1300003200 -18000 1 CDT}
-    {1320562800 -21600 0 CST}
-    {1331452800 -18000 1 CDT}
-    {1352012400 -21600 0 CST}
-    {1362902400 -18000 1 CDT}
-    {1383462000 -21600 0 CST}
-    {1394352000 -18000 1 CDT}
-    {1414911600 -21600 0 CST}
-    {1425801600 -18000 1 CDT}
-    {1446361200 -21600 0 CST}
-    {1457856000 -18000 1 CDT}
-    {1478415600 -21600 0 CST}
-    {1489305600 -18000 1 CDT}
-    {1509865200 -21600 0 CST}
-    {1520755200 -18000 1 CDT}
-    {1541314800 -21600 0 CST}
-    {1552204800 -18000 1 CDT}
-    {1572764400 -21600 0 CST}
-    {1583654400 -18000 1 CDT}
-    {1604214000 -21600 0 CST}
-    {1615708800 -18000 1 CDT}
-    {1636268400 -21600 0 CST}
-    {1647158400 -18000 1 CDT}
-    {1667718000 -21600 0 CST}
-    {1678608000 -18000 1 CDT}
-    {1699167600 -21600 0 CST}
-    {1710057600 -18000 1 CDT}
-    {1730617200 -21600 0 CST}
-    {1741507200 -18000 1 CDT}
-    {1762066800 -21600 0 CST}
-    {1772956800 -18000 1 CDT}
-    {1793516400 -21600 0 CST}
-    {1805011200 -18000 1 CDT}
-    {1825570800 -21600 0 CST}
-    {1836460800 -18000 1 CDT}
-    {1857020400 -21600 0 CST}
-    {1867910400 -18000 1 CDT}
-    {1888470000 -21600 0 CST}
-    {1899360000 -18000 1 CDT}
-    {1919919600 -21600 0 CST}
-    {1930809600 -18000 1 CDT}
-    {1951369200 -21600 0 CST}
-    {1962864000 -18000 1 CDT}
-    {1983423600 -21600 0 CST}
-    {1994313600 -18000 1 CDT}
-    {2014873200 -21600 0 CST}
-    {2025763200 -18000 1 CDT}
-    {2046322800 -21600 0 CST}
-    {2057212800 -18000 1 CDT}
-    {2077772400 -21600 0 CST}
-    {2088662400 -18000 1 CDT}
-    {2109222000 -21600 0 CST}
-    {2120112000 -18000 1 CDT}
-    {2140671600 -21600 0 CST}
-    {2152166400 -18000 1 CDT}
-    {2172726000 -21600 0 CST}
-    {2183616000 -18000 1 CDT}
-    {2204175600 -21600 0 CST}
-    {2215065600 -18000 1 CDT}
-    {2235625200 -21600 0 CST}
-    {2246515200 -18000 1 CDT}
-    {2267074800 -21600 0 CST}
-    {2277964800 -18000 1 CDT}
-    {2298524400 -21600 0 CST}
-    {2309414400 -18000 1 CDT}
-    {2329974000 -21600 0 CST}
-    {2341468800 -18000 1 CDT}
-    {2362028400 -21600 0 CST}
-    {2372918400 -18000 1 CDT}
-    {2393478000 -21600 0 CST}
-    {2404368000 -18000 1 CDT}
-    {2424927600 -21600 0 CST}
-    {2435817600 -18000 1 CDT}
-    {2456377200 -21600 0 CST}
-    {2467267200 -18000 1 CDT}
-    {2487826800 -21600 0 CST}
-    {2499321600 -18000 1 CDT}
-    {2519881200 -21600 0 CST}
-    {2530771200 -18000 1 CDT}
-    {2551330800 -21600 0 CST}
-    {2562220800 -18000 1 CDT}
-    {2582780400 -21600 0 CST}
-    {2593670400 -18000 1 CDT}
-    {2614230000 -21600 0 CST}
-    {2625120000 -18000 1 CDT}
-    {2645679600 -21600 0 CST}
-    {2656569600 -18000 1 CDT}
-    {2677129200 -21600 0 CST}
-    {2688624000 -18000 1 CDT}
-    {2709183600 -21600 0 CST}
-    {2720073600 -18000 1 CDT}
-    {2740633200 -21600 0 CST}
-    {2751523200 -18000 1 CDT}
-    {2772082800 -21600 0 CST}
-    {2782972800 -18000 1 CDT}
-    {2803532400 -21600 0 CST}
-    {2814422400 -18000 1 CDT}
-    {2834982000 -21600 0 CST}
-    {2846476800 -18000 1 CDT}
-    {2867036400 -21600 0 CST}
-    {2877926400 -18000 1 CDT}
-    {2898486000 -21600 0 CST}
-    {2909376000 -18000 1 CDT}
-    {2929935600 -21600 0 CST}
-    {2940825600 -18000 1 CDT}
-    {2961385200 -21600 0 CST}
-    {2972275200 -18000 1 CDT}
-    {2992834800 -21600 0 CST}
-    {3003724800 -18000 1 CDT}
-    {3024284400 -21600 0 CST}
-    {3035779200 -18000 1 CDT}
-    {3056338800 -21600 0 CST}
-    {3067228800 -18000 1 CDT}
-    {3087788400 -21600 0 CST}
-    {3098678400 -18000 1 CDT}
-    {3119238000 -21600 0 CST}
-    {3130128000 -18000 1 CDT}
-    {3150687600 -21600 0 CST}
-    {3161577600 -18000 1 CDT}
-    {3182137200 -21600 0 CST}
-    {3193027200 -18000 1 CDT}
-    {3213586800 -21600 0 CST}
-    {3225081600 -18000 1 CDT}
-    {3245641200 -21600 0 CST}
-    {3256531200 -18000 1 CDT}
-    {3277090800 -21600 0 CST}
-    {3287980800 -18000 1 CDT}
-    {3308540400 -21600 0 CST}
-    {3319430400 -18000 1 CDT}
-    {3339990000 -21600 0 CST}
-    {3350880000 -18000 1 CDT}
-    {3371439600 -21600 0 CST}
-    {3382934400 -18000 1 CDT}
-    {3403494000 -21600 0 CST}
-    {3414384000 -18000 1 CDT}
-    {3434943600 -21600 0 CST}
-    {3445833600 -18000 1 CDT}
-    {3466393200 -21600 0 CST}
-    {3477283200 -18000 1 CDT}
-    {3497842800 -21600 0 CST}
-    {3508732800 -18000 1 CDT}
-    {3529292400 -21600 0 CST}
-    {3540182400 -18000 1 CDT}
-    {3560742000 -21600 0 CST}
-    {3572236800 -18000 1 CDT}
-    {3592796400 -21600 0 CST}
-    {3603686400 -18000 1 CDT}
-    {3624246000 -21600 0 CST}
-    {3635136000 -18000 1 CDT}
-    {3655695600 -21600 0 CST}
-    {3666585600 -18000 1 CDT}
-    {3687145200 -21600 0 CST}
-    {3698035200 -18000 1 CDT}
-    {3718594800 -21600 0 CST}
-    {3730089600 -18000 1 CDT}
-    {3750649200 -21600 0 CST}
-    {3761539200 -18000 1 CDT}
-    {3782098800 -21600 0 CST}
-    {3792988800 -18000 1 CDT}
-    {3813548400 -21600 0 CST}
-    {3824438400 -18000 1 CDT}
-    {3844998000 -21600 0 CST}
-    {3855888000 -18000 1 CDT}
-    {3876447600 -21600 0 CST}
-    {3887337600 -18000 1 CDT}
-    {3907897200 -21600 0 CST}
-    {3919392000 -18000 1 CDT}
-    {3939951600 -21600 0 CST}
-    {3950841600 -18000 1 CDT}
-    {3971401200 -21600 0 CST}
-    {3982291200 -18000 1 CDT}
-    {4002850800 -21600 0 CST}
-    {4013740800 -18000 1 CDT}
-    {4034300400 -21600 0 CST}
-    {4045190400 -18000 1 CDT}
-    {4065750000 -21600 0 CST}
-    {4076640000 -18000 1 CDT}
-    {4097199600 -21600 0 CST}
+if {![info exists TZData(America/Winnipeg)]} {
+    LoadTimeZoneFile America/Winnipeg
 }
+set TZData(:America/Rainy_River) $TZData(:America/Winnipeg)
diff --git a/library/tzdata/America/Thunder_Bay b/library/tzdata/America/Thunder_Bay
index 8a454be..4761beb 100644
--- a/library/tzdata/America/Thunder_Bay
+++ b/library/tzdata/America/Thunder_Bay
@@ -1,272 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Thunder_Bay) {
-    {-9223372036854775808 -21420 0 LMT}
-    {-2366733780 -21600 0 CST}
-    {-1893434400 -18000 0 EST}
-    {-883594800 -18000 0 EST}
-    {-880218000 -14400 1 EWT}
-    {-769395600 -14400 1 EPT}
-    {-765396000 -18000 0 EST}
-    {18000 -18000 0 EST}
-    {9961200 -14400 1 EDT}
-    {25682400 -18000 0 EST}
-    {41410800 -14400 1 EDT}
-    {57736800 -18000 0 EST}
-    {73465200 -14400 1 EDT}
-    {89186400 -18000 0 EST}
-    {94712400 -18000 0 EST}
-    {126248400 -18000 0 EST}
-    {136364400 -14400 1 EDT}
-    {152085600 -18000 0 EST}
-    {167814000 -14400 1 EDT}
-    {183535200 -18000 0 EST}
-    {199263600 -14400 1 EDT}
-    {215589600 -18000 0 EST}
-    {230713200 -14400 1 EDT}
-    {247039200 -18000 0 EST}
-    {262767600 -14400 1 EDT}
-    {278488800 -18000 0 EST}
-    {294217200 -14400 1 EDT}
-    {309938400 -18000 0 EST}
-    {325666800 -14400 1 EDT}
-    {341388000 -18000 0 EST}
-    {357116400 -14400 1 EDT}
-    {372837600 -18000 0 EST}
-    {388566000 -14400 1 EDT}
-    {404892000 -18000 0 EST}
-    {420015600 -14400 1 EDT}
-    {436341600 -18000 0 EST}
-    {452070000 -14400 1 EDT}
-    {467791200 -18000 0 EST}
-    {483519600 -14400 1 EDT}
-    {499240800 -18000 0 EST}
-    {514969200 -14400 1 EDT}
-    {530690400 -18000 0 EST}
-    {544604400 -14400 1 EDT}
-    {562140000 -18000 0 EST}
-    {576054000 -14400 1 EDT}
-    {594194400 -18000 0 EST}
-    {607503600 -14400 1 EDT}
-    {625644000 -18000 0 EST}
-    {638953200 -14400 1 EDT}
-    {657093600 -18000 0 EST}
-    {671007600 -14400 1 EDT}
-    {688543200 -18000 0 EST}
-    {702457200 -14400 1 EDT}
-    {719992800 -18000 0 EST}
-    {733906800 -14400 1 EDT}
-    {752047200 -18000 0 EST}
-    {765356400 -14400 1 EDT}
-    {783496800 -18000 0 EST}
-    {796806000 -14400 1 EDT}
-    {814946400 -18000 0 EST}
-    {828860400 -14400 1 EDT}
-    {846396000 -18000 0 EST}
-    {860310000 -14400 1 EDT}
-    {877845600 -18000 0 EST}
-    {891759600 -14400 1 EDT}
-    {909295200 -18000 0 EST}
-    {923209200 -14400 1 EDT}
-    {941349600 -18000 0 EST}
-    {954658800 -14400 1 EDT}
-    {972799200 -18000 0 EST}
-    {986108400 -14400 1 EDT}
-    {1004248800 -18000 0 EST}
-    {1018162800 -14400 1 EDT}
-    {1035698400 -18000 0 EST}
-    {1049612400 -14400 1 EDT}
-    {1067148000 -18000 0 EST}
-    {1081062000 -14400 1 EDT}
-    {1099202400 -18000 0 EST}
-    {1112511600 -14400 1 EDT}
-    {1130652000 -18000 0 EST}
-    {1143961200 -14400 1 EDT}
-    {1162101600 -18000 0 EST}
-    {1173596400 -14400 1 EDT}
-    {1194156000 -18000 0 EST}
-    {1205046000 -14400 1 EDT}
-    {1225605600 -18000 0 EST}
-    {1236495600 -14400 1 EDT}
-    {1257055200 -18000 0 EST}
-    {1268550000 -14400 1 EDT}
-    {1289109600 -18000 0 EST}
-    {1299999600 -14400 1 EDT}
-    {1320559200 -18000 0 EST}
-    {1331449200 -14400 1 EDT}
-    {1352008800 -18000 0 EST}
-    {1362898800 -14400 1 EDT}
-    {1383458400 -18000 0 EST}
-    {1394348400 -14400 1 EDT}
-    {1414908000 -18000 0 EST}
-    {1425798000 -14400 1 EDT}
-    {1446357600 -18000 0 EST}
-    {1457852400 -14400 1 EDT}
-    {1478412000 -18000 0 EST}
-    {1489302000 -14400 1 EDT}
-    {1509861600 -18000 0 EST}
-    {1520751600 -14400 1 EDT}
-    {1541311200 -18000 0 EST}
-    {1552201200 -14400 1 EDT}
-    {1572760800 -18000 0 EST}
-    {1583650800 -14400 1 EDT}
-    {1604210400 -18000 0 EST}
-    {1615705200 -14400 1 EDT}
-    {1636264800 -18000 0 EST}
-    {1647154800 -14400 1 EDT}
-    {1667714400 -18000 0 EST}
-    {1678604400 -14400 1 EDT}
-    {1699164000 -18000 0 EST}
-    {1710054000 -14400 1 EDT}
-    {1730613600 -18000 0 EST}
-    {1741503600 -14400 1 EDT}
-    {1762063200 -18000 0 EST}
-    {1772953200 -14400 1 EDT}
-    {1793512800 -18000 0 EST}
-    {1805007600 -14400 1 EDT}
-    {1825567200 -18000 0 EST}
-    {1836457200 -14400 1 EDT}
-    {1857016800 -18000 0 EST}
-    {1867906800 -14400 1 EDT}
-    {1888466400 -18000 0 EST}
-    {1899356400 -14400 1 EDT}
-    {1919916000 -18000 0 EST}
-    {1930806000 -14400 1 EDT}
-    {1951365600 -18000 0 EST}
-    {1962860400 -14400 1 EDT}
-    {1983420000 -18000 0 EST}
-    {1994310000 -14400 1 EDT}
-    {2014869600 -18000 0 EST}
-    {2025759600 -14400 1 EDT}
-    {2046319200 -18000 0 EST}
-    {2057209200 -14400 1 EDT}
-    {2077768800 -18000 0 EST}
-    {2088658800 -14400 1 EDT}
-    {2109218400 -18000 0 EST}
-    {2120108400 -14400 1 EDT}
-    {2140668000 -18000 0 EST}
-    {2152162800 -14400 1 EDT}
-    {2172722400 -18000 0 EST}
-    {2183612400 -14400 1 EDT}
-    {2204172000 -18000 0 EST}
-    {2215062000 -14400 1 EDT}
-    {2235621600 -18000 0 EST}
-    {2246511600 -14400 1 EDT}
-    {2267071200 -18000 0 EST}
-    {2277961200 -14400 1 EDT}
-    {2298520800 -18000 0 EST}
-    {2309410800 -14400 1 EDT}
-    {2329970400 -18000 0 EST}
-    {2341465200 -14400 1 EDT}
-    {2362024800 -18000 0 EST}
-    {2372914800 -14400 1 EDT}
-    {2393474400 -18000 0 EST}
-    {2404364400 -14400 1 EDT}
-    {2424924000 -18000 0 EST}
-    {2435814000 -14400 1 EDT}
-    {2456373600 -18000 0 EST}
-    {2467263600 -14400 1 EDT}
-    {2487823200 -18000 0 EST}
-    {2499318000 -14400 1 EDT}
-    {2519877600 -18000 0 EST}
-    {2530767600 -14400 1 EDT}
-    {2551327200 -18000 0 EST}
-    {2562217200 -14400 1 EDT}
-    {2582776800 -18000 0 EST}
-    {2593666800 -14400 1 EDT}
-    {2614226400 -18000 0 EST}
-    {2625116400 -14400 1 EDT}
-    {2645676000 -18000 0 EST}
-    {2656566000 -14400 1 EDT}
-    {2677125600 -18000 0 EST}
-    {2688620400 -14400 1 EDT}
-    {2709180000 -18000 0 EST}
-    {2720070000 -14400 1 EDT}
-    {2740629600 -18000 0 EST}
-    {2751519600 -14400 1 EDT}
-    {2772079200 -18000 0 EST}
-    {2782969200 -14400 1 EDT}
-    {2803528800 -18000 0 EST}
-    {2814418800 -14400 1 EDT}
-    {2834978400 -18000 0 EST}
-    {2846473200 -14400 1 EDT}
-    {2867032800 -18000 0 EST}
-    {2877922800 -14400 1 EDT}
-    {2898482400 -18000 0 EST}
-    {2909372400 -14400 1 EDT}
-    {2929932000 -18000 0 EST}
-    {2940822000 -14400 1 EDT}
-    {2961381600 -18000 0 EST}
-    {2972271600 -14400 1 EDT}
-    {2992831200 -18000 0 EST}
-    {3003721200 -14400 1 EDT}
-    {3024280800 -18000 0 EST}
-    {3035775600 -14400 1 EDT}
-    {3056335200 -18000 0 EST}
-    {3067225200 -14400 1 EDT}
-    {3087784800 -18000 0 EST}
-    {3098674800 -14400 1 EDT}
-    {3119234400 -18000 0 EST}
-    {3130124400 -14400 1 EDT}
-    {3150684000 -18000 0 EST}
-    {3161574000 -14400 1 EDT}
-    {3182133600 -18000 0 EST}
-    {3193023600 -14400 1 EDT}
-    {3213583200 -18000 0 EST}
-    {3225078000 -14400 1 EDT}
-    {3245637600 -18000 0 EST}
-    {3256527600 -14400 1 EDT}
-    {3277087200 -18000 0 EST}
-    {3287977200 -14400 1 EDT}
-    {3308536800 -18000 0 EST}
-    {3319426800 -14400 1 EDT}
-    {3339986400 -18000 0 EST}
-    {3350876400 -14400 1 EDT}
-    {3371436000 -18000 0 EST}
-    {3382930800 -14400 1 EDT}
-    {3403490400 -18000 0 EST}
-    {3414380400 -14400 1 EDT}
-    {3434940000 -18000 0 EST}
-    {3445830000 -14400 1 EDT}
-    {3466389600 -18000 0 EST}
-    {3477279600 -14400 1 EDT}
-    {3497839200 -18000 0 EST}
-    {3508729200 -14400 1 EDT}
-    {3529288800 -18000 0 EST}
-    {3540178800 -14400 1 EDT}
-    {3560738400 -18000 0 EST}
-    {3572233200 -14400 1 EDT}
-    {3592792800 -18000 0 EST}
-    {3603682800 -14400 1 EDT}
-    {3624242400 -18000 0 EST}
-    {3635132400 -14400 1 EDT}
-    {3655692000 -18000 0 EST}
-    {3666582000 -14400 1 EDT}
-    {3687141600 -18000 0 EST}
-    {3698031600 -14400 1 EDT}
-    {3718591200 -18000 0 EST}
-    {3730086000 -14400 1 EDT}
-    {3750645600 -18000 0 EST}
-    {3761535600 -14400 1 EDT}
-    {3782095200 -18000 0 EST}
-    {3792985200 -14400 1 EDT}
-    {3813544800 -18000 0 EST}
-    {3824434800 -14400 1 EDT}
-    {3844994400 -18000 0 EST}
-    {3855884400 -14400 1 EDT}
-    {3876444000 -18000 0 EST}
-    {3887334000 -14400 1 EDT}
-    {3907893600 -18000 0 EST}
-    {3919388400 -14400 1 EDT}
-    {3939948000 -18000 0 EST}
-    {3950838000 -14400 1 EDT}
-    {3971397600 -18000 0 EST}
-    {3982287600 -14400 1 EDT}
-    {4002847200 -18000 0 EST}
-    {4013737200 -14400 1 EDT}
-    {4034296800 -18000 0 EST}
-    {4045186800 -14400 1 EDT}
-    {4065746400 -18000 0 EST}
-    {4076636400 -14400 1 EDT}
-    {4097196000 -18000 0 EST}
+if {![info exists TZData(America/Toronto)]} {
+    LoadTimeZoneFile America/Toronto
 }
+set TZData(:America/Thunder_Bay) $TZData(:America/Toronto)
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index 67a1f00..c1d748b 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -31,159 +31,4 @@ set TZData(:Pacific/Fiji) {
     {1578751200 43200 0 +12}
     {1608386400 46800 1 +12}
     {1610805600 43200 0 +12}
-    {1668261600 46800 1 +12}
-    {1673704800 43200 0 +12}
-    {1699711200 46800 1 +12}
-    {1705154400 43200 0 +12}
-    {1731160800 46800 1 +12}
-    {1736604000 43200 0 +12}
-    {1762610400 46800 1 +12}
-    {1768658400 43200 0 +12}
-    {1794060000 46800 1 +12}
-    {1800108000 43200 0 +12}
-    {1826114400 46800 1 +12}
-    {1831557600 43200 0 +12}
-    {1857564000 46800 1 +12}
-    {1863007200 43200 0 +12}
-    {1889013600 46800 1 +12}
-    {1894456800 43200 0 +12}
-    {1920463200 46800 1 +12}
-    {1925906400 43200 0 +12}
-    {1951912800 46800 1 +12}
-    {1957960800 43200 0 +12}
-    {1983967200 46800 1 +12}
-    {1989410400 43200 0 +12}
-    {2015416800 46800 1 +12}
-    {2020860000 43200 0 +12}
-    {2046866400 46800 1 +12}
-    {2052309600 43200 0 +12}
-    {2078316000 46800 1 +12}
-    {2083759200 43200 0 +12}
-    {2109765600 46800 1 +12}
-    {2115813600 43200 0 +12}
-    {2141215200 46800 1 +12}
-    {2147263200 43200 0 +12}
-    {2173269600 46800 1 +12}
-    {2178712800 43200 0 +12}
-    {2204719200 46800 1 +12}
-    {2210162400 43200 0 +12}
-    {2236168800 46800 1 +12}
-    {2241612000 43200 0 +12}
-    {2267618400 46800 1 +12}
-    {2273061600 43200 0 +12}
-    {2299068000 46800 1 +12}
-    {2305116000 43200 0 +12}
-    {2330517600 46800 1 +12}
-    {2336565600 43200 0 +12}
-    {2362572000 46800 1 +12}
-    {2368015200 43200 0 +12}
-    {2394021600 46800 1 +12}
-    {2399464800 43200 0 +12}
-    {2425471200 46800 1 +12}
-    {2430914400 43200 0 +12}
-    {2456920800 46800 1 +12}
-    {2462364000 43200 0 +12}
-    {2488370400 46800 1 +12}
-    {2494418400 43200 0 +12}
-    {2520424800 46800 1 +12}
-    {2525868000 43200 0 +12}
-    {2551874400 46800 1 +12}
-    {2557317600 43200 0 +12}
-    {2583324000 46800 1 +12}
-    {2588767200 43200 0 +12}
-    {2614773600 46800 1 +12}
-    {2620216800 43200 0 +12}
-    {2646223200 46800 1 +12}
-    {2652271200 43200 0 +12}
-    {2677672800 46800 1 +12}
-    {2683720800 43200 0 +12}
-    {2709727200 46800 1 +12}
-    {2715170400 43200 0 +12}
-    {2741176800 46800 1 +12}
-    {2746620000 43200 0 +12}
-    {2772626400 46800 1 +12}
-    {2778069600 43200 0 +12}
-    {2804076000 46800 1 +12}
-    {2809519200 43200 0 +12}
-    {2835525600 46800 1 +12}
-    {2841573600 43200 0 +12}
-    {2867580000 46800 1 +12}
-    {2873023200 43200 0 +12}
-    {2899029600 46800 1 +12}
-    {2904472800 43200 0 +12}
-    {2930479200 46800 1 +12}
-    {2935922400 43200 0 +12}
-    {2961928800 46800 1 +12}
-    {2967372000 43200 0 +12}
-    {2993378400 46800 1 +12}
-    {2999426400 43200 0 +12}
-    {3024828000 46800 1 +12}
-    {3030876000 43200 0 +12}
-    {3056882400 46800 1 +12}
-    {3062325600 43200 0 +12}
-    {3088332000 46800 1 +12}
-    {3093775200 43200 0 +12}
-    {3119781600 46800 1 +12}
-    {3125224800 43200 0 +12}
-    {3151231200 46800 1 +12}
-    {3156674400 43200 0 +12}
-    {3182680800 46800 1 +12}
-    {3188728800 43200 0 +12}
-    {3214130400 46800 1 +12}
-    {3220178400 43200 0 +12}
-    {3246184800 46800 1 +12}
-    {3251628000 43200 0 +12}
-    {3277634400 46800 1 +12}
-    {3283077600 43200 0 +12}
-    {3309084000 46800 1 +12}
-    {3314527200 43200 0 +12}
-    {3340533600 46800 1 +12}
-    {3345976800 43200 0 +12}
-    {3371983200 46800 1 +12}
-    {3378031200 43200 0 +12}
-    {3404037600 46800 1 +12}
-    {3409480800 43200 0 +12}
-    {3435487200 46800 1 +12}
-    {3440930400 43200 0 +12}
-    {3466936800 46800 1 +12}
-    {3472380000 43200 0 +12}
-    {3498386400 46800 1 +12}
-    {3503829600 43200 0 +12}
-    {3529836000 46800 1 +12}
-    {3535884000 43200 0 +12}
-    {3561285600 46800 1 +12}
-    {3567333600 43200 0 +12}
-    {3593340000 46800 1 +12}
-    {3598783200 43200 0 +12}
-    {3624789600 46800 1 +12}
-    {3630232800 43200 0 +12}
-    {3656239200 46800 1 +12}
-    {3661682400 43200 0 +12}
-    {3687688800 46800 1 +12}
-    {3693132000 43200 0 +12}
-    {3719138400 46800 1 +12}
-    {3725186400 43200 0 +12}
-    {3751192800 46800 1 +12}
-    {3756636000 43200 0 +12}
-    {3782642400 46800 1 +12}
-    {3788085600 43200 0 +12}
-    {3814092000 46800 1 +12}
-    {3819535200 43200 0 +12}
-    {3845541600 46800 1 +12}
-    {3850984800 43200 0 +12}
-    {3876991200 46800 1 +12}
-    {3883039200 43200 0 +12}
-    {3908440800 46800 1 +12}
-    {3914488800 43200 0 +12}
-    {3940495200 46800 1 +12}
-    {3945938400 43200 0 +12}
-    {3971944800 46800 1 +12}
-    {3977388000 43200 0 +12}
-    {4003394400 46800 1 +12}
-    {4008837600 43200 0 +12}
-    {4034844000 46800 1 +12}
-    {4040287200 43200 0 +12}
-    {4066293600 46800 1 +12}
-    {4072341600 43200 0 +12}
-    {4097743200 46800 1 +12}
 }
-- 
cgit v0.12


From d9a19f95121e4fd846211083cc7c3b0d22c7a564 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 30 Oct 2022 17:41:56 +0000
Subject: Bytecode compiler for ledit

---
 generic/tclBasic.c      |   5 +-
 generic/tclCompCmdsGR.c | 187 ++++++++++++++++++++++++++++++------------------
 generic/tclInt.h        |   3 +
 tests/lreplace.test     |   1 +
 4 files changed, 124 insertions(+), 72 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index c9697d2..a1eb4cc 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -310,9 +310,9 @@ static const CmdInfo builtInCmds[] = {
     {"join",		Tcl_JoinObjCmd,		NULL,			NULL,	CMD_IS_SAFE},
     {"lappend",		Tcl_LappendObjCmd,	TclCompileLappendCmd,	NULL,	CMD_IS_SAFE},
     {"lassign",		Tcl_LassignObjCmd,	TclCompileLassignCmd,	NULL,	CMD_IS_SAFE},
+    {"ledit",		Tcl_LeditObjCmd,	TclCompileLeditCmd,	NULL,	CMD_IS_SAFE},
     {"lindex",		Tcl_LindexObjCmd,	TclCompileLindexCmd,	NULL,	CMD_IS_SAFE},
     {"linsert",		Tcl_LinsertObjCmd,	TclCompileLinsertCmd,	NULL,	CMD_IS_SAFE},
-    {"xx",		Tcl_LinsertObjCmd,	TclCompileXxCmd,	NULL,	CMD_IS_SAFE},
     {"list",		Tcl_ListObjCmd,		TclCompileListCmd,	NULL,	CMD_IS_SAFE|CMD_COMPILES_EXPANDED},
     {"llength",		Tcl_LlengthObjCmd,	TclCompileLlengthCmd,	NULL,	CMD_IS_SAFE},
     {"lmap",		Tcl_LmapObjCmd,		TclCompileLmapCmd,	TclNRLmapCmd,	CMD_IS_SAFE},
@@ -323,10 +323,9 @@ static const CmdInfo builtInCmds[] = {
     {"lreplace",	Tcl_LreplaceObjCmd,	TclCompileLreplaceCmd,	NULL,	CMD_IS_SAFE},
     {"lreverse",	Tcl_LreverseObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
     {"lsearch",		Tcl_LsearchObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
-    {"lseq",            Tcl_LseqObjCmd,         NULL,                   NULL,   CMD_IS_SAFE},
+    {"lseq",		Tcl_LseqObjCmd,         NULL,                   NULL,   CMD_IS_SAFE},
     {"lset",		Tcl_LsetObjCmd,		TclCompileLsetCmd,	NULL,	CMD_IS_SAFE},
     {"lsort",		Tcl_LsortObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
-    {"ledit",		Tcl_LeditObjCmd,	NULL,			NULL,	CMD_IS_SAFE},
     {"package",		Tcl_PackageObjCmd,	NULL,			TclNRPackageObjCmd,	CMD_IS_SAFE},
     {"proc",		Tcl_ProcObjCmd,		NULL,			NULL,	CMD_IS_SAFE},
     {"regexp",		Tcl_RegexpObjCmd,	TclCompileRegexpCmd,	NULL,	CMD_IS_SAFE},
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 72716a4..bf6288a 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1036,6 +1036,124 @@ TclCompileLassignCmd(
 /*
  *----------------------------------------------------------------------
  *
+ * TclCompileLeditCmd --
+ *
+ *	How to compile the "ledit" command. We only bother with the case
+ *	where the index is constant.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclCompileLeditCmd(
+    Tcl_Interp *interp,		/* Tcl interpreter for context. */
+    Tcl_Parse *parsePtr,	/* Points to a parse structure for the
+				 * command. */
+    TCL_UNUSED(Command *),
+    CompileEnv *envPtr)		/* Holds the resulting instructions. */
+{
+    DefineLineInformation;	/* TIP #280 */
+    Tcl_Token *tokenPtr, *varTokenPtr;
+    int localIndex;             /* Index of var in local var table. */
+    int isScalar;		/* Flag == 1 if scalar, 0 if array. */
+    int tempDepth;		/* Depth used for emitting one part of the
+				 * code burst. */
+    int first, last, i, end_indicator;
+
+    if (parsePtr->numWords < 4) {
+	return TCL_ERROR;
+    }
+    varTokenPtr = TokenAfter(parsePtr->tokenPtr);
+
+    tokenPtr = TokenAfter(varTokenPtr);
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_NONE,
+	    &first) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    tokenPtr = TokenAfter(tokenPtr);
+    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_NONE, TCL_INDEX_END,
+	    &last) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    end_indicator = 1; /* "end" means last element by default */
+    if (first == (int)TCL_INDEX_NONE) {
+	/* first == TCL_INDEX_NONE => Range after last element. */
+	first = TCL_INDEX_END; /* Insert at end where ... */
+	end_indicator = 0;     /* ... end means AFTER last element */
+	last = TCL_INDEX_NONE; /* Informs lreplace, nothing to replace */
+    }
+
+    PushVarNameWord(interp, varTokenPtr, envPtr, 0,
+	    &localIndex, &isScalar, 1);
+
+    /* Duplicate the variable name if it's been pushed. */
+    if (localIndex < 0) {
+	if (isScalar) {
+	    tempDepth = 0;
+	} else {
+	    tempDepth = 1;
+	}
+	TclEmitInstInt4(INST_OVER, tempDepth, envPtr);
+    }
+
+    /* Duplicate an array index if one's been pushed. */
+    if (!isScalar) {
+	if (localIndex < 0) {
+	    tempDepth = 1;
+	} else {
+	    tempDepth = parsePtr->numWords - 2;
+	}
+	TclEmitInstInt4(INST_OVER, tempDepth, envPtr);
+    }
+
+    /* Emit code to load the variable's value.  */
+    if (isScalar) {
+	if (localIndex < 0) {
+	    TclEmitOpcode(INST_LOAD_STK, envPtr);
+	} else {
+	    Emit14Inst(INST_LOAD_SCALAR, localIndex, envPtr);
+	}
+    } else {
+	if (localIndex < 0) {
+	    TclEmitOpcode(INST_LOAD_ARRAY_STK, envPtr);
+	} else {
+	    Emit14Inst(INST_LOAD_ARRAY, localIndex, envPtr);
+	}
+    }
+
+    for (i=4 ; i<parsePtr->numWords ; ++i) {
+	tokenPtr = TokenAfter(tokenPtr);
+	CompileWord(envPtr, tokenPtr, interp, i);
+    }
+
+    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 3, envPtr);
+    TclEmitInt4(end_indicator, envPtr);
+    TclEmitInt4(first, envPtr);
+    TclEmitInt4(last, envPtr);
+    
+    /* Emit code to put the value back in the variable. */
+
+    if (isScalar) {
+	if (localIndex < 0) {
+	    TclEmitOpcode(INST_STORE_STK, envPtr);
+	} else {
+	    Emit14Inst(INST_STORE_SCALAR, localIndex, envPtr);
+	}
+    } else {
+	if (localIndex < 0) {
+	    TclEmitOpcode(INST_STORE_ARRAY_STK, envPtr);
+	} else {
+	    Emit14Inst(INST_STORE_ARRAY, localIndex, envPtr);
+	}
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TclCompileLindexCmd --
  *
  *	Procedure called to compile the "lindex" command.
@@ -2908,75 +3026,6 @@ TclCompileObjectSelfCmd(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TclCompileXxCmd --
- *
- *	How to compile the "linsert2" command. We only bother with the case
- *	where the index is constant.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileXxCmd(
-    Tcl_Interp *interp,		/* Tcl interpreter for context. */
-    Tcl_Parse *parsePtr,	/* Points to a parse structure for the
-				 * command. */
-    TCL_UNUSED(Command *),
-    CompileEnv *envPtr)		/* Holds the resulting instructions. */
-{
-    DefineLineInformation;	/* TIP #280 */
-    Tcl_Token *tokenPtr, *listTokenPtr;
-    int first, last, i, end_indicator;
-
-    if (parsePtr->numWords < 4) {
-	return TCL_ERROR;
-    }
-    listTokenPtr = TokenAfter(parsePtr->tokenPtr);
-
-    tokenPtr = TokenAfter(listTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_NONE,
-	    &first) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_NONE, TCL_INDEX_END,
-	    &last) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    end_indicator = 1; /* "end" means last element by default */
-    if (first == (int)TCL_INDEX_NONE) {
-	/* first == TCL_INDEX_NONE => Range after last element. */
-	first = TCL_INDEX_END; /* Insert at end where ... */
-	end_indicator = 0;     /* ... end means AFTER last element */
-	last = TCL_INDEX_NONE; /* Informs lreplace, nothing to replace */
-    } else if (last == TCL_INDEX_NONE) {
-	/*
-	 * last == TCL_INDEX_NONE => last precedes first element
-	 * lreplace4 will treat this as nothing to delete
-	 * Nought to do, just here for clarity, will be optimized away
-	 */
-    } else {
-
-    }
-
-    CompileWord(envPtr, listTokenPtr, interp, 1);
-
-    for (i=4 ; i<parsePtr->numWords ; i++) {
-	tokenPtr = TokenAfter(tokenPtr);
-	CompileWord(envPtr, tokenPtr, interp, i);
-    }
-
-    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 3, envPtr);
-    TclEmitInt4(end_indicator, envPtr);
-    TclEmitInt4(first, envPtr);
-    TclEmitInt4(last, envPtr);
-    return TCL_OK;
-}
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a67c8f9..5c977e5 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3759,6 +3759,9 @@ MODULE_SCOPE int	TclCompileLappendCmd(Tcl_Interp *interp,
 MODULE_SCOPE int	TclCompileLassignCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
+MODULE_SCOPE int	TclCompileLeditCmd(Tcl_Interp *interp,
+			    Tcl_Parse *parsePtr, Command *cmdPtr,
+			    struct CompileEnv *envPtr);
 MODULE_SCOPE int	TclCompileLindexCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
diff --git a/tests/lreplace.test b/tests/lreplace.test
index 2952899..209c3d2 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -521,6 +521,7 @@ apply {{} {
 		foreach i $ins {
 		    set expected [list [catch {$lreplace $ls $a $b {*}$i} m] $m]
 		    set tester [list ledit ls $a $b {*}$i]
+		    #set script [list catch $tester m]
 		    set script [list catch $tester m]
 		    set script "list \[$script\] \$m"
 		    test ledit-6.[incr n] {ledit battery} -body \
-- 
cgit v0.12


From 026e32d86a8119bac99953394dffdfd5a80665e9 Mon Sep 17 00:00:00 2001
From: griffin <briang42@easystreet.net>
Date: Tue, 1 Nov 2022 02:05:11 +0000
Subject: Fix refCount crash. Improve ArithSeries regression coverage.

---
 generic/tclArithSeries.c | 22 ++++++++++++++++++++--
 generic/tclDecls.h       |  4 ++--
 generic/tclListObj.c     |  2 +-
 tests/lseq.test          | 35 +++++++++++++++++++++++++++++++++--
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index c3c44f3..5c4e5a5 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -723,9 +723,27 @@ TclArithSeriesObjRange(
 	return obj;
     }
 
-    TclArithSeriesObjIndex(arithSeriesPtr, fromIdx, &startObj);
+    if (TclArithSeriesObjIndex(arithSeriesPtr, fromIdx, &startObj) != TCL_OK) {
+	if (interp) {
+	    Tcl_SetObjResult(
+		interp,
+		Tcl_ObjPrintf("index %d is out of bounds 0 to %"
+			      TCL_LL_MODIFIER "d", fromIdx, (arithSeriesRepPtr->len-1)));
+	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+	}
+	return NULL;
+    }
     Tcl_IncrRefCount(startObj);
-    TclArithSeriesObjIndex(arithSeriesPtr, toIdx, &endObj);
+    if (TclArithSeriesObjIndex(arithSeriesPtr, toIdx, &endObj) != TCL_OK) {
+	if (interp) {
+	    Tcl_SetObjResult(
+		interp,
+		Tcl_ObjPrintf("index %d is out of bounds 0 to %"
+			      TCL_LL_MODIFIER "d", fromIdx, (arithSeriesRepPtr->len-1)));
+	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+	}
+	return NULL;
+    }
     Tcl_IncrRefCount(endObj);
     TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
     Tcl_IncrRefCount(stepObj);
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index a7d3023..8cb77b8 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -636,7 +636,7 @@ EXTERN Tcl_Channel	Tcl_OpenFileChannel(Tcl_Interp *interp,
 /* 199 */
 EXTERN Tcl_Channel	Tcl_OpenTcpClient(Tcl_Interp *interp, int port,
 				const char *address, const char *myaddr,
-				int myport, int async);
+				int myport, int flags);
 /* 200 */
 EXTERN Tcl_Channel	Tcl_OpenTcpServer(Tcl_Interp *interp, int port,
 				const char *host,
@@ -2272,7 +2272,7 @@ typedef struct TclStubs {
     Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */
     Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, Tcl_Size argc, const char **argv, int flags); /* 197 */
     Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, const char *fileName, const char *modeString, int permissions); /* 198 */
-    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, const char *address, const char *myaddr, int myport, int async); /* 199 */
+    Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, const char *address, const char *myaddr, int myport, int flags); /* 199 */
     Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, const char *host, Tcl_TcpAcceptProc *acceptProc, void *callbackData); /* 200 */
     void (*tcl_Preserve) (void *data); /* 201 */
     void (*tcl_PrintDouble) (Tcl_Interp *interp, double value, char *dst); /* 202 */
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index a1d080c..8ee0f48 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2644,10 +2644,10 @@ TclLindexFlat(
 		/* ArithSeries cannot be a list of lists */
 		Tcl_DecrRefCount(elemObj);
 		TclNewObj(elemObj);
-		Tcl_IncrRefCount(elemObj);
 		break;
 	    }
 	}
+	Tcl_IncrRefCount(elemObj);
 	return elemObj;
     }
 
diff --git a/tests/lseq.test b/tests/lseq.test
index 2e5d7e1..b8ae2e9 100644
--- a/tests/lseq.test
+++ b/tests/lseq.test
@@ -255,8 +255,9 @@ test lseq-3.7 {lmap lseq} {
 
 test lseq-3.8 {lrange lseq} {
     set r [lrange [lseq 1 100] 10 20]
-    lindex [tcl::unsupported::representation $r] 3
-} {arithseries}
+    set empty [lrange [lseq 1 100] 20 10]
+    list $r $empty [lindex [tcl::unsupported::representation $r] 3]
+} {{11 12 13 14 15 16 17 18 19 20 21} {} arithseries}
 
 test lseq-3.9 {lassign lseq} arithSeriesShimmer {
     set r [lseq 15]
@@ -510,6 +511,36 @@ test lseq-4.5 {lindex off by one} -body {
     unset res
 } -result {4 3}
 
+# Bad refcount on ResultObj
+test lseq-4.6 {lindex flat} -body {
+    set l [lseq 2 10]
+    set cmd lindex
+    set i 4
+    set c [lindex $l $i]
+    set d [$cmd $l $i]
+    set e [lindex [lseq 2 10] $i]
+    set f [$cmd [lseq 2 10] $i]
+    list $c $d $e $f
+} -cleanup {
+    unset l
+    unset e
+} -result [lrepeat 4 6]
+
+test lseq-4.7 {empty list} {
+    list [lseq 0] [join [lseq 0] {}] [join [lseq 1] {}]
+} {{} {} 0}
+
+test lseq-4.8 {error case lrange} -body {
+    lrange [lseq 1 5] fred ginger
+} -returnCodes 1 \
+    -result {bad index "fred": must be integer?[+-]integer? or end?[+-]integer?}
+
+test lseq-4.9 {error case lrange} -body {
+    set fred 7
+    set ginger 8
+    lrange [lseq 1 5] $fred $ginger
+} -returnCodes 1 \
+    -result {index 7 is out of bounds 0 to 4}
 
 # cleanup
 ::tcltest::cleanupTests
-- 
cgit v0.12


From 4d9dcbbcbc557a5b15e79a8b05e5b0b92230adcb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 1 Nov 2022 16:13:26 +0000
Subject: Two missing out-of-bound situations in TclIndexEncode(), one for
 index > MAX_INT, one for index < end-MAX_INT

---
 generic/tclUtil.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 1ac2b31..a361ba3 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3751,7 +3751,11 @@ TclIndexEncode(
 	 * We parsed an end+offset index value.
 	 * wide holds the offset value in the range WIDE_MIN...WIDE_MAX.
 	 */
-	if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
+	if (!irPtr && (wide > INT_MAX)) {
+	    return TCL_ERROR;
+	} else if (irPtr && (wide < INT_MIN)) {
+	    return TCL_ERROR;
+	} else if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
 	    /*
 	     * All end+postive or end-negative expressions
 	     * always indicate "after the end".
-- 
cgit v0.12


From 67319477f132908fc3f5241bece926457d7d4a5e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 1 Nov 2022 17:02:02 +0000
Subject: Bug-fix for TIP #502 implementation: Two missing out-of-bound
 situations in TclIndexEncode(), one for index > MAX_INT, one for index <
 end-MAX_INT

---
 generic/tclUtil.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index ab97461..4b9c120 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -4068,7 +4068,11 @@ TclIndexEncode(
 	 * We parsed an end+offset index value.
 	 * wide holds the offset value in the range WIDE_MIN...WIDE_MAX.
 	 */
-	if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
+	if (!irPtr && (wide > INT_MAX)) {
+	    return TCL_ERROR;
+	} else if (irPtr && (wide < INT_MIN)) {
+	    return TCL_ERROR;
+	} else if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
 	    /*
 	     * All end+postive or end-negative expressions
 	     * always indicate "after the end".
-- 
cgit v0.12


From cbbee698745c4ddd1f5482cfca6cf73dab8fd953 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 1 Nov 2022 21:45:49 +0000
Subject: Backout previous change: test-cases are failing

---
 generic/tclUtil.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 4b9c120..ab97461 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -4068,11 +4068,7 @@ TclIndexEncode(
 	 * We parsed an end+offset index value.
 	 * wide holds the offset value in the range WIDE_MIN...WIDE_MAX.
 	 */
-	if (!irPtr && (wide > INT_MAX)) {
-	    return TCL_ERROR;
-	} else if (irPtr && (wide < INT_MIN)) {
-	    return TCL_ERROR;
-	} else if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
+	if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
 	    /*
 	     * All end+postive or end-negative expressions
 	     * always indicate "after the end".
-- 
cgit v0.12


From 954b5db3bb10738fab8a1b20e69b0a47c4c3a55a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Nov 2022 08:02:00 +0000
Subject: Make robust against TIP #288 proposed change

---
 generic/tclOOScript.h | 4 ++--
 tools/tclOOScript.tcl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index a1e4624..f2e99b0 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -116,7 +116,7 @@ static const char *tclOOSetupScript =
 "\t\t\t\t}]\n"
 "\t\t}\n"
 "\t}\n"
-"\tproc define::classmethod {name {args {}} {body {}}} {\n"
+"\tproc define::classmethod {name args} {\n"
 "\t\t::set argc [::llength [::info level 0]]\n"
 "\t\t::if {$argc == 3} {\n"
 "\t\t\t::return -code error -errorcode {TCL WRONGARGS} [::format \\\n"
@@ -125,7 +125,7 @@ static const char *tclOOSetupScript =
 "\t\t}\n"
 "\t\t::set cls [::uplevel 1 self]\n"
 "\t\t::if {$argc == 4} {\n"
-"\t\t\t::oo::define [::oo::DelegateName $cls] method $name $args $body\n"
+"\t\t\t::oo::define [::oo::DelegateName $cls] method $name {*}$args\n"
 "\t\t}\n"
 "\t\t::tailcall forward $name myclass $name\n"
 "\t}\n"
diff --git a/tools/tclOOScript.tcl b/tools/tclOOScript.tcl
index 10d3bf8..941f15c 100644
--- a/tools/tclOOScript.tcl
+++ b/tools/tclOOScript.tcl
@@ -195,7 +195,7 @@
     #
     # ----------------------------------------------------------------------
 
-    proc define::classmethod {name {args {}} {body {}}} {
+    proc define::classmethod {name args} {
         # Create the method on the class if the caller gave arguments and body
         ::set argc [::llength [::info level 0]]
         ::if {$argc == 3} {
@@ -205,7 +205,7 @@
         }
         ::set cls [::uplevel 1 self]
         ::if {$argc == 4} {
-            ::oo::define [::oo::DelegateName $cls] method $name $args $body
+            ::oo::define [::oo::DelegateName $cls] method $name {*}$args
         }
         # Make the connection by forwarding
         ::tailcall forward $name myclass $name
-- 
cgit v0.12


From 7b395ecf512b54237e5fd3b5c243fd6a58996711 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Nov 2022 08:30:20 +0000
Subject: code cleanup (e.g. ProcGetIntRep -> ProcGetInternalRep, size_t ->
 Tcl_Size)

---
 generic/tclProc.c | 76 +++++++++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/generic/tclProc.c b/generic/tclProc.c
index acb520c..f5bd652 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -76,7 +76,7 @@ const Tcl_ObjType tclProcBodyType = {
 	Tcl_StoreInternalRep((objPtr), &tclProcBodyType, &ir);		\
     } while (0)
 
-#define ProcGetIntRep(objPtr, procPtr)					\
+#define ProcGetInternalRep(objPtr, procPtr)					\
     do {								\
 	const Tcl_ObjInternalRep *irPtr;					\
 	irPtr = TclFetchInternalRep((objPtr), &tclProcBodyType);		\
@@ -153,7 +153,7 @@ int
 Tcl_ProcObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    size_t objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Interp *iPtr = (Interp *) interp;
@@ -339,7 +339,7 @@ Tcl_ProcObjCmd(
     }
 
     if ((procArgs[0] == 'a') && (strncmp(procArgs, "args", 4) == 0)) {
-	size_t numBytes;
+	Tcl_Size numBytes;
 
 	procArgs +=4;
 	while (*procArgs != '\0') {
@@ -405,12 +405,12 @@ TclCreateProc(
     Interp *iPtr = (Interp *) interp;
 
     Proc *procPtr = NULL;
-    size_t i, numArgs;
+    Tcl_Size i, numArgs;
     CompiledLocal *localPtr = NULL;
     Tcl_Obj **argArray;
     int precompiled = 0, result;
 
-    ProcGetIntRep(bodyPtr, procPtr);
+    ProcGetInternalRep(bodyPtr, procPtr);
     if (procPtr != NULL) {
 	/*
 	 * Because the body is a TclProProcBody, the actual body is already
@@ -445,7 +445,7 @@ TclCreateProc(
 
 	if (Tcl_IsShared(bodyPtr)) {
 	    const char *bytes;
-	    size_t length;
+	    Tcl_Size length;
 	    Tcl_Obj *sharedBodyPtr = bodyPtr;
 
 	    bytes = Tcl_GetStringFromObj(bodyPtr, &length);
@@ -508,7 +508,7 @@ TclCreateProc(
 
     for (i = 0; i < numArgs; i++) {
 	const char *argname, *argnamei, *argnamelast;
-	size_t fieldCount, nameLength;
+	Tcl_Size fieldCount, nameLength;
 	Tcl_Obj **fieldValues;
 
 	/*
@@ -600,7 +600,7 @@ TclCreateProc(
 	     */
 
 	    if (localPtr->defValuePtr != NULL) {
-		size_t tmpLength, valueLength;
+		Tcl_Size tmpLength, valueLength;
 		const char *tmpPtr = Tcl_GetStringFromObj(localPtr->defValuePtr, &tmpLength);
 		const char *value = Tcl_GetStringFromObj(fieldValues[1], &valueLength);
 
@@ -865,7 +865,7 @@ badLevel:
 
 static int
 Uplevel_Callback(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -886,7 +886,7 @@ Uplevel_Callback(
 
 int
 Tcl_UplevelObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -920,7 +920,7 @@ TclNRUplevelObjCmd(
 	return TCL_ERROR;
     } else if (!TclHasStringRep(objv[1]) && objc == 2) {
 	int status;
-	size_t llength;
+	Tcl_Size llength;
 	status = TclListObjLengthM(interp, objv[1], &llength);
 	if (status == TCL_OK && llength > 1) {
 	    /* the first argument can't interpreted as a level. Avoid
@@ -1247,7 +1247,7 @@ TclFreeLocalCache(
     Tcl_Interp *interp,
     LocalCache *localCachePtr)
 {
-    size_t i;
+    Tcl_Size i;
     Tcl_Obj **namePtrPtr = &localCachePtr->varName0;
 
     for (i = 0; i < localCachePtr->numVars; i++, namePtrPtr++) {
@@ -1267,8 +1267,8 @@ InitLocalCache(
 {
     Interp *iPtr = procPtr->iPtr;
     ByteCode *codePtr;
-    size_t localCt = procPtr->numCompiledLocals;
-    size_t numArgs = procPtr->numArgs, i = 0;
+    Tcl_Size localCt = procPtr->numCompiledLocals;
+    Tcl_Size numArgs = procPtr->numArgs, i = 0;
 
     Tcl_Obj **namePtr;
     Var *varPtr;
@@ -1501,11 +1501,11 @@ InitArgsAndLocals(
 
 int
 TclPushProcCallFrame(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
-    size_t objc1,			/* Count of number of arguments to this
+    Tcl_Size objc,			/* Count of number of arguments to this
 				 * procedure. */
     Tcl_Obj *const objv[],	/* Argument value objects. */
     int isLambda)		/* 1 if this is a call by ApplyObjCmd: it
@@ -1516,7 +1516,6 @@ TclPushProcCallFrame(
     CallFrame *framePtr, **framePtrPtr;
     int result;
     ByteCode *codePtr;
-    int objc = objc1;
 
     /*
      * If necessary (i.e. if we haven't got a suitable compilation already
@@ -1597,7 +1596,7 @@ TclPushProcCallFrame(
 
 int
 TclObjInterpProc(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1614,7 +1613,7 @@ TclObjInterpProc(
 
 int
 TclNRInterpProc(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1633,7 +1632,7 @@ TclNRInterpProc(
 
 static int
 NRInterpProc2(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1652,7 +1651,7 @@ NRInterpProc2(
 
 static int
 ObjInterpProc2(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1691,7 +1690,7 @@ TclNRInterpProcCore(
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
     Tcl_Obj *procNameObj,	/* Procedure name for error reporting. */
-    size_t skip1,			/* Number of initial arguments to be skipped,
+    Tcl_Size skip,			/* Number of initial arguments to be skipped,
 				 * i.e., words in the "command name". */
     ProcErrorProc *errorProc)	/* How to convert results from the script into
 				 * results of the overall procedure. */
@@ -1701,7 +1700,6 @@ TclNRInterpProcCore(
     int result;
     CallFrame *freePtr;
     ByteCode *codePtr;
-    int skip = skip1;
 
     result = InitArgsAndLocals(interp, skip);
     if (result != TCL_OK) {
@@ -1716,7 +1714,7 @@ TclNRInterpProcCore(
 #if defined(TCL_COMPILE_DEBUG)
     if (tclTraceExec >= 1) {
 	CallFrame *framePtr = iPtr->varFramePtr;
-	size_t i;
+	Tcl_Size i;
 
 	if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) {
 	    fprintf(stdout, "Calling lambda ");
@@ -1734,9 +1732,9 @@ TclNRInterpProcCore(
 
 #ifdef USE_DTRACE
     if (TCL_DTRACE_PROC_ARGS_ENABLED()) {
-	size_t l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 	const char *a[10];
-	size_t i;
+	Tcl_Size i;
 
 	for (i = 0 ; i < 10 ; i++) {
 	    a[i] = (l < iPtr->varFramePtr->objc ?
@@ -1755,7 +1753,7 @@ TclNRInterpProcCore(
 	TclDecrRefCount(info);
     }
     if (TCL_DTRACE_PROC_ENTRY_ENABLED()) {
-	size_t l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 
 	TCL_DTRACE_PROC_ENTRY(l < iPtr->varFramePtr->objc ?
 		TclGetString(iPtr->varFramePtr->objv[l]) : NULL,
@@ -1763,7 +1761,7 @@ TclNRInterpProcCore(
 		(Tcl_Obj **)(iPtr->varFramePtr->objv + l + 1));
     }
     if (TCL_DTRACE_PROC_ENTRY_ENABLED()) {
-	size_t l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 
 	TCL_DTRACE_PROC_ENTRY(l < iPtr->varFramePtr->objc ?
 		TclGetString(iPtr->varFramePtr->objv[l]) : NULL,
@@ -1786,7 +1784,7 @@ TclNRInterpProcCore(
 
 static int
 InterpProcNR2(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -1797,7 +1795,7 @@ InterpProcNR2(
     ProcErrorProc *errorProc = (ProcErrorProc *)data[1];
 
     if (TCL_DTRACE_PROC_RETURN_ENABLED()) {
-	size_t l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 
 	TCL_DTRACE_PROC_RETURN(l < iPtr->varFramePtr->objc ?
 		TclGetString(iPtr->varFramePtr->objv[l]) : NULL, result);
@@ -1820,7 +1818,7 @@ InterpProcNR2(
 
     done:
     if (TCL_DTRACE_PROC_RESULT_ENABLED()) {
-	size_t l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 	Tcl_Obj *r = Tcl_GetObjResult(interp);
 
 	TCL_DTRACE_PROC_RESULT(l < iPtr->varFramePtr->objc ?
@@ -2079,7 +2077,7 @@ MakeProcError(
 				 * messages and trace information. */
 {
     unsigned int overflow, limit = 60;
-    size_t nameLen;
+    Tcl_Size nameLen;
     const char *procName = Tcl_GetStringFromObj(procNameObj, &nameLen);
 
     overflow = (nameLen > limit);
@@ -2111,7 +2109,7 @@ MakeProcError(
 
 void
 TclProcDeleteProc(
-    ClientData clientData)	/* Procedure to be deleted. */
+    void *clientData)	/* Procedure to be deleted. */
 {
     Proc *procPtr = (Proc *)clientData;
 
@@ -2350,7 +2348,7 @@ ProcBodyDup(
     Tcl_Obj *dupPtr)		/* Target object for the duplication. */
 {
     Proc *procPtr;
-    ProcGetIntRep(srcPtr, procPtr);
+    ProcGetInternalRep(srcPtr, procPtr);
 
     ProcSetIntRep(dupPtr, procPtr);
 }
@@ -2380,7 +2378,7 @@ ProcBodyFree(
 {
     Proc *procPtr;
 
-    ProcGetIntRep(objPtr, procPtr);
+    ProcGetInternalRep(objPtr, procPtr);
 
     if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
@@ -2443,7 +2441,7 @@ SetLambdaFromAny(
     const char *name;
     Tcl_Obj *argsPtr, *bodyPtr, *nsObjPtr, **objv;
     int isNew, result;
-    size_t objc;
+    Tcl_Size objc;
     CmdFrame *cfPtr = NULL;
     Proc *procPtr;
 
@@ -2650,7 +2648,7 @@ TclGetLambdaFromObj(
 
 int
 Tcl_ApplyObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2729,7 +2727,7 @@ TclNRApplyObjCmd(
 
 static int
 ApplyNR2(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -2765,7 +2763,7 @@ MakeLambdaError(
 				 * messages and trace information. */
 {
     unsigned int overflow, limit = 60;
-    size_t nameLen;
+    Tcl_Size nameLen;
     const char *procName = Tcl_GetStringFromObj(procNameObj, &nameLen);
 
     overflow = (nameLen > limit);
-- 
cgit v0.12


From 6ab05e04d1c2e4d0a473c114f67d7a8f1cab4dbd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Nov 2022 10:00:17 +0000
Subject: If CFLAGS contains -DTCL_NO_DEPRECATED, remove TclInitCompiledLocals.
 More code cleanup (backported from 9.0)

---
 generic/tclProc.c     | 96 +++++++++++++++++++++++++++------------------------
 generic/tclStubInit.c |  1 +
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/generic/tclProc.c b/generic/tclProc.c
index 1644376..b8c324e 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -84,7 +84,7 @@ const Tcl_ObjType tclProcBodyType = {
     } while (0)
 
 /*
- * The [upvar]/[uplevel] level reference type. Uses the longValue field
+ * The [upvar]/[uplevel] level reference type. Uses the wideValue field
  * to remember the integer value of a parsed #<integer> format.
  *
  * Uses the default behaviour throughout, and never disposes of the string
@@ -151,9 +151,9 @@ static const Tcl_ObjType lambdaType = {
 #undef TclObjInterpProc
 int
 Tcl_ProcObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Interp *iPtr = (Interp *) interp;
@@ -339,7 +339,7 @@ Tcl_ProcObjCmd(
     }
 
     if ((procArgs[0] == 'a') && (strncmp(procArgs, "args", 4) == 0)) {
-	int numBytes;
+	Tcl_Size numBytes;
 
 	procArgs +=4;
 	while (*procArgs != '\0') {
@@ -405,10 +405,10 @@ TclCreateProc(
     Interp *iPtr = (Interp *) interp;
 
     Proc *procPtr = NULL;
-    int i, result, numArgs;
+    Tcl_Size i, numArgs;
     CompiledLocal *localPtr = NULL;
     Tcl_Obj **argArray;
-    int precompiled = 0;
+    int precompiled = 0, result;
 
     ProcGetInternalRep(bodyPtr, procPtr);
     if (procPtr != NULL) {
@@ -445,7 +445,7 @@ TclCreateProc(
 
 	if (Tcl_IsShared(bodyPtr)) {
 	    const char *bytes;
-	    int length;
+	    Tcl_Size length;
 	    Tcl_Obj *sharedBodyPtr = bodyPtr;
 
 	    bytes = TclGetStringFromObj(bodyPtr, &length);
@@ -508,7 +508,7 @@ TclCreateProc(
 
     for (i = 0; i < numArgs; i++) {
 	const char *argname, *argnamei, *argnamelast;
-	int fieldCount, nameLength;
+	Tcl_Size fieldCount, nameLength;
 	Tcl_Obj **fieldValues;
 
 	/*
@@ -600,10 +600,9 @@ TclCreateProc(
 	     */
 
 	    if (localPtr->defValuePtr != NULL) {
-		const char *tmpPtr = TclGetString(localPtr->defValuePtr);
-		size_t tmpLength = localPtr->defValuePtr->length;
-		const char *value = TclGetString(fieldValues[1]);
-		size_t valueLength = fieldValues[1]->length;
+		Tcl_Size tmpLength, valueLength;
+		const char *tmpPtr = TclGetStringFromObj(localPtr->defValuePtr, &tmpLength);
+		const char *value = TclGetStringFromObj(fieldValues[1], &valueLength);
 
 		if ((valueLength != tmpLength)
 		     || memcmp(value, tmpPtr, tmpLength) != 0
@@ -866,7 +865,7 @@ badLevel:
 
 static int
 Uplevel_Callback(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -887,7 +886,7 @@ Uplevel_Callback(
 
 int
 Tcl_UplevelObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -897,7 +896,7 @@ Tcl_UplevelObjCmd(
 
 int
 TclNRUplevelObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -920,7 +919,8 @@ TclNRUplevelObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "?level? command ?arg ...?");
 	return TCL_ERROR;
     } else if (!TclHasStringRep(objv[1]) && objc == 2) {
-	int status ,llength;
+	int status;
+	Tcl_Size llength;
 	status = TclListObjLengthM(interp, objv[1], &llength);
 	if (status == TCL_OK && llength > 1) {
 	    /* the first argument can't interpreted as a level. Avoid
@@ -1141,6 +1141,7 @@ ProcWrongNumArgs(
  *----------------------------------------------------------------------
  */
 
+#ifndef TCL_NO_DEPRECATED
 void
 TclInitCompiledLocals(
     Tcl_Interp *interp,		/* Current interpreter. */
@@ -1167,6 +1168,7 @@ TclInitCompiledLocals(
 
     InitResolvedLocals(interp, codePtr, varPtr, nsPtr);
 }
+#endif /* TCL_NO_DEPRECATED */
 
 /*
  *----------------------------------------------------------------------
@@ -1299,7 +1301,7 @@ TclFreeLocalCache(
     Tcl_Interp *interp,
     LocalCache *localCachePtr)
 {
-    int i;
+    Tcl_Size i;
     Tcl_Obj **namePtrPtr = &localCachePtr->varName0;
 
     for (i = 0; i < localCachePtr->numVars; i++, namePtrPtr++) {
@@ -1319,8 +1321,8 @@ InitLocalCache(
 {
     Interp *iPtr = procPtr->iPtr;
     ByteCode *codePtr;
-    int localCt = procPtr->numCompiledLocals;
-    int numArgs = procPtr->numArgs, i = 0;
+    Tcl_Size localCt = procPtr->numCompiledLocals;
+    Tcl_Size numArgs = procPtr->numArgs, i = 0;
 
     Tcl_Obj **namePtr;
     Var *varPtr;
@@ -1483,7 +1485,7 @@ InitArgsAndLocals(
 
     varPtr->flags = 0;
     if (defPtr && defPtr->flags & VAR_IS_ARGS) {
-	Tcl_Obj *listPtr = Tcl_NewListObj(argCt-i, argObjs+i);
+	Tcl_Obj *listPtr = Tcl_NewListObj((argCt>i)? argCt-i : 0, argObjs+i);
 
 	varPtr->value.objPtr = listPtr;
 	Tcl_IncrRefCount(listPtr);	/* Local var is a reference. */
@@ -1553,11 +1555,11 @@ InitArgsAndLocals(
 
 int
 TclPushProcCallFrame(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
-    int objc,			/* Count of number of arguments to this
+    Tcl_Size objc,			/* Count of number of arguments to this
 				 * procedure. */
     Tcl_Obj *const objv[],	/* Argument value objects. */
     int isLambda)		/* 1 if this is a call by ApplyObjCmd: it
@@ -1648,7 +1650,7 @@ TclPushProcCallFrame(
 
 int
 TclObjInterpProc(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1665,7 +1667,7 @@ TclObjInterpProc(
 
 int
 TclNRInterpProc(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1684,7 +1686,7 @@ TclNRInterpProc(
 
 static int
 NRInterpProc2(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1703,7 +1705,7 @@ NRInterpProc2(
 
 static int
 ObjInterpProc2(
-    ClientData clientData,	/* Record describing procedure to be
+    void *clientData,	/* Record describing procedure to be
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
@@ -1742,7 +1744,7 @@ TclNRInterpProcCore(
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
     Tcl_Obj *procNameObj,	/* Procedure name for error reporting. */
-    int skip,			/* Number of initial arguments to be skipped,
+    Tcl_Size skip,			/* Number of initial arguments to be skipped,
 				 * i.e., words in the "command name". */
     ProcErrorProc *errorProc)	/* How to convert results from the script into
 				 * results of the overall procedure. */
@@ -1766,7 +1768,7 @@ TclNRInterpProcCore(
 #if defined(TCL_COMPILE_DEBUG)
     if (tclTraceExec >= 1) {
 	CallFrame *framePtr = iPtr->varFramePtr;
-	int i;
+	Tcl_Size i;
 
 	if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) {
 	    fprintf(stdout, "Calling lambda ");
@@ -1784,9 +1786,9 @@ TclNRInterpProcCore(
 
 #ifdef USE_DTRACE
     if (TCL_DTRACE_PROC_ARGS_ENABLED()) {
-	int l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 	const char *a[10];
-	int i;
+	Tcl_Size i;
 
 	for (i = 0 ; i < 10 ; i++) {
 	    a[i] = (l < iPtr->varFramePtr->objc ?
@@ -1805,7 +1807,7 @@ TclNRInterpProcCore(
 	TclDecrRefCount(info);
     }
     if (TCL_DTRACE_PROC_ENTRY_ENABLED()) {
-	int l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 
 	TCL_DTRACE_PROC_ENTRY(l < iPtr->varFramePtr->objc ?
 		TclGetString(iPtr->varFramePtr->objv[l]) : NULL,
@@ -1813,7 +1815,7 @@ TclNRInterpProcCore(
 		(Tcl_Obj **)(iPtr->varFramePtr->objv + l + 1));
     }
     if (TCL_DTRACE_PROC_ENTRY_ENABLED()) {
-	int l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 
 	TCL_DTRACE_PROC_ENTRY(l < iPtr->varFramePtr->objc ?
 		TclGetString(iPtr->varFramePtr->objv[l]) : NULL,
@@ -1836,7 +1838,7 @@ TclNRInterpProcCore(
 
 static int
 InterpProcNR2(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -1847,7 +1849,7 @@ InterpProcNR2(
     ProcErrorProc *errorProc = (ProcErrorProc *)data[1];
 
     if (TCL_DTRACE_PROC_RETURN_ENABLED()) {
-	int l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 
 	TCL_DTRACE_PROC_RETURN(l < iPtr->varFramePtr->objc ?
 		TclGetString(iPtr->varFramePtr->objv[l]) : NULL, result);
@@ -1870,7 +1872,7 @@ InterpProcNR2(
 
     done:
     if (TCL_DTRACE_PROC_RESULT_ENABLED()) {
-	int l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+	Tcl_Size l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
 	Tcl_Obj *r = Tcl_GetObjResult(interp);
 
 	TCL_DTRACE_PROC_RESULT(l < iPtr->varFramePtr->objc ?
@@ -2128,13 +2130,14 @@ MakeProcError(
     Tcl_Obj *procNameObj)	/* Name of the procedure. Used for error
 				 * messages and trace information. */
 {
-    int overflow, limit = 60, nameLen;
+    int overflow, limit = 60;
+    Tcl_Size nameLen;
     const char *procName = TclGetStringFromObj(procNameObj, &nameLen);
 
     overflow = (nameLen > limit);
     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 	    "\n    (procedure \"%.*s%s\" line %d)",
-	    (overflow ? limit : nameLen), procName,
+	    (overflow ? limit : (int)nameLen), procName,
 	    (overflow ? "..." : ""), Tcl_GetErrorLine(interp)));
 }
 
@@ -2160,7 +2163,7 @@ MakeProcError(
 
 void
 TclProcDeleteProc(
-    ClientData clientData)	/* Procedure to be deleted. */
+    void *clientData)	/* Procedure to be deleted. */
 {
     Proc *procPtr = (Proc *)clientData;
 
@@ -2317,7 +2320,8 @@ TclUpdateReturnInfo(
  *	of a function exported by a DLL exist.
  *
  * Results:
- *	Returns the internal address of the TclObjInterpProc function.
+ *	Returns the internal address of the TclObjInterpProc/ObjInterpProc2
+ *	functions.
  *
  * Side effects:
  *	None.
@@ -2490,7 +2494,8 @@ SetLambdaFromAny(
     Interp *iPtr = (Interp *) interp;
     const char *name;
     Tcl_Obj *argsPtr, *bodyPtr, *nsObjPtr, **objv;
-    int isNew, objc, result;
+    int isNew, result;
+    Tcl_Size objc;
     CmdFrame *cfPtr = NULL;
     Proc *procPtr;
 
@@ -2697,7 +2702,7 @@ TclGetLambdaFromObj(
 
 int
 Tcl_ApplyObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2707,7 +2712,7 @@ Tcl_ApplyObjCmd(
 
 int
 TclNRApplyObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2776,7 +2781,7 @@ TclNRApplyObjCmd(
 
 static int
 ApplyNR2(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -2811,13 +2816,14 @@ MakeLambdaError(
     Tcl_Obj *procNameObj)	/* Name of the procedure. Used for error
 				 * messages and trace information. */
 {
-    int overflow, limit = 60, nameLen;
+    int overflow, limit = 60;
+    Tcl_Size nameLen;
     const char *procName = TclGetStringFromObj(procNameObj, &nameLen);
 
     overflow = (nameLen > limit);
     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 	    "\n    (lambda term \"%.*s%s\" line %d)",
-	    (overflow ? limit : nameLen), procName,
+	    (overflow ? limit : (int)nameLen), procName,
 	    (overflow ? "..." : ""), Tcl_GetErrorLine(interp)));
 }
 
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 6d50a46..1ffe916 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -380,6 +380,7 @@ mp_err	TclBN_mp_mul_d(const mp_int *a, unsigned int b, mp_int *c) {
 #   define TclGetLoadedPackages 0
 #   undef TclSetPreInitScript
 #   define TclSetPreInitScript 0
+#   define TclInitCompiledLocals 0
 #else
 
 #define TclGuessPackageName guessPackageName
-- 
cgit v0.12


From 366778e86ecc27d557a56047f3f6d12439f67cf8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Nov 2022 13:18:42 +0000
Subject: Fix [00cced7b87]: Incorrect handling of indices > 0x80000000 in byte
 compiler (64-bit Tcl)

---
 generic/tclUtil.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 1ac2b31..577c45a 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3751,7 +3751,17 @@ TclIndexEncode(
 	 * We parsed an end+offset index value.
 	 * wide holds the offset value in the range WIDE_MIN...WIDE_MAX.
 	 */
-	if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
+	if (irPtr ? ((wide < INT_MIN) && ((size_t)-wide <= LIST_MAX))
+		: ((wide > INT_MAX) && ((size_t)wide <= LIST_MAX))) {
+	    if (interp) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"index \"%s\" out of range",
+			TclGetString(objPtr)));
+		Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX"
+			"OUTOFRANGE", NULL);
+	    }
+	    return TCL_ERROR;
+	} else if (wide > (unsigned)(irPtr ? TCL_INDEX_END : INT_MAX)) {
 	    /*
 	     * All end+postive or end-negative expressions
 	     * always indicate "after the end".
-- 
cgit v0.12


From 0dfd2bdc9def2f625b73fa3f8ca501d68ab24f98 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 2 Nov 2022 15:56:42 +0000
Subject: Bug #0f98bce669 - string repeat support for > 2**31 characters

---
 generic/tcl.h          |  5 +++--
 generic/tclCmdMZ.c     |  4 ++--
 generic/tclStringObj.c | 22 +++++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index cb781a6..be39d2f 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -664,10 +664,11 @@ typedef union Tcl_ObjInternalRep {	/* The internal representation: */
  * or both.
  */
 #if TCL_MAJOR_VERSION > 8
-#   define Tcl_Size size_t
+typedef size_t Tcl_Size;
 #else
-#   define Tcl_Size int
+typedef int Tcl_Size;
 #endif
+#define TCL_SIZE_SMAX ((((Tcl_Size) 1) << ((8*sizeof(Tcl_Size)) - 1)) - 1)
 
 
 typedef struct Tcl_Obj {
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 8a08f53..83e5647 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -2337,7 +2337,7 @@ StringReptCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int count;
+    Tcl_WideInt count;
     Tcl_Obj *resultPtr;
 
     if (objc != 3) {
@@ -2345,7 +2345,7 @@ StringReptCmd(
 	return TCL_ERROR;
     }
 
-    if (TclGetIntFromObj(interp, objv[2], &count) != TCL_OK) {
+    if (TclGetWideIntFromObj(interp, objv[2], &count) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index cf23aab..60dfa4d 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2933,6 +2933,7 @@ TclStringRepeat(
     int inPlace = flags & TCL_STRING_IN_PLACE;
     size_t length = 0, unichar = 0, done = 1;
     int binary = TclIsPureByteArray(objPtr);
+    size_t maxCount;
 
     /* assert (count >= 2) */
 
@@ -2955,12 +2956,17 @@ TclStringRepeat(
     if (binary) {
 	/* Result will be pure byte array. Pre-size it */
 	(void)Tcl_GetByteArrayFromObj(objPtr, &length);
-    } else if (unichar) {
+	maxCount = TCL_SIZE_SMAX;
+    }
+    else if (unichar) {
 	/* Result will be pure Tcl_UniChar array. Pre-size it. */
 	(void)Tcl_GetUnicodeFromObj(objPtr, &length);
-    } else {
+	maxCount = TCL_SIZE_SMAX/sizeof(Tcl_UniChar);
+    }
+    else {
 	/* Result will be concat of string reps. Pre-size it. */
 	(void)Tcl_GetStringFromObj(objPtr, &length);
+	maxCount = TCL_SIZE_SMAX;
     }
 
     if (length == 0) {
@@ -2968,10 +2974,14 @@ TclStringRepeat(
 	return objPtr;
     }
 
-    if (count > INT_MAX/length) {
+    /* maxCount includes space for null */
+    if (count > (maxCount-1)) {
 	if (interp) {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "max size for a Tcl value (%d bytes) exceeded", INT_MAX));
+	    Tcl_SetObjResult(
+		interp,
+		Tcl_ObjPrintf("max size for a Tcl value (%u" TCL_Z_MODIFIER
+			      " bytes) exceeded",
+			      TCL_SIZE_SMAX));
 	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	}
 	return NULL;
@@ -2982,6 +2992,7 @@ TclStringRepeat(
 	objResultPtr = (!inPlace || Tcl_IsShared(objPtr)) ?
 		Tcl_DuplicateObj(objPtr) : objPtr;
 
+	/* Allocate count*length space */
 	Tcl_SetByteArrayLength(objResultPtr, count*length); /* PANIC? */
 	Tcl_SetByteArrayLength(objResultPtr, length);
 	while (count - done > done) {
@@ -3049,6 +3060,7 @@ TclStringRepeat(
 		(count - done) * length);
     }
     return objResultPtr;
+
 }
 
 /*
-- 
cgit v0.12


From 3920a8f42ae243f7c84d2101438263da7583793b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Nov 2022 16:02:07 +0000
Subject: Fix [d2c2baac2]: Tcl 9 32-bit build exits immediately with stack
 overflow on Windows

---
 generic/tclDecls.h    | 2 +-
 generic/tclStubInit.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 56cd7e8..273e2e1 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4159,7 +4159,7 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
 		: tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
-#else
+#elif !defined(BUILD_tcl)
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
 		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
 		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 4b13d06..4b2fd30 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -55,6 +55,13 @@
 #undef TclSockMinimumBuffers
 #undef Tcl_SetIntObj
 #undef Tcl_SetLongObj
+#undef Tcl_ListObjGetElements
+#undef Tcl_ListObjLength
+#undef Tcl_DictObjSize
+#undef Tcl_SplitList
+#undef Tcl_SplitPath
+#undef Tcl_FSSplitPath
+#undef Tcl_ParseArgsObjv
 #undef TclpInetNtoa
 #undef TclWinGetServByName
 #undef TclWinGetSockOpt
-- 
cgit v0.12


From 330034ec028701d182ab255424084a9a5a9b5499 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Nov 2022 16:20:27 +0000
Subject: Make Tcl_WCharToUtfDString() usable (again) on Windows. Was lost due
 to previous commit

---
 generic/tclDecls.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 273e2e1..8040adf 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4159,7 +4159,7 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
 		: tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
-#elif !defined(BUILD_tcl)
+#else
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
 		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
 		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
@@ -4172,6 +4172,7 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
 		? (Tcl_Size (*)(wchar_t *))Tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
+#if !defined(BUILD_tcl)
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? TclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
 		: (Tcl_ListObjGetElements)((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)))
@@ -4193,6 +4194,7 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? TclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
 		: (Tcl_ParseArgsObjv)((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
+#endif /* !defined(BUILD_tcl) */
 #endif
 
 /*
-- 
cgit v0.12


From 59ee35fd388827c8ca20bf08a63bd827a42519ec Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Nov 2022 16:25:59 +0000
Subject: Fix testcase failure (assemble-15.9), only seen on 32-bit

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

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 577c45a..92dac30 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3751,8 +3751,8 @@ TclIndexEncode(
 	 * We parsed an end+offset index value.
 	 * wide holds the offset value in the range WIDE_MIN...WIDE_MAX.
 	 */
-	if (irPtr ? ((wide < INT_MIN) && ((size_t)-wide <= LIST_MAX))
-		: ((wide > INT_MAX) && ((size_t)wide <= LIST_MAX))) {
+	if ((irPtr ? ((wide < INT_MIN) && ((size_t)-wide <= LIST_MAX))
+		: ((wide > INT_MAX) && ((size_t)wide <= LIST_MAX))) && (sizeof(int) != sizeof(size_t))) {
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"index \"%s\" out of range",
-- 
cgit v0.12


From 5a3d2ddfede6842bc089bd78d0c80fad82f911b0 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 2 Nov 2022 16:28:59 +0000
Subject: Bug #0f98bce669 - string cat support for > 2**31 characters. Tests
 pending

---
 generic/tcl.h          |  1 -
 generic/tclInt.h       |  5 +++++
 generic/tclStringObj.c | 14 ++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index be39d2f..706c5f1 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -668,7 +668,6 @@ typedef size_t Tcl_Size;
 #else
 typedef int Tcl_Size;
 #endif
-#define TCL_SIZE_SMAX ((((Tcl_Size) 1) << ((8*sizeof(Tcl_Size)) - 1)) - 1)
 
 
 typedef struct Tcl_Obj {
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a7985f7..39ddef2 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -105,6 +105,11 @@
 #endif
 
 /*
+ * Maximum *signed* value that can be stored in a Tcl_Size type.
+ */
+#define TCL_SIZE_SMAX ((((Tcl_Size) 1) << ((8*sizeof(Tcl_Size)) - 1)) - 1)
+
+/*
  * Macros used to cast between pointers and integers (e.g. when storing an int
  * in ClientData), on 64-bit architectures they avoid gcc warning about "cast
  * to/from pointer from/to integer of different size".
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 60dfa4d..008ece9 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -3089,7 +3089,7 @@ TclStringCat(
 {
     Tcl_Obj *objResultPtr, * const *ov;
     int oc, binary = 1;
-	size_t length = 0;
+    size_t length = 0;
     int allowUniChar = 1, requestUniChar = 0, forceUniChar = 0;
     int first = objc - 1;	/* Index of first value possibly not empty */
     int last = 0;		/* Index of last value possibly not empty */
@@ -3171,6 +3171,9 @@ TclStringCat(
 		    if (length == 0) {
 			first = last;
 		    }
+		    if (length > (TCL_SIZE_SMAX-numBytes)) {
+			goto overflow;
+		    }
 		    length += numBytes;
 		}
 	    }
@@ -3194,6 +3197,9 @@ TclStringCat(
 		    if (length == 0) {
 			first = last;
 		    }
+		    if (length > ((TCL_SIZE_SMAX/sizeof(Tcl_UniChar))-numChars)) {
+			goto overflow;
+		    }
 		    length += numChars;
 		}
 	    }
@@ -3258,7 +3264,7 @@ TclStringCat(
 		    if (numBytes) {
 			first = last;
 		    }
-		} else if (numBytes + length > (size_t)INT_MAX) {
+		} else if (numBytes > (TCL_SIZE_SMAX - length)) {
 		    goto overflow;
 		}
 		length += numBytes;
@@ -3275,7 +3281,7 @@ TclStringCat(
 	    numBytes = objPtr->length;
 	    if (numBytes) {
 		last = objc - oc;
-		if (numBytes + length > (size_t)INT_MAX) {
+		if (numBytes > (TCL_SIZE_SMAX - length)) {
 		    goto overflow;
 		}
 		length += numBytes;
@@ -3434,7 +3440,7 @@ TclStringCat(
   overflow:
     if (interp) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "max size for a Tcl value (%d bytes) exceeded", INT_MAX));
+		    "max size for a Tcl value (%u" TCL_Z_MODIFIER " bytes) exceeded", TCL_SIZE_SMAX));
 	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
     }
     return NULL;
-- 
cgit v0.12


From 9cc14dacd9e5389835ce195da4375592572f5a45 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 Nov 2022 08:15:19 +0000
Subject: Fix formatting of error-message

---
 generic/tclStringObj.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 008ece9..f8b795e 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2979,8 +2979,8 @@ TclStringRepeat(
 	if (interp) {
 	    Tcl_SetObjResult(
 		interp,
-		Tcl_ObjPrintf("max size for a Tcl value (%u" TCL_Z_MODIFIER
-			      " bytes) exceeded",
+		Tcl_ObjPrintf("max size for a Tcl value (%" TCL_Z_MODIFIER
+			      "u bytes) exceeded",
 			      TCL_SIZE_SMAX));
 	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	}
@@ -3440,7 +3440,7 @@ TclStringCat(
   overflow:
     if (interp) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "max size for a Tcl value (%u" TCL_Z_MODIFIER " bytes) exceeded", TCL_SIZE_SMAX));
+		    "max size for a Tcl value (%" TCL_Z_MODIFIER "u bytes) exceeded", TCL_SIZE_SMAX));
 	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
     }
     return NULL;
-- 
cgit v0.12


From 6559f4084e844e187198c5471bfd15f19c8dfecc Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 3 Nov 2022 12:26:41 +0000
Subject: Bug [0f98bce669]. Fix limits for string replace.

---
 generic/tclCmdMZ.c     | 3 +++
 generic/tclInt.h       | 3 ++-
 generic/tclStringObj.c | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 83e5647..f94d914 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -2437,6 +2437,9 @@ StringRplcCmd(
 		last + 1 - first, (objc == 5) ? objv[4] : NULL,
 		TCL_STRING_IN_PLACE);
 
+	if (resultPtr == NULL) {
+	    return TCL_ERROR;
+	}
 	Tcl_SetObjResult(interp, resultPtr);
     }
     return TCL_OK;
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 39ddef2..a17ce7d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -105,7 +105,8 @@
 #endif
 
 /*
- * Maximum *signed* value that can be stored in a Tcl_Size type.
+ * Maximum *signed* value that can be stored in a Tcl_Size type. This is
+ * primarily used for checking overflows in dynamically allocating memory.
  */
 #define TCL_SIZE_SMAX ((((Tcl_Size) 1) << ((8*sizeof(Tcl_Size)) - 1)) - 1)
 
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index f8b795e..7c0d626 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -4100,11 +4100,11 @@ TclStringReplace(
 		return objPtr;
 	    }
 
-	    if ((size_t)newBytes > INT_MAX - (numBytes - count)) {
+	    if (newBytes > (TCL_SIZE_SMAX - (numBytes - count))) {
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "max size for a Tcl value (%d bytes) exceeded",
-			    INT_MAX));
+			    "max size for a Tcl value (%" TCL_Z_MODIFIER "u bytes) exceeded",
+			    TCL_SIZE_SMAX));
 		    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 		}
 		return NULL;
@@ -4139,7 +4139,7 @@ TclStringReplace(
 	if (insertPtr) {
 	    Tcl_AppendObjToObj(result, insertPtr);
 	}
-	if (first + count < (size_t)numChars) {
+	if ((first + count) < numChars) {
 	    Tcl_AppendUnicodeToObj(result, ustring + first + count,
 		    numChars - first - count);
 	}
-- 
cgit v0.12


From f768eb3bf2d09ebf310ed07f664dc114e1c1412d Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 3 Nov 2022 17:04:07 +0000
Subject: Rewrite lreplace4 implementation not to need extra immediate
 operands.

---
 generic/tclBasic.c      |   2 +-
 generic/tclCompCmdsGR.c | 210 +++++++++---------------------------------------
 generic/tclCompile.c    |  13 +--
 generic/tclCompile.h    |  10 ++-
 generic/tclExecute.c    | 129 ++++++++++++++++++-----------
 generic/tclInt.h        |   3 -
 6 files changed, 135 insertions(+), 232 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index a1eb4cc..80dc416 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -310,7 +310,7 @@ static const CmdInfo builtInCmds[] = {
     {"join",		Tcl_JoinObjCmd,		NULL,			NULL,	CMD_IS_SAFE},
     {"lappend",		Tcl_LappendObjCmd,	TclCompileLappendCmd,	NULL,	CMD_IS_SAFE},
     {"lassign",		Tcl_LassignObjCmd,	TclCompileLassignCmd,	NULL,	CMD_IS_SAFE},
-    {"ledit",		Tcl_LeditObjCmd,	TclCompileLeditCmd,	NULL,	CMD_IS_SAFE},
+    {"ledit",		Tcl_LeditObjCmd,	NULL,	NULL,	CMD_IS_SAFE},
     {"lindex",		Tcl_LindexObjCmd,	TclCompileLindexCmd,	NULL,	CMD_IS_SAFE},
     {"linsert",		Tcl_LinsertObjCmd,	TclCompileLinsertCmd,	NULL,	CMD_IS_SAFE},
     {"list",		Tcl_ListObjCmd,		TclCompileListCmd,	NULL,	CMD_IS_SAFE|CMD_COMPILES_EXPANDED},
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index bf6288a..2681d01 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1036,124 +1036,6 @@ TclCompileLassignCmd(
 /*
  *----------------------------------------------------------------------
  *
- * TclCompileLeditCmd --
- *
- *	How to compile the "ledit" command. We only bother with the case
- *	where the index is constant.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileLeditCmd(
-    Tcl_Interp *interp,		/* Tcl interpreter for context. */
-    Tcl_Parse *parsePtr,	/* Points to a parse structure for the
-				 * command. */
-    TCL_UNUSED(Command *),
-    CompileEnv *envPtr)		/* Holds the resulting instructions. */
-{
-    DefineLineInformation;	/* TIP #280 */
-    Tcl_Token *tokenPtr, *varTokenPtr;
-    int localIndex;             /* Index of var in local var table. */
-    int isScalar;		/* Flag == 1 if scalar, 0 if array. */
-    int tempDepth;		/* Depth used for emitting one part of the
-				 * code burst. */
-    int first, last, i, end_indicator;
-
-    if (parsePtr->numWords < 4) {
-	return TCL_ERROR;
-    }
-    varTokenPtr = TokenAfter(parsePtr->tokenPtr);
-
-    tokenPtr = TokenAfter(varTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_NONE,
-	    &first) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_NONE, TCL_INDEX_END,
-	    &last) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    end_indicator = 1; /* "end" means last element by default */
-    if (first == (int)TCL_INDEX_NONE) {
-	/* first == TCL_INDEX_NONE => Range after last element. */
-	first = TCL_INDEX_END; /* Insert at end where ... */
-	end_indicator = 0;     /* ... end means AFTER last element */
-	last = TCL_INDEX_NONE; /* Informs lreplace, nothing to replace */
-    }
-
-    PushVarNameWord(interp, varTokenPtr, envPtr, 0,
-	    &localIndex, &isScalar, 1);
-
-    /* Duplicate the variable name if it's been pushed. */
-    if (localIndex < 0) {
-	if (isScalar) {
-	    tempDepth = 0;
-	} else {
-	    tempDepth = 1;
-	}
-	TclEmitInstInt4(INST_OVER, tempDepth, envPtr);
-    }
-
-    /* Duplicate an array index if one's been pushed. */
-    if (!isScalar) {
-	if (localIndex < 0) {
-	    tempDepth = 1;
-	} else {
-	    tempDepth = parsePtr->numWords - 2;
-	}
-	TclEmitInstInt4(INST_OVER, tempDepth, envPtr);
-    }
-
-    /* Emit code to load the variable's value.  */
-    if (isScalar) {
-	if (localIndex < 0) {
-	    TclEmitOpcode(INST_LOAD_STK, envPtr);
-	} else {
-	    Emit14Inst(INST_LOAD_SCALAR, localIndex, envPtr);
-	}
-    } else {
-	if (localIndex < 0) {
-	    TclEmitOpcode(INST_LOAD_ARRAY_STK, envPtr);
-	} else {
-	    Emit14Inst(INST_LOAD_ARRAY, localIndex, envPtr);
-	}
-    }
-
-    for (i=4 ; i<parsePtr->numWords ; ++i) {
-	tokenPtr = TokenAfter(tokenPtr);
-	CompileWord(envPtr, tokenPtr, interp, i);
-    }
-
-    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 3, envPtr);
-    TclEmitInt4(end_indicator, envPtr);
-    TclEmitInt4(first, envPtr);
-    TclEmitInt4(last, envPtr);
-    
-    /* Emit code to put the value back in the variable. */
-
-    if (isScalar) {
-	if (localIndex < 0) {
-	    TclEmitOpcode(INST_STORE_STK, envPtr);
-	} else {
-	    Emit14Inst(INST_STORE_SCALAR, localIndex, envPtr);
-	}
-    } else {
-	if (localIndex < 0) {
-	    TclEmitOpcode(INST_STORE_ARRAY_STK, envPtr);
-	} else {
-	    Emit14Inst(INST_STORE_ARRAY, localIndex, envPtr);
-	}
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TclCompileLindexCmd --
  *
  *	Procedure called to compile the "lindex" command.
@@ -1473,42 +1355,34 @@ TclCompileLinsertCmd(
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
     DefineLineInformation;	/* TIP #280 */
-    Tcl_Token *tokenPtr, *listTokenPtr;
-    int idx, i;
+    Tcl_Token *tokenPtr;
+    int i;
 
     if (parsePtr->numWords < 3) {
 	return TCL_ERROR;
     }
-    listTokenPtr = TokenAfter(parsePtr->tokenPtr);
-
-    tokenPtr = TokenAfter(listTokenPtr);
-
-    /*
-     * This command treats all inserts at indices before the list
-     * the same as inserts at the start of the list, and all inserts
-     * after the list the same as inserts at the end of the list. We
-     * make that transformation here so we can use the optimized bytecode
-     * as much as possible.
-     */
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_END, &idx)
-	!= TCL_OK) {
-	/* Not a constant index. */
-	return TCL_ERROR;
-    }
-
-    CompileWord(envPtr, listTokenPtr, interp, 1);
+    
+    /* Push list, insertion index onto the stack */
+    tokenPtr = TokenAfter(parsePtr->tokenPtr);
+    CompileWord(envPtr, tokenPtr, interp, 1);
+    tokenPtr = TokenAfter(tokenPtr);
+    CompileWord(envPtr, tokenPtr, interp, 2);
 
+    /* Push new elements to be inserted */
     for (i=3 ; i<parsePtr->numWords ; i++) {
 	tokenPtr = TokenAfter(tokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, i);
     }
 
-    /* First operand is count of new elements */
-    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 2, envPtr);
-    TclEmitInt4(0, envPtr); /* "end" refers to position AFTER last element */
-    TclEmitInt4(idx, envPtr);/* Insertion point (also start of range to delete) */
-    TclEmitInt4(TCL_INDEX_NONE, envPtr); /* End of range to delete.
-					    TCL_INDEX_NONE => no deletions */
+    /* First operand is count of arguments */
+    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 1, envPtr);
+    /* 
+     * Second operand is bitmask
+     *  TCL_LREPLACE4_END_IS_LAST - end refers to last element
+     *  TCL_LREPLACE4_SINGLE_INDEX - second index is not present
+     *     indicating this is a pure insert
+     */
+    TclEmitInt1(TCL_LREPLACE4_SINGLE_INDEX, envPtr);
 
     return TCL_OK;
 }
@@ -1533,46 +1407,38 @@ TclCompileLreplaceCmd(
     CompileEnv *envPtr)		/* Holds the resulting instructions. */
 {
     DefineLineInformation;	/* TIP #280 */
-    Tcl_Token *tokenPtr, *listTokenPtr;
-    int first, last, i, end_indicator;
+    Tcl_Token *tokenPtr;
+    int i;
 
     if (parsePtr->numWords < 4) {
 	return TCL_ERROR;
     }
-    listTokenPtr = TokenAfter(parsePtr->tokenPtr);
-
-    tokenPtr = TokenAfter(listTokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_START, TCL_INDEX_NONE,
-	    &first) != TCL_OK) {
-	return TCL_ERROR;
-    }
 
+    /* Push list, first, last onto the stack */
+    tokenPtr = TokenAfter(parsePtr->tokenPtr);
+    CompileWord(envPtr, tokenPtr, interp, 1);
     tokenPtr = TokenAfter(tokenPtr);
-    if (TclGetIndexFromToken(tokenPtr, TCL_INDEX_NONE, TCL_INDEX_END,
-	    &last) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    end_indicator = 1; /* "end" means last element by default */
-    if (first == (int)TCL_INDEX_NONE) {
-	/* Special case: first == TCL_INDEX_NONE => Range after last element. */
-	first = TCL_INDEX_END; /* Insert at end where ... */
-	end_indicator = 0;     /* ... end means AFTER last element */
-	last = TCL_INDEX_NONE; /* Informs lreplace, nothing to replace */
-    }
-
-    CompileWord(envPtr, listTokenPtr, interp, 1);
+    CompileWord(envPtr, tokenPtr, interp, 2);
+    tokenPtr = TokenAfter(tokenPtr);
+    CompileWord(envPtr, tokenPtr, interp, 3);
 
+    /* Push new elements to be inserted */
     for (i=4 ; i<parsePtr->numWords ; i++) {
 	tokenPtr = TokenAfter(tokenPtr);
 	CompileWord(envPtr, tokenPtr, interp, i);
     }
 
-    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 3, envPtr);
-    TclEmitInt4(end_indicator, envPtr);
-    TclEmitInt4(first, envPtr);
-    TclEmitInt4(last, envPtr);
-    return TCL_OK;}
-
+    /* First operand is count of arguments */
+    TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 1, envPtr);
+    /* 
+     * Second operand is bitmask
+     *  TCL_LREPLACE4_END_IS_LAST - end refers to last element
+     */
+    TclEmitInt1(TCL_LREPLACE4_END_IS_LAST, envPtr);
+
+    return TCL_OK;
+}
+
 /*
  *----------------------------------------------------------------------
  *
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 57e2d71..2dd0718 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -675,12 +675,13 @@ InstructionDesc const tclInstructionTable[] = {
 	/* String Less or equal:	push (stknext <= stktop) */
     {"strge",		  1,   -1,         0,	{OPERAND_NONE}},
 	/* String Greater or equal:	push (stknext >= stktop) */
-    {"lreplace4",	  17,   INT_MIN,    4,	{OPERAND_UINT4, OPERAND_UINT4, OPERAND_INT4, OPERAND_INT4}},
-	/* Operands: number of arguments, end_indicator, firstIdx, lastIdx
-	 * end_indicator: 1 if "end" is treated as index of last element, 
-	 *                0 if "end" is position after last element
-	 * firstIdx,lastIdx: range of elements to delete
-	 * Stack: ... listobj new1 ... newN => ... newlistobj */
+    {"lreplace4",	  6,   INT_MIN,    2,	{OPERAND_UINT4, OPERAND_UINT1}},
+	/* Operands: number of arguments, flags
+	 * flags: Combination of TCL_LREPLACE4_* flags
+	 * Stack: ... listobj index1 ?index2? new1 ... newN => ... newlistobj 
+	 * where index2 is present only if TCL_LREPLACE_SINGLE_INDEX is not
+	 * set in flags.
+	 */
 
     {NULL, 0, 0, 0, {OPERAND_NONE}}
 };
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 9633050..71ceede 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -848,7 +848,7 @@ typedef struct ByteCode {
 #define INST_STR_LE			193
 #define INST_STR_GE			194
 
-#define INST_LREPLACE4                   195
+#define INST_LREPLACE4			195
 
 /* The last opcode */
 #define LAST_INST_OPCODE		195
@@ -862,7 +862,7 @@ typedef struct ByteCode {
  * instruction.
  */
 
-#define MAX_INSTRUCTION_OPERANDS 4
+#define MAX_INSTRUCTION_OPERANDS 2
 
 typedef enum InstOperandType {
     OPERAND_NONE,
@@ -1685,6 +1685,12 @@ MODULE_SCOPE int	TclPushProcCallFrame(void *clientData,
 #define TCL_NO_ELEMENT 2	/* Do not push the array element. */
 
 /*
+ * Flags bits used by lreplace4 instruction
+ */
+#define TCL_LREPLACE4_END_IS_LAST  1 /* "end" refers to last element */
+#define TCL_LREPLACE4_SINGLE_INDEX 2 /* Second index absent (pure insert) */
+
+/*
  * DTrace probe macros (NOPs if DTrace support is not enabled).
  */
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 2713093..a8d9d57 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5246,61 +5246,94 @@ TEBCresume(
 
     case INST_LREPLACE4:
 	{
-	    int firstIdx, lastIdx, numToDelete, numNewElems, end_indicator;
-	    opnd = TclGetInt4AtPtr(pc + 1);
-	    end_indicator = TclGetInt4AtPtr(pc + 5);
-	    firstIdx = TclGetInt4AtPtr(pc + 9);
-	    lastIdx = TclGetInt4AtPtr(pc + 13);
-	    numNewElems = opnd - 1;
-	    valuePtr = OBJ_AT_DEPTH(numNewElems);
-	    if (Tcl_ListObjLength(interp, valuePtr, &length) != TCL_OK) {
+	int numToDelete, numNewElems, end_indicator;
+	int haveSecondIndex, flags;
+	Tcl_Obj *fromIdxObj, *toIdxObj;
+	opnd = TclGetInt4AtPtr(pc + 1);
+	flags = TclGetInt1AtPtr(pc + 5);
+
+	/* Stack: ... listobj index1 ?index2? new1 ... newN */
+	valuePtr = OBJ_AT_DEPTH(opnd-1);
+
+	/* haveSecondIndex==0 => pure insert */
+	haveSecondIndex = (flags & TCL_LREPLACE4_SINGLE_INDEX) == 0;
+	numNewElems = opnd - 2 - haveSecondIndex;
+
+	/* end_indicator==1 => "end" is last element's index, 0=>index beyond */
+	end_indicator = (flags & TCL_LREPLACE4_END_IS_LAST) != 0;
+	fromIdxObj = OBJ_AT_DEPTH(opnd - 2);
+	toIdxObj = haveSecondIndex ? OBJ_AT_DEPTH(opnd - 3) : NULL;
+	if (Tcl_ListObjLength(interp, valuePtr, &length) != TCL_OK) {
+	    TRACE_ERROR(interp);
+	    goto gotError;
+	}
+
+	DECACHE_STACK_INFO();
+
+	if (TclGetIntForIndexM(
+		interp, fromIdxObj, length - end_indicator, &fromIdx)
+	    != TCL_OK) {
+	    CACHE_STACK_INFO();
+	    TRACE_ERROR(interp);
+	    goto gotError;
+	}
+	if (fromIdx == TCL_INDEX_NONE) {
+	    fromIdx = 0;
+	}
+	else if (fromIdx > length) {
+	    fromIdx = length;
+	}
+	numToDelete = 0;
+	if (toIdxObj) {
+	    if (TclGetIntForIndexM(
+		    interp, toIdxObj, length - end_indicator, &toIdx)
+		!= TCL_OK) {
+		CACHE_STACK_INFO();
 		TRACE_ERROR(interp);
 		goto gotError;
 	    }
-	    firstIdx = TclIndexDecode(firstIdx, length-end_indicator);
-	    if (firstIdx == TCL_INDEX_NONE) {
-		firstIdx = 0;
-	    } else if (firstIdx > length) {
-		firstIdx = length;
-	    }
-	    numToDelete = 0;
-	    if (lastIdx != TCL_INDEX_NONE) {
-		lastIdx = TclIndexDecode(lastIdx, length - end_indicator);
-		if (lastIdx >= firstIdx) {
-		    numToDelete = lastIdx - firstIdx + 1;
-		}
+	    if (toIdx > length) {
+		toIdx = length;
 	    }
-	    if (Tcl_IsShared(valuePtr)) {
-		objResultPtr = Tcl_DuplicateObj(valuePtr);
-		if (Tcl_ListObjReplace(interp,
-				       objResultPtr,
-				       firstIdx,
-				       numToDelete,
-				       numNewElems,
-				       &OBJ_AT_DEPTH(numNewElems-1))
-		    != TCL_OK) {
-		    TRACE_ERROR(interp);
-		    Tcl_DecrRefCount(objResultPtr);
-		    goto gotError;
-		}
-		TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
-		NEXT_INST_V(17, opnd, 1);
-	    } else {
-		if (Tcl_ListObjReplace(interp,
-				       valuePtr,
-				       firstIdx,
-				       numToDelete,
-				       numNewElems,
-				       &OBJ_AT_DEPTH(numNewElems-1))
-		    != TCL_OK) {
-		    TRACE_ERROR(interp);
-		    goto gotError;
-		}
-		TRACE_APPEND(("\"%.30s\"\n", O2S(valuePtr)));
-		NEXT_INST_V(17, opnd-1, 0);
+	    if (toIdx >= fromIdx) {
+		numToDelete = toIdx - fromIdx + 1;
 	    }
 	}
 
+	CACHE_STACK_INFO();
+
+	if (Tcl_IsShared(valuePtr)) {
+	    objResultPtr = Tcl_DuplicateObj(valuePtr);
+	    if (Tcl_ListObjReplace(interp,
+				   objResultPtr,
+				   fromIdx,
+				   numToDelete,
+				   numNewElems,
+				   &OBJ_AT_DEPTH(numNewElems - 1))
+		!= TCL_OK) {
+		TRACE_ERROR(interp);
+		Tcl_DecrRefCount(objResultPtr);
+		goto gotError;
+	    }
+	    TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
+	    NEXT_INST_V(6, opnd, 1);
+	}
+	else {
+	    if (Tcl_ListObjReplace(interp,
+				   valuePtr,
+				   fromIdx,
+				   numToDelete,
+				   numNewElems,
+				   &OBJ_AT_DEPTH(numNewElems - 1))
+		!= TCL_OK) {
+		TRACE_ERROR(interp);
+		goto gotError;
+	    }
+	    TRACE_APPEND(("\"%.30s\"\n", O2S(valuePtr)));
+	    NEXT_INST_V(6, opnd - 1, 0);
+	}
+	}
+
 	/*
 	 *	   End of INST_LIST and related instructions.
 	 * -----------------------------------------------------------------
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 5c977e5..a67c8f9 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3759,9 +3759,6 @@ MODULE_SCOPE int	TclCompileLappendCmd(Tcl_Interp *interp,
 MODULE_SCOPE int	TclCompileLassignCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclCompileLeditCmd(Tcl_Interp *interp,
-			    Tcl_Parse *parsePtr, Command *cmdPtr,
-			    struct CompileEnv *envPtr);
 MODULE_SCOPE int	TclCompileLindexCmd(Tcl_Interp *interp,
 			    Tcl_Parse *parsePtr, Command *cmdPtr,
 			    struct CompileEnv *envPtr);
-- 
cgit v0.12


From b07c7ad8aea461d1e2e16c66029fbaa43d05d54c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 6 Nov 2022 20:27:51 +0000
Subject: Update Tcl_Filesystem documentation

---
 ChangeLog.2008   | 2 +-
 doc/FileSystem.3 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.2008 b/ChangeLog.2008
index 9c4e951..53690e4 100644
--- a/ChangeLog.2008
+++ b/ChangeLog.2008
@@ -1939,7 +1939,7 @@
 2008-07-28  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* doc/FileSystem.3:		CONSTified many functions using
-	* generic/tcl.decls:		Tcl_FileSystem which all are supposed
+	* generic/tcl.decls:		Tcl_Filesystem which all are supposed
 	* generic/tclDecls.h:		to be a constant, but this was not
 	* generic/tclFileSystem.h:	reflected in the API: Tcl_FSData,
 	* generic/tclIOUtil.c:		Tcl_FSGetInternalRep, Tcl_FSRegister,
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index 239ff0f..469af22 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -850,7 +850,7 @@ The \fBTcl_Filesystem\fR structure contains the following fields:
 .CS
 typedef struct Tcl_Filesystem {
     const char *\fItypeName\fR;
-    int \fIstructureLength\fR;
+    size_t \fIstructureLength\fR;
     Tcl_FSVersion \fIversion\fR;
     Tcl_FSPathInFilesystemProc *\fIpathInFilesystemProc\fR;
     Tcl_FSDupInternalRepProc *\fIdupInternalRepProc\fR;
-- 
cgit v0.12


From fac57136f20a8c4ace9517a25a77be701705827e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 6 Nov 2022 21:01:12 +0000
Subject: Remove TclpHasSockets(): Every system nowadays has sockets

---
 generic/tclIOCmd.c    |   4 +-
 generic/tclInt.decls  |   7 +-
 generic/tclInt.h      |   1 +
 generic/tclIntDecls.h |   8 +-
 generic/tclStubInit.c |   2 +-
 unix/tclUnixSock.c    |  23 ------
 win/tclWinSock.c      | 216 ++++++++++----------------------------------------
 7 files changed, 51 insertions(+), 210 deletions(-)

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index e706f40..4ce27bb 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1455,9 +1455,7 @@ Tcl_SocketObjCmd(
     Tcl_Obj *script = NULL;
     Tcl_Channel chan;
 
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return TCL_ERROR;
-    }
+    TclInitSockets();
 
     for (a = 1; a < objc; a++) {
 	const char *arg = TclGetString(objv[a]);
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 1bd462d..d9bd5c5 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -330,9 +330,10 @@ declare 131 {
 	    Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc,
 	    Tcl_ResolveCompiledVarProc *compiledVarProc)
 }
-declare 132 {
-    int TclpHasSockets(Tcl_Interp *interp)
-}
+# Removed in 9.0:
+#declare 132 {
+#    int TclpHasSockets(Tcl_Interp *interp)
+#}
 # Removed in 9.0:
 #declare 133 {
 #    struct tm *TclpGetDate(const time_t *time, int useGMT)
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a17ce7d..dbe44b5 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3276,6 +3276,7 @@ MODULE_SCOPE void	TclpFinalizeMutex(Tcl_Mutex *mutexPtr);
 MODULE_SCOPE void	TclpFinalizeNotifier(void *clientData);
 MODULE_SCOPE void	TclpFinalizePipes(void);
 MODULE_SCOPE void	TclpFinalizeSockets(void);
+MODULE_SCOPE void	TclInitSockets(void);
 MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    struct addrinfo **addrlist,
 			    const char *host, int port, int willBind,
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index b84b996..eaa7d95 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -292,8 +292,7 @@ EXTERN void		Tcl_SetNamespaceResolvers(
 				Tcl_ResolveCmdProc *cmdProc,
 				Tcl_ResolveVarProc *varProc,
 				Tcl_ResolveCompiledVarProc *compiledVarProc);
-/* 132 */
-EXTERN int		TclpHasSockets(Tcl_Interp *interp);
+/* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
 /* Slot 135 is reserved */
@@ -721,7 +720,7 @@ typedef struct TclIntStubs {
     int (*tcl_PushCallFrame) (Tcl_Interp *interp, Tcl_CallFrame *framePtr, Tcl_Namespace *nsPtr, int isProcCallFrame); /* 129 */
     int (*tcl_RemoveInterpResolvers) (Tcl_Interp *interp, const char *name); /* 130 */
     void (*tcl_SetNamespaceResolvers) (Tcl_Namespace *namespacePtr, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc); /* 131 */
-    int (*tclpHasSockets) (Tcl_Interp *interp); /* 132 */
+    void (*reserved132)(void);
     void (*reserved133)(void);
     void (*reserved134)(void);
     void (*reserved135)(void);
@@ -1058,8 +1057,7 @@ extern const TclIntStubs *tclIntStubsPtr;
 	(tclIntStubsPtr->tcl_RemoveInterpResolvers) /* 130 */
 #define Tcl_SetNamespaceResolvers \
 	(tclIntStubsPtr->tcl_SetNamespaceResolvers) /* 131 */
-#define TclpHasSockets \
-	(tclIntStubsPtr->tclpHasSockets) /* 132 */
+/* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
 /* Slot 135 is reserved */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 4b2fd30..a1d0541 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -531,7 +531,7 @@ static const TclIntStubs tclIntStubs = {
     Tcl_PushCallFrame, /* 129 */
     Tcl_RemoveInterpResolvers, /* 130 */
     Tcl_SetNamespaceResolvers, /* 131 */
-    TclpHasSockets, /* 132 */
+    0, /* 132 */
     0, /* 133 */
     0, /* 134 */
     0, /* 135 */
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index de4d9a8..864d477 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -319,29 +319,6 @@ Tcl_GetHostName(void)
 /*
  * ----------------------------------------------------------------------
  *
- * TclpHasSockets --
- *
- *	Detect if sockets are available on this platform.
- *
- * Results:
- *	Returns TCL_OK.
- *
- * Side effects:
- *	None.
- *
- * ----------------------------------------------------------------------
- */
-
-int
-TclpHasSockets(
-    TCL_UNUSED(Tcl_Interp *))
-{
-    return TCL_OK;
-}
-
-/*
- * ----------------------------------------------------------------------
- *
  * TclpFinalizeSockets --
  *
  *	Performs per-thread socket subsystem finalization.
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index d9cff72..3c82caa 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -234,7 +234,6 @@ static TcpState *	NewSocketInfo(SOCKET socket);
 static void		SocketExitHandler(void *clientData);
 static LRESULT CALLBACK	SocketProc(HWND hwnd, UINT message, WPARAM wParam,
 			    LPARAM lParam);
-static int		SocketsEnabled(void);
 static void		TcpAccept(TcpFdList *fds, SOCKET newSocket, address addr);
 static int		WaitForConnect(TcpState *statePtr, int *errorCodePtr);
 static int		WaitForSocketEvent(TcpState *statePtr, int events,
@@ -362,23 +361,22 @@ InitializeHostName(
 	Tcl_UtfToLower(Tcl_WCharToUtfDString(wbuf, TCL_INDEX_NONE, &ds));
 
     } else {
-	if (TclpHasSockets(NULL) == TCL_OK) {
-	    /*
-	     * The buffer size of 256 is recommended by the MSDN page that
-	     * documents gethostname() as being always adequate.
-	     */
+	TclInitSockets();
+	/*
+	 * The buffer size of 256 is recommended by the MSDN page that
+	 * documents gethostname() as being always adequate.
+	 */
 
-	    Tcl_DString inDs;
+	Tcl_DString inDs;
 
-	    Tcl_DStringInit(&inDs);
-	    Tcl_DStringSetLength(&inDs, 256);
-	    if (gethostname(Tcl_DStringValue(&inDs),
-		    Tcl_DStringLength(&inDs)) == 0) {
-		Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&inDs),
-			TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &ds);
-	    }
-	    Tcl_DStringFree(&inDs);
+	Tcl_DStringInit(&inDs);
+	Tcl_DStringSetLength(&inDs, 256);
+	if (gethostname(Tcl_DStringValue(&inDs),
+		Tcl_DStringLength(&inDs)) == 0) {
+	    Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&inDs),
+		    TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &ds);
 	}
+	Tcl_DStringFree(&inDs);
     }
 
     *encodingPtr = Tcl_GetEncoding(NULL, "utf-8");
@@ -415,11 +413,9 @@ Tcl_GetHostName(void)
 /*
  *----------------------------------------------------------------------
  *
- * TclpHasSockets --
+ * TclInitSockets --
  *
- *	This function determines whether sockets are available on the current
- *	system and returns an error in interp if they are not. Note that
- *	interp may be NULL.
+ *	This function just calls InitSockets(), but is protected by a mutex.
  *
  * Results:
  *	Returns TCL_OK if the system supports sockets, or TCL_ERROR with an
@@ -433,24 +429,16 @@ Tcl_GetHostName(void)
  *----------------------------------------------------------------------
  */
 
-int
-TclpHasSockets(
-    Tcl_Interp *interp)		/* Where to write an error message if sockets
-				 * are not present, or NULL if no such message
-				 * is to be written. */
+void
+TclInitSockets()
 {
-    Tcl_MutexLock(&socketMutex);
-    InitSockets();
-    Tcl_MutexUnlock(&socketMutex);
-
-    if (SocketsEnabled()) {
-	return TCL_OK;
-    }
-    if (interp != NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"sockets are not available on this system", TCL_INDEX_NONE));
+    if (!initialized) {
+	Tcl_MutexLock(&socketMutex);
+	if (!initialized) {
+	    InitSockets();
+	}
+	Tcl_MutexUnlock(&socketMutex);
     }
-    return TCL_ERROR;
 }
 
 /*
@@ -775,17 +763,6 @@ TcpInputProc(
     *errorCodePtr = 0;
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	*errorCodePtr = EFAULT;
-	return -1;
-    }
-
-    /*
      * First check to see if EOF was already detected, to prevent calling the
      * socket stack after the first time EOF is detected.
      */
@@ -918,17 +895,6 @@ TcpOutputProc(
     *errorCodePtr = 0;
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	*errorCodePtr = EFAULT;
-	return -1;
-    }
-
-    /*
      * Check if there is an async connect running.
      * For blocking sockets terminate connect, otherwise do one step.
      * For a non blocking socket return EWOULDBLOCK if connect not terminated
@@ -1029,28 +995,20 @@ TcpCloseProc(
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
+     * Clean up the OS socket handle. The default Windows setting for a
+     * socket is SO_DONTLINGER, which does a graceful shutdown in the
+     * background.
      */
 
-    if (SocketsEnabled()) {
-	/*
-	 * Clean up the OS socket handle. The default Windows setting for a
-	 * socket is SO_DONTLINGER, which does a graceful shutdown in the
-	 * background.
-	 */
-
-	while (statePtr->sockets != NULL) {
-	    TcpFdList *thisfd = statePtr->sockets;
+    while (statePtr->sockets != NULL) {
+	TcpFdList *thisfd = statePtr->sockets;
 
-	    statePtr->sockets = thisfd->next;
-	    if (closesocket(thisfd->fd) == SOCKET_ERROR) {
-		Tcl_WinConvertError((DWORD) WSAGetLastError());
-		errorCode = Tcl_GetErrno();
-	    }
-	    Tcl_Free(thisfd);
+	statePtr->sockets = thisfd->next;
+	if (closesocket(thisfd->fd) == SOCKET_ERROR) {
+	    Tcl_WinConvertError((DWORD) WSAGetLastError());
+	    errorCode = Tcl_GetErrno();
 	}
+	Tcl_Free(thisfd);
     }
 
     if (statePtr->addrlist != NULL) {
@@ -1177,20 +1135,6 @@ TcpSetOptionProc(
 	len = strlen(optionName);
     }
 
-    /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	if (interp) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "winsock is not initialized", -1));
-	}
-	return TCL_ERROR;
-    }
-
     sock = statePtr->sockets->fd;
 
     if ((len > 1) && (optionName[1] == 'k') &&
@@ -1277,20 +1221,6 @@ TcpGetOptionProc(
 #define SUPPRESS_RDNS_VAR "::tcl::unsupported::noReverseDNS"
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	if (interp) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "winsock is not initialized", -1));
-	}
-	return TCL_ERROR;
-    }
-
-    /*
      * Go one step in async connect
      *
      * If any error is thrown save it as backround error to report eventually
@@ -2013,19 +1943,7 @@ Tcl_OpenTcpClient(
     struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
     char channelName[SOCK_CHAN_LENGTH];
 
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	return NULL;
-    }
+    TclInitSockets();
 
     /*
      * Do the name lookups for the local and remote addresses.
@@ -2099,9 +2017,7 @@ Tcl_MakeTcpClientChannel(
     char channelName[SOCK_CHAN_LENGTH];
     ThreadSpecificData *tsdPtr;
 
-    if (TclpHasSockets(NULL) != TCL_OK) {
-	return NULL;
-    }
+    TclInitSockets();
 
     tsdPtr = (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
 
@@ -2167,19 +2083,7 @@ Tcl_OpenTcpServerEx(
     const char *errorMsg = NULL;
     int optvalue, port;
 
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	return NULL;
-    }
+    TclInitSockets();
 
     /*
      * Construct the addresses for each end of the socket.
@@ -2510,55 +2414,19 @@ InitSockets(void)
 
     WaitForSingleObject(tsdPtr->readyEvent, INFINITE);
 
-    if (tsdPtr->hwnd == NULL) {
-	goto initFailure;	/* Trouble creating the window. */
+    if (tsdPtr->hwnd != NULL) {
+	Tcl_CreateEventSource(SocketSetupProc, SocketCheckProc, NULL);
+	return;
     }
 
-    Tcl_CreateEventSource(SocketSetupProc, SocketCheckProc, NULL);
-    return;
-
   initFailure:
-    TclpFinalizeSockets();
-    initialized = -1;
+    Tcl_Panic("InitSockets failed");
     return;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * SocketsEnabled --
- *
- *	Check that the WinSock was successfully initialized.
- *
- * Warning:
- *	This check was useful in times of Windows98 where WinSock may
- *	not be available. This is not the case any more.
- *	This function may be removed with TCL 9.0
- *
- * Results:
- *	1 if it is.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SocketsEnabled(void)
-{
-    int enabled;
-
-    Tcl_MutexLock(&socketMutex);
-    enabled = (initialized == 1);
-    Tcl_MutexUnlock(&socketMutex);
-    return enabled;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
  * SocketExitHandler --
  *
  *	Callback invoked during exit clean up to delete the socket
@@ -3388,9 +3256,7 @@ TcpThreadActionProc(
 	 * sockets will not work.
 	 */
 
-	Tcl_MutexLock(&socketMutex);
-	InitSockets();
-	Tcl_MutexUnlock(&socketMutex);
+	TclInitSockets();
 
 	tsdPtr = TCL_TSD_INIT(&dataKey);
 
-- 
cgit v0.12


From 44ce8c245fa83b3cc8733db27a99b24bdca732fb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 7 Nov 2022 10:50:39 +0000
Subject: TclInitSockets() only exists on Windows

---
 generic/tclInt.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index dbe44b5..a633a17 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3276,7 +3276,11 @@ MODULE_SCOPE void	TclpFinalizeMutex(Tcl_Mutex *mutexPtr);
 MODULE_SCOPE void	TclpFinalizeNotifier(void *clientData);
 MODULE_SCOPE void	TclpFinalizePipes(void);
 MODULE_SCOPE void	TclpFinalizeSockets(void);
+#ifdef _WIN32
 MODULE_SCOPE void	TclInitSockets(void);
+#else
+#define TclInitSockets() /* do nothing */
+#endif
 MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    struct addrinfo **addrlist,
 			    const char *host, int port, int willBind,
-- 
cgit v0.12


From 82a4bb8618f4a8672fd62a895fa355c1a0628b88 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 7 Nov 2022 20:46:49 +0000
Subject: Deprecate TclpHasSockets(): Every system nowadays has sockets

---
 ChangeLog.2008          |   2 +-
 generic/tclCompCmdsGR.c |  25 +++---
 generic/tclCompile.c    |   2 +-
 generic/tclIOCmd.c      |  61 +++++++-------
 generic/tclInt.decls    |   2 +-
 generic/tclInt.h        |   5 ++
 generic/tclIntDecls.h   |   5 +-
 generic/tclStubInit.c   |   3 +
 unix/tclUnixSock.c      |  27 +-----
 win/tclWinSock.c        | 216 +++++++++---------------------------------------
 10 files changed, 102 insertions(+), 246 deletions(-)

diff --git a/ChangeLog.2008 b/ChangeLog.2008
index 9c4e951..53690e4 100644
--- a/ChangeLog.2008
+++ b/ChangeLog.2008
@@ -1939,7 +1939,7 @@
 2008-07-28  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* doc/FileSystem.3:		CONSTified many functions using
-	* generic/tcl.decls:		Tcl_FileSystem which all are supposed
+	* generic/tcl.decls:		Tcl_Filesystem which all are supposed
 	* generic/tclDecls.h:		to be a constant, but this was not
 	* generic/tclFileSystem.h:	reflected in the API: Tcl_FSData,
 	* generic/tclIOUtil.c:		Tcl_FSGetInternalRep, Tcl_FSRegister,
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 2681d01..7bb06ab 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -181,7 +181,8 @@ TclCompileIfCmd(
 				 * determined. */
     Tcl_Token *tokenPtr, *testTokenPtr;
     int jumpIndex = 0;		/* Avoid compiler warning. */
-    int jumpFalseDist, numWords, wordIdx, numBytes, j, code;
+    int numBytes, j;
+    int jumpFalseDist, numWords, wordIdx, code;
     const char *word;
     int realCond = 1;		/* Set to 0 for static conditions:
 				 * "if 0 {..}" */
@@ -1361,7 +1362,7 @@ TclCompileLinsertCmd(
     if (parsePtr->numWords < 3) {
 	return TCL_ERROR;
     }
-    
+
     /* Push list, insertion index onto the stack */
     tokenPtr = TokenAfter(parsePtr->tokenPtr);
     CompileWord(envPtr, tokenPtr, interp, 1);
@@ -1376,7 +1377,7 @@ TclCompileLinsertCmd(
 
     /* First operand is count of arguments */
     TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 1, envPtr);
-    /* 
+    /*
      * Second operand is bitmask
      *  TCL_LREPLACE4_END_IS_LAST - end refers to last element
      *  TCL_LREPLACE4_SINGLE_INDEX - second index is not present
@@ -1430,7 +1431,7 @@ TclCompileLreplaceCmd(
 
     /* First operand is count of arguments */
     TclEmitInstInt4(INST_LREPLACE4, parsePtr->numWords - 1, envPtr);
-    /* 
+    /*
      * Second operand is bitmask
      *  TCL_LREPLACE4_END_IS_LAST - end refers to last element
      */
@@ -1438,7 +1439,7 @@ TclCompileLreplaceCmd(
 
     return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1924,7 +1925,8 @@ TclCompileRegexpCmd(
     DefineLineInformation;	/* TIP #280 */
     Tcl_Token *varTokenPtr;	/* Pointer to the Tcl_Token representing the
 				 * parse of the RE or string. */
-    int i, len, nocase, exact, sawLast, simple;
+    int len;
+    int i, nocase, exact, sawLast, simple;
     const char *str;
 
     /*
@@ -2110,7 +2112,8 @@ TclCompileRegsubCmd(
     Tcl_Obj *patternObj = NULL, *replacementObj = NULL;
     Tcl_DString pattern;
     const char *bytes;
-    int len, exact, quantified, result = TCL_ERROR;
+    int exact, quantified, result = TCL_ERROR;
+    int len;
 
     if (parsePtr->numWords < 5 || parsePtr->numWords > 6) {
 	return TCL_ERROR;
@@ -2264,7 +2267,8 @@ TclCompileReturnCmd(
      * General syntax: [return ?-option value ...? ?result?]
      * An even number of words means an explicit result argument is present.
      */
-    int level, code, objc, size, status = TCL_OK;
+    int level, code, objc, status = TCL_OK;
+    int size;
     int numWords = parsePtr->numWords;
     int explicitResult = (0 == (numWords % 2));
     int numOptionWords = numWords - 1 - explicitResult;
@@ -2374,7 +2378,7 @@ TclCompileReturnCmd(
 	    ExceptionRange range = envPtr->exceptArrayPtr[index];
 
 	    if ((range.type == CATCH_EXCEPTION_RANGE)
-		    && (range.catchOffset == -1)) {
+		    && (range.catchOffset == TCL_INDEX_NONE)) {
 		enclosingCatch = 1;
 		break;
 	    }
@@ -2700,7 +2704,8 @@ IndexTailVarIfKnown(
 {
     Tcl_Obj *tailPtr;
     const char *tailName, *p;
-    int len, n = varTokenPtr->numComponents;
+    int n = varTokenPtr->numComponents;
+    int len;
     Tcl_Token *lastTokenPtr;
     int full, localIndex;
 
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 2dd0718..c10145c 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -678,7 +678,7 @@ InstructionDesc const tclInstructionTable[] = {
     {"lreplace4",	  6,   INT_MIN,    2,	{OPERAND_UINT4, OPERAND_UINT1}},
 	/* Operands: number of arguments, flags
 	 * flags: Combination of TCL_LREPLACE4_* flags
-	 * Stack: ... listobj index1 ?index2? new1 ... newN => ... newlistobj 
+	 * Stack: ... listobj index1 ?index2? new1 ... newN => ... newlistobj
 	 * where index2 is present only if TCL_LREPLACE_SINGLE_INDEX is not
 	 * set in flags.
 	 */
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 0ea84f1..e8a534f 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 {
     Tcl_Obj *script;		/* Script to invoke. */
     Tcl_Interp *interp;		/* Interpreter in which to run it. */
 } AcceptCallback;
@@ -44,7 +44,7 @@ static void			RegisterTcpServerInterpCleanup(
 				    Tcl_Interp *interp,
 				    AcceptCallback *acceptCallbackPtr);
 static Tcl_InterpDeleteProc	TcpAcceptCallbacksDeleteProc;
-static void		TcpServerCloseProc(ClientData callbackData);
+static void		TcpServerCloseProc(void *callbackData);
 static void		UnregisterTcpServerInterpCleanupProc(
 			    Tcl_Interp *interp,
 			    AcceptCallback *acceptCallbackPtr);
@@ -67,7 +67,7 @@ static void		UnregisterTcpServerInterpCleanupProc(
 
 static void
 FinalizeIOCmdTSD(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -97,7 +97,7 @@ FinalizeIOCmdTSD(
 
 int
 Tcl_PutsObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -223,7 +223,7 @@ Tcl_PutsObjCmd(
 
 int
 Tcl_FlushObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -287,7 +287,7 @@ Tcl_FlushObjCmd(
 
 int
 Tcl_GetsObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -335,7 +335,7 @@ Tcl_GetsObjCmd(
 	    code = TCL_ERROR;
 	    goto done;
 	}
-	lineLen = -1;
+	lineLen = TCL_INDEX_NONE;
     }
     if (objc == 3) {
 	if (Tcl_ObjSetVar2(interp, objv[2], NULL, linePtr,
@@ -371,7 +371,7 @@ Tcl_GetsObjCmd(
 
 int
 Tcl_ReadObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -514,7 +514,7 @@ Tcl_ReadObjCmd(
 
 int
 Tcl_SeekObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -589,7 +589,7 @@ Tcl_SeekObjCmd(
 
 int
 Tcl_TellObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -651,7 +651,7 @@ Tcl_TellObjCmd(
 
 int
 Tcl_CloseObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -759,7 +759,7 @@ Tcl_CloseObjCmd(
 
 int
 Tcl_FconfigureObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -834,7 +834,7 @@ Tcl_FconfigureObjCmd(
 
 int
 Tcl_EofObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -873,7 +873,7 @@ Tcl_EofObjCmd(
 
 int
 Tcl_ExecObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -883,8 +883,8 @@ Tcl_ExecObjCmd(
 				 * on the _Tcl_ stack. */
     const char *string;
     Tcl_Channel chan;
-    int argc, background, i, index, keepNewline, result, skip, length;
-    int ignoreStderr;
+    int argc, background, i, index, keepNewline, result, skip, ignoreStderr;
+    int length;
     static const char *const options[] = {
 	"-ignorestderr", "-keepnewline", "--", NULL
     };
@@ -1040,7 +1040,7 @@ Tcl_ExecObjCmd(
 
 int
 Tcl_FblockedObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1086,7 +1086,7 @@ Tcl_FblockedObjCmd(
 
 int
 Tcl_OpenObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1144,7 +1144,8 @@ Tcl_OpenObjCmd(
     if (!pipeline) {
 	chan = Tcl_FSOpenFileChannel(interp, objv[1], modeString, prot);
     } else {
-	int mode, seekFlag, cmdObjc, binary;
+	int mode, seekFlag, binary;
+	int cmdObjc;
 	const char **cmdArgv;
 
 	if (Tcl_SplitList(interp, what+1, &cmdObjc, &cmdArgv) != TCL_OK) {
@@ -1209,7 +1210,7 @@ Tcl_OpenObjCmd(
 
 static void
 TcpAcceptCallbacksDeleteProc(
-    ClientData clientData,	/* Data which was passed when the assocdata
+    void *clientData,	/* Data which was passed when the assocdata
 				 * was registered. */
     TCL_UNUSED(Tcl_Interp *))
 {
@@ -1337,7 +1338,7 @@ UnregisterTcpServerInterpCleanupProc(
 
 static void
 AcceptCallbackProc(
-    ClientData callbackData,	/* The data stored when the callback was
+    void *callbackData,	/* The data stored when the callback was
 				 * created in the call to
 				 * Tcl_OpenTcpServer. */
     Tcl_Channel chan,		/* Channel for the newly accepted
@@ -1428,7 +1429,7 @@ AcceptCallbackProc(
 
 static void
 TcpServerCloseProc(
-    ClientData callbackData)	/* The data passed in the call to
+    void *callbackData)	/* The data passed in the call to
 				 * Tcl_CreateCloseHandler. */
 {
     AcceptCallback *acceptCallbackPtr = (AcceptCallback *)callbackData;
@@ -1461,7 +1462,7 @@ TcpServerCloseProc(
 
 int
 Tcl_SocketObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1481,9 +1482,7 @@ Tcl_SocketObjCmd(
     Tcl_Obj *script = NULL;
     Tcl_Channel chan;
 
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return TCL_ERROR;
-    }
+    TclInitSockets();
 
     for (a = 1; a < objc; a++) {
 	const char *arg = Tcl_GetString(objv[a]);
@@ -1714,7 +1713,7 @@ Tcl_SocketObjCmd(
 
 int
 Tcl_FcopyObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1809,7 +1808,7 @@ Tcl_FcopyObjCmd(
 
 static int
 ChanPendingObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1871,7 +1870,7 @@ ChanPendingObjCmd(
 
 static int
 ChanTruncateObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1944,7 +1943,7 @@ ChanTruncateObjCmd(
 
 static int
 ChanPipeObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1995,7 +1994,7 @@ ChanPipeObjCmd(
 
 int
 TclChannelNamesCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index d16a74c..c0e0e06 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -321,7 +321,7 @@ declare 131 {
 	    Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc,
 	    Tcl_ResolveCompiledVarProc *compiledVarProc)
 }
-declare 132 {
+declare 132 {deprecated {}} {
     int TclpHasSockets(Tcl_Interp *interp)
 }
 declare 133 {deprecated {}} {
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 6af0991..bdd7e5a 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3294,6 +3294,11 @@ MODULE_SCOPE void	TclpFinalizeMutex(Tcl_Mutex *mutexPtr);
 MODULE_SCOPE void	TclpFinalizeNotifier(void *clientData);
 MODULE_SCOPE void	TclpFinalizePipes(void);
 MODULE_SCOPE void	TclpFinalizeSockets(void);
+#ifdef _WIN32
+MODULE_SCOPE void	TclInitSockets(void);
+#else
+#define TclInitSockets() /* do nothing */
+#endif
 MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 			    struct addrinfo **addrlist,
 			    const char *host, int port, int willBind,
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index ec9023f..3da8567 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -354,7 +354,8 @@ EXTERN void		Tcl_SetNamespaceResolvers(
 				Tcl_ResolveVarProc *varProc,
 				Tcl_ResolveCompiledVarProc *compiledVarProc);
 /* 132 */
-EXTERN int		TclpHasSockets(Tcl_Interp *interp);
+TCL_DEPRECATED("")
+int			TclpHasSockets(Tcl_Interp *interp);
 /* 133 */
 TCL_DEPRECATED("")
 struct tm *		TclpGetDate(const time_t *time, int useGMT);
@@ -801,7 +802,7 @@ typedef struct TclIntStubs {
     int (*tcl_PushCallFrame) (Tcl_Interp *interp, Tcl_CallFrame *framePtr, Tcl_Namespace *nsPtr, int isProcCallFrame); /* 129 */
     int (*tcl_RemoveInterpResolvers) (Tcl_Interp *interp, const char *name); /* 130 */
     void (*tcl_SetNamespaceResolvers) (Tcl_Namespace *namespacePtr, Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, Tcl_ResolveCompiledVarProc *compiledVarProc); /* 131 */
-    int (*tclpHasSockets) (Tcl_Interp *interp); /* 132 */
+    TCL_DEPRECATED_API("") int (*tclpHasSockets) (Tcl_Interp *interp); /* 132 */
     TCL_DEPRECATED_API("") struct tm * (*tclpGetDate) (const time_t *time, int useGMT); /* 133 */
     void (*reserved134)(void);
     void (*reserved135)(void);
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 1ffe916..7af42d3 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -795,6 +795,7 @@ static int utfNcasecmp(const char *s1, const char *s2, unsigned int n){
 #   undef TclBN_s_mp_sub
 #   define TclBN_s_mp_sub 0
 #   define Tcl_MakeSafe 0
+#   define TclpHasSockets 0
 #else /* TCL_NO_DEPRECATED */
 #   define Tcl_SeekOld seekOld
 #   define Tcl_TellOld tellOld
@@ -818,6 +819,8 @@ static int utfNcasecmp(const char *s1, const char *s2, unsigned int n){
 #   define TclpGmtime_unix TclpGmtime
 #   define Tcl_MakeSafe TclMakeSafe
 
+int TclpHasSockets(TCL_UNUSED(Tcl_Interp *)) {return TCL_OK;}
+
 static int
 seekOld(
     Tcl_Channel chan,		/* The channel on which to seek. */
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 4e34af5..70dfc61 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -322,29 +322,6 @@ Tcl_GetHostName(void)
 /*
  * ----------------------------------------------------------------------
  *
- * TclpHasSockets --
- *
- *	Detect if sockets are available on this platform.
- *
- * Results:
- *	Returns TCL_OK.
- *
- * Side effects:
- *	None.
- *
- * ----------------------------------------------------------------------
- */
-
-int
-TclpHasSockets(
-    TCL_UNUSED(Tcl_Interp *))
-{
-    return TCL_OK;
-}
-
-/*
- * ----------------------------------------------------------------------
- *
  * TclpFinalizeSockets --
  *
  *	Performs per-thread socket subsystem finalization.
@@ -541,7 +518,7 @@ TcpInputProc(
     if (WaitForConnect(statePtr, errorCodePtr) != 0) {
 	return -1;
     }
-    bytesRead = recv(statePtr->fds.fd, buf, (size_t) bufSize, 0);
+    bytesRead = recv(statePtr->fds.fd, buf, bufSize, 0);
     if (bytesRead >= 0) {
 	return bytesRead;
     }
@@ -591,7 +568,7 @@ TcpOutputProc(
     if (WaitForConnect(statePtr, errorCodePtr) != 0) {
 	return -1;
     }
-    written = send(statePtr->fds.fd, buf, (size_t) toWrite, 0);
+    written = send(statePtr->fds.fd, buf, toWrite, 0);
 
     if (written >= 0) {
 	return written;
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 9ac1a15..ef01fa8 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -234,7 +234,6 @@ static TcpState *	NewSocketInfo(SOCKET socket);
 static void		SocketExitHandler(void *clientData);
 static LRESULT CALLBACK	SocketProc(HWND hwnd, UINT message, WPARAM wParam,
 			    LPARAM lParam);
-static int		SocketsEnabled(void);
 static void		TcpAccept(TcpFdList *fds, SOCKET newSocket, address addr);
 static int		WaitForConnect(TcpState *statePtr, int *errorCodePtr);
 static int		WaitForSocketEvent(TcpState *statePtr, int events,
@@ -366,23 +365,22 @@ InitializeHostName(
 	Tcl_UtfToLower(Tcl_WCharToUtfDString(wbuf, TCL_INDEX_NONE, &ds));
 
     } else {
-	if (TclpHasSockets(NULL) == TCL_OK) {
-	    /*
-	     * The buffer size of 256 is recommended by the MSDN page that
-	     * documents gethostname() as being always adequate.
-	     */
+	TclInitSockets();
+	/*
+	 * The buffer size of 256 is recommended by the MSDN page that
+	 * documents gethostname() as being always adequate.
+	 */
 
-	    Tcl_DString inDs;
+	Tcl_DString inDs;
 
-	    Tcl_DStringInit(&inDs);
-	    Tcl_DStringSetLength(&inDs, 256);
-	    if (gethostname(Tcl_DStringValue(&inDs),
-		    Tcl_DStringLength(&inDs)) == 0) {
-		Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&inDs),
-			TCL_INDEX_NONE, &ds);
-	    }
-	    Tcl_DStringFree(&inDs);
+	Tcl_DStringInit(&inDs);
+	Tcl_DStringSetLength(&inDs, 256);
+	if (gethostname(Tcl_DStringValue(&inDs),
+		Tcl_DStringLength(&inDs)) == 0) {
+	    Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&inDs),
+		    TCL_INDEX_NONE, &ds);
 	}
+	Tcl_DStringFree(&inDs);
     }
 
     *encodingPtr = Tcl_GetEncoding(NULL, "utf-8");
@@ -419,11 +417,9 @@ Tcl_GetHostName(void)
 /*
  *----------------------------------------------------------------------
  *
- * TclpHasSockets --
+ * TclInitSockets --
  *
- *	This function determines whether sockets are available on the current
- *	system and returns an error in interp if they are not. Note that
- *	interp may be NULL.
+ *	This function just calls InitSockets(), but is protected by a mutex.
  *
  * Results:
  *	Returns TCL_OK if the system supports sockets, or TCL_ERROR with an
@@ -437,24 +433,16 @@ Tcl_GetHostName(void)
  *----------------------------------------------------------------------
  */
 
-int
-TclpHasSockets(
-    Tcl_Interp *interp)		/* Where to write an error message if sockets
-				 * are not present, or NULL if no such message
-				 * is to be written. */
+void
+TclInitSockets()
 {
-    Tcl_MutexLock(&socketMutex);
-    InitSockets();
-    Tcl_MutexUnlock(&socketMutex);
-
-    if (SocketsEnabled()) {
-	return TCL_OK;
-    }
-    if (interp != NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"sockets are not available on this system", TCL_INDEX_NONE));
+    if (!initialized) {
+	Tcl_MutexLock(&socketMutex);
+	if (!initialized) {
+	    InitSockets();
+	}
+	Tcl_MutexUnlock(&socketMutex);
     }
-    return TCL_ERROR;
 }
 
 /*
@@ -779,17 +767,6 @@ TcpInputProc(
     *errorCodePtr = 0;
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	*errorCodePtr = EFAULT;
-	return -1;
-    }
-
-    /*
      * First check to see if EOF was already detected, to prevent calling the
      * socket stack after the first time EOF is detected.
      */
@@ -922,17 +899,6 @@ TcpOutputProc(
     *errorCodePtr = 0;
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	*errorCodePtr = EFAULT;
-	return -1;
-    }
-
-    /*
      * Check if there is an async connect running.
      * For blocking sockets terminate connect, otherwise do one step.
      * For a non blocking socket return EWOULDBLOCK if connect not terminated
@@ -1033,28 +999,20 @@ TcpCloseProc(
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
+     * Clean up the OS socket handle. The default Windows setting for a
+     * socket is SO_DONTLINGER, which does a graceful shutdown in the
+     * background.
      */
 
-    if (SocketsEnabled()) {
-	/*
-	 * Clean up the OS socket handle. The default Windows setting for a
-	 * socket is SO_DONTLINGER, which does a graceful shutdown in the
-	 * background.
-	 */
-
-	while (statePtr->sockets != NULL) {
-	    TcpFdList *thisfd = statePtr->sockets;
+    while (statePtr->sockets != NULL) {
+	TcpFdList *thisfd = statePtr->sockets;
 
-	    statePtr->sockets = thisfd->next;
-	    if (closesocket(thisfd->fd) == SOCKET_ERROR) {
-		Tcl_WinConvertError((DWORD) WSAGetLastError());
-		errorCode = Tcl_GetErrno();
-	    }
-	    ckfree(thisfd);
+	statePtr->sockets = thisfd->next;
+	if (closesocket(thisfd->fd) == SOCKET_ERROR) {
+	    Tcl_WinConvertError((DWORD) WSAGetLastError());
+	    errorCode = Tcl_GetErrno();
 	}
+	ckfree(thisfd);
     }
 
     if (statePtr->addrlist != NULL) {
@@ -1181,20 +1139,6 @@ TcpSetOptionProc(
 	len = strlen(optionName);
     }
 
-    /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	if (interp) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "winsock is not initialized", -1));
-	}
-	return TCL_ERROR;
-    }
-
     sock = statePtr->sockets->fd;
 
     if ((len > 1) && (optionName[1] == 'k') &&
@@ -1281,20 +1225,6 @@ TcpGetOptionProc(
 #define SUPPRESS_RDNS_VAR "::tcl::unsupported::noReverseDNS"
 
     /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	if (interp) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "winsock is not initialized", -1));
-	}
-	return TCL_ERROR;
-    }
-
-    /*
      * Go one step in async connect
      *
      * If any error is thrown save it as backround error to report eventually
@@ -2017,19 +1947,7 @@ Tcl_OpenTcpClient(
     struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
     char channelName[SOCK_CHAN_LENGTH];
 
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	return NULL;
-    }
+    TclInitSockets();
 
     /*
      * Do the name lookups for the local and remote addresses.
@@ -2103,9 +2021,7 @@ Tcl_MakeTcpClientChannel(
     char channelName[SOCK_CHAN_LENGTH];
     ThreadSpecificData *tsdPtr;
 
-    if (TclpHasSockets(NULL) != TCL_OK) {
-	return NULL;
-    }
+    TclInitSockets();
 
     tsdPtr = (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
 
@@ -2171,19 +2087,7 @@ Tcl_OpenTcpServerEx(
     const char *errorMsg = NULL;
     int optvalue, port;
 
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to prevent
-     * system crashes. This can happen at exit time if the exit handler for
-     * WinSock ran before other exit handlers that want to use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	return NULL;
-    }
+    TclInitSockets();
 
     /*
      * Construct the addresses for each end of the socket.
@@ -2514,55 +2418,19 @@ InitSockets(void)
 
     WaitForSingleObject(tsdPtr->readyEvent, INFINITE);
 
-    if (tsdPtr->hwnd == NULL) {
-	goto initFailure;	/* Trouble creating the window. */
+    if (tsdPtr->hwnd != NULL) {
+	Tcl_CreateEventSource(SocketSetupProc, SocketCheckProc, NULL);
+	return;
     }
 
-    Tcl_CreateEventSource(SocketSetupProc, SocketCheckProc, NULL);
-    return;
-
   initFailure:
-    TclpFinalizeSockets();
-    initialized = -1;
+    Tcl_Panic("InitSockets failed");
     return;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * SocketsEnabled --
- *
- *	Check that the WinSock was successfully initialized.
- *
- * Warning:
- *	This check was useful in times of Windows98 where WinSock may
- *	not be available. This is not the case any more.
- *	This function may be removed with TCL 9.0
- *
- * Results:
- *	1 if it is.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SocketsEnabled(void)
-{
-    int enabled;
-
-    Tcl_MutexLock(&socketMutex);
-    enabled = (initialized == 1);
-    Tcl_MutexUnlock(&socketMutex);
-    return enabled;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
  * SocketExitHandler --
  *
  *	Callback invoked during exit clean up to delete the socket
@@ -3454,9 +3322,7 @@ TcpThreadActionProc(
 	 * sockets will not work.
 	 */
 
-	Tcl_MutexLock(&socketMutex);
-	InitSockets();
-	Tcl_MutexUnlock(&socketMutex);
+	TclInitSockets();
 
 	tsdPtr = TCL_TSD_INIT(&dataKey);
 
-- 
cgit v0.12


From aed83779fd0befd6315d01433e60ba27a324fc31 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 7 Nov 2022 21:35:41 +0000
Subject: tests/httpProxy.test - test for leftover socket placeholders, improve
 result layout, for https fetch with status 407 expect result
 SecureProxyFailed not SecureProxy.

---
 tests/httpProxy.test | 236 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 144 insertions(+), 92 deletions(-)

diff --git a/tests/httpProxy.test b/tests/httpProxy.test
index 90fe828..d9e865a 100644
--- a/tests/httpProxy.test
+++ b/tests/httpProxy.test
@@ -85,40 +85,44 @@ test httpProxy-1.1.$ThreadLevel {squid is running - ipv4 noauth} -constraints {n
 } -body {
     set token [http::geturl http://$n4host:$n4port/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 400 none} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed]"
+} -result {complete ok 400 -- none} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
 }
 
 test httpProxy-1.2.$ThreadLevel {squid is running - ipv6 noauth} -constraints {needsSquid} -setup {
 } -body {
     set token [http::geturl http://\[$n6host\]:$n6port/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 400 none} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed]"
+} -result {complete ok 400 -- none} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
 }
 
 test httpProxy-1.3.$ThreadLevel {squid is running - ipv4 auth} -constraints {needsSquid} -setup {
 } -body {
     set token [http::geturl http://$a4host:$a4port/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 400 none} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed]"
+} -result {complete ok 400 -- none} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
 }
 
 test httpProxy-1.4.$ThreadLevel {squid is running - ipv6 auth} -constraints {needsSquid} -setup {
 } -body {
     set token [http::geturl http://\[$a6host\]:$a6port/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 400 none} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed]"
+} -result {complete ok 400 -- none} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
 }
 
 test httpProxy-2.1.$ThreadLevel {http no-proxy no-auth} -constraints {needsSquid} -setup {
@@ -126,10 +130,12 @@ test httpProxy-2.1.$ThreadLevel {http no-proxy no-auth} -constraints {needsSquid
 } -body {
     set token [http::geturl http://www.google.com/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 200 none} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
 }
 
 test httpProxy-2.2.$ThreadLevel {https no-proxy no-auth} -constraints {needsSquid needsTls} -setup {
@@ -137,10 +143,12 @@ test httpProxy-2.2.$ThreadLevel {https no-proxy no-auth} -constraints {needsSqui
 } -body {
     set token [http::geturl https://www.google.com/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 200 none} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
 }
 
 test httpProxy-2.3.$ThreadLevel {http with-proxy ipv4 no-auth} -constraints {needsSquid} -setup {
@@ -148,10 +156,12 @@ test httpProxy-2.3.$ThreadLevel {http with-proxy ipv4 no-auth} -constraints {nee
 } -body {
     set token [http::geturl http://www.google.com/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 200 HttpProxy} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- HttpProxy -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
@@ -160,34 +170,40 @@ test httpProxy-2.4.$ThreadLevel {https with-proxy ipv4 no-auth} -constraints {ne
 } -body {
     set token [http::geturl https://www.google.com/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 200 SecureProxy} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- SecureProxy -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
 test httpProxy-2.5.$ThreadLevel {http with-proxy ipv6 no-auth} -constraints {needsSquid} -setup {
-   http::config -proxyhost $n6host -proxyport $n6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+   http::config -proxyhost $n6host -proxyport $n6port -proxynot {::1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 200 HttpProxy} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- HttpProxy -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
 test httpProxy-2.6.$ThreadLevel {https with-proxy ipv6 no-auth} -constraints {needsSquid needsTls} -setup {
-   http::config -proxyhost $n6host -proxyport $n6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+   http::config -proxyhost $n6host -proxyport $n6port -proxynot {::1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
     set ri [http::responseInfo $token]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed]"
-} -result {complete ok 200 SecureProxy} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- SecureProxy -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res
+    unset -nocomplain token ri res
     http::config -proxyhost {} -proxyport {} -proxynot {}
 }
 
@@ -198,10 +214,12 @@ test httpProxy-3.1.$ThreadLevel {http no-proxy with-auth valid-creds-provided} -
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 none 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -212,10 +230,12 @@ test httpProxy-3.2.$ThreadLevel {https no-proxy with-auth valid-creds-provided}
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 none 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -226,10 +246,12 @@ test httpProxy-3.3.$ThreadLevel {http with-proxy ipv4 with-auth valid-creds-prov
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 HttpProxy 1 1} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- HttpProxy 1 1 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -240,38 +262,44 @@ test httpProxy-3.4.$ThreadLevel {https with-proxy ipv4 with-auth valid-creds-pro
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 SecureProxy 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- SecureProxy 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
 test httpProxy-3.5.$ThreadLevel {http with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid} -setup {
-   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl http://www.google.com/]
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 HttpProxy 1 1} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- HttpProxy 1 1 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
 test httpProxy-3.6.$ThreadLevel {https with-proxy ipv6 with-auth valid-creds-provided} -constraints {needsSquid needsTls} -setup {
-   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $aliceCreds
 } -body {
     set token [http::geturl https://www.google.com/]
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 SecureProxy 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- SecureProxy 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -282,10 +310,12 @@ test httpProxy-4.1.$ThreadLevel {http no-proxy with-auth no-creds-provided} -con
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 none 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -296,10 +326,12 @@ test httpProxy-4.2.$ThreadLevel {https no-proxy with-auth no-creds-provided} -co
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 none 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -310,10 +342,12 @@ test httpProxy-4.3.$ThreadLevel {http with-proxy ipv4 with-auth no-creds-provide
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 HttpProxy 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- HttpProxy 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -324,38 +358,44 @@ test httpProxy-4.4.$ThreadLevel {https with-proxy ipv4 with-auth no-creds-provid
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 SecureProxy 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- SecureProxyFailed 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
 test httpProxy-4.5.$ThreadLevel {http with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid} -setup {
-   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl http://www.google.com/]
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 HttpProxy 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- HttpProxy 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
 test httpProxy-4.6.$ThreadLevel {https with-proxy ipv6 with-auth no-creds-provided} -constraints {needsSquid needsTls} -setup {
-   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth {}
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
 } -body {
     set token [http::geturl https://www.google.com/]
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 SecureProxy 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- SecureProxyFailed 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -366,10 +406,12 @@ test httpProxy-5.1.$ThreadLevel {http no-proxy with-auth bad-creds-provided} -co
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 none 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -380,10 +422,12 @@ test httpProxy-5.2.$ThreadLevel {https no-proxy with-auth bad-creds-provided} -c
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 200 none 0 0} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 200 -- none 0 0 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -394,10 +438,12 @@ test httpProxy-5.3.$ThreadLevel {http with-proxy ipv4 with-auth bad-creds-provid
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 HttpProxy 1 1} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- HttpProxy 1 1 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
@@ -408,38 +454,44 @@ test httpProxy-5.4.$ThreadLevel {https with-proxy ipv4 with-auth bad-creds-provi
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 SecureProxy 1 1} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- SecureProxyFailed 1 1 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
 test httpProxy-5.5.$ThreadLevel {http with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid} -setup {
-   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl http://www.google.com/]
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 HttpProxy 1 1} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- HttpProxy 1 1 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
 test httpProxy-5.6.$ThreadLevel {https with-proxy ipv6 with-auth bad-creds-provided} -constraints {needsSquid needsTls} -setup {
-   http::config -proxyhost $a6host -proxyport $a6port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+   http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $badCreds
 } -body {
     set token [http::geturl https://www.google.com/]
     set ri [http::responseInfo $token]
     set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
     set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
-    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}]"
-} -result {complete ok 407 SecureProxy 1 1} -cleanup {
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*]"
+} -result {complete ok 407 -- SecureProxyFailed 1 1 -- -1} -cleanup {
     http::cleanup $token
-    unset -nocomplain ri res pos1 pos2
+    unset -nocomplain token ri res pos1 pos2
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
-- 
cgit v0.12


From bf454b34d59371152ca527105f0908a4d29027f1 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 7 Nov 2022 21:40:55 +0000
Subject: tests/httpProxy.test - add new tests for cleanup (mainly after 407
 request) by checking that a second request is handled correctly.

---
 tests/httpProxy.test | 638 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 638 insertions(+)

diff --git a/tests/httpProxy.test b/tests/httpProxy.test
index d9e865a..d8bd6b7 100644
--- a/tests/httpProxy.test
+++ b/tests/httpProxy.test
@@ -26,6 +26,10 @@ proc bgerror {args} {
     puts stderr $errorInfo
 }
 
+proc stopMe {token} {
+    set ${token}(z) done
+}
+
 if {![info exists ThreadLevel]} {
     if {[catch {package require Thread}] == 0} {
         set ValueRange {0 1 2}
@@ -303,6 +307,294 @@ test httpProxy-3.6.$ThreadLevel {https with-proxy ipv6 with-auth valid-creds-pro
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
+test httpProxy-3.7.$ThreadLevel {http with-proxy ipv4 with-auth valid-creds-provided; check that 2nd valid request with creds is possible, and keep-alive works} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.7x.$ThreadLevel {http with-proxy ipv4 with-auth 1st request no-creds-provided; check that 2nd request with creds is possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+
+    http::config -proxyauth $aliceCreds
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.8.$ThreadLevel {https with-proxy ipv4 with-auth valid-creds-provided; check that 2nd valid request with creds is possible, and keep-alive works} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $aliceCreds
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- SecureProxy 0 0 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.8x.$ThreadLevel {https with-proxy ipv4 with-auth 1st request no-creds-provided; check that 2nd request with creds is possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+
+    http::config -proxyauth $aliceCreds
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- SecureProxy 0 0 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.9.$ThreadLevel {http with-proxy ipv6 with-auth valid-creds-provided; check that 2nd valid request with creds is possible, and keep-alive works} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $aliceCreds
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.9p.$ThreadLevel {http with-proxy ipv6 with-auth valid-creds-provided; check that 2nd valid request with creds is possible, and keep-alive works, pipelining requested and possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $aliceCreds
+} -body {
+    set can0 [after 6000 {http::reset $token0; set ${token0}(z) timeout}]
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+after idle {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+}
+    vwait ${token0}(z)
+    after cancel $can0
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can0 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.9x.$ThreadLevel {http with-proxy ipv6 with-auth 1st request no-creds-provided; check that 2nd request with creds is possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+
+    http::config -proxyauth $aliceCreds
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.10.$ThreadLevel {https with-proxy ipv6 with-auth valid-creds-provided; check that 2nd valid request with creds is possible, and keep-alive works} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $aliceCreds
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- SecureProxy 0 0 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.10p.$ThreadLevel {https with-proxy ipv6 with-auth valid-creds-provided; check that 2nd valid request with creds is possible, and keep-alive works, pipelining requested and possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $aliceCreds
+} -body {
+    set can0 [after 6000 {http::reset $token0; set ${token0}(z) timeout}]
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+after idle {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token0; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+}
+    vwait ${token0}(z)
+    after cancel $can0
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- SecureProxy 0 0 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can0 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-3.10x.$ThreadLevel {https with-proxy ipv6 with-auth 1st request no-creds-provided; check that 2nd request with creds is possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+
+    http::config -proxyauth $aliceCreds
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 200 -- SecureProxy 0 0 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
 test httpProxy-4.1.$ThreadLevel {http no-proxy with-auth no-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
 } -body {
@@ -399,6 +691,179 @@ test httpProxy-4.6.$ThreadLevel {https with-proxy ipv6 with-auth no-creds-provid
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
+test httpProxy-4.7.$ThreadLevel {http with-proxy ipv4 with-auth no-creds-provided; check that 2nd request is possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- HttpProxy 0 0 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.8.$ThreadLevel {https with-proxy ipv4 with-auth no-creds-provided; check that 2nd request is possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth {}
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- SecureProxyFailed 0 0 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.9.$ThreadLevel {http with-proxy ipv6 with-auth no-creds-provided; check that 2nd request is possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- HttpProxy 0 0 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.9p.$ThreadLevel {http with-proxy ipv6 with-auth no-creds-provided; check that 2nd request is possible, pipelining requested and possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
+} -body {
+    set can0 [after 6000 {http::reset $token0; set ${token0}(z) timeout}]
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+after idle {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token0; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+}
+    vwait ${token0}(z)
+    after cancel $can0
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- HttpProxy 0 0 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can0 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.10.$ThreadLevel {https with-proxy ipv6 with-auth no-creds-provided; check that 2nd request is possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- SecureProxyFailed 0 0 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-4.10p.$ThreadLevel {https with-proxy ipv6 with-auth no-creds-provided; check that 2nd request is possible, pipelining requested but not possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth {}
+} -body {
+    set can0 [after 6000 {http::reset $token0; set ${token0}(z) timeout}]
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+
+after idle {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+}
+    vwait ${token0}(z)
+    after cancel $can0
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $aliceCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- SecureProxyFailed 0 0 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can0 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
 test httpProxy-5.1.$ThreadLevel {http no-proxy with-auth bad-creds-provided} -constraints {needsSquid} -setup {
    http::config -proxyhost {} -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
 } -body {
@@ -495,10 +960,183 @@ test httpProxy-5.6.$ThreadLevel {https with-proxy ipv6 with-auth bad-creds-provi
     http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
 }
 
+test httpProxy-5.7.$ThreadLevel {http with-proxy ipv4 with-auth bad-creds-provided; check that 2nd request is possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.7p.$ThreadLevel {http with-proxy ipv4 with-auth bad-creds-provided; check that 2nd request is possible, pipelining requested and possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set can0 [after 6000 {http::reset $token0; set ${token0}(z) timeout}]
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    # Use the same caution as for the corresponding https test.
+after idle {
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+}
+    vwait ${token0}(z)
+    after cancel $can0
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can0 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.8.$ThreadLevel {https with-proxy ipv4 with-auth bad-creds-provided; check that 2nd request is possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- SecureProxyFailed 1 1 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.8p.$ThreadLevel {https with-proxy ipv4 with-auth bad-creds-provided; check that 2nd request is possible, pipelining requested but not possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a4host -proxyport $a4port -proxynot {127.0.0.1 localhost} -proxyauth $badCreds
+} -body {
+    set can0 [after 6000 {http::reset $token0; set ${token0}(z) timeout}]
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+after idle {
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+}
+    vwait ${token0}(z)
+    after cancel $can0
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- SecureProxyFailed 1 1 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can0 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.9.$ThreadLevel {http with-proxy ipv6 with-auth bad-creds-provided; check that 2nd request is possible} -constraints {needsSquid} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $badCreds
+    set token0 [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # Use the same caution as for the corresponding https test.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl http://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- HttpProxy 1 1 -- -1 done 1} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
+test httpProxy-5.10.$ThreadLevel {https with-proxy ipv6 with-auth bad-creds-provided; check that 2nd request is possible} -constraints {needsSquid needsTls} -setup {
+    array unset ::http::socketMapping
+    http::config -proxyhost $a6host -proxyport $a6port -proxynot {::1 localhost} -proxyauth $badCreds
+    set token0 [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000]
+} -body {
+    # If a bug passes the socket of a failed CONNECT to the main request, an infinite
+    # wait can occur despite -timeout.  Fix this with http::reset; to do this the call
+    # to http::geturl must be async so we have $token for use as argument of reset.
+    set can [after 6000 {http::reset $token; set ${token}(z) timeout}]
+    set token [http::geturl https://www.google.com/ -keepalive 1 -timeout 5000 -command stopMe]
+    vwait ${token}(z)
+    after cancel $can
+
+    set ri [http::responseInfo $token]
+    set pos1 [lsearch -exact [string tolower [set ${token}(requestHeaders)]] proxy-authorization]
+    set pos2 [lsearch -exact [set ${token}(requestHeaders)] $badCreds]
+    set same [string equal [set ${token0}(sock)] [set ${token}(sock)]]
+    set res "[dict get $ri stage] [dict get $ri status] [dict get $ri responseCode] --\
+             [dict get $ri proxyUsed] [expr {$pos1 > -1}] [expr {$pos2 > -1}] --\
+             [lsearch -glob [array get ::http::socketMapping] HTTP_PLACEHOLDER_*] [set ${token}(z)] $same"
+} -result {complete ok 407 -- SecureProxyFailed 1 1 -- -1 done 0} -cleanup {
+    http::cleanup $token0
+    http::cleanup $token
+    unset -nocomplain token0 token ri res pos1 pos2 can same
+    array unset ::http::socketMapping
+    http::config -proxyhost {} -proxyport {} -proxynot {} -proxyauth {}
+}
+
 # cleanup
 unset -nocomplain n4host n6host n4port n6port a4host a6host a4port a6port aliceCreds badCreds
 
 rename bgerror {}
+rename stopMe {}
 
 ::tcltest::cleanupTests
 
-- 
cgit v0.12


From 4c3d010bffd99f30596787903dfa04162f26c2b3 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 7 Nov 2022 21:44:39 +0000
Subject: library/http/http.tcl - replace lremove with lreplace for
 compatibility with 8.6.

---
 library/http/http.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index fcb03e1..bbde39d 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -4896,7 +4896,7 @@ proc http::SecureProxyConnect {args} {
     # Extract (non-proxy) target from args.
     set host [lindex $args end-3]
     set port [lindex $args end-2]
-    set args [lremove $args end-3 end-2]
+    set args [lreplace $args end-3 end-2]
 
     # Proxy server URL for connection.
     # This determines where the socket is opened.
-- 
cgit v0.12


From 95b74de5c21547a344748baff089d47e8c57e391 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 7 Nov 2022 21:49:08 +0000
Subject: library/http/http.tcl - in http::SecureProxyConnect and its caller,
 bugfix cleanup after 407 from HTTPS proxy.  Close the connection to the
 proxy.  Do not copy all values of state() from the proxy CONNECT to the main
 request, especially leave out state(sock).  Raise an error for a 3xx and 401
 response to CONNECT.  In http::Event, trap TLS handshake errors in a place
 where they do not occur for a non-proxy request.

---
 library/http/http.tcl | 176 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 132 insertions(+), 44 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index bbde39d..907256e 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -219,6 +219,33 @@ namespace eval http {
         511 {Network Authentication Required}
     }]
 
+    variable failedProxyValues {
+	binary
+	body
+	charset
+	coding
+	connection
+	connectionRespFlag
+	currentsize
+	host
+	http
+	httpResponse
+	meta
+	method
+	querylength
+	queryoffset
+	reasonPhrase
+	requestHeaders
+	requestLine
+	responseCode
+	state
+	status
+	tid
+	totalsize
+	transfer
+	type
+    }
+
     namespace export geturl config reset wait formatQuery postError quoteString
     namespace export register unregister registerError
     namespace export requestLine requestHeaders requestHeaderValue
@@ -871,6 +898,7 @@ proc http::reset {token {why reset}} {
 	set errorlist $state(error)
 	unset state
 	eval ::error $errorlist
+	# i.e. error msg errorInfo errorCode
     }
     return
 }
@@ -1699,14 +1727,21 @@ proc http::OpenSocket {token DoLater} {
         ConfigureNewSocket $token $sockOld $DoLater
     } result errdict]} {
         if {[string range $result 0 20] eq {proxy connect failed:}} {
-            # The socket can be persistent: if so it is identified with
-            # the https target host, and will be kept open.
-            # Results of the failed proxy CONNECT have been copied to $token and
-            # are available to the caller.
-            Eot $token
-        } else {
-            Finish $token $result
-        }
+	    # - The HTTPS proxy did not create a socket.  The pre-existing value
+	    #   (a "placeholder socket") is unchanged.
+	    # - The proxy returned a valid HTTP response to the failed CONNECT
+	    #   request, and http::SecureProxyConnect copied this to $token,
+	    #   and also set ${token}(connection) set to "close".
+	    # - Remove the error message $result so that Finish delivers this
+	    #   HTTP response to the caller.
+	    set result {}
+	}
+	Finish $token $result
+	# Because socket creation failed, the placeholder "socket" must be
+	# "closed" and (if persistent) removed from the persistent sockets
+	# table.  In the {proxy connect failed:} case Finish does this because
+	# the value of ${token}(connection) is "close". In the other cases here,
+	# it does so because $result is non-empty.
     }
     ##Log Leaving http::OpenSocket coroutine [info coroutine] - token $token
     return
@@ -2325,7 +2360,8 @@ proc http::Connected {token proto phost srvurl} {
 	    # If any other requests are in flight or pipelined/queued, they will
 	    # be discarded.
 	} elseif {$state(status) eq ""} {
-	    # ...https handshake errors come here.
+	    # https handshake errors come here, for
+	    # Tcl 8.7 without http::SecureProxyConnect, and for Tcl 8.6.
 	    set msg [registerError $sock]
 	    registerError $sock {}
 	    if {$msg eq {}} {
@@ -3473,8 +3509,15 @@ proc http::Event {sock token} {
 		    # If any other requests are in flight or pipelined/queued,
 		    # they will be discarded.
 		} else {
+		    # https handshake errors come here, for
+		    # Tcl 8.7 with http::SecureProxyConnect.
+		    set msg [registerError $sock]
+		    registerError $sock {}
+		    if {$msg eq {}} {
+			set msg $nsl
+		    }
 		    Log ^X$tk end of response (error) - token $token
-		    Finish $token $nsl
+		    Finish $token $msg
 		    return
 		}
 	    } elseif {$nsl >= 0} {
@@ -4882,15 +4925,12 @@ proc http::socketForTls {args} {
 #
 # Return Value: a socket identifier
 # ------------------------------------------------------------------------------
-proc http::AllDone {varName args} {
-    set $varName done
-    return
-}
 
 proc http::SecureProxyConnect {args} {
     variable http
     variable ConnectVar
     variable ConnectCounter
+    variable failedProxyValues
     set varName ::http::ConnectVar([incr ConnectCounter])
 
     # Extract (non-proxy) target from args.
@@ -4941,8 +4981,11 @@ proc http::SecureProxyConnect {args} {
     variable $token2
     upvar 0 $token2 state2
 
-    # Setting this variable overrides the HTTP request line and allows
+    # Kludges:
+    # Setting this variable overrides the HTTP request line and also allows
     # -headers to override the Connection: header set by -keepalive.
+    # The arguments "-keepalive 0" ensure that when Finish is called for an
+    # unsuccessful request, the socket is always closed.
     set state2(bypass) "CONNECT $host:$port HTTP/1.1"
 
     AsyncTransaction $token2
@@ -4961,41 +5004,86 @@ proc http::SecureProxyConnect {args} {
     }
     unset $varName
 
-    set sock $state2(sock)
-    set code $state2(responseCode)
-    if {[string is integer -strict $code] && ($code >= 200) && ($code < 300)} {
-        # All OK.  The caller in tls will now call "tls::import $sock".
-        # Do not use Finish, which will close (sock).
-        # Other tidying done in http::Event.
-        array unset state2
-    } elseif {$targ != -1} {
-        # Bad HTTP status code; token is known.
-        # Copy from state2 to state, including (sock).
-        foreach name [array names state2] {
-            set state($name) $state2($name)
+    if {    ($state2(state) ne "complete")
+         || ($state2(status) ne "ok")
+         || (![string is integer -strict $state2(responseCode)])
+    } {
+        set msg {the HTTP request to the proxy server did not return a valid\
+                and complete response}
+        if {[info exists state2(error)]} {
+            append msg ": " [lindex $state2(error) 0]
         }
-        set state(proxyUsed) SecureProxy
-        set state(proxyFail) failed
+        cleanup $token2
+        return -code error $msg
+    }
 
-        # Do not use Finish, which will close (sock).
-        # Other tidying done in http::Event.
-        array unset state2
+    set code $state2(responseCode)
 
-        # Error message detected by http::OpenSocket.
-        return -code error "proxy connect failed: $code"
-    } else {
-        # Bad HTTP status code; token is not known because option -type
-        # (cf. targ) was not passed through tcltls, and so the script
-        # cannot write to state(*).
-        # Do not use Finish, which will close (sock).
-        # Other tidying done in http::Event.
-        array unset state2
+    if {($code >= 200) && ($code < 300)} {
+        # All OK.  The caller in package tls will now call "tls::import $sock".
+        # The cleanup command does not close $sock.
+        # Other tidying was done in http::Event.
+        set sock $state2(sock)
+        cleanup $token2
+        return $sock
+    }
 
-        # Error message detected by http::OpenSocket.
-        return -code error "proxy connect failed: $code\n$block"
+    if {$targ != -1} {
+        # Non-OK HTTP status code; token is known because option -type
+        # (cf. targ) was passed through tcltls, and so the useful
+        # parts of the proxy's response can be copied to state(*).
+        # Do not copy state2(sock).
+        # Return the proxy response to the caller of geturl.
+        foreach name $failedProxyValues {
+            if {[info exists state2($name)]} {
+                set state($name) $state2($name)
+            }
+        }
+        set state(proxyUsed) SecureProxyFailed
+        set state(connection) close
+        set msg "proxy connect failed: $code"
+	# - This error message will be detected by http::OpenSocket and will
+	#   cause it to present the proxy's HTTP response as that of the
+	#   original $token transaction, identified only by state(proxyUsed)
+	#   as the response of the proxy.
+	# - The cases where this would mislead the caller of http::geturl are
+	#   given a different value of msg (below) so that http::OpenSocket will
+	#   treat them as errors, but will preserve the $token array for
+	#   inspection by the caller.
+	# - Status code 305 (Proxy Required) was deprecated for security reasons
+	#   in RFC 2616 (June 1999) and in any case should never be served by a
+	#   proxy.
+	# - Other 3xx responses from the proxy are inappropriate, and should not
+	#   occur.
+	# - A 401 response from the proxy is inappropriate, and should not
+	#   occur.  It would be confusing if returned to the caller.
+
+	if {($code >= 300) && ($code < 400)} {
+	    set msg "the proxy server responded to the HTTP request with an\
+		    inappropriate $code redirect"
+	    set loc [responseHeaderValue $token2 location]
+	    if {$loc ne {}} {
+		append msg "to " $loc
+	    }
+	} elseif {($code == 401)} {
+	    set msg "the proxy server responded to the HTTP request with an\
+		    inappropriate 401 request for target-host credentials"
+	} else {
+	}
+    } else {
+	set msg "connection to proxy failed with status code $code"
     }
 
-    return $sock
+    # - ${token2}(sock) has already been closed because -keepalive 0.
+    # - Error return does not pass the socket ID to the
+    #   $token transaction, which retains its socket placeholder.
+    cleanup $token2
+    return -code error $msg
+}
+
+proc http::AllDone {varName args} {
+    set $varName done
+    return
 }
 
 
-- 
cgit v0.12


From 0a9238b48a692d42d47391c88a59e76e3c3d8a52 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 7 Nov 2022 21:53:19 +0000
Subject: library/http/http.tcl - in http::SecureProxyConnect, bugfix
 state(proxyUsed) so the correct value SecureProxyFailed or SecureProxy is
 returned.

---
 library/http/http.tcl | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 907256e..0ba201e 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -805,7 +805,7 @@ proc http::CloseQueuedQueries {connId {token {}}} {
     variable socketPlayCmd
     variable socketCoEvent
 
-    ##Log CloseQueuedQueries $connId
+    ##Log CloseQueuedQueries $connId $token
     if {![info exists socketMapping($connId)]} {
 	# Command has already been called.
 	# Don't come here again - especially recursively.
@@ -1725,7 +1725,9 @@ proc http::OpenSocket {token DoLater} {
 
         # Code above has set state(sock) $sock
         ConfigureNewSocket $token $sockOld $DoLater
+        ##Log OpenSocket success $sock - token $token
     } result errdict]} {
+        ##Log OpenSocket failed $result - token $token
         if {[string range $result 0 20] eq {proxy connect failed:}} {
 	    # - The HTTPS proxy did not create a socket.  The pre-existing value
 	    #   (a "placeholder socket") is unchanged.
@@ -4958,8 +4960,12 @@ proc http::SecureProxyConnect {args} {
         # Record in the token that this is a proxy call.
         set token [lindex $args $targ+1]
         upvar 0 ${token} state
-        set state(proxyUsed) SecureProxy
         set tim $state(-timeout)
+        set state(proxyUsed) SecureProxyFailed
+        # This value is overwritten with "SecureProxy" below if the CONNECT is
+        # successful.  If it is unsuccessful, the socket will be closed
+        # below, and so in this unsuccessful case there are no other transactions
+        # whose (proxyUsed) must be updated.
     } else {
         set tim 0
     }
@@ -5023,6 +5029,11 @@ proc http::SecureProxyConnect {args} {
         # All OK.  The caller in package tls will now call "tls::import $sock".
         # The cleanup command does not close $sock.
         # Other tidying was done in http::Event.
+
+        # If this is a persistent socket, any other transactions that are
+        # already marked to use the socket will have their (proxyUsed) updated
+        # when http::OpenSocket calls http::ConfigureNewSocket.
+        set state(proxyUsed) SecureProxy
         set sock $state2(sock)
         cleanup $token2
         return $sock
@@ -5039,7 +5050,6 @@ proc http::SecureProxyConnect {args} {
                 set state($name) $state2($name)
             }
         }
-        set state(proxyUsed) SecureProxyFailed
         set state(connection) close
         set msg "proxy connect failed: $code"
 	# - This error message will be detected by http::OpenSocket and will
-- 
cgit v0.12


From c3e9fc9aedad22f58fd1fe766f6d01ccb8d3d6f7 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 7 Nov 2022 22:02:33 +0000
Subject: library/http/http.tcl - define http::socketProxyId and use it to
 record the proxy (if any) used by each persistent socket.  Minor fix to
 socketPhQueue.

---
 library/http/http.tcl | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 0ba201e..f1d5f8b 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -77,6 +77,7 @@ namespace eval http {
 	variable socketClosing
 	variable socketPlayCmd
 	variable socketCoEvent
+	variable socketProxyId
 	if {[info exists socketMapping]} {
 	    # Close open sockets on re-init.  Do not permit retries.
 	    foreach {url sock} [array get socketMapping] {
@@ -101,6 +102,7 @@ namespace eval http {
 	array unset socketClosing
 	array unset socketPlayCmd
 	array unset socketCoEvent
+	array unset socketProxyId
 	array set socketMapping {}
 	array set socketRdState {}
 	array set socketWrState {}
@@ -110,6 +112,7 @@ namespace eval http {
 	array set socketClosing {}
 	array set socketPlayCmd {}
 	array set socketCoEvent {}
+	array set socketProxyId {}
 	return
     }
     init
@@ -407,6 +410,7 @@ proc http::Finish {token {errormsg ""} {skipCB 0}} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     variable $token
     upvar 0 $token state
@@ -540,6 +544,7 @@ proc http::KeepSocket {token} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     variable $token
     upvar 0 $token state
@@ -742,6 +747,7 @@ proc http::CloseSocket {s {token {}}} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     set tk [namespace tail $token]
 
@@ -804,6 +810,7 @@ proc http::CloseQueuedQueries {connId {token {}}} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     ##Log CloseQueuedQueries $connId $token
     if {![info exists socketMapping($connId)]} {
@@ -865,6 +872,7 @@ proc http::Unset {connId} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     unset socketMapping($connId)
     unset socketRdState($connId)
@@ -873,6 +881,7 @@ proc http::Unset {connId} {
     unset -nocomplain socketWrQueue($connId)
     unset -nocomplain socketClosing($connId)
     unset -nocomplain socketPlayCmd($connId)
+    unset -nocomplain socketProxyId($connId)
     return
 }
 
@@ -1344,6 +1353,11 @@ proc http::CreateToken {url args} {
 	set srvurl $url
 	set targetAddr [list $phost $pport]
 	set state(proxyUsed) HttpProxy
+	# The value of state(proxyUsed) none|HttpProxy depends only on the
+	# all-transactions http::config settings and on the target URL.
+	# Even if this is a persistent socket there is no need to change the
+	# value of state(proxyUsed) for other transactions that use the socket:
+	# they have the same value already.
     } else {
 	set targetAddr [list $host $port]
     }
@@ -1379,6 +1393,7 @@ proc http::CreateToken {url args} {
 	variable socketClosing
 	variable socketPlayCmd
 	variable socketCoEvent
+	variable socketProxyId
 
 	if {[info exists socketMapping($state(socketinfo))]} {
 	    # - If the connection is idle, it has a "fileevent readable" binding
@@ -1401,6 +1416,7 @@ proc http::CreateToken {url args} {
 		# causes a call to Finish.
 		set reusing 1
 		set sock $socketMapping($state(socketinfo))
+		set state(proxyUsed) $socketProxyId($state(socketinfo))
 		Log "reusing closing socket $sock for $state(socketinfo) - token $token"
 
 		set state(alreadyQueued) 1
@@ -1435,6 +1451,7 @@ proc http::CreateToken {url args} {
 		# - The socket may not yet exist, and be defined with a placeholder.
 		set reusing 1
 		set sock $socketMapping($state(socketinfo))
+		set state(proxyUsed) $socketProxyId($state(socketinfo))
 		if {[SockIsPlaceHolder $sock]} {
 		    set state(ReusingPlaceholder) 1
 		    lappend socketPhQueue($sock) $token
@@ -1533,6 +1550,7 @@ proc http::AsyncTransaction {token} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     set sock $state(sock)
 
@@ -1609,9 +1627,15 @@ proc http::PreparePersistentConnection {token} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     set DoLater {-traceread 0 -tracewrite 0}
     set socketMapping($state(socketinfo)) $state(sock)
+    set socketProxyId($state(socketinfo)) $state(proxyUsed)
+    # - The value of state(proxyUsed) was set in http::CreateToken to either
+    #   "none" or "HttpProxy".
+    # - $token is the first transaction to use this placeholder, so there are
+    #   no other tokens whose (proxyUsed) must be modified.
 
     if {![info exists socketRdState($state(socketinfo))]} {
         set socketRdState($state(socketinfo)) {}
@@ -1643,10 +1667,11 @@ proc http::PreparePersistentConnection {token} {
 
     set socketRdQueue($state(socketinfo)) {}
     set socketWrQueue($state(socketinfo)) {}
-    set socketPhQueue($state(socketinfo)) {}
+    set socketPhQueue($state(sock))       {}
     set socketClosing($state(socketinfo)) 0
     set socketPlayCmd($state(socketinfo)) {ReplayIfClose Wready {} {}}
     set socketCoEvent($state(socketinfo)) {}
+    set socketProxyId($state(socketinfo)) {}
 
     return $DoLater
 }
@@ -1679,6 +1704,7 @@ proc http::OpenSocket {token DoLater} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     Log >K$tk Start OpenSocket coroutine
 
@@ -1795,9 +1821,11 @@ proc http::ConfigureNewSocket {token sockOld DoLater} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     set reusing $state(reusing)
     set sock $state(sock)
+    set proxyUsed $state(proxyUsed)
     ##Log "  ConfigureNewSocket" $token $sockOld ... -- $sock
 
     if {(!$reusing) && ($sock ne $sockOld)} {
@@ -1807,6 +1835,8 @@ proc http::ConfigureNewSocket {token sockOld DoLater} {
              && ($socketMapping($state(socketinfo)) eq $sockOld)
         } {
             set socketMapping($state(socketinfo)) $sock
+            set socketProxyId($state(socketinfo)) $proxyUsed
+            # tokens that use the placeholder $sockOld are updated below.
             ##Log set socketMapping($state(socketinfo)) $sock
         }
 
@@ -1846,6 +1876,7 @@ proc http::ConfigureNewSocket {token sockOld DoLater} {
 	    # 1. Amend the token's (sock).
 	    ##Log set ${tok}(sock) $sock
 	    set ${tok}(sock) $sock
+	    set ${tok}(proxyUsed) $proxyUsed
 
 	    # 2. Schedule the token's HTTP request.
 	    # Every token in socketPhQueue(*) has reusing 1 alreadyQueued 0.
@@ -1876,7 +1907,7 @@ proc http::ConfigureNewSocket {token sockOld DoLater} {
 #                        waiting until the read(s) in progress are finished).
 # socketRdQueue($connId) List of tokens that are queued for reading later.
 # socketWrQueue($connId) List of tokens that are queued for writing later.
-# socketPhQueue($connId) List of tokens that are queued to use a placeholder
+# socketPhQueue($sock)   List of tokens that are queued to use a placeholder
 #                        socket, when the real socket has not yet been created.
 # socketClosing($connId) (boolean) true iff a server response header indicates
 #                        that the server will close the connection at the end of
@@ -1885,6 +1916,11 @@ proc http::ConfigureNewSocket {token sockOld DoLater} {
 #                        part-completed transactions if the socket closes early.
 # socketCoEvent($connId) Identifier for the "after idle" event that will launch
 #                        an OpenSocket coroutine to open or re-use a socket.
+# socketProxyId($connId) The type of proxy that this socket uses: values are
+#                        those of state(proxyUsed) i.e. none, HttpProxy,
+#                        SecureProxy, and SecureProxyFailed.
+#                        The value is not used for anything by http, its purpose
+#                        is to set the value of state() for caller information.
 # ------------------------------------------------------------------------------
 
 
@@ -1940,6 +1976,7 @@ proc http::ScheduleRequest {token} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     set Unfinished 0
 
@@ -2085,6 +2122,7 @@ proc http::Connected {token proto phost srvurl} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     variable $token
     upvar 0 $token state
@@ -2424,6 +2462,7 @@ proc http::DoneRequest {token} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     variable $token
     upvar 0 $token state
@@ -2755,6 +2794,7 @@ proc http::ReplayIfDead {token doing} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     variable $token
     upvar 0 $token state
@@ -2998,6 +3038,7 @@ proc http::ReplayCore {newQueue} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     if {[llength $newQueue] == 0} {
 	# Nothing to do.
@@ -3347,6 +3388,7 @@ proc http::Write {token} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     variable $token
     upvar 0 $token state
@@ -3459,6 +3501,7 @@ proc http::Event {sock token} {
     variable socketClosing
     variable socketPlayCmd
     variable socketCoEvent
+    variable socketProxyId
 
     variable $token
     upvar 0 $token state
-- 
cgit v0.12


From 03a9eaa9512a6a1a87cc4c3225caa6bbcb44cdb1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 7 Nov 2022 22:04:59 +0000
Subject: Use TCLFLEXARRAY

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

diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 8999858..6749978 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -56,7 +56,7 @@ typedef struct {
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
-    char command[1];		/* Space for Tcl command to invoke. Actual
+    char command[TCLFLEXARRAY];		/* Space for Tcl command to invoke. Actual
 				 * size will be as large as necessary to hold
 				 * command. This field must be the last in the
 				 * structure, so that it can be larger than 1
@@ -1039,7 +1039,7 @@ TraceVariableObjCmd(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 Tcl_CommandTraceInfo(
     Tcl_Interp *interp,		/* Interpreter containing command. */
     const char *cmdName,	/* Name of command. */
@@ -1818,7 +1818,8 @@ TraceExecutionProc(
 
 	if (call) {
 	    Tcl_DString cmd, sub;
-	    int i, saveInterpFlags;
+	    int i;
+	    int saveInterpFlags;
 
 	    Tcl_DStringInit(&cmd);
 	    Tcl_DStringAppend(&cmd, tcmdPtr->command, tcmdPtr->length);
@@ -2074,7 +2075,7 @@ TraceVarProc(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_CreateObjTrace --
+ * Tcl_CreateObjTrace/Tcl_CreateObjTrace2 --
  *
  *	Arrange for a function to be called to trace command execution.
  *
@@ -2087,7 +2088,7 @@ TraceVarProc(
  *	called to execute a Tcl command. Calls to proc will have the following
  *	form:
  *
- *	void proc(ClientData	 clientData,
+ *	void proc(void   *	 clientData,
  *		  Tcl_Interp *	 interp,
  *		  int		 level,
  *		  const char *	 command,
@@ -3036,7 +3037,7 @@ Tcl_UntraceVar2(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 Tcl_VarTraceInfo2(
     Tcl_Interp *interp,		/* Interpreter containing variable. */
     const char *part1,		/* Name of variable or array. */
-- 
cgit v0.12


From e977d6e7af0d658006f243be34f927a266b0fc23 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Mon, 7 Nov 2022 22:06:42 +0000
Subject: library/http/http.tcl - bugfix OpenSocket to replay any requests in
 the socketPhQueue placeholder queue, if the socket was not created.

---
 library/http/http.tcl | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index f1d5f8b..4c9f6a7 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1753,7 +1753,20 @@ proc http::OpenSocket {token DoLater} {
         ConfigureNewSocket $token $sockOld $DoLater
         ##Log OpenSocket success $sock - token $token
     } result errdict]} {
-        ##Log OpenSocket failed $result - token $token
+	##Log OpenSocket failed $result - token $token
+	# There may be other requests in the socketPhQueue.
+	# Prepare socketPlayCmd so that Finish will replay them.
+	if {    ($state(-keepalive)) && (!$state(reusing))
+	     && [info exists socketPhQueue($sockOld)]
+	     && ($socketPhQueue($sockOld) ne {})
+	} {
+	    if {$socketMapping($state(socketinfo)) ne $sockOld} {
+		Log "WARNING: this code should not be reached.\
+			{$socketMapping($state(socketinfo)) ne $sockOld}"
+	    }
+	    set socketPlayCmd($state(socketinfo)) [list ReplayIfClose Wready {} $socketPhQueue($sockOld)]
+	    set socketPhQueue($sockOld) {}
+	}
         if {[string range $result 0 20] eq {proxy connect failed:}} {
 	    # - The HTTPS proxy did not create a socket.  The pre-existing value
 	    #   (a "placeholder socket") is unchanged.
-- 
cgit v0.12


From 7e8c940ac114ea986ce22a24a142df025e0b1bbb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Nov 2022 07:28:44 +0000
Subject: Fix "package files tcl", considering TIP #590

---
 generic/tclInterp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index c5f84db..ad24d28 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -333,7 +333,7 @@ int
 Tcl_Init(
     Tcl_Interp *interp)		/* Interpreter to initialize. */
 {
-    PkgName pkgName = {NULL, "Tcl"};
+    PkgName pkgName = {NULL, "tcl"};
     PkgName **names = (PkgName **)TclInitPkgFiles(interp);
     int result = TCL_ERROR;
 
-- 
cgit v0.12


From 008001c3b5e35ff3c122f2eb1bf566d93746b172 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Nov 2022 07:30:42 +0000
Subject: More TCLFLEXARRAY usage

---
 generic/tclPkg.c   | 2 +-
 generic/tclTrace.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index fd45cc1..bfe1c66 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -40,7 +40,7 @@ typedef struct PkgAvail {
 typedef struct PkgName {
     struct PkgName *nextPtr;	/* Next in list of package names being
 				 * initialized. */
-    char name[1];
+    char name[TCLFLEXARRAY];
 } PkgName;
 
 typedef struct PkgFiles {
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 0c243a6..bed5084 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -22,7 +22,7 @@ typedef struct {
     int flags;			/* Operations for which Tcl command is to be
 				 * invoked. */
     size_t length;		/* Number of non-NUL chars. in command. */
-    char command[1];		/* Space for Tcl command to invoke. Actual
+    char command[TCLFLEXARRAY];		/* Space for Tcl command to invoke. Actual
 				 * size will be as large as necessary to hold
 				 * command. This field must be the last in the
 				 * structure, so that it can be larger than 1
@@ -56,7 +56,7 @@ typedef struct {
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
-    char command[1];		/* Space for Tcl command to invoke. Actual
+    char command[TCLFLEXARRAY];		/* Space for Tcl command to invoke. Actual
 				 * size will be as large as necessary to hold
 				 * command. This field must be the last in the
 				 * structure, so that it can be larger than 1
-- 
cgit v0.12


From 2afe485f41e0c7303cbf8d181745c56f7d19f5b0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Nov 2022 09:59:28 +0000
Subject: NEVER use sizeof(FLEXARRAY)! Use offsetof()

---
 generic/tclPkg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index bfe1c66..7866158 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -828,7 +828,7 @@ SelectPackage(
 	 * Push "ifneeded" package name in "tclPkgFiles" assocdata.
 	 */
 
-	pkgName = (PkgName *)ckalloc(sizeof(PkgName) + strlen(name));
+	pkgName = (PkgName *)ckalloc(offsetof(PkgName, name) + 1 + strlen(name));
 	pkgName->nextPtr = pkgFiles->names;
 	strcpy(pkgName->name, name);
 	pkgFiles->names = pkgName;
-- 
cgit v0.12


From b6c0957a8f2f5b52b9c0f1c1c433cda524970f99 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Nov 2022 20:27:01 +0000
Subject: More int -> size_t (argc and level) in trace handling

---
 doc/CrtObjCmd.3    |   2 +-
 doc/CrtTrace.3     |  16 +++++++-
 generic/tcl.decls  |   6 +--
 generic/tcl.h      |   4 +-
 generic/tclDecls.h |  18 +++++----
 generic/tclInt.h   |   6 ++-
 generic/tclTrace.c | 110 ++++++++++++++++++++++++++---------------------------
 7 files changed, 91 insertions(+), 71 deletions(-)

diff --git a/doc/CrtObjCmd.3 b/doc/CrtObjCmd.3
index 012c46c..ffd9e27 100644
--- a/doc/CrtObjCmd.3
+++ b/doc/CrtObjCmd.3
@@ -224,7 +224,7 @@ pointed to by \fIinfoPtr\fR and returns 1.
 A \fBTcl_CmdInfo\fR structure has the following fields:
 .PP
 .CS
-typedef struct Tcl_CmdInfo {
+typedef struct {
     int \fIisNativeObjectProc\fR;
     Tcl_ObjCmdProc *\fIobjProc\fR;
     void *\fIobjClientData\fR;
diff --git a/doc/CrtTrace.3 b/doc/CrtTrace.3
index 6833fc5..e4d1a43 100644
--- a/doc/CrtTrace.3
+++ b/doc/CrtTrace.3
@@ -29,7 +29,7 @@ Tcl_Trace
 .AS Tcl_CmdObjTraceDeleteProc *deleteProc
 .AP Tcl_Interp *interp in
 Interpreter containing command to be traced or untraced.
-.AP int level in
+.AP size_t level in
 Only commands at or below this nesting level will be traced unless
 0 is specified.  1 means
 top-level commands only, 2 means top-level commands or those that are
@@ -81,6 +81,20 @@ typedef int \fBTcl_CmdObjTraceProc\fR(
         \fBTcl_Obj\fR *const \fIobjv\fR[]);
 .CE
 .PP
+\fIobjProc2\fR should have arguments and result that match the type,
+\fBTcl_CmdObjTraceProc2\fR:
+.PP
+.CS
+typedef int \fBTcl_CmdObjTraceProc2\fR(
+        \fBvoid *\fR \fIclientData\fR,
+        \fBTcl_Interp\fR* \fIinterp\fR,
+        size_t \fIlevel\fR,
+        const char *\fIcommand\fR,
+        \fBTcl_Command\fR \fIcommandToken\fR,
+        size_t \fIobjc\fR,
+        \fBTcl_Obj\fR *const \fIobjv\fR[]);
+.CE
+.PP
 The \fIclientData\fR and \fIinterp\fR parameters are copies of the
 corresponding arguments given to \fBTcl_CreateTrace\fR.
 \fIclientData\fR typically points to an application-specific data
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 0def57e..322d0cf 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -388,7 +388,7 @@ declare 98 {
 	    Tcl_TimerProc *proc, void *clientData)
 }
 declare 99 {
-    Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, int level,
+    Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, Tcl_Size level,
 	    Tcl_CmdTraceProc *proc, void *clientData)
 }
 declare 100 {
@@ -1781,7 +1781,7 @@ declare 482 {
 
 # TIP#32 (object-enabled traces) kbk
 declare 483 {
-    Tcl_Trace Tcl_CreateObjTrace(Tcl_Interp *interp, int level, int flags,
+    Tcl_Trace Tcl_CreateObjTrace(Tcl_Interp *interp, Tcl_Size level, int flags,
 	    Tcl_CmdObjTraceProc *objProc, void *clientData,
 	    Tcl_CmdObjTraceDeleteProc *delProc)
 }
@@ -2576,7 +2576,7 @@ declare 676 {
 	    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 677 {
-    Tcl_Trace Tcl_CreateObjTrace2(Tcl_Interp *interp, int level, int flags,
+    Tcl_Trace Tcl_CreateObjTrace2(Tcl_Interp *interp, Tcl_Size level, int flags,
 	    Tcl_CmdObjTraceProc2 *objProc2, void *clientData,
 	    Tcl_CmdObjTraceDeleteProc *delProc)
 }
diff --git a/generic/tcl.h b/generic/tcl.h
index 706c5f1..a2fd2a4 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -558,7 +558,7 @@ typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp,
 	int level, const char *command, Tcl_Command commandInfo, int objc,
 	struct Tcl_Obj *const *objv);
 typedef int (Tcl_CmdObjTraceProc2) (void *clientData, Tcl_Interp *interp,
-	int level, const char *command, Tcl_Command commandInfo, size_t objc,
+	size_t level, const char *command, Tcl_Command commandInfo, size_t objc,
 	struct Tcl_Obj *const *objv);
 typedef void (Tcl_CmdObjTraceDeleteProc) (void *clientData);
 typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
@@ -773,7 +773,7 @@ typedef struct Tcl_CallFrame {
  * then calls the other function.
  */
 
-typedef struct Tcl_CmdInfo {
+typedef struct {
     int isNativeObjectProc;	/* 1 if objProc was registered by a call to
 				 * Tcl_CreateObjCommand; 2 if objProc was registered by
 				 * a call to Tcl_CreateObjCommand2; 0 otherwise.
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8040adf..8e4aa59 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -306,7 +306,7 @@ EXTERN Tcl_Interp *	Tcl_CreateChild(Tcl_Interp *interp, const char *name,
 EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
 				Tcl_TimerProc *proc, void *clientData);
 /* 99 */
-EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, int level,
+EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, Tcl_Size level,
 				Tcl_CmdTraceProc *proc, void *clientData);
 /* 100 */
 EXTERN void		Tcl_DeleteAssocData(Tcl_Interp *interp,
@@ -1263,8 +1263,9 @@ EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
 /* 482 */
 EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
 /* 483 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp, int level,
-				int flags, Tcl_CmdObjTraceProc *objProc,
+EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp,
+				Tcl_Size level, int flags,
+				Tcl_CmdObjTraceProc *objProc,
 				void *clientData,
 				Tcl_CmdObjTraceDeleteProc *delProc);
 /* 484 */
@@ -1824,8 +1825,9 @@ EXTERN Tcl_Command	Tcl_CreateObjCommand2(Tcl_Interp *interp,
 				void *clientData,
 				Tcl_CmdDeleteProc *deleteProc);
 /* 677 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace2(Tcl_Interp *interp, int level,
-				int flags, Tcl_CmdObjTraceProc2 *objProc2,
+EXTERN Tcl_Trace	Tcl_CreateObjTrace2(Tcl_Interp *interp,
+				Tcl_Size level, int flags,
+				Tcl_CmdObjTraceProc2 *objProc2,
 				void *clientData,
 				Tcl_CmdObjTraceDeleteProc *delProc);
 /* 678 */
@@ -1960,7 +1962,7 @@ typedef struct TclStubs {
     Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
     Tcl_Interp * (*tcl_CreateChild) (Tcl_Interp *interp, const char *name, int isSafe); /* 97 */
     Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, void *clientData); /* 98 */
-    Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, int level, Tcl_CmdTraceProc *proc, void *clientData); /* 99 */
+    Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, Tcl_Size level, Tcl_CmdTraceProc *proc, void *clientData); /* 99 */
     void (*tcl_DeleteAssocData) (Tcl_Interp *interp, const char *name); /* 100 */
     void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc *proc, void *clientData); /* 101 */
     void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, void *clientData); /* 102 */
@@ -2344,7 +2346,7 @@ typedef struct TclStubs {
     void (*tcl_FSMountsChanged) (const Tcl_Filesystem *fsPtr); /* 480 */
     int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Size count); /* 481 */
     void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */
-    Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
+    Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
     int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */
     int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, const Tcl_CmdInfo *infoPtr); /* 485 */
     Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, const char *file, int line); /* 486 */
@@ -2538,7 +2540,7 @@ typedef struct TclStubs {
     int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *charPtr); /* 674 */
     int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *charPtr); /* 675 */
     Tcl_Command (*tcl_CreateObjCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 676 */
-    Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
+    Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
     Tcl_Command (*tcl_NRCreateCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc, Tcl_ObjCmdProc2 *nreProc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 678 */
     int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, size_t objc, Tcl_Obj *const objv[]); /* 679 */
     int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a633a17..1b817e9 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1041,9 +1041,13 @@ typedef void (ProcErrorProc)(Tcl_Interp *interp, Tcl_Obj *procNameObj);
  */
 
 typedef struct Trace {
-    int level;			/* Only trace commands at nesting level less
+    Tcl_Size level;		/* Only trace commands at nesting level less
 				 * than or equal to this. */
+#if TCL_MAJOR_VERSION > 8
+    Tcl_CmdObjTraceProc2 *proc;	/* Procedure to call to trace command. */
+#else
     Tcl_CmdObjTraceProc *proc;	/* Procedure to call to trace command. */
+#endif
     void *clientData;	/* Arbitrary value to pass to proc. */
     struct Trace *nextPtr;	/* Next in list of traces for this interp. */
     int flags;			/* Flags governing the trace - see
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 2c525b0..1b70f1e 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -44,7 +44,7 @@ typedef struct {
     size_t length;		/* Number of non-NUL chars. in command. */
     Tcl_Trace stepTrace;	/* Used for execution traces, when tracing
 				 * inside the given command */
-    int startLevel;		/* Used for bookkeeping with step execution
+    Tcl_Size startLevel;		/* Used for bookkeeping with step execution
 				 * traces, store the level at which the step
 				 * trace was invoked */
     char *startCmd;		/* Used for bookkeeping with step execution
@@ -99,7 +99,7 @@ enum traceOptions {
 #endif
 };
 typedef int (Tcl_TraceTypeObjCmd)(Tcl_Interp *interp, enum traceOptions optionIndex,
-	int objc, Tcl_Obj *const objv[]);
+	Tcl_Size objc, Tcl_Obj *const objv[]);
 
 static Tcl_TraceTypeObjCmd TraceVariableObjCmd;
 static Tcl_TraceTypeObjCmd TraceCommandObjCmd;
@@ -126,18 +126,18 @@ static Tcl_TraceTypeObjCmd *const traceSubCmds[] = {
  */
 
 static int		CallTraceFunction(Tcl_Interp *interp, Trace *tracePtr,
-			    Command *cmdPtr, const char *command, size_t numChars,
-			    int objc, Tcl_Obj *const objv[]);
+			    Command *cmdPtr, const char *command, Tcl_Size numChars,
+			    Tcl_Size objc, Tcl_Obj *const objv[]);
 static char *		TraceVarProc(void *clientData, Tcl_Interp *interp,
 			    const char *name1, const char *name2, int flags);
 static void		TraceCommandProc(void *clientData,
 			    Tcl_Interp *interp, const char *oldName,
 			    const char *newName, int flags);
-static Tcl_CmdObjTraceProc TraceExecutionProc;
+static Tcl_CmdObjTraceProc2 TraceExecutionProc;
 static int		StringTraceProc(void *clientData,
-			    Tcl_Interp *interp, int level,
+			    Tcl_Interp *interp, Tcl_Size level,
 			    const char *command, Tcl_Command commandInfo,
-			    int objc, Tcl_Obj *const objv[]);
+			    Tcl_Size objc, Tcl_Obj *const objv[]);
 static void		StringTraceDeleteProc(void *clientData);
 static void		DisposeTraceResult(int flags, char *result);
 static int		TraceVarEx(Tcl_Interp *interp, const char *part1,
@@ -270,7 +270,7 @@ Tcl_TraceObjCmd(
 	Tcl_Obj *copyObjv[6];
 	Tcl_Obj *opsList;
 	int code;
-	size_t numFlags;
+	Tcl_Size numFlags;
 
 	if (objc != 5) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "name ops command");
@@ -399,11 +399,11 @@ static int
 TraceExecutionObjCmd(
     Tcl_Interp *interp,		/* Current interpreter. */
 	enum traceOptions optionIndex,		/* Add, info or remove */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     const char *name, *command;
-    size_t commandLength, length;
+    Tcl_Size length;
     static const char *const opStrings[] = {
 	"enter", "leave", "enterstep", "leavestep", NULL
     };
@@ -416,7 +416,7 @@ TraceExecutionObjCmd(
     case TRACE_ADD:
     case TRACE_REMOVE: {
 	int flags = 0, result;
-	size_t i, listLen;
+	Tcl_Size i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -461,8 +461,7 @@ TraceExecutionObjCmd(
 		break;
 	    }
 	}
-	command = Tcl_GetStringFromObj(objv[5], &commandLength);
-	length = commandLength;
+	command = Tcl_GetStringFromObj(objv[5], &length);
 	if (optionIndex == TRACE_ADD) {
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)Tcl_Alloc(
 		    offsetof(TraceCommandInfo, command) + 1 + length);
@@ -571,7 +570,7 @@ TraceExecutionObjCmd(
 
 	resultListPtr = Tcl_NewListObj(0, NULL);
 	FOREACH_COMMAND_TRACE(interp, name, clientData) {
-	    size_t numOps = 0;
+	    Tcl_Size numOps = 0;
 	    Tcl_Obj *opObj, *eachTraceObjPtr, *elemObjPtr;
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
@@ -647,11 +646,11 @@ static int
 TraceCommandObjCmd(
     Tcl_Interp *interp,		/* Current interpreter. */
 	enum traceOptions optionIndex,		/* Add, info or remove */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     const char *name, *command;
-    size_t commandLength, length;
+    Tcl_Size length;
     static const char *const opStrings[] = { "delete", "rename", NULL };
     enum operations { TRACE_CMD_DELETE, TRACE_CMD_RENAME } index;
 
@@ -659,7 +658,7 @@ TraceCommandObjCmd(
     case TRACE_ADD:
     case TRACE_REMOVE: {
 	int flags = 0, result;
-	size_t i, listLen;
+	Tcl_Size i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -700,8 +699,7 @@ TraceCommandObjCmd(
 	    }
 	}
 
-	command = Tcl_GetStringFromObj(objv[5], &commandLength);
-	length = commandLength;
+	command = Tcl_GetStringFromObj(objv[5], &length);
 	if (optionIndex == TRACE_ADD) {
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)Tcl_Alloc(
 		    offsetof(TraceCommandInfo, command) + 1 + length);
@@ -776,7 +774,7 @@ TraceCommandObjCmd(
 
 	resultListPtr = Tcl_NewListObj(0, NULL);
 	FOREACH_COMMAND_TRACE(interp, name, clientData) {
-	    size_t numOps = 0;
+	    Tcl_Size numOps = 0;
 	    Tcl_Obj *opObj, *eachTraceObjPtr, *elemObjPtr;
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
@@ -843,11 +841,11 @@ static int
 TraceVariableObjCmd(
     Tcl_Interp *interp,		/* Current interpreter. */
 	enum traceOptions optionIndex,		/* Add, info or remove */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     const char *name, *command;
-    size_t commandLength, length;
+    Tcl_Size length;
     void *clientData;
     static const char *const opStrings[] = {
 	"array", "read", "unset", "write", NULL
@@ -860,7 +858,7 @@ TraceVariableObjCmd(
     case TRACE_ADD:
     case TRACE_REMOVE: {
 	int flags = 0, result;
-	size_t i, listLen;
+	Tcl_Size i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -905,8 +903,7 @@ TraceVariableObjCmd(
 		break;
 	    }
 	}
-	command = Tcl_GetStringFromObj(objv[5], &commandLength);
-	length = commandLength;
+	command = Tcl_GetStringFromObj(objv[5], &length);
 	if (optionIndex == TRACE_ADD) {
 	    CombinedTraceVarInfo *ctvarPtr = (CombinedTraceVarInfo *)Tcl_Alloc(
 		    offsetof(CombinedTraceVarInfo, traceCmdInfo.command)
@@ -1423,17 +1420,17 @@ TclCheckExecutionTraces(
     Tcl_Interp *interp,		/* The current interpreter. */
     const char *command,	/* Pointer to beginning of the current command
 				 * string. */
-    TCL_UNUSED(size_t) /*numChars*/,
+    TCL_UNUSED(Tcl_Size) /*numChars*/,
     Command *cmdPtr,		/* Points to command's Command struct. */
     int code,			/* The current result code. */
     int traceFlags,		/* Current tracing situation. */
-    size_t objc,			/* Number of arguments for the command. */
+    Tcl_Size objc,			/* Number of arguments for the command. */
     Tcl_Obj *const objv[])	/* Pointers to Tcl_Obj of each argument. */
 {
     Interp *iPtr = (Interp *) interp;
     CommandTrace *tracePtr, *lastTracePtr;
     ActiveCommandTrace active;
-    int curLevel;
+    Tcl_Size curLevel;
     int traceCode = TCL_OK;
     Tcl_InterpState state = NULL;
 
@@ -1528,18 +1525,18 @@ TclCheckInterpTraces(
     Tcl_Interp *interp,		/* The current interpreter. */
     const char *command,	/* Pointer to beginning of the current command
 				 * string. */
-    size_t numChars,		/* The number of characters in 'command' which
+    Tcl_Size numChars,		/* The number of characters in 'command' which
 				 * are part of the command string. */
     Command *cmdPtr,		/* Points to command's Command struct. */
     int code,			/* The current result code. */
     int traceFlags,		/* Current tracing situation. */
-    size_t objc,			/* Number of arguments for the command. */
+    Tcl_Size objc,			/* Number of arguments for the command. */
     Tcl_Obj *const objv[])	/* Pointers to Tcl_Obj of each argument. */
 {
     Interp *iPtr = (Interp *) interp;
     Trace *tracePtr, *lastTracePtr;
     ActiveInterpTrace active;
-    int curLevel;
+    Tcl_Size curLevel;
     int traceCode = TCL_OK;
     Tcl_InterpState state = NULL;
 
@@ -1675,9 +1672,9 @@ CallTraceFunction(
     Command *cmdPtr,		/* Points to command's Command struct. */
     const char *command,	/* Points to the first character of the
 				 * command's source before substitutions. */
-    size_t numChars,		/* The number of characters in the command's
+    Tcl_Size numChars,		/* The number of characters in the command's
 				 * source. */
-    int objc,		/* Number of arguments for the command. */
+    Tcl_Size objc,		/* Number of arguments for the command. */
     Tcl_Obj *const objv[])	/* Pointers to Tcl_Obj of each argument. */
 {
     Interp *iPtr = (Interp *) interp;
@@ -1760,10 +1757,10 @@ static int
 TraceExecutionProc(
     void *clientData,
     Tcl_Interp *interp,
-    int level,
+    Tcl_Size level,
     const char *command,
     TCL_UNUSED(Tcl_Command),
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     int call = 0;
@@ -1818,7 +1815,7 @@ TraceExecutionProc(
 
 	if (call) {
 	    Tcl_DString cmd, sub;
-	    int i;
+	    Tcl_Size i;
 	    int saveInterpFlags;
 
 	    Tcl_DStringInit(&cmd);
@@ -1926,7 +1923,7 @@ TraceExecutionProc(
 	    tcmdPtr->startCmd = (char *)Tcl_Alloc(len);
 	    memcpy(tcmdPtr->startCmd, command, len);
 	    tcmdPtr->refCount++;
-	    tcmdPtr->stepTrace = Tcl_CreateObjTrace(interp, 0,
+	    tcmdPtr->stepTrace = Tcl_CreateObjTrace2(interp, 0,
 		   (tcmdPtr->flags & TCL_TRACE_ANY_EXEC) >> 2,
 		   TraceExecutionProc, tcmdPtr, CommandObjTraceDeleted);
 	}
@@ -2128,7 +2125,7 @@ TraceVarProc(
  */
 
 typedef struct {
-    Tcl_CmdObjTraceProc2 *proc;
+	Tcl_CmdObjTraceProc *proc;
     Tcl_CmdObjTraceDeleteProc *delProc;
     void *clientData;
 } TraceWrapperInfo;
@@ -2136,14 +2133,17 @@ typedef struct {
 static int traceWrapperProc(
     void *clientData,
     Tcl_Interp *interp,
-	int level,
+    Tcl_Size level,
     const char *command,
     Tcl_Command commandInfo,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     TraceWrapperInfo *info = (TraceWrapperInfo *)clientData;
-    return info->proc(info->clientData, interp, level, command, commandInfo, objc, objv);
+    if (objc > INT_MAX) {
+	objc = -1; /* Signal Tcl_CmdObjTraceProc that objc is out of range */
+    }
+    return info->proc(info->clientData, interp, (int)level, command, commandInfo, objc, objv);
 }
 
 static void traceWrapperDelProc(void *clientData)
@@ -2157,30 +2157,30 @@ static void traceWrapperDelProc(void *clientData)
 }
 
 Tcl_Trace
-Tcl_CreateObjTrace2(
+Tcl_CreateObjTrace(
     Tcl_Interp *interp,		/* Tcl interpreter */
-    int level,			/* Maximum nesting level */
+    Tcl_Size level,			/* Maximum nesting level */
     int flags,			/* Flags, see above */
-    Tcl_CmdObjTraceProc2 *proc,	/* Trace callback */
+    Tcl_CmdObjTraceProc *proc,	/* Trace callback */
     void *clientData,	/* Client data for the callback */
     Tcl_CmdObjTraceDeleteProc *delProc)
 				/* Function to call when trace is deleted */
 {
-    TraceWrapperInfo *info = (TraceWrapperInfo *)Tcl_Alloc(sizeof(TraceWrapperInfo));
+	TraceWrapperInfo *info = (TraceWrapperInfo *)Tcl_Alloc(sizeof(TraceWrapperInfo));
     info->proc = proc;
     info->delProc = delProc;
     info->clientData = clientData;
-    return Tcl_CreateObjTrace(interp, level, flags,
+    return Tcl_CreateObjTrace2(interp, level, flags,
 	    (proc ? traceWrapperProc : NULL),
 	    info, traceWrapperDelProc);
 }
 
 Tcl_Trace
-Tcl_CreateObjTrace(
+Tcl_CreateObjTrace2(
     Tcl_Interp *interp,		/* Tcl interpreter */
-    int level,			/* Maximum nesting level */
+    Tcl_Size level,			/* Maximum nesting level */
     int flags,			/* Flags, see above */
-    Tcl_CmdObjTraceProc *proc,	/* Trace callback */
+    Tcl_CmdObjTraceProc2 *proc2,	/* Trace callback */
     void *clientData,	/* Client data for the callback */
     Tcl_CmdObjTraceDeleteProc *delProc)
 				/* Function to call when trace is deleted */
@@ -2212,7 +2212,7 @@ Tcl_CreateObjTrace(
 
     tracePtr = (Trace *)Tcl_Alloc(sizeof(Trace));
     tracePtr->level = level;
-    tracePtr->proc = proc;
+    tracePtr->proc = proc2;
     tracePtr->clientData = clientData;
     tracePtr->delProc = delProc;
     tracePtr->nextPtr = iPtr->tracePtr;
@@ -2267,7 +2267,7 @@ Tcl_CreateObjTrace(
 Tcl_Trace
 Tcl_CreateTrace(
     Tcl_Interp *interp,		/* Interpreter in which to create trace. */
-    int level,			/* Only call proc for commands at nesting
+    Tcl_Size level,			/* Only call proc for commands at nesting
 				 * level<=argument level (1=>top level). */
     Tcl_CmdTraceProc *proc,	/* Function to call before executing each
 				 * command. */
@@ -2277,7 +2277,7 @@ Tcl_CreateTrace(
 
     data->clientData = clientData;
     data->proc = proc;
-    return Tcl_CreateObjTrace(interp, level, 0, StringTraceProc,
+    return Tcl_CreateObjTrace2(interp, level, 0, StringTraceProc,
 	    data, StringTraceDeleteProc);
 }
 
@@ -2301,16 +2301,16 @@ static int
 StringTraceProc(
     void *clientData,
     Tcl_Interp *interp,
-    int level,
+    Tcl_Size level,
     const char *command,
     Tcl_Command commandInfo,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const *objv)
 {
     StringTraceData *data = (StringTraceData *)clientData;
     Command *cmdPtr = (Command *) commandInfo;
     const char **argv;		/* Args to pass to string trace proc */
-    int i;
+    Tcl_Size i;
 
     /*
      * This is a bit messy because we have to emulate the old trace interface,
-- 
cgit v0.12


From a90bc45a547c857ffc5257490827aebfb7ac6d8d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Nov 2022 21:58:01 +0000
Subject: int -> size_t in Tcl_CmdObjTraceProc2 (for 'level'). Add missing
 documentation

---
 doc/CrtTrace.3     |  24 ++++--
 generic/tcl.decls  |   6 +-
 generic/tcl.h      |   2 +-
 generic/tclDecls.h |  18 +++--
 generic/tclInt.h   |   2 +-
 generic/tclTrace.c | 230 +++++++++++++++++++++++++++--------------------------
 6 files changed, 153 insertions(+), 129 deletions(-)

diff --git a/doc/CrtTrace.3 b/doc/CrtTrace.3
index 417c892..723a392 100644
--- a/doc/CrtTrace.3
+++ b/doc/CrtTrace.3
@@ -47,7 +47,7 @@ details of the calling sequence.
 .AP Tcl_CmdTraceProc *proc in
 Procedure to call for each command that is executed.  See below for
 details on the calling sequence.
-.AP ClientData clientData in
+.AP void *clientData in
 Arbitrary one-word value to pass to \fIobjProc\fR, \fIobjProc2\fR or \fIproc\fR.
 .AP Tcl_CmdObjTraceDeleteProc *deleteProc in
 Procedure to call when the trace is deleted.  See below for details of
@@ -72,7 +72,7 @@ interpreter.
 .PP
 .CS
 typedef int \fBTcl_CmdObjTraceProc\fR(
-        \fBClientData\fR \fIclientData\fR,
+        \fBvoid *\fR \fIclientData\fR,
         \fBTcl_Interp\fR* \fIinterp\fR,
         int \fIlevel\fR,
         const char *\fIcommand\fR,
@@ -81,6 +81,20 @@ typedef int \fBTcl_CmdObjTraceProc\fR(
         \fBTcl_Obj\fR *const \fIobjv\fR[]);
 .CE
 .PP
+\fIobjProc2\fR should have arguments and result that match the type,
+\fBTcl_CmdObjTraceProc2\fR:
+.PP
+.CS
+typedef int \fBTcl_CmdObjTraceProc2\fR(
+        \fBvoid *\fR \fIclientData\fR,
+        \fBTcl_Interp\fR* \fIinterp\fR,
+        size_t \fIlevel\fR,
+        const char *\fIcommand\fR,
+        \fBTcl_Command\fR \fIcommandToken\fR,
+        size_t \fIobjc\fR,
+        \fBTcl_Obj\fR *const \fIobjv\fR[]);
+.CE
+.PP
 The \fIclientData\fR and \fIinterp\fR parameters are copies of the
 corresponding arguments given to \fBTcl_CreateTrace\fR.
 \fIClientData\fR typically points to an application-specific data
@@ -146,7 +160,7 @@ When \fBTcl_DeleteTrace\fR is called, the interpreter invokes the
 .PP
 .CS
 typedef void \fBTcl_CmdObjTraceDeleteProc\fR(
-        \fBClientData\fR \fIclientData\fR);
+        \fBvoid *\fR \fIclientData\fR);
 .CE
 .PP
 The \fIclientData\fR parameter will be the same as the
@@ -162,12 +176,12 @@ match the type \fBTcl_CmdTraceProc\fR:
 .PP
 .CS
 typedef void \fBTcl_CmdTraceProc\fR(
-        ClientData \fIclientData\fR,
+        void *\fIclientData\fR,
         Tcl_Interp *\fIinterp\fR,
         int \fIlevel\fR,
         char *\fIcommand\fR,
         Tcl_CmdProc *\fIcmdProc\fR,
-        ClientData \fIcmdClientData\fR,
+        void *\fIcmdClientData\fR,
         int \fIargc\fR,
         const char *\fIargv\fR[]);
 .CE
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 994af13..6d9fbbd 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -374,7 +374,7 @@ declare 98 {
 	    Tcl_TimerProc *proc, void *clientData)
 }
 declare 99 {
-    Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, int level,
+    Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, Tcl_Size level,
 	    Tcl_CmdTraceProc *proc, void *clientData)
 }
 declare 100 {
@@ -1722,7 +1722,7 @@ declare 482 {
 
 # TIP#32 (object-enabled traces) kbk
 declare 483 {
-    Tcl_Trace Tcl_CreateObjTrace(Tcl_Interp *interp, int level, int flags,
+    Tcl_Trace Tcl_CreateObjTrace(Tcl_Interp *interp, Tcl_Size level, int flags,
 	    Tcl_CmdObjTraceProc *objProc, void *clientData,
 	    Tcl_CmdObjTraceDeleteProc *delProc)
 }
@@ -2517,7 +2517,7 @@ declare 676 {
 	    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 677 {
-    Tcl_Trace Tcl_CreateObjTrace2(Tcl_Interp *interp, int level, int flags,
+    Tcl_Trace Tcl_CreateObjTrace2(Tcl_Interp *interp, Tcl_Size level, int flags,
 	    Tcl_CmdObjTraceProc2 *objProc2, void *clientData,
 	    Tcl_CmdObjTraceDeleteProc *delProc)
 }
diff --git a/generic/tcl.h b/generic/tcl.h
index 3560481..e705cdb 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -674,7 +674,7 @@ typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp,
 	int level, const char *command, Tcl_Command commandInfo, int objc,
 	struct Tcl_Obj *const *objv);
 typedef int (Tcl_CmdObjTraceProc2) (void *clientData, Tcl_Interp *interp,
-	int level, const char *command, Tcl_Command commandInfo, size_t objc,
+	size_t level, const char *command, Tcl_Command commandInfo, size_t objc,
 	struct Tcl_Obj *const *objv);
 typedef void (Tcl_CmdObjTraceDeleteProc) (void *clientData);
 typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8cb77b8..0888ecf 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -360,7 +360,7 @@ EXTERN Tcl_Interp *	Tcl_CreateChild(Tcl_Interp *interp, const char *name,
 EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
 				Tcl_TimerProc *proc, void *clientData);
 /* 99 */
-EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, int level,
+EXTERN Tcl_Trace	Tcl_CreateTrace(Tcl_Interp *interp, Tcl_Size level,
 				Tcl_CmdTraceProc *proc, void *clientData);
 /* 100 */
 EXTERN void		Tcl_DeleteAssocData(Tcl_Interp *interp,
@@ -1451,8 +1451,9 @@ EXTERN int		Tcl_EvalTokensStandard(Tcl_Interp *interp,
 /* 482 */
 EXTERN void		Tcl_GetTime(Tcl_Time *timeBuf);
 /* 483 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp, int level,
-				int flags, Tcl_CmdObjTraceProc *objProc,
+EXTERN Tcl_Trace	Tcl_CreateObjTrace(Tcl_Interp *interp,
+				Tcl_Size level, int flags,
+				Tcl_CmdObjTraceProc *objProc,
 				void *clientData,
 				Tcl_CmdObjTraceDeleteProc *delProc);
 /* 484 */
@@ -2012,8 +2013,9 @@ EXTERN Tcl_Command	Tcl_CreateObjCommand2(Tcl_Interp *interp,
 				void *clientData,
 				Tcl_CmdDeleteProc *deleteProc);
 /* 677 */
-EXTERN Tcl_Trace	Tcl_CreateObjTrace2(Tcl_Interp *interp, int level,
-				int flags, Tcl_CmdObjTraceProc2 *objProc2,
+EXTERN Tcl_Trace	Tcl_CreateObjTrace2(Tcl_Interp *interp,
+				Tcl_Size level, int flags,
+				Tcl_CmdObjTraceProc2 *objProc2,
 				void *clientData,
 				Tcl_CmdObjTraceDeleteProc *delProc);
 /* 678 */
@@ -2164,7 +2166,7 @@ typedef struct TclStubs {
     Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
     Tcl_Interp * (*tcl_CreateChild) (Tcl_Interp *interp, const char *name, int isSafe); /* 97 */
     Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, void *clientData); /* 98 */
-    Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, int level, Tcl_CmdTraceProc *proc, void *clientData); /* 99 */
+    Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, Tcl_Size level, Tcl_CmdTraceProc *proc, void *clientData); /* 99 */
     void (*tcl_DeleteAssocData) (Tcl_Interp *interp, const char *name); /* 100 */
     void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc *proc, void *clientData); /* 101 */
     void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, void *clientData); /* 102 */
@@ -2556,7 +2558,7 @@ typedef struct TclStubs {
     void (*tcl_FSMountsChanged) (const Tcl_Filesystem *fsPtr); /* 480 */
     int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, Tcl_Size count); /* 481 */
     void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */
-    Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
+    Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc *objProc, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */
     int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */
     int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, const Tcl_CmdInfo *infoPtr); /* 485 */
     Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, const char *file, int line); /* 486 */
@@ -2750,7 +2752,7 @@ typedef struct TclStubs {
     int (*tcl_GetBool) (Tcl_Interp *interp, const char *src, int flags, char *charPtr); /* 674 */
     int (*tcl_GetBoolFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, char *charPtr); /* 675 */
     Tcl_Command (*tcl_CreateObjCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 676 */
-    Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
+    Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
     Tcl_Command (*tcl_NRCreateCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc, Tcl_ObjCmdProc2 *nreProc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 678 */
     int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, size_t objc, Tcl_Obj *const objv[]); /* 679 */
     int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index bdd7e5a..ec82abd 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1019,7 +1019,7 @@ typedef void (ProcErrorProc)(Tcl_Interp *interp, Tcl_Obj *procNameObj);
  */
 
 typedef struct Trace {
-    int level;			/* Only trace commands at nesting level less
+    Tcl_Size level;		/* Only trace commands at nesting level less
 				 * than or equal to this. */
     Tcl_CmdObjTraceProc *proc;	/* Procedure to call to trace command. */
     void *clientData;	/* Arbitrary value to pass to proc. */
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index bed5084..e2be167 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -21,7 +21,7 @@
 typedef struct {
     int flags;			/* Operations for which Tcl command is to be
 				 * invoked. */
-    size_t length;		/* Number of non-NUL chars. in command. */
+    Tcl_Size length;		/* Number of non-NUL chars. in command. */
     char command[TCLFLEXARRAY];		/* Space for Tcl command to invoke. Actual
 				 * size will be as large as necessary to hold
 				 * command. This field must be the last in the
@@ -41,10 +41,10 @@ typedef struct {
 typedef struct {
     int flags;			/* Operations for which Tcl command is to be
 				 * invoked. */
-    size_t length;		/* Number of non-NUL chars. in command. */
+    Tcl_Size length;		/* Number of non-NUL chars. in command. */
     Tcl_Trace stepTrace;	/* Used for execution traces, when tracing
 				 * inside the given command */
-    int startLevel;		/* Used for bookkeeping with step execution
+    Tcl_Size startLevel;		/* Used for bookkeeping with step execution
 				 * traces, store the level at which the step
 				 * trace was invoked */
     char *startCmd;		/* Used for bookkeeping with step execution
@@ -92,8 +92,15 @@ typedef struct {
  * Forward declarations for functions defined in this file:
  */
 
-typedef int (Tcl_TraceTypeObjCmd)(Tcl_Interp *interp, int optionIndex,
-	int objc, Tcl_Obj *const objv[]);
+/* 'OLD' options are pre-Tcl-8.4 style */
+enum traceOptionsEnum {
+    TRACE_ADD, TRACE_INFO, TRACE_REMOVE
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
+    ,TRACE_OLD_VARIABLE, TRACE_OLD_VDELETE, TRACE_OLD_VINFO
+#endif
+};
+typedef int (Tcl_TraceTypeObjCmd)(Tcl_Interp *interp, enum traceOptionsEnum optionIndex,
+	Tcl_Size objc, Tcl_Obj *const objv[]);
 
 static Tcl_TraceTypeObjCmd TraceVariableObjCmd;
 static Tcl_TraceTypeObjCmd TraceCommandObjCmd;
@@ -120,19 +127,19 @@ static Tcl_TraceTypeObjCmd *const traceSubCmds[] = {
  */
 
 static int		CallTraceFunction(Tcl_Interp *interp, Trace *tracePtr,
-			    Command *cmdPtr, const char *command, int numChars,
-			    int objc, Tcl_Obj *const objv[]);
-static char *		TraceVarProc(ClientData clientData, Tcl_Interp *interp,
+			    Command *cmdPtr, const char *command, Tcl_Size numChars,
+			    Tcl_Size objc, Tcl_Obj *const objv[]);
+static char *		TraceVarProc(void *clientData, Tcl_Interp *interp,
 			    const char *name1, const char *name2, int flags);
-static void		TraceCommandProc(ClientData clientData,
+static void		TraceCommandProc(void *clientData,
 			    Tcl_Interp *interp, const char *oldName,
 			    const char *newName, int flags);
 static Tcl_CmdObjTraceProc TraceExecutionProc;
-static int		StringTraceProc(ClientData clientData,
-			    Tcl_Interp *interp, int level,
+static int		StringTraceProc(void *clientData,
+			    Tcl_Interp *interp, Tcl_Size level,
 			    const char *command, Tcl_Command commandInfo,
-			    int objc, Tcl_Obj *const objv[]);
-static void		StringTraceDeleteProc(ClientData clientData);
+			    Tcl_Size objc, Tcl_Obj *const objv[]);
+static void		StringTraceDeleteProc(void *clientData);
 static void		DisposeTraceResult(int flags, char *result);
 static int		TraceVarEx(Tcl_Interp *interp, const char *part1,
 			    const char *part2, VarTrace *tracePtr);
@@ -143,7 +150,7 @@ static int		TraceVarEx(Tcl_Interp *interp, const char *part1,
  */
 
 typedef struct {
-    ClientData clientData;	/* Client data from Tcl_CreateTrace */
+    void *clientData;	/* Client data from Tcl_CreateTrace */
     Tcl_CmdTraceProc *proc;	/* Trace function from Tcl_CreateTrace */
 } StringTraceData;
 
@@ -185,10 +192,9 @@ int
 Tcl_TraceObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int optionIndex;
 #ifndef TCL_REMOVE_OBSOLETE_TRACES
     const char *name;
     const char *flagOps, *p;
@@ -201,13 +207,7 @@ Tcl_TraceObjCmd(
 #endif
 	NULL
     };
-    /* 'OLD' options are pre-Tcl-8.4 style */
-    enum traceOptionsEnum {
-	TRACE_ADD, TRACE_INFO, TRACE_REMOVE,
-#ifndef TCL_REMOVE_OBSOLETE_TRACES
-	TRACE_OLD_VARIABLE, TRACE_OLD_VDELETE, TRACE_OLD_VINFO
-#endif
-    };
+    int optionIndex;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
@@ -237,7 +237,7 @@ Tcl_TraceObjCmd(
 		0, &typeIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	return traceSubCmds[typeIndex](interp, optionIndex, objc, objv);
+	return traceSubCmds[typeIndex](interp, (enum traceOptionsEnum)optionIndex, objc, objv);
     }
     case TRACE_INFO: {
 	/*
@@ -260,7 +260,7 @@ Tcl_TraceObjCmd(
 		0, &typeIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	return traceSubCmds[typeIndex](interp, optionIndex, objc, objv);
+	return traceSubCmds[typeIndex](interp, (enum traceOptionsEnum)optionIndex, objc, objv);
 	break;
     }
 
@@ -312,7 +312,7 @@ Tcl_TraceObjCmd(
 	return code;
     }
     case TRACE_OLD_VINFO: {
-	ClientData clientData;
+	void *clientData;
 	char ops[5];
 	Tcl_Obj *resultListPtr, *pairObjPtr, *elemObjPtr;
 
@@ -397,16 +397,12 @@ Tcl_TraceObjCmd(
 static int
 TraceExecutionObjCmd(
     Tcl_Interp *interp,		/* Current interpreter. */
-    int optionIndex,		/* Add, info or remove */
-    int objc,			/* Number of arguments. */
+	enum traceOptionsEnum optionIndex,		/* Add, info or remove */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int commandLength, index;
     const char *name, *command;
-    size_t length;
-    enum traceOptions {
-	TRACE_ADD, TRACE_INFO, TRACE_REMOVE
-    };
+    Tcl_Size length;
     static const char *const opStrings[] = {
 	"enter", "leave", "enterstep", "leavestep", NULL
     };
@@ -414,12 +410,13 @@ TraceExecutionObjCmd(
 	TRACE_EXEC_ENTER, TRACE_EXEC_LEAVE,
 	TRACE_EXEC_ENTER_STEP, TRACE_EXEC_LEAVE_STEP
     };
+    int index;
 
-    switch ((enum traceOptions) optionIndex) {
+    switch (optionIndex) {
     case TRACE_ADD:
     case TRACE_REMOVE: {
-	int flags = 0;
-	int i, listLen, result;
+	int flags = 0, result;
+	Tcl_Size i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -464,9 +461,8 @@ TraceExecutionObjCmd(
 		break;
 	    }
 	}
-	command = TclGetStringFromObj(objv[5], &commandLength);
-	length = (size_t) commandLength;
-	if ((enum traceOptions) optionIndex == TRACE_ADD) {
+	command = TclGetStringFromObj(objv[5], &length);
+	if ((enum traceOptionsEnum) optionIndex == TRACE_ADD) {
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)ckalloc(
 		    offsetof(TraceCommandInfo, command) + 1 + length);
 
@@ -495,7 +491,7 @@ TraceExecutionObjCmd(
 	     * first one that matches.
 	     */
 
-	    ClientData clientData;
+	    void *clientData;
 
 	    /*
 	     * First ensure the name given is valid.
@@ -519,7 +515,7 @@ TraceExecutionObjCmd(
 			&& ((tcmdPtr->flags & (TCL_TRACE_ANY_EXEC |
 				TCL_TRACE_RENAME | TCL_TRACE_DELETE)) == flags)
 			&& (strncmp(command, tcmdPtr->command,
-				(size_t) length) == 0)) {
+				length) == 0)) {
 		    flags |= TCL_TRACE_DELETE;
 		    if (flags & (TCL_TRACE_ENTER_DURING_EXEC |
 			    TCL_TRACE_LEAVE_DURING_EXEC)) {
@@ -554,7 +550,7 @@ TraceExecutionObjCmd(
 	break;
     }
     case TRACE_INFO: {
-	ClientData clientData;
+	void *clientData;
 	Tcl_Obj *resultListPtr;
 
 	if (objc != 4) {
@@ -574,7 +570,7 @@ TraceExecutionObjCmd(
 
 	resultListPtr = Tcl_NewListObj(0, NULL);
 	FOREACH_COMMAND_TRACE(interp, name, clientData) {
-	    int numOps = 0;
+	    Tcl_Size numOps = 0;
 	    Tcl_Obj *opObj, *eachTraceObjPtr, *elemObjPtr;
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
@@ -619,6 +615,10 @@ TraceExecutionObjCmd(
 	Tcl_SetObjResult(interp, resultListPtr);
 	break;
     }
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
+    default:
+	break;
+#endif
     }
     return TCL_OK;
 }
@@ -645,22 +645,21 @@ TraceExecutionObjCmd(
 static int
 TraceCommandObjCmd(
     Tcl_Interp *interp,		/* Current interpreter. */
-    int optionIndex,		/* Add, info or remove */
-    int objc,			/* Number of arguments. */
+    enum traceOptionsEnum optionIndex,		/* Add, info or remove */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int commandLength, index;
     const char *name, *command;
-    size_t length;
-    enum traceOptions { TRACE_ADD, TRACE_INFO, TRACE_REMOVE };
+    Tcl_Size length;
     static const char *const opStrings[] = { "delete", "rename", NULL };
     enum operations { TRACE_CMD_DELETE, TRACE_CMD_RENAME };
+    int index;
 
-    switch ((enum traceOptions) optionIndex) {
+    switch (optionIndex) {
     case TRACE_ADD:
     case TRACE_REMOVE: {
-	int flags = 0;
-	int i, listLen, result;
+	int flags = 0, result;
+	Tcl_Size i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -701,9 +700,8 @@ TraceCommandObjCmd(
 	    }
 	}
 
-	command = TclGetStringFromObj(objv[5], &commandLength);
-	length = (size_t) commandLength;
-	if ((enum traceOptions) optionIndex == TRACE_ADD) {
+	command = TclGetStringFromObj(objv[5], &length);
+	if ((enum traceOptionsEnum) optionIndex == TRACE_ADD) {
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)ckalloc(
 		    offsetof(TraceCommandInfo, command) + 1 + length);
 
@@ -728,7 +726,7 @@ TraceCommandObjCmd(
 	     * first one that matches.
 	     */
 
-	    ClientData clientData;
+	    void *clientData;
 
 	    /*
 	     * First ensure the name given is valid.
@@ -744,7 +742,7 @@ TraceCommandObjCmd(
 
 		if ((tcmdPtr->length == length) && (tcmdPtr->flags == flags)
 			&& (strncmp(command, tcmdPtr->command,
-				(size_t) length) == 0)) {
+				length) == 0)) {
 		    Tcl_UntraceCommand(interp, name, flags | TCL_TRACE_DELETE,
 			    TraceCommandProc, clientData);
 		    tcmdPtr->flags |= TCL_TRACE_DESTROYED;
@@ -758,7 +756,7 @@ TraceCommandObjCmd(
 	break;
     }
     case TRACE_INFO: {
-	ClientData clientData;
+	void *clientData;
 	Tcl_Obj *resultListPtr;
 
 	if (objc != 4) {
@@ -777,7 +775,7 @@ TraceCommandObjCmd(
 
 	resultListPtr = Tcl_NewListObj(0, NULL);
 	FOREACH_COMMAND_TRACE(interp, name, clientData) {
-	    int numOps = 0;
+	    Tcl_Size numOps = 0;
 	    Tcl_Obj *opObj, *eachTraceObjPtr, *elemObjPtr;
 	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
@@ -813,6 +811,10 @@ TraceCommandObjCmd(
 	Tcl_SetObjResult(interp, resultListPtr);
 	break;
     }
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
+    default:
+	break;
+#endif
     }
     return TCL_OK;
 }
@@ -839,27 +841,26 @@ TraceCommandObjCmd(
 static int
 TraceVariableObjCmd(
     Tcl_Interp *interp,		/* Current interpreter. */
-    int optionIndex,		/* Add, info or remove */
-    int objc,			/* Number of arguments. */
+	enum traceOptionsEnum optionIndex,		/* Add, info or remove */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int commandLength, index;
     const char *name, *command;
-    size_t length;
-    ClientData clientData;
-    enum traceOptions { TRACE_ADD, TRACE_INFO, TRACE_REMOVE };
+    Tcl_Size length;
+    void *clientData;
     static const char *const opStrings[] = {
 	"array", "read", "unset", "write", NULL
     };
     enum operations {
 	TRACE_VAR_ARRAY, TRACE_VAR_READ, TRACE_VAR_UNSET, TRACE_VAR_WRITE
     };
+    int index;
 
-    switch ((enum traceOptions) optionIndex) {
+    switch ((enum traceOptionsEnum) optionIndex) {
     case TRACE_ADD:
     case TRACE_REMOVE: {
-	int flags = 0;
-	int i, listLen, result;
+	int flags = 0, result;
+	Tcl_Size i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -904,9 +905,8 @@ TraceVariableObjCmd(
 		break;
 	    }
 	}
-	command = TclGetStringFromObj(objv[5], &commandLength);
-	length = (size_t) commandLength;
-	if ((enum traceOptions) optionIndex == TRACE_ADD) {
+	command = TclGetStringFromObj(objv[5], &length);
+	if ((enum traceOptionsEnum) optionIndex == TRACE_ADD) {
 	    CombinedTraceVarInfo *ctvarPtr = (CombinedTraceVarInfo *)ckalloc(
 		    offsetof(CombinedTraceVarInfo, traceCmdInfo.command)
 		    + 1 + length);
@@ -947,7 +947,7 @@ TraceVariableObjCmd(
 #endif
 						)==flags)
 			&& (strncmp(command, tvarPtr->command,
-				(size_t) length) == 0)) {
+				length) == 0)) {
 		    Tcl_UntraceVar2(interp, name, NULL,
 			    flags | TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT,
 			    TraceVarProc, clientData);
@@ -1005,6 +1005,10 @@ TraceVariableObjCmd(
 	Tcl_SetObjResult(interp, resultListPtr);
 	break;
     }
+#ifndef TCL_REMOVE_OBSOLETE_TRACES
+    default:
+	break;
+#endif
     }
     return TCL_OK;
 }
@@ -1034,13 +1038,13 @@ TraceVariableObjCmd(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 Tcl_CommandTraceInfo(
     Tcl_Interp *interp,		/* Interpreter containing command. */
     const char *cmdName,	/* Name of command. */
     TCL_UNUSED(int) /*flags*/,
     Tcl_CommandTraceProc *proc,	/* Function assocated with trace. */
-    ClientData prevClientData)	/* If non-NULL, gives last value returned by
+    void *prevClientData)	/* If non-NULL, gives last value returned by
 				 * this function, so this call will return the
 				 * next trace after that one. If NULL, this
 				 * call will return the first trace. */
@@ -1108,7 +1112,7 @@ Tcl_TraceCommand(
 				 * of the TRACE_*_EXEC flags */
     Tcl_CommandTraceProc *proc,	/* Function to call when specified ops are
 				 * invoked upon cmdName. */
-    ClientData clientData)	/* Arbitrary argument to pass to proc. */
+    void *clientData)	/* Arbitrary argument to pass to proc. */
 {
     Command *cmdPtr;
     CommandTrace *tracePtr;
@@ -1172,7 +1176,7 @@ Tcl_UntraceCommand(
 				 * TCL_TRACE_RENAME, TCL_TRACE_DELETE, and any
 				 * of the TRACE_*_EXEC flags */
     Tcl_CommandTraceProc *proc,	/* Function assocated with trace. */
-    ClientData clientData)	/* Arbitrary argument to pass to proc. */
+    void *clientData)	/* Arbitrary argument to pass to proc. */
 {
     CommandTrace *tracePtr;
     CommandTrace *prevPtr;
@@ -1277,7 +1281,7 @@ Tcl_UntraceCommand(
 
 static void
 TraceCommandProc(
-    ClientData clientData,	/* Information about the command trace. */
+    void *clientData,	/* Information about the command trace. */
     Tcl_Interp *interp,		/* Interpreter containing command. */
     const char *oldName,	/* Name of command being changed. */
     const char *newName,	/* New name of command. Empty string or NULL
@@ -1300,7 +1304,7 @@ TraceCommandProc(
 	 */
 
 	Tcl_DStringInit(&cmd);
-	Tcl_DStringAppend(&cmd, tcmdPtr->command, (int) tcmdPtr->length);
+	Tcl_DStringAppend(&cmd, tcmdPtr->command, tcmdPtr->length);
 	Tcl_DStringAppendElement(&cmd, oldName);
 	Tcl_DStringAppendElement(&cmd, (newName ? newName : ""));
 	if (flags & TCL_TRACE_RENAME) {
@@ -1418,17 +1422,17 @@ TclCheckExecutionTraces(
     Tcl_Interp *interp,		/* The current interpreter. */
     const char *command,	/* Pointer to beginning of the current command
 				 * string. */
-    TCL_UNUSED(int) /*numChars*/,
+    TCL_UNUSED(Tcl_Size) /*numChars*/,
     Command *cmdPtr,		/* Points to command's Command struct. */
     int code,			/* The current result code. */
     int traceFlags,		/* Current tracing situation. */
-    int objc,			/* Number of arguments for the command. */
+    Tcl_Size objc,			/* Number of arguments for the command. */
     Tcl_Obj *const objv[])	/* Pointers to Tcl_Obj of each argument. */
 {
     Interp *iPtr = (Interp *) interp;
     CommandTrace *tracePtr, *lastTracePtr;
     ActiveCommandTrace active;
-    int curLevel;
+    Tcl_Size curLevel;
     int traceCode = TCL_OK;
     Tcl_InterpState state = NULL;
 
@@ -1523,18 +1527,18 @@ TclCheckInterpTraces(
     Tcl_Interp *interp,		/* The current interpreter. */
     const char *command,	/* Pointer to beginning of the current command
 				 * string. */
-    int numChars,		/* The number of characters in 'command' which
+    Tcl_Size numChars,		/* The number of characters in 'command' which
 				 * are part of the command string. */
     Command *cmdPtr,		/* Points to command's Command struct. */
     int code,			/* The current result code. */
     int traceFlags,		/* Current tracing situation. */
-    int objc,			/* Number of arguments for the command. */
+    Tcl_Size objc,			/* Number of arguments for the command. */
     Tcl_Obj *const objv[])	/* Pointers to Tcl_Obj of each argument. */
 {
     Interp *iPtr = (Interp *) interp;
     Trace *tracePtr, *lastTracePtr;
     ActiveInterpTrace active;
-    int curLevel;
+    Tcl_Size curLevel;
     int traceCode = TCL_OK;
     Tcl_InterpState state = NULL;
 
@@ -1670,9 +1674,9 @@ CallTraceFunction(
     Command *cmdPtr,		/* Points to command's Command struct. */
     const char *command,	/* Points to the first character of the
 				 * command's source before substitutions. */
-    int numChars,		/* The number of characters in the command's
+    Tcl_Size numChars,		/* The number of characters in the command's
 				 * source. */
-    int objc,		/* Number of arguments for the command. */
+    Tcl_Size objc,		/* Number of arguments for the command. */
     Tcl_Obj *const objv[])	/* Pointers to Tcl_Obj of each argument. */
 {
     Interp *iPtr = (Interp *) interp;
@@ -1717,7 +1721,7 @@ CallTraceFunction(
 
 static void
 CommandObjTraceDeleted(
-    ClientData clientData)
+    void *clientData)
 {
     TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
@@ -1753,12 +1757,12 @@ CommandObjTraceDeleted(
 
 static int
 TraceExecutionProc(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
-    int level,
+    Tcl_Size level,
     const char *command,
     TCL_UNUSED(Tcl_Command),
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     int call = 0;
@@ -1813,10 +1817,11 @@ TraceExecutionProc(
 
 	if (call) {
 	    Tcl_DString cmd, sub;
-	    int i, saveInterpFlags;
+	    Tcl_Size i;
+	    int saveInterpFlags;
 
 	    Tcl_DStringInit(&cmd);
-	    Tcl_DStringAppend(&cmd, tcmdPtr->command, (int)tcmdPtr->length);
+	    Tcl_DStringAppend(&cmd, tcmdPtr->command, tcmdPtr->length);
 
 	    /*
 	     * Append command with arguments.
@@ -1960,7 +1965,7 @@ TraceExecutionProc(
 
 static char *
 TraceVarProc(
-    ClientData clientData,	/* Information about the variable trace. */
+    void *clientData,	/* Information about the variable trace. */
     Tcl_Interp *interp,		/* Interpreter containing variable. */
     const char *name1,		/* Name of variable or array. */
     const char *name2,		/* Name of element within array; NULL means
@@ -1984,14 +1989,14 @@ TraceVarProc(
     result = NULL;
     if ((tvarPtr->flags & flags) && !Tcl_InterpDeleted(interp)
 	    && !Tcl_LimitExceeded(interp)) {
-	if (tvarPtr->length != (size_t) 0) {
+	if (tvarPtr->length) {
 	    /*
 	     * Generate a command to execute by appending list elements for
 	     * the two variable names and the operation.
 	     */
 
 	    Tcl_DStringInit(&cmd);
-	    Tcl_DStringAppend(&cmd, tvarPtr->command, (int) tvarPtr->length);
+	    Tcl_DStringAppend(&cmd, tvarPtr->command, tvarPtr->length);
 	    Tcl_DStringAppendElement(&cmd, name1);
 	    Tcl_DStringAppendElement(&cmd, (name2 ? name2 : ""));
 #ifndef TCL_REMOVE_OBSOLETE_TRACES
@@ -2069,7 +2074,7 @@ TraceVarProc(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_CreateObjTrace --
+ * Tcl_CreateObjTrace/Tcl_CreateObjTrace2 --
  *
  *	Arrange for a function to be called to trace command execution.
  *
@@ -2082,7 +2087,7 @@ TraceVarProc(
  *	called to execute a Tcl command. Calls to proc will have the following
  *	form:
  *
- *	void proc(ClientData	 clientData,
+ *	void proc(void   *	 clientData,
  *		  Tcl_Interp *	 interp,
  *		  int		 level,
  *		  const char *	 command,
@@ -2130,13 +2135,16 @@ typedef struct {
 static int traceWrapperProc(
     void *clientData,
     Tcl_Interp *interp,
-	int level,
+    Tcl_Size level,
     const char *command,
     Tcl_Command commandInfo,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     TraceWrapperInfo *info = (TraceWrapperInfo *)clientData;
+    if (objc < 0) {
+	objc = -1; /* Signal Tcl_CmdObjTraceProc that objc is out of range */
+    }
     return info->proc(info->clientData, interp, level, command, commandInfo, objc, objv);
 }
 
@@ -2153,7 +2161,7 @@ static void traceWrapperDelProc(void *clientData)
 Tcl_Trace
 Tcl_CreateObjTrace2(
     Tcl_Interp *interp,		/* Tcl interpreter */
-    int level,			/* Maximum nesting level */
+    Tcl_Size level,			/* Maximum nesting level */
     int flags,			/* Flags, see above */
     Tcl_CmdObjTraceProc2 *proc,	/* Trace callback */
     void *clientData,	/* Client data for the callback */
@@ -2172,10 +2180,10 @@ Tcl_CreateObjTrace2(
 Tcl_Trace
 Tcl_CreateObjTrace(
     Tcl_Interp *interp,		/* Tcl interpreter */
-    int level,			/* Maximum nesting level */
+    Tcl_Size level,			/* Maximum nesting level */
     int flags,			/* Flags, see above */
     Tcl_CmdObjTraceProc *proc,	/* Trace callback */
-    ClientData clientData,	/* Client data for the callback */
+    void *clientData,	/* Client data for the callback */
     Tcl_CmdObjTraceDeleteProc *delProc)
 				/* Function to call when trace is deleted */
 {
@@ -2235,12 +2243,12 @@ Tcl_CreateObjTrace(
  *	void
  *	proc(clientData, interp, level, command, cmdProc, cmdClientData,
  *		argc, argv)
- *	    ClientData clientData;
+ *	    void *clientData;
  *	    Tcl_Interp *interp;
  *	    int level;
  *	    char *command;
  *	    int (*cmdProc)();
- *	    ClientData cmdClientData;
+ *	    void *cmdClientData;
  *	    int argc;
  *	    char **argv;
  *	{
@@ -2261,11 +2269,11 @@ Tcl_CreateObjTrace(
 Tcl_Trace
 Tcl_CreateTrace(
     Tcl_Interp *interp,		/* Interpreter in which to create trace. */
-    int level,			/* Only call proc for commands at nesting
+    Tcl_Size level,			/* Only call proc for commands at nesting
 				 * level<=argument level (1=>top level). */
     Tcl_CmdTraceProc *proc,	/* Function to call before executing each
 				 * command. */
-    ClientData clientData)	/* Arbitrary value word to pass to proc. */
+    void *clientData)	/* Arbitrary value word to pass to proc. */
 {
     StringTraceData *data = (StringTraceData *)ckalloc(sizeof(StringTraceData));
 
@@ -2293,18 +2301,18 @@ Tcl_CreateTrace(
 
 static int
 StringTraceProc(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
-    int level,
+    Tcl_Size level,
     const char *command,
     Tcl_Command commandInfo,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const *objv)
 {
     StringTraceData *data = (StringTraceData *)clientData;
     Command *cmdPtr = (Command *) commandInfo;
     const char **argv;		/* Args to pass to string trace proc */
-    int i;
+    Tcl_Size i;
 
     /*
      * This is a bit messy because we have to emulate the old trace interface,
@@ -2349,7 +2357,7 @@ StringTraceProc(
 
 static void
 StringTraceDeleteProc(
-    ClientData clientData)
+    void *clientData)
 {
     ckfree(clientData);
 }
@@ -3239,7 +3247,7 @@ Tcl_TraceVar2(
 				 * TCL_NAMESPACE_ONLY. */
     Tcl_VarTraceProc *proc,	/* Function to call when specified ops are
 				 * invoked upon varName. */
-    ClientData clientData)	/* Arbitrary argument to pass to proc. */
+    void *clientData)	/* Arbitrary argument to pass to proc. */
 {
     VarTrace *tracePtr;
     int result;
-- 
cgit v0.12


From 822d3017ef86babab61e2c2b44d6866e8d7f4349 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Wed, 9 Nov 2022 10:53:23 +0000
Subject: Bugfix to socketPhQueue.  Add some Log commands for debugging.

---
 library/http/http.tcl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 4c9f6a7..a1d4a2b 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1665,9 +1665,12 @@ proc http::PreparePersistentConnection {token} {
         set socketWrState($state(socketinfo)) $token
     }
 
+    # Value of socketPhQueue() may have already been set by ReplayCore.
+    if {![info exists socketPhQueue($state(sock))]} {
+        set socketPhQueue($state(sock))   {}
+    }
     set socketRdQueue($state(socketinfo)) {}
     set socketWrQueue($state(socketinfo)) {}
-    set socketPhQueue($state(sock))       {}
     set socketClosing($state(socketinfo)) 0
     set socketPlayCmd($state(socketinfo)) {ReplayIfClose Wready {} {}}
     set socketCoEvent($state(socketinfo)) {}
@@ -1839,7 +1842,7 @@ proc http::ConfigureNewSocket {token sockOld DoLater} {
     set reusing $state(reusing)
     set sock $state(sock)
     set proxyUsed $state(proxyUsed)
-    ##Log "  ConfigureNewSocket" $token $sockOld ... -- $sock
+    ##Log "  ConfigureNewSocket" $token $sockOld ... -- $reusing $sock $proxyUsed
 
     if {(!$reusing) && ($sock ne $sockOld)} {
         # Replace the placeholder value sockOld with sock.
@@ -3071,6 +3074,7 @@ proc http::ReplayCore {newQueue} {
 
     if {![ReInit $token]} {
 	Log FAILED in http::ReplayCore - NO tmp vars
+	Log ReplayCore reject $token
 	Finish $token {cannot send this request again}
 	return
     }
@@ -3085,6 +3089,7 @@ proc http::ReplayCore {newQueue} {
     set state(reusing) 0
     set state(ReusingPlaceholder) 0
     set state(alreadyQueued) 0
+    Log ReplayCore replay $token
 
     # Give the socket a placeholder name before it is created.
     set sock HTTP_PLACEHOLDER_[incr TmpSockCounter]
@@ -3097,7 +3102,9 @@ proc http::ReplayCore {newQueue} {
 	    set ${tok}(reusing) 1
 	    set ${tok}(sock) $sock
 	    lappend socketPhQueue($sock) $tok
+	    Log ReplayCore replay $tok
 	} else {
+	    Log ReplayCore reject $tok
 	    set ${tok}(reusing) 1
 	    set ${tok}(sock) NONE
 	    Finish $tok {cannot send this request again}
-- 
cgit v0.12


From 7c5899368038b1f25f6d2230553986e212e49708 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 9 Nov 2022 13:15:55 +0000
Subject: update target release date

---
 changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes b/changes
index 1aa760a..4483334 100644
--- a/changes
+++ b/changes
@@ -9166,4 +9166,4 @@ Update bundled libtommath
 
 Many code fixes to avoid overflow or undefined behavior.  Thanks chrstphrchvz.
 
-- Released 8.6.13, Oct 28, 2022 - details at https://core.tcl-lang.org/tcl/ -
+- Released 8.6.13, Nov 15, 2022 - details at https://core.tcl-lang.org/tcl/ -
-- 
cgit v0.12


From 50f633ff289fe9ff3f3c37defa42209ecd4e24ea Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 9 Nov 2022 17:15:52 +0000
Subject: No trailing ','

---
 generic/tclDisassemble.c | 2 +-
 generic/tclEncoding.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 66acade..57adcf0 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -42,7 +42,7 @@ static const Tcl_ObjType instNameType = {
     NULL,			/* dupIntRepProc */
     UpdateStringOfInstName,	/* updateStringProc */
     NULL,			/* setFromAnyProc */
-    TCL_OBJTYPE_V0,
+    TCL_OBJTYPE_V0
 };
 
 #define InstNameSetInternalRep(objPtr, inst)				\
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 455d7a6..76a936c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -241,7 +241,7 @@ static const Tcl_ObjType encodingType = {
     DupEncodingInternalRep,
     NULL,
     NULL,
-    TCL_OBJTYPE_V0,
+    TCL_OBJTYPE_V0
 };
 
 #define EncodingSetInternalRep(objPtr, encoding)				\
-- 
cgit v0.12


From 6065eb2868a1672cbc4285c8117db7cb451f239e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 10 Nov 2022 11:20:02 +0000
Subject: Forgot one TCL_OBJTYPE_V0

---
 macosx/tclMacOSXFCmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 020288f..71b98b5 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -88,7 +88,8 @@ static const Tcl_ObjType tclOSTypeType = {
     NULL,				/* freeIntRepProc */
     NULL,				/* dupIntRepProc */
     UpdateStringOfOSType,		/* updateStringProc */
-    SetOSTypeFromAny			/* setFromAnyProc */
+    SetOSTypeFromAny,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
 };
 
 enum {
-- 
cgit v0.12


From 874327229c5e64a52e1fc3b4da6a31936ec07ed2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 11 Nov 2022 21:09:21 +0000
Subject: Add (internal) TclNewUIntObj(), and use it to fix TCL_LINK_WIDE_UINT
 for big (>= 2^63) integers. With testcase

---
 generic/tclInt.h     | 35 +++++++++++++++++++++++++++++++++++
 generic/tclLink.c    | 11 +++++++----
 generic/tclOOBasic.c |  2 +-
 tests/link.test      |  4 ++--
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index ec82abd..036c653 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4852,6 +4852,26 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	TCL_DTRACE_OBJ_CREATE(objPtr);			\
     } while (0)
 
+#define TclNewUIntObj(objPtr, uw) \
+    do {						\
+	TclIncrObjsAllocated();				\
+	TclAllocObjStorage(objPtr);			\
+	(objPtr)->refCount = 0;				\
+	(objPtr)->bytes = NULL;				\
+	Tcl_WideUInt uw_ = (uw);		\
+	if (uw_ > WIDE_MAX) {			\
+	    mp_int bignumValue_;		\
+	    if (mp_init_u64(&bignumValue_, uw_) != MP_OKAY) {	\
+		Tcl_Panic("%s: memory overflow", "TclNewUIntObj");	\
+	    }	\
+	    TclSetBignumInternalRep((objPtr), &bignumValue_);	\
+	} else {	\
+	    (objPtr)->internalRep.wideValue = (Tcl_WideInt)(uw_);	\
+	    (objPtr)->typePtr = &tclIntType;		\
+	}	\
+	TCL_DTRACE_OBJ_CREATE(objPtr);			\
+    } while (0)
+
 #define TclNewIndexObj(objPtr, w) \
     TclNewIntObj(objPtr, w)
 
@@ -4880,6 +4900,21 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 #define TclNewIntObj(objPtr, w) \
     (objPtr) = Tcl_NewWideIntObj(w)
 
+#define TclNewUIntObj(objPtr, uw) \
+    do {						\
+	Tcl_WideUInt uw_ = (uw);		\
+	if (uw_ > WIDE_MAX) {			\
+	    mp_int bignumValue_;		\
+	    if (mp_init_u64(&bignumValue_, uw_) == MP_OKAY) {	\
+		(objPtr) = Tcl_NewBignumObj(&bignumValue_));	\
+	    } else {	\
+		(objPtr) = NULL; \
+	    } \
+	} else {	\
+	    (objPtr) = Tcl_NewWideIntObj(uw_);	\
+	}	\
+    } while (0)
+
 #define TclNewIndexObj(objPtr, w) \
     TclNewIntObj(objPtr, w)
 
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 0d57d44..af48302 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -553,7 +553,7 @@ GetUWide(
 		 */
 		return 1;
 	    }
-#ifdef WORDS_BIGENDIAN
+#ifndef WORDS_BIGENDIAN
 	    while (numBytes-- > 0) {
 		value = (value << CHAR_BIT) | *bytes++;
 	    }
@@ -1451,12 +1451,12 @@ ObjValue(
 	}
 	linkPtr->lastValue.f = LinkedVar(float);
 	return Tcl_NewDoubleObj(linkPtr->lastValue.f);
-    case TCL_LINK_WIDE_UINT:
+    case TCL_LINK_WIDE_UINT: {
 	if (linkPtr->flags & LINK_ALLOC_LAST) {
 	    memcpy(linkPtr->lastValue.aryPtr, linkPtr->addr, linkPtr->bytes);
 	    objv = (Tcl_Obj **)ckalloc(linkPtr->numElems * sizeof(Tcl_Obj *));
 	    for (i=0; i < linkPtr->numElems; i++) {
-		TclNewIntObj(objv[i], (Tcl_WideInt)
+		TclNewUIntObj(objv[i],
 			linkPtr->lastValue.uwPtr[i]);
 	    }
 	    resultObj = Tcl_NewListObj(linkPtr->numElems, objv);
@@ -1464,7 +1464,10 @@ ObjValue(
 	    return resultObj;
 	}
 	linkPtr->lastValue.uw = LinkedVar(Tcl_WideUInt);
-	return Tcl_NewWideIntObj((Tcl_WideInt) linkPtr->lastValue.uw);
+	Tcl_Obj *uwObj;
+	TclNewUIntObj(uwObj, linkPtr->lastValue.uw);
+	return uwObj;
+	}
 
     case TCL_LINK_STRING:
 	p = LinkedVar(char *);
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index 6ea4681..3593193 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -1249,7 +1249,7 @@ TclOOSelfObjCmd(
 	}
     case SELF_CALL:
 	result[0] = TclOORenderCallChain(interp, contextPtr->callPtr);
-	TclNewIntObj(result[1], contextPtr->index);
+	TclNewIndexObj(result[1], contextPtr->index);
 	Tcl_SetObjResult(interp, Tcl_NewListObj(2, result));
 	return TCL_OK;
     }
diff --git a/tests/link.test b/tests/link.test
index eba359c..69ebb02 100644
--- a/tests/link.test
+++ b/tests/link.test
@@ -69,9 +69,9 @@ test link-2.1 {writing C variables from Tcl} -constraints {testlink} -setup {
     set long 34543
     set ulong 567890
     set float 1.0987654321
-    set uwide 357357357357
+    set uwide 12345678901234567890
     concat [testlink get] | $int $real $bool $string $wide $char $uchar $short $ushort $uint $long $ulong $float $uwide
-} -result {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 357357357357 | 0o0721 -10.5 true abcdef 135135 79 161 8000 40000 0xc001babe 34543 567890 1.0987654321 357357357357}
+} -result {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 -6101065172474983726 | 0o0721 -10.5 true abcdef 135135 79 161 8000 40000 0xc001babe 34543 567890 1.0987654321 12345678901234567890}
 test link-2.2 {writing bad values into variables} -setup {
     testlink delete
 } -constraints {testlink} -body {
-- 
cgit v0.12


From 67e92c7ada3b079caeb029907f19ecce31906ff6 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 13 Nov 2022 06:06:43 +0000
Subject: Fix compilation error for STATS=memdbg

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

diff --git a/generic/tclInt.h b/generic/tclInt.h
index b079364..adf02b7 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4880,7 +4880,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	if (uw_ > WIDE_MAX) {			\
 	    mp_int bignumValue_;		\
 	    if (mp_init_u64(&bignumValue_, uw_) == MP_OKAY) {	\
-		(objPtr) = Tcl_NewBignumObj(&bignumValue_));	\
+		(objPtr) = Tcl_NewBignumObj(&bignumValue_);	\
 	    } else {	\
 		(objPtr) = NULL; \
 	    } \
-- 
cgit v0.12


From 7dc710b2f42b81cfac6a8e5b8a80f4acf35aee78 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 13 Nov 2022 06:37:55 +0000
Subject: Update Tcl_ObjType documentation

---
 doc/ObjectType.3 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ObjectType.3 b/doc/ObjectType.3
index 9f8d04f..3e6d0c2 100644
--- a/doc/ObjectType.3
+++ b/doc/ObjectType.3
@@ -109,6 +109,7 @@ typedef struct Tcl_ObjType {
     Tcl_DupInternalRepProc *\fIdupIntRepProc\fR;
     Tcl_UpdateStringProc *\fIupdateStringProc\fR;
     Tcl_SetFromAnyProc *\fIsetFromAnyProc\fR;
+    size_t \fIversion\fR;
 } \fBTcl_ObjType\fR;
 .CE
 .SS "THE NAME FIELD"
@@ -253,6 +254,10 @@ Note that if a subsidiary value has its reference count reduced to zero
 during the running of a \fIfreeIntRepProc\fR, that value may be not freed
 immediately, in order to limit stack usage. However, the value will be freed
 before the outermost current \fBTcl_DecrRefCount\fR returns.
+.SS "THE VERSION FIELD"
+.PP
+The \fIversion\fR member provides for future extensibility of the structure
+and should be set to \fITCL_OBJTYPE_V0\fR.
 .SH "REFERENCE COUNT MANAGEMENT"
 .PP
 The \fIobjPtr\fR argument to \fBTcl_AppendAllObjTypes\fR should be an unshared
-- 
cgit v0.12


From 46a5d4b5fa40f76f18980d1995c96698335ad4b2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 13 Nov 2022 16:53:43 +0000
Subject: Fix compilation error for STATS=memdbg. Fix incorrect comment

---
 generic/tclInt.h  | 2 +-
 generic/tclLink.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 036c653..2d29e1d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4906,7 +4906,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	if (uw_ > WIDE_MAX) {			\
 	    mp_int bignumValue_;		\
 	    if (mp_init_u64(&bignumValue_, uw_) == MP_OKAY) {	\
-		(objPtr) = Tcl_NewBignumObj(&bignumValue_));	\
+		(objPtr) = Tcl_NewBignumObj(&bignumValue_);	\
 	    } else {	\
 		(objPtr) = NULL; \
 	    } \
diff --git a/generic/tclLink.c b/generic/tclLink.c
index af48302..1973067 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -557,9 +557,9 @@ GetUWide(
 	    while (numBytes-- > 0) {
 		value = (value << CHAR_BIT) | *bytes++;
 	    }
-#else /* !WORDS_BIGENDIAN */
+#else /* WORDS_BIGENDIAN */
 	    /*
-	     * Little-endian can read the value directly.
+	     * Big-endian can read the value directly.
 	     */
 	    value = scratch.value;
 #endif /* WORDS_BIGENDIAN */
-- 
cgit v0.12


From 14225bf18403da5689ee38fe70343b877b7bc571 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 13 Nov 2022 21:25:31 +0000
Subject: fix filename

---
 library/cookiejar/idna.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/cookiejar/idna.tcl b/library/cookiejar/idna.tcl
index 658dcd6..dc25cd8 100644
--- a/library/cookiejar/idna.tcl
+++ b/library/cookiejar/idna.tcl
@@ -1,4 +1,4 @@
-# cookiejar.tcl --
+# idna.tcl --
 #
 #	Implementation of IDNA (Internationalized Domain Names for
 #	Applications) encoding/decoding system, built on a punycode engine
-- 
cgit v0.12


From 2a1443e0e07d217161b094cf6e550f63ef2cab54 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 14 Nov 2022 17:23:52 +0000
Subject: Test suite hygiene   - Several tests missing the "testdstring"
 constraint   - [package require tcltests] is fragile, and almost all test
 files that     had it were not making use of anything it provides.  Removed.

---
 tests/chanio.test   |  1 -
 tests/env.test      |  2 --
 tests/exec.test     |  2 --
 tests/io.test       |  1 -
 tests/ioCmd.test    |  2 --
 tests/platform.test |  1 -
 tests/thread.test   |  3 ++-
 tests/util.test     | 10 +++++-----
 8 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index 5381a88..0f45819 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -34,7 +34,6 @@ namespace eval ::tcl::test::io {
 	package require -exact Tcltest [info patchlevel]
 	set ::tcltestlib [lindex [package ifneeded Tcltest [info patchlevel]] 1]
     }
-    package require tcltests
 
     testConstraint testbytestring   [llength [info commands testbytestring]]
     testConstraint testchannel      [llength [info commands testchannel]]
diff --git a/tests/env.test b/tests/env.test
index ff111e9..6c46532 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -16,8 +16,6 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
-package require tcltests
-
 # [exec] is required here to see the actual environment received by child
 # processes.
 proc getenv {} {
diff --git a/tests/exec.test b/tests/exec.test
index 0f5db76..4cc4a05 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -19,8 +19,6 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
-package require tcltests
-
 # All tests require the "exec" command.
 # Skip them if exec is not defined.
 testConstraint exec [llength [info commands exec]]
diff --git a/tests/io.test b/tests/io.test
index 94d8764..cd4c954 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -34,7 +34,6 @@ namespace eval ::tcl::test::io {
 	package require -exact Tcltest [info patchlevel]
 	set ::tcltestlib [lindex [package ifneeded Tcltest [info patchlevel]] 1]
     }
-    package require tcltests
 
 testConstraint testbytestring [llength [info commands testbytestring]]
 testConstraint testchannel      [llength [info commands testchannel]]
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 898d076..99bb464 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -21,8 +21,6 @@ if {"::tcltest" ni [namespace children]} {
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
 
-package require tcltests
-
 # Custom constraints used in this file
 testConstraint testchannel	[llength [info commands testchannel]]
 
diff --git a/tests/platform.test b/tests/platform.test
index 042469b..6b775cf 100644
--- a/tests/platform.test
+++ b/tests/platform.test
@@ -10,7 +10,6 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require tcltest 2.5
-package require tcltests
 
 namespace eval ::tcl::test::platform {
     namespace import ::tcltest::testConstraint
diff --git a/tests/thread.test b/tests/thread.test
index 7c7dc27..28934a2 100644
--- a/tests/thread.test
+++ b/tests/thread.test
@@ -15,7 +15,8 @@
 #  when thread::release is used, -wait is passed in order allow the thread to
 #  be fully finalized, which avoids valgrind "still reachable" reports.
 
-package require tcltests
+package require tcltest 2.5
+namespace import ::tcltest::*
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/util.test b/tests/util.test
index d0b98a5..11ee3fa 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -528,7 +528,7 @@ test util-8.6 {TclNeedSpace - correct utf-8 handling} testdstring {
     testdstring append \} -1
     list [llength [testdstring get]] [string length [testdstring get]]
 } {2 8}
-test util-8.7 {TclNeedSpace - watch out for escaped space} {
+test util-8.7 {TclNeedSpace - watch out for escaped space} testdstring {
     testdstring free
     testdstring append {\ } -1
     testdstring start
@@ -537,7 +537,7 @@ test util-8.7 {TclNeedSpace - watch out for escaped space} {
     # Should make {\  {}}
     list [llength [testdstring get]] [string index [testdstring get] 3]
 } {2 \{}
-test util-8.8 {TclNeedSpace - watch out for escaped space} {
+test util-8.8 {TclNeedSpace - watch out for escaped space} testdstring {
     testdstring free
     testdstring append {\\ } -1
     testdstring start
@@ -546,7 +546,7 @@ test util-8.8 {TclNeedSpace - watch out for escaped space} {
     # Should make {\\ {}}
     list [llength [testdstring get]] [string index [testdstring get] 3]
 } {2 \{}
-test util-8.9 {TclNeedSpace - watch out for escaped space} {
+test util-8.9 {TclNeedSpace - watch out for escaped space} testdstring {
     testdstring free
     testdstring append {\\\ } -1
     testdstring start
@@ -555,7 +555,7 @@ test util-8.9 {TclNeedSpace - watch out for escaped space} {
     # Should make {\\\  {}}
     list [llength [testdstring get]] [string index [testdstring get] 5]
 } {2 \{}
-test util-8.10 {TclNeedSpace - watch out for escaped space} {
+test util-8.10 {TclNeedSpace - watch out for escaped space} testdstring {
     testdstring free
     testdstring append {\\\\\\\ } -1
     testdstring start
@@ -564,7 +564,7 @@ test util-8.10 {TclNeedSpace - watch out for escaped space} {
     # Should make {\\\\\\\  {}}
     list [llength [testdstring get]] [string index [testdstring get] 9]
 } {2 \{}
-test util-8.11 {TclNeedSpace - watch out for escaped space} {
+test util-8.11 {TclNeedSpace - watch out for escaped space} testdstring {
     testdstring free
     testdstring append {\\\\\\\\ } -1
     testdstring start
-- 
cgit v0.12


From 79f559fdb5b42afb0b51a81227aea6038d338b15 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Nov 2022 10:57:59 +0000
Subject: Add mp_pack to the libtommath stub-table: it's easier to work with
 than mp_to_ubin

---
 generic/tclLink.c         | 19 ++-----------------
 generic/tclStubInit.c     |  6 ++++--
 generic/tclTomMath.decls  |  7 +++++++
 generic/tclTomMathDecls.h | 22 ++++++++++++++++------
 unix/Makefile.in          | 12 +++++++++---
 win/Makefile.in           |  2 ++
 win/makefile.vc           |  2 ++
 7 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/generic/tclLink.c b/generic/tclLink.c
index 1973067..397c9bc 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -537,15 +537,10 @@ GetUWide(
 	} else if (type == TCL_NUMBER_BIG) {
 	    mp_int *numPtr = (mp_int *)clientData;
 	    Tcl_WideUInt value = 0;
-	    union {
-		Tcl_WideUInt value;
-		unsigned char bytes[sizeof(Tcl_WideUInt)];
-	    } scratch;
 	    size_t numBytes;
-	    unsigned char *bytes = scratch.bytes;
 
-	    if (numPtr->sign || (MP_OKAY != mp_to_ubin(numPtr,
-		    bytes, sizeof(Tcl_WideUInt), &numBytes))) {
+	    if (numPtr->sign || (MP_OKAY != mp_pack(&value, 1,
+		    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, numPtr))) {
 		/*
 		 * If the sign bit is set (a negative value) or if the value
 		 * can't possibly fit in the bits of an unsigned wide, there's
@@ -553,16 +548,6 @@ GetUWide(
 		 */
 		return 1;
 	    }
-#ifndef WORDS_BIGENDIAN
-	    while (numBytes-- > 0) {
-		value = (value << CHAR_BIT) | *bytes++;
-	    }
-#else /* WORDS_BIGENDIAN */
-	    /*
-	     * Big-endian can read the value directly.
-	     */
-	    value = scratch.value;
-#endif /* WORDS_BIGENDIAN */
 	    *uwidePtr = value;
 	    return 0;
 	}
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 7af42d3..ad60fc3 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -232,6 +232,8 @@ int TclParseArgsObjv(Tcl_Interp *interp,
 #define TclBN_mp_mul_2d mp_mul_2d
 #define TclBN_mp_neg mp_neg
 #define TclBN_mp_or mp_or
+#define TclBN_mp_pack mp_pack
+#define TclBN_mp_pack_count mp_pack_count
 #define TclBN_mp_radix_size mp_radix_size
 #define TclBN_mp_reverse mp_reverse
 #define TclBN_mp_read_radix mp_read_radix
@@ -1325,12 +1327,12 @@ const TclTomMathStubs tclTomMathStubs = {
     TclBN_mp_get_mag_u64, /* 69 */
     TclBN_mp_set_i64, /* 70 */
     TclBN_mp_unpack, /* 71 */
-    0, /* 72 */
+    TclBN_mp_pack, /* 72 */
     TclBN_mp_tc_and, /* 73 */
     TclBN_mp_tc_or, /* 74 */
     TclBN_mp_tc_xor, /* 75 */
     TclBN_mp_signed_rsh, /* 76 */
-    0, /* 77 */
+    TclBN_mp_pack_count, /* 77 */
     TclBN_mp_to_ubin, /* 78 */
     TclBN_mp_div_ld, /* 79 */
     TclBN_mp_to_radix, /* 80 */
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 3a3b9a8..27c4f98 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -247,6 +247,10 @@ declare 71 {
     mp_err MP_WUR TclBN_mp_unpack(mp_int *rop, size_t count, mp_order order, size_t size,
 	    mp_endian endian, size_t nails, const void *op)
 }
+declare 72 {
+    mp_err MP_WUR TclBN_mp_pack(void *rop, size_t maxcount, size_t *written, mp_order order,
+	    size_t size, mp_endian endian, size_t nails, const mp_int *op)
+}
 
 # Added in libtommath 1.1.0
 declare 73 {deprecated {merged with mp_and}} {
@@ -261,6 +265,9 @@ declare 75 {deprecated {merged with mp_xor}} {
 declare 76 {
     mp_err MP_WUR TclBN_mp_signed_rsh(const mp_int *a, int b, mp_int *c)
 }
+declare 77 {
+    size_t MP_WUR TclBN_mp_pack_count(const mp_int *a, size_t nails, size_t size)
+}
 
 # Added in libtommath 1.2.0
 declare 78 {
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 8d12adf..009f914 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -125,6 +125,8 @@ MODULE_SCOPE mp_err	TclBN_mp_set_int(mp_int *a, unsigned long b);
 #define mp_mul_2d TclBN_mp_mul_2d
 #define mp_neg TclBN_mp_neg
 #define mp_or TclBN_mp_or
+#define mp_pack TclBN_mp_pack
+#define mp_pack_count TclBN_mp_pack_count
 #define mp_radix_size TclBN_mp_radix_size
 #define mp_read_radix TclBN_mp_read_radix
 #define mp_rshd TclBN_mp_rshd
@@ -394,7 +396,11 @@ EXTERN mp_err		TclBN_mp_unpack(mp_int *rop, size_t count,
 				mp_order order, size_t size,
 				mp_endian endian, size_t nails,
 				const void *op) MP_WUR;
-/* Slot 72 is reserved */
+/* 72 */
+EXTERN mp_err		TclBN_mp_pack(void *rop, size_t maxcount,
+				size_t *written, mp_order order, size_t size,
+				mp_endian endian, size_t nails,
+				const mp_int *op) MP_WUR;
 /* 73 */
 TCL_DEPRECATED("merged with mp_and")
 mp_err			TclBN_mp_tc_and(const mp_int *a, const mp_int *b,
@@ -410,7 +416,9 @@ mp_err			TclBN_mp_tc_xor(const mp_int *a, const mp_int *b,
 /* 76 */
 EXTERN mp_err		TclBN_mp_signed_rsh(const mp_int *a, int b,
 				mp_int *c) MP_WUR;
-/* Slot 77 is reserved */
+/* 77 */
+EXTERN size_t		TclBN_mp_pack_count(const mp_int *a, size_t nails,
+				size_t size) MP_WUR;
 /* 78 */
 EXTERN int		TclBN_mp_to_ubin(const mp_int *a, unsigned char *buf,
 				size_t maxlen, size_t *written) MP_WUR;
@@ -497,12 +505,12 @@ typedef struct TclTomMathStubs {
     uint64_t (*tclBN_mp_get_mag_u64) (const mp_int *a) MP_WUR; /* 69 */
     void (*tclBN_mp_set_i64) (mp_int *a, int64_t i); /* 70 */
     mp_err (*tclBN_mp_unpack) (mp_int *rop, size_t count, mp_order order, size_t size, mp_endian endian, size_t nails, const void *op) MP_WUR; /* 71 */
-    void (*reserved72)(void);
+    mp_err (*tclBN_mp_pack) (void *rop, size_t maxcount, size_t *written, mp_order order, size_t size, mp_endian endian, size_t nails, const mp_int *op) MP_WUR; /* 72 */
     TCL_DEPRECATED_API("merged with mp_and") mp_err (*tclBN_mp_tc_and) (const mp_int *a, const mp_int *b, mp_int *c); /* 73 */
     TCL_DEPRECATED_API("merged with mp_or") mp_err (*tclBN_mp_tc_or) (const mp_int *a, const mp_int *b, mp_int *c); /* 74 */
     TCL_DEPRECATED_API("merged with mp_xor") mp_err (*tclBN_mp_tc_xor) (const mp_int *a, const mp_int *b, mp_int *c); /* 75 */
     mp_err (*tclBN_mp_signed_rsh) (const mp_int *a, int b, mp_int *c) MP_WUR; /* 76 */
-    void (*reserved77)(void);
+    size_t (*tclBN_mp_pack_count) (const mp_int *a, size_t nails, size_t size) MP_WUR; /* 77 */
     int (*tclBN_mp_to_ubin) (const mp_int *a, unsigned char *buf, size_t maxlen, size_t *written) MP_WUR; /* 78 */
     mp_err (*tclBN_mp_div_ld) (const mp_int *a, uint64_t b, mp_int *q, uint64_t *r) MP_WUR; /* 79 */
     int (*tclBN_mp_to_radix) (const mp_int *a, char *str, size_t maxlen, size_t *written, int radix) MP_WUR; /* 80 */
@@ -664,7 +672,8 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_set_i64) /* 70 */
 #define TclBN_mp_unpack \
 	(tclTomMathStubsPtr->tclBN_mp_unpack) /* 71 */
-/* Slot 72 is reserved */
+#define TclBN_mp_pack \
+	(tclTomMathStubsPtr->tclBN_mp_pack) /* 72 */
 #define TclBN_mp_tc_and \
 	(tclTomMathStubsPtr->tclBN_mp_tc_and) /* 73 */
 #define TclBN_mp_tc_or \
@@ -673,7 +682,8 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_tc_xor) /* 75 */
 #define TclBN_mp_signed_rsh \
 	(tclTomMathStubsPtr->tclBN_mp_signed_rsh) /* 76 */
-/* Slot 77 is reserved */
+#define TclBN_mp_pack_count \
+	(tclTomMathStubsPtr->tclBN_mp_pack_count) /* 77 */
 #define TclBN_mp_to_ubin \
 	(tclTomMathStubsPtr->tclBN_mp_to_ubin) /* 78 */
 #define TclBN_mp_div_ld \
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c1bfca5..edcb010 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -335,9 +335,9 @@ TOMMATH_OBJS = bn_s_mp_reverse.o bn_s_mp_mul_digs_fast.o \
 	bn_mp_init_i64.o bn_mp_init_u64.o \
 	bn_s_mp_karatsuba_sqr.o bn_s_mp_balance_mul.o \
 	bn_mp_lshd.o bn_mp_mod.o bn_mp_mod_2d.o bn_mp_mul.o bn_mp_mul_2.o \
-	bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_neg.o bn_mp_or.o \
-	bn_mp_radix_size.o bn_mp_radix_smap.o bn_mp_set_i64.o  \
-	bn_mp_read_radix.o bn_mp_rshd.o \
+	bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_neg.o bn_mp_or.o bn_mp_pack.o \
+	bn_mp_pack_count.o bn_mp_radix_size.o bn_mp_radix_smap.o  \
+	bn_mp_set_i64.o bn_mp_read_radix.o bn_mp_rshd.o \
 	bn_mp_set_u64.o bn_mp_shrink.o \
 	bn_mp_sqr.o bn_mp_sqrt.o bn_mp_sub.o bn_mp_sub_d.o \
 	bn_mp_signed_rsh.o \
@@ -1690,6 +1690,12 @@ bn_mp_neg.o: $(TOMMATH_DIR)/bn_mp_neg.c $(MATHHDRS)
 bn_mp_or.o: $(TOMMATH_DIR)/bn_mp_or.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_or.c
 
+bn_mp_pack.o: $(TOMMATH_DIR)/bn_mp_pack.c $(MATHHDRS)
+	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_pack.c
+
+bn_mp_pack_count.o: $(TOMMATH_DIR)/bn_mp_pack_count.c $(MATHHDRS)
+	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_pack_count.c
+
 bn_mp_radix_size.o: $(TOMMATH_DIR)/bn_mp_radix_size.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_radix_size.c
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 0035a50..8d28c9e 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -401,6 +401,8 @@ TOMMATH_OBJS = \
 	bn_mp_mul_d.${OBJEXT} \
 	bn_mp_neg.${OBJEXT} \
 	bn_mp_or.${OBJEXT} \
+	bn_mp_pack.${OBJEXT} \
+	bn_mp_pack_count.${OBJEXT} \
 	bn_mp_radix_size.${OBJEXT} \
 	bn_mp_radix_smap.${OBJEXT} \
 	bn_mp_read_radix.${OBJEXT} \
diff --git a/win/makefile.vc b/win/makefile.vc
index f9c9242..e583ae0 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -379,6 +379,8 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_mul_d.obj \
 	$(TMP_DIR)\bn_mp_neg.obj \
 	$(TMP_DIR)\bn_mp_or.obj \
+	$(TMP_DIR)\bn_mp_pack.obj \
+	$(TMP_DIR)\bn_mp_pack_count.obj \
 	$(TMP_DIR)\bn_mp_radix_size.obj \
 	$(TMP_DIR)\bn_mp_radix_smap.obj \
 	$(TMP_DIR)\bn_mp_read_radix.obj \
-- 
cgit v0.12


From 386c7ea2d345ea032e96b2f0085bbaa31b204448 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Nov 2022 11:24:44 +0000
Subject: Since this FIXME! is already fixed, adapt documentation

---
 doc/LinkVar.3 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/LinkVar.3 b/doc/LinkVar.3
index 3a41582..6d7ef12 100644
--- a/doc/LinkVar.3
+++ b/doc/LinkVar.3
@@ -239,9 +239,8 @@ The C variable, or each element of the C array, is of type \fBTcl_WideUInt\fR
 (which is an unsigned integer type at least 64-bits wide on all platforms that
 can support it.)
 Any value written into the Tcl variable must have a proper unsigned
-integer form acceptable to \fBTcl_GetWideIntFromObj\fR (it will be
-cast to unsigned);
-.\" FIXME! Use bignums instead.
+wideinteger form acceptable to \fBTcl_GetBignumFromObj\fR and in the
+platform's defined range for the \fBTcl_WideUInt\fR type;
 attempts to write non-integer values into \fIvarName\fR will be
 rejected with Tcl errors. Incomplete integer representations (like
 the empty string, '+', '-' or the hex/octal/decimal/binary prefix) are accepted
-- 
cgit v0.12


From 870cb82c96d74e93a642296f68319c777359a11d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Nov 2022 13:06:59 +0000
Subject: Change all mp_to_ubin() usages to mp_pack(). It makes the code much
 more clear

---
 generic/tclObj.c | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/generic/tclObj.c b/generic/tclObj.c
index ce8e610..bad3f85 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3124,15 +3124,12 @@ Tcl_GetLongFromObj(
 
 		{
 	    mp_int big;
-	    unsigned long scratch, value = 0;
-	    unsigned char *bytes = (unsigned char *) &scratch;
+	    unsigned long value = 0;
 	    size_t numBytes;
 
 	    TclUnpackBignum(objPtr, big);
-	    if (mp_to_ubin(&big, bytes, sizeof(long), &numBytes) == MP_OKAY) {
-		while (numBytes-- > 0) {
-			value = (value << CHAR_BIT) | *bytes++;
-		}
+	    if (mp_pack(&value, 1,
+			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
 		if (big.sign) {
 		    if (value <= 1 + (unsigned long)LONG_MAX) {
 			*longPtr = (long)(-value);
@@ -3364,14 +3361,10 @@ Tcl_GetWideIntFromObj(
 	    mp_int big;
 	    Tcl_WideUInt value = 0;
 	    size_t numBytes;
-	    Tcl_WideInt scratch;
-	    unsigned char *bytes = (unsigned char *) &scratch;
 
 	    TclUnpackBignum(objPtr, big);
-	    if (mp_to_ubin(&big, bytes, sizeof(Tcl_WideInt), &numBytes) == MP_OKAY) {
-		while (numBytes-- > 0) {
-		    value = (value << CHAR_BIT) | *bytes++;
-		}
+	    if (mp_pack(&value, 1,
+			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
 		if (big.sign) {
 		    if (value <= 1 + ~(Tcl_WideUInt)WIDE_MIN) {
 			*wideIntPtr = (Tcl_WideInt)(-value);
@@ -3444,21 +3437,18 @@ TclGetWideBitsFromObj(
 	    mp_int big;
 	    mp_err err;
 
-	    Tcl_WideUInt value = 0, scratch;
+	    Tcl_WideUInt value = 0;
 	    size_t numBytes;
-	    unsigned char *bytes = (unsigned char *) &scratch;
 
 	    Tcl_GetBignumFromObj(NULL, objPtr, &big);
 	    err = mp_mod_2d(&big, (int) (CHAR_BIT * sizeof(Tcl_WideInt)), &big);
 	    if (err == MP_OKAY) {
-		err = mp_to_ubin(&big, bytes, sizeof(Tcl_WideInt), &numBytes);
+		err = mp_pack(&value, 1,
+			&numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big);
 	    }
 	    if (err != MP_OKAY) {
 		return TCL_ERROR;
 	    }
-	    while (numBytes-- > 0) {
-		value = (value << CHAR_BIT) | *bytes++;
-	    }
 	    *wideIntPtr = !big.sign ? (Tcl_WideInt)value : -(Tcl_WideInt)value;
 	    mp_clear(&big);
 	    return TCL_OK;
@@ -3828,19 +3818,15 @@ Tcl_SetBignumObj(
 {
     Tcl_WideUInt value = 0;
     size_t numBytes;
-    Tcl_WideUInt scratch;
-    unsigned char *bytes = (unsigned char *) &scratch;
     mp_int *bignumValue = (mp_int *) big;
 
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_SetBignumObj");
     }
-    if (mp_to_ubin(bignumValue, bytes, sizeof(Tcl_WideUInt), &numBytes) != MP_OKAY) {
+    if (mp_pack(&value, 1,
+		    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, bignumValue) != MP_OKAY) {
 	goto tooLargeForWide;
     }
-    while (numBytes-- > 0) {
-	value = (value << CHAR_BIT) | *bytes++;
-    }
     if (value > ((Tcl_WideUInt)WIDE_MAX + bignumValue->sign)) {
 	goto tooLargeForWide;
     }
-- 
cgit v0.12


From d13a3cd5020a792d88f940a51eb79639c12331c3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Nov 2022 14:03:34 +0000
Subject: New function Tcl_GetWideUIntFromObj

---
 doc/IntObj.3          |  7 ++++-
 doc/LinkVar.3         |  3 +-
 generic/tcl.decls     |  5 ++++
 generic/tclDecls.h    | 15 ++++++++++
 generic/tclLink.c     | 39 ++++---------------------
 generic/tclObj.c      | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
 generic/tclStubInit.c |  4 +++
 7 files changed, 118 insertions(+), 36 deletions(-)

diff --git a/doc/IntObj.3 b/doc/IntObj.3
index d640dbb..18d867e 100644
--- a/doc/IntObj.3
+++ b/doc/IntObj.3
@@ -8,7 +8,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_NewIntObj, Tcl_NewLongObj, Tcl_NewWideIntObj, Tcl_SetIntObj, Tcl_SetLongObj, Tcl_SetWideIntObj, Tcl_GetIntFromObj, Tcl_GetIntForIndex, Tcl_GetLongFromObj, Tcl_GetWideIntFromObj, Tcl_NewBignumObj, Tcl_SetBignumObj, Tcl_GetBignumFromObj, Tcl_TakeBignumFromObj \- manipulate Tcl values as integers
+Tcl_NewIntObj, Tcl_NewLongObj, Tcl_NewWideIntObj, Tcl_SetIntObj, Tcl_SetLongObj, Tcl_SetWideIntObj, Tcl_GetIntFromObj, Tcl_GetIntForIndex, Tcl_GetLongFromObj, Tcl_GetWideIntFromObj, Tcl_GetWideUIntFromObj, Tcl_NewBignumObj, Tcl_SetBignumObj, Tcl_GetBignumFromObj, Tcl_TakeBignumFromObj \- manipulate Tcl values as integers
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -40,6 +40,9 @@ int
 int
 \fBTcl_GetWideIntFromObj\fR(\fIinterp, objPtr, widePtr\fR)
 .sp
+int
+\fBTcl_GetWideUIntFromObj\fR(\fIinterp, objPtr, uwidePtr\fR)
+.sp
 .sp
 \fB#include <tclTomMath.h>\fR
 .sp
@@ -82,6 +85,8 @@ Points to place to store the integer value retrieved from \fIobjPtr\fR.
 Points to place to store the long integer value retrieved from \fIobjPtr\fR.
 .AP Tcl_WideInt *widePtr out
 Points to place to store the wide integer value retrieved from \fIobjPtr\fR.
+.AP Tcl_WideUInt *uwidePtr out
+Points to place to store the unsigned wide integer value retrieved from \fIobjPtr\fR.
 .AP mp_int *bigValue in/out
 Points to a multi-precision integer structure declared by the LibTomMath
 library.
diff --git a/doc/LinkVar.3 b/doc/LinkVar.3
index 6d7ef12..f5e97b4 100644
--- a/doc/LinkVar.3
+++ b/doc/LinkVar.3
@@ -239,8 +239,7 @@ The C variable, or each element of the C array, is of type \fBTcl_WideUInt\fR
 (which is an unsigned integer type at least 64-bits wide on all platforms that
 can support it.)
 Any value written into the Tcl variable must have a proper unsigned
-wideinteger form acceptable to \fBTcl_GetBignumFromObj\fR and in the
-platform's defined range for the \fBTcl_WideUInt\fR type;
+wideinteger form acceptable to \fBTcl_GetWideUIntFromObj\fR;
 attempts to write non-integer values into \fIvarName\fR will be
 rejected with Tcl errors. Incomplete integer representations (like
 the empty string, '+', '-' or the hex/octal/decimal/binary prefix) are accepted
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 6d9fbbd..2128880 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2552,6 +2552,11 @@ declare 683 {
    int Tcl_GetEncodingNulLength(Tcl_Encoding encoding)
 }
 
+declare 687 {
+    int Tcl_GetWideUIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+	    Tcl_WideUInt *uwidePtr)
+}
+
 # ----- BASELINE -- FOR -- 8.7.0 ----- #
 
 ##############################################################################
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 0888ecf..9c70434 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -2040,6 +2040,12 @@ EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
 				Tcl_Channel chan, int mode);
 /* 683 */
 EXTERN int		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
+/* Slot 684 is reserved */
+/* Slot 685 is reserved */
+/* Slot 686 is reserved */
+/* 687 */
+EXTERN int		Tcl_GetWideUIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2759,6 +2765,10 @@ typedef struct TclStubs {
     int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, size_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
     int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
     int (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
+    void (*reserved684)(void);
+    void (*reserved685)(void);
+    void (*reserved686)(void);
+    int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 687 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4157,6 +4167,11 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_RemoveChannelMode) /* 682 */
 #define Tcl_GetEncodingNulLength \
 	(tclStubsPtr->tcl_GetEncodingNulLength) /* 683 */
+/* Slot 684 is reserved */
+/* Slot 685 is reserved */
+/* Slot 686 is reserved */
+#define Tcl_GetWideUIntFromObj \
+	(tclStubsPtr->tcl_GetWideUIntFromObj) /* 687 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 397c9bc..cd2c731 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -526,41 +526,14 @@ GetUWide(
     Tcl_Obj *objPtr,
     Tcl_WideUInt *uwidePtr)
 {
-    Tcl_WideInt *widePtr = (Tcl_WideInt *) uwidePtr;
-    void *clientData;
-    int type, intValue;
-
-    if (Tcl_GetNumberFromObj(NULL, objPtr, &clientData, &type) == TCL_OK) {
-	if (type == TCL_NUMBER_INT) {
-	    *widePtr = *((const Tcl_WideInt *) clientData);
-	    return (*widePtr < 0);
-	} else if (type == TCL_NUMBER_BIG) {
-	    mp_int *numPtr = (mp_int *)clientData;
-	    Tcl_WideUInt value = 0;
-	    size_t numBytes;
-
-	    if (numPtr->sign || (MP_OKAY != mp_pack(&value, 1,
-		    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, numPtr))) {
-		/*
-		 * If the sign bit is set (a negative value) or if the value
-		 * can't possibly fit in the bits of an unsigned wide, there's
-		 * no point in doing further conversion.
-		 */
-		return 1;
-	    }
-	    *uwidePtr = value;
-	    return 0;
-	}
-    }
-
-    /*
-     * Evil edge case fallback.
-     */
+    if (Tcl_GetWideUIntFromObj(NULL, objPtr, uwidePtr) != TCL_OK) {
+	int intValue;
 
-    if (GetInvalidIntFromObj(objPtr, &intValue) != TCL_OK) {
-	return 1;
+	if (GetInvalidIntFromObj(objPtr, &intValue) != TCL_OK) {
+	    return 1;
+	}
+	*uwidePtr = intValue;
     }
-    *uwidePtr = intValue;
     return 0;
 }
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index bad3f85..5a52e29 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3394,6 +3394,87 @@ Tcl_GetWideIntFromObj(
 /*
  *----------------------------------------------------------------------
  *
+ * Tcl_GetWideUIntFromObj --
+ *
+ *	Attempt to return a unsigned wide integer from the Tcl object "objPtr". If the
+ *	object is not already a wide int object or a bignum object, an attempt will
+ *	be made to convert it to one.
+ *
+ * Results:
+ *	The return value is a standard Tcl object result. If an error occurs
+ *	during conversion, an error message is left in the interpreter's
+ *	result unless "interp" is NULL.
+ *
+ * Side effects:
+ *	If the object is not already an int object, the conversion will free
+ *	any old internal representation.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tcl_GetWideUIntFromObj(
+    Tcl_Interp *interp,         /* Used for error reporting if not NULL. */
+    Tcl_Obj *objPtr,	/* Object from which to get a wide int. */
+    Tcl_WideUInt *wideUIntPtr)
+				/* Place to store resulting long. */
+{
+    do {
+	if (objPtr->typePtr == &tclIntType) {
+	    if (objPtr->internalRep.wideValue < 0) {
+	wideUIntOutOfRange:
+		if (interp != NULL) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "expected unsigned integer but got \"%s\"",
+			    TclGetString(objPtr)));
+		    Tcl_SetErrorCode(interp, "TCL", "VALUE", "INTEGER", NULL);
+		}
+		return TCL_ERROR;
+	    }
+	    *wideUIntPtr = (Tcl_WideUInt)objPtr->internalRep.wideValue;
+	    return TCL_OK;
+	}
+	if (objPtr->typePtr == &tclDoubleType) {
+	    goto wideUIntOutOfRange;
+	}
+	if (objPtr->typePtr == &tclBignumType) {
+	    /*
+	     * Must check for those bignum values that can fit in a
+	     * Tcl_WideInt, even when auto-narrowing is enabled.
+	     */
+
+	    mp_int big;
+	    Tcl_WideUInt value = 0;
+	    size_t numBytes;
+
+	    TclUnpackBignum(objPtr, big);
+	    if (mp_pack(&value, 1,
+			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
+		if (big.sign == MP_NEG) {
+		    goto wideUIntOutOfRange;
+		}
+		if (value <= (Tcl_WideUInt)UWIDE_MAX) {
+		    *wideUIntPtr = (Tcl_WideUInt)value;
+		    return TCL_OK;
+		}
+	    }
+	    if (interp != NULL) {
+		const char *s = "integer value too large to represent";
+		Tcl_Obj *msg = Tcl_NewStringObj(s, -1);
+
+		Tcl_SetObjResult(interp, msg);
+		Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
+	    }
+	    return TCL_ERROR;
+	}
+    } while (TclParseNumber(interp, objPtr, "integer", NULL, -1, NULL,
+	    TCL_PARSE_INTEGER_ONLY)==TCL_OK);
+    return TCL_ERROR;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TclGetWideBitsFromObj --
  *
  *	Attempt to return a wide integer from the Tcl object "objPtr". If the
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index ad60fc3..e3c519b 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2055,6 +2055,10 @@ const TclStubs tclStubs = {
     Tcl_GetNumber, /* 681 */
     Tcl_RemoveChannelMode, /* 682 */
     Tcl_GetEncodingNulLength, /* 683 */
+    0, /* 684 */
+    0, /* 685 */
+    0, /* 686 */
+    Tcl_GetWideUIntFromObj, /* 687 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From 9d2a40a82608f1e3d87aac7de2190dfcd92470da Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Nov 2022 14:36:01 +0000
Subject: Reserve stub entries 684/685 for TIP #648 and 686 for TIP #650

---
 generic/tcl.decls | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 6d9fbbd..adaaf7c 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2552,7 +2552,22 @@ declare 683 {
    int Tcl_GetEncodingNulLength(Tcl_Encoding encoding)
 }
 
-# ----- BASELINE -- FOR -- 8.7.0 ----- #
+# TIP #648 (reserved)
+#declare 684 {
+#    Tcl_Obj *Tcl_NewWideUIntObj(Tcl_WideUInt wideValue)
+#}
+#declare 685 {
+#    void Tcl_SetWideUIntObj(Tcl_Obj *objPtr, Tcl_WideUInt uwideValue)
+#}
+
+# TIP #650 (reserved)
+#declare 686 {
+#    int Tcl_GetWideUIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+#	    Tcl_WideUInt *uwidePtr)
+#}
+
+
+# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
 
 ##############################################################################
 
-- 
cgit v0.12


From bc7b50deb01ade74b10ba048ed869537d7d8b1d1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Nov 2022 22:09:09 +0000
Subject: Make httpd11.tcl work with Tcl 8.6 too

---
 tests/httpd11.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/httpd11.tcl b/tests/httpd11.tcl
index 55b52fd..b605005 100644
--- a/tests/httpd11.tcl
+++ b/tests/httpd11.tcl
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcl
+package require Tcl
 
 proc ::tcl::dict::get? {dict key} {
     if {[dict exists $dict $key]} {
-- 
cgit v0.12


From c432e303c0b17ee4dde9a3ec3bc1e04c381b32e3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Nov 2022 09:37:42 +0000
Subject: http 2.10a4 -> 2.10b1, for upcoming release

---
 library/http/http.tcl     | 2 +-
 library/http/pkgIndex.tcl | 2 +-
 library/manifest.txt      | 2 +-
 unix/Makefile.in          | 4 ++--
 win/Makefile.in           | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index a1d4a2b..1f476f3 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -11,7 +11,7 @@
 package require Tcl 8.6-
 # Keep this in sync with pkgIndex.tcl and with the install directories in
 # Makefiles
-package provide http 2.10a4
+package provide http 2.10b1
 
 namespace eval http {
     # Allow resourcing to not clobber existing data
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index 5437859..8977ef3 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
-package ifneeded http 2.10a4 [list tclPkgSetup $dir http 2.10a4 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
+package ifneeded http 2.10b1 [list tclPkgSetup $dir http 2.10b1 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
diff --git a/library/manifest.txt b/library/manifest.txt
index 6d999e8..cc1e223 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -5,7 +5,7 @@ apply {{dir} {
   set ::test [info script]
   set isafe [interp issafe]
   foreach {safe package version file} {
-    0 http            2.10a4  {http http.tcl}
+    0 http            2.10b1  {http http.tcl}
     1 msgcat          1.7.1  {msgcat msgcat.tcl}
     1 opt             0.4.8  {opt optparse.tcl}
     0 cookiejar       0.2.0  {cookiejar cookiejar.tcl}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index edcb010..dcaf6e3 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1041,9 +1041,9 @@ install-libraries: libraries
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/cookiejar0.2"; \
 	    done
-	@echo "Installing package http 2.10a4 as a Tcl Module"
+	@echo "Installing package http 2.10b1 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
-		"$(MODULE_INSTALL_DIR)/8.6/http-2.10a4.tm"
+		"$(MODULE_INSTALL_DIR)/8.6/http-2.10b1.tm"
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"
 	@for i in $(TOP_DIR)/library/opt/*.tcl; do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
diff --git a/win/Makefile.in b/win/Makefile.in
index 8d28c9e..689f9b8 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -881,8 +881,8 @@ install-libraries: libraries install-tzdata install-msgs
 	          $(ROOT_DIR)/library/cookiejar/*.gz; do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.2"; \
 	    done;
-	@echo "Installing package http 2.10a4 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.10a4.tm";
+	@echo "Installing package http 2.10b1 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.10b1.tm";
 	@echo "Installing package opt 0.4.7";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
-- 
cgit v0.12


From f9c4e3a8b2291e504e646c00229d5b335ab3aab8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Nov 2022 20:39:34 +0000
Subject: Change 5 functions signatures from int -> size_t. Those should have
 been part of TIP #494 (Thanks, Gustaf!)

---
 generic/tcl.decls  | 10 +++++-----
 generic/tclDecls.h | 20 ++++++++++----------
 generic/tclUtf.c   | 10 +++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 85e5082..da8ea4f 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1239,16 +1239,16 @@ declare 333 {
 	    const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr)
 }
 declare 334 {
-    int Tcl_UtfToLower(char *src)
+    Tcl_Size Tcl_UtfToLower(char *src)
 }
 declare 335 {
-    int Tcl_UtfToTitle(char *src)
+    Tcl_Size Tcl_UtfToTitle(char *src)
 }
 declare 336 {
-    int Tcl_UtfToChar16(const char *src, unsigned short *chPtr)
+    Tcl_Size Tcl_UtfToChar16(const char *src, unsigned short *chPtr)
 }
 declare 337 {
-    int Tcl_UtfToUpper(char *src)
+    Tcl_Size Tcl_UtfToUpper(char *src)
 }
 declare 338 {
     Tcl_Size Tcl_WriteChars(Tcl_Channel chan, const char *src, Tcl_Size srcLen)
@@ -2454,7 +2454,7 @@ declare 645 {
 
 # TIP #548
 declare 646 {
-    int Tcl_UtfToUniChar(const char *src, int *chPtr)
+    Tcl_Size Tcl_UtfToUniChar(const char *src, int *chPtr)
 }
 declare 647 {
     char *Tcl_UniCharToUtfDString(const int *uniStr,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8e4aa59..eebdb64 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -888,14 +888,14 @@ EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
 				const char *src, Tcl_Size srcLen,
 				Tcl_DString *dsPtr);
 /* 334 */
-EXTERN int		Tcl_UtfToLower(char *src);
+EXTERN Tcl_Size		Tcl_UtfToLower(char *src);
 /* 335 */
-EXTERN int		Tcl_UtfToTitle(char *src);
+EXTERN Tcl_Size		Tcl_UtfToTitle(char *src);
 /* 336 */
-EXTERN int		Tcl_UtfToChar16(const char *src,
+EXTERN Tcl_Size		Tcl_UtfToChar16(const char *src,
 				unsigned short *chPtr);
 /* 337 */
-EXTERN int		Tcl_UtfToUpper(char *src);
+EXTERN Tcl_Size		Tcl_UtfToUpper(char *src);
 /* 338 */
 EXTERN Tcl_Size		Tcl_WriteChars(Tcl_Channel chan, const char *src,
 				Tcl_Size srcLen);
@@ -1735,7 +1735,7 @@ EXTERN int		Tcl_GetIntForIndex(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_Size endValue,
 				Tcl_Size *indexPtr);
 /* 646 */
-EXTERN int		Tcl_UtfToUniChar(const char *src, int *chPtr);
+EXTERN Tcl_Size		Tcl_UtfToUniChar(const char *src, int *chPtr);
 /* 647 */
 EXTERN char *		Tcl_UniCharToUtfDString(const int *uniStr,
 				Tcl_Size uniLength, Tcl_DString *dsPtr);
@@ -2197,10 +2197,10 @@ typedef struct TclStubs {
     const char * (*tclUtfPrev) (const char *src, const char *start); /* 331 */
     int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
     char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 333 */
-    int (*tcl_UtfToLower) (char *src); /* 334 */
-    int (*tcl_UtfToTitle) (char *src); /* 335 */
-    int (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
-    int (*tcl_UtfToUpper) (char *src); /* 337 */
+    Tcl_Size (*tcl_UtfToLower) (char *src); /* 334 */
+    Tcl_Size (*tcl_UtfToTitle) (char *src); /* 335 */
+    Tcl_Size (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
+    Tcl_Size (*tcl_UtfToUpper) (char *src); /* 337 */
     Tcl_Size (*tcl_WriteChars) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 338 */
     Tcl_Size (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
     char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
@@ -2509,7 +2509,7 @@ typedef struct TclStubs {
     int (*tcl_IsShared) (Tcl_Obj *objPtr); /* 643 */
     int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, Tcl_Size size); /* 644 */
     int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size endValue, Tcl_Size *indexPtr); /* 645 */
-    int (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
+    Tcl_Size (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
     char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
     int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
     unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index e882f18..77a7cf2 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -447,7 +447,7 @@ static const unsigned short cp1252[32] = {
 };
 
 #undef Tcl_UtfToUniChar
-int
+size_t
 Tcl_UtfToUniChar(
     const char *src,	/* The UTF-8 string. */
     int *chPtr)/* Filled with the Unicode character represented by
@@ -530,7 +530,7 @@ Tcl_UtfToUniChar(
     return 1;
 }
 
-int
+size_t
 Tcl_UtfToChar16(
     const char *src,	/* The UTF-8 string. */
     unsigned short *chPtr)/* Filled with the Tcl_UniChar represented by
@@ -1335,7 +1335,7 @@ Tcl_UtfBackslash(
  *----------------------------------------------------------------------
  */
 
-int
+size_t
 Tcl_UtfToUpper(
     char *str)			/* String to convert in place. */
 {
@@ -1388,7 +1388,7 @@ Tcl_UtfToUpper(
  *----------------------------------------------------------------------
  */
 
-int
+size_t
 Tcl_UtfToLower(
     char *str)			/* String to convert in place. */
 {
@@ -1442,7 +1442,7 @@ Tcl_UtfToLower(
  *----------------------------------------------------------------------
  */
 
-int
+size_t
 Tcl_UtfToTitle(
     char *str)			/* String to convert in place. */
 {
-- 
cgit v0.12


From 197060f0971c7ba1c3148200b4c90fb0fa430859 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Nov 2022 20:52:30 +0000
Subject: one more (Tcl_UniCharToUtf), and adapt documentation

---
 doc/ToUpper.3      |  6 +++---
 doc/Utf.3          |  8 ++++----
 generic/tcl.decls  |  2 +-
 generic/tclDecls.h | 12 ++++++------
 generic/tclUtf.c   |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/ToUpper.3 b/doc/ToUpper.3
index 37ebd2b..86d2f98 100644
--- a/doc/ToUpper.3
+++ b/doc/ToUpper.3
@@ -22,13 +22,13 @@ int
 int
 \fBTcl_UniCharToTitle\fR(\fIch\fR)
 .sp
-int
+size_t
 \fBTcl_UtfToUpper\fR(\fIstr\fR)
 .sp
-int
+size_t
 \fBTcl_UtfToLower\fR(\fIstr\fR)
 .sp
-int
+size_t
 \fBTcl_UtfToTitle\fR(\fIstr\fR)
 .SH ARGUMENTS
 .AS char *str in/out
diff --git a/doc/Utf.3 b/doc/Utf.3
index 514c2dc..31cc333 100644
--- a/doc/Utf.3
+++ b/doc/Utf.3
@@ -15,16 +15,16 @@ Tcl_UniChar, Tcl_UniCharToUtf, Tcl_UtfToUniChar, Tcl_UtfToChar16, Tcl_UtfToWChar
 .sp
 typedef ... \fBTcl_UniChar\fR;
 .sp
-int
+size_t
 \fBTcl_UniCharToUtf\fR(\fIch, buf\fR)
 .sp
-int
+size_t
 \fBTcl_UtfToUniChar\fR(\fIsrc, chPtr\fR)
 .sp
-int
+size_t
 \fBTcl_UtfToChar16\fR(\fIsrc, uPtr\fR)
 .sp
-int
+size_t
 \fBTcl_UtfToWChar\fR(\fIsrc, wPtr\fR)
 .sp
 char *
diff --git a/generic/tcl.decls b/generic/tcl.decls
index da8ea4f..3fb1a43 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1205,7 +1205,7 @@ declare 323 {
     int Tcl_UniCharToUpper(int ch)
 }
 declare 324 {
-    int Tcl_UniCharToUtf(int ch, char *buf)
+    Tcl_Size Tcl_UniCharToUtf(int ch, char *buf)
 }
 declare 325 {
     const char *TclUtfAtIndex(const char *src, Tcl_Size index)
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index eebdb64..90105bc 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -860,7 +860,7 @@ EXTERN int		Tcl_UniCharToTitle(int ch);
 /* 323 */
 EXTERN int		Tcl_UniCharToUpper(int ch);
 /* 324 */
-EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
+EXTERN Tcl_Size		Tcl_UniCharToUtf(int ch, char *buf);
 /* 325 */
 EXTERN const char *	TclUtfAtIndex(const char *src, Tcl_Size index);
 /* 326 */
@@ -2187,7 +2187,7 @@ typedef struct TclStubs {
     int (*tcl_UniCharToLower) (int ch); /* 321 */
     int (*tcl_UniCharToTitle) (int ch); /* 322 */
     int (*tcl_UniCharToUpper) (int ch); /* 323 */
-    int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
+    Tcl_Size (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
     const char * (*tclUtfAtIndex) (const char *src, Tcl_Size index); /* 325 */
     int (*tclUtfCharComplete) (const char *src, Tcl_Size length); /* 326 */
     Tcl_Size (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
@@ -4128,8 +4128,8 @@ extern const TclStubs *tclStubsPtr;
 		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))tclStubsPtr->tcl_UtfToUniCharDString \
 		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
 #   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
-		? (int (*)(const char *, wchar_t *))tclStubsPtr->tcl_UtfToUniChar \
-		: (int (*)(const char *, wchar_t *))Tcl_UtfToChar16)
+		? (Tcl_Size (*)(const char *, wchar_t *))tclStubsPtr->tcl_UtfToUniChar \
+		: (Tcl_Size (*)(const char *, wchar_t *))Tcl_UtfToChar16)
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
 		? (Tcl_Size (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
@@ -4169,8 +4169,8 @@ extern const TclStubs *tclStubsPtr;
 		? (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToUniCharDString \
 		: (wchar_t *(*)(const char *, Tcl_Size, Tcl_DString *))Tcl_UtfToChar16DString)
 #   define Tcl_UtfToWChar (sizeof(wchar_t) != sizeof(short) \
-		? (int (*)(const char *, wchar_t *))Tcl_UtfToUniChar \
-		: (int (*)(const char *, wchar_t *))Tcl_UtfToChar16)
+		? (Tcl_Size (*)(const char *, wchar_t *))Tcl_UtfToUniChar \
+		: (Tcl_Size (*)(const char *, wchar_t *))Tcl_UtfToChar16)
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
 		? (Tcl_Size (*)(wchar_t *))Tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 77a7cf2..92bcf4f 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -209,7 +209,7 @@ Invalid(
  */
 
 #undef Tcl_UniCharToUtf
-int
+size_t
 Tcl_UniCharToUtf(
     int ch,			/* The Tcl_UniChar to be stored in the
 				 * buffer. Can be or'ed with flag TCL_COMBINE */
-- 
cgit v0.12


From 00c7d174e45b9a5f10dc0de803dc98c4f1490061 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 17 Nov 2022 03:52:45 +0000
Subject: Reserve stub entry 687 for TIP #651

---
 generic/tcl.decls | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index adaaf7c..3f4103f 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2566,6 +2566,10 @@ declare 683 {
 #	    Tcl_WideUInt *uwidePtr)
 #}
 
+# TIP 651 (reserved)
+#declare 687 {
+#    Tcl_Obj *Tcl_DStringToObj(Tcl_DString *dsPtr)
+#}
 
 # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
 
-- 
cgit v0.12


From e0becc6161a79eee0bcac49c6424690002100cd8 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 17 Nov 2022 04:54:02 +0000
Subject: TIP 651 implementation

---
 doc/DString.3         | 17 +++++++++++++++++
 generic/tcl.decls     |  8 ++++----
 generic/tclDecls.h    | 14 ++++++++++++++
 generic/tclInt.h      |  3 ++-
 generic/tclStubInit.c |  4 ++++
 generic/tclTest.c     |  9 +++++++--
 generic/tclUtil.c     |  2 +-
 tests/dstring.test    | 39 +++++++++++++++++++++++++++++++++++++++
 8 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/doc/DString.3 b/doc/DString.3
index 00f1b8a..66323a7 100644
--- a/doc/DString.3
+++ b/doc/DString.3
@@ -41,6 +41,10 @@ char *
 \fBTcl_DStringResult\fR(\fIinterp, dsPtr\fR)
 .sp
 \fBTcl_DStringGetResult\fR(\fIinterp, dsPtr\fR)
+.sp
+Tcl_Obj *
+\fBTcl_DStringToObj\fR(\fIdsPtr\fR)
+.sp
 .SH ARGUMENTS
 .AS Tcl_DString newLength in/out
 .AP Tcl_DString *dsPtr in/out
@@ -142,12 +146,25 @@ a pointer from \fIdsPtr\fR to the interpreter's result.
 This saves the cost of allocating new memory and copying the string.
 \fBTcl_DStringResult\fR also reinitializes the dynamic string to
 an empty string.
+Since the dynamic string is reinitialized, there is no need to
+further call \fBTcl_DStringFree\fR on it and it can be reused without
+calling \fBTcl_DStringInit\fR.
 .PP
 \fBTcl_DStringGetResult\fR does the opposite of \fBTcl_DStringResult\fR.
 It sets the value of \fIdsPtr\fR to the result of \fIinterp\fR and
 it clears \fIinterp\fR's result.
 If possible it does this by moving a pointer rather than by copying
 the string.
+.PP
+\fBTcl_DStringToObj\fR returns a \fBTcl_Obj\fR containing the value of
+the dynamic string given by \fIdsPtr\fR.  It does this by moving
+a pointer from \fIdsPtr\fR to a newly allocated \fBTcl_Obj\fR
+and reinitializing to dynamic string to an empty string.
+This saves the cost of allocating new memory and copying the string.
+Since the dynamic string is reinitialized, there is no need to
+further call \fBTcl_DStringFree\fR on it and it can be reused without
+calling \fBTcl_DStringInit\fR.
+The returned \fBTcl_Obj\fR has a reference count of 0.
 
 .SH KEYWORDS
 append, dynamic string, free, result
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 3f4103f..59d0ece 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2566,10 +2566,10 @@ declare 683 {
 #	    Tcl_WideUInt *uwidePtr)
 #}
 
-# TIP 651 (reserved)
-#declare 687 {
-#    Tcl_Obj *Tcl_DStringToObj(Tcl_DString *dsPtr)
-#}
+# TIP 651
+declare 687 {
+    Tcl_Obj *Tcl_DStringToObj(Tcl_DString *dsPtr)
+}
 
 # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 0888ecf..3a57b2f 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -2040,6 +2040,11 @@ EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
 				Tcl_Channel chan, int mode);
 /* 683 */
 EXTERN int		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
+/* Slot 684 is reserved */
+/* Slot 685 is reserved */
+/* Slot 686 is reserved */
+/* 687 */
+EXTERN Tcl_Obj *	Tcl_DStringToObj(Tcl_DString *dsPtr);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2759,6 +2764,10 @@ typedef struct TclStubs {
     int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, size_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
     int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
     int (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
+    void (*reserved684)(void);
+    void (*reserved685)(void);
+    void (*reserved686)(void);
+    Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 687 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4157,6 +4166,11 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_RemoveChannelMode) /* 682 */
 #define Tcl_GetEncodingNulLength \
 	(tclStubsPtr->tcl_GetEncodingNulLength) /* 683 */
+/* Slot 684 is reserved */
+/* Slot 685 is reserved */
+/* Slot 686 is reserved */
+#define Tcl_DStringToObj \
+	(tclStubsPtr->tcl_DStringToObj) /* 687 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2d29e1d..9f0eef0 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3128,7 +3128,6 @@ MODULE_SCOPE char *	TclDStringAppendObj(Tcl_DString *dsPtr,
 			    Tcl_Obj *objPtr);
 MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 			    Tcl_DString *toAppendPtr);
-MODULE_SCOPE Tcl_Obj *	TclDStringToObj(Tcl_DString *dsPtr);
 MODULE_SCOPE Tcl_Obj *const *TclFetchEnsembleRoot(Tcl_Interp *interp,
 			    Tcl_Obj *const *objv, int objc, int *objcPtr);
 MODULE_SCOPE Tcl_Obj *const *TclEnsembleGetRewriteValues(Tcl_Interp *interp);
@@ -4946,6 +4945,8 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
     Tcl_DStringAppend((dsPtr), (sLiteral), sizeof(sLiteral "") - 1)
 #define TclDStringClear(dsPtr) \
     Tcl_DStringSetLength((dsPtr), 0)
+/* Backward compatibility for TclDStringToObj which is now exported */
+#define TclDStringToObj Tcl_DStringToObj
 
 /*
  *----------------------------------------------------------------
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index ad60fc3..b3eb0de 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2055,6 +2055,10 @@ const TclStubs tclStubs = {
     Tcl_GetNumber, /* 681 */
     Tcl_RemoveChannelMode, /* 682 */
     Tcl_GetEncodingNulLength, /* 683 */
+    0, /* 684 */
+    0, /* 685 */
+    0, /* 686 */
+    Tcl_DStringToObj, /* 687 */
 };
 
 /* !END!: Do not edit above this line. */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index c9bad56..86fd965 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1934,6 +1934,11 @@ TestdstringCmd(
 	    goto wrongNumArgs;
 	}
 	Tcl_DStringResult(interp, &dstring);
+    } else if (strcmp(argv[1], "toobj") == 0) {
+	if (argc != 2) {
+	    goto wrongNumArgs;
+	}
+	Tcl_SetObjResult(interp, Tcl_DStringToObj(&dstring));
     } else if (strcmp(argv[1], "trunc") == 0) {
 	if (argc != 3) {
 	    goto wrongNumArgs;
@@ -1949,8 +1954,8 @@ TestdstringCmd(
 	Tcl_DStringStartSublist(&dstring);
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be append, element, end, free, get, length, "
-		"result, trunc, or start", NULL);
+		"\": must be append, element, end, free, get, gresult, length, "
+		"result, start, toobj, or trunc", NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index ab97461..fc5d1cc 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3107,7 +3107,7 @@ Tcl_DStringGetResult(
  */
 
 Tcl_Obj *
-TclDStringToObj(
+Tcl_DStringToObj(
     Tcl_DString *dsPtr)
 {
     Tcl_Obj *result;
diff --git a/tests/dstring.test b/tests/dstring.test
index 11c5754..314cee8 100644
--- a/tests/dstring.test
+++ b/tests/dstring.test
@@ -473,6 +473,45 @@ test dstring-6.5 {Tcl_DStringGetResult} -constraints testdstring -body {
 } -cleanup {
     testdstring free
 } -result {{} {This is a specially-allocated stringz}}
+
+test dstring-7.1 {copying to Tcl_Obj} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring append xyz -1
+    list [testdstring toobj] [testdstring length]
+} -cleanup {
+    testdstring free
+} -result {xyz 0}
+test dstring-7.2 {copying to a Tcl_Obj} -constraints testdstring -setup {
+    testdstring free
+    unset -nocomplain a
+} -body {
+    foreach l {a b c d e f g h i j k l m n o p} {
+	testdstring append $l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l\n -1
+    }
+    set a [testdstring toobj]
+    testdstring append abc -1
+    list $a [testdstring get]
+} -cleanup {
+    testdstring free
+} -result {{aaaaaaaaaaaaaaaaaaaaa
+bbbbbbbbbbbbbbbbbbbbb
+ccccccccccccccccccccc
+ddddddddddddddddddddd
+eeeeeeeeeeeeeeeeeeeee
+fffffffffffffffffffff
+ggggggggggggggggggggg
+hhhhhhhhhhhhhhhhhhhhh
+iiiiiiiiiiiiiiiiiiiii
+jjjjjjjjjjjjjjjjjjjjj
+kkkkkkkkkkkkkkkkkkkkk
+lllllllllllllllllllll
+mmmmmmmmmmmmmmmmmmmmm
+nnnnnnnnnnnnnnnnnnnnn
+ooooooooooooooooooooo
+ppppppppppppppppppppp
+} abc}
+
 
 # cleanup
 if {[testConstraint testdstring]} {
-- 
cgit v0.12


From 8b9fe0fa5355f282642f092c269ffa174813ba73 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 17 Nov 2022 11:18:51 +0000
Subject: doc update

---
 doc/OpenFileChnl.3 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/OpenFileChnl.3 b/doc/OpenFileChnl.3
index 4e42b93..e8ed521 100644
--- a/doc/OpenFileChnl.3
+++ b/doc/OpenFileChnl.3
@@ -406,10 +406,10 @@ to UTF-8 based on the channel's encoding and storing the produced data in
 \fIreadObjPtr\fR's string representation.  The return value of
 \fBTcl_ReadChars\fR is the number of characters, up to \fIcharsToRead\fR,
 that were stored in \fIreadObjPtr\fR.  If an error occurs while reading, the
-return value is \-1 and \fBTcl_ReadChars\fR records a POSIX error code that
+return value is TCL_INDEX_NONE and \fBTcl_ReadChars\fR records a POSIX error code that
 can be retrieved with \fBTcl_GetErrno\fR.
 .PP
-Setting \fIcharsToRead\fR to \fB\-1\fR will cause the command to read
+Setting \fIcharsToRead\fR to TCL_INDEX_NONE will cause the command to read
 all characters currently available (non-blocking) or everything until
 eof (blocking mode).
 .PP
@@ -471,14 +471,14 @@ character(s) are read and discarded.
 .PP
 If a line was successfully read, the return value is greater than or equal
 to zero and indicates the number of bytes stored in \fIlineObjPtr\fR.  If an
-error occurs, \fBTcl_GetsObj\fR returns \-1 and records a POSIX error code
+error occurs, \fBTcl_GetsObj\fR returns TCL_INDEX_NONE and records a POSIX error code
 that can be retrieved with \fBTcl_GetErrno\fR.  \fBTcl_GetsObj\fR also
-returns \-1 if the end of the file is reached; the \fBTcl_Eof\fR procedure
+returns TCL_INDEX_NONE if the end of the file is reached; the \fBTcl_Eof\fR procedure
 can be used to distinguish an error from an end-of-file condition.
 .PP
-If the channel is in nonblocking mode, the return value can also be \-1 if
-no data was available or the data that was available did not contain an
-end-of-line character.  When \-1 is returned, the \fBTcl_InputBlocked\fR
+If the channel is in nonblocking mode, the return value can also be TCL_INDEX_NONE
+if no data was available or the data that was available did not contain an
+end-of-line character.  When TCL_INDEX_NONE is returned, the \fBTcl_InputBlocked\fR
 procedure may be invoked to determine if the channel is blocked because
 of input unavailability.
 .PP
@@ -496,7 +496,7 @@ head of the queue.  If \fIchannel\fR has a
 .QW sticky
 EOF set, no data will be
 added to the input queue.  \fBTcl_Ungets\fR returns \fIinputLen\fR or
-\-1 if an error occurs.
+TCL_INDEX_NONE if an error occurs.
 .SH "TCL_WRITECHARS, TCL_WRITEOBJ, AND TCL_WRITE"
 .PP
 \fBTcl_WriteChars\fR accepts \fIbytesToWrite\fR bytes of character data at
@@ -513,10 +513,10 @@ to appear as soon as a complete line is accepted for output, set the
 \fB\-buffering\fR option on the channel to \fBline\fR mode.
 .PP
 The return value of \fBTcl_WriteChars\fR is a count of how many bytes were
-accepted for output to the channel.  This is either greater than zero to
-indicate success or \-1 to indicate that an error occurred.  If an error
-occurs, \fBTcl_WriteChars\fR records a POSIX error code that may be
-retrieved with \fBTcl_GetErrno\fR.
+accepted for output to the channel.  This is either TCL_INDEX_NONE to
+indicate that an error occurred or another number greater than
+zero to indicate success.  If an error occurs, \fBTcl_WriteChars\fR records
+a POSIX error code that may be retrieved with \fBTcl_GetErrno\fR.
 .PP
 Newline characters in the output data are translated to platform-specific
 end-of-line sequences according to the \fB\-translation\fR option for the
-- 
cgit v0.12


From b669079dd69a6f5b0027edd74d53f8b0390769f3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 17 Nov 2022 20:24:20 +0000
Subject: Add dummy TCL_OBJTYPE_V0 #define. Minimal no-op backport of TIP #644

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

diff --git a/generic/tcl.h b/generic/tcl.h
index e705cdb..800ffa1 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -752,6 +752,7 @@ typedef struct Tcl_ObjType {
 				 * to this type. Frees the internal rep of the
 				 * old type. Returns TCL_ERROR on failure. */
 } Tcl_ObjType;
+#define TCL_OBJTYPE_V0 /* just empty */
 
 /*
  * The following structure stores an internal representation (internalrep) for
-- 
cgit v0.12


From a65db858ffa31d266f6b08eac9d609153db39d90 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Nov 2022 15:24:44 +0000
Subject: Fix bug in TIP #628: Tcl 8.x version of registry/dde dll was not
 correct

---
 win/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index a2b8ea7..296b398 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -150,10 +150,10 @@ TCL_STUB_LIB_FILE	= @TCL_STUB_LIB_FILE@
 TCL_DLL_FILE		= @TCL_DLL_FILE@
 TCL_LIB_FILE		= @TCL_LIB_FILE@
 DDE_DLL_FILE		= tcl9dde$(DDEVER)${DLLSUFFIX}
-DDE_DLL_FILE8		= dde$(DDEVER)${DLLSUFFIX}
+DDE_DLL_FILE8		= tcldde$(DDEVER)${DLLSUFFIX}
 DDE_LIB_FILE		= @LIBPREFIX@tcldde$(DDEVER)${DLLSUFFIX}${LIBSUFFIX}
 REG_DLL_FILE		= tcl9registry$(REGVER)${DLLSUFFIX}
-REG_DLL_FILE8		= registry$(REGVER)${DLLSUFFIX}
+REG_DLL_FILE8		= tclregistry$(REGVER)${DLLSUFFIX}
 REG_LIB_FILE		= @LIBPREFIX@tclregistry$(REGVER)${DLLSUFFIX}${LIBSUFFIX}
 TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
 TEST_EXE_FILE		= tcltest${EXESUFFIX}
-- 
cgit v0.12


From ae54d4dd89479887660e43d8189196e5ec1a2fa2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Nov 2022 16:24:27 +0000
Subject: Another bug in TIP #628: dde and registry extensions didn't really
 load in tclsh8.7. One reason: handle TclpReaddir correctly in tcl8
 compatibility mode

---
 generic/tclIntPlatDecls.h |  6 +-----
 win/Makefile.in           | 14 ++++++++++----
 win/tclWinDde.c           |  2 +-
 win/tclWinReg.c           |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 1ec9259..cab43a4 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -140,8 +140,6 @@ EXTERN int		TclWinSetSockOpt(SOCKET s, int level, int optname,
 EXTERN int		TclpGetPid(Tcl_Pid pid);
 /* 9 */
 EXTERN int		TclWinGetPlatformId(void);
-/* 10 */
-EXTERN Tcl_DirEntry *	TclpReaddir(TclDIR *dir);
 /* 11 */
 EXTERN void		TclGetAndDetachPids(Tcl_Interp *interp,
 				Tcl_Channel chan);
@@ -316,7 +314,7 @@ typedef struct TclIntPlatStubs {
     int (*tclWinSetSockOpt) (SOCKET s, int level, int optname, const char *optval, int optlen); /* 7 */
     int (*tclpGetPid) (Tcl_Pid pid); /* 8 */
     int (*tclWinGetPlatformId) (void); /* 9 */
-    Tcl_DirEntry * (*tclpReaddir) (TclDIR *dir); /* 10 */
+    void *(*tclpReaddir) (void *dir); /* 10 */
     void (*tclGetAndDetachPids) (Tcl_Interp *interp, Tcl_Channel chan); /* 11 */
     int (*tclpCloseFile) (TclFile file); /* 12 */
     Tcl_Channel (*tclpCreateCommandChannel) (TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr); /* 13 */
@@ -462,8 +460,6 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 	(tclIntPlatStubsPtr->tclpGetPid) /* 8 */
 #define TclWinGetPlatformId \
 	(tclIntPlatStubsPtr->tclWinGetPlatformId) /* 9 */
-#define TclpReaddir \
-	(tclIntPlatStubsPtr->tclpReaddir) /* 10 */
 #define TclGetAndDetachPids \
 	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 11 */
 #define TclpCloseFile \
diff --git a/win/Makefile.in b/win/Makefile.in
index 296b398..7a5dc09 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -593,12 +593,12 @@ ${REG_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${REG_OBJS}
 	@MAKE_DLL@ ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
 	$(COPY) tclsh.exe.manifest ${REG_DLL_FILE}.manifest
 
-${DDE_DLL_FILE8}: ${TCL_STUB_LIB_FILE} ${DDE_OBJS}
-	@MAKE_DLL@ -DTCL_MAJOR_VERSION=8 ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+${DDE_DLL_FILE8}: ${TCL_STUB_LIB_FILE} tcl8WinDde.$(OBJEXT)
+	@MAKE_DLL@ tcl8WinDde.$(OBJEXT) $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
 	$(COPY) tclsh.exe.manifest ${DDE_DLL_FILE8}.manifest
 
-${REG_DLL_FILE8}: ${TCL_STUB_LIB_FILE} ${REG_OBJS}
-	@MAKE_DLL@ -DTCL_MAJOR_VERSION=8 ${REG_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+${REG_DLL_FILE8}: ${TCL_STUB_LIB_FILE} tcl8WinReg.$(OBJEXT)
+	@MAKE_DLL@ -DTCL_MAJOR_VERSION=8 tcl8WinReg.$(OBJEXT) $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
 	$(COPY) tclsh.exe.manifest ${REG_DLL_FILE8}.manifest
 
 ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
@@ -653,9 +653,15 @@ tclWinPipe.${OBJEXT}: tclWinPipe.c
 tclWinReg.${OBJEXT}: tclWinReg.c
 	$(CC) -c $(CC_SWITCHES) $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
+tcl8WinReg.${OBJEXT}: tclWinReg.c
+	$(CC)  -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
+
 tclWinDde.${OBJEXT}: tclWinDde.c
 	$(CC) -c $(CC_SWITCHES) $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
+tcl8WinDde.${OBJEXT}: tclWinDde.c
+	$(CC) -o $@ -c $(CC_SWITCHES) -DTCL_MAJOR_VERSION=8 $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
+
 tclAppInit.${OBJEXT}: tclAppInit.c
 	$(CC) -c $(CC_SWITCHES) $(EXTFLAGS) -DUNICODE -D_UNICODE @DEPARG@ $(CC_OBJNAME)
 
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 1c10c65..23d0bce 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -117,7 +117,7 @@ static int		DdeObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 
-#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
+#if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 # if TCL_UTF_MAX > 3
 #   define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
 #   define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 998521c..a3341c2 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -124,7 +124,7 @@ static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
 			    Tcl_Obj *valueNameObj, Tcl_Obj *dataObj,
 			    Tcl_Obj *typeObj, REGSAM mode);
 
-#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
+#if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 # if TCL_UTF_MAX > 3
 #   define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
 #   define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
-- 
cgit v0.12


From 3e4ac217aab55243d9096d19d611bfd368a4aa9b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 18 Nov 2022 17:53:54 +0000
Subject: Bring back the common facilities of the tcltests "package", but use a
 less fragile method to gain access to them.

---
 tests/chanio.test             |  1 +
 tests/env.test                |  2 ++
 tests/exec.test               |  4 +---
 tests/fileSystemEncoding.test | 15 +--------------
 tests/io.test                 |  1 +
 tests/ioCmd.test              |  1 +
 tests/platform.test           |  1 +
 tests/tcltests.tcl            |  3 +++
 tests/thread.test             |  2 +-
 9 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index 0f45819..1c689fb 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -34,6 +34,7 @@ namespace eval ::tcl::test::io {
 	package require -exact Tcltest [info patchlevel]
 	set ::tcltestlib [lindex [package ifneeded Tcltest [info patchlevel]] 1]
     }
+    source [file join [file dirname [info script]] tcltests.tcl]
 
     testConstraint testbytestring   [llength [info commands testbytestring]]
     testConstraint testchannel      [llength [info commands testchannel]]
diff --git a/tests/env.test b/tests/env.test
index 6c46532..bc1d7e9 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -16,6 +16,8 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
+source [file join [file dirname [info script]] tcltests.tcl]
+
 # [exec] is required here to see the actual environment received by child
 # processes.
 proc getenv {} {
diff --git a/tests/exec.test b/tests/exec.test
index 4cc4a05..3c445e8 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -18,10 +18,8 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
+source [file join [file dirname [info script]] tcltests.tcl]
 
-# All tests require the "exec" command.
-# Skip them if exec is not defined.
-testConstraint exec [llength [info commands exec]]
 # Some skips when running in a macOS CI environment
 testConstraint noosxCI [expr {![info exists ::env(MAC_CI)]}]
 
diff --git a/tests/fileSystemEncoding.test b/tests/fileSystemEncoding.test
index 6561bef..24003b8 100644
--- a/tests/fileSystemEncoding.test
+++ b/tests/fileSystemEncoding.test
@@ -15,20 +15,7 @@ namespace eval ::tcl::test::fileSystemEncoding {
 
     variable fname1 \u767b\u9e1b\u9d72\u6a13
 
-    proc autopath {} {
-	global auto_path
-	set scriptpath [info script]
-	set scriptpathnorm [file dirname [file normalize $scriptpath/...]]
-	set dirnorm [file dirname $scriptpathnorm]
-	set idx [lsearch -exact $auto_path $dirnorm]
-	if {$idx >= 0} {
-	    set auto_path [lreplace $auto_path[set auto_path {}] $idx $idx {}]
-	}
-	set auto_path [linsert $auto_path[set auto_path {}] 0 0 $dirnorm]
-    }
-    autopath
-
-    package require tcltests
+    source [file join [file dirname [info script]] tcltests.tcl]
 
     test filesystemEncoding-1.0 {
 	issue bcd100410465
diff --git a/tests/io.test b/tests/io.test
index cd4c954..ca7bd0c 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -34,6 +34,7 @@ namespace eval ::tcl::test::io {
 	package require -exact Tcltest [info patchlevel]
 	set ::tcltestlib [lindex [package ifneeded Tcltest [info patchlevel]] 1]
     }
+    source [file join [file dirname [info script]] tcltests.tcl]
 
 testConstraint testbytestring [llength [info commands testbytestring]]
 testConstraint testchannel      [llength [info commands testchannel]]
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 99bb464..d17dce3 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -17,6 +17,7 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
+source [file join [file dirname [info script]] tcltests.tcl]
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/platform.test b/tests/platform.test
index 6b775cf..faab6d9 100644
--- a/tests/platform.test
+++ b/tests/platform.test
@@ -10,6 +10,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require tcltest 2.5
+source [file join [file dirname [info script]] tcltests.tcl]
 
 namespace eval ::tcl::test::platform {
     namespace import ::tcltest::testConstraint
diff --git a/tests/tcltests.tcl b/tests/tcltests.tcl
index 58e6bfb..1a473e9 100644
--- a/tests/tcltests.tcl
+++ b/tests/tcltests.tcl
@@ -1,5 +1,8 @@
 #! /usr/bin/env tclsh
 
+# Don't overwrite tcltests facilities already present
+if {[package provide tcltests] ne {}} return
+
 package require tcltest 2.5
 namespace import ::tcltest::*
 
diff --git a/tests/thread.test b/tests/thread.test
index 28934a2..92f3a06 100644
--- a/tests/thread.test
+++ b/tests/thread.test
@@ -16,7 +16,7 @@
 #  be fully finalized, which avoids valgrind "still reachable" reports.
 
 package require tcltest 2.5
-namespace import ::tcltest::*
+source [file join [file dirname [info script]] tcltests.tcl]
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
-- 
cgit v0.12


From 78bce4ec934a2cce5174e894d2c845df212f71b9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Nov 2022 19:17:32 +0000
Subject: Fix [bec4219123]: test utf-4.12 fails in custom builds

---
 generic/tclTest.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index c9bad56..2ebbcc2 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -20,10 +20,12 @@
 #ifndef USE_TCL_STUBS
 #   define USE_TCL_STUBS
 #endif
+#undef TCL_UTF_MAX
 #ifdef TCL_NO_DEPRECATED
 #   define TCL_UTF_MAX 4
 #else
 #   define TCL_NO_DEPRECATED
+#   define TCL_UTF_MAX 3
 #endif
 #include "tclInt.h"
 #ifdef TCL_WITH_EXTERNAL_TOMMATH
-- 
cgit v0.12


From 90a23f176d6423227cc2fd2be8cd3a88ceb1c088 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Nov 2022 19:43:09 +0000
Subject: Fix
 [https://core.tcl-lang.org/thread/tktview?name=16bf24d70b|16bf24d70b]:
 Installed Thread for Tcl 8.7 breaks availability of Thread in 8.6

---
 generic/tcl.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 800ffa1..26054ea 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2405,27 +2405,14 @@ const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
 #endif
 
 #ifdef USE_TCL_STUBS
-#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
 #   define Tcl_InitStubs(interp, version, exact) \
 	(Tcl_InitStubs)(interp, version, \
 	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
 	    TCL_STUB_MAGIC)
 #else
 #   define Tcl_InitStubs(interp, version, exact) \
-	(Tcl_InitStubs)(interp, TCL_PATCH_LEVEL, \
-	    1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
-	    TCL_STUB_MAGIC)
-#endif
-#else
-#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE
-#   define Tcl_InitStubs(interp, version, exact) \
 	Tcl_PkgInitStubsCheck(interp, version, \
 		(exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
-#else
-#   define Tcl_InitStubs(interp, version, exact) \
-	Tcl_PkgInitStubsCheck(interp, TCL_PATCH_LEVEL, \
-		1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16))
-#endif
 #endif
 
 /*
-- 
cgit v0.12


From 0bcca87681ea390671d67a96f771697c9f5ff3be Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Nov 2022 20:26:52 +0000
Subject: Backout [52a52a65f0], let's see if this fixes the Windows crash

---
 generic/tclLink.c | 19 +++++++++++++++++--
 generic/tclObj.c  | 34 ++++++++++++++++++++++++----------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/generic/tclLink.c b/generic/tclLink.c
index 397c9bc..1973067 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -537,10 +537,15 @@ GetUWide(
 	} else if (type == TCL_NUMBER_BIG) {
 	    mp_int *numPtr = (mp_int *)clientData;
 	    Tcl_WideUInt value = 0;
+	    union {
+		Tcl_WideUInt value;
+		unsigned char bytes[sizeof(Tcl_WideUInt)];
+	    } scratch;
 	    size_t numBytes;
+	    unsigned char *bytes = scratch.bytes;
 
-	    if (numPtr->sign || (MP_OKAY != mp_pack(&value, 1,
-		    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, numPtr))) {
+	    if (numPtr->sign || (MP_OKAY != mp_to_ubin(numPtr,
+		    bytes, sizeof(Tcl_WideUInt), &numBytes))) {
 		/*
 		 * If the sign bit is set (a negative value) or if the value
 		 * can't possibly fit in the bits of an unsigned wide, there's
@@ -548,6 +553,16 @@ GetUWide(
 		 */
 		return 1;
 	    }
+#ifndef WORDS_BIGENDIAN
+	    while (numBytes-- > 0) {
+		value = (value << CHAR_BIT) | *bytes++;
+	    }
+#else /* WORDS_BIGENDIAN */
+	    /*
+	     * Big-endian can read the value directly.
+	     */
+	    value = scratch.value;
+#endif /* WORDS_BIGENDIAN */
 	    *uwidePtr = value;
 	    return 0;
 	}
diff --git a/generic/tclObj.c b/generic/tclObj.c
index bad3f85..ce8e610 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3124,12 +3124,15 @@ Tcl_GetLongFromObj(
 
 		{
 	    mp_int big;
-	    unsigned long value = 0;
+	    unsigned long scratch, value = 0;
+	    unsigned char *bytes = (unsigned char *) &scratch;
 	    size_t numBytes;
 
 	    TclUnpackBignum(objPtr, big);
-	    if (mp_pack(&value, 1,
-			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
+	    if (mp_to_ubin(&big, bytes, sizeof(long), &numBytes) == MP_OKAY) {
+		while (numBytes-- > 0) {
+			value = (value << CHAR_BIT) | *bytes++;
+		}
 		if (big.sign) {
 		    if (value <= 1 + (unsigned long)LONG_MAX) {
 			*longPtr = (long)(-value);
@@ -3361,10 +3364,14 @@ Tcl_GetWideIntFromObj(
 	    mp_int big;
 	    Tcl_WideUInt value = 0;
 	    size_t numBytes;
+	    Tcl_WideInt scratch;
+	    unsigned char *bytes = (unsigned char *) &scratch;
 
 	    TclUnpackBignum(objPtr, big);
-	    if (mp_pack(&value, 1,
-			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
+	    if (mp_to_ubin(&big, bytes, sizeof(Tcl_WideInt), &numBytes) == MP_OKAY) {
+		while (numBytes-- > 0) {
+		    value = (value << CHAR_BIT) | *bytes++;
+		}
 		if (big.sign) {
 		    if (value <= 1 + ~(Tcl_WideUInt)WIDE_MIN) {
 			*wideIntPtr = (Tcl_WideInt)(-value);
@@ -3437,18 +3444,21 @@ TclGetWideBitsFromObj(
 	    mp_int big;
 	    mp_err err;
 
-	    Tcl_WideUInt value = 0;
+	    Tcl_WideUInt value = 0, scratch;
 	    size_t numBytes;
+	    unsigned char *bytes = (unsigned char *) &scratch;
 
 	    Tcl_GetBignumFromObj(NULL, objPtr, &big);
 	    err = mp_mod_2d(&big, (int) (CHAR_BIT * sizeof(Tcl_WideInt)), &big);
 	    if (err == MP_OKAY) {
-		err = mp_pack(&value, 1,
-			&numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big);
+		err = mp_to_ubin(&big, bytes, sizeof(Tcl_WideInt), &numBytes);
 	    }
 	    if (err != MP_OKAY) {
 		return TCL_ERROR;
 	    }
+	    while (numBytes-- > 0) {
+		value = (value << CHAR_BIT) | *bytes++;
+	    }
 	    *wideIntPtr = !big.sign ? (Tcl_WideInt)value : -(Tcl_WideInt)value;
 	    mp_clear(&big);
 	    return TCL_OK;
@@ -3818,15 +3828,19 @@ Tcl_SetBignumObj(
 {
     Tcl_WideUInt value = 0;
     size_t numBytes;
+    Tcl_WideUInt scratch;
+    unsigned char *bytes = (unsigned char *) &scratch;
     mp_int *bignumValue = (mp_int *) big;
 
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_SetBignumObj");
     }
-    if (mp_pack(&value, 1,
-		    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, bignumValue) != MP_OKAY) {
+    if (mp_to_ubin(bignumValue, bytes, sizeof(Tcl_WideUInt), &numBytes) != MP_OKAY) {
 	goto tooLargeForWide;
     }
+    while (numBytes-- > 0) {
+	value = (value << CHAR_BIT) | *bytes++;
+    }
     if (value > ((Tcl_WideUInt)WIDE_MAX + bignumValue->sign)) {
 	goto tooLargeForWide;
     }
-- 
cgit v0.12


From 1c1ee1c59dab10aa856f9ecc8a2e9613aa69c04e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Nov 2022 21:43:40 +0000
Subject: Backout [52a52a65f0], let's see if this fixes the Windows crash

---
 generic/tclLink.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
 generic/tclObj.c  | 49 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/generic/tclLink.c b/generic/tclLink.c
index cd2c731..1973067 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -526,14 +526,56 @@ GetUWide(
     Tcl_Obj *objPtr,
     Tcl_WideUInt *uwidePtr)
 {
-    if (Tcl_GetWideUIntFromObj(NULL, objPtr, uwidePtr) != TCL_OK) {
-	int intValue;
-
-	if (GetInvalidIntFromObj(objPtr, &intValue) != TCL_OK) {
-	    return 1;
+    Tcl_WideInt *widePtr = (Tcl_WideInt *) uwidePtr;
+    void *clientData;
+    int type, intValue;
+
+    if (Tcl_GetNumberFromObj(NULL, objPtr, &clientData, &type) == TCL_OK) {
+	if (type == TCL_NUMBER_INT) {
+	    *widePtr = *((const Tcl_WideInt *) clientData);
+	    return (*widePtr < 0);
+	} else if (type == TCL_NUMBER_BIG) {
+	    mp_int *numPtr = (mp_int *)clientData;
+	    Tcl_WideUInt value = 0;
+	    union {
+		Tcl_WideUInt value;
+		unsigned char bytes[sizeof(Tcl_WideUInt)];
+	    } scratch;
+	    size_t numBytes;
+	    unsigned char *bytes = scratch.bytes;
+
+	    if (numPtr->sign || (MP_OKAY != mp_to_ubin(numPtr,
+		    bytes, sizeof(Tcl_WideUInt), &numBytes))) {
+		/*
+		 * If the sign bit is set (a negative value) or if the value
+		 * can't possibly fit in the bits of an unsigned wide, there's
+		 * no point in doing further conversion.
+		 */
+		return 1;
+	    }
+#ifndef WORDS_BIGENDIAN
+	    while (numBytes-- > 0) {
+		value = (value << CHAR_BIT) | *bytes++;
+	    }
+#else /* WORDS_BIGENDIAN */
+	    /*
+	     * Big-endian can read the value directly.
+	     */
+	    value = scratch.value;
+#endif /* WORDS_BIGENDIAN */
+	    *uwidePtr = value;
+	    return 0;
 	}
-	*uwidePtr = intValue;
     }
+
+    /*
+     * Evil edge case fallback.
+     */
+
+    if (GetInvalidIntFromObj(objPtr, &intValue) != TCL_OK) {
+	return 1;
+    }
+    *uwidePtr = intValue;
     return 0;
 }
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 5a52e29..cc792c7 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3124,12 +3124,15 @@ Tcl_GetLongFromObj(
 
 		{
 	    mp_int big;
-	    unsigned long value = 0;
+	    unsigned long scratch, value = 0;
+	    unsigned char *bytes = (unsigned char *) &scratch;
 	    size_t numBytes;
 
 	    TclUnpackBignum(objPtr, big);
-	    if (mp_pack(&value, 1,
-			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
+	    if (mp_to_ubin(&big, bytes, sizeof(long), &numBytes) == MP_OKAY) {
+		while (numBytes-- > 0) {
+			value = (value << CHAR_BIT) | *bytes++;
+		}
 		if (big.sign) {
 		    if (value <= 1 + (unsigned long)LONG_MAX) {
 			*longPtr = (long)(-value);
@@ -3361,10 +3364,14 @@ Tcl_GetWideIntFromObj(
 	    mp_int big;
 	    Tcl_WideUInt value = 0;
 	    size_t numBytes;
+	    Tcl_WideInt scratch;
+	    unsigned char *bytes = (unsigned char *) &scratch;
 
 	    TclUnpackBignum(objPtr, big);
-	    if (mp_pack(&value, 1,
-			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
+	    if (mp_to_ubin(&big, bytes, sizeof(Tcl_WideInt), &numBytes) == MP_OKAY) {
+		while (numBytes-- > 0) {
+		    value = (value << CHAR_BIT) | *bytes++;
+		}
 		if (big.sign) {
 		    if (value <= 1 + ~(Tcl_WideUInt)WIDE_MIN) {
 			*wideIntPtr = (Tcl_WideInt)(-value);
@@ -3440,24 +3447,27 @@ Tcl_GetWideUIntFromObj(
 	if (objPtr->typePtr == &tclBignumType) {
 	    /*
 	     * Must check for those bignum values that can fit in a
-	     * Tcl_WideInt, even when auto-narrowing is enabled.
+	     * Tcl_WideUInt, even when auto-narrowing is enabled.
 	     */
 
 	    mp_int big;
 	    Tcl_WideUInt value = 0;
 	    size_t numBytes;
+	    Tcl_WideUInt scratch;
+	    unsigned char *bytes = (unsigned char *) &scratch;
 
 	    TclUnpackBignum(objPtr, big);
-	    if (mp_pack(&value, 1,
-			    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big) == MP_OKAY) {
 		if (big.sign == MP_NEG) {
 		    goto wideUIntOutOfRange;
 		}
-		if (value <= (Tcl_WideUInt)UWIDE_MAX) {
-		    *wideUIntPtr = (Tcl_WideUInt)value;
-		    return TCL_OK;
+	    if (mp_to_ubin(&big, bytes, sizeof(Tcl_WideUInt), &numBytes) == MP_OKAY) {
+		while (numBytes-- > 0) {
+		    value = (value << CHAR_BIT) | *bytes++;
 		}
+		*wideUIntPtr = (Tcl_WideUInt)value;
+		return TCL_OK;
 	    }
+
 	    if (interp != NULL) {
 		const char *s = "integer value too large to represent";
 		Tcl_Obj *msg = Tcl_NewStringObj(s, -1);
@@ -3518,18 +3528,21 @@ TclGetWideBitsFromObj(
 	    mp_int big;
 	    mp_err err;
 
-	    Tcl_WideUInt value = 0;
+	    Tcl_WideUInt value = 0, scratch;
 	    size_t numBytes;
+	    unsigned char *bytes = (unsigned char *) &scratch;
 
 	    Tcl_GetBignumFromObj(NULL, objPtr, &big);
 	    err = mp_mod_2d(&big, (int) (CHAR_BIT * sizeof(Tcl_WideInt)), &big);
 	    if (err == MP_OKAY) {
-		err = mp_pack(&value, 1,
-			&numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, &big);
+		err = mp_to_ubin(&big, bytes, sizeof(Tcl_WideInt), &numBytes);
 	    }
 	    if (err != MP_OKAY) {
 		return TCL_ERROR;
 	    }
+	    while (numBytes-- > 0) {
+		value = (value << CHAR_BIT) | *bytes++;
+	    }
 	    *wideIntPtr = !big.sign ? (Tcl_WideInt)value : -(Tcl_WideInt)value;
 	    mp_clear(&big);
 	    return TCL_OK;
@@ -3899,15 +3912,19 @@ Tcl_SetBignumObj(
 {
     Tcl_WideUInt value = 0;
     size_t numBytes;
+    Tcl_WideUInt scratch;
+    unsigned char *bytes = (unsigned char *) &scratch;
     mp_int *bignumValue = (mp_int *) big;
 
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_SetBignumObj");
     }
-    if (mp_pack(&value, 1,
-		    &numBytes, 0, sizeof(Tcl_WideUInt), 0, 0, bignumValue) != MP_OKAY) {
+    if (mp_to_ubin(bignumValue, bytes, sizeof(Tcl_WideUInt), &numBytes) != MP_OKAY) {
 	goto tooLargeForWide;
     }
+    while (numBytes-- > 0) {
+	value = (value << CHAR_BIT) | *bytes++;
+    }
     if (value > ((Tcl_WideUInt)WIDE_MAX + bignumValue->sign)) {
 	goto tooLargeForWide;
     }
-- 
cgit v0.12


From 124340611ed97ad4347b3ce4bc6aa1d76a99f1b0 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sun, 20 Nov 2022 14:16:36 +0000
Subject: Newest tests must have most recent releases of http to pass.

---
 tests/http.test | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index b0f5144..498621b 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -30,6 +30,8 @@ if {[catch {package require http 2} version]} {
 	return
     }
 }
+testConstraint http2.9.7 [package vsatisfies [package provide http] 2.9.7]
+testConstraint http2.9.8 [package vsatisfies [package provide http] 2.9.8]
 
 proc bgerror {args} {
     global errorInfo
@@ -119,25 +121,25 @@ test http-1.6 {http::config} -setup {
 test http-2.1 {http::reset} {
     catch {http::reset http#1}
 } 0
-test http-2.2 {http::CharsetToEncoding} {
+test http-2.2 {http::CharsetToEncoding} http2.9.7 {
     http::CharsetToEncoding iso-8859-11
 } iso8859-11
-test http-2.3 {http::CharsetToEncoding} {
+test http-2.3 {http::CharsetToEncoding} http2.9.7 {
     http::CharsetToEncoding iso-2022-kr
 } iso2022-kr
-test http-2.4 {http::CharsetToEncoding} {
+test http-2.4 {http::CharsetToEncoding} http2.9.7 {
     http::CharsetToEncoding shift-jis
 } shiftjis
-test http-2.5 {http::CharsetToEncoding} {
+test http-2.5 {http::CharsetToEncoding} http2.9.7 {
     http::CharsetToEncoding windows-437
 } cp437
-test http-2.6 {http::CharsetToEncoding} {
+test http-2.6 {http::CharsetToEncoding} http2.9.7 {
     http::CharsetToEncoding latin5
 } iso8859-9
-test http-2.7 {http::CharsetToEncoding} {
+test http-2.7 {http::CharsetToEncoding} http2.9.7 {
     http::CharsetToEncoding latin1
 } iso8859-1
-test http-2.8 {http::CharsetToEncoding} {
+test http-2.8 {http::CharsetToEncoding} http2.9.7 {
     http::CharsetToEncoding latin4
 } binary
 
@@ -468,12 +470,14 @@ test http-3.33 {http::geturl application/xml is text} -body {
 } -cleanup {
     catch { http::cleanup $token }
 } -result {test 4660 /test}
+
+
 test http-3.34 {http::geturl -headers not a list} -returnCodes error -body {
     http::geturl http://test/t -headers \"
-} -result {Bad value for -headers ("), must be list}
+} -constraints http2.9.8 -result {Bad value for -headers ("), must be list}
 test http-3.35 {http::geturl -headers not even number of elements} -returnCodes error -body {
     http::geturl http://test/t -headers {List Length 3}
-} -result {Bad value for -headers (List Length 3), number of list elements must be even}
+} -constraints http2.9.8 -result {Bad value for -headers (List Length 3), number of list elements must be even}
 
 test http-4.1 {http::Event} -body {
     set token [http::geturl $url -keepalive 0]
-- 
cgit v0.12


From 0666836834ee47bf27a03d10a7228593d57c43b2 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sun, 20 Nov 2022 15:34:08 +0000
Subject: bump release date

---
 changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes b/changes
index d75258c..74e3cc0 100644
--- a/changes
+++ b/changes
@@ -9166,4 +9166,4 @@ Update bundled libtommath
 
 Many code fixes to avoid overflow or undefined behavior.  Thanks chrstphrchvz.
 
-- Released 8.6.13, Nov 16, 2022 - details at https://core.tcl-lang.org/tcl/ -
+- Released 8.6.13, Nov 22, 2022 - details at https://core.tcl-lang.org/tcl/ -
-- 
cgit v0.12


From b71ebc2746c2c92514bfd0dd8b9ad48019ac2e16 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 20 Nov 2022 19:29:53 +0000
Subject: Constraints http2.9.x make no sense, when testing http2.10

---
 tests/http.test | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/http.test b/tests/http.test
index 46242bd..08195a6 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -15,11 +15,9 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
-source [file join [file dirname [info script]] tcltests.tcl]
+package require tcltests
 
 package require http 2.10
-testConstraint http2.9.7 [package vsatisfies [package provide http] 2.9.7]
-testConstraint http2.9.8 [package vsatisfies [package provide http] 2.9.8]
 
 proc bgerror {args} {
     global errorInfo
@@ -128,25 +126,25 @@ test http-1.6.$ThreadLevel {http::config} -setup {
 test http-2.1.$ThreadLevel {http::reset} {
     catch {http::reset http#1}
 } 0
-test http-2.2.$ThreadLevel {http::CharsetToEncoding} http2.9.7 {
+test http-2.2.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding iso-8859-11
 } iso8859-11
-test http-2.3.$ThreadLevel {http::CharsetToEncoding} http2.9.7 {
+test http-2.3.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding iso-2022-kr
 } iso2022-kr
-test http-2.4.$ThreadLevel {http::CharsetToEncoding} http2.9.7 {
+test http-2.4.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding shift-jis
 } shiftjis
-test http-2.5.$ThreadLevel {http::CharsetToEncoding} http2.9.7 {
+test http-2.5.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding windows-437
 } cp437
-test http-2.6.$ThreadLevel {http::CharsetToEncoding} http2.9.7 {
+test http-2.6.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding latin5
 } iso8859-9
-test http-2.7.$ThreadLevel {http::CharsetToEncoding} http2.9.7 {
+test http-2.7.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding latin1
 } iso8859-1
-test http-2.8.$ThreadLevel {http::CharsetToEncoding} http2.9.7 {
+test http-2.8.$ThreadLevel {http::CharsetToEncoding} {
     http::CharsetToEncoding latin4
 } binary
 
@@ -483,10 +481,10 @@ test http-3.33.$ThreadLevel {http::geturl application/xml is text} -body {
 } -result {test 4660 /test}
 test http-3.34.$ThreadLevel {http::geturl -headers not a list} -returnCodes error -body {
     http::geturl http://test/t -headers \"
-} -constraints http2.9.8 -result {Bad value for -headers ("), must be list}
+} -result {Bad value for -headers ("), must be list}
 test http-3.35.$ThreadLevel {http::geturl -headers not even number of elements} -returnCodes error -body {
     http::geturl http://test/t -headers {List Length 3}
-} -constraints http2.9.8 -result {Bad value for -headers (List Length 3), number of list elements must be even}
+} -result {Bad value for -headers (List Length 3), number of list elements must be even}
 
 test http-4.1.$ThreadLevel {http::Event} -body {
     set token [http::geturl $url -keepalive 0]
-- 
cgit v0.12


From bfdd211de9210e8b9cf5af6cf3aa03a4698ef0ee Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 20 Nov 2022 19:33:00 +0000
Subject: Don't use "package require tcltests" any more, as in other tests

---
 tests/http.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/http.test b/tests/http.test
index 08195a6..587e6e4 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -15,7 +15,7 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
-package require tcltests
+source [file join [file dirname [info script]] tcltests.tcl]
 
 package require http 2.10
 
-- 
cgit v0.12


From 8f9ddfae668df094f955bb9763bbf7569be015ca Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sun, 20 Nov 2022 21:39:43 +0000
Subject: missing constraints

---
 tests/listRep.test | 72 +++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/tests/listRep.test b/tests/listRep.test
index 7883a21..02ff18f 100644
--- a/tests/listRep.test
+++ b/tests/listRep.test
@@ -472,7 +472,7 @@ test listrep-1.10.1 {
 test listrep-1.11 {
     Append elements to large unshared list is optimized as lappend
     so no free space in front - lreplace version
-} -body {
+} -constraints testlistrep -body {
     # Note $end, not end else byte code compiler short-cuts
     set l [lreplace [freeSpaceNone 1000] $end+1 $end+1 1000]
     validate $l
@@ -482,7 +482,7 @@ test listrep-1.11 {
 test listrep-1.11.1 {
     Append elements to large unshared list is optimized as lappend
     so no free space in front - linsert version
-} -body {
+} -constraints testlistrep -body {
     # Note $end, not end else byte code compiler short-cuts
     set l [linsert [freeSpaceNone 1000] $end+1 1000]
     validate $l
@@ -492,7 +492,7 @@ test listrep-1.11.1 {
 test listrep-1.11.2 {
     Append elements to large unshared list leaves no free space in front
     - lappend version
-} -body {
+} -constraints testlistrep -body {
     # Note $end, not end else byte code compiler short-cuts
     set l [freeSpaceNone 1000]
     lappend l 1000 1001
@@ -504,7 +504,7 @@ test listrep-1.11.2 {
 test listrep-1.12 {
     Replacement of elements at front with same number elements in unshared list
     is in-place - lreplace version
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $zero $one 10 11]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -513,7 +513,7 @@ test listrep-1.12 {
 test listrep-1.12.1 {
     Replacement of elements at front with same number elements in unshared list
     is in-place - lset version
-} -body {
+} -constraints testlistrep -body {
     set l [freeSpaceNone]
     lset l 0 -1
     validate $l
@@ -523,7 +523,7 @@ test listrep-1.12.1 {
 test listrep-1.13 {
     Replacement of elements at front with fewer elements in unshared list
     results in a spanned list with space only in front
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $zero $four 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -532,7 +532,7 @@ test listrep-1.13 {
 test listrep-1.14 {
     Replacement of elements at front with more elements in unshared list
     results in a reallocated spanned list with space at front and back
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $zero $one 10 11 12]
     validate $l
     list $l [spaceEqual $l]
@@ -541,7 +541,7 @@ test listrep-1.14 {
 test listrep-1.15 {
     Replacement of elements in middle with same number elements in unshared list
     is in-place - lreplace version
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $one $two 10 11]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -550,7 +550,7 @@ test listrep-1.15 {
 test listrep-1.15.1 {
     Replacement of elements in middle with same number elements in unshared list
     is in-place - lset version
-} -body {
+} -constraints testlistrep -body {
     set l [freeSpaceNone]
     lset l $two -1
     validate $l
@@ -560,7 +560,7 @@ test listrep-1.15.1 {
 test listrep-1.16 {
     Replacement of elements in front half with fewer elements in unshared list
     results in a spanned list with space only in front since smaller segment moved
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $one $four 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -569,7 +569,7 @@ test listrep-1.16 {
 test listrep-1.17 {
     Replacement of elements in back half with fewer elements in unshared list
     results in a spanned list with space only at back
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] end-$four end-$one 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -578,7 +578,7 @@ test listrep-1.17 {
 test listrep-1.18 {
     Replacement of elements in middle more elements in unshared list
     results in a reallocated spanned list with space at front and back
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $one $two 10 11 12]
     validate $l
     list $l [spaceEqual $l]
@@ -587,7 +587,7 @@ test listrep-1.18 {
 test listrep-1.19 {
     Replacement of elements at back with same number elements in unshared list
     is in-place - lreplace version
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $end-1 $end 10 11]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -596,7 +596,7 @@ test listrep-1.19 {
 test listrep-1.19.1 {
     Replacement of elements at back with same number elements in unshared list
     is in-place - lset version
-} -body {
+} -constraints testlistrep -body {
     set l [freeSpaceNone]
     lset l $end 10
     validate $l
@@ -606,7 +606,7 @@ test listrep-1.19.1 {
 test listrep-1.20 {
     Replacement of elements at back with fewer elements in unshared list
     is in-place with space only at the back
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $end-2 $end 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -615,7 +615,7 @@ test listrep-1.20 {
 test listrep-1.21 {
     Replacement of elements at back with more elements in unshared list
     allocates new representation with equal space at front and back
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceNone] $end-1 $end 10 11 12]
     validate $l
     list $l [spaceEqual $l]
@@ -1667,7 +1667,7 @@ test listrep-3.22.1 {
 test listrep-3.23 {
     Replacement of elements at front with same number elements in unshared
     spanned list is in-place - lreplace version
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $zero $one 10 11]
     list $l [leadSpace $l] [tailSpace $l]
 } -result [list {10 11 2 3 4 5 6 7} 3 3]
@@ -1675,7 +1675,7 @@ test listrep-3.23 {
 test listrep-3.23.1 {
     Replacement of elements at front with same number elements in unshared
     spanned list is in-place - lset version
-} -body {
+} -constraints testlistrep -body {
     set l [freeSpaceBoth]
     lset l $zero 10
     list $l [leadSpace $l] [tailSpace $l]
@@ -1684,7 +1684,7 @@ test listrep-3.23.1 {
 test listrep-3.24 {
     Replacement of elements at front with fewer elements in unshared
     spanned list expands leading space - lreplace version
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $zero $four 10]
     list $l [leadSpace $l] [tailSpace $l]
 } -result [list {10 5 6 7} 7 3]
@@ -1692,7 +1692,7 @@ test listrep-3.24 {
 test listrep-3.25 {
     Replacement of elements at front with more elements in unshared
     spanned list with sufficient leading space shrinks leading space
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $zero $one 10 11 12]
     list $l [leadSpace $l] [tailSpace $l]
 } -result [list {10 11 12 2 3 4 5 6 7} 2 3]
@@ -1719,7 +1719,7 @@ test listrep-3.27 {
 test listrep-3.28 {
     Replacement of elements at back with same number of elements in unshared
     spanned list is in-place - lreplace version
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $end-1 $end 10 11]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1728,7 +1728,7 @@ test listrep-3.28 {
 test listrep-3.28.1 {
     Replacement of elements at back with same number of elements in unshared
     spanned list is in-place - lset version
-} -body {
+} -constraints testlistrep -body {
     set l [freeSpaceBoth]
     lset l $end 10
     validate $l
@@ -1738,7 +1738,7 @@ test listrep-3.28.1 {
 test listrep-3.29 {
     Replacement of elements at back with fewer elements in unshared
     spanned list expands tail space
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $end-2 $end 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1747,7 +1747,7 @@ test listrep-3.29 {
 test listrep-3.30 {
     Replacement of elements at back with more elements in unshared
     spanned list with sufficient tail space shrinks tailspace
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $end-1 $end 10 11 12]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1756,7 +1756,7 @@ test listrep-3.30 {
 test listrep-3.31 {
     Replacement of elements at back with more elements in unshared spanned list
     with insufficient tail space but enough total free space moves up the span
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth 8 2 2] $end-1 $end 10 11 12 13 14]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1766,7 +1766,7 @@ test listrep-3.32 {
     Replacement of elements at back with more elements in unshared spanned list
     with insufficient total space reallocates with more room in the tail because
     of realloc()
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth 8 1 1] $end-1 $end 10 11 12 13 14]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1775,7 +1775,7 @@ test listrep-3.32 {
 test listrep-3.33 {
     Replacement of elements in the middle in an unshared spanned list with
     the same number of elements - lreplace version
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $two $four 10 11 12]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1784,7 +1784,7 @@ test listrep-3.33 {
 test listrep-3.33.1 {
     Replacement of elements in the middle in an unshared spanned list with
     the same number of elements - lset version
-} -body {
+} -constraints testlistrep -body {
     set l [freeSpaceBoth]
     lset l $two 10
     validate $l
@@ -1794,7 +1794,7 @@ test listrep-3.33.1 {
 test listrep-3.34 {
     Replacement of elements in an unshared spanned list with fewer elements
     in the front half moves the front (smaller) segment
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $two $four 10 11]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1803,7 +1803,7 @@ test listrep-3.34 {
 test listrep-3.35 {
     Replacement of elements in an unshared spanned list with fewer elements
     in the back half moves the tail (smaller) segment
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $end-2 $end-1 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1813,7 +1813,7 @@ test listrep-3.36 {
     Replacement of elements in an unshared spanned list with more elements
     when both front and back have room should move the smaller segment
     (front case)
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $one $two 8 9 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1823,7 +1823,7 @@ test listrep-3.37 {
     Replacement of elements in an unshared spanned list with more elements
     when both front and back have room should move the smaller segment
     (back case)
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $end-2 $end-1 8 9 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1832,7 +1832,7 @@ test listrep-3.37 {
 test listrep-3.38 {
     Replacement of elements in an unshared spanned list with more elements
     when only front has room
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth 8 3 1] $end-1 $end-1 8 9 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1841,7 +1841,7 @@ test listrep-3.38 {
 test listrep-3.39 {
     Replacement of elements in an unshared spanned list with more elements
     when only back has room
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth 8 1 3] $one $one 8 9 10]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1850,7 +1850,7 @@ test listrep-3.39 {
 test listrep-3.40 {
     Replacement of elements in an unshared spanned list with more elements
     when neither send has enough room by itself
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth] $one $one 8 9 10 11 12]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
@@ -1860,7 +1860,7 @@ test listrep-3.41 {
     Replacement of elements in an unshared spanned list with more elements
     when there is not enough free space results in new allocation. The back
     end has more space because of realloc()
-} -body {
+} -constraints testlistrep -body {
     set l [lreplace [freeSpaceBoth 8 1 1] $one $one 8 9 10 11 12]
     validate $l
     list $l [leadSpace $l] [tailSpace $l]
-- 
cgit v0.12


From 49cb764a5a3c9a06ea2bebcbe8d7f46cca7472f5 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sun, 20 Nov 2022 22:08:19 +0000
Subject: In most testing scenarios, the TCL_LIBRARY variable is masking a bug
 in system encoding discovery.  Adapted test unixInit-3.2 to stop shielding
 this problem from view.

---
 tests/unixInit.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/unixInit.test b/tests/unixInit.test
index 2ea7d8e..69c3eac 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -346,6 +346,8 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints {
 } -match regexp -result {^(iso8859-15?|utf-8)$}
 test unixInit-3.2 {TclpSetInitialEncodings} -setup {
     catch {set oldlc_all $env(LC_ALL)}
+    catch {set oldtcl_library $env(TCL_LIBRARY)}
+    unset -nocomplain env(TCL_LIBRARY)
 } -constraints {unix stdio} -body {
     set env(LANG) japanese
     set env(LC_ALL) japanese
@@ -364,6 +366,7 @@ test unixInit-3.2 {TclpSetInitialEncodings} -setup {
 } -cleanup {
     unset -nocomplain env(LANG) env(LC_ALL)
     catch {set env(LC_ALL) $oldlc_all}
+    catch {set env(TCL_LIBRARY) $oldtcl_library}
 } -result 0
 
 test unixInit-4.1 {TclpSetVariables} {unix} {
-- 
cgit v0.12


From 91e64fb4758b08118646d3a4cb707a9288e920f3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 20 Nov 2022 23:27:09 +0000
Subject: indenting

---
 generic/tclIO.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6b9b48d..d5fbd18 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -5518,8 +5518,8 @@ FilterInputBytes(
 	    &gsPtr->bytesWrote, &gsPtr->charsWrote);
 
 	if (result == TCL_CONVERT_UNKNOWN || result == TCL_CONVERT_SYNTAX) {
-		SetFlag(statePtr, CHANNEL_ENCODING_ERROR);
-		result = TCL_OK;
+	    SetFlag(statePtr, CHANNEL_ENCODING_ERROR);
+	    result = TCL_OK;
 	}
 
     /*
@@ -6351,7 +6351,7 @@ ReadChars(
 		dst, dstLimit, &srcRead, &dstDecoded, &numChars);
 
 	if (code == TCL_CONVERT_UNKNOWN || code == TCL_CONVERT_SYNTAX) {
-		SetFlag(statePtr, CHANNEL_ENCODING_ERROR);
+	    SetFlag(statePtr, CHANNEL_ENCODING_ERROR);
 	    code = TCL_OK;
 	}
 
-- 
cgit v0.12


From 23ef10a6a40fd66b675102e65fe948610b8fe224 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Nov 2022 16:18:56 +0000
Subject: There is no guarantee that sizeof(Tcl_WideInt) == sizeof(double), so
 the offset of 'isDouble' in the struct could vary between ArithSeries and
 ArithSeriesDbl. Solution: put those fields last

---
 generic/tclArithSeries.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index af4777c..f7f2fa8 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -16,20 +16,20 @@
  * but it's faster to cache it inside the internal representation.
  */
 typedef struct ArithSeries {
+    Tcl_WideInt len;
+    Tcl_Obj **elements;
+    int isDouble;
     Tcl_WideInt start;
     Tcl_WideInt end;
     Tcl_WideInt step;
+} ArithSeries;
+typedef struct ArithSeriesDbl {
     Tcl_WideInt len;
     Tcl_Obj **elements;
     int isDouble;
-} ArithSeries;
-typedef struct ArithSeriesDbl {
     double start;
     double end;
     double step;
-    Tcl_WideInt len;
-    Tcl_Obj **elements;
-    int isDouble;
 } ArithSeriesDbl;
 
 
-- 
cgit v0.12


From 338c6692672696a76b6cb4073820426406c6f3f9 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 21 Nov 2022 17:37:38 +0000
Subject: improve accuracy of a changes line

---
 changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes b/changes
index 74e3cc0..f3d0120 100644
--- a/changes
+++ b/changes
@@ -9132,7 +9132,7 @@ See RFC 2045
 
 2022-04-26 (bug)[27520c] test error-9.6 (goth,sebres)
 
-2022-05-04 (bug)[8eb64b] http package support for Content-encoding: br
+2022-05-04 (bug)[8eb64b] http package tolerant again invalid reply header
 
 2022-05-11 (bug)[6898f9] http package failed detection of shiftjis charset
 
-- 
cgit v0.12


From 0fd21c5dd08de33ecb24bef9bcf700a40b3d2db3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Nov 2022 23:22:03 +0000
Subject: TCL_OUT_LINE_COMPILE is deprecated

---
 generic/tclInt.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 8c5d1da..31c7fcb 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1428,7 +1428,9 @@ struct CompileEnv;
  * 			sake of old code only.
  */
 
-#define TCL_OUT_LINE_COMPILE	TCL_ERROR
+#ifndef TCL_NO_DEPRECATED
+#   define TCL_OUT_LINE_COMPILE	TCL_ERROR
+#endif
 
 typedef int (CompileProc)(Tcl_Interp *interp, Tcl_Parse *parsePtr,
 	struct Command *cmdPtr, struct CompileEnv *compEnvPtr);
-- 
cgit v0.12


From b1432e6e0d74f34378a92c4768734ec92c9b6b23 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Nov 2022 23:52:36 +0000
Subject: Mark unixInit-3.2 as "knownBug". See [fccb9f322f]

---
 tests/unixInit.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unixInit.test b/tests/unixInit.test
index 69c3eac..8e64c7a 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -348,7 +348,7 @@ test unixInit-3.2 {TclpSetInitialEncodings} -setup {
     catch {set oldlc_all $env(LC_ALL)}
     catch {set oldtcl_library $env(TCL_LIBRARY)}
     unset -nocomplain env(TCL_LIBRARY)
-} -constraints {unix stdio} -body {
+} -constraints {unix stdio knownBug} -body {
     set env(LANG) japanese
     set env(LC_ALL) japanese
     set f [open "|[list [interpreter]]" w+]
-- 
cgit v0.12


From eddb2b2801aceda76f3fef6cbcd93c2b1241f165 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 22 Nov 2022 20:08:07 +0000
Subject: Unused stub entries up to Tcl_DStringToObj() (for Tcl 8.7/9.0)

---
 generic/tcl.decls     |  4 +++-
 generic/tclDecls.h    | 18 +++++++++++++++---
 generic/tclStubInit.c |  6 +++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index a933d95..379280a 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2112,10 +2112,12 @@ declare 579 {
 
 # ----- BASELINE -- FOR -- 8.5.0 ----- #
 
-declare 683 {
+declare 687 {
     void TclUnusedStubEntry(void)
 }
 
+# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
+
 ##############################################################################
 
 # Define the platform specific public Tcl interface. These functions are only
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index d8ec374..66b4782 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3515,9 +3515,13 @@ EXTERN void		Tcl_AppendPrintfToObj(Tcl_Obj *objPtr,
 /* Slot 680 is reserved */
 /* Slot 681 is reserved */
 /* Slot 682 is reserved */
+/* Slot 683 is reserved */
+/* Slot 684 is reserved */
+/* Slot 685 is reserved */
+/* Slot 686 is reserved */
 #ifndef TclUnusedStubEntry_TCL_DECLARED
 #define TclUnusedStubEntry_TCL_DECLARED
-/* 683 */
+/* 687 */
 EXTERN void		TclUnusedStubEntry(void);
 #endif
 
@@ -4238,7 +4242,11 @@ typedef struct TclStubs {
     VOID *reserved680;
     VOID *reserved681;
     VOID *reserved682;
-    void (*tclUnusedStubEntry) (void); /* 683 */
+    VOID *reserved683;
+    VOID *reserved684;
+    VOID *reserved685;
+    VOID *reserved686;
+    void (*tclUnusedStubEntry) (void); /* 687 */
 } TclStubs;
 
 extern TclStubs *tclStubsPtr;
@@ -6694,9 +6702,13 @@ extern TclStubs *tclStubsPtr;
 /* Slot 680 is reserved */
 /* Slot 681 is reserved */
 /* Slot 682 is reserved */
+/* Slot 683 is reserved */
+/* Slot 684 is reserved */
+/* Slot 685 is reserved */
+/* Slot 686 is reserved */
 #ifndef TclUnusedStubEntry
 #define TclUnusedStubEntry \
-	(tclStubsPtr->tclUnusedStubEntry) /* 683 */
+	(tclStubsPtr->tclUnusedStubEntry) /* 687 */
 #endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 9502ba2..4d0e10a 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1484,7 +1484,11 @@ TclStubs tclStubs = {
     NULL, /* 680 */
     NULL, /* 681 */
     NULL, /* 682 */
-    TclUnusedStubEntry, /* 683 */
+    NULL, /* 683 */
+    NULL, /* 684 */
+    NULL, /* 685 */
+    NULL, /* 686 */
+    TclUnusedStubEntry, /* 687 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From d942525e228c522b5f0101ced6a494e80c2cd06d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 22 Nov 2022 22:25:46 +0000
Subject: Better -strict checking, with testcases

---
 generic/tclEncoding.c |  4 ++--
 tests/encoding.test   | 17 ++++++++++-------
 tests/io.test         | 21 +++++++++++++++++++--
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 1df5e93..eb217b4 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2428,8 +2428,8 @@ UtfToUtfProc(
 	    int low;
 	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
-	    if ((len < 2) && (ch != 0) && STOPONERROR
-		    && (flags & TCL_ENCODING_MODIFIED)) {
+	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)
+		    && (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
diff --git a/tests/encoding.test b/tests/encoding.test
index b4f35db..9aa123d 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -674,16 +674,19 @@ test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
 } -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
 test encoding-24.24 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xC0\x80"
+    encoding convertfrom -strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
 test encoding-24.25 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\x80"
-} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\x80'}
-test encoding-24.26 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xF0"
-} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xF0'}
+    encoding convertfrom -strict utf-8 "\x40\x80\x00\x00"
+} -returnCodes 1 -result {unexpected byte sequence starting at index 1: '\x80'}
+test encoding-24.26 {Parse valid utf-8 with -strict} -body {
+    encoding convertfrom -strict utf-8 "\xF1\x80\x80\x80"
+} -result \U40000
 test encoding-24.27 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xFF"
+    encoding convertfrom -strict utf-8 "\xF0\x80\x80\x80"
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xF0'}
+test encoding-24.28 {Parse invalid utf-8 with -strict} -body {
+    encoding convertfrom -strict utf-8 "\xFF\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xFF'}
 
 file delete [file join [temporaryDirectory] iso2022.txt]
diff --git a/tests/io.test b/tests/io.test
index 9ae25bb..ef9e14d 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9029,11 +9029,10 @@ test io-75.4 {shiftjis encoding error read results in raw bytes} -setup {
     removeFile io-75.4
 } -result "4181ff41"
 
-test io-75.5 {incomplete shiftjis encoding read is ignored} -setup {
+test io-75.5 {invalid utf-8 encoding read is ignored} -setup {
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding binary
-    # \x81 announces a two byte sequence.
     puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
@@ -9047,6 +9046,24 @@ test io-75.5 {incomplete shiftjis encoding read is ignored} -setup {
     removeFile io-75.5
 } -result "4181"
 
+test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+    set fn [makeFile {} io-75.6]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f "A\x81"
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [catch {read $f} msg]
+    close $f
+    lappend hd $msg
+} -cleanup {
+    removeFile io-75.6
+} -result "41 0 {}" ; # Here, an exception should be thrown
 
 # ### ### ### ######### ######### #########
 
-- 
cgit v0.12


From 13eb211d5add69c9c05892fd9dff2dc5aa7dbaf0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 00:19:46 +0000
Subject: leave unixInit-3.2 as-is

---
 tests/unixInit.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/unixInit.test b/tests/unixInit.test
index 16d9e64..8e64c7a 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -346,6 +346,8 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints {
 } -match regexp -result {^(iso8859-15?|utf-8)$}
 test unixInit-3.2 {TclpSetInitialEncodings} -setup {
     catch {set oldlc_all $env(LC_ALL)}
+    catch {set oldtcl_library $env(TCL_LIBRARY)}
+    unset -nocomplain env(TCL_LIBRARY)
 } -constraints {unix stdio knownBug} -body {
     set env(LANG) japanese
     set env(LC_ALL) japanese
@@ -364,6 +366,7 @@ test unixInit-3.2 {TclpSetInitialEncodings} -setup {
 } -cleanup {
     unset -nocomplain env(LANG) env(LC_ALL)
     catch {set env(LC_ALL) $oldlc_all}
+    catch {set env(TCL_LIBRARY) $oldtcl_library}
 } -result 0
 
 test unixInit-4.1 {TclpSetVariables} {unix} {
-- 
cgit v0.12


From 7129a50b10269174f1d8f247449abe6df0dc890a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 07:36:49 +0000
Subject: Re-generate configure scripts (with correct autoconf version)

---
 unix/configure |  1 +
 win/configure  | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/unix/configure b/unix/configure
index 57d5081..043da1c 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2823,6 +2823,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
diff --git a/win/configure b/win/configure
index 2765e6c..25bc18a 100755
--- a/win/configure
+++ b/win/configure
@@ -2729,6 +2729,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -3031,24 +3032,26 @@ fi
 
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+set x ${MAKE-make}
+ac_make=`echo "" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
-- 
cgit v0.12


From 86f51a0a0b0c3eb9945f12e6aa8972d3878c67ff Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 07:38:49 +0000
Subject: Add mp_pack, mp_pack_count and mp_unpack to the libtommath stub
 table. Not used by Tcl, but can be used by extensions (backported from 8.7)

---
 generic/tclStubInit.c     |  6 +++---
 generic/tclTomMath.decls  | 11 +++++++++++
 generic/tclTomMathDecls.h | 34 +++++++++++++++++++++++++---------
 unix/Makefile.in          | 30 ++++++++++++++++++------------
 win/Makefile.in           |  3 +++
 win/makefile.vc           |  3 +++
 6 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 89a33e4..ee0412a 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -948,13 +948,13 @@ const TclTomMathStubs tclTomMathStubs = {
     TclBN_mp_set_ull, /* 68 */
     TclBN_mp_get_mag_ull, /* 69 */
     TclBN_mp_set_ll, /* 70 */
-    0, /* 71 */
-    0, /* 72 */
+    TclBN_mp_unpack, /* 71 */
+    TclBN_mp_pack, /* 72 */
     TclBN_mp_tc_and, /* 73 */
     TclBN_mp_tc_or, /* 74 */
     TclBN_mp_tc_xor, /* 75 */
     TclBN_mp_signed_rsh, /* 76 */
-    0, /* 77 */
+    TclBN_mp_pack_count, /* 77 */
     TclBN_mp_to_ubin, /* 78 */
     TclBN_mp_div_ld, /* 79 */
     TclBN_mp_to_radix, /* 80 */
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 0aa9a42..27afefd 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -243,6 +243,14 @@ declare 69 {
 declare 70 {
     void TclBN_mp_set_ll(mp_int *a, Tcl_WideInt i)
 }
+declare 71 {
+    mp_err TclBN_mp_unpack(mp_int *rop, size_t count, mp_order order, size_t size,
+	    mp_endian endian, size_t nails, const void *op)
+}
+declare 72 {
+    mp_err TclBN_mp_pack(void *rop, size_t maxcount, size_t *written, mp_order order,
+	    size_t size, mp_endian endian, size_t nails, const mp_int *op)
+}
 
 # Added in libtommath 1.1.0
 declare 73 {
@@ -257,6 +265,9 @@ declare 75 {
 declare 76 {
     mp_err TclBN_mp_signed_rsh(const mp_int *a, int b, mp_int *c)
 }
+declare 77 {
+    size_t TclBN_mp_pack_count(const mp_int *a, size_t nails, size_t size)
+}
 
 # Added in libtommath 1.2.0
 declare 78 {
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 6991643..e6f23aa 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -89,6 +89,8 @@
 #define mp_mul_d TclBN_mp_mul_d
 #define mp_neg TclBN_mp_neg
 #define mp_or TclBN_mp_or
+#define mp_pack TclBN_mp_pack
+#define mp_pack_count TclBN_mp_pack_count
 #define mp_radix_size TclBN_mp_radix_size
 #define mp_read_radix TclBN_mp_read_radix
 #define mp_rshd TclBN_mp_rshd
@@ -114,6 +116,7 @@
 #define mp_toradix_n TclBN_mp_toradix_n
 #define mp_to_radix TclBN_mp_to_radix
 #define mp_to_ubin TclBN_mp_to_ubin
+#define mp_unpack TclBN_mp_unpack
 #define mp_ubin_size TclBN_mp_unsigned_bin_size
 #define mp_unsigned_bin_size(a) ((int)TclBN_mp_unsigned_bin_size(a))
 #define mp_xor TclBN_mp_xor
@@ -329,8 +332,16 @@ EXTERN void		TclBN_mp_set_ull(mp_int *a, Tcl_WideUInt i);
 EXTERN Tcl_WideUInt	TclBN_mp_get_mag_ull(const mp_int *a);
 /* 70 */
 EXTERN void		TclBN_mp_set_ll(mp_int *a, Tcl_WideInt i);
-/* Slot 71 is reserved */
-/* Slot 72 is reserved */
+/* 71 */
+EXTERN mp_err		TclBN_mp_unpack(mp_int *rop, size_t count,
+				mp_order order, size_t size,
+				mp_endian endian, size_t nails,
+				const void *op);
+/* 72 */
+EXTERN mp_err		TclBN_mp_pack(void *rop, size_t maxcount,
+				size_t *written, mp_order order, size_t size,
+				mp_endian endian, size_t nails,
+				const mp_int *op);
 /* 73 */
 EXTERN mp_err		TclBN_mp_tc_and(const mp_int *a, const mp_int *b,
 				mp_int *c);
@@ -343,7 +354,9 @@ EXTERN mp_err		TclBN_mp_tc_xor(const mp_int *a, const mp_int *b,
 /* 76 */
 EXTERN mp_err		TclBN_mp_signed_rsh(const mp_int *a, int b,
 				mp_int *c);
-/* Slot 77 is reserved */
+/* 77 */
+EXTERN size_t		TclBN_mp_pack_count(const mp_int *a, size_t nails,
+				size_t size);
 /* 78 */
 EXTERN int		TclBN_mp_to_ubin(const mp_int *a, unsigned char *buf,
 				size_t maxlen, size_t *written);
@@ -429,13 +442,13 @@ typedef struct TclTomMathStubs {
     void (*tclBN_mp_set_ull) (mp_int *a, Tcl_WideUInt i); /* 68 */
     Tcl_WideUInt (*tclBN_mp_get_mag_ull) (const mp_int *a); /* 69 */
     void (*tclBN_mp_set_ll) (mp_int *a, Tcl_WideInt i); /* 70 */
-    void (*reserved71)(void);
-    void (*reserved72)(void);
+    mp_err (*tclBN_mp_unpack) (mp_int *rop, size_t count, mp_order order, size_t size, mp_endian endian, size_t nails, const void *op); /* 71 */
+    mp_err (*tclBN_mp_pack) (void *rop, size_t maxcount, size_t *written, mp_order order, size_t size, mp_endian endian, size_t nails, const mp_int *op); /* 72 */
     mp_err (*tclBN_mp_tc_and) (const mp_int *a, const mp_int *b, mp_int *c); /* 73 */
     mp_err (*tclBN_mp_tc_or) (const mp_int *a, const mp_int *b, mp_int *c); /* 74 */
     mp_err (*tclBN_mp_tc_xor) (const mp_int *a, const mp_int *b, mp_int *c); /* 75 */
     mp_err (*tclBN_mp_signed_rsh) (const mp_int *a, int b, mp_int *c); /* 76 */
-    void (*reserved77)(void);
+    size_t (*tclBN_mp_pack_count) (const mp_int *a, size_t nails, size_t size); /* 77 */
     int (*tclBN_mp_to_ubin) (const mp_int *a, unsigned char *buf, size_t maxlen, size_t *written); /* 78 */
     mp_err (*tclBN_mp_div_ld) (const mp_int *a, Tcl_WideUInt b, mp_int *q, Tcl_WideUInt *r); /* 79 */
     int (*tclBN_mp_to_radix) (const mp_int *a, char *str, size_t maxlen, size_t *written, int radix); /* 80 */
@@ -595,8 +608,10 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_get_mag_ull) /* 69 */
 #define TclBN_mp_set_ll \
 	(tclTomMathStubsPtr->tclBN_mp_set_ll) /* 70 */
-/* Slot 71 is reserved */
-/* Slot 72 is reserved */
+#define TclBN_mp_unpack \
+	(tclTomMathStubsPtr->tclBN_mp_unpack) /* 71 */
+#define TclBN_mp_pack \
+	(tclTomMathStubsPtr->tclBN_mp_pack) /* 72 */
 #define TclBN_mp_tc_and \
 	(tclTomMathStubsPtr->tclBN_mp_tc_and) /* 73 */
 #define TclBN_mp_tc_or \
@@ -605,7 +620,8 @@ extern const TclTomMathStubs *tclTomMathStubsPtr;
 	(tclTomMathStubsPtr->tclBN_mp_tc_xor) /* 75 */
 #define TclBN_mp_signed_rsh \
 	(tclTomMathStubsPtr->tclBN_mp_signed_rsh) /* 76 */
-/* Slot 77 is reserved */
+#define TclBN_mp_pack_count \
+	(tclTomMathStubsPtr->tclBN_mp_pack_count) /* 77 */
 #define TclBN_mp_to_ubin \
 	(tclTomMathStubsPtr->tclBN_mp_to_ubin) /* 78 */
 #define TclBN_mp_div_ld \
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0a99998..eac47a6 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -332,13 +332,12 @@ TOMMATH_OBJS = bn_s_mp_reverse.o bn_s_mp_mul_digs_fast.o \
 	bn_mp_init_size.o bn_s_mp_karatsuba_mul.o \
 	bn_s_mp_karatsuba_sqr.o bn_s_mp_balance_mul.o \
 	bn_mp_lshd.o bn_mp_mod.o bn_mp_mod_2d.o bn_mp_mul.o bn_mp_mul_2.o \
-	bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_neg.o bn_mp_or.o \
-	bn_mp_radix_size.o bn_mp_radix_smap.o \
-	bn_mp_read_radix.o bn_mp_rshd.o bn_mp_set.o \
-	bn_mp_shrink.o \
+	bn_mp_mul_2d.o bn_mp_mul_d.o bn_mp_neg.o bn_mp_or.o bn_mp_pack.o \
+	bn_mp_pack_count.o bn_mp_radix_size.o bn_mp_radix_smap.o  \
+	bn_mp_read_radix.o bn_mp_rshd.o bn_mp_shrink.o \
+	bn_mp_set.o \
 	bn_mp_sqr.o bn_mp_sqrt.o bn_mp_sub.o bn_mp_sub_d.o \
-	bn_mp_signed_rsh.o \
-	bn_mp_to_ubin.o \
+	bn_mp_signed_rsh.o bn_mp_to_ubin.o bn_mp_unpack.o \
 	bn_s_mp_toom_mul.o bn_s_mp_toom_sqr.o bn_mp_to_radix.o \
 	bn_mp_ubin_size.o bn_mp_xor.o bn_mp_zero.o bn_s_mp_add.o \
 	bn_s_mp_mul_digs.o bn_s_mp_sqr.o bn_s_mp_sub.o
@@ -1573,6 +1572,12 @@ bn_mp_neg.o: $(TOMMATH_DIR)/bn_mp_neg.c $(MATHHDRS)
 bn_mp_or.o: $(TOMMATH_DIR)/bn_mp_or.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_or.c
 
+bn_mp_pack.o: $(TOMMATH_DIR)/bn_mp_pack.c $(MATHHDRS)
+	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_pack.c
+
+bn_mp_pack_count.o: $(TOMMATH_DIR)/bn_mp_pack_count.c $(MATHHDRS)
+	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_pack_count.c
+
 bn_mp_radix_size.o: $(TOMMATH_DIR)/bn_mp_radix_size.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_radix_size.c
 
@@ -1621,6 +1626,9 @@ bn_mp_to_radix.o: $(TOMMATH_DIR)/bn_mp_to_radix.c $(MATHHDRS)
 bn_mp_ubin_size.o: $(TOMMATH_DIR)/bn_mp_ubin_size.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_ubin_size.c
 
+bn_mp_unpack.o: $(TOMMATH_DIR)/bn_mp_unpack.c $(MATHHDRS)
+	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_unpack.c
+
 bn_mp_xor.o: $(TOMMATH_DIR)/bn_mp_xor.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(TOMMATH_DIR)/bn_mp_xor.c
 
@@ -2100,8 +2108,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 	@mkdir $(DISTDIR)/library/msgs
 	cp -p $(TOP_DIR)/library/msgs/*.msg $(DISTDIR)/library/msgs
 	@echo cp -r $(TOP_DIR)/library/tzdata $(DISTDIR)/library/tzdata
-	@( cd $(TOP_DIR); \
-	  find library/tzdata -name CVS -prune -o -type f -print ) \
+	@( cd $(TOP_DIR); find library/tzdata -type f -print ) \
 	    | ( cd $(TOP_DIR) ; xargs tar cf - ) \
 	    | ( cd $(DISTDIR) ; tar xfp - )
 	@mkdir $(DISTDIR)/doc
@@ -2112,10 +2119,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 		$(COMPAT_DIR)/README $(DISTDIR)/compat
 	@mkdir $(DISTDIR)/compat/zlib
 	@echo cp -r $(COMPAT_DIR)/zlib $(DISTDIR)/compat/zlib
-	@( cd $(COMPAT_DIR)/zlib; \
-	  find . -name CVS -prune -o -type f -print ) \
+	@( cd $(COMPAT_DIR)/zlib; find . -type f -print ) \
 	    | ( cd $(COMPAT_DIR)/zlib ; xargs tar cf - ) \
 	    | ( cd $(DISTDIR)/compat/zlib ; tar xfp - )
+	@mkdir $(DISTDIR)/libtommath
+	cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h $(DISTDIR)/libtommath
 	@mkdir $(DISTDIR)/tests
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests
 	cp -p $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \
@@ -2175,8 +2183,6 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 		$(TOOL_DIR)/*.tcl $(TOOL_DIR)/man2tcl.c \
 		$(TOOL_DIR)/*.bmp $(TOOL_DIR)/tcl.hpj.in \
 		$(DISTDIR)/tools
-	@mkdir $(DISTDIR)/libtommath
-	cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h $(DISTDIR)/libtommath
 	@mkdir $(DISTDIR)/pkgs
 	cp -p $(TOP_DIR)/pkgs/README $(DISTDIR)/pkgs
 	cp -p $(TOP_DIR)/pkgs/package.list.txt $(DISTDIR)/pkgs
diff --git a/win/Makefile.in b/win/Makefile.in
index 7d444a7..33a1e2c 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -350,6 +350,8 @@ TOMMATH_OBJS = \
 	bn_mp_mul_d.${OBJEXT} \
 	bn_mp_neg.${OBJEXT} \
 	bn_mp_or.${OBJEXT} \
+	bn_mp_pack.${OBJEXT} \
+	bn_mp_pack_count.${OBJEXT} \
 	bn_mp_radix_size.${OBJEXT} \
 	bn_mp_radix_smap.${OBJEXT} \
 	bn_mp_read_radix.${OBJEXT} \
@@ -364,6 +366,7 @@ TOMMATH_OBJS = \
 	bn_mp_to_ubin.${OBJEXT} \
 	bn_mp_to_radix.${OBJEXT} \
 	bn_mp_ubin_size.${OBJEXT} \
+	bn_mp_unpack.${OBJEXT} \
 	bn_mp_xor.${OBJEXT} \
 	bn_mp_zero.${OBJEXT} \
 	bn_s_mp_add.${OBJEXT} \
diff --git a/win/makefile.vc b/win/makefile.vc
index 011546a..aa5dd54 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -355,6 +355,8 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_mul_d.obj \
 	$(TMP_DIR)\bn_mp_neg.obj \
 	$(TMP_DIR)\bn_mp_or.obj \
+	$(TMP_DIR)\bn_mp_pack.obj \
+	$(TMP_DIR)\bn_mp_pack_count.obj \
 	$(TMP_DIR)\bn_mp_radix_size.obj \
 	$(TMP_DIR)\bn_mp_radix_smap.obj \
 	$(TMP_DIR)\bn_mp_read_radix.obj \
@@ -369,6 +371,7 @@ TOMMATHOBJS = \
 	$(TMP_DIR)\bn_mp_to_ubin.obj \
 	$(TMP_DIR)\bn_mp_to_radix.obj \
 	$(TMP_DIR)\bn_mp_ubin_size.obj \
+	$(TMP_DIR)\bn_mp_unpack.obj \
 	$(TMP_DIR)\bn_mp_xor.obj \
 	$(TMP_DIR)\bn_mp_zero.obj \
 	$(TMP_DIR)\bn_s_mp_add.obj \
-- 
cgit v0.12


From 5b4f454e1cb62b2e67262392eb4c641b1e1f1226 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 09:24:06 +0000
Subject: Change assert, since the new flag CHANNEL_ENCODING_ERROR could be set
 as well

---
 generic/tclIO.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index d5fbd18..652043c 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -6142,6 +6142,7 @@ DoReadChars(
 
     assert(!GotFlag(statePtr, CHANNEL_EOF)
 	    || GotFlag(statePtr, CHANNEL_STICKY_EOF)
+	    || GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
 	    || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0);
     assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED)
             == (CHANNEL_EOF|CHANNEL_BLOCKED)));
-- 
cgit v0.12


From b432766202acec5c8414a7a3409d64807a652564 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 12:15:24 +0000
Subject: Make "read" throwing a "illegal byte sequence" exception. Doesn't
 work for "gets" yet.

---
 generic/tclIO.c | 32 ++++++++++++++++++++++++++------
 tests/io.test   |  2 +-
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 652043c..f5344b3 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -397,9 +397,9 @@ ChanClose(
  *	    calling Tcl_GetErrno().
  *
  * Side effects:
- *	The CHANNEL_BLOCKED and CHANNEL_EOF flags of the channel state are set
- *	as appropriate.  On EOF, the inputEncodingFlags are set to perform
- *	ending operations on decoding.
+ *	The CHANNEL_ENCODING_ERROR, CHANNEL_BLOCKED and CHANNEL_EOF flags
+ *	of the channel state are set as appropriate.  On EOF, the
+ *	inputEncodingFlags are set to perform ending operations on decoding.
  *
  *	TODO - Is this really the right place for that?
  *
@@ -4661,6 +4661,12 @@ Tcl_GetsObj(
     char *dst, *dstEnd, *eol, *eof;
     Tcl_EncodingState oldState;
 
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
+	UpdateInterest(chanPtr);
+	Tcl_SetErrno(EILSEQ);
+	return TCL_INDEX_NONE;
+    }
+
     if (CheckChannelErrors(statePtr, TCL_READABLE) != 0) {
 	return TCL_INDEX_NONE;
     }
@@ -5031,6 +5037,7 @@ Tcl_GetsObj(
   done:
     assert(!GotFlag(statePtr, CHANNEL_EOF)
 	    || GotFlag(statePtr, CHANNEL_STICKY_EOF)
+	    || GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
 	    || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0);
     assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED)
 	    == (CHANNEL_EOF|CHANNEL_BLOCKED)));
@@ -6016,6 +6023,12 @@ DoReadChars(
 	}
     }
 
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
+	/* TODO: We don't need this call? */
+	UpdateInterest(chanPtr);
+	Tcl_SetErrno(EILSEQ);
+	return -1;
+    }
     /*
      * Early out when next read will see eofchar.
      *
@@ -10108,6 +10121,11 @@ DoRead(
      * too.  Keep on keeping on for now.
      */
 
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
+	UpdateInterest(chanPtr);
+	Tcl_SetErrno(EILSEQ);
+	return -1;
+    }
     if (GotFlag(statePtr, CHANNEL_STICKY_EOF)) {
 	SetFlag(statePtr, CHANNEL_EOF);
 	assert(statePtr->inputEncodingFlags & TCL_ENCODING_END);
@@ -10205,10 +10223,10 @@ DoRead(
 	    }
 
 	    /*
-	     * 1) We're @EOF because we saw eof char.
+	     * 1) We're @EOF because we saw eof char, or there was an encoding error.
 	     */
 
-	    if (GotFlag(statePtr, CHANNEL_STICKY_EOF)) {
+	    if (GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR)) {
 		break;
 	    }
 
@@ -10293,6 +10311,7 @@ DoRead(
 
     assert(!GotFlag(statePtr, CHANNEL_EOF)
 	    || GotFlag(statePtr, CHANNEL_STICKY_EOF)
+	    || GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
 	    || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0);
     assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED)
 	    == (CHANNEL_EOF|CHANNEL_BLOCKED)));
@@ -11566,8 +11585,8 @@ DumpFlags(
     char *str,
     int flags)
 {
-    char buf[20];
     int i = 0;
+    char buf[24];
 
 #define ChanFlag(chr, bit)      (buf[i++] = ((flags & (bit)) ? (chr) : '_'))
 
@@ -11580,6 +11599,7 @@ DumpFlags(
     ChanFlag('c', CHANNEL_CLOSED);
     ChanFlag('E', CHANNEL_EOF);
     ChanFlag('S', CHANNEL_STICKY_EOF);
+    ChanFlag('U', CHANNEL_ENCODING_ERROR);
     ChanFlag('B', CHANNEL_BLOCKED);
     ChanFlag('/', INPUT_SAW_CR);
     ChanFlag('D', CHANNEL_DEAD);
diff --git a/tests/io.test b/tests/io.test
index ef9e14d..d5f10a5 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9063,7 +9063,7 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     lappend hd $msg
 } -cleanup {
     removeFile io-75.6
-} -result "41 0 {}" ; # Here, an exception should be thrown
+} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
 # ### ### ### ######### ######### #########
 
-- 
cgit v0.12


From d8dac38437604bf1c0e6ae5126069ca094edee37 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 15:21:29 +0000
Subject: Proposed fix for [da63e4c1e]. First version, not 100% as expected
 yet.

---
 generic/tclBinary.c |  2 +-
 generic/tclIO.c     | 35 +++++++++++++++++++++--------------
 generic/tclInt.h    |  1 -
 tests/chanio.test   |  4 ++--
 tests/io.test       |  4 ++--
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 84188ef..07c78a8 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -530,7 +530,7 @@ MakeByteArray(
     return proper;
 }
 
-Tcl_Obj *
+static Tcl_Obj *
 TclNarrowToBytes(
     Tcl_Obj *objPtr)
 {
diff --git a/generic/tclIO.c b/generic/tclIO.c
index b7cfb45..f20a387 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4149,13 +4149,13 @@ Tcl_WriteChars(
     Tcl_Channel chan,		/* The channel to buffer output for. */
     const char *src,		/* UTF-8 characters to queue in output
 				 * buffer. */
-    size_t len)			/* Length of string in bytes, or -1 for
+    size_t len)			/* Length of string in bytes, or TCL_INDEX_NONE for
 				 * strlen(). */
 {
     Channel *chanPtr = (Channel *) chan;
     ChannelState *statePtr = chanPtr->state;	/* State info for channel */
-    int result;
-    Tcl_Obj *objPtr, *copy;
+    size_t result;
+    Tcl_Obj *objPtr;
 
     if (CheckChannelErrors(statePtr, TCL_WRITABLE) != 0) {
 	return TCL_INDEX_NONE;
@@ -4182,11 +4182,15 @@ Tcl_WriteChars(
     }
 
     objPtr = Tcl_NewStringObj(src, len);
-    copy = TclNarrowToBytes(objPtr);
-    src = (char *) Tcl_GetByteArrayFromObj(copy, &len);
+    Tcl_IncrRefCount(objPtr);
+    src = (char *) Tcl_GetByteArrayFromObj(objPtr, &len);
+    if (src == NULL) {
+	Tcl_SetErrno(EILSEQ);
+	result = TCL_INDEX_NONE;
+    } else {
+	result = WriteBytes(chanPtr, src, len);
+    }
     TclDecrRefCount(objPtr);
-    result = WriteBytes(chanPtr, src, len);
-    TclDecrRefCount(copy);
     return result;
 }
 
@@ -4205,8 +4209,8 @@ Tcl_WriteChars(
  *	line buffering mode.
  *
  * Results:
- *	The number of bytes written or -1 in case of error. If -1,
- *	Tcl_GetErrno() will return the error code.
+ *	The number of bytes written or TCL_INDEX_NONE in case of error. If
+ *	TCL_INDEX_NONE, Tcl_GetErrno() will return the error code.
  *
  * Side effects:
  *	May buffer up output and may cause output to be produced on the
@@ -4236,12 +4240,15 @@ Tcl_WriteObj(
 	return TCL_INDEX_NONE;
     }
     if (statePtr->encoding == NULL) {
-	int result;
-	Tcl_Obj *copy = TclNarrowToBytes(objPtr);
+	size_t result;
 
-	src = (char *) Tcl_GetByteArrayFromObj(copy, &srcLen);
-	result = WriteBytes(chanPtr, src, srcLen);
-	Tcl_DecrRefCount(copy);
+	src = (char *) Tcl_GetByteArrayFromObj(objPtr, &srcLen);
+	if (src == NULL) {
+	    Tcl_SetErrno(EILSEQ);
+	    result = TCL_INDEX_NONE;
+	} else {
+	    result = WriteBytes(chanPtr, src, srcLen);
+	}
 	return result;
     } else {
 	src = Tcl_GetStringFromObj(objPtr, &srcLen);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 554d642..650ea2d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3230,7 +3230,6 @@ MODULE_SCOPE int	TclMaxListLength(const char *bytes, size_t numBytes,
 MODULE_SCOPE int	TclMergeReturnOptions(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr,
 			    int *codePtr, int *levelPtr);
-MODULE_SCOPE Tcl_Obj *	TclNarrowToBytes(Tcl_Obj *objPtr);
 MODULE_SCOPE Tcl_Obj *  TclNoErrorStack(Tcl_Interp *interp, Tcl_Obj *options);
 MODULE_SCOPE int	TclNokia770Doubles(void);
 MODULE_SCOPE void	TclNsDecrRefCount(Namespace *nsPtr);
diff --git a/tests/chanio.test b/tests/chanio.test
index 49ac471..1d0b225 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -116,7 +116,7 @@ set path(test1) [makeFile {} test1]
 test chan-io-1.6 {Tcl_WriteChars: WriteBytes} {
     set f [open $path(test1) w]
     chan configure $f -encoding binary
-    chan puts -nonewline $f "a乍\x00"
+    chan puts -nonewline $f "a\x4D\x00"
     chan close $f
     contents $path(test1)
 } "aM\x00"
@@ -432,7 +432,7 @@ test chan-io-6.3 {Tcl_GetsObj: how many have we used?} -body {
 test chan-io-6.4 {Tcl_GetsObj: encoding == NULL} -body {
     set f [open $path(test1) w]
     chan configure $f -translation binary
-    chan puts $f "\x81\u1234\x00"
+    chan puts $f "\x81\x34\x00"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -translation binary
diff --git a/tests/io.test b/tests/io.test
index b2c79d2..4eb62e3 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -108,7 +108,7 @@ set path(test1) [makeFile {} test1]
 test io-1.6 {Tcl_WriteChars: WriteBytes} {
     set f [open $path(test1) w]
     fconfigure $f -encoding binary
-    puts -nonewline $f "a乍\x00"
+    puts -nonewline $f "a\x4D\x00"
     close $f
     contents $path(test1)
 } "a\x4D\x00"
@@ -466,7 +466,7 @@ test io-6.3 {Tcl_GetsObj: how many have we used?} {
 test io-6.4 {Tcl_GetsObj: encoding == NULL} {
     set f [open $path(test1) w]
     fconfigure $f -translation binary
-    puts $f "\x81\u1234\x00"
+    puts $f "\x81\x34\x00"
     close $f
     set f [open $path(test1)]
     fconfigure $f -translation binary
-- 
cgit v0.12


From 826db93d76965d85df64187e05ec05095a6eae56 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 17:04:18 +0000
Subject: Internal abstract list, don't let "llength" shimmer any more.

---
 generic/tclArithSeries.c |  29 +++++++-------
 generic/tclArithSeries.h |  10 ++---
 generic/tclBasic.c       |  14 +++----
 generic/tclBinary.c      |   4 +-
 generic/tclClock.c       |   2 +-
 generic/tclCmdAH.c       |   4 +-
 generic/tclCmdIL.c       |   8 ++--
 generic/tclCmdMZ.c       |  12 +++---
 generic/tclCompExpr.c    |   2 +-
 generic/tclDictObj.c     |  30 +++++++-------
 generic/tclExecute.c     |  18 ++++-----
 generic/tclInt.h         |  58 +++++++++++++++------------
 generic/tclLink.c        |   2 +-
 generic/tclListObj.c     |  59 ++++++++++++++++++---------
 generic/tclObj.c         | 102 +++++++++++++++++++++++++----------------------
 generic/tclScan.c        |   2 +-
 generic/tclStrToD.c      |  12 +++---
 generic/tclUtil.c        |  15 ++++---
 generic/tclVar.c         |   8 +++-
 19 files changed, 217 insertions(+), 174 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 3fa9792..ccae8aa 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -29,7 +29,7 @@
 #define ArithSeriesGetInternalRep(objPtr, arithRepPtr)		\
     do {								\
 	const Tcl_ObjInternalRep *irPtr;				\
-	irPtr = TclFetchInternalRep((objPtr), &tclArithSeriesType);	\
+	irPtr = TclFetchInternalRep((objPtr), &tclArithSeriesType.objType);	\
 	(arithRepPtr) = irPtr ? (ArithSeries *)irPtr->twoPtrValue.ptr1 : NULL;	\
     } while (0)
 
@@ -70,13 +70,14 @@ static void		UpdateStringOfArithSeries (Tcl_Obj *listPtr);
  * are valid and will be equivalent to the empty list.
  */
 
-const Tcl_ObjType tclArithSeriesType = {
-    "arithseries",			/* name */
+const TclObjTypeWithAbstractList tclArithSeriesType = {
+    {"arithseries",			/* name */
     FreeArithSeriesInternalRep,		/* freeIntRepProc */
     DupArithSeriesInternalRep,		/* dupIntRepProc */
     UpdateStringOfArithSeries,		/* updateStringProc */
     SetArithSeriesFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0
+    TCL_OBJTYPE_V0_1},
+	TclArithSeriesObjLength
 };
 
 /*
@@ -154,7 +155,7 @@ TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_W
     arithSeriesRepPtr->elements = NULL;
     arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
     arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    arithSeriesPtr->typePtr = &tclArithSeriesType;
+    arithSeriesPtr->typePtr = &tclArithSeriesType.objType;
     if (length > 0)
     	Tcl_InvalidateStringRep(arithSeriesPtr);
 
@@ -201,7 +202,7 @@ TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
     arithSeriesRepPtr->elements = NULL;
     arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
     arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    arithSeriesPtr->typePtr = &tclArithSeriesType;
+    arithSeriesPtr->typePtr = &tclArithSeriesType.objType;
     if (length > 0)
     	Tcl_InvalidateStringRep(arithSeriesPtr);
 
@@ -387,7 +388,7 @@ TclArithSeriesObjStep(
 {
     ArithSeries *arithSeriesRepPtr;
 
-    if (arithSeriesPtr->typePtr != &tclArithSeriesType) {
+    if (arithSeriesPtr->typePtr != &tclArithSeriesType.objType) {
         Tcl_Panic("TclArithSeriesObjIndex called with a not ArithSeries Obj.");
     }
     arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesPtr);
@@ -427,11 +428,11 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
 {
     ArithSeries *arithSeriesRepPtr;
 
-    if (arithSeriesPtr->typePtr != &tclArithSeriesType) {
+    if (arithSeriesPtr->typePtr != &tclArithSeriesType.objType) {
 	Tcl_Panic("TclArithSeriesObjIndex called with a not ArithSeries Obj.");
     }
     arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesPtr);
-    if (index < 0 || index >= arithSeriesRepPtr->len) {
+    if ((unsigned long long)index >= arithSeriesRepPtr->len) {
 	return TCL_ERROR;
     }
     /* List[i] = Start + (Step * index) */
@@ -460,7 +461,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
  *
  *----------------------------------------------------------------------
  */
-Tcl_WideInt TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
+unsigned long long TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
 {
     ArithSeries *arithSeriesRepPtr = (ArithSeries*)
 	    arithSeriesPtr->internalRep.twoPtrValue.ptr1;
@@ -491,7 +492,7 @@ FreeArithSeriesInternalRep(Tcl_Obj *arithSeriesPtr)
     ArithSeries *arithSeriesRepPtr =
 	    (ArithSeries *) arithSeriesPtr->internalRep.twoPtrValue.ptr1;
     if (arithSeriesRepPtr->elements) {
-	Tcl_WideInt i;
+	unsigned long long i;
 	Tcl_Obj**elmts = arithSeriesRepPtr->elements;
 	for(i=0; i<arithSeriesRepPtr->len; i++) {
 	    if (elmts[i]) {
@@ -538,7 +539,7 @@ DupArithSeriesInternalRep(
     copyArithSeriesRepPtr->elements = NULL;
     copyPtr->internalRep.twoPtrValue.ptr1 = copyArithSeriesRepPtr;
     copyPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    copyPtr->typePtr = &tclArithSeriesType;
+    copyPtr->typePtr = &tclArithSeriesType.objType;
 }
 
 /*
@@ -576,7 +577,7 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
 	    (ArithSeries*) arithSeriesPtr->internalRep.twoPtrValue.ptr1;
     char *elem, *p;
     Tcl_Obj *elemObj;
-    Tcl_WideInt i;
+    unsigned long long i;
     Tcl_WideInt length = 0;
     int slen;
 
@@ -845,7 +846,7 @@ TclArithSeriesGetElements(
     Tcl_Obj ***objvPtr)		/* Where to store the pointer to an array of
 				 * pointers to the list's objects. */
 {
-    if (TclHasInternalRep(objPtr,&tclArithSeriesType)) {
+    if (TclHasInternalRep(objPtr,&tclArithSeriesType.objType)) {
 	ArithSeries *arithSeriesRepPtr;
 	Tcl_Obj **objv;
 	int i, objc;
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index f7f2fa8..8392a57 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -15,16 +15,16 @@
  * Note that the len can in theory be always computed by start,end,step
  * but it's faster to cache it inside the internal representation.
  */
-typedef struct ArithSeries {
-    Tcl_WideInt len;
+typedef struct {
+    unsigned long long len;
     Tcl_Obj **elements;
     int isDouble;
     Tcl_WideInt start;
     Tcl_WideInt end;
     Tcl_WideInt step;
 } ArithSeries;
-typedef struct ArithSeriesDbl {
-    Tcl_WideInt len;
+typedef struct {
+    unsigned long long len;
     Tcl_Obj **elements;
     int isDouble;
     double start;
@@ -39,7 +39,7 @@ MODULE_SCOPE int	TclArithSeriesObjStep(Tcl_Obj *arithSeriesPtr,
 			    Tcl_Obj **stepObj);
 MODULE_SCOPE int	TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr,
 			    Tcl_WideInt index, Tcl_Obj **elementObj);
-MODULE_SCOPE Tcl_WideInt TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
+MODULE_SCOPE unsigned long long TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr, Tcl_Size fromIdx, Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Interp *interp,
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index cd1bfc8..0f968e1 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -7031,7 +7031,7 @@ ExprCeilFunc(
     code = Tcl_GetDoubleFromObj(interp, objv[1], &d);
 #ifdef ACCEPT_NAN
     if (code != TCL_OK) {
-	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType);
+	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType.objType);
 
 	if (irPtr) {
 	    Tcl_SetObjResult(interp, objv[1]);
@@ -7071,7 +7071,7 @@ ExprFloorFunc(
     code = Tcl_GetDoubleFromObj(interp, objv[1], &d);
 #ifdef ACCEPT_NAN
     if (code != TCL_OK) {
-	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType);
+	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType.objType);
 
 	if (irPtr) {
 	    Tcl_SetObjResult(interp, objv[1]);
@@ -7217,7 +7217,7 @@ ExprSqrtFunc(
     code = Tcl_GetDoubleFromObj(interp, objv[1], &d);
 #ifdef ACCEPT_NAN
     if (code != TCL_OK) {
-	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType);
+	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType.objType);
 
 	if (irPtr) {
 	    Tcl_SetObjResult(interp, objv[1]);
@@ -7271,7 +7271,7 @@ ExprUnaryFunc(
     code = Tcl_GetDoubleFromObj(interp, objv[1], &d);
 #ifdef ACCEPT_NAN
     if (code != TCL_OK) {
-	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType);
+	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType.objType);
 
 	if (irPtr) {
 	    d = irPtr->doubleValue;
@@ -7335,7 +7335,7 @@ ExprBinaryFunc(
     code = Tcl_GetDoubleFromObj(interp, objv[1], &d1);
 #ifdef ACCEPT_NAN
     if (code != TCL_OK) {
-	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType);
+	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType.objType);
 
 	if (irPtr) {
 	    d1 = irPtr->doubleValue;
@@ -7350,7 +7350,7 @@ ExprBinaryFunc(
     code = Tcl_GetDoubleFromObj(interp, objv[2], &d2);
 #ifdef ACCEPT_NAN
     if (code != TCL_OK) {
-	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType);
+	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objv[1], &tclDoubleType.objType);
 
 	if (irPtr) {
 	    d2 = irPtr->doubleValue;
@@ -7511,7 +7511,7 @@ ExprDoubleFunc(
     }
     if (Tcl_GetDoubleFromObj(interp, objv[1], &dResult) != TCL_OK) {
 #ifdef ACCEPT_NAN
-	if (TclHasInternalRep(objv[1], &tclDoubleType)) {
+	if (TclHasInternalRep(objv[1], &tclDoubleType.objType)) {
 	    Tcl_SetObjResult(interp, objv[1]);
 	    return TCL_OK;
 	}
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 84188ef..975b8e6 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -2017,7 +2017,7 @@ FormatNumber(
 	 */
 
 	if (Tcl_GetDoubleFromObj(interp, src, &dvalue) != TCL_OK) {
-	    const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(src, &tclDoubleType);
+	    const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(src, &tclDoubleType.objType);
 	    if (irPtr == NULL) {
 		return TCL_ERROR;
 	    }
@@ -2037,7 +2037,7 @@ FormatNumber(
 	 */
 
 	if (Tcl_GetDoubleFromObj(interp, src, &dvalue) != TCL_OK) {
-	    const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(src, &tclDoubleType);
+	    const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(src, &tclDoubleType.objType);
 
 	    if (irPtr == NULL) {
 		return TCL_ERROR;
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 6fd8327..36f82e6 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -432,7 +432,7 @@ ClockGetdatefieldsObjCmd(
      * that it isn't.
      */
 
-    if (TclHasInternalRep(objv[1], &tclBignumType)) {
+    if (TclHasInternalRep(objv[1], &tclBignumType.objType)) {
 	Tcl_SetObjResult(interp, lit[LIT_INTEGER_VALUE_TOO_LARGE]);
 	return TCL_ERROR;
     }
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index a5384fd..928b68f 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -2726,7 +2726,7 @@ EachloopCmd(
 	}
 
 	/* Values */
-	if (TclHasInternalRep(objv[2+i*2],&tclArithSeriesType)) {
+	if (TclHasInternalRep(objv[2+i*2],&tclArithSeriesType.objType)) {
 	    /* Special case for Arith Series */
 	    statePtr->aCopyList[i] = TclArithSeriesObjCopy(interp, objv[2+i*2]);
 	    if (statePtr->aCopyList[i] == NULL) {
@@ -2868,7 +2868,7 @@ ForeachAssignments(
     Tcl_Obj *valuePtr, *varValuePtr;
 
     for (i=0 ; i<statePtr->numLists ; i++) {
-	int isarithseries = TclHasInternalRep(statePtr->aCopyList[i],&tclArithSeriesType);
+	int isarithseries = TclHasInternalRep(statePtr->aCopyList[i],&tclArithSeriesType.objType);
 	for (v=0 ; v<statePtr->varcList[i] ; v++) {
 	    k = statePtr->index[i]++;
 	    if (k < statePtr->argcList[i]) {
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 1ca6c5e..befcb9a 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2215,7 +2215,7 @@ Tcl_JoinObjCmd(
      * pointer to its array of element pointers.
      */
 
-    if (TclHasInternalRep(objv[1],&tclArithSeriesType)) {
+    if (TclHasInternalRep(objv[1],&tclArithSeriesType.objType)) {
 	isArithSeries = 1;
 	listLen = TclArithSeriesObjLength(objv[1]);
     } else {
@@ -2746,7 +2746,7 @@ Tcl_LrangeObjCmd(
 	return result;
     }
 
-    if (TclHasInternalRep(objv[1],&tclArithSeriesType)) {
+    if (TclHasInternalRep(objv[1],&tclArithSeriesType.objType)) {
 	Tcl_Obj *rangeObj;
 	rangeObj = TclArithSeriesObjRange(interp, objv[1], first, last);
 	if (rangeObj) {
@@ -3145,7 +3145,7 @@ Tcl_LreverseObjCmd(
      *  Handle ArithSeries special case - don't shimmer a series into a list
      *  just to reverse it.
      */
-    if (TclHasInternalRep(objv[1],&tclArithSeriesType)) {
+    if (TclHasInternalRep(objv[1],&tclArithSeriesType.objType)) {
 	Tcl_Obj *resObj = TclArithSeriesObjReverse(interp, objv[1]);
 	if (resObj) {
 	    Tcl_SetObjResult(interp, resObj);
@@ -4728,7 +4728,7 @@ Tcl_LsortObjCmd(
 	sortInfo.compareCmdPtr = newCommandPtr;
     }
 
-    if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
+    if (TclHasInternalRep(listObj,&tclArithSeriesType.objType)) {
 	sortInfo.resultCode = TclArithSeriesGetElements(interp,
 	    listObj, &length, &listObjPtrs);
     } else {
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 8abf166..7506e66 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1612,7 +1612,7 @@ StringIsCmd(
     case STR_IS_BOOL:
     case STR_IS_TRUE:
     case STR_IS_FALSE:
-	if (!TclHasInternalRep(objPtr, &tclBooleanType)
+	if (!TclHasInternalRep(objPtr, &tclBooleanType.objType)
 		&& (TCL_OK != TclSetBooleanFromAny(NULL, objPtr))) {
 	    if (strict) {
 		result = 0;
@@ -1682,9 +1682,9 @@ StringIsCmd(
 	chcomp = Tcl_UniCharIsDigit;
 	break;
     case STR_IS_DOUBLE: {
-	if (TclHasInternalRep(objPtr, &tclDoubleType) ||
-		TclHasInternalRep(objPtr, &tclIntType) ||
-		TclHasInternalRep(objPtr, &tclBignumType)) {
+	if (TclHasInternalRep(objPtr, &tclDoubleType.objType) ||
+		TclHasInternalRep(objPtr, &tclIntType.objType) ||
+		TclHasInternalRep(objPtr, &tclBignumType.objType)) {
 	    break;
 	}
 	string1 = Tcl_GetStringFromObj(objPtr, &length1);
@@ -1713,8 +1713,8 @@ StringIsCmd(
 	break;
     case STR_IS_INT:
     case STR_IS_ENTIER:
-	if (TclHasInternalRep(objPtr, &tclIntType) ||
-		TclHasInternalRep(objPtr, &tclBignumType)) {
+	if (TclHasInternalRep(objPtr, &tclIntType.objType) ||
+		TclHasInternalRep(objPtr, &tclBignumType.objType)) {
 	    break;
 	}
 	string1 = Tcl_GetStringFromObj(objPtr, &length1);
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index fbd59d8..5e7806d 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2111,7 +2111,7 @@ ParseLexeme(
 	     * Example: Inf + luence + () becomes a valid function call.
 	     * [Bug 3401704]
 	     */
-	    if (TclHasInternalRep(literal, &tclDoubleType)) {
+	    if (TclHasInternalRep(literal, &tclDoubleType.objType)) {
 		const char *p = start;
 
 		while (p < end) {
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 26f98e1..a7e6bbf 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -136,20 +136,6 @@ typedef struct Dict {
 				 * dictionaries. */
 } Dict;
 
-/*
- * The structure below defines the dictionary object type by means of
- * functions that can be invoked by generic object code.
- */
-
-const Tcl_ObjType tclDictType = {
-    "dict",
-    FreeDictInternalRep,		/* freeIntRepProc */
-    DupDictInternalRep,			/* dupIntRepProc */
-    UpdateStringOfDict,			/* updateStringProc */
-    SetDictFromAny,			/* setFromAnyProc */
-    TCL_OBJTYPE_V0
-};
-
 #define DictSetInternalRep(objPtr, dictRepPtr)				\
     do {                                                                \
         Tcl_ObjInternalRep ir;                                               \
@@ -166,6 +152,20 @@ const Tcl_ObjType tclDictType = {
     } while (0)
 
 /*
+ * The structure below defines the dictionary object type by means of
+ * functions that can be invoked by generic object code.
+ */
+
+const Tcl_ObjType tclDictType = {
+    "dict",
+    FreeDictInternalRep,		/* freeIntRepProc */
+    DupDictInternalRep,			/* dupIntRepProc */
+    UpdateStringOfDict,			/* updateStringProc */
+    SetDictFromAny,			/* setFromAnyProc */
+    TCL_OBJTYPE_V0
+};
+
+/*
  * The type of the specially adapted version of the Tcl_Obj*-containing hash
  * table defined in the tclObj.c code. This version differs in that it
  * allocates a bit more space in each hash entry in order to hold the pointers
@@ -603,7 +603,7 @@ SetDictFromAny(
      * the conversion from lists to dictionaries.
      */
 
-    if (TclHasInternalRep(objPtr, &tclListType)) {
+    if (TclHasInternalRep(objPtr, &tclListType.objType)) {
 	size_t objc, i;
 	Tcl_Obj **objv;
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 926fd61..610b88e 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -452,11 +452,11 @@ VarHashCreateVar(
  */
 
 #define GetNumberFromObj(interp, objPtr, ptrPtr, tPtr) \
-    ((TclHasInternalRep((objPtr), &tclIntType))					\
+    ((TclHasInternalRep((objPtr), &tclIntType.objType))					\
 	?	(*(tPtr) = TCL_NUMBER_INT,				\
 		*(ptrPtr) = (void *)				\
 		    (&((objPtr)->internalRep.wideValue)), TCL_OK) :	\
-    TclHasInternalRep((objPtr), &tclDoubleType)				\
+    TclHasInternalRep((objPtr), &tclDoubleType.objType)				\
 	?	(((isnan((objPtr)->internalRep.doubleValue))		\
 		    ?	(*(tPtr) = TCL_NUMBER_NAN)			\
 		    :	(*(tPtr) = TCL_NUMBER_DOUBLE)),			\
@@ -4660,7 +4660,7 @@ TEBCresume(
 
 
 	/* special case for ArithSeries */
-	if (TclHasInternalRep(valuePtr,&tclArithSeriesType)) {
+	if (TclHasInternalRep(valuePtr,&tclArithSeriesType.objType)) {
 	    length = TclArithSeriesObjLength(valuePtr);
 	    if (TclGetIntForIndexM(interp, value2Ptr, length-1, &index)!=TCL_OK) {
 		CACHE_STACK_INFO();
@@ -4681,7 +4681,7 @@ TEBCresume(
 	 */
 
 	if ((TclListObjGetElementsM(interp, valuePtr, &objc, &objv) == TCL_OK)
-		&& !TclHasInternalRep(value2Ptr, &tclListType)) {
+		&& !TclHasInternalRep(value2Ptr, &tclListType.objType)) {
 	    int code;
 
 	    DECACHE_STACK_INFO();
@@ -4723,7 +4723,7 @@ TEBCresume(
 	TRACE(("\"%.30s\" %d => ", O2S(valuePtr), opnd));
 
 	/* special case for ArithSeries */
-	if (TclHasInternalRep(valuePtr,&tclArithSeriesType)) {
+	if (TclHasInternalRep(valuePtr,&tclArithSeriesType.objType)) {
 	    length = TclArithSeriesObjLength(valuePtr);
 
 	    /* Decode end-offset index values. */
@@ -4943,7 +4943,7 @@ TEBCresume(
 
 	fromIdx = TclIndexDecode(fromIdx, objc - 1);
 
-	if (TclHasInternalRep(valuePtr,&tclArithSeriesType)) {
+	if (TclHasInternalRep(valuePtr,&tclArithSeriesType.objType)) {
 	    objResultPtr = TclArithSeriesObjRange(interp, valuePtr, fromIdx, toIdx);
 	    if (objResultPtr == NULL) {
 		TRACE_ERROR(interp);
@@ -4971,7 +4971,7 @@ TEBCresume(
 	if (length > 0) {
 	    size_t i = 0;
 	    Tcl_Obj *o;
-	    int isArithSeries = TclHasInternalRep(value2Ptr,&tclArithSeriesType);
+	    int isArithSeries = TclHasInternalRep(value2Ptr,&tclArithSeriesType.objType);
 	    /*
 	     * An empty list doesn't match anything.
 	     */
@@ -6337,7 +6337,7 @@ TEBCresume(
 
     case INST_TRY_CVT_TO_BOOLEAN:
 	valuePtr = OBJ_AT_TOS;
-	if (TclHasInternalRep(valuePtr,  &tclBooleanType)) {
+	if (TclHasInternalRep(valuePtr,  &tclBooleanType.objType)) {
 	    objResultPtr = TCONST(1);
 	} else {
 	    int res = (TclSetBooleanFromAny(NULL, valuePtr) == TCL_OK);
@@ -8357,7 +8357,7 @@ ExecuteExtendedBinaryMathOp(
     overflowExpon:
 
 	if ((TclGetWideIntFromObj(NULL, value2Ptr, &w2) != TCL_OK)
-		|| (value2Ptr->typePtr != &tclIntType)
+		|| (value2Ptr->typePtr != &tclIntType.objType)
 		|| (Tcl_WideUInt)w2 >= (1<<28)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "exponent too large", -1));
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 554d642..8d850db 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1076,6 +1076,14 @@ typedef struct ActiveInterpTrace {
 				 * in reverse order. */
 } ActiveInterpTrace;
 
+
+#define TCL_OBJTYPE_V0_1 ((size_t)1) /* For internal core use only */
+
+typedef struct {  /* For internal core use only */
+    Tcl_ObjType objType;
+    unsigned long long (*lengthProc)(Tcl_Obj *obj);
+} TclObjTypeWithAbstractList;
+
 /*
  * Flag values designating types of execution traces. See tclTrace.c for
  * related flag values.
@@ -2613,7 +2621,7 @@ typedef struct ListRep {
  * converted to a list.
  */
 #define TclListObjGetElementsM(interp_, listObj_, objcPtr_, objvPtr_)    \
-    (((listObj_)->typePtr == &tclListType)                              \
+    (((listObj_)->typePtr == &tclListType.objType)                              \
 	 ? ((ListObjGetElements((listObj_), *(objcPtr_), *(objvPtr_))), \
 	    TCL_OK)                                                     \
 	 : Tcl_ListObjGetElements(                                      \
@@ -2625,12 +2633,12 @@ typedef struct ListRep {
  * Tcl_Obj cannot be converted to a list.
  */
 #define TclListObjLengthM(interp_, listObj_, lenPtr_)         \
-    (((listObj_)->typePtr == &tclListType)                   \
+    (((listObj_)->typePtr == &tclListType.objType)                   \
 	 ? ((ListObjLength((listObj_), *(lenPtr_))), TCL_OK) \
 	 : Tcl_ListObjLength((interp_), (listObj_), (lenPtr_)))
 
 #define TclListObjIsCanonical(listObj_) \
-    (((listObj_)->typePtr == &tclListType) ? ListObjIsCanonical((listObj_)) : 0)
+    (((listObj_)->typePtr == &tclListType.objType) ? ListObjIsCanonical((listObj_)) : 0)
 
 /*
  * Modes for collecting (or not) in the implementations of TclNRForeachCmd,
@@ -2650,27 +2658,27 @@ typedef struct ListRep {
 
 #if TCL_MAJOR_VERSION > 8
 #define TclGetBooleanFromObj(interp, objPtr, intPtr) \
-    (((objPtr)->typePtr == &tclIntType \
-	    || (objPtr)->typePtr == &tclBooleanType) \
+    (((objPtr)->typePtr == &tclIntType.objType \
+	    || (objPtr)->typePtr == &tclBooleanType.objType) \
 	? (*(intPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
 	: Tcl_GetBooleanFromObj((interp), (objPtr), (intPtr)))
 #else
 #define TclGetBooleanFromObj(interp, objPtr, intPtr) \
-    (((objPtr)->typePtr == &tclIntType)			\
+    (((objPtr)->typePtr == &tclIntType.objType)			\
 	? (*(intPtr) = ((objPtr)->internalRep.wideValue!=0), TCL_OK)	\
-	: ((objPtr)->typePtr == &tclBooleanType)			\
+	: ((objPtr)->typePtr == &tclBooleanType.objType)			\
 	? (*(intPtr) = ((objPtr)->internalRep.longValue!=0), TCL_OK)	\
 	: Tcl_GetBooleanFromObj((interp), (objPtr), (intPtr)))
 #endif
 
 #ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetLongFromObj(interp, objPtr, longPtr) \
-    (((objPtr)->typePtr == &tclIntType)	\
+    (((objPtr)->typePtr == &tclIntType.objType)	\
 	    ? ((*(longPtr) = (objPtr)->internalRep.wideValue), TCL_OK) \
 	    : Tcl_GetLongFromObj((interp), (objPtr), (longPtr)))
 #else
 #define TclGetLongFromObj(interp, objPtr, longPtr) \
-    (((objPtr)->typePtr == &tclIntType \
+    (((objPtr)->typePtr == &tclIntType.objType \
 	    && (objPtr)->internalRep.wideValue >= (Tcl_WideInt)(LONG_MIN) \
 	    && (objPtr)->internalRep.wideValue <= (Tcl_WideInt)(LONG_MAX)) \
 	    ? ((*(longPtr) = (long)(objPtr)->internalRep.wideValue), TCL_OK) \
@@ -2678,13 +2686,13 @@ typedef struct ListRep {
 #endif
 
 #define TclGetIntFromObj(interp, objPtr, intPtr) \
-    (((objPtr)->typePtr == &tclIntType \
+    (((objPtr)->typePtr == &tclIntType.objType \
 	    && (objPtr)->internalRep.wideValue >= (Tcl_WideInt)(INT_MIN) \
 	    && (objPtr)->internalRep.wideValue <= (Tcl_WideInt)(INT_MAX)) \
 	    ? ((*(intPtr) = (int)(objPtr)->internalRep.wideValue), TCL_OK) \
 	    : Tcl_GetIntFromObj((interp), (objPtr), (intPtr)))
 #define TclGetIntForIndexM(interp, objPtr, endValue, idxPtr) \
-    ((((objPtr)->typePtr == &tclIntType) && ((objPtr)->internalRep.wideValue >= 0) \
+    ((((objPtr)->typePtr == &tclIntType.objType) && ((objPtr)->internalRep.wideValue >= 0) \
 	    && ((Tcl_WideUInt)(objPtr)->internalRep.wideValue <= (Tcl_WideUInt)(endValue + 1))) \
 	    ? ((*(idxPtr) = (objPtr)->internalRep.wideValue), TCL_OK) \
 	    : Tcl_GetIntForIndex((interp), (objPtr), (endValue), (idxPtr)))
@@ -2698,7 +2706,7 @@ typedef struct ListRep {
  */
 
 #define TclGetWideIntFromObj(interp, objPtr, wideIntPtr) \
-    (((objPtr)->typePtr == &tclIntType)					\
+    (((objPtr)->typePtr == &tclIntType.objType)					\
 	? (*(wideIntPtr) =						\
 		((objPtr)->internalRep.wideValue), TCL_OK) :		\
 	Tcl_GetWideIntFromObj((interp), (objPtr), (wideIntPtr)))
@@ -2876,13 +2884,13 @@ MODULE_SCOPE void *tclTimeClientData;
  * Variables denoting the Tcl object types defined in the core.
  */
 
-MODULE_SCOPE const Tcl_ObjType tclBignumType;
-MODULE_SCOPE const Tcl_ObjType tclBooleanType;
+MODULE_SCOPE const TclObjTypeWithAbstractList tclBignumType;
+MODULE_SCOPE const TclObjTypeWithAbstractList tclBooleanType;
 MODULE_SCOPE const Tcl_ObjType tclByteCodeType;
-MODULE_SCOPE const Tcl_ObjType tclDoubleType;
-MODULE_SCOPE const Tcl_ObjType tclIntType;
-MODULE_SCOPE const Tcl_ObjType tclListType;
-MODULE_SCOPE const Tcl_ObjType tclArithSeriesType;
+MODULE_SCOPE const TclObjTypeWithAbstractList tclDoubleType;
+MODULE_SCOPE const TclObjTypeWithAbstractList tclIntType;
+MODULE_SCOPE const TclObjTypeWithAbstractList tclListType;
+MODULE_SCOPE const TclObjTypeWithAbstractList tclArithSeriesType;
 MODULE_SCOPE const Tcl_ObjType tclDictType;
 MODULE_SCOPE const Tcl_ObjType tclProcBodyType;
 MODULE_SCOPE const Tcl_ObjType tclStringType;
@@ -4764,7 +4772,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	Tcl_ObjInternalRep ir;				\
 	ir.wideValue = (Tcl_WideInt) i;			\
 	TclInvalidateStringRep(objPtr);			\
-	Tcl_StoreInternalRep(objPtr, &tclIntType, &ir);	\
+	Tcl_StoreInternalRep(objPtr, &tclIntType.objType, &ir);	\
     } while (0)
 
 #define TclSetDoubleObj(objPtr, d) \
@@ -4772,7 +4780,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	Tcl_ObjInternalRep ir;				\
 	ir.doubleValue = (double) d;			\
 	TclInvalidateStringRep(objPtr);			\
-	Tcl_StoreInternalRep(objPtr, &tclDoubleType, &ir);	\
+	Tcl_StoreInternalRep(objPtr, &tclDoubleType.objType, &ir);	\
     } while (0)
 
 /*
@@ -4797,7 +4805,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	(objPtr)->refCount = 0;				\
 	(objPtr)->bytes = NULL;				\
 	(objPtr)->internalRep.wideValue = (Tcl_WideInt)(w);	\
-	(objPtr)->typePtr = &tclIntType;		\
+	(objPtr)->typePtr = &tclIntType.objType;		\
 	TCL_DTRACE_OBJ_CREATE(objPtr);			\
     } while (0)
 
@@ -4816,7 +4824,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	    TclSetBignumInternalRep((objPtr), &bignumValue_);	\
 	} else {	\
 	    (objPtr)->internalRep.wideValue = (Tcl_WideInt)(uw_);	\
-	    (objPtr)->typePtr = &tclIntType;		\
+	    (objPtr)->typePtr = &tclIntType.objType;		\
 	}	\
 	TCL_DTRACE_OBJ_CREATE(objPtr);			\
     } while (0)
@@ -4830,7 +4838,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	Tcl_WideUInt uw_ = (uw);		\
 	if (uw_ >= TCL_INDEX_NONE) {			\
 	    (objPtr)->internalRep.wideValue = -1; \
-	    (objPtr)->typePtr = &tclIntType;		\
+	    (objPtr)->typePtr = &tclIntType.objType;		\
 	} else if (uw_ > WIDE_MAX) {			\
 	    mp_int bignumValue_;		\
 	    if (mp_init_u64(&bignumValue_, uw_) != MP_OKAY) {	\
@@ -4839,7 +4847,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	    TclSetBignumInternalRep((objPtr), &bignumValue_);	\
 	} else {	\
 	    (objPtr)->internalRep.wideValue = (Tcl_WideInt)(uw_); \
-	    (objPtr)->typePtr = &tclIntType;		\
+	    (objPtr)->typePtr = &tclIntType.objType;		\
 	}	\
 	TCL_DTRACE_OBJ_CREATE(objPtr);			\
     } while (0)
@@ -4851,7 +4859,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 	(objPtr)->refCount = 0;					\
 	(objPtr)->bytes = NULL;					\
 	(objPtr)->internalRep.doubleValue = (double)(d);	\
-	(objPtr)->typePtr = &tclDoubleType;			\
+	(objPtr)->typePtr = &tclDoubleType.objType;			\
 	TCL_DTRACE_OBJ_CREATE(objPtr);				\
     } while (0)
 
diff --git a/generic/tclLink.c b/generic/tclLink.c
index a0212ee..a28a030 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -547,7 +547,7 @@ GetDouble(
 	return 0;
     } else {
 #ifdef ACCEPT_NAN
-	Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objPtr, &tclDoubleType);
+	Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objPtr, &tclDoubleType.objType);
 
 	if (irPtr != NULL) {
 	    *dblPtr = irPtr->doubleValue;
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index ea5afac..d9fcada 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -68,7 +68,7 @@
 
 /* Checks for when caller should have already converted to internal list type */
 #define LIST_ASSERT_TYPE(listObj_) \
-    LIST_ASSERT((listObj_)->typePtr == &tclListType);
+    LIST_ASSERT((listObj_)->typePtr == &tclListType.objType);
 
 
 /*
@@ -142,6 +142,7 @@ static void	DupListInternalRep(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
 static void	FreeListInternalRep(Tcl_Obj *listPtr);
 static int	SetListFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void	UpdateStringOfList(Tcl_Obj *listPtr);
+static unsigned long long ListLength(Tcl_Obj *listPtr);
 
 /*
  * The structure below defines the list Tcl object type by means of functions
@@ -150,13 +151,14 @@ static void	UpdateStringOfList(Tcl_Obj *listPtr);
  * The internal representation of a list object is ListRep defined in tcl.h.
  */
 
-const Tcl_ObjType tclListType = {
-    "list",			/* name */
+const TclObjTypeWithAbstractList tclListType = {
+    {"list",			/* name */
     FreeListInternalRep,	/* freeIntRepProc */
     DupListInternalRep,		/* dupIntRepProc */
     UpdateStringOfList,		/* updateStringProc */
     SetListFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0
+    TCL_OBJTYPE_V0_1},
+    ListLength
 };
 
 /* Macros to manipulate the List internal rep */
@@ -202,7 +204,7 @@ const Tcl_ObjType tclListType = {
     do {                                                               \
 	(objPtr_)->internalRep.twoPtrValue.ptr1 = (repPtr_)->storePtr; \
 	(objPtr_)->internalRep.twoPtrValue.ptr2 = (repPtr_)->spanPtr;  \
-	(objPtr_)->typePtr = &tclListType;                             \
+	(objPtr_)->typePtr = &tclListType.objType;                             \
     } while (0)
 
 #define ListObjOverwriteRep(objPtr_, repPtr_) \
@@ -1272,7 +1274,7 @@ TclListObjGetRep(
 			 * to be returned. */
     ListRep *repPtr) /* Location to store descriptor */
 {
-    if (!TclHasInternalRep(listObj, &tclListType)) {
+    if (!TclHasInternalRep(listObj, &tclListType.objType)) {
 	int result;
 	result = SetListFromAny(interp, listObj);
 	if (result != TCL_OK) {
@@ -1366,8 +1368,8 @@ TclListObjCopy(
 {
     Tcl_Obj *copyObj;
 
-    if (!TclHasInternalRep(listObj, &tclListType)) {
-	if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
+    if (!TclHasInternalRep(listObj, &tclListType.objType)) {
+	if (TclHasInternalRep(listObj,&tclArithSeriesType.objType)) {
 	    return TclArithSeriesObjCopy(interp, listObj);
 	}
 	if (SetListFromAny(interp, listObj) != TCL_OK) {
@@ -1663,7 +1665,7 @@ Tcl_ListObjGetElements(
 {
     ListRep listRep;
 
-    if (TclHasInternalRep(objPtr,&tclArithSeriesType)) {
+    if (TclHasInternalRep(objPtr,&tclArithSeriesType.objType)) {
 	return TclArithSeriesGetElements(interp, objPtr, objcPtr, objvPtr);
     }
 
@@ -1991,11 +1993,19 @@ Tcl_ListObjLength(
     Tcl_Obj *listObj,	/* List object whose #elements to return. */
     Tcl_Size *lenPtr)	/* The resulting int is stored here. */
 {
-    ListRep listRep;
-
-    if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
-	*lenPtr = TclArithSeriesObjLength(listObj);
-	return TCL_OK;
+    if (listObj->typePtr && (listObj->typePtr->version == TCL_OBJTYPE_V0_1)) {
+	const TclObjTypeWithAbstractList *objType =  (const TclObjTypeWithAbstractList *)listObj->typePtr;
+	if (objType->lengthProc) {
+	    unsigned long long len = objType->lengthProc(listObj);
+	    if (len >= TCL_INDEX_NONE) {
+		if (interp) {
+			Tcl_AppendResult(interp, "List too large");
+		}
+		return TCL_ERROR;
+	    }
+	    *lenPtr = len;
+	    return TCL_OK;
+	}
     }
 
     /*
@@ -2005,12 +2015,23 @@ Tcl_ListObjLength(
      * other hand, this code will be faster for the case where the object
      * is currently a dict. Benchmark the two cases.
      */
+    ListRep listRep;
+
     if (TclListObjGetRep(interp, listObj, &listRep) != TCL_OK) {
 	return TCL_ERROR;
     }
     *lenPtr = ListRepLength(&listRep);
     return TCL_OK;
 }
+
+unsigned long long ListLength(
+    Tcl_Obj *listPtr)
+{
+	ListRep listRep;
+	ListObjGetRep(listPtr, &listRep);
+
+    return ListRepLength(&listRep);
+}
 
 /*
  *----------------------------------------------------------------------
@@ -2553,7 +2574,7 @@ TclLindexList(
      * shimmering; if internal rep is already a list do not shimmer it.
      * see TIP#22 and TIP#33 for the details.
      */
-    if (!TclHasInternalRep(argObj, &tclListType)
+    if (!TclHasInternalRep(argObj, &tclListType.objType)
 	&& TclGetIntForIndexM(NULL, argObj, ListSizeT_MAX - 1, &index)
 	       == TCL_OK) {
 	/*
@@ -2626,7 +2647,7 @@ TclLindexFlat(
     Tcl_Size i;
 
     /* Handle ArithSeries as special case */
-    if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
+    if (TclHasInternalRep(listObj,&tclArithSeriesType.objType)) {
 	Tcl_WideInt listLen = TclArithSeriesObjLength(listObj);
 	Tcl_Size index;
 	Tcl_Obj *elemObj = NULL;
@@ -2744,7 +2765,7 @@ TclLsetList(
      * shimmering; see TIP #22 and #23 for details.
      */
 
-    if (!TclHasInternalRep(indexArgObj, &tclListType)
+    if (!TclHasInternalRep(indexArgObj, &tclListType.objType)
 	&& TclGetIntForIndexM(NULL, indexArgObj, ListSizeT_MAX - 1, &index)
 	       == TCL_OK) {
 	/* indexArgPtr designates a single index. */
@@ -3274,7 +3295,7 @@ SetListFromAny(
 	    Tcl_IncrRefCount(valuePtr);
 	    Tcl_DictObjNext(&search, &keyPtr, &valuePtr, &done);
 	}
-    } else if (TclHasInternalRep(objPtr,&tclArithSeriesType)) {
+    } else if (TclHasInternalRep(objPtr,&tclArithSeriesType.objType)) {
 	/*
 	 * Convertion from Arithmetic Series is a special case
 	 * because it can be done an order of magnitude faster
@@ -3382,7 +3403,7 @@ fail:
     TclFreeInternalRep(objPtr);
     objPtr->internalRep.twoPtrValue.ptr1 = listRep.storePtr;
     objPtr->internalRep.twoPtrValue.ptr2 = listRep.spanPtr;
-    objPtr->typePtr = &tclListType;
+    objPtr->typePtr = &tclListType.objType;
 
     return TCL_OK;
 }
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 76f1627..5e3f4f1 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -225,37 +225,43 @@ static int		SetCmdNameFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
  * implementations.
  */
 
-const Tcl_ObjType tclBooleanType = {
-    "boolean",			/* name */
+static unsigned long long LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
+
+const TclObjTypeWithAbstractList tclBooleanType= {
+    {"boolean",			/* name */
     NULL,			/* freeIntRepProc */
     NULL,			/* dupIntRepProc */
     NULL,			/* updateStringProc */
     TclSetBooleanFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0
+    TCL_OBJTYPE_V0_1},
+    LengthOne
 };
-const Tcl_ObjType tclDoubleType = {
-    "double",			/* name */
+const TclObjTypeWithAbstractList tclDoubleType= {
+    {"double",			/* name */
     NULL,			/* freeIntRepProc */
     NULL,			/* dupIntRepProc */
     UpdateStringOfDouble,	/* updateStringProc */
     SetDoubleFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0
+    TCL_OBJTYPE_V0_1},
+    LengthOne
 };
-const Tcl_ObjType tclIntType = {
-    "int",			/* name */
+const TclObjTypeWithAbstractList tclIntType = {
+    {"int",			/* name */
     NULL,			/* freeIntRepProc */
     NULL,			/* dupIntRepProc */
     UpdateStringOfInt,		/* updateStringProc */
     SetIntFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0
+    TCL_OBJTYPE_V0_1},
+    LengthOne
 };
-const Tcl_ObjType tclBignumType = {
-    "bignum",			/* name */
+const TclObjTypeWithAbstractList tclBignumType = {
+    {"bignum",			/* name */
     FreeBignum,			/* freeIntRepProc */
     DupBignum,			/* dupIntRepProc */
     UpdateStringOfBignum,	/* updateStringProc */
     NULL,			/* setFromAnyProc */
-    TCL_OBJTYPE_V0
+    TCL_OBJTYPE_V0_1},
+    LengthOne
 };
 
 /*
@@ -365,9 +371,9 @@ TclInitObjSubsystem(void)
     Tcl_InitHashTable(&typeTable, TCL_STRING_KEYS);
     Tcl_MutexUnlock(&tableMutex);
 
-    Tcl_RegisterObjType(&tclDoubleType);
+    Tcl_RegisterObjType(&tclDoubleType.objType);
     Tcl_RegisterObjType(&tclStringType);
-    Tcl_RegisterObjType(&tclListType);
+    Tcl_RegisterObjType(&tclListType.objType);
     Tcl_RegisterObjType(&tclDictType);
     Tcl_RegisterObjType(&tclByteCodeType);
     Tcl_RegisterObjType(&tclCmdNameType);
@@ -2007,11 +2013,11 @@ Tcl_GetBoolFromObj(
 	return TCL_ERROR;
     }
     do {
-	if (objPtr->typePtr == &tclIntType || objPtr->typePtr == &tclBooleanType) {
+	if (objPtr->typePtr == &tclIntType.objType || objPtr->typePtr == &tclBooleanType.objType) {
 	    result = (objPtr->internalRep.wideValue != 0);
 	    goto boolEnd;
 	}
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    /*
 	     * Caution: Don't be tempted to check directly for the "double"
 	     * Tcl_ObjType and then compare the internalrep to 0.0. This isn't
@@ -2028,7 +2034,7 @@ Tcl_GetBoolFromObj(
 	    result = (d != 0.0);
 	    goto boolEnd;
 	}
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    result = 1;
 	boolEnd:
 	    if (charPtr != NULL) {
@@ -2096,18 +2102,18 @@ TclSetBooleanFromAny(
      */
 
     if (objPtr->bytes == NULL) {
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    if ((Tcl_WideUInt)objPtr->internalRep.wideValue < 2) {
 		return TCL_OK;
 	    }
 	    goto badBoolean;
 	}
 
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    goto badBoolean;
 	}
 
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    goto badBoolean;
 	}
     }
@@ -2238,13 +2244,13 @@ ParseBoolean(
   goodBoolean:
     TclFreeInternalRep(objPtr);
     objPtr->internalRep.wideValue = newBool;
-    objPtr->typePtr = &tclBooleanType;
+    objPtr->typePtr = &tclBooleanType.objType;
     return TCL_OK;
 
   numericBoolean:
     TclFreeInternalRep(objPtr);
     objPtr->internalRep.wideValue = newBool;
-    objPtr->typePtr = &tclIntType;
+    objPtr->typePtr = &tclIntType.objType;
     return TCL_OK;
 }
 
@@ -2336,7 +2342,7 @@ Tcl_DbNewDoubleObj(
     objPtr->bytes = NULL;
 
     objPtr->internalRep.doubleValue = dblValue;
-    objPtr->typePtr = &tclDoubleType;
+    objPtr->typePtr = &tclDoubleType.objType;
     return objPtr;
 }
 
@@ -2409,7 +2415,7 @@ Tcl_GetDoubleFromObj(
     double *dblPtr)	/* Place to store resulting double. */
 {
     do {
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    if (isnan(objPtr->internalRep.doubleValue)) {
 		if (interp != NULL) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -2422,11 +2428,11 @@ Tcl_GetDoubleFromObj(
 	    *dblPtr = (double) objPtr->internalRep.doubleValue;
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    *dblPtr = (double) objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    mp_int big;
 
 	    TclUnpackBignum(objPtr, big);
@@ -2640,12 +2646,12 @@ Tcl_GetLongFromObj(
 {
     do {
 #ifdef TCL_WIDE_INT_IS_LONG
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    *longPtr = objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
 #else
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    /*
 	     * We return any integer in the range LONG_MIN to ULONG_MAX
 	     * converted to a long, ignoring overflow. The rule preserves
@@ -2664,7 +2670,7 @@ Tcl_GetLongFromObj(
 	    goto tooLarge;
 	}
 #endif
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    if (interp != NULL) {
                 Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                         "expected integer but got \"%s\"",
@@ -2673,7 +2679,7 @@ Tcl_GetLongFromObj(
 	    }
 	    return TCL_ERROR;
 	}
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    /*
 	     * Must check for those bignum values that can fit in a long, even
 	     * when auto-narrowing is enabled. Only those values in the signed
@@ -2901,11 +2907,11 @@ Tcl_GetWideIntFromObj(
 				/* Place to store resulting long. */
 {
     do {
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    *wideIntPtr = objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    if (interp != NULL) {
                 Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                         "expected integer but got \"%s\"",
@@ -2914,7 +2920,7 @@ Tcl_GetWideIntFromObj(
 	    }
 	    return TCL_ERROR;
 	}
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    /*
 	     * Must check for those bignum values that can fit in a
 	     * Tcl_WideInt, even when auto-narrowing is enabled.
@@ -2986,7 +2992,7 @@ Tcl_GetWideUIntFromObj(
 				/* Place to store resulting long. */
 {
     do {
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    if (objPtr->internalRep.wideValue < 0) {
 	wideUIntOutOfRange:
 		if (interp != NULL) {
@@ -3000,10 +3006,10 @@ Tcl_GetWideUIntFromObj(
 	    *wideUIntPtr = (Tcl_WideUInt)objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    goto wideUIntOutOfRange;
 	}
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    /*
 	     * Must check for those bignum values that can fit in a
 	     * Tcl_WideUInt, even when auto-narrowing is enabled.
@@ -3070,11 +3076,11 @@ TclGetWideBitsFromObj(
     Tcl_WideInt *wideIntPtr)    /* Place to store resulting wide integer. */
 {
     do {
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    *wideIntPtr = objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    if (interp != NULL) {
                 Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                         "expected integer but got \"%s\"",
@@ -3083,7 +3089,7 @@ TclGetWideBitsFromObj(
 	    }
 	    return TCL_ERROR;
 	}
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    mp_int big;
 	    mp_err err;
 
@@ -3162,7 +3168,7 @@ DupBignum(
     mp_int bignumVal;
     mp_int bignumCopy;
 
-    copyPtr->typePtr = &tclBignumType;
+    copyPtr->typePtr = &tclBignumType.objType;
     TclUnpackBignum(srcPtr, bignumVal);
     if (mp_init_copy(&bignumCopy, &bignumVal) != MP_OKAY) {
 	Tcl_Panic("initialization failure in DupBignum");
@@ -3332,7 +3338,7 @@ GetBignumFromObj(
     mp_int *bignumValue)	/* Returned bignum value. */
 {
     do {
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    if (copy || Tcl_IsShared(objPtr)) {
 		mp_int temp;
 
@@ -3357,14 +3363,14 @@ GetBignumFromObj(
 	    }
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    if (mp_init_i64(bignumValue,
 		    objPtr->internalRep.wideValue) != MP_OKAY) {
 		return TCL_ERROR;
 	    }
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    if (interp != NULL) {
                 Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                         "expected integer but got \"%s\"",
@@ -3524,7 +3530,7 @@ TclSetBignumInternalRep(
     void *big)
 {
     mp_int *bignumValue = (mp_int *)big;
-    objPtr->typePtr = &tclBignumType;
+    objPtr->typePtr = &tclBignumType.objType;
     PACK_BIGNUM(*bignumValue, objPtr);
 
     /*
@@ -3567,7 +3573,7 @@ Tcl_GetNumberFromObj(
     int *typePtr)
 {
     do {
-	if (objPtr->typePtr == &tclDoubleType) {
+	if (objPtr->typePtr == &tclDoubleType.objType) {
 	    if (isnan(objPtr->internalRep.doubleValue)) {
 		*typePtr = TCL_NUMBER_NAN;
 	    } else {
@@ -3576,12 +3582,12 @@ Tcl_GetNumberFromObj(
 	    *clientDataPtr = &objPtr->internalRep.doubleValue;
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclIntType) {
+	if (objPtr->typePtr == &tclIntType.objType) {
 	    *typePtr = TCL_NUMBER_INT;
 	    *clientDataPtr = &objPtr->internalRep.wideValue;
 	    return TCL_OK;
 	}
-	if (objPtr->typePtr == &tclBignumType) {
+	if (objPtr->typePtr == &tclBignumType.objType) {
 	    static Tcl_ThreadDataKey bignumKey;
 	    mp_int *bigPtr = (mp_int *)Tcl_GetThreadData(&bignumKey,
 		    sizeof(mp_int));
@@ -4520,7 +4526,7 @@ Tcl_RepresentationCmd(
 	    objv[1]->refCount, objv[1]);
 
     if (objv[1]->typePtr) {
-	if (objv[1]->typePtr == &tclDoubleType) {
+	if (objv[1]->typePtr == &tclDoubleType.objType) {
 	    Tcl_AppendPrintfToObj(descObj, ", internal representation %g",
 		    objv[1]->internalRep.doubleValue);
 	} else {
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 0a8e9ae..3e9cfae 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -1019,7 +1019,7 @@ Tcl_ScanObjCmd(
 		if (Tcl_GetDoubleFromObj(NULL, objPtr, &dvalue) != TCL_OK) {
 #ifdef ACCEPT_NAN
 		    const Tcl_ObjInternalRep *irPtr
-			    = TclFetchInternalRep(objPtr, &tclDoubleType);
+			    = TclFetchInternalRep(objPtr, &tclDoubleType.objType);
 		    if (irPtr) {
 			dvalue = irPtr->doubleValue;
 		    } else
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index a816062..fed2aea 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -554,7 +554,7 @@ TclParseNumber(
 		/* A dict can never be a (single) number */
 		return TCL_ERROR;
 	    }
-	    if (TclHasInternalRep(objPtr, &tclListType)) {
+	    if (TclHasInternalRep(objPtr, &tclListType.objType)) {
 		size_t length;
 		/* A list can only be a (single) number if its length == 1 */
 		TclListObjLengthM(NULL, objPtr, &length);
@@ -1377,7 +1377,7 @@ TclParseNumber(
 			    octalSignificandWide);
 		    octalSignificandOverflow = 1;
 		} else {
-		    objPtr->typePtr = &tclIntType;
+		    objPtr->typePtr = &tclIntType.objType;
 		    if (signum) {
 			objPtr->internalRep.wideValue =
 				(Tcl_WideInt)(-octalSignificandWide);
@@ -1413,7 +1413,7 @@ TclParseNumber(
 			    significandWide);
 		    significandOverflow = 1;
 		} else {
-		    objPtr->typePtr = &tclIntType;
+		    objPtr->typePtr = &tclIntType.objType;
 		    if (signum) {
 			objPtr->internalRep.wideValue =
 				(Tcl_WideInt)(-significandWide);
@@ -1445,7 +1445,7 @@ TclParseNumber(
 	     * k = numTrailZeros+exponent-numDigitsAfterDp.
 	     */
 
-	    objPtr->typePtr = &tclDoubleType;
+	    objPtr->typePtr = &tclDoubleType.objType;
 	    if (exponentSignum) {
 		/*
 		 * At this point exponent>=0, so the following calculation
@@ -1496,14 +1496,14 @@ TclParseNumber(
 	    } else {
 		objPtr->internalRep.doubleValue = HUGE_VAL;
 	    }
-	    objPtr->typePtr = &tclDoubleType;
+	    objPtr->typePtr = &tclDoubleType.objType;
 	    break;
 
 #ifdef IEEE_FLOATING_POINT
 	case sNAN:
 	case sNANFINISH:
 	    objPtr->internalRep.doubleValue = MakeNaN(signum, significandWide);
-	    objPtr->typePtr = &tclDoubleType;
+	    objPtr->typePtr = &tclDoubleType.objType;
 	    break;
 #endif
 	case INITIAL:
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 0b898f1..b23d134 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -122,13 +122,16 @@ static int		FindElement(Tcl_Interp *interp, const char *string,
  * is unregistered, so has no need of a setFromAnyProc either.
  */
 
-static const Tcl_ObjType endOffsetType = {
-    "end-offset",			/* name */
+static unsigned long long LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
+
+static const TclObjTypeWithAbstractList endOffsetType = {
+    {"end-offset",			/* name */
     NULL,				/* freeIntRepProc */
     NULL,				/* dupIntRepProc */
     NULL,				/* updateStringProc */
     NULL,				/* setFromAnyProc */
-    TCL_OBJTYPE_V0
+    TCL_OBJTYPE_V0_1},
+    LengthOne
 };
 
 /*
@@ -3455,7 +3458,7 @@ GetEndOffsetFromObj(
     Tcl_WideInt offset = -1;	/* Offset in the "end-offset" expression - 1 */
     void *cd;
 
-    while ((irPtr = TclFetchInternalRep(objPtr, &endOffsetType)) == NULL) {
+    while ((irPtr = TclFetchInternalRep(objPtr, &endOffsetType.objType)) == NULL) {
 	Tcl_ObjInternalRep ir;
 	size_t length;
 	const char *bytes = Tcl_GetStringFromObj(objPtr, &length);
@@ -3641,7 +3644,7 @@ GetEndOffsetFromObj(
     parseOK:
 	/* Success. Store the new internal rep. */
 	ir.wideValue = offset;
-	Tcl_StoreInternalRep(objPtr, &endOffsetType, &ir);
+	Tcl_StoreInternalRep(objPtr, &endOffsetType.objType, &ir);
     }
 
     offset = irPtr->wideValue;
@@ -3743,7 +3746,7 @@ TclIndexEncode(
     int idx;
 
     if (TCL_OK == GetWideForIndex(interp, objPtr, (unsigned)TCL_INDEX_END , &wide)) {
-	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objPtr, &endOffsetType);
+	const Tcl_ObjInternalRep *irPtr = TclFetchInternalRep(objPtr, &endOffsetType.objType);
 	if (irPtr && irPtr->wideValue >= 0) {
 	    /* "int[+-]int" syntax, works the same here as "int" */
 	    irPtr = NULL;
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 6226e1e..f7ec7c8 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -4042,8 +4042,7 @@ ArraySetCmd(
 	size_t elemLen;
 	Tcl_Obj **elemPtrs, *copyListObj;
 
-	result = TclListObjGetElementsM(interp, arrayElemObj,
-		&elemLen, &elemPtrs);
+	result = TclListObjLengthM(interp, arrayElemObj, &elemLen);
 	if (result != TCL_OK) {
 	    return result;
 	}
@@ -4056,6 +4055,11 @@ ArraySetCmd(
 	if (elemLen == 0) {
 	    goto ensureArray;
 	}
+	result = TclListObjGetElementsM(interp, arrayElemObj,
+		&elemLen, &elemPtrs);
+	if (result != TCL_OK) {
+	    return result;
+	}
 
 	/*
 	 * We needn't worry about traces invalidating arrayPtr: should that be
-- 
cgit v0.12


From e4f687d97860f2ec8767e5d978fc4cb71013c488 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 20:41:34 +0000
Subject: -1 -> TCL_INDEX_NONE

---
 generic/tclIO.c | 126 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 652043c..045f0e5 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -125,12 +125,12 @@ typedef struct {
 				 * ChannelState exists per set of stacked
 				 * channels. */
     Tcl_Channel stdinChannel;	/* Static variable for the stdin channel. */
-    int stdinInitialized;
     Tcl_Channel stdoutChannel;	/* Static variable for the stdout channel. */
-    int stdoutInitialized;
     Tcl_Channel stderrChannel;	/* Static variable for the stderr channel. */
-    int stderrInitialized;
     Tcl_Encoding binaryEncoding;
+    int stdinInitialized;
+    int stdoutInitialized;
+    int stderrInitialized;
 } ThreadSpecificData;
 
 static Tcl_ThreadDataKey dataKey;
@@ -393,7 +393,7 @@ ChanClose(
  * Results:
  *	The return value of the driver inputProc,
  *	  - number of bytes stored at dst, ot
- *	  - -1 on error, with a Posix error code available to the caller by
+ *	  - TCL_INDEX_NONE on error, with a Posix error code available to the caller by
  *	    calling Tcl_GetErrno().
  *
  * Side effects:
@@ -431,7 +431,7 @@ ChanRead(
     ResetFlag(chanPtr->state, CHANNEL_BLOCKED | CHANNEL_EOF);
     chanPtr->state->inputEncodingFlags &= ~TCL_ENCODING_END;
     if (WillRead(chanPtr) < 0) {
-        return -1;
+        return TCL_INDEX_NONE;
     }
 
     bytesRead = chanPtr->typePtr->inputProc(chanPtr->instanceData,
@@ -486,14 +486,14 @@ ChanSeek(
 #ifndef TCL_NO_DEPRECATED
 	if (offset<LONG_MIN || offset>LONG_MAX) {
 	    *errnoPtr = EOVERFLOW;
-	    return -1;
+	    return TCL_INDEX_NONE;
 	}
 
 	return Tcl_ChannelSeekProc(chanPtr->typePtr)(chanPtr->instanceData,
 		offset, mode, errnoPtr);
 #else
 	*errnoPtr = EINVAL;
-	return -1;
+	return TCL_INDEX_NONE;
 #endif
     }
 
@@ -1237,7 +1237,7 @@ Tcl_UnregisterChannel(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                     "illegal recursive call to close through close-handler"
-                    " of channel", -1));
+                    " of channel", TCL_INDEX_NONE));
 	}
 	return TCL_ERROR;
     }
@@ -2720,7 +2720,7 @@ CheckForDeadChannel(
     Tcl_SetErrno(EINVAL);
     if (interp) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "unable to access channel: invalid channel", -1));
+                "unable to access channel: invalid channel", TCL_INDEX_NONE));
     }
     return 1;
 }
@@ -2918,7 +2918,7 @@ FlushChannel(
 		if (interp != NULL && !TclChanCaughtErrorBypass(interp,
 			(Tcl_Channel) chanPtr)) {
 		    Tcl_SetObjResult(interp,
-			    Tcl_NewStringObj(Tcl_PosixError(interp), -1));
+			    Tcl_NewStringObj(Tcl_PosixError(interp), TCL_INDEX_NONE));
 		}
 
 		/*
@@ -3493,7 +3493,7 @@ Tcl_Close(
 	if (interp) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                     "illegal recursive call to close through close-handler"
-                    " of channel", -1));
+                    " of channel", TCL_INDEX_NONE));
 	}
 	return TCL_ERROR;
     }
@@ -3606,7 +3606,7 @@ Tcl_Close(
 	Tcl_SetErrno(stickyError);
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp,
-			     Tcl_NewStringObj(Tcl_PosixError(interp), -1));
+			     Tcl_NewStringObj(Tcl_PosixError(interp), TCL_INDEX_NONE));
 	}
 	return TCL_ERROR;
     }
@@ -3624,7 +3624,7 @@ Tcl_Close(
 	    && 0 == TclGetCharLength(Tcl_GetObjResult(interp))) {
 	Tcl_SetErrno(result);
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj(Tcl_PosixError(interp), -1));
+		Tcl_NewStringObj(Tcl_PosixError(interp), TCL_INDEX_NONE));
     }
     if (result != 0) {
 	return TCL_ERROR;
@@ -3696,7 +3696,7 @@ Tcl_CloseEx(
 
     if (chanPtr != statePtr->topChanPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"half-close not applicable to stack of transformations", -1));
+		"half-close not applicable to stack of transformations", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
 
@@ -3729,7 +3729,7 @@ Tcl_CloseEx(
 	if (interp) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                     "illegal recursive call to close through close-handler"
-                    " of channel", -1));
+                    " of channel", TCL_INDEX_NONE));
 	}
 	return TCL_ERROR;
     }
@@ -4111,7 +4111,7 @@ Tcl_Write(
     chanPtr = statePtr->topChanPtr;
 
     if (CheckChannelErrors(statePtr, TCL_WRITABLE) != 0) {
-	return -1;
+	return TCL_INDEX_NONE;
     }
 
     if (srcLen < 0) {
@@ -4208,7 +4208,7 @@ Tcl_WriteChars(
     Tcl_Channel chan,		/* The channel to buffer output for. */
     const char *src,		/* UTF-8 characters to queue in output
 				 * buffer. */
-    int len)			/* Length of string in bytes, or < 0 for
+    int len)			/* Length of string in bytes, or TCL_INDEX_NONE for
 				 * strlen(). */
 {
     Channel *chanPtr = (Channel *) chan;
@@ -4330,7 +4330,7 @@ WillRead(
 
 	DiscardInputQueued(chanPtr->state, 0);
 	Tcl_SetErrno(EINVAL);
-	return -1;
+	return TCL_INDEX_NONE;
     }
     if (((Tcl_ChannelWideSeekProc(chanPtr->typePtr) != NULL)
 #ifndef TCL_NO_DEPRECATED
@@ -4348,7 +4348,7 @@ WillRead(
 	 */
 
 	if (FlushChannel(NULL, chanPtr, 0) != 0) {
-	return -1;
+	return TCL_INDEX_NONE;
 	}
     }
     return 0;
@@ -4365,7 +4365,7 @@ WillRead(
  *	ready e.g. if it contains a newline and we are in line buffering mode.
  *
  * Results:
- *	The number of bytes written or -1 in case of error. If -1,
+ *	The number of bytes written or TCL_INDEX_NONE in case of error. If TCL_INDEX_NONE,
  *	Tcl_GetErrno will return the error code.
  *
  * Side effects:
@@ -4394,7 +4394,7 @@ Write(
     }
 
     /*
-     * Transfer encoding strict/nocomplain option to the encoding flags
+     * Transfer encoding nocomplain/strict option to the encoding flags
      */
 
     if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
@@ -4546,7 +4546,7 @@ Write(
 
 	if (IsBufferFull(bufPtr)) {
 	    if (FlushChannel(NULL, chanPtr, 0) != 0) {
-		return -1;
+		return TCL_INDEX_NONE;
 	    }
 	    flushed += statePtr->bufSize;
 
@@ -4569,7 +4569,7 @@ Write(
     if (((flushed < total) && GotFlag(statePtr, CHANNEL_UNBUFFERED)) ||
 	    (needNlFlush && GotFlag(statePtr, CHANNEL_LINEBUFFERED))) {
 	if (FlushChannel(NULL, chanPtr, 0) != 0) {
-	    return -1;
+	    return TCL_INDEX_NONE;
 	}
     }
 
@@ -4577,7 +4577,7 @@ Write(
 
     if (encodingError) {
 	Tcl_SetErrno(EILSEQ);
-	return -1;
+	return TCL_INDEX_NONE;
     }
     return total;
 }
@@ -4590,8 +4590,8 @@ Write(
  *	Reads a complete line of input from the channel into a Tcl_DString.
  *
  * Results:
- *	Length of line read (in characters) or -1 if error, EOF, or blocked.
- *	If -1, use Tcl_GetErrno() to retrieve the POSIX error code for the
+ *	Length of line read (in characters) or TCL_INDEX_NONE if error, EOF, or blocked.
+ *	If TCL_INDEX_NONE, use Tcl_GetErrno() to retrieve the POSIX error code for the
  *	error or condition that occurred.
  *
  * Side effects:
@@ -4631,8 +4631,8 @@ Tcl_Gets(
  *	converted to UTF-8 using the encoding specified by the channel.
  *
  * Results:
- *	Number of characters accumulated in the object or -1 if error,
- *	blocked, or EOF. If -1, use Tcl_GetErrno() to retrieve the POSIX error
+ *	Number of characters accumulated in the object or TCL_INDEX_NONE if error,
+ *	blocked, or EOF. If TCL_INDEX_NONE, use Tcl_GetErrno() to retrieve the POSIX error
  *	code for the error or condition that occurred.
  *
  * Side effects:
@@ -5064,8 +5064,8 @@ Tcl_GetsObj(
  *	may be called when an -eofchar is set on the channel.
  *
  * Results:
- *	Number of characters accumulated in the object or -1 if error,
- *	blocked, or EOF. If -1, use Tcl_GetErrno() to retrieve the POSIX error
+ *	Number of characters accumulated in the object or TCL_INDEX_NONE if error,
+ *	blocked, or EOF. If TCL_INDEX_NONE, use Tcl_GetErrno() to retrieve the POSIX error
  *	code for the error or condition that occurred.
  *
  * Side effects:
@@ -5213,12 +5213,12 @@ TclGetsObjBinary(
 	    if ((dst == dstEnd) && (byteLen == oldLength)) {
 		/*
 		 * If we didn't append any bytes before encountering EOF,
-		 * caller needs to see -1.
+		 * caller needs to see TCL_INDEX_NONE.
 		 */
 
 		byteArray = Tcl_SetByteArrayLength(objPtr, oldLength);
 		CommonGetsCleanup(chanPtr);
-		copiedTotal = -1;
+		copiedTotal = TCL_INDEX_NONE;
 		ResetFlag(statePtr, CHANNEL_BLOCKED);
 		goto done;
 	    }
@@ -5307,7 +5307,7 @@ TclGetsObjBinary(
      */
 
     SetFlag(statePtr, CHANNEL_NEED_MORE_DATA);
-    copiedTotal = -1;
+    copiedTotal = TCL_INDEX_NONE;
 
     /*
      * Update the notifier state so we don't block while there is still data
@@ -5741,7 +5741,7 @@ CommonGetsCleanup(
  *	No encoding conversions are applied to the bytes being read.
  *
  * Results:
- *	The number of bytes read, or -1 on error. Use Tcl_GetErrno() to
+ *	The number of bytes read, or TCL_INDEX_NONE on error. Use Tcl_GetErrno() to
  *	retrieve the error code for the error that occurred.
  *
  * Side effects:
@@ -5786,7 +5786,7 @@ Tcl_Read(
  *	No encoding conversions are applied to the bytes being read.
  *
  * Results:
- *	The number of bytes read, or -1 on error. Use Tcl_GetErrno() to
+ *	The number of bytes read, or TCL_INDEX_NONE on error. Use Tcl_GetErrno() to
  *	retrieve the error code for the error that occurred.
  *
  * Side effects:
@@ -5874,7 +5874,7 @@ Tcl_ReadRaw(
 	     */
 
 	    if (!GotFlag(statePtr, CHANNEL_BLOCKED) || copied == 0) {
-		copied = -1;
+		copied = TCL_INDEX_NONE;
 	    }
 	} else if (nread > 0) {
 	    /*
@@ -5904,7 +5904,7 @@ Tcl_ReadRaw(
  *	object.
  *
  * Results:
- *	The number of characters read, or -1 on error. Use Tcl_GetErrno() to
+ *	The number of characters read, or TCL_INDEX_NONE on error. Use Tcl_GetErrno() to
  *	retrieve the error code for the error that occurred.
  *
  * Side effects:
@@ -5918,7 +5918,7 @@ Tcl_ReadChars(
     Tcl_Channel chan,		/* The channel to read. */
     Tcl_Obj *objPtr,		/* Input data is stored in this object. */
     int toRead,			/* Maximum number of characters to store, or
-				 * -1 to read all available data (up to EOF or
+				 * TCL_INDEX_NONE to read all available data (up to EOF or
 				 * when channel blocks). */
     int appendFlag)		/* If non-zero, data read from the channel
 				 * will be appended to the object. Otherwise,
@@ -5942,7 +5942,7 @@ Tcl_ReadChars(
 	 */
 
 	UpdateInterest(chanPtr);
-	return -1;
+	return TCL_INDEX_NONE;
     }
 
     return DoReadChars(chanPtr, objPtr, toRead, appendFlag);
@@ -5960,7 +5960,7 @@ Tcl_ReadChars(
  *	object.
  *
  * Results:
- *	The number of characters read, or -1 on error. Use Tcl_GetErrno() to
+ *	The number of characters read, or TCL_INDEX_NONE on error. Use Tcl_GetErrno() to
  *	retrieve the error code for the error that occurred.
  *
  * Side effects:
@@ -5974,7 +5974,7 @@ DoReadChars(
     Channel *chanPtr,		/* The channel to read. */
     Tcl_Obj *objPtr,		/* Input data is stored in this object. */
     int toRead,			/* Maximum number of characters to store, or
-				 * -1 to read all available data (up to EOF or
+				 * TCL_INDEX_NONE to read all available data (up to EOF or
 				 * when channel blocks). */
     int appendFlag)		/* If non-zero, data read from the channel
 				 * will be appended to the object. Otherwise,
@@ -6064,7 +6064,7 @@ DoReadChars(
     ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
     statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
     for (copied = 0; (unsigned) toRead > 0; ) {
-	copiedNow = -1;
+	copiedNow = TCL_INDEX_NONE;
 	if (statePtr->inQueueHead != NULL) {
 	    if (binaryMode) {
 		copiedNow = ReadBytes(statePtr, objPtr, toRead);
@@ -6104,7 +6104,7 @@ DoReadChars(
 	    }
 	    if (result != 0) {
 		if (!GotFlag(statePtr, CHANNEL_BLOCKED)) {
-		    copied = -1;
+		    copied = TCL_INDEX_NONE;
 		}
 		break;
 	    }
@@ -6166,7 +6166,7 @@ DoReadChars(
  *
  * Results:
  *	The return value is the number of bytes appended to the object, or
- *	-1 to indicate that zero bytes were read due to an EOF.
+ *	TCL_INDEX_NONE to indicate that zero bytes were read due to an EOF.
  *
  * Side effects:
  *	The storage of bytes in objPtr can cause (re-)allocation of memory.
@@ -6235,7 +6235,7 @@ ReadChars(
 				 * allocated to hold data, not how many bytes
 				 * of data have been stored in the object. */
     int charsToRead,		/* Maximum number of characters to store, or
-				 * -1 to get all available characters.
+				 * TCL_INDEX_NONE to get all available characters.
 				 * Characters are obtained from the first
 				 * buffer in the queue -- even if this number
 				 * is larger than the number of characters
@@ -6383,12 +6383,12 @@ ReadChars(
 		 * the stopping, but the value of dstRead does not include it.
 		 *
 		 * Also rather bizarre, our caller can only notice an EOF
-		 * condition if we return the value -1 as the number of chars
+		 * condition if we return the value TCL_INDEX_NONE as the number of chars
 		 * read.  This forces us to perform a 2-call dance where the
 		 * first call can read all the chars up to the eof char, and
 		 * the second call is solely for consuming the encoded eof
 		 * char then pointed at by src so that we can return that
-		 * magic -1 value.  This seems really wasteful, especially
+		 * magic TCL_INDEX_NONE value.  This seems really wasteful, especially
 		 * since the first decoding pass of each call is likely to
 		 * decode many bytes beyond that eof char that's all we care
 		 * about.
@@ -6403,7 +6403,7 @@ ReadChars(
 		     */
 
 		    Tcl_SetObjLength(objPtr, numBytes);
-		    return -1;
+		    return TCL_INDEX_NONE;
 		}
 
 		{
@@ -6578,7 +6578,7 @@ ReadChars(
 		    SetFlag(statePtr, CHANNEL_NEED_MORE_DATA);
 		}
 		Tcl_SetObjLength(objPtr, numBytes);
-		return -1;
+		return TCL_INDEX_NONE;
 	    }
 
 	    /*
@@ -7856,10 +7856,10 @@ Tcl_BadChannelOption(
         Tcl_Obj *errObj;
 
 	Tcl_DStringInit(&ds);
-	Tcl_DStringAppend(&ds, genericopt, -1);
+	Tcl_DStringAppend(&ds, genericopt, TCL_INDEX_NONE);
 	if (optionList && (*optionList)) {
 	    TclDStringAppendLiteral(&ds, " ");
-	    Tcl_DStringAppend(&ds, optionList, -1);
+	    Tcl_DStringAppend(&ds, optionList, TCL_INDEX_NONE);
 	}
 	if (Tcl_SplitList(interp, Tcl_DStringValue(&ds),
 		&argc, &argv) != TCL_OK) {
@@ -8178,7 +8178,7 @@ Tcl_SetChannelOption(
 	if (interp) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                     "unable to set channel options: background copy in"
-                    " progress", -1));
+                    " progress", TCL_INDEX_NONE));
 	}
 	return TCL_ERROR;
     }
@@ -8229,7 +8229,7 @@ Tcl_SetChannelOption(
 	} else if (interp) {
             Tcl_SetObjResult(interp, Tcl_NewStringObj(
                     "bad value for -buffering: must be one of"
-                    " full, line, or none", -1));
+                    " full, line, or none", TCL_INDEX_NONE));
             return TCL_ERROR;
 	}
 	return TCL_OK;
@@ -8292,7 +8292,7 @@ Tcl_SetChannelOption(
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                             "bad value for -eofchar: must be non-NUL ASCII"
-                            " character", -1));
+                            " character", TCL_INDEX_NONE));
 		}
 		ckfree(argv);
 		return TCL_ERROR;
@@ -8307,7 +8307,7 @@ Tcl_SetChannelOption(
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"bad value for -eofchar: should be a list of zero,"
-			" one, or two elements", -1));
+			" one, or two elements", TCL_INDEX_NONE));
 	    }
 	    ckfree(argv);
 	    return TCL_ERROR;
@@ -8382,7 +8382,7 @@ Tcl_SetChannelOption(
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"bad value for -translation: must be a one or two"
-			" element list", -1));
+			" element list", TCL_INDEX_NONE));
 	    }
 	    ckfree(argv);
 	    return TCL_ERROR;
@@ -8412,7 +8412,7 @@ Tcl_SetChannelOption(
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "bad value for -translation: must be one of "
-                            "auto, binary, cr, lf, crlf, or platform", -1));
+                            "auto, binary, cr, lf, crlf, or platform", TCL_INDEX_NONE));
 		}
 		ckfree(argv);
 		return TCL_ERROR;
@@ -8462,7 +8462,7 @@ Tcl_SetChannelOption(
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "bad value for -translation: must be one of "
-                            "auto, binary, cr, lf, crlf, or platform", -1));
+                            "auto, binary, cr, lf, crlf, or platform", TCL_INDEX_NONE));
 		}
 		ckfree(argv);
 		return TCL_ERROR;
@@ -10067,7 +10067,7 @@ CopyData(
  *
  * Results:
  *	The number of bytes actually stored (<= bytesToRead),
- * 	or -1 if there is an error in reading the channel.  Use
+ * 	or TCL_INDEX_NONE if there is an error in reading the channel.  Use
  * 	Tcl_GetErrno() to retrieve the error code for the error
  *	that occurred.
  *
@@ -10076,7 +10076,7 @@ CopyData(
  *	  - EOF is reached on the channel; or
  *	  - the channel is non-blocking, and we've read all we can
  *	    without blocking.
- *	  - a channel reading error occurs (and we return -1)
+ *	  - a channel reading error occurs (and we return TCL_INDEX_NONE)
  *
  * Side effects:
  *	May cause input to be buffered.
@@ -10175,7 +10175,7 @@ DoRead(
 
 		UpdateInterest(chanPtr);
 		TclChannelRelease((Tcl_Channel)chanPtr);
-		return -1;
+		return TCL_INDEX_NONE;
 	    }
 
 	    assert(IsBufferFull(bufPtr));
@@ -10583,7 +10583,7 @@ Tcl_GetChannelNamesEx(
 	    && (pattern[2] == 'd'))) {
 	if ((Tcl_FindHashEntry(hTblPtr, pattern) != NULL)
 		&& (Tcl_ListObjAppendElement(interp, resultPtr,
-		Tcl_NewStringObj(pattern, -1)) != TCL_OK)) {
+		Tcl_NewStringObj(pattern, TCL_INDEX_NONE)) != TCL_OK)) {
 	    goto error;
 	}
 	goto done;
@@ -10610,7 +10610,7 @@ Tcl_GetChannelNamesEx(
 
 	if (((pattern == NULL) || Tcl_StringMatch(name, pattern)) &&
 		(Tcl_ListObjAppendElement(interp, resultPtr,
-			Tcl_NewStringObj(name, -1)) != TCL_OK)) {
+			Tcl_NewStringObj(name, TCL_INDEX_NONE)) != TCL_OK)) {
 	error:
 	    TclDecrRefCount(resultPtr);
 	    return TCL_ERROR;
-- 
cgit v0.12


From 9c802c440b678f7596b6167240964a4e5320565b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Nov 2022 20:42:38 +0000
Subject: Writing characters > \xFF to a binary channel is deprecated, this
 will start throwing an exception in Tcl 9.0

---
 tests/chanio.test | 4 ++--
 tests/io.test     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index 787d926..2189cc4 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -116,7 +116,7 @@ set path(test1) [makeFile {} test1]
 test chan-io-1.6 {Tcl_WriteChars: WriteBytes} {
     set f [open $path(test1) w]
     chan configure $f -encoding binary
-    chan puts -nonewline $f "a乍\x00"
+    chan puts -nonewline $f "a\x4D\x00"
     chan close $f
     contents $path(test1)
 } "aM\x00"
@@ -432,7 +432,7 @@ test chan-io-6.3 {Tcl_GetsObj: how many have we used?} -body {
 test chan-io-6.4 {Tcl_GetsObj: encoding == NULL} -body {
     set f [open $path(test1) w]
     chan configure $f -translation binary
-    chan puts $f "\x81\u1234\x00"
+    chan puts $f "\x81\x34\x00"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -translation binary
diff --git a/tests/io.test b/tests/io.test
index ef9e14d..24fda19 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -108,7 +108,7 @@ set path(test1) [makeFile {} test1]
 test io-1.6 {Tcl_WriteChars: WriteBytes} {
     set f [open $path(test1) w]
     fconfigure $f -encoding binary
-    puts -nonewline $f "a乍\x00"
+    puts -nonewline $f "a\x4D\x00"
     close $f
     contents $path(test1)
 } "a\x4D\x00"
@@ -466,7 +466,7 @@ test io-6.3 {Tcl_GetsObj: how many have we used?} {
 test io-6.4 {Tcl_GetsObj: encoding == NULL} {
     set f [open $path(test1) w]
     fconfigure $f -translation binary
-    puts $f "\x81\u1234\x00"
+    puts $f "\x81\x34\x00"
     close $f
     set f [open $path(test1)]
     fconfigure $f -translation binary
-- 
cgit v0.12


From 2a569c94ef1b7bac9236da247c9f02f96992eec3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Nov 2022 10:17:51 +0000
Subject: Since Tcl 9.0 throws exceptions on an illegal byte sequence (no
 longer simply truncates it), adapt test-case for that

---
 tests/ioCmd.test | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 690b196..50cdcf5 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -491,9 +491,15 @@ test iocmd-12.10 {POSIX open access modes: BINARY} {
     close $f
     set result
 } 5
-test iocmd-12.11 {POSIX open access modes: BINARY} {
+test iocmd-12.11 {POSIX open access modes: BINARY} -body {
     set f [open $path(test1) {WRONLY BINARY TRUNC}]
-    puts $f Ɉ		;# gets truncated to H
+    puts $f Ɉ		;# throws an exception
+} -cleanup {
+    close $f
+} -returnCodes 1 -match glob -result {error writing "*": illegal byte sequence}
+test iocmd-12.12 {POSIX open access modes: BINARY} {
+    set f [open $path(test1) {WRONLY BINARY TRUNC}]
+    puts $f H
     close $f
     set f [open $path(test1) r]
     fconfigure $f -translation binary
-- 
cgit v0.12


From ddf4a5f1583b7a5c030020dcf4a1e712b5d465f2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Nov 2022 14:05:58 +0000
Subject: Use Tcl_GetByteArrayFromObj(... in stead of
 Tcl_GetBytesFromObj(NULL,.... Add some more error-checking for invalid
 byte-arrays

---
 generic/tclBinary.c    | 14 +++++++-------
 generic/tclConfig.c    |  5 ++++-
 generic/tclExecute.c   |  4 ++--
 generic/tclIO.c        |  8 ++++++--
 generic/tclIORChan.c   |  2 +-
 generic/tclLink.c      |  4 +++-
 generic/tclStringObj.c |  6 +++---
 generic/tclZipfs.c     |  2 +-
 generic/tclZlib.c      | 10 ++++++++--
 9 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 07c78a8..28cf31d 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -912,9 +912,9 @@ BinaryFormatCmd(
 		goto badIndex;
 	    }
 	    if (count == BINARY_ALL) {
-		Tcl_Obj *copy = TclNarrowToBytes(objv[arg]);
-		(void)Tcl_GetByteArrayFromObj(copy, &count);
-		Tcl_DecrRefCount(copy);
+		if (Tcl_GetByteArrayFromObj(objv[arg], &count) == NULL) {
+		    count = Tcl_GetCharLength(objv[arg]);
+		}
 	    } else if (count == BINARY_NOCOUNT) {
 		count = 1;
 	    }
@@ -2524,7 +2524,7 @@ BinaryDecodeHex(
     }
 
     TclNewObj(resultObj);
-    data = Tcl_GetBytesFromObj(NULL, objv[objc - 1], &count);
+    data = Tcl_GetByteArrayFromObj(objv[objc - 1], &count);
     if (data == NULL) {
 	pure = 0;
 	data = (unsigned char *) Tcl_GetStringFromObj(objv[objc - 1], &count);
@@ -2657,7 +2657,7 @@ BinaryEncode64(
 	    }
 	    break;
 	case OPT_WRAPCHAR:
-	    wrapchar = (const char *)Tcl_GetBytesFromObj(NULL,
+	    wrapchar = (const char *)Tcl_GetByteArrayFromObj(
 		    objv[i + 1], &wrapcharlen);
 	    if (wrapchar == NULL) {
 		purewrap = 0;
@@ -2928,7 +2928,7 @@ BinaryDecodeUu(
     }
 
     TclNewObj(resultObj);
-    data = Tcl_GetBytesFromObj(NULL, objv[objc - 1], &count);
+    data = Tcl_GetByteArrayFromObj(objv[objc - 1], &count);
     if (data == NULL) {
 	pure = 0;
 	data = (unsigned char *) Tcl_GetStringFromObj(objv[objc - 1], &count);
@@ -3103,7 +3103,7 @@ BinaryDecode64(
     }
 
     TclNewObj(resultObj);
-    data = Tcl_GetBytesFromObj(NULL, objv[objc - 1], &count);
+    data = Tcl_GetByteArrayFromObj(objv[objc - 1], &count);
     if (data == NULL) {
 	pure = 0;
 	data = (unsigned char *) Tcl_GetStringFromObj(objv[objc - 1], &count);
diff --git a/generic/tclConfig.c b/generic/tclConfig.c
index fcd991a..1ece31c 100644
--- a/generic/tclConfig.c
+++ b/generic/tclConfig.c
@@ -258,7 +258,10 @@ QueryConfigObjCmd(
 	 * Value is stored as-is in a byte array, see Bug [9b2e636361],
 	 * so we have to decode it first.
 	 */
-	value = (const char *) Tcl_GetByteArrayFromObj(val, &n);
+	value = (const char *) Tcl_GetBytesFromObj(interp, val, &n);
+	if (value == NULL) {
+	    return TCL_ERROR;
+	}
 	value = Tcl_ExternalToUtfDString(venc, value, n, &conv);
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(value,
 		Tcl_DStringLength(&conv)));
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 926fd61..950cabe 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5274,7 +5274,7 @@ TEBCresume(
 	    TclNewObj(objResultPtr);
 	} else if (TclIsPureByteArray(valuePtr)) {
 	    objResultPtr = Tcl_NewByteArrayObj(
-		    Tcl_GetBytesFromObj(NULL, valuePtr, (size_t *)NULL)+index, 1);
+		    Tcl_GetByteArrayFromObj(valuePtr, (size_t *)NULL)+index, 1);
 	} else if (valuePtr->bytes && slength == valuePtr->length) {
 	    objResultPtr = Tcl_NewStringObj((const char *)
 		    valuePtr->bytes+index, 1);
@@ -5536,7 +5536,7 @@ TEBCresume(
 	    ustring2 = Tcl_GetUnicodeFromObj(value2Ptr, &length2);
 	    match = TclUniCharMatch(ustring1, slength, ustring2, length2,
 		    nocase);
-	} else if (TclIsPureByteArray(valuePtr) && !nocase) {
+	} else if (TclIsPureByteArray(valuePtr) && TclIsPureByteArray(value2Ptr) && !nocase) {
 	    unsigned char *bytes1, *bytes2;
 	    size_t wlen1 = 0, wlen2 = 0;
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 26db2f4..1541390 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4638,7 +4638,7 @@ Tcl_GetsObj(
     if ((statePtr->encoding == NULL)
 	    && ((statePtr->inputTranslation == TCL_TRANSLATE_LF)
 		    || (statePtr->inputTranslation == TCL_TRANSLATE_CR))
-	    && Tcl_GetBytesFromObj(NULL, objPtr, (size_t *)NULL) != NULL) {
+	    && Tcl_GetByteArrayFromObj(objPtr, (size_t *)NULL) != NULL) {
 	return TclGetsObjBinary(chan, objPtr);
     }
 
@@ -5057,6 +5057,10 @@ TclGetsObjBinary(
      */
 
     byteArray = Tcl_GetByteArrayFromObj(objPtr, &byteLen);
+    if (byteArray == NULL) {
+	Tcl_SetErrno(EILSEQ);
+	return -1;
+    }
     oldFlags = statePtr->inputEncodingFlags;
     oldRemoved = BUFFER_PADDING;
     oldLength = byteLen;
@@ -5945,7 +5949,7 @@ DoReadChars(
 	    && (statePtr->inEofChar == '\0');
 
     if (appendFlag) {
-	if (binaryMode && (NULL == Tcl_GetBytesFromObj(NULL, objPtr, (size_t *)NULL))) {
+	if (binaryMode && (NULL == Tcl_GetByteArrayFromObj(objPtr, (size_t *)NULL))) {
 	    binaryMode = 0;
 	}
     } else {
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 67abca6..5bf7ea4 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -1387,7 +1387,7 @@ ReflectInput(
 
     if (bytev == NULL) {
 	SetChannelErrorStr(rcPtr->chan, msg_read_nonbyte);
-        goto invalid;
+	goto invalid;
     } else if ((size_t)toRead < bytec) {
 	SetChannelErrorStr(rcPtr->chan, msg_read_toomuch);
 	goto invalid;
diff --git a/generic/tclLink.c b/generic/tclLink.c
index a0212ee..0088950 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -880,7 +880,9 @@ LinkTraceProc(
 
     case TCL_LINK_BINARY:
 	value = (char *) Tcl_GetByteArrayFromObj(valueObj, &valueLength);
-	if (valueLength != linkPtr->bytes) {
+	if (value == NULL) {
+	    return (char *) "invalid binary value";
+	} else if (valueLength != linkPtr->bytes) {
 	    return (char *) "wrong size of binary value";
 	}
 	if (linkPtr->flags & LINK_ALLOC_LAST) {
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 743f0ed..545a1e0 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1471,7 +1471,7 @@ Tcl_AppendObjToObj(
 	 */
 
 	TclAppendBytesToByteArray(objPtr,
-		Tcl_GetBytesFromObj(NULL, appendObjPtr, (size_t *)NULL), lengthSrc);
+		Tcl_GetByteArrayFromObj(appendObjPtr, (size_t *)NULL), lengthSrc);
 	return;
     }
 
@@ -3000,7 +3000,7 @@ TclStringRepeat(
 	    done *= 2;
 	}
 	TclAppendBytesToByteArray(objResultPtr,
-		Tcl_GetBytesFromObj(NULL, objResultPtr, (size_t *)NULL),
+		Tcl_GetByteArrayFromObj(objResultPtr, (size_t *)NULL),
 		(count - done) * length);
     } else if (unichar) {
 	/*
@@ -3884,7 +3884,7 @@ TclStringReverse(
 	if (!inPlace || Tcl_IsShared(objPtr)) {
 	    objPtr = Tcl_NewByteArrayObj(NULL, numBytes);
 	}
-	ReverseBytes(Tcl_GetBytesFromObj(NULL, objPtr, (size_t *)NULL), from, numBytes);
+	ReverseBytes(Tcl_GetByteArrayFromObj(objPtr, (size_t *)NULL), from, numBytes);
 	return objPtr;
     }
 
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index c7bf4f9..45f65fe 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -2409,7 +2409,7 @@ ZipFSMkKeyObjCmd(
     }
 
     passObj = Tcl_NewByteArrayObj(NULL, 264);
-    passBuf = Tcl_GetBytesFromObj(NULL, passObj, (size_t *)NULL);
+    passBuf = Tcl_GetByteArrayFromObj(passObj, (size_t *)NULL);
     while (len > 0) {
 	int ch = pw[len - 1];
 
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 1077b7c..5a6dbc4 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -597,6 +597,9 @@ SetInflateDictionary(
 	size_t length = 0;
 	unsigned char *bytes = Tcl_GetByteArrayFromObj(compDictObj, &length);
 
+	if (bytes == NULL) {
+	    return Z_DATA_ERROR;
+	}
 	return inflateSetDictionary(strm, bytes, length);
     }
     return Z_OK;
@@ -611,6 +614,9 @@ SetDeflateDictionary(
 	size_t length = 0;
 	unsigned char *bytes = Tcl_GetByteArrayFromObj(compDictObj, &length);
 
+	if (bytes == NULL) {
+	    return Z_DATA_ERROR;
+	}
 	return deflateSetDictionary(strm, bytes, length);
     }
     return Z_OK;
@@ -1154,7 +1160,7 @@ Tcl_ZlibStreamSetCompressionDictionary(
 {
     ZlibStreamHandle *zshPtr = (ZlibStreamHandle *) zshandle;
 
-    if (compressionDictionaryObj && (NULL == Tcl_GetBytesFromObj(NULL,
+    if (compressionDictionaryObj && (NULL == Tcl_GetByteArrayFromObj(
 	    compressionDictionaryObj, (size_t *)NULL))) {
 	/* Missing or invalid compression dictionary */
 	compressionDictionaryObj = NULL;
@@ -3722,7 +3728,7 @@ ZlibStackChannelTransform(
     if (compDictObj != NULL) {
 	cd->compDictObj = Tcl_DuplicateObj(compDictObj);
 	Tcl_IncrRefCount(cd->compDictObj);
-	Tcl_GetBytesFromObj(NULL, cd->compDictObj, (size_t *)NULL);
+	Tcl_GetByteArrayFromObj(cd->compDictObj, (size_t *)NULL);
     }
 
     if (format == TCL_ZLIB_FORMAT_RAW) {
-- 
cgit v0.12


From ec4cf7a9950b3987b1736ee072b787c0b5494d7f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Nov 2022 16:16:53 +0000
Subject: Use some more TCL_INDEX_NONE and Tcl_Size

---
 macosx/tclMacOSXFCmd.c |  2 +-
 win/tclWinFCmd.c       | 20 ++++++------
 win/tclWinFile.c       | 47 +++++++++++++--------------
 win/tclWinLoad.c       | 14 ++++----
 win/tclWinPipe.c       | 88 ++++++++++++++++++++++++++------------------------
 win/tclWinSock.c       |  8 ++---
 6 files changed, 90 insertions(+), 89 deletions(-)

diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 02e57f1..60cb7f3 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -708,7 +708,7 @@ UpdateStringOfOSType(
     src[4] = '\0';
 
     encoding = Tcl_GetEncoding(NULL, "macRoman");
-    Tcl_ExternalToUtf(NULL, encoding, src, -1, /* flags */ 0,
+    Tcl_ExternalToUtf(NULL, encoding, src, TCL_INDEX_NONE, /* flags */ 0,
 	    /* statePtr */ NULL, dst, size, /* srcReadPtr */ NULL,
 	    /* dstWrotePtr */ &written, /* dstCharsPtr */ NULL);
     Tcl_FreeEncoding(encoding);
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 656db04..7f8cfd1 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -915,8 +915,8 @@ TclpObjCopyDirectory(
 
     Tcl_DStringInit(&srcString);
     Tcl_DStringInit(&dstString);
-    Tcl_UtfToWCharDString(Tcl_GetString(normSrcPtr), -1, &srcString);
-    Tcl_UtfToWCharDString(Tcl_GetString(normDestPtr), -1, &dstString);
+    Tcl_UtfToWCharDString(TclGetString(normSrcPtr), TCL_INDEX_NONE, &srcString);
+    Tcl_UtfToWCharDString(TclGetString(normDestPtr), TCL_INDEX_NONE, &dstString);
 
     ret = TraverseWinTree(TraversalCopy, &srcString, &dstString, &ds);
 
@@ -989,7 +989,7 @@ TclpObjRemoveDirectory(
 	    return TCL_ERROR;
 	}
 	Tcl_DStringInit(&native);
-	Tcl_UtfToWCharDString(Tcl_GetString(normPtr), -1, &native);
+	Tcl_UtfToWCharDString(TclGetString(normPtr), TCL_INDEX_NONE, &native);
 	ret = DoRemoveDirectory(&native, recursive, &ds);
 	Tcl_DStringFree(&native);
     } else {
@@ -1732,7 +1732,7 @@ ConvertFileNameFormat(
 	}
     }
 
-    *attributePtrPtr = Tcl_FSJoinPath(splitPath, -1);
+    *attributePtrPtr = Tcl_FSJoinPath(splitPath, TCL_INDEX_NONE);
 
     if (splitPath != NULL) {
 	/*
@@ -2008,9 +2008,9 @@ TclpCreateTemporaryDirectory(
 	    goto useSystemTemp;
 	}
 	Tcl_DStringInit(&base);
-	Tcl_UtfToWCharDString(Tcl_GetString(dirObj), -1, &base);
+	Tcl_UtfToWCharDString(Tcl_GetString(dirObj), TCL_INDEX_NONE, &base);
 	if (dirObj->bytes[dirObj->length - 1] != '\\') {
-	    Tcl_UtfToWCharDString("\\", -1, &base);
+	    Tcl_UtfToWCharDString("\\", TCL_INDEX_NONE, &base);
 	}
     } else {
     useSystemTemp:
@@ -2026,11 +2026,11 @@ TclpCreateTemporaryDirectory(
 #define SUFFIX_LENGTH	8
 
     if (basenameObj) {
-	Tcl_UtfToWCharDString(Tcl_GetString(basenameObj), -1, &base);
+	Tcl_UtfToWCharDString(Tcl_GetString(basenameObj), TCL_INDEX_NONE, &base);
     } else {
-	Tcl_UtfToWCharDString(DEFAULT_TEMP_DIR_PREFIX, -1, &base);
+	Tcl_UtfToWCharDString(DEFAULT_TEMP_DIR_PREFIX, TCL_INDEX_NONE, &base);
     }
-    Tcl_UtfToWCharDString("_", -1, &base);
+    Tcl_UtfToWCharDString("_", TCL_INDEX_NONE, &base);
 
     /*
      * Now we keep on trying random suffixes until we get one that works
@@ -2057,7 +2057,7 @@ TclpCreateTemporaryDirectory(
 	    tempbuf[i] = randChars[(int) (rand() % numRandChars)];
 	}
 	Tcl_DStringSetLength(&base, baseLen);
-	Tcl_UtfToWCharDString(tempbuf, -1, &base);
+	Tcl_UtfToWCharDString(tempbuf, TCL_INDEX_NONE, &base);
     } while (!CreateDirectoryW((LPCWSTR) Tcl_DStringValue(&base), NULL)
 	    && (error = GetLastError()) == ERROR_ALREADY_EXISTS);
 
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 16c1d59..7e0a763 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -170,7 +170,7 @@ static int		NativeWriteReparse(const WCHAR *LinkDirectory,
 static int		NativeMatchType(int isDrive, DWORD attr,
 			    const WCHAR *nativeName, Tcl_GlobTypeData *types);
 static int		WinIsDrive(const char *name, size_t nameLen);
-static int		WinIsReserved(const char *path);
+static Tcl_Size		WinIsReserved(const char *path);
 static Tcl_Obj *	WinReadLink(const WCHAR *LinkSource);
 static Tcl_Obj *	WinReadLinkDirectory(const WCHAR *LinkDirectory);
 static int		WinLink(const WCHAR *LinkSource,
@@ -938,9 +938,9 @@ TclpMatchInDirectory(
 	     * Match a single file directly.
 	     */
 
-	    int len;
 	    DWORD attr;
 	    WIN32_FILE_ATTRIBUTE_DATA data;
+	    Tcl_Size len = 0;
 	    const char *str = TclGetStringFromObj(norm, &len);
 
 	    native = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
@@ -951,7 +951,7 @@ TclpMatchInDirectory(
 	    }
 	    attr = data.dwFileAttributes;
 
-	    if (NativeMatchType(WinIsDrive(str,len), attr, native, types)) {
+	    if (NativeMatchType(WinIsDrive(str, len), attr, native, types)) {
 		Tcl_ListObjAppendElement(interp, resultPtr, pathPtr);
 	    }
 	}
@@ -962,7 +962,7 @@ TclpMatchInDirectory(
 	WIN32_FIND_DATAW data;
 	const char *dirName;	/* UTF-8 dir name, later with pattern
 				 * appended. */
-	int dirLength;
+	Tcl_Size dirLength;
 	int matchSpecialDots;
 	Tcl_DString ds;		/* Native encoding of dir, also used
 				 * temporarily for other things. */
@@ -1030,7 +1030,7 @@ TclpMatchInDirectory(
 	}
 
 	Tcl_DStringInit(&ds);
-	native = Tcl_UtfToWCharDString(dirName, -1, &ds);
+	native = Tcl_UtfToWCharDString(dirName, TCL_INDEX_NONE, &ds);
 	if ((types == NULL) || (types->type != TCL_GLOB_TYPE_DIR)) {
 	    handle = FindFirstFileW(native, &data);
 	} else {
@@ -1245,7 +1245,7 @@ WinIsDrive(
  * (not any trailing :).
  */
 
-static int
+static Tcl_Size
 WinIsReserved(
     const char *path)		/* Path in UTF-8 */
 {
@@ -1477,7 +1477,7 @@ TclpGetUserHome(
 	Tcl_DStringFree(&ds);
     } else {
 	Tcl_DStringInit(&ds);
-	wName = Tcl_UtfToWCharDString(domain + 1, -1, &ds);
+	wName = Tcl_UtfToWCharDString(domain + 1, TCL_INDEX_NONE, &ds);
 	rc = NetGetDCName(NULL, wName, (LPBYTE *) &wDomain);
 	Tcl_DStringFree(&ds);
 	nameLen = domain - name;
@@ -2362,9 +2362,9 @@ FromCTime(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpGetNativeCwd(
-    ClientData clientData)
+    void *clientData)
 {
     WCHAR buffer[MAX_PATH];
 
@@ -2585,17 +2585,17 @@ TclpObjNormalizePath(
 		 */
 
 		if (isDrive) {
-		    int len = WinIsReserved(path);
+		    Tcl_Size len = WinIsReserved(path);
 
 		    if (len > 0) {
 			/*
 			 * Actually it does exist - COM1, etc.
 			 */
 
-			int i;
+			Tcl_Size i;
 
 			for (i=0 ; i<len ; i++) {
-			    WCHAR wc = ((WCHAR *) nativePath)[i];
+			    WCHAR wc = ((WCHAR *)nativePath)[i];
 
 			    if (wc >= 'a') {
 				wc -= ('a' - 'A');
@@ -2604,7 +2604,7 @@ TclpObjNormalizePath(
 			}
 			Tcl_DStringAppend(&dsNorm,
 				(const char *)nativePath,
-				(int)(sizeof(WCHAR) * len));
+				sizeof(WCHAR) * len);
 			lastValidPathEnd = currentPathEndPosition;
 		    } else if (nextCheckpoint == 0) {
 			/*
@@ -2820,8 +2820,8 @@ TclpObjNormalizePath(
 	     * Not the end of the string.
 	     */
 
-	    int len;
 	    Tcl_Obj *tmpPathPtr;
+	    Tcl_Size len;
 
 	    tmpPathPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds),
 		    nextCheckpoint);
@@ -2910,7 +2910,7 @@ TclWinVolumeRelativeNormalize(
 	 * also on drive C.
 	 */
 
-	int cwdLen;
+	Tcl_Size cwdLen;
 	const char *drive = TclGetStringFromObj(useThisCwd, &cwdLen);
 	char drive_cur = path[0];
 
@@ -2980,11 +2980,11 @@ TclWinVolumeRelativeNormalize(
 
 Tcl_Obj *
 TclpNativeToNormalized(
-    ClientData clientData)
+    void *clientData)
 {
     Tcl_DString ds;
     Tcl_Obj *objPtr;
-    int len;
+    Tcl_Size len;
     char *copy, *p;
 
     Tcl_DStringInit(&ds);
@@ -3040,14 +3040,14 @@ TclpNativeToNormalized(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclNativeCreateNativeRep(
     Tcl_Obj *pathPtr)
 {
     WCHAR *nativePathPtr = NULL;
     const char *str;
     Tcl_Obj *validPathPtr;
-    size_t len;
+    Tcl_Size len;
     WCHAR *wp;
 
     if (TclFSCwdIsNative()) {
@@ -3084,10 +3084,9 @@ TclNativeCreateNativeRep(
 	Tcl_IncrRefCount(validPathPtr);
     }
 
-    str = Tcl_GetString(validPathPtr);
-    len = validPathPtr->length;
+    str = TclGetStringFromObj(validPathPtr, &len);
 
-    if (strlen(str) != len) {
+    if (strlen(str) != (size_t)len) {
 	/*
 	 * String contains NUL-bytes. This is invalid.
 	 */
@@ -3202,9 +3201,9 @@ TclNativeCreateNativeRep(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclNativeDupInternalRep(
-    ClientData clientData)
+    void *clientData)
 {
     char *copy;
     size_t len;
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index 2106343..df49337 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -98,7 +98,7 @@ TclpDlopen(
 		ERROR_MOD_NOT_FOUND : GetLastError();
 
 	Tcl_DStringInit(&ds);
-	nativeName = Tcl_UtfToWCharDString(Tcl_GetString(pathPtr), -1, &ds);
+	nativeName = Tcl_UtfToWCharDString(TclGetString(pathPtr), TCL_INDEX_NONE, &ds);
 	hInstance = LoadLibraryExW(nativeName, NULL,
 		LOAD_WITH_ALTERED_SEARCH_PATH);
 	Tcl_DStringFree(&ds);
@@ -139,31 +139,31 @@ TclpDlopen(
 		Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_NOT_FOUND", NULL);
 	    notFoundMsg:
 		Tcl_AppendToObj(errMsg, "this library or a dependent library"
-			" could not be found in library path", -1);
+			" could not be found in library path", TCL_INDEX_NONE);
 		break;
 	    case ERROR_PROC_NOT_FOUND:
 		Tcl_SetErrorCode(interp, "WIN_LOAD", "PROC_NOT_FOUND", NULL);
 		Tcl_AppendToObj(errMsg, "A function specified in the import"
 			" table could not be resolved by the system. Windows"
-			" is not telling which one, I'm sorry.", -1);
+			" is not telling which one, I'm sorry.", TCL_INDEX_NONE);
 		break;
 	    case ERROR_INVALID_DLL:
 		Tcl_SetErrorCode(interp, "WIN_LOAD", "INVALID_DLL", NULL);
 		Tcl_AppendToObj(errMsg, "this library or a dependent library"
-			" is damaged", -1);
+			" is damaged", TCL_INDEX_NONE);
 		break;
 	    case ERROR_DLL_INIT_FAILED:
 		Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_INIT_FAILED", NULL);
 		Tcl_AppendToObj(errMsg, "the library initialization"
-			" routine failed", -1);
+			" routine failed", TCL_INDEX_NONE);
 		break;
             case ERROR_BAD_EXE_FORMAT:
 		Tcl_SetErrorCode(interp, "WIN_LOAD", "BAD_EXE_FORMAT", NULL);
-		Tcl_AppendToObj(errMsg, "Bad exe format. Possibly a 32/64-bit mismatch.", -1);
+		Tcl_AppendToObj(errMsg, "Bad exe format. Possibly a 32/64-bit mismatch.", TCL_INDEX_NONE);
                 break;
             default:
 		Tcl_WinConvertError(lastError);
-		Tcl_AppendToObj(errMsg, Tcl_PosixError(interp), -1);
+		Tcl_AppendToObj(errMsg, Tcl_PosixError(interp), TCL_INDEX_NONE);
 	    }
 	    Tcl_SetObjResult(interp, errMsg);
 	}
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 4a84038..6f9a8db 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -104,7 +104,7 @@ typedef struct PipeInfo {
     TclFile readFile;		/* Output from pipe. */
     TclFile writeFile;		/* Input from pipe. */
     TclFile errorFile;		/* Error output from pipe. */
-    int numPids;		/* Number of processes attached to pipe. */
+    Tcl_Size numPids;		/* Number of processes attached to pipe. */
     Tcl_Pid *pidPtr;		/* Pids of attached processes. */
     Tcl_ThreadId threadId;	/* Thread to which events should be reported.
 				 * This value is used by the reader/writer
@@ -171,28 +171,28 @@ typedef struct {
 
 static int		ApplicationType(Tcl_Interp *interp,
 			    const char *fileName, char *fullName);
-static void		BuildCommandLine(const char *executable, int argc,
+static void		BuildCommandLine(const char *executable, Tcl_Size argc,
 			    const char **argv, Tcl_DString *linePtr);
 static BOOL		HasConsole(void);
-static int		PipeBlockModeProc(ClientData instanceData, int mode);
-static void		PipeCheckProc(ClientData clientData, int flags);
-static int		PipeClose2Proc(ClientData instanceData,
+static int		PipeBlockModeProc(void *instanceData, int mode);
+static void		PipeCheckProc(void *clientData, int flags);
+static int		PipeClose2Proc(void *instanceData,
 			    Tcl_Interp *interp, int flags);
 static int		PipeEventProc(Tcl_Event *evPtr, int flags);
-static int		PipeGetHandleProc(ClientData instanceData,
-			    int direction, ClientData *handlePtr);
+static int		PipeGetHandleProc(void *instanceData,
+			    int direction, void **handlePtr);
 static void		PipeInit(void);
-static int		PipeInputProc(ClientData instanceData, char *buf,
+static int		PipeInputProc(void *instanceData, char *buf,
 			    int toRead, int *errorCode);
-static int		PipeOutputProc(ClientData instanceData,
+static int		PipeOutputProc(void *instanceData,
 			    const char *buf, int toWrite, int *errorCode);
 static DWORD WINAPI	PipeReaderThread(LPVOID arg);
-static void		PipeSetupProc(ClientData clientData, int flags);
-static void		PipeWatchProc(ClientData instanceData, int mask);
+static void		PipeSetupProc(void *clientData, int flags);
+static void		PipeWatchProc(void *instanceData, int mask);
 static DWORD WINAPI	PipeWriterThread(LPVOID arg);
 static int		TempFileName(WCHAR name[MAX_PATH]);
 static int		WaitForRead(PipeInfo *infoPtr, int blocking);
-static void		PipeThreadActionProc(ClientData instanceData,
+static void		PipeThreadActionProc(void *instanceData,
 			    int action);
 
 /*
@@ -310,7 +310,7 @@ TclpFinalizePipes(void)
 
 void
 PipeSetupProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     PipeInfo *infoPtr;
@@ -363,7 +363,7 @@ PipeSetupProc(
 
 static void
 PipeCheckProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     PipeInfo *infoPtr;
@@ -500,7 +500,7 @@ TclpMakeFile(
     HANDLE handle;
 
     if (Tcl_GetChannelHandle(channel, direction,
-	    (ClientData *) &handle) == TCL_OK) {
+	    (void **) &handle) == TCL_OK) {
 	return TclWinMakeFile(handle);
     } else {
 	return (TclFile) NULL;
@@ -578,7 +578,7 @@ TclpOpenFile(
     }
 
     Tcl_DStringInit(&ds);
-    nativePath = Tcl_UtfToWCharDString(path, -1, &ds);
+    nativePath = Tcl_UtfToWCharDString(path, TCL_INDEX_NONE, &ds);
 
     /*
      * If the file is not being created, use the existing file attributes.
@@ -851,7 +851,7 @@ TclpCloseFile(
  * Results:
  *	Returns the process id for the child process. If the pid was not known
  *	by Tcl, either because the pid was not created by Tcl or the child
- *	process has already been reaped, -1 is returned.
+ *	process has already been reaped, TCL_INDEX_NONE is returned.
  *
  * Side effects:
  *	None.
@@ -859,7 +859,7 @@ TclpCloseFile(
  *--------------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 TclpGetPid(
     Tcl_Pid pid)		/* The HANDLE of the child process. */
 {
@@ -869,13 +869,13 @@ TclpGetPid(
 
     Tcl_MutexLock(&pipeMutex);
     for (infoPtr = procList; infoPtr != NULL; infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->dwProcessId == (DWORD) (size_t) pid) {
+	if (infoPtr->dwProcessId == (DWORD)(size_t)pid) {
 	    Tcl_MutexUnlock(&pipeMutex);
 	    return infoPtr->dwProcessId;
 	}
     }
     Tcl_MutexUnlock(&pipeMutex);
-    return (unsigned long) -1;
+    return TCL_INDEX_NONE;
 }
 
 /*
@@ -911,7 +911,7 @@ TclpCreateProcess(
 				 * occurred when creating the child process.
 				 * Error messages from the child process
 				 * itself are sent to errorFile. */
-    int argc,			/* Number of arguments in following array. */
+    Tcl_Size argc,			/* Number of arguments in following array. */
     const char **argv,		/* Array of argument strings. argv[0] contains
 				 * the name of the executable converted to
 				 * native format (using the
@@ -1536,13 +1536,14 @@ static void
 BuildCommandLine(
     const char *executable,	/* Full path of executable (including
 				 * extension). Replacement for argv[0]. */
-    int argc,			/* Number of arguments. */
+    Tcl_Size argc,			/* Number of arguments. */
     const char **argv,		/* Argument strings in UTF. */
     Tcl_DString *linePtr)	/* Initialized Tcl_DString that receives the
 				 * command line (WCHAR). */
 {
     const char *arg, *start, *special, *bspos;
-    int quote = 0, i;
+    int quote = 0;
+    Tcl_Size i;
     Tcl_DString ds;
     static const char specMetaChars[] = "&|^<>!()%";
 				/* Characters to enclose in quotes if unpaired
@@ -1759,7 +1760,7 @@ TclpCreateCommandChannel(
     TclFile writeFile,		/* If non-null, gives the file for writing. */
     TclFile errorFile,		/* If non-null, gives the file where errors
 				 * can be read. */
-    int numPids,		/* The number of pids in the pid array. */
+    Tcl_Size numPids,		/* The number of pids in the pid array. */
     Tcl_Pid *pidPtr)		/* An array of process identifiers. */
 {
     char channelName[16 + TCL_INTEGER_SPACE];
@@ -1872,10 +1873,10 @@ Tcl_CreatePipe(
 	return TCL_ERROR;
     }
 
-    *rchan = Tcl_MakeFileChannel((ClientData) readHandle, TCL_READABLE);
+    *rchan = Tcl_MakeFileChannel((void *) readHandle, TCL_READABLE);
     Tcl_RegisterChannel(interp, *rchan);
 
-    *wchan = Tcl_MakeFileChannel((ClientData) writeHandle, TCL_WRITABLE);
+    *wchan = Tcl_MakeFileChannel((void *) writeHandle, TCL_WRITABLE);
     Tcl_RegisterChannel(interp, *wchan);
 
     return TCL_OK;
@@ -1906,7 +1907,7 @@ TclGetAndDetachPids(
     PipeInfo *pipePtr;
     const Tcl_ChannelType *chanTypePtr;
     Tcl_Obj *pidsObj;
-    int i;
+    Tcl_Size i;
 
     /*
      * Punt if the channel is not a command channel.
@@ -1950,7 +1951,7 @@ TclGetAndDetachPids(
 
 static int
 PipeBlockModeProc(
-    ClientData instanceData,	/* Instance data for channel. */
+    void *instanceData,	/* Instance data for channel. */
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
@@ -1989,7 +1990,7 @@ PipeBlockModeProc(
 
 static int
 PipeClose2Proc(
-    ClientData instanceData,	/* Pointer to PipeInfo structure. */
+    void *instanceData,	/* Pointer to PipeInfo structure. */
     Tcl_Interp *interp,		/* For error reporting. */
     int flags)			/* Flags that indicate which side to close. */
 {
@@ -2112,7 +2113,7 @@ PipeClose2Proc(
 	if (pipePtr->errorFile) {
 	    WinFile *filePtr = (WinFile *) pipePtr->errorFile;
 
-	    errChan = Tcl_MakeFileChannel((ClientData) filePtr->handle,
+	    errChan = Tcl_MakeFileChannel((void *)filePtr->handle,
 		    TCL_READABLE);
 	    ckfree(filePtr);
 	} else {
@@ -2159,7 +2160,7 @@ PipeClose2Proc(
 
 static int
 PipeInputProc(
-    ClientData instanceData,	/* Pipe state. */
+    void *instanceData,	/* Pipe state. */
     char *buf,			/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -2253,7 +2254,7 @@ PipeInputProc(
 
 static int
 PipeOutputProc(
-    ClientData instanceData,	/* Pipe state. */
+    void *instanceData,	/* Pipe state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -2435,7 +2436,7 @@ PipeEventProc(
 
 static void
 PipeWatchProc(
-    ClientData instanceData,	/* Pipe state. */
+    void *instanceData,	/* Pipe state. */
     int mask)			/* What events to watch for, OR-ed combination
 				 * of TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -2497,21 +2498,21 @@ PipeWatchProc(
 
 static int
 PipeGetHandleProc(
-    ClientData instanceData,	/* The pipe state. */
+    void *instanceData,	/* The pipe state. */
     int direction,		/* TCL_READABLE or TCL_WRITABLE */
-    ClientData *handlePtr)	/* Where to store the handle.  */
+    void **handlePtr)	/* Where to store the handle.  */
 {
     PipeInfo *infoPtr = (PipeInfo *) instanceData;
     WinFile *filePtr;
 
     if (direction == TCL_READABLE && infoPtr->readFile) {
 	filePtr = (WinFile*) infoPtr->readFile;
-	*handlePtr = (ClientData) filePtr->handle;
+	*handlePtr = (void *) filePtr->handle;
 	return TCL_OK;
     }
     if (direction == TCL_WRITABLE && infoPtr->writeFile) {
 	filePtr = (WinFile*) infoPtr->writeFile;
-	*handlePtr = (ClientData) filePtr->handle;
+	*handlePtr = (void *) filePtr->handle;
 	return TCL_OK;
     }
     return TCL_ERROR;
@@ -2742,7 +2743,7 @@ TclWinAddProcess(
 
 int
 Tcl_PidObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const *objv)	/* Argument strings. */
@@ -2750,7 +2751,7 @@ Tcl_PidObjCmd(
     Tcl_Channel chan;
     const Tcl_ChannelType *chanTypePtr;
     PipeInfo *pipePtr;
-    int i;
+    Tcl_Size i;
     Tcl_Obj *resultPtr;
 
     if (objc > 2) {
@@ -3136,7 +3137,7 @@ PipeWriterThread(
 
 static void
 PipeThreadActionProc(
-    ClientData instanceData,
+    void *instanceData,
     int action)
 {
     PipeInfo *infoPtr = (PipeInfo *) instanceData;
@@ -3197,7 +3198,8 @@ TclpOpenTemporaryFile(
     char *namePtr;
     HANDLE handle;
     DWORD flags = FILE_ATTRIBUTE_TEMPORARY;
-    int length, counter, counter2;
+    Tcl_Size length;
+    int counter, counter2;
     Tcl_DString buf;
 
     if (!resultingNameObj) {
@@ -3256,7 +3258,7 @@ TclpOpenTemporaryFile(
 	TclDecrRefCount(tmpObj);
     }
 
-    return Tcl_MakeFileChannel((ClientData) handle,
+    return Tcl_MakeFileChannel((void *) handle,
 	    TCL_READABLE|TCL_WRITABLE);
 
   gotError:
@@ -3280,7 +3282,7 @@ TclpOpenTemporaryFile(
 TclPipeThreadInfo *
 TclPipeThreadCreateTI(
     TclPipeThreadInfo **pipeTIPtr,
-    ClientData clientData,
+    void *clientData,
     HANDLE wakeEvent)
 {
     TclPipeThreadInfo *pipeTI;
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index ef01fa8..b349d0d 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -349,7 +349,7 @@ printaddrinfolist(
 void
 InitializeHostName(
     char **valuePtr,
-    unsigned int *lengthPtr,
+    TCL_HASH_TYPE *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     WCHAR wbuf[256];
@@ -1256,7 +1256,7 @@ TcpGetOptionProc(
 
 		if (statePtr->connectError != 0) {
 		    Tcl_DStringAppend(dsPtr,
-			    Tcl_ErrnoMsg(statePtr->connectError), -1);
+			    Tcl_ErrnoMsg(statePtr->connectError), TCL_INDEX_NONE);
 		    statePtr->connectError = 0;
 		}
 	    } else {
@@ -1291,7 +1291,7 @@ TcpGetOptionProc(
 
 		if (err) {
 		    Tcl_WinConvertError(err);
-		    Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(Tcl_GetErrno()), -1);
+		    Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(Tcl_GetErrno()), TCL_INDEX_NONE);
 		}
 	    }
 	}
@@ -1302,7 +1302,7 @@ TcpGetOptionProc(
 	    (strncmp(optionName, "-connecting", len) == 0)) {
 	Tcl_DStringAppend(dsPtr,
 		GOT_BITS(statePtr->flags, TCP_ASYNC_PENDING)
-		? "1" : "0", -1);
+		? "1" : "0", TCL_INDEX_NONE);
         return TCL_OK;
     }
 
-- 
cgit v0.12


From a4ac44fccc008eb38b43511905b3797f9b0274df Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Nov 2022 17:43:12 +0000
Subject: Fix gcc warning, seen on Ubuntu with select notifier

---
 unix/tclSelectNotfy.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c
index 732e4c9..fc77e77 100644
--- a/unix/tclSelectNotfy.c
+++ b/unix/tclSelectNotfy.c
@@ -938,7 +938,10 @@ TclAsyncNotifier(
 	    *flagPtr = value;
 	    if (!asyncPending) {
 		asyncPending = 1;
-		write(triggerPipe, "S", 1);
+		if (write(triggerPipe, "S", 1) != 1) {
+		    asyncPending = 0;
+		    return 0;
+		};
 	    }
 	    return 1;
 	}
-- 
cgit v0.12


From 21920649b543f44f48eea83bd8d781282ce05dbf Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Nov 2022 21:04:48 +0000
Subject: Move Tcl_Size definition earlier in tcl.h

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

diff --git a/generic/tcl.h b/generic/tcl.h
index 580397d..68d6719 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -311,6 +311,12 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
 #define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
 
+#if TCL_MAJOR_VERSION > 8
+typedef size_t Tcl_Size;
+#else
+typedef int Tcl_Size;
+#endif
+
 #ifdef _WIN32
 #   if TCL_MAJOR_VERSION > 8
 	typedef struct __stat64 Tcl_StatBuf;
@@ -668,12 +674,6 @@ typedef union Tcl_ObjInternalRep {	/* The internal representation: */
  * An object stores a value as either a string, some internal representation,
  * or both.
  */
-#if TCL_MAJOR_VERSION > 8
-typedef size_t Tcl_Size;
-#else
-typedef int Tcl_Size;
-#endif
-
 
 typedef struct Tcl_Obj {
     Tcl_Size refCount;		/* When 0 the object will be freed. */
@@ -688,7 +688,7 @@ typedef struct Tcl_Obj {
 				 * should use Tcl_GetStringFromObj or
 				 * Tcl_GetString to get a pointer to the byte
 				 * array as a readonly value. */
-    Tcl_Size length;			/* The number of bytes at *bytes, not
+    Tcl_Size length;		/* The number of bytes at *bytes, not
 				 * including the terminating null. */
     const Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
 				 * corresponds to the type of the object's
-- 
cgit v0.12


From 191fa0458a0d2c822b73cbfb8c63752461ac9ce5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Nov 2022 08:29:06 +0000
Subject: Handle closeProc == NULL the same as closeProc == TCL_CLOSE2PROC in
 stead of panicing. Backported from 8.7 (undocumented feature)

---
 generic/tclIO.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index d228d50..85ff39b 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -358,7 +358,7 @@ ChanClose(
     Channel *chanPtr,
     Tcl_Interp *interp)
 {
-    if (chanPtr->typePtr->closeProc != TCL_CLOSE2PROC) {
+    if ((chanPtr->typePtr->closeProc != TCL_CLOSE2PROC) && (chanPtr->typePtr->closeProc != NULL)) {
 	return chanPtr->typePtr->closeProc(chanPtr->instanceData, interp);
     } else {
 	return chanPtr->typePtr->close2Proc(chanPtr->instanceData, interp, 0);
@@ -1602,8 +1602,8 @@ Tcl_CreateChannel(
 
     assert(sizeof(Tcl_ChannelTypeVersion) == sizeof(Tcl_DriverBlockModeProc *));
     assert(typePtr->typeName != NULL);
-    if (NULL == typePtr->closeProc) {
-	Tcl_Panic("channel type %s must define closeProc", typePtr->typeName);
+    if (((NULL == typePtr->closeProc) || (TCL_CLOSE2PROC == typePtr->closeProc)) && (typePtr->close2Proc == NULL)) {
+	Tcl_Panic("channel type %s must define closeProc or close2Proc", typePtr->typeName);
     }
     if ((TCL_READABLE & mask) && (NULL == typePtr->inputProc)) {
 	Tcl_Panic("channel type %s must define inputProc when used for reader channel", typePtr->typeName);
@@ -3460,9 +3460,9 @@ Tcl_Close(
      * it anymore and this will help avoid deadlocks on some channel types.
      */
 
-    if (chanPtr->typePtr->closeProc == TCL_CLOSE2PROC) {
-	result = chanPtr->typePtr->close2Proc(chanPtr->instanceData, interp,
-		TCL_CLOSE_READ);
+    if ((chanPtr->typePtr->closeProc == TCL_CLOSE2PROC) || (chanPtr->typePtr->closeProc == NULL)) {
+	/* If this half-close gives a EINVAL or ENOTCONN, just continue the full close */
+	result = chanPtr->typePtr->close2Proc(chanPtr->instanceData, interp, TCL_CLOSE_READ);
 	if ((result == EINVAL) || result == ENOTCONN) {
 	    result = 0;
 	}
-- 
cgit v0.12


From 66e2117d2071a5ffe2c16ef8ff2ff39d6172b05b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Nov 2022 10:01:00 +0000
Subject: Unbreak Windows build. More int -> size_t, being able to handle
 longer strings

---
 generic/tclArithSeries.c |  6 +++---
 generic/tclBasic.c       |  4 ++--
 generic/tclZipfs.c       | 43 +++++++++++++++++++++++--------------------
 win/tclWinFile.c         |  2 +-
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 3fa9792..befe19e 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -578,14 +578,14 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
     Tcl_Obj *elemObj;
     Tcl_WideInt i;
     Tcl_WideInt length = 0;
-    int slen;
+    size_t slen;
 
     /*
      * Pass 1: estimate space.
      */
     for (i = 0; i < arithSeriesRepPtr->len; i++) {
 	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
-	elem = TclGetStringFromObj(elemObj, &slen);
+	elem = Tcl_GetStringFromObj(elemObj, &slen);
 	Tcl_DecrRefCount(elemObj);
 	slen += 1; /* + 1 is for the space or the nul-term */
 	length += slen;
@@ -598,7 +598,7 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
     p = Tcl_InitStringRep(arithSeriesPtr, NULL, length);
     for (i = 0; i < arithSeriesRepPtr->len; i++) {
 	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
-	elem = TclGetStringFromObj(elemObj, &slen);
+	elem = Tcl_GetStringFromObj(elemObj, &slen);
 	strcpy(p, elem);
 	p[slen] = ' ';
 	p += slen+1;
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index cd1bfc8..52c35fc 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -621,8 +621,8 @@ buildInfoObjCmd2(
 	return TCL_ERROR;
     }
     if (objc == 2) {
-	int len;
-	const char *arg = TclGetStringFromObj(objv[1], &len);
+	size_t len;
+	const char *arg = Tcl_GetStringFromObj(objv[1], &len);
 	if (len == 7 && !strcmp(arg, "version")) {
 	    char buf[80];
 	    const char *p = strchr((char *)clientData, '.');
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 45f65fe..93ff054 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -669,11 +669,11 @@ ToDosDate(
  *-------------------------------------------------------------------------
  */
 
-static inline int
+static inline size_t
 CountSlashes(
     const char *string)
 {
-    int count = 0;
+    size_t count = 0;
     const char *p = string;
 
     while (*p != '\0') {
@@ -2391,7 +2391,7 @@ ZipFSMkKeyObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int len, i = 0;
+    size_t len, i = 0;
     const char *pw;
     Tcl_Obj *passObj;
     unsigned char *passBuf;
@@ -2400,7 +2400,7 @@ ZipFSMkKeyObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "password");
 	return TCL_ERROR;
     }
-    pw = TclGetStringFromObj(objv[1], &len);
+    pw = Tcl_GetStringFromObj(objv[1], &len);
     if (len == 0) {
 	return TCL_OK;
     }
@@ -2918,16 +2918,16 @@ ComputeNameInArchive(
 				 * archive */
     const char *strip,		/* A prefix to strip; may be NULL if no
 				 * stripping need be done. */
-    int slen)			/* The length of the prefix; must be 0 if no
+    size_t slen)			/* The length of the prefix; must be 0 if no
 				 * stripping need be done. */
 {
     const char *name;
-    int len;
+    size_t len;
 
     if (directNameObj) {
 	name = TclGetString(directNameObj);
     } else {
-	name = TclGetStringFromObj(pathObj, &len);
+	name = Tcl_GetStringFromObj(pathObj, &len);
 	if (slen > 0) {
 	    if ((len <= slen) || (strncmp(strip, name, slen) != 0)) {
 		/*
@@ -2990,8 +2990,8 @@ ZipFSMkZipOrImg(
 				 * there's no password protection. */
 {
     Tcl_Channel out;
-    int pwlen = 0, slen = 0, count, ret = TCL_ERROR;
-    size_t lobjc, len, i = 0;
+    int pwlen = 0, count, ret = TCL_ERROR;
+    size_t slen = 0, lobjc, len, i = 0;
     long long directoryStartOffset;
 				/* The overall file offset of the start of the
 				 * central directory. */
@@ -3169,7 +3169,7 @@ ZipFSMkZipOrImg(
 
     Tcl_InitHashTable(&fileHash, TCL_STRING_KEYS);
     if (mappingList == NULL && stripPrefix != NULL) {
-	strip = TclGetStringFromObj(stripPrefix, &slen);
+	strip = Tcl_GetStringFromObj(stripPrefix, &slen);
 	if (!slen) {
 	    strip = NULL;
 	}
@@ -4998,7 +4998,8 @@ ZipFSMatchInDirectoryProc(
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
     Tcl_Obj *normPathPtr = Tcl_FSGetNormalizedPath(NULL, pathPtr);
-    int scnt, l, dirOnly = -1, prefixLen, strip = 0, mounts = 0, len;
+    int scnt, l, dirOnly = -1, strip = 0, mounts = 0;
+    size_t prefixLen, len;
     char *pat, *prefix, *path;
     Tcl_DString dsPref, *prefixBuf = NULL;
 
@@ -5014,13 +5015,13 @@ ZipFSMatchInDirectoryProc(
      * The prefix that gets prepended to results.
      */
 
-    prefix = TclGetStringFromObj(pathPtr, &prefixLen);
+    prefix = Tcl_GetStringFromObj(pathPtr, &prefixLen);
 
     /*
      * The (normalized) path we're searching.
      */
 
-    path = TclGetStringFromObj(normPathPtr, &len);
+    path = Tcl_GetStringFromObj(normPathPtr, &len);
 
     Tcl_DStringInit(&dsPref);
     if (strcmp(prefix, path) == 0) {
@@ -5134,9 +5135,9 @@ ZipFSMatchMountPoints(
 {
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
-    int l, normLength;
-    const char *path = TclGetStringFromObj(normPathPtr, &normLength);
-    size_t len = (size_t) normLength;
+    size_t l, normLength;
+    const char *path = Tcl_GetStringFromObj(normPathPtr, &normLength);
+    size_t len = normLength;
 
     if (len < 1) {
 	/*
@@ -5215,14 +5216,15 @@ ZipFSPathInFilesystemProc(
 {
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
-    int ret = -1, len;
+    int ret = -1;
+    size_t len;
     char *path;
 
     pathPtr = Tcl_FSGetNormalizedPath(NULL, pathPtr);
     if (!pathPtr) {
 	return -1;
     }
-    path = TclGetStringFromObj(pathPtr, &len);
+    path = Tcl_GetStringFromObj(pathPtr, &len);
     if (strncmp(path, ZIPFS_VOLUME, ZIPFS_VOLUME_LEN) != 0) {
 	return -1;
     }
@@ -5362,7 +5364,8 @@ ZipFSFileAttrsGetProc(
     Tcl_Obj *pathPtr,
     Tcl_Obj **objPtrRef)
 {
-    int len, ret = TCL_OK;
+    size_t len;
+    int ret = TCL_OK;
     char *path;
     ZipEntry *z;
 
@@ -5370,7 +5373,7 @@ ZipFSFileAttrsGetProc(
     if (!pathPtr) {
 	return -1;
     }
-    path = TclGetStringFromObj(pathPtr, &len);
+    path = Tcl_GetStringFromObj(pathPtr, &len);
     ReadLock();
     z = ZipFSLookup(path);
     if (!z) {
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 58ec311..30ca622 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -3065,7 +3065,7 @@ TclNativeCreateNativeRep(
 	Tcl_IncrRefCount(validPathPtr);
     }
 
-    str = TclGetStringFromObj(validPathPtr, &len);
+    str = Tcl_GetStringFromObj(validPathPtr, &len);
 
     if (strlen(str) != (size_t)len) {
 	/*
-- 
cgit v0.12


From 73116e2c54973fea6efc412b979d78999df3a08a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Nov 2022 10:12:32 +0000
Subject: one more int -> size_t

---
 generic/tclZipfs.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 93ff054..48bcd48 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -1515,7 +1515,7 @@ static inline int
 IsPasswordValid(
     Tcl_Interp *interp,
     const char *passwd,
-    int pwlen)
+    size_t pwlen)
 {
     if ((pwlen > 255) || strchr(passwd, 0xff)) {
 	ZIPFS_ERROR(interp, "illegal password");
@@ -1552,8 +1552,8 @@ ZipFSCatalogFilesystem(
 				 * the ZIP is unprotected. */
     const char *zipname)	/* Path to ZIP file to build a catalog of. */
 {
-    int pwlen, isNew;
-    size_t i;
+    int isNew;
+    size_t i, pwlen;
     ZipFile *zf0;
     ZipEntry *z;
     Tcl_HashEntry *hPtr;
@@ -2990,8 +2990,8 @@ ZipFSMkZipOrImg(
 				 * there's no password protection. */
 {
     Tcl_Channel out;
-    int pwlen = 0, count, ret = TCL_ERROR;
-    size_t slen = 0, lobjc, len, i = 0;
+    int count, ret = TCL_ERROR;
+    size_t pwlen = 0, slen = 0, lobjc, len, i = 0;
     long long directoryStartOffset;
 				/* The overall file offset of the start of the
 				 * central directory. */
@@ -3013,13 +3013,12 @@ ZipFSMkZipOrImg(
 
     passBuf[0] = 0;
     if (passwordObj != NULL) {
-	pw = TclGetStringFromObj(passwordObj, &pwlen);
+	pw = Tcl_GetStringFromObj(passwordObj, &pwlen);
 	if (IsPasswordValid(interp, pw, pwlen) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (pwlen <= 0) {
+	if (pwlen == 0) {
 	    pw = NULL;
-	    pwlen = 0;
 	}
     }
     if (dirRoot != NULL) {
-- 
cgit v0.12


From b816a585c00c97feca1b4516769ccf2769a58e02 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Nov 2022 16:11:38 +0000
Subject: Tcl_NewDoubleObj -> TclNewDoubleObj and Tcl_NewWideIntObj ->
 TclNewIntObj (and similar). Gives more info when debugging

---
 generic/tclArithSeries.c |  7 ++++---
 generic/tclClock.c       | 12 +++++++++---
 generic/tclCmdIL.c       |  6 +++---
 generic/tclCmdMZ.c       |  8 ++++----
 generic/tclCompExpr.c    |  2 +-
 generic/tclInt.decls     |  2 +-
 generic/tclIntDecls.h    |  6 +++---
 generic/tclLink.c        |  7 +++----
 generic/tclListObj.c     | 14 ++++----------
 generic/tclScan.c        |  4 ++--
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 5c4e5a5..40f34b5 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -390,9 +390,9 @@ TclArithSeriesObjStep(
     }
     arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesPtr);
     if (arithSeriesRepPtr->isDouble) {
-	*stepObj = Tcl_NewDoubleObj(((ArithSeriesDbl*)(arithSeriesRepPtr))->step);
+	TclNewDoubleObj(*stepObj, ((ArithSeriesDbl*)(arithSeriesRepPtr))->step);
     } else {
-	*stepObj = Tcl_NewWideIntObj(arithSeriesRepPtr->step);
+	TclNewIntObj(*stepObj, arithSeriesRepPtr->step);
     }
     return TCL_OK;
 }
@@ -956,7 +956,8 @@ TclArithSeriesObjReverse(
 
     if (Tcl_IsShared(arithSeriesPtr) ||
 	    ((arithSeriesPtr->refCount > 1))) {
-	Tcl_Obj *lenObj = Tcl_NewWideIntObj(len);
+	Tcl_Obj *lenObj;
+	TclNewIntObj(lenObj, len);
 	if (TclNewArithSeriesObj(interp, &resultObj,
 		 isDouble, startObj, endObj, stepObj, lenObj) != TCL_OK) {
 	    resultObj = NULL;
diff --git a/generic/tclClock.c b/generic/tclClock.c
index a9ba70c..d1f08c1 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -14,6 +14,7 @@
  */
 
 #include "tclInt.h"
+#include "tclTomMath.h"
 
 /*
  * Windows has mktime. The configurators do not check.
@@ -1804,14 +1805,16 @@ ClockMillisecondsObjCmd(
     Tcl_Obj *const *objv)	/* Parameter values */
 {
     Tcl_Time now;
+    Tcl_Obj *timeObj;
 
     if (objc != 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, NULL);
 	return TCL_ERROR;
     }
     Tcl_GetTime(&now);
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt)
-	    now.sec * 1000 + now.usec / 1000));
+    TclNewUIntObj(timeObj, (Tcl_WideUInt)
+	    now.sec * 1000 + now.usec / 1000);
+    Tcl_SetObjResult(interp, timeObj);
     return TCL_OK;
 }
 
@@ -1992,13 +1995,16 @@ ClockSecondsObjCmd(
     Tcl_Obj *const *objv)	/* Parameter values */
 {
     Tcl_Time now;
+    Tcl_Obj *timeObj;
 
     if (objc != 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, NULL);
 	return TCL_ERROR;
     }
     Tcl_GetTime(&now);
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj((Tcl_WideInt) now.sec));
+    TclNewUIntObj(timeObj, (Tcl_WideUInt)now.sec);
+
+    Tcl_SetObjResult(interp, timeObj);
     return TCL_OK;
 }
 
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 4b7bd48..e2493c4 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -3607,7 +3607,7 @@ Tcl_LsearchObjCmd(
 	    if (allMatches || inlineReturn) {
 		Tcl_ResetResult(interp);
 	    } else {
-		TclNewIndexObj(itemPtr, TCL_INDEX_NONE);
+		TclNewIntObj(itemPtr, -1);
 		Tcl_SetObjResult(interp, itemPtr);
 	    }
 	    goto done;
@@ -4103,10 +4103,10 @@ SequenceIdentifyArgument(
 		exprValueObj = argPtr;
 	    } else {
 		if (floor(dvalue) == dvalue) {
-		    exprValueObj = Tcl_NewWideIntObj(value);
+		    TclNewIntObj(exprValueObj, value);
 		    keyword = TCL_NUMBER_INT;
 		} else {
-		    exprValueObj = Tcl_NewDoubleObj(dvalue);
+		    TclNewDoubleObj(exprValueObj, dvalue);
 		    keyword = TCL_NUMBER_DOUBLE;
 		}
 	    }
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index b063689..57541f9 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -3775,7 +3775,7 @@ TclNRSwitchObjCmd(
 		    TclNewIndexObj(rangeObjAry[0], info.matches[j].start);
 		    TclNewIndexObj(rangeObjAry[1], info.matches[j].end-1);
 		} else {
-		    TclNewIndexObj(rangeObjAry[1], TCL_INDEX_NONE);
+		    TclNewIntObj(rangeObjAry[1], -1);
 		    rangeObjAry[0] = rangeObjAry[1];
 		}
 
@@ -4099,9 +4099,9 @@ Tcl_TimeObjCmd(
 	 * Use int obj since we know time is not fractional. [Bug 1202178]
 	 */
 
-	objs[0] = Tcl_NewWideIntObj((count <= 0) ? 0 : (Tcl_WideInt)totalMicroSec);
+	TclNewIntObj(objs[0], (count <= 0) ? 0 : (Tcl_WideInt)totalMicroSec);
     } else {
-	objs[0] = Tcl_NewDoubleObj(totalMicroSec/count);
+	TclNewDoubleObj(objs[0], totalMicroSec/count);
     }
 
     /*
@@ -4586,7 +4586,7 @@ Tcl_TimeRateObjCmd(
 	    if (measureOverhead > ((double) usec) / count) {
 		measureOverhead = ((double) usec) / count;
 	    }
-	    objs[0] = Tcl_NewDoubleObj(measureOverhead);
+	    TclNewDoubleObj(objs[0], measureOverhead);
 	    TclNewLiteralStringObj(objs[1], "\xC2\xB5s/#-overhead"); /* mics */
 	    objs += 2;
 	}
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 06b4b05..ded32aa 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2787,7 +2787,7 @@ TclVariadicOpCmd(
 	    nodes[1].p.parent = 0;
 	} else {
 	    if (lexeme == DIVIDE) {
-		litObjv[0] = Tcl_NewDoubleObj(1.0);
+		TclNewDoubleObj(litObjv[0], 1.0);
 	    } else {
 		TclNewIntObj(litObjv[0], occdPtr->i.identity);
 	    }
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index c0e0e06..b3e352a 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -701,7 +701,7 @@ declare 258 {
 
 # TIP 625: for unit testing - create list objects with span
 declare 260 {
-    Tcl_Obj *TclListTestObj(int length, int leadingSpace, int endSpace)
+    Tcl_Obj *TclListTestObj(Tcl_Size length, Tcl_Size leadingSpace, Tcl_Size endSpace)
 }
 
 # TIP 625: for unit testing - check list invariants
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 3da8567..4c8d897 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -660,8 +660,8 @@ EXTERN Tcl_Obj *	TclpCreateTemporaryDirectory(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj);
 /* Slot 259 is reserved */
 /* 260 */
-EXTERN Tcl_Obj *	TclListTestObj(int length, int leadingSpace,
-				int endSpace);
+EXTERN Tcl_Obj *	TclListTestObj(Tcl_Size length,
+				Tcl_Size leadingSpace, Tcl_Size endSpace);
 /* 261 */
 EXTERN void		TclListObjValidate(Tcl_Interp *interp,
 				Tcl_Obj *listObj);
@@ -930,7 +930,7 @@ typedef struct TclIntStubs {
     void (*tclStaticLibrary) (Tcl_Interp *interp, const char *prefix, Tcl_LibraryInitProc *initProc, Tcl_LibraryInitProc *safeInitProc); /* 257 */
     Tcl_Obj * (*tclpCreateTemporaryDirectory) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj); /* 258 */
     void (*reserved259)(void);
-    Tcl_Obj * (*tclListTestObj) (int length, int leadingSpace, int endSpace); /* 260 */
+    Tcl_Obj * (*tclListTestObj) (Tcl_Size length, Tcl_Size leadingSpace, Tcl_Size endSpace); /* 260 */
     void (*tclListObjValidate) (Tcl_Interp *interp, Tcl_Obj *listObj); /* 261 */
 } TclIntStubs;
 
diff --git a/generic/tclLink.c b/generic/tclLink.c
index cd2c731..f478a00 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -1282,7 +1282,7 @@ ObjValue(
 	    memcpy(linkPtr->lastValue.aryPtr, linkPtr->addr, linkPtr->bytes);
 	    objv = (Tcl_Obj **)ckalloc(linkPtr->numElems * sizeof(Tcl_Obj *));
 	    for (i=0; i < linkPtr->numElems; i++) {
-		objv[i] = Tcl_NewDoubleObj(linkPtr->lastValue.dPtr[i]);
+		TclNewDoubleObj(objv[i], linkPtr->lastValue.dPtr[i]);
 	    }
 	    resultObj = Tcl_NewListObj(linkPtr->numElems, objv);
 	    ckfree(objv);
@@ -1401,7 +1401,7 @@ ObjValue(
 	    memcpy(linkPtr->lastValue.aryPtr, linkPtr->addr, linkPtr->bytes);
 	    objv = (Tcl_Obj **)ckalloc(linkPtr->numElems * sizeof(Tcl_Obj *));
 	    for (i=0; i < linkPtr->numElems; i++) {
-		objv[i] = Tcl_NewDoubleObj(linkPtr->lastValue.fPtr[i]);
+		TclNewDoubleObj(objv[i], linkPtr->lastValue.fPtr[i]);
 	    }
 	    resultObj = Tcl_NewListObj(linkPtr->numElems, objv);
 	    ckfree(objv);
@@ -1414,8 +1414,7 @@ ObjValue(
 	    memcpy(linkPtr->lastValue.aryPtr, linkPtr->addr, linkPtr->bytes);
 	    objv = (Tcl_Obj **)ckalloc(linkPtr->numElems * sizeof(Tcl_Obj *));
 	    for (i=0; i < linkPtr->numElems; i++) {
-		TclNewUIntObj(objv[i],
-			linkPtr->lastValue.uwPtr[i]);
+		TclNewUIntObj(objv[i], linkPtr->lastValue.uwPtr[i]);
 	    }
 	    resultObj = Tcl_NewListObj(linkPtr->numElems, objv);
 	    ckfree(objv);
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 8ee0f48..486baa2 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -11,6 +11,7 @@
 
 #include <assert.h>
 #include "tclInt.h"
+#include "tclTomMath.h"
 #include "tclArithSeries.h"
 
 /*
@@ -3514,15 +3515,8 @@ UpdateStringOfList(
  *------------------------------------------------------------------------
  */
 Tcl_Obj *
-TclListTestObj (int length, int leadingSpace, int endSpace)
+TclListTestObj(Tcl_Size length, Tcl_Size leadingSpace, Tcl_Size endSpace)
 {
-    if (length < 0)
-	length = 0;
-    if (leadingSpace < 0)
-	leadingSpace = 0;
-    if (endSpace < 0)
-	endSpace = 0;
-
     ListRep listRep;
     Tcl_Size capacity;
     Tcl_Obj *listObj;
@@ -3538,9 +3532,9 @@ TclListTestObj (int length, int leadingSpace, int endSpace)
     ListRepInit(capacity, NULL, 0, &listRep);
 
     ListStore *storePtr = listRep.storePtr;
-    int i;
+    Tcl_Size i;
     for (i = 0; i < length; ++i) {
-	storePtr->slots[i + leadingSpace] = Tcl_NewIntObj(i);
+	TclNewUIntObj(storePtr->slots[i + leadingSpace], i);
 	Tcl_IncrRefCount(storePtr->slots[i + leadingSpace]);
     }
     storePtr->firstUsed = leadingSpace;
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 6bc914d..c200fa0 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -993,7 +993,7 @@ Tcl_ScanObjCmd(
 	     * Scan a floating point number
 	     */
 
-	    objPtr = Tcl_NewDoubleObj(0.0);
+	    TclNewDoubleObj(objPtr, 0.0);
 	    Tcl_IncrRefCount(objPtr);
 	    if (width == 0) {
 		width = ~0;
@@ -1090,7 +1090,7 @@ Tcl_ScanObjCmd(
     if (code == TCL_OK) {
 	if (underflow && (nconversions == 0)) {
 	    if (numVars) {
-		TclNewIndexObj(objPtr, TCL_INDEX_NONE);
+		TclNewIntObj(objPtr, -1);
 	    } else {
 		if (objPtr) {
 		    Tcl_SetListObj(objPtr, 0, NULL);
-- 
cgit v0.12


From ba490472b58358406e7f04356e4e8a076644d9c6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Nov 2022 22:40:47 +0000
Subject: Remove "knownBug" constraint: no longer necessary

---
 tests/io.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index fdb4be4..9dd37f3 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9053,8 +9053,8 @@ test io-75.6 {multibyte encoding error read results in raw bytes} -setup {
     puts -nonewline $f "A\xC0\x40"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none
-} -constraints knownBug -body {
+    fconfigure $f -encoding utf-8 -buffering none -strict 1
+} -body {
     set d [read $f]
     binary scan $d H* hd
     set hd
@@ -9113,7 +9113,7 @@ test io-75.9 {shiftjis encoding error read results in raw bytes} -setup {
     flush $f
     seek $f 0
     fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf
-} -constraints knownBug -body {
+} -body {
     set d [read $f]
     binary scan $d H* hd
     set hd
-- 
cgit v0.12


From 513b2d50314fa22ef6df699c698ee0f05b7f59b5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 26 Nov 2022 23:57:26 +0000
Subject: HAS_ABSTRACTLIST_PROC

---
 generic/tclArithSeries.c |  3 ++-
 generic/tclInt.h         | 18 ++++++++++--------
 generic/tclListObj.c     | 23 +++++++++++------------
 generic/tclObj.c         | 20 ++++++++++++--------
 generic/tclUtil.c        |  5 +++--
 5 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 34c0dd1..70bbb1b 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -76,8 +76,9 @@ const TclObjTypeWithAbstractList tclArithSeriesType = {
     DupArithSeriesInternalRep,		/* dupIntRepProc */
     UpdateStringOfArithSeries,		/* updateStringProc */
     SetArithSeriesFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0_1},
+    TCL_OBJTYPE_V0_1(
 	TclArithSeriesObjLength
+    )
 };
 
 /*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a58c401..0ff0d8e 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1076,14 +1076,6 @@ typedef struct ActiveInterpTrace {
 				 * in reverse order. */
 } ActiveInterpTrace;
 
-
-#define TCL_OBJTYPE_V0_1 ((size_t)1) /* For internal core use only */
-
-typedef struct {  /* For internal core use only */
-    Tcl_ObjType objType;
-    unsigned long long (*lengthProc)(Tcl_Obj *obj);
-} TclObjTypeWithAbstractList;
-
 /*
  * Flag values designating types of execution traces. See tclTrace.c for
  * related flag values.
@@ -1099,6 +1091,16 @@ typedef struct {  /* For internal core use only */
 #define TCL_TRACE_ENTER_EXEC	1
 #define TCL_TRACE_LEAVE_EXEC	2
 
+typedef struct {  /* For internal core use only */
+    Tcl_ObjType objType;
+    unsigned long long (*lengthProc)(Tcl_Obj *obj);
+} TclObjTypeWithAbstractList;
+#define TCL_OBJTYPE_V0_1(lengthProc) (sizeof(TclObjTypeWithAbstractList)) \
+	}, lengthProc /* For internal core use only */
+#define HAS_ABSTRACTLIST_PROC(objPtr, proc) (objPtr->typePtr \
+	&& (objPtr->typePtr->version > offsetof(TclObjTypeWithAbstractList, proc)) \
+	&& (((const TclObjTypeWithAbstractList *)objPtr->typePtr)->proc))
+
 /*
  * The structure below defines an entry in the assocData hash table which is
  * associated with an interpreter. The entry contains a pointer to a function
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 4a5b3ae..565872e 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -158,8 +158,9 @@ const TclObjTypeWithAbstractList tclListType = {
     DupListInternalRep,		/* dupIntRepProc */
     UpdateStringOfList,		/* updateStringProc */
     SetListFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0_1},
-    ListLength
+    TCL_OBJTYPE_V0_1(
+	ListLength
+    )
 };
 
 /* Macros to manipulate the List internal rep */
@@ -1994,19 +1995,17 @@ Tcl_ListObjLength(
     Tcl_Obj *listObj,	/* List object whose #elements to return. */
     Tcl_Size *lenPtr)	/* The resulting int is stored here. */
 {
-    if (listObj->typePtr && (listObj->typePtr->version == TCL_OBJTYPE_V0_1)) {
+    if (HAS_ABSTRACTLIST_PROC(listObj, lengthProc)) {
 	const TclObjTypeWithAbstractList *objType =  (const TclObjTypeWithAbstractList *)listObj->typePtr;
-	if (objType->lengthProc) {
-	    unsigned long long len = objType->lengthProc(listObj);
-	    if (len >= TCL_INDEX_NONE) {
-		if (interp) {
-			Tcl_AppendResult(interp, "List too large");
-		}
-		return TCL_ERROR;
+	unsigned long long len = objType->lengthProc(listObj);
+	if (len >= TCL_INDEX_NONE) {
+	    if (interp) {
+		    Tcl_AppendResult(interp, "List too large");
 	    }
-	    *lenPtr = len;
-	    return TCL_OK;
+	    return TCL_ERROR;
 	}
+	*lenPtr = len;
+	return TCL_OK;
     }
 
     /*
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 5e3f4f1..ca7861f 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -233,8 +233,9 @@ const TclObjTypeWithAbstractList tclBooleanType= {
     NULL,			/* dupIntRepProc */
     NULL,			/* updateStringProc */
     TclSetBooleanFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0_1},
-    LengthOne
+    TCL_OBJTYPE_V0_1(
+	LengthOne
+    )
 };
 const TclObjTypeWithAbstractList tclDoubleType= {
     {"double",			/* name */
@@ -242,8 +243,9 @@ const TclObjTypeWithAbstractList tclDoubleType= {
     NULL,			/* dupIntRepProc */
     UpdateStringOfDouble,	/* updateStringProc */
     SetDoubleFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0_1},
-    LengthOne
+    TCL_OBJTYPE_V0_1(
+	LengthOne
+    )
 };
 const TclObjTypeWithAbstractList tclIntType = {
     {"int",			/* name */
@@ -251,8 +253,9 @@ const TclObjTypeWithAbstractList tclIntType = {
     NULL,			/* dupIntRepProc */
     UpdateStringOfInt,		/* updateStringProc */
     SetIntFromAny,		/* setFromAnyProc */
-    TCL_OBJTYPE_V0_1},
-    LengthOne
+    TCL_OBJTYPE_V0_1(
+	LengthOne
+    )
 };
 const TclObjTypeWithAbstractList tclBignumType = {
     {"bignum",			/* name */
@@ -260,8 +263,9 @@ const TclObjTypeWithAbstractList tclBignumType = {
     DupBignum,			/* dupIntRepProc */
     UpdateStringOfBignum,	/* updateStringProc */
     NULL,			/* setFromAnyProc */
-    TCL_OBJTYPE_V0_1},
-    LengthOne
+    TCL_OBJTYPE_V0_1(
+	LengthOne
+    )
 };
 
 /*
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index b23d134..58fb1e4 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -130,8 +130,9 @@ static const TclObjTypeWithAbstractList endOffsetType = {
     NULL,				/* dupIntRepProc */
     NULL,				/* updateStringProc */
     NULL,				/* setFromAnyProc */
-    TCL_OBJTYPE_V0_1},
-    LengthOne
+    TCL_OBJTYPE_V0_1(
+	LengthOne
+    )
 };
 
 /*
-- 
cgit v0.12


From 82fb7b1d551b7e74efa4ee9cc814ef74fab5332c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 27 Nov 2022 23:37:32 +0000
Subject: size_t result for lengthProc. More usage of Tcl_GetWideUIntFromObj

---
 generic/tclArithSeries.c |  2 +-
 generic/tclArithSeries.h |  2 +-
 generic/tclCmdIL.c       |  4 +++-
 generic/tclExecute.c     |  2 +-
 generic/tclInt.h         |  2 +-
 generic/tclListObj.c     |  6 +++---
 generic/tclObj.c         |  2 +-
 generic/tclTest.c        | 32 ++++++++++++++++++++++++--------
 generic/tclUtil.c        |  2 +-
 tests/link.test          |  2 +-
 10 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 70bbb1b..1d6291d 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -462,7 +462,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
  *
  *----------------------------------------------------------------------
  */
-unsigned long long TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
+size_t TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
 {
     ArithSeries *arithSeriesRepPtr = (ArithSeries*)
 	    arithSeriesPtr->internalRep.twoPtrValue.ptr1;
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index 8392a57..ccd050f 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -39,7 +39,7 @@ MODULE_SCOPE int	TclArithSeriesObjStep(Tcl_Obj *arithSeriesPtr,
 			    Tcl_Obj **stepObj);
 MODULE_SCOPE int	TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr,
 			    Tcl_WideInt index, Tcl_Obj **elementObj);
-MODULE_SCOPE unsigned long long TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
+MODULE_SCOPE size_t TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr, Tcl_Size fromIdx, Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Interp *interp,
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 612764d..d5c7fc8 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2575,6 +2575,7 @@ Tcl_LlengthObjCmd(
 {
     size_t listLen;
     int result;
+    Tcl_Obj *objPtr;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "list");
@@ -2591,7 +2592,8 @@ Tcl_LlengthObjCmd(
      * length.
      */
 
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(listLen));
+    TclNewUIntObj(objPtr, listLen);
+    Tcl_SetObjResult(interp, objPtr);
     return TCL_OK;
 }
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 9049c0a..c1a2bfd 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4649,7 +4649,7 @@ TEBCresume(
 	    TRACE_ERROR(interp);
 	    goto gotError;
 	}
-	TclNewIntObj(objResultPtr, length);
+	TclNewUIntObj(objResultPtr, length);
 	TRACE_APPEND(("%" TCL_Z_MODIFIER "u\n", length));
 	NEXT_INST_F(1, 1, 1);
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 0ff0d8e..b5fc48e 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1093,7 +1093,7 @@ typedef struct ActiveInterpTrace {
 
 typedef struct {  /* For internal core use only */
     Tcl_ObjType objType;
-    unsigned long long (*lengthProc)(Tcl_Obj *obj);
+    size_t (*lengthProc)(Tcl_Obj *obj);
 } TclObjTypeWithAbstractList;
 #define TCL_OBJTYPE_V0_1(lengthProc) (sizeof(TclObjTypeWithAbstractList)) \
 	}, lengthProc /* For internal core use only */
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 565872e..58322c5 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -143,7 +143,7 @@ static void	DupListInternalRep(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
 static void	FreeListInternalRep(Tcl_Obj *listPtr);
 static int	SetListFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void	UpdateStringOfList(Tcl_Obj *listPtr);
-static unsigned long long ListLength(Tcl_Obj *listPtr);
+static size_t ListLength(Tcl_Obj *listPtr);
 
 /*
  * The structure below defines the list Tcl object type by means of functions
@@ -2024,7 +2024,7 @@ Tcl_ListObjLength(
     return TCL_OK;
 }
 
-unsigned long long ListLength(
+size_t ListLength(
     Tcl_Obj *listPtr)
 {
 	ListRep listRep;
@@ -2648,7 +2648,7 @@ TclLindexFlat(
 
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType.objType)) {
-	Tcl_WideInt listLen = TclArithSeriesObjLength(listObj);
+	size_t listLen = TclArithSeriesObjLength(listObj);
 	Tcl_Size index;
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
diff --git a/generic/tclObj.c b/generic/tclObj.c
index ca7861f..e4caf3e 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -225,7 +225,7 @@ static int		SetCmdNameFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
  * implementations.
  */
 
-static unsigned long long LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
+static size_t LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
 
 const TclObjTypeWithAbstractList tclBooleanType= {
     {"boolean",			/* name */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index f175c01..b526c0c 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -3089,12 +3089,28 @@ TestlinkCmd(
 	tmp = Tcl_NewWideIntObj(longVar);
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
-	tmp = Tcl_NewWideIntObj((long)ulongVar);
+	if (ulongVar > WIDE_MAX) {
+		mp_int bignumValue;
+		if (mp_init_u64(&bignumValue, ulongVar) != MP_OKAY) {
+		    Tcl_Panic("%s: memory overflow", "Tcl_SetWideUIntObj");
+		}
+		tmp = Tcl_NewBignumObj(&bignumValue);
+	} else {
+	    tmp = Tcl_NewWideIntObj((Tcl_WideInt)ulongVar);
+	}
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
 	Tcl_PrintDouble(NULL, (double)floatVar, buffer);
 	Tcl_AppendElement(interp, buffer);
-	tmp = Tcl_NewWideIntObj((Tcl_WideInt)uwideVar);
+	if (uwideVar > WIDE_MAX) {
+		mp_int bignumValue;
+		if (mp_init_u64(&bignumValue, uwideVar) != MP_OKAY) {
+		    Tcl_Panic("%s: memory overflow", "Tcl_SetWideUIntObj");
+		}
+		tmp = Tcl_NewBignumObj(&bignumValue);
+	} else {
+	    tmp = Tcl_NewWideIntObj((Tcl_WideInt)uwideVar);
+	}
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
     } else if (strcmp(argv[1], "set") == 0) {
@@ -3500,18 +3516,18 @@ TestlistrepCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "length ?leadSpace endSpace?");
 	    return TCL_ERROR;
 	} else {
-	    Tcl_WideInt length;
-	    Tcl_WideInt leadSpace = 0;
-	    Tcl_WideInt endSpace = 0;
-	    if (Tcl_GetWideIntFromObj(interp, objv[2], &length) != TCL_OK) {
+	    Tcl_WideUInt length;
+	    Tcl_WideUInt leadSpace = 0;
+	    Tcl_WideUInt endSpace = 0;
+	    if (Tcl_GetWideUIntFromObj(interp, objv[2], &length) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (objc > 3) {
-		if (Tcl_GetWideIntFromObj(interp, objv[3], &leadSpace) != TCL_OK) {
+		if (Tcl_GetWideUIntFromObj(interp, objv[3], &leadSpace) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		if (objc > 4) {
-		    if (Tcl_GetWideIntFromObj(interp, objv[4], &endSpace)
+		    if (Tcl_GetWideUIntFromObj(interp, objv[4], &endSpace)
 			!= TCL_OK) {
 			return TCL_ERROR;
 		    }
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 58fb1e4..a0a866b 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -122,7 +122,7 @@ static int		FindElement(Tcl_Interp *interp, const char *string,
  * is unregistered, so has no need of a setFromAnyProc either.
  */
 
-static unsigned long long LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
+static size_t LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
 
 static const TclObjTypeWithAbstractList endOffsetType = {
     {"end-offset",			/* name */
diff --git a/tests/link.test b/tests/link.test
index 69ebb02..43a85fb 100644
--- a/tests/link.test
+++ b/tests/link.test
@@ -71,7 +71,7 @@ test link-2.1 {writing C variables from Tcl} -constraints {testlink} -setup {
     set float 1.0987654321
     set uwide 12345678901234567890
     concat [testlink get] | $int $real $bool $string $wide $char $uchar $short $ushort $uint $long $ulong $float $uwide
-} -result {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 -6101065172474983726 | 0o0721 -10.5 true abcdef 135135 79 161 8000 40000 0xc001babe 34543 567890 1.0987654321 12345678901234567890}
+} -result {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 12345678901234567890 | 0o0721 -10.5 true abcdef 135135 79 161 8000 40000 0xc001babe 34543 567890 1.0987654321 12345678901234567890}
 test link-2.2 {writing bad values into variables} -setup {
     testlink delete
 } -constraints {testlink} -body {
-- 
cgit v0.12


From 18f90309e43e13dde5891a7548dad46e248e2c9a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 28 Nov 2022 12:06:41 +0000
Subject: Use Tcl_Size for ArithSeries.len

---
 generic/tclArithSeries.c | 46 +++++++++++++++++++---------------
 generic/tclArithSeries.h | 14 ++++++++---
 generic/tclInt.decls     |  2 +-
 generic/tclIntDecls.h    |  6 ++---
 generic/tclListObj.c     |  9 ++++---
 generic/tclTest.c        | 65 +++++++++++++++++++++++++++++++++---------------
 tests/link.test          |  2 +-
 7 files changed, 93 insertions(+), 51 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 40f34b5..c32c443 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -149,7 +149,7 @@ TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_W
     arithSeriesRepPtr->start = start;
     arithSeriesRepPtr->end = end;
     arithSeriesRepPtr->step = step;
-    arithSeriesRepPtr->len = length;
+    arithSeriesRepPtr->len1 = length;
     arithSeriesRepPtr->elements = NULL;
     arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
     arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
@@ -196,7 +196,7 @@ TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
     arithSeriesRepPtr->start = start;
     arithSeriesRepPtr->end = end;
     arithSeriesRepPtr->step = step;
-    arithSeriesRepPtr->len = length;
+    arithSeriesRepPtr->len1 = length;
     arithSeriesRepPtr->elements = NULL;
     arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
     arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
@@ -429,7 +429,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
 	Tcl_Panic("TclArithSeriesObjIndex called with a not ArithSeries Obj.");
     }
     arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesPtr);
-    if (index < 0 || index >= arithSeriesRepPtr->len) {
+    if (index < 0 || index >= arithSeriesRepPtr->len1) {
 	return TCL_ERROR;
     }
     /* List[i] = Start + (Step * index) */
@@ -458,11 +458,11 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
  *
  *----------------------------------------------------------------------
  */
-Tcl_WideInt TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
+Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
 {
     ArithSeries *arithSeriesRepPtr = (ArithSeries*)
 	    arithSeriesPtr->internalRep.twoPtrValue.ptr1;
-    return arithSeriesRepPtr->len;
+    return arithSeriesRepPtr->len1;
 }
 
 /*
@@ -491,7 +491,7 @@ FreeArithSeriesInternalRep(Tcl_Obj *arithSeriesPtr)
     if (arithSeriesRepPtr->elements) {
 	Tcl_WideInt i;
 	Tcl_Obj**elmts = arithSeriesRepPtr->elements;
-	for(i=0; i<arithSeriesRepPtr->len; i++) {
+	for(i=0; i<arithSeriesRepPtr->len1; i++) {
 	    if (elmts[i]) {
 		Tcl_DecrRefCount(elmts[i]);
 	    }
@@ -581,7 +581,7 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
     /*
      * Pass 1: estimate space.
      */
-    for (i = 0; i < arithSeriesRepPtr->len; i++) {
+    for (i = 0; i < arithSeriesRepPtr->len1; i++) {
 	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
 	elem = TclGetStringFromObj(elemObj, &slen);
 	Tcl_DecrRefCount(elemObj);
@@ -594,7 +594,7 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
      */
 
     p = Tcl_InitStringRep(arithSeriesPtr, NULL, length);
-    for (i = 0; i < arithSeriesRepPtr->len; i++) {
+    for (i = 0; i < arithSeriesRepPtr->len1; i++) {
 	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
 	elem = TclGetStringFromObj(elemObj, &slen);
 	strcpy(p, elem);
@@ -725,10 +725,9 @@ TclArithSeriesObjRange(
 
     if (TclArithSeriesObjIndex(arithSeriesPtr, fromIdx, &startObj) != TCL_OK) {
 	if (interp) {
-	    Tcl_SetObjResult(
-		interp,
-		Tcl_ObjPrintf("index %d is out of bounds 0 to %"
-			      TCL_LL_MODIFIER "d", fromIdx, (arithSeriesRepPtr->len-1)));
+	    Tcl_SetObjResult(interp,
+		    Tcl_ObjPrintf("index %d is out of bounds 0 to %"
+			    "d", fromIdx, (arithSeriesRepPtr->len1-1)));
 	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	}
 	return NULL;
@@ -736,10 +735,9 @@ TclArithSeriesObjRange(
     Tcl_IncrRefCount(startObj);
     if (TclArithSeriesObjIndex(arithSeriesPtr, toIdx, &endObj) != TCL_OK) {
 	if (interp) {
-	    Tcl_SetObjResult(
-		interp,
-		Tcl_ObjPrintf("index %d is out of bounds 0 to %"
-			      TCL_LL_MODIFIER "d", fromIdx, (arithSeriesRepPtr->len-1)));
+	    Tcl_SetObjResult(interp,
+		    Tcl_ObjPrintf("index %d is out of bounds 0 to %"
+			    "d", fromIdx, (arithSeriesRepPtr->len1-1)));
 	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	}
 	return NULL;
@@ -782,7 +780,7 @@ TclArithSeriesObjRange(
 	arithSeriesDblRepPtr->start = start;
 	arithSeriesDblRepPtr->end = end;
 	arithSeriesDblRepPtr->step = step;
-	arithSeriesDblRepPtr->len = (end-start+step)/step;
+	arithSeriesDblRepPtr->len1 = (end-start+step)/step;
 	arithSeriesDblRepPtr->elements = NULL;
 
     } else {
@@ -793,7 +791,7 @@ TclArithSeriesObjRange(
 	arithSeriesRepPtr->start = start;
 	arithSeriesRepPtr->end = end;
 	arithSeriesRepPtr->step = step;
-	arithSeriesRepPtr->len = (end-start+step)/step;
+	arithSeriesRepPtr->len1 = (end-start+step)/step;
 	arithSeriesRepPtr->elements = NULL;
     }
 
@@ -849,7 +847,7 @@ TclArithSeriesGetElements(
 	int i, objc;
 
 	ArithSeriesGetInternalRep(objPtr, arithSeriesRepPtr);
-	objc = arithSeriesRepPtr->len;
+	objc = arithSeriesRepPtr->len1;
 	if (objc > 0) {
 	    if (arithSeriesRepPtr->elements) {
 		/* If this exists, it has already been populated */
@@ -931,7 +929,7 @@ TclArithSeriesObjReverse(
     ArithSeriesGetInternalRep(arithSeriesPtr, arithSeriesRepPtr);
 
     isDouble = arithSeriesRepPtr->isDouble;
-    len = arithSeriesRepPtr->len;
+    len = arithSeriesRepPtr->len1;
 
     TclArithSeriesObjIndex(arithSeriesPtr, (len-1), &startObj);
     Tcl_IncrRefCount(startObj);
@@ -1000,3 +998,11 @@ TclArithSeriesObjReverse(
 
     return resultObj;
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index f7f2fa8..f855f6f 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -16,7 +16,7 @@
  * but it's faster to cache it inside the internal representation.
  */
 typedef struct ArithSeries {
-    Tcl_WideInt len;
+    Tcl_Size len1;
     Tcl_Obj **elements;
     int isDouble;
     Tcl_WideInt start;
@@ -24,7 +24,7 @@ typedef struct ArithSeries {
     Tcl_WideInt step;
 } ArithSeries;
 typedef struct ArithSeriesDbl {
-    Tcl_WideInt len;
+    Tcl_Size len1;
     Tcl_Obj **elements;
     int isDouble;
     double start;
@@ -39,7 +39,7 @@ MODULE_SCOPE int	TclArithSeriesObjStep(Tcl_Obj *arithSeriesPtr,
 			    Tcl_Obj **stepObj);
 MODULE_SCOPE int	TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr,
 			    Tcl_WideInt index, Tcl_Obj **elementObj);
-MODULE_SCOPE Tcl_WideInt TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
+MODULE_SCOPE Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr, Tcl_Size fromIdx, Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Interp *interp,
@@ -55,3 +55,11 @@ MODULE_SCOPE int 	TclNewArithSeriesObj(Tcl_Interp *interp,
 			    Tcl_Obj **arithSeriesObj, int useDoubles,
 			    Tcl_Obj *startObj, Tcl_Obj *endObj,
 			    Tcl_Obj *stepObj, Tcl_Obj *lenObj);
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index b3e352a..4db3919 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -701,7 +701,7 @@ declare 258 {
 
 # TIP 625: for unit testing - create list objects with span
 declare 260 {
-    Tcl_Obj *TclListTestObj(Tcl_Size length, Tcl_Size leadingSpace, Tcl_Size endSpace)
+    Tcl_Obj *TclListTestObj(size_t length, size_t leadingSpace, size_t endSpace)
 }
 
 # TIP 625: for unit testing - check list invariants
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 4c8d897..ffd559d 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -660,8 +660,8 @@ EXTERN Tcl_Obj *	TclpCreateTemporaryDirectory(Tcl_Obj *dirObj,
 				Tcl_Obj *basenameObj);
 /* Slot 259 is reserved */
 /* 260 */
-EXTERN Tcl_Obj *	TclListTestObj(Tcl_Size length,
-				Tcl_Size leadingSpace, Tcl_Size endSpace);
+EXTERN Tcl_Obj *	TclListTestObj(size_t length, size_t leadingSpace,
+				size_t endSpace);
 /* 261 */
 EXTERN void		TclListObjValidate(Tcl_Interp *interp,
 				Tcl_Obj *listObj);
@@ -930,7 +930,7 @@ typedef struct TclIntStubs {
     void (*tclStaticLibrary) (Tcl_Interp *interp, const char *prefix, Tcl_LibraryInitProc *initProc, Tcl_LibraryInitProc *safeInitProc); /* 257 */
     Tcl_Obj * (*tclpCreateTemporaryDirectory) (Tcl_Obj *dirObj, Tcl_Obj *basenameObj); /* 258 */
     void (*reserved259)(void);
-    Tcl_Obj * (*tclListTestObj) (Tcl_Size length, Tcl_Size leadingSpace, Tcl_Size endSpace); /* 260 */
+    Tcl_Obj * (*tclListTestObj) (size_t length, size_t leadingSpace, size_t endSpace); /* 260 */
     void (*tclListObjValidate) (Tcl_Interp *interp, Tcl_Obj *listObj); /* 261 */
 } TclIntStubs;
 
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 486baa2..776ff0e 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -3515,10 +3515,10 @@ UpdateStringOfList(
  *------------------------------------------------------------------------
  */
 Tcl_Obj *
-TclListTestObj(Tcl_Size length, Tcl_Size leadingSpace, Tcl_Size endSpace)
+TclListTestObj(size_t length, size_t leadingSpace, size_t endSpace)
 {
     ListRep listRep;
-    Tcl_Size capacity;
+    size_t capacity;
     Tcl_Obj *listObj;
 
     TclNewObj(listObj);
@@ -3528,11 +3528,14 @@ TclListTestObj(Tcl_Size length, Tcl_Size leadingSpace, Tcl_Size endSpace)
     if (capacity == 0) {
 	return listObj;
     }
+    if (capacity > LIST_MAX) {
+	return NULL;
+    }
 
     ListRepInit(capacity, NULL, 0, &listRep);
 
     ListStore *storePtr = listRep.storePtr;
-    Tcl_Size i;
+    size_t i;
     for (i = 0; i < length; ++i) {
 	TclNewUIntObj(storePtr->slots[i + leadingSpace], i);
 	Tcl_IncrRefCount(storePtr->slots[i + leadingSpace]);
diff --git a/generic/tclTest.c b/generic/tclTest.c
index bc3b553..c5eb6eb 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -300,7 +300,7 @@ static Tcl_ObjCmdProc	TestprintObjCmd;
 static Tcl_ObjCmdProc	TestregexpObjCmd;
 static Tcl_ObjCmdProc	TestreturnObjCmd;
 static void		TestregexpXflags(const char *string,
-			    int length, int *cflagsPtr, int *eflagsPtr);
+			    size_t length, int *cflagsPtr, int *eflagsPtr);
 #ifndef TCL_NO_DEPRECATED
 static Tcl_ObjCmdProc	TestsaveresultCmd;
 static void		TestsaveresultFree(char *blockPtr);
@@ -999,7 +999,8 @@ AsyncHandlerProc(
 {
     TestAsyncHandler *asyncPtr;
     int id = PTR2INT(clientData);
-    const char *listArgv[4], *cmd;
+    const char *listArgv[4];
+    char *cmd;
     char string[TCL_INTEGER_SPACE];
 
     Tcl_MutexLock(&asyncTestMutex);
@@ -3121,12 +3122,28 @@ TestlinkCmd(
 	tmp = Tcl_NewWideIntObj(longVar);
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
-	tmp = Tcl_NewWideIntObj((long)ulongVar);
+	if (ulongVar > WIDE_MAX) {
+		mp_int bignumValue;
+		if (mp_init_u64(&bignumValue, ulongVar) != MP_OKAY) {
+		    Tcl_Panic("%s: memory overflow", "Tcl_SetWideUIntObj");
+		}
+		tmp = Tcl_NewBignumObj(&bignumValue);
+	} else {
+	    tmp = Tcl_NewWideIntObj((Tcl_WideInt)ulongVar);
+	}
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
 	Tcl_PrintDouble(NULL, (double)floatVar, buffer);
 	Tcl_AppendElement(interp, buffer);
-	tmp = Tcl_NewWideIntObj((Tcl_WideInt)uwideVar);
+	if (uwideVar > WIDE_MAX) {
+		mp_int bignumValue;
+		if (mp_init_u64(&bignumValue, uwideVar) != MP_OKAY) {
+		    Tcl_Panic("%s: memory overflow", "Tcl_SetWideUIntObj");
+		}
+		tmp = Tcl_NewBignumObj(&bignumValue);
+	} else {
+	    tmp = Tcl_NewWideIntObj((Tcl_WideInt)uwideVar);
+	}
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
     } else if (strcmp(argv[1], "set") == 0) {
@@ -3532,24 +3549,28 @@ TestlistrepCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "length ?leadSpace endSpace?");
 	    return TCL_ERROR;
 	} else {
-	    int length;
-	    int leadSpace = 0;
-	    int endSpace = 0;
-	    if (Tcl_GetIntFromObj(interp, objv[2], &length) != TCL_OK) {
+	    Tcl_WideUInt length;
+	    Tcl_WideUInt leadSpace = 0;
+	    Tcl_WideUInt endSpace = 0;
+	    if (Tcl_GetWideUIntFromObj(interp, objv[2], &length) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (objc > 3) {
-		if (Tcl_GetIntFromObj(interp, objv[3], &leadSpace) != TCL_OK) {
+		if (Tcl_GetWideUIntFromObj(interp, objv[3], &leadSpace) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		if (objc > 4) {
-		    if (Tcl_GetIntFromObj(interp, objv[4], &endSpace)
+		    if (Tcl_GetWideUIntFromObj(interp, objv[4], &endSpace)
 			!= TCL_OK) {
 			return TCL_ERROR;
 		    }
 		}
 	    }
 	    resultObj = TclListTestObj(length, leadSpace, endSpace);
+	    if (resultObj == NULL) {
+		Tcl_AppendResult(interp, "List capacity exceeded", NULL);
+		return TCL_ERROR;
+	    }
 	}
 	break;
 
@@ -4347,11 +4368,11 @@ TestregexpObjCmd(
 static void
 TestregexpXflags(
     const char *string,	/* The string of flags. */
-    int length,			/* The length of the string in bytes. */
+    size_t length,			/* The length of the string in bytes. */
     int *cflagsPtr,		/* compile flags word */
     int *eflagsPtr)		/* exec flags word */
 {
-    int i;
+    size_t i;
     int cflags, eflags;
 
     cflags = *cflagsPtr;
@@ -5369,12 +5390,17 @@ TestsetbytearraylengthObjCmd(
     if (TCL_OK != Tcl_GetIntFromObj(interp, objv[2], &n)) {
 	return TCL_ERROR;
     }
-    if (Tcl_IsShared(objv[1])) {
-	obj = Tcl_DuplicateObj(objv[1]);
-    } else {
-	obj = objv[1];
+    obj = objv[1];
+    if (Tcl_IsShared(obj)) {
+	obj = Tcl_DuplicateObj(obj);
+    }
+    if (Tcl_SetByteArrayLength(obj, n) == NULL) {
+	if (obj != objv[1]) {
+	    Tcl_DecrRefCount(obj);
+	}
+	Tcl_AppendResult(interp, "expected bytes", NULL);
+	return TCL_ERROR;
     }
-    Tcl_SetByteArrayLength(obj, n);
     Tcl_SetObjResult(interp, obj);
     return TCL_OK;
 }
@@ -6658,15 +6684,14 @@ TestWrongNumArgsObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i;
-    int length;
+    int i, length;
     const char *msg;
 
     if (objc < 3) {
 	goto insufArgs;
     }
 
-    if (Tcl_GetIntFromObj(interp, objv[1], &i) != TCL_OK) {
+    if (Tcl_GetIntForIndex(interp, objv[1], TCL_INDEX_NONE, &i) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/tests/link.test b/tests/link.test
index 69ebb02..43a85fb 100644
--- a/tests/link.test
+++ b/tests/link.test
@@ -71,7 +71,7 @@ test link-2.1 {writing C variables from Tcl} -constraints {testlink} -setup {
     set float 1.0987654321
     set uwide 12345678901234567890
     concat [testlink get] | $int $real $bool $string $wide $char $uchar $short $ushort $uint $long $ulong $float $uwide
-} -result {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 -6101065172474983726 | 0o0721 -10.5 true abcdef 135135 79 161 8000 40000 0xc001babe 34543 567890 1.0987654321 12345678901234567890}
+} -result {465 -10.5 1 abcdef 135135 79 161 8000 40000 -1073628482 34543 567890 1.0987653732299805 12345678901234567890 | 0o0721 -10.5 true abcdef 135135 79 161 8000 40000 0xc001babe 34543 567890 1.0987654321 12345678901234567890}
 test link-2.2 {writing bad values into variables} -setup {
     testlink delete
 } -constraints {testlink} -body {
-- 
cgit v0.12


From da196c33450ded41b2370bf956f7d3cd7b081069 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 28 Nov 2022 12:58:18 +0000
Subject: No reservation for TIP #648 any more in stub table.

---
 generic/tcl.decls        | 17 +++++++----------
 generic/tclArithSeries.c | 26 +++++++++++++-------------
 generic/tclArithSeries.h |  4 ++--
 generic/tclDecls.h       | 26 ++++++++++++++------------
 generic/tclStubInit.c    |  8 ++++----
 5 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 6283089..a9c042c 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2552,27 +2552,23 @@ declare 683 {
    int Tcl_GetEncodingNulLength(Tcl_Encoding encoding)
 }
 
-# TIP #648 (reserved)
-#declare 684 {
-#    Tcl_Obj *Tcl_NewWideUIntObj(Tcl_WideUInt wideValue)
-#}
-#declare 685 {
-#    void Tcl_SetWideUIntObj(Tcl_Obj *objPtr, Tcl_WideUInt uwideValue)
-#}
-
 # TIP #650
-declare 686 {
+declare 684 {
     int Tcl_GetWideUIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 	    Tcl_WideUInt *uwidePtr)
 }
 
 # TIP 651
-declare 687 {
+declare 685 {
     Tcl_Obj *Tcl_DStringToObj(Tcl_DString *dsPtr)
 }
 
 # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
 
+declare 687 {
+    void TclUnusedStubEntry(void)
+}
+
 ##############################################################################
 
 # Define the platform specific public Tcl interface. These functions are only
@@ -2662,6 +2658,7 @@ export {
     const char *TclZipfs_AppHook(int *argc, char ***argv)
 }
 
+
 # Local Variables:
 # mode: tcl
 # End:
diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index c32c443..b278644 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -149,7 +149,7 @@ TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_W
     arithSeriesRepPtr->start = start;
     arithSeriesRepPtr->end = end;
     arithSeriesRepPtr->step = step;
-    arithSeriesRepPtr->len1 = length;
+    arithSeriesRepPtr->len = length;
     arithSeriesRepPtr->elements = NULL;
     arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
     arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
@@ -196,7 +196,7 @@ TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
     arithSeriesRepPtr->start = start;
     arithSeriesRepPtr->end = end;
     arithSeriesRepPtr->step = step;
-    arithSeriesRepPtr->len1 = length;
+    arithSeriesRepPtr->len = length;
     arithSeriesRepPtr->elements = NULL;
     arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
     arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
@@ -429,7 +429,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
 	Tcl_Panic("TclArithSeriesObjIndex called with a not ArithSeries Obj.");
     }
     arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesPtr);
-    if (index < 0 || index >= arithSeriesRepPtr->len1) {
+    if (index < 0 || index >= arithSeriesRepPtr->len) {
 	return TCL_ERROR;
     }
     /* List[i] = Start + (Step * index) */
@@ -462,7 +462,7 @@ Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
 {
     ArithSeries *arithSeriesRepPtr = (ArithSeries*)
 	    arithSeriesPtr->internalRep.twoPtrValue.ptr1;
-    return arithSeriesRepPtr->len1;
+    return arithSeriesRepPtr->len;
 }
 
 /*
@@ -491,7 +491,7 @@ FreeArithSeriesInternalRep(Tcl_Obj *arithSeriesPtr)
     if (arithSeriesRepPtr->elements) {
 	Tcl_WideInt i;
 	Tcl_Obj**elmts = arithSeriesRepPtr->elements;
-	for(i=0; i<arithSeriesRepPtr->len1; i++) {
+	for(i=0; i<arithSeriesRepPtr->len; i++) {
 	    if (elmts[i]) {
 		Tcl_DecrRefCount(elmts[i]);
 	    }
@@ -581,7 +581,7 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
     /*
      * Pass 1: estimate space.
      */
-    for (i = 0; i < arithSeriesRepPtr->len1; i++) {
+    for (i = 0; i < arithSeriesRepPtr->len; i++) {
 	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
 	elem = TclGetStringFromObj(elemObj, &slen);
 	Tcl_DecrRefCount(elemObj);
@@ -594,7 +594,7 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
      */
 
     p = Tcl_InitStringRep(arithSeriesPtr, NULL, length);
-    for (i = 0; i < arithSeriesRepPtr->len1; i++) {
+    for (i = 0; i < arithSeriesRepPtr->len; i++) {
 	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
 	elem = TclGetStringFromObj(elemObj, &slen);
 	strcpy(p, elem);
@@ -727,7 +727,7 @@ TclArithSeriesObjRange(
 	if (interp) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_ObjPrintf("index %d is out of bounds 0 to %"
-			    "d", fromIdx, (arithSeriesRepPtr->len1-1)));
+			    "d", fromIdx, (arithSeriesRepPtr->len-1)));
 	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	}
 	return NULL;
@@ -737,7 +737,7 @@ TclArithSeriesObjRange(
 	if (interp) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_ObjPrintf("index %d is out of bounds 0 to %"
-			    "d", fromIdx, (arithSeriesRepPtr->len1-1)));
+			    "d", fromIdx, (arithSeriesRepPtr->len-1)));
 	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	}
 	return NULL;
@@ -780,7 +780,7 @@ TclArithSeriesObjRange(
 	arithSeriesDblRepPtr->start = start;
 	arithSeriesDblRepPtr->end = end;
 	arithSeriesDblRepPtr->step = step;
-	arithSeriesDblRepPtr->len1 = (end-start+step)/step;
+	arithSeriesDblRepPtr->len = (end-start+step)/step;
 	arithSeriesDblRepPtr->elements = NULL;
 
     } else {
@@ -791,7 +791,7 @@ TclArithSeriesObjRange(
 	arithSeriesRepPtr->start = start;
 	arithSeriesRepPtr->end = end;
 	arithSeriesRepPtr->step = step;
-	arithSeriesRepPtr->len1 = (end-start+step)/step;
+	arithSeriesRepPtr->len = (end-start+step)/step;
 	arithSeriesRepPtr->elements = NULL;
     }
 
@@ -847,7 +847,7 @@ TclArithSeriesGetElements(
 	int i, objc;
 
 	ArithSeriesGetInternalRep(objPtr, arithSeriesRepPtr);
-	objc = arithSeriesRepPtr->len1;
+	objc = arithSeriesRepPtr->len;
 	if (objc > 0) {
 	    if (arithSeriesRepPtr->elements) {
 		/* If this exists, it has already been populated */
@@ -929,7 +929,7 @@ TclArithSeriesObjReverse(
     ArithSeriesGetInternalRep(arithSeriesPtr, arithSeriesRepPtr);
 
     isDouble = arithSeriesRepPtr->isDouble;
-    len = arithSeriesRepPtr->len1;
+    len = arithSeriesRepPtr->len;
 
     TclArithSeriesObjIndex(arithSeriesPtr, (len-1), &startObj);
     Tcl_IncrRefCount(startObj);
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index f855f6f..1daacdd 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -16,7 +16,7 @@
  * but it's faster to cache it inside the internal representation.
  */
 typedef struct ArithSeries {
-    Tcl_Size len1;
+    Tcl_Size len;
     Tcl_Obj **elements;
     int isDouble;
     Tcl_WideInt start;
@@ -24,7 +24,7 @@ typedef struct ArithSeries {
     Tcl_WideInt step;
 } ArithSeries;
 typedef struct ArithSeriesDbl {
-    Tcl_Size len1;
+    Tcl_Size len;
     Tcl_Obj **elements;
     int isDouble;
     double start;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index eb15582..75fc17e 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -2040,13 +2040,14 @@ EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
 				Tcl_Channel chan, int mode);
 /* 683 */
 EXTERN int		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
-/* Slot 684 is reserved */
-/* Slot 685 is reserved */
-/* 686 */
+/* 684 */
 EXTERN int		Tcl_GetWideUIntFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr);
-/* 687 */
+/* 685 */
 EXTERN Tcl_Obj *	Tcl_DStringToObj(Tcl_DString *dsPtr);
+/* Slot 686 is reserved */
+/* 687 */
+EXTERN void		TclUnusedStubEntry(void);
 
 typedef struct {
     const struct TclPlatStubs *tclPlatStubs;
@@ -2766,10 +2767,10 @@ typedef struct TclStubs {
     int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, size_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
     int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
     int (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
-    void (*reserved684)(void);
-    void (*reserved685)(void);
-    int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 686 */
-    Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 687 */
+    int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
+    Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */
+    void (*reserved686)(void);
+    void (*tclUnusedStubEntry) (void); /* 687 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -4168,12 +4169,13 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_RemoveChannelMode) /* 682 */
 #define Tcl_GetEncodingNulLength \
 	(tclStubsPtr->tcl_GetEncodingNulLength) /* 683 */
-/* Slot 684 is reserved */
-/* Slot 685 is reserved */
 #define Tcl_GetWideUIntFromObj \
-	(tclStubsPtr->tcl_GetWideUIntFromObj) /* 686 */
+	(tclStubsPtr->tcl_GetWideUIntFromObj) /* 684 */
 #define Tcl_DStringToObj \
-	(tclStubsPtr->tcl_DStringToObj) /* 687 */
+	(tclStubsPtr->tcl_DStringToObj) /* 685 */
+/* Slot 686 is reserved */
+#define TclUnusedStubEntry \
+	(tclStubsPtr->tclUnusedStubEntry) /* 687 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 865effe..ddc0bc9 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2055,10 +2055,10 @@ const TclStubs tclStubs = {
     Tcl_GetNumber, /* 681 */
     Tcl_RemoveChannelMode, /* 682 */
     Tcl_GetEncodingNulLength, /* 683 */
-    0, /* 684 */
-    0, /* 685 */
-    Tcl_GetWideUIntFromObj, /* 686 */
-    Tcl_DStringToObj, /* 687 */
+    Tcl_GetWideUIntFromObj, /* 684 */
+    Tcl_DStringToObj, /* 685 */
+    0, /* 686 */
+    TclUnusedStubEntry, /* 687 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From 71b0ad990caaf6a297049da2c63821a4e29c57ac Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 28 Nov 2022 23:16:31 +0000
Subject: Reduce shimmering: If a conclusion can be drawn about the number of
 list elements, don't get the elements before the list length is checked

---
 generic/tclArithSeries.h |  4 ++--
 generic/tclAssembly.c    |  5 ++++-
 generic/tclBinary.c      | 10 +++++++---
 generic/tclCmdAH.c       |  6 ++++--
 generic/tclCmdIL.c       | 10 ++++++++--
 generic/tclCmdMZ.c       |  5 ++++-
 generic/tclDecls.h       |  1 +
 generic/tclEnsemble.c    | 12 ++++++++++--
 generic/tclListObj.c     |  4 ++--
 generic/tclProc.c        |  8 ++++++++
 generic/tclTrace.c       | 19 +++++++++++++++----
 generic/tclVar.c         |  8 ++++++--
 generic/tclZipfs.c       |  6 +++++-
 13 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index 1daacdd..28fd993 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -15,7 +15,7 @@
  * Note that the len can in theory be always computed by start,end,step
  * but it's faster to cache it inside the internal representation.
  */
-typedef struct ArithSeries {
+typedef struct {
     Tcl_Size len;
     Tcl_Obj **elements;
     int isDouble;
@@ -23,7 +23,7 @@ typedef struct ArithSeries {
     Tcl_WideInt end;
     Tcl_WideInt step;
 } ArithSeries;
-typedef struct ArithSeriesDbl {
+typedef struct {
     Tcl_Size len;
     Tcl_Obj **elements;
     int isDouble;
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index dbf37bb8..ab5cd7a 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -1985,7 +1985,7 @@ CreateMirrorJumpTable(
 				 * table. */
     int i;
 
-    if (TclListObjGetElementsM(interp, jumps, &objc, &objv) != TCL_OK) {
+    if (TclListObjLengthM(interp, jumps, &objc) != TCL_OK) {
 	return TCL_ERROR;
     }
     if (objc % 2 != 0) {
@@ -1997,6 +1997,9 @@ CreateMirrorJumpTable(
 	}
 	return TCL_ERROR;
     }
+    if (TclListObjGetElementsM(interp, jumps, &objc, &objv) != TCL_OK) {
+	return TCL_ERROR;
+    }
 
     /*
      * Allocate the jumptable.
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index e4c8766..b744203 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -1125,11 +1125,10 @@ BinaryFormatCmd(
 		 * The macro evals its args more than once: avoid arg++
 		 */
 
-		if (TclListObjGetElementsM(interp, objv[arg], &listc,
-			&listv) != TCL_OK) {
+		if (TclListObjLengthM(interp, objv[arg], &listc
+			) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		arg++;
 
 		if (count == BINARY_ALL) {
 		    count = listc;
@@ -1139,6 +1138,11 @@ BinaryFormatCmd(
 			    -1));
 		    return TCL_ERROR;
 		}
+		if (TclListObjGetElementsM(interp, objv[arg], &listc,
+			&listv) != TCL_OK) {
+		    return TCL_ERROR;
+		}
+		arg++;
 	    }
 	    offset += count*size;
 	    break;
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 9905633..2281b5a 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -2860,8 +2860,8 @@ EachloopCmd(
 	    result = TCL_ERROR;
 	    goto done;
 	}
-	TclListObjGetElementsM(NULL, statePtr->vCopyList[i],
-	    &statePtr->varcList[i], &statePtr->varvList[i]);
+	TclListObjLengthM(NULL, statePtr->vCopyList[i],
+	    &statePtr->varcList[i]);
 	if (statePtr->varcList[i] < 1) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"%s varlist is empty",
@@ -2872,6 +2872,8 @@ EachloopCmd(
 	    result = TCL_ERROR;
 	    goto done;
 	}
+	TclListObjGetElementsM(NULL, statePtr->vCopyList[i],
+	    &statePtr->varcList[i], &statePtr->varvList[i]);
 
 	/* Values */
 	if (TclHasInternalRep(objv[2+i*2],&tclArithSeriesType)) {
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index e2493c4..8e52d65 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -20,6 +20,7 @@
 #include "tclInt.h"
 #include "tclRegexp.h"
 #include "tclArithSeries.h"
+#include "tclTomMath.h"
 #include <math.h>
 #include <assert.h>
 
@@ -2573,6 +2574,7 @@ Tcl_LlengthObjCmd(
 				/* Argument objects. */
 {
     int listLen, result;
+    Tcl_Obj *objPtr;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "list");
@@ -2589,7 +2591,8 @@ Tcl_LlengthObjCmd(
      * length.
      */
 
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(listLen));
+    TclNewUIntObj(objPtr, listLen);
+    Tcl_SetObjResult(interp, objPtr);
     return TCL_OK;
 }
 
@@ -3152,7 +3155,7 @@ Tcl_LreverseObjCmd(
     } /* end ArithSeries */
 
     /* True List */
-    if (TclListObjGetElementsM(interp, objv[1], &elemc, &elemv) != TCL_OK) {
+    if (TclListObjLengthM(interp, objv[1], &elemc) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -3164,6 +3167,9 @@ Tcl_LreverseObjCmd(
 	Tcl_SetObjResult(interp, objv[1]);
 	return TCL_OK;
     }
+    if (TclListObjGetElementsM(interp, objv[1], &elemc, &elemv) != TCL_OK) {
+	return TCL_ERROR;
+    }
 
     if (Tcl_IsShared(objv[1])
 	|| ListObjRepIsShared(objv[1])) { /* Bug 1675044 */
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 57541f9..147c2dc 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -3610,7 +3610,7 @@ TclNRSwitchObjCmd(
 	Tcl_Obj **listv;
 
 	blist = objv[0];
-	if (TclListObjGetElementsM(interp, objv[0], &objc, &listv) != TCL_OK) {
+	if (TclListObjLengthM(interp, objv[0], &objc) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
@@ -3623,6 +3623,9 @@ TclNRSwitchObjCmd(
 		    "?-option ...? string {?pattern body ...? ?default body?}");
 	    return TCL_ERROR;
 	}
+	if (TclListObjGetElementsM(interp, objv[0], &objc, &listv) != TCL_OK) {
+	    return TCL_ERROR;
+	}
 	objv = listv;
 	splitObjs = 1;
     }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 75fc17e..d8b4b5d 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4182,6 +4182,7 @@ extern const TclStubs *tclStubsPtr;
 /* !END!: Do not edit above this line. */
 
 #undef TclUnusedStubEntry
+
 #if defined(USE_TCL_STUBS)
 #   undef Tcl_CreateInterp
 #   undef Tcl_FindExecutable
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 88b611f..963f1d8 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -562,8 +562,8 @@ TclNamespaceEnsembleCmd(
 			continue;
 		    }
 		    do {
-			if (TclListObjGetElementsM(interp, listObj, &len,
-				&listv) != TCL_OK) {
+			if (TclListObjLengthM(interp, listObj, &len
+				) != TCL_OK) {
 			    Tcl_DictObjDone(&search);
 			    if (patchedDict) {
 				Tcl_DecrRefCount(patchedDict);
@@ -582,6 +582,14 @@ TclNamespaceEnsembleCmd(
 			    }
 			    goto freeMapAndError;
 			}
+			if (TclListObjGetElementsM(interp, listObj, &len,
+				&listv) != TCL_OK) {
+			    Tcl_DictObjDone(&search);
+			    if (patchedDict) {
+				Tcl_DecrRefCount(patchedDict);
+			    }
+			    goto freeMapAndError;
+			}
 			cmd = TclGetString(listv[0]);
 			if (!(cmd[0] == ':' && cmd[1] == ':')) {
 			    Tcl_Obj *newList = Tcl_DuplicateObj(listObj);
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 776ff0e..80477f7 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -1994,7 +1994,7 @@ int
 Tcl_ListObjLength(
     Tcl_Interp *interp,	/* Used to report errors if not NULL. */
     Tcl_Obj *listObj,	/* List object whose #elements to return. */
-    Tcl_Size *lenPtr)	/* The resulting int is stored here. */
+    Tcl_Size *lenPtr)	/* The resulting length is stored here. */
 {
     ListRep listRep;
 
@@ -2632,7 +2632,7 @@ TclLindexFlat(
 
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType)) {
-	Tcl_WideInt listLen = TclArithSeriesObjLength(listObj);
+	Tcl_Size listLen = TclArithSeriesObjLength(listObj);
 	Tcl_Size index;
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
diff --git a/generic/tclProc.c b/generic/tclProc.c
index b8c324e..3ada9ea 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -2508,6 +2508,14 @@ SetLambdaFromAny(
      * length is not 2, then it cannot be converted to lambdaType.
      */
 
+    result = TclListObjLengthM(NULL, objPtr, &objc);
+    if ((result != TCL_OK) || ((objc != 2) && (objc != 3))) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can't interpret \"%s\" as a lambda expression",
+		Tcl_GetString(objPtr)));
+	Tcl_SetErrorCode(interp, "TCL", "VALUE", "LAMBDA", NULL);
+	return TCL_ERROR;
+    }
     result = TclListObjGetElementsM(NULL, objPtr, &objc, &objv);
     if ((result != TCL_OK) || ((objc != 2) && (objc != 3))) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index e2be167..3e8844a 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -429,7 +429,7 @@ TraceExecutionObjCmd(
 	 * pointer to its array of element pointers.
 	 */
 
-	result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+	result = TclListObjLengthM(interp, objv[4], &listLen);
 	if (result != TCL_OK) {
 	    return result;
 	}
@@ -441,6 +441,10 @@ TraceExecutionObjCmd(
 		    NULL);
 	    return TCL_ERROR;
 	}
+	result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+	if (result != TCL_OK) {
+	    return result;
+	}
 	for (i = 0; i < listLen; i++) {
 	    if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
 		    "operation", TCL_EXACT, &index) != TCL_OK) {
@@ -672,7 +676,7 @@ TraceCommandObjCmd(
 	 * pointer to its array of element pointers.
 	 */
 
-	result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+	result = TclListObjLengthM(interp, objv[4], &listLen);
 	if (result != TCL_OK) {
 	    return result;
 	}
@@ -684,7 +688,10 @@ TraceCommandObjCmd(
 		    NULL);
 	    return TCL_ERROR;
 	}
-
+	result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+	if (result != TCL_OK) {
+	    return result;
+	}
 	for (i = 0; i < listLen; i++) {
 	    if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
 		    "operation", TCL_EXACT, &index) != TCL_OK) {
@@ -873,7 +880,7 @@ TraceVariableObjCmd(
 	 * pointer to its array of element pointers.
 	 */
 
-	result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+	result = TclListObjLengthM(interp, objv[4], &listLen);
 	if (result != TCL_OK) {
 	    return result;
 	}
@@ -885,6 +892,10 @@ TraceVariableObjCmd(
 		    NULL);
 	    return TCL_ERROR;
 	}
+	result = TclListObjGetElementsM(interp, objv[4], &listLen, &elemPtrs);
+	if (result != TCL_OK) {
+	    return result;
+	}
 	for (i = 0; i < listLen ; i++) {
 	    if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
 		    "operation", TCL_EXACT, &index) != TCL_OK) {
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 2a96fb6..c614371 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -4161,8 +4161,7 @@ ArraySetCmd(
 	int elemLen;
 	Tcl_Obj **elemPtrs, *copyListObj;
 
-	result = TclListObjGetElementsM(interp, arrayElemObj,
-		&elemLen, &elemPtrs);
+	result = TclListObjLengthM(interp, arrayElemObj, &elemLen);
 	if (result != TCL_OK) {
 	    return result;
 	}
@@ -4175,6 +4174,11 @@ ArraySetCmd(
 	if (elemLen == 0) {
 	    goto ensureArray;
 	}
+	result = TclListObjGetElementsM(interp, arrayElemObj,
+		&elemLen, &elemPtrs);
+	if (result != TCL_OK) {
+	    return result;
+	}
 
 	/*
 	 * We needn't worry about traces invalidating arrayPtr: should that be
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 3b1d787..1b602ea 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -3044,7 +3044,7 @@ ZipFSMkZipOrImg(
 	}
     }
     Tcl_IncrRefCount(list);
-    if (TclListObjGetElementsM(interp, list, &lobjc, &lobjv) != TCL_OK) {
+    if (TclListObjLengthM(interp, list, &lobjc) != TCL_OK) {
 	Tcl_DecrRefCount(list);
 	return TCL_ERROR;
     }
@@ -3060,6 +3060,10 @@ ZipFSMkZipOrImg(
 	ZIPFS_ERROR_CODE(interp, "EMPTY");
 	return TCL_ERROR;
     }
+    if (TclListObjGetElementsM(interp, list, &lobjc, &lobjv) != TCL_OK) {
+	Tcl_DecrRefCount(list);
+	return TCL_ERROR;
+    }
     out = Tcl_FSOpenFileChannel(interp, targetFile, "wb", 0755);
     if (out == NULL) {
 	Tcl_DecrRefCount(list);
-- 
cgit v0.12


From cdb467ed6129f23bc867e6169352010e458bdc60 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Nov 2022 10:30:41 +0000
Subject: Update all "8.5" versions in Tcl_InitStubs() to "8.5-", since they
 can be compiled for Tcl 9.0 as well.

---
 generic/tclTest.c    | 4 ++--
 tools/tsdPerf.c      | 2 +-
 unix/dltest/pkga.c   | 2 +-
 unix/dltest/pkgb.c   | 4 ++--
 unix/dltest/pkgc.c   | 4 ++--
 unix/dltest/pkgd.c   | 4 ++--
 unix/dltest/pkge.c   | 2 +-
 unix/dltest/pkgooa.c | 2 +-
 unix/dltest/pkgua.c  | 2 +-
 unix/tclXtTest.c     | 2 +-
 win/tclWinDde.c      | 2 +-
 win/tclWinReg.c      | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 0004c8e..bc51c99 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -445,7 +445,7 @@ Tcltest_Init(
 	"-appinitprocclosestderr", "-appinitprocsetrcfile", NULL
     };
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     if (Tcl_TomMath_InitStubs(interp, "8.5") == NULL) {
@@ -694,7 +694,7 @@ int
 Tcltest_SafeInit(
     Tcl_Interp *interp)		/* Interpreter for application. */
 {
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     return Procbodytest_SafeInit(interp);
diff --git a/tools/tsdPerf.c b/tools/tsdPerf.c
index 40004b1..a75e962 100644
--- a/tools/tsdPerf.c
+++ b/tools/tsdPerf.c
@@ -40,7 +40,7 @@ tsdPerfGetObjCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const
 
 int
 Tsdperf_Init(Tcl_Interp *interp) {
-    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
 
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index ff8f000..c2d814f 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -126,7 +126,7 @@ Pkga_Init(
 {
     int code;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     code = Tcl_PkgProvide(interp, "pkga", "1.0");
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 29f4a23..8d8d123 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -149,7 +149,7 @@ Pkgb_Init(
 {
     int code;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     code = Tcl_PkgProvide(interp, "pkgb", "2.3");
@@ -186,7 +186,7 @@ Pkgb_SafeInit(
 {
     int code;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     code = Tcl_PkgProvide(interp, "pkgb", "2.3");
diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c
index 23bb2e5..46f6e86 100644
--- a/unix/dltest/pkgc.c
+++ b/unix/dltest/pkgc.c
@@ -118,7 +118,7 @@ Pkgc_Init(
 {
     int code;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     code = Tcl_PkgProvide(interp, "pkgc", "1.7.2");
@@ -155,7 +155,7 @@ Pkgc_SafeInit(
 {
     int code;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     code = Tcl_PkgProvide(interp, "pkgc", "1.7.2");
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
index d51dd6a..d64c807 100644
--- a/unix/dltest/pkgd.c
+++ b/unix/dltest/pkgd.c
@@ -118,7 +118,7 @@ Pkgd_Init(
 {
     int code;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     code = Tcl_PkgProvide(interp, "pkgd", "7.3");
@@ -155,7 +155,7 @@ Pkgd_SafeInit(
 {
     int code;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     code = Tcl_PkgProvide(interp, "pkgd", "7.3");
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
index 9120538..f46ca74 100644
--- a/unix/dltest/pkge.c
+++ b/unix/dltest/pkge.c
@@ -38,7 +38,7 @@ Pkge_Init(
 {
     static const char script[] = "if 44 {open non_existent}";
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     return Tcl_EvalEx(interp, script, -1, 0);
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index 9f78da8..06ff3ac 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -105,7 +105,7 @@ Pkgooa_Init(
      * This worked in Tcl 8.6.0, and is expected
      * to keep working in all future Tcl 8.x releases.
      */
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     if (tclStubsPtr == NULL) {
diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c
index ad2b2b3..e6a4fbb 100644
--- a/unix/dltest/pkgua.c
+++ b/unix/dltest/pkgua.c
@@ -216,7 +216,7 @@ Pkgua_Init(
     int code;
     Tcl_Command *cmdTokens;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
 
diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c
index 12960ad..7eb1fdc 100644
--- a/unix/tclXtTest.c
+++ b/unix/tclXtTest.c
@@ -47,7 +47,7 @@ DLLEXPORT int
 Tclxttest_Init(
     Tcl_Interp *interp)		/* Interpreter for application. */
 {
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
     XtToolkitInitialize();
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 1c10c65..678eed3 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -175,7 +175,7 @@ int
 Dde_Init(
     Tcl_Interp *interp)
 {
-    if (!Tcl_InitStubs(interp, "8.5", 0)) {
+    if (!Tcl_InitStubs(interp, "8.5-", 0)) {
 	return TCL_ERROR;
     }
 
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 16a0d3d..cd4ab33 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -184,7 +184,7 @@ Registry_Init(
 {
     Tcl_Command cmd;
 
-    if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
 
-- 
cgit v0.12


From 4813d492cacd8473e3266e284b3d3714f49602ae Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Nov 2022 14:51:03 +0000
Subject: Proposed fix for [084ab982fe]: Use -strict to disable noncharacters

---
 generic/tclEncoding.c | 27 ++++++++++++++-------------
 tests/encoding.test   | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index eb217b4..5be6a2e 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -562,7 +562,7 @@ TclInitEncodingSubsystem(void)
     type.nullSize	= 1;
     type.clientData	= INT2PTR(TCL_ENCODING_UTF);
     Tcl_CreateEncoding(&type);
-    type.clientData	= INT2PTR(0);
+    type.clientData	= INT2PTR(TCL_ENCODING_NOCOMPLAIN);
     type.encodingName	= "cesu-8";
     Tcl_CreateEncoding(&type);
 
@@ -571,13 +571,13 @@ TclInitEncodingSubsystem(void)
     type.freeProc	= NULL;
     type.nullSize	= 2;
     type.encodingName   = "ucs-2le";
-    type.clientData	= INT2PTR(TCL_ENCODING_LE);
+    type.clientData	= INT2PTR(TCL_ENCODING_LE|TCL_ENCODING_NOCOMPLAIN);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2be";
-    type.clientData	= INT2PTR(0);
+    type.clientData	= INT2PTR(TCL_ENCODING_NOCOMPLAIN);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2";
-    type.clientData	= INT2PTR(isLe.c);
+    type.clientData	= INT2PTR(isLe.c|TCL_ENCODING_NOCOMPLAIN);
     Tcl_CreateEncoding(&type);
 
     type.toUtfProc	= Utf32ToUtfProc;
@@ -2468,15 +2468,16 @@ UtfToUtfProc(
 		src += len;
 		dst += Tcl_UniCharToUtf(ch, dst);
 		ch = low;
-	    } else if (!Tcl_UniCharIsUnicode(ch)) {
-		if (STOPONERROR) {
-		    result = TCL_CONVERT_UNKNOWN;
-		    src = saveSrc;
-		    break;
-		}
-		if (!(flags & TCL_ENCODING_MODIFIED)) {
-		    ch = 0xFFFD;
-		}
+	    } else if (STOPONERROR && !(flags & TCL_ENCODING_MODIFIED) && !Tcl_UniCharIsUnicode(ch)
+		    && (((ch  & ~0x7FF) == 0xD800) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+		result = TCL_CONVERT_UNKNOWN;
+		src = saveSrc;
+		break;
+	    } else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
+		    && (flags & TCL_ENCODING_MODIFIED) && !Tcl_UniCharIsUnicode(ch)) {
+		result = TCL_CONVERT_SYNTAX;
+		src = saveSrc;
+		break;
 	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
diff --git a/tests/encoding.test b/tests/encoding.test
index 9aa123d..1125397 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -688,6 +688,42 @@ test encoding-24.27 {Parse invalid utf-8 with -strict} -body {
 test encoding-24.28 {Parse invalid utf-8 with -strict} -body {
     encoding convertfrom -strict utf-8 "\xFF\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xFF'}
+test encoding-24.29 {Parse invalid utf-8} -body {
+    encoding convertfrom utf-8 \xEF\xBF\xBF
+} -result \uFFFF
+test encoding-24.30 {Parse invalid utf-8 with -strict} -body {
+    encoding convertfrom -strict utf-8 \xEF\xBF\xBF
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xEF'}
+test encoding-24.31 {Parse invalid utf-8 with -nocomplain} -body {
+    encoding convertfrom -nocomplain utf-8 \xEF\xBF\xBF
+} -result \uFFFF
+test encoding-24.32 {Try to generate invalid utf-8} -body {
+    encoding convertto utf-8 \uFFFF
+} -result \xEF\xBF\xBF
+test encoding-24.33 {Try to generate invalid utf-8 with -strict} -body {
+    encoding convertto -strict utf-8 \uFFFF
+} -returnCodes 1 -result {unexpected character at index 0: 'U+00FFFF'}
+test encoding-24.34 {Try to generate invalid utf-8 with -nocomplain} -body {
+    encoding convertto -nocomplain utf-8 \uFFFF
+} -result \xEF\xBF\xBF
+test encoding-24.35 {Parse invalid utf-8} -constraints deprecated -body {
+    encoding convertfrom utf-8 \xED\xA0\x80
+} -result \uD800
+test encoding-24.36 {Parse invalid utf-8 with -strict} -body {
+    encoding convertfrom -strict utf-8 \xED\xA0\x80
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
+test encoding-24.37 {Parse invalid utf-8 with -nocomplain} -body {
+    encoding convertfrom -nocomplain utf-8 \xED\xA0\x80
+} -result \uD800
+test encoding-24.38 {Try to generate invalid utf-8} -constraints deprecated -body {
+    encoding convertto utf-8 \uD800
+} -result \xED\xA0\x80
+test encoding-24.39 {Try to generate invalid utf-8 with -strict} -body {
+    encoding convertto -strict utf-8 \uD800
+} -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
+test encoding-24.40 {Try to generate invalid utf-8 with -nocomplain} -body {
+    encoding convertto -nocomplain utf-8 \uD800
+} -result \xED\xA0\x80
 
 file delete [file join [temporaryDirectory] iso2022.txt]
 
-- 
cgit v0.12


From 6d6996d99fb8dc3566f23a3b6fa22dfb0bda0a16 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Nov 2022 16:05:33 +0000
Subject: make Windows dde (-> 1.4.5) and registry (-> 1.3.7) extensions ready
 for the Tcl 9.0 era.

---
 library/dde/pkgIndex.tcl      |   6 +-
 library/registry/pkgIndex.tcl |   4 +-
 tests/registry.test           |   4 +-
 tests/winDde.test             |   4 +-
 win/Makefile.in               |   4 +-
 win/makefile.vc               |   4 +-
 win/tclWinDde.c               |  93 ++++++++++++-------------------
 win/tclWinReg.c               | 124 +++++++++++++++++++++++-------------------
 8 files changed, 116 insertions(+), 127 deletions(-)

diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index 18ac517..ace1681 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,12 +1,12 @@
 if {[info sharedlibextension] != ".dll"} return
 if {[package vsatisfies [package provide Tcl] 9.0-]} {
-    package ifneeded dde 1.4.4 \
+    package ifneeded dde 1.4.5 \
 	    [list load [file join $dir tcl9dde14.dll] Dde]
 } elseif {![package vsatisfies [package provide Tcl] 8.7]
 	&& [::tcl::pkgconfig get debug]} {
-    package ifneeded dde 1.4.4 \
+    package ifneeded dde 1.4.5 \
 	    [list load [file join $dir tcldde14g.dll] Dde]
 } else {
-    package ifneeded dde 1.4.4 \
+    package ifneeded dde 1.4.5 \
 	    [list load [file join $dir tcldde14.dll] Dde]
 }
diff --git a/library/registry/pkgIndex.tcl b/library/registry/pkgIndex.tcl
index 765f02a..edb4729 100644
--- a/library/registry/pkgIndex.tcl
+++ b/library/registry/pkgIndex.tcl
@@ -1,9 +1,9 @@
 if {![package vsatisfies [package provide Tcl] 8.5-]} return
 if {[info sharedlibextension] != ".dll"} return
 if {[package vsatisfies [package provide Tcl] 9.0-]} {
-    package ifneeded registry 1.3.6 \
+    package ifneeded registry 1.3.7 \
 	    [list load [file join $dir tcl9registry13.dll] Registry]
 } else {
-    package ifneeded registry 1.3.6 \
+    package ifneeded registry 1.3.7 \
 	    [list load [file join $dir tclregistry13.dll] Registry]
 }
diff --git a/tests/registry.test b/tests/registry.test
index 4fc96bf..2f1fd8c 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -19,7 +19,7 @@ testConstraint reg 0
 if {[testConstraint win]} {
     if {![catch {
 	    ::tcltest::loadTestedCommands
-	    set ::regver [package require registry 1.3.6]
+	    set ::regver [package require registry 1.3.7]
 	}]} {
 	testConstraint reg 1
     }
@@ -34,7 +34,7 @@ testConstraint english [expr {
 
 test registry-1.0 {check if we are testing the right dll} {win reg} {
     set ::regver
-} {1.3.6}
+} {1.3.7}
 test registry-1.1 {argument parsing for registry command} {win reg} {
     list [catch {registry} msg] $msg
 } {1 {wrong # args: should be "registry ?-32bit|-64bit? option ?arg ...?"}}
diff --git a/tests/winDde.test b/tests/winDde.test
index c56d27d..14308c7 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -19,7 +19,7 @@ testConstraint dde 0
 if {[testConstraint win]} {
     if {![catch {
 	    ::tcltest::loadTestedCommands
-	    set ::ddever [package require dde 1.4.4]
+	    set ::ddever [package require dde 1.4.5]
 	    set ::ddelib [info loaded {} Dde]}]} {
 	testConstraint dde 1
     }
@@ -105,7 +105,7 @@ proc createChildProcess {ddeServerName args} {
 # -------------------------------------------------------------------------
 test winDde-1.0 {check if we are testing the right dll} {win dde} {
     set ::ddever
-} {1.4.4}
+} {1.4.5}
 
 test winDde-1.1 {Settings the server's topic name} -constraints dde -body {
     list [dde servername foobar] [dde servername] [dde servername self]
diff --git a/win/Makefile.in b/win/Makefile.in
index 689f9b8..6d7bb7d 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -157,8 +157,8 @@ TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
 TEST_EXE_FILE		= tcltest${EXESUFFIX}
 TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${DLLSUFFIX}${LIBSUFFIX}
 TEST_LOAD_PRMS		= lappend ::auto_path {$(ROOT_DIR_WIN_NATIVE)/tests};\
-			  package ifneeded dde 1.4.4 [list load [file normalize ${DDE_DLL_FILE}]];\
-			  package ifneeded registry 1.3.6 [list load [file normalize ${REG_DLL_FILE}]]
+			  package ifneeded dde 1.4.5 [list load [file normalize ${DDE_DLL_FILE}]];\
+			  package ifneeded registry 1.3.7 [list load [file normalize ${REG_DLL_FILE}]]
 TEST_LOAD_FACILITIES	= package ifneeded tcl::test ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\
 			  $(TEST_LOAD_PRMS)
 ZLIB_DLL_FILE		= zlib1.dll
diff --git a/win/makefile.vc b/win/makefile.vc
index e583ae0..1f0b02e 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -500,8 +500,8 @@ test: test-core test-pkgs
 test-core: setup $(TCLTEST) dlls
 	set TCL_LIBRARY=$(ROOT:\=/)/library
 	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
-		package ifneeded dde 1.4.4 [list load "$(TCLDDELIB:\=/)"]
-		package ifneeded registry 1.3.6 [list load "$(TCLREGLIB:\=/)"]
+		package ifneeded dde 1.4.5 [list load "$(TCLDDELIB:\=/)"]
+		package ifneeded registry 1.3.7 [list load "$(TCLREGLIB:\=/)"]
 <<
 
 runtest: setup $(TCLTEST) dlls
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 678eed3..e232471 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -79,7 +79,7 @@ static DWORD ddeInstance;	/* The application instance handle given to us
 				 * by DdeInitialize. */
 static int ddeIsServer = 0;
 
-#define TCL_DDE_VERSION		"1.4.4"
+#define TCL_DDE_VERSION		"1.4.5"
 #define TCL_DDE_PACKAGE_NAME	"dde"
 #define TCL_DDE_SERVICE_NAME	L"TclEval"
 #define TCL_DDE_EXECUTE_RESULT	L"$TCLEVAL$EXECUTE$RESULT"
@@ -117,7 +117,7 @@ static int		DdeObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 
-#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
+#if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 # if TCL_UTF_MAX > 3
 #   define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
 #   define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
@@ -125,32 +125,20 @@ static int		DdeObjCmd(void *clientData,
 #   define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString
 #   define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString
 # endif
+#define Tcl_Size int
+#define TCL_INDEX_NONE -1
 #endif
 
-static unsigned char *
-getByteArrayFromObj(
-	Tcl_Obj *objPtr,
-	size_t *lengthPtr
-) {
-    int length;
-
-    unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &length);
-#if TCL_MAJOR_VERSION > 8
-    if (sizeof(TCL_HASH_TYPE) > sizeof(int)) {
-	/* 64-bit and TIP #494 situation: */
-	 *lengthPtr = *(TCL_HASH_TYPE *) objPtr->internalRep.twoPtrValue.ptr1;
-    } else
-#endif
-	/* 32-bit or without TIP #494 */
-    *lengthPtr = (size_t) (unsigned) length;
-    return result;
-}
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 DLLEXPORT int		Dde_Init(Tcl_Interp *interp);
 DLLEXPORT int		Dde_SafeInit(Tcl_Interp *interp);
+#if TCL_MAJOR_VERSION < 9
+/* With those additional entries, "load dde14.dll" works without 3th argument */
+DLLEXPORT int		Tcldde_Init(Tcl_Interp *interp);
+DLLEXPORT int		Tcldde_SafeInit(Tcl_Interp *interp);
+#endif
 #ifdef __cplusplus
 }
 #endif
@@ -410,7 +398,7 @@ DdeSetServerName(
 
 		Tcl_ListObjIndex(interp, srvPtrPtr[n], 1, &namePtr);
 		Tcl_DStringInit(&ds);
-		Tcl_UtfToWCharDString(Tcl_GetString(namePtr), -1, &ds);
+		Tcl_UtfToWCharDString(Tcl_GetString(namePtr), TCL_INDEX_NONE, &ds);
 		if (wcscmp(actualName, (WCHAR *)Tcl_DStringValue(&ds)) == 0) {
 		    suffix++;
 		    Tcl_DStringFree(&ds);
@@ -568,7 +556,7 @@ ExecuteRemoteObject(
     if ((riPtr->handlerPtr == NULL) && Tcl_IsSafe(riPtr->interp)) {
 	Tcl_SetObjResult(riPtr->interp, Tcl_NewStringObj("permission denied: "
 		"a handler procedure must be defined for use in a safe "
-		"interp", -1));
+		"interp", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(riPtr->interp, "TCL", "DDE", "SECURITY_CHECK", NULL);
 	result = TCL_ERROR;
     }
@@ -647,7 +635,7 @@ DdeServerProc(
 				/* Transaction-dependent data. */
 {
     Tcl_DString dString;
-    size_t len;
+    Tcl_Size len;
     DWORD dlen;
     WCHAR *utilString;
     Tcl_Obj *ddeObjectPtr;
@@ -767,8 +755,7 @@ DdeServerProc(
 		    CP_WINUNICODE);
 	    if (_wcsicmp(utilString, TCL_DDE_EXECUTE_RESULT) == 0) {
 		returnString =
-			Tcl_GetString(convPtr->returnPackagePtr);
-		len = convPtr->returnPackagePtr->length;
+			Tcl_GetStringFromObj(convPtr->returnPackagePtr, &len);
 		if (uFmt != CF_TEXT) {
 		    Tcl_DStringInit(&dsBuf);
 		    Tcl_UtfToWCharDString(returnString, len, &dsBuf);
@@ -790,8 +777,7 @@ DdeServerProc(
 			    convPtr->riPtr->interp, Tcl_DStringValue(&ds), NULL,
 			    TCL_GLOBAL_ONLY);
 		    if (variableObjPtr != NULL) {
-			returnString = Tcl_GetString(variableObjPtr);
-			len = variableObjPtr->length;
+			returnString = Tcl_GetStringFromObj(variableObjPtr, &len);
 			if (uFmt != CF_TEXT) {
 			    Tcl_DStringInit(&dsBuf);
 			    Tcl_UtfToWCharDString(returnString, len, &dsBuf);
@@ -852,7 +838,7 @@ DdeServerProc(
 		Tcl_WCharToUtfDString(utilString, wcslen(utilString), &ds2);
 		utilString = (WCHAR *) Tcl_DStringValue(&ds2);
 	    }
-	    variableObjPtr = Tcl_NewStringObj((char *)utilString, -1);
+	    variableObjPtr = Tcl_NewStringObj((char *)utilString, TCL_INDEX_NONE);
 
 	    Tcl_SetVar2Ex(convPtr->riPtr->interp, Tcl_DStringValue(&ds), NULL,
 		    variableObjPtr, TCL_GLOBAL_ONLY);
@@ -1147,12 +1133,12 @@ DdeServicesOnAck(
 	GlobalGetAtomNameW(service, sz, 255);
 	Tcl_DStringInit(&dString);
 	Tcl_WCharToUtfDString(sz, wcslen(sz), &dString);
-	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(Tcl_DStringValue(&dString), -1));
+	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(Tcl_DStringValue(&dString), TCL_INDEX_NONE));
 	Tcl_DStringFree(&dString);
 	GlobalGetAtomNameW(topic, sz, 255);
 	Tcl_DStringInit(&dString);
 	Tcl_WCharToUtfDString(sz, wcslen(sz), &dString);
-	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(Tcl_DStringValue(&dString), -1));
+	Tcl_ListObjAppendElement(NULL, matchPtr, Tcl_NewStringObj(Tcl_DStringValue(&dString), TCL_INDEX_NONE));
 	Tcl_DStringFree(&dString);
 
 	/*
@@ -1270,7 +1256,7 @@ SetDdeError(
 	errorCode = "FAILED";
     }
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(errorMessage, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(errorMessage, TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "TCL", "DDE", errorCode, NULL);
 }
 
@@ -1325,7 +1311,7 @@ DdeObjCmd(
     };
 
     int index, i, argIndex;
-    size_t length;
+    Tcl_Size length;
     int flags = 0, result = TCL_OK, firstArg = 0;
     HSZ ddeService = NULL, ddeTopic = NULL, ddeItem = NULL, ddeCookie = NULL;
     HDDEDATA ddeData = NULL, ddeItemData = NULL, ddeReturn;
@@ -1488,9 +1474,8 @@ DdeObjCmd(
     Initialize();
 
     if (firstArg != 1) {
-	const char *src = Tcl_GetString(objv[firstArg]);
+	const char *src = Tcl_GetStringFromObj(objv[firstArg], &length);
 
-	length = objv[firstArg]->length;
 	Tcl_DStringInit(&serviceBuf);
 	Tcl_UtfToWCharDString(src, length, &serviceBuf);
 	serviceName = (WCHAR *) Tcl_DStringValue(&serviceBuf);
@@ -1507,9 +1492,8 @@ DdeObjCmd(
     }
 
     if ((index != DDE_SERVERNAME) && (index != DDE_EVAL)) {
-	const char *src = Tcl_GetString(objv[firstArg + 1]);
+	const char *src = Tcl_GetStringFromObj(objv[firstArg + 1], &length);
 
-	length = objv[firstArg + 1]->length;
 	Tcl_DStringInit(&topicBuf);
 	topicName = Tcl_UtfToWCharDString(src, length, &topicBuf);
 	length = Tcl_DStringLength(&topicBuf) / sizeof(WCHAR);
@@ -1539,19 +1523,18 @@ DdeObjCmd(
 	break;
 
     case DDE_EXECUTE: {
-	size_t dataLength;
+	Tcl_Size dataLength;
 	const void *dataString;
 	Tcl_DString dsBuf;
 
 	Tcl_DStringInit(&dsBuf);
 	if (flags & DDE_FLAG_BINARY) {
 	    dataString =
-		    getByteArrayFromObj(objv[firstArg + 2], &dataLength);
+		    Tcl_GetByteArrayFromObj(objv[firstArg + 2], &dataLength);
 	} else {
 	    const char *src;
 
-	    src = Tcl_GetString(objv[firstArg + 2]);
-	    dataLength = objv[firstArg + 2]->length;
+	    src = Tcl_GetStringFromObj(objv[firstArg + 2], &dataLength);
 	    Tcl_DStringInit(&dsBuf);
 	    dataString =
 		    Tcl_UtfToWCharDString(src, dataLength, &dsBuf);
@@ -1560,7 +1543,7 @@ DdeObjCmd(
 
 	if (dataLength + 1 < 2) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("cannot execute null data", -1));
+		    Tcl_NewStringObj("cannot execute null data", TCL_INDEX_NONE));
 	    Tcl_DStringFree(&dsBuf);
 	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", NULL);
 	    result = TCL_ERROR;
@@ -1604,15 +1587,14 @@ DdeObjCmd(
 	const WCHAR *itemString;
 	const char *src;
 
-	src = Tcl_GetString(objv[firstArg + 2]);
-	length = objv[firstArg + 2]->length;
+	src = Tcl_GetStringFromObj(objv[firstArg + 2], &length);
 	Tcl_DStringInit(&itemBuf);
 	itemString = Tcl_UtfToWCharDString(src, length, &itemBuf);
 	length = Tcl_DStringLength(&itemBuf) / sizeof(WCHAR);
 
 	if (length == 0) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("cannot request value of null data", -1));
+		    Tcl_NewStringObj("cannot request value of null data", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", NULL);
 	    result = TCL_ERROR;
 	    goto cleanup;
@@ -1672,14 +1654,13 @@ DdeObjCmd(
 	BYTE *dataString;
 	const char *src;
 
-	src = Tcl_GetString(objv[firstArg + 2]);
-	length = objv[firstArg + 2]->length;
+	src = Tcl_GetStringFromObj(objv[firstArg + 2], &length);
 	Tcl_DStringInit(&itemBuf);
 	itemString = Tcl_UtfToWCharDString(src, length, &itemBuf);
 	length = Tcl_DStringLength(&itemBuf) / sizeof(WCHAR);
 	if (length == 0) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("cannot have a null item", -1));
+		    Tcl_NewStringObj("cannot have a null item", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", NULL);
 	    result = TCL_ERROR;
 	    goto cleanup;
@@ -1687,11 +1668,10 @@ DdeObjCmd(
 	Tcl_DStringInit(&dsBuf);
 	if (flags & DDE_FLAG_BINARY) {
 	    dataString = (BYTE *)
-		    getByteArrayFromObj(objv[firstArg + 3], &length);
+		    Tcl_GetByteArrayFromObj(objv[firstArg + 3], &length);
 	} else {
 	    const char *data =
-		    Tcl_GetString(objv[firstArg + 3]);
-	    length = objv[firstArg + 3]->length;
+		    Tcl_GetStringFromObj(objv[firstArg + 3], &length);
 	    Tcl_DStringInit(&dsBuf);
 	    dataString = (BYTE *)
 		    Tcl_UtfToWCharDString(data, length, &dsBuf);
@@ -1734,7 +1714,7 @@ DdeObjCmd(
 
 	if (serviceName == NULL) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("invalid service name \"\"", -1));
+		    Tcl_NewStringObj("invalid service name \"\"", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", NULL);
 	    result = TCL_ERROR;
 	    goto cleanup;
@@ -1782,7 +1762,7 @@ DdeObjCmd(
 	    if (Tcl_IsSafe(riPtr->interp) && (riPtr->handlerPtr == NULL)) {
 		Tcl_SetObjResult(riPtr->interp, Tcl_NewStringObj(
 			"permission denied: a handler procedure must be"
-			" defined for use in a safe interp", -1));
+			" defined for use in a safe interp", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "DDE", "SECURITY_CHECK",
 			NULL);
 		result = TCL_ERROR;
@@ -1848,15 +1828,14 @@ DdeObjCmd(
 	    if (MakeDdeConnection(interp, serviceName, &hConv) != TCL_OK) {
 	    invalidServerResponse:
 		Tcl_SetObjResult(interp,
-			Tcl_NewStringObj("invalid data returned from server", -1));
+			Tcl_NewStringObj("invalid data returned from server", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "DDE", "BAD_RESPONSE", NULL);
 		result = TCL_ERROR;
 		goto cleanup;
 	    }
 
 	    objPtr = Tcl_ConcatObj(objc, objv);
-	    string = Tcl_GetString(objPtr);
-	    length = objPtr->length;
+	    string = Tcl_GetStringFromObj(objPtr, &length);
 	    Tcl_DStringInit(&dsBuf);
 	    Tcl_UtfToWCharDString(string, length, &dsBuf);
 	    string = Tcl_DStringValue(&dsBuf);
@@ -1906,7 +1885,7 @@ DdeObjCmd(
 		length = DdeGetData(ddeData, NULL, 0, 0);
 		ddeDataString = (WCHAR *) Tcl_Alloc(length);
 		DdeGetData(ddeData, (BYTE *) ddeDataString, (DWORD) length, 0);
-		if (length > sizeof(WCHAR)) {
+		if (length > (Tcl_Size)sizeof(WCHAR)) {
 		    length -= sizeof(WCHAR);
 		}
 		Tcl_DStringInit(&dsBuf);
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 2daf43e..6fafead 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -124,7 +124,7 @@ static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
 			    Tcl_Obj *valueNameObj, Tcl_Obj *dataObj,
 			    Tcl_Obj *typeObj, REGSAM mode);
 
-#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
+#if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 # if TCL_UTF_MAX > 3
 #   define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
 #   define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
@@ -132,32 +132,20 @@ static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
 #   define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString
 #   define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString
 # endif
+#define Tcl_Size int
+#define TCL_INDEX_NONE -1
 #endif
 
-static unsigned char *
-getByteArrayFromObj(
-	Tcl_Obj *objPtr,
-	size_t *lengthPtr
-) {
-    int length;
-
-    unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &length);
-#if TCL_MAJOR_VERSION > 8
-    if (sizeof(TCL_HASH_TYPE) > sizeof(int)) {
-	/* 64-bit and TIP #494 situation: */
-	 *lengthPtr = *(TCL_HASH_TYPE *) objPtr->internalRep.twoPtrValue.ptr1;
-    } else
-#endif
-	/* 32-bit or without TIP #494 */
-    *lengthPtr = (size_t) (unsigned) length;
-    return result;
-}
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 DLLEXPORT int		Registry_Init(Tcl_Interp *interp);
 DLLEXPORT int		Registry_Unload(Tcl_Interp *interp, int flags);
+#if TCL_MAJOR_VERSION < 9
+/* With those additional entries, "load registry13.dll" works without 3th argument */
+DLLEXPORT int		Tclregistry_Init(Tcl_Interp *interp);
+DLLEXPORT int		Tclregistry_SafeInit(Tcl_Interp *interp);
+#endif
 #ifdef __cplusplus
 }
 #endif
@@ -191,8 +179,16 @@ Registry_Init(
     cmd = Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd,
 	    interp, DeleteCmd);
     Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, cmd);
-    return Tcl_PkgProvideEx(interp, "registry", "1.3.6", NULL);
+    return Tcl_PkgProvideEx(interp, "registry", "1.3.7", NULL);
+}
+#if TCL_MAJOR_VERSION < 9
+int
+Tclregistry_Init(
+    Tcl_Interp *interp)
+{
+    return Registry_Init(interp);
 }
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -223,9 +219,9 @@ Registry_Unload(
      * Unregister the registry package. There is no Tcl_PkgForget()
      */
 
-    objv[0] = Tcl_NewStringObj("package", -1);
-    objv[1] = Tcl_NewStringObj("forget", -1);
-    objv[2] = Tcl_NewStringObj("registry", -1);
+    objv[0] = Tcl_NewStringObj("package", TCL_INDEX_NONE);
+    objv[1] = Tcl_NewStringObj("forget", TCL_INDEX_NONE);
+    objv[2] = Tcl_NewStringObj("registry", TCL_INDEX_NONE);
     Tcl_EvalObjv(interp, 3, objv, TCL_EVAL_GLOBAL);
 
     /*
@@ -239,6 +235,15 @@ Registry_Unload(
 
     return TCL_OK;
 }
+#if TCL_MAJOR_VERSION < 9
+int
+Tclregistry_Unload(
+    Tcl_Interp *interp,
+    int flags)
+{
+    return Registry_Unload(interp, flags);
+}
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -438,13 +443,14 @@ DeleteKey(
     DWORD result;
     Tcl_DString buf;
     REGSAM saveMode = mode;
+    Tcl_Size len;
 
     /*
      * Find the parent of the key being deleted and open it.
      */
 
-    keyName = Tcl_GetString(keyNameObj);
-    buffer = (char *)Tcl_Alloc(keyNameObj->length + 1);
+    keyName = Tcl_GetStringFromObj(keyNameObj, &len);
+    buffer = (char *)Tcl_Alloc(len + 1);
     strcpy(buffer, keyName);
 
     if (ParseKeyName(interp, buffer, &hostName, &rootKey,
@@ -455,7 +461,7 @@ DeleteKey(
 
     if (*keyName == '\0') {
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("bad key: cannot delete root keys", -1));
+		Tcl_NewStringObj("bad key: cannot delete root keys", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "WIN_REG", "DEL_ROOT_KEY", NULL);
 	Tcl_Free(buffer);
 	return TCL_ERROR;
@@ -477,7 +483,7 @@ DeleteKey(
 	    return TCL_OK;
 	}
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("unable to delete key: ", -1));
+		Tcl_NewStringObj("unable to delete key: ", TCL_INDEX_NONE));
 	AppendSystemError(interp, result);
 	return TCL_ERROR;
     }
@@ -487,13 +493,13 @@ DeleteKey(
      */
 
     Tcl_DStringInit(&buf);
-    nativeTail = Tcl_UtfToWCharDString(tail, -1, &buf);
+    nativeTail = Tcl_UtfToWCharDString(tail, TCL_INDEX_NONE, &buf);
     result = RecursiveDeleteKey(subkey, nativeTail, saveMode);
     Tcl_DStringFree(&buf);
 
     if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("unable to delete key: ", -1));
+		Tcl_NewStringObj("unable to delete key: ", TCL_INDEX_NONE));
 	AppendSystemError(interp, result);
 	result = TCL_ERROR;
     } else {
@@ -532,6 +538,7 @@ DeleteValue(
     char *valueName;
     DWORD result;
     Tcl_DString ds;
+    Tcl_Size len;
 
     /*
      * Attempt to open the key for deletion.
@@ -542,9 +549,9 @@ DeleteValue(
 	return TCL_ERROR;
     }
 
-    valueName = Tcl_GetString(valueNameObj);
+    valueName = Tcl_GetStringFromObj(valueNameObj, &len);
     Tcl_DStringInit(&ds);
-    Tcl_UtfToWCharDString(valueName, valueNameObj->length, &ds);
+    Tcl_UtfToWCharDString(valueName, len, &ds);
     result = RegDeleteValueW(key, (const WCHAR *)Tcl_DStringValue(&ds));
     Tcl_DStringFree(&ds);
     if (result != ERROR_SUCCESS) {
@@ -685,6 +692,7 @@ GetType(
     Tcl_DString ds;
     const char *valueName;
     const WCHAR *nativeValue;
+    Tcl_Size len;
 
     /*
      * Attempt to open the key for reading.
@@ -699,9 +707,9 @@ GetType(
      * Get the type of the value.
      */
 
-    valueName = Tcl_GetString(valueNameObj);
+    valueName = Tcl_GetStringFromObj(valueNameObj, &len);
     Tcl_DStringInit(&ds);
-    nativeValue = Tcl_UtfToWCharDString(valueName, valueNameObj->length, &ds);
+    nativeValue = Tcl_UtfToWCharDString(valueName, len, &ds);
     result = RegQueryValueExW(key, nativeValue, NULL, &type,
 	    NULL, NULL);
     Tcl_DStringFree(&ds);
@@ -723,7 +731,7 @@ GetType(
     if (type > lastType) {
 	Tcl_SetObjResult(interp, Tcl_NewIntObj((int) type));
     } else {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(typeNames[type], -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(typeNames[type], TCL_INDEX_NONE));
     }
     return TCL_OK;
 }
@@ -757,6 +765,7 @@ GetValue(
     const WCHAR *nativeValue;
     DWORD result, length, type;
     Tcl_DString data, buf;
+    Tcl_Size len;
 
     /*
      * Attempt to open the key for reading.
@@ -781,9 +790,9 @@ GetValue(
     Tcl_DStringSetLength(&data, TCL_DSTRING_STATIC_SIZE - 1);
     length = TCL_DSTRING_STATIC_SIZE/sizeof(WCHAR) - 1;
 
-    valueName = Tcl_GetString(valueNameObj);
+    valueName = Tcl_GetStringFromObj(valueNameObj, &len);
     Tcl_DStringInit(&buf);
-    nativeValue = Tcl_UtfToWCharDString(valueName, valueNameObj->length, &buf);
+    nativeValue = Tcl_UtfToWCharDString(valueName, len, &buf);
 
     result = RegQueryValueExW(key, nativeValue, NULL, &type,
 	    (BYTE *) Tcl_DStringValue(&data), &length);
@@ -975,9 +984,10 @@ OpenKey(
     char *keyName, *buffer, *hostName;
     HKEY rootKey;
     DWORD result;
+    Tcl_Size len;
 
-    keyName = Tcl_GetString(keyNameObj);
-    buffer = (char *)Tcl_Alloc(keyNameObj->length + 1);
+    keyName = Tcl_GetStringFromObj(keyNameObj, &len);
+    buffer = (char *)Tcl_Alloc(len + 1);
     strcpy(buffer, keyName);
 
     result = ParseKeyName(interp, buffer, &hostName, &rootKey, &keyName);
@@ -985,7 +995,7 @@ OpenKey(
 	result = OpenSubKey(hostName, rootKey, keyName, mode, flags, keyPtr);
 	if (result != ERROR_SUCCESS) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("unable to open key: ", -1));
+		    Tcl_NewStringObj("unable to open key: ", TCL_INDEX_NONE));
 	    AppendSystemError(interp, result);
 	    result = TCL_ERROR;
 	} else {
@@ -1033,7 +1043,7 @@ OpenSubKey(
 
     if (hostName) {
 	Tcl_DStringInit(&buf);
-	hostName = (char *) Tcl_UtfToWCharDString(hostName, -1, &buf);
+	hostName = (char *) Tcl_UtfToWCharDString(hostName, TCL_INDEX_NONE, &buf);
 	result = RegConnectRegistryW((WCHAR *)hostName, rootKey,
 		&rootKey);
 	Tcl_DStringFree(&buf);
@@ -1049,7 +1059,7 @@ OpenSubKey(
 
     if (keyName) {
 	Tcl_DStringInit(&buf);
-	keyName = (char *) Tcl_UtfToWCharDString(keyName, -1, &buf);
+	keyName = (char *) Tcl_UtfToWCharDString(keyName, TCL_INDEX_NONE, &buf);
     }
     if (flags & REG_CREATE) {
 	DWORD create;
@@ -1153,7 +1163,7 @@ ParseKeyName(
      * Look for a matching root name.
      */
 
-    rootObj = Tcl_NewStringObj(rootName, -1);
+    rootObj = Tcl_NewStringObj(rootName, TCL_INDEX_NONE);
     result = Tcl_GetIndexFromObj(interp, rootObj, rootKeyNames, "root name",
 	    TCL_EXACT, &index);
     Tcl_DecrRefCount(rootObj);
@@ -1285,6 +1295,7 @@ SetValue(
     HKEY key;
     const char *valueName;
     Tcl_DString nameBuf;
+    Tcl_Size len;
 
     if (typeObj == NULL) {
 	type = REG_SZ;
@@ -1300,9 +1311,9 @@ SetValue(
 	return TCL_ERROR;
     }
 
-    valueName = Tcl_GetString(valueNameObj);
+    valueName = Tcl_GetStringFromObj(valueNameObj, &len);
     Tcl_DStringInit(&nameBuf);
-    valueName = (char *) Tcl_UtfToWCharDString(valueName, valueNameObj->length, &nameBuf);
+    valueName = (char *) Tcl_UtfToWCharDString(valueName, len, &nameBuf);
 
     if (type == REG_DWORD || type == REG_DWORD_BIG_ENDIAN) {
 	int value;
@@ -1335,9 +1346,9 @@ SetValue(
 
 	Tcl_DStringInit(&data);
 	for (i = 0; i < objc; i++) {
-	    const char *bytes = Tcl_GetString(objv[i]);
+	    const char *bytes = Tcl_GetStringFromObj(objv[i], &len);
 
-	    Tcl_DStringAppend(&data, bytes, objv[i]->length);
+	    Tcl_DStringAppend(&data, bytes, len);
 
 	    /*
 	     * Add a null character to separate this value from the next.
@@ -1356,10 +1367,10 @@ SetValue(
 	Tcl_DStringFree(&buf);
     } else if (type == REG_SZ || type == REG_EXPAND_SZ) {
 	Tcl_DString buf;
-	const char *data = Tcl_GetString(dataObj);
+	const char *data = Tcl_GetStringFromObj(dataObj, &len);
 
 	Tcl_DStringInit(&buf);
-	data = (char *) Tcl_UtfToWCharDString(data, dataObj->length, &buf);
+	data = (char *) Tcl_UtfToWCharDString(data, len, &buf);
 
 	/*
 	 * Include the null in the length, padding if needed for WCHAR.
@@ -1372,13 +1383,13 @@ SetValue(
 	Tcl_DStringFree(&buf);
     } else {
 	BYTE *data;
-	size_t bytelength;
+	Tcl_Size bytelength;
 
 	/*
 	 * Store binary data in the registry.
 	 */
 
-	data = (BYTE *) getByteArrayFromObj(dataObj, &bytelength);
+	data = (BYTE *) Tcl_GetByteArrayFromObj(dataObj, &bytelength);
 	result = RegSetValueExW(key, (WCHAR *) valueName, 0,
 		(DWORD) type, data, (DWORD) bytelength);
     }
@@ -1388,7 +1399,7 @@ SetValue(
 
     if (result != ERROR_SUCCESS) {
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("unable to set value: ", -1));
+		Tcl_NewStringObj("unable to set value: ", TCL_INDEX_NONE));
 	AppendSystemError(interp, result);
 	return TCL_ERROR;
     }
@@ -1421,15 +1432,14 @@ BroadcastValue(
     LRESULT result;
     DWORD_PTR sendResult;
     int timeout = 3000;
-    size_t len;
+    Tcl_Size len;
     const char *str;
     Tcl_Obj *objPtr;
     WCHAR *wstr;
     Tcl_DString ds;
 
     if (objc == 3) {
-	str = Tcl_GetString(objv[1]);
-	len = objv[1]->length;
+	str = Tcl_GetStringFromObj(objv[1], &len);
 	if ((len < 2) || (*str != '-') || strncmp(str, "-timeout", len)) {
 	    return TCL_BREAK;
 	}
@@ -1438,9 +1448,9 @@ BroadcastValue(
 	}
     }
 
-    str = Tcl_GetString(objv[0]);
+    str = Tcl_GetStringFromObj(objv[0], &len);
     Tcl_DStringInit(&ds);
-    wstr = Tcl_UtfToWCharDString(str, objv[0]->length, &ds);
+    wstr = Tcl_UtfToWCharDString(str, len, &ds);
     if (Tcl_DStringLength(&ds) == 0) {
 	wstr = NULL;
     }
-- 
cgit v0.12


From a744c509d4d7d059d01a0e6331f134fe5383b370 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Nov 2022 20:54:20 +0000
Subject: Remove ARGSUSED. More type-casts

---
 generic/tclConfig.c   |   6 +--
 generic/tclInt.decls  |  10 ++---
 generic/tclInt.h      |  16 +++----
 generic/tclIntDecls.h |  23 +++++-----
 generic/tclTrace.c    |  94 ++++++++++++++++++++--------------------
 generic/tclVar.c      | 118 +++++++++++++++++++++-----------------------------
 6 files changed, 121 insertions(+), 146 deletions(-)

diff --git a/generic/tclConfig.c b/generic/tclConfig.c
index 2fb3e92..8ea1f4d 100644
--- a/generic/tclConfig.c
+++ b/generic/tclConfig.c
@@ -41,9 +41,7 @@ typedef struct QCCD {
  * Static functions in this file:
  */
 
-static int		QueryConfigObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    struct Tcl_Obj *const *objv);
+static Tcl_ObjCmdProc QueryConfigObjCmd;
 static void		QueryConfigDelete(ClientData clientData);
 static Tcl_Obj *	GetConfigDict(Tcl_Interp *interp);
 static void		ConfigDictDeleteProc(ClientData clientData,
@@ -197,7 +195,7 @@ QueryConfigObjCmd(
     ClientData clientData,
     Tcl_Interp *interp,
     int objc,
-    struct Tcl_Obj *const *objv)
+    Tcl_Obj *const *objv)
 {
     QCCD *cdPtr = clientData;
     Tcl_Obj *pkgName = cdPtr->pkg;
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index c2d8253..c75c2e1 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -914,7 +914,7 @@ declare 229 {
 declare 230 {
     Var *TclObjLookupVar(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 	    const char *part2, int flags, const char *msg,
-	    const int createPart1, const int createPart2, Var **arrayPtrPtr)
+	    int createPart1, int createPart2, Var **arrayPtrPtr)
 }
 declare 231 {
     int	TclGetNamespaceFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
@@ -1018,17 +1018,17 @@ declare 251 {
 declare 252 {
     Tcl_Obj *TclPtrGetVar(Tcl_Interp *interp, Tcl_Var varPtr,
 	    Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr,
-	    const int flags)
+	    int flags)
 }
 declare 253 {
     Tcl_Obj *TclPtrSetVar(Tcl_Interp *interp, Tcl_Var varPtr,
 	    Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr,
-	    Tcl_Obj *newValuePtr, const int flags)
+	    Tcl_Obj *newValuePtr, int flags)
 }
 declare 254 {
     Tcl_Obj *TclPtrIncrObjVar(Tcl_Interp *interp, Tcl_Var varPtr,
 	    Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr,
-	    Tcl_Obj *incrPtr, const int flags)
+	    Tcl_Obj *incrPtr, int flags)
 }
 declare 255 {
     int	TclPtrObjMakeUpvar(Tcl_Interp *interp, Tcl_Var otherPtr,
@@ -1036,7 +1036,7 @@ declare 255 {
 }
 declare 256 {
     int	TclPtrUnsetVar(Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr,
-	    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags)
+	    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags)
 }
 
 declare 257 {
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 8c3efb5..3fa9a11 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4017,30 +4017,30 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
 
 MODULE_SCOPE Var *	TclObjLookupVarEx(Tcl_Interp * interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags,
-			    const char *msg, const int createPart1,
-			    const int createPart2, Var **arrayPtrPtr);
+			    const char *msg, int createPart1,
+			    int createPart2, Var **arrayPtrPtr);
 MODULE_SCOPE Var *	TclLookupArrayElement(Tcl_Interp *interp,
 			    Tcl_Obj *arrayNamePtr, Tcl_Obj *elNamePtr,
-			    const int flags, const char *msg,
-			    const int createPart1, const int createPart2,
+			    int flags, const char *msg,
+			    int createPart1, int createPart2,
 			    Var *arrayPtr, int index);
 MODULE_SCOPE Tcl_Obj *	TclPtrGetVarIdx(Tcl_Interp *interp,
 			    Var *varPtr, Var *arrayPtr, Tcl_Obj *part1Ptr,
-			    Tcl_Obj *part2Ptr, const int flags, int index);
+			    Tcl_Obj *part2Ptr, int flags, int index);
 MODULE_SCOPE Tcl_Obj *	TclPtrSetVarIdx(Tcl_Interp *interp,
 			    Var *varPtr, Var *arrayPtr, Tcl_Obj *part1Ptr,
 			    Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
-			    const int flags, int index);
+			    int flags, int index);
 MODULE_SCOPE Tcl_Obj *	TclPtrIncrObjVarIdx(Tcl_Interp *interp,
 			    Var *varPtr, Var *arrayPtr, Tcl_Obj *part1Ptr,
 			    Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr,
-			    const int flags, int index);
+			    int flags, int index);
 MODULE_SCOPE int	TclPtrObjMakeUpvarIdx(Tcl_Interp *interp,
 			    Var *otherPtr, Tcl_Obj *myNamePtr, int myFlags,
 			    int index);
 MODULE_SCOPE int	TclPtrUnsetVarIdx(Tcl_Interp *interp, Var *varPtr,
 			    Var *arrayPtr, Tcl_Obj *part1Ptr,
-			    Tcl_Obj *part2Ptr, const int flags,
+			    Tcl_Obj *part2Ptr, int flags,
 			    int index);
 MODULE_SCOPE void	TclInvalidateNsPath(Namespace *nsPtr);
 MODULE_SCOPE void	TclFindArrayPtrElements(Var *arrayPtr,
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index c524608..e958733 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -551,9 +551,8 @@ EXTERN int		TclPtrMakeUpvar(Tcl_Interp *interp, Var *otherP1Ptr,
 /* 230 */
 EXTERN Var *		TclObjLookupVar(Tcl_Interp *interp,
 				Tcl_Obj *part1Ptr, const char *part2,
-				int flags, const char *msg,
-				const int createPart1, const int createPart2,
-				Var **arrayPtrPtr);
+				int flags, const char *msg, int createPart1,
+				int createPart2, Var **arrayPtrPtr);
 /* 231 */
 EXTERN int		TclGetNamespaceFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr);
@@ -619,17 +618,17 @@ EXTERN int		TclRegisterLiteral(void *envPtr, char *bytes,
 /* 252 */
 EXTERN Tcl_Obj *	TclPtrGetVar(Tcl_Interp *interp, Tcl_Var varPtr,
 				Tcl_Var arrayPtr, Tcl_Obj *part1Ptr,
-				Tcl_Obj *part2Ptr, const int flags);
+				Tcl_Obj *part2Ptr, int flags);
 /* 253 */
 EXTERN Tcl_Obj *	TclPtrSetVar(Tcl_Interp *interp, Tcl_Var varPtr,
 				Tcl_Var arrayPtr, Tcl_Obj *part1Ptr,
 				Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr,
-				const int flags);
+				int flags);
 /* 254 */
 EXTERN Tcl_Obj *	TclPtrIncrObjVar(Tcl_Interp *interp, Tcl_Var varPtr,
 				Tcl_Var arrayPtr, Tcl_Obj *part1Ptr,
 				Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr,
-				const int flags);
+				int flags);
 /* 255 */
 EXTERN int		TclPtrObjMakeUpvar(Tcl_Interp *interp,
 				Tcl_Var otherPtr, Tcl_Obj *myNamePtr,
@@ -637,7 +636,7 @@ EXTERN int		TclPtrObjMakeUpvar(Tcl_Interp *interp,
 /* 256 */
 EXTERN int		TclPtrUnsetVar(Tcl_Interp *interp, Tcl_Var varPtr,
 				Tcl_Var arrayPtr, Tcl_Obj *part1Ptr,
-				Tcl_Obj *part2Ptr, const int flags);
+				Tcl_Obj *part2Ptr, int flags);
 /* 257 */
 EXTERN void		TclStaticPackage(Tcl_Interp *interp,
 				const char *prefix,
@@ -883,7 +882,7 @@ typedef struct TclIntStubs {
     void (*tclSetNsPath) (Namespace *nsPtr, int pathLength, Tcl_Namespace *pathAry[]); /* 227 */
     void (*reserved228)(void);
     int (*tclPtrMakeUpvar) (Tcl_Interp *interp, Var *otherP1Ptr, const char *myName, int myFlags, int index); /* 229 */
-    Var * (*tclObjLookupVar) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, const char *part2, int flags, const char *msg, const int createPart1, const int createPart2, Var **arrayPtrPtr); /* 230 */
+    Var * (*tclObjLookupVar) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, const char *part2, int flags, const char *msg, int createPart1, int createPart2, Var **arrayPtrPtr); /* 230 */
     int (*tclGetNamespaceFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr); /* 231 */
     int (*tclEvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, const CmdFrame *invoker, int word); /* 232 */
     void (*tclGetSrcInfoForPc) (CmdFrame *contextPtr); /* 233 */
@@ -905,11 +904,11 @@ typedef struct TclIntStubs {
     char * (*tclDoubleDigits) (double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); /* 249 */
     void (*tclSetSlaveCancelFlags) (Tcl_Interp *interp, int flags, int force); /* 250 */
     int (*tclRegisterLiteral) (void *envPtr, char *bytes, int length, int flags); /* 251 */
-    Tcl_Obj * (*tclPtrGetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags); /* 252 */
-    Tcl_Obj * (*tclPtrSetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, const int flags); /* 253 */
-    Tcl_Obj * (*tclPtrIncrObjVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr, const int flags); /* 254 */
+    Tcl_Obj * (*tclPtrGetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 252 */
+    Tcl_Obj * (*tclPtrSetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 253 */
+    Tcl_Obj * (*tclPtrIncrObjVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr, int flags); /* 254 */
     int (*tclPtrObjMakeUpvar) (Tcl_Interp *interp, Tcl_Var otherPtr, Tcl_Obj *myNamePtr, int myFlags); /* 255 */
-    int (*tclPtrUnsetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags); /* 256 */
+    int (*tclPtrUnsetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 256 */
     void (*tclStaticPackage) (Tcl_Interp *interp, const char *prefix, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 257 */
     void (*reserved258)(void);
     void (*reserved259)(void);
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 87fe063..8c1c79d 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -182,7 +182,6 @@ typedef struct StringTraceData {
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_TraceObjCmd(
     ClientData dummy,		/* Not used. */
@@ -271,7 +270,8 @@ Tcl_TraceObjCmd(
     case TRACE_OLD_VDELETE: {
 	Tcl_Obj *copyObjv[6];
 	Tcl_Obj *opsList;
-	int code, numFlags;
+	int code;
+	int numFlags;
 
 	if (objc != 5) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "name ops command");
@@ -325,7 +325,7 @@ Tcl_TraceObjCmd(
 	TclNewObj(resultListPtr);
 	name = Tcl_GetString(objv[2]);
 	FOREACH_VAR_TRACE(interp, name, clientData) {
-	    TraceVarInfo *tvarPtr = clientData;
+	    TraceVarInfo *tvarPtr = (TraceVarInfo *)clientData;
 	    char *q = ops;
 
 	    pairObjPtr = Tcl_NewListObj(0, NULL);
@@ -467,9 +467,9 @@ TraceExecutionObjCmd(
 	    }
 	}
 	command = Tcl_GetStringFromObj(objv[5], &commandLength);
-	length = (size_t) commandLength;
+	length = commandLength;
 	if ((enum traceOptions) optionIndex == TRACE_ADD) {
-	    TraceCommandInfo *tcmdPtr = ckalloc(
+	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)ckalloc(
 		    TclOffset(TraceCommandInfo, command) + 1 + length);
 
 	    tcmdPtr->flags = flags;
@@ -509,7 +509,7 @@ TraceExecutionObjCmd(
 	    }
 
 	    FOREACH_COMMAND_TRACE(interp, name, clientData) {
-		TraceCommandInfo *tcmdPtr = clientData;
+		TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
 		/*
 		 * In checking the 'flags' field we must remove any extraneous
@@ -521,7 +521,7 @@ TraceExecutionObjCmd(
 			&& ((tcmdPtr->flags & (TCL_TRACE_ANY_EXEC |
 				TCL_TRACE_RENAME | TCL_TRACE_DELETE)) == flags)
 			&& (strncmp(command, tcmdPtr->command,
-				(size_t) length) == 0)) {
+				length) == 0)) {
 		    flags |= TCL_TRACE_DELETE;
 		    if (flags & (TCL_TRACE_ENTER_DURING_EXEC |
 			    TCL_TRACE_LEAVE_DURING_EXEC)) {
@@ -578,7 +578,7 @@ TraceExecutionObjCmd(
 	FOREACH_COMMAND_TRACE(interp, name, clientData) {
 	    int numOps = 0;
 	    Tcl_Obj *opObj, *eachTraceObjPtr, *elemObjPtr;
-	    TraceCommandInfo *tcmdPtr = clientData;
+	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
 	    /*
 	     * Build a list with the ops list as the first obj element and the
@@ -661,8 +661,8 @@ TraceCommandObjCmd(
     switch ((enum traceOptions) optionIndex) {
     case TRACE_ADD:
     case TRACE_REMOVE: {
-	int flags = 0;
-	int i, listLen, result;
+	int flags = 0, result;
+	int i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -704,9 +704,9 @@ TraceCommandObjCmd(
 	}
 
 	command = Tcl_GetStringFromObj(objv[5], &commandLength);
-	length = (size_t) commandLength;
+	length = commandLength;
 	if ((enum traceOptions) optionIndex == TRACE_ADD) {
-	    TraceCommandInfo *tcmdPtr = ckalloc(
+	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)ckalloc(
 		    TclOffset(TraceCommandInfo, command) + 1 + length);
 
 	    tcmdPtr->flags = flags;
@@ -742,11 +742,11 @@ TraceCommandObjCmd(
 	    }
 
 	    FOREACH_COMMAND_TRACE(interp, name, clientData) {
-		TraceCommandInfo *tcmdPtr = clientData;
+		TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
 		if ((tcmdPtr->length == length) && (tcmdPtr->flags == flags)
 			&& (strncmp(command, tcmdPtr->command,
-				(size_t) length) == 0)) {
+				length) == 0)) {
 		    Tcl_UntraceCommand(interp, name, flags | TCL_TRACE_DELETE,
 			    TraceCommandProc, clientData);
 		    tcmdPtr->flags |= TCL_TRACE_DESTROYED;
@@ -781,7 +781,7 @@ TraceCommandObjCmd(
 	FOREACH_COMMAND_TRACE(interp, name, clientData) {
 	    int numOps = 0;
 	    Tcl_Obj *opObj, *eachTraceObjPtr, *elemObjPtr;
-	    TraceCommandInfo *tcmdPtr = clientData;
+	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
 	    /*
 	     * Build a list with the ops list as the first obj element and the
@@ -860,8 +860,8 @@ TraceVariableObjCmd(
     switch ((enum traceOptions) optionIndex) {
     case TRACE_ADD:
     case TRACE_REMOVE: {
-	int flags = 0;
-	int i, listLen, result;
+	int flags = 0, result;
+	int i, listLen;
 	Tcl_Obj **elemPtrs;
 
 	if (objc != 6) {
@@ -907,9 +907,9 @@ TraceVariableObjCmd(
 	    }
 	}
 	command = Tcl_GetStringFromObj(objv[5], &commandLength);
-	length = (size_t) commandLength;
+	length = commandLength;
 	if ((enum traceOptions) optionIndex == TRACE_ADD) {
-	    CombinedTraceVarInfo *ctvarPtr = ckalloc(
+	    CombinedTraceVarInfo *ctvarPtr = (CombinedTraceVarInfo *)ckalloc(
 		    TclOffset(CombinedTraceVarInfo, traceCmdInfo.command)
 		    + 1 + length);
 
@@ -940,7 +940,7 @@ TraceVariableObjCmd(
 
 	    name = Tcl_GetString(objv[3]);
 	    FOREACH_VAR_TRACE(interp, name, clientData) {
-		TraceVarInfo *tvarPtr = clientData;
+		TraceVarInfo *tvarPtr = (TraceVarInfo *)clientData;
 
 		if ((tvarPtr->length == length)
 			&& ((tvarPtr->flags
@@ -949,7 +949,7 @@ TraceVariableObjCmd(
 #endif
 						)==flags)
 			&& (strncmp(command, tvarPtr->command,
-				(size_t) length) == 0)) {
+				length) == 0)) {
 		    Tcl_UntraceVar2(interp, name, NULL,
 			    flags | TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT,
 			    TraceVarProc, clientData);
@@ -971,7 +971,7 @@ TraceVariableObjCmd(
 	name = Tcl_GetString(objv[3]);
 	FOREACH_VAR_TRACE(interp, name, clientData) {
 	    Tcl_Obj *opObjPtr, *eachTraceObjPtr, *elemObjPtr;
-	    TraceVarInfo *tvarPtr = clientData;
+	    TraceVarInfo *tvarPtr = (TraceVarInfo *)clientData;
 
 	    /*
 	     * Build a list with the ops list as the first obj element and the
@@ -1126,7 +1126,7 @@ Tcl_TraceCommand(
      * Set up trace information.
      */
 
-    tracePtr = ckalloc(sizeof(CommandTrace));
+    tracePtr = (CommandTrace *)ckalloc(sizeof(CommandTrace));
     tracePtr->traceProc = proc;
     tracePtr->clientData = clientData;
     tracePtr->flags = flags &
@@ -1278,7 +1278,6 @@ Tcl_UntraceCommand(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TraceCommandProc(
     ClientData clientData,	/* Information about the command trace. */
@@ -1290,7 +1289,7 @@ TraceCommandProc(
     int flags)			/* OR-ed bits giving operation and other
 				 * information. */
 {
-    TraceCommandInfo *tcmdPtr = clientData;
+    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
     int code;
     Tcl_DString cmd;
 
@@ -1304,7 +1303,7 @@ TraceCommandProc(
 	 */
 
 	Tcl_DStringInit(&cmd);
-	Tcl_DStringAppend(&cmd, tcmdPtr->command, (int) tcmdPtr->length);
+	Tcl_DStringAppend(&cmd, tcmdPtr->command, tcmdPtr->length);
 	Tcl_DStringAppendElement(&cmd, oldName);
 	Tcl_DStringAppendElement(&cmd, (newName ? newName : ""));
 	if (flags & TCL_TRACE_RENAME) {
@@ -1468,7 +1467,7 @@ TclCheckExecutionTraces(
 	    active.nextTracePtr = tracePtr->nextPtr;
 	}
 	if (tracePtr->traceProc == TraceCommandProc) {
-	    TraceCommandInfo *tcmdPtr = tracePtr->clientData;
+	    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)tracePtr->clientData;
 
 	    if (tcmdPtr->flags != 0) {
 		tcmdPtr->curFlags = traceFlags | TCL_TRACE_EXEC_DIRECT;
@@ -1609,7 +1608,7 @@ TclCheckInterpTraces(
 
 		if (tracePtr->flags & traceFlags) {
 		    if (tracePtr->proc == TraceExecutionProc) {
-			TraceCommandInfo *tcmdPtr = tracePtr->clientData;
+			TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)tracePtr->clientData;
 
 			tcmdPtr->curFlags = traceFlags;
 			tcmdPtr->curCode = code;
@@ -1688,7 +1687,7 @@ CallTraceFunction(
      * Copy the command characters into a new string.
      */
 
-    commandCopy = TclStackAlloc(interp, numChars + 1);
+    commandCopy = (char *)TclStackAlloc(interp, numChars + 1);
     memcpy(commandCopy, command, numChars);
     commandCopy[numChars] = '\0';
 
@@ -1724,7 +1723,7 @@ static void
 CommandObjTraceDeleted(
     ClientData clientData)
 {
-    TraceCommandInfo *tcmdPtr = clientData;
+    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
 
     if (tcmdPtr->refCount-- <= 1) {
 	ckfree(tcmdPtr);
@@ -1764,11 +1763,11 @@ TraceExecutionProc(
     const char *command,
     Tcl_Command cmdInfo,
     int objc,
-    struct Tcl_Obj *const objv[])
+    Tcl_Obj *const objv[])
 {
     int call = 0;
     Interp *iPtr = (Interp *) interp;
-    TraceCommandInfo *tcmdPtr = clientData;
+    TraceCommandInfo *tcmdPtr = (TraceCommandInfo *)clientData;
     int flags = tcmdPtr->curFlags;
     int code = tcmdPtr->curCode;
     int traceCode = TCL_OK;
@@ -1821,7 +1820,7 @@ TraceExecutionProc(
 	    int i, saveInterpFlags;
 
 	    Tcl_DStringInit(&cmd);
-	    Tcl_DStringAppend(&cmd, tcmdPtr->command, (int)tcmdPtr->length);
+	    Tcl_DStringAppend(&cmd, tcmdPtr->command, tcmdPtr->length);
 
 	    /*
 	     * Append command with arguments.
@@ -1922,7 +1921,7 @@ TraceExecutionProc(
 	    unsigned len = strlen(command) + 1;
 
 	    tcmdPtr->startLevel = level;
-	    tcmdPtr->startCmd = ckalloc(len);
+	    tcmdPtr->startCmd = (char *)ckalloc(len);
 	    memcpy(tcmdPtr->startCmd, command, len);
 	    tcmdPtr->refCount++;
 	    tcmdPtr->stepTrace = Tcl_CreateObjTrace(interp, 0,
@@ -1963,7 +1962,6 @@ TraceExecutionProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static char *
 TraceVarProc(
     ClientData clientData,	/* Information about the variable trace. */
@@ -1974,7 +1972,7 @@ TraceVarProc(
     int flags)			/* OR-ed bits giving operation and other
 				 * information. */
 {
-    TraceVarInfo *tvarPtr = clientData;
+    TraceVarInfo *tvarPtr = (TraceVarInfo *)clientData;
     char *result;
     int code, destroy = 0;
     Tcl_DString cmd;
@@ -1990,14 +1988,14 @@ TraceVarProc(
     result = NULL;
     if ((tvarPtr->flags & flags) && !Tcl_InterpDeleted(interp)
 	    && !Tcl_LimitExceeded(interp)) {
-	if (tvarPtr->length != (size_t) 0) {
+	if (tvarPtr->length) {
 	    /*
 	     * Generate a command to execute by appending list elements for
 	     * the two variable names and the operation.
 	     */
 
 	    Tcl_DStringInit(&cmd);
-	    Tcl_DStringAppend(&cmd, tvarPtr->command, (int) tvarPtr->length);
+	    Tcl_DStringAppend(&cmd, tvarPtr->command, tvarPtr->length);
 	    Tcl_DStringAppendElement(&cmd, name1);
 	    Tcl_DStringAppendElement(&cmd, (name2 ? name2 : ""));
 #ifndef TCL_REMOVE_OBSOLETE_TRACES
@@ -2162,7 +2160,7 @@ Tcl_CreateObjTrace(
 	iPtr->tracesForbiddingInline++;
     }
 
-    tracePtr = ckalloc(sizeof(Trace));
+    tracePtr = (Trace *)ckalloc(sizeof(Trace));
     tracePtr->level = level;
     tracePtr->proc = proc;
     tracePtr->clientData = clientData;
@@ -2225,7 +2223,7 @@ Tcl_CreateTrace(
 				 * command. */
     ClientData clientData)	/* Arbitrary value word to pass to proc. */
 {
-    StringTraceData *data = ckalloc(sizeof(StringTraceData));
+    StringTraceData *data = (StringTraceData *)ckalloc(sizeof(StringTraceData));
 
     data->clientData = clientData;
     data->proc = proc;
@@ -2259,7 +2257,7 @@ StringTraceProc(
     int objc,
     Tcl_Obj *const *objv)
 {
-    StringTraceData *data = clientData;
+    StringTraceData *data = (StringTraceData *)clientData;
     Command *cmdPtr = (Command *) commandInfo;
     const char **argv;		/* Args to pass to string trace proc */
     int i;
@@ -2270,7 +2268,7 @@ StringTraceProc(
      */
 
     argv = (const char **) TclStackAlloc(interp,
-	    (unsigned) ((objc + 1) * sizeof(const char *)));
+	    (objc + 1) * sizeof(const char *));
     for (i = 0; i < objc; i++) {
 	argv[i] = Tcl_GetString(objv[i]);
     }
@@ -2657,7 +2655,7 @@ TclCallVarTraces(
 	    && (arrayPtr->flags & traceflags)) {
 	hPtr = Tcl_FindHashEntry(&iPtr->varTraces, (char *) arrayPtr);
 	active.varPtr = arrayPtr;
-	for (tracePtr = Tcl_GetHashValue(hPtr);
+	for (tracePtr = (VarTrace *)Tcl_GetHashValue(hPtr);
 		tracePtr != NULL; tracePtr = active.nextTracePtr) {
 	    active.nextTracePtr = tracePtr->nextPtr;
 	    if (!(tracePtr->flags & flags)) {
@@ -2701,7 +2699,7 @@ TclCallVarTraces(
     active.varPtr = varPtr;
     if (varPtr->flags & traceflags) {
 	hPtr = Tcl_FindHashEntry(&iPtr->varTraces, (char *) varPtr);
-	for (tracePtr = Tcl_GetHashValue(hPtr);
+	for (tracePtr = (VarTrace *)Tcl_GetHashValue(hPtr);
 		tracePtr != NULL; tracePtr = active.nextTracePtr) {
 	    active.nextTracePtr = tracePtr->nextPtr;
 	    if (!(tracePtr->flags & flags)) {
@@ -2937,7 +2935,7 @@ Tcl_UntraceVar2(
     flags &= flagMask;
 
     hPtr = Tcl_FindHashEntry(&iPtr->varTraces, (char *) varPtr);
-    for (tracePtr = Tcl_GetHashValue(hPtr), prevPtr = NULL; ;
+    for (tracePtr = (VarTrace *)Tcl_GetHashValue(hPtr), prevPtr = NULL; ;
 	    prevPtr = tracePtr, tracePtr = tracePtr->nextPtr) {
 	if (tracePtr == NULL) {
 	    goto updateFlags;
@@ -3094,7 +3092,7 @@ Tcl_VarTraceInfo2(
     hPtr = Tcl_FindHashEntry(&iPtr->varTraces, (char *) varPtr);
 
     if (hPtr) {
-	VarTrace *tracePtr = Tcl_GetHashValue(hPtr);
+	VarTrace *tracePtr = (VarTrace *)Tcl_GetHashValue(hPtr);
 
 	if (prevClientData != NULL) {
 	    for (; tracePtr != NULL; tracePtr = tracePtr->nextPtr) {
@@ -3193,7 +3191,7 @@ Tcl_TraceVar2(
     VarTrace *tracePtr;
     int result;
 
-    tracePtr = ckalloc(sizeof(VarTrace));
+    tracePtr = (VarTrace *)ckalloc(sizeof(VarTrace));
     tracePtr->traceProc = proc;
     tracePtr->clientData = clientData;
     tracePtr->flags = flags;
@@ -3287,7 +3285,7 @@ TraceVarEx(
     if (isNew) {
 	tracePtr->nextPtr = NULL;
     } else {
-	tracePtr->nextPtr = Tcl_GetHashValue(hPtr);
+	tracePtr->nextPtr = (VarTrace *)Tcl_GetHashValue(hPtr);
     }
     Tcl_SetHashValue(hPtr, tracePtr);
 
diff --git a/generic/tclVar.c b/generic/tclVar.c
index a8d6664..6f0ec89 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -9,8 +9,8 @@
  *
  * Copyright (c) 1987-1994 The Regents of the University of California.
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- * Copyright (c) 2001 by Kevin B. Kenny. All rights reserved.
+ * Copyright (c) 1998-1999 Scriptics Corporation.
+ * Copyright (c) 2001 Kevin B. Kenny. All rights reserved.
  * Copyright (c) 2007 Miguel Sofer
  *
  * See the file "license.terms" for information on usage and redistribution of
@@ -63,11 +63,10 @@ VarHashCreateVar(
     Tcl_HashEntry *hPtr = Tcl_CreateHashEntry(&tablePtr->table,
 	    key, newPtr);
 
-    if (hPtr) {
-	return VarHashGetValue(hPtr);
-    } else {
+    if (!hPtr) {
 	return NULL;
     }
+    return VarHashGetValue(hPtr);
 }
 
 #define VarHashFindVar(tablePtr, key) \
@@ -92,11 +91,10 @@ VarHashFirstVar(
 {
     Tcl_HashEntry *hPtr = VarHashFirstEntry(tablePtr, searchPtr);
 
-    if (hPtr) {
-	return VarHashGetValue(hPtr);
-    } else {
+    if (!hPtr) {
 	return NULL;
     }
+    return VarHashGetValue(hPtr);
 }
 
 static inline Var *
@@ -105,11 +103,10 @@ VarHashNextVar(
 {
     Tcl_HashEntry *hPtr = VarHashNextEntry(searchPtr);
 
-    if (hPtr) {
-	return VarHashGetValue(hPtr);
-    } else {
+    if (!hPtr) {
 	return NULL;
     }
+    return VarHashGetValue(hPtr);
 }
 
 #define VarHashGetKey(varPtr) \
@@ -184,7 +181,7 @@ static Tcl_Var		ObjFindNamespaceVar(Tcl_Interp *interp,
 			    int flags);
 static int		ObjMakeUpvar(Tcl_Interp *interp,
 			    CallFrame *framePtr, Tcl_Obj *otherP1Ptr,
-			    const char *otherP2, const int otherFlags,
+			    const char *otherP2, int otherFlags,
 			    Tcl_Obj *myNamePtr, int myFlags, int index);
 static ArraySearch *	ParseSearchId(Tcl_Interp *interp, const Var *varPtr,
 			    Tcl_Obj *varNamePtr, Tcl_Obj *handleObj);
@@ -200,7 +197,7 @@ static int		SetArraySearchObj(Tcl_Interp *interp,
  */
 
 MODULE_SCOPE Var *	TclLookupSimpleVar(Tcl_Interp *interp,
-			    Tcl_Obj *varNamePtr, int flags, const int create,
+			    Tcl_Obj *varNamePtr, int flags, int create,
 			    const char **errMsgPtr, int *indexPtr);
 
 static Tcl_DupInternalRepProc	DupLocalVarName;
@@ -499,10 +496,10 @@ TclObjLookupVar(
     const char *msg,		/* Verb to use in error messages, e.g. "read"
 				 * or "set". Only needed if TCL_LEAVE_ERR_MSG
 				 * is set in flags. */
-    const int createPart1,	/* If 1, create hash table entry for part 1 of
+    int createPart1,	/* If 1, create hash table entry for part 1 of
 				 * name, if it doesn't already exist. If 0,
 				 * return error if it doesn't exist. */
-    const int createPart2,	/* If 1, create hash table entry for part 2 of
+    int createPart2,	/* If 1, create hash table entry for part 2 of
 				 * name, if it doesn't already exist. If 0,
 				 * return error if it doesn't exist. */
     Var **arrayPtrPtr)		/* If the name refers to an element of an
@@ -549,10 +546,10 @@ TclObjLookupVarEx(
     const char *msg,		/* Verb to use in error messages, e.g. "read"
 				 * or "set". Only needed if TCL_LEAVE_ERR_MSG
 				 * is set in flags. */
-    const int createPart1,	/* If 1, create hash table entry for part 1 of
+    int createPart1,	/* If 1, create hash table entry for part 1 of
 				 * name, if it doesn't already exist. If 0,
 				 * return error if it doesn't exist. */
-    const int createPart2,	/* If 1, create hash table entry for part 2 of
+    int createPart2,	/* If 1, create hash table entry for part 2 of
 				 * name, if it doesn't already exist. If 0,
 				 * return error if it doesn't exist. */
     Var **arrayPtrPtr)		/* If the name refers to an element of an
@@ -827,7 +824,7 @@ TclLookupSimpleVar(
     int flags,			/* Only TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
 				 * TCL_AVOID_RESOLVERS and TCL_LEAVE_ERR_MSG
 				 * bits matter. */
-    const int create,		/* If 1, create hash table entry for varname,
+    int create,		/* If 1, create hash table entry for varname,
 				 * if it doesn't already exist. If 0, return
 				 * error if it doesn't exist. */
     const char **errMsgPtr,
@@ -996,7 +993,7 @@ TclLookupSimpleVar(
 	tablePtr = varFramePtr->varTablePtr;
 	if (create) {
 	    if (tablePtr == NULL) {
-		tablePtr = ckalloc(sizeof(TclVarHashTable));
+		tablePtr = (TclVarHashTable *)ckalloc(sizeof(TclVarHashTable));
 		TclInitVarHashTable(tablePtr, NULL);
 		varFramePtr->varTablePtr = tablePtr;
 	    }
@@ -1059,15 +1056,15 @@ TclLookupArrayElement(
     Tcl_Obj *arrayNamePtr,	/* This is the name of the array, or NULL if
 				 * index>= 0. */
     Tcl_Obj *elNamePtr,		/* Name of element within array. */
-    const int flags,		/* Only TCL_LEAVE_ERR_MSG bit matters. */
+    int flags,		/* Only TCL_LEAVE_ERR_MSG bit matters. */
     const char *msg,		/* Verb to use in error messages, e.g. "read"
 				 * or "set". Only needed if TCL_LEAVE_ERR_MSG
 				 * is set in flags. */
-    const int createArray,	/* If 1, transform arrayName to be an array if
+    int createArray,	/* If 1, transform arrayName to be an array if
 				 * it isn't one yet and the transformation is
 				 * possible. If 0, return error if it isn't
 				 * already an array. */
-    const int createElem,	/* If 1, create hash table entry for the
+    int createElem,	/* If 1, create hash table entry for the
 				 * element, if it doesn't already exist. If 0,
 				 * return error if it doesn't exist. */
     Var *arrayPtr,		/* Pointer to the array's Var structure. */
@@ -1389,7 +1386,7 @@ TclPtrGetVar(
 				 * the name of a variable. */
     Tcl_Obj *part2Ptr,		/* If non-NULL, gives the name of an element
 				 * in the array part1. */
-    const int flags)		/* OR-ed combination of TCL_GLOBAL_ONLY, and
+    int flags)		/* OR-ed combination of TCL_GLOBAL_ONLY, and
 				 * TCL_LEAVE_ERR_MSG bits. */
 {
     if (varPtr == NULL) {
@@ -1435,7 +1432,7 @@ TclPtrGetVarIdx(
 				 * the name of a variable. */
     Tcl_Obj *part2Ptr,		/* If non-NULL, gives the name of an element
 				 * in the array part1. */
-    const int flags,		/* OR-ed combination of TCL_GLOBAL_ONLY, and
+    int flags,		/* OR-ed combination of TCL_GLOBAL_ONLY, and
 				 * TCL_LEAVE_ERR_MSG bits. */
     int index)			/* Index into the local variable table of the
 				 * variable, or -1. Only used when part1Ptr is
@@ -1508,7 +1505,6 @@ TclPtrGetVarIdx(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_SetObjCmd(
     ClientData dummy,		/* Not used. */
@@ -1809,7 +1805,7 @@ TclPtrSetVar(
     Tcl_Obj *part2Ptr,		/* If non-NULL, gives the name of an element
 				 * in the array part1. */
     Tcl_Obj *newValuePtr,	/* New value for variable. */
-    const int flags)		/* OR-ed combination of TCL_GLOBAL_ONLY, and
+    int flags)		/* OR-ed combination of TCL_GLOBAL_ONLY, and
 				 * TCL_LEAVE_ERR_MSG bits. */
 {
     if (varPtr == NULL) {
@@ -1864,7 +1860,7 @@ TclPtrSetVarIdx(
     Tcl_Obj *part2Ptr,		/* If non-NULL, gives the name of an element
 				 * in the array part1. */
     Tcl_Obj *newValuePtr,	/* New value for variable. */
-    const int flags,		/* OR-ed combination of TCL_GLOBAL_ONLY, and
+    int flags,		/* OR-ed combination of TCL_GLOBAL_ONLY, and
 				 * TCL_LEAVE_ERR_MSG bits. */
     int index)			/* Index of local var where part1 is to be
 				 * found. */
@@ -2141,7 +2137,7 @@ TclPtrIncrObjVar(
 				 * part1Ptr. */
     Tcl_Obj *incrPtr,		/* Increment value. */
 /* TODO: Which of these flag values really make sense? */
-    const int flags)		/* Various flags that tell how to incr value:
+    int flags)		/* Various flags that tell how to incr value:
 				 * any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
 				 * TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
 				 * TCL_LEAVE_ERR_MSG. */
@@ -2197,7 +2193,7 @@ TclPtrIncrObjVarIdx(
 				 * part1Ptr. */
     Tcl_Obj *incrPtr,		/* Increment value. */
 /* TODO: Which of these flag values really make sense? */
-    const int flags,		/* Various flags that tell how to incr value:
+    int flags,		/* Various flags that tell how to incr value:
 				 * any of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
 				 * TCL_APPEND_VALUE, TCL_LIST_ELEMENT,
 				 * TCL_LEAVE_ERR_MSG. */
@@ -2232,7 +2228,6 @@ TclPtrIncrObjVarIdx(
     } else {
 	/* Unshared - can Incr in place */
 	if (TCL_OK == TclIncrObj(interp, varValuePtr, incrPtr)) {
-
 	    /*
 	     * This seems dumb to write the incremeted value into the var
 	     * after we just adjusted the value in place, but the spec for
@@ -2425,7 +2420,7 @@ TclPtrUnsetVar(
 				 * the name of a variable. */
     Tcl_Obj *part2Ptr,		/* If non-NULL, gives the name of an element
 				 * in the array part1. */
-    const int flags)		/* OR-ed combination of any of
+    int flags)		/* OR-ed combination of any of
 				 * TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
 				 * TCL_LEAVE_ERR_MSG. */
 {
@@ -2472,7 +2467,7 @@ TclPtrUnsetVarIdx(
 				 * the name of a variable. */
     Tcl_Obj *part2Ptr,		/* If non-NULL, gives the name of an element
 				 * in the array part1. */
-    const int flags,		/* OR-ed combination of any of
+    int flags,		/* OR-ed combination of any of
 				 * TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
 				 * TCL_LEAVE_ERR_MSG. */
     int index)			/* Index into the local variable table of the
@@ -2598,7 +2593,7 @@ UnsetVarStruct(
 	    int isNew;
 
 	    tPtr = Tcl_FindHashEntry(&iPtr->varTraces, varPtr);
-	    tracePtr = Tcl_GetHashValue(tPtr);
+	    tracePtr = (VarTrace *)Tcl_GetHashValue(tPtr);
 	    varPtr->flags &= ~VAR_ALL_TRACES;
 	    Tcl_DeleteHashEntry(tPtr);
 	    if (dummyVar.flags & VAR_TRACED_UNSET) {
@@ -2625,7 +2620,7 @@ UnsetVarStruct(
 	    if (TclIsVarTraced(&dummyVar)) {
 		tPtr = Tcl_FindHashEntry(&iPtr->varTraces, &dummyVar);
 		if (tPtr) {
-		    tracePtr = Tcl_GetHashValue(tPtr);
+		    tracePtr = (VarTrace *)Tcl_GetHashValue(tPtr);
 		    Tcl_DeleteHashEntry(tPtr);
 		}
 	    }
@@ -2711,7 +2706,6 @@ UnsetVarStruct(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_UnsetObjCmd(
     ClientData dummy,		/* Not used. */
@@ -2779,7 +2773,6 @@ Tcl_UnsetObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_AppendObjCmd(
     ClientData dummy,		/* Not used. */
@@ -2845,7 +2838,6 @@ Tcl_AppendObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_LappendObjCmd(
     ClientData dummy,		/* Not used. */
@@ -2987,7 +2979,6 @@ Tcl_LappendObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayStartSearchCmd(
     ClientData clientData,
@@ -3056,7 +3047,6 @@ ArrayStartSearchCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayAnyMoreCmd(
     ClientData clientData,
@@ -3135,7 +3125,6 @@ ArrayAnyMoreCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayNextElementCmd(
     ClientData clientData,
@@ -3216,7 +3205,6 @@ ArrayNextElementCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayDoneSearchCmd(
     ClientData clientData,
@@ -3297,7 +3285,6 @@ ArrayDoneSearchCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayExistsCmd(
     ClientData clientData,
@@ -3338,7 +3325,6 @@ ArrayExistsCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayGetCmd(
     ClientData clientData,
@@ -3498,7 +3484,6 @@ ArrayGetCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayNamesCmd(
     ClientData clientData,
@@ -3509,7 +3494,7 @@ ArrayNamesCmd(
     static const char *const options[] = {
 	"-exact", "-glob", "-regexp", NULL
     };
-    enum options { OPT_EXACT, OPT_GLOB, OPT_REGEXP };
+    enum arrayNamesOptionsEnum { OPT_EXACT, OPT_GLOB, OPT_REGEXP };
     Var *varPtr, *varPtr2;
     Tcl_Obj *nameObj, *resultObj, *patternObj;
     Tcl_HashSearch search;
@@ -3577,7 +3562,7 @@ ArrayNamesCmd(
 	    const char *name = TclGetString(nameObj);
 	    int matched = 0;
 
-	    switch ((enum options) mode) {
+	    switch ((enum arrayNamesOptionsEnum) mode) {
 	    case OPT_EXACT:
 		Tcl_Panic("exact matching shouldn't get here");
 	    case OPT_GLOB:
@@ -3666,7 +3651,6 @@ TclFindArrayPtrElements(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArraySetCmd(
     ClientData clientData,
@@ -3786,7 +3770,8 @@ ArraySetCmd(
 
 	    if ((elemVarPtr == NULL) ||
 		    (TclPtrSetVarIdx(interp, elemVarPtr, varPtr, arrayNameObj,
-		    elemPtrs[i],elemPtrs[i+1],TCL_LEAVE_ERR_MSG,-1) == NULL)){
+			    elemPtrs[i], elemPtrs[i+1], TCL_LEAVE_ERR_MSG,
+			    -1) == NULL)) {
 		result = TCL_ERROR;
 		break;
 	    }
@@ -3843,7 +3828,6 @@ ArraySetCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArraySizeCmd(
     ClientData clientData,
@@ -3903,7 +3887,6 @@ ArraySizeCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayStatsCmd(
     ClientData clientData,
@@ -3958,7 +3941,6 @@ ArrayStatsCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArrayUnsetCmd(
     ClientData clientData,
@@ -3970,7 +3952,7 @@ ArrayUnsetCmd(
     Tcl_Obj *varNameObj, *patternObj, *nameObj;
     Tcl_HashSearch search;
     const char *pattern;
-    const int unsetFlags = 0;	/* Should this be TCL_LEAVE_ERR_MSG? */
+    int unsetFlags = 0;	/* Should this be TCL_LEAVE_ERR_MSG? */
     int isArray;
 
     switch (objc) {
@@ -4095,7 +4077,6 @@ ArrayUnsetCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 Tcl_Command
 TclInitArrayCmd(
     Tcl_Interp *interp)		/* Current interpreter. */
@@ -4128,7 +4109,7 @@ TclInitArrayCmd(
  *
  * Results:
  *	A standard Tcl completion code. If an error occurs then an error
- *	message is left in iPtr->result.
+ *	message is left in interp.
  *
  * Side effects:
  *	The variable given by myName is linked to the variable in framePtr
@@ -4148,7 +4129,7 @@ ObjMakeUpvar(
 				 * NULL means use global :: context. */
     Tcl_Obj *otherP1Ptr,
     const char *otherP2,	/* Two-part name of variable in framePtr. */
-    const int otherFlags,	/* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
+    int otherFlags,	/* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
 				 * indicates scope of "other" variable. */
     Tcl_Obj *myNamePtr,		/* Name of variable which will refer to
 				 * otherP1/otherP2. Must be a scalar. */
@@ -4222,7 +4203,7 @@ ObjMakeUpvar(
  *
  * Results:
  *	A standard Tcl completion code. If an error occurs then an error
- *	message is left in iPtr->result.
+ *	message is left in interp.
  *
  * Side effects:
  *	The variable given by myName is linked to the variable in framePtr
@@ -4818,7 +4799,6 @@ Tcl_VariableObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_UpvarObjCmd(
     ClientData dummy,		/* Not used. */
@@ -5089,7 +5069,7 @@ DeleteSearches(
 
     if (arrayVarPtr->flags & VAR_SEARCH_ACTIVE) {
 	sPtr = Tcl_FindHashEntry(&iPtr->varSearches, arrayVarPtr);
-	for (searchPtr = Tcl_GetHashValue(sPtr); searchPtr != NULL;
+	for (searchPtr = (ArraySearch *)Tcl_GetHashValue(sPtr); searchPtr != NULL;
 		searchPtr = nextPtr) {
 	    nextPtr = searchPtr->nextPtr;
 	    ckfree(searchPtr);
@@ -5159,7 +5139,7 @@ TclDeleteNamespaceVars(
 
 	if (TclIsVarTraced(varPtr)) {
 	    Tcl_HashEntry *tPtr = Tcl_FindHashEntry(&iPtr->varTraces, varPtr);
-	    VarTrace *tracePtr = Tcl_GetHashValue(tPtr);
+	    VarTrace *tracePtr = (VarTrace *)Tcl_GetHashValue(tPtr);
 	    ActiveVarTrace *activePtr;
 
 	    while (tracePtr) {
@@ -5356,7 +5336,7 @@ DeleteArray(
 			elNamePtr, flags,/* leaveErrMsg */ 0, index);
 	    }
 	    tPtr = Tcl_FindHashEntry(&iPtr->varTraces, elPtr);
-	    tracePtr = Tcl_GetHashValue(tPtr);
+	    tracePtr = (VarTrace *)Tcl_GetHashValue(tPtr);
 	    while (tracePtr) {
 		VarTrace *prevPtr = tracePtr;
 
@@ -5497,7 +5477,7 @@ static void
 FreeLocalVarName(
     Tcl_Obj *objPtr)
 {
-    Tcl_Obj *namePtr = objPtr->internalRep.twoPtrValue.ptr1;
+    Tcl_Obj *namePtr = (Tcl_Obj *)objPtr->internalRep.twoPtrValue.ptr1;
 
     if (namePtr) {
 	Tcl_DecrRefCount(namePtr);
@@ -5559,7 +5539,7 @@ DupParsedVarName(
     if (arrayPtr != NULL) {
 	Tcl_IncrRefCount(arrayPtr);
 	elemLen = strlen(elem);
-	elemCopy = ckalloc(elemLen + 1);
+	elemCopy = (char *)ckalloc(elemLen + 1);
 	memcpy(elemCopy, elem, elemLen);
 	*(elemCopy + elemLen) = '\0';
 	elem = elemCopy;
@@ -5931,7 +5911,7 @@ TclInfoVarsCmd(
 	     */
 
 	    if ((nsPtr != globalNsPtr) && !specificNsInPattern) {
-		varPtr = VarHashFirstVar(&globalNsPtr->varTable,&search);
+		varPtr = VarHashFirstVar(&globalNsPtr->varTable, &search);
 		while (varPtr) {
 		    if (!TclIsVarUndefined(varPtr)
 			    || TclIsVarNamespaceVar(varPtr)) {
@@ -6270,11 +6250,11 @@ AllocVarEntry(
     Tcl_HashTable *tablePtr,	/* Hash table. */
     void *keyPtr)		/* Key to store in the hash table entry. */
 {
-    Tcl_Obj *objPtr = keyPtr;
+    Tcl_Obj *objPtr = (Tcl_Obj *)keyPtr;
     Tcl_HashEntry *hPtr;
     Var *varPtr;
 
-    varPtr = ckalloc(sizeof(VarInHash));
+    varPtr = (Var *)ckalloc(sizeof(VarInHash));
     varPtr->flags = VAR_IN_HASHTABLE;
     varPtr->value.objPtr = NULL;
     VarHashRefCount(varPtr) = 1;
@@ -6310,7 +6290,7 @@ CompareVarKeys(
     void *keyPtr,		/* New key to compare. */
     Tcl_HashEntry *hPtr)	/* Existing key to compare. */
 {
-    Tcl_Obj *objPtr1 = keyPtr;
+    Tcl_Obj *objPtr1 = (Tcl_Obj *)keyPtr;
     Tcl_Obj *objPtr2 = hPtr->key.objPtr;
     const char *p1, *p2;
     int l1, l2;
@@ -6318,9 +6298,9 @@ CompareVarKeys(
     /*
      * If the object pointers are the same then they match.
      * OPT: this comparison was moved to the caller
-
-       if (objPtr1 == objPtr2) return 1;
-    */
+     *
+     * if (objPtr1 == objPtr2) return 1;
+     */
 
     /*
      * Don't use Tcl_GetStringFromObj as it would prevent l1 and l2 being in a
-- 
cgit v0.12


From 521b3bfb0efbff8cb6b5df2fd40630ece70f8e1f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 30 Nov 2022 08:12:16 +0000
Subject: Update to tzdata 2022g

---
 library/tzdata/America/Bogota        |   2 +-
 library/tzdata/America/Cambridge_Bay |  18 ++-
 library/tzdata/America/Dawson        |   2 +
 library/tzdata/America/Inuvik        |  18 ++-
 library/tzdata/America/Iqaluit       |  18 ++-
 library/tzdata/America/Nuuk          | 155 +--------------------
 library/tzdata/America/Ojinaga       | 155 +++++++++++++++++++++
 library/tzdata/America/Pangnirtung   | 253 +----------------------------------
 library/tzdata/America/Rankin_Inlet  |  18 ++-
 library/tzdata/America/Resolute      |  18 ++-
 library/tzdata/America/Whitehorse    |   2 +
 library/tzdata/America/Yellowknife   |  18 ++-
 library/tzdata/Asia/Singapore        |   2 +-
 13 files changed, 261 insertions(+), 418 deletions(-)

diff --git a/library/tzdata/America/Bogota b/library/tzdata/America/Bogota
index 8ca39ba..ae7b53e 100644
--- a/library/tzdata/America/Bogota
+++ b/library/tzdata/America/Bogota
@@ -5,5 +5,5 @@ set TZData(:America/Bogota) {
     {-2707671824 -17776 0 BMT}
     {-1739041424 -18000 0 -05}
     {704869200 -14400 1 -05}
-    {733896000 -18000 0 -05}
+    {729057600 -18000 0 -05}
 }
diff --git a/library/tzdata/America/Cambridge_Bay b/library/tzdata/America/Cambridge_Bay
index 3115ee1..584ed83 100644
--- a/library/tzdata/America/Cambridge_Bay
+++ b/library/tzdata/America/Cambridge_Bay
@@ -6,8 +6,22 @@ set TZData(:America/Cambridge_Bay) {
     {-880210800 -21600 1 MWT}
     {-769395600 -21600 1 MPT}
     {-765388800 -25200 0 MST}
-    {-147891600 -18000 1 MDDT}
-    {-131562000 -25200 0 MST}
+    {73472400 -21600 1 MDT}
+    {89193600 -25200 0 MST}
+    {104922000 -21600 1 MDT}
+    {120643200 -25200 0 MST}
+    {136371600 -21600 1 MDT}
+    {152092800 -25200 0 MST}
+    {167821200 -21600 1 MDT}
+    {183542400 -25200 0 MST}
+    {199270800 -21600 1 MDT}
+    {215596800 -25200 0 MST}
+    {230720400 -21600 1 MDT}
+    {247046400 -25200 0 MST}
+    {262774800 -21600 1 MDT}
+    {278496000 -25200 0 MST}
+    {294224400 -21600 1 MDT}
+    {309945600 -25200 0 MST}
     {325674000 -21600 1 MDT}
     {341395200 -25200 0 MST}
     {357123600 -21600 1 MDT}
diff --git a/library/tzdata/America/Dawson b/library/tzdata/America/Dawson
index c8e3f26..62b0654 100644
--- a/library/tzdata/America/Dawson
+++ b/library/tzdata/America/Dawson
@@ -10,8 +10,10 @@ set TZData(:America/Dawson) {
     {-880203600 -28800 1 YWT}
     {-769395600 -28800 1 YPT}
     {-765381600 -32400 0 YST}
+    {-157734000 -32400 0 YST}
     {-147884400 -25200 1 YDDT}
     {-131554800 -32400 0 YST}
+    {120646800 -28800 0 PST}
     {315561600 -28800 0 PST}
     {325677600 -25200 1 PDT}
     {341398800 -28800 0 PST}
diff --git a/library/tzdata/America/Inuvik b/library/tzdata/America/Inuvik
index 08f0fd6..84231f8 100644
--- a/library/tzdata/America/Inuvik
+++ b/library/tzdata/America/Inuvik
@@ -3,8 +3,22 @@
 set TZData(:America/Inuvik) {
     {-9223372036854775808 0 0 -00}
     {-536457600 -28800 0 PST}
-    {-147888000 -21600 1 PDDT}
-    {-131558400 -28800 0 PST}
+    {73476000 -25200 1 PDT}
+    {89197200 -28800 0 PST}
+    {104925600 -25200 1 PDT}
+    {120646800 -28800 0 PST}
+    {136375200 -25200 1 PDT}
+    {152096400 -28800 0 PST}
+    {167824800 -25200 1 PDT}
+    {183546000 -28800 0 PST}
+    {199274400 -25200 1 PDT}
+    {215600400 -28800 0 PST}
+    {230724000 -25200 1 PDT}
+    {247050000 -28800 0 PST}
+    {262778400 -25200 1 PDT}
+    {278499600 -28800 0 PST}
+    {294228000 -21600 0 MDT}
+    {309945600 -25200 0 MST}
     {315558000 -25200 0 MST}
     {325674000 -21600 1 MDT}
     {341395200 -25200 0 MST}
diff --git a/library/tzdata/America/Iqaluit b/library/tzdata/America/Iqaluit
index ff82866..413a548 100644
--- a/library/tzdata/America/Iqaluit
+++ b/library/tzdata/America/Iqaluit
@@ -5,8 +5,22 @@ set TZData(:America/Iqaluit) {
     {-865296000 -14400 0 EWT}
     {-769395600 -14400 1 EPT}
     {-765396000 -18000 0 EST}
-    {-147898800 -10800 1 EDDT}
-    {-131569200 -18000 0 EST}
+    {73465200 -14400 1 EDT}
+    {89186400 -18000 0 EST}
+    {104914800 -14400 1 EDT}
+    {120636000 -18000 0 EST}
+    {136364400 -14400 1 EDT}
+    {152085600 -18000 0 EST}
+    {167814000 -14400 1 EDT}
+    {183535200 -18000 0 EST}
+    {199263600 -14400 1 EDT}
+    {215589600 -18000 0 EST}
+    {230713200 -14400 1 EDT}
+    {247039200 -18000 0 EST}
+    {262767600 -14400 1 EDT}
+    {278488800 -18000 0 EST}
+    {294217200 -14400 1 EDT}
+    {309938400 -18000 0 EST}
     {325666800 -14400 1 EDT}
     {341388000 -18000 0 EST}
     {357116400 -14400 1 EDT}
diff --git a/library/tzdata/America/Nuuk b/library/tzdata/America/Nuuk
index 8d85a81..d010cab 100644
--- a/library/tzdata/America/Nuuk
+++ b/library/tzdata/America/Nuuk
@@ -89,158 +89,5 @@ set TZData(:America/Nuuk) {
     {1635642000 -10800 0 -03}
     {1648342800 -7200 1 -02}
     {1667091600 -10800 0 -03}
-    {1679792400 -7200 1 -02}
-    {1698541200 -10800 0 -03}
-    {1711846800 -7200 1 -02}
-    {1729990800 -10800 0 -03}
-    {1743296400 -7200 1 -02}
-    {1761440400 -10800 0 -03}
-    {1774746000 -7200 1 -02}
-    {1792890000 -10800 0 -03}
-    {1806195600 -7200 1 -02}
-    {1824944400 -10800 0 -03}
-    {1837645200 -7200 1 -02}
-    {1856394000 -10800 0 -03}
-    {1869094800 -7200 1 -02}
-    {1887843600 -10800 0 -03}
-    {1901149200 -7200 1 -02}
-    {1919293200 -10800 0 -03}
-    {1932598800 -7200 1 -02}
-    {1950742800 -10800 0 -03}
-    {1964048400 -7200 1 -02}
-    {1982797200 -10800 0 -03}
-    {1995498000 -7200 1 -02}
-    {2014246800 -10800 0 -03}
-    {2026947600 -7200 1 -02}
-    {2045696400 -10800 0 -03}
-    {2058397200 -7200 1 -02}
-    {2077146000 -10800 0 -03}
-    {2090451600 -7200 1 -02}
-    {2108595600 -10800 0 -03}
-    {2121901200 -7200 1 -02}
-    {2140045200 -10800 0 -03}
-    {2153350800 -7200 1 -02}
-    {2172099600 -10800 0 -03}
-    {2184800400 -7200 1 -02}
-    {2203549200 -10800 0 -03}
-    {2216250000 -7200 1 -02}
-    {2234998800 -10800 0 -03}
-    {2248304400 -7200 1 -02}
-    {2266448400 -10800 0 -03}
-    {2279754000 -7200 1 -02}
-    {2297898000 -10800 0 -03}
-    {2311203600 -7200 1 -02}
-    {2329347600 -10800 0 -03}
-    {2342653200 -7200 1 -02}
-    {2361402000 -10800 0 -03}
-    {2374102800 -7200 1 -02}
-    {2392851600 -10800 0 -03}
-    {2405552400 -7200 1 -02}
-    {2424301200 -10800 0 -03}
-    {2437606800 -7200 1 -02}
-    {2455750800 -10800 0 -03}
-    {2469056400 -7200 1 -02}
-    {2487200400 -10800 0 -03}
-    {2500506000 -7200 1 -02}
-    {2519254800 -10800 0 -03}
-    {2531955600 -7200 1 -02}
-    {2550704400 -10800 0 -03}
-    {2563405200 -7200 1 -02}
-    {2582154000 -10800 0 -03}
-    {2595459600 -7200 1 -02}
-    {2613603600 -10800 0 -03}
-    {2626909200 -7200 1 -02}
-    {2645053200 -10800 0 -03}
-    {2658358800 -7200 1 -02}
-    {2676502800 -10800 0 -03}
-    {2689808400 -7200 1 -02}
-    {2708557200 -10800 0 -03}
-    {2721258000 -7200 1 -02}
-    {2740006800 -10800 0 -03}
-    {2752707600 -7200 1 -02}
-    {2771456400 -10800 0 -03}
-    {2784762000 -7200 1 -02}
-    {2802906000 -10800 0 -03}
-    {2816211600 -7200 1 -02}
-    {2834355600 -10800 0 -03}
-    {2847661200 -7200 1 -02}
-    {2866410000 -10800 0 -03}
-    {2879110800 -7200 1 -02}
-    {2897859600 -10800 0 -03}
-    {2910560400 -7200 1 -02}
-    {2929309200 -10800 0 -03}
-    {2942010000 -7200 1 -02}
-    {2960758800 -10800 0 -03}
-    {2974064400 -7200 1 -02}
-    {2992208400 -10800 0 -03}
-    {3005514000 -7200 1 -02}
-    {3023658000 -10800 0 -03}
-    {3036963600 -7200 1 -02}
-    {3055712400 -10800 0 -03}
-    {3068413200 -7200 1 -02}
-    {3087162000 -10800 0 -03}
-    {3099862800 -7200 1 -02}
-    {3118611600 -10800 0 -03}
-    {3131917200 -7200 1 -02}
-    {3150061200 -10800 0 -03}
-    {3163366800 -7200 1 -02}
-    {3181510800 -10800 0 -03}
-    {3194816400 -7200 1 -02}
-    {3212960400 -10800 0 -03}
-    {3226266000 -7200 1 -02}
-    {3245014800 -10800 0 -03}
-    {3257715600 -7200 1 -02}
-    {3276464400 -10800 0 -03}
-    {3289165200 -7200 1 -02}
-    {3307914000 -10800 0 -03}
-    {3321219600 -7200 1 -02}
-    {3339363600 -10800 0 -03}
-    {3352669200 -7200 1 -02}
-    {3370813200 -10800 0 -03}
-    {3384118800 -7200 1 -02}
-    {3402867600 -10800 0 -03}
-    {3415568400 -7200 1 -02}
-    {3434317200 -10800 0 -03}
-    {3447018000 -7200 1 -02}
-    {3465766800 -10800 0 -03}
-    {3479072400 -7200 1 -02}
-    {3497216400 -10800 0 -03}
-    {3510522000 -7200 1 -02}
-    {3528666000 -10800 0 -03}
-    {3541971600 -7200 1 -02}
-    {3560115600 -10800 0 -03}
-    {3573421200 -7200 1 -02}
-    {3592170000 -10800 0 -03}
-    {3604870800 -7200 1 -02}
-    {3623619600 -10800 0 -03}
-    {3636320400 -7200 1 -02}
-    {3655069200 -10800 0 -03}
-    {3668374800 -7200 1 -02}
-    {3686518800 -10800 0 -03}
-    {3699824400 -7200 1 -02}
-    {3717968400 -10800 0 -03}
-    {3731274000 -7200 1 -02}
-    {3750022800 -10800 0 -03}
-    {3762723600 -7200 1 -02}
-    {3781472400 -10800 0 -03}
-    {3794173200 -7200 1 -02}
-    {3812922000 -10800 0 -03}
-    {3825622800 -7200 1 -02}
-    {3844371600 -10800 0 -03}
-    {3857677200 -7200 1 -02}
-    {3875821200 -10800 0 -03}
-    {3889126800 -7200 1 -02}
-    {3907270800 -10800 0 -03}
-    {3920576400 -7200 1 -02}
-    {3939325200 -10800 0 -03}
-    {3952026000 -7200 1 -02}
-    {3970774800 -10800 0 -03}
-    {3983475600 -7200 1 -02}
-    {4002224400 -10800 0 -03}
-    {4015530000 -7200 1 -02}
-    {4033674000 -10800 0 -03}
-    {4046979600 -7200 1 -02}
-    {4065123600 -10800 0 -03}
-    {4078429200 -7200 1 -02}
-    {4096573200 -10800 0 -03}
+    {1679792400 -7200 0 -02}
 }
diff --git a/library/tzdata/America/Ojinaga b/library/tzdata/America/Ojinaga
index 7102f73..e189f72 100644
--- a/library/tzdata/America/Ojinaga
+++ b/library/tzdata/America/Ojinaga
@@ -65,4 +65,159 @@ set TZData(:America/Ojinaga) {
     {1636272000 -25200 0 MST}
     {1647162000 -21600 1 MDT}
     {1667120400 -21600 0 CST}
+    {1669788000 -21600 0 CST}
+    {1678608000 -18000 1 CDT}
+    {1699167600 -21600 0 CST}
+    {1710057600 -18000 1 CDT}
+    {1730617200 -21600 0 CST}
+    {1741507200 -18000 1 CDT}
+    {1762066800 -21600 0 CST}
+    {1772956800 -18000 1 CDT}
+    {1793516400 -21600 0 CST}
+    {1805011200 -18000 1 CDT}
+    {1825570800 -21600 0 CST}
+    {1836460800 -18000 1 CDT}
+    {1857020400 -21600 0 CST}
+    {1867910400 -18000 1 CDT}
+    {1888470000 -21600 0 CST}
+    {1899360000 -18000 1 CDT}
+    {1919919600 -21600 0 CST}
+    {1930809600 -18000 1 CDT}
+    {1951369200 -21600 0 CST}
+    {1962864000 -18000 1 CDT}
+    {1983423600 -21600 0 CST}
+    {1994313600 -18000 1 CDT}
+    {2014873200 -21600 0 CST}
+    {2025763200 -18000 1 CDT}
+    {2046322800 -21600 0 CST}
+    {2057212800 -18000 1 CDT}
+    {2077772400 -21600 0 CST}
+    {2088662400 -18000 1 CDT}
+    {2109222000 -21600 0 CST}
+    {2120112000 -18000 1 CDT}
+    {2140671600 -21600 0 CST}
+    {2152166400 -18000 1 CDT}
+    {2172726000 -21600 0 CST}
+    {2183616000 -18000 1 CDT}
+    {2204175600 -21600 0 CST}
+    {2215065600 -18000 1 CDT}
+    {2235625200 -21600 0 CST}
+    {2246515200 -18000 1 CDT}
+    {2267074800 -21600 0 CST}
+    {2277964800 -18000 1 CDT}
+    {2298524400 -21600 0 CST}
+    {2309414400 -18000 1 CDT}
+    {2329974000 -21600 0 CST}
+    {2341468800 -18000 1 CDT}
+    {2362028400 -21600 0 CST}
+    {2372918400 -18000 1 CDT}
+    {2393478000 -21600 0 CST}
+    {2404368000 -18000 1 CDT}
+    {2424927600 -21600 0 CST}
+    {2435817600 -18000 1 CDT}
+    {2456377200 -21600 0 CST}
+    {2467267200 -18000 1 CDT}
+    {2487826800 -21600 0 CST}
+    {2499321600 -18000 1 CDT}
+    {2519881200 -21600 0 CST}
+    {2530771200 -18000 1 CDT}
+    {2551330800 -21600 0 CST}
+    {2562220800 -18000 1 CDT}
+    {2582780400 -21600 0 CST}
+    {2593670400 -18000 1 CDT}
+    {2614230000 -21600 0 CST}
+    {2625120000 -18000 1 CDT}
+    {2645679600 -21600 0 CST}
+    {2656569600 -18000 1 CDT}
+    {2677129200 -21600 0 CST}
+    {2688624000 -18000 1 CDT}
+    {2709183600 -21600 0 CST}
+    {2720073600 -18000 1 CDT}
+    {2740633200 -21600 0 CST}
+    {2751523200 -18000 1 CDT}
+    {2772082800 -21600 0 CST}
+    {2782972800 -18000 1 CDT}
+    {2803532400 -21600 0 CST}
+    {2814422400 -18000 1 CDT}
+    {2834982000 -21600 0 CST}
+    {2846476800 -18000 1 CDT}
+    {2867036400 -21600 0 CST}
+    {2877926400 -18000 1 CDT}
+    {2898486000 -21600 0 CST}
+    {2909376000 -18000 1 CDT}
+    {2929935600 -21600 0 CST}
+    {2940825600 -18000 1 CDT}
+    {2961385200 -21600 0 CST}
+    {2972275200 -18000 1 CDT}
+    {2992834800 -21600 0 CST}
+    {3003724800 -18000 1 CDT}
+    {3024284400 -21600 0 CST}
+    {3035779200 -18000 1 CDT}
+    {3056338800 -21600 0 CST}
+    {3067228800 -18000 1 CDT}
+    {3087788400 -21600 0 CST}
+    {3098678400 -18000 1 CDT}
+    {3119238000 -21600 0 CST}
+    {3130128000 -18000 1 CDT}
+    {3150687600 -21600 0 CST}
+    {3161577600 -18000 1 CDT}
+    {3182137200 -21600 0 CST}
+    {3193027200 -18000 1 CDT}
+    {3213586800 -21600 0 CST}
+    {3225081600 -18000 1 CDT}
+    {3245641200 -21600 0 CST}
+    {3256531200 -18000 1 CDT}
+    {3277090800 -21600 0 CST}
+    {3287980800 -18000 1 CDT}
+    {3308540400 -21600 0 CST}
+    {3319430400 -18000 1 CDT}
+    {3339990000 -21600 0 CST}
+    {3350880000 -18000 1 CDT}
+    {3371439600 -21600 0 CST}
+    {3382934400 -18000 1 CDT}
+    {3403494000 -21600 0 CST}
+    {3414384000 -18000 1 CDT}
+    {3434943600 -21600 0 CST}
+    {3445833600 -18000 1 CDT}
+    {3466393200 -21600 0 CST}
+    {3477283200 -18000 1 CDT}
+    {3497842800 -21600 0 CST}
+    {3508732800 -18000 1 CDT}
+    {3529292400 -21600 0 CST}
+    {3540182400 -18000 1 CDT}
+    {3560742000 -21600 0 CST}
+    {3572236800 -18000 1 CDT}
+    {3592796400 -21600 0 CST}
+    {3603686400 -18000 1 CDT}
+    {3624246000 -21600 0 CST}
+    {3635136000 -18000 1 CDT}
+    {3655695600 -21600 0 CST}
+    {3666585600 -18000 1 CDT}
+    {3687145200 -21600 0 CST}
+    {3698035200 -18000 1 CDT}
+    {3718594800 -21600 0 CST}
+    {3730089600 -18000 1 CDT}
+    {3750649200 -21600 0 CST}
+    {3761539200 -18000 1 CDT}
+    {3782098800 -21600 0 CST}
+    {3792988800 -18000 1 CDT}
+    {3813548400 -21600 0 CST}
+    {3824438400 -18000 1 CDT}
+    {3844998000 -21600 0 CST}
+    {3855888000 -18000 1 CDT}
+    {3876447600 -21600 0 CST}
+    {3887337600 -18000 1 CDT}
+    {3907897200 -21600 0 CST}
+    {3919392000 -18000 1 CDT}
+    {3939951600 -21600 0 CST}
+    {3950841600 -18000 1 CDT}
+    {3971401200 -21600 0 CST}
+    {3982291200 -18000 1 CDT}
+    {4002850800 -21600 0 CST}
+    {4013740800 -18000 1 CDT}
+    {4034300400 -21600 0 CST}
+    {4045190400 -18000 1 CDT}
+    {4065750000 -21600 0 CST}
+    {4076640000 -18000 1 CDT}
+    {4097199600 -21600 0 CST}
 }
diff --git a/library/tzdata/America/Pangnirtung b/library/tzdata/America/Pangnirtung
index 14d8516..b7db25d 100644
--- a/library/tzdata/America/Pangnirtung
+++ b/library/tzdata/America/Pangnirtung
@@ -1,252 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Pangnirtung) {
-    {-9223372036854775808 0 0 -00}
-    {-1546300800 -14400 0 AST}
-    {-880221600 -10800 1 AWT}
-    {-769395600 -10800 1 APT}
-    {-765399600 -14400 0 AST}
-    {-147902400 -7200 1 ADDT}
-    {-131572800 -14400 0 AST}
-    {325663200 -10800 1 ADT}
-    {341384400 -14400 0 AST}
-    {357112800 -10800 1 ADT}
-    {372834000 -14400 0 AST}
-    {388562400 -10800 1 ADT}
-    {404888400 -14400 0 AST}
-    {420012000 -10800 1 ADT}
-    {436338000 -14400 0 AST}
-    {452066400 -10800 1 ADT}
-    {467787600 -14400 0 AST}
-    {483516000 -10800 1 ADT}
-    {499237200 -14400 0 AST}
-    {514965600 -10800 1 ADT}
-    {530686800 -14400 0 AST}
-    {544600800 -10800 1 ADT}
-    {562136400 -14400 0 AST}
-    {576050400 -10800 1 ADT}
-    {594190800 -14400 0 AST}
-    {607500000 -10800 1 ADT}
-    {625640400 -14400 0 AST}
-    {638949600 -10800 1 ADT}
-    {657090000 -14400 0 AST}
-    {671004000 -10800 1 ADT}
-    {688539600 -14400 0 AST}
-    {702453600 -10800 1 ADT}
-    {719989200 -14400 0 AST}
-    {733903200 -10800 1 ADT}
-    {752043600 -14400 0 AST}
-    {765352800 -10800 1 ADT}
-    {783493200 -14400 0 AST}
-    {796802400 -18000 0 EST}
-    {796806000 -14400 1 EDT}
-    {814946400 -18000 0 EST}
-    {828860400 -14400 1 EDT}
-    {846396000 -18000 0 EST}
-    {860310000 -14400 1 EDT}
-    {877845600 -18000 0 EST}
-    {891759600 -14400 1 EDT}
-    {909295200 -18000 0 EST}
-    {923209200 -14400 1 EDT}
-    {941353200 -21600 0 CST}
-    {954662400 -18000 1 CDT}
-    {972806400 -18000 0 EST}
-    {986108400 -14400 1 EDT}
-    {1004248800 -18000 0 EST}
-    {1018162800 -14400 1 EDT}
-    {1035698400 -18000 0 EST}
-    {1049612400 -14400 1 EDT}
-    {1067148000 -18000 0 EST}
-    {1081062000 -14400 1 EDT}
-    {1099202400 -18000 0 EST}
-    {1112511600 -14400 1 EDT}
-    {1130652000 -18000 0 EST}
-    {1143961200 -14400 1 EDT}
-    {1162101600 -18000 0 EST}
-    {1173596400 -14400 1 EDT}
-    {1194156000 -18000 0 EST}
-    {1205046000 -14400 1 EDT}
-    {1225605600 -18000 0 EST}
-    {1236495600 -14400 1 EDT}
-    {1257055200 -18000 0 EST}
-    {1268550000 -14400 1 EDT}
-    {1289109600 -18000 0 EST}
-    {1299999600 -14400 1 EDT}
-    {1320559200 -18000 0 EST}
-    {1331449200 -14400 1 EDT}
-    {1352008800 -18000 0 EST}
-    {1362898800 -14400 1 EDT}
-    {1383458400 -18000 0 EST}
-    {1394348400 -14400 1 EDT}
-    {1414908000 -18000 0 EST}
-    {1425798000 -14400 1 EDT}
-    {1446357600 -18000 0 EST}
-    {1457852400 -14400 1 EDT}
-    {1478412000 -18000 0 EST}
-    {1489302000 -14400 1 EDT}
-    {1509861600 -18000 0 EST}
-    {1520751600 -14400 1 EDT}
-    {1541311200 -18000 0 EST}
-    {1552201200 -14400 1 EDT}
-    {1572760800 -18000 0 EST}
-    {1583650800 -14400 1 EDT}
-    {1604210400 -18000 0 EST}
-    {1615705200 -14400 1 EDT}
-    {1636264800 -18000 0 EST}
-    {1647154800 -14400 1 EDT}
-    {1667714400 -18000 0 EST}
-    {1678604400 -14400 1 EDT}
-    {1699164000 -18000 0 EST}
-    {1710054000 -14400 1 EDT}
-    {1730613600 -18000 0 EST}
-    {1741503600 -14400 1 EDT}
-    {1762063200 -18000 0 EST}
-    {1772953200 -14400 1 EDT}
-    {1793512800 -18000 0 EST}
-    {1805007600 -14400 1 EDT}
-    {1825567200 -18000 0 EST}
-    {1836457200 -14400 1 EDT}
-    {1857016800 -18000 0 EST}
-    {1867906800 -14400 1 EDT}
-    {1888466400 -18000 0 EST}
-    {1899356400 -14400 1 EDT}
-    {1919916000 -18000 0 EST}
-    {1930806000 -14400 1 EDT}
-    {1951365600 -18000 0 EST}
-    {1962860400 -14400 1 EDT}
-    {1983420000 -18000 0 EST}
-    {1994310000 -14400 1 EDT}
-    {2014869600 -18000 0 EST}
-    {2025759600 -14400 1 EDT}
-    {2046319200 -18000 0 EST}
-    {2057209200 -14400 1 EDT}
-    {2077768800 -18000 0 EST}
-    {2088658800 -14400 1 EDT}
-    {2109218400 -18000 0 EST}
-    {2120108400 -14400 1 EDT}
-    {2140668000 -18000 0 EST}
-    {2152162800 -14400 1 EDT}
-    {2172722400 -18000 0 EST}
-    {2183612400 -14400 1 EDT}
-    {2204172000 -18000 0 EST}
-    {2215062000 -14400 1 EDT}
-    {2235621600 -18000 0 EST}
-    {2246511600 -14400 1 EDT}
-    {2267071200 -18000 0 EST}
-    {2277961200 -14400 1 EDT}
-    {2298520800 -18000 0 EST}
-    {2309410800 -14400 1 EDT}
-    {2329970400 -18000 0 EST}
-    {2341465200 -14400 1 EDT}
-    {2362024800 -18000 0 EST}
-    {2372914800 -14400 1 EDT}
-    {2393474400 -18000 0 EST}
-    {2404364400 -14400 1 EDT}
-    {2424924000 -18000 0 EST}
-    {2435814000 -14400 1 EDT}
-    {2456373600 -18000 0 EST}
-    {2467263600 -14400 1 EDT}
-    {2487823200 -18000 0 EST}
-    {2499318000 -14400 1 EDT}
-    {2519877600 -18000 0 EST}
-    {2530767600 -14400 1 EDT}
-    {2551327200 -18000 0 EST}
-    {2562217200 -14400 1 EDT}
-    {2582776800 -18000 0 EST}
-    {2593666800 -14400 1 EDT}
-    {2614226400 -18000 0 EST}
-    {2625116400 -14400 1 EDT}
-    {2645676000 -18000 0 EST}
-    {2656566000 -14400 1 EDT}
-    {2677125600 -18000 0 EST}
-    {2688620400 -14400 1 EDT}
-    {2709180000 -18000 0 EST}
-    {2720070000 -14400 1 EDT}
-    {2740629600 -18000 0 EST}
-    {2751519600 -14400 1 EDT}
-    {2772079200 -18000 0 EST}
-    {2782969200 -14400 1 EDT}
-    {2803528800 -18000 0 EST}
-    {2814418800 -14400 1 EDT}
-    {2834978400 -18000 0 EST}
-    {2846473200 -14400 1 EDT}
-    {2867032800 -18000 0 EST}
-    {2877922800 -14400 1 EDT}
-    {2898482400 -18000 0 EST}
-    {2909372400 -14400 1 EDT}
-    {2929932000 -18000 0 EST}
-    {2940822000 -14400 1 EDT}
-    {2961381600 -18000 0 EST}
-    {2972271600 -14400 1 EDT}
-    {2992831200 -18000 0 EST}
-    {3003721200 -14400 1 EDT}
-    {3024280800 -18000 0 EST}
-    {3035775600 -14400 1 EDT}
-    {3056335200 -18000 0 EST}
-    {3067225200 -14400 1 EDT}
-    {3087784800 -18000 0 EST}
-    {3098674800 -14400 1 EDT}
-    {3119234400 -18000 0 EST}
-    {3130124400 -14400 1 EDT}
-    {3150684000 -18000 0 EST}
-    {3161574000 -14400 1 EDT}
-    {3182133600 -18000 0 EST}
-    {3193023600 -14400 1 EDT}
-    {3213583200 -18000 0 EST}
-    {3225078000 -14400 1 EDT}
-    {3245637600 -18000 0 EST}
-    {3256527600 -14400 1 EDT}
-    {3277087200 -18000 0 EST}
-    {3287977200 -14400 1 EDT}
-    {3308536800 -18000 0 EST}
-    {3319426800 -14400 1 EDT}
-    {3339986400 -18000 0 EST}
-    {3350876400 -14400 1 EDT}
-    {3371436000 -18000 0 EST}
-    {3382930800 -14400 1 EDT}
-    {3403490400 -18000 0 EST}
-    {3414380400 -14400 1 EDT}
-    {3434940000 -18000 0 EST}
-    {3445830000 -14400 1 EDT}
-    {3466389600 -18000 0 EST}
-    {3477279600 -14400 1 EDT}
-    {3497839200 -18000 0 EST}
-    {3508729200 -14400 1 EDT}
-    {3529288800 -18000 0 EST}
-    {3540178800 -14400 1 EDT}
-    {3560738400 -18000 0 EST}
-    {3572233200 -14400 1 EDT}
-    {3592792800 -18000 0 EST}
-    {3603682800 -14400 1 EDT}
-    {3624242400 -18000 0 EST}
-    {3635132400 -14400 1 EDT}
-    {3655692000 -18000 0 EST}
-    {3666582000 -14400 1 EDT}
-    {3687141600 -18000 0 EST}
-    {3698031600 -14400 1 EDT}
-    {3718591200 -18000 0 EST}
-    {3730086000 -14400 1 EDT}
-    {3750645600 -18000 0 EST}
-    {3761535600 -14400 1 EDT}
-    {3782095200 -18000 0 EST}
-    {3792985200 -14400 1 EDT}
-    {3813544800 -18000 0 EST}
-    {3824434800 -14400 1 EDT}
-    {3844994400 -18000 0 EST}
-    {3855884400 -14400 1 EDT}
-    {3876444000 -18000 0 EST}
-    {3887334000 -14400 1 EDT}
-    {3907893600 -18000 0 EST}
-    {3919388400 -14400 1 EDT}
-    {3939948000 -18000 0 EST}
-    {3950838000 -14400 1 EDT}
-    {3971397600 -18000 0 EST}
-    {3982287600 -14400 1 EDT}
-    {4002847200 -18000 0 EST}
-    {4013737200 -14400 1 EDT}
-    {4034296800 -18000 0 EST}
-    {4045186800 -14400 1 EDT}
-    {4065746400 -18000 0 EST}
-    {4076636400 -14400 1 EDT}
-    {4097196000 -18000 0 EST}
+if {![info exists TZData(America/Iqaluit)]} {
+    LoadTimeZoneFile America/Iqaluit
 }
+set TZData(:America/Pangnirtung) $TZData(:America/Iqaluit)
diff --git a/library/tzdata/America/Rankin_Inlet b/library/tzdata/America/Rankin_Inlet
index 9ce9f8d..0f6db70 100644
--- a/library/tzdata/America/Rankin_Inlet
+++ b/library/tzdata/America/Rankin_Inlet
@@ -3,8 +3,22 @@
 set TZData(:America/Rankin_Inlet) {
     {-9223372036854775808 0 0 -00}
     {-410227200 -21600 0 CST}
-    {-147895200 -14400 1 CDDT}
-    {-131565600 -21600 0 CST}
+    {73468800 -18000 1 CDT}
+    {89190000 -21600 0 CST}
+    {104918400 -18000 1 CDT}
+    {120639600 -21600 0 CST}
+    {136368000 -18000 1 CDT}
+    {152089200 -21600 0 CST}
+    {167817600 -18000 1 CDT}
+    {183538800 -21600 0 CST}
+    {199267200 -18000 1 CDT}
+    {215593200 -21600 0 CST}
+    {230716800 -18000 1 CDT}
+    {247042800 -21600 0 CST}
+    {262771200 -18000 1 CDT}
+    {278492400 -21600 0 CST}
+    {294220800 -18000 1 CDT}
+    {309942000 -21600 0 CST}
     {325670400 -18000 1 CDT}
     {341391600 -21600 0 CST}
     {357120000 -18000 1 CDT}
diff --git a/library/tzdata/America/Resolute b/library/tzdata/America/Resolute
index a9881b4..27e7300 100644
--- a/library/tzdata/America/Resolute
+++ b/library/tzdata/America/Resolute
@@ -3,8 +3,22 @@
 set TZData(:America/Resolute) {
     {-9223372036854775808 0 0 -00}
     {-704937600 -21600 0 CST}
-    {-147895200 -14400 1 CDDT}
-    {-131565600 -21600 0 CST}
+    {73468800 -18000 1 CDT}
+    {89190000 -21600 0 CST}
+    {104918400 -18000 1 CDT}
+    {120639600 -21600 0 CST}
+    {136368000 -18000 1 CDT}
+    {152089200 -21600 0 CST}
+    {167817600 -18000 1 CDT}
+    {183538800 -21600 0 CST}
+    {199267200 -18000 1 CDT}
+    {215593200 -21600 0 CST}
+    {230716800 -18000 1 CDT}
+    {247042800 -21600 0 CST}
+    {262771200 -18000 1 CDT}
+    {278492400 -21600 0 CST}
+    {294220800 -18000 1 CDT}
+    {309942000 -21600 0 CST}
     {325670400 -18000 1 CDT}
     {341391600 -21600 0 CST}
     {357120000 -18000 1 CDT}
diff --git a/library/tzdata/America/Whitehorse b/library/tzdata/America/Whitehorse
index 498a203..602ecd1 100644
--- a/library/tzdata/America/Whitehorse
+++ b/library/tzdata/America/Whitehorse
@@ -10,8 +10,10 @@ set TZData(:America/Whitehorse) {
     {-880203600 -28800 1 YWT}
     {-769395600 -28800 1 YPT}
     {-765381600 -32400 0 YST}
+    {-157734000 -32400 0 YST}
     {-147884400 -25200 1 YDDT}
     {-131554800 -32400 0 YST}
+    {-121273200 -28800 0 PST}
     {315561600 -28800 0 PST}
     {325677600 -25200 1 PDT}
     {341398800 -28800 0 PST}
diff --git a/library/tzdata/America/Yellowknife b/library/tzdata/America/Yellowknife
index c6c4ed5..65ddbb6 100644
--- a/library/tzdata/America/Yellowknife
+++ b/library/tzdata/America/Yellowknife
@@ -6,8 +6,22 @@ set TZData(:America/Yellowknife) {
     {-880210800 -21600 1 MWT}
     {-769395600 -21600 1 MPT}
     {-765388800 -25200 0 MST}
-    {-147891600 -18000 1 MDDT}
-    {-131562000 -25200 0 MST}
+    {73472400 -21600 1 MDT}
+    {89193600 -25200 0 MST}
+    {104922000 -21600 1 MDT}
+    {120643200 -25200 0 MST}
+    {136371600 -21600 1 MDT}
+    {152092800 -25200 0 MST}
+    {167821200 -21600 1 MDT}
+    {183542400 -25200 0 MST}
+    {199270800 -21600 1 MDT}
+    {215596800 -25200 0 MST}
+    {230720400 -21600 1 MDT}
+    {247046400 -25200 0 MST}
+    {262774800 -21600 1 MDT}
+    {278496000 -25200 0 MST}
+    {294224400 -21600 1 MDT}
+    {309945600 -25200 0 MST}
     {315558000 -25200 0 MST}
     {325674000 -21600 1 MDT}
     {341395200 -25200 0 MST}
diff --git a/library/tzdata/Asia/Singapore b/library/tzdata/Asia/Singapore
index f10eb1f..0fcd130 100644
--- a/library/tzdata/Asia/Singapore
+++ b/library/tzdata/Asia/Singapore
@@ -9,5 +9,5 @@ set TZData(:Asia/Singapore) {
     {-894180000 27000 0 +0730}
     {-879665400 32400 0 +09}
     {-767005200 27000 0 +0730}
-    {378664200 28800 0 +08}
+    {378662400 28800 0 +08}
 }
-- 
cgit v0.12


From 6c7ad3b1183f1a912bac6ba4fcdf0231749c359e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 30 Nov 2022 21:16:15 +0000
Subject: Let Tcl_GetEncodingNulLength() return size_t on 9.0, for consisancy
 with other API's. No change on 8.7

---
 doc/Encoding.3        | 6 +++---
 generic/tcl.decls     | 2 +-
 generic/tcl.h         | 4 ++--
 generic/tclDecls.h    | 4 ++--
 generic/tclEncoding.c | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 43bb2b8..9b88c11 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -347,7 +347,7 @@ typedef struct Tcl_EncodingType {
     Tcl_EncodingConvertProc *\fItoUtfProc\fR;
     Tcl_EncodingConvertProc *\fIfromUtfProc\fR;
     Tcl_EncodingFreeProc *\fIfreeProc\fR;
-    ClientData \fIclientData\fR;
+    void *\fIclientData\fR;
     int \fInullSize\fR;
 } \fBTcl_EncodingType\fR;
 .CE
@@ -378,7 +378,7 @@ type \fBTcl_EncodingConvertProc\fR:
 .PP
 .CS
 typedef int \fBTcl_EncodingConvertProc\fR(
-        ClientData \fIclientData\fR,
+        void *\fIclientData\fR,
         const char *\fIsrc\fR,
         int \fIsrcLen\fR,
         int \fIflags\fR,
@@ -410,7 +410,7 @@ The callback procedure \fIfreeProc\fR, if non-NULL, should match the type
 .PP
 .CS
 typedef void \fBTcl_EncodingFreeProc\fR(
-        ClientData \fIclientData\fR);
+        void *\fIclientData\fR);
 .CE
 .PP
 This \fIfreeProc\fR function is called when the encoding is deleted.  The
diff --git a/generic/tcl.decls b/generic/tcl.decls
index a9c042c..a48ab02 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2549,7 +2549,7 @@ declare 682 {
 
 # TIP 643
 declare 683 {
-   int Tcl_GetEncodingNulLength(Tcl_Encoding encoding)
+   Tcl_Size Tcl_GetEncodingNulLength(Tcl_Encoding encoding)
 }
 
 # TIP #650
diff --git a/generic/tcl.h b/generic/tcl.h
index ebe989c..c6afaa1 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2078,11 +2078,11 @@ typedef struct Tcl_EncodingType {
 				 * encoding is deleted. */
     void *clientData;	/* Arbitrary value associated with encoding
 				 * type. Passed to conversion functions. */
-    int nullSize;		/* Number of zero bytes that signify
+    Tcl_Size nullSize;		/* Number of zero bytes that signify
 				 * end-of-string in this encoding. This number
 				 * is used to determine the source string
 				 * length when the srcLen argument is
-				 * negative. Must be 1 or 2. */
+				 * negative. Must be 1, 2, or 4. */
 } Tcl_EncodingType;
 
 /*
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index d8b4b5d..77517e8 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -2039,7 +2039,7 @@ EXTERN int		Tcl_GetNumber(Tcl_Interp *interp, const char *bytes,
 EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
 				Tcl_Channel chan, int mode);
 /* 683 */
-EXTERN int		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
+EXTERN Tcl_Size		Tcl_GetEncodingNulLength(Tcl_Encoding encoding);
 /* 684 */
 EXTERN int		Tcl_GetWideUIntFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr);
@@ -2766,7 +2766,7 @@ typedef struct TclStubs {
     int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
     int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, size_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
     int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
-    int (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
+    Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
     int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
     Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */
     void (*reserved686)(void);
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 5be6a2e..169e975 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -33,13 +33,13 @@ typedef struct {
     Tcl_EncodingFreeProc *freeProc;
 				/* If non-NULL, function to call when this
 				 * encoding is deleted. */
+    void *clientData;	/* Arbitrary value associated with encoding
+				 * type. Passed to conversion functions. */
     int nullSize;		/* Number of 0x00 bytes that signify
 				 * end-of-string in this encoding. This number
 				 * is used to determine the source string
 				 * length when the srcLen argument is
 				 * negative. This number can be 1, 2, or 4. */
-    void *clientData;	/* Arbitrary value associated with encoding
-				 * type. Passed to conversion functions. */
     LengthProc *lengthProc;	/* Function to compute length of
 				 * null-terminated strings in this encoding.
 				 * If nullSize is 1, this is strlen; if
@@ -888,7 +888,7 @@ FreeEncoding(
  *
  * Tcl_GetEncodingName --
  *
- *	Given an encoding, return the name that was used to constuct the
+ *	Given an encoding, return the name that was used to construct the
  *	encoding.
  *
  * Results:
@@ -991,7 +991,7 @@ Tcl_GetEncodingNames(
  *      string termination.
  *
  * Results:
- *	The name of the encoding.
+ *	The number of nul bytes used for the string termination.
  *
  * Side effects:
  *	None.
-- 
cgit v0.12


From 36c94773b45337052801cf689d1c2a3ab1ea790b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 1 Dec 2022 10:18:35 +0000
Subject: Handle "deprecated" condition correctly in test-cases

---
 tests/chan.test   | 3 ++-
 tests/chanio.test | 4 ++--
 tests/io.test     | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/chan.test b/tests/chan.test
index cb44f06..87d642c 100644
--- a/tests/chan.test
+++ b/tests/chan.test
@@ -11,6 +11,7 @@ if {"::tcltest" ni [namespace children]} {
     package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
+source [file join [file dirname [info script]] tcltests.tcl]
 
 package require tcltests
 
@@ -55,7 +56,7 @@ test chan-4.2 {chan command: [Bug 800753]} -body {
 test chan-4.3 {chan command: [Bug 800753]} -body {
     chan configure stdout -eofchar \x00
 } -returnCodes error -result {bad value for -eofchar: must be non-NUL ASCII character}
-test chan-4.4 {chan command: check valid inValue, no outValue} -body {
+test chan-4.4 {chan command: check valid inValue, no outValue} -constraints deprecated -body {
     chan configure stdout -eofchar [list \x27 {}]
 } -result {}
 test chan-4.5 {chan command: check valid inValue, invalid outValue} -body {
diff --git a/tests/chanio.test b/tests/chanio.test
index 6cd3955..4ad59f1 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -5285,7 +5285,7 @@ test chan-io-39.21 {Tcl_SetChannelOption, setting read mode independently} \
 test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
     file delete $path(test1)
     set l ""
-} -constraints unix -body {
+} -constraints {unix deprecated} -body {
     set f1 [open $path(test1) w+]
     lappend l [chan configure $f1 -eofchar]
     chan configure $f1 -eofchar {O {}}
@@ -5295,7 +5295,7 @@ test chan-io-39.22 {Tcl_SetChannelOption, invariance} -setup {
 } -cleanup {
     chan close $f1
 } -result {{} O D}
-test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
+test chan-io-39.22a {Tcl_SetChannelOption, invariance} -constraints deprecated -setup {
     file delete $path(test1)
     set l [list]
 } -body {
diff --git a/tests/io.test b/tests/io.test
index 52ec200..cbf20c1 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -5756,7 +5756,7 @@ test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \
     close $s2
     set modes
 } {auto crlf}
-test io-39.22 {Tcl_SetChannelOption, invariance} unix {
+test io-39.22 {Tcl_SetChannelOption, invariance} -constraints {unix deprecated} -body {
     file delete $path(test1)
     set f1 [open $path(test1) w+]
     set l ""
@@ -5767,8 +5767,8 @@ test io-39.22 {Tcl_SetChannelOption, invariance} unix {
     lappend l [fconfigure $f1 -eofchar]
     close $f1
     set l
-} {{} O D}
-test io-39.22a {Tcl_SetChannelOption, invariance} {
+} -result {{} O D}
+test io-39.22a {Tcl_SetChannelOption, invariance} -constraints deprecated -body {
     file delete $path(test1)
     set f1 [open $path(test1) w+]
     set l [list]
@@ -5779,7 +5779,7 @@ test io-39.22a {Tcl_SetChannelOption, invariance} {
     lappend l [list [catch {fconfigure $f1 -eofchar {1 2 3}} msg] $msg]
     close $f1
     set l
-} {O D {1 {bad value for -eofchar: must be non-NUL ASCII character}}}
+} -result {O D {1 {bad value for -eofchar: must be non-NUL ASCII character}}}
 test io-39.23 {Tcl_GetChannelOption, server socket is not readable or
         writeable, it should still have valid -eofchar and -translation options } {
     set l [list]
-- 
cgit v0.12


From b3838ea4450c4d290daa647c9a7f62d4e55ee7c0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 1 Dec 2022 17:27:03 +0000
Subject: Backport TIP #402: General Platform UNC Support from 8.7, but only
 for Cygwin and QNX. This was already partially present, but was never
 completed.

---
 generic/tclFileName.c | 32 +++++++-------------------------
 unix/tclUnixFile.c    |  5 ++---
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index b6a6439..dcd3d0e 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -5,7 +5,7 @@
  *	and network form.
  *
  * Copyright (c) 1995-1998 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * Copyright (c) 1998-1999 Scriptics Corporation.
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -422,22 +422,11 @@ TclpGetNativePathType(
 		    while (*path && *path != '/') {
 			++path;
 		    }
-#if defined(__CYGWIN__)
-		    /* UNC paths need to be followed by a share name */
-		    if (*path++ && (*path && *path != '/')) {
-			++path;
-			while (*path && *path != '/') {
-			    ++path;
-			}
-		    } else {
-			path = origPath + 1;
-		    }
-#endif
 		}
 #endif
 		if (driveNameLengthPtr != NULL) {
 		    /*
-		     * We need this addition in case the QNX or Cygwin code was used.
+		     * We need this addition in case the "//" code was used.
 		     */
 
 		    *driveNameLengthPtr = (path - origPath);
@@ -664,17 +653,6 @@ SplitUnixPath(
 	    while (*path && *path != '/') {
 		++path;
 	    }
-#if defined(__CYGWIN__)
-	    /* UNC paths need to be followed by a share name */
-	    if (*path++ && (*path && *path != '/')) {
-		++path;
-		while (*path && *path != '/') {
-		    ++path;
-		}
-	    } else {
-		path = origPath + 1;
-	    }
-#endif
 	}
 #endif
 	rootElt = Tcl_NewStringObj(origPath, path - origPath);
@@ -1889,7 +1867,11 @@ TclGlob(
 	separators = "/\\";
 
     } else if (tclPlatform == TCL_PLATFORM_UNIX) {
-	if (pathPrefix == NULL && tail[0] == '/') {
+	if (pathPrefix == NULL && tail[0] == '/'
+#if defined(__CYGWIN__) || defined(__QNX__)
+		&& tail[1] != '/'
+#endif
+	) {
 	    pathPrefix = Tcl_NewStringObj(tail, 1);
 	    tail++;
 	    Tcl_IncrRefCount(pathPrefix);
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index a75ae22..c269079 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -39,7 +39,6 @@ TclpFindExecutable(
     const char *argv0)		/* The value of the application's argv[0]
 				 * (native). */
 {
-    Tcl_Encoding encoding;
 #ifdef __CYGWIN__
     int length;
     wchar_t buf[PATH_MAX] = L"";
@@ -52,10 +51,10 @@ TclpFindExecutable(
 	/* Strip '.exe' part. */
 	length -= 4;
     }
-    encoding = Tcl_GetEncoding(NULL, NULL);
     TclSetObjNameOfExecutable(
-	    Tcl_NewStringObj(name, length), encoding);
+	    Tcl_NewStringObj(name, length), NULL);
 #else
+    Tcl_Encoding encoding;
     const char *name, *p;
     Tcl_StatBuf statBuf;
     Tcl_DString buffer, nameString, cwd, utfName;
-- 
cgit v0.12


From ae115792863b91165a1da7d6d51509061cb574b9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Dec 2022 08:19:36 +0000
Subject: Make options -nocomplain and -strictencoding truly independant.
 Leftover from initial implementation. Noted by Rolf Ade (thanks!)

---
 generic/tclIO.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 64b309d..0686571 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8252,7 +8252,6 @@ Tcl_SetChannelOption(
 	}
 	if (newMode) {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-	    SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	}
@@ -8265,7 +8264,6 @@ Tcl_SetChannelOption(
 	}
 	if (newMode) {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	}
-- 
cgit v0.12


From 25b3cffdd2b616b796b57e6f6766456cfb6ce8e7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Dec 2022 08:35:05 +0000
Subject: Oops, that's the wrong one ...

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

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 0686571..93d1d46 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8251,7 +8251,7 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
+	    SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	}
@@ -8263,7 +8263,7 @@ Tcl_SetChannelOption(
 	    return TCL_ERROR;
 	}
 	if (newMode) {
-	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
+	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	}
-- 
cgit v0.12


From 635dd1a69689dbc6054b475fd4d15c92aa59dfd4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Dec 2022 11:27:10 +0000
Subject: Fix utf32 lables in testcases (some not necessary any more, one
 missing), indicating differences between Tcl 8.x and 9.0

---
 tests/encoding.test | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index a87cd24..89209d0 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -43,7 +43,7 @@ testConstraint testgetencpath [llength [info commands testgetencpath]]
 testConstraint fullutf [expr {[format %c 0x010000] ne "\uFFFD"}]
 testConstraint utf32 [expr {[testConstraint fullutf]
 		&& [string length [format %c 0x10000]] == 1}]
-
+
 # TclInitEncodingSubsystem is tested by the rest of this file
 # TclFinalizeEncodingSubsystem is not currently tested
 
@@ -353,55 +353,55 @@ test encoding-15.6 {UtfToUtfProc emoji character output} utf32 {
     binary scan $y H* z
     list [string length $y] $z
 } {12 edb882eda0bdedb882eda0bd}
-test encoding-15.7 {UtfToUtfProc emoji character output} utf32 {
+test encoding-15.7 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83D\uD83D
     set y [encoding convertto -nocomplain utf-8 \uDE02\uD83D\uD83D]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 9 edb882eda0bdeda0bd}
-test encoding-15.8 {UtfToUtfProc emoji character output} utf32 {
+test encoding-15.8 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83Dé
     set y [encoding convertto -nocomplain utf-8 \uDE02\uD83Dé]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 8 edb882eda0bdc3a9}
-test encoding-15.9 {UtfToUtfProc emoji character output} utf32 {
+test encoding-15.9 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83DX
     set y [encoding convertto -nocomplain utf-8 \uDE02\uD83DX]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 7 edb882eda0bd58}
-test encoding-15.10 {UtfToUtfProc high surrogate character output} utf32 {
+test encoding-15.10 {UtfToUtfProc high surrogate character output} {
     set x \uDE02é
     set y [encoding convertto -nocomplain utf-8 \uDE02é]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 5 edb882c3a9}
-test encoding-15.11 {UtfToUtfProc low surrogate character output} utf32 {
+test encoding-15.11 {UtfToUtfProc low surrogate character output} {
     set x \uDA02é
     set y [encoding convertto -nocomplain utf-8 \uDA02é]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 5 eda882c3a9}
-test encoding-15.12 {UtfToUtfProc high surrogate character output} utf32 {
+test encoding-15.12 {UtfToUtfProc high surrogate character output} {
     set x \uDE02Y
     set y [encoding convertto -nocomplain utf-8 \uDE02Y]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 4 edb88259}
-test encoding-15.13 {UtfToUtfProc low surrogate character output} utf32 {
+test encoding-15.13 {UtfToUtfProc low surrogate character output} {
     set x \uDA02Y
     set y [encoding convertto -nocomplain utf-8 \uDA02Y]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 4 eda88259}
-test encoding-15.14 {UtfToUtfProc high surrogate character output} utf32 {
+test encoding-15.14 {UtfToUtfProc high surrogate character output} {
     set x \uDE02
     set y [encoding convertto -nocomplain utf-8 \uDE02]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {1 3 edb882}
-test encoding-15.15 {UtfToUtfProc low surrogate character output} utf32 {
+test encoding-15.15 {UtfToUtfProc low surrogate character output} {
     set x \uDA02
     set y [encoding convertto -nocomplain utf-8 \uDA02]
     binary scan $y H* z
@@ -707,7 +707,7 @@ test encoding-24.33 {Try to generate invalid utf-8 with -strict} -body {
 test encoding-24.34 {Try to generate invalid utf-8 with -nocomplain} -body {
     encoding convertto -nocomplain utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.35 {Parse invalid utf-8} -body {
+test encoding-24.35 {Parse invalid utf-8} -constraints utf32 -body {
     encoding convertfrom utf-8 \xED\xA0\x80
 } -result \uD800
 test encoding-24.36 {Parse invalid utf-8 with -strict} -body {
-- 
cgit v0.12


From f029161eb76f8c022ce2d07098f8c92967bd12f2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 5 Dec 2022 13:10:20 +0000
Subject: Eliminate (gcc) warning in tclTest.c

---
 generic/tclTest.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index c5eb6eb..f4450ff 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -3122,15 +3122,16 @@ TestlinkCmd(
 	tmp = Tcl_NewWideIntObj(longVar);
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
+#ifdef TCL_WIDE_INT_IS_LONG
 	if (ulongVar > WIDE_MAX) {
 		mp_int bignumValue;
 		if (mp_init_u64(&bignumValue, ulongVar) != MP_OKAY) {
 		    Tcl_Panic("%s: memory overflow", "Tcl_SetWideUIntObj");
 		}
 		tmp = Tcl_NewBignumObj(&bignumValue);
-	} else {
-	    tmp = Tcl_NewWideIntObj((Tcl_WideInt)ulongVar);
-	}
+	} else
+#endif /* TCL_WIDE_INT_IS_LONG */
+	tmp = Tcl_NewWideIntObj((Tcl_WideInt)ulongVar);
 	Tcl_AppendElement(interp, Tcl_GetString(tmp));
 	Tcl_DecrRefCount(tmp);
 	Tcl_PrintDouble(NULL, (double)floatVar, buffer);
-- 
cgit v0.12


From b1af92a6e9b1b3d5beb88352a5d8f610cb7bf0e0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 5 Dec 2022 15:33:57 +0000
Subject: On Cygwin, dev_t == unsigned, and long long == long

---
 generic/tcl.h        | 16 ++++------------
 generic/tclTomMath.h |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index c6afaa1..d36448b0 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -406,9 +406,7 @@ typedef int Tcl_Size;
 #endif
 
 #ifdef _WIN32
-#   if TCL_MAJOR_VERSION > 8
-	typedef struct __stat64 Tcl_StatBuf;
-#   elif defined(_WIN64) || defined(_USE_64BIT_TIME_T)
+#   if TCL_MAJOR_VERSION > 8 || defined(_WIN64) || defined(_USE_64BIT_TIME_T)
 	typedef struct __stat64 Tcl_StatBuf;
 #   elif defined(_USE_32BIT_TIME_T)
 	typedef struct _stati64	Tcl_StatBuf;
@@ -417,26 +415,20 @@ typedef int Tcl_Size;
 #   endif
 #elif defined(__CYGWIN__)
     typedef struct {
-	dev_t st_dev;
+	unsigned st_dev;
 	unsigned short st_ino;
 	unsigned short st_mode;
 	short st_nlink;
 	short st_uid;
 	short st_gid;
 	/* Here is a 2-byte gap */
-	dev_t st_rdev;
+	unsigned st_rdev;
 	/* Here is a 4-byte gap */
-	long long st_size;
-#if TCL_MAJOR_VERSION > 8
-	struct {long long tv_sec;} st_atim;
-	struct {long long tv_sec;} st_mtim;
-	struct {long long tv_sec;} st_ctim;
-#else
+	long st_size;
 	struct {long tv_sec;} st_atim;
 	struct {long tv_sec;} st_mtim;
 	struct {long tv_sec;} st_ctim;
 	/* Here is a 4-byte gap */
-#endif
     } Tcl_StatBuf;
 #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
     typedef struct stat64 Tcl_StatBuf;
diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index b421cde..40a4e9d 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -4,7 +4,7 @@
 #ifdef MP_NO_STDINT
 #   ifdef HAVE_STDINT_H
 #	include <stdint.h>
-#else
+#   else
 #	include "../compat/stdint.h"
 #   endif
 #endif
-- 
cgit v0.12


From d8d1a902ef6f907032ea693bd66f898e56e6827c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 5 Dec 2022 15:39:50 +0000
Subject: There's no gap on Cygwin any more

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

diff --git a/generic/tcl.h b/generic/tcl.h
index d36448b0..68e3082 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -428,7 +428,6 @@ typedef int Tcl_Size;
 	struct {long tv_sec;} st_atim;
 	struct {long tv_sec;} st_mtim;
 	struct {long tv_sec;} st_ctim;
-	/* Here is a 4-byte gap */
     } Tcl_StatBuf;
 #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
     typedef struct stat64 Tcl_StatBuf;
-- 
cgit v0.12


From 7b530373393bfc62e3f8a32bdfb427e6487d1fe2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 5 Dec 2022 23:05:25 +0000
Subject: dev_t -> unsigned for Cygwin in tcl.h, so we don't need sys/types.h
 any more. There's no gap in Tcl_StatBuf for 64-bit Cygwin

---
 generic/tcl.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 3a4622e..8b7c4ed 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -464,20 +464,19 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #   endif /* _MSC_VER < 1400 */
 #elif defined(__CYGWIN__)
     typedef struct {
-	dev_t st_dev;
+	unsigned st_dev;
 	unsigned short st_ino;
 	unsigned short st_mode;
 	short st_nlink;
 	short st_uid;
 	short st_gid;
 	/* Here is a 2-byte gap */
-	dev_t st_rdev;
+	unsigned st_rdev;
 	/* Here is a 4-byte gap */
 	long long st_size;
 	struct {long tv_sec;} st_atim;
 	struct {long tv_sec;} st_mtim;
 	struct {long tv_sec;} st_ctim;
-	/* Here is a 4-byte gap */
     } Tcl_StatBuf;
 #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
     typedef struct stat64 Tcl_StatBuf;
-- 
cgit v0.12


From 1a21edb59250cdae54af5eab910e283beb0a12e0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Dec 2022 17:17:48 +0000
Subject: Eliminate TclArithSeriesObjLength and TclArithSeriesObjStep from
 tclArithSeries.h: they can be static internal.

---
 generic/tclArithSeries.c | 19 ++++++++++---------
 generic/tclArithSeries.h |  3 ---
 generic/tclCmdAH.c       |  4 ++--
 generic/tclCmdIL.c       |  2 +-
 generic/tclExecute.c     |  4 ++--
 generic/tclListObj.c     |  4 ++--
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 632d812..ab4258a 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -42,6 +42,7 @@ static void		DupArithSeriesInternalRep (Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
 static void		FreeArithSeriesInternalRep (Tcl_Obj *listPtr);
 static int		SetArithSeriesFromAny (Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		UpdateStringOfArithSeries (Tcl_Obj *listPtr);
+static Tcl_Size ArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
 
 /*
  * The structure below defines the arithmetic series Tcl object type by
@@ -77,7 +78,7 @@ const TclObjTypeWithAbstractList tclArithSeriesType = {
     UpdateStringOfArithSeries,		/* updateStringProc */
     SetArithSeriesFromAny,		/* setFromAnyProc */
     TCL_OBJTYPE_V0_1(
-    TclArithSeriesObjLength
+    ArithSeriesObjLength
     )}
 };
 
@@ -364,7 +365,7 @@ TclNewArithSeriesObj(
 /*
  *----------------------------------------------------------------------
  *
- * TclArithSeriesObjStep --
+ * ArithSeriesObjStep --
  *
  *	Return a Tcl_Obj with the step value from the give ArithSeries Obj.
  *	refcount = 0.
@@ -380,10 +381,10 @@ TclNewArithSeriesObj(
  *----------------------------------------------------------------------
  */
 /*
- * TclArithSeriesObjStep --
+ * ArithSeriesObjStep --
  */
-int
-TclArithSeriesObjStep(
+static int
+ArithSeriesObjStep(
     Tcl_Obj *arithSeriesPtr,
     Tcl_Obj **stepObj)
 {
@@ -448,7 +449,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
 /*
  *----------------------------------------------------------------------
  *
- * TclArithSeriesObjLength
+ * ArithSeriesObjLength
  *
  *	Returns the length of the arithmetic series.
  *
@@ -462,7 +463,7 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
  *
  *----------------------------------------------------------------------
  */
-Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
+Tcl_Size ArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
 {
     ArithSeries *arithSeriesRepPtr = (ArithSeries*)
 	    arithSeriesPtr->internalRep.twoPtrValue.ptr1;
@@ -749,7 +750,7 @@ TclArithSeriesObjRange(
 	return NULL;
     }
     Tcl_IncrRefCount(endObj);
-    TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
+    ArithSeriesObjStep(arithSeriesPtr, &stepObj);
     Tcl_IncrRefCount(stepObj);
 
     if (Tcl_IsShared(arithSeriesPtr) ||
@@ -941,7 +942,7 @@ TclArithSeriesObjReverse(
     Tcl_IncrRefCount(startObj);
     TclArithSeriesObjIndex(arithSeriesPtr, 0, &endObj);
     Tcl_IncrRefCount(endObj);
-    TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
+    ArithSeriesObjStep(arithSeriesPtr, &stepObj);
     Tcl_IncrRefCount(stepObj);
 
     if (isDouble) {
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index 28fd993..91243db 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -35,11 +35,8 @@ typedef struct {
 
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjCopy(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr);
-MODULE_SCOPE int	TclArithSeriesObjStep(Tcl_Obj *arithSeriesPtr,
-			    Tcl_Obj **stepObj);
 MODULE_SCOPE int	TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr,
 			    Tcl_WideInt index, Tcl_Obj **elementObj);
-MODULE_SCOPE Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr, Tcl_Size fromIdx, Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Interp *interp,
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 6a1de71..875bbdd 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -2735,8 +2735,8 @@ EachloopCmd(
 		result = TCL_ERROR;
 		goto done;
 	    }
-	    /* Don't compute values here, wait until the last momement */
-	    statePtr->argcList[i] = TclArithSeriesObjLength(statePtr->aCopyList[i]);
+	    /* Don't compute values here, wait until the last moment */
+	    statePtr->argcList[i] = ABSTRACTLIST_PROC(statePtr->aCopyList[i], lengthProc)(statePtr->aCopyList[i]);
 	} else {
 	    /* List values */
 	    statePtr->aCopyList[i] = TclListObjCopy(interp, objv[2+i*2]);
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 552548b..fbc4995 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2217,7 +2217,7 @@ Tcl_JoinObjCmd(
 
     if (TclHasInternalRep(objv[1],&tclArithSeriesType.objType)) {
 	isArithSeries = 1;
-	listLen = TclArithSeriesObjLength(objv[1]);
+	listLen = ABSTRACTLIST_PROC(objv[1], lengthProc)(objv[1]);
     } else {
 	if (TclListObjGetElementsM(interp, objv[1], &listLen,
 	    &elemPtrs) != TCL_OK) {
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index c1a2bfd..d1d7df1 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4661,7 +4661,7 @@ TEBCresume(
 
 	/* special case for ArithSeries */
 	if (TclHasInternalRep(valuePtr,&tclArithSeriesType.objType)) {
-	    length = TclArithSeriesObjLength(valuePtr);
+	    length = ABSTRACTLIST_PROC(valuePtr, lengthProc)(valuePtr);
 	    if (TclGetIntForIndexM(interp, value2Ptr, length-1, &index)!=TCL_OK) {
 		CACHE_STACK_INFO();
 		TRACE_ERROR(interp);
@@ -4724,7 +4724,7 @@ TEBCresume(
 
 	/* special case for ArithSeries */
 	if (TclHasInternalRep(valuePtr,&tclArithSeriesType.objType)) {
-	    length = TclArithSeriesObjLength(valuePtr);
+	    length = ABSTRACTLIST_PROC(valuePtr, lengthProc)(valuePtr);
 
 	    /* Decode end-offset index values. */
 
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index e29c307..8583bad 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2641,7 +2641,7 @@ TclLindexFlat(
 
     /* Handle ArithSeries as special case */
     if (TclHasInternalRep(listObj,&tclArithSeriesType.objType)) {
-	Tcl_Size listLen = TclArithSeriesObjLength(listObj);
+	Tcl_Size listLen = ABSTRACTLIST_PROC(listObj, lengthProc)(listObj);
 	Tcl_Size index;
 	Tcl_Obj *elemObj = NULL;
 	for (i=0 ; i<indexCount && listObj ; i++) {
@@ -3294,7 +3294,7 @@ SetListFromAny(
 	 * because it can be done an order of magnitude faster
 	 * and may occur frequently.
 	 */
-	Tcl_Size j, size = TclArithSeriesObjLength(objPtr);
+	Tcl_Size j, size = ABSTRACTLIST_PROC(objPtr, lengthProc)(objPtr);
 
 	/* TODO - leave space in front and/or back? */
 	if (ListRepInitAttempt(
-- 
cgit v0.12


From 768fa22c43bfd6228f6e09e81dfebed70c1a9244 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 9 Dec 2022 10:22:11 +0000
Subject: Partial solution for [b8f575aa23]. Still missing:  1) testcases. 2)
 What if both EOF and ENCODING_ERROR happens (because there is both an eofchar
 and an invalid byte in the stream)

---
 generic/tclIO.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 8e4ecee..afe6aec 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7588,7 +7588,7 @@ Tcl_Eof(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of real channel structure. */
 
-    return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0;
+    return (GotFlag(statePtr, CHANNEL_EOF) && !GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) ? 1 : 0;
 }
 
 /*
-- 
cgit v0.12


From ae31cee4ae595cd1a16f50df82add275c41d8cde Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 9 Dec 2022 14:53:25 +0000
Subject: Add 2 unit-tests, for the 2 cornercases mentioned in the TIP. This
 shows that the fix works as expected

---
 tests/io.test | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/io.test b/tests/io.test
index c58bbce..d4839f5 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9065,6 +9065,46 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     removeFile io-75.6
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
+test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+    set fn [makeFile {} io-75.7]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8. -eofchar is not detected, because it comes later.
+    puts -nonewline $f "A\x81\x1A"
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [eof $f]
+    lappend hd [catch {read $f} msg]
+    close $f
+    lappend hd $msg
+} -cleanup {
+    removeFile io-75.6
+} -match glob -result {41 0 1 {error reading "*": illegal byte sequence}}
+
+test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+    set fn [makeFile {} io-75.8]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8, but since \x1A comes first, -eofchar takes precedence.
+    puts -nonewline $f "A\x1A\x81"
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [eof $f]
+    lappend hd [read $f]
+    close $f
+    set hd
+} -cleanup {
+    removeFile io-75.6
+} -result {41 1 {}}
+
 # ### ### ### ######### ######### #########
 
 
-- 
cgit v0.12


From 4f69a6f297bc3013c0c00a24db52fd34a59f902e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 9 Dec 2022 19:55:38 +0000
Subject: Fix compilation with tcc. Thanks, Cyan Ogilvie for the report

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

diff --git a/generic/tcl.h b/generic/tcl.h
index da3d1f0..f373382 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -156,8 +156,13 @@ extern "C" {
 #   endif
 #else
 #   define TCL_FORMAT_PRINTF(a,b)
-#   define TCL_NORETURN _declspec(noreturn)
-#   define TCL_NOINLINE __declspec(noinline)
+#   if defined(_MSC_VER)
+#	define TCL_NORETURN _declspec(noreturn)
+#	define TCL_NOINLINE __declspec(noinline)
+#   else
+#	define TCL_NORETURN /* nothing */
+#	define TCL_NOINLINE /* nothing */
+#   endif
 #   define TCL_NORETURN1 /* nothing */
 #endif
 
-- 
cgit v0.12


From 196f704d08e8b1dd8cf3a6db055931a03d614ffb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 11 Dec 2022 17:57:55 +0000
Subject: More io test-cases. Mostly backported (and modified) from 9.0

---
 tests/io.test | 155 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 124 insertions(+), 31 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 65ebcbd..d10e1e4 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -13,12 +13,12 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-namespace eval ::tcl::test::io {
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+}
 
-    if {"::tcltest" ni [namespace children]} {
-	package require tcltest 2.5
-	namespace import -force ::tcltest::*
-    }
+namespace eval ::tcl::test::io {
+    namespace import ::tcltest::*
 
     variable umaskValue
     variable path
@@ -8924,7 +8924,7 @@ test io-73.5 {effect of eof on encoding end flags} -setup {
     read $rfd
 } -body {
     set result [eof $rfd]
-    puts -nonewline $wfd "more\xC2\xA0data"
+    puts -nonewline $wfd more\xC2\xA0data
     lappend result [eof $rfd]
     lappend result [read $rfd]
     lappend result [eof $rfd]
@@ -8955,16 +8955,16 @@ test io-74.1 {[104f2885bb] improper cache validity check} -setup {
 # The following tests 75.1 to 75.5 exercise strict or tolerant channel
 # encoding.
 # TCL 8.7 only offers tolerant channel encoding, what is tested here.
-test io-75.1 {multibyte encoding error read results in raw bytes} -constraints deprecated -setup {
+test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
     set fn [makeFile {} io-75.1]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     # In UTF-8, a byte 0xCx starts a multibyte sequence and must be followed
     # by a byte > 0x7F. This is violated to get an invalid sequence.
-    puts -nonewline $f "A\xC0\x40"
+    puts -nonewline $f A\xC0\x40
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none
+    fconfigure $f -encoding utf-8 -nocomplainencoding 1 -buffering none
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -8972,33 +8972,33 @@ test io-75.1 {multibyte encoding error read results in raw bytes} -constraints d
 } -cleanup {
     close $f
     removeFile io-75.1
-} -result "41c040"
+} -result 41c040
 
-test io-75.2 {unrepresentable character write passes and is replaced by ?} -constraints deprecated -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ? (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.2]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1
+    fconfigure $f -encoding iso8859-1 -nocomplainencoding 1
 } -body {
-    puts -nonewline $f "A\u2022"
+    puts -nonewline $f A\u2022
     flush $f
     seek $f 0
     read $f
 } -cleanup {
     close $f
     removeFile io-75.2
-} -result "A?"
+} -result A?
 
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
 # But the read already returns the incomplete sequence.
-test io-75.3 {incomplete multibyte encoding read is ignored} -setup {
+test io-75.3 {incomplete multibyte encoding read is ignored (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.3]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f "A\xC0"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none
+    fconfigure $f -encoding utf-8 -buffering none -nocomplainencoding 1
 } -body {
     set d [read $f]
     close $f
@@ -9006,37 +9006,37 @@ test io-75.3 {incomplete multibyte encoding read is ignored} -setup {
     set hd
 } -cleanup {
     removeFile io-75.3
-} -result "41c0"
+} -result 41c0
 
 # As utf-8 has a special treatment in multi-byte decoding, also test another
 # one.
-test io-75.4 {shiftjis encoding error read results in raw bytes} -setup {
+test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.4]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     # In shiftjis, \x81 starts a two-byte sequence.
     # But 2nd byte \xFF is not allowed
-    puts -nonewline $f "A\x81\xFFA"
+    puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf
-} -constraints deprecated -body {
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -nocomplainencoding 1
+} -body {
     set d [read $f]
     binary scan $d H* hd
     set hd
 } -cleanup {
     close $f
     removeFile io-75.4
-} -result "4181ff41"
+} -result 4181ff41
 
-test io-75.5 {invalid utf-8 encoding read is ignored} -setup {
+test io-75.5 {invalid utf-8 encoding read is ignored (-nocomplainencoding 1)} -setup {
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding binary
-    puts -nonewline $f "A\x81"
+    puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -nocomplainencoding 1
 } -body {
     set d [read $f]
     close $f
@@ -9044,14 +9044,14 @@ test io-75.5 {invalid utf-8 encoding read is ignored} -setup {
     set hd
 } -cleanup {
     removeFile io-75.5
-} -result "4181"
+} -result 4181
 
 test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
     set fn [makeFile {} io-75.6]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     # \x81 is invalid in utf-8
-    puts -nonewline $f "A\x81"
+    puts -nonewline $f A\x81
     flush $f
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
@@ -9070,7 +9070,7 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     set f [open $fn w+]
     fconfigure $f -encoding binary
     # \xA1 is invalid in utf-8. -eofchar is not detected, because it comes later.
-    puts -nonewline $f "A\xA1\x1A"
+    puts -nonewline $f A\xA1\x1A
     flush $f
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
@@ -9085,7 +9085,7 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     close $f
     set hd
 } -cleanup {
-    removeFile io-75.6
+    removeFile io-75.7
 } -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
 
 test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
@@ -9093,7 +9093,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     set f [open $fn w+]
     fconfigure $f -encoding binary
     # \x81 is invalid in utf-8, but since \x1A comes first, -eofchar takes precedence.
-    puts -nonewline $f "A\x1A\x81"
+    puts -nonewline $f A\x1A\x81
     flush $f
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
@@ -9105,9 +9105,102 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     close $f
     set hd
 } -cleanup {
-    removeFile io-75.6
+    removeFile io-75.8
 } -result {41 1 {}}
 
+test io-75.9 {unrepresentable character write passes and is replaced by ?} -setup {
+    set fn [makeFile {} io-75.9]
+    set f [open $fn w+]
+    fconfigure $f -encoding iso8859-1 -strictencoding 1
+} -body {
+    catch {puts -nonewline $f "A\u2022"} msg
+    flush $f
+    seek $f 0
+    list [read $f] $msg
+} -cleanup {
+    close $f
+    removeFile io-75.9
+} -match glob -result [list {A} {error writing "*": illegal byte sequence}]
+
+# Incomplete sequence test.
+# This error may IMHO only be detected with the close.
+# But the read already returns the incomplete sequence.
+test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
+    set fn [makeFile {} io-75.10]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    puts -nonewline $f A\xC0
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none
+} -body {
+    set d [read $f]
+    close $f
+    binary scan $d H* hd
+    set hd
+} -cleanup {
+    removeFile io-75.10
+} -result 41c0
+# The current result returns the orphan byte as byte.
+# This may be expected due to special utf-8 handling.
+
+# As utf-8 has a special treatment in multi-byte decoding, also test another
+# one.
+test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
+    set fn [makeFile {} io-75.11]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # In shiftjis, \x81 starts a two-byte sequence.
+    # But 2nd byte \xFF is not allowed
+    puts -nonewline $f A\x81\xFFA
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [catch {set d [read $f]} msg]
+    lappend hd $msg
+} -cleanup {
+    close $f
+    removeFile io-75.11
+} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+
+test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
+    set fn [makeFile {} io-75.12]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    puts -nonewline $f A\x81
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf
+} -body {
+    set d [read $f]
+    close $f
+    binary scan $d H* hd
+    set hd
+} -cleanup {
+    removeFile io-75.12
+} -result 4181
+test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+    set fn [makeFile {} io-75.13]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f "A\x81"
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [catch {read $f} msg]
+    close $f
+    lappend hd $msg
+} -cleanup {
+    removeFile io-75.13
+} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+
 # ### ### ### ######### ######### #########
 
 
-- 
cgit v0.12


From 89be5d2d3d0734da0af7a0d6a678f292be3013c3 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 12 Dec 2022 06:08:21 +0000
Subject: Change copyright in Windows rc from Activestate to UCal and others to
 match license.

---
 win/tcl.rc   | 3 +--
 win/tclsh.rc | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/win/tcl.rc b/win/tcl.rc
index be5e0a7..06024d4 100644
--- a/win/tcl.rc
+++ b/win/tcl.rc
@@ -43,9 +43,8 @@ BEGIN
         BEGIN
             VALUE "FileDescription", "Tcl DLL\0"
             VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".dll\0"
-            VALUE "CompanyName", "ActiveState Corporation\0"
             VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0"
+            VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0"
             VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
             VALUE "ProductVersion", TCL_PATCH_LEVEL
         END
diff --git a/win/tclsh.rc b/win/tclsh.rc
index 161da50..685bebd1 100644
--- a/win/tclsh.rc
+++ b/win/tclsh.rc
@@ -50,9 +50,8 @@ BEGIN
         BEGIN
             VALUE "FileDescription", "Tclsh Application\0"
             VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0"
-            VALUE "CompanyName", "ActiveState Corporation\0"
             VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0"
+            VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0"
             VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
             VALUE "ProductVersion", TCL_PATCH_LEVEL
         END
-- 
cgit v0.12


From 2e1db6850f0a6da09fd1457c2f2cf851f4c5f315 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 13 Dec 2022 07:42:17 +0000
Subject: Clarify what "-strict" means for the utf-8 encoder, making it clear
 that this is not the same as "strict" in python

---
 doc/encoding.n | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index bbe197d..78580f2 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -54,9 +54,9 @@ The option \fB-nocomplain\fR has no effect and is available for compatibility wi
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
 This switch restores the TCL8.7 behaviour.
 .PP
-The \fB-strict\fR option followes more strict rules in conversion.  Currently, only
-the sequence \fB\\xC0\\x80\fR in \fButf-8\fR encoding is disallowed.  Additional rules
-may follow.
+The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
+encoder, it disallows the the sequence \fB\\xC0\\x80\fR and noncharacters (which -
+otherwise - are just passed through).
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
@@ -87,8 +87,9 @@ The option \fB-nocomplain\fR has no effect and is available for compatibility wi
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
 This switch restores the TCL8.7 behaviour.
 .PP
-The \fB-strict\fR option followes more strict rules in conversion.  Currently, it has
-no effect but may be used in future to add additional encoding checks.
+The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
+encoder, it disallows the the sequence \fB\\xC0\\x80\fR and noncharacters (which -
+otherwise - are just passed through).
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
-- 
cgit v0.12


From 7b36aa11b6880b342a177a864601d97d839b7279 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 15 Dec 2022 14:38:24 +0000
Subject: Fix Tcl_BadChannelOption(), new -nocomplainencoding and
 -strictencoding options were still missing (reported by Rolf Ade, thanks!)

---
 generic/tclIO.c       |  2 +-
 tests/winConsole.test | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 8a551f3..730d963 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7862,7 +7862,7 @@ Tcl_BadChannelOption(
 {
     if (interp != NULL) {
 	const char *genericopt =
-		"blocking buffering buffersize encoding eofchar translation";
+		"blocking buffering buffersize encoding eofchar nocomplainencoding strictencoding translation";
 	const char **argv;
 	int argc, i;
 	Tcl_DString ds;
diff --git a/tests/winConsole.test b/tests/winConsole.test
index 821a143..b04f3e9 100644
--- a/tests/winConsole.test
+++ b/tests/winConsole.test
@@ -224,7 +224,7 @@ test console-fconfigure-get-1.[incr testnum] {
     fconfigure -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure get stdout/stderr
 foreach chan {stdout stderr} major {2 3} {
@@ -260,7 +260,7 @@ foreach chan {stdout stderr} major {2 3} {
         fconfigure -inputmode
     } -constraints {win interactive} -body {
         fconfigure $chan -inputmode
-    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, or -winsize} -returnCodes error
+    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -winsize} -returnCodes error
 
 }
 
@@ -330,7 +330,7 @@ test console-fconfigure-set-1.3 {
     fconfigure stdin -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure set stdout,stderr
 
@@ -338,13 +338,13 @@ test console-fconfigure-set-2.0 {
     fconfigure stdout -winsize
 } -constraints {win interactive} -body {
     fconfigure stdout -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error
 
 test console-fconfigure-set-3.0 {
     fconfigure stderr -winsize
 } -constraints {win interactive} -body {
     fconfigure stderr -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error
 
 # Multiple threads
 
-- 
cgit v0.12


From 9faf91402bd760daffdd9a305bd63065e9c9dc11 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 15 Dec 2022 23:59:48 +0000
Subject: Make -strict work the same for UTF-16 as for UTF-8

---
 generic/tclEncoding.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 169e975..78b0b9d 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2565,6 +2565,13 @@ Utf32ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
+	if  (ch >= 0x10FFFF || (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
+		&& !Tcl_UniCharIsUnicode(ch))) {
+	    if (STOPONERROR) {
+		result = TCL_CONVERT_SYNTAX;
+		break;
+	    }
+	}
 
 	/*
 	 * Special case for 1-byte utf chars for speed. Make sure we work with
@@ -2655,12 +2662,11 @@ UtfToUtf32Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if (!Tcl_UniCharIsUnicode(ch)) {
+	if (!Tcl_UniCharIsUnicode(ch) && (((ch  & ~0x7FF) == 0xD800) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-	    ch = 0xFFFD;
 	}
 	src += len;
 	if (flags & TCL_ENCODING_LE) {
@@ -2858,12 +2864,11 @@ UtfToUtf16Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if (!Tcl_UniCharIsUnicode(ch)) {
+	if (!Tcl_UniCharIsUnicode(ch) && (((ch  & ~0x7FF) == 0xD800) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-	    ch = 0xFFFD;
 	}
 	src += len;
 	if (flags & TCL_ENCODING_LE) {
-- 
cgit v0.12


From 94c928a85902c6e9cd103d3b2e9f6fca2cfacc6b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Dec 2022 08:15:02 +0000
Subject: Add testcase

---
 tests/encoding.test | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index 1125397..db70744 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -490,16 +490,22 @@ test encoding-17.2 {UtfToUcs2Proc} -body {
 } -result "\uFFFD"
 test encoding-17.3 {UtfToUtf16Proc} -body {
     encoding convertto -nocomplain utf-16be "\uDCDC"
-} -result "\xFF\xFD"
+} -result "\xDC\xDC"
 test encoding-17.4 {UtfToUtf16Proc} -body {
     encoding convertto -nocomplain utf-16le "\uD8D8"
-} -result "\xFD\xFF"
+} -result "\xD8\xD8"
 test encoding-17.5 {UtfToUtf16Proc} -body {
     encoding convertto utf-32le "\U460DC"
 } -result "\xDC\x60\x04\x00"
 test encoding-17.6 {UtfToUtf16Proc} -body {
     encoding convertto utf-32be "\U460DC"
 } -result "\x00\x04\x60\xDC"
+test encoding-17.7 {UtfToUtf16Proc} -body {
+    encoding convertto -strict utf-16be "\uDCDC"
+} -returnCodes error -result {unexpected character at index 0: 'U+00DCDC'}
+test encoding-17.8 {UtfToUtf16Proc} -body {
+    encoding convertto -strict utf-16le "\uD8D8"
+} -returnCodes error -result {unexpected character at index 0: 'U+00D8D8'}
 
 test encoding-18.1 {TableToUtfProc} {
 } {}
-- 
cgit v0.12


From c78879e7075b00638b1dc25237b2e208e35a82ca Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Dec 2022 09:25:54 +0000
Subject: Adapt iocmd-8.* testcases to change in previous commit

---
 tests/ioCmd.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index c4edd25..73f0e1c 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -207,7 +207,7 @@ test iocmd-7.5 {close command} -setup {
 
 proc expectedOpts {got extra} {
     set basicOpts {
-	-blocking -buffering -buffersize -encoding -eofchar -translation
+	-blocking -buffering -buffersize -encoding -eofchar -nocomplainencoding -strictencoding -translation
     }
     set opts [list {*}$basicOpts {*}$extra]
     lset opts end [string cat "or " [lindex $opts end]]
-- 
cgit v0.12


From fd98096770210ed4e5e1ddbf93c7d3860716efcb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Dec 2022 10:23:56 +0000
Subject: Addendum to [https://core.tcl-lang.org/tips/doc/trunk/tip/601.md|TIP
 #601]. Add check for characters > U+10FFFF in utf-32. Since utf-8 cannot
 handle that, either replace it with the replacement character (-nocomplain)
 or throw an exception (-strict).

---
 generic/tclEncoding.c | 2 +-
 tests/encoding.test   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 78b0b9d..f81b0eb 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2565,7 +2565,7 @@ Utf32ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
-	if  (ch >= 0x10FFFF || (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
+	if  ((unsigned)ch > 0x10FFFF || (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
 		&& !Tcl_UniCharIsUnicode(ch))) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_SYNTAX;
diff --git a/tests/encoding.test b/tests/encoding.test
index db70744..19c7cca 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -506,6 +506,12 @@ test encoding-17.7 {UtfToUtf16Proc} -body {
 test encoding-17.8 {UtfToUtf16Proc} -body {
     encoding convertto -strict utf-16le "\uD8D8"
 } -returnCodes error -result {unexpected character at index 0: 'U+00D8D8'}
+test encoding-17.9 {Utf32ToUtfProc} -body {
+    encoding convertfrom -strict utf-32 "\xFF\xFF\xFF\xFF"
+} -returnCodes error -result {unexpected byte sequence starting at index 0: '\xFF'}
+test encoding-17.10 {Utf32ToUtfProc} -body {
+    encoding convertfrom -nocomplain utf-32 "\xFF\xFF\xFF\xFF"
+} -result \uFFFD
 
 test encoding-18.1 {TableToUtfProc} {
 } {}
-- 
cgit v0.12


From f632ecb40650fc82b537e938435e44e2c1f2fb14 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Dec 2022 12:16:54 +0000
Subject: Now that 32-bit cygwin is dead, eliminate the need for --enable-64bit
 in a Cygwin build

---
 unix/configure | 50 ++++++++++++++++++-------------------
 unix/tcl.m4    | 78 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/unix/configure b/unix/configure
index 043da1c..11ee9ef 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6782,7 +6782,7 @@ fi
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	CYGWIN_*|MINGW32_*|MSYS_*)
-	    SHLIB_CFLAGS=""
+	    SHLIB_CFLAGS="-fno-common"
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
 	    DL_OBJS="tclLoadDl.o"
@@ -6864,9 +6864,9 @@ echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2
 	    fi
 	    do64bit_ok=yes
 	    if test "x${SHARED_BUILD}" = "x1"; then
-		echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args"
+		echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32"
 		# The eval makes quoting arguments work.
-		if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args; cd ../unix
+		if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32; cd ../unix
 		then :
 		else
 		    { echo "configure: error: configure failed for ../win" 1>&2; exit 1; }
@@ -7307,7 +7307,7 @@ fi
 
 	    ;;
 	Linux*|GNU*|NetBSD-Debian|DragonFly-*|FreeBSD-*)
-	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_CFLAGS="-fPIC -fno-common"
 	    SHLIB_SUFFIX=".so"
 
 	    CFLAGS_OPTIMIZE="-O2"
@@ -7517,7 +7517,7 @@ fi
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
 		CFLAGS="$CFLAGS -pthread"
-	    	LDFLAGS="$LDFLAGS -pthread"
+		LDFLAGS="$LDFLAGS -pthread"
 
 fi
 
@@ -8207,13 +8207,13 @@ fi
 	    # below.
 	    if test "$GCC" = yes; then
 
-	    	SHLIB_CFLAGS="-fPIC -melf"
-	    	LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
+		SHLIB_CFLAGS="-fPIC -melf"
+		LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
 
 else
 
-	    	SHLIB_CFLAGS="-Kpic -belf"
-	    	LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
+		SHLIB_CFLAGS="-Kpic -belf"
+		LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 
 fi
 
@@ -8848,11 +8848,11 @@ fi
 
 
 
-	# See if the compiler supports casting to a union type.
-	# This is used to stop gcc from printing a compiler
-	# warning when initializing a union member.
+    # See if the compiler supports casting to a union type.
+    # This is used to stop gcc from printing a compiler
+    # warning when initializing a union member.
 
-	echo "$as_me:$LINENO: checking for cast to union support" >&5
+    echo "$as_me:$LINENO: checking for cast to union support" >&5
 echo $ECHO_N "checking for cast to union support... $ECHO_C" >&6
 if test "${tcl_cv_cast_to_union+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8868,8 +8868,8 @@ int
 main ()
 {
 
-		  union foo { int i; double d; };
-		  union foo f = (union foo) (int) 0;
+		union foo { int i; double d; };
+		union foo f = (union foo) (int) 0;
 
   ;
   return 0;
@@ -8909,15 +8909,15 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $tcl_cv_cast_to_union" >&5
 echo "${ECHO_T}$tcl_cv_cast_to_union" >&6
-	if test "$tcl_cv_cast_to_union" = "yes"; then
+    if test "$tcl_cv_cast_to_union" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_CAST_TO_UNION 1
 _ACEOF
 
-	fi
-	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -fno-lto"
-	echo "$as_me:$LINENO: checking for working -fno-lto" >&5
+    fi
+    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -fno-lto"
+    echo "$as_me:$LINENO: checking for working -fno-lto" >&5
 echo $ECHO_N "checking for working -fno-lto... $ECHO_C" >&6
 if test "${ac_cv_nolto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8971,12 +8971,12 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_nolto" >&5
 echo "${ECHO_T}$ac_cv_nolto" >&6
-	CFLAGS=$hold_cflags
-	if test "$ac_cv_nolto" = "yes" ; then
-	    CFLAGS_NOLTO="-fno-lto"
-	else
-	    CFLAGS_NOLTO=""
-	fi
+    CFLAGS=$hold_cflags
+    if test "$ac_cv_nolto" = "yes" ; then
+	CFLAGS_NOLTO="-fno-lto"
+    else
+	CFLAGS_NOLTO=""
+    fi
 
     # FIXME: This subst was left in only because the TCL_DL_LIBS
     # entry in tclConfig.sh uses it. It is not clear why someone
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index ca94abd..6063847 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1185,7 +1185,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	CYGWIN_*|MINGW32_*|MSYS_*)
-	    SHLIB_CFLAGS=""
+	    SHLIB_CFLAGS="-fno-common"
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
 	    DL_OBJS="tclLoadDl.o"
@@ -1215,9 +1215,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    fi
 	    do64bit_ok=yes
 	    if test "x${SHARED_BUILD}" = "x1"; then
-		echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args"
+		echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32"
 		# The eval makes quoting arguments work.
-		if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args; cd ../unix
+		if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32; cd ../unix
 		then :
 		else
 		    { echo "configure: error: configure failed for ../win" 1>&2; exit 1; }
@@ -1373,7 +1373,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    ])
 	    ;;
 	Linux*|GNU*|NetBSD-Debian|DragonFly-*|FreeBSD-*)
-	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_CFLAGS="-fPIC -fno-common"
 	    SHLIB_SUFFIX=".so"
 
 	    CFLAGS_OPTIMIZE="-O2"
@@ -1500,7 +1500,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
 		CFLAGS="$CFLAGS -pthread"
-	    	LDFLAGS="$LDFLAGS -pthread"
+		LDFLAGS="$LDFLAGS -pthread"
 	    ])
 	    ;;
 	Darwin-*)
@@ -1740,11 +1740,11 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    # this test works, since "uname -s" was non-standard in 3.2.4 and
 	    # below.
 	    AS_IF([test "$GCC" = yes], [
-	    	SHLIB_CFLAGS="-fPIC -melf"
-	    	LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
+		SHLIB_CFLAGS="-fPIC -melf"
+		LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
 	    ], [
-	    	SHLIB_CFLAGS="-Kpic -belf"
-	    	LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
+		SHLIB_CFLAGS="-Kpic -belf"
+		LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 	    ])
 	    SHLIB_LD="ld -G"
 	    SHLIB_LD_LIBS=""
@@ -2037,36 +2037,36 @@ dnl # preprocessing tests use only CPPFLAGS.
         TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"])
     AC_SUBST(TCL_LIBS)
 
-	# See if the compiler supports casting to a union type.
-	# This is used to stop gcc from printing a compiler
-	# warning when initializing a union member.
-
-	AC_CACHE_CHECK(for cast to union support,
-	    tcl_cv_cast_to_union,
-	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
-		  union foo { int i; double d; };
-		  union foo f = (union foo) (int) 0;
-	    ]])],
-	    [tcl_cv_cast_to_union=yes],
-	    [tcl_cv_cast_to_union=no])
-	)
-	if test "$tcl_cv_cast_to_union" = "yes"; then
-	    AC_DEFINE(HAVE_CAST_TO_UNION, 1,
-		    [Defined when compiler supports casting to union type.])
-	fi
-	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -fno-lto"
-	AC_CACHE_CHECK(for working -fno-lto,
-	    ac_cv_nolto,
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-	    [ac_cv_nolto=yes],
-	    [ac_cv_nolto=no])
-	)
-	CFLAGS=$hold_cflags
-	if test "$ac_cv_nolto" = "yes" ; then
-	    CFLAGS_NOLTO="-fno-lto"
-	else
-	    CFLAGS_NOLTO=""
-	fi
+    # See if the compiler supports casting to a union type.
+    # This is used to stop gcc from printing a compiler
+    # warning when initializing a union member.
+
+    AC_CACHE_CHECK(for cast to union support,
+	tcl_cv_cast_to_union,
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+		union foo { int i; double d; };
+		union foo f = (union foo) (int) 0;
+	]])],
+	[tcl_cv_cast_to_union=yes],
+	[tcl_cv_cast_to_union=no])
+    )
+    if test "$tcl_cv_cast_to_union" = "yes"; then
+	AC_DEFINE(HAVE_CAST_TO_UNION, 1,
+		[Defined when compiler supports casting to union type.])
+    fi
+    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -fno-lto"
+    AC_CACHE_CHECK(for working -fno-lto,
+	ac_cv_nolto,
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+	[ac_cv_nolto=yes],
+	[ac_cv_nolto=no])
+    )
+    CFLAGS=$hold_cflags
+    if test "$ac_cv_nolto" = "yes" ; then
+	CFLAGS_NOLTO="-fno-lto"
+    else
+	CFLAGS_NOLTO=""
+    fi
 
     # FIXME: This subst was left in only because the TCL_DL_LIBS
     # entry in tclConfig.sh uses it. It is not clear why someone
-- 
cgit v0.12


From 2031d40f819aee5bbd3c5b550228204ff2897e0c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Dec 2022 15:16:56 +0000
Subject: Add checks to the configure script for mknod, tcdrain and uname, for
 systems (like VxWorks) which don't have it. See [aa4d088e5d]

---
 unix/configure    | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 unix/configure.in |   3 +
 2 files changed, 303 insertions(+)

diff --git a/unix/configure b/unix/configure
index 11ee9ef..8981ef8 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10687,6 +10687,306 @@ _ACEOF
 
 fi
 
+echo "$as_me:$LINENO: checking for fork" >&5
+echo $ECHO_N "checking for fork... $ECHO_C" >&6
+if test "${ac_cv_func_fork+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define fork to an innocuous variant, in case <limits.h> declares fork.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define fork innocuous_fork
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char fork (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef fork
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char fork ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_fork) || defined (__stub___fork)
+choke me
+#else
+char (*f) () = fork;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != fork;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_fork=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_fork=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_fork" >&5
+echo "${ECHO_T}$ac_cv_func_fork" >&6
+if test $ac_cv_func_fork = yes; then
+  :
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_FORK 1
+_ACEOF
+
+fi
+
+echo "$as_me:$LINENO: checking for mknod" >&5
+echo $ECHO_N "checking for mknod... $ECHO_C" >&6
+if test "${ac_cv_func_mknod+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define mknod to an innocuous variant, in case <limits.h> declares mknod.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define mknod innocuous_mknod
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char mknod (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef mknod
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char mknod ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_mknod) || defined (__stub___mknod)
+choke me
+#else
+char (*f) () = mknod;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != mknod;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_mknod=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_mknod=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_mknod" >&5
+echo "${ECHO_T}$ac_cv_func_mknod" >&6
+if test $ac_cv_func_mknod = yes; then
+  :
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MKNOD 1
+_ACEOF
+
+fi
+
+echo "$as_me:$LINENO: checking for tcdrain" >&5
+echo $ECHO_N "checking for tcdrain... $ECHO_C" >&6
+if test "${ac_cv_func_tcdrain+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define tcdrain to an innocuous variant, in case <limits.h> declares tcdrain.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define tcdrain innocuous_tcdrain
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char tcdrain (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef tcdrain
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char tcdrain ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_tcdrain) || defined (__stub___tcdrain)
+choke me
+#else
+char (*f) () = tcdrain;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != tcdrain;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_tcdrain=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_tcdrain=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_tcdrain" >&5
+echo "${ECHO_T}$ac_cv_func_tcdrain" >&6
+if test $ac_cv_func_tcdrain = yes; then
+  :
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_TCDRAIN 1
+_ACEOF
+
+fi
+
 echo "$as_me:$LINENO: checking for uname" >&5
 echo $ECHO_N "checking for uname... $ECHO_C" >&6
 if test "${ac_cv_func_uname+set}" = set; then
diff --git a/unix/configure.in b/unix/configure.in
index 62ab90e..55f09eb 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -215,6 +215,9 @@ AC_REPLACE_FUNCS(mkstemp opendir strtol waitpid)
 AC_CHECK_FUNC(strerror, , [AC_DEFINE(NO_STRERROR, 1, [Do we have strerror()])])
 AC_CHECK_FUNC(getwd, , [AC_DEFINE(NO_GETWD, 1, [Do we have getwd()])])
 AC_CHECK_FUNC(wait3, , [AC_DEFINE(NO_WAIT3, 1, [Do we have wait3()])])
+AC_CHECK_FUNC(fork, , [AC_DEFINE(NO_FORK, 1, [Do we have fork()])])
+AC_CHECK_FUNC(mknod, , [AC_DEFINE(NO_MKNOD, 1, [Do we have mknod()])])
+AC_CHECK_FUNC(tcdrain, , [AC_DEFINE(NO_TCDRAIN, 1, [Do we have tcdrain()])])
 AC_CHECK_FUNC(uname, , [AC_DEFINE(NO_UNAME, 1, [Do we have uname()])])
 
 if test "`uname -s`" = "Darwin" && test "${TCL_THREADS}" = 1 && \
-- 
cgit v0.12


From c05419204a477060c97bc9991114b62ee2324c8f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Dec 2022 15:26:40 +0000
Subject: Update tclConfig.h.in

---
 unix/tclConfig.h.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index c8d4e0c..0b7ed35 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -309,6 +309,9 @@
 /* Do we have <float.h>? */
 #undef NO_FLOAT_H
 
+/* Do we have fork() */
+#undef NO_FORK
+
 /* Do we have fstatfs()? */
 #undef NO_FSTATFS
 
@@ -324,6 +327,9 @@
 /* Do we have memmove()? */
 #undef NO_MEMMOVE
 
+/* Do we have mknod() */
+#undef NO_MKNOD
+
 /* Do we have realpath() */
 #undef NO_REALPATH
 
@@ -339,6 +345,9 @@
 /* Do we have <sys/wait.h>? */
 #undef NO_SYS_WAIT_H
 
+/* Do we have tcdrain() */
+#undef NO_TCDRAIN
+
 /* Do we have uname() */
 #undef NO_UNAME
 
-- 
cgit v0.12


From 002511bea498081ece2abcbbc0b065a48f0cf8af Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 18 Dec 2022 18:08:38 +0000
Subject: MODULE_SCOPE TclLengthOne (in stead of 2 separate static functions
 doing the same)

---
 generic/tclInt.h  |  2 ++
 generic/tclObj.c  | 10 ++++------
 generic/tclUtil.c | 13 +++++++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 392ccab..827fd6f 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1103,6 +1103,8 @@ typedef struct {  /* For internal core use only */
 	&& ((objPtr)->typePtr->version > offsetof(TclObjTypeWithAbstractList, abstractList.proc))) ? \
 	((const TclObjTypeWithAbstractList *)(objPtr)->typePtr)->abstractList.proc : NULL)
 
+MODULE_SCOPE size_t TclLengthOne(Tcl_Obj *);
+
 /*
  * The structure below defines an entry in the assocData hash table which is
  * associated with an interpreter. The entry contains a pointer to a function
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 67b7487..eaa6766 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -225,8 +225,6 @@ static int		SetCmdNameFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
  * implementations.
  */
 
-static size_t LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
-
 const TclObjTypeWithAbstractList tclBooleanType= {
     {"boolean",			/* name */
     NULL,			/* freeIntRepProc */
@@ -234,7 +232,7 @@ const TclObjTypeWithAbstractList tclBooleanType= {
     NULL,			/* updateStringProc */
     TclSetBooleanFromAny,		/* setFromAnyProc */
     TCL_OBJTYPE_V0_1(
-    LengthOne
+    TclLengthOne
     )}
 };
 const TclObjTypeWithAbstractList tclDoubleType= {
@@ -244,7 +242,7 @@ const TclObjTypeWithAbstractList tclDoubleType= {
     UpdateStringOfDouble,	/* updateStringProc */
     SetDoubleFromAny,		/* setFromAnyProc */
     TCL_OBJTYPE_V0_1(
-    LengthOne
+    TclLengthOne
     )}
 };
 const TclObjTypeWithAbstractList tclIntType = {
@@ -254,7 +252,7 @@ const TclObjTypeWithAbstractList tclIntType = {
     UpdateStringOfInt,		/* updateStringProc */
     SetIntFromAny,		/* setFromAnyProc */
     TCL_OBJTYPE_V0_1(
-    LengthOne
+    TclLengthOne
     )}
 };
 const TclObjTypeWithAbstractList tclBignumType = {
@@ -264,7 +262,7 @@ const TclObjTypeWithAbstractList tclBignumType = {
     UpdateStringOfBignum,	/* updateStringProc */
     NULL,			/* setFromAnyProc */
     TCL_OBJTYPE_V0_1(
-    LengthOne
+    TclLengthOne
     )}
 };
 
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index a53ca28..e96a564 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -122,8 +122,6 @@ static int		FindElement(Tcl_Interp *interp, const char *string,
  * is unregistered, so has no need of a setFromAnyProc either.
  */
 
-static size_t LengthOne(TCL_UNUSED(Tcl_Obj *)) {return 1;}
-
 static const TclObjTypeWithAbstractList endOffsetType = {
     {"end-offset",			/* name */
     NULL,				/* freeIntRepProc */
@@ -131,10 +129,17 @@ static const TclObjTypeWithAbstractList endOffsetType = {
     NULL,				/* updateStringProc */
     NULL,				/* setFromAnyProc */
     TCL_OBJTYPE_V0_1(
-    LengthOne
+    TclLengthOne
     )}
 };
-
+
+size_t
+TclLengthOne(
+    TCL_UNUSED(Tcl_Obj *))
+{
+    return 1;
+}
+
 /*
  *	*	STRING REPRESENTATION OF LISTS	*	*	*
  *
-- 
cgit v0.12


From 9dabd6f1accf6870c461a9ed5ae931aee09de1fe Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 19 Dec 2022 15:40:40 +0000
Subject: When changing the -nocomplainencoding or -strictencoding settings of
 a channel, reset the CHANNEL_NEED_MORE_DATA and CHANNEL_ENCODING_ERROR flags,
 so we can continue reading the channel and find out what's going on.

---
 generic/tclIO.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 730d963..e6e3560 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8364,6 +8364,7 @@ Tcl_SetChannelOption(
 	    }
 #endif
 	}
+	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	return TCL_OK;
     } else if (HaveOpt(1, "-strictencoding")) {
 	int newMode;
@@ -8377,6 +8378,7 @@ Tcl_SetChannelOption(
 	} else {
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	}
+	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
-- 
cgit v0.12


From 5db223f8ece1c31149d24e5ebddb1d2190aa62f6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 19 Dec 2022 15:43:22 +0000
Subject: Add two testcases, showing how we can distinguish Invalid Byte
 sequences, Surrogates, and Noncharacters when an exception occurred.

---
 tests/io.test | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/tests/io.test b/tests/io.test
index d10e1e4..eb49b44 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9201,6 +9201,84 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
     removeFile io-75.13
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
+# Testcase for Rolf's use-case (detecting Invalid byte sequence, but allowing noncharacter)
+test io-75.14 {How to use -strict, but allow non-characters} -setup {
+    set fn [makeFile {} io-75.14]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # Noncharacter followed by a single 
+    puts -nonewline $f pre\xEF\xBF\xBE\x81post
+    flush $f
+    seek $f 0
+    fconfigure stdout -nocomplainencoding 1
+    catch {fconfigure $f -nocomplainencoding 0};# Only needed on Tcl 9
+    fconfigure $f -encoding utf-8 -buffering none -translation lf -strictencoding 1
+} -body {
+    set hd {}
+    catch {
+    while {![eof $f]} {
+	if {[catch {
+	    append hd [read $f]
+	}]} {
+	    fconfigure $f -nocomplainencoding 1 -strictencoding 0
+	    set char [read $f 1]
+	    if {[string is unicode $char]} {
+		error "InvalidByteSequence"
+	    } elseif {$char >= "\uD800" && $char < "\uE000"} {
+		error "Surrogate"
+	    } else {
+		append hd $char
+	    }
+	    catch {fconfigure $f -nocomplainencoding 0};# Only needed on Tcl 9
+	    fconfigure $f -strictencoding 1 -encoding utf-8
+	}
+	}
+	} msg
+    close $f
+    append hd +$msg
+} -cleanup {
+    removeFile io-75.14
+} -result "pre\uFFFE+InvalidByteSequence"
+
+# Testcase for Rolf's use-case (detecting Surrogate, but allowing noncharacter)
+test io-75.15 {How to use -strict, but allow non-characters} -setup {
+    set fn [makeFile {} io-75.14]
+    set f [open $fn w+]
+    fconfigure $f -encoding utf-8 -nocomplainencoding 1
+    # Noncharacter followed by a single 
+    puts -nonewline $f pre\uFFFE\uD800post
+    flush $f
+    seek $f 0
+    fconfigure stdout -nocomplainencoding 1
+    catch {fconfigure $f -nocomplainencoding 0};# Only needed on Tcl 9
+    fconfigure $f -buffering none -translation lf -strictencoding 1
+} -body {
+    set hd {}
+    catch {
+    while {![eof $f]} {
+	if {[catch {
+	    append hd [read $f]
+	}]} {
+	    fconfigure $f -nocomplainencoding 1 -strictencoding 0
+	    set char [read $f 1]
+	    if {[string is unicode $char]} {
+		error "Invalid Byte Sequence"
+	    } elseif {$char >= "\uD800" && $char < "\uE000"} {
+		error "Surrogate"
+	    } else {
+		append hd $char
+	    }
+	    catch {fconfigure $f -nocomplainencoding 0};# Only needed on Tcl 9
+	    fconfigure $f -strictencoding 1
+	}
+	}
+	} msg
+    close $f
+    append hd +$msg
+} -cleanup {
+    removeFile io-75.15
+} -result "pre\uFFFE+Surrogate"
+
 # ### ### ### ######### ######### #########
 
 
-- 
cgit v0.12


From af98d8fa201c3de5ef583d20e6eacb2d556c15bd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 19 Dec 2022 22:19:59 +0000
Subject: Remove all checks for noncharacters

---
 generic/tclEncoding.c | 11 +++++------
 tests/encoding.test   |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index f81b0eb..d10d9ca 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2468,13 +2468,12 @@ UtfToUtfProc(
 		src += len;
 		dst += Tcl_UniCharToUtf(ch, dst);
 		ch = low;
-	    } else if (STOPONERROR && !(flags & TCL_ENCODING_MODIFIED) && !Tcl_UniCharIsUnicode(ch)
-		    && (((ch  & ~0x7FF) == 0xD800) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+	    } else if (STOPONERROR && !(flags & TCL_ENCODING_MODIFIED) && (((ch  & ~0x7FF) == 0xD800))) {
 		result = TCL_CONVERT_UNKNOWN;
 		src = saveSrc;
 		break;
 	    } else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		    && (flags & TCL_ENCODING_MODIFIED) && !Tcl_UniCharIsUnicode(ch)) {
+		    && (flags & TCL_ENCODING_MODIFIED) && ((ch  & ~0x7FF) == 0xD800)) {
 		result = TCL_CONVERT_SYNTAX;
 		src = saveSrc;
 		break;
@@ -2566,7 +2565,7 @@ Utf32ToUtfProc(
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
 	if  ((unsigned)ch > 0x10FFFF || (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		&& !Tcl_UniCharIsUnicode(ch))) {
+		&& ((ch  & ~0x7FF) == 0xD800))) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
@@ -2662,7 +2661,7 @@ UtfToUtf32Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if (!Tcl_UniCharIsUnicode(ch) && (((ch  & ~0x7FF) == 0xD800) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+	if ((ch  & ~0x7FF) == 0xD800) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
@@ -2864,7 +2863,7 @@ UtfToUtf16Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if (!Tcl_UniCharIsUnicode(ch) && (((ch  & ~0x7FF) == 0xD800) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+	if ((ch  & ~0x7FF) == 0xD800) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
diff --git a/tests/encoding.test b/tests/encoding.test
index 19c7cca..5fd4e8c 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -703,18 +703,18 @@ test encoding-24.28 {Parse invalid utf-8 with -strict} -body {
 test encoding-24.29 {Parse invalid utf-8} -body {
     encoding convertfrom utf-8 \xEF\xBF\xBF
 } -result \uFFFF
-test encoding-24.30 {Parse invalid utf-8 with -strict} -body {
+test encoding-24.30 {Parse noncharacter with -strict} -body {
     encoding convertfrom -strict utf-8 \xEF\xBF\xBF
-} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xEF'}
+} -result \uFFFF
 test encoding-24.31 {Parse invalid utf-8 with -nocomplain} -body {
     encoding convertfrom -nocomplain utf-8 \xEF\xBF\xBF
 } -result \uFFFF
 test encoding-24.32 {Try to generate invalid utf-8} -body {
     encoding convertto utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.33 {Try to generate invalid utf-8 with -strict} -body {
+test encoding-24.33 {Try to generate noncharacter with -strict} -body {
     encoding convertto -strict utf-8 \uFFFF
-} -returnCodes 1 -result {unexpected character at index 0: 'U+00FFFF'}
+} -result \xEF\xBF\xBF
 test encoding-24.34 {Try to generate invalid utf-8 with -nocomplain} -body {
     encoding convertto -nocomplain utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-- 
cgit v0.12


From e872538a2e315cffa0f5279b3044f904029f14c0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 21 Dec 2022 13:15:54 +0000
Subject: Tweaks to dde and registry extension, so they "load" without 3th
 argument in Tcl 8.6 too.

---
 win/tclWinDde.c | 16 ++++++++++++++++
 win/tclWinReg.c |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index e232471..fb2be99 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -171,6 +171,14 @@ Dde_Init(
     Tcl_CreateExitHandler(DdeExitProc, NULL);
     return Tcl_PkgProvideEx(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION, NULL);
 }
+#if TCL_MAJOR_VERSION < 9
+int
+Tcldde_Init(
+    Tcl_Interp *interp)
+{
+    return Dde_Init(interp);
+}
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -198,6 +206,14 @@ Dde_SafeInit(
     }
     return result;
 }
+#if TCL_MAJOR_VERSION < 9
+int
+Tcldde_SafeInit(
+    Tcl_Interp *interp)
+{
+    return Dde_SafeInit(interp);
+}
+#endif
 
 /*
  *----------------------------------------------------------------------
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 6fafead..f9481be 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -144,7 +144,7 @@ DLLEXPORT int		Registry_Unload(Tcl_Interp *interp, int flags);
 #if TCL_MAJOR_VERSION < 9
 /* With those additional entries, "load registry13.dll" works without 3th argument */
 DLLEXPORT int		Tclregistry_Init(Tcl_Interp *interp);
-DLLEXPORT int		Tclregistry_SafeInit(Tcl_Interp *interp);
+DLLEXPORT int		Tclregistry_Unload(Tcl_Interp *interp, int flags);
 #endif
 #ifdef __cplusplus
 }
-- 
cgit v0.12


From a01390fa0bb4b8455b38528cb895b70ed49cd75b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 21 Dec 2022 20:43:53 +0000
Subject: Add 'interp' argument to some arith functions, for better
 error-handling

---
 generic/tclArithSeries.c | 210 +++++++++++++++++++++++------------------------
 generic/tclArithSeries.h |   6 +-
 generic/tclCmdAH.c       |   3 +-
 generic/tclCmdIL.c       |   7 +-
 generic/tclExecute.c     |   8 +-
 generic/tclListObj.c     |   5 +-
 6 files changed, 118 insertions(+), 121 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index b278644..6c52469 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -41,7 +41,8 @@
 static void		DupArithSeriesInternalRep (Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
 static void		FreeArithSeriesInternalRep (Tcl_Obj *listPtr);
 static int		SetArithSeriesFromAny (Tcl_Interp *interp, Tcl_Obj *objPtr);
-static void		UpdateStringOfArithSeries (Tcl_Obj *listPtr);
+static void		UpdateStringOfArithSeries (Tcl_Obj *arithSeriesObj);
+static Tcl_Obj *ArithSeriesObjStep(Tcl_Obj *arithSeriesPtr);
 
 /*
  * The structure below defines the arithmetic series Tcl object type by
@@ -64,7 +65,7 @@ static void		UpdateStringOfArithSeries (Tcl_Obj *listPtr);
  * And where the equivalent's list I-th element is calculated
  * as:
  *
- * LIST[i] = START+(STEP*i)
+ * LIST[i] = START + (STEP * i)
  *
  * Zero elements ranges, like in the case of START=10 END=10 STEP=1
  * are valid and will be equivalent to the empty list.
@@ -135,13 +136,13 @@ Tcl_Obj *
 TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_WideInt len)
 {
     Tcl_WideInt length = (len>=0 ? len : ArithSeriesLen(start, end, step));
-    Tcl_Obj *arithSeriesPtr;
+    Tcl_Obj *arithSeriesObj;
     ArithSeries *arithSeriesRepPtr;
 
-    TclNewObj(arithSeriesPtr);
+    TclNewObj(arithSeriesObj);
 
     if (length <= 0) {
-	return arithSeriesPtr;
+	return arithSeriesObj;
     }
 
     arithSeriesRepPtr = (ArithSeries*) ckalloc(sizeof (ArithSeries));
@@ -151,13 +152,13 @@ TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_W
     arithSeriesRepPtr->step = step;
     arithSeriesRepPtr->len = length;
     arithSeriesRepPtr->elements = NULL;
-    arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
-    arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    arithSeriesPtr->typePtr = &tclArithSeriesType;
+    arithSeriesObj->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
+    arithSeriesObj->internalRep.twoPtrValue.ptr2 = NULL;
+    arithSeriesObj->typePtr = &tclArithSeriesType;
     if (length > 0)
-    	Tcl_InvalidateStringRep(arithSeriesPtr);
+    	Tcl_InvalidateStringRep(arithSeriesObj);
 
-    return arithSeriesPtr;
+    return arithSeriesObj;
 }
 
 /*
@@ -182,13 +183,13 @@ Tcl_Obj *
 TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
 {
     Tcl_WideInt length = (len>=0 ? len : ArithSeriesLen(start, end, step));
-    Tcl_Obj *arithSeriesPtr;
+    Tcl_Obj *arithSeriesObj;
     ArithSeriesDbl *arithSeriesRepPtr;
 
-    TclNewObj(arithSeriesPtr);
+    TclNewObj(arithSeriesObj);
 
     if (length <= 0) {
-	return arithSeriesPtr;
+	return arithSeriesObj;
     }
 
     arithSeriesRepPtr = (ArithSeriesDbl*) ckalloc(sizeof (ArithSeriesDbl));
@@ -198,13 +199,13 @@ TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
     arithSeriesRepPtr->step = step;
     arithSeriesRepPtr->len = length;
     arithSeriesRepPtr->elements = NULL;
-    arithSeriesPtr->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
-    arithSeriesPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    arithSeriesPtr->typePtr = &tclArithSeriesType;
+    arithSeriesObj->internalRep.twoPtrValue.ptr1 = arithSeriesRepPtr;
+    arithSeriesObj->internalRep.twoPtrValue.ptr2 = NULL;
+    arithSeriesObj->typePtr = &tclArithSeriesType;
     if (length > 0)
-    	Tcl_InvalidateStringRep(arithSeriesPtr);
+    	Tcl_InvalidateStringRep(arithSeriesObj);
 
-    return arithSeriesPtr;
+    return arithSeriesObj;
 }
 
 /*
@@ -227,7 +228,11 @@ TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
  *----------------------------------------------------------------------
  */
 static void
-assignNumber(int useDoubles, Tcl_WideInt *intNumberPtr, double *dblNumberPtr, Tcl_Obj *numberObj)
+assignNumber(
+    int useDoubles,
+    Tcl_WideInt *intNumberPtr,
+    double *dblNumberPtr,
+    Tcl_Obj *numberObj)
 {
     void *clientData;
     int tcl_number_type;
@@ -270,6 +275,7 @@ assignNumber(int useDoubles, Tcl_WideInt *intNumberPtr, double *dblNumberPtr, Tc
  * 	None.
  *----------------------------------------------------------------------
  */
+
 int
 TclNewArithSeriesObj(
     Tcl_Interp *interp,       /* For error reporting */
@@ -360,7 +366,7 @@ TclNewArithSeriesObj(
 /*
  *----------------------------------------------------------------------
  *
- * TclArithSeriesObjStep --
+ * ArithSeriesObjStep --
  *
  *	Return a Tcl_Obj with the step value from the give ArithSeries Obj.
  *	refcount = 0.
@@ -375,26 +381,23 @@ TclNewArithSeriesObj(
  * 	None.
  *----------------------------------------------------------------------
  */
-/*
- * TclArithSeriesObjStep --
- */
-int
-TclArithSeriesObjStep(
-    Tcl_Obj *arithSeriesPtr,
-    Tcl_Obj **stepObj)
+Tcl_Obj *
+ArithSeriesObjStep(
+    Tcl_Obj *arithSeriesObj)
 {
     ArithSeries *arithSeriesRepPtr;
+    Tcl_Obj *stepObj;
 
-    if (arithSeriesPtr->typePtr != &tclArithSeriesType) {
-        Tcl_Panic("TclArithSeriesObjIndex called with a not ArithSeries Obj.");
+    if (arithSeriesObj->typePtr != &tclArithSeriesType) {
+        Tcl_Panic("ArithSeriesObjStep called with a not ArithSeries Obj.");
     }
-    arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesPtr);
+    arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesObj);
     if (arithSeriesRepPtr->isDouble) {
-	TclNewDoubleObj(*stepObj, ((ArithSeriesDbl*)(arithSeriesRepPtr))->step);
+	TclNewDoubleObj(stepObj, ((ArithSeriesDbl*)(arithSeriesRepPtr))->step);
     } else {
-	TclNewIntObj(*stepObj, arithSeriesRepPtr->step);
+	TclNewIntObj(stepObj, arithSeriesRepPtr->step);
     }
-    return TCL_OK;
+    return stepObj;
 }
 
 
@@ -405,13 +408,11 @@ TclArithSeriesObjStep(
  *
  *	Returns the element with the specified index in the list
  *	represented by the specified Arithmetic Sequence object.
- *	If the index is out of range, TCL_ERROR is returned,
- *	otherwise TCL_OK is returned and the integer value of the
- *	element is stored in *element.
+ *	If the index is out of range, NULL is returned.
  *
  * Results:
  *
- * 	TCL_OK on success, TCL_ERROR on index out of range.
+ * 	The element on success, NULL on index out of range.
  *
  * Side Effects:
  *
@@ -420,27 +421,35 @@ TclArithSeriesObjStep(
  *----------------------------------------------------------------------
  */
 
-int
-TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **elementObj)
+Tcl_Obj *
+TclArithSeriesObjIndex(
+    Tcl_Interp *interp,
+    Tcl_Obj *arithSeriesObj,
+    Tcl_Size index)
 {
     ArithSeries *arithSeriesRepPtr;
 
-    if (arithSeriesPtr->typePtr != &tclArithSeriesType) {
+    if (arithSeriesObj->typePtr != &tclArithSeriesType) {
 	Tcl_Panic("TclArithSeriesObjIndex called with a not ArithSeries Obj.");
     }
-    arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesPtr);
+    arithSeriesRepPtr = ArithSeriesRepPtr(arithSeriesObj);
     if (index < 0 || index >= arithSeriesRepPtr->len) {
-	return TCL_ERROR;
+	if (interp) {
+	    Tcl_SetObjResult(interp,
+		    Tcl_ObjPrintf("index %d is out of bounds 0 to %"
+			    "d", index, (arithSeriesRepPtr->len-1)));
+	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
+	}
+	return NULL;
     }
     /* List[i] = Start + (Step * index) */
     if (arithSeriesRepPtr->isDouble) {
-	*elementObj = Tcl_NewDoubleObj(ArithSeriesIndexM(arithSeriesRepPtr, index));
+	return Tcl_NewDoubleObj(ArithSeriesIndexM(arithSeriesRepPtr, index));
     } else {
-	*elementObj = Tcl_NewWideIntObj(ArithSeriesIndexM(arithSeriesRepPtr, index));
+	return Tcl_NewWideIntObj(ArithSeriesIndexM(arithSeriesRepPtr, index));
     }
-    return TCL_OK;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -458,10 +467,10 @@ TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr, Tcl_WideInt index, Tcl_Obj **ele
  *
  *----------------------------------------------------------------------
  */
-Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
+Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesObj)
 {
     ArithSeries *arithSeriesRepPtr = (ArithSeries*)
-	    arithSeriesPtr->internalRep.twoPtrValue.ptr1;
+	    arithSeriesObj->internalRep.twoPtrValue.ptr1;
     return arithSeriesRepPtr->len;
 }
 
@@ -477,17 +486,17 @@ Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr)
  *	None.
  *
  * Side effects:
- *	Frees arithSeriesPtr's ArithSeries* internal representation and
+ *	Frees arithSeriesObj's ArithSeries* internal representation and
  *	sets listPtr's	internalRep.twoPtrValue.ptr1 to NULL.
  *
  *----------------------------------------------------------------------
  */
 
 static void
-FreeArithSeriesInternalRep(Tcl_Obj *arithSeriesPtr)
+FreeArithSeriesInternalRep(Tcl_Obj *arithSeriesObj)
 {
     ArithSeries *arithSeriesRepPtr =
-	    (ArithSeries *) arithSeriesPtr->internalRep.twoPtrValue.ptr1;
+	    (ArithSeries *) arithSeriesObj->internalRep.twoPtrValue.ptr1;
     if (arithSeriesRepPtr->elements) {
 	Tcl_WideInt i;
 	Tcl_Obj**elmts = arithSeriesRepPtr->elements;
@@ -499,7 +508,7 @@ FreeArithSeriesInternalRep(Tcl_Obj *arithSeriesPtr)
 	ckfree((char *) arithSeriesRepPtr->elements);
     }
     ckfree((char *) arithSeriesRepPtr);
-    arithSeriesPtr->internalRep.twoPtrValue.ptr1 = NULL;
+    arithSeriesObj->internalRep.twoPtrValue.ptr1 = NULL;
 }
 
 /*
@@ -568,10 +577,10 @@ DupArithSeriesInternalRep(
  */
 
 static void
-UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
+UpdateStringOfArithSeries(Tcl_Obj *arithSeriesObj)
 {
     ArithSeries *arithSeriesRepPtr =
-	    (ArithSeries*) arithSeriesPtr->internalRep.twoPtrValue.ptr1;
+	    (ArithSeries*) arithSeriesObj->internalRep.twoPtrValue.ptr1;
     char *elem, *p;
     Tcl_Obj *elemObj;
     Tcl_WideInt i;
@@ -582,7 +591,7 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
      * Pass 1: estimate space.
      */
     for (i = 0; i < arithSeriesRepPtr->len; i++) {
-	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
+	elemObj = TclArithSeriesObjIndex(NULL, arithSeriesObj, i);
 	elem = TclGetStringFromObj(elemObj, &slen);
 	Tcl_DecrRefCount(elemObj);
 	slen += 1; /* + 1 is for the space or the nul-term */
@@ -593,17 +602,17 @@ UpdateStringOfArithSeries(Tcl_Obj *arithSeriesPtr)
      * Pass 2: generate the string repr.
      */
 
-    p = Tcl_InitStringRep(arithSeriesPtr, NULL, length);
+    p = Tcl_InitStringRep(arithSeriesObj, NULL, length);
     for (i = 0; i < arithSeriesRepPtr->len; i++) {
-	TclArithSeriesObjIndex(arithSeriesPtr, i, &elemObj);
+	elemObj = TclArithSeriesObjIndex(NULL, arithSeriesObj, i);
 	elem = TclGetStringFromObj(elemObj, &slen);
 	strcpy(p, elem);
 	p[slen] = ' ';
 	p += slen+1;
 	Tcl_DecrRefCount(elemObj);
     }
-    if (length > 0) arithSeriesPtr->bytes[length-1] = '\0';
-    arithSeriesPtr->length = length-1;
+    if (length > 0) arithSeriesObj->bytes[length-1] = '\0';
+    arithSeriesObj->length = length-1;
 }
 
 /*
@@ -649,8 +658,8 @@ SetArithSeriesFromAny(
  * Results:
  *
  *	Normally returns a pointer to a new Tcl_Obj, that contains the same
- *	arithSeries value as *arithSeriesPtr does. The returned Tcl_Obj has a
- *	refCount of zero. If *arithSeriesPtr does not hold an arithSeries,
+ *	arithSeries value as *arithSeriesObj does. The returned Tcl_Obj has a
+ *	refCount of zero. If *arithSeriesObj does not hold an arithSeries,
  *	NULL is returned, and if interp is non-NULL, an error message is
  *	recorded there.
  *
@@ -663,15 +672,15 @@ SetArithSeriesFromAny(
 Tcl_Obj *
 TclArithSeriesObjCopy(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *arithSeriesPtr)	/* List object for which an element array is
+    Tcl_Obj *arithSeriesObj)	/* List object for which an element array is
 				 * to be returned. */
 {
     Tcl_Obj *copyPtr;
     ArithSeries *arithSeriesRepPtr;
 
-    ArithSeriesGetInternalRep(arithSeriesPtr, arithSeriesRepPtr);
+    ArithSeriesGetInternalRep(arithSeriesObj, arithSeriesRepPtr);
     if (NULL == arithSeriesRepPtr) {
-	if (SetArithSeriesFromAny(interp, arithSeriesPtr) != TCL_OK) {
+	if (SetArithSeriesFromAny(interp, arithSeriesObj) != TCL_OK) {
 	    /* We know this is going to panic, but it's the message we want */
 	    return NULL;
 	}
@@ -679,7 +688,7 @@ TclArithSeriesObjCopy(
 
     TclNewObj(copyPtr);
     TclInvalidateStringRep(copyPtr);
-    DupArithSeriesInternalRep(arithSeriesPtr, copyPtr);
+    DupArithSeriesInternalRep(arithSeriesObj, copyPtr);
     return copyPtr;
 }
 
@@ -689,7 +698,7 @@ TclArithSeriesObjCopy(
  * TclArithSeriesObjRange --
  *
  *	Makes a slice of an ArithSeries value.
- *      *arithSeriesPtr must be known to be a valid list.
+ *      *arithSeriesObj must be known to be a valid list.
  *
  * Results:
  *	Returns a pointer to the sliced series.
@@ -705,14 +714,14 @@ TclArithSeriesObjCopy(
 Tcl_Obj *
 TclArithSeriesObjRange(
     Tcl_Interp *interp,         /* For error message(s) */
-    Tcl_Obj *arithSeriesPtr,	/* List object to take a range from. */
-    int fromIdx,		/* Index of first element to include. */
-    int toIdx)			/* Index of last element to include. */
+    Tcl_Obj *arithSeriesObj,	/* List object to take a range from. */
+    Tcl_Size fromIdx,		/* Index of first element to include. */
+    Tcl_Size toIdx)		/* Index of last element to include. */
 {
     ArithSeries *arithSeriesRepPtr;
     Tcl_Obj *startObj, *endObj, *stepObj;
 
-    ArithSeriesGetInternalRep(arithSeriesPtr, arithSeriesRepPtr);
+    ArithSeriesGetInternalRep(arithSeriesObj, arithSeriesRepPtr);
 
     if (fromIdx < 0) {
 	fromIdx = 0;
@@ -723,31 +732,21 @@ TclArithSeriesObjRange(
 	return obj;
     }
 
-    if (TclArithSeriesObjIndex(arithSeriesPtr, fromIdx, &startObj) != TCL_OK) {
-	if (interp) {
-	    Tcl_SetObjResult(interp,
-		    Tcl_ObjPrintf("index %d is out of bounds 0 to %"
-			    "d", fromIdx, (arithSeriesRepPtr->len-1)));
-	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
-	}
+    startObj = TclArithSeriesObjIndex(interp, arithSeriesObj, fromIdx);
+    if (startObj == NULL) {
 	return NULL;
     }
     Tcl_IncrRefCount(startObj);
-    if (TclArithSeriesObjIndex(arithSeriesPtr, toIdx, &endObj) != TCL_OK) {
-	if (interp) {
-	    Tcl_SetObjResult(interp,
-		    Tcl_ObjPrintf("index %d is out of bounds 0 to %"
-			    "d", fromIdx, (arithSeriesRepPtr->len-1)));
-	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
-	}
+    endObj = TclArithSeriesObjIndex(interp, arithSeriesObj, toIdx);
+    if (endObj == NULL) {
 	return NULL;
     }
     Tcl_IncrRefCount(endObj);
-    TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
+    stepObj = ArithSeriesObjStep(arithSeriesObj);
     Tcl_IncrRefCount(stepObj);
 
-    if (Tcl_IsShared(arithSeriesPtr) ||
-	    ((arithSeriesPtr->refCount > 1))) {
+    if (Tcl_IsShared(arithSeriesObj) ||
+	    ((arithSeriesObj->refCount > 1))) {
 	Tcl_Obj *newSlicePtr;
 	if (TclNewArithSeriesObj(interp, &newSlicePtr,
 	        arithSeriesRepPtr->isDouble, startObj, endObj,
@@ -769,10 +768,10 @@ TclArithSeriesObjRange(
      * string-canonizing effect of [lrange 0 end].
      */
 
-    TclInvalidateStringRep(arithSeriesPtr);
+    TclInvalidateStringRep(arithSeriesObj);
 
     if (arithSeriesRepPtr->isDouble) {
-	ArithSeriesDbl *arithSeriesDblRepPtr = (ArithSeriesDbl*)arithSeriesPtr;
+	ArithSeriesDbl *arithSeriesDblRepPtr = (ArithSeriesDbl*)arithSeriesObj;
 	double start, end, step;
 	Tcl_GetDoubleFromObj(NULL, startObj, &start);
 	Tcl_GetDoubleFromObj(NULL, endObj, &end);
@@ -799,7 +798,7 @@ TclArithSeriesObjRange(
     Tcl_DecrRefCount(endObj);
     Tcl_DecrRefCount(stepObj);
 
-    return arithSeriesPtr;
+    return arithSeriesObj;
 }
 
 /*
@@ -834,7 +833,7 @@ TclArithSeriesObjRange(
 int
 TclArithSeriesGetElements(
     Tcl_Interp *interp,		/* Used to report errors if not NULL. */
-    Tcl_Obj *objPtr,		/* AbstractList object for which an element
+    Tcl_Obj *objPtr,		/* ArithSeries object for which an element
 				 * array is to be returned. */
     Tcl_Size *objcPtr,		/* Where to store the count of objects
 				 * referenced by objv. */
@@ -866,13 +865,8 @@ TclArithSeriesGetElements(
 		}
 		arithSeriesRepPtr->elements = objv;
 		for (i = 0; i < objc; i++) {
-		    if (TclArithSeriesObjIndex(objPtr, i, &objv[i]) != TCL_OK) {
-			if (interp) {
-			    Tcl_SetObjResult(
-				interp,
-				Tcl_NewStringObj("indexing error", -1));
-			    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
-			}
+		    objv[i] = TclArithSeriesObjIndex(interp, objPtr, i);
+		    if (objv[i] == NULL) {
 			return TCL_ERROR;
 		    }
 		    Tcl_IncrRefCount(objv[i]);
@@ -901,7 +895,7 @@ TclArithSeriesGetElements(
  * TclArithSeriesObjReverse --
  *
  *	Reverse the order of the ArithSeries value.
- *      *arithSeriesPtr must be known to be a valid list.
+ *      *arithSeriesObj must be known to be a valid list.
  *
  * Results:
  *	Returns a pointer to the reordered series.
@@ -917,7 +911,7 @@ TclArithSeriesGetElements(
 Tcl_Obj *
 TclArithSeriesObjReverse(
     Tcl_Interp *interp,         /* For error message(s) */
-    Tcl_Obj *arithSeriesPtr)	/* List object to reverse. */
+    Tcl_Obj *arithSeriesObj)	/* List object to reverse. */
 {
     ArithSeries *arithSeriesRepPtr;
     Tcl_Obj *startObj, *endObj, *stepObj;
@@ -926,16 +920,16 @@ TclArithSeriesObjReverse(
     double dstart, dend, dstep;
     int isDouble;
 
-    ArithSeriesGetInternalRep(arithSeriesPtr, arithSeriesRepPtr);
+    ArithSeriesGetInternalRep(arithSeriesObj, arithSeriesRepPtr);
 
     isDouble = arithSeriesRepPtr->isDouble;
     len = arithSeriesRepPtr->len;
 
-    TclArithSeriesObjIndex(arithSeriesPtr, (len-1), &startObj);
+    startObj = TclArithSeriesObjIndex(NULL, arithSeriesObj, (len-1));
     Tcl_IncrRefCount(startObj);
-    TclArithSeriesObjIndex(arithSeriesPtr, 0, &endObj);
+    endObj = TclArithSeriesObjIndex(NULL, arithSeriesObj, 0);
     Tcl_IncrRefCount(endObj);
-    TclArithSeriesObjStep(arithSeriesPtr, &stepObj);
+    stepObj = ArithSeriesObjStep(arithSeriesObj);
     Tcl_IncrRefCount(stepObj);
 
     if (isDouble) {
@@ -952,8 +946,8 @@ TclArithSeriesObjReverse(
 	TclSetIntObj(stepObj, step);
     }
 
-    if (Tcl_IsShared(arithSeriesPtr) ||
-	    ((arithSeriesPtr->refCount > 1))) {
+    if (Tcl_IsShared(arithSeriesObj) ||
+	    ((arithSeriesObj->refCount > 1))) {
 	Tcl_Obj *lenObj;
 	TclNewIntObj(lenObj, len);
 	if (TclNewArithSeriesObj(interp, &resultObj,
@@ -967,7 +961,7 @@ TclArithSeriesObjReverse(
 	 * In-place is possible.
 	 */
 
-	TclInvalidateStringRep(arithSeriesPtr);
+	TclInvalidateStringRep(arithSeriesObj);
 
 	if (isDouble) {
 	    ArithSeriesDbl *arithSeriesDblRepPtr =
@@ -989,7 +983,7 @@ TclArithSeriesObjReverse(
 	}
 	arithSeriesRepPtr->elements = NULL;
 
-	resultObj = arithSeriesPtr;
+	resultObj = arithSeriesObj;
     }
 
     Tcl_DecrRefCount(startObj);
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index 28fd993..af770a9 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -35,10 +35,8 @@ typedef struct {
 
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjCopy(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr);
-MODULE_SCOPE int	TclArithSeriesObjStep(Tcl_Obj *arithSeriesPtr,
-			    Tcl_Obj **stepObj);
-MODULE_SCOPE int	TclArithSeriesObjIndex(Tcl_Obj *arithSeriesPtr,
-			    Tcl_WideInt index, Tcl_Obj **elementObj);
+MODULE_SCOPE  Tcl_Obj *TclArithSeriesObjIndex(Tcl_Interp *, Tcl_Obj *,
+			    Tcl_Size index);
 MODULE_SCOPE Tcl_Size TclArithSeriesObjLength(Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjRange(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr, Tcl_Size fromIdx, Tcl_Size toIdx);
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 2281b5a..b4084d1 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -3022,7 +3022,8 @@ ForeachAssignments(
 	    k = statePtr->index[i]++;
 	    if (k < statePtr->argcList[i]) {
 		if (isarithseries) {
-		    if (TclArithSeriesObjIndex(statePtr->aCopyList[i], k, &valuePtr) != TCL_OK) {
+		    valuePtr = TclArithSeriesObjIndex(interp, statePtr->aCopyList[i], k);
+		    if (valuePtr == NULL) {
 			Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			"\n    (setting %s loop variable \"%s\")",
 			(statePtr->resultList != NULL ? "lmap" : "foreach"),
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 8e52d65..1838f7f 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2232,8 +2232,8 @@ Tcl_JoinObjCmd(
     if (listLen == 1) {
 	/* One element; return it */
 	if (isArithSeries) {
-	    Tcl_Obj *valueObj;
-	    if (TclArithSeriesObjIndex(objv[1], 0, &valueObj) != TCL_OK) {
+	    Tcl_Obj *valueObj = TclArithSeriesObjIndex(interp, objv[1], 0);
+	    if (valueObj == NULL) {
 		return TCL_ERROR;
 	    }
 	    Tcl_SetObjResult(interp, valueObj);
@@ -2267,7 +2267,8 @@ Tcl_JoinObjCmd(
 
 		    Tcl_AppendObjToObj(resObjPtr, joinObjPtr);
 		}
-		if (TclArithSeriesObjIndex(objv[1], i, &valueObj) != TCL_OK) {
+		valueObj = TclArithSeriesObjIndex(interp, objv[1], i);
+		if (valueObj == NULL) {
 		    return TCL_ERROR;
 		}
 		Tcl_AppendObjToObj(resObjPtr, valueObj);
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index a8d9d57..ec144a2 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4876,7 +4876,8 @@ TEBCresume(
 		TRACE_ERROR(interp);
 		goto gotError;
 	    }
-	    if (TclArithSeriesObjIndex(valuePtr, index, &objResultPtr) != TCL_OK) {
+	    objResultPtr = TclArithSeriesObjIndex(interp, valuePtr, index);
+	    if (objResultPtr == NULL) {
 		CACHE_STACK_INFO();
 		TRACE_ERROR(interp);
 		goto gotError;
@@ -4941,7 +4942,8 @@ TEBCresume(
 
 	    /* Compute value @ index */
 	    if (index >= 0 && index < length) {
-		if (TclArithSeriesObjIndex(valuePtr, index, &objResultPtr) != TCL_OK) {
+		objResultPtr = TclArithSeriesObjIndex(interp, valuePtr, index);
+		if (objResultPtr == NULL) {
 		    CACHE_STACK_INFO();
 		    TRACE_ERROR(interp);
 		    goto gotError;
@@ -5187,7 +5189,7 @@ TEBCresume(
 
 	    do {
 		if (isArithSeries) {
-		    TclArithSeriesObjIndex(value2Ptr, i, &o);
+		    o = TclArithSeriesObjIndex(NULL, value2Ptr, i);
 		} else {
 		    Tcl_ListObjIndex(NULL, value2Ptr, i, &o);
 		}
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 80477f7..3f17e90 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2640,7 +2640,7 @@ TclLindexFlat(
 				   &index) == TCL_OK) {
 	    }
 	    if (i==0) {
-		TclArithSeriesObjIndex(listObj, index, &elemObj);
+		elemObj = TclArithSeriesObjIndex(NULL, listObj, index);
 	    } else if (index > 0) {
 		/* ArithSeries cannot be a list of lists */
 		Tcl_DecrRefCount(elemObj);
@@ -3301,7 +3301,8 @@ SetListFromAny(
 	listRep.storePtr->numUsed = size;
 	elemPtrs = listRep.storePtr->slots;
 	for (j = 0; j < size; j++) {
-	    if (TclArithSeriesObjIndex(objPtr, j, &elemPtrs[j]) != TCL_OK) {
+	    elemPtrs[j] = TclArithSeriesObjIndex(interp, objPtr, j);
+	    if (elemPtrs[j] == NULL) {
 		return TCL_ERROR;
 	    }
 	}
-- 
cgit v0.12


From ecaf98ffad23b0a547d0cedb852e0186d5c0c0af Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 21 Dec 2022 21:07:33 +0000
Subject: Make two more functions static

---
 generic/tclArithSeries.c | 14 ++++++++------
 generic/tclArithSeries.h |  5 -----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 6c52469..0419841 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -117,7 +117,7 @@ ArithSeriesLen(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step)
 /*
  *----------------------------------------------------------------------
  *
- * TclNewArithSeriesInt --
+ * NewArithSeriesInt --
  *
  *	Creates a new ArithSeries object. The returned object has
  *	refcount = 0.
@@ -132,8 +132,9 @@ ArithSeriesLen(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step)
  * 	None.
  *----------------------------------------------------------------------
  */
+static
 Tcl_Obj *
-TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_WideInt len)
+NewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_WideInt len)
 {
     Tcl_WideInt length = (len>=0 ? len : ArithSeriesLen(start, end, step));
     Tcl_Obj *arithSeriesObj;
@@ -164,7 +165,7 @@ TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_W
 /*
  *----------------------------------------------------------------------
  *
- * TclNewArithSeriesDbl --
+ * NewArithSeriesDbl --
  *
  *	Creates a new ArithSeries object with doubles. The returned object has
  *	refcount = 0.
@@ -179,8 +180,9 @@ TclNewArithSeriesInt(Tcl_WideInt start, Tcl_WideInt end, Tcl_WideInt step, Tcl_W
  * 	None.
  *----------------------------------------------------------------------
  */
+static
 Tcl_Obj *
-TclNewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
+NewArithSeriesDbl(double start, double end, double step, Tcl_WideInt len)
 {
     Tcl_WideInt length = (len>=0 ? len : ArithSeriesLen(start, end, step));
     Tcl_Obj *arithSeriesObj;
@@ -357,8 +359,8 @@ TclNewArithSeriesObj(
 
     if (arithSeriesObj) {
 	*arithSeriesObj = (useDoubles)
-	    ? TclNewArithSeriesDbl(dstart, dend, dstep, len)
-	    : TclNewArithSeriesInt(start, end, step, len);
+	    ? NewArithSeriesDbl(dstart, dend, dstep, len)
+	    : NewArithSeriesInt(start, end, step, len);
     }
     return TCL_OK;
 }
diff --git a/generic/tclArithSeries.h b/generic/tclArithSeries.h
index af770a9..947d437 100644
--- a/generic/tclArithSeries.h
+++ b/generic/tclArithSeries.h
@@ -44,11 +44,6 @@ MODULE_SCOPE Tcl_Obj *	TclArithSeriesObjReverse(Tcl_Interp *interp,
 			    Tcl_Obj *arithSeriesPtr);
 MODULE_SCOPE int	TclArithSeriesGetElements(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, Tcl_Size *objcPtr, Tcl_Obj ***objvPtr);
-MODULE_SCOPE Tcl_Obj *	TclNewArithSeriesInt(Tcl_WideInt start,
-			    Tcl_WideInt end, Tcl_WideInt step,
-			    Tcl_WideInt len);
-MODULE_SCOPE Tcl_Obj *	TclNewArithSeriesDbl(double start, double end,
-			    double step, Tcl_WideInt len);
 MODULE_SCOPE int 	TclNewArithSeriesObj(Tcl_Interp *interp,
 			    Tcl_Obj **arithSeriesObj, int useDoubles,
 			    Tcl_Obj *startObj, Tcl_Obj *endObj,
-- 
cgit v0.12


From a1de562f5c569cc85c2d2e3cddc82970f503b2d4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 24 Dec 2022 14:36:57 +0000
Subject: First part of fix for [4a7397e0b3]: Take flags into account when
 deciding to do a binary fcopy or not. TODO: Handle generating an exception

---
 generic/tclIO.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index cfb97ec..98315db 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -9347,7 +9347,9 @@ TclCopyChannel(
     moveBytes = inStatePtr->inEofChar == '\0'	/* No eofChar to stop input */
 	    && inStatePtr->inputTranslation == TCL_TRANSLATE_LF
 	    && outStatePtr->outputTranslation == TCL_TRANSLATE_LF
-	    && inStatePtr->encoding == outStatePtr->encoding;
+	    && inStatePtr->encoding == outStatePtr->encoding
+	    && (inStatePtr->flags & TCL_ENCODING_STRICT) != TCL_ENCODING_STRICT
+	    && outStatePtr->flags & TCL_ENCODING_NOCOMPLAIN;
 
     /*
      * Allocate a new CopyState to maintain info about the current copy in
@@ -9674,7 +9676,9 @@ CopyData(
 
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
-    sameEncoding = (inStatePtr->encoding == outStatePtr->encoding);
+    sameEncoding = inStatePtr->encoding == outStatePtr->encoding
+	    && (inStatePtr->flags & TCL_ENCODING_STRICT) != TCL_ENCODING_STRICT
+	    && outStatePtr->flags & TCL_ENCODING_NOCOMPLAIN;
 
     if (!(inBinary || sameEncoding)) {
 	TclNewObj(bufObj);
-- 
cgit v0.12


From 4a8b2cf10f8ebcebaa9d3546f3399d3d9a8aa00e Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 28 Dec 2022 12:07:18 +0000
Subject: A better fix for [b8f575aa23], as it maintains the expectation that
 synchronous [read] results in an error when invalid data is encountered.

someone other than pooryorick:  Pushed this check-in back on to a review branch.  It needs more baking/review.
As is, it makes two tests fail, and it introduces a new element "-result" to
the return options dictionary.
---
 generic/tclIO.c    | 13 +++++++++++--
 generic/tclIOCmd.c | 10 +++++++++-
 tests/io.test      | 29 ++++++++++++++++-------------
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index e6e3560..63b9a7d 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -6041,7 +6041,7 @@ DoReadChars(
 	assert(statePtr->inputEncodingFlags & TCL_ENCODING_END);
 	assert(!GotFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR));
 
-	/* TODO: We don't need this call? */
+	/* TODO: UpdateInterest isn't needed here? */
 	UpdateInterest(chanPtr);
 	return 0;
     }
@@ -6055,7 +6055,7 @@ DoReadChars(
 	}
 	ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
-	/* TODO: We don't need this call? */
+	/* TODO: UpdateInterest isn't needed here? */
 	UpdateInterest(chanPtr);
 	return 0;
     }
@@ -6084,6 +6084,15 @@ DoReadChars(
 	    } else {
 		copiedNow = ReadChars(statePtr, objPtr, toRead, &factor);
 	    }
+	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR) && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
+		/* Channel is Synchronous.  Return an error so that [read] and
+		 * friends can return an error
+		*/
+		TclChannelRelease((Tcl_Channel)chanPtr);
+		UpdateInterest(chanPtr);
+		Tcl_SetErrno(EILSEQ);
+		return -1;
+	    }
 
 	    /*
 	     * If the current buffer is empty recycle it.
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index e8a534f..8794365 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -381,7 +381,7 @@ Tcl_ReadObjCmd(
     int toRead;			/* How many bytes to read? */
     int charactersRead;		/* How many characters were read? */
     int mode;			/* Mode in which channel is opened. */
-    Tcl_Obj *resultPtr, *chanObjPtr;
+    Tcl_Obj *resultPtr, *returnOptsPtr, *chanObjPtr;
 
     if ((objc != 2) && (objc != 3)) {
 	Interp *iPtr;
@@ -470,8 +470,16 @@ Tcl_ReadObjCmd(
 		    "error reading \"%s\": %s",
 		    TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	}
+	returnOptsPtr = Tcl_NewDictObj();
+	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-code", -1)
+	    , Tcl_NewStringObj("error", -1));
+	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-level", -1)
+	    , Tcl_NewIntObj(0));
+	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
+	    , resultPtr);
 	TclChannelRelease(chan);
 	Tcl_DecrRefCount(resultPtr);
+	Tcl_SetReturnOptions(interp, returnOptsPtr);
 	return TCL_ERROR;
     }
 
diff --git a/tests/io.test b/tests/io.test
index d10e1e4..451a790 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9056,12 +9056,12 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
 } -body {
-    set d [read $f]
+    set status [catch {read $f} cres copts]
+    set d [dict get $copts -result]
     binary scan $d H* hd
-    lappend hd [catch {read $f} msg]
-    close $f
-    lappend hd $msg
+    lappend hd $status $cres
 } -cleanup {
+    close $f
     removeFile io-75.6
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
@@ -9075,11 +9075,12 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
 } -body {
-    set d [read $f]
+    set status [catch {read $f} cres copts]
+    set d [dict get $copts -result]
     binary scan $d H* hd
     lappend hd [eof $f]
-    lappend hd [catch {read $f} msg]
-    lappend hd $msg
+    lappend hd $status
+    lappend hd $cres
     fconfigure $f -encoding iso8859-1
     lappend hd [read $f];# We changed encoding, so now we can read the \xA1
     close $f
@@ -9157,10 +9158,11 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     seek $f 0
     fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 1
 } -body {
-    set d [read $f]
+    set status [catch {read $f} cres copts]
+    set d [dict get $copts -result]
     binary scan $d H* hd
-    lappend hd [catch {set d [read $f]} msg]
-    lappend hd $msg
+    lappend hd $status
+    lappend hd $cres
 } -cleanup {
     close $f
     removeFile io-75.11
@@ -9192,11 +9194,12 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
 } -body {
-    set d [read $f]
+    set status [catch {read $f} cres copts]
+    set d [dict get $copts -result]
     binary scan $d H* hd
-    lappend hd [catch {read $f} msg]
+    lappend hd $status
     close $f
-    lappend hd $msg
+    lappend hd $cres
 } -cleanup {
     removeFile io-75.13
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
-- 
cgit v0.12


From dbd4edc3d53208fc92252173a0714d8f6524d1a1 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 28 Dec 2022 20:39:17 +0000
Subject: Fix [8e811bc1f1]: Wrong formatting of arguments in man page

---
 tools/tcltk-man2html-utils.tcl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index 6e4f1fb..1e9e31e 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -583,6 +583,7 @@ proc output-IP-list {context code rest} {
 	backup-text 1
 	set accept_RE 0
 	set para {}
+	set endpara {}
 	while {[more-text]} {
 	    set line [next-text]
 	    if {[is-a-directive $line]} {
@@ -594,7 +595,7 @@ proc output-IP-list {context code rest} {
 			    continue
 			}
 			if {$manual(section) eq "ARGUMENTS"} {
-			    man-puts "$para<DT>$rest<DD>"
+			    man-puts "$para<DT>$rest<DD>$endpara"
 			} elseif {[regexp {^\[([\da-f]+)\]$} $rest -> value]} {
 			    man-puts "$para<LI value=\"$value\">"
 			} elseif {[regexp {^\(?([\da-f]+)\)$} $rest -> value]} {
@@ -664,6 +665,7 @@ proc output-IP-list {context code rest} {
 		man-puts $line
 	    }
 	    set para <P>
+	    set endpara </P>
 	}
 	man-puts "$para$enddl"
 	lappend manual(section-toc) $enddl
-- 
cgit v0.12


From f2cc84c99a732dbde0a6845d0809443e43276d17 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 28 Dec 2022 22:46:37 +0000
Subject: Update fix so that the two failing tests, iocmd-23.8 and iortrans-4.7
 now pass.

---
 generic/tclIOCmd.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 8794365..e5ba298 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -471,10 +471,6 @@ Tcl_ReadObjCmd(
 		    TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	}
 	returnOptsPtr = Tcl_NewDictObj();
-	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-code", -1)
-	    , Tcl_NewStringObj("error", -1));
-	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-level", -1)
-	    , Tcl_NewIntObj(0));
 	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
 	    , resultPtr);
 	TclChannelRelease(chan);
-- 
cgit v0.12


From 23d30205a5621acc748c0c3b6ad79a21bb80e327 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 29 Dec 2022 17:04:43 +0000
Subject: Instead of fiddling with html tags, simply enlarge a bit the width in
 the CSS stylesheet.

---
 tools/tcltk-man2html-utils.tcl | 4 +---
 tools/tcltk-man2html.tcl       | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index 1e9e31e..6e4f1fb 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -583,7 +583,6 @@ proc output-IP-list {context code rest} {
 	backup-text 1
 	set accept_RE 0
 	set para {}
-	set endpara {}
 	while {[more-text]} {
 	    set line [next-text]
 	    if {[is-a-directive $line]} {
@@ -595,7 +594,7 @@ proc output-IP-list {context code rest} {
 			    continue
 			}
 			if {$manual(section) eq "ARGUMENTS"} {
-			    man-puts "$para<DT>$rest<DD>$endpara"
+			    man-puts "$para<DT>$rest<DD>"
 			} elseif {[regexp {^\[([\da-f]+)\]$} $rest -> value]} {
 			    man-puts "$para<LI value=\"$value\">"
 			} elseif {[regexp {^\(?([\da-f]+)\)$} $rest -> value]} {
@@ -665,7 +664,6 @@ proc output-IP-list {context code rest} {
 		man-puts $line
 	    }
 	    set para <P>
-	    set endpara </P>
 	}
 	man-puts "$para$enddl"
 	lappend manual(section-toc) $enddl
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 236a49f..caececa 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -221,14 +221,14 @@ proc css-stylesheet {} {
 	font-size: 11px;
     }
     css-style ".keylist dt" ".arguments dt" {
-	width: 20em;
+	width: 25em;
 	float: left;
 	padding: 2px;
 	border-top: 1px solid #999999;
     }
     css-style ".keylist dt" { font-weight: bold; }
     css-style ".keylist dd" ".arguments dd" {
-	margin-left: 20em;
+	margin-left: 25em;
 	padding: 2px;
 	border-top: 1px solid #999999;
     }
-- 
cgit v0.12


From 3b45005127de0885251471d5591ecb58c5b3e286 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Thu, 29 Dec 2022 22:59:10 +0000
Subject: Arrange new code in DoReadChars to ensure that final steps are always
 taken.

---
 generic/tclIO.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 63b9a7d..9ae8fb5 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -6024,8 +6024,9 @@ DoReadChars(
     }
 
     if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
-	/* TODO: We don't need this call? */
+	/* TODO: UpdateInterest not needed here? */
 	UpdateInterest(chanPtr);
+
 	Tcl_SetErrno(EILSEQ);
 	return -1;
     }
@@ -6041,7 +6042,7 @@ DoReadChars(
 	assert(statePtr->inputEncodingFlags & TCL_ENCODING_END);
 	assert(!GotFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR));
 
-	/* TODO: UpdateInterest isn't needed here? */
+	/* TODO: UpdateInterest not needed here? */
 	UpdateInterest(chanPtr);
 	return 0;
     }
@@ -6055,7 +6056,7 @@ DoReadChars(
 	}
 	ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
-	/* TODO: UpdateInterest isn't needed here? */
+	/* TODO: UpdateInterest not needed here? */
 	UpdateInterest(chanPtr);
 	return 0;
     }
@@ -6084,18 +6085,9 @@ DoReadChars(
 	    } else {
 		copiedNow = ReadChars(statePtr, objPtr, toRead, &factor);
 	    }
-	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR) && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
-		/* Channel is Synchronous.  Return an error so that [read] and
-		 * friends can return an error
-		*/
-		TclChannelRelease((Tcl_Channel)chanPtr);
-		UpdateInterest(chanPtr);
-		Tcl_SetErrno(EILSEQ);
-		return -1;
-	    }
 
 	    /*
-	     * If the current buffer is empty recycle it.
+	     * Recycle current buffer if empty.
 	     */
 
 	    bufPtr = statePtr->inQueueHead;
@@ -6108,6 +6100,15 @@ DoReadChars(
 		    statePtr->inQueueTail = NULL;
 		}
 	    }
+
+	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR) && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
+		/* Channel is synchronous.  Return an error so that callers
+		 * like [read] can return an error.
+		*/
+		Tcl_SetErrno(EILSEQ);
+		copied = -1;
+		goto finish;
+	    }
 	}
 
 	if (copiedNow < 0) {
@@ -6136,6 +6137,7 @@ DoReadChars(
 	}
     }
 
+finish:
     /*
      * Failure to fill a channel buffer may have left channel reporting a
      * "blocked" state, but so long as we fulfilled the request here, the
-- 
cgit v0.12


From a801c2d4741015dbb5875938248eff1701e1ff29 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Fri, 30 Dec 2022 20:27:47 +0000
Subject: Fix DoReadChars() to correctly discard encoding errors after eofchar
 has been seen, and add new test, io-75.8.invalid.

---
 generic/tclEncoding.c |  7 ++++++-
 generic/tclIO.c       | 16 ++++++++++++++--
 tests/io.test         | 36 ++++++++++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index d10d9ca..37b3073 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2386,7 +2386,12 @@ UtfToUtfProc(
 
 	    *dst++ = *src++;
 	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-		&& (UCHAR(src[1]) == 0x80) && (!(flags & TCL_ENCODING_MODIFIED) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+	    && (UCHAR(src[1]) == 0x80)
+	    && (
+		!(flags & TCL_ENCODING_MODIFIED)
+		|| ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
+	    ))
+	{
 	    /*
 	     * If in input mode, and -strict is specified: This is an error.
 	     */
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 9ae8fb5..3b47de5 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -6101,7 +6101,16 @@ DoReadChars(
 		}
 	    }
 
-	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR) && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
+	    /*
+	     * If CHANNEL_ENCODING_ERROR and CHANNEL_STICKY_EOF are both set,
+	     * then CHANNEL_ENCODING_ERROR was caused by data that occurred
+	     * after the EOF character was encountered, so it doesn't count as
+	     * a real error.
+	     */
+
+	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
+		    && !GotFlag(statePtr, CHANNEL_STICKY_EOF)
+		    && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
 		/* Channel is synchronous.  Return an error so that callers
 		 * like [read] can return an error.
 		*/
@@ -6816,11 +6825,14 @@ TranslateInputEOL(
 	 * EOF character was seen in EOL translated range. Leave current file
 	 * position pointing at the EOF character, but don't store the EOF
 	 * character in the output string.
+	 *
+	 * If CHANNEL_ENCODING_ERROR is set, it can only be because of data
+	 * encountered after the EOF character, so it is nonsense.  Unset it.
 	 */
 
 	SetFlag(statePtr, CHANNEL_EOF | CHANNEL_STICKY_EOF);
 	statePtr->inputEncodingFlags |= TCL_ENCODING_END;
-	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR);
+	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR|CHANNEL_ENCODING_ERROR);
     }
 }
 
diff --git a/tests/io.test b/tests/io.test
index 451a790..aece338 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9089,11 +9089,15 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     removeFile io-75.7
 } -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
 
-test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+test io-75.8.incomplete {
+    incomplete uft-8 char after eof char is not an error (-strictencoding 1)
+} -setup {
+    set hd {}
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
     fconfigure $f -encoding binary
-    # \x81 is invalid in utf-8, but since \x1A comes first, -eofchar takes precedence.
+    # \x81 is invalid and also incomplete utf-8 data, but because the eof
+    # character \x1A appears first, it's not an error.
     puts -nonewline $f A\x1A\x81
     flush $f
     seek $f 0
@@ -9102,6 +9106,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     set d [read $f]
     binary scan $d H* hd
     lappend hd [eof $f]
+    # there should be no error on additional reads
     lappend hd [read $f]
     close $f
     set hd
@@ -9109,6 +9114,33 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     removeFile io-75.8
 } -result {41 1 {}}
 
+
+test io-75.8.invalid {invalid utf-8 after eof char is not an error  (-strictencoding 1)} -setup {
+    set res {}
+    set fn [makeFile {} io-75.8]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \xc0\x80 is invalid utf-8 data, but because the eof character \x1A
+    # appears first, it's not an error.
+    puts -nonewline $f A\x1a\xc0\x80
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    foreach char [split $d {}] {
+	lappend res [format %x [scan $char %c]]
+    }
+    lappend res [eof $f]
+    # there should be no error on additional reads
+    lappend res [read $f]
+    close $f
+    set res
+} -cleanup {
+    removeFile io-75.8
+} -result {41 1 {}}
+
+
 test io-75.9 {unrepresentable character write passes and is replaced by ?} -setup {
     set fn [makeFile {} io-75.9]
     set f [open $fn w+]
-- 
cgit v0.12


From 63e04b3c2dc7ecaf014a93f2116b5913a256e875 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Fri, 30 Dec 2022 21:05:56 +0000
Subject: New test, io-12.9.strict, for issue report [1bedc53c8cb878f0].

---
 tests/io.test | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/io.test b/tests/io.test
index aece338..6fb3587 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -1555,11 +1555,29 @@ test io-12.9 {ReadChars: multibyte chars split} -body {
     set f [open $path(test1)]
     fconfigure $f -encoding utf-8 -buffersize 10
     set in [read $f]
+    read $f
     close $f
     scan [string index $in end] %c
 } -cleanup {
     catch {close $f}
 } -result 194
+test io-12.9.strict {ReadChars: multibyte chars split} -body {
+    set res {}
+    set f [open $path(test1) w]
+    fconfigure $f -translation binary
+    puts -nonewline $f [string repeat a 9]\xC2
+    close $f
+    set f [open $path(test1)]
+    fconfigure $f -encoding utf-8 -strictencoding 1 -buffersize 10
+    set status [catch {read $f} cres copts]
+    set in [dict get $copts -result]
+    lappend res $in
+    lappend res $status $cres
+    set res
+} -cleanup {
+    close $f
+    catch {close $f}
+} -match glob -result {aaaaaaaaa 1 {error reading "*": illegal byte sequence}}
 test io-12.10 {ReadChars: multibyte chars split} -body {
     set f [open $path(test1) w]
     fconfigure $f -translation binary
-- 
cgit v0.12


From 3919b0a0b4e371b574d16adaa1c73df6da8007ce Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Fri, 30 Dec 2022 21:53:47 +0000
Subject: Add test for [gets] in non-strict mode after an encoding error.

---
 tests/io.test | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/io.test b/tests/io.test
index 6fb3587..2fa06ea 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9254,6 +9254,28 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
     removeFile io-75.13
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
+test io-75.14 {invalid utf-8 encoding [gets] coninues in non-strict mode after error} -setup {
+    set fn [makeFile {} io-75.14]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \xc0 is invalid in utf-8
+    puts -nonewline $f a\nb\xc0\nc\n
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar {} -translation lf -strictencoding 1
+} -body {
+    lappend res [gets $f]
+    set status [catch {gets $f} cres copts]
+    lappend res $status $cres
+    chan configure $f -strictencoding 0
+    lappend res [gets $f]
+    lappend res [gets $f]
+    close $f
+	return $res
+} -cleanup {
+    removeFile io-75.14
+} -match glob -result {a 1 {error reading "*": illegal byte sequence} bÀ c}
+
 # ### ### ### ######### ######### #########
 
 
-- 
cgit v0.12


From 985ea00b16865c0dccc99eb9b006f97e8e59edb0 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 2 Jan 2023 23:12:02 +0000
Subject: Merge py-b8f575aa23: Fix for [154ed7ce56], Tcl 9: [gets] on
 -strictencoding 1 configured channel.

---
 generic/tclIO.c    | 28 ++++++++++++++++++++++++++--
 generic/tclIOCmd.c |  7 +++++--
 tests/io.test      | 32 ++++++++++++++++++++++++++++++--
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 3b47de5..81af96e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4656,7 +4656,8 @@ Tcl_GetsObj(
 				/* State info for channel */
     ChannelBuffer *bufPtr;
     int inEofChar, skip, copiedTotal, oldFlags, oldRemoved;
-    int oldLength;
+    int reportError = 0;
+    size_t oldLength;
     Tcl_Encoding encoding;
     char *dst, *dstEnd, *eol, *eof;
     Tcl_EncodingState oldState;
@@ -4664,6 +4665,7 @@ Tcl_GetsObj(
     if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
 	UpdateInterest(chanPtr);
 	Tcl_SetErrno(EILSEQ);
+	ResetFlag(statePtr, CHANNEL_ENCODING_ERROR);
 	return TCL_INDEX_NONE;
     }
 
@@ -4938,6 +4940,19 @@ Tcl_GetsObj(
 		goto done;
 	    }
 	    goto gotEOL;
+	} else if (gs.bytesWrote == 0
+		&& GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
+	    /* Set eol to the position that caused the encoding error, and then
+	     * coninue to gotEOL, which stores the data that was decoded
+	     * without error to objPtr.  This allows the caller to do something
+	     * useful with the data decoded so far, and also results in the
+	     * position of the file being the first byte that was not
+	     * succesfully decoded, allowing further processing at exactly that
+	     * point, if desired.
+	     */
+	    eol = dstEnd;
+	    reportError = 1;
+	    goto gotEOL;
 	}
 	dst = dstEnd;
     }
@@ -4981,7 +4996,16 @@ Tcl_GetsObj(
     Tcl_SetObjLength(objPtr, eol - objPtr->bytes);
     CommonGetsCleanup(chanPtr);
     ResetFlag(statePtr, CHANNEL_BLOCKED);
-    copiedTotal = gs.totalChars + gs.charsWrote - skip;
+    if (reportError) {
+	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR|CHANNEL_ENCODING_ERROR);
+	/* reset CHANNEL_ENCODING_ERROR to afford a chance to reconfigure
+	 * the channel and try again
+	 */
+	Tcl_SetErrno(EILSEQ);
+	copiedTotal = -1;
+    } else {
+	copiedTotal = gs.totalChars + gs.charsWrote - skip;
+    }
     goto done;
 
     /*
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index e5ba298..bc52b8e 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -295,7 +295,7 @@ Tcl_GetsObjCmd(
     Tcl_Channel chan;		/* The channel to read from. */
     int lineLen;		/* Length of line just read. */
     int mode;			/* Mode in which channel is opened. */
-    Tcl_Obj *linePtr, *chanObjPtr;
+    Tcl_Obj *linePtr, *chanObjPtr, *returnOptsPtr;
     int code = TCL_OK;
 
     if ((objc != 2) && (objc != 3)) {
@@ -318,7 +318,6 @@ Tcl_GetsObjCmd(
     lineLen = Tcl_GetsObj(chan, linePtr);
     if (lineLen < 0) {
 	if (!Tcl_Eof(chan) && !Tcl_InputBlocked(chan)) {
-	    Tcl_DecrRefCount(linePtr);
 
 	    /*
 	     * TIP #219.
@@ -332,7 +331,11 @@ Tcl_GetsObjCmd(
 			"error reading \"%s\": %s",
 			TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	    }
+	    returnOptsPtr = Tcl_NewDictObj();
+	    Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
+	    , linePtr);
 	    code = TCL_ERROR;
+	    Tcl_SetReturnOptions(interp, returnOptsPtr);
 	    goto done;
 	}
 	lineLen = TCL_INDEX_NONE;
diff --git a/tests/io.test b/tests/io.test
index 2fa06ea..854759e 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9255,6 +9255,7 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
 test io-75.14 {invalid utf-8 encoding [gets] coninues in non-strict mode after error} -setup {
+    set res {} 
     set fn [makeFile {} io-75.14]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9271,13 +9272,40 @@ test io-75.14 {invalid utf-8 encoding [gets] coninues in non-strict mode after e
     lappend res [gets $f]
     lappend res [gets $f]
     close $f
-	return $res
+    return $res
 } -cleanup {
     removeFile io-75.14
 } -match glob -result {a 1 {error reading "*": illegal byte sequence} bÀ c}
 
-# ### ### ### ######### ######### #########
 
+test io-75.15 {invalid utf-8 encoding strict gets should not hang} -setup {
+    set res {}
+    set fn [makeFile {} io-75.15]
+    set chan [open $fn w+]
+    fconfigure $chan -encoding binary
+    # This is not valid UTF-8
+    puts $chan hello\nAB\xc0\x40CD\nEFG
+    close $chan
+} -body {
+    #Now try to read it with [gets]
+    set chan [open $fn]
+    fconfigure $chan -encoding utf-8 -strictencoding 1
+    lappend res [gets $chan]
+    set status [catch {gets $chan} cres copts]
+    lappend res $status $cres
+    set status [catch {gets $chan} cres copts]
+    lappend res $status $cres
+    lappend res [dict get $copts -result]
+    chan configur $chan -encoding binary
+    foreach char [split [read $chan 2] {}] {
+	lappend res [format %x [scan $char %c]]
+    }
+    return $res
+} -cleanup {
+    close $chan
+    removeFile io-75.15
+} -match glob -result {hello 1 {error reading "*": illegal byte sequence}\
+    1 {error reading "*": illegal byte sequence} AB c0 40}
 
 
 test io-76.0 {channel modes} -setup {
-- 
cgit v0.12


From ce9fb3bcfb5727f83db328e2ee54bc6b56c6e7ea Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 4 Jan 2023 23:21:16 +0000
Subject: Fix [0f19edcb78]: Windows 11 not reported in tcl_platform(osVersion)

---
 unix/tclUnixInit.c | 3 +++
 win/tclWinInit.c   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 7467938..47b8df3 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -895,6 +895,9 @@ TclpSetVariables(
 
     GetSystemInfo(&sysInfo);
 
+    if (osInfo.dwMajorVersion == 10 && osInfo.dwBuildNumber >= 22000) {
+	osInfo.dwMajorVersion = 11;
+    }
     Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY);
     sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index eae4404..582c700 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -552,6 +552,9 @@ TclpSetVariables(
 	    TCL_GLOBAL_ONLY);
     Tcl_SetVar2(interp, "tcl_platform", "os",
 	    "Windows NT", TCL_GLOBAL_ONLY);
+    if (osInfo.dwMajorVersion == 10 && osInfo.dwBuildNumber >= 22000) {
+	osInfo.dwMajorVersion = 11;
+    }
     wsprintfA(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sys.oemId.wProcessorArchitecture < NUMPROCESSORS) {
-- 
cgit v0.12


From 72eb4e42290dccb6db60a66a085c355fb1e779e9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 6 Jan 2023 16:56:14 +0000
Subject: Fix [ad393071c2]: Use different LD_LIBRARY_PATH_VAR on macOS

---
 unix/configure | 2 +-
 unix/tcl.m4    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/configure b/unix/configure
index 8981ef8..94ecfc6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7898,7 +7898,7 @@ fi
 
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
-	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+	    LD_LIBRARY_PATH_VAR="DYLD_FALLBACK_LIBRARY_PATH"
 
 cat >>confdefs.h <<\_ACEOF
 #define MAC_OSX_TCL 1
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6063847..6cee92c 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1594,7 +1594,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    ])
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
-	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+	    LD_LIBRARY_PATH_VAR="DYLD_FALLBACK_LIBRARY_PATH"
 	    AC_DEFINE(MAC_OSX_TCL, 1, [Is this a Mac I see before me?])
 	    PLAT_OBJS='${MAC_OSX_OBJS}'
 	    PLAT_SRCS='${MAC_OSX_SRCS}'
-- 
cgit v0.12


From 805fa175fc88005a9955a6202f05d17b91b70c19 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sun, 8 Jan 2023 10:07:46 +0000
Subject: For [read] and [gets] encoding errors, use "-result read" in return
 options dictionary instead of just "-result".

---
 generic/tclIOCmd.c |  14 ++++--
 tests/io.test      | 141 ++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 106 insertions(+), 49 deletions(-)

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index bc52b8e..2eeb04c 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -295,7 +295,7 @@ Tcl_GetsObjCmd(
     Tcl_Channel chan;		/* The channel to read from. */
     int lineLen;		/* Length of line just read. */
     int mode;			/* Mode in which channel is opened. */
-    Tcl_Obj *linePtr, *chanObjPtr, *returnOptsPtr;
+    Tcl_Obj *linePtr, *chanObjPtr, *resultDictPtr, *returnOptsPtr;
     int code = TCL_OK;
 
     if ((objc != 2) && (objc != 3)) {
@@ -331,9 +331,12 @@ Tcl_GetsObjCmd(
 			"error reading \"%s\": %s",
 			TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	    }
+	    resultDictPtr = Tcl_NewDictObj();
+	    Tcl_DictObjPut(NULL, resultDictPtr, Tcl_NewStringObj("read", -1)
+	    , linePtr);
 	    returnOptsPtr = Tcl_NewDictObj();
 	    Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
-	    , linePtr);
+	    , resultDictPtr);
 	    code = TCL_ERROR;
 	    Tcl_SetReturnOptions(interp, returnOptsPtr);
 	    goto done;
@@ -384,7 +387,7 @@ Tcl_ReadObjCmd(
     int toRead;			/* How many bytes to read? */
     int charactersRead;		/* How many characters were read? */
     int mode;			/* Mode in which channel is opened. */
-    Tcl_Obj *resultPtr, *returnOptsPtr, *chanObjPtr;
+    Tcl_Obj *resultPtr, *resultDictPtr, *returnOptsPtr, *chanObjPtr;
 
     if ((objc != 2) && (objc != 3)) {
 	Interp *iPtr;
@@ -473,9 +476,12 @@ Tcl_ReadObjCmd(
 		    "error reading \"%s\": %s",
 		    TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	}
+	resultDictPtr = Tcl_NewDictObj();
+	Tcl_DictObjPut(NULL, resultDictPtr, Tcl_NewStringObj("read", -1)
+	    , resultPtr);
 	returnOptsPtr = Tcl_NewDictObj();
 	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
-	    , resultPtr);
+	    , resultDictPtr);
 	TclChannelRelease(chan);
 	Tcl_DecrRefCount(resultPtr);
 	Tcl_SetReturnOptions(interp, returnOptsPtr);
diff --git a/tests/io.test b/tests/io.test
index 854759e..3f00561 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -1547,37 +1547,43 @@ test io-12.8 {ReadChars: multibyte chars split} {
     close $f
     scan [string index $in end] %c
 } 160
-test io-12.9 {ReadChars: multibyte chars split} -body {
-    set f [open $path(test1) w]
-    fconfigure $f -translation binary
-    puts -nonewline $f [string repeat a 9]\xC2
-    close $f
-    set f [open $path(test1)]
-    fconfigure $f -encoding utf-8 -buffersize 10
-    set in [read $f]
-    read $f
-    close $f
-    scan [string index $in end] %c
-} -cleanup {
-    catch {close $f}
-} -result 194
-test io-12.9.strict {ReadChars: multibyte chars split} -body {
-    set res {}
-    set f [open $path(test1) w]
-    fconfigure $f -translation binary
-    puts -nonewline $f [string repeat a 9]\xC2
-    close $f
-    set f [open $path(test1)]
-    fconfigure $f -encoding utf-8 -strictencoding 1 -buffersize 10
-    set status [catch {read $f} cres copts]
-    set in [dict get $copts -result]
-    lappend res $in
-    lappend res $status $cres
-    set res
-} -cleanup {
-    close $f
-    catch {close $f}
-} -match glob -result {aaaaaaaaa 1 {error reading "*": illegal byte sequence}}
+
+
+apply [list {} {
+	set template {
+		test io-12.9.@variant@ {ReadChars: multibyte chars split, default (strict)} -body {
+			set res {}
+			set f [open $path(test1) w]
+			fconfigure $f -translation binary
+			puts -nonewline $f [string repeat a 9]\xC2
+			close $f
+			set f [open $path(test1)]
+			fconfigure $f -encoding utf-8 @strict@ -buffersize 10
+			set status [catch {read $f} cres copts]
+			set in [dict get $copts -result]
+			lappend res $in
+			lappend res $status $cres
+			set status [catch {read $f} cres copts]
+			set in [dict get $copts -result]
+			lappend res $in
+			lappend res $status $cres
+			set res
+		} -cleanup {
+			catch {close $f}
+		} -match glob -result {{read aaaaaaaaa} 1\
+			{error reading "*": illegal byte sequence}\
+			{read {}} 1 {error reading "*": illegal byte sequence}}
+	}
+
+	# strict encoding may be the default in Tcl 9, but in 8 it is not
+	foreach variant {encodingstrict} strict {{-strictencoding 1}} {
+		set script [string map [
+			list @variant@ $variant @strict@ $strict] $template] 
+		uplevel 1 $script
+	}
+} [namespace current]]
+
+
 test io-12.10 {ReadChars: multibyte chars split} -body {
     set f [open $path(test1) w]
     fconfigure $f -translation binary
@@ -9075,7 +9081,7 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
 } -body {
     set status [catch {read $f} cres copts]
-    set d [dict get $copts -result]
+    set d [dict get $copts -result read]
     binary scan $d H* hd
     lappend hd $status $cres
 } -cleanup {
@@ -9094,7 +9100,7 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
 } -body {
     set status [catch {read $f} cres copts]
-    set d [dict get $copts -result]
+    set d [dict get $copts -result read]
     binary scan $d H* hd
     lappend hd [eof $f]
     lappend hd $status
@@ -9173,9 +9179,7 @@ test io-75.9 {unrepresentable character write passes and is replaced by ?} -setu
     removeFile io-75.9
 } -match glob -result [list {A} {error writing "*": illegal byte sequence}]
 
-# Incomplete sequence test.
-# This error may IMHO only be detected with the close.
-# But the read already returns the incomplete sequence.
+
 test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
     set fn [makeFile {} io-75.10]
     set f [open $fn w+]
@@ -9183,7 +9187,7 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
     puts -nonewline $f A\xC0
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none
+    fconfigure $f -encoding utf-8 -strictencoding 0 -buffering none
 } -body {
     set d [read $f]
     close $f
@@ -9192,8 +9196,32 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
 } -cleanup {
     removeFile io-75.10
 } -result 41c0
-# The current result returns the orphan byte as byte.
-# This may be expected due to special utf-8 handling.
+
+
+test io-75.10_strict {incomplete multibyte encoding read is an error} -setup {
+	set res {}
+    set fn [makeFile {} io-75.10]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    puts -nonewline $f A\xC0
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -strictencoding 1 -buffering none
+} -body {
+    set status [catch {read $f} cres copts]
+    set d [dict get $copts -result read]
+    binary scan $d H* hd
+	lappend res $hd $cres
+	chan configure $f -encoding iso8859-1
+	set d [read $f]
+    binary scan $d H* hd
+	lappend res $hd
+    close $f
+	return $res
+} -cleanup {
+    removeFile io-75.10
+} -match glob -result {41 {error reading "*": illegal byte sequence} c0}
+
 
 # As utf-8 has a special treatment in multi-byte decoding, also test another
 # one.
@@ -9206,10 +9234,11 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" \
+		-translation lf -strictencoding 1
 } -body {
     set status [catch {read $f} cres copts]
-    set d [dict get $copts -result]
+    set d [dict get $copts -result read]
     binary scan $d H* hd
     lappend hd $status
     lappend hd $cres
@@ -9218,14 +9247,36 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     removeFile io-75.11
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
+
+test io-75.12 {invalid utf-8 encoding read is an error} -setup {
+	set res {}
+    set fn [makeFile {} io-75.12]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    puts -nonewline $f A\x81
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar {} -translation lf \
+		-strictencoding 1
+} -body {
+    set status [catch {read $f} cres copts]
+    set d [dict get $copts -result read]
+    close $f
+    binary scan $d H* hd
+	lappend res $hd $status $cres
+	return $res
+} -cleanup {
+    removeFile io-75.12
+} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+test io-75.12_ignore {invalid utf-8 encoding read is ignored} -setup {
     set fn [makeFile {} io-75.12]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf
+    fconfigure $f -encoding utf-8 -buffering none -eofchar {} \
+		-translation lf -strictencoding 0
 } -body {
     set d [read $f]
     close $f
@@ -9245,7 +9296,7 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
 } -body {
     set status [catch {read $f} cres copts]
-    set d [dict get $copts -result]
+    set d [dict get $copts -result read]
     binary scan $d H* hd
     lappend hd $status
     close $f
@@ -9305,7 +9356,7 @@ test io-75.15 {invalid utf-8 encoding strict gets should not hang} -setup {
     close $chan
     removeFile io-75.15
 } -match glob -result {hello 1 {error reading "*": illegal byte sequence}\
-    1 {error reading "*": illegal byte sequence} AB c0 40}
+    1 {error reading "*": illegal byte sequence} {read AB} c0 40}
 
 
 test io-76.0 {channel modes} -setup {
-- 
cgit v0.12


From 33f4149ee57d7c60a267c0f72bec5dabba389613 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 8 Jan 2023 22:47:45 +0000
Subject: Fix for
 [https://core.tcl-lang.org/tk/tktview?name=370b1ff03e|370b1ff03e]. Not
 complete/correct yet, since this backouts the fix for [4dbfa46caa]

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

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index d10d9ca..cfad548 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2409,7 +2409,7 @@ UtfToUtfProc(
 	     */
 
 	    if (flags & TCL_ENCODING_MODIFIED) {
-		if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
+		if (STOPONERROR) {
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
@@ -3199,7 +3199,7 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
+	    if (STOPONERROR) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-- 
cgit v0.12


From 24656c280590bbc66e98685342c461af58f478a1 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sat, 14 Jan 2023 22:07:21 +0000
Subject: Properly quote contents of Make variables to pass through gdb.run
 file.

---
 unix/Makefile.in | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index eac47a6..21d4085 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -270,6 +270,8 @@ VALGRINDARGS		= --tool=memcheck --num-callers=24 \
 	--keep-debuginfo=yes \
 	--suppressions=$(TOOL_DIR)/valgrind_suppress
 
+shquotequote = $(subst ",\",$(subst ',\',$(1)))
+shquotesingle = $(subst ','\'',$(1))
 #--------------------------------------------------------------------------
 # The information below should be usable as is. The configure script won't
 # modify it and you shouldn't need to modify it either.
@@ -816,9 +818,12 @@ test-tcl: ${TCLTEST_EXE}
 	$(SHELL_ENV) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
 
 gdb-test: ${TCLTEST_EXE}
-	@echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run
-	@echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
-	@echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run
+	@printf '%s ' set env @LD_LIBRARY_PATH_VAR@=\"`pwd`$${@LD_LIBRARY_PATH_VAR@:+:$${@LD_LIBRARY_PATH_VAR}}\" > gdb.run
+	@printf '\n' >>gdb.run
+	@printf '%s ' set env TCL_LIBRARY=\'$(call shquotesingle,${TCL_BUILDTIME_LIBRARY})\' >> gdb.run
+	@printf '\n' >>gdb.run
+	@printf '%s ' set args $(call shquotequote,$(TOP_DIR))/tests/all.tcl\
+		$(call shquotequote,$(TESTFLAGS)) -singleproc 1 >> gdb.run
 	$(GDB) ./${TCLTEST_EXE} --command=gdb.run
 	rm gdb.run
 
-- 
cgit v0.12


From 5aef206d2d6f165c0997b8050cf92c5645afb8b4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 14 Jan 2023 22:20:53 +0000
Subject: Proposed fix for [a31caff057]: encoding command does not allow
 -strict to be used with -failindex

---
 doc/encoding.n      | 13 ++++++-------
 generic/tclCmdAH.c  |  6 +++---
 tests/cmdAH.test    | 28 ++++++++++++++--------------
 tests/encoding.test |  4 ++--
 tests/safe.test     |  8 ++++----
 5 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index 78580f2..7eae61a 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -28,7 +28,7 @@ formats.
 Performs one of several encoding related operations, depending on
 \fIoption\fR.  The legal \fIoption\fRs are:
 .TP
-\fBencoding convertfrom\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR? ?\fB-strict\fR? ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertfrom\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
 .
 Convert \fIdata\fR to a Unicode string from the specified \fIencoding\fR.  The
 characters in \fIdata\fR are 8 bit binary data.  The resulting
@@ -48,19 +48,19 @@ in case of a conversion error, the position of the input byte causing the error
 is returned in the given variable.  The return value of the command are the
 converted characters until the first error position.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
+may not be used together with \fB-nocomplain\fR, and it already implies \fB-strict\fR.
 .PP
 The option \fB-nocomplain\fR has no effect and is available for compatibility with
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
 This switch restores the TCL8.7 behaviour.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows the the sequence \fB\\xC0\\x80\fR and noncharacters (which -
+encoder, it disallows invalid byte sequences and surrogates (which -
 otherwise - are just passed through).
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
-\fBencoding convertto\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR? ?\fB-strict\fR? ?\fIencoding\fR? \fIstring\fR
+\fBencoding convertto\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIstring\fR
 .
 Convert \fIstring\fR from Unicode to the specified \fIencoding\fR.
 The result is a sequence of bytes that represents the converted
@@ -81,15 +81,14 @@ in case of a conversion error, the position of the input character causing the e
 is returned in the given variable.  The return value of the command are the
 converted bytes until the first error position. No error condition is raised.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
+may not be used together with \fB-nocomplain\fR, and it already implies \fB-strict\fR.
 .PP
 The option \fB-nocomplain\fR has no effect and is available for compatibility with
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
 This switch restores the TCL8.7 behaviour.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows the the sequence \fB\\xC0\\x80\fR and noncharacters (which -
-otherwise - are just passed through).
+encoder, it disallows surrogates (which - otherwise - are just passed through).
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index b4084d1..8f1bf1d 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -593,7 +593,7 @@ EncodingConvertfromObjCmd(
 		goto encConvFromError;
 	    }
 	    failVarObj = objv[2];
-	    flags = TCL_ENCODING_STOPONERROR;
+	    flags = TCL_ENCODING_STRICT;
 	    objcUnprocessed -= 2;
 	}
 	switch (objcUnprocessed) {
@@ -610,7 +610,7 @@ EncodingConvertfromObjCmd(
 	}
     } else {
     encConvFromError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-strict? ?-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|-strict|-failindex var? ?encoding? data");
 	return TCL_ERROR;
     }
 
@@ -749,7 +749,7 @@ EncodingConverttoObjCmd(
 	}
     } else {
     encConvToError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-strict? ?-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|-strict|-failindex var? ?encoding? data");
 	return TCL_ERROR;
     }
 
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index cb7e1cf..3533cb6 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -179,7 +179,7 @@ test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
 } -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
 test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.4 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto foo bar
 } -result {unknown encoding "foo"}
@@ -201,7 +201,7 @@ test cmdAH-4.6 {Tcl_EncodingObjCmd} -setup {
 } -result 8C
 test cmdAH-4.7 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.8 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom foo bar
 } -result {unknown encoding "foo"}
@@ -238,10 +238,10 @@ test cmdAH-4.13 {Tcl_EncodingObjCmd} -setup {
 
 test cmdAH-4.14.1 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.14.2 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertto -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.15.1 {Syntax error, -failindex and -nocomplain, no encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain ABC
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
@@ -250,19 +250,19 @@ test cmdAH-4.15.2 {Syntax error, -failindex and -nocomplain, no encoding} -body
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
 test cmdAH-4.16.1 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.16.2 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertto -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.17.1 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.17.2 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertto -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.18.1 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertfrom -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertfrom -failindex ABC
@@ -270,12 +270,12 @@ test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.18.3 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertto -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertto -failindex ABC
@@ -283,7 +283,7 @@ test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.19.1 {convertrom -failindex with correct data} -body {
@@ -320,7 +320,7 @@ test cmdAH-4.20.1 {convertrom -failindex with incomplete utf8} -body {
     set x [encoding convertfrom -failindex i utf-8 A\xc3]
     binary scan $x H* y
     list $y $i
-} -returnCodes 0 -result {41c3 -1}
+} -returnCodes 0 -result {41 1}
 test cmdAH-4.20.2 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
     proc encoding_test {} {
 	set x [encoding convertfrom -failindex i utf-8 A\xc3]
@@ -330,7 +330,7 @@ test cmdAH-4.20.2 {convertrom -failindex with incomplete utf8 (byte compiled)} -
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 0 -result {41c3 -1} -cleanup {
+} -returnCodes 0 -result {41 1} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.21.1 {convertto -failindex with wrong character} -body {
diff --git a/tests/encoding.test b/tests/encoding.test
index 5fd4e8c..a1d129e 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -681,10 +681,10 @@ test encoding-24.21 {Parse with -nocomplain but without providing encoding} {
 } 1
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test encoding-24.24 {Parse invalid utf-8 with -strict} -body {
     encoding convertfrom -strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
diff --git a/tests/safe.test b/tests/safe.test
index e5d4d18..f2c0862 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1473,7 +1473,7 @@ test safe-11.7 {testing safe encoding} -setup {
     interp eval $i encoding convertfrom
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test safe-11.7.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1482,7 +1482,7 @@ test safe-11.7.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"
     while executing
 "encoding convertfrom"
     invoked from within
@@ -1495,7 +1495,7 @@ test safe-11.8 {testing safe encoding} -setup {
     interp eval $i encoding convertto
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test safe-11.8.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1504,7 +1504,7 @@ test safe-11.8.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"
     while executing
 "encoding convertto"
     invoked from within
-- 
cgit v0.12


From 25f683758268f3059f49d51f7ae24c3cf0c1d316 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 14 Jan 2023 22:57:15 +0000
Subject: Same change for "encoding convertto"

---
 generic/tclCmdAH.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 8f1bf1d..016bd02 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -732,7 +732,7 @@ EncodingConverttoObjCmd(
 		goto encConvToError;
 	    }
 	    failVarObj = objv[2];
-	    flags = TCL_ENCODING_STOPONERROR;
+	    flags = TCL_ENCODING_STRICT;
 	    objcUnprocessed -= 2;
 	}
 	switch (objcUnprocessed) {
-- 
cgit v0.12


From 81262438a784ae0087c36fabd189c15a2433df33 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sun, 15 Jan 2023 19:26:36 +0000
Subject: Fix issue  [8f7fdea2d], string-2.20.1 fails on big endian, and also
 fix issues in TclStringCmp when checkEq is 1.

---
 generic/tclCmdMZ.c    | 38 ++++++++++++++++++++++++--------------
 tests/stringComp.test |  6 +++---
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 53e12c5..a97f309 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -2629,7 +2629,7 @@ StringEqualCmd(
      */
 
     objv += objc-2;
-    match = TclStringCmp(objv[0], objv[1], 0, nocase, reqlength);
+    match = TclStringCmp(objv[0], objv[1], 1, nocase, reqlength);
     Tcl_SetObjResult(interp, Tcl_NewBooleanObj(match ? 0 : 1));
     return TCL_OK;
 }
@@ -2702,8 +2702,8 @@ TclStringCmp(
     Tcl_Obj *value2Ptr,
     int checkEq,		/* comparison is only for equality */
     int nocase,			/* comparison is not case sensitive */
-    int reqlength)		/* requested length; -1 to compare whole
-				 * strings */
+    int reqlength)		/* requested length in characters; -1 to
+				 * compare whole strings */
 {
     const char *s1, *s2;
     int empty, length, match, s1len, s2len;
@@ -2731,10 +2731,10 @@ TclStringCmp(
     } else if ((value1Ptr->typePtr == &tclStringType)
 	    && (value2Ptr->typePtr == &tclStringType)) {
 	/*
-	 * Do a unicode-specific comparison if both of the args are of String
+	 * Do a Unicode-specific comparison if both of the args are of String
 	 * type. If the char length == byte length, we can do a memcmp. In
 	 * benchmark testing this proved the most efficient check between the
-	 * unicode and string comparison operations.
+	 * Unicode and string comparison operations.
 	 */
 
 	if (nocase) {
@@ -2748,6 +2748,9 @@ TclStringCmp(
 		    && (value1Ptr->bytes != NULL)
 		    && (s2len == value2Ptr->length)
 		    && (value2Ptr->bytes != NULL)) {
+		/* each byte represents one character so s1l3n, s2l3n, and
+		 * reqlength are in both bytes and characters
+		 */
 		s1 = value1Ptr->bytes;
 		s2 = value2Ptr->bytes;
 		memCmpFn = memcmp;
@@ -2756,14 +2759,17 @@ TclStringCmp(
 		s2 = (char *) Tcl_GetUnicode(value2Ptr);
 		if (
 #if defined(WORDS_BIGENDIAN) && (TCL_UTF_MAX != 4)
-			1
+		    1
 #else
-			checkEq
+		    checkEq
 #endif /* WORDS_BIGENDIAN */
-		        ) {
+		) {
 		    memCmpFn = memcmp;
 		    s1len *= sizeof(Tcl_UniChar);
 		    s2len *= sizeof(Tcl_UniChar);
+		    if (reqlength > 0) {
+			reqlength *= sizeof(Tcl_UniChar);
+		    }
 		} else {
 		    memCmpFn = (memCmpFn_t) Tcl_UniCharNcmp;
 		}
@@ -2805,7 +2811,7 @@ TclStringCmp(
 	    s2 = TclGetStringFromObj(value2Ptr, &s2len);
 	}
 
-	if (!nocase && checkEq) {
+	if (!nocase && checkEq && reqlength < 0) {
 	    /*
 	     * When we have equal-length we can check only for (in)equality.
 	     * We can use memcmp() in all (n)eq cases because we don't need to
@@ -2826,24 +2832,28 @@ TclStringCmp(
 		s1len = Tcl_NumUtfChars(s1, s1len);
 		s2len = Tcl_NumUtfChars(s2, s2len);
 		memCmpFn = (memCmpFn_t)
-			(nocase ? Tcl_UtfNcasecmp : Tcl_UtfNcmp);
+		    (nocase ? Tcl_UtfNcasecmp : Tcl_UtfNcmp);
 	    }
 	}
     }
 
+    /* At this point s1len, s2len, and reqlength should by now have been
+     * adjusted so that they are all in the units expected by the selected
+     * comparison function.
+     */
+
     length = (s1len < s2len) ? s1len : s2len;
     if (reqlength > 0 && reqlength < length) {
 	length = reqlength;
     } else if (reqlength < 0) {
 	/*
-	 * The requested length is negative, so we ignore it by setting it to
-	 * length + 1 so we correct the match var.
+	 * The requested length is negative, so ignore it by setting it to
+	 * length + 1 to correct the match var.
 	 */
-
 	reqlength = length + 1;
     }
 
-    if (checkEq && (s1len != s2len)) {
+    if (checkEq && reqlength < 0 && (s1len != s2len)) {
 	match = 1;		/* This will be reversed below. */
     } else {
 	/*
diff --git a/tests/stringComp.test b/tests/stringComp.test
index a17390d..95a738c 100644
--- a/tests/stringComp.test
+++ b/tests/stringComp.test
@@ -100,7 +100,7 @@ foreach {tname tbody tresult tcode} {
     {unicode} {string compare \334 \u00fc} -1 {}
     {unicode} {string compare \334\334\334\374\374 \334\334\334\334\334} 1 {}
     {high bit} {
-	# This test will fail if the underlying comparison
+	# This test fails if the underlying comparison
 	# is using signed chars instead of unsigned chars.
 	# (like SunOS's default memcmp thus the compat/memcmp.c)
 	string compare "\x80" "@"
@@ -156,10 +156,10 @@ foreach {tname tbody tresult tcode} {
     {-nocase null strings} {
 	string compare -nocase foo ""
     } 1 {}
-    {with length, unequal strings} {
+    {with length, unequal strings, partial first string} {
 	string compare -length 2 abc abde
     } 0 {}
-    {with length, unequal strings} {
+    {with length, unequal strings 2, full first string} {
 	string compare -length 2 ab abde
     } 0 {}
     {with NUL character vs. other ASCII} {
-- 
cgit v0.12


From 7faef9ce700c7dc01e1333046e7a69bdb7a45bbf Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 15 Jan 2023 19:45:54 +0000
Subject: Update documentation, matching current implementation

---
 doc/encoding.n      | 13 ++++++-------
 generic/tclCmdAH.c  |  4 ++--
 tests/cmdAH.test    | 24 ++++++++++++------------
 tests/encoding.test |  4 ++--
 tests/safe.test     |  8 ++++----
 5 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index 78580f2..d4b91e2 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -28,7 +28,7 @@ formats.
 Performs one of several encoding related operations, depending on
 \fIoption\fR.  The legal \fIoption\fRs are:
 .TP
-\fBencoding convertfrom\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR? ?\fB-strict\fR? ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertfrom\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
 .
 Convert \fIdata\fR to a Unicode string from the specified \fIencoding\fR.  The
 characters in \fIdata\fR are 8 bit binary data.  The resulting
@@ -48,19 +48,19 @@ in case of a conversion error, the position of the input byte causing the error
 is returned in the given variable.  The return value of the command are the
 converted characters until the first error position.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
+may not be used together with \fB-nocomplain\fR or \fB-strict\fR.
 .PP
 The option \fB-nocomplain\fR has no effect and is available for compatibility with
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
 This switch restores the TCL8.7 behaviour.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows the the sequence \fB\\xC0\\x80\fR and noncharacters (which -
+encoder, it disallows invalid byte sequences and surrogates (which -
 otherwise - are just passed through).
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
-\fBencoding convertto\fR ?\fB-nocomplain\fR? ?\fB-failindex var\fR? ?\fB-strict\fR? ?\fIencoding\fR? \fIstring\fR
+\fBencoding convertto\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIstring\fR
 .
 Convert \fIstring\fR from Unicode to the specified \fIencoding\fR.
 The result is a sequence of bytes that represents the converted
@@ -81,15 +81,14 @@ in case of a conversion error, the position of the input character causing the e
 is returned in the given variable.  The return value of the command are the
 converted bytes until the first error position. No error condition is raised.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
+may not be used together with \fB-nocomplain\fR or \fB-strict\fR.
 .PP
 The option \fB-nocomplain\fR has no effect and is available for compatibility with
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
 This switch restores the TCL8.7 behaviour.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows the the sequence \fB\\xC0\\x80\fR and noncharacters (which -
-otherwise - are just passed through).
+encoder, it disallows surrogates (which - otherwise - are just passed through).
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index b4084d1..dd0a525 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -610,7 +610,7 @@ EncodingConvertfromObjCmd(
 	}
     } else {
     encConvFromError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-strict? ?-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|-strict|-failindex var? ?encoding? data");
 	return TCL_ERROR;
     }
 
@@ -749,7 +749,7 @@ EncodingConverttoObjCmd(
 	}
     } else {
     encConvToError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain? ?-strict? ?-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|-strict|-failindex var? ?encoding? data");
 	return TCL_ERROR;
     }
 
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index cb7e1cf..9b853f5 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -179,7 +179,7 @@ test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
 } -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
 test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.4 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto foo bar
 } -result {unknown encoding "foo"}
@@ -201,7 +201,7 @@ test cmdAH-4.6 {Tcl_EncodingObjCmd} -setup {
 } -result 8C
 test cmdAH-4.7 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.8 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom foo bar
 } -result {unknown encoding "foo"}
@@ -238,10 +238,10 @@ test cmdAH-4.13 {Tcl_EncodingObjCmd} -setup {
 
 test cmdAH-4.14.1 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.14.2 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertto -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.15.1 {Syntax error, -failindex and -nocomplain, no encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain ABC
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
@@ -250,19 +250,19 @@ test cmdAH-4.15.2 {Syntax error, -failindex and -nocomplain, no encoding} -body
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
 test cmdAH-4.16.1 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.16.2 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertto -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.17.1 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.17.2 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertto -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.18.1 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertfrom -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertfrom -failindex ABC
@@ -270,12 +270,12 @@ test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.18.3 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertto -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertto -failindex ABC
@@ -283,7 +283,7 @@ test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.19.1 {convertrom -failindex with correct data} -body {
diff --git a/tests/encoding.test b/tests/encoding.test
index 5fd4e8c..a1d129e 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -681,10 +681,10 @@ test encoding-24.21 {Parse with -nocomplain but without providing encoding} {
 } 1
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test encoding-24.24 {Parse invalid utf-8 with -strict} -body {
     encoding convertfrom -strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
diff --git a/tests/safe.test b/tests/safe.test
index e5d4d18..f2c0862 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1473,7 +1473,7 @@ test safe-11.7 {testing safe encoding} -setup {
     interp eval $i encoding convertfrom
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test safe-11.7.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1482,7 +1482,7 @@ test safe-11.7.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"
     while executing
 "encoding convertfrom"
     invoked from within
@@ -1495,7 +1495,7 @@ test safe-11.8 {testing safe encoding} -setup {
     interp eval $i encoding convertto
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
 test safe-11.8.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1504,7 +1504,7 @@ test safe-11.8.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain? ?-strict? ?-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"
     while executing
 "encoding convertto"
     invoked from within
-- 
cgit v0.12


From 5021d1c11f0e3287ce96351e20e79552a92e7177 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 16 Jan 2023 13:10:07 +0000
Subject: New flag TCL_ENCODING_HACK_FLAG to control the behaviour. (This is
 NOT the way to do it, but it's only meant for experimenting)

---
 generic/tcl.h         | 1 +
 generic/tclEncoding.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index f373382..36e1a35 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2145,6 +2145,7 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_MODIFIED		0x20
 #define TCL_ENCODING_NOCOMPLAIN		0x40
 #define TCL_ENCODING_STRICT			0x44
+#define TCL_ENCODING_HACK_FLAG (1<<20)
 
 /*
  * The following definitions are the error codes returned by the conversion
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index cfad548..2c4382d 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2409,7 +2409,7 @@ UtfToUtfProc(
 	     */
 
 	    if (flags & TCL_ENCODING_MODIFIED) {
-		if (STOPONERROR) {
+		if ((STOPONERROR) && ((flags & TCL_ENCODING_CHAR_LIMIT) || (flags & TCL_ENCODING_HACK_FLAG))) {
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
@@ -3199,7 +3199,7 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if (STOPONERROR) {
+	    if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-- 
cgit v0.12


From 925f00c5cad128feb5c4e49b7dd31edc205b4746 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 17 Jan 2023 14:15:39 +0000
Subject: Use TCL_ENCODING_HACK_FLAG in TableFromUtfProc too

---
 generic/tclEncoding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 2c4382d..3b9ab3e 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3199,7 +3199,7 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
+	    if ((STOPONERROR) && ((flags & TCL_ENCODING_CHAR_LIMIT) || (flags & TCL_ENCODING_HACK_FLAG))) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-- 
cgit v0.12


From 5d50502a2952145d5a6eaa4482ccd79628c1e16f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 18 Jan 2023 13:26:15 +0000
Subject: Forget about TCL_ENCODING_HACK_FLAG, this should be the fix. Testing
 ...

---
 generic/tcl.h         | 1 -
 generic/tclEncoding.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 36e1a35..f373382 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2145,7 +2145,6 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_MODIFIED		0x20
 #define TCL_ENCODING_NOCOMPLAIN		0x40
 #define TCL_ENCODING_STRICT			0x44
-#define TCL_ENCODING_HACK_FLAG (1<<20)
 
 /*
  * The following definitions are the error codes returned by the conversion
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 3b9ab3e..ca96057 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2409,7 +2409,7 @@ UtfToUtfProc(
 	     */
 
 	    if (flags & TCL_ENCODING_MODIFIED) {
-		if ((STOPONERROR) && ((flags & TCL_ENCODING_CHAR_LIMIT) || (flags & TCL_ENCODING_HACK_FLAG))) {
+		if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
@@ -3199,7 +3199,7 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if ((STOPONERROR) && ((flags & TCL_ENCODING_CHAR_LIMIT) || (flags & TCL_ENCODING_HACK_FLAG))) {
+	    if (STOPONERROR) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-- 
cgit v0.12


From 31226696c3e4dd02735044bc1fbf316c0955e65a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 18 Jan 2023 14:10:09 +0000
Subject: Some test-cases need -nocomplainencoding 1, because they use the
 fallback behavior.

---
 tests/chanio.test | 6 +++---
 tests/io.test     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index 2189cc4..6b45da9 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -252,7 +252,7 @@ test chan-io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} -bod
 test chan-io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 16
+    chan configure $f -encoding jis0208 -buffersize 16 -nocomplainencoding 1
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -265,7 +265,7 @@ test chan-io-3.5 {WriteChars: saved != 0} -body {
     # be moved to beginning of next channel buffer to preserve requested
     # buffersize.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17
+    chan configure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -298,7 +298,7 @@ test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # on flush. The truncated bytes are moved to the beginning of the next
     # channel buffer.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17
+    chan configure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
diff --git a/tests/io.test b/tests/io.test
index d10e1e4..d2e687d 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -272,7 +272,7 @@ test io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 16
+    fconfigure $f -encoding jis0208 -buffersize 16 -nocomplainencoding 1
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -286,7 +286,7 @@ test io-3.5 {WriteChars: saved != 0} -body {
     # requested buffersize.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17
+    fconfigure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -319,7 +319,7 @@ test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # of the next channel buffer.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17
+    fconfigure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
-- 
cgit v0.12


From 22657ad365387756101eef242c94c8989688955c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 19 Jan 2023 17:01:40 +0000
Subject: New proposal: Allow "-strict" immediately before or after "-failindex
 var".

---
 doc/encoding.n        |  4 ++--
 generic/tclCmdAH.c    | 43 +++++++++++++++++++++++++++++++++-----
 generic/tclEncoding.c |  7 ++++---
 generic/tclIO.h       |  1 +
 tests/cmdAH.test      | 58 ++++++++++++++++++++++++++++++++++++++++-----------
 tests/encoding.test   |  4 ++--
 tests/safe.test       |  8 +++----
 7 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index 7eae61a..24ca1c7 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -48,7 +48,7 @@ in case of a conversion error, the position of the input byte causing the error
 is returned in the given variable.  The return value of the command are the
 converted characters until the first error position.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR, and it already implies \fB-strict\fR.
+may not be used together with \fB-nocomplain\fR.
 .PP
 The option \fB-nocomplain\fR has no effect and is available for compatibility with
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
@@ -81,7 +81,7 @@ in case of a conversion error, the position of the input character causing the e
 is returned in the given variable.  The return value of the command are the
 converted bytes until the first error position. No error condition is raised.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR, and it already implies \fB-strict\fR.
+may not be used together with \fB-nocomplain\fR.
 .PP
 The option \fB-nocomplain\fR has no effect and is available for compatibility with
 TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 016bd02..72cc618 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -12,6 +12,7 @@
  */
 
 #include "tclInt.h"
+#include "tclIO.h"
 #ifdef _WIN32
 #   include "tclWinInt.h"
 #endif
@@ -574,7 +575,7 @@ EncodingConvertfromObjCmd(
     if (objc == 2) {
 	encoding = Tcl_GetEncoding(interp, NULL);
 	data = objv[1];
-    } else if (objc > 2 && objc < 6) {
+    } else if (objc > 2 && objc < 7) {
 	int objcUnprocessed = objc;
 	data = objv[objc - 1];
 	bytesPtr = Tcl_GetString(objv[1]);
@@ -586,6 +587,16 @@ EncodingConvertfromObjCmd(
 		&& !strncmp(bytesPtr, "-strict", strlen(bytesPtr))) {
 	    flags = TCL_ENCODING_STRICT;
 	    objcUnprocessed--;
+		bytesPtr = Tcl_GetString(objv[2]);
+		if (bytesPtr[0] == '-' && bytesPtr[1] == 'f'
+			&& !strncmp(bytesPtr, "-failindex", strlen(bytesPtr))) {
+		    /* at least two additional arguments needed */
+		    if (objc < 6) {
+			goto encConvFromError;
+		    }
+		    failVarObj = objv[3];
+		    objcUnprocessed -= 2;
+		}
 	} else if (bytesPtr[0] == '-' && bytesPtr[1] == 'f'
 		&& !strncmp(bytesPtr, "-failindex", strlen(bytesPtr))) {
 	    /* at least two additional arguments needed */
@@ -593,8 +604,14 @@ EncodingConvertfromObjCmd(
 		goto encConvFromError;
 	    }
 	    failVarObj = objv[2];
-	    flags = TCL_ENCODING_STRICT;
+	    flags = ENCODING_FAILINDEX;
 	    objcUnprocessed -= 2;
+		bytesPtr = Tcl_GetString(objv[3]);
+		if (bytesPtr[0] == '-' && bytesPtr[1] == 's'
+			&& !strncmp(bytesPtr, "-strict", strlen(bytesPtr))) {
+		    flags = TCL_ENCODING_STRICT;
+		    objcUnprocessed --;
+		}
 	}
 	switch (objcUnprocessed) {
 	    case 3:
@@ -610,7 +627,7 @@ EncodingConvertfromObjCmd(
 	}
     } else {
     encConvFromError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|-strict|-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|?-strict? ?-failindex var?? ?encoding? data");
 	return TCL_ERROR;
     }
 
@@ -725,6 +742,16 @@ EncodingConverttoObjCmd(
 		&& !strncmp(stringPtr, "-strict", strlen(stringPtr))) {
 	    flags = TCL_ENCODING_STRICT;
 	    objcUnprocessed--;
+		stringPtr = Tcl_GetString(objv[2]);
+		if (stringPtr[0] == '-' && stringPtr[1] == 'f'
+			&& !strncmp(stringPtr, "-failindex", strlen(stringPtr))) {
+		    /* at least two additional arguments needed */
+		    if (objc < 6) {
+			goto encConvToError;
+		    }
+		    failVarObj = objv[3];
+		    objcUnprocessed -= 2;
+		}
 	} else if (stringPtr[0] == '-' && stringPtr[1] == 'f'
 		&& !strncmp(stringPtr, "-failindex", strlen(stringPtr))) {
 	    /* at least two additional arguments needed */
@@ -732,8 +759,14 @@ EncodingConverttoObjCmd(
 		goto encConvToError;
 	    }
 	    failVarObj = objv[2];
-	    flags = TCL_ENCODING_STRICT;
+	    flags = TCL_ENCODING_STOPONERROR;
 	    objcUnprocessed -= 2;
+		stringPtr = Tcl_GetString(objv[3]);
+		if (stringPtr[0] == '-' && stringPtr[1] == 's'
+			&& !strncmp(stringPtr, "-strict", strlen(stringPtr))) {
+		    flags = TCL_ENCODING_STRICT;
+		    objcUnprocessed --;
+		}
 	}
 	switch (objcUnprocessed) {
 	    case 3:
@@ -749,7 +782,7 @@ EncodingConverttoObjCmd(
 	}
     } else {
     encConvToError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|-strict|-failindex var? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|?-strict? ?-failindex var?? ?encoding? data");
 	return TCL_ERROR;
     }
 
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index ca96057..2f7d803 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -10,6 +10,7 @@
  */
 
 #include "tclInt.h"
+#include "tclIO.h"
 
 typedef size_t (LengthProc)(const char *src);
 
@@ -2386,9 +2387,9 @@ UtfToUtfProc(
 
 	    *dst++ = *src++;
 	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-		&& (UCHAR(src[1]) == 0x80) && (!(flags & TCL_ENCODING_MODIFIED) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+		&& (UCHAR(src[1]) == 0x80) && (!(flags & TCL_ENCODING_MODIFIED) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX))) {
 	    /*
-	     * If in input mode, and -strict is specified: This is an error.
+	     * If in input mode, and -strict or -failindex is specified: This is an error.
 	     */
 	    if (flags & TCL_ENCODING_MODIFIED) {
 		result = TCL_CONVERT_SYNTAX;
@@ -2413,7 +2414,7 @@ UtfToUtfProc(
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
-	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
diff --git a/generic/tclIO.h b/generic/tclIO.h
index fbd01ee..a69e990 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -284,6 +284,7 @@ typedef struct ChannelState {
 					 * usable, but it may not be closed
 					 * again from within the close
 					 * handler. */
+#define ENCODING_FAILINDEX	(1<<20) /* Internal flag, fail on Invalid bytes only */
 #define CHANNEL_CLOSEDWRITE	(1<<21)	/* Channel write side has been closed.
 					 * No further Tcl-level write IO on
 					 * the channel is allowed. */
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 3533cb6..9d51951 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -179,7 +179,7 @@ test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
 } -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
 test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto
-} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.4 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto foo bar
 } -result {unknown encoding "foo"}
@@ -201,7 +201,7 @@ test cmdAH-4.6 {Tcl_EncodingObjCmd} -setup {
 } -result 8C
 test cmdAH-4.7 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.8 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom foo bar
 } -result {unknown encoding "foo"}
@@ -238,10 +238,10 @@ test cmdAH-4.13 {Tcl_EncodingObjCmd} -setup {
 
 test cmdAH-4.14.1 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.14.2 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertto -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.15.1 {Syntax error, -failindex and -nocomplain, no encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain ABC
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
@@ -250,19 +250,19 @@ test cmdAH-4.15.2 {Syntax error, -failindex and -nocomplain, no encoding} -body
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
 test cmdAH-4.16.1 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.16.2 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertto -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.17.1 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.17.2 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertto -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.18.1 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertfrom -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertfrom -failindex ABC
@@ -270,12 +270,12 @@ test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.18.3 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertto -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertto -failindex ABC
@@ -283,7 +283,7 @@ test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.19.1 {convertrom -failindex with correct data} -body {
@@ -333,6 +333,40 @@ test cmdAH-4.20.2 {convertrom -failindex with incomplete utf8 (byte compiled)} -
 } -returnCodes 0 -result {41 1} -cleanup {
     rename encoding_test ""
 }
+test cmdAH-4.20.3 {convertrom -failindex with incomplete utf8} -body {
+    set x [encoding convertfrom -strict -failindex i utf-8 A\xc3]
+    binary scan $x H* y
+    list $y $i
+} -returnCodes 0 -result {41 1}
+test cmdAH-4.20.4 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
+    proc encoding_test {} {
+	set x [encoding convertfrom -strict -failindex i utf-8 A\xc3]
+	binary scan $x H* y
+	list $y $i
+    }
+} -body {
+    # Compile and execute
+    encoding_test
+} -returnCodes 0 -result {41 1} -cleanup {
+    rename encoding_test ""
+}
+test cmdAH-4.20.5 {convertrom -failindex with incomplete utf8} -body {
+    set x [encoding convertfrom -failindex i -strict utf-8 A\xc3]
+    binary scan $x H* y
+    list $y $i
+} -returnCodes 0 -result {41 1}
+test cmdAH-4.20.6 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
+    proc encoding_test {} {
+	set x [encoding convertfrom -failindex i -strict utf-8 A\xc3]
+	binary scan $x H* y
+	list $y $i
+    }
+} -body {
+    # Compile and execute
+    encoding_test
+} -returnCodes 0 -result {41 1} -cleanup {
+    rename encoding_test ""
+}
 test cmdAH-4.21.1 {convertto -failindex with wrong character} -body {
     set x [encoding convertto -failindex i iso8859-1 A\u0141]
     binary scan $x H* y
diff --git a/tests/encoding.test b/tests/encoding.test
index a1d129e..095672c 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -681,10 +681,10 @@ test encoding-24.21 {Parse with -nocomplain but without providing encoding} {
 } 1
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test encoding-24.24 {Parse invalid utf-8 with -strict} -body {
     encoding convertfrom -strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
diff --git a/tests/safe.test b/tests/safe.test
index f2c0862..be1ce57 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1473,7 +1473,7 @@ test safe-11.7 {testing safe encoding} -setup {
     interp eval $i encoding convertfrom
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test safe-11.7.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1482,7 +1482,7 @@ test safe-11.7.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|-strict|-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"
     while executing
 "encoding convertfrom"
     invoked from within
@@ -1495,7 +1495,7 @@ test safe-11.8 {testing safe encoding} -setup {
     interp eval $i encoding convertto
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
 test safe-11.8.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1504,7 +1504,7 @@ test safe-11.8.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain|-strict|-failindex var? ?encoding? data"
+} -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"
     while executing
 "encoding convertto"
     invoked from within
-- 
cgit v0.12


From c611835152c63f8995c427ab9684ecf6125ec2f8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 19 Jan 2023 21:36:05 +0000
Subject: Proposed fix for [3e8074aea7]: [interp limit time -seconds] has a
 y2k38 problem

---
 generic/tclInterp.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 11202ce..613a86a 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -4686,7 +4686,7 @@ ChildTimeLimitCmd(
 		Tcl_Time limitMoment;
 
 		Tcl_LimitGetTime(childInterp, &limitMoment);
-		Tcl_SetObjResult(interp, Tcl_NewLongObj(limitMoment.sec));
+		Tcl_SetObjResult(interp, Tcl_NewWideIntObj(limitMoment.sec));
 	    }
 	    break;
 	}
@@ -4744,25 +4744,27 @@ ChildTimeLimitCmd(
 		}
 		limitMoment.usec = ((long) tmp)*1000;
 		break;
-	    case OPT_SEC:
+	    case OPT_SEC: {
+		Tcl_WideInt sec;
 		secObj = objv[i+1];
 		(void) Tcl_GetStringFromObj(objv[i+1], &secLen);
 		if (secLen == 0) {
 		    break;
 		}
-		if (TclGetIntFromObj(interp, objv[i+1], &tmp) != TCL_OK) {
+		if (TclGetWideIntFromObj(interp, objv[i+1], &sec) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		if (tmp < 0) {
+		if (sec < 0) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "seconds must be at least 0", -1));
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			    "BADVALUE", NULL);
 		    return TCL_ERROR;
 		}
-		limitMoment.sec = tmp;
+		limitMoment.sec = sec;
 		break;
 	    }
+	    }
 	}
 	if (milliObj != NULL || secObj != NULL) {
 	    if (milliObj != NULL) {
-- 
cgit v0.12


From 073e6715d127e9c252cdc1c852445d0f983e8e27 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 20 Jan 2023 16:51:50 +0000
Subject: Better error-message

---
 generic/tclCmdAH.c  |  9 +++++++--
 tests/cmdAH.test    | 24 ++++++++++++------------
 tests/encoding.test |  4 ++--
 tests/safe.test     |  8 ++++----
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 72cc618..b52e2fc 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -627,7 +627,9 @@ EncodingConvertfromObjCmd(
 	}
     } else {
     encConvFromError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|?-strict? ?-failindex var?? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-strict? ?-failindex var? ?encoding? data");
+	((Interp *) interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
+	Tcl_WrongNumArgs(interp, 1, objv, "-nocomplain ?encoding? data");
 	return TCL_ERROR;
     }
 
@@ -782,7 +784,10 @@ EncodingConverttoObjCmd(
 	}
     } else {
     encConvToError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nocomplain|?-strict? ?-failindex var?? ?encoding? data");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-strict? ?-failindex var? ?encoding? data");
+	((Interp *) interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
+	Tcl_WrongNumArgs(interp, 1, objv, "-nocomplain ?encoding? data");
+
 	return TCL_ERROR;
     }
 
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 9d51951..d7a3657 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -179,7 +179,7 @@ test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
 } -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
 test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto
-} -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
 test cmdAH-4.4 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertto foo bar
 } -result {unknown encoding "foo"}
@@ -201,7 +201,7 @@ test cmdAH-4.6 {Tcl_EncodingObjCmd} -setup {
 } -result 8C
 test cmdAH-4.7 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
 test cmdAH-4.8 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding convertfrom foo bar
 } -result {unknown encoding "foo"}
@@ -238,10 +238,10 @@ test cmdAH-4.13 {Tcl_EncodingObjCmd} -setup {
 
 test cmdAH-4.14.1 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
 test cmdAH-4.14.2 {Syntax error, -nocomplain and -failindex, no encoding} -body {
     encoding convertto -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
 test cmdAH-4.15.1 {Syntax error, -failindex and -nocomplain, no encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain ABC
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
@@ -250,19 +250,19 @@ test cmdAH-4.15.2 {Syntax error, -failindex and -nocomplain, no encoding} -body
 } -returnCodes 1 -result {unknown encoding "-nocomplain"}
 test cmdAH-4.16.1 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertfrom -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
 test cmdAH-4.16.2 {Syntax error, -nocomplain and -failindex, encoding} -body {
     encoding convertto -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
 test cmdAH-4.17.1 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertfrom -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
 test cmdAH-4.17.2 {Syntax error, -failindex and -nocomplain, encoding} -body {
     encoding convertto -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
 test cmdAH-4.18.1 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertfrom -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"}
 test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertfrom -failindex ABC
@@ -270,12 +270,12 @@ test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.18.3 {Syntax error, -failindex with no var, no encoding} -body {
     encoding convertto -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"}
 test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
     proc encoding_test {} {
         encoding convertto -failindex ABC
@@ -283,7 +283,7 @@ test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compi
 } -body {
     # Compile and execute
     encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"} -cleanup {
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"} -cleanup {
     rename encoding_test ""
 }
 test cmdAH-4.19.1 {convertrom -failindex with correct data} -body {
diff --git a/tests/encoding.test b/tests/encoding.test
index 095672c..61676ea 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -681,10 +681,10 @@ test encoding-24.21 {Parse with -nocomplain but without providing encoding} {
 } 1
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"}
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"}
 test encoding-24.24 {Parse invalid utf-8 with -strict} -body {
     encoding convertfrom -strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
diff --git a/tests/safe.test b/tests/safe.test
index be1ce57..ee81783 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1473,7 +1473,7 @@ test safe-11.7 {testing safe encoding} -setup {
     interp eval $i encoding convertfrom
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
 test safe-11.7.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1482,7 +1482,7 @@ test safe-11.7.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"
+} -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"
     while executing
 "encoding convertfrom"
     invoked from within
@@ -1495,7 +1495,7 @@ test safe-11.8 {testing safe encoding} -setup {
     interp eval $i encoding convertto
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"}
+} -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
 test safe-11.8.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1504,7 +1504,7 @@ test safe-11.8.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ?-nocomplain|?-strict? ?-failindex var?? ?encoding? data"
+} -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"
     while executing
 "encoding convertto"
     invoked from within
-- 
cgit v0.12


From 792c57a7fb9f7db346f92861d380a32d1c31ea8a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 20 Jan 2023 20:59:22 +0000
Subject: Make documentation conform to implementation in this branch

---
 doc/encoding.n | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index 24ca1c7..9577da3 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -28,7 +28,8 @@ formats.
 Performs one of several encoding related operations, depending on
 \fIoption\fR.  The legal \fIoption\fRs are:
 .TP
-\fBencoding convertfrom\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertfrom\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertfrom\fR \fB-nocomplain\fR ?\fIencoding\fR? \fIdata\fR
 .
 Convert \fIdata\fR to a Unicode string from the specified \fIencoding\fR.  The
 characters in \fIdata\fR are 8 bit binary data.  The resulting
@@ -56,11 +57,13 @@ This switch restores the TCL8.7 behaviour.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
 encoder, it disallows invalid byte sequences and surrogates (which -
-otherwise - are just passed through).
+otherwise - are just passed through).  This option may not be used together
+with \fB-nocomplain\fR.
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
-\fBencoding convertto\fR ?\fB-nocomplain\fR|\fB-strict\fR|\fB-failindex var\fR? ?\fIencoding\fR? \fIstring\fR
+\fBencoding convertto\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertto\fR \fB-nocomplain\fR ?\fIencoding\fR? \fIdata\fR
 .
 Convert \fIstring\fR from Unicode to the specified \fIencoding\fR.
 The result is a sequence of bytes that represents the converted
@@ -88,7 +91,8 @@ TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
 This switch restores the TCL8.7 behaviour.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows surrogates (which - otherwise - are just passed through).
+encoder, it disallows surrogates (which - otherwise - are just passed through).  This
+option may not be used together with \fB-nocomplain\fR.
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .RE
 .TP
-- 
cgit v0.12


From 52948a790cfe853df5cdbecc3c5436685b6210ba Mon Sep 17 00:00:00 2001
From: Kevin B Kenny <kennykb@acm.org>
Date: Sun, 22 Jan 2023 01:33:44 +0000
Subject: Bug [e3dcab1d14] fix

---
 generic/tclStrToD.c | 59 +++++++++++++++++++++++++++--------------------------
 tests/expr.test     | 37 +++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 557eaa1..972b5fd 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -263,34 +263,35 @@ static const int log2pow5[27] = {
 };
 #define N_LOG2POW5 27
 
-static const Tcl_WideUInt wuipow5[27] = {
-    (Tcl_WideUInt) 1,		/* 5**0 */
-    (Tcl_WideUInt) 5,
-    (Tcl_WideUInt) 25,
-    (Tcl_WideUInt) 125,
-    (Tcl_WideUInt) 625,
-    (Tcl_WideUInt) 3125,	/* 5**5 */
-    (Tcl_WideUInt) 3125*5,
-    (Tcl_WideUInt) 3125*25,
-    (Tcl_WideUInt) 3125*125,
-    (Tcl_WideUInt) 3125*625,
-    (Tcl_WideUInt) 3125*3125,	/* 5**10 */
-    (Tcl_WideUInt) 3125*3125*5,
-    (Tcl_WideUInt) 3125*3125*25,
-    (Tcl_WideUInt) 3125*3125*125,
-    (Tcl_WideUInt) 3125*3125*625,
-    (Tcl_WideUInt) 3125*3125*3125, /* 5**15 */
-    (Tcl_WideUInt) 3125*3125*3125*5,
-    (Tcl_WideUInt) 3125*3125*3125*25,
-    (Tcl_WideUInt) 3125*3125*3125*125,
-    (Tcl_WideUInt) 3125*3125*3125*625,
-    (Tcl_WideUInt) 3125*3125*3125*3125,	/* 5**20 */
-    (Tcl_WideUInt) 3125*3125*3125*3125*5,
-    (Tcl_WideUInt) 3125*3125*3125*3125*25,
-    (Tcl_WideUInt) 3125*3125*3125*3125*125,
-    (Tcl_WideUInt) 3125*3125*3125*3125*625,
-    (Tcl_WideUInt) 3125*3125*3125*3125*3125,  /* 5**25 */
-    (Tcl_WideUInt) 3125*3125*3125*3125*3125*5 /* 5**26 */
+static const Tcl_WideUInt wuipow5[28] = {
+    (Tcl_WideUInt) 1U,		/* 5**0 */
+    (Tcl_WideUInt) 5U,
+    (Tcl_WideUInt) 25U,
+    (Tcl_WideUInt) 125U,
+    (Tcl_WideUInt) 625U,
+    (Tcl_WideUInt) 3125U,	/* 5**5 */
+    (Tcl_WideUInt) 3125U*5U,
+    (Tcl_WideUInt) 3125U*25U,
+    (Tcl_WideUInt) 3125U*125U,
+    (Tcl_WideUInt) 3125U*625U,
+    (Tcl_WideUInt) 3125U*3125U,	/* 5**10 */
+    (Tcl_WideUInt) 3125U*3125U*5U,
+    (Tcl_WideUInt) 3125U*3125U*25U,
+    (Tcl_WideUInt) 3125U*3125U*125U,
+    (Tcl_WideUInt) 3125U*3125U*625U,
+    (Tcl_WideUInt) 3125U*3125U*3125U, /* 5**15 */
+    (Tcl_WideUInt) 3125U*3125U*3125U*5U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*25U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*125U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*625U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U,	/* 5**20 */
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U*5U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U*25U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U*125U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U*625U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U*3125U,  /* 5**25 */
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U*3125U*5U,
+    (Tcl_WideUInt) 3125U*3125U*3125U*3125U*3125U*25U /* 5**27 */
 };
 
 /*
@@ -4395,7 +4396,7 @@ TclDoubleDigits(
 	    ++m2plus;
 	}
 
-	if (s5+1 < N_LOG2POW5 && s2+1 + log2pow5[s5+1] <= 64) {
+	if (s5+1 < N_LOG2POW5 && s2+1 + log2pow5[s5+1] < 64) {
 	    /*
 	     * If 10*2**s2*5**s5 == 2**(s2+1)+5**(s5+1) fits in a 64-bit word,
 	     * then all our intermediate calculations can be done using exact
diff --git a/tests/expr.test b/tests/expr.test
index 4fa6821..57c44ed 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -7277,6 +7277,43 @@ test expr-52.1 {
 		::tcl::unsupported::representation $a]]
 } {0 0 1 1}
 
+# Bug e3dcab1d14
+proc do-one-test-expr-61 {e p float athreshold} {
+    # e - power of 2 to test
+    # p - tcl_precision to test wuth
+    # float - floating point value 2**-$p
+    # athreshold - tolerable absolute error (1/2 decimal digit in
+    #              least significant place plus 1/2 least significant bit)
+    set trouble {}
+    set ::tcl_precision $p
+    set xfmt x[expr $float]
+    set ::tcl_precision 0
+    set fmt [string range $xfmt 1 end]
+    set aerror [expr {abs($fmt - $float)}]
+    if {$aerror > $athreshold} {
+        return "Result $fmt is more than $athreshold away from $float"
+    } else {
+        return {}
+    }
+}
+
+proc run-test-expr-61 {} {
+    for {set e 0} {$e <= 1023} {incr e} {
+        set pt [expr {floor($e*log(2)/log(10))}]
+        for {set p 6} {$p <= 17} {incr p} {
+            set athreshold [expr {0.5*10.0**-($pt+$p) + 2.0**-($e+53)}]
+            set numer [expr {5**$e}]
+            set xfloat x[expr {2.**-$e}]
+            set float [string range $xfloat 1 end]
+            test expr-61.$p.$e "convert 2**-$e to decimal at precision $p" {
+                do-one-test-expr-61 $e $p $float $athreshold
+            } {}
+        }
+    }
+    rename do-one-test-expr-61 {}
+    rename run-test-expr-61 {}
+}
+run-test-expr-61
 
 
 # cleanup
-- 
cgit v0.12


From 119519c4df904cc9914302f68b70897ad33b9db3 Mon Sep 17 00:00:00 2001
From: Kevin B Kenny <kennykb@acm.org>
Date: Sun, 22 Jan 2023 01:37:07 +0000
Subject: Remove unneeded hard-coded array size

---
 generic/tclStrToD.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 972b5fd..d5578a9 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -263,7 +263,7 @@ static const int log2pow5[27] = {
 };
 #define N_LOG2POW5 27
 
-static const Tcl_WideUInt wuipow5[28] = {
+static const Tcl_WideUInt wuipow5[] = {
     (Tcl_WideUInt) 1U,		/* 5**0 */
     (Tcl_WideUInt) 5U,
     (Tcl_WideUInt) 25U,
-- 
cgit v0.12


From 4ef7c0c4b836759619b399102ea01f01b4a61165 Mon Sep 17 00:00:00 2001
From: Kevin B Kenny <kennykb@acm.org>
Date: Sun, 22 Jan 2023 01:48:02 +0000
Subject: Missed one more off-by-one error, also, tests misnumbered for merge
 forward.

---
 generic/tclStrToD.c |  2 +-
 tests/expr.test     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index d5578a9..c55554c 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -4453,7 +4453,7 @@ TclDoubleDigits(
 	    s2 -= b2; b2 = 0;
 	}
 
-	if (s5+1 < N_LOG2POW5 && s2+1 + log2pow5[s5+1] <= 64) {
+	if (s5+1 < N_LOG2POW5 && s2+1 + log2pow5[s5+1] < 64) {
 	    /*
 	     * If 10*2**s2*5**s5 == 2**(s2+1)+5**(s5+1) fits in a 64-bit word,
 	     * then all our intermediate calculations can be done using exact
diff --git a/tests/expr.test b/tests/expr.test
index 57c44ed..2434ab4 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -7278,7 +7278,7 @@ test expr-52.1 {
 } {0 0 1 1}
 
 # Bug e3dcab1d14
-proc do-one-test-expr-61 {e p float athreshold} {
+proc do-one-test-expr-63 {e p float athreshold} {
     # e - power of 2 to test
     # p - tcl_precision to test wuth
     # float - floating point value 2**-$p
@@ -7297,7 +7297,7 @@ proc do-one-test-expr-61 {e p float athreshold} {
     }
 }
 
-proc run-test-expr-61 {} {
+proc run-test-expr-63 {} {
     for {set e 0} {$e <= 1023} {incr e} {
         set pt [expr {floor($e*log(2)/log(10))}]
         for {set p 6} {$p <= 17} {incr p} {
@@ -7305,15 +7305,15 @@ proc run-test-expr-61 {} {
             set numer [expr {5**$e}]
             set xfloat x[expr {2.**-$e}]
             set float [string range $xfloat 1 end]
-            test expr-61.$p.$e "convert 2**-$e to decimal at precision $p" {
-                do-one-test-expr-61 $e $p $float $athreshold
+            test expr-63.$p.$e "convert 2**-$e to decimal at precision $p" {
+                do-one-test-expr-63 $e $p $float $athreshold
             } {}
         }
     }
-    rename do-one-test-expr-61 {}
-    rename run-test-expr-61 {}
+    rename do-one-test-expr-63 {}
+    rename run-test-expr-63 {}
 }
-run-test-expr-61
+run-test-expr-63
 
 
 # cleanup
-- 
cgit v0.12


From 46dcc60e4182a6b1bfae4b7bf93d03430e5e8ce6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 23 Jan 2023 19:18:39 +0000
Subject: Better error-message for previous commit. Some more code-cleanup,
 backported from 8.7

---
 generic/tclCmdAH.c  |  84 ++++++++++-----------------
 generic/tclInterp.c | 107 +++++++++++++++++-----------------
 generic/tclNamesp.c | 162 +++++++++++++++++++++++-----------------------------
 3 files changed, 153 insertions(+), 200 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index b3269f4..0bf5b8e 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -46,24 +46,12 @@ struct ForeachState {
 
 static int		CheckAccess(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 			    int mode);
-static int		BadEncodingSubcommand(ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		EncodingConvertfromObjCmd(ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		EncodingConverttoObjCmd(ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		EncodingDirsObjCmd(ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		EncodingNamesObjCmd(ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		EncodingSystemObjCmd(ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc	BadEncodingSubcommand;
+static Tcl_ObjCmdProc	EncodingConvertfromObjCmd;
+static Tcl_ObjCmdProc	EncodingConverttoObjCmd;
+static Tcl_ObjCmdProc	EncodingDirsObjCmd;
+static Tcl_ObjCmdProc	EncodingNamesObjCmd;
+static Tcl_ObjCmdProc	EncodingSystemObjCmd;
 static inline int	ForeachAssignments(Tcl_Interp *interp,
 			    struct ForeachState *statePtr);
 static inline void	ForeachCleanup(Tcl_Interp *interp,
@@ -132,7 +120,6 @@ static Tcl_ObjCmdProc PathTypeCmd;
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_BreakObjCmd(
     ClientData dummy,		/* Not used. */
@@ -164,8 +151,6 @@ Tcl_BreakObjCmd(
  *
  *----------------------------------------------------------------------
  */
-
-	/* ARGSUSED */
 int
 Tcl_CaseObjCmd(
     ClientData dummy,		/* Not used. */
@@ -300,7 +285,6 @@ Tcl_CaseObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_CatchObjCmd(
     ClientData dummy,		/* Not used. */
@@ -353,8 +337,8 @@ CatchObjCmdCallback(
 {
     Interp *iPtr = (Interp *) interp;
     int objc = PTR2INT(data[0]);
-    Tcl_Obj *varNamePtr = data[1];
-    Tcl_Obj *optionVarNamePtr = data[2];
+    Tcl_Obj *varNamePtr = (Tcl_Obj *)data[1];
+    Tcl_Obj *optionVarNamePtr = (Tcl_Obj *)data[2];
     int rewind = iPtr->execEnvPtr->rewind;
 
     /*
@@ -406,7 +390,6 @@ CatchObjCmdCallback(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_CdObjCmd(
     ClientData dummy,		/* Not used. */
@@ -462,7 +445,6 @@ Tcl_CdObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ConcatObjCmd(
     ClientData dummy,		/* Not used. */
@@ -497,7 +479,6 @@ Tcl_ConcatObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ContinueObjCmd(
     ClientData dummy,		/* Not used. */
@@ -834,10 +815,11 @@ EncodingDirsObjCmd(
  */
 
 int
-EncodingNamesObjCmd(ClientData dummy,       /* Unused */
-		    Tcl_Interp* interp,	    /* Tcl interpreter */
-		    int objc,		    /* Number of command line args */
-		    Tcl_Obj* const objv[])  /* Vector of command line args */
+EncodingNamesObjCmd(
+    ClientData dummy,       /* Unused */
+    Tcl_Interp* interp,	    /* Tcl interpreter */
+    int objc,		    /* Number of command line args */
+    Tcl_Obj* const objv[])  /* Vector of command line args */
 {
     if (objc > 1) {
 	Tcl_WrongNumArgs(interp, 1, objv, NULL);
@@ -864,10 +846,11 @@ EncodingNamesObjCmd(ClientData dummy,       /* Unused */
  */
 
 int
-EncodingSystemObjCmd(ClientData dummy,      /* Unused */
-		     Tcl_Interp* interp,    /* Tcl interpreter */
-		     int objc,		    /* Number of command line args */
-		     Tcl_Obj* const objv[]) /* Vector of command line args */
+EncodingSystemObjCmd(
+    ClientData dummy,      /* Unused */
+    Tcl_Interp* interp,     /* Tcl interpreter */
+    int objc,		    /* Number of command line args */
+    Tcl_Obj* const objv[])  /* Vector of command line args */
 {
     if (objc > 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?encoding?");
@@ -899,7 +882,6 @@ EncodingSystemObjCmd(ClientData dummy,      /* Unused */
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ErrorObjCmd(
     ClientData dummy,		/* Not used. */
@@ -949,7 +931,6 @@ Tcl_ErrorObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 EvalCmdErrMsg(
     ClientData data[],
@@ -1032,7 +1013,6 @@ TclNREvalObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ExitObjCmd(
     ClientData dummy,		/* Not used. */
@@ -1053,7 +1033,6 @@ Tcl_ExitObjCmd(
 	return TCL_ERROR;
     }
     Tcl_Exit(value);
-    /*NOTREACHED*/
     return TCL_OK;		/* Better not ever reach this! */
 }
 
@@ -1081,7 +1060,6 @@ Tcl_ExitObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ExprObjCmd(
     ClientData dummy,		/* Not used. */
@@ -1125,8 +1103,8 @@ ExprCallback(
     Tcl_Interp *interp,
     int result)
 {
-    Tcl_Obj *resultPtr = data[0];
-    Tcl_Obj *objPtr = data[1];
+    Tcl_Obj *resultPtr = (Tcl_Obj *)data[0];
+    Tcl_Obj *objPtr = (Tcl_Obj *)data[1];
 
     if (objPtr != NULL) {
 	Tcl_DecrRefCount(objPtr);
@@ -2319,7 +2297,7 @@ FilesystemSeparatorCmd(
 	return TCL_ERROR;
     }
     if (objc == 1) {
-	const char *separator = NULL; /* lint */
+	const char *separator = NULL;
 
 	switch (tclPlatform) {
 	case TCL_PLATFORM_UNIX:
@@ -2622,7 +2600,6 @@ GetTypeFromMode(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ForObjCmd(
     ClientData dummy,		/* Not used. */
@@ -2670,7 +2647,7 @@ ForSetupCallback(
     Tcl_Interp *interp,
     int result)
 {
-    ForIterData *iterPtr = data[0];
+    ForIterData *iterPtr = (ForIterData *)data[0];
 
     if (result != TCL_OK) {
 	if (result == TCL_ERROR) {
@@ -2689,7 +2666,7 @@ TclNRForIterCallback(
     Tcl_Interp *interp,
     int result)
 {
-    ForIterData *iterPtr = data[0];
+    ForIterData *iterPtr = (ForIterData *)data[0];
     Tcl_Obj *boolObj;
 
     switch (result) {
@@ -2725,8 +2702,8 @@ ForCondCallback(
     int result)
 {
     Interp *iPtr = (Interp *) interp;
-    ForIterData *iterPtr = data[0];
-    Tcl_Obj *boolObj = data[1];
+    ForIterData *iterPtr = (ForIterData *)data[0];
+    Tcl_Obj *boolObj = (Tcl_Obj *)data[1];
     int value;
 
     if (result != TCL_OK) {
@@ -2763,7 +2740,7 @@ ForNextCallback(
     int result)
 {
     Interp *iPtr = (Interp *) interp;
-    ForIterData *iterPtr = data[0];
+    ForIterData *iterPtr = (ForIterData *)data[0];
     Tcl_Obj *next = iterPtr->next;
 
     if ((result == TCL_OK) || (result == TCL_CONTINUE)) {
@@ -2787,7 +2764,7 @@ ForPostNextCallback(
     Tcl_Interp *interp,
     int result)
 {
-    ForIterData *iterPtr = data[0];
+    ForIterData *iterPtr = (ForIterData *)data[0];
 
     if ((result != TCL_BREAK) && (result != TCL_OK)) {
 	if (result == TCL_ERROR) {
@@ -2817,7 +2794,6 @@ ForPostNextCallback(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_ForeachObjCmd(
     ClientData dummy,		/* Not used. */
@@ -2892,7 +2868,7 @@ EachloopCmd(
      * allocation for better performance.
      */
 
-    statePtr = TclStackAlloc(interp,
+    statePtr = (struct ForeachState *)TclStackAlloc(interp,
 	    sizeof(struct ForeachState) + 3 * numLists * sizeof(int)
 	    + 2 * numLists * (sizeof(Tcl_Obj **) + sizeof(Tcl_Obj *)));
     memset(statePtr, 0,
@@ -2993,7 +2969,7 @@ ForeachLoopStep(
     Tcl_Interp *interp,
     int result)
 {
-    struct ForeachState *statePtr = data[0];
+    struct ForeachState *statePtr = (struct ForeachState *)data[0];
 
     /*
      * Process the result code from this run of the [foreach] body. Note that
@@ -3070,7 +3046,6 @@ ForeachAssignments(
     for (i=0 ; i<statePtr->numLists ; i++) {
 	for (v=0 ; v<statePtr->varcList[i] ; v++) {
 	    k = statePtr->index[i]++;
-
 	    if (k < statePtr->argcList[i]) {
 		valuePtr = statePtr->argvList[i][k];
 	    } else {
@@ -3135,7 +3110,6 @@ ForeachCleanup(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tcl_FormatObjCmd(
     ClientData dummy,		/* Not used. */
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 613a86a..2633a18 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -225,15 +225,12 @@ static int		AliasList(Tcl_Interp *interp, Tcl_Interp *childInterp);
 static int		AliasObjCmd(ClientData dummy,
 			    Tcl_Interp *currentInterp, int objc,
 			    Tcl_Obj *const objv[]);
-static int		AliasNRCmd(ClientData dummy,
-			    Tcl_Interp *currentInterp, int objc,
-			    Tcl_Obj *const objv[]);
-static void		AliasObjCmdDeleteProc(ClientData clientData);
+static Tcl_ObjCmdProc		AliasNRCmd;
+static Tcl_CmdDeleteProc	AliasObjCmdDeleteProc;
 static Tcl_Interp *	GetInterp(Tcl_Interp *interp, Tcl_Obj *pathPtr);
 static Tcl_Interp *	GetInterp2(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
-static void		InterpInfoDeleteProc(ClientData clientData,
-			    Tcl_Interp *interp);
+static Tcl_InterpDeleteProc	InterpInfoDeleteProc;
 static int		ChildBgerror(Tcl_Interp *interp,
 			    Tcl_Interp *childInterp, int objc,
 			    Tcl_Obj *const objv[]);
@@ -259,7 +256,7 @@ static int		ChildMarkTrusted(Tcl_Interp *interp,
 			    Tcl_Interp *childInterp);
 static int		ChildObjCmd(ClientData dummy, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
-static void		ChildObjCmdDeleteProc(ClientData clientData);
+static Tcl_CmdDeleteProc	ChildObjCmdDeleteProc;
 static int		ChildRecursionLimit(Tcl_Interp *interp,
 			    Tcl_Interp *childInterp, int objc,
 			    Tcl_Obj *const objv[]);
@@ -309,7 +306,7 @@ TclSetPreInitScript(
 {
     const char *prevString = tclPreInitScript;
     tclPreInitScript = string;
-    return(prevString);
+    return prevString;
 }
 
 /*
@@ -473,7 +470,7 @@ TclInterpInit(
     Parent *parentPtr;
     Child *childPtr;
 
-    interpInfoPtr = ckalloc(sizeof(InterpInfo));
+    interpInfoPtr = (InterpInfo *)ckalloc(sizeof(InterpInfo));
     ((Interp *) interp)->interpInfo = interpInfoPtr;
 
     parentPtr = &interpInfoPtr->parent;
@@ -589,7 +586,7 @@ InterpInfoDeleteProc(
  *
  *----------------------------------------------------------------------
  */
-	/* ARGSUSED */
+
 int
 Tcl_InterpObjCmd(
     ClientData clientData,		/* Unused. */
@@ -618,7 +615,7 @@ NRInterpCmd(
 	"slaves",	"share",	"target",	"transfer",
 	NULL
     };
-    enum option {
+    enum interpOptionEnum {
 	OPT_ALIAS,	OPT_ALIASES,	OPT_BGERROR,	OPT_CANCEL,
 	OPT_CHILDREN,	OPT_CREATE,	OPT_DEBUG,	OPT_DELETE,
 	OPT_EVAL,	OPT_EXISTS,	OPT_EXPOSE,
@@ -635,7 +632,7 @@ NRInterpCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    switch ((enum option) index) {
+    switch ((enum interpOptionEnum)index) {
     case OPT_ALIAS: {
 	Tcl_Interp *parentInterp;
 
@@ -688,7 +685,7 @@ NRInterpCmd(
 	static const char *const cancelOptions[] = {
 	    "-unwind",	"--",	NULL
 	};
-	enum option {
+	enum optionCancelEnum {
 	    OPT_UNWIND,	OPT_LAST
 	};
 
@@ -703,7 +700,7 @@ NRInterpCmd(
 		return TCL_ERROR;
 	    }
 
-	    switch ((enum option) index) {
+	    switch ((enum optionCancelEnum) index) {
 	    case OPT_UNWIND:
 		/*
 		 * The evaluation stack in the target interp is to be unwound.
@@ -1024,7 +1021,7 @@ NRInterpCmd(
 	TclNewObj(resultPtr);
 	hPtr = Tcl_FirstHashEntry(&iiPtr->parent.childTable, &hashSearch);
 	for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&hashSearch)) {
-	    string = Tcl_GetHashKey(&iiPtr->parent.childTable, hPtr);
+	    string = (char *)Tcl_GetHashKey(&iiPtr->parent.childTable, hPtr);
 	    Tcl_ListObjAppendElement(NULL, resultPtr,
 		    Tcl_NewStringObj(string, -1));
 	}
@@ -1095,7 +1092,7 @@ NRInterpCmd(
 		    NULL);
 	    return TCL_ERROR;
 	}
-	aliasPtr = Tcl_GetHashValue(hPtr);
+	aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
 	if (Tcl_GetInterpPath(interp, aliasPtr->targetInterp) != TCL_OK) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "target interpreter for alias \"%s\" in path \"%s\" is "
@@ -1178,7 +1175,7 @@ Tcl_CreateAlias(
     int i;
     int result;
 
-    objv = TclStackAlloc(childInterp, (unsigned) sizeof(Tcl_Obj *) * argc);
+    objv = (Tcl_Obj **)TclStackAlloc(childInterp, sizeof(Tcl_Obj *) * argc);
     for (i = 0; i < argc; i++) {
 	objv[i] = Tcl_NewStringObj(argv[i], -1);
 	Tcl_IncrRefCount(objv[i]);
@@ -1284,7 +1281,7 @@ Tcl_GetAlias(
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName, NULL);
 	return TCL_ERROR;
     }
-    aliasPtr = Tcl_GetHashValue(hPtr);
+    aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
     objc = aliasPtr->objc;
     objv = &aliasPtr->objPtr;
 
@@ -1346,7 +1343,7 @@ Tcl_GetAliasObj(
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName, NULL);
 	return TCL_ERROR;
     }
-    aliasPtr = Tcl_GetHashValue(hPtr);
+    aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
     objc = aliasPtr->objc;
     objv = &aliasPtr->objPtr;
 
@@ -1414,7 +1411,7 @@ TclPreventAliasLoop(
      * chain then we have a loop.
      */
 
-    aliasPtr = cmdPtr->objClientData;
+    aliasPtr = (Alias *)cmdPtr->objClientData;
     nextAliasPtr = aliasPtr;
     while (1) {
 	Tcl_Obj *cmdNamePtr;
@@ -1462,10 +1459,8 @@ TclPreventAliasLoop(
 	if (aliasCmdPtr->objProc != AliasObjCmd) {
 	    return TCL_OK;
 	}
-	nextAliasPtr = aliasCmdPtr->objClientData;
+	nextAliasPtr = (Alias *)aliasCmdPtr->objClientData;
     }
-
-    /* NOTREACHED */
 }
 
 /*
@@ -1505,7 +1500,7 @@ AliasCreate(
     Tcl_Obj **prefv;
     int isNew, i;
 
-    aliasPtr = ckalloc(sizeof(Alias) + objc * sizeof(Tcl_Obj *));
+    aliasPtr = (Alias *)ckalloc(sizeof(Alias) + objc * sizeof(Tcl_Obj *));
     aliasPtr->token = namePtr;
     Tcl_IncrRefCount(aliasPtr->token);
     aliasPtr->targetInterp = parentInterp;
@@ -1613,7 +1608,7 @@ AliasCreate(
      * interp alias {} foo {} zop		# Now recreate "foo"...
      */
 
-    targetPtr = ckalloc(sizeof(Target));
+    targetPtr = (Target *)ckalloc(sizeof(Target));
     targetPtr->childCmd = aliasPtr->childCmd;
     targetPtr->childInterp = childInterp;
 
@@ -1674,7 +1669,7 @@ AliasDelete(
 		TclGetString(namePtr), NULL);
 	return TCL_ERROR;
     }
-    aliasPtr = Tcl_GetHashValue(hPtr);
+    aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
     Tcl_DeleteCommandFromToken(childInterp, aliasPtr->childCmd);
     return TCL_OK;
 }
@@ -1719,7 +1714,7 @@ AliasDescribe(
     if (hPtr == NULL) {
 	return TCL_OK;
     }
-    aliasPtr = Tcl_GetHashValue(hPtr);
+    aliasPtr = (Alias *)Tcl_GetHashValue(hPtr);
     prefixPtr = Tcl_NewListObj(aliasPtr->objc, &aliasPtr->objPtr);
     Tcl_SetObjResult(interp, prefixPtr);
     return TCL_OK;
@@ -1757,7 +1752,7 @@ AliasList(
 
     entryPtr = Tcl_FirstHashEntry(&childPtr->aliasTable, &hashSearch);
     for ( ; entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&hashSearch)) {
-	aliasPtr = Tcl_GetHashValue(entryPtr);
+	aliasPtr = (Alias *)Tcl_GetHashValue(entryPtr);
 	Tcl_ListObjAppendElement(NULL, resultPtr, aliasPtr->token);
     }
     Tcl_SetObjResult(interp, resultPtr);
@@ -1793,7 +1788,7 @@ AliasNRCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument vector. */
 {
-    Alias *aliasPtr = clientData;
+    Alias *aliasPtr = (Alias *)clientData;
     int prefc, cmdc, i;
     Tcl_Obj **prefv, **cmdv;
     Tcl_Obj *listPtr;
@@ -1842,7 +1837,7 @@ AliasObjCmd(
     Tcl_Obj *const objv[])	/* Argument vector. */
 {
 #define ALIAS_CMDV_PREALLOC 10
-    Alias *aliasPtr = clientData;
+    Alias *aliasPtr = (Alias *)clientData;
     Tcl_Interp *targetInterp = aliasPtr->targetInterp;
     int result, prefc, cmdc, i;
     Tcl_Obj **prefv, **cmdv;
@@ -1861,7 +1856,7 @@ AliasObjCmd(
     if (cmdc <= ALIAS_CMDV_PREALLOC) {
 	cmdv = cmdArr;
     } else {
-	cmdv = TclStackAlloc(interp, cmdc * sizeof(Tcl_Obj *));
+	cmdv = (Tcl_Obj **)TclStackAlloc(interp, cmdc * sizeof(Tcl_Obj *));
     }
 
     memcpy(cmdv, prefv, prefc * sizeof(Tcl_Obj *));
@@ -1947,7 +1942,7 @@ static void
 AliasObjCmdDeleteProc(
     ClientData clientData)	/* The alias record for this alias. */
 {
-    Alias *aliasPtr = clientData;
+    Alias *aliasPtr = (Alias *)clientData;
     Target *targetPtr;
     int i;
     Tcl_Obj **objv;
@@ -2123,7 +2118,7 @@ TclSetChildCancelFlags(
 
     hPtr = Tcl_FirstHashEntry(&parentPtr->childTable, &hashSearch);
     for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&hashSearch)) {
-	childPtr = Tcl_GetHashValue(hPtr);
+	childPtr = (Child *)Tcl_GetHashValue(hPtr);
 	iPtr = (Interp *) childPtr->childInterp;
 
 	if (iPtr == NULL) {
@@ -2188,7 +2183,7 @@ Tcl_GetInterpPath(
 	return TCL_ERROR;
     }
     Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp),
-	    Tcl_NewStringObj(Tcl_GetHashKey(&iiPtr->parent.childTable,
+	    Tcl_NewStringObj((const char *)Tcl_GetHashKey(&iiPtr->parent.childTable,
 		    iiPtr->child.childEntryPtr), -1));
     return TCL_OK;
 }
@@ -2236,7 +2231,7 @@ GetInterp(
 	    searchInterp = NULL;
 	    break;
 	}
-	childPtr = Tcl_GetHashValue(hPtr);
+	childPtr = (Child *)Tcl_GetHashValue(hPtr);
 	searchInterp = childPtr->childInterp;
 	if (searchInterp == NULL) {
 	    break;
@@ -2462,7 +2457,7 @@ NRChildCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tcl_Interp *childInterp = clientData;
+    Tcl_Interp *childInterp = (Tcl_Interp *)clientData;
     int index;
     static const char *const options[] = {
 	"alias",	"aliases",	"bgerror",	"debug",
@@ -2470,7 +2465,7 @@ NRChildCmd(
 	"issafe",	"invokehidden",	"limit",	"marktrusted",
 	"recursionlimit", NULL
     };
-    enum options {
+    enum childCmdOptionsEnum {
 	OPT_ALIAS,	OPT_ALIASES,	OPT_BGERROR,	OPT_DEBUG,
 	OPT_EVAL,	OPT_EXPOSE,	OPT_HIDE,	OPT_HIDDEN,
 	OPT_ISSAFE,	OPT_INVOKEHIDDEN, OPT_LIMIT,	OPT_MARKTRUSTED,
@@ -2490,7 +2485,7 @@ NRChildCmd(
 	return TCL_ERROR;
     }
 
-    switch ((enum options) index) {
+    switch ((enum childCmdOptionsEnum) index) {
     case OPT_ALIAS:
 	if (objc > 2) {
 	    if (objc == 3) {
@@ -2666,7 +2661,7 @@ ChildObjCmdDeleteProc(
     ClientData clientData)	/* The ChildRecord for the command. */
 {
     Child *childPtr;		/* Interim storage for Child record. */
-    Tcl_Interp *childInterp = clientData;
+    Tcl_Interp *childInterp = (Tcl_Interp *)clientData;
 				/* And for a child interp. */
 
     childPtr = &((InterpInfo *) ((Interp *) childInterp)->interpInfo)->child;
@@ -2995,7 +2990,7 @@ ChildHidden(
     Tcl_Interp *interp,		/* Interp for data return. */
     Tcl_Interp *childInterp)	/* Interp whose hidden commands to query. */
 {
-    Tcl_Obj *listObjPtr;	/* Local object pointer. */
+    Tcl_Obj *listObjPtr;		/* Local object pointer. */
     Tcl_HashTable *hTblPtr;		/* For local searches. */
     Tcl_HashEntry *hPtr;		/* For local searches. */
     Tcl_HashSearch hSearch;		/* For local searches. */
@@ -3007,7 +3002,7 @@ ChildHidden(
 		hPtr != NULL;
 		hPtr = Tcl_NextHashEntry(&hSearch)) {
 	    Tcl_ListObjAppendElement(NULL, listObjPtr,
-		    Tcl_NewStringObj(Tcl_GetHashKey(hTblPtr, hPtr), -1));
+		    Tcl_NewStringObj((const char *)Tcl_GetHashKey(hTblPtr, hPtr), -1));
 	}
     }
     Tcl_SetObjResult(interp, listObjPtr);
@@ -3530,7 +3525,7 @@ Tcl_LimitAddHandler(
      * Allocate a handler record.
      */
 
-    handlerPtr = ckalloc(sizeof(LimitHandler));
+    handlerPtr = (LimitHandler *)ckalloc(sizeof(LimitHandler));
     handlerPtr->flags = 0;
     handlerPtr->handlerProc = handlerProc;
     handlerPtr->clientData = clientData;
@@ -3987,8 +3982,8 @@ static void
 TimeLimitCallback(
     ClientData clientData)
 {
-    Tcl_Interp *interp = clientData;
-    Interp *iPtr = clientData;
+    Tcl_Interp *interp = (Tcl_Interp *)clientData;
+    Interp *iPtr = (Interp *)clientData;
     int code;
 
     Tcl_Preserve(interp);
@@ -4131,7 +4126,7 @@ static void
 DeleteScriptLimitCallback(
     ClientData clientData)
 {
-    ScriptLimitCallback *limitCBPtr = clientData;
+    ScriptLimitCallback *limitCBPtr = (ScriptLimitCallback *)clientData;
 
     Tcl_DecrRefCount(limitCBPtr->scriptObj);
     if (limitCBPtr->entryPtr != NULL) {
@@ -4163,7 +4158,7 @@ CallScriptLimitCallback(
     ClientData clientData,
     Tcl_Interp *interp)		/* Interpreter which failed the limit */
 {
-    ScriptLimitCallback *limitCBPtr = clientData;
+    ScriptLimitCallback *limitCBPtr = (ScriptLimitCallback *)clientData;
     int code;
 
     if (Tcl_InterpDeleted(limitCBPtr->interp)) {
@@ -4231,13 +4226,13 @@ SetScriptLimitCallback(
     hashPtr = Tcl_CreateHashEntry(&iPtr->limit.callbacks, &key,
 	    &isNew);
     if (!isNew) {
-	limitCBPtr = Tcl_GetHashValue(hashPtr);
+	limitCBPtr = (ScriptLimitCallback *)Tcl_GetHashValue(hashPtr);
 	limitCBPtr->entryPtr = NULL;
 	Tcl_LimitRemoveHandler(targetInterp, type, CallScriptLimitCallback,
 		limitCBPtr);
     }
 
-    limitCBPtr = ckalloc(sizeof(ScriptLimitCallback));
+    limitCBPtr = (ScriptLimitCallback *)ckalloc(sizeof(ScriptLimitCallback));
     limitCBPtr->interp = interp;
     limitCBPtr->scriptObj = scriptObj;
     limitCBPtr->entryPtr = hashPtr;
@@ -4426,7 +4421,7 @@ ChildCommandLimitCmd(
 	key.type = TCL_LIMIT_COMMANDS;
 	hPtr = Tcl_FindHashEntry(&iPtr->limit.callbacks, (char *) &key);
 	if (hPtr != NULL) {
-	    limitCBPtr = Tcl_GetHashValue(hPtr);
+	    limitCBPtr = (ScriptLimitCallback *)Tcl_GetHashValue(hPtr);
 	    if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
 		Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], -1),
 			limitCBPtr->scriptObj);
@@ -4468,7 +4463,7 @@ ChildCommandLimitCmd(
 	    key.type = TCL_LIMIT_COMMANDS;
 	    hPtr = Tcl_FindHashEntry(&iPtr->limit.callbacks, (char *) &key);
 	    if (hPtr != NULL) {
-		limitCBPtr = Tcl_GetHashValue(hPtr);
+		limitCBPtr = (ScriptLimitCallback *)Tcl_GetHashValue(hPtr);
 		if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
 		    Tcl_SetObjResult(interp, limitCBPtr->scriptObj);
 		}
@@ -4502,7 +4497,7 @@ ChildCommandLimitCmd(
 	    switch ((enum Options) index) {
 	    case OPT_CMD:
 		scriptObj = objv[i+1];
-		(void) Tcl_GetStringFromObj(objv[i+1], &scriptLen);
+		(void) Tcl_GetStringFromObj(scriptObj, &scriptLen);
 		break;
 	    case OPT_GRAN:
 		granObj = objv[i+1];
@@ -4614,7 +4609,7 @@ ChildTimeLimitCmd(
 	key.type = TCL_LIMIT_TIME;
 	hPtr = Tcl_FindHashEntry(&iPtr->limit.callbacks, (char *) &key);
 	if (hPtr != NULL) {
-	    limitCBPtr = Tcl_GetHashValue(hPtr);
+	    limitCBPtr = (ScriptLimitCallback *)Tcl_GetHashValue(hPtr);
 	    if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
 		Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], -1),
 			limitCBPtr->scriptObj);
@@ -4662,7 +4657,7 @@ ChildTimeLimitCmd(
 	    key.type = TCL_LIMIT_TIME;
 	    hPtr = Tcl_FindHashEntry(&iPtr->limit.callbacks, (char *) &key);
 	    if (hPtr != NULL) {
-		limitCBPtr = Tcl_GetHashValue(hPtr);
+		limitCBPtr = (ScriptLimitCallback *)Tcl_GetHashValue(hPtr);
 		if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
 		    Tcl_SetObjResult(interp, limitCBPtr->scriptObj);
 		}
@@ -4754,9 +4749,15 @@ ChildTimeLimitCmd(
 		if (TclGetWideIntFromObj(interp, objv[i+1], &sec) != TCL_OK) {
 		    return TCL_ERROR;
 		}
+		if (sec > LONG_MAX) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "seconds must be between 0 and %ld", LONG_MAX));
+		    goto badValue;
+		}
 		if (sec < 0) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "seconds must be at least 0", -1));
+		badValue:
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			    "BADVALUE", NULL);
 		    return TCL_ERROR;
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index eccca78..7290bd1 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
@@ -89,51 +89,30 @@ static char *		EstablishErrorInfoTraces(ClientData clientData,
 static void		FreeNsNameInternalRep(Tcl_Obj *objPtr);
 static int		GetNamespaceFromObj(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr);
-static int		InvokeImportedCmd(ClientData clientData,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
 static int		InvokeImportedNRCmd(ClientData clientData,
 			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceChildrenCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceCodeCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceCurrentCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceDeleteCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceEvalCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NRNamespaceEvalCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceExistsCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceExportCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceForgetCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc	InvokeImportedCmd;
+static Tcl_ObjCmdProc	NamespaceChildrenCmd;
+static Tcl_ObjCmdProc	NamespaceCodeCmd;
+static Tcl_ObjCmdProc	NamespaceCurrentCmd;
+static Tcl_ObjCmdProc	NamespaceDeleteCmd;
+static Tcl_ObjCmdProc	NamespaceEvalCmd;
+static Tcl_ObjCmdProc	NRNamespaceEvalCmd;
+static Tcl_ObjCmdProc	NamespaceExistsCmd;
+static Tcl_ObjCmdProc	NamespaceExportCmd;
+static Tcl_ObjCmdProc	NamespaceForgetCmd;
 static void		NamespaceFree(Namespace *nsPtr);
-static int		NamespaceImportCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceInscopeCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NRNamespaceInscopeCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceOriginCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceParentCmd(ClientData dummy,Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespacePathCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceQualifiersCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceTailCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceUpvarCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		NamespaceUnknownCmd(ClientData dummy,
-			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
-static int		NamespaceWhichCmd(ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc	NamespaceImportCmd;
+static Tcl_ObjCmdProc	NamespaceInscopeCmd;
+static Tcl_ObjCmdProc	NRNamespaceInscopeCmd;
+static Tcl_ObjCmdProc	NamespaceOriginCmd;
+static Tcl_ObjCmdProc	NamespaceParentCmd;
+static Tcl_ObjCmdProc	NamespacePathCmd;
+static Tcl_ObjCmdProc	NamespaceQualifiersCmd;
+static Tcl_ObjCmdProc	NamespaceTailCmd;
+static Tcl_ObjCmdProc	NamespaceUpvarCmd;
+static Tcl_ObjCmdProc	NamespaceUnknownCmd;
+static Tcl_ObjCmdProc	NamespaceWhichCmd;
 static int		SetNsNameFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		UnlinkNsPath(Namespace *nsPtr);
 
@@ -320,7 +299,6 @@ Tcl_PushCallFrame(
 
 	if (nsPtr->flags & NS_DEAD) {
 	    Tcl_Panic("Trying to push call frame for dead namespace");
-	    /*NOTREACHED*/
 	}
     }
 
@@ -465,7 +443,7 @@ TclPushStackFrame(
 				 * treated as references to namespace
 				 * variables. */
 {
-    *framePtrPtr = TclStackAlloc(interp, sizeof(CallFrame));
+    *framePtrPtr = (Tcl_CallFrame *)TclStackAlloc(interp, sizeof(CallFrame));
     return Tcl_PushCallFrame(interp, *framePtrPtr, namespacePtr,
 	    isProcCallFrame);
 }
@@ -770,9 +748,9 @@ Tcl_CreateNamespace(
      */
 
   doCreate:
-    nsPtr = ckalloc(sizeof(Namespace));
+    nsPtr = (Namespace *)ckalloc(sizeof(Namespace));
     nameLen = strlen(simpleName) + 1;
-    nsPtr->name = ckalloc(nameLen);
+    nsPtr->name = (char *)ckalloc(nameLen);
     memcpy(nsPtr->name, simpleName, nameLen);
     nsPtr->fullName = NULL;		/* Set below. */
     nsPtr->clientData = clientData;
@@ -860,7 +838,7 @@ Tcl_CreateNamespace(
 
     name = Tcl_DStringValue(namePtr);
     nameLen = Tcl_DStringLength(namePtr);
-    nsPtr->fullName = ckalloc(nameLen + 1);
+    nsPtr->fullName = (char *)ckalloc(nameLen + 1);
     memcpy(nsPtr->fullName, name, nameLen + 1);
 
     Tcl_DStringFree(&buffer1);
@@ -952,7 +930,7 @@ Tcl_DeleteNamespace(
 
     for (entryPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search);
 	    entryPtr != NULL;) {
-	cmdPtr = Tcl_GetHashValue(entryPtr);
+	cmdPtr = (Command *)Tcl_GetHashValue(entryPtr);
 	if (cmdPtr->nreProc == TclNRInterpCoroutine) {
 	    Tcl_DeleteCommandFromToken((Tcl_Interp *) iPtr,
 		    (Tcl_Command) cmdPtr);
@@ -1131,14 +1109,14 @@ TclTeardownNamespace(
 
     while (nsPtr->cmdTable.numEntries > 0) {
 	int length = nsPtr->cmdTable.numEntries;
-	Command **cmds = TclStackAlloc((Tcl_Interp *) iPtr,
+	Command **cmds = (Command **)TclStackAlloc((Tcl_Interp *) iPtr,
 		sizeof(Command *) * length);
 
 	i = 0;
 	for (entryPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search);
 		entryPtr != NULL;
 		entryPtr = Tcl_NextHashEntry(&search)) {
-	    cmds[i] = Tcl_GetHashValue(entryPtr);
+	    cmds[i] = (Command *)Tcl_GetHashValue(entryPtr);
 	    cmds[i]->refCount++;
 	    i++;
 	}
@@ -1445,7 +1423,7 @@ Tcl_Export(
     if (neededElems > nsPtr->maxExportPatterns) {
 	nsPtr->maxExportPatterns = nsPtr->maxExportPatterns ?
 		2 * nsPtr->maxExportPatterns : INIT_EXPORT_PATTERNS;
-	nsPtr->exportArrayPtr = ckrealloc(nsPtr->exportArrayPtr,
+	nsPtr->exportArrayPtr = (char **)ckrealloc(nsPtr->exportArrayPtr,
 		sizeof(char *) * nsPtr->maxExportPatterns);
     }
 
@@ -1454,7 +1432,7 @@ Tcl_Export(
      */
 
     len = strlen(pattern);
-    patternCpy = ckalloc(len + 1);
+    patternCpy = (char *)ckalloc(len + 1);
     memcpy(patternCpy, pattern, len + 1);
 
     nsPtr->exportArrayPtr[nsPtr->numExportPatterns] = patternCpy;
@@ -1665,7 +1643,7 @@ Tcl_Import(
     }
     for (hPtr = Tcl_FirstHashEntry(&importNsPtr->cmdTable, &search);
 	    (hPtr != NULL); hPtr = Tcl_NextHashEntry(&search)) {
-	char *cmdName = Tcl_GetHashKey(&importNsPtr->cmdTable, hPtr);
+	char *cmdName = (char *)Tcl_GetHashKey(&importNsPtr->cmdTable, hPtr);
 
 	if (Tcl_StringMatch(cmdName, simplePattern) &&
 		DoImport(interp, nsPtr, hPtr, cmdName, pattern, importNsPtr,
@@ -1752,13 +1730,13 @@ DoImport(
 	 * namespace would create a cycle of imported command references.
 	 */
 
-	cmdPtr = Tcl_GetHashValue(hPtr);
+	cmdPtr = (Command *)Tcl_GetHashValue(hPtr);
 	if (found != NULL && cmdPtr->deleteProc == DeleteImportedCmd) {
-	    Command *overwrite = Tcl_GetHashValue(found);
+	    Command *overwrite = (Command *)Tcl_GetHashValue(found);
 	    Command *linkCmd = cmdPtr;
 
 	    while (linkCmd->deleteProc == DeleteImportedCmd) {
-		dataPtr = linkCmd->objClientData;
+		dataPtr = (ImportedCmdData *)linkCmd->objClientData;
 		linkCmd = dataPtr->realCmdPtr;
 		if (overwrite == linkCmd) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -1772,7 +1750,7 @@ DoImport(
 	    }
 	}
 
-	dataPtr = ckalloc(sizeof(ImportedCmdData));
+	dataPtr = (ImportedCmdData *)ckalloc(sizeof(ImportedCmdData));
 	importedCmd = Tcl_NRCreateCommand(interp, Tcl_DStringValue(&ds),
 		InvokeImportedCmd, InvokeImportedNRCmd, dataPtr,
 		DeleteImportedCmd);
@@ -1786,15 +1764,15 @@ DoImport(
 	 * and add it to the import ref list in the "real" command.
 	 */
 
-	refPtr = ckalloc(sizeof(ImportRef));
+	refPtr = (ImportRef *)ckalloc(sizeof(ImportRef));
 	refPtr->importedCmdPtr = (Command *) importedCmd;
 	refPtr->nextPtr = cmdPtr->importRefPtr;
 	cmdPtr->importRefPtr = refPtr;
     } else {
-	Command *overwrite = Tcl_GetHashValue(found);
+	Command *overwrite = (Command *)Tcl_GetHashValue(found);
 
 	if (overwrite->deleteProc == DeleteImportedCmd) {
-	    ImportedCmdData *dataPtr = overwrite->objClientData;
+	    ImportedCmdData *dataPtr = (ImportedCmdData *)overwrite->objClientData;
 
 	    if (dataPtr->realCmdPtr == Tcl_GetHashValue(hPtr)) {
 		/*
@@ -1888,7 +1866,7 @@ Tcl_ForgetImport(
 	if (TclMatchIsTrivial(simplePattern)) {
 	    hPtr = Tcl_FindHashEntry(&nsPtr->cmdTable, simplePattern);
 	    if (hPtr != NULL) {
-		Command *cmdPtr = Tcl_GetHashValue(hPtr);
+		Command *cmdPtr = (Command *)Tcl_GetHashValue(hPtr);
 
 		if (cmdPtr && (cmdPtr->deleteProc == DeleteImportedCmd)) {
 		    Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cmdPtr);
@@ -1898,12 +1876,12 @@ Tcl_ForgetImport(
 	}
 	for (hPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search);
 		(hPtr != NULL); hPtr = Tcl_NextHashEntry(&search)) {
-	    Command *cmdPtr = Tcl_GetHashValue(hPtr);
+	    Command *cmdPtr = (Command *)Tcl_GetHashValue(hPtr);
 
 	    if (cmdPtr->deleteProc != DeleteImportedCmd) {
 		continue;
 	    }
-	    cmdName = Tcl_GetHashKey(&nsPtr->cmdTable, hPtr);
+	    cmdName = (char *)Tcl_GetHashKey(&nsPtr->cmdTable, hPtr);
 	    if (Tcl_StringMatch(cmdName, simplePattern)) {
 		Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cmdPtr);
 	    }
@@ -1918,7 +1896,7 @@ Tcl_ForgetImport(
     for (hPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search); (hPtr != NULL);
 	    hPtr = Tcl_NextHashEntry(&search)) {
 	Tcl_CmdInfo info;
-	Tcl_Command token = Tcl_GetHashValue(hPtr);
+	Tcl_Command token = (Tcl_Command)Tcl_GetHashValue(hPtr);
 	Tcl_Command origin = TclGetOriginalCommand(token);
 
 	if (Tcl_GetCommandInfoFromToken(origin, &info) == 0) {
@@ -1931,7 +1909,7 @@ Tcl_ForgetImport(
 	     */
 
 	    Command *cmdPtr = (Command *) token;
-	    ImportedCmdData *dataPtr = cmdPtr->objClientData;
+	    ImportedCmdData *dataPtr = (ImportedCmdData *)cmdPtr->objClientData;
 	    Tcl_Command firstToken = (Tcl_Command) dataPtr->realCmdPtr;
 
 	    if (firstToken == origin) {
@@ -1986,7 +1964,7 @@ TclGetOriginalCommand(
     }
 
     while (cmdPtr->deleteProc == DeleteImportedCmd) {
-	dataPtr = cmdPtr->objClientData;
+	dataPtr = (ImportedCmdData *)cmdPtr->objClientData;
 	cmdPtr = dataPtr->realCmdPtr;
     }
     return (Tcl_Command) cmdPtr;
@@ -2019,7 +1997,7 @@ InvokeImportedNRCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
-    ImportedCmdData *dataPtr = clientData;
+    ImportedCmdData *dataPtr = (ImportedCmdData *)clientData;
     Command *realCmdPtr = dataPtr->realCmdPtr;
 
     TclSkipTailcall(interp);
@@ -2064,7 +2042,7 @@ DeleteImportedCmd(
     ClientData clientData)	/* Points to the imported command's
 				 * ImportedCmdData structure. */
 {
-    ImportedCmdData *dataPtr = clientData;
+    ImportedCmdData *dataPtr = (ImportedCmdData *)clientData;
     Command *realCmdPtr = dataPtr->realCmdPtr;
     Command *selfPtr = dataPtr->selfPtr;
     ImportRef *refPtr, *prevPtr;
@@ -2340,7 +2318,7 @@ TclGetNamespaceForQualName(
 	    }
 #endif
 	    if (entryPtr != NULL) {
-		nsPtr = Tcl_GetHashValue(entryPtr);
+		nsPtr = (Namespace *)Tcl_GetHashValue(entryPtr);
 	    } else if (flags & TCL_CREATE_NS_IF_UNKNOWN) {
 		Tcl_CallFrame *framePtr;
 
@@ -2375,7 +2353,7 @@ TclGetNamespaceForQualName(
 	    }
 #endif
 	    if (entryPtr != NULL) {
-		altNsPtr = Tcl_GetHashValue(entryPtr);
+		altNsPtr = (Namespace *)Tcl_GetHashValue(entryPtr);
 	    } else {
 		altNsPtr = NULL;
 	    }
@@ -2625,7 +2603,7 @@ Tcl_FindCommand(
 		    || !(realNsPtr->flags & NS_DYING)) {
 		entryPtr = Tcl_FindHashEntry(&realNsPtr->cmdTable, simpleName);
 		if (entryPtr != NULL) {
-		    cmdPtr = Tcl_GetHashValue(entryPtr);
+		    cmdPtr = (Command *)Tcl_GetHashValue(entryPtr);
 		}
 	    }
 	}
@@ -2646,7 +2624,7 @@ Tcl_FindCommand(
 		    && !(realNsPtr->flags & NS_DYING)) {
 		entryPtr = Tcl_FindHashEntry(&realNsPtr->cmdTable, simpleName);
 		if (entryPtr != NULL) {
-		    cmdPtr = Tcl_GetHashValue(entryPtr);
+		    cmdPtr = (Command *)Tcl_GetHashValue(entryPtr);
 		}
 	    }
 	}
@@ -2664,7 +2642,7 @@ Tcl_FindCommand(
 		    && !(realNsPtr->flags & NS_DYING)) {
 		entryPtr = Tcl_FindHashEntry(&realNsPtr->cmdTable, simpleName);
 		if (entryPtr != NULL) {
-		    cmdPtr = Tcl_GetHashValue(entryPtr);
+		    cmdPtr = (Command *)Tcl_GetHashValue(entryPtr);
 		}
 	    }
 	}
@@ -2686,7 +2664,7 @@ Tcl_FindCommand(
 		entryPtr = Tcl_FindHashEntry(&nsPtr[search]->cmdTable,
 			simpleName);
 		if (entryPtr != NULL) {
-		    cmdPtr = Tcl_GetHashValue(entryPtr);
+		    cmdPtr = (Command *)Tcl_GetHashValue(entryPtr);
 		}
 	    }
 	}
@@ -2750,7 +2728,7 @@ TclResetShadowedCmdRefs(
     int found, i;
     int trailFront = -1;
     int trailSize = 5;		/* Formerly NUM_TRAIL_ELEMS. */
-    Namespace **trailPtr = TclStackAlloc(interp,
+    Namespace **trailPtr = (Namespace **)TclStackAlloc(interp,
 	    trailSize * sizeof(Namespace *));
 
     /*
@@ -2770,7 +2748,7 @@ TclResetShadowedCmdRefs(
      * cmdName.
      */
 
-    cmdName = Tcl_GetHashKey(newCmdPtr->hPtr->tablePtr, newCmdPtr->hPtr);
+    cmdName = (char *)Tcl_GetHashKey(newCmdPtr->hPtr->tablePtr, newCmdPtr->hPtr);
     for (nsPtr=newCmdPtr->nsPtr ; (nsPtr!=NULL) && (nsPtr!=globalNsPtr) ;
 	    nsPtr=nsPtr->parentPtr) {
 	/*
@@ -2799,7 +2777,7 @@ TclResetShadowedCmdRefs(
 	    }
 #endif
 	    if (hPtr != NULL) {
-		shadowNsPtr = Tcl_GetHashValue(hPtr);
+		shadowNsPtr = (Namespace *)Tcl_GetHashValue(hPtr);
 	    } else {
 		found = 0;
 		break;
@@ -2840,7 +2818,7 @@ TclResetShadowedCmdRefs(
 	if (trailFront == trailSize) {
 	    int newSize = 2 * trailSize;
 
-	    trailPtr = TclStackRealloc(interp, trailPtr,
+	    trailPtr = (Namespace **)TclStackRealloc(interp, trailPtr,
 		    newSize * sizeof(Namespace *));
 	    trailSize = newSize;
 	}
@@ -3065,7 +3043,7 @@ NamespaceChildrenCmd(
     entryPtr = Tcl_FirstHashEntry(nsPtr->childTablePtr, &search);
 #endif
     while (entryPtr != NULL) {
-	childNsPtr = Tcl_GetHashValue(entryPtr);
+	childNsPtr = (Namespace *)Tcl_GetHashValue(entryPtr);
 	if ((pattern == NULL)
 		|| Tcl_StringMatch(childNsPtr->fullName, pattern)) {
 	    elemPtr = Tcl_NewStringObj(childNsPtr->fullName, -1);
@@ -3428,13 +3406,13 @@ NsEval_Callback(
     Tcl_Interp *interp,
     int result)
 {
-    Tcl_Namespace *namespacePtr = data[0];
+    Tcl_Namespace *namespacePtr = (Tcl_Namespace *)data[0];
 
     if (result == TCL_ERROR) {
 	int length = strlen(namespacePtr->fullName);
 	int limit = 200;
 	int overflow = (length > limit);
-	char *cmd = data[1];
+	char *cmd = (char *)data[1];
 
 	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 		"\n    (in namespace %s \"%.*s%s\" script line %d)",
@@ -3550,7 +3528,7 @@ NamespaceExportCmd(
 	Tcl_Obj *listPtr;
 
 	TclNewObj(listPtr);
-	(void) Tcl_AppendExportList(interp, NULL, listPtr);
+	(void)Tcl_AppendExportList(interp, NULL, listPtr);
 	Tcl_SetObjResult(interp, listPtr);
 	return TCL_OK;
     }
@@ -3716,11 +3694,11 @@ NamespaceImportCmd(
 	TclNewObj(listPtr);
 	for (hPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search);
 		hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	    Command *cmdPtr = Tcl_GetHashValue(hPtr);
+	    Command *cmdPtr = (Command *)Tcl_GetHashValue(hPtr);
 
 	    if (cmdPtr->deleteProc == DeleteImportedCmd) {
 		Tcl_ListObjAppendElement(NULL, listPtr, Tcl_NewStringObj(
-			Tcl_GetHashKey(&nsPtr->cmdTable, hPtr) ,-1));
+			(char *)Tcl_GetHashKey(&nsPtr->cmdTable, hPtr) ,-1));
 	    }
 	}
 	Tcl_SetObjResult(interp, listPtr);
@@ -4048,7 +4026,7 @@ NamespacePathCmd(
 	goto badNamespace;
     }
     if (nsObjc != 0) {
-	namespaceList = TclStackAlloc(interp,
+	namespaceList = (Tcl_Namespace **)TclStackAlloc(interp,
 		sizeof(Tcl_Namespace *) * nsObjc);
 
 	for (i=0 ; i<nsObjc ; i++) {
@@ -4101,7 +4079,7 @@ TclSetNsPath(
 {
     if (pathLength != 0) {
 	NamespacePathEntry *tmpPathArray =
-		ckalloc(sizeof(NamespacePathEntry) * pathLength);
+		(NamespacePathEntry *)ckalloc(sizeof(NamespacePathEntry) * pathLength);
 	int i;
 
 	for (i=0 ; i<pathLength ; i++) {
@@ -4699,7 +4677,7 @@ FreeNsNameInternalRep(
     Tcl_Obj *objPtr)	/* nsName object with internal representation
 				 * to free. */
 {
-    ResolvedNsName *resNamePtr = objPtr->internalRep.twoPtrValue.ptr1;
+    ResolvedNsName *resNamePtr = (ResolvedNsName *)objPtr->internalRep.twoPtrValue.ptr1;
 
     /*
      * Decrement the reference count of the namespace. If there are no more
@@ -4812,12 +4790,12 @@ SetNsNameFromAny(
     }
 
     nsPtr->refCount++;
-    resNamePtr = ckalloc(sizeof(ResolvedNsName));
+    resNamePtr = (ResolvedNsName *)ckalloc(sizeof(ResolvedNsName));
     resNamePtr->nsPtr = nsPtr;
     if ((name[0] == ':') && (name[1] == ':')) {
 	resNamePtr->refNsPtr = NULL;
     } else {
-	resNamePtr->refNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
+	resNamePtr->refNsPtr = (Namespace *)Tcl_GetCurrentNamespace(interp);
     }
     resNamePtr->refCount = 1;
     TclFreeIntRep(objPtr);
@@ -4874,7 +4852,7 @@ TclGetNamespaceChildTable(
     return &nPtr->childTable;
 #else
     if (nPtr->childTablePtr == NULL) {
-	nPtr->childTablePtr = ckalloc(sizeof(Tcl_HashTable));
+	nPtr->childTablePtr = (Tcl_HashTable *)ckalloc(sizeof(Tcl_HashTable));
 	Tcl_InitHashTable(nPtr->childTablePtr, TCL_STRING_KEYS);
     }
     return nPtr->childTablePtr;
@@ -4963,7 +4941,7 @@ TclLogCommandInfo(
 	} else {
 	    Tcl_HashEntry *hPtr
 		    = Tcl_FindHashEntry(&iPtr->varTraces, (char *) varPtr);
-	    VarTrace *tracePtr = Tcl_GetHashValue(hPtr);
+	    VarTrace *tracePtr = (VarTrace *)Tcl_GetHashValue(hPtr);
 
 	    if (tracePtr->traceProc != EstablishErrorInfoTraces) {
 		/*
-- 
cgit v0.12


From ca4e244cca3e93fb8689fe1cef85954da16ff989 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 25 Jan 2023 02:52:24 +0000
Subject: Test TableFromUtfProc() with strict handling of encoding errors.

---
 generic/tclEncoding.c | 2 +-
 tests/encoding.test   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index d10d9ca..5ba7763 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3199,7 +3199,7 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
+	    if ((STOPONERROR)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
diff --git a/tests/encoding.test b/tests/encoding.test
index a1d129e..d9382e4 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -513,8 +513,11 @@ test encoding-17.10 {Utf32ToUtfProc} -body {
     encoding convertfrom -nocomplain utf-32 "\xFF\xFF\xFF\xFF"
 } -result \uFFFD
 
-test encoding-18.1 {TableToUtfProc} {
-} {}
+
+test encoding-18.1 {TableToUtfProc error on invalid input with -strict} -body {
+	list [catch {encoding convertto -strict jis0208 \\} res] $res
+} -result {1 {unexpected character at index 0: 'U+00005C'}}
+
 
 test encoding-19.1 {TableFromUtfProc} {
 } {}
@@ -915,6 +918,7 @@ test encoding-29.0 {get encoding nul terminator lengths} -constraints {
         [testencoding nullength ksc5601]
 } -result {1 2 4 2 2}
 
+
 # cleanup
 namespace delete ::tcl::test::encoding
 ::tcltest::cleanupTests
-- 
cgit v0.12


From d271c9f407a60528785465284451c752639b1128 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Thu, 26 Jan 2023 23:55:30 +0000
Subject: Fix for [ee08ed090b0a5408], sporadic segmentation fault in
 coroutine.test/coroutine-7.4.

---
 generic/tclBasic.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 80dc416..bea5996 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -10520,6 +10520,7 @@ TclNRCoroutineObjCmd(
     corPtr->running.lineLABCPtr = corPtr->lineLABCPtr;
     corPtr->stackLevel = NULL;
     corPtr->auxNumLevels = 0;
+    corPtr->yieldPtr = NULL;
 
     /*
      * Create the coro's execEnv, switch to it to push the exit and coro
-- 
cgit v0.12


From 8ea5f2cfcee413e2281a0434827d999f43743f6c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 27 Jan 2023 08:17:34 +0000
Subject: Update fcopy documentation regarding -size argument

---
 doc/fcopy.n | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/fcopy.n b/doc/fcopy.n
index d39c803..57f9968 100644
--- a/doc/fcopy.n
+++ b/doc/fcopy.n
@@ -26,8 +26,9 @@ network sockets.
 The \fBfcopy\fR
 command transfers data from \fIinchan\fR until end of file
 or \fIsize\fR bytes or characters have been
-transferred; \fIsize\fR is in bytes if the two channels are using the
-same encoding, and is in characters otherwise.
+transferred; \fIsize\fR is in bytes if the input channel is in binary mode,
+or if the two channels are using the same encoding and -strict is not specified.
+Otherwise, size is in characters.
 If no \fB\-size\fR argument is given,
 then the copy goes until end of file.
 All the data read from \fIinchan\fR is copied to \fIoutchan\fR.
-- 
cgit v0.12


From 06de3a9ba1e4397a226e168a72c9da63c2a6f30a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 27 Jan 2023 14:23:08 +0000
Subject: new testcase encoding-18.1. Testcase cleanup

---
 tests/encoding.test | 151 ++++++++++++++++++++++++++--------------------------
 1 file changed, 76 insertions(+), 75 deletions(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index aaba01e..f558e01 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -3,7 +3,7 @@
 # No output means no errors were found.
 #
 # Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright (c) 1998-1999 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -65,12 +65,12 @@ test encoding-1.2 {Tcl_GetEncoding: existing encoding} {testencoding} {
     return $x
 } {{fromutf }}
 test encoding-1.3 {Tcl_GetEncoding: load encoding} {
-    list [encoding convertto jis0208 \u4e4e] \
+    list [encoding convertto jis0208 \u4E4E] \
 	[encoding convertfrom jis0208 8C]
-} "8C \u4e4e"
+} "8C \u4E4E"
 
 test encoding-2.1 {Tcl_FreeEncoding: refcount == 0} {
-    encoding convertto jis0208 \u4e4e
+    encoding convertto jis0208 \u4E4E
 } {8C}
 test encoding-2.2 {Tcl_FreeEncoding: refcount != 0} -setup {
     set system [encoding system]
@@ -78,15 +78,15 @@ test encoding-2.2 {Tcl_FreeEncoding: refcount != 0} -setup {
 } -constraints {testencoding} -body {
     encoding system shiftjis		;# incr ref count
     encoding dirs [list [pwd]]
-    set x [encoding convertto shiftjis \u4e4e]	;# old one found
+    set x [encoding convertto shiftjis \u4E4E]	;# old one found
     encoding system iso8859-1
     llength shiftjis		;# Shimmer away any cache of Tcl_Encoding
-    lappend x [catch {encoding convertto shiftjis \u4e4e} msg] $msg
+    lappend x [catch {encoding convertto shiftjis \u4E4E} msg] $msg
 } -cleanup {
     encoding system iso8859-1
     encoding dirs $path
     encoding system $system
-} -result "\u008c\u00c1 1 {unknown encoding \"shiftjis\"}"
+} -result "\x8C\xC1 1 {unknown encoding \"shiftjis\"}"
 
 test encoding-3.1 {Tcl_GetEncodingName, NULL} -setup {
     set old [encoding system]
@@ -138,7 +138,7 @@ test encoding-5.1 {Tcl_SetSystemEncoding} -setup {
     set old [encoding system]
 } -body {
     encoding system jis0208
-    encoding convertto \u4e4e
+    encoding convertto \u4E4E
 } -cleanup {
     encoding system iso8859-1
     encoding system $old
@@ -170,7 +170,7 @@ test encoding-6.2 {Tcl_CreateEncoding: replace encoding} {testencoding} {
 
 test encoding-7.1 {Tcl_ExternalToUtfDString: small buffer} {
     encoding convertfrom jis0208 8c8c8c8c
-} "\u543e\u543e\u543e\u543e"
+} "\u543E\u543E\u543E\u543E"
 test encoding-7.2 {Tcl_UtfToExternalDString: big buffer} {
     set a 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
     append a $a
@@ -179,12 +179,12 @@ test encoding-7.2 {Tcl_UtfToExternalDString: big buffer} {
     append a $a
     set x [encoding convertfrom jis0208 $a]
     list [string length $x] [string index $x 0]
-} "512 \u4e4e"
+} "512 \u4E4E"
 
 test encoding-8.1 {Tcl_ExternalToUtf} {
     set f [open [file join [temporaryDirectory] dummy] w]
     fconfigure $f -translation binary -encoding iso8859-1
-    puts -nonewline $f "ab\x8c\xc1g"
+    puts -nonewline $f "ab\x8C\xC1g"
     close $f
     set f [open [file join [temporaryDirectory] dummy] r]
     fconfigure $f -translation binary -encoding shiftjis
@@ -192,13 +192,13 @@ test encoding-8.1 {Tcl_ExternalToUtf} {
     close $f
     file delete [file join [temporaryDirectory] dummy]
     return $x
-} "ab\u4e4eg"
+} "ab\u4E4Eg"
 
 test encoding-9.1 {Tcl_UtfToExternalDString: small buffer} {
-    encoding convertto jis0208 "\u543e\u543e\u543e\u543e"
+    encoding convertto jis0208 "\u543E\u543E\u543E\u543E"
 } {8c8c8c8c}
 test encoding-9.2 {Tcl_UtfToExternalDString: big buffer} {
-    set a \u4e4e\u4e4e\u4e4e\u4e4e\u4e4e\u4e4e\u4e4e\u4e4e
+    set a \u4E4E\u4E4E\u4E4E\u4E4E\u4E4E\u4E4E\u4E4E\u4E4E
     append a $a
     append a $a
     append a $a
@@ -212,7 +212,7 @@ test encoding-9.2 {Tcl_UtfToExternalDString: big buffer} {
 test encoding-10.1 {Tcl_UtfToExternal} {
     set f [open [file join [temporaryDirectory] dummy] w]
     fconfigure $f -translation binary -encoding shiftjis
-    puts -nonewline $f "ab\u4e4eg"
+    puts -nonewline $f "ab\u4E4Eg"
     close $f
     set f [open [file join [temporaryDirectory] dummy] r]
     fconfigure $f -translation binary -encoding iso8859-1
@@ -220,7 +220,7 @@ test encoding-10.1 {Tcl_UtfToExternal} {
     close $f
     file delete [file join [temporaryDirectory] dummy]
     return $x
-} "ab\x8c\xc1g"
+} "ab\x8C\xC1g"
 
 proc viewable {str} {
     set res ""
@@ -228,7 +228,7 @@ proc viewable {str} {
 	if {[string is print $c] && [string is ascii $c]} {
 	    append res $c
 	} else {
-	    append res "\\u[format %4.4x [scan $c %c]]"
+	    append res "\\u[format %4.4X [scan $c %c]]"
 	}
     }
     return "$str ($res)"
@@ -240,26 +240,26 @@ test encoding-11.1 {LoadEncodingFile: unknown encoding} {testencoding} {
     encoding system iso8859-1
     encoding dirs {}
     llength jis0208	;# Shimmer any cached Tcl_Encoding in shared literal
-    set x [list [catch {encoding convertto jis0208 \u4e4e} msg] $msg]
+    set x [list [catch {encoding convertto jis0208 \u4E4E} msg] $msg]
     encoding dirs $path
     encoding system $system
-    lappend x [encoding convertto jis0208 \u4e4e]
+    lappend x [encoding convertto jis0208 \u4E4E]
 } {1 {unknown encoding "jis0208"} 8C}
 test encoding-11.2 {LoadEncodingFile: single-byte} {
-    encoding convertfrom jis0201 \xa1
-} "\uff61"
+    encoding convertfrom jis0201 \xA1
+} \uFF61
 test encoding-11.3 {LoadEncodingFile: double-byte} {
     encoding convertfrom jis0208 8C
-} "\u4e4e"
+} \u4E4E
 test encoding-11.4 {LoadEncodingFile: multi-byte} {
-    encoding convertfrom shiftjis \x8c\xc1
-} "\u4e4e"
+    encoding convertfrom shiftjis \x8C\xC1
+} \u4E4E
 test encoding-11.5 {LoadEncodingFile: escape file} {
-    viewable [encoding convertto iso2022 \u4e4e]
-} [viewable "\x1b\$B8C\x1b(B"]
+    viewable [encoding convertto iso2022 \u4E4E]
+} [viewable "\x1B\$B8C\x1B(B"]
 test encoding-11.5.1 {LoadEncodingFile: escape file} {
-    viewable [encoding convertto iso2022-jp \u4e4e]
-} [viewable "\x1b\$B8C\x1b(B"]
+    viewable [encoding convertto iso2022-jp \u4E4E]
+} [viewable "\x1B\$B8C\x1B(B"]
 test encoding-11.6 {LoadEncodingFile: invalid file} -constraints {testencoding} -setup {
     set system [encoding system]
     set path [encoding dirs]
@@ -273,7 +273,7 @@ test encoding-11.6 {LoadEncodingFile: invalid file} -constraints {testencoding}
     fconfigure $f -translation binary
     puts $f "abcdefghijklmnop"
     close $f
-    encoding convertto splat \u4e4e
+    encoding convertto splat \u4E4E
 } -returnCodes error -cleanup {
     file delete [file join [temporaryDirectory] tmp encoding splat.enc]
     removeDirectory [file join tmp encoding]
@@ -289,45 +289,45 @@ test encoding-12.1 {LoadTableEncoding: normal encoding} {
     set x [encoding convertto iso8859-3 \u0120]
     append x [encoding convertto iso8859-3 \xD5]
     append x [encoding convertfrom iso8859-3 \xD5]
-} "\xd5?\u120"
+} \xD5?\u0120
 test encoding-12.2 {LoadTableEncoding: single-byte encoding} {
     set x [encoding convertto iso8859-3 ab\u0120g]
     append x [encoding convertfrom iso8859-3 ab\xD5g]
-} "ab\xd5gab\u120g"
+} ab\xD5gab\u0120g
 test encoding-12.3 {LoadTableEncoding: multi-byte encoding} {
     set x [encoding convertto shiftjis ab\u4E4Eg]
-    append x [encoding convertfrom shiftjis ab\x8c\xc1g]
-} "ab\x8c\xc1gab\u4e4eg"
+    append x [encoding convertfrom shiftjis ab\x8C\xC1g]
+} ab\x8C\xC1gab\u4E4Eg
 test encoding-12.4 {LoadTableEncoding: double-byte encoding} {
-    set x [encoding convertto jis0208 \u4e4e\u3b1]
+    set x [encoding convertto jis0208 \u4E4E\u03B1]
     append x [encoding convertfrom jis0208 8C&A]
-} "8C&A\u4e4e\u3b1"
+} 8C&A\u4E4E\u03B1
 test encoding-12.5 {LoadTableEncoding: symbol encoding} {
-    set x [encoding convertto symbol \u3b3]
-    append x [encoding convertto symbol \u67]
-    append x [encoding convertfrom symbol \x67]
-} "\x67\x67\u3b3"
+    set x [encoding convertto symbol \u03B3]
+    append x [encoding convertto symbol g]
+    append x [encoding convertfrom symbol g]
+} gg\u03B3
 test encoding-12.6 {LoadTableEncoding: overflow in char value} ucs2 {
     encoding convertto iso8859-3 \U010000
-} "?"
+} ?
 
 test encoding-13.1 {LoadEscapeTable} {
-    viewable [set x [encoding convertto iso2022 ab\u4e4e\u68d9g]]
-} [viewable "ab\x1b\$B8C\x1b\$\(DD%\x1b(Bg"]
+    viewable [set x [encoding convertto iso2022 ab\u4E4E\u68D9g]]
+} [viewable "ab\x1B\$B8C\x1B\$\(DD%\x1B(Bg"]
 
 test encoding-14.1 {BinaryProc} {
     encoding convertto identity \x12\x34\x56\xff\x69
 } "\x12\x34\x56\xc3\xbf\x69"
 
 test encoding-15.1 {UtfToUtfProc} {
-    encoding convertto utf-8 \xa3
-} "\xc2\xa3"
+    encoding convertto utf-8 \xA3
+} "\xC2\xA3"
 test encoding-15.2 {UtfToUtfProc null character output} testbytestring {
-    binary scan [testbytestring [encoding convertto utf-8 \u0000]] H* z
+    binary scan [testbytestring [encoding convertto utf-8 \x00]] H* z
     set z
 } 00
 test encoding-15.3 {UtfToUtfProc null character input} teststringbytes {
-    set y [encoding convertfrom utf-8 [encoding convertto utf-8 \u0000]]
+    set y [encoding convertfrom utf-8 [encoding convertto utf-8 \x00]]
     binary scan [teststringbytes $y] H* z
     set z
 } c080
@@ -407,18 +407,18 @@ test encoding-15.16 {UtfToUtfProc: Invalid 4-byte UTF-8, see [ed29806ba]} {
     list [string length $x] $y
 } "4 \xF0\xA0\xA1\xC2"
 
-test encoding-16.1 {UnicodeToUtfProc} {
+test encoding-16.1 {UnicodeToUtfProc} -body {
     set val [encoding convertfrom unicode NN]
-    list $val [format %x [scan $val %c]]
-} "\u4e4e 4e4e"
+    list $val [format %X [scan $val %c]]
+} -result "\u4E4E 4E4E"
 test encoding-16.2 {UnicodeToUtfProc} -constraints fullutf -body {
     set val [encoding convertfrom unicode "\xD8\xD8\xDC\xDC"]
     list $val [format %x [scan $val %c]]
 } -result "\U460DC 460dc"
 test encoding-16.3 {UnicodeToUtfProc} -body {
     set val [encoding convertfrom unicode "\xDC\xDC"]
-    list $val [format %x [scan $val %c]]
-} -result "\uDCDC dcdc"
+    list $val [format %X [scan $val %c]]
+} -result "\uDCDC DCDC"
 
 test encoding-17.1 {UtfToUnicodeProc} -constraints fullutf -body {
     encoding convertto unicode "\U460DC"
@@ -430,8 +430,9 @@ test encoding-17.3 {UtfToUnicodeProc} -body {
     encoding convertto unicode "\uD8D8"
 } -result "\xD8\xD8"
 
-test encoding-18.1 {TableToUtfProc} {
-} {}
+test encoding-18.1 {TableToUtfProc on invalid input} -body {
+	list [catch {encoding convertto jis0208 \\} res] $res
+} -result {0 !)}
 
 test encoding-19.1 {TableFromUtfProc} {
 } {}
@@ -445,11 +446,11 @@ test encoding-21.1 {EscapeToUtfProc} {
 test encoding-22.1 {EscapeFromUtfProc} {
 } {}
 
-set iso2022encData "\u001b\$B;d\$I\$b\$G\$O!\"%A%C%W\$49XF~;~\$K\$4EPO?\$\$\$?\$@\$\$\$?\$4=;=j\$r%-%c%C%7%e%\"%&%H\$N:]\$N\u001b(B
-\u001b\$B>.@Z<jAwIU@h\$H\$7\$F;HMQ\$7\$F\$*\$j\$^\$9!#62\$lF~\$j\$^\$9\$,!\"@5\$7\$\$=;=j\$r\$4EPO?\$7\$J\$*\u001b(B
-\u001b\$B\$*4j\$\$\$\$\$?\$7\$^\$9!#\$^\$?!\"BgJQ62=L\$G\$9\$,!\"=;=jJQ99\$N\$\"\$H!\"F|K\\8l%5!<%S%9It!J\u001b(B
-casino_japanese@___.com \u001b\$B!K\$^\$G\$4=;=jJQ99:Q\$NO\"Mm\$r\$\$\$?\$@\$1\$J\$\$\$G\u001b(B
-\u001b\$B\$7\$g\$&\$+!)\u001b(B"
+set iso2022encData "\x1B\$B;d\$I\$b\$G\$O!\"%A%C%W\$49XF~;~\$K\$4EPO?\$\$\$?\$@\$\$\$?\$4=;=j\$r%-%c%C%7%e%\"%&%H\$N:]\$N\x1B(B
+\x1B\$B>.@Z<jAwIU@h\$H\$7\$F;HMQ\$7\$F\$*\$j\$^\$9!#62\$lF~\$j\$^\$9\$,!\"@5\$7\$\$=;=j\$r\$4EPO?\$7\$J\$*\x1B(B
+\x1B\$B\$*4j\$\$\$\$\$?\$7\$^\$9!#\$^\$?!\"BgJQ62=L\$G\$9\$,!\"=;=jJQ99\$N\$\"\$H!\"F|K\\8l%5!<%S%9It!J\x1B(B
+casino_japanese@___.com \x1B\$B!K\$^\$G\$4=;=jJQ99:Q\$NO\"Mm\$r\$\$\$?\$@\$1\$J\$\$\$G\x1B(B
+\x1B\$B\$7\$g\$&\$+!)\x1B(B"
 
 set iso2022uniData [encoding convertfrom iso2022-jp $iso2022encData]
 set iso2022uniData2 "\u79c1\u3069\u3082\u3067\u306f\u3001\u30c1\u30c3\u30d7\u3054\u8cfc\u5165\u6642\u306b\u3054\u767b\u9332\u3044\u305f\u3060\u3044\u305f\u3054\u4f4f\u6240\u3092\u30ad\u30e3\u30c3\u30b7\u30e5\u30a2\u30a6\u30c8\u306e\u969b\u306e
@@ -521,17 +522,17 @@ test encoding-24.2 {EscapeFreeProc on open channels} {exec} {
     viewable [runInSubprocess {
 	encoding system cp1252;	# Bug #2891556 crash revelator
 	fconfigure stdout -encoding iso2022-jp
-	puts ab\u4e4e\u68d9g
+	puts ab\u4E4E\u68D9g
 	set env(TCL_FINALIZE_ON_EXIT) 1
 	exit
     }]
-} "ab\x1b\$B8C\x1b\$(DD%\x1b(Bg (ab\\u001b\$B8C\\u001b\$(DD%\\u001b(Bg)"
+} "ab\x1B\$B8C\x1B\$(DD%\x1B(Bg (ab\\u001B\$B8C\\u001B\$(DD%\\u001B(Bg)"
 test encoding-24.3 {EscapeFreeProc on open channels} {stdio} {
     # Bug #219314 - if we don't free escape encodings correctly on channel
     # closure, we go boom
     set file [makeFile {
 	encoding system iso2022-jp
-	set a "\u4e4e\u4e5e\u4e5f"; # 3 Japanese Kanji letters
+	set a \u4E4E\u4E5E\u4E5F; # 3 Japanese Kanji letters
 	puts $a
     } iso2022.tcl]
     set f [open "|[list [interpreter] $file]"]
@@ -540,31 +541,31 @@ test encoding-24.3 {EscapeFreeProc on open channels} {stdio} {
     close $f
     removeFile iso2022.tcl
     list $count [viewable $line]
-} [list 3 "\u4e4e\u4e5e\u4e5f (\\u4e4e\\u4e5e\\u4e5f)"]
+} [list 3 "\u4E4E\u4E5E\u4E5F (\\u4E4E\\u4E5E\\u4E5F)"]
 
 test encoding-24.4 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xc0\x80"]
+    string length [encoding convertfrom utf-8 "\xC0\x80"]
 } 1
 test encoding-24.5 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xc0\x81"]
+    string length [encoding convertfrom utf-8 "\xC0\x81"]
 } 2
 test encoding-24.6 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xc1\xbf"]
+    string length [encoding convertfrom utf-8 "\xC1\xBF"]
 } 2
 test encoding-24.7 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xc2\x80"]
+    string length [encoding convertfrom utf-8 "\xC2\x80"]
 } 1
 test encoding-24.8 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xe0\x80\x80"]
+    string length [encoding convertfrom utf-8 "\xE0\x80\x80"]
 } 3
 test encoding-24.9 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xe0\x9f\xbf"]
+    string length [encoding convertfrom utf-8 "\xE0\x9F\xBF"]
 } 3
 test encoding-24.10 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xe0\xa0\x80"]
+    string length [encoding convertfrom utf-8 "\xE0\xA0\x80"]
 } 1
 test encoding-24.11 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom utf-8 "\xef\xbf\xbf"]
+    string length [encoding convertfrom utf-8 "\xEF\xBF\xBF"]
 } 1
 
 file delete [file join [temporaryDirectory] iso2022.txt]
@@ -618,20 +619,20 @@ proc foreach-jisx0208 {varName command} {
 }
 proc gen-jisx0208-euc-jp {code} {
     binary format cc \
-	[expr {($code >> 8) | 0x80}] [expr {($code & 0xff) | 0x80}]
+	[expr {($code >> 8) | 0x80}] [expr {($code & 0xFF) | 0x80}]
 }
 proc gen-jisx0208-iso2022-jp {code} {
     binary format a3cca3 \
-	"\x1b\$B" [expr {$code >> 8}] [expr {$code & 0xff}] "\x1b(B"
+	"\x1B\$B" [expr {$code >> 8}] [expr {$code & 0xFF}] "\x1B(B"
 }
 proc gen-jisx0208-cp932 {code} {
     set c1 [expr {($code >> 8) | 0x80}]
     set c2 [expr {($code & 0xff)| 0x80}]
     if {$c1 % 2} {
-	set c1 [expr {($c1 >> 1) + ($c1 < 0xdf ? 0x31 : 0x71)}]
-	incr c2 [expr {- (0x60 + ($c2 < 0xe0))}]
+	set c1 [expr {($c1 >> 1) + ($c1 < 0xDF ? 0x31 : 0x71)}]
+	incr c2 [expr {- (0x60 + ($c2 < 0xE0))}]
     } else {
-	set c1 [expr {($c1 >> 1) + ($c1 < 0xdf ? 0x30 : 0x70)}]
+	set c1 [expr {($c1 >> 1) + ($c1 < 0xDF ? 0x30 : 0x70)}]
 	incr c2 -2
     }
     binary format cc $c1 $c2
-- 
cgit v0.12


From 7f87f0f8ea86cf01682eb02e4fa8c313dc6ef4ef Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Fri, 27 Jan 2023 19:15:09 +0000
Subject: Add some comments and tidy code.

---
 generic/tclBasic.c   | 3 ++-
 generic/tclExecute.c | 2 +-
 generic/tclNamesp.c  | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index bea5996..cdaf6fe 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -9716,6 +9716,7 @@ TclNRYieldToObjCmd(
      */
 
     iPtr->execEnvPtr = corPtr->callerEEPtr;
+    /* Not calling Tcl_IncrRefCount(listPtr) here because listPtr is private */
     TclSetTailcall(interp, listPtr);
     corPtr->yieldPtr = listPtr;
     iPtr->execEnvPtr = corPtr->eePtr;
@@ -9918,8 +9919,8 @@ TclNRCoroutineActivateCallback(
 	    if (corPtr->yieldPtr) {
 		for (runPtr = TOP_CB(interp); runPtr; runPtr = runPtr->nextPtr) {
 		    if (runPtr->data[1] == corPtr->yieldPtr) {
+			Tcl_DecrRefCount(runPtr->data[1]);
 			runPtr->data[1] = NULL;
-			Tcl_DecrRefCount(corPtr->yieldPtr);
 			corPtr->yieldPtr = NULL;
 			break;
 		    }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index ec144a2..7ee5471 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2503,8 +2503,8 @@ TEBCresume(
 	 * 'yieldParameter').
 	 */
 
-	Tcl_IncrRefCount(valuePtr);
 	iPtr->execEnvPtr = corPtr->callerEEPtr;
+	Tcl_IncrRefCount(valuePtr);
 	TclSetTailcall(interp, valuePtr);
 	corPtr->yieldPtr = valuePtr;
 	iPtr->execEnvPtr = corPtr->eePtr;
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 6269bbe..5a2979e 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -417,6 +417,8 @@ Tcl_PopCallFrame(
     framePtr->nsPtr = NULL;
 
     if (framePtr->tailcallPtr) {
+	/* Reusing the existing reference count from framePtr->tailcallPtr, so
+	 * no need to Tcl_IncrRefCount(framePtr->tailcallPtr)*/
 	TclSetTailcall(interp, framePtr->tailcallPtr);
     }
 }
-- 
cgit v0.12


From 468b1a434681f98ea64d399abce7ddd8c605617d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 28 Jan 2023 18:50:32 +0000
Subject: Fix "format %c 0x10000041", should give the same answer as in Tcl 8.6
 (Handling of TCL_COMBINE flag should not be visible at script level)

---
 generic/tclStringObj.c | 3 +++
 tests/format.test      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index a041d4c..e1376f4 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2130,6 +2130,9 @@ Tcl_AppendFormatToObj(
 	    if (TclGetIntFromObj(interp, segment, &code) != TCL_OK) {
 		goto error;
 	    }
+	    if ((unsigned)code > 0x10FFFF) {
+	    	code = 0xFFFD;
+	    }
 	    length = Tcl_UniCharToUtf(code, buf);
 #if TCL_UTF_MAX < 4
 	    if ((code >= 0xD800) && (length < 3)) {
diff --git a/tests/format.test b/tests/format.test
index c47774a..8cabbf1 100644
--- a/tests/format.test
+++ b/tests/format.test
@@ -402,6 +402,9 @@ test format-8.26 {Undocumented formats} -body {
 test format-8.27 {Undocumented formats} -constraints pointerIs64bit -body {
     format "%p %#llx" [expr {2**33}] [expr {2**33}]
 } -result {0x200000000 0x200000000}
+test format-8.28 {Internal use of TCL_COMBINE flag should not be visiable at script level} {
+    format %c 0x10000041
+} \uFFFD
 
 test format-9.1 {long result} {
     set a {1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}
-- 
cgit v0.12


From 5b86b255d41b6a0948597ccc8b7499efde42c4d7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 28 Jan 2023 20:50:36 +0000
Subject: Another situation where TCL_COMBINE handling gives a strange result
 (utf-32 encoder)

---
 generic/tclEncoding.c | 10 ++++++++--
 tests/encoding.test   |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index e548663..46508b7 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2505,8 +2505,14 @@ Utf32ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
-	if  ((unsigned)ch > 0x10FFFF || (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		&& ((ch  & ~0x7FF) == 0xD800))) {
+	if  ((unsigned)ch > 0x10FFFF) {
+	    if (STOPONERROR) {
+		result = TCL_CONVERT_SYNTAX;
+		break;
+	    }
+	    ch = 0xFFFD;
+	} else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
+		&& ((ch  & ~0x7FF) == 0xD800)) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
diff --git a/tests/encoding.test b/tests/encoding.test
index a6c8a80..1971360 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -482,6 +482,10 @@ test encoding-16.7 {Utf32ToUtfProc} -body {
     set val [encoding convertfrom utf-32be \0\0NN]
     list $val [format %x [scan $val %c]]
 } -result "乎 4e4e"
+test encoding-16.8 {Utf32ToUtfProc} -body {
+    set val [encoding convertfrom -nocomplain utf-32 \x41\x00\x00\x41]
+    list $val [format %x [scan $val %c]]
+} -result "\uFFFD fffd"
 
 test encoding-17.1 {UtfToUtf16Proc} -body {
     encoding convertto utf-16 "\U460DC"
-- 
cgit v0.12


From 4d235ca93a0588d63b0b2a0d1cdceb594a1a3a32 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 30 Jan 2023 11:22:28 +0000
Subject: Make Tcl_UniCharToUtf() a little easier to read.

---
 generic/tclUtf.c | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 92bcf4f..ee0724c 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -231,8 +231,8 @@ Tcl_UniCharToUtf(
     }
     if (ch >= 0) {
 	if (ch <= 0x7FF) {
-	    buf[1] = (char) ((ch | 0x80) & 0xBF);
-	    buf[0] = (char) ((ch >> 6) | 0xC0);
+	    buf[1] = (char) (0x80 | (0x3F & ch));
+	    buf[0] = (char) (0xC0 | (ch >> 6));
 	    return 2;
 	}
 	if (ch <= 0xFFFF) {
@@ -243,10 +243,11 @@ Tcl_UniCharToUtf(
 		    ((ch & 0xF800) == 0xD800)) {
 		if (ch & 0x0400) {
 		    /* Low surrogate */
-		    if (((buf[0] & 0xC0) == 0x80) && ((buf[1] & 0xCF) == 0)) {
+		    if (   (0x80 == (0xC0 & buf[0]))
+			&& (0    == (0xCF & buf[1]))) {
 			/* Previous Tcl_UniChar was a high surrogate, so combine */
-			buf[2] = (char) ((ch & 0x3F) | 0x80);
-			buf[1] |= (char) (((ch >> 6) & 0x0F) | 0x80);
+			buf[2]  = (char) (0x80 | (0x3F & ch));
+			buf[1] |= (char) (0x80 | (0x0F & (ch >> 6)));
 			return 3;
 		    }
 		    /* Previous Tcl_UniChar was not a high surrogate, so just output */
@@ -255,38 +256,41 @@ Tcl_UniCharToUtf(
 		    ch += 0x40;
 		    /* Fill buffer with specific 3-byte (invalid) byte combination,
 		       so following low surrogate can recognize it and combine */
-		    buf[2] = (char) ((ch << 4) & 0x30);
-		    buf[1] = (char) (((ch >> 2) & 0x3F) | 0x80);
-		    buf[0] = (char) (((ch >> 8) & 0x07) | 0xF0);
+		    buf[2] = (char) (        0x03 & ch);
+		    buf[1] = (char) (0x80 | (0x3F & (ch >> 2)));
+		    buf[0] = (char) (0xF0 | (0x07 & (ch >> 8)));
 		    return 1;
 		}
 	    }
 	    goto three;
 	}
 	if (ch <= 0x10FFFF) {
-	    buf[3] = (char) ((ch | 0x80) & 0xBF);
-	    buf[2] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	    buf[1] = (char) (((ch >> 12) | 0x80) & 0xBF);
-	    buf[0] = (char) ((ch >> 18) | 0xF0);
+	    buf[3] = (char) (0x80 | (0x3F & ch));
+	    buf[2] = (char) (0xBF & (0x80 | (ch >> 6)));
+	    buf[1] = (char) (0xBF & (0x80 | (ch >> 12)));
+	    buf[0] = (char) (0xF0 |         (ch >> 18));
 	    return 4;
 	}
     } else if (ch == -1) {
-	if (((buf[0] & 0xC0) == 0x80) && ((buf[1] & 0xCF) == 0)
-		&& ((buf[-1] & 0xF8) == 0xF0)) {
-	    ch = 0xD7C0 + ((buf[-1] & 0x07) << 8) + ((buf[0] & 0x3F) << 2)
-		    + ((buf[1] & 0x30) >> 4);
-	    buf[1] = (char) ((ch | 0x80) & 0xBF);
-	    buf[0] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	    buf[-1] = (char) ((ch >> 12) | 0xE0);
+	if (   (0x80 == (0xC0 & buf[0]))
+	    && (0    == (0xCF & buf[1]))
+	    && (0xF0 == (0xF8 & buf[-1]))) {
+	    ch = 0xD7C0
+		+ ((0x07 & buf[-1]) << 8)
+		+ ((0x3F & buf[0])  << 2)
+		+ ((0x30 & buf[1])  >> 4);
+	    buf[1]  = (char) (0xBF & (0x80 | ch));
+	    buf[0]  = (char) (0xBF & (0x80 | (ch >> 6)));
+	    buf[-1] = (char) (0xE0 | (ch >> 12));
 	    return 2;
 	}
     }
 
     ch = 0xFFFD;
 three:
-    buf[2] = (char) ((ch | 0x80) & 0xBF);
-    buf[1] = (char) (((ch >> 6) | 0x80) & 0xBF);
-    buf[0] = (char) ((ch >> 12) | 0xE0);
+    buf[2] = (char) (0x80 | (0x3F & ch));
+    buf[1] = (char) (0x80 | (0x3F & (ch >> 6)));
+    buf[0] = (char) (0xE0 |         (ch >> 12));
     return 3;
 }
 
-- 
cgit v0.12


From 8c0f76a7de2b22a611f26c3a08a434b5b85ce261 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 30 Jan 2023 11:59:41 +0000
Subject: A few more readability changes to Tcl_UniCharToUtf()

jn: Please, don't do that here. Tcl_UniCharToUtf() is shared between 8.6, 8.7 and 9.0. So if you want to make it easier to read, it should be done on all 3 branches. I know you only care about "trunk", but it makes maintenance on 8.6/8.7/9.0 harder than it already is. I don't want to spend time on reviewing such kind of changes, and no-one else is doing it. Thanks for understanding (I hope)!
---
 generic/tclUtf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index ee0724c..ab27f1b 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -266,8 +266,8 @@ Tcl_UniCharToUtf(
 	}
 	if (ch <= 0x10FFFF) {
 	    buf[3] = (char) (0x80 | (0x3F & ch));
-	    buf[2] = (char) (0xBF & (0x80 | (ch >> 6)));
-	    buf[1] = (char) (0xBF & (0x80 | (ch >> 12)));
+	    buf[2] = (char) (0x80 | (0x3F & (ch >> 6)));
+	    buf[1] = (char) (0x80 | (0x3F & (ch >> 12)));
 	    buf[0] = (char) (0xF0 |         (ch >> 18));
 	    return 4;
 	}
@@ -279,8 +279,8 @@ Tcl_UniCharToUtf(
 		+ ((0x07 & buf[-1]) << 8)
 		+ ((0x3F & buf[0])  << 2)
 		+ ((0x30 & buf[1])  >> 4);
-	    buf[1]  = (char) (0xBF & (0x80 | ch));
-	    buf[0]  = (char) (0xBF & (0x80 | (ch >> 6)));
+	    buf[1]  = (char) (0x80 | (0x3F & ch));
+	    buf[0]  = (char) (0x80 | (0x3F & (ch >> 6)));
 	    buf[-1] = (char) (0xE0 | (ch >> 12));
 	    return 2;
 	}
-- 
cgit v0.12


From d3dae9eba4c8d979d72feddfded60eb08835543d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 30 Jan 2023 15:37:41 +0000
Subject: silence compiler warning

---
 generic/tclBasic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index cdaf6fe..a31bfb6 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -9919,7 +9919,7 @@ TclNRCoroutineActivateCallback(
 	    if (corPtr->yieldPtr) {
 		for (runPtr = TOP_CB(interp); runPtr; runPtr = runPtr->nextPtr) {
 		    if (runPtr->data[1] == corPtr->yieldPtr) {
-			Tcl_DecrRefCount(runPtr->data[1]);
+			Tcl_DecrRefCount((Tcl_Obj *)runPtr->data[1]);
 			runPtr->data[1] = NULL;
 			corPtr->yieldPtr = NULL;
 			break;
-- 
cgit v0.12


From 64e3a23bfdcfbe7b66872c58d095aa6e1868f95e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 31 Jan 2023 07:49:16 +0000
Subject: SetFlag -> GotFlag (since SetFlag always returns 1, this is nonsence
 in an if() statement). Also add test-case, showing that it was actually
 wrong, in behavior too.

---
 generic/tclIO.c  |  2 +-
 tests/ioCmd.test | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 47040d5..fed469c 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8354,7 +8354,7 @@ Tcl_SetChannelOption(
 #ifdef TCL_NO_DEPRECATED
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 #else
-	    if (SetFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
+	    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT) != CHANNEL_ENCODING_STRICT) {
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "bad value for -nocomplainencoding: only true allowed",
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 73f0e1c..1a72f70 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -376,6 +376,16 @@ test iocmd-8.21 {fconfigure command / -nocomplainencoding 0 error} -constraints
 } -body {
     fconfigure $console -nocomplainencoding 0
 } -returnCodes error -result "bad value for -nocomplainencoding: only true allowed"
+test iocmd-8.22 {fconfigure command / -nocomplainencoding 0, no error if -strictencoding already defined} -setup {
+    set console stdin
+    set oldmode [fconfigure $console -strictencoding]
+} -body {
+    fconfigure $console -strictencoding 1
+    fconfigure $console -nocomplainencoding 0
+    fconfigure $console -nocomplainencoding
+} -cleanup {
+    fconfigure $console -strictencoding $oldmode
+} -result 0
 
 
 test iocmd-9.1 {eof command} {
-- 
cgit v0.12


From 596e33bb9ec8c0083b2d6234c84afc293e525d24 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 31 Jan 2023 17:30:59 +0000
Subject: Remove incorrect comment. See:
 [https://www.magicsplat.com/tcl9/tcl9unicode.html#surrogates-as-literals].
 Thanks, Ashok, for noticing this!

---
 doc/Tcl.n | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/Tcl.n b/doc/Tcl.n
index 0f46f73..8e0b342 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.n
@@ -221,12 +221,6 @@ twenty-one-bit hexadecimal value for the Unicode character that will be
 inserted, in the range U+000000\(enU+10FFFF.  The parser will stop just
 before this range overflows, or when the maximum of eight digits
 is reached.  The upper bits of the Unicode character will be 0.
-.RS
-.PP
-The range U+00D800\(enU+00DFFF is reserved for surrogates, which
-are illegal on their own. Therefore, such sequences will result in
-the replacement character U+FFFD. Surrogate pairs should be
-encoded as single \e\fBU\fIhhhhhhhh\fR character.
 .RE
 .PP
 Backslash substitution is not performed on words enclosed in braces,
-- 
cgit v0.12


From 078a694834be8669ba6f79def0adbb61afacc0e2 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 31 Jan 2023 22:15:02 +0000
Subject: Fix error introduced in [3e5e37f83b058f3d] for Tcl_UniCharToUtf, and
 add test.

---
 generic/tclUtf.c    |  2 +-
 tests/encoding.test | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index ab27f1b..bef32f0 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -256,7 +256,7 @@ Tcl_UniCharToUtf(
 		    ch += 0x40;
 		    /* Fill buffer with specific 3-byte (invalid) byte combination,
 		       so following low surrogate can recognize it and combine */
-		    buf[2] = (char) (        0x03 & ch);
+		    buf[2] = (char) ((ch << 4) & 0x30);
 		    buf[1] = (char) (0x80 | (0x3F & (ch >> 2)));
 		    buf[0] = (char) (0xF0 | (0x07 & (ch >> 8)));
 		    return 1;
diff --git a/tests/encoding.test b/tests/encoding.test
index 1971360..8351c91 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -487,6 +487,30 @@ test encoding-16.8 {Utf32ToUtfProc} -body {
     list $val [format %x [scan $val %c]]
 } -result "\uFFFD fffd"
 
+test encoding-16.8 {
+    Utf16ToUtfProc, Tcl_UniCharToUtf, surrogate pairs in utf-16
+} -body {
+    apply [list {} {
+	for {set i 0xD800} {$i < 0xDBFF} {incr i} {
+	    for {set j 0xDC00} {$j < 0xDFFF} {incr j} {
+		set string [binary format S2 [list $i $j]]
+		set status [catch {
+		    set decoded [encoding convertfrom utf-16be $string]
+		    set encoded [encoding convertto utf-16be $decoded]
+		}]
+		if {$status || ( $encoded ne $string )} {
+		    return [list [format %x $i] [format %x $j]]
+		}
+	    }
+	}
+	return done
+    } [namespace current]]
+} -result done
+
+
+
+
+
 test encoding-17.1 {UtfToUtf16Proc} -body {
     encoding convertto utf-16 "\U460DC"
 } -result "\xD8\xD8\xDC\xDC"
-- 
cgit v0.12


From 5866ef6d2acf4db24499c820df08a8feb88ea865 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 1 Feb 2023 07:29:48 +0000
Subject: (Cherry-pick) Make Tcl_UniCharToUtf more readable.

---
 generic/tclEncoding.c |  6 +++---
 generic/tclUtf.c      | 57 +++++++++++++++++++++++++++------------------------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index fe2b55b..dfa7907 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2244,9 +2244,9 @@ UtfExtToUtfIntProc(
  *
  * UtfToUtfProc --
  *
- *	Convert from UTF-8 to UTF-8. Note that the UTF-8 to UTF-8 translation
- *	is not a no-op, because it will turn a stream of improperly formed
- *	UTF-8 into a properly formed stream.
+ *	Converts from UTF-8 to UTF-8. Note that the UTF-8 to UTF-8 translation
+ *	is not a no-op, because it turns a stream of improperly formed
+ *	UTF-8 into a properly-formed stream.
  *
  * Results:
  *	Returns TCL_OK if conversion was successful.
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 8931b39..e4d0fc8 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -206,12 +206,11 @@ Invalid(
  *
  * Tcl_UniCharToUtf --
  *
- *	Store the given Tcl_UniChar as a sequence of UTF-8 bytes in the
+ *	Stores the given Tcl_UniChar as a sequence of UTF-8 bytes in the
  *	provided buffer. Equivalent to Plan 9 runetochar().
  *
  * Results:
- *	The return values is the number of bytes in the buffer that were
- *	consumed.
+ *	Returns the number of bytes stored into the buffer.
  *
  * Side effects:
  *	None.
@@ -234,8 +233,8 @@ Tcl_UniCharToUtf(
     }
     if (ch >= 0) {
 	if (ch <= 0x7FF) {
-	    buf[1] = (char) ((ch | 0x80) & 0xBF);
-	    buf[0] = (char) ((ch >> 6) | 0xC0);
+	    buf[1] = (char) (0x80 | (0x3F & ch));
+	    buf[0] = (char) (0xC0 | (ch >> 6));
 	    return 2;
 	}
 	if (ch <= 0xFFFF) {
@@ -243,10 +242,11 @@ Tcl_UniCharToUtf(
 	    if ((ch & 0xF800) == 0xD800) {
 		if (ch & 0x0400) {
 		    /* Low surrogate */
-		    if (((buf[0] & 0xC0) == 0x80) && ((buf[1] & 0xCF) == 0)) {
+		    if (   (0x80 == (0xC0 & buf[0]))
+			&& (0    == (0xCF & buf[1]))) {
 			/* Previous Tcl_UniChar was a high surrogate, so combine */
-			buf[2] = (char) ((ch & 0x3F) | 0x80);
-			buf[1] |= (char) (((ch >> 6) & 0x0F) | 0x80);
+			buf[2]  = (char) (0x80 | (0x3F & ch));
+			buf[1] |= (char) (0x80 | (0x0F & (ch >> 6)));
 			return 3;
 		    }
 		    /* Previous Tcl_UniChar was not a high surrogate, so just output */
@@ -256,8 +256,8 @@ Tcl_UniCharToUtf(
 		    /* Fill buffer with specific 3-byte (invalid) byte combination,
 		       so following low surrogate can recognize it and combine */
 		    buf[2] = (char) ((ch << 4) & 0x30);
-		    buf[1] = (char) (((ch >> 2) & 0x3F) | 0x80);
-		    buf[0] = (char) (((ch >> 8) & 0x07) | 0xF0);
+		    buf[1] = (char) (0x80 | (0x3F & (ch >> 2)));
+		    buf[0] = (char) (0xF0 | (0x07 & (ch >> 8)));
 		    return 1;
 		}
 	    }
@@ -267,20 +267,23 @@ Tcl_UniCharToUtf(
 
 #if TCL_UTF_MAX > 3
 	if (ch <= 0x10FFFF) {
-	    buf[3] = (char) ((ch | 0x80) & 0xBF);
-	    buf[2] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	    buf[1] = (char) (((ch >> 12) | 0x80) & 0xBF);
-	    buf[0] = (char) ((ch >> 18) | 0xF0);
+	    buf[3] = (char) (0x80 | (0x3F & ch));
+	    buf[2] = (char) (0x80 | (0x3F & (ch >> 6)));
+	    buf[1] = (char) (0x80 | (0x3F & (ch >> 12)));
+	    buf[0] = (char) (0xF0 |         (ch >> 18));
 	    return 4;
 	}
     } else if (ch == -1) {
-	if (((buf[0] & 0xC0) == 0x80) && ((buf[1] & 0xCF) == 0)
-		&& ((buf[-1] & 0xF8) == 0xF0)) {
-	    ch = 0xD7C0 + ((buf[-1] & 0x07) << 8) + ((buf[0] & 0x3F) << 2)
-		    + ((buf[1] & 0x30) >> 4);
-	    buf[1] = (char) ((ch | 0x80) & 0xBF);
-	    buf[0] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	    buf[-1] = (char) ((ch >> 12) | 0xE0);
+	if (   (0x80 == (0xC0 & buf[0]))
+	    && (0    == (0xCF & buf[1]))
+	    && (0xF0 == (0xF8 & buf[-1]))) {
+	    ch = 0xD7C0
+		+ ((0x07 & buf[-1]) << 8)
+		+ ((0x3F & buf[0])  << 2)
+		+ ((0x30 & buf[1])  >> 4);
+	    buf[1]  = (char) (0x80 | (0x3F & ch));
+	    buf[0]  = (char) (0x80 | (0x3F & (ch >> 6)));
+	    buf[-1] = (char) (0xE0 | (ch >> 12));
 	    return 2;
 	}
 #endif
@@ -288,9 +291,9 @@ Tcl_UniCharToUtf(
 
     ch = 0xFFFD;
 three:
-    buf[2] = (char) ((ch | 0x80) & 0xBF);
-    buf[1] = (char) (((ch >> 6) | 0x80) & 0xBF);
-    buf[0] = (char) ((ch >> 12) | 0xE0);
+    buf[2] = (char) (0x80 | (0x3F & ch));
+    buf[1] = (char) (0x80 | (0x3F & (ch >> 6)));
+    buf[0] = (char) (0xE0 |         (ch >> 12));
     return 3;
 }
 
@@ -2386,7 +2389,7 @@ TclUniCharMatch(
  *
  * TclUtfToUCS4 --
  *
- *	Extract the 4-byte codepoint from the leading bytes of the
+ *	Extracts the 4-byte codepoint from the leading bytes of the
  *	Modified UTF-8 string "src".  This is a utility routine to
  *	contain the surrogate gymnastics in one place.
  *
@@ -2398,8 +2401,8 @@ TclUniCharMatch(
  *	enough bytes remain in the string.
  *
  * Results:
- *	*usc4Ptr is filled with the UCS4 code point, and the return value is
- *	the number of bytes from the UTF-8 string that were consumed.
+ *	Fills *usc4Ptr with the UCS4 code point and returns the number of bytes
+ *	consumed from the source string.
  *
  * Side effects:
  *	None.
-- 
cgit v0.12


From 3eaad4bbc95c9cb3eaaf79872646d4fa7f6d8c6e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 1 Feb 2023 08:10:12 +0000
Subject: (cherry-pick) Make Tcl_UniCharToUtf more readable and add test to
 exercise surrogate handling. (test-case was still missing, which cannot be
 used in Tcl 8.6)

---
 generic/tclUtf.c    | 14 ++++++--------
 tests/encoding.test | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index db2be84..cb8bb3e 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -185,17 +185,15 @@ Invalid(
  *	Stores the given Tcl_UniChar as a sequence of UTF-8 bytes in the
  *	provided buffer. Equivalent to Plan 9 runetochar().
  *
- *	Special handling of Surrogate pairs is handled as follows:
- *	When this function is called for ch being a high surrogate,
- *	the first byte of the 4-byte UTF-8 sequence is produced and
- *	the function returns 1. Calling the function again with a
- *	low surrogate, the remaining 3 bytes of the 4-byte UTF-8
- *	sequence is produced, and the function returns 3. The buffer
- *	is used to remember the high surrogate between the two calls.
+ *	Surrogate pairs are handled as follows: When ch is a high surrogate,
+ *	the first byte of the 4-byte UTF-8 sequence is stored in the buffer and
+ *	the function returns 1. If the function is called again with a low
+ *	surrogate and the same buffer, the remaining 3 bytes of the 4-byte
+ *	UTF-8 sequence are produced.
  *
  *	If no low surrogate follows the high surrogate (which is actually
  *	illegal), this can be handled reasonably by calling Tcl_UniCharToUtf
- *	again with ch = -1. This will produce a 3-byte UTF-8 sequence
+ *	again with ch = -1. This produces a 3-byte UTF-8 sequence
  *	representing the high surrogate.
  *
  * Results:
diff --git a/tests/encoding.test b/tests/encoding.test
index 10a37f8..ae6c78a 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -482,6 +482,30 @@ test encoding-16.7 {Utf32ToUtfProc} -body {
     list $val [format %x [scan $val %c]]
 } -result "乎 4e4e"
 
+test encoding-16.8 {
+    Utf16ToUtfProc, Tcl_UniCharToUtf, surrogate pairs in utf-16
+} -body {
+    apply [list {} {
+	for {set i 0xD800} {$i < 0xDBFF} {incr i} {
+	    for {set j 0xDC00} {$j < 0xDFFF} {incr j} {
+		set string [binary format S2 [list $i $j]]
+		set status [catch {
+		    set decoded [encoding convertfrom utf-16be $string]
+		    set encoded [encoding convertto utf-16be $decoded]
+		}]
+		if {$status || ( $encoded ne $string )} {
+		    return [list [format %x $i] [format %x $j]]
+		}
+	    }
+	}
+	return done
+    } [namespace current]]
+} -result done
+
+
+
+
+
 test encoding-17.1 {UtfToUtf16Proc} -body {
     encoding convertto utf-16 "\U460DC"
 } -result "\xD8\xD8\xDC\xDC"
-- 
cgit v0.12


From b9c893dbc940d680560b5cc10b414c702d845004 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 1 Feb 2023 21:01:51 +0000
Subject: Renumber testscase, sync with Tcl 9.0

---
 tests/encoding.test | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index ae6c78a..05d9918 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -481,8 +481,12 @@ test encoding-16.7 {Utf32ToUtfProc} -body {
     set val [encoding convertfrom utf-32be \0\0NN]
     list $val [format %x [scan $val %c]]
 } -result "乎 4e4e"
+test encoding-16.8 {Utf32ToUtfProc} -body {
+    set val [encoding convertfrom -nocomplain utf-32 \x41\x00\x00\x41]
+    list $val [format %x [scan $val %c]]
+} -result "\uFFFD fffd"
 
-test encoding-16.8 {
+test encoding-16.9 {
     Utf16ToUtfProc, Tcl_UniCharToUtf, surrogate pairs in utf-16
 } -body {
     apply [list {} {
@@ -930,7 +934,9 @@ test encoding-27.2 {encoding dirs basic behavior} -returnCodes error -body {
 test encoding-28.0 {all encodings load} -body {
 	set string hello
 	foreach name [encoding names] {
-		incr count
+		if {$name ne "unicode"} {
+		    incr count
+		}
 		encoding convertto -nocomplain $name $string
 
 		# discard the cached internal representation of Tcl_Encoding
@@ -938,7 +944,7 @@ test encoding-28.0 {all encodings load} -body {
 		llength $name
 	}
 	return $count
-} -result [expr {[info exists ::tcl_precision] ? 92 : 91}]
+} -result 91
 
 runtests
 
-- 
cgit v0.12


From de0a637d7c24faa768c266bacda17bf6ac48171d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 2 Feb 2023 07:12:34 +0000
Subject: Fix documentation on "encoding" command

---
 doc/encoding.n | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index 9577da3..4ad2824 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -39,9 +39,9 @@ system encoding is used.
 .VS "TCL8.7 TIP346, TIP607, TIP601"
 .PP
 .RS
-The command does not fail on encoding errors.  Instead, any not convertable bytes
-(like incomplete UTF-8  sequences, see example below) are put as byte values into
-the output stream.
+The command does not fail on encoding errors (unless \fB-strict\fR is specified).
+Instead, any not convertable bytes (like incomplete UTF-8  sequences, see example
+below) are put as byte values into the output stream.
 .PP
 If the option \fB-failindex\fR with a variable name is given, the error reporting
 is changed in the following manner:
@@ -51,9 +51,8 @@ converted characters until the first error position.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
 may not be used together with \fB-nocomplain\fR.
 .PP
-The option \fB-nocomplain\fR has no effect and is available for compatibility with
-TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
-This switch restores the TCL8.7 behaviour.
+The option \fB-nocomplain\fR has no effect, but assures to get the same result
+in Tcl 9.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
 encoder, it disallows invalid byte sequences and surrogates (which -
@@ -74,9 +73,9 @@ specified, the current system encoding is used.
 .VS "TCL8.7 TIP346, TIP607, TIP601"
 .PP
 .RS
-The command does not fail on encoding errors.  Instead, the replacement character
-\fB?\fR is output for any not representable character (like the dot \fB\\U2022\fR
-in \fBiso-8859-1\fR encoding, see example below).
+The command does not fail on encoding errors (unless \fB-strict\fR is specified).
+Instead, the replacement character \fB?\fR is output for any not representable
+character (like the dot \fB\\U2022\fR in \fBiso-8859-1\fR encoding, see example below).
 .PP
 If the option \fB-failindex\fR with a variable name is given, the error reporting
 is changed in the following manner:
@@ -86,9 +85,8 @@ converted bytes until the first error position. No error condition is raised.
 In case of no error, the value \fI-1\fR is written to the variable.  This option
 may not be used together with \fB-nocomplain\fR.
 .PP
-The option \fB-nocomplain\fR has no effect and is available for compatibility with
-TCL 9. In TCL 9, the encoding command fails with an error on any encoding issue.
-This switch restores the TCL8.7 behaviour.
+The option \fB-nocomplain\fR has no effect, but assures to get the same result
+in Tcl 9.
 .PP
 The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
 encoder, it disallows surrogates (which - otherwise - are just passed through).  This
@@ -157,7 +155,7 @@ Example 4: detect the error location while transforming to ISO8859-1
 (ISO-Latin 1):
 .PP
 .CS
-% set s [\fBencoding convertto\fR -failindex i utf-8 "A\eu0141"]
+% set s [\fBencoding convertto\fR -failindex i iso8859-1 "A\eu0141"]
 A
 % set i
 1
@@ -166,11 +164,11 @@ A
 Example 5: replace a not representable character by the replacement character:
 .PP
 .CS
-% set s [\fBencoding convertto\fR -nocomplain utf-8 "A\eu0141"]
+% set s [\fBencoding convertto\fR -nocomplain iso8859-1 "A\eu0141"]
 A?
 .CE
 The option \fB-nocomplain\fR has no effect, but assures to get the same result
-with TCL9.
+in Tcl 9.
 .VE "TCL8.7 TIP346, TIP607, TIP601"
 .PP
 .SH "SEE ALSO"
-- 
cgit v0.12


From 637e7224c9b4c5bde7709455dc262bdf476f9b4d Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 2 Feb 2023 11:52:31 +0000
Subject: Replace encoding -strict etc. with -profile

---
 generic/tclCmdAH.c    | 325 +++++++++++++++++++++++++++++---------------------
 generic/tclEncoding.c |  34 ++++++
 generic/tclInt.h      |  20 ++++
 tests/encoding.test   | 132 ++++++++++----------
 4 files changed, 310 insertions(+), 201 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 4f743cc..818159d 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -527,6 +527,137 @@ TclInitEncodingCmd(
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * EncodingConvertParseOptions --
+ *
+ *    Common routine for parsing arguments passed to encoding convertfrom
+ *    and encoding convertto.
+ *
+ * Results:
+ *    TCL_OK or TCL_ERROR.
+ *
+ * Side effects:
+ *    On success,
+ *    - *encPtr is set to the encoding. Must be freed with Tcl_FreeEncoding
+ *      if non-NULL
+ *    - *dataObjPtr is set to the Tcl_Obj containing the data to encode or
+ *      decode
+ *    - *flagsPtr is set to encoding error handling flags
+ *    - *failVarPtr is set to -failindex option value or NULL
+ *    On error, all of the above are uninitialized.
+ *
+ *------------------------------------------------------------------------
+ */
+static int
+EncodingConvertParseOptions (
+    Tcl_Interp *interp,    /* For error messages. May be NULL */
+    int objc,		   /* Number of arguments */
+    Tcl_Obj *const objv[], /* Argument objects as passed to command. */
+    int isEncoder,         /* 1 -> convertto, 0 -> convertfrom */
+    Tcl_Encoding *encPtr,  /* Where to store the encoding */
+    Tcl_Obj **dataObjPtr,  /* Where to store ptr to Tcl_Obj containing data */
+    int *flagsPtr,         /* Bit mask of encoding option flags */
+    Tcl_Obj **failVarPtr   /* Where to store -failindex option value */
+)
+{
+    static const char *const options[] = {"-profile", "-failindex", NULL};
+    enum convertfromOptions { PROFILE, FAILINDEX } optIndex;
+    enum TclEncodingProfile profile;
+    Tcl_Encoding encoding;
+    Tcl_Obj *dataObj;
+    Tcl_Obj *failVarObj;
+#if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
+    int flags = TCL_ENCODING_STOPONERROR;
+#else
+    int flags = TCL_ENCODING_NOCOMPLAIN;
+#endif
+
+    /*
+     * Possible combinations:
+     * 1) data						-> objc = 2
+     * 2) ?options? encoding data			-> objc >= 3
+     * It is intentional that specifying option forces encoding to be
+     * specified. Less prone to user error. This should have always been
+     * the case even in 8.6 imho where there were no options (ie (1)
+     * should never have been allowed)
+     */
+
+    if (objc == 1) {
+numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
+	Tcl_WrongNumArgs(
+	    interp,
+	    1,
+	    objv,
+	    "??-profile profile? ?-failindex var? ?encoding?? data");
+	return TCL_ERROR;
+    }
+
+    failVarObj = NULL;
+    if (objc == 2) {
+	encoding = Tcl_GetEncoding(interp, NULL);
+	dataObj = objv[1];
+    } else {
+	int argIndex;
+	for (argIndex = 1; argIndex < (objc-2); ++argIndex) {
+	    if (Tcl_GetIndexFromObj(
+		    interp, objv[argIndex], options, "option", 0, &optIndex)
+		!= TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    if (++argIndex == (objc - 2)) {
+		goto numArgsError;
+	    }
+	    switch (optIndex) {
+	    case PROFILE:
+		if (TclEncodingProfileParseName(
+			interp, objv[argIndex], &profile)
+		    != TCL_OK) {
+		    return TCL_ERROR;
+		}
+		switch (profile) {
+		case TCL_ENCODING_PROFILE_TCL8:
+		    flags = TCL_ENCODING_NOCOMPLAIN;
+		    break;
+		case TCL_ENCODING_PROFILE_STRICT:
+		    flags = TCL_ENCODING_STRICT;
+		    break;
+		case TCL_ENCODING_PROFILE_DEFAULT: /* FALLTHRU */
+		default:
+		    break;
+		}
+		break;
+	    case FAILINDEX:
+		failVarObj = objv[argIndex];
+		break;
+	    }
+	}
+	/* Get encoding after opts so no need to free it on option error */
+	if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding)
+	    != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	dataObj = objv[objc - 1];
+    }
+
+    /* -failindex forces checking*/
+    if (failVarObj != NULL && flags == TCL_ENCODING_NOCOMPLAIN) {
+	/* 
+	 * Historical, but I really don't like this mixing of defines
+	 * from two different bit mask domains - ENCODING_FAILINDEX
+	 */
+	flags = isEncoder ? TCL_ENCODING_STOPONERROR : ENCODING_FAILINDEX;
+    }
+
+    *encPtr = encoding;
+    *dataObjPtr = dataObj;
+    *flagsPtr = flags;
+    *failVarPtr = failVarObj;
+
+    return TCL_OK;
+}
+
+/*
  *----------------------------------------------------------------------
  *
  * EncodingConvertfromObjCmd --
@@ -559,78 +690,73 @@ EncodingConvertfromObjCmd(
 #endif
     int result;
     Tcl_Obj *failVarObj = NULL;
+    static const char *const options[] = {"-profile", "-failindex", NULL};
+    enum convertfromOptions { PROFILE, FAILINDEX } optIndex;
+    enum TclEncodingProfile profile;
+
     /*
-     * Decode parameters:
      * Possible combinations:
      * 1) data						-> objc = 2
-     * 2) encoding data					-> objc = 3
-     * 3) -nocomplain data				-> objc = 3
-     * 4) -nocomplain encoding data			-> objc = 4
-     * 5) -strict data				-> objc = 3
-     * 6) -strict encoding data			-> objc = 4
-     * 7) -failindex val data				-> objc = 4
-     * 8) -failindex val encoding data			-> objc = 5
+     * 2) ?options? encoding data			-> objc >= 3
+     * It is intentional that specifying option forces encoding to be
+     * specified. Less prone to user error. This should have always been
+     * the case even in 8.6 imho where there were no options (ie (1)
+     * should never have been allowed)
      */
 
-    if (objc == 2) {
+    if (objc == 1) {
+numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
+	Tcl_WrongNumArgs(
+	    interp,
+	    1,
+	    objv,
+	    "??-profile profile? ?-failindex var? ?encoding?? data");
+	return TCL_ERROR;
+    }
+    else if (objc == 2) {
 	encoding = Tcl_GetEncoding(interp, NULL);
 	data = objv[1];
-    } else if (objc > 2 && objc < 7) {
-	int objcUnprocessed = objc;
-	data = objv[objc - 1];
-	bytesPtr = Tcl_GetString(objv[1]);
-	if (bytesPtr[0] == '-' && bytesPtr[1] == 'n'
-		&& !strncmp(bytesPtr, "-nocomplain", strlen(bytesPtr))) {
-	    flags = TCL_ENCODING_NOCOMPLAIN;
-	    objcUnprocessed--;
-	} else if (bytesPtr[0] == '-' && bytesPtr[1] == 's'
-		&& !strncmp(bytesPtr, "-strict", strlen(bytesPtr))) {
-	    flags = TCL_ENCODING_STRICT;
-	    objcUnprocessed--;
-		bytesPtr = Tcl_GetString(objv[2]);
-		if (bytesPtr[0] == '-' && bytesPtr[1] == 'f'
-			&& !strncmp(bytesPtr, "-failindex", strlen(bytesPtr))) {
-		    /* at least two additional arguments needed */
-		    if (objc < 6) {
-			goto encConvFromError;
-		    }
-		    failVarObj = objv[3];
-		    objcUnprocessed -= 2;
-		}
-	} else if (bytesPtr[0] == '-' && bytesPtr[1] == 'f'
-		&& !strncmp(bytesPtr, "-failindex", strlen(bytesPtr))) {
-	    /* at least two additional arguments needed */
-	    if (objc < 4) {
-		goto encConvFromError;
+    } else {
+	int argIndex;
+	for (argIndex = 1; argIndex < (objc-2); ++argIndex) {
+	    if (Tcl_GetIndexFromObj(
+		    interp, objv[argIndex], options, "option", 0, &optIndex)
+		!= TCL_OK) {
+		return TCL_ERROR;
 	    }
-	    failVarObj = objv[2];
-	    flags = ENCODING_FAILINDEX;
-	    objcUnprocessed -= 2;
-		bytesPtr = Tcl_GetString(objv[3]);
-		if (bytesPtr[0] == '-' && bytesPtr[1] == 's'
-			&& !strncmp(bytesPtr, "-strict", strlen(bytesPtr))) {
-		    flags = TCL_ENCODING_STRICT;
-		    objcUnprocessed --;
-		}
-	}
-	switch (objcUnprocessed) {
-	    case 3:
-		if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding) != TCL_OK) {
+	    if (++argIndex == (objc - 2)) {
+		goto numArgsError;
+	    }
+	    switch (optIndex) {
+	    case PROFILE:
+		if (TclEncodingProfileParseName(
+			interp, objv[argIndex], &profile)
+		    != TCL_OK) {
 		    return TCL_ERROR;
 		}
+		switch (profile) {
+		case TCL_ENCODING_PROFILE_TCL8:
+		    flags = TCL_ENCODING_NOCOMPLAIN;
+		    break;
+		case TCL_ENCODING_PROFILE_STRICT:
+		    flags = TCL_ENCODING_STRICT;
+		    break;
+		case TCL_ENCODING_PROFILE_DEFAULT: /* FALLTHRU */
+		default:
+		    break;
+		}
 		break;
-	    case 2:
-		encoding = Tcl_GetEncoding(interp, NULL);
+	    case FAILINDEX:
+		failVarObj = objv[argIndex];
 		break;
-	    default:
-		goto encConvFromError;
+	    }
 	}
-    } else {
-    encConvFromError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-strict? ?-failindex var? ?encoding? data");
-	((Interp *) interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
-	Tcl_WrongNumArgs(interp, 1, objv, "-nocomplain ?encoding? data");
-	return TCL_ERROR;
+	/* Get encoding after opts so no need to free it on option error */
+	if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding)
+	    != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	data = objv[objc - 1];
     }
 
     /*
@@ -711,83 +837,12 @@ EncodingConverttoObjCmd(
     int length;			/* Length of the string being converted */
     const char *stringPtr;	/* Pointer to the first byte of the string */
     int result;
-#if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
-    int flags = TCL_ENCODING_STOPONERROR;
-#else
-    int flags = TCL_ENCODING_NOCOMPLAIN;
-#endif
-    Tcl_Obj *failVarObj = NULL;
-
-    /*
-     * Decode parameters:
-     * Possible combinations:
-     * 1) data						-> objc = 2
-     * 2) encoding data					-> objc = 3
-     * 3) -nocomplain data				-> objc = 3
-     * 4) -nocomplain encoding data			-> objc = 4
-     * 5) -failindex val data				-> objc = 4
-     * 6) -failindex val encoding data			-> objc = 5
-     */
-
-    if (objc == 2) {
-	encoding = Tcl_GetEncoding(interp, NULL);
-	data = objv[1];
-    } else if (objc > 2 && objc < 7) {
-	int objcUnprocessed = objc;
-	data = objv[objc - 1];
-	stringPtr = Tcl_GetString(objv[1]);
-	if (stringPtr[0] == '-' && stringPtr[1] == 'n'
-		&& !strncmp(stringPtr, "-nocomplain", strlen(stringPtr))) {
-	    flags = TCL_ENCODING_NOCOMPLAIN;
-	    objcUnprocessed--;
-	} else if (stringPtr[0] == '-' && stringPtr[1] == 's'
-		&& !strncmp(stringPtr, "-strict", strlen(stringPtr))) {
-	    flags = TCL_ENCODING_STRICT;
-	    objcUnprocessed--;
-		stringPtr = Tcl_GetString(objv[2]);
-		if (stringPtr[0] == '-' && stringPtr[1] == 'f'
-			&& !strncmp(stringPtr, "-failindex", strlen(stringPtr))) {
-		    /* at least two additional arguments needed */
-		    if (objc < 6) {
-			goto encConvToError;
-		    }
-		    failVarObj = objv[3];
-		    objcUnprocessed -= 2;
-		}
-	} else if (stringPtr[0] == '-' && stringPtr[1] == 'f'
-		&& !strncmp(stringPtr, "-failindex", strlen(stringPtr))) {
-	    /* at least two additional arguments needed */
-	    if (objc < 4) {
-		goto encConvToError;
-	    }
-	    failVarObj = objv[2];
-	    flags = TCL_ENCODING_STOPONERROR;
-	    objcUnprocessed -= 2;
-		stringPtr = Tcl_GetString(objv[3]);
-		if (stringPtr[0] == '-' && stringPtr[1] == 's'
-			&& !strncmp(stringPtr, "-strict", strlen(stringPtr))) {
-		    flags = TCL_ENCODING_STRICT;
-		    objcUnprocessed --;
-		}
-	}
-	switch (objcUnprocessed) {
-	    case 3:
-		if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		break;
-	    case 2:
-		encoding = Tcl_GetEncoding(interp, NULL);
-		break;
-	    default:
-		goto encConvToError;
-	}
-    } else {
-    encConvToError:
-	Tcl_WrongNumArgs(interp, 1, objv, "?-strict? ?-failindex var? ?encoding? data");
-	((Interp *) interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
-	Tcl_WrongNumArgs(interp, 1, objv, "-nocomplain ?encoding? data");
+    int flags;
+    Tcl_Obj *failVarObj;
 
+    if (EncodingConvertParseOptions(
+	    interp, objc, objv, 1, &encoding, &data, &flags, &failVarObj)
+	!= TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 288b07c..bdd091f 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -4085,6 +4085,40 @@ InitializeEncodingSearchPath(
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * TclEncodingProfileParseName --
+ *
+ *    Maps an encoding profile name to its enum value.
+ *
+ * Results:
+ *    TCL_OK on success or TCL_ERROR on failure.
+ *
+ * Side effects:
+ *    Returns the profile enum value in *profilePtr
+ *
+ *------------------------------------------------------------------------
+ */
+int
+TclEncodingProfileParseName(
+    Tcl_Interp *interp,			  /* For error messages. May be NULL */
+    Tcl_Obj *profileName,		  /* Name of profile */
+    enum TclEncodingProfile *profilePtr)  /* Output */
+{
+    /* NOTE: Order must match enum TclEncodingProfile !!! */
+    static const char *const profileNames[] = {"", "tcl8", "strict"};
+    int idx;
+
+    if (Tcl_GetIndexFromObj(
+	    interp, profileName, profileNames, "profile", 0, &idx)
+	!= TCL_OK) {
+	return TCL_ERROR;
+    }
+    *profilePtr = (enum TclEncodingProfile)idx;
+    return TCL_OK;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 31c7fcb..db8ee9f 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2879,7 +2879,25 @@ MODULE_SCOPE int tclFindExecutableSearchDone;
 MODULE_SCOPE char *tclMemDumpFileName;
 MODULE_SCOPE TclPlatformType tclPlatform;
 
+/*
+ * Declarations related to internal encoding functions.
+ */
+
+/*
+ * Enum for encoding profiles that control encoding treatment of 
+ * invalid bytes. NOTE: Order must match that of encodingProfileNames in 
+ * TclEncodingProfileParseName() !!!
+ */
+enum TclEncodingProfile {
+    TCL_ENCODING_PROFILE_DEFAULT,
+    TCL_ENCODING_PROFILE_TCL8,
+    TCL_ENCODING_PROFILE_STRICT,
+};
 MODULE_SCOPE Tcl_Encoding tclIdentityEncoding;
+MODULE_SCOPE int
+TclEncodingProfileParseName(Tcl_Interp *interp,
+			    Tcl_Obj *profileName,
+			    enum TclEncodingProfile *profilePtr);
 
 /*
  * TIP #233 (Virtualized Time)
@@ -4787,6 +4805,8 @@ MODULE_SCOPE Tcl_LibraryInitProc TclThread_Init;
 MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_Init;
 MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit;
 
+
+
 /*
  *----------------------------------------------------------------
  * Macro used by the Tcl core to check whether a pattern has any characters
diff --git a/tests/encoding.test b/tests/encoding.test
index ae6c78a..813cd84 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -299,7 +299,7 @@ test encoding-11.11 {encoding: extended Unicode UTF-32} {
 
 test encoding-12.1 {LoadTableEncoding: normal encoding} {
     set x [encoding convertto iso8859-3 Ġ]
-    append x [encoding convertto -nocomplain iso8859-3 Õ]
+    append x [encoding convertto -profile tcl8 iso8859-3 Õ]
     append x [encoding convertfrom iso8859-3 Õ]
 } "Õ?Ġ"
 test encoding-12.2 {LoadTableEncoding: single-byte encoding} {
@@ -348,67 +348,67 @@ test encoding-15.5 {UtfToUtfProc emoji character input} {
 } "4 😂"
 test encoding-15.6 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83D\uDE02\uD83D
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83D\uDE02\uD83D]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83D\uDE02\uD83D]
     binary scan $y H* z
     list [string length $y] $z
 } {10 edb882f09f9882eda0bd}
 test encoding-15.7 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83D\uD83D
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83D\uD83D]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83D\uD83D]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 9 edb882eda0bdeda0bd}
 test encoding-15.8 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83Dé
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83Dé]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83Dé]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 8 edb882eda0bdc3a9}
 test encoding-15.9 {UtfToUtfProc emoji character output} {
     set x \uDE02\uD83DX
-    set y [encoding convertto -nocomplain utf-8 \uDE02\uD83DX]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02\uD83DX]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {3 7 edb882eda0bd58}
 test encoding-15.10 {UtfToUtfProc high surrogate character output} {
     set x \uDE02é
-    set y [encoding convertto -nocomplain utf-8 \uDE02é]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02é]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 5 edb882c3a9}
 test encoding-15.11 {UtfToUtfProc low surrogate character output} {
     set x \uDA02é
-    set y [encoding convertto -nocomplain utf-8 \uDA02é]
+    set y [encoding convertto -profile tcl8 utf-8 \uDA02é]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 5 eda882c3a9}
 test encoding-15.12 {UtfToUtfProc high surrogate character output} {
     set x \uDE02Y
-    set y [encoding convertto -nocomplain utf-8 \uDE02Y]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02Y]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 4 edb88259}
 test encoding-15.13 {UtfToUtfProc low surrogate character output} {
     set x \uDA02Y
-    set y [encoding convertto -nocomplain utf-8 \uDA02Y]
+    set y [encoding convertto -profile tcl8 utf-8 \uDA02Y]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {2 4 eda88259}
 test encoding-15.14 {UtfToUtfProc high surrogate character output} {
     set x \uDE02
-    set y [encoding convertto -nocomplain utf-8 \uDE02]
+    set y [encoding convertto -profile tcl8 utf-8 \uDE02]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {1 3 edb882}
 test encoding-15.15 {UtfToUtfProc low surrogate character output} {
     set x \uDA02
-    set y [encoding convertto -nocomplain utf-8 \uDA02]
+    set y [encoding convertto -profile tcl8 utf-8 \uDA02]
     binary scan $y H* z
     list [string length $x] [string length $y] $z
 } {1 3 eda882}
 test encoding-15.16 {UtfToUtfProc: Invalid 4-byte UTF-8, see [ed29806ba]} {
     set x \xF0\xA0\xA1\xC2
-    set y [encoding convertfrom -nocomplain utf-8 \xF0\xA0\xA1\xC2]
+    set y [encoding convertfrom -profile tcl8 utf-8 \xF0\xA0\xA1\xC2]
     list [string length $x] $y
 } "4 \xF0\xA0\xA1\xC2"
 test encoding-15.17 {UtfToUtfProc emoji character output} {
@@ -513,10 +513,10 @@ test encoding-17.2 {UtfToUcs2Proc} -body {
     encoding convertfrom utf-16 [encoding convertto ucs-2 "\U460DC"]
 } -result "\uFFFD"
 test encoding-17.3 {UtfToUtf16Proc} -body {
-    encoding convertto -nocomplain utf-16be "\uDCDC"
+    encoding convertto -profile tcl8 utf-16be "\uDCDC"
 } -result "\xDC\xDC"
 test encoding-17.4 {UtfToUtf16Proc} -body {
-    encoding convertto -nocomplain utf-16le "\uD8D8"
+    encoding convertto -profile tcl8 utf-16le "\uD8D8"
 } -result "\xD8\xD8"
 test encoding-17.5 {UtfToUtf16Proc} -body {
     encoding convertto utf-32le "\U460DC"
@@ -525,35 +525,35 @@ test encoding-17.6 {UtfToUtf16Proc} -body {
     encoding convertto utf-32be "\U460DC"
 } -result "\x00\x04\x60\xDC"
 test encoding-17.7 {UtfToUtf16Proc} -body {
-    encoding convertto -strict utf-16be "\uDCDC"
+    encoding convertto -profile strict utf-16be "\uDCDC"
 } -returnCodes error -result {unexpected character at index 0: 'U+00DCDC'}
 test encoding-17.8 {UtfToUtf16Proc} -body {
-    encoding convertto -strict utf-16le "\uD8D8"
+    encoding convertto -profile strict utf-16le "\uD8D8"
 } -returnCodes error -result {unexpected character at index 0: 'U+00D8D8'}
 test encoding-17.9 {Utf32ToUtfProc} -body {
-    encoding convertfrom -strict utf-32 "\xFF\xFF\xFF\xFF"
+    encoding convertfrom -profile strict utf-32 "\xFF\xFF\xFF\xFF"
 } -returnCodes error -result {unexpected byte sequence starting at index 0: '\xFF'}
 test encoding-17.10 {Utf32ToUtfProc} -body {
-    encoding convertfrom -nocomplain utf-32 "\xFF\xFF\xFF\xFF"
+    encoding convertfrom -profile tcl8 utf-32 "\xFF\xFF\xFF\xFF"
 } -result \uFFFD
 
 test encoding-18.1 {TableToUtfProc on invalid input} -constraints deprecated -body {
 	list [catch {encoding convertto jis0208 \\} res] $res
 } -result {0 !)}
-test encoding-18.2 {TableToUtfProc on invalid input with -strict} -body {
-	list [catch {encoding convertto -strict jis0208 \\} res] $res
+test encoding-18.2 {TableToUtfProc on invalid input with -profile strict} -body {
+	list [catch {encoding convertto -profile strict jis0208 \\} res] $res
 } -result {1 {unexpected character at index 0: 'U+00005C'}}
-test encoding-18.3 {TableToUtfProc on invalid input with -strict -failindex} -body {
-	list [catch {encoding convertto -strict -failindex pos jis0208 \\} res] $res $pos
+test encoding-18.3 {TableToUtfProc on invalid input with -profile strict -failindex} -body {
+	list [catch {encoding convertto -profile strict -failindex pos jis0208 \\} res] $res $pos
 } -result {0 {} 0}
-test encoding-18.4 {TableToUtfProc on invalid input with -failindex -strict} -body {
-	list [catch {encoding convertto -failindex pos -strict jis0208 \\} res] $res $pos
+test encoding-18.4 {TableToUtfProc on invalid input with -failindex -profile strict} -body {
+	list [catch {encoding convertto -failindex pos -profile strict jis0208 \\} res] $res $pos
 } -result {0 {} 0}
 test encoding-18.5 {TableToUtfProc on invalid input with -failindex} -body {
 	list [catch {encoding convertto -failindex pos jis0208 \\} res] $res $pos
 } -result {0 {} 0}
-test encoding-18.6 {TableToUtfProc on invalid input with -nocomplain} -body {
-	list [catch {encoding convertto -nocomplain jis0208 \\} res] $res
+test encoding-18.6 {TableToUtfProc on invalid input with -profile tcl8} -body {
+	list [catch {encoding convertto -profile tcl8 jis0208 \\} res] $res
 } -result {0 !)}
 
 test encoding-19.1 {TableFromUtfProc} {
@@ -669,25 +669,25 @@ test encoding-24.4 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xC0\x80"]
 } 1
 test encoding-24.5 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xC0\x81"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xC0\x81"]
 } 2
 test encoding-24.6 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xC1\xBF"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xC1\xBF"]
 } 2
 test encoding-24.7 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xC2\x80"]
 } 1
 test encoding-24.8 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xE0\x80\x80"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xE0\x80\x80"]
 } 3
 test encoding-24.9 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xE0\x9F\xBF"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xE0\x9F\xBF"]
 } 3
 test encoding-24.10 {Parse valid or invalid utf-8} {
     string length [encoding convertfrom utf-8 "\xE0\xA0\x80"]
 } 1
 test encoding-24.11 {Parse valid or invalid utf-8} {
-    string length [encoding convertfrom -nocomplain utf-8 "\xEF\xBF\xBF"]
+    string length [encoding convertfrom -profile tcl8 utf-8 "\xEF\xBF\xBF"]
 } 1
 test encoding-24.12 {Parse valid or invalid utf-8} -constraints deprecated -body {
     encoding convertfrom utf-8 "\xC0\x81"
@@ -713,68 +713,68 @@ test encoding-24.18 {Parse valid or invalid utf-8} -constraints testbytestring -
 test encoding-24.19 {Parse valid or invalid utf-8} -constraints deprecated -body {
     encoding convertto utf-8 "ZX\uD800"
 } -result ZX\xED\xA0\x80
-test encoding-24.20 {Parse with -nocomplain but without providing encoding} {
-    string length [encoding convertfrom -nocomplain "\x20"]
-} 1
-test encoding-24.21 {Parse with -nocomplain but without providing encoding} {
-    string length [encoding convertto -nocomplain "\x20"]
-} 1
+test encoding-24.20 {Parse with -profile tcl8 but without providing encoding} -body {
+    encoding convertfrom -profile tcl8 "\x20"
+} -result {wrong # args: should be "::tcl::encoding::convertfrom ??-profile profile? ?-failindex var? ?encoding?? data"} -returnCodes error
+test encoding-24.21 {Parse with -profile tcl8 but without providing encoding} -body {
+    string length [encoding convertto -profile tcl8 "\x20"]
+} -result {::tcl::encoding::convertto ??-profile profile? ?-failindex var? ?encoding?? data} -returnCodes error
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"}
+} -returnCodes 1 -result {::tcl::encoding::convertto ??-profile profile? ?-failindex var? ?encoding?? data}
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"}
-test encoding-24.24 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xC0\x80\x00\x00"
+} -returnCodes 1 -result {::tcl::encoding::convertto ??-profile profile? ?-failindex var? ?encoding?? data}
+test encoding-24.24 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
-test encoding-24.25 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\x40\x80\x00\x00"
+test encoding-24.25 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\x40\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 1: '\x80'}
-test encoding-24.26 {Parse valid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xF1\x80\x80\x80"
+test encoding-24.26 {Parse valid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xF1\x80\x80\x80"
 } -result \U40000
-test encoding-24.27 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xF0\x80\x80\x80"
+test encoding-24.27 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xF0\x80\x80\x80"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xF0'}
-test encoding-24.28 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 "\xFF\x00\x00"
+test encoding-24.28 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 "\xFF\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xFF'}
 test encoding-24.29 {Parse invalid utf-8} -body {
     encoding convertfrom utf-8 \xEF\xBF\xBF
 } -result \uFFFF
-test encoding-24.30 {Parse noncharacter with -strict} -body {
-    encoding convertfrom -strict utf-8 \xEF\xBF\xBF
+test encoding-24.30 {Parse noncharacter with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 \xEF\xBF\xBF
 } -result \uFFFF
-test encoding-24.31 {Parse invalid utf-8 with -nocomplain} -body {
-    encoding convertfrom -nocomplain utf-8 \xEF\xBF\xBF
+test encoding-24.31 {Parse invalid utf-8 with -profile tcl8} -body {
+    encoding convertfrom -profile tcl8 utf-8 \xEF\xBF\xBF
 } -result \uFFFF
 test encoding-24.32 {Try to generate invalid utf-8} -body {
     encoding convertto utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.33 {Try to generate noncharacter with -strict} -body {
-    encoding convertto -strict utf-8 \uFFFF
+test encoding-24.33 {Try to generate noncharacter with -profile strict} -body {
+    encoding convertto -profile strict utf-8 \uFFFF
 } -result \xEF\xBF\xBF
-test encoding-24.34 {Try to generate invalid utf-8 with -nocomplain} -body {
-    encoding convertto -nocomplain utf-8 \uFFFF
+test encoding-24.34 {Try to generate invalid utf-8 with -profile tcl8} -body {
+    encoding convertto -profile tcl8 utf-8 \uFFFF
 } -result \xEF\xBF\xBF
 test encoding-24.35 {Parse invalid utf-8} -constraints deprecated -body {
     encoding convertfrom utf-8 \xED\xA0\x80
 } -result \uD800
-test encoding-24.36 {Parse invalid utf-8 with -strict} -body {
-    encoding convertfrom -strict utf-8 \xED\xA0\x80
+test encoding-24.36 {Parse invalid utf-8 with -profile strict} -body {
+    encoding convertfrom -profile strict utf-8 \xED\xA0\x80
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
-test encoding-24.37 {Parse invalid utf-8 with -nocomplain} -body {
-    encoding convertfrom -nocomplain utf-8 \xED\xA0\x80
+test encoding-24.37 {Parse invalid utf-8 with -profile tcl8} -body {
+    encoding convertfrom -profile tcl8 utf-8 \xED\xA0\x80
 } -result \uD800
 test encoding-24.38 {Try to generate invalid utf-8} -constraints deprecated -body {
     encoding convertto utf-8 \uD800
 } -result \xED\xA0\x80
-test encoding-24.39 {Try to generate invalid utf-8 with -strict} -body {
-    encoding convertto -strict utf-8 \uD800
+test encoding-24.39 {Try to generate invalid utf-8 with -profile strict} -body {
+    encoding convertto -profile strict utf-8 \uD800
 } -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
-test encoding-24.40 {Try to generate invalid utf-8 with -nocomplain} -body {
-    encoding convertto -nocomplain utf-8 \uD800
+test encoding-24.40 {Try to generate invalid utf-8 with -profile tcl8} -body {
+    encoding convertto -profile tcl8 utf-8 \uD800
 } -result \xED\xA0\x80
 
 file delete [file join [temporaryDirectory] iso2022.txt]
@@ -931,7 +931,7 @@ test encoding-28.0 {all encodings load} -body {
 	set string hello
 	foreach name [encoding names] {
 		incr count
-		encoding convertto -nocomplain $name $string
+		encoding convertto -profile tcl8 $name $string
 
 		# discard the cached internal representation of Tcl_Encoding
 		# Unfortunately, without this, encoding 2-1 fails.
-- 
cgit v0.12


From 26e89b4b3c03b100a2a461c034c1930a23a4273b Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 2 Feb 2023 12:23:37 +0000
Subject: Use common option parsing for ConvertfromObjCmd. Fix test error
 messages.

---
 generic/tclCmdAH.c  | 76 ++++-------------------------------------------------
 tests/encoding.test |  6 ++---
 2 files changed, 8 insertions(+), 74 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 818159d..67f76a6 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -683,81 +683,15 @@ EncodingConvertfromObjCmd(
     Tcl_Encoding encoding;	/* Encoding to use */
     int length;			/* Length of the byte array being converted */
     const char *bytesPtr;	/* Pointer to the first byte of the array */
-#if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
-    int flags = TCL_ENCODING_STOPONERROR;
-#else
-    int flags = TCL_ENCODING_NOCOMPLAIN;
-#endif
+    int flags;
     int result;
-    Tcl_Obj *failVarObj = NULL;
-    static const char *const options[] = {"-profile", "-failindex", NULL};
-    enum convertfromOptions { PROFILE, FAILINDEX } optIndex;
-    enum TclEncodingProfile profile;
-
-    /*
-     * Possible combinations:
-     * 1) data						-> objc = 2
-     * 2) ?options? encoding data			-> objc >= 3
-     * It is intentional that specifying option forces encoding to be
-     * specified. Less prone to user error. This should have always been
-     * the case even in 8.6 imho where there were no options (ie (1)
-     * should never have been allowed)
-     */
+    Tcl_Obj *failVarObj;
 
-    if (objc == 1) {
-numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
-	Tcl_WrongNumArgs(
-	    interp,
-	    1,
-	    objv,
-	    "??-profile profile? ?-failindex var? ?encoding?? data");
+    if (EncodingConvertParseOptions(
+	    interp, objc, objv, 1, &encoding, &data, &flags, &failVarObj)
+	!= TCL_OK) {
 	return TCL_ERROR;
     }
-    else if (objc == 2) {
-	encoding = Tcl_GetEncoding(interp, NULL);
-	data = objv[1];
-    } else {
-	int argIndex;
-	for (argIndex = 1; argIndex < (objc-2); ++argIndex) {
-	    if (Tcl_GetIndexFromObj(
-		    interp, objv[argIndex], options, "option", 0, &optIndex)
-		!= TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (++argIndex == (objc - 2)) {
-		goto numArgsError;
-	    }
-	    switch (optIndex) {
-	    case PROFILE:
-		if (TclEncodingProfileParseName(
-			interp, objv[argIndex], &profile)
-		    != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		switch (profile) {
-		case TCL_ENCODING_PROFILE_TCL8:
-		    flags = TCL_ENCODING_NOCOMPLAIN;
-		    break;
-		case TCL_ENCODING_PROFILE_STRICT:
-		    flags = TCL_ENCODING_STRICT;
-		    break;
-		case TCL_ENCODING_PROFILE_DEFAULT: /* FALLTHRU */
-		default:
-		    break;
-		}
-		break;
-	    case FAILINDEX:
-		failVarObj = objv[argIndex];
-		break;
-	    }
-	}
-	/* Get encoding after opts so no need to free it on option error */
-	if (Tcl_GetEncodingFromObj(interp, objv[objc - 2], &encoding)
-	    != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	data = objv[objc - 1];
-    }
 
     /*
      * Convert the string into a byte array in 'ds'
diff --git a/tests/encoding.test b/tests/encoding.test
index 813cd84..e4a2acb 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -718,13 +718,13 @@ test encoding-24.20 {Parse with -profile tcl8 but without providing encoding} -b
 } -result {wrong # args: should be "::tcl::encoding::convertfrom ??-profile profile? ?-failindex var? ?encoding?? data"} -returnCodes error
 test encoding-24.21 {Parse with -profile tcl8 but without providing encoding} -body {
     string length [encoding convertto -profile tcl8 "\x20"]
-} -result {::tcl::encoding::convertto ??-profile profile? ?-failindex var? ?encoding?? data} -returnCodes error
+} -result {wrong # args: should be "::tcl::encoding::convertto ??-profile profile? ?-failindex var? ?encoding?? data"} -returnCodes error
 test encoding-24.22 {Syntax error, two encodings} -body {
     encoding convertfrom iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {::tcl::encoding::convertto ??-profile profile? ?-failindex var? ?encoding?? data}
+} -result {bad option "iso8859-1": must be -profile or -failindex} -returnCodes error
 test encoding-24.23 {Syntax error, two encodings} -body {
     encoding convertto iso8859-1 utf-8 "ZX\uD800"
-} -returnCodes 1 -result {::tcl::encoding::convertto ??-profile profile? ?-failindex var? ?encoding?? data}
+} -result {bad option "iso8859-1": must be -profile or -failindex} -returnCodes error
 test encoding-24.24 {Parse invalid utf-8 with -profile strict} -body {
     encoding convertfrom -profile strict utf-8 "\xC0\x80\x00\x00"
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
-- 
cgit v0.12


From e31133e3b0149b9bc29c9c6f06e76ccc6994df7e Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 2 Feb 2023 15:37:21 +0000
Subject: Change encoding error options to fconfigure to encoding profiles

---
 generic/tclCmdAH.c    |  2 +-
 generic/tclEncoding.c | 23 +++++++++++------
 generic/tclIO.c       | 69 ++++++++++++++++-----------------------------------
 generic/tclInt.h      |  2 +-
 4 files changed, 39 insertions(+), 57 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 67f76a6..9165fda 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -611,7 +611,7 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 	    switch (optIndex) {
 	    case PROFILE:
 		if (TclEncodingProfileParseName(
-			interp, objv[argIndex], &profile)
+			interp, Tcl_GetString(objv[argIndex]), &profile)
 		    != TCL_OK) {
 		    return TCL_ERROR;
 		}
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index bdd091f..55ace3c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -4102,20 +4102,29 @@ InitializeEncodingSearchPath(
 int
 TclEncodingProfileParseName(
     Tcl_Interp *interp,			  /* For error messages. May be NULL */
-    Tcl_Obj *profileName,		  /* Name of profile */
+    const char *profileName,		  /* Name of profile */
     enum TclEncodingProfile *profilePtr)  /* Output */
 {
     /* NOTE: Order must match enum TclEncodingProfile !!! */
     static const char *const profileNames[] = {"", "tcl8", "strict"};
     int idx;
 
-    if (Tcl_GetIndexFromObj(
-	    interp, profileName, profileNames, "profile", 0, &idx)
-	!= TCL_OK) {
-	return TCL_ERROR;
+    for (idx = 0; idx < sizeof(profileNames) / sizeof(profileNames[0]); ++idx) {
+	if (!strcmp(profileName, profileNames[idx])) {
+	    *profilePtr = (enum TclEncodingProfile)idx;
+	    return TCL_OK;
+	}
     }
-    *profilePtr = (enum TclEncodingProfile)idx;
-    return TCL_OK;
+    if (interp) {
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_ObjPrintf(
+		"bad profile \"%s\". Must be \"\", \"tcl8\" or \"strict\".",
+		profileName));
+	Tcl_SetErrorCode(
+	    interp, "TCL", "ENCODING", "PROFILE", profileName, NULL);
+    }
+    return TCL_ERROR;
 }
 
 /*
diff --git a/generic/tclIO.c b/generic/tclIO.c
index fed469c..47740ef 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7862,7 +7862,7 @@ Tcl_BadChannelOption(
 {
     if (interp != NULL) {
 	const char *genericopt =
-		"blocking buffering buffersize encoding eofchar nocomplainencoding strictencoding translation";
+		"blocking buffering buffersize encoding encodingprofile eofchar translation";
 	const char **argv;
 	int argc, i;
 	Tcl_DString ds;
@@ -8060,27 +8060,17 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(1, "-nocomplainencoding")) {
+    if (len == 0 || HaveOpt(1, "-encodingprofile")) {
 	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-nocomplainencoding");
+	    Tcl_DStringAppendElement(dsPtr, "-encodingprofile");
 	}
-#ifdef TCL_NO_DEPRECATED
-	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_NOCOMPLAIN) ? "1" : "0");
-#else
-	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_STRICT) ? "0" : "1");
-#endif
-	if (len > 0) {
-	    return TCL_OK;
-	}
-    }
-    if (len == 0 || HaveOpt(1, "-strictencoding")) {
-	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-strictencoding");
+	if (flags & CHANNEL_ENCODING_STRICT) {
+	    Tcl_DStringAppendElement(dsPtr, "strict");
+	} else if (flags & CHANNEL_ENCODING_NOCOMPLAIN) {
+	    Tcl_DStringAppendElement(dsPtr, "tcl8");
+	} else {
+	    Tcl_DStringAppendElement(dsPtr, "");
 	}
-	Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_ENCODING_STRICT) ? "1" : "0");
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8341,42 +8331,25 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
-    } else if (HaveOpt(1, "-nocomplainencoding")) {
-	int newMode;
-
-	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
+    } else if (HaveOpt(1, "-encodingprofile")) {
+	enum TclEncodingProfile profile;
+	if (TclEncodingProfileParseName(interp, newValue, &profile) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (newMode) {
+	switch (profile) {
+	case TCL_ENCODING_PROFILE_TCL8:
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	    SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-	} else {
-#ifdef TCL_NO_DEPRECATED
-	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-#else
-	    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT) != CHANNEL_ENCODING_STRICT) {
-		if (interp) {
-		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "bad value for -nocomplainencoding: only true allowed",
-			    TCL_INDEX_NONE));
-		}
-		return TCL_ERROR;
-	    }
-#endif
-	}
-	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
-	return TCL_OK;
-    } else if (HaveOpt(1, "-strictencoding")) {
-	int newMode;
-
-	if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
-	    return TCL_ERROR;
-	}
-	if (newMode) {
+	    break;
+	case TCL_ENCODING_PROFILE_STRICT:
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-	} else {
+	    break;
+	case TCL_ENCODING_PROFILE_DEFAULT: /* FALLTHRU */
+	default:
+	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
+	    break;
 	}
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	return TCL_OK;
diff --git a/generic/tclInt.h b/generic/tclInt.h
index db8ee9f..82728d3 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2896,7 +2896,7 @@ enum TclEncodingProfile {
 MODULE_SCOPE Tcl_Encoding tclIdentityEncoding;
 MODULE_SCOPE int
 TclEncodingProfileParseName(Tcl_Interp *interp,
-			    Tcl_Obj *profileName,
+			    const char *profileName,
 			    enum TclEncodingProfile *profilePtr);
 
 /*
-- 
cgit v0.12


From 100d8ce724b2ed4d9f15a045bc2e48119b53465f Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 2 Feb 2023 16:43:12 +0000
Subject: Update tests to use -encodingprofile

---
 generic/tclIO.c       | 30 +++++++++++++++---------------
 tests/chanio.test     |  6 +++---
 tests/io.test         | 44 ++++++++++++++++++++++----------------------
 tests/ioCmd.test      | 26 ++++++++++++++------------
 tests/winConsole.test | 14 +++++++-------
 tests/zlib.test       |  4 ++--
 6 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 47740ef..b76234b 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8017,6 +8017,21 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
+    if (len == 0 || HaveOpt(1, "-encodingprofile")) {
+	if (len == 0) {
+	    Tcl_DStringAppendElement(dsPtr, "-encodingprofile");
+	}
+	if (flags & CHANNEL_ENCODING_STRICT) {
+	    Tcl_DStringAppendElement(dsPtr, "strict");
+	} else if (flags & CHANNEL_ENCODING_NOCOMPLAIN) {
+	    Tcl_DStringAppendElement(dsPtr, "tcl8");
+	} else {
+	    Tcl_DStringAppendElement(dsPtr, "");
+	}
+	if (len > 0) {
+	    return TCL_OK;
+	}
+    }
     if (len == 0 || HaveOpt(2, "-eofchar")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-eofchar");
@@ -8060,21 +8075,6 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(1, "-encodingprofile")) {
-	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-encodingprofile");
-	}
-	if (flags & CHANNEL_ENCODING_STRICT) {
-	    Tcl_DStringAppendElement(dsPtr, "strict");
-	} else if (flags & CHANNEL_ENCODING_NOCOMPLAIN) {
-	    Tcl_DStringAppendElement(dsPtr, "tcl8");
-	} else {
-	    Tcl_DStringAppendElement(dsPtr, "");
-	}
-	if (len > 0) {
-	    return TCL_OK;
-	}
-    }
     if (len == 0 || HaveOpt(1, "-translation")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-translation");
diff --git a/tests/chanio.test b/tests/chanio.test
index fb94051..7c9857d 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -252,7 +252,7 @@ test chan-io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} -bod
 test chan-io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 16 -nocomplainencoding 1
+    chan configure $f -encoding jis0208 -buffersize 16 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -265,7 +265,7 @@ test chan-io-3.5 {WriteChars: saved != 0} -body {
     # be moved to beginning of next channel buffer to preserve requested
     # buffersize.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    chan configure $f -encoding jis0208 -buffersize 17 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -298,7 +298,7 @@ test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # on flush. The truncated bytes are moved to the beginning of the next
     # channel buffer.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    chan configure $f -encoding jis0208 -buffersize 17 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
diff --git a/tests/io.test b/tests/io.test
index 2708906..efc6374 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -272,7 +272,7 @@ test io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 16 -nocomplainencoding 1
+    fconfigure $f -encoding jis0208 -buffersize 16 -encodingprofile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -286,7 +286,7 @@ test io-3.5 {WriteChars: saved != 0} -body {
     # requested buffersize.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    fconfigure $f -encoding jis0208 -buffersize 17 -encodingprofile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -319,7 +319,7 @@ test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # of the next channel buffer.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 -nocomplainencoding 1
+    fconfigure $f -encoding jis0208 -buffersize 17 -encodingprofile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -8964,7 +8964,7 @@ test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\xC0\x40
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -nocomplainencoding 1 -buffering none
+    fconfigure $f -encoding utf-8 -encodingprofile tcl8 -buffering none
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -8974,10 +8974,10 @@ test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
     removeFile io-75.1
 } -result 41c040
 
-test io-75.2 {unrepresentable character write passes and is replaced by ? (-nocomplainencoding 1)} -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ? (-encodingprofile tcl8)} -setup {
     set fn [makeFile {} io-75.2]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1 -nocomplainencoding 1
+    fconfigure $f -encoding iso8859-1 -encodingprofile tcl8
 } -body {
     puts -nonewline $f A\u2022
     flush $f
@@ -8991,14 +8991,14 @@ test io-75.2 {unrepresentable character write passes and is replaced by ? (-noco
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
 # But the read already returns the incomplete sequence.
-test io-75.3 {incomplete multibyte encoding read is ignored (-nocomplainencoding 1)} -setup {
+test io-75.3 {incomplete multibyte encoding read is ignored (-encodingprofile tcl8)} -setup {
     set fn [makeFile {} io-75.3]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f "A\xC0"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -nocomplainencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -encodingprofile tcl8
 } -body {
     set d [read $f]
     close $f
@@ -9010,7 +9010,7 @@ test io-75.3 {incomplete multibyte encoding read is ignored (-nocomplainencoding
 
 # As utf-8 has a special treatment in multi-byte decoding, also test another
 # one.
-test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainencoding 1)} -setup {
+test io-75.4 {shiftjis encoding error read results in raw bytes (-encodingprofile tcl8)} -setup {
     set fn [makeFile {} io-75.4]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9019,7 +9019,7 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainenco
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -nocomplainencoding 1
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -encodingprofile tcl8
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9029,14 +9029,14 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-nocomplainenco
     removeFile io-75.4
 } -result 4181ff41
 
-test io-75.5 {invalid utf-8 encoding read is ignored (-nocomplainencoding 1)} -setup {
+test io-75.5 {invalid utf-8 encoding read is ignored (-encodingprofile tcl8)} -setup {
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -nocomplainencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile tcl8
 } -body {
     set d [read $f]
     close $f
@@ -9046,7 +9046,7 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-nocomplainencoding 1)} -s
     removeFile io-75.5
 } -result 4181
 
-test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+test io-75.6 {invalid utf-8 encoding read is not ignored (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.6]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9054,7 +9054,7 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9065,7 +9065,7 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     removeFile io-75.6
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+test io-75.7 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.7]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9073,7 +9073,7 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     puts -nonewline $f A\xA1\x1A
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9088,7 +9088,7 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     removeFile io-75.7
 } -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
 
-test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+test io-75.8 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9096,7 +9096,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     puts -nonewline $f A\x1A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9111,7 +9111,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
 test io-75.9 {unrepresentable character write passes and is replaced by ?} -setup {
     set fn [makeFile {} io-75.9]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1 -strictencoding 1
+    fconfigure $f -encoding iso8859-1 -encodingprofile strict
 } -body {
     catch {puts -nonewline $f "A\u2022"} msg
     flush $f
@@ -9155,7 +9155,7 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9182,7 +9182,7 @@ test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
 } -cleanup {
     removeFile io-75.12
 } -result 4181
-test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+test io-75.13 {invalid utf-8 encoding read is not ignored (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.13]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9190,7 +9190,7 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
     puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 1a72f70..8c9d870 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -207,7 +207,7 @@ test iocmd-7.5 {close command} -setup {
 
 proc expectedOpts {got extra} {
     set basicOpts {
-	-blocking -buffering -buffersize -encoding -eofchar -nocomplainencoding -strictencoding -translation
+	-blocking -buffering -buffersize -encoding -encodingprofile -eofchar -translation
     }
     set opts [list {*}$basicOpts {*}$extra]
     lset opts end [string cat "or " [lindex $opts end]]
@@ -240,33 +240,33 @@ test iocmd-8.7 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
     set f1 [open $path(test1) w]
-    fconfigure $f1 -translation lf -eofchar {} -encoding utf-16 -nocomplainencoding 1
+    fconfigure $f1 -translation lf -eofchar {} -encoding utf-16 -encodingprofile tcl8
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -encodingprofile tcl8 -eofchar {} -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
 } -body {
     set f1 [open $path(test1) w]
     fconfigure $f1 -translation lf -buffering line -buffersize 3030 \
-		-eofchar {} -encoding utf-16 -nocomplainencoding 1
+		-eofchar {} -encoding utf-16 -encodingprofile tcl8
     lappend x [fconfigure $f1 -buffering]
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -encodingprofile tcl8 -eofchar {} -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
     set f1 [open $path(test1) w]
     fconfigure $f1 -translation binary -buffering none -buffersize 4040 \
-		-eofchar {} -encoding binary -nocomplainencoding 1
+		-eofchar {} -encoding binary -encodingprofile tcl8
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -encodingprofile tcl8 -eofchar {} -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -369,7 +369,7 @@ test iocmd-8.20 {fconfigure command / win console channel} -constraints {nonPort
 # TODO: Test parsing of serial channel options (nonPortable, since requires an
 # open channel to work with).
 test iocmd-8.21 {fconfigure command / -nocomplainencoding 0 error} -constraints {
-    deprecated
+    deprecated obsolete
 } -setup {
     # I don't know how else to open the console, but this is non-portable
     set console stdin
@@ -378,7 +378,9 @@ test iocmd-8.21 {fconfigure command / -nocomplainencoding 0 error} -constraints
 } -returnCodes error -result "bad value for -nocomplainencoding: only true allowed"
 test iocmd-8.22 {fconfigure command / -nocomplainencoding 0, no error if -strictencoding already defined} -setup {
     set console stdin
-    set oldmode [fconfigure $console -strictencoding]
+    set oldprofile [fconfigure $console -encodingprofile]
+} -constraints {
+    obsolete
 } -body {
     fconfigure $console -strictencoding 1
     fconfigure $console -nocomplainencoding 0
@@ -1381,7 +1383,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding * -strictencoding 0 -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -encodingprofile * -eofchar {{} {}} -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1390,7 +1392,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding * -strictencoding 0 -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -encodingprofile * -eofchar {{} {}} -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1402,7 +1404,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -nocomplainencoding * -strictencoding 0 -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -encodingprofile * -eofchar {{} {}} -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/winConsole.test b/tests/winConsole.test
index b04f3e9..62dfbf3 100644
--- a/tests/winConsole.test
+++ b/tests/winConsole.test
@@ -198,7 +198,7 @@ test console-fconfigure-get-1.0 {
     Console get stdin configuration
 } -constraints {win interactive} -body {
     lsort [dict keys [fconfigure stdin]]
-} -result {-blocking -buffering -buffersize -encoding -eofchar -inputmode -translation}
+} -result {-blocking -buffering -buffersize -encoding -encodingprofile -eofchar -inputmode -translation}
 
 set testnum 0
 foreach {opt result} {
@@ -224,7 +224,7 @@ test console-fconfigure-get-1.[incr testnum] {
     fconfigure -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure get stdout/stderr
 foreach chan {stdout stderr} major {2 3} {
@@ -232,7 +232,7 @@ foreach chan {stdout stderr} major {2 3} {
         win interactive
     } -body {
         lsort [dict keys [fconfigure $chan]]
-    } -result {-blocking -buffering -buffersize -encoding -eofchar -translation -winsize}
+    } -result {-blocking -buffering -buffersize -encoding -encodingprofile -eofchar -translation -winsize}
     set testnum 0
     foreach {opt result} {
         -blocking 1
@@ -260,7 +260,7 @@ foreach chan {stdout stderr} major {2 3} {
         fconfigure -inputmode
     } -constraints {win interactive} -body {
         fconfigure $chan -inputmode
-    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -winsize} -returnCodes error
+    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, -translation, or -winsize} -returnCodes error
 
 }
 
@@ -330,7 +330,7 @@ test console-fconfigure-set-1.3 {
     fconfigure stdin -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure set stdout,stderr
 
@@ -338,13 +338,13 @@ test console-fconfigure-set-2.0 {
     fconfigure stdout -winsize
 } -constraints {win interactive} -body {
     fconfigure stdout -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, or -translation} -returnCodes error
 
 test console-fconfigure-set-3.0 {
     fconfigure stderr -winsize
 } -constraints {win interactive} -body {
     fconfigure stderr -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -nocomplainencoding, -strictencoding, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, or -translation} -returnCodes error
 
 # Multiple threads
 
diff --git a/tests/zlib.test b/tests/zlib.test
index ebbdd50..272a663 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -nocomplainencoding 1 -strictencoding 0 -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 52fc9a970c0239d9f74fd6313920572315e757a7 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Thu, 2 Feb 2023 22:51:26 +0000
Subject: Fix for [b8f575aa2398b0e4] and [154ed7ce564a7b4c],
 double-[read]/[gets] problem.  Partial-read functionality commented out.

---
 generic/tclIOCmd.c |   6 +-
 tests/io.test      | 450 ++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 297 insertions(+), 159 deletions(-)

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 2eeb04c..5b47b08 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -331,14 +331,16 @@ Tcl_GetsObjCmd(
 			"error reading \"%s\": %s",
 			TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	    }
+	    /*
 	    resultDictPtr = Tcl_NewDictObj();
 	    Tcl_DictObjPut(NULL, resultDictPtr, Tcl_NewStringObj("read", -1)
 	    , linePtr);
 	    returnOptsPtr = Tcl_NewDictObj();
 	    Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
 	    , resultDictPtr);
-	    code = TCL_ERROR;
 	    Tcl_SetReturnOptions(interp, returnOptsPtr);
+	    */
+	    code = TCL_ERROR;
 	    goto done;
 	}
 	lineLen = TCL_INDEX_NONE;
@@ -476,6 +478,7 @@ Tcl_ReadObjCmd(
 		    "error reading \"%s\": %s",
 		    TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	}
+	/*
 	resultDictPtr = Tcl_NewDictObj();
 	Tcl_DictObjPut(NULL, resultDictPtr, Tcl_NewStringObj("read", -1)
 	    , resultPtr);
@@ -485,6 +488,7 @@ Tcl_ReadObjCmd(
 	TclChannelRelease(chan);
 	Tcl_DecrRefCount(resultPtr);
 	Tcl_SetReturnOptions(interp, returnOptsPtr);
+	*/
 	return TCL_ERROR;
     }
 
diff --git a/tests/io.test b/tests/io.test
index 3f00561..5bf5f10 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -1560,19 +1560,29 @@ apply [list {} {
 			set f [open $path(test1)]
 			fconfigure $f -encoding utf-8 @strict@ -buffersize 10
 			set status [catch {read $f} cres copts]
-			set in [dict get $copts -result]
-			lappend res $in
+			#set in [dict get $copts -result]
+			#lappend res $in
 			lappend res $status $cres
 			set status [catch {read $f} cres copts]
-			set in [dict get $copts -result]
-			lappend res $in
+			#set in [dict get $copts -result]
+			#lappend res $in
 			lappend res $status $cres
 			set res
 		} -cleanup {
 			catch {close $f}
-		} -match glob -result {{read aaaaaaaaa} 1\
+		} -match glob\
+	}
+
+	#append template {\
+	#	-result {{read aaaaaaaaa} 1\
+	#		{error reading "*": illegal byte sequence}\
+	#		{read {}} 1 {error reading "*": illegal byte sequence}}
+	#}
+
+	append template {\
+		-result {1\
 			{error reading "*": illegal byte sequence}\
-			{read {}} 1 {error reading "*": illegal byte sequence}}
+			1 {error reading "*": illegal byte sequence}}
 	}
 
 	# strict encoding may be the default in Tcl 9, but in 8 it is not
@@ -9070,48 +9080,83 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-nocomplainencoding 1)} -s
     removeFile io-75.5
 } -result 4181
 
-test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
-    set fn [makeFile {} io-75.6]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # \x81 is invalid in utf-8
-    puts -nonewline $f A\x81
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
-} -body {
-    set status [catch {read $f} cres copts]
-    set d [dict get $copts -result read]
-    binary scan $d H* hd
-    lappend hd $status $cres
-} -cleanup {
-    close $f
-    removeFile io-75.6
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
-    set fn [makeFile {} io-75.7]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # \xA1 is invalid in utf-8. -eofchar is not detected, because it comes later.
-    puts -nonewline $f A\xA1\x1A
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
-} -body {
-    set status [catch {read $f} cres copts]
-    set d [dict get $copts -result read]
-    binary scan $d H* hd
-    lappend hd [eof $f]
-    lappend hd $status
-    lappend hd $cres
-    fconfigure $f -encoding iso8859-1
-    lappend hd [read $f];# We changed encoding, so now we can read the \xA1
-    close $f
-    set hd
-} -cleanup {
-    removeFile io-75.7
-} -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
+apply [list {} { 
+
+
+    set test {
+	test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+	    set hd {}
+	    set fn [makeFile {} io-75.6]
+	    set f [open $fn w+]
+	    fconfigure $f -encoding binary
+	    # \x81 is invalid in utf-8
+	    puts -nonewline $f A\x81
+	    flush $f
+	    seek $f 0
+	    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+	} -body {
+	    set status [catch {read $f} cres copts]
+	    #set d [dict get $copts -result read]
+	    #binary scan $d H* hd
+	    lappend hd $status $cres
+	} -cleanup {
+	    close $f
+	    removeFile io-75.6
+	} -match glob\
+    }
+
+    #append test {\
+    #    -result {41 1 {error reading "*": illegal byte sequence}}
+    #}
+
+    append test {\
+        -result {1 {error reading "*": illegal byte sequence}}
+    }
+
+    uplevel 1 $test
+
+    set test {
+	test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+	    set hd {}
+	    set fn [makeFile {} io-75.7]
+	    set f [open $fn w+]
+	    fconfigure $f -encoding binary
+	    # \xA1 is invalid in utf-8. -eofchar is not detected, because it comes later.
+	    puts -nonewline $f A\xA1\x1A
+	    flush $f
+	    seek $f 0
+	    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+	} -body {
+	    set status [catch {read $f} cres copts]
+	    #set d [dict get $copts -result read]
+	    #binary scan $d H* hd
+	    lappend hd [eof $f]
+	    lappend hd $status
+	    lappend hd $cres
+	    fconfigure $f -encoding iso8859-1
+	    lappend hd [read $f];# We changed encoding, so now we can read the \xA1
+	    close $f
+	    set hd
+	} -cleanup {
+	    removeFile io-75.7
+	} -match glob\
+    }
+
+    #append test {\
+    #    -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
+    #}
+
+    append test {\
+	-result {0 1 {error reading "*": illegal byte sequence} ¡}
+    }
+
+    uplevel 1 $test
+
+
+} [namespace current]]
+
+
 
 test io-75.8.incomplete {
     incomplete uft-8 char after eof char is not an error (-strictencoding 1)
@@ -9198,76 +9243,124 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
 } -result 41c0
 
 
-test io-75.10_strict {incomplete multibyte encoding read is an error} -setup {
-	set res {}
-    set fn [makeFile {} io-75.10]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    puts -nonewline $f A\xC0
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -strictencoding 1 -buffering none
-} -body {
-    set status [catch {read $f} cres copts]
-    set d [dict get $copts -result read]
-    binary scan $d H* hd
-	lappend res $hd $cres
-	chan configure $f -encoding iso8859-1
-	set d [read $f]
-    binary scan $d H* hd
-	lappend res $hd
-    close $f
-	return $res
-} -cleanup {
-    removeFile io-75.10
-} -match glob -result {41 {error reading "*": illegal byte sequence} c0}
+apply [list {} {
 
+    set test {
+	test io-75.10_strict {incomplete multibyte encoding read is an error} -setup {
+		set res {}
+	    set fn [makeFile {} io-75.10]
+	    set f [open $fn w+]
+	    fconfigure $f -encoding binary
+	    puts -nonewline $f A\xC0
+	    flush $f
+	    seek $f 0
+	    fconfigure $f -encoding utf-8 -strictencoding 1 -buffering none
+	} -body {
+	    set status [catch {read $f} cres copts]
+
+	    #set d [dict get $copts -result read]
+	    #binary scan $d H* hd
+	    #lappend res $hd $cres
+	    lappend res $cres
+
+	    chan configure $f -encoding iso8859-1
+
+	    set d [read $f]
+	    binary scan $d H* hd
+	    lappend res $hd
+	    close $f
+		return $res
+	} -cleanup {
+	    removeFile io-75.10
+	} -match glob\
+    }
+
+    #append test {\
+    #    -result {41 {error reading "*": illegal byte sequence} c0}
+    #}
+
+    append test {\
+	-result {{error reading "*": illegal byte sequence} c0}
+    }
+
+    uplevel 1 $test
+
+    
+
+    set test {
+	# As utf-8 has a special treatment in multi-byte decoding, also test another
+	# one.
+	test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
+	    set hd {}
+	    set fn [makeFile {} io-75.11]
+	    set f [open $fn w+]
+	    fconfigure $f -encoding binary
+	    # In shiftjis, \x81 starts a two-byte sequence.
+	    # But 2nd byte \xFF is not allowed
+	    puts -nonewline $f A\x81\xFFA
+	    flush $f
+	    seek $f 0
+	    fconfigure $f -encoding shiftjis -buffering none -eofchar "" \
+			-translation lf -strictencoding 1
+	} -body {
+	    set status [catch {read $f} cres copts]
+	    #set d [dict get $copts -result read]
+	    #binary scan $d H* hd
+	    lappend hd $status
+	    lappend hd $cres
+	} -cleanup {
+	    close $f
+	    removeFile io-75.11
+	} -match glob
+    }
 
-# As utf-8 has a special treatment in multi-byte decoding, also test another
-# one.
-test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
-    set fn [makeFile {} io-75.11]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # In shiftjis, \x81 starts a two-byte sequence.
-    # But 2nd byte \xFF is not allowed
-    puts -nonewline $f A\x81\xFFA
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" \
-		-translation lf -strictencoding 1
-} -body {
-    set status [catch {read $f} cres copts]
-    set d [dict get $copts -result read]
-    binary scan $d H* hd
-    lappend hd $status
-    lappend hd $cres
-} -cleanup {
-    close $f
-    removeFile io-75.11
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+    #append test {\
+    #    -result {41 1 {error reading "*": illegal byte sequence}}
+    #}
 
+    append test {\
+	-result {1 {error reading "*": illegal byte sequence}}
+    }
 
-test io-75.12 {invalid utf-8 encoding read is an error} -setup {
-	set res {}
-    set fn [makeFile {} io-75.12]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    puts -nonewline $f A\x81
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar {} -translation lf \
+
+    set test {
+	test io-75.12 {invalid utf-8 encoding read is an error} -setup {
+	    set hd {}
+	    set res {}
+	    set fn [makeFile {} io-75.12]
+	    set f [open $fn w+]
+	    fconfigure $f -encoding binary
+	    puts -nonewline $f A\x81
+	    flush $f
+	    seek $f 0
+	    fconfigure $f -encoding utf-8 -buffering none -eofchar {} -translation lf \
 		-strictencoding 1
-} -body {
-    set status [catch {read $f} cres copts]
-    set d [dict get $copts -result read]
-    close $f
-    binary scan $d H* hd
-	lappend res $hd $status $cres
-	return $res
-} -cleanup {
-    removeFile io-75.12
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+	} -body {
+	    set status [catch {read $f} cres copts]
+	    #set d [dict get $copts -result read]
+	    #binary scan $d H* hd
+	    #lappend res $hd
+	    lappend res $status $cres
+	    return $res
+	} -cleanup {
+	    catch {close $f}
+	    removeFile io-75.12
+	} -match glob\
+    }
+
+    #append test {\
+    #    -result {41 1 {error reading "*": illegal byte sequence}}
+    #}
+
+
+    append test {\
+	-result {1 {error reading "*": illegal byte sequence}}
+    }
+
+    uplevel 1 $test
+} [namespace current]]
+
+
 test io-75.12_ignore {invalid utf-8 encoding read is ignored} -setup {
     set fn [makeFile {} io-75.12]
     set f [open $fn w+]
@@ -9285,25 +9378,49 @@ test io-75.12_ignore {invalid utf-8 encoding read is ignored} -setup {
 } -cleanup {
     removeFile io-75.12
 } -result 4181
-test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
-    set fn [makeFile {} io-75.13]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # \x81 is invalid in utf-8
-    puts -nonewline $f "A\x81"
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
-} -body {
-    set status [catch {read $f} cres copts]
-    set d [dict get $copts -result read]
-    binary scan $d H* hd
-    lappend hd $status
-    close $f
-    lappend hd $cres
-} -cleanup {
-    removeFile io-75.13
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+
+
+apply [list {} {
+
+    set test {
+	test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+	    set hd {}
+	    set fn [makeFile {} io-75.13]
+	    set f [open $fn w+]
+	    fconfigure $f -encoding binary
+	    # \x81 is invalid in utf-8
+	    puts -nonewline $f A\x81
+	    flush $f
+	    seek $f 0
+	    fconfigure $f -encoding utf-8 -buffering none -eofchar "" \
+		-translation lf -strictencoding 1
+	} -body {
+	    set status [catch {read $f} cres copts]
+	    #set d [dict get $copts -result read]
+	    #binary scan $d H* hd
+	    lappend hd $status
+	    lappend hd $cres
+	} -cleanup {
+	    catch {close $f}
+	    removeFile io-75.13
+	} -match glob\
+    }
+
+    #append test {\
+    #    -result {41 1 {error reading "*": illegal byte sequence}}
+    #}
+ 
+    append test {\
+        -result {1 {error reading "*": illegal byte sequence}}
+    }
+
+    uplevel 1 $test
+
+    set test {
+    }
+
+} [namespace current]]
+
 
 test io-75.14 {invalid utf-8 encoding [gets] coninues in non-strict mode after error} -setup {
     set res {} 
@@ -9329,34 +9446,51 @@ test io-75.14 {invalid utf-8 encoding [gets] coninues in non-strict mode after e
 } -match glob -result {a 1 {error reading "*": illegal byte sequence} bÀ c}
 
 
-test io-75.15 {invalid utf-8 encoding strict gets should not hang} -setup {
-    set res {}
-    set fn [makeFile {} io-75.15]
-    set chan [open $fn w+]
-    fconfigure $chan -encoding binary
-    # This is not valid UTF-8
-    puts $chan hello\nAB\xc0\x40CD\nEFG
-    close $chan
-} -body {
-    #Now try to read it with [gets]
-    set chan [open $fn]
-    fconfigure $chan -encoding utf-8 -strictencoding 1
-    lappend res [gets $chan]
-    set status [catch {gets $chan} cres copts]
-    lappend res $status $cres
-    set status [catch {gets $chan} cres copts]
-    lappend res $status $cres
-    lappend res [dict get $copts -result]
-    chan configur $chan -encoding binary
-    foreach char [split [read $chan 2] {}] {
-	lappend res [format %x [scan $char %c]]
+
+apply [list {} {
+    set test {
+	test io-75.15 {invalid utf-8 encoding strict gets should not hang} -setup {
+	    set res {}
+	    set fn [makeFile {} io-75.15]
+	    set chan [open $fn w+]
+	    fconfigure $chan -encoding binary
+	    # This is not valid UTF-8
+	    puts $chan hello\nAB\xc0\x40CD\nEFG
+	    close $chan
+	} -body {
+	    #Now try to read it with [gets]
+	    set chan [open $fn]
+	    fconfigure $chan -encoding utf-8 -strictencoding 1
+	    lappend res [gets $chan]
+	    set status [catch {gets $chan} cres copts]
+	    lappend res $status $cres
+	    set status [catch {gets $chan} cres copts]
+	    lappend res $status $cres
+	    #lappend res [dict get $copts -result]
+	    chan configur $chan -encoding binary
+	    foreach char [split [read $chan 2] {}] {
+		lappend res [format %x [scan $char %c]]
+	    }
+	    return $res
+	} -cleanup {
+	    close $chan
+	    removeFile io-75.15
+	} -match glob\
     }
-    return $res
-} -cleanup {
-    close $chan
-    removeFile io-75.15
-} -match glob -result {hello 1 {error reading "*": illegal byte sequence}\
-    1 {error reading "*": illegal byte sequence} {read AB} c0 40}
+
+    #append test {\
+    #    -result {hello 1 {error reading "*": illegal byte sequence}\
+    #        1 {error reading "*": illegal byte sequence} {read AB} c0 40}
+    #}
+
+    append test {\
+	-result {hello 1 {error reading "*": illegal byte sequence}\
+	    1 {error reading "*": illegal byte sequence} c0 40}
+    }
+
+    uplevel 1 $test
+
+} [namespace current]]
 
 
 test io-76.0 {channel modes} -setup {
-- 
cgit v0.12


From f238eb1dbc93130d15f8b4e7dd32602c1870794a Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sat, 4 Feb 2023 00:28:12 +0000
Subject: Fix test io-75.14.

---
 tests/io.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/io.test b/tests/io.test
index 0f62a4f..75255ca 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9428,7 +9428,7 @@ test io-75.14 {
     set res {} 
     set fn [makeFile {} io-75.14]
     set f [open $fn w+]
-    fconfigure $f -encoding binary
+    fconfigure $f -translation binary
     # \xc0 is invalid in utf-8
     puts -nonewline $f a\nb\xc0\nc\n
     flush $f
-- 
cgit v0.12


From f5f5ff4257a24b2e8a8d96c820f6874c86e81304 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 6 Feb 2023 22:43:30 +0000
Subject: Proposed fix for [10c2c17c32]: UTF-LE32 encoder mapping of
 surrogates. TODO: testcase

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

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 288b07c..d19e237 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2582,6 +2582,10 @@ Utf32ToUtfProc(
 	    *dst++ = (ch & 0xFF);
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
+	    if ((ch  & ~0x3FF) == 0xD800) {
+		/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
+		dst += Tcl_UniCharToUtf(-1, dst);
+	    }
 	}
 	src += sizeof(unsigned int);
     }
-- 
cgit v0.12


From 694ae1913191cf93072702e7612b88544f7bea54 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 7 Feb 2023 11:22:08 +0000
Subject: Fix call to EncodingConvertParseOption for decoding

---
 generic/tclCmdAH.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 9165fda..02a3a46 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -688,7 +688,7 @@ EncodingConvertfromObjCmd(
     Tcl_Obj *failVarObj;
 
     if (EncodingConvertParseOptions(
-	    interp, objc, objv, 1, &encoding, &data, &flags, &failVarObj)
+	    interp, objc, objv, 0, &encoding, &data, &flags, &failVarObj)
 	!= TCL_OK) {
 	return TCL_ERROR;
     }
-- 
cgit v0.12


From e0ee29b9b606d2a3872ddf7f04332ba62433ae32 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 7 Feb 2023 11:23:52 +0000
Subject: Refactor encoding tests for broader coverage and easier test case
 management

---
 tests/cmdAH.test | 538 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 343 insertions(+), 195 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index d7a3657..22dc2a4 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -171,239 +171,387 @@ test cmdAH-3.2 {Tcl_ContinueObjCmd, success} {
     list [catch {continue} msg] $msg
 } {4 {}}
 
-test cmdAH-4.1 {Tcl_EncodingObjCmd} -returnCodes error -body {
+###
+# encoding command
+
+set "numargErrors(encoding system)" {^wrong # args: should be "(encoding |::tcl::encoding::)system \?encoding\?"$}
+set "numargErrors(encoding convertfrom)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertfrom \?\?-profile profile\? \?-failindex var\? \?encoding\?\? data"$}
+set "numargErrors(encoding convertto)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertto \?\?-profile profile\? \?-failindex var\? \?encoding\?\? data"$}
+set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
+
+set encProfiles {tcl8 strict}
+
+# TODO - valid sequences for different encodings - shiftjis etc.
+# Note utf-16, utf-32 missing because they are automatically
+# generated based on le/be versions.
+set encValidStrings {
+    ascii    ABC                           \x41\x42\x43
+    utf-8    A\u0000\u03A9\u8A9E\U00010384 \x41\x00\xCE\xA9\xE8\xAA\x9E\xF0\x90\x8E\x84
+    utf-16le A\u0000\u03A9\u8A9E\U00010384 \x41\x00\x00\x00\xA9\x03\x9E\x8A\x00\xD8\x84\xDF
+    utf-16be A\u0000\u03A9\u8A9E\U00010384 \x00\x41\x00\x00\x03\xA9\x8A\x9E\xD8\x00\xDF\x84
+    utf-32le A\u0000\u03A9\u8A9E\U00010384 \x41\x00\x00\x00\x00\x00\x00\x00\xA9\x03\x00\x00\x9E\x8A\x00\x00\x84\x03\x01\x00
+    utf-32be A\u0000\u03A9\u8A9E\U00010384 \x00\x00\x00\x41\x00\x00\x00\x00\x00\x00\x03\xA9\x00\x00\x8A\x9E\x00\x01\x03\x84
+}
+
+# Invalid byte sequences {encoding bytes profile prefix failindex tag}
+# Note tag is used in test id generation as well. The combination
+# <enc,profile,tag> should be unique for test ids to be unique.
+# Note utf-16, utf-32 missing because they are automatically
+# generated based on le/be versions.
+# TODO - other encodings and test cases
+set encInvalidBytes {
+    ascii \x41\xe9\x42 default A\u00E9B     -1 {non-ASCII}
+    ascii \x41\xe9\x42 tcl8    A\u00E9B     -1 {non-ASCII}
+    ascii \x41\xe9\x42 strict  A             1 {non-ASCII}
+
+    utf-8 \x41\xC0\x42     default   A\u00C0B -1 C0
+    utf-8 \x41\xC0\x42     tcl8      A\u00C0B -1 C0
+    utf-8 \x41\xC0\x42     strict    A         1 C0
+    utf-8 \x41\x80\x42     default   A\u0080B -1 80
+    utf-8 \x41\x80\x42     tcl8      A\u0080B -1 80
+    utf-8 \x41\x80\x42     strict    A         1 80
+    utf-8 \x41\xC0\x80\x42 default   A\u0000B -1 C080
+    utf-8 \x41\xC0\x80\x42 tcl8      A\u0000B -1 C080
+    utf-8 \x41\xC0\x80\x42 strict    A         1 C080
+    utf-8 \x41\xC1\x42     default   A\u00C1B -1 C1
+    utf-8 \x41\xC1\x42     tcl8      A\u00C1B -1 C1
+    utf-8 \x41\xC1\x42     strict    A         1 C1
+    utf-8 \x41\xC2\x42     default   A\u00C2B -1 C2-nontrail
+    utf-8 \x41\xC2\x42     tcl8      A\u00C2B -1 C2-nontrail
+    utf-8 \x41\xC2\x42     strict    A         1 C2-nontrail
+    utf-8 \x41\xC2         default   A\u00C2  -1 C2-incomplete
+    utf-8 \x41\xC2         tcl8      A\u00C2  -1 C2-incomplete
+    utf-8 \x41\xC2         strict    A         1 C2-incomplete
+    utf-8 A\xed\xa0\x80B   default   A\uD800B -1 High-surrogate
+    utf-8 A\xed\xa0\x80B   tcl8      A\uD800B -1 High-surrogate
+    utf-8 A\xed\xa0\x80B   strict    A         1 High-surrogate
+    utf-8 A\xed\xb0\x80B   default   A\uDC00B -1 Low-surrogate
+    utf-8 A\xed\xb0\x80B   tcl8      A\uDC00B -1 Low-surrogate
+    utf-8 A\xed\xb0\x80B   strict    A         1 Low-surrogate
+
+    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   default  A\uD800B -1 {High-surrogate}
+    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   tcl8     A\uD800B -1 {High-surrogate}
+    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   strict   A         4 {High-surrogate}
+}
+
+# Strings that cannot be encoded for specific encoding / profiles
+# {encoding string profile bytes failindex tag}
+# Note tag is used in test id generation as well. The combination
+# <enc,profile,tag> should be unique for test ids to be unique.
+# Note utf-16, utf-32 missing because they are automatically
+# generated based on le/be versions.
+# TODO - other encodings and test cases
+# TODO - out of range code point (note cannot be generated by \U notation)
+set encUnencodableStrings {
+    ascii A\u00e0B default \x41\x3f\x42 -1 non-ASCII
+    ascii A\u00e0B tcl8    \x41\x3f\x42 -1 non-ASCII
+    ascii A\u00e0B strict  \x41          1 non-ASCII
+
+    iso8859-1 A\u0141B default \x41\x3f\x42 -1 unencodable
+    iso8859-1 A\u0141B tcl8    \x41\x3f\x42 -1 unencodable
+    iso8859-1 A\u0141B strict  \x41          1 unencodable
+
+    utf-8 A\uD800B default \x41\xed\xa0\x80\x42 -1 High-surrogate
+    utf-8 A\uD800B tcl8    \x41\xed\xa0\x80\x42 -1 High-surrogate
+    utf-8 A\uD800B strict  \x41                  1 High-surrogate
+    utf-8 A\uDC00B default \x41\xed\xb0\x80\x42 -1 High-surrogate
+    utf-8 A\uDC00B tcl8    \x41\xed\xb0\x80\x42 -1 High-surrogate
+    utf-8 A\uDC00B strict  \x41                  1 High-surrogate
+}
+
+if {$::tcl_platform(byteOrder) eq "littleEndian"} {
+    set endian le
+} else {
+    set endian be
+}
+
+#
+# Check errors for invalid number of arguments
+proc badnumargs {id cmd cmdargs} {
+    variable numargErrors
+    test $id.a "Syntax error: $cmd $cmdargs" \
+        -body [list {*}$cmd {*}$cmdargs] \
+        -result $numargErrors($cmd) \
+        -match regexp \
+        -returnCodes error
+    test $id.b "Syntax error: $cmd (byte compiled)" \
+        -setup [list proc compiled_proc {} [list {*}$cmd {*}$cmdargs]] \
+        -body {compiled_proc} \
+        -cleanup {rename compiled_proc {}} \
+        -result $numargErrors($cmd) \
+        -match regexp \
+        -returnCodes error
+}
+
+# Wraps tests resulting in unknown encoding errors
+proc unknownencodingtest {id cmd} {
+    set result "unknown encoding \"[lindex $cmd end-1]\""
+    test $id.a "Unknown encoding error: $cmd" \
+        -body [list encoding {*}$cmd] \
+        -result $result \
+        -returnCodes error
+    test $id.b "Syntax error: $cmd (byte compiled)" \
+        -setup [list proc encoding_test {} [list encoding {*}$cmd]] \
+        -body {encoding_test} \
+        -cleanup {rename encoding_test {}} \
+        -result $result \
+        -returnCodes error
+}
+
+# Wraps tests for conversion, successful or not.
+# Really more general than just for encoding conversion.
+proc testconvert {id body result args} {
+    test $id.a $body \
+        -body $body \
+        -result $result \
+        {*}$args
+    dict append args -setup \n[list proc compiled_script {} $body]
+    dict append args -cleanup "\nrename compiled_script {}"
+    test $id.b "$body (byte compiled)" \
+        -body {compiled_script} \
+        -result $result \
+        {*}$args
+}
+
+test cmdAH-4.1.1 {encoding} -returnCodes error -body {
     encoding
 } -result {wrong # args: should be "encoding subcommand ?arg ...?"}
-test cmdAH-4.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
+test cmdAH-4.1.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding foo
 } -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
-test cmdAH-4.3 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertto
-} -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.4 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertto foo bar
-} -result {unknown encoding "foo"}
-test cmdAH-4.5 {Tcl_EncodingObjCmd} -setup {
-    set system [encoding system]
-} -body {
-    encoding system jis0208
-    encoding convertto 乎
-} -cleanup {
-    encoding system $system
-} -result 8C
-test cmdAH-4.6 {Tcl_EncodingObjCmd} -setup {
+
+#
+# encoding system 4.2.*
+badnumargs cmdAH-4.2.1 {encoding system} {ascii ascii}
+test cmdAH-4.2.2 {Tcl_EncodingObjCmd} -setup {
     set system [encoding system]
 } -body {
     encoding system iso8859-1
-    encoding convertto jis0208 乎
-} -cleanup {
-    encoding system $system
-} -result 8C
-test cmdAH-4.7 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertfrom
-} -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.8 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding convertfrom foo bar
-} -result {unknown encoding "foo"}
-test cmdAH-4.9 {Tcl_EncodingObjCmd} -setup {
-    set system [encoding system]
-} -body {
-    encoding system jis0208
-    encoding convertfrom 8C
+    encoding system
 } -cleanup {
     encoding system $system
-} -result 乎
-test cmdAH-4.10 {Tcl_EncodingObjCmd} -setup {
+} -result iso8859-1
+
+#
+# encoding convertfrom 4.3.*
+
+# Odd number of args is always invalid since last two args
+# are ENCODING DATA and all options take a value
+badnumargs cmdAH-4.3.1 {encoding convertfrom} {}
+badnumargs cmdAH-4.3.2 {encoding convertfrom} {-failindex VAR ABC}
+badnumargs cmdAH-4.3.3 {encoding convertfrom} {-profile VAR ABC}
+badnumargs cmdAH-4.3.4 {encoding convertfrom} {-failindex VAR -profile strict ABC}
+badnumargs cmdAH-4.3.5 {encoding convertfrom} {-profile strict -failindex VAR ABC}
+
+# Test that last two args always treated as ENCODING DATA
+unknownencodingtest 4.3.6 {convertfrom -failindex ABC}
+unknownencodingtest 4.3.7 {convertfrom -profile ABC}
+unknownencodingtest 4.3.8 {convertfrom nosuchencoding ABC}
+unknownencodingtest 4.3.9 {convertfrom -failindex VAR -profile ABC}
+unknownencodingtest 4.3.10 {convertfrom -profile strict -failindex ABC}
+testconvert cmdAH-4.3.11 {
+    encoding convertfrom jis0208 \x38\x43
+} \u4e4e -setup {
     set system [encoding system]
-} -body {
     encoding system iso8859-1
-    encoding convertfrom jis0208 8C
 } -cleanup {
     encoding system $system
-} -result 乎
-test cmdAH-4.11 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding names foo
-} -result {wrong # args: should be "encoding names"}
-test cmdAH-4.12 {Tcl_EncodingObjCmd} -returnCodes error -body {
-    encoding system foo bar
-} -result {wrong # args: should be "encoding system ?encoding?"}
-test cmdAH-4.13 {Tcl_EncodingObjCmd} -setup {
+}
+
+# Verify single arg defaults to system encoding
+testconvert cmdAH-4.3.12 {
+    encoding convertfrom \x38\x43
+} \u4e4e -setup {
     set system [encoding system]
-} -body {
-    encoding system iso8859-1
-    encoding system
+    encoding system jis0208
 } -cleanup {
     encoding system $system
-} -result iso8859-1
+}
 
-test cmdAH-4.14.1 {Syntax error, -nocomplain and -failindex, no encoding} -body {
-    encoding convertfrom -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.14.2 {Syntax error, -nocomplain and -failindex, no encoding} -body {
-    encoding convertto -nocomplain -failindex 2 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.15.1 {Syntax error, -failindex and -nocomplain, no encoding} -body {
-    encoding convertfrom -failindex 2 -nocomplain ABC
-} -returnCodes 1 -result {unknown encoding "-nocomplain"}
-test cmdAH-4.15.2 {Syntax error, -failindex and -nocomplain, no encoding} -body {
-    encoding convertto -failindex 2 -nocomplain ABC
-} -returnCodes 1 -result {unknown encoding "-nocomplain"}
-test cmdAH-4.16.1 {Syntax error, -nocomplain and -failindex, encoding} -body {
-    encoding convertfrom -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.16.2 {Syntax error, -nocomplain and -failindex, encoding} -body {
-    encoding convertto -nocomplain -failindex 2 utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.17.1 {Syntax error, -failindex and -nocomplain, encoding} -body {
-    encoding convertfrom -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertfrom ?-strict? ?-failindex var? ?encoding? data" or "encoding convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.17.2 {Syntax error, -failindex and -nocomplain, encoding} -body {
-    encoding convertto -failindex 2 -nocomplain utf-8 ABC
-} -returnCodes 1 -result {wrong # args: should be "encoding convertto ?-strict? ?-failindex var? ?encoding? data" or "encoding convertto -nocomplain ?encoding? data"}
-test cmdAH-4.18.1 {Syntax error, -failindex with no var, no encoding} -body {
-    encoding convertfrom -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"}
-test cmdAH-4.18.2 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
-    proc encoding_test {} {
-        encoding convertfrom -failindex ABC
+# Wrapper for verifying -failindex
+proc testfailindex {id converter enc data result {profile default}} {
+    if {$profile eq "default"} {
+        testconvert $id "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+    } else {
+        testconvert $id "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertfrom ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertfrom -nocomplain ?encoding? data"} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.18.3 {Syntax error, -failindex with no var, no encoding} -body {
-    encoding convertto -failindex ABC
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"}
-test cmdAH-4.18.4 {Syntax error, -failindex with no var, no encoding (byte compiled)} -setup {
-    proc encoding_test {} {
-        encoding convertto -failindex ABC
+
+# -failindex - valid data
+foreach {enc string bytes} $encValidStrings {
+    testfailindex 4.3.13.$enc convertfrom $enc $bytes [list $string -1]
+    if {"utf-16$endian" eq $enc} {
+        # utf-16le ->utf-16, utf-32be -> utf32 etc.
+        set enc [string range $enc 0 5]
+        testfailindex 4.3.13.$enc convertfrom $enc $bytes [list $string -1]
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 1 -result {wrong # args: should be "::tcl::encoding::convertto ?-strict? ?-failindex var? ?encoding? data" or "::tcl::encoding::convertto -nocomplain ?encoding? data"} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.19.1 {convertrom -failindex with correct data} -body {
-    encoding convertfrom -failindex test ABC
-    set test
-} -returnCodes 0 -result -1
-test cmdAH-4.19.2 {convertrom -failindex with correct data (byt compiled)} -setup {
-    proc encoding_test {} {
-	encoding convertfrom -failindex test ABC
-	set test
+
+# -failindex - invalid data
+foreach {enc bytes profile prefix failidx tag} $encInvalidBytes {
+    testfailindex 4.3.14.$enc.$profile.$tag convertfrom $enc $bytes [list $prefix $failidx] $profile
+    if {"utf-16$endian" eq $enc} {
+        # utf-16le ->utf-16, utf-32be -> utf32 etc.
+        set enc [string range $enc 0 5]
+        testfailindex 4.3.14.$enc.$profile.$tag convertfrom $enc $bytes [list $prefix $failidx] $profile
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result -1 -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.19.3 {convertrom -failindex with correct data} -body {
-    encoding convertto -failindex test ABC
-    set test
-} -returnCodes 0 -result -1
-test cmdAH-4.19.4 {convertrom -failindex with correct data (byt compiled)} -setup {
-    proc encoding_test {} {
-	encoding convertto -failindex test ABC
-	set test
+
+# -profile
+
+# All valid byte sequences should be accepted by all profiles
+foreach profile $encProfiles {
+    set i 0
+    foreach {enc string bytes} $encValidStrings {
+        testconvert 4.3.15.$enc.$profile.[incr i] [list encoding convertfrom $enc $bytes] $string
+        if {"utf-16$endian" eq $enc} {
+            # utf-16le ->utf-16, utf-32be -> utf32 etc.
+            set enc [string range $enc 0 5]
+            testconvert 4.3.15.$enc.$profile.[incr i] [list encoding convertfrom $enc $bytes] $string
+        }
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result -1 -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.20.1 {convertrom -failindex with incomplete utf8} -body {
-    set x [encoding convertfrom -failindex i utf-8 A\xc3]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.20.2 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
-    proc encoding_test {} {
-	set x [encoding convertfrom -failindex i utf-8 A\xc3]
-	binary scan $x H* y
-	list $y $i
+
+# Cycle through the various combinations of encodings and profiles
+# for invalid byte sequences
+foreach {enc bytes profile prefix failidx tag} $encInvalidBytes {
+    if {$failidx eq -1} {
+        set result [list $prefix]
+    } else {
+        set badbyte "'\\x[string toupper [binary encode hex [string index $bytes $failidx]]]'"
+        # TODO - if the bad byte is unprintable, tcltest errors out when printing a mismatch
+        # so glob it out for now.
+        set result [list "unexpected byte sequence starting at index $failidx: *" -returnCodes error -match glob]
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
-}
-test cmdAH-4.20.3 {convertrom -failindex with incomplete utf8} -body {
-    set x [encoding convertfrom -strict -failindex i utf-8 A\xc3]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.20.4 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
-    proc encoding_test {} {
-	set x [encoding convertfrom -strict -failindex i utf-8 A\xc3]
-	binary scan $x H* y
-	list $y $i
+    if {$profile eq "default"} {
+        testconvert 4.3.15.$enc.$profile.$tag [list encoding convertfrom $enc $bytes] {*}$result
+        if {"utf-16$endian" eq $enc} {
+            # utf-16le ->utf-16, utf-32be -> utf32 etc.
+            set enc [string range $enc 0 5]
+            testconvert 4.3.15.$enc.$profile.$tag [list encoding convertfrom $enc $bytes] {*}$result
+        }
+    } else {
+        testconvert 4.3.15.$enc.$profile.$tag [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
+        if {"utf-16$endian" eq $enc} {
+            # utf-16le ->utf-16, utf-32be -> utf32 etc.
+            set enc [string range $enc 0 5]
+            testconvert 4.3.15.$enc.$profile.$tag [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
+        }
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.20.5 {convertrom -failindex with incomplete utf8} -body {
-    set x [encoding convertfrom -failindex i -strict utf-8 A\xc3]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.20.6 {convertrom -failindex with incomplete utf8 (byte compiled)} -setup {
-    proc encoding_test {} {
-	set x [encoding convertfrom -failindex i -strict utf-8 A\xc3]
-	binary scan $x H* y
-	list $y $i
+
+#
+# encoding convertto 4.4.*
+
+badnumargs cmdAH-4.4.1 {encoding convertto} {}
+badnumargs cmdAH-4.4.2 {encoding convertto} {-failindex VAR ABC}
+badnumargs cmdAH-4.4.3 {encoding convertto} {-profile VAR ABC}
+badnumargs cmdAH-4.4.4 {encoding convertto} {-failindex VAR -profile strict ABC}
+badnumargs cmdAH-4.4.5 {encoding convertto} {-profile strict -failindex VAR ABC}
+
+# Test that last two args always treated as ENCODING DATA
+unknownencodingtest 4.4.6 {convertto -failindex ABC}
+unknownencodingtest 4.4.7 {convertto -profile ABC}
+unknownencodingtest 4.4.8 {convertto nosuchencoding ABC}
+unknownencodingtest 4.4.9 {convertto -failindex VAR -profile ABC}
+unknownencodingtest 4.4.10 {convertto -profile strict -failindex ABC}
+testconvert cmdAH-4.4.11 {
+    encoding convertto jis0208 \u4e4e
+} \x38\x43 -setup {
+    set system [encoding system]
+    encoding system iso8859-1
+} -cleanup {
+    encoding system $system
+}
+
+# Verify single arg defaults to system encoding
+testconvert cmdAH-4.4.12 {
+    encoding convertto \u4e4e
+} \x38\x43 -setup {
+    set system [encoding system]
+    encoding system jis0208
+} -cleanup {
+    encoding system $system
+}
+
+# -failindex - valid data
+foreach {enc string bytes} $encValidStrings {
+    testfailindex 4.4.13.$enc convertto $enc $string [list $bytes -1]
+    if {"utf-16$endian" eq $enc} {
+        # utf-16le ->utf-16, utf-32be -> utf32 etc.
+        set enc [string range $enc 0 5]
+        testfailindex 4.4.13.$enc convertto $enc $string [list $bytes -1]
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.21.1 {convertto -failindex with wrong character} -body {
-    set x [encoding convertto -failindex i iso8859-1 A\u0141]
-    binary scan $x H* y
-    list $y $i
-} -returnCodes 0 -result {41 1}
-test cmdAH-4.21.2 {convertto -failindex with wrong character (byte compiled)} -setup {
-    proc encoding_test {} {
-    set x [encoding convertto -failindex i iso8859-1 A\u0141]
-	binary scan $x H* y
-	list $y $i
+
+# -failindex - invalid data
+foreach {enc string profile bytes failidx tag} $encUnencodableStrings {
+    testfailindex 4.4.14.$enc.$profile.$tag convertto $enc $string [list $bytes $failidx] $profile
+    if {"utf-16$endian" eq $enc} {
+        # utf-16le ->utf-16, utf-32be -> utf32 etc.
+        set enc [string range $enc 0 5]
+        testfailindex 4.4.14.$enc.$profile.$tag convertto $enc $string [list $bytes $failidx] $profile
     }
-} -body {
-    # Compile and execute
-    encoding_test
-} -returnCodes 0 -result {41 1} -cleanup {
-    rename encoding_test ""
 }
-test cmdAH-4.22 {convertfrom -strict} -body {
-    encoding convertfrom -strict utf-8 A\x00B
-} -result A\x00B
 
-test cmdAH-4.23 {convertfrom -strict} -body {
-    encoding convertfrom -strict utf-8 A\xC0\x80B
-} -returnCodes error -result {unexpected byte sequence starting at index 1: '\xC0'}
+# -profile
 
-test cmdAH-4.24 {convertto -strict} -body {
-    encoding convertto -strict utf-8 A\x00B
-} -result A\x00B
+# All valid byte sequences should be accepted by all profiles
+foreach profile $encProfiles {
+    set i 0
+    foreach {enc string bytes} $encValidStrings {
+        testconvert 4.4.15.$enc.$profile.[incr i] [list encoding convertto $enc $string] $bytes
+        if {"utf-16$endian" eq $enc} {
+            # utf-16le ->utf-16, utf-32be -> utf32 etc.
+            set enc [string range $enc 0 5]
+            testconvert 4.4.15.$enc.$profile.[incr i] [list encoding convertto $enc $string] $bytes
+        }
+    }
+}
 
-test cmdAH-4.25 {convertfrom -strict} -constraints knownBug -body {
-    encoding convertfrom -strict utf-8 A\x80B
-} -returnCodes error -result {unexpected byte sequence starting at index 1: '\x80'}
+# Cycle through the various combinations of encodings and profiles
+# for invalid byte sequences
+foreach {enc string profile bytes failidx tag} $encUnencodableStrings {
+    if {$failidx eq -1} {
+        set result [list $bytes]
+    } else {
+        # TODO - if the bad char is unprintable, tcltest errors out when printing a mismatch
+        # so glob it out for now.
+        set result [list "unexpected character at index $failidx: *" -returnCodes error -match glob]
+    }
+    if {$profile eq "default"} {
+        testconvert 4.4.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
+        if {"utf-16$endian" eq $enc} {
+            # utf-16le ->utf-16, utf-32be -> utf32 etc.
+            set enc [string range $enc 0 5]
+            testconvert 4.3.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
+        }
+    } else {
+        testconvert 4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
+        if {"utf-16$endian" eq $enc} {
+            # utf-16le ->utf-16, utf-32be -> utf32 etc.
+            set enc [string range $enc 0 5]
+            testconvert 4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
+        }
+    }
+}
 
-test cmdAH-4.26 {convertto -strict} -constraints {testbytestring knownBug} -body {
-    encoding convertto -strict utf-8 A[testbytestring \x80]B
+test cmdAH-4.5.1 {convertto -profile strict} -constraints {testbytestring knownBug} -body {
+    # TODO - what does testbytestring even test? Invalid UTF8 in the Tcl_Obj bytes field
+    encoding convertto -profile strict utf-8 A[testbytestring \x80]B
 } -returnCodes error -result {unexpected byte sequence starting at index 1: '\x80'}
 
+#
+# encoding names 4.5.*
+badnumargs cmdAH-4.5.1 {encoding names} {foo}
+test cmdAH-4.5.2 {encoding names should include at least utf-8 and iso8859-1 and at least one more} -body {
+    set names [encoding names]
+    list [expr {"utf-8" in $names}] [expr {"iso8859-1" in $names}] [expr {[llength $names] > 2}]
+} -result {1 1 1}
+
+#
+# file command
+
 test cmdAH-5.1 {Tcl_FileObjCmd} -returnCodes error -body {
     file
 } -result {wrong # args: should be "file subcommand ?arg ...?"}
-- 
cgit v0.12


From b741dab392a7e58c23568bd821d7eff982c2ec14 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 7 Feb 2023 11:25:22 +0000
Subject: Fix tcltest to not exit on encoding errors when printing to stdout

---
 library/tcltest/tcltest.tcl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 7344f9f..94010a7 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -2221,7 +2221,11 @@ proc tcltest::test {name description args} {
 	if {$scriptCompare} {
 	    puts [outputChannel] "---- Error testing result: $scriptMatch"
 	} else {
-	    puts [outputChannel] "---- Result was:\n$actualAnswer"
+            try {
+                puts [outputChannel] "---- Result was:\n$actualAnswer"
+            } on error {errMsg errCode} {
+                puts [outputChannel] "---- Result was:\n<error printing result: $errMsg ($errCode)>"
+            }
 	    puts [outputChannel] "---- Result should have been\
 		    ($match matching):\n$result"
 	}
-- 
cgit v0.12


From 4294befd8b12d341c6fa74ef24120838d931a07a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 9 Feb 2023 07:27:43 +0000
Subject: Do not have -failindex imply -strict

---
 generic/tclCmdAH.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 02a3a46..efc156c 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -554,7 +554,6 @@ EncodingConvertParseOptions (
     Tcl_Interp *interp,    /* For error messages. May be NULL */
     int objc,		   /* Number of arguments */
     Tcl_Obj *const objv[], /* Argument objects as passed to command. */
-    int isEncoder,         /* 1 -> convertto, 0 -> convertfrom */
     Tcl_Encoding *encPtr,  /* Where to store the encoding */
     Tcl_Obj **dataObjPtr,  /* Where to store ptr to Tcl_Obj containing data */
     int *flagsPtr,         /* Bit mask of encoding option flags */
@@ -640,15 +639,6 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 	dataObj = objv[objc - 1];
     }
 
-    /* -failindex forces checking*/
-    if (failVarObj != NULL && flags == TCL_ENCODING_NOCOMPLAIN) {
-	/* 
-	 * Historical, but I really don't like this mixing of defines
-	 * from two different bit mask domains - ENCODING_FAILINDEX
-	 */
-	flags = isEncoder ? TCL_ENCODING_STOPONERROR : ENCODING_FAILINDEX;
-    }
-
     *encPtr = encoding;
     *dataObjPtr = dataObj;
     *flagsPtr = flags;
@@ -688,7 +678,7 @@ EncodingConvertfromObjCmd(
     Tcl_Obj *failVarObj;
 
     if (EncodingConvertParseOptions(
-	    interp, objc, objv, 0, &encoding, &data, &flags, &failVarObj)
+	    interp, objc, objv, &encoding, &data, &flags, &failVarObj)
 	!= TCL_OK) {
 	return TCL_ERROR;
     }
@@ -775,7 +765,7 @@ EncodingConverttoObjCmd(
     Tcl_Obj *failVarObj;
 
     if (EncodingConvertParseOptions(
-	    interp, objc, objv, 1, &encoding, &data, &flags, &failVarObj)
+	    interp, objc, objv, &encoding, &data, &flags, &failVarObj)
 	!= TCL_OK) {
 	return TCL_ERROR;
     }
-- 
cgit v0.12


From b185a55c3b335a847e148680c628136c7c16640f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 9 Feb 2023 07:55:29 +0000
Subject: Add 4 testcases, showing that the bug fix introduces another (minor)
 problem. To be fixed soon

---
 tests/encoding.test | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/encoding.test b/tests/encoding.test
index 05d9918..e42c3b9 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -485,6 +485,18 @@ test encoding-16.8 {Utf32ToUtfProc} -body {
     set val [encoding convertfrom -nocomplain utf-32 \x41\x00\x00\x41]
     list $val [format %x [scan $val %c]]
 } -result "\uFFFD fffd"
+test encoding-16.9 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32le \x00\xD8\x00\x00
+} -result \uD800
+test encoding-16.10 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32le \x00\xDC\x00\x00
+} -result \uDC00
+test encoding-16.11 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00
+} -result \uD800\uDC00
+test encoding-16.12 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00
+} -result \uDC00\uD800
 
 test encoding-16.9 {
     Utf16ToUtfProc, Tcl_UniCharToUtf, surrogate pairs in utf-16
-- 
cgit v0.12


From d46a2441593da26b460fba5a4612ec43fa0d9215 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 9 Feb 2023 17:03:31 +0000
Subject: Add equivalent tests from ff630bf370

---
 tests/cmdAH.test | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index ad5e540..c4053a2 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -229,9 +229,21 @@ set encInvalidBytes {
     utf-8 A\xed\xb0\x80B   tcl8      A\uDC00B -1 Low-surrogate
     utf-8 A\xed\xb0\x80B   strict    A         1 Low-surrogate
 
-    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   default  A\uD800B -1 {High-surrogate}
-    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   tcl8     A\uD800B -1 {High-surrogate}
-    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   strict   A         4 {High-surrogate}
+    utf-32le \x00\xD8\x00\x00                                   default  \uD800   -1 {High-surrogate}
+    utf-32le \x00\xD8\x00\x00                                   tcl8     \uD800   -1 {High-surrogate}
+    utf-32le \x00\xD8\x00\x00                                   strict   ""        0 {High-surrogate}
+    utf-32le \x00\xDC\x00\x00                                   default  \uDC00   -1 {Low-surrogate}
+    utf-32le \x00\xDC\x00\x00                                   tcl8     \uDC00   -1 {Low-surrogate}
+    utf-32le \x00\xDC\x00\x00                                   strict   ""        0 {Low-surrogate}
+    utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   default  \uD800\uDC00  -1 {High-low-surrogate}
+    utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   tcl8     \uD800\uDC00  -1 {High-low-surrogate}
+    utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   strict   ""             0 {High-low-surrogate}
+    utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   default  \uDC00\uD800  -1 {High-low-surrogate}
+    utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   tcl8     \uDC00\uD800  -1 {High-low-surrogate}
+    utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   strict   ""             0 {High-low-surrogate}
+    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   default  A\uD800B -1 {High-surrogate-middle}
+    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   tcl8     A\uD800B -1 {High-surrogate-middle}
+    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   strict   A         4 {High-surrogate-middle}
 }
 
 # Strings that cannot be encoded for specific encoding / profiles
-- 
cgit v0.12


From 9d1ba01f11c772a015e3edbfb1ea4ae8e9f148bf Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 9 Feb 2023 17:04:33 +0000
Subject: Modify encoding C API to use profiles (in progress)

---
 generic/tcl.h         |  22 +++++++++-
 generic/tclCmdAH.c    |  16 ++-----
 generic/tclEncoding.c | 118 ++++++++++++++++++++++++++++++++++++++------------
 generic/tclIO.c       |   6 ++-
 generic/tclInt.h      |  13 +-----
 5 files changed, 122 insertions(+), 53 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index f373382..ec94e71 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2144,7 +2144,27 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_CHAR_LIMIT		0x10
 #define TCL_ENCODING_MODIFIED		0x20
 #define TCL_ENCODING_NOCOMPLAIN		0x40
-#define TCL_ENCODING_STRICT			0x44
+#define TCL_ENCODING_STRICT		0x44
+/* Reserve top byte for profile values (disjoint) */
+#define TCL_ENCODING_PROFILE_TCL8     0x01000000
+#define TCL_ENCODING_PROFILE_STRICT   0x02000000
+#define TCL_ENCODING_PROFILE_MASK     0xFF000000
+#define TCL_ENCODING_PROFILE_GET(flags_)  ((flags_) & TCL_ENCODING_PROFILE_MASK)
+#define TCL_ENCODING_PROFILE_SET(flags_, profile_) \
+    do {                                           \
+	(flags_) &= ~TCL_ENCODING_PROFILE_MASK;    \
+	(flags_) |= profile_;                      \
+    } while (0)
+/* Still being argued - For Tcl9, is the default strict? TODO */
+#if TCL_MAJOR_VERSION < 9
+#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8
+#else
+#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8 /* STRICT? TODO */
+#endif
+
+#define TCL_ENCODING_EXTERNAL_FLAG_MASK \
+     (TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR)
+
 
 /*
  * The following definitions are the error codes returned by the conversion
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index efc156c..05c0887 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -562,7 +562,7 @@ EncodingConvertParseOptions (
 {
     static const char *const options[] = {"-profile", "-failindex", NULL};
     enum convertfromOptions { PROFILE, FAILINDEX } optIndex;
-    enum TclEncodingProfile profile;
+    int profile;
     Tcl_Encoding encoding;
     Tcl_Obj *dataObj;
     Tcl_Obj *failVarObj;
@@ -614,17 +614,9 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 		    != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		switch (profile) {
-		case TCL_ENCODING_PROFILE_TCL8:
-		    flags = TCL_ENCODING_NOCOMPLAIN;
-		    break;
-		case TCL_ENCODING_PROFILE_STRICT:
-		    flags = TCL_ENCODING_STRICT;
-		    break;
-		case TCL_ENCODING_PROFILE_DEFAULT: /* FALLTHRU */
-		default:
-		    break;
-		}
+		/* TODO - next line probably not needed as the conversion
+		   functions already take care of mapping profile to flags */
+		flags = TclEncodingExternalFlagsToInternal(profile);
 		break;
 	    case FAILINDEX:
 		failVarObj = objv[argIndex];
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 106a2f1..8e42e26 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -542,6 +542,8 @@ TclInitEncodingSubsystem(void)
     Tcl_InitHashTable(&encodingTable, TCL_STRING_KEYS);
     Tcl_MutexUnlock(&encodingMutex);
 
+    /* TODO - why is NOCOMPLAIN being hardcoded for encodings below? */
+
     /*
      * Create a few initial encodings.  UTF-8 to UTF-8 translation is not a
      * no-op because it turns a stream of improperly formed UTF-8 into a
@@ -1184,13 +1186,12 @@ Tcl_ExternalToUtfDString(
 *	The parameter flags controls the behavior, if any of the bytes in
  *	the source buffer are invalid or cannot be represented in utf-8.
  *	Possible flags values:
- *	TCL_ENCODING_STOPONERROR: don't replace invalid characters/bytes but
- *	return the first error position (Default in Tcl 9.0).
- *	TCL_ENCODING_NOCOMPLAIN: replace invalid characters/bytes by a default
- *	fallback character. Always return -1 (Default in Tcl 8.7).
- *	TCL_ENCODING_MODIFIED: convert NULL bytes to \xC0\x80 in stead of 0x00.
- *	Only valid for "utf-8" and "cesu-8". This flag may be used together
- *	with the other flags.
+ *	target encoding. It should be composed by OR-ing the following:
+ *	- *At most one* of TCL_ENCODING_PROFILE{DEFAULT,TCL8,STRICT}
+ *	- TCL_ENCODING_STOPONERROR: Backward compatibility. Sets the profile
+ *	  to TCL_ENCODING_PROFILE_STRICT overriding any specified profile flags
+ *	- TCL_ENCODING_MODIFIED: enable Tcl internal conversion mapping \xC0\x80
+ *        to 0x00. Only valid for "utf-8" and "cesu-8".
  *
  * Results:
  *	The converted bytes are stored in the DString, which is then NULL
@@ -1236,6 +1237,7 @@ Tcl_ExternalToUtfDStringEx(
 	srcLen = encodingPtr->lengthProc(src);
     }
 
+    flags = TclEncodingExternalFlagsToInternal(flags);
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
 	flags |= TCL_ENCODING_MODIFIED | TCL_ENCODING_UTF;
@@ -1408,7 +1410,7 @@ Tcl_UtfToExternalDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_UtfToExternalDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr);
+    Tcl_UtfToExternalDStringEx(encoding, src, srcLen, TCL_ENCODING_PROFILE_DEFAULT, dstPtr);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1421,15 +1423,12 @@ Tcl_UtfToExternalDString(
  *	Convert a source buffer from UTF-8 to the specified encoding.
  *	The parameter flags controls the behavior, if any of the bytes in
  *	the source buffer are invalid or cannot be represented in the
- *	target encoding.
- *	Possible flags values:
- *	TCL_ENCODING_STOPONERROR: don't replace invalid characters/bytes but
- *	return the first error position (Default in Tcl 9.0).
- *	TCL_ENCODING_NOCOMPLAIN: replace invalid characters/bytes by a default
- *	fallback character. Always return -1 (Default in Tcl 8.7).
- *	TCL_ENCODING_MODIFIED: convert NULL bytes to \xC0\x80 in stead of 0x00.
- *	Only valid for "utf-8" and "cesu-8". This flag may be used together
- *	with the other flags.
+ *	target encoding. It should be composed by OR-ing the following:
+ *	- *At most one* of TCL_ENCODING_PROFILE{DEFAULT,TCL8,STRICT}
+ *	- TCL_ENCODING_STOPONERROR: Backward compatibility. Sets the profile
+ *	  to TCL_ENCODING_PROFILE_STRICT overriding any specified profile flags
+ *	- TCL_ENCODING_MODIFIED: convert NULL bytes to \xC0\x80 instead
+ *        of 0x00. Only valid for "utf-8" and "cesu-8".
  *
  * Results:
  *	The converted bytes are stored in the DString, which is then NULL
@@ -1450,7 +1449,7 @@ Tcl_UtfToExternalDStringEx(
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes, or < 0 for
 				 * strlen(). */
-    int flags,	/* Conversion control flags. */
+    int flags,			/* Conversion control flags. */
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
@@ -1474,6 +1473,7 @@ Tcl_UtfToExternalDStringEx(
     } else if (srcLen < 0) {
 	srcLen = strlen(src);
     }
+    flags = TclEncodingExternalFlagsToInternal(flags);
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     while (1) {
 	result = encodingPtr->fromUtfProc(encodingPtr->clientData, src,
@@ -4095,7 +4095,7 @@ InitializeEncodingSearchPath(
  *
  * TclEncodingProfileParseName --
  *
- *    Maps an encoding profile name to its enum value.
+ *    Maps an encoding profile name to its integer equivalent.
  *
  * Results:
  *    TCL_OK on success or TCL_ERROR on failure.
@@ -4107,17 +4107,22 @@ InitializeEncodingSearchPath(
  */
 int
 TclEncodingProfileParseName(
-    Tcl_Interp *interp,			  /* For error messages. May be NULL */
-    const char *profileName,		  /* Name of profile */
-    enum TclEncodingProfile *profilePtr)  /* Output */
+    Tcl_Interp *interp,		/* For error messages. May be NULL */
+    const char *profileName,	/* Name of profile */
+    int *profilePtr)  		/* Output */
 {
-    /* NOTE: Order must match enum TclEncodingProfile !!! */
-    static const char *const profileNames[] = {"", "tcl8", "strict"};
-    int idx;
+    /* NOTE: Order in arrays must match !!! */
+    static const char *const profileNames[] = {"", "tcl8", "strict", NULL};
+    static int profileFlags[] = {
+	TCL_ENCODING_PROFILE_DEFAULT,
+	TCL_ENCODING_PROFILE_TCL8,
+	TCL_ENCODING_PROFILE_STRICT,
+    };
+    int i;
 
-    for (idx = 0; idx < sizeof(profileNames) / sizeof(profileNames[0]); ++idx) {
-	if (!strcmp(profileName, profileNames[idx])) {
-	    *profilePtr = (enum TclEncodingProfile)idx;
+    for (i = 0; i < sizeof(profileNames) / sizeof(profileNames[0]); ++i) {
+	if (!strcmp(profileName, profileNames[i])) {
+	    *profilePtr = profileFlags[i];
 	    return TCL_OK;
 	}
     }
@@ -4134,6 +4139,63 @@ TclEncodingProfileParseName(
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * TclEncodingExternalFlagsToInternal --
+ *
+ *	Maps the flags supported in the encoding C API's to internal flags.
+ *
+ *	TCL_ENCODING_STRICT and TCL_ENCODING_NOCOMPLAIN are masked off
+ *	because they are for internal use only and externally specified
+ *	through TCL_ENCODING_PROFILE_* bits.
+ *
+ *	For backward compatibility reasons, TCL_ENCODING_STOPONERROR is
+ *	is mapped to the TCL_ENCODING_PROFILE_STRICT overwriting any profile
+ *	specified.
+ *
+ *	If no profile or an invalid profile is specified, it is set to 
+ *	the default.
+ *
+ * Results:
+ *    Internal encoding flag mask.
+ *
+ * Side effects:
+ *    None.
+ *
+ *------------------------------------------------------------------------
+ */
+int TclEncodingExternalFlagsToInternal(int flags)
+{
+    flags &= ~(TCL_ENCODING_STRICT | TCL_ENCODING_NOCOMPLAIN);
+    if (flags & TCL_ENCODING_STOPONERROR) {
+	TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
+    }
+    else {
+	int profile = TCL_ENCODING_PROFILE_GET(flags);
+	switch (profile) {
+	case TCL_ENCODING_PROFILE_TCL8:
+	    flags |= TCL_ENCODING_NOCOMPLAIN;
+	    break;
+	case TCL_ENCODING_PROFILE_STRICT:
+	    flags |= TCL_ENCODING_STRICT;
+	    break;
+	default:
+	    /* TODO - clean this up once default mechanisms settled */
+	    TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_DEFAULT);
+#if TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_TCL8
+	    flags |= TCL_ENCODING_NOCOMPLAIN;
+#elif TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT
+	    flags |= TCL_ENCODING_STRICT;
+#else
+#error TCL_ENCODING_PROFILE_DEFAULT must be TCL8 or STRICT
+#endif
+	    break;
+	}
+    }
+    return flags;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 370ca95..0152740 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8379,7 +8379,7 @@ Tcl_SetChannelOption(
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
     } else if (HaveOpt(1, "-encodingprofile")) {
-	enum TclEncodingProfile profile;
+	int profile;
 	if (TclEncodingProfileParseName(interp, newValue, &profile) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -8392,7 +8392,11 @@ Tcl_SetChannelOption(
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
 	    break;
+	/* TODO - clean up this DEFAULT handling once channel flags fixed */
+#if TCL_ENCODING_PROFILE_DEFAULT != TCL_ENCODING_PROFILE_TCL8 \
+    && TCL_ENCODING_PROFILE_DEFAULT != TCL_ENCODING_PROFILE_STRICT
 	case TCL_ENCODING_PROFILE_DEFAULT: /* FALLTHRU */
+#endif
 	default:
 	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
 	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 82728d3..2b491d6 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2883,21 +2883,12 @@ MODULE_SCOPE TclPlatformType tclPlatform;
  * Declarations related to internal encoding functions.
  */
 
-/*
- * Enum for encoding profiles that control encoding treatment of 
- * invalid bytes. NOTE: Order must match that of encodingProfileNames in 
- * TclEncodingProfileParseName() !!!
- */
-enum TclEncodingProfile {
-    TCL_ENCODING_PROFILE_DEFAULT,
-    TCL_ENCODING_PROFILE_TCL8,
-    TCL_ENCODING_PROFILE_STRICT,
-};
 MODULE_SCOPE Tcl_Encoding tclIdentityEncoding;
 MODULE_SCOPE int
 TclEncodingProfileParseName(Tcl_Interp *interp,
 			    const char *profileName,
-			    enum TclEncodingProfile *profilePtr);
+			    int *profilePtr);
+MODULE_SCOPE int TclEncodingExternalFlagsToInternal(int flags);
 
 /*
  * TIP #233 (Virtualized Time)
-- 
cgit v0.12


From fd83fb931e43901b77f4e480ef63841e10b39f22 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 9 Feb 2023 19:52:00 +0000
Subject: Add 4 more testcases, showing that the same bug is present in utf-16
 as well. Also fix the bug (really, now!)

---
 generic/tclEncoding.c | 44 ++++++++++++++++++++++++++++++++++++--------
 tests/encoding.test   | 12 ++++++++++++
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index d19e237..0941f14 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2531,7 +2531,7 @@ Utf32ToUtfProc(
     const char *srcStart, *srcEnd;
     const char *dstEnd, *dstStart;
     int result, numChars, charLimit = INT_MAX;
-    int ch;
+    int ch = 0;
 
     flags |= PTR2INT(clientData);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
@@ -2548,6 +2548,19 @@ Utf32ToUtfProc(
 	srcLen &= -4;
     }
 
+    /*
+     * If last code point is a high surrogate, we cannot handle that yet,
+     * unless we are at the end.
+     */
+
+    if (!(flags & TCL_ENCODING_END) && (srcLen >= 4) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?3:2)] & 0xFC) == 0xD8) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?2:3)]) == 0) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?1:4)]) == 0)) {
+	result = TCL_CONVERT_MULTIBYTE;
+	srcLen-= 4;
+    }
+
     srcStart = src;
     srcEnd = src + srcLen;
 
@@ -2560,11 +2573,16 @@ Utf32ToUtfProc(
 	    break;
 	}
 
+	int prev = ch;
 	if (flags & TCL_ENCODING_LE) {
 	    ch = (src[3] & 0xFF) << 24 | (src[2] & 0xFF) << 16 | (src[1] & 0xFF) << 8 | (src[0] & 0xFF);
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
+	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
+	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
+	    dst += Tcl_UniCharToUtf(-1, dst);
+	}
 	if  ((unsigned)ch > 0x10FFFF || (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
 		&& ((ch  & ~0x7FF) == 0xD800))) {
 	    if (STOPONERROR) {
@@ -2582,14 +2600,14 @@ Utf32ToUtfProc(
 	    *dst++ = (ch & 0xFF);
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
-	    if ((ch  & ~0x3FF) == 0xD800) {
-		/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
-		dst += Tcl_UniCharToUtf(-1, dst);
-	    }
 	}
 	src += sizeof(unsigned int);
     }
 
+    if ((ch  & ~0x3FF) == 0xD800) {
+	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
+	dst += Tcl_UniCharToUtf(-1, dst);
+    }
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = numChars;
@@ -2734,7 +2752,7 @@ Utf16ToUtfProc(
     const char *srcStart, *srcEnd;
     const char *dstEnd, *dstStart;
     int result, numChars, charLimit = INT_MAX;
-    unsigned short ch;
+    unsigned short ch = 0;
 
     flags |= PTR2INT(clientData);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
@@ -2752,10 +2770,11 @@ Utf16ToUtfProc(
     }
 
     /*
-     * If last code point is a high surrogate, we cannot handle that yet.
+     * If last code point is a high surrogate, we cannot handle that yet,
+     * unless we are at the end.
      */
 
-    if ((srcLen >= 2) &&
+    if (!(flags & TCL_ENCODING_END) && (srcLen >= 2) &&
 	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?1:2)] & 0xFC) == 0xD8)) {
 	result = TCL_CONVERT_MULTIBYTE;
 	srcLen-= 2;
@@ -2773,11 +2792,16 @@ Utf16ToUtfProc(
 	    break;
 	}
 
+	unsigned short prev = ch;
 	if (flags & TCL_ENCODING_LE) {
 	    ch = (src[1] & 0xFF) << 8 | (src[0] & 0xFF);
 	} else {
 	    ch = (src[0] & 0xFF) << 8 | (src[1] & 0xFF);
 	}
+	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
+	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
+	    dst += Tcl_UniCharToUtf(-1, dst);
+	}
 
 	/*
 	 * Special case for 1-byte utf chars for speed. Make sure we work with
@@ -2792,6 +2816,10 @@ Utf16ToUtfProc(
 	src += sizeof(unsigned short);
     }
 
+    if ((ch  & ~0x3FF) == 0xD800) {
+	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
+	dst += Tcl_UniCharToUtf(-1, dst);
+    }
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = numChars;
diff --git a/tests/encoding.test b/tests/encoding.test
index e42c3b9..b2b029e 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -497,6 +497,18 @@ test encoding-16.11 {Utf32ToUtfProc} -body {
 test encoding-16.12 {Utf32ToUtfProc} -body {
     encoding convertfrom utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00
 } -result \uDC00\uD800
+test encoding-16.13 {Utf16ToUtfProc} -body {
+    encoding convertfrom utf-16le \x00\xD8
+} -result \uD800
+test encoding-16.14 {Utf16ToUtfProc} -body {
+    encoding convertfrom utf-16le \x00\xDC
+} -result \uDC00
+test encoding-16.15 {Utf16ToUtfProc} -body {
+    encoding convertfrom utf-16le \x00\xD8\x00\xDC
+} -result \uD800\uDC00
+test encoding-16.16 {Utf16ToUtfProc} -body {
+    encoding convertfrom utf-16le \x00\xDC\x00\xD8
+} -result \uDC00\uD800
 
 test encoding-16.9 {
     Utf16ToUtfProc, Tcl_UniCharToUtf, surrogate pairs in utf-16
-- 
cgit v0.12


From e26214c28753b22c398ba4d7196a8afae999ab5a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 10 Feb 2023 17:07:12 +0000
Subject: Phase out (almost) STRICT and NOCOMPLAIN flags.

---
 generic/tclCmdAH.c    |  38 +++++++++-------
 generic/tclEncoding.c | 114 +++++++++++++++++++++++++++++++++++-------------
 generic/tclIO.c       | 118 ++++++++++++--------------------------------------
 generic/tclIO.h       |   3 +-
 generic/tclInt.h      |   8 ++--
 5 files changed, 140 insertions(+), 141 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 05c0887..5fbe27e 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -543,7 +543,7 @@ TclInitEncodingCmd(
  *      if non-NULL
  *    - *dataObjPtr is set to the Tcl_Obj containing the data to encode or
  *      decode
- *    - *flagsPtr is set to encoding error handling flags
+ *    - *profilePtr is set to encoding error handling profile
  *    - *failVarPtr is set to -failindex option value or NULL
  *    On error, all of the above are uninitialized.
  *
@@ -556,20 +556,19 @@ EncodingConvertParseOptions (
     Tcl_Obj *const objv[], /* Argument objects as passed to command. */
     Tcl_Encoding *encPtr,  /* Where to store the encoding */
     Tcl_Obj **dataObjPtr,  /* Where to store ptr to Tcl_Obj containing data */
-    int *flagsPtr,         /* Bit mask of encoding option flags */
+    int *profilePtr,         /* Bit mask of encoding option profile */
     Tcl_Obj **failVarPtr   /* Where to store -failindex option value */
 )
 {
     static const char *const options[] = {"-profile", "-failindex", NULL};
     enum convertfromOptions { PROFILE, FAILINDEX } optIndex;
-    int profile;
     Tcl_Encoding encoding;
     Tcl_Obj *dataObj;
     Tcl_Obj *failVarObj;
 #if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
-    int flags = TCL_ENCODING_STOPONERROR;
+    int profile = TCL_ENCODING_PROFILE_TCL8; /* TODO - default for Tcl9? */
 #else
-    int flags = TCL_ENCODING_NOCOMPLAIN;
+    int profile = TCL_ENCODING_PROFILE_TCL8;
 #endif
 
     /*
@@ -609,14 +608,16 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 	    }
 	    switch (optIndex) {
 	    case PROFILE:
-		if (TclEncodingProfileParseName(
+		if (TclEncodingProfileNameToId(
 			interp, Tcl_GetString(objv[argIndex]), &profile)
 		    != TCL_OK) {
 		    return TCL_ERROR;
 		}
+#ifdef NOTNEEDED
 		/* TODO - next line probably not needed as the conversion
 		   functions already take care of mapping profile to flags */
-		flags = TclEncodingExternalFlagsToInternal(profile);
+		profile = TclEncodingExternalFlagsToInternal(profile);
+#endif
 		break;
 	    case FAILINDEX:
 		failVarObj = objv[argIndex];
@@ -633,7 +634,7 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 
     *encPtr = encoding;
     *dataObjPtr = dataObj;
-    *flagsPtr = flags;
+    *profilePtr = profile;
     *failVarPtr = failVarObj;
 
     return TCL_OK;
@@ -676,20 +677,23 @@ EncodingConvertfromObjCmd(
     }
 
     /*
-     * Convert the string into a byte array in 'ds'
+     * Convert the string into a byte array in 'ds'.
      */
 #if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-    if (!(flags & TCL_ENCODING_STOPONERROR)) {
+    if (TCL_ENCODING_PROFILE_GET(flags) == TCL_ENCODING_PROFILE_TCL8) {
+	/* Permits high bits to be non-0 in byte array (Tcl 8 style) */
 	bytesPtr = (char *) Tcl_GetByteArrayFromObj(data, &length);
-    } else
+    }
+    else
 #endif
-    bytesPtr = (char *) TclGetBytesFromObj(interp, data, &length);
+	bytesPtr = (char *) TclGetBytesFromObj(interp, data, &length);
+
     if (bytesPtr == NULL) {
 	return TCL_ERROR;
     }
     result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length,
 	    flags, &ds);
-    if ((!(flags & TCL_ENCODING_NOCOMPLAIN) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) && (result != TCL_INDEX_NONE)) {
+    if (result != TCL_INDEX_NONE) {
 	if (failVarObj != NULL) {
 	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
 		return TCL_ERROR;
@@ -704,7 +708,8 @@ EncodingConvertfromObjCmd(
 	    Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
-    } else if (failVarObj != NULL) {
+    }
+    else if (failVarObj != NULL) {
 	if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewIntObj(-1), TCL_LEAVE_ERR_MSG) == NULL) {
 	    return TCL_ERROR;
 	}
@@ -769,7 +774,7 @@ EncodingConverttoObjCmd(
     stringPtr = TclGetStringFromObj(data, &length);
     result = Tcl_UtfToExternalDStringEx(encoding, stringPtr, length,
 	    flags, &ds);
-    if ((!(flags & TCL_ENCODING_NOCOMPLAIN) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) && (result != TCL_INDEX_NONE)) {
+    if (result != TCL_INDEX_NONE) {
 	if (failVarObj != NULL) {
 	    /* I hope, wide int will cover size_t data type */
 	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
@@ -788,7 +793,8 @@ EncodingConverttoObjCmd(
 	    Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
-    } else if (failVarObj != NULL) {
+    }
+    else if (failVarObj != NULL) {
 	if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewIntObj(-1), TCL_LEAVE_ERR_MSG) == NULL) {
 	    return TCL_ERROR;
 	}
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 8e42e26..153f8d3 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -188,6 +188,15 @@ static Tcl_Encoding systemEncoding = NULL;
 Tcl_Encoding tclIdentityEncoding = NULL;
 
 /*
+ * Names of encoding profiles and corresponding integer values
+ */
+static struct TclEncodingProfiles {
+    const char *name;
+    int value;
+} encodingProfiles[] = {{"tcl8", TCL_ENCODING_PROFILE_TCL8},
+			{"strict", TCL_ENCODING_PROFILE_STRICT}};
+
+/*
  * The following variable is used in the sparse matrix code for a
  * TableEncoding to represent a page in the table that has no entries.
  */
@@ -1172,7 +1181,7 @@ Tcl_ExternalToUtfDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, TCL_ENCODING_NOCOMPLAIN, dstPtr);
+    Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, TCL_ENCODING_PROFILE_TCL8, dstPtr);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -2315,11 +2324,17 @@ BinaryProc(
  *-------------------------------------------------------------------------
  */
 
+#ifdef OBSOLETE
 #if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
 #   define STOPONERROR (!(flags & TCL_ENCODING_NOCOMPLAIN) || (flags & TCL_ENCODING_STOPONERROR))
 #else
 #   define STOPONERROR (flags & TCL_ENCODING_STOPONERROR)
 #endif
+#endif
+
+
+#define STRICT_PROFILE(flags_) (TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT)
+#define STOPONERROR STRICT_PROFILE(flags)
 
 static int
 UtfToUtfProc(
@@ -2386,10 +2401,11 @@ UtfToUtfProc(
 	     */
 
 	    *dst++ = *src++;
-	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-		&& (UCHAR(src[1]) == 0x80) && (!(flags & TCL_ENCODING_MODIFIED)
-			|| ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-			|| (flags & ENCODING_FAILINDEX))) {
+	} else if ((UCHAR(*src) == 0xC0) &&
+		   (src + 1 < srcEnd) &&
+		   (UCHAR(src[1]) == 0x80) &&
+		   (!(flags & TCL_ENCODING_MODIFIED)
+		     || (STRICT_PROFILE(flags)))) {
 	    /*
 	     * If in input mode, and -strict or -failindex is specified: This is an error.
 	     */
@@ -2403,7 +2419,8 @@ UtfToUtfProc(
 	     */
 	    *dst++ = 0;
 	    src += 2;
-	} else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
+	}
+	else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
 	    /*
 	     * Always check before using TclUtfToUCS4. Not doing can so
 	     * cause it run beyond the end of the buffer! If we happen such an
@@ -2416,10 +2433,10 @@ UtfToUtfProc(
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
-	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX)) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
-	    }
+		if (STRICT_PROFILE(flags)) {
+		    result = TCL_CONVERT_SYNTAX;
+		    break;
+		}
 		ch = UCHAR(*src++);
 	    } else {
 		char chbuf[2];
@@ -2427,12 +2444,13 @@ UtfToUtfProc(
 		TclUtfToUCS4(chbuf, &ch);
 	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
-	} else {
+	}
+	else {
 	    int low;
 	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
 	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)
-		    && (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+		    && STRICT_PROFILE(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
@@ -2475,8 +2493,9 @@ UtfToUtfProc(
 		result = TCL_CONVERT_UNKNOWN;
 		src = saveSrc;
 		break;
-	    } else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		    && (flags & TCL_ENCODING_MODIFIED) && ((ch  & ~0x7FF) == 0xD800)) {
+	    } else if (STRICT_PROFILE(flags) &&
+		       (flags & TCL_ENCODING_MODIFIED) &&
+		       ((ch & ~0x7FF) == 0xD800)) {
 		result = TCL_CONVERT_SYNTAX;
 		src = saveSrc;
 		break;
@@ -2567,8 +2586,8 @@ Utf32ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
-	if  ((unsigned)ch > 0x10FFFF || (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		&& ((ch  & ~0x7FF) == 0xD800))) {
+	if ((unsigned)ch > 0x10FFFF
+	    || (STRICT_PROFILE(flags) && ((ch & ~0x7FF) == 0xD800))) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
@@ -4095,34 +4114,27 @@ InitializeEncodingSearchPath(
  *
  * TclEncodingProfileParseName --
  *
- *    Maps an encoding profile name to its integer equivalent.
+ *	Maps an encoding profile name to its integer equivalent.
  *
  * Results:
- *    TCL_OK on success or TCL_ERROR on failure.
+ *	TCL_OK on success or TCL_ERROR on failure.
  *
  * Side effects:
- *    Returns the profile enum value in *profilePtr
+ *	Returns the profile enum value in *profilePtr
  *
  *------------------------------------------------------------------------
  */
 int
-TclEncodingProfileParseName(
+TclEncodingProfileNameToId(
     Tcl_Interp *interp,		/* For error messages. May be NULL */
     const char *profileName,	/* Name of profile */
     int *profilePtr)  		/* Output */
 {
-    /* NOTE: Order in arrays must match !!! */
-    static const char *const profileNames[] = {"", "tcl8", "strict", NULL};
-    static int profileFlags[] = {
-	TCL_ENCODING_PROFILE_DEFAULT,
-	TCL_ENCODING_PROFILE_TCL8,
-	TCL_ENCODING_PROFILE_STRICT,
-    };
     int i;
 
-    for (i = 0; i < sizeof(profileNames) / sizeof(profileNames[0]); ++i) {
-	if (!strcmp(profileName, profileNames[i])) {
-	    *profilePtr = profileFlags[i];
+    for (i = 0; i < sizeof(encodingProfiles) / sizeof(encodingProfiles[0]); ++i) {
+	if (!strcmp(profileName, encodingProfiles[i].name)) {
+	    *profilePtr = encodingProfiles[i].value;
 	    return TCL_OK;
 	}
     }
@@ -4130,13 +4142,52 @@ TclEncodingProfileParseName(
 	Tcl_SetObjResult(
 	    interp,
 	    Tcl_ObjPrintf(
-		"bad profile \"%s\". Must be \"\", \"tcl8\" or \"strict\".",
+		"bad profile \"%s\". Must be \"tcl8\" or \"strict\".",
 		profileName));
 	Tcl_SetErrorCode(
 	    interp, "TCL", "ENCODING", "PROFILE", profileName, NULL);
     }
     return TCL_ERROR;
 }
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * TclEncodingProfileValueToName --
+ *
+ *	Maps an encoding profile value to its name.
+ *
+ * Results:
+ *	Pointer to the name or NULL on failure. Caller must not make
+ *	not modify the string and must make a copy to hold on to it.
+ *
+ * Side effects:
+ *	None.
+ *------------------------------------------------------------------------
+ */
+const char *
+TclEncodingProfileIdToName(
+    Tcl_Interp *interp,		/* For error messages. May be NULL */
+    int profileValue)		/* Profile #define value */
+{
+    int i;
+
+    for (i = 0; i < sizeof(encodingProfiles) / sizeof(encodingProfiles[0]); ++i) {
+	if (profileValue == encodingProfiles[i].value) {
+	    return encodingProfiles[i].name;
+	}
+    }
+    if (interp) {
+	Tcl_SetObjResult(
+	    interp,
+	    Tcl_ObjPrintf(
+		"Internal error. Bad profile id \"%d\".",
+		profileValue));
+	Tcl_SetErrorCode(
+	    interp, "TCL", "ENCODING", "PROFILEID", NULL);
+    }
+    return NULL;
+}
 
 /*
  *------------------------------------------------------------------------
@@ -4179,6 +4230,7 @@ int TclEncodingExternalFlagsToInternal(int flags)
 	case TCL_ENCODING_PROFILE_STRICT:
 	    flags |= TCL_ENCODING_STRICT;
 	    break;
+	case 0: /* Unspecified by caller */
 	default:
 	    /* TODO - clean this up once default mechanisms settled */
 	    TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_DEFAULT);
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 0152740..49f4257 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1700,8 +1700,12 @@ Tcl_CreateChannel(
     }
     statePtr->inputEncodingState  = NULL;
     statePtr->inputEncodingFlags  = TCL_ENCODING_START;
+    TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags,
+			     TCL_ENCODING_PROFILE_DEFAULT);
     statePtr->outputEncodingState = NULL;
     statePtr->outputEncodingFlags = TCL_ENCODING_START;
+    TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags,
+			     TCL_ENCODING_PROFILE_DEFAULT);
 
     /*
      * Set the channel up initially in AUTO input translation mode to accept
@@ -4394,21 +4398,6 @@ Write(
     }
 
     /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->outputEncodingFlags |= TCL_ENCODING_STRICT;
-#ifdef TCL_NO_DEPRECATED
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->outputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->outputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-#endif
-    } else {
-	statePtr->outputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
-    /*
      * Write the terminated escape sequence even if srcLen is 0.
      */
 
@@ -4733,21 +4722,6 @@ Tcl_GetsObj(
     }
 
     /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-#ifdef TCL_NO_DEPRECATED
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-#endif
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
-    /*
      * Object used by FilterInputBytes to keep track of how much data has been
      * consumed from the channel buffers.
      */
@@ -5528,21 +5502,6 @@ FilterInputBytes(
     }
     gsPtr->state = statePtr->inputEncodingState;
 
-    /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-#ifdef TCL_NO_DEPRECATED
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-#endif
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
     result = Tcl_ExternalToUtf(NULL, gsPtr->encoding, raw, rawLen,
 	    statePtr->inputEncodingFlags | TCL_ENCODING_NO_TERMINATE,
 	    &statePtr->inputEncodingState, dst, spaceLeft, &gsPtr->rawRead,
@@ -6349,21 +6308,6 @@ ReadChars(
     }
 
     /*
-     * Transfer encoding nocomplain/strict option to the encoding flags
-     */
-
-    if (GotFlag(statePtr, CHANNEL_ENCODING_STRICT)) {
-	statePtr->inputEncodingFlags |= TCL_ENCODING_STRICT;
-#ifdef TCL_NO_DEPRECATED
-    } else if (GotFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN)) {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-	statePtr->inputEncodingFlags |= TCL_ENCODING_NOCOMPLAIN;
-#endif
-    } else {
-	statePtr->inputEncodingFlags &= ~TCL_ENCODING_STRICT;
-    }
-
-    /*
      * This routine is burdened with satisfying several constraints. It cannot
      * append more than 'charsToRead` chars onto objPtr. This is measured
      * after encoding and translation transformations are completed. There is
@@ -8065,16 +8009,18 @@ Tcl_GetChannelOption(
 	}
     }
     if (len == 0 || HaveOpt(1, "-encodingprofile")) {
+	int profile;
+	const char *profileName;
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-encodingprofile");
 	}
-	if (flags & CHANNEL_ENCODING_STRICT) {
-	    Tcl_DStringAppendElement(dsPtr, "strict");
-	} else if (flags & CHANNEL_ENCODING_NOCOMPLAIN) {
-	    Tcl_DStringAppendElement(dsPtr, "tcl8");
-	} else {
-	    Tcl_DStringAppendElement(dsPtr, "");
+	/* Note currently input and output profiles are same */
+	profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
+	profileName = TclEncodingProfileIdToName(interp, profile);
+	if (profileName == NULL) {
+	    return TCL_ERROR;
 	}
+	Tcl_DStringAppendElement(dsPtr, profileName);
 	if (len > 0) {
 	    return TCL_OK;
 	}
@@ -8293,6 +8239,7 @@ Tcl_SetChannelOption(
 	return TCL_OK;
     } else if (HaveOpt(2, "-encoding")) {
 	Tcl_Encoding encoding;
+	int profile;
 
 	if ((newValue[0] == '\0') || (strcmp(newValue, "binary") == 0)) {
 	    encoding = NULL;
@@ -8317,9 +8264,12 @@ Tcl_SetChannelOption(
 	Tcl_FreeEncoding(statePtr->encoding);
 	statePtr->encoding = encoding;
 	statePtr->inputEncodingState = NULL;
+	profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
 	statePtr->inputEncodingFlags = TCL_ENCODING_START;
+	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
 	statePtr->outputEncodingState = NULL;
 	statePtr->outputEncodingFlags = TCL_ENCODING_START;
+	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
@@ -8380,28 +8330,11 @@ Tcl_SetChannelOption(
 	return TCL_OK;
     } else if (HaveOpt(1, "-encodingprofile")) {
 	int profile;
-	if (TclEncodingProfileParseName(interp, newValue, &profile) != TCL_OK) {
+	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	switch (profile) {
-	case TCL_ENCODING_PROFILE_TCL8:
-	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-	    SetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-	    break;
-	case TCL_ENCODING_PROFILE_STRICT:
-	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-	    SetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-	    break;
-	/* TODO - clean up this DEFAULT handling once channel flags fixed */
-#if TCL_ENCODING_PROFILE_DEFAULT != TCL_ENCODING_PROFILE_TCL8 \
-    && TCL_ENCODING_PROFILE_DEFAULT != TCL_ENCODING_PROFILE_STRICT
-	case TCL_ENCODING_PROFILE_DEFAULT: /* FALLTHRU */
-#endif
-	default:
-	    ResetFlag(statePtr, CHANNEL_ENCODING_NOCOMPLAIN);
-	    ResetFlag(statePtr, CHANNEL_ENCODING_STRICT);
-	    break;
-	}
+	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
@@ -9493,12 +9426,17 @@ TclCopyChannel(
      * of the bytes themselves.
      */
 
+    /*
+     * TODO - should really only allow lossless profiles. Below reflects
+     * Tcl 8.7 alphas prior to encoding profiles
+     */
+
     moveBytes = inStatePtr->inEofChar == '\0'	/* No eofChar to stop input */
 	    && inStatePtr->inputTranslation == TCL_TRANSLATE_LF
 	    && outStatePtr->outputTranslation == TCL_TRANSLATE_LF
 	    && inStatePtr->encoding == outStatePtr->encoding
-	    && (inStatePtr->flags & TCL_ENCODING_STRICT) != TCL_ENCODING_STRICT
-	    && outStatePtr->flags & TCL_ENCODING_NOCOMPLAIN;
+	    && TCL_ENCODING_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
+	    && TCL_ENCODING_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
 
     /*
      * Allocate a new CopyState to maintain info about the current copy in
@@ -9826,8 +9764,8 @@ CopyData(
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
     sameEncoding = inStatePtr->encoding == outStatePtr->encoding
-	    && (inStatePtr->flags & TCL_ENCODING_STRICT) != TCL_ENCODING_STRICT
-	    && outStatePtr->flags & TCL_ENCODING_NOCOMPLAIN;
+	    && TCL_ENCODING_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
+	    && TCL_ENCODING_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
 
     if (!(inBinary || sameEncoding)) {
 	TclNewObj(bufObj);
diff --git a/generic/tclIO.h b/generic/tclIO.h
index a69e990..3f2feee 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -275,16 +275,17 @@ typedef struct ChannelState {
 					 * encountered an encoding error */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
+#ifdef APN
 #define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option
 					 * -nocomplainencoding is set to 1 */
 #define CHANNEL_ENCODING_STRICT	(1<<18)	/* set if option
 					 * -strictencoding is set to 1 */
+#endif
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
 					 * usable, but it may not be closed
 					 * again from within the close
 					 * handler. */
-#define ENCODING_FAILINDEX	(1<<20) /* Internal flag, fail on Invalid bytes only */
 #define CHANNEL_CLOSEDWRITE	(1<<21)	/* Channel write side has been closed.
 					 * No further Tcl-level write IO on
 					 * the channel is allowed. */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2b491d6..4b6303d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2885,9 +2885,11 @@ MODULE_SCOPE TclPlatformType tclPlatform;
 
 MODULE_SCOPE Tcl_Encoding tclIdentityEncoding;
 MODULE_SCOPE int
-TclEncodingProfileParseName(Tcl_Interp *interp,
-			    const char *profileName,
-			    int *profilePtr);
+TclEncodingProfileNameToId(Tcl_Interp *interp,
+			   const char *profileName,
+			   int *profilePtr);
+MODULE_SCOPE const char *TclEncodingProfileIdToName(Tcl_Interp *interp,
+						    int profileId);
 MODULE_SCOPE int TclEncodingExternalFlagsToInternal(int flags);
 
 /*
-- 
cgit v0.12


From bab9170bdca67622ada57df9a0e7f55c5ac92b2f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 10 Feb 2023 20:22:07 +0000
Subject: Proposed fix (and testcases) for [4a7397e0b3]: Tcl 9: fcopy with
 -strictencoding 1 UTF-8 channels

---
 generic/tclIO.c |  8 +++++
 tests/io.test   | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index fed469c..2e0cd1f 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -9820,12 +9820,20 @@ CopyData(
 	    Tcl_SetErrno(inStatePtr->unreportedError);
 	    inStatePtr->unreportedError = 0;
 	    goto readError;
+	} else if (inStatePtr->flags & CHANNEL_ENCODING_ERROR) {
+	    Tcl_SetErrno(EILSEQ);
+	    inStatePtr->flags &= ~CHANNEL_ENCODING_ERROR;
+	    goto readError;
 	}
 	Tcl_GetChannelError(outChan, &msg);
 	if ((outStatePtr->unreportedError != 0) || (msg != NULL)) {
 	    Tcl_SetErrno(outStatePtr->unreportedError);
 	    outStatePtr->unreportedError = 0;
 	    goto writeError;
+	} else if (outStatePtr->flags & CHANNEL_ENCODING_ERROR) {
+	    Tcl_SetErrno(EILSEQ);
+	    outStatePtr->flags &= ~CHANNEL_ENCODING_ERROR;
+	    goto writeError;
 	}
 
 	if (cmdPtr && (mask == 0)) {
diff --git a/tests/io.test b/tests/io.test
index 2708906..7b8182e 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7609,6 +7609,103 @@ test io-52.19 {coverage of eofChar handling} {
     close $out
     file size $path(test2)
 } 8
+test io-52.20 {TclCopyChannel & encodings} -setup {
+    set out [open $path(utf8-fcopy.txt) w]
+    fconfigure $out -encoding utf-8 -translation lf
+    puts $out "Á"
+    close $out
+} -constraints {fcopy} -body {
+    # binary to encoding => the input has to be
+    # in utf-8 to make sense to the encoder
+
+    set in  [open $path(utf8-fcopy.txt) r]
+    set out [open $path(kyrillic.txt) w]
+
+    # Using "-encoding ascii" means reading the "Á" gives an error
+    fconfigure $in  -encoding ascii -strictencoding 1
+    fconfigure $out -encoding koi8-r -translation lf
+
+    fcopy $in $out
+} -cleanup {
+    close $in
+    close $out
+} -returnCodes 1 -match glob -result {error reading "file*": illegal byte sequence}
+test io-52.21 {TclCopyChannel & encodings} -setup {
+    set out [open $path(utf8-fcopy.txt) w]
+    fconfigure $out -encoding utf-8 -translation lf
+    puts $out "Á"
+    close $out
+} -constraints {fcopy} -body {
+    # binary to encoding => the input has to be
+    # in utf-8 to make sense to the encoder
+
+    set in  [open $path(utf8-fcopy.txt) r]
+    set out [open $path(kyrillic.txt) w]
+
+    # Using "-encoding ascii" means writing the "Á" gives an error
+    fconfigure $in  -encoding utf-8
+    fconfigure $out -encoding ascii -translation lf -strictencoding 1
+
+    fcopy $in $out
+} -cleanup {
+    close $in
+    close $out
+} -returnCodes 1 -match glob -result {error writing "file*": illegal byte sequence}
+test io-52.22 {TclCopyChannel & encodings} -setup {
+    set out [open $path(utf8-fcopy.txt) w]
+    fconfigure $out -encoding utf-8 -translation lf
+    puts $out "Á"
+    close $out
+} -constraints {fcopy} -body {
+    # binary to encoding => the input has to be
+    # in utf-8 to make sense to the encoder
+
+    set in  [open $path(utf8-fcopy.txt) r]
+    set out [open $path(kyrillic.txt) w]
+
+    # Using "-encoding ascii" means reading the "Á" gives an error
+    fconfigure $in  -encoding ascii -strictencoding 1
+    fconfigure $out -encoding koi8-r -translation lf
+    proc ::xxx args {
+        set ::s0 $args
+    }
+
+    fcopy $in $out -command ::xxx
+    vwait ::s0
+    set ::s0
+} -cleanup {
+    close $in
+    close $out
+    unset ::s0
+} -match glob -result {0 {error reading "file*": illegal byte sequence}}
+test io-52.23 {TclCopyChannel & encodings} -setup {
+    set out [open $path(utf8-fcopy.txt) w]
+    fconfigure $out -encoding utf-8 -translation lf
+    puts $out "Á"
+    close $out
+} -constraints {fcopy} -body {
+    # binary to encoding => the input has to be
+    # in utf-8 to make sense to the encoder
+
+    set in  [open $path(utf8-fcopy.txt) r]
+    set out [open $path(kyrillic.txt) w]
+
+    # Using "-encoding ascii" means writing the "Á" gives an error
+    fconfigure $in  -encoding utf-8
+    fconfigure $out -encoding ascii -translation lf -strictencoding 1
+    proc ::xxx args {
+        set ::s0 $args
+    }
+
+    fcopy $in $out -command ::xxx
+    vwait ::s0
+    set ::s0
+} -cleanup {
+    close $in
+    close $out
+    unset ::s0
+} -match glob -result {0 {error writing "file*": illegal byte sequence}}
+
 
 test io-53.1 {CopyData} {fcopy} {
     file delete $path(test1)
-- 
cgit v0.12


From c2f0e2f8da529b6bd9f8793a07e73ed1bb6eb903 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 11 Feb 2023 01:51:32 +0000
Subject: Eliminate TCL_ENCODING_{STRICT,NOCOMPLAIN}

---
 generic/tcl.h         | 12 ++----------
 generic/tclEncoding.c | 37 ++++++++-----------------------------
 generic/tclIO.h       |  6 ------
 3 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index ec94e71..b7d31aa 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2127,14 +2127,8 @@ typedef struct Tcl_EncodingType {
  *				0x00. Only valid for "utf-8" and "cesu-8".
  *				This flag is implicit for external -> internal conversions,
  *				optional for internal -> external conversions.
- * TCL_ENCODING_NOCOMPLAIN -	If set, the converter
- *				substitutes the problematic character(s) with
- *				one or more "close" characters in the
- *				destination buffer and then continues to
- *				convert the source. If clear, the converter returns
- *				immediately upon encountering an invalid byte sequence
- *				or a source character that has no mapping in the
- *				target encoding. Only for Tcl 9.x.
+ * TCL_ENCODING_PROFILE_* -	Mutually exclusive encoding profile ids. Note
+ *				these are bit masks.
  */
 
 #define TCL_ENCODING_START		0x01
@@ -2143,8 +2137,6 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_NO_TERMINATE	0x08
 #define TCL_ENCODING_CHAR_LIMIT		0x10
 #define TCL_ENCODING_MODIFIED		0x20
-#define TCL_ENCODING_NOCOMPLAIN		0x40
-#define TCL_ENCODING_STRICT		0x44
 /* Reserve top byte for profile values (disjoint) */
 #define TCL_ENCODING_PROFILE_TCL8     0x01000000
 #define TCL_ENCODING_PROFILE_STRICT   0x02000000
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 153f8d3..85c2b6a 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -574,7 +574,7 @@ TclInitEncodingSubsystem(void)
     type.nullSize	= 1;
     type.clientData	= INT2PTR(TCL_ENCODING_UTF);
     Tcl_CreateEncoding(&type);
-    type.clientData	= INT2PTR(TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(0);
     type.encodingName	= "cesu-8";
     Tcl_CreateEncoding(&type);
 
@@ -583,13 +583,13 @@ TclInitEncodingSubsystem(void)
     type.freeProc	= NULL;
     type.nullSize	= 2;
     type.encodingName   = "ucs-2le";
-    type.clientData	= INT2PTR(TCL_ENCODING_LE|TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(TCL_ENCODING_LE);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2be";
-    type.clientData	= INT2PTR(TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(0);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2";
-    type.clientData	= INT2PTR(isLe.c|TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(isLe.c);
     Tcl_CreateEncoding(&type);
 
     type.toUtfProc	= Utf32ToUtfProc;
@@ -2324,16 +2324,11 @@ BinaryProc(
  *-------------------------------------------------------------------------
  */
 
-#ifdef OBSOLETE
-#if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
-#   define STOPONERROR (!(flags & TCL_ENCODING_NOCOMPLAIN) || (flags & TCL_ENCODING_STOPONERROR))
-#else
-#   define STOPONERROR (flags & TCL_ENCODING_STOPONERROR)
-#endif
-#endif
-
+#define STRICT_PROFILE(flags_)                                         \
+    ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
+     || (TCL_ENCODING_PROFILE_GET(flags_) == 0                         \
+	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT))
 
-#define STRICT_PROFILE(flags_) (TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT)
 #define STOPONERROR STRICT_PROFILE(flags)
 
 static int
@@ -4196,10 +4191,6 @@ TclEncodingProfileIdToName(
  *
  *	Maps the flags supported in the encoding C API's to internal flags.
  *
- *	TCL_ENCODING_STRICT and TCL_ENCODING_NOCOMPLAIN are masked off
- *	because they are for internal use only and externally specified
- *	through TCL_ENCODING_PROFILE_* bits.
- *
  *	For backward compatibility reasons, TCL_ENCODING_STOPONERROR is
  *	is mapped to the TCL_ENCODING_PROFILE_STRICT overwriting any profile
  *	specified.
@@ -4217,7 +4208,6 @@ TclEncodingProfileIdToName(
  */
 int TclEncodingExternalFlagsToInternal(int flags)
 {
-    flags &= ~(TCL_ENCODING_STRICT | TCL_ENCODING_NOCOMPLAIN);
     if (flags & TCL_ENCODING_STOPONERROR) {
 	TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
     }
@@ -4225,22 +4215,11 @@ int TclEncodingExternalFlagsToInternal(int flags)
 	int profile = TCL_ENCODING_PROFILE_GET(flags);
 	switch (profile) {
 	case TCL_ENCODING_PROFILE_TCL8:
-	    flags |= TCL_ENCODING_NOCOMPLAIN;
-	    break;
 	case TCL_ENCODING_PROFILE_STRICT:
-	    flags |= TCL_ENCODING_STRICT;
 	    break;
 	case 0: /* Unspecified by caller */
 	default:
-	    /* TODO - clean this up once default mechanisms settled */
 	    TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_DEFAULT);
-#if TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_TCL8
-	    flags |= TCL_ENCODING_NOCOMPLAIN;
-#elif TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT
-	    flags |= TCL_ENCODING_STRICT;
-#else
-#error TCL_ENCODING_PROFILE_DEFAULT must be TCL8 or STRICT
-#endif
 	    break;
 	}
     }
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 3f2feee..dded07f 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -275,12 +275,6 @@ typedef struct ChannelState {
 					 * encountered an encoding error */
 #define CHANNEL_RAW_MODE	(1<<16)	/* When set, notes that the Raw API is
 					 * being used. */
-#ifdef APN
-#define CHANNEL_ENCODING_NOCOMPLAIN	(1<<17)	/* set if option
-					 * -nocomplainencoding is set to 1 */
-#define CHANNEL_ENCODING_STRICT	(1<<18)	/* set if option
-					 * -strictencoding is set to 1 */
-#endif
 #define CHANNEL_INCLOSE		(1<<19)	/* Channel is currently being closed.
 					 * Its structures are still live and
 					 * usable, but it may not be closed
-- 
cgit v0.12


From 727887b6dc02960e49117cb5db99e44806a0327f Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 11 Feb 2023 17:38:07 +0000
Subject: Partial implementation of replace profile

---
 generic/tcl.h         |   7 +--
 generic/tclEncoding.c | 119 +++++++++++++++++++++++++++++++++++++++-----------
 tests/cmdAH.test      |   3 ++
 3 files changed, 99 insertions(+), 30 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index b7d31aa..3fc53db 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2140,6 +2140,7 @@ typedef struct Tcl_EncodingType {
 /* Reserve top byte for profile values (disjoint) */
 #define TCL_ENCODING_PROFILE_TCL8     0x01000000
 #define TCL_ENCODING_PROFILE_STRICT   0x02000000
+#define TCL_ENCODING_PROFILE_REPLACE  0x03000000
 #define TCL_ENCODING_PROFILE_MASK     0xFF000000
 #define TCL_ENCODING_PROFILE_GET(flags_)  ((flags_) & TCL_ENCODING_PROFILE_MASK)
 #define TCL_ENCODING_PROFILE_SET(flags_, profile_) \
@@ -2151,13 +2152,9 @@ typedef struct Tcl_EncodingType {
 #if TCL_MAJOR_VERSION < 9
 #define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8
 #else
-#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8 /* STRICT? TODO */
+#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8 /* STRICT? REPLACE? TODO */
 #endif
 
-#define TCL_ENCODING_EXTERNAL_FLAG_MASK \
-     (TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR)
-
-
 /*
  * The following definitions are the error codes returned by the conversion
  * routines:
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 85c2b6a..bb1f32f 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -193,8 +193,12 @@ Tcl_Encoding tclIdentityEncoding = NULL;
 static struct TclEncodingProfiles {
     const char *name;
     int value;
-} encodingProfiles[] = {{"tcl8", TCL_ENCODING_PROFILE_TCL8},
-			{"strict", TCL_ENCODING_PROFILE_STRICT}};
+} encodingProfiles[] = {
+    {"tcl8", TCL_ENCODING_PROFILE_TCL8},
+    {"strict", TCL_ENCODING_PROFILE_STRICT},
+    {"replace", TCL_ENCODING_PROFILE_REPLACE},
+};
+#define UNICODE_REPLACE_CHAR 0xFFFD
 
 /*
  * The following variable is used in the sparse matrix code for a
@@ -2336,7 +2340,7 @@ UtfToUtfProc(
     void *clientData,	/* additional flags, e.g. TCL_ENCODING_MODIFIED */
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes. */
-    int flags,			/* Conversion control flags. */
+    int flags,			/* TCL_ENCODING_* conversion control flags. */
     TCL_UNUSED(Tcl_EncodingState *),
     char *dst,			/* Output buffer in which converted string is
 				 * stored. */
@@ -2376,6 +2380,8 @@ UtfToUtfProc(
     dstEnd = dst + dstLen - ((flags & TCL_ENCODING_UTF) ? TCL_UTF_MAX : 6);
 
     for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
+	int profile = TCL_ENCODING_PROFILE_GET(flags);
+
 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
 	    /*
 	     * If there is more string to follow, this will ensure that the
@@ -2389,34 +2395,51 @@ UtfToUtfProc(
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
 	}
-	if (UCHAR(*src) < 0x80 && !((UCHAR(*src) == 0) && (flags & TCL_ENCODING_MODIFIED))) {
+	/*
+	 * TCL_ENCODING_MODIFIED is set when the target encoding is Tcl's
+	 * internal UTF-8 modified version.
+	 */
+	if (UCHAR(*src) < 0x80
+	    && !((UCHAR(*src) == 0) && (flags & TCL_ENCODING_MODIFIED))) {
 	    /*
-	     * Copy 7bit characters, but skip null-bytes when we are in input
-	     * mode, so that they get converted to 0xC080.
+	     * Copy 7bit characters, but skip null-bytes when target encoding
+	     * is Tcl's "modified" UTF-8. These need to be converted to
+	     * \xC0\x80 as is done in a later branch.
 	     */
 
 	    *dst++ = *src++;
-	} else if ((UCHAR(*src) == 0xC0) &&
-		   (src + 1 < srcEnd) &&
-		   (UCHAR(src[1]) == 0x80) &&
-		   (!(flags & TCL_ENCODING_MODIFIED)
-		     || (STRICT_PROFILE(flags)))) {
+	}
+	else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
+		 && (UCHAR(src[1]) == 0x80)
+		 && (!(flags & TCL_ENCODING_MODIFIED)
+		     || (profile == TCL_ENCODING_PROFILE_STRICT))) {
 	    /*
-	     * If in input mode, and -strict or -failindex is specified: This is an error.
+	     *  \xC0\x80 and either strict profile or target is "real" UTF-8
+	     *     - Strict profile - error
+	     *     - Non-strict, real UTF-8 - output \x00
 	     */
 	    if (flags & TCL_ENCODING_MODIFIED) {
+		/* 
+		 * TODO - should above check not be against STRICT? 
+		 * That would probably break a convertto command that goes
+		 * from the internal UTF8 to the real UTF8. On the other
+		 * hand this means, a strict UTF8->UTF8 transform is not
+		 * possible using this function.
+		 */
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
 
 	    /*
-	     * Convert 0xC080 to real nulls when we are in output mode, with or without '-strict'.
+	     * Convert 0xC080 to real nulls when we are in output mode, 
+	     * irrespective of the profile.
 	     */
 	    *dst++ = 0;
 	    src += 2;
 	}
 	else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
 	    /*
+	     * Incomplete byte sequence.
 	     * Always check before using TclUtfToUCS4. Not doing can so
 	     * cause it run beyond the end of the buffer! If we happen such an
 	     * incomplete char its bytes are made to represent themselves
@@ -2424,17 +2447,39 @@ UtfToUtfProc(
 	     */
 
 	    if (flags & TCL_ENCODING_MODIFIED) {
-		if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
-		    result = TCL_CONVERT_MULTIBYTE;
+		/* Incomplete bytes for modified UTF-8 target */
+		if (profile == TCL_ENCODING_PROFILE_STRICT) {
+		    result = (flags & TCL_ENCODING_CHAR_LIMIT)
+			       ? TCL_CONVERT_MULTIBYTE
+			       : TCL_CONVERT_SYNTAX;
 		    break;
 		}
-		if (STRICT_PROFILE(flags)) {
-		    result = TCL_CONVERT_SYNTAX;
-		    break;
+		if (profile == TCL_ENCODING_PROFILE_REPLACE) {
+		    ch = UNICODE_REPLACE_CHAR;
+		} else {
+		    /* TCL_ENCODING_PROFILE_TCL8 */
+		    ch = UCHAR(*src);
 		}
-		ch = UCHAR(*src++);
-	    } else {
+		++src;
+	    }
+	    else {
+		/*
+		 * Incomplete bytes for real UTF-8 target.
+		 * TODO - no profile check here because did not have any
+		 * checks in the pre-profile code. Why? Is it because on
+		 * output a valid internal utf-8 stream is assumed?
+		 */
 		char chbuf[2];
+		/*
+		 * TODO - this code seems broken to me.
+		 * - it does not check profiles
+		 * - generates invalid output for real UTF-8 target
+		 *   (consider \xC2)
+		 * A possible explanation is this behavior matches the
+		 * Tcl8 decoding behavior of mapping invalid bytes to the same
+		 * code point value. Still, at least strictness checks should
+		 * be made.
+		 */
 		chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
 		TclUtfToUCS4(chbuf, &ch);
 	    }
@@ -2444,11 +2489,31 @@ UtfToUtfProc(
 	    int low;
 	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
+
+	    /*
+	     * Valid single char encodings were already handled earlier.
+	     * So len==1 means an invalid byte that is magically transformed
+	     * to a code point unless it resulted from the special
+	     * \xC0\x80 sequence. Tests io-75.*
+	     * TODO - below check could be simplified to remove the MODIFIED
+	     * expression I think given the checks already made above. May be.
+	     */
+#if 0
 	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)
-		    && STRICT_PROFILE(flags)) {
+		    && (profile == TCL_ENCODING_PROFILE_STRICT)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
+#else
+	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)) {
+		if (profile == TCL_ENCODING_PROFILE_STRICT) {
+		    result = TCL_CONVERT_SYNTAX;
+		    break;
+		} else if (profile == TCL_ENCODING_PROFILE_REPLACE) {
+		    ch = UNICODE_REPLACE_CHAR;
+		}
+	    }
+#endif
 	    src += len;
 	    if (!(flags & TCL_ENCODING_UTF) && (ch > 0x3FF)) {
 		if (ch > 0xFFFF) {
@@ -2464,13 +2529,14 @@ UtfToUtfProc(
 		/*
 		 * A surrogate character is detected, handle especially.
 		 */
+		/* TODO - what about REPLACE profile? */
 
 		low = ch;
 		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;
 
 		if (((low & ~0x3FF) != 0xDC00) || (ch & 0x400)) {
 
-		    if (STOPONERROR) {
+		    if (profile == TCL_ENCODING_PROFILE_STRICT) {
 			result = TCL_CONVERT_UNKNOWN;
 			src = saveSrc;
 			break;
@@ -2484,12 +2550,14 @@ UtfToUtfProc(
 		src += len;
 		dst += Tcl_UniCharToUtf(ch, dst);
 		ch = low;
-	    } else if (STOPONERROR && !(flags & TCL_ENCODING_MODIFIED) && (((ch  & ~0x7FF) == 0xD800))) {
+	    } else if ((profile == TCL_ENCODING_PROFILE_STRICT) &&
+		       !(flags & TCL_ENCODING_MODIFIED) &&
+		       (((ch & ~0x7FF) == 0xD800))) {
 		result = TCL_CONVERT_UNKNOWN;
 		src = saveSrc;
 		break;
-	    } else if (STRICT_PROFILE(flags) &&
-		       (flags & TCL_ENCODING_MODIFIED) &&
+	    } else if ((profile == TCL_ENCODING_PROFILE_STRICT) &&
+	               (flags & TCL_ENCODING_MODIFIED) &&
 		       ((ch & ~0x7FF) == 0xD800)) {
 		result = TCL_CONVERT_SYNTAX;
 		src = saveSrc;
@@ -4216,6 +4284,7 @@ int TclEncodingExternalFlagsToInternal(int flags)
 	switch (profile) {
 	case TCL_ENCODING_PROFILE_TCL8:
 	case TCL_ENCODING_PROFILE_STRICT:
+	case TCL_ENCODING_PROFILE_REPLACE:
 	    break;
 	case 0: /* Unspecified by caller */
 	default:
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index c4053a2..52e7ac3 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -228,6 +228,9 @@ set encInvalidBytes {
     utf-8 A\xed\xb0\x80B   default   A\uDC00B -1 Low-surrogate
     utf-8 A\xed\xb0\x80B   tcl8      A\uDC00B -1 Low-surrogate
     utf-8 A\xed\xb0\x80B   strict    A         1 Low-surrogate
+    utf-8 \xed\xa0\x80\xed\xb0\x80   default   \U00010000 -1 High-low-surrogate
+    utf-8 \xed\xa0\x80\xed\xb0\x80   tcl8      \U00010000 -1 High-low-surrogate
+    utf-8 \xed\xa0\x80\xed\xb0\x80   strict    \U00010000  0 High-low-surrogate
 
     utf-32le \x00\xD8\x00\x00                                   default  \uD800   -1 {High-surrogate}
     utf-32le \x00\xD8\x00\x00                                   tcl8     \uD800   -1 {High-surrogate}
-- 
cgit v0.12


From b5095134dfebce7a33739c75d6533d90862901e3 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 12 Feb 2023 06:15:59 +0000
Subject: Minor readability changes

---
 generic/tclEncoding.c | 101 ++++++++++++++++++++++++++++++++------------------
 tests/cmdAH.test      |   2 +-
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index bb1f32f..d2f3551 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -198,7 +198,20 @@ static struct TclEncodingProfiles {
     {"strict", TCL_ENCODING_PROFILE_STRICT},
     {"replace", TCL_ENCODING_PROFILE_REPLACE},
 };
+#define PROFILE_STRICT(flags_)                                         \
+    ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
+     || (TCL_ENCODING_PROFILE_GET(flags_) == 0                         \
+	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT))
+
+#define PROFILE_REPLACE(flags_)                                         \
+    ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE) \
+     || (TCL_ENCODING_PROFILE_GET(flags_) == 0                          \
+	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_REPLACE))
+
 #define UNICODE_REPLACE_CHAR 0xFFFD
+#define SURROGATE(c_)      (((c_) & ~0x7FF) == 0xD800)
+#define HIGH_SURROGATE(c_) (((c_) & ~0x3FF) == 0xD800)
+#define LOW_SURROGATE(c_)  (((c_) & ~0x3FF) == 0xDC00)
 
 /*
  * The following variable is used in the sparse matrix code for a
@@ -243,6 +256,7 @@ static Tcl_EncodingConvertProc	UtfToUtfProc;
 static Tcl_EncodingConvertProc	Iso88591FromUtfProc;
 static Tcl_EncodingConvertProc	Iso88591ToUtfProc;
 
+
 /*
  * A Tcl_ObjType for holding a cached Tcl_Encoding in the twoPtrValue.ptr1 field
  * of the internalrep. This should help the lifetime of encodings be more useful.
@@ -2328,13 +2342,6 @@ BinaryProc(
  *-------------------------------------------------------------------------
  */
 
-#define STRICT_PROFILE(flags_)                                         \
-    ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
-     || (TCL_ENCODING_PROFILE_GET(flags_) == 0                         \
-	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT))
-
-#define STOPONERROR STRICT_PROFILE(flags)
-
 static int
 UtfToUtfProc(
     void *clientData,	/* additional flags, e.g. TCL_ENCODING_MODIFIED */
@@ -2412,7 +2419,7 @@ UtfToUtfProc(
 	else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
 		 && (UCHAR(src[1]) == 0x80)
 		 && (!(flags & TCL_ENCODING_MODIFIED)
-		     || (profile == TCL_ENCODING_PROFILE_STRICT))) {
+		     || PROFILE_STRICT(profile))) {
 	    /*
 	     *  \xC0\x80 and either strict profile or target is "real" UTF-8
 	     *     - Strict profile - error
@@ -2448,13 +2455,13 @@ UtfToUtfProc(
 
 	    if (flags & TCL_ENCODING_MODIFIED) {
 		/* Incomplete bytes for modified UTF-8 target */
-		if (profile == TCL_ENCODING_PROFILE_STRICT) {
+		if (PROFILE_STRICT(profile)) {
 		    result = (flags & TCL_ENCODING_CHAR_LIMIT)
 			       ? TCL_CONVERT_MULTIBYTE
 			       : TCL_CONVERT_SYNTAX;
 		    break;
 		}
-		if (profile == TCL_ENCODING_PROFILE_REPLACE) {
+		if (PROFILE_REPLACE(profile)) {
 		    ch = UNICODE_REPLACE_CHAR;
 		} else {
 		    /* TCL_ENCODING_PROFILE_TCL8 */
@@ -2506,10 +2513,10 @@ UtfToUtfProc(
 	    }
 #else
 	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)) {
-		if (profile == TCL_ENCODING_PROFILE_STRICT) {
+		if (PROFILE_STRICT(profile)) {
 		    result = TCL_CONVERT_SYNTAX;
 		    break;
-		} else if (profile == TCL_ENCODING_PROFILE_REPLACE) {
+		} else if (PROFILE_REPLACE(profile)) {
 		    ch = UNICODE_REPLACE_CHAR;
 		}
 	    }
@@ -2534,9 +2541,9 @@ UtfToUtfProc(
 		low = ch;
 		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;
 
-		if (((low & ~0x3FF) != 0xDC00) || (ch & 0x400)) {
+		if ((!LOW_SURROGATE(low)) || (ch & 0x400)) {
 
-		    if (profile == TCL_ENCODING_PROFILE_STRICT) {
+		    if (PROFILE_STRICT(profile)) {
 			result = TCL_CONVERT_UNKNOWN;
 			src = saveSrc;
 			break;
@@ -2550,15 +2557,15 @@ UtfToUtfProc(
 		src += len;
 		dst += Tcl_UniCharToUtf(ch, dst);
 		ch = low;
-	    } else if ((profile == TCL_ENCODING_PROFILE_STRICT) &&
-		       !(flags & TCL_ENCODING_MODIFIED) &&
-		       (((ch & ~0x7FF) == 0xD800))) {
+	    } else if (PROFILE_STRICT(profile) &&
+		       (!(flags & TCL_ENCODING_MODIFIED)) &&
+		       SURROGATE(ch)) {
 		result = TCL_CONVERT_UNKNOWN;
 		src = saveSrc;
 		break;
-	    } else if ((profile == TCL_ENCODING_PROFILE_STRICT) &&
+	    } else if (PROFILE_STRICT(profile) &&
 	               (flags & TCL_ENCODING_MODIFIED) &&
-		       ((ch & ~0x7FF) == 0xD800)) {
+		       SURROGATE(ch)) {
 		result = TCL_CONVERT_SYNTAX;
 		src = saveSrc;
 		break;
@@ -2649,12 +2656,15 @@ Utf32ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
-	if ((unsigned)ch > 0x10FFFF
-	    || (STRICT_PROFILE(flags) && ((ch & ~0x7FF) == 0xD800))) {
-	    if (STOPONERROR) {
+	
+	if ((unsigned)ch > 0x10FFFF || SURROGATE(ch)) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
+	    if (PROFILE_REPLACE(flags)) {
+		ch = UNICODE_REPLACE_CHAR;
+	    }
 	}
 
 	/*
@@ -2666,7 +2676,7 @@ Utf32ToUtfProc(
 	    *dst++ = (ch & 0xFF);
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
-	    if ((ch  & ~0x3FF) == 0xD800) {
+	    if (HIGH_SURROGATE(ch)) {
 		/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
 		dst += Tcl_UniCharToUtf(-1, dst);
 	    }
@@ -2750,11 +2760,14 @@ UtfToUtf32Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if ((ch  & ~0x7FF) == 0xD800) {
-	    if (STOPONERROR) {
+	if (SURROGATE(ch)) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
+	    if (PROFILE_REPLACE(flags)) {
+		ch = UNICODE_REPLACE_CHAR;
+	    }
 	}
 	src += len;
 	if (flags & TCL_ENCODING_LE) {
@@ -2952,11 +2965,14 @@ UtfToUtf16Proc(
 	    break;
 	}
 	len = TclUtfToUCS4(src, &ch);
-	if ((ch  & ~0x7FF) == 0xD800) {
-	    if (STOPONERROR) {
+	if (SURROGATE(ch)) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
+	    if (PROFILE_REPLACE(flags)) {
+		ch = UNICODE_REPLACE_CHAR;
+	    }
 	}
 	src += len;
 	if (flags & TCL_ENCODING_LE) {
@@ -3059,6 +3075,9 @@ UtfToUcs2Proc(
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
 	}
+	/* TODO - there were no STRICT or NOCOMPLAIN checks here (why?)
+	 * so no profile checks either for now. */
+
 #if TCL_UTF_MAX < 4
 	src += (len = TclUtfToUniChar(src, &ch));
 	if ((ch >= 0xD800) && (len < 3)) {
@@ -3163,23 +3182,30 @@ TableToUtfProc(
 	if (prefixBytes[byte]) {
 	    src++;
 	    if (src >= srcEnd) {
+		/*
+		 * TODO - this is broken. For consistency with other 
+		 * decoders, an error should be raised only if strict.
+		 * However, doing that check cause a whole bunch of test
+		 * failures. Need to verify if those tests are in fact
+		 * correct.
+		 */
 		src--;
 		result = TCL_CONVERT_MULTIBYTE;
 		break;
 	    }
-	    ch = toUnicode[byte][*((unsigned char *) src)];
+	    ch = toUnicode[byte][*((unsigned char *)src)];
 	} else {
 	    ch = pageZero[byte];
 	}
 	if ((ch == 0) && (byte != 0)) {
-	    if (STOPONERROR) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
 	    if (prefixBytes[byte]) {
 		src--;
 	    }
-	    ch = (Tcl_UniChar) byte;
+	    ch = (Tcl_UniChar)byte;
 	}
 
 	/*
@@ -3288,11 +3314,11 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if (STOPONERROR) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
-	    word = dataPtr->fallback;
+	    word = dataPtr->fallback; /* Both profiles REPLACE and TCL8 */
 	}
 	if (prefixBytes[(word >> 8)] != 0) {
 	    if (dst + 1 > dstEnd) {
@@ -3476,7 +3502,7 @@ Iso88591FromUtfProc(
 		|| ((ch >= 0xD800) && (len < 3))
 #endif
 		) {
-	    if (STOPONERROR) {
+	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }
@@ -3489,7 +3515,7 @@ Iso88591FromUtfProc(
 	     * Plunge on, using '?' as a fallback character.
 	     */
 
-	    ch = (Tcl_UniChar) '?';
+	    ch = (Tcl_UniChar) '?'; /* Profiles TCL8 and REPLACE */
 	}
 
 	if (dst > dstEnd) {
@@ -3703,9 +3729,10 @@ EscapeToUtfProc(
 
 	    if ((checked == dataPtr->numSubTables + 2)
 		    || (flags & TCL_ENCODING_END)) {
-		if (!STOPONERROR) {
+		if (!PROFILE_STRICT(flags)) {
 		    /*
-		     * Skip the unknown escape sequence.
+		     * Skip the unknown escape sequence. TODO - bug?
+		     * May be replace with UNICODE_REPLACE_CHAR?
 		     */
 
 		    src += longest;
@@ -3878,7 +3905,7 @@ EscapeFromUtfProc(
 
 	    if (word == 0) {
 		state = oldState;
-		if (STOPONERROR) {
+		if (PROFILE_STRICT(flags)) {
 		    result = TCL_CONVERT_UNKNOWN;
 		    break;
 		}
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 52e7ac3..7b2d99f 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -179,7 +179,7 @@ set "numargErrors(encoding convertfrom)" {^wrong # args: should be "(encoding |:
 set "numargErrors(encoding convertto)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertto \?\?-profile profile\? \?-failindex var\? \?encoding\?\? data"$}
 set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
 
-set encProfiles {tcl8 strict}
+set encProfiles {tcl8 strict replace}
 
 # TODO - valid sequences for different encodings - shiftjis etc.
 # Note utf-16, utf-32 missing because they are automatically
-- 
cgit v0.12


From bf448a6421c4fd0340d6bba70aba3b0a713d049b Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 12 Feb 2023 11:04:16 +0000
Subject: Added 'encoding profiles'

---
 generic/tclEncoding.c | 31 ++++++++++++++++++++++++++++++-
 tests/cmdAH.test      |  9 +++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index d2f3551..e8e1756 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -4278,7 +4278,7 @@ TclEncodingProfileIdToName(
     }
     return NULL;
 }
-
+
 /*
  *------------------------------------------------------------------------
  *
@@ -4321,6 +4321,35 @@ int TclEncodingExternalFlagsToInternal(int flags)
     }
     return flags;
 }
+
+/*
+ *------------------------------------------------------------------------
+ *
+ * TclGetEncodingProfiles --
+ *
+ *	Get the list of supported encoding profiles.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	The list of profile names is stored in the interpreter result.
+ *
+ *------------------------------------------------------------------------
+ */
+void
+TclGetEncodingProfiles(Tcl_Interp *interp)
+{
+    int i, n;
+    Tcl_Obj *objPtr;
+    n = sizeof(encodingProfiles) / sizeof(encodingProfiles[0]);
+    objPtr = Tcl_NewListObj(n, NULL);
+    for (i = 0; i < n; ++i) {
+	Tcl_ListObjAppendElement(
+	    interp, objPtr, Tcl_NewStringObj(encodingProfiles[i].name, -1));
+    }
+    Tcl_SetObjResult(interp, objPtr);
+}
 
 /*
  * Local Variables:
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 7b2d99f..c666513 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -178,6 +178,7 @@ set "numargErrors(encoding system)" {^wrong # args: should be "(encoding |::tcl:
 set "numargErrors(encoding convertfrom)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertfrom \?\?-profile profile\? \?-failindex var\? \?encoding\?\? data"$}
 set "numargErrors(encoding convertto)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertto \?\?-profile profile\? \?-failindex var\? \?encoding\?\? data"$}
 set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
+set "numargErrors(encoding profiles)" {wrong # args: should be "encoding profiles"}
 
 set encProfiles {tcl8 strict replace}
 
@@ -202,6 +203,7 @@ set encValidStrings {
 set encInvalidBytes {
     ascii \x41\xe9\x42 default A\u00E9B     -1 {non-ASCII}
     ascii \x41\xe9\x42 tcl8    A\u00E9B     -1 {non-ASCII}
+    ascii \x41\xe9\x42 replace A\uFFFDB     -1 {non-ASCII}
     ascii \x41\xe9\x42 strict  A             1 {non-ASCII}
 
     utf-8 \x41\xC0\x42     default   A\u00C0B -1 C0
@@ -565,6 +567,13 @@ test cmdAH-4.5.2 {encoding names should include at least utf-8 and iso8859-1 and
 } -result {1 1 1}
 
 #
+# encoding profiles 4.6.*
+badnumargs cmdAH-4.6.1 {encoding profiles} {foo}
+test cmdAH-4.6.2 {encoding profiles} -body {
+    lsort [encoding profiles]
+} -result {replace strict tcl8}
+
+#
 # file command
 
 test cmdAH-5.1 {Tcl_FileObjCmd} -returnCodes error -body {
-- 
cgit v0.12


From 0c764d2b03ab2b8daf95b3a25a470b56dffdad4f Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 12 Feb 2023 16:56:17 +0000
Subject: Minor fixes and tests

---
 generic/tclCmdAH.c    | 30 ++++++++++++++++++++++++++++++
 generic/tclEncoding.c | 22 ++++++++++------------
 generic/tclInt.h      |  1 +
 tests/cmdAH.test      |  7 ++++++-
 tests/socket.test     |  2 +-
 5 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 5fbe27e..692c75b 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -51,6 +51,7 @@ static Tcl_ObjCmdProc	EncodingConvertfromObjCmd;
 static Tcl_ObjCmdProc	EncodingConverttoObjCmd;
 static Tcl_ObjCmdProc	EncodingDirsObjCmd;
 static Tcl_ObjCmdProc	EncodingNamesObjCmd;
+static Tcl_ObjCmdProc	EncodingProfilesObjCmd;
 static Tcl_ObjCmdProc	EncodingSystemObjCmd;
 static inline int	ForeachAssignments(Tcl_Interp *interp,
 			    struct ForeachState *statePtr);
@@ -519,6 +520,7 @@ TclInitEncodingCmd(
 	{"convertto",   EncodingConverttoObjCmd,   TclCompileBasic1To3ArgCmd, NULL, NULL, 0},
 	{"dirs",        EncodingDirsObjCmd,        TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
 	{"names",       EncodingNamesObjCmd,       TclCompileBasic0ArgCmd,    NULL, NULL, 0},
+	{"profiles",    EncodingProfilesObjCmd,    TclCompileBasic0ArgCmd,    NULL, NULL, 0},
 	{"system",      EncodingSystemObjCmd,      TclCompileBasic0Or1ArgCmd, NULL, NULL, 1},
 	{NULL,          NULL,                      NULL,                      NULL, NULL, 0}
     };
@@ -891,6 +893,34 @@ EncodingNamesObjCmd(
 /*
  *-----------------------------------------------------------------------------
  *
+ * EncodingProfilesObjCmd --
+ *
+ *	This command returns a list of the available encoding profiles
+ *
+ * Results:
+ *	Returns a standard Tcl result
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+int
+EncodingProfilesObjCmd(
+    TCL_UNUSED(void *),
+    Tcl_Interp* interp,	    /* Tcl interpreter */
+    int objc,		    /* Number of command line args */
+    Tcl_Obj* const objv[])  /* Vector of command line args */
+{
+    if (objc > 1) {
+	Tcl_WrongNumArgs(interp, 1, objv, NULL);
+	return TCL_ERROR;
+    }
+    TclGetEncodingProfiles(interp);
+    return TCL_OK;
+}
+
+/*
+ *-----------------------------------------------------------------------------
+ *
  * EncodingSystemObjCmd --
  *
  *	This command retrieves or changes the system encoding
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index e8e1756..fc3ac77 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -208,7 +208,7 @@ static struct TclEncodingProfiles {
      || (TCL_ENCODING_PROFILE_GET(flags_) == 0                          \
 	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_REPLACE))
 
-#define UNICODE_REPLACE_CHAR 0xFFFD
+#define UNICODE_REPLACE_CHAR ((Tcl_UniChar)0xFFFD)
 #define SURROGATE(c_)      (((c_) & ~0x7FF) == 0xD800)
 #define HIGH_SURROGATE(c_) (((c_) & ~0x3FF) == 0xD800)
 #define LOW_SURROGATE(c_)  (((c_) & ~0x3FF) == 0xDC00)
@@ -547,6 +547,7 @@ FillEncodingFileMap(void)
  * TCL_ENCODING_LE is only used for  utf-16/utf-32/ucs-2. re-use the same value */
 #define TCL_ENCODING_LE		TCL_ENCODING_MODIFIED	/* Little-endian encoding */
 #define TCL_ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
+#define TCL_ENCODING_CESU8	0x400	/* TODO - Distinguishes cesu-8 from utf-8*/
 
 void
 TclInitEncodingSubsystem(void)
@@ -592,7 +593,7 @@ TclInitEncodingSubsystem(void)
     type.nullSize	= 1;
     type.clientData	= INT2PTR(TCL_ENCODING_UTF);
     Tcl_CreateEncoding(&type);
-    type.clientData	= INT2PTR(0);
+    type.clientData	= INT2PTR(TCL_ENCODING_CESU8);
     type.encodingName	= "cesu-8";
     Tcl_CreateEncoding(&type);
 
@@ -2505,13 +2506,6 @@ UtfToUtfProc(
 	     * TODO - below check could be simplified to remove the MODIFIED
 	     * expression I think given the checks already made above. May be.
 	     */
-#if 0
-	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)
-		    && (profile == TCL_ENCODING_PROFILE_STRICT)) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
-	    }
-#else
 	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)) {
 		if (PROFILE_STRICT(profile)) {
 		    result = TCL_CONVERT_SYNTAX;
@@ -2520,7 +2514,7 @@ UtfToUtfProc(
 		    ch = UNICODE_REPLACE_CHAR;
 		}
 	    }
-#endif
+
 	    src += len;
 	    if (!(flags & TCL_ENCODING_UTF) && (ch > 0x3FF)) {
 		if (ch > 0xFFFF) {
@@ -2551,7 +2545,7 @@ UtfToUtfProc(
 		cesu8:
 		    *dst++ = (char) (((ch >> 12) | 0xE0) & 0xEF);
 		    *dst++ = (char) (((ch >> 6) | 0x80) & 0xBF);
-		    *dst++ = (char) ((ch | 0x80) & 0xBF);
+		    *dst++ = (char)	 ((ch | 0x80) & 0xBF);
 		    continue;
 		}
 		src += len;
@@ -3205,7 +3199,11 @@ TableToUtfProc(
 	    if (prefixBytes[byte]) {
 		src--;
 	    }
-	    ch = (Tcl_UniChar)byte;
+	    if (PROFILE_REPLACE(flags)) {
+		ch = UNICODE_REPLACE_CHAR;
+	    } else {
+		ch = (Tcl_UniChar)byte;
+	    }
 	}
 
 	/*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 4b6303d..538b177 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2891,6 +2891,7 @@ TclEncodingProfileNameToId(Tcl_Interp *interp,
 MODULE_SCOPE const char *TclEncodingProfileIdToName(Tcl_Interp *interp,
 						    int profileId);
 MODULE_SCOPE int TclEncodingExternalFlagsToInternal(int flags);
+MODULE_SCOPE void TclGetEncodingProfiles(Tcl_Interp *interp);
 
 /*
  * TIP #233 (Virtualized Time)
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index c666513..65ecac5 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -208,21 +208,26 @@ set encInvalidBytes {
 
     utf-8 \x41\xC0\x42     default   A\u00C0B -1 C0
     utf-8 \x41\xC0\x42     tcl8      A\u00C0B -1 C0
+    utf-8 \x41\xC0\x42     replace   A\uFFFDB -1 C0
     utf-8 \x41\xC0\x42     strict    A         1 C0
     utf-8 \x41\x80\x42     default   A\u0080B -1 80
     utf-8 \x41\x80\x42     tcl8      A\u0080B -1 80
+    utf-8 \x41\x80\x42     replace   A\uFFFDB -1 80
     utf-8 \x41\x80\x42     strict    A         1 80
     utf-8 \x41\xC0\x80\x42 default   A\u0000B -1 C080
     utf-8 \x41\xC0\x80\x42 tcl8      A\u0000B -1 C080
     utf-8 \x41\xC0\x80\x42 strict    A         1 C080
     utf-8 \x41\xC1\x42     default   A\u00C1B -1 C1
     utf-8 \x41\xC1\x42     tcl8      A\u00C1B -1 C1
+    utf-8 \x41\xC1\x42     replace   A\uFFFDB -1 C1
     utf-8 \x41\xC1\x42     strict    A         1 C1
     utf-8 \x41\xC2\x42     default   A\u00C2B -1 C2-nontrail
     utf-8 \x41\xC2\x42     tcl8      A\u00C2B -1 C2-nontrail
+    utf-8 \x41\xC2\x42     replace   A\uFFFDB -1 C2-nontrail
     utf-8 \x41\xC2\x42     strict    A         1 C2-nontrail
     utf-8 \x41\xC2         default   A\u00C2  -1 C2-incomplete
     utf-8 \x41\xC2         tcl8      A\u00C2  -1 C2-incomplete
+    utf-8 \x41\xC2         replace   A\uFFFD  -1 C2-incomplete
     utf-8 \x41\xC2         strict    A         1 C2-incomplete
     utf-8 A\xed\xa0\x80B   default   A\uD800B -1 High-surrogate
     utf-8 A\xed\xa0\x80B   tcl8      A\uD800B -1 High-surrogate
@@ -335,7 +340,7 @@ test cmdAH-4.1.1 {encoding} -returnCodes error -body {
 } -result {wrong # args: should be "encoding subcommand ?arg ...?"}
 test cmdAH-4.1.2 {Tcl_EncodingObjCmd} -returnCodes error -body {
     encoding foo
-} -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, or system}
+} -result {unknown or ambiguous subcommand "foo": must be convertfrom, convertto, dirs, names, profiles, or system}
 
 #
 # encoding system 4.2.*
diff --git a/tests/socket.test b/tests/socket.test
index a0fe2f7..b1435be 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -1071,7 +1071,7 @@ test socket_$af-7.3 {testing socket specific options} -constraints [list socket
     close $s
     update
     llength $l
-} -result 22
+} -result 20
 test socket_$af-7.4 {testing socket specific options} -constraints [list socket supported_$af] -setup {
     set timer [after 10000 "set x timed_out"]
     set l ""
-- 
cgit v0.12


From 86d84d444cba1b00cf6b8771db83f21d9e6e5e13 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 12 Feb 2023 17:34:58 +0000
Subject: Tentative fix for [bd1a60eb9] - surrogates in strict utf-8

---
 generic/tclEncoding.c | 11 +++++++++--
 tests/cmdAH.test      |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index fc3ac77..5d099f9 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -547,7 +547,8 @@ FillEncodingFileMap(void)
  * TCL_ENCODING_LE is only used for  utf-16/utf-32/ucs-2. re-use the same value */
 #define TCL_ENCODING_LE		TCL_ENCODING_MODIFIED	/* Little-endian encoding */
 #define TCL_ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
-#define TCL_ENCODING_CESU8	0x400	/* TODO - Distinguishes cesu-8 from utf-8*/
+#define TCL_ENCODING_CESU8_SOURCE 0x400	/* TODO - Distinguishes cesu-8 
+					 * *source* from utf-8 *source* */
 
 void
 TclInitEncodingSubsystem(void)
@@ -593,7 +594,7 @@ TclInitEncodingSubsystem(void)
     type.nullSize	= 1;
     type.clientData	= INT2PTR(TCL_ENCODING_UTF);
     Tcl_CreateEncoding(&type);
-    type.clientData	= INT2PTR(TCL_ENCODING_CESU8);
+    type.clientData	= INT2PTR(TCL_ENCODING_CESU8_SOURCE);
     type.encodingName	= "cesu-8";
     Tcl_CreateEncoding(&type);
 
@@ -2370,6 +2371,7 @@ UtfToUtfProc(
     const char *dstStart, *dstEnd;
     int result, numChars, charLimit = INT_MAX;
     int ch;
+    int isCesu8;
 
     result = TCL_OK;
 
@@ -2531,6 +2533,11 @@ UtfToUtfProc(
 		 * A surrogate character is detected, handle especially.
 		 */
 		/* TODO - what about REPLACE profile? */
+		if (PROFILE_STRICT(profile) && !(flags & TCL_ENCODING_CESU8_SOURCE)) {
+		    result = TCL_CONVERT_UNKNOWN;
+		    src = saveSrc;
+		    break;
+		}
 
 		low = ch;
 		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 65ecac5..f2aab52 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -237,8 +237,9 @@ set encInvalidBytes {
     utf-8 A\xed\xb0\x80B   strict    A         1 Low-surrogate
     utf-8 \xed\xa0\x80\xed\xb0\x80   default   \U00010000 -1 High-low-surrogate
     utf-8 \xed\xa0\x80\xed\xb0\x80   tcl8      \U00010000 -1 High-low-surrogate
-    utf-8 \xed\xa0\x80\xed\xb0\x80   strict    \U00010000  0 High-low-surrogate
-
+    utf-8 \xed\xa0\x80\xed\xb0\x80   strict    {}          0 High-low-surrogate
+}
+set utf32-le-TODO {
     utf-32le \x00\xD8\x00\x00                                   default  \uD800   -1 {High-surrogate}
     utf-32le \x00\xD8\x00\x00                                   tcl8     \uD800   -1 {High-surrogate}
     utf-32le \x00\xD8\x00\x00                                   strict   ""        0 {High-surrogate}
-- 
cgit v0.12


From 2974b5727951737a5b67789f4b7712cf72096ed0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 14 Feb 2023 07:29:36 +0000
Subject: Make a start fixing [bd1a60eb9c]. WIP

---
 generic/tclEncoding.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 0941f14..01c4eb1 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -519,7 +519,8 @@ FillEncodingFileMap(void)
 /* Since TCL_ENCODING_MODIFIED is only used for utf-8/cesu-8 and
  * TCL_ENCODING_LE is only used for  utf-16/utf-32/ucs-2. re-use the same value */
 #define TCL_ENCODING_LE		TCL_ENCODING_MODIFIED	/* Little-endian encoding */
-#define TCL_ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
+#define ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
+#define ENCODING_INPUT	0x400 /* For UTF-8/CESU-8 encoding, means external -> internal */
 
 void
 TclInitEncodingSubsystem(void)
@@ -561,7 +562,7 @@ TclInitEncodingSubsystem(void)
     type.fromUtfProc	= UtfToUtfProc;
     type.freeProc	= NULL;
     type.nullSize	= 1;
-    type.clientData	= INT2PTR(TCL_ENCODING_UTF);
+    type.clientData	= INT2PTR(ENCODING_UTF);
     Tcl_CreateEncoding(&type);
     type.clientData	= INT2PTR(TCL_ENCODING_NOCOMPLAIN);
     type.encodingName	= "cesu-8";
@@ -1238,7 +1239,7 @@ Tcl_ExternalToUtfDStringEx(
 
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
-	flags |= TCL_ENCODING_MODIFIED | TCL_ENCODING_UTF;
+	flags |= ENCODING_INPUT;
     }
 
     while (1) {
@@ -1355,7 +1356,7 @@ Tcl_ExternalToUtf(
 	dstLen--;
     }
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
-	flags |= TCL_ENCODING_MODIFIED | TCL_ENCODING_UTF;
+	flags |= ENCODING_INPUT;
     }
     do {
 	Tcl_EncodingState savedState = *statePtr;
@@ -1450,7 +1451,7 @@ Tcl_UtfToExternalDStringEx(
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes, or < 0 for
 				 * strlen(). */
-    int flags,	/* Conversion control flags. */
+    int flags,			/* Conversion control flags. */
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
@@ -2363,7 +2364,7 @@ UtfToUtfProc(
 
     dstStart = dst;
     flags |= PTR2INT(clientData);
-    dstEnd = dst + dstLen - ((flags & TCL_ENCODING_UTF) ? TCL_UTF_MAX : 6);
+    dstEnd = dst + dstLen - ((flags & ENCODING_UTF) ? TCL_UTF_MAX : 6);
 
     for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
@@ -2435,7 +2436,7 @@ UtfToUtfProc(
 		break;
 	    }
 	    src += len;
-	    if (!(flags & TCL_ENCODING_UTF) && (ch > 0x3FF)) {
+	    if (!(flags & ENCODING_UTF) && (ch > 0x3FF)) {
 		if (ch > 0xFFFF) {
 		    /* CESU-8 6-byte sequence for chars > U+FFFF */
 		    ch -= 0x10000;
-- 
cgit v0.12


From 85320f8fd074a2a55f76a7c0a8290f0a195530dc Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 14 Feb 2023 11:37:35 +0000
Subject: Bug [bd1a60eb9c]. Eliminate TCL_ENCODING_UTF.

---
 generic/tclEncoding.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 5d099f9..778fca8 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -546,7 +546,6 @@ FillEncodingFileMap(void)
 /* Since TCL_ENCODING_MODIFIED is only used for utf-8/cesu-8 and
  * TCL_ENCODING_LE is only used for  utf-16/utf-32/ucs-2. re-use the same value */
 #define TCL_ENCODING_LE		TCL_ENCODING_MODIFIED	/* Little-endian encoding */
-#define TCL_ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
 #define TCL_ENCODING_CESU8_SOURCE 0x400	/* TODO - Distinguishes cesu-8 
 					 * *source* from utf-8 *source* */
 
@@ -592,7 +591,7 @@ TclInitEncodingSubsystem(void)
     type.fromUtfProc	= UtfToUtfProc;
     type.freeProc	= NULL;
     type.nullSize	= 1;
-    type.clientData	= INT2PTR(TCL_ENCODING_UTF);
+    type.clientData	= INT2PTR(0);
     Tcl_CreateEncoding(&type);
     type.clientData	= INT2PTR(TCL_ENCODING_CESU8_SOURCE);
     type.encodingName	= "cesu-8";
@@ -1269,7 +1268,7 @@ Tcl_ExternalToUtfDStringEx(
     flags = TclEncodingExternalFlagsToInternal(flags);
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
-	flags |= TCL_ENCODING_MODIFIED | TCL_ENCODING_UTF;
+	flags |= TCL_ENCODING_MODIFIED;
     }
 
     while (1) {
@@ -1386,7 +1385,7 @@ Tcl_ExternalToUtf(
 	dstLen--;
     }
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
-	flags |= TCL_ENCODING_MODIFIED | TCL_ENCODING_UTF;
+	flags |= TCL_ENCODING_MODIFIED;
     }
     do {
 	Tcl_EncodingState savedState = *statePtr;
@@ -2371,7 +2370,6 @@ UtfToUtfProc(
     const char *dstStart, *dstEnd;
     int result, numChars, charLimit = INT_MAX;
     int ch;
-    int isCesu8;
 
     result = TCL_OK;
 
@@ -2387,7 +2385,7 @@ UtfToUtfProc(
 
     dstStart = dst;
     flags |= PTR2INT(clientData);
-    dstEnd = dst + dstLen - ((flags & TCL_ENCODING_UTF) ? TCL_UTF_MAX : 6);
+    dstEnd = dst + dstLen - ((flags & TCL_ENCODING_CESU8_SOURCE) ? 6 : TCL_UTF_MAX);
 
     for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
 	int profile = TCL_ENCODING_PROFILE_GET(flags);
@@ -2518,7 +2516,7 @@ UtfToUtfProc(
 	    }
 
 	    src += len;
-	    if (!(flags & TCL_ENCODING_UTF) && (ch > 0x3FF)) {
+	    if ((flags & TCL_ENCODING_CESU8_SOURCE) && (ch > 0x3FF)) {
 		if (ch > 0xFFFF) {
 		    /* CESU-8 6-byte sequence for chars > U+FFFF */
 		    ch -= 0x10000;
-- 
cgit v0.12


From a750ed2c2475387ab61073159ebf455c2452c78e Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 14 Feb 2023 11:39:35 +0000
Subject: Fix uniqueness parsing fconfigure -encoding / -encodingprofile
 options

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

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 49f4257..8a6f76a 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7994,7 +7994,7 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(2, "-encoding")) {
+    if (len == 0 || HaveOpt(8, "-encoding")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-encoding");
 	}
@@ -8008,7 +8008,7 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(1, "-encodingprofile")) {
+    if (len == 0 || HaveOpt(9, "-encodingprofile")) {
 	int profile;
 	const char *profileName;
 	if (len == 0) {
-- 
cgit v0.12


From 891d60a9ad2f9600dd9b1c3f0ce966d79a8942e8 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 14 Feb 2023 11:56:49 +0000
Subject: Remove obsolete comment

---
 generic/tclEncoding.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 778fca8..0f5e05f 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -570,8 +570,6 @@ TclInitEncodingSubsystem(void)
     Tcl_InitHashTable(&encodingTable, TCL_STRING_KEYS);
     Tcl_MutexUnlock(&encodingMutex);
 
-    /* TODO - why is NOCOMPLAIN being hardcoded for encodings below? */
-
     /*
      * Create a few initial encodings.  UTF-8 to UTF-8 translation is not a
      * no-op because it turns a stream of improperly formed UTF-8 into a
-- 
cgit v0.12


From 38df35585000fd7245c6604e845663751a7bd524 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 14 Feb 2023 20:50:26 +0000
Subject: Complete fix for [bd1a60eb9c]. Also fix a bug in the tableencoding.
 With testcases.

---
 generic/tclEncoding.c | 24 ++++++++++++++++--------
 tests/encoding.test   | 38 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 01c4eb1..c5ecc46 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2380,7 +2380,7 @@ UtfToUtfProc(
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
 	}
-	if (UCHAR(*src) < 0x80 && !((UCHAR(*src) == 0) && (flags & TCL_ENCODING_MODIFIED))) {
+	if (UCHAR(*src) < 0x80 && !((UCHAR(*src) == 0) && (flags & ENCODING_INPUT))) {
 	    /*
 	     * Copy 7bit characters, but skip null-bytes when we are in input
 	     * mode, so that they get converted to 0xC080.
@@ -2388,11 +2388,13 @@ UtfToUtfProc(
 
 	    *dst++ = *src++;
 	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-		&& (UCHAR(src[1]) == 0x80) && (!(flags & TCL_ENCODING_MODIFIED) || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX))) {
+		&& (UCHAR(src[1]) == 0x80) && (flags & ENCODING_UTF) && (!(flags & ENCODING_INPUT)
+			|| ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
+			|| (flags & ENCODING_FAILINDEX))) {
 	    /*
 	     * If in input mode, and -strict or -failindex is specified: This is an error.
 	     */
-	    if (flags & TCL_ENCODING_MODIFIED) {
+	    if (flags & ENCODING_INPUT) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
@@ -2410,7 +2412,7 @@ UtfToUtfProc(
 	     * unless the user has explicitly asked to be told.
 	     */
 
-	    if (flags & TCL_ENCODING_MODIFIED) {
+	    if (flags & ENCODING_INPUT) {
 		if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
@@ -2430,7 +2432,7 @@ UtfToUtfProc(
 	    int low;
 	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
-	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_MODIFIED)
+	    if ((len < 2) && (ch != 0) && (flags & ENCODING_INPUT)
 		    && (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
@@ -2451,6 +2453,11 @@ UtfToUtfProc(
 		 * A surrogate character is detected, handle especially.
 		 */
 
+		if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) && (flags & ENCODING_UTF)) {
+		    result = TCL_CONVERT_UNKNOWN;
+		    src = saveSrc;
+		    break;
+		}
 		low = ch;
 		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;
 
@@ -2470,12 +2477,12 @@ UtfToUtfProc(
 		src += len;
 		dst += Tcl_UniCharToUtf(ch, dst);
 		ch = low;
-	    } else if (STOPONERROR && !(flags & TCL_ENCODING_MODIFIED) && (((ch  & ~0x7FF) == 0xD800))) {
+	    } else if (STOPONERROR && !(flags & ENCODING_INPUT) && (((ch  & ~0x7FF) == 0xD800))) {
 		result = TCL_CONVERT_UNKNOWN;
 		src = saveSrc;
 		break;
 	    } else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
-		    && (flags & TCL_ENCODING_MODIFIED) && ((ch  & ~0x7FF) == 0xD800)) {
+		    && (flags & ENCODING_INPUT) && ((ch  & ~0x7FF) == 0xD800)) {
 		result = TCL_CONVERT_SYNTAX;
 		src = saveSrc;
 		break;
@@ -3117,7 +3124,8 @@ TableToUtfProc(
 	    ch = pageZero[byte];
 	}
 	if ((ch == 0) && (byte != 0)) {
-	    if (STOPONERROR) {
+	    if ((flags & ENCODING_FAILINDEX)
+		    || ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
diff --git a/tests/encoding.test b/tests/encoding.test
index b2b029e..bbb40d7 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -452,6 +452,24 @@ test encoding-15.24 {UtfToUtfProc CESU-8 bug [048dd20b4171c8da]} {
     binary scan $y H* z
     list [string length $y] $z
 } {2 cfbf}
+test encoding-15.25 {UtfToUtfProc CESU-8} {
+    encoding convertfrom cesu-8 \x00
+} \x00
+test encoding-15.26 {UtfToUtfProc CESU-8} {
+    encoding convertfrom cesu-8 \xC0\x80
+} \x00
+test encoding-15.27 {UtfToUtfProc -strict CESU-8} {
+    encoding convertfrom -strict cesu-8 \xC0\x80
+} \x00
+test encoding-15.28 {UtfToUtfProc -strict CESU-8} {
+    encoding convertfrom -strict cesu-8 \xC0\x80
+} \x00
+test encoding-15.29 {UtfToUtfProc CESU-8} {
+    encoding convertto cesu-8 \x00
+} \xC0\x80
+test encoding-15.30 {UtfToUtfProc -strict CESU-8} {
+    encoding convertto -strict cesu-8 \x00
+} \xC0\x80
 
 test encoding-16.1 {Utf16ToUtfProc} -body {
     set val [encoding convertfrom utf-16 NN]
@@ -584,8 +602,21 @@ test encoding-18.6 {TableToUtfProc on invalid input with -nocomplain} -body {
 	list [catch {encoding convertto -nocomplain jis0208 \\} res] $res
 } -result {0 !)}
 
-test encoding-19.1 {TableFromUtfProc} {
-} {}
+test encoding-19.1 {TableFromUtfProc} -body {
+    encoding convertfrom ascii AÁ
+} -result AÁ
+test encoding-19.2 {TableFromUtfProc} -body {
+    encoding convertfrom -nocomplain ascii AÁ
+} -result AÁ
+test encoding-19.3 {TableFromUtfProc} -body {
+    encoding convertfrom -strict ascii AÁ
+} -returnCodes 1 -result {unexpected byte sequence starting at index 1: '\xC1'}
+test encoding-19.4 {TableFromUtfProc} -body {
+    list [encoding convertfrom -failindex idx ascii AÁ] [set idx]
+} -result {A 1}
+test encoding-19.4 {TableFromUtfProc} -body {
+    list [encoding convertfrom -failindex idx -strict ascii AÁ] [set idx]
+} -result {A 1}
 
 test encoding-20.1 {TableFreefProc} {
 } {}
@@ -804,6 +835,9 @@ test encoding-24.39 {Try to generate invalid utf-8 with -strict} -body {
 test encoding-24.40 {Try to generate invalid utf-8 with -nocomplain} -body {
     encoding convertto -nocomplain utf-8 \uD800
 } -result \xED\xA0\x80
+test encoding-24.41 {Parse invalid utf-8 with -strict} -body {
+    encoding convertfrom -strict utf-8 \xED\xA0\x80\xED\xB0\x80
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
 
 file delete [file join [temporaryDirectory] iso2022.txt]
 
-- 
cgit v0.12


From 4c2d834fca441a8d463e3bd1a06489f0b864cf73 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 15 Feb 2023 07:21:55 +0000
Subject: Ticket [10c2c17c32] follow-up. One output char too much with
 -failindex.

---
 generic/tclEncoding.c | 1 +
 tests/encoding.test   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index c5ecc46..c4db314 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2595,6 +2595,7 @@ Utf32ToUtfProc(
 		&& ((ch  & ~0x7FF) == 0xD800))) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_SYNTAX;
+		ch = 0;
 		break;
 	    }
 	}
diff --git a/tests/encoding.test b/tests/encoding.test
index bbb40d7..916a84a 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -527,6 +527,9 @@ test encoding-16.15 {Utf16ToUtfProc} -body {
 test encoding-16.16 {Utf16ToUtfProc} -body {
     encoding convertfrom utf-16le \x00\xDC\x00\xD8
 } -result \uDC00\uD800
+test encoding-16.17 {Utf32ToUtfProc} -body {
+    list [encoding convertfrom -strict -failindex  idx utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00] [set idx]
+} -result {A 4}
 
 test encoding-16.9 {
     Utf16ToUtfProc, Tcl_UniCharToUtf, surrogate pairs in utf-16
-- 
cgit v0.12


From 96e60d29b763fa1c662fb77e731556ddfaf9c912 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 15 Feb 2023 17:27:55 +0000
Subject: Start on expanding encoding tests

---
 generic/tclEncoding.c |  41 +++++------
 tests/cmdAH.test      | 196 +++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 190 insertions(+), 47 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 7886910..8cd970f 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2409,32 +2409,29 @@ UtfToUtfProc(
 	     */
 
 	    *dst++ = *src++;
-	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-                   && (UCHAR(src[1]) == 0x80) && (flags & ENCODING_UTF) && (!(flags & ENCODING_INPUT)
-                                                                            || PROFILE_STRICT(profile))) {
-	    /*
-	     *  \xC0\x80 and either strict profile or target is "real" UTF-8
-	     *     - Strict profile - error
-	     *     - Non-strict, real UTF-8 - output \x00
-	     */
-	    if (flags & ENCODING_INPUT) {
-		/* 
-		 * TODO - should above check not be against STRICT? 
-		 * That would probably break a convertto command that goes
-		 * from the internal UTF8 to the real UTF8. On the other
-		 * hand this means, a strict UTF8->UTF8 transform is not
-		 * possible using this function.
-		 */
+	}
+	else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd) &&
+		 (UCHAR(src[1]) == 0x80) && (flags & ENCODING_UTF) &&
+		 (!(flags & ENCODING_INPUT) || PROFILE_STRICT(profile) ||
+		  PROFILE_REPLACE(profile))) {
+	    /* Special sequence \xC0\x80 */
+	    if (PROFILE_STRICT(profile)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
 
-	    /*
-	     * Convert 0xC080 to real nulls when we are in output mode, 
-	     * irrespective of the profile.
-	     */
-	    *dst++ = 0;
-	    src += 2;
+	    if (PROFILE_REPLACE(profile)) {
+		dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+		src += 1; /* C0, 80 handled in next loop iteration
+		             since dst limit has to be checked */
+	    } else {
+		/*
+		 * Convert 0xC080 to real nulls when we are in output mode,
+		 * irrespective of the profile.
+		 */
+		*dst++ = 0;
+		src += 2;
+	    }
 	}
 	else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
 	    /*
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index f2aab52..6aa3c2e 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -184,7 +184,8 @@ set encProfiles {tcl8 strict replace}
 
 # TODO - valid sequences for different encodings - shiftjis etc.
 # Note utf-16, utf-32 missing because they are automatically
-# generated based on le/be versions.
+# generated based on le/be versions. Also add all ranges from Unicode standard
+# Table 3.7
 set encValidStrings {
     ascii    ABC                           \x41\x42\x43
     utf-8    A\u0000\u03A9\u8A9E\U00010384 \x41\x00\xCE\xA9\xE8\xAA\x9E\xF0\x90\x8E\x84
@@ -194,22 +195,106 @@ set encValidStrings {
     utf-32be A\u0000\u03A9\u8A9E\U00010384 \x00\x00\x00\x41\x00\x00\x00\x00\x00\x00\x03\xA9\x00\x00\x8A\x9E\x00\x01\x03\x84
 }
 
-# Invalid byte sequences {encoding bytes profile prefix failindex tag}
+# Invalid byte sequences. These are driven from a table with format
+#    {encoding bytes profile expectedresult expectedfailindex ctrl comment}
+#
 # Note tag is used in test id generation as well. The combination
-# <enc,profile,tag> should be unique for test ids to be unique.
-# Note utf-16, utf-32 missing because they are automatically
-# generated based on le/be versions.
+# <enc,profile,tag> should be unique for test ids to be unique. Note utf-16,
+# utf-32 missing because they are automatically generated based on le/be
+# versions. Each entry potentially results in generation of multiple tests.
+# This is controlled by the ctrl field. This should be a list of
+# zero or more of the following:
+#   solo - the test data is the string itself
+#   lead - the test data is the string followed by a valid suffix
+#   tail - the test data is the string preceded by a prefix
+#   middle - the test data is the string wrapped by a prefix and suffix
+# If the ctrl field is empty it is treated as all of the above
+# Note if there is any other value by itself, it will cause the test to
+# be skipped. This is intentional to skip known bugs.
+
 # TODO - other encodings and test cases
+
+# ascii - Any byte above 127 is invalid
 set encInvalidBytes {
+    ascii 80 default \u20AC -1 {} {map to cp1252}
+    ascii 80 tcl8    \u20AC -1 {} {map to cp1252}
+    ascii 80 replace \uFFFD -1 {} {Smallest invalid byte}
+    ascii 80 strict  {}      0 {} {Smallest invalid byte}
+
+    ascii 81 default \u0081 -1 {knownBug} {map to cp1252}
+    ascii 82 default \u201A -1 {knownBug} {map to cp1252}
+    ascii 83 default \u0192 -1 {knownBug} {map to cp1252}
+    ascii 84 default \u201E -1 {knownBug} {map to cp1252}
+    ascii 85 default \u2026 -1 {knownBug} {map to cp1252}
+    ascii 86 default \u2020 -1 {knownBug} {map to cp1252}
+    ascii 87 default \u2021 -1 {knownBug} {map to cp1252}
+    ascii 88 default \u0276 -1 {knownBug} {map to cp1252}
+    ascii 89 default \u2030 -1 {knownBug} {map to cp1252}
+    ascii 8A default \u0160 -1 {knownBug} {map to cp1252}
+    ascii 8B default \u2039 -1 {knownBug} {map to cp1252}
+    ascii 8C default \u0152 -1 {knownBug} {map to cp1252}
+    ascii 8D default \u008D -1 {knownBug} {map to cp1252}
+    ascii 8E default \u017D -1 {knownBug} {map to cp1252}
+    ascii 8F default \u008F -1 {knownBug} {map to cp1252}
+    ascii 90 default \u0090 -1 {knownBug} {map to cp1252}
+    ascii 91 default \u2018 -1 {knownBug} {map to cp1252}
+    ascii 92 default \u2019 -1 {knownBug} {map to cp1252}
+    ascii 93 default \u201C -1 {knownBug} {map to cp1252}
+    ascii 94 default \u201D -1 {knownBug} {map to cp1252}
+    ascii 95 default \u2022 -1 {knownBug} {map to cp1252}
+    ascii 96 default \u2013 -1 {knownBug} {map to cp1252}
+    ascii 97 default \u2014 -1 {knownBug} {map to cp1252}
+    ascii 98 default \u02DC -1 {knownBug} {map to cp1252}
+    ascii 99 default \u2122 -1 {knownBug} {map to cp1252}
+    ascii 9A default \u0161 -1 {knownBug} {map to cp1252}
+    ascii 9B default \u203A -1 {knownBug} {map to cp1252}
+    ascii 9C default \u0153 -1 {knownBug} {map to cp1252}
+    ascii 9D default \u009D -1 {knownBug} {map to cp1252}
+    ascii 9E default \u017E -1 {knownBug} {map to cp1252}
+    ascii 9F default \u0178 -1 {knownBug} {map to cp1252}
+
+    ascii FF default \u00FF -1 {} {Largest invalid byte}
+    ascii FF tcl8    \u00FF -1 {} {Largest invalid byte}
+    ascii FF replace \uFFFD -1 {} {Largest invalid byte}
+    ascii FF strict  {}      0 {} {Largest invalid byte}
+}
+
+# Following invalid sequences based on Table 3.7 in the Unicode standard.
+# utf-8 C0, C1, F5:FF are invalid bytes ANYWHERE.
+# Exception is C080 in non-strict mode.
+# 
+lappend encInvalidBytes {*}{
+    utf-8 C0 default \u00C0 -1 {} {C0 is invalid anywhere}
+    utf-8 C0 tcl8    \u00C0 -1 {} {C0 is invalid anywhere}
+    utf-8 C0 replace \uFFFD -1 {} {C0 is invalid anywhere}
+    utf-8 C0 strict  {}      0 {} {C0 is invalid anywhere}
+
+    utf-8 C080 default \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
+    utf-8 C080 tcl8    \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
+    utf-8 C080 replace \uFFFD\uFFFD -1 C080 {} {C080 -> U+0 in Tcl's internal modified UTF8}
+    utf-8 C080 strict  {}      0 {} {C080 -> U+0 in Tcl's internal modified UTF8}
+
+    utf-8 C1 default \u00C1 -1 {} {C1 is invalid everywhere}
+    utf-8 C1 tcl8    \u00C1 -1 {} {C1 is invalid everywhere}
+    utf-8 C1 replace \uFFFD -1 {} {C1 is invalid everywhere}
+    utf-8 C1 strict  {}      0 {} {C1 is invalid everywhere}
+    utf-8 F5 default \u00F5 -1 {} {F5:FF are invalid everywhere}
+    utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
+    utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
+    utf-8 F5 strict  {}      0 {} {F5:FF are invalid everywhere}
+    utf-8 FF default \u00FF -1 {} {F5:FF are invalid everywhere}
+    utf-8 FF tcl8    \u00FF -1 {} {F5:FF are invalid everywhere}
+    utf-8 FF replace \uFFFD -1 {} {F5:FF are invalid everywhere}
+    utf-8 FF strict  {}      0 {} {F5:FF are invalid everywhere}
+    utf-8 F5908080 default \u00F5 -1 {knownBug} {F5:FF with trailing bytes}
+}
+
+set xxencInvalidBytes {
     ascii \x41\xe9\x42 default A\u00E9B     -1 {non-ASCII}
     ascii \x41\xe9\x42 tcl8    A\u00E9B     -1 {non-ASCII}
     ascii \x41\xe9\x42 replace A\uFFFDB     -1 {non-ASCII}
     ascii \x41\xe9\x42 strict  A             1 {non-ASCII}
-
-    utf-8 \x41\xC0\x42     default   A\u00C0B -1 C0
-    utf-8 \x41\xC0\x42     tcl8      A\u00C0B -1 C0
-    utf-8 \x41\xC0\x42     replace   A\uFFFDB -1 C0
-    utf-8 \x41\xC0\x42     strict    A         1 C0
+    
     utf-8 \x41\x80\x42     default   A\u0080B -1 80
     utf-8 \x41\x80\x42     tcl8      A\u0080B -1 80
     utf-8 \x41\x80\x42     replace   A\uFFFDB -1 80
@@ -272,7 +357,7 @@ set encUnencodableStrings {
 
     iso8859-1 A\u0141B default \x41\x3f\x42 -1 unencodable
     iso8859-1 A\u0141B tcl8    \x41\x3f\x42 -1 unencodable
-    iso8859-1 A\u0141B strict  \x41          1 unencodable
+    iso8859-1 A\u0141B strict  \x41          0 unencodable
 
     utf-8 A\uD800B default \x41\xed\xa0\x80\x42 -1 High-surrogate
     utf-8 A\uD800B tcl8    \x41\xed\xa0\x80\x42 -1 High-surrogate
@@ -282,12 +367,28 @@ set encUnencodableStrings {
     utf-8 A\uDC00B strict  \x41                  1 High-surrogate
 }
 
+
 if {$::tcl_platform(byteOrder) eq "littleEndian"} {
     set endian le
 } else {
     set endian be
 }
 
+# Maps utf-{16,32}{le,be} to utf-16, utf-32 and
+# others to "". Used to test utf-16, utf-32 based
+# on system endianness
+proc endianUtf {enc} {
+    if {$::tcl_platform(byteOrder) eq "littleEndian"} {
+        set endian le
+    } else {
+        set endian be
+    }
+    if {$enc eq "utf-16$endian" || $enc eq "utf-32$endian"} {
+        return [string range $enc 0 5]
+    }
+    return ""
+}
+
 #
 # Check errors for invalid number of arguments
 proc badnumargs {id cmd cmdargs} {
@@ -394,9 +495,17 @@ testconvert cmdAH-4.3.12 {
 # Wrapper for verifying -failindex
 proc testfailindex {id converter enc data result {profile default}} {
     if {$profile eq "default"} {
-        testconvert $id "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+        testconvert $id.$enc "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+        if {[set enc [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+        }
     } else {
-        testconvert $id "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+        testconvert $id.$enc "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+        if {[set enc [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+        }
     }
 }
 
@@ -410,13 +519,49 @@ foreach {enc string bytes} $encValidStrings {
     }
 }
 
-# -failindex - invalid data
-foreach {enc bytes profile prefix failidx tag} $encInvalidBytes {
-    testfailindex cmdAH-4.3.14.$enc.$profile.$tag convertfrom $enc $bytes [list $prefix $failidx] $profile
-    if {"utf-16$endian" eq $enc} {
-        # utf-16le ->utf-16, utf-32be -> utf32 etc.
-        set enc [string range $enc 0 5]
-        testfailindex cmdAH-4.3.14.$enc.$profile.$tag convertfrom $enc $bytes [list $prefix $failidx] $profile
+# -failindex - invalid data for each profile
+foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
+    # There are multiple test cases based on location of invalid bytes
+    set bytes [binary format H* $hex]
+    set prefix A
+    set suffix B
+    set prefixLen [string length [encoding convertto $enc $prefix]]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        testfailindex xxcmdAH-4.3.14.$profile.$hex.solo convertfrom $enc $bytes [list $str $failidx] $profile
+    }
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            # If success expected
+            set result $str$suffix
+        } else {
+            # Failure expected
+            set result ""
+        }
+        testfailindex xxcmdAH-4.3.14.$profile.$hex.lead convertfrom $enc $bytes$suffix [list $result $failidx] $profile
+    }
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$str
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx [string length [encoding convertto $enc $prefix]]
+        }
+        testfailindex xxcmdAH-4.3.14.$profile.$hex.tail convertfrom $enc $prefix$bytes [list $result $expected_failidx] $profile
+    }
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$str$suffix
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx [string length [encoding convertto $enc $prefix]]
+        }
+        testfailindex xxcmdAH-4.3.14.$profile.$hex.middle convertfrom $enc $prefix$bytes$suffix [list $result $expected_failidx] $profile
     }
 }
 
@@ -437,7 +582,8 @@ foreach profile $encProfiles {
 
 # Cycle through the various combinations of encodings and profiles
 # for invalid byte sequences
-foreach {enc bytes profile prefix failidx tag} $encInvalidBytes {
+foreach {enc hex profile prefix failidx ctrl comment} $encInvalidBytes {
+    set bytes [binary format H* $hex]
     if {$failidx eq -1} {
         set result [list $prefix]
     } else {
@@ -447,18 +593,18 @@ foreach {enc bytes profile prefix failidx tag} $encInvalidBytes {
         set result [list "unexpected byte sequence starting at index $failidx: *" -returnCodes error -match glob]
     }
     if {$profile eq "default"} {
-        testconvert cmdAH-4.3.15.$enc.$profile.$tag [list encoding convertfrom $enc $bytes] {*}$result
+        testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom $enc $bytes] {*}$result
         if {"utf-16$endian" eq $enc} {
             # utf-16le ->utf-16, utf-32be -> utf32 etc.
             set enc [string range $enc 0 5]
-            testconvert cmdAH-4.3.15.$enc.$profile.$tag [list encoding convertfrom $enc $bytes] {*}$result
+            testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom $enc $bytes] {*}$result
         }
     } else {
-        testconvert cmdAH-4.3.15.$enc.$profile.$tag [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
+        testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
         if {"utf-16$endian" eq $enc} {
             # utf-16le ->utf-16, utf-32be -> utf32 etc.
             set enc [string range $enc 0 5]
-            testconvert cmdAH-4.3.15.$enc.$profile.$tag [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
+            testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
         }
     }
 }
-- 
cgit v0.12


From f06c5e7af1c85806bcbce3202000670b90ab4528 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 15 Feb 2023 20:26:10 +0000
Subject: Fix for [33ab6d08eb]: Inconsistent behavior with encoding convertfrom
 -failindex

---
 generic/tclEncoding.c | 2 +-
 tests/encoding.test   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index c4db314..af7f30a 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2433,7 +2433,7 @@ UtfToUtfProc(
 	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
 	    if ((len < 2) && (ch != 0) && (flags & ENCODING_INPUT)
-		    && (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
+		    && (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX))) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
diff --git a/tests/encoding.test b/tests/encoding.test
index 916a84a..6f1a760 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -617,9 +617,12 @@ test encoding-19.3 {TableFromUtfProc} -body {
 test encoding-19.4 {TableFromUtfProc} -body {
     list [encoding convertfrom -failindex idx ascii AÁ] [set idx]
 } -result {A 1}
-test encoding-19.4 {TableFromUtfProc} -body {
+test encoding-19.5 {TableFromUtfProc} -body {
     list [encoding convertfrom -failindex idx -strict ascii AÁ] [set idx]
 } -result {A 1}
+test encoding-19.6 {TableFromUtfProc} -body {
+    list [encoding convertfrom -failindex idx -strict ascii AÁB] [set idx]
+} -result {A 1}
 
 test encoding-20.1 {TableFreefProc} {
 } {}
-- 
cgit v0.12


From 50538911836e76d66a3526e5fe950134cca022d8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 16 Feb 2023 07:59:09 +0000
Subject: Try to fix [885c86a9a0]. Doesn't work completely yet.

---
 generic/tclEncoding.c | 8 +++-----
 tests/encoding.test   | 8 +++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index c4db314..e178f80 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2421,12 +2421,10 @@ UtfToUtfProc(
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
-		ch = UCHAR(*src++);
-	    } else {
-		char chbuf[2];
-		chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
-		TclUtfToUCS4(chbuf, &ch);
 	    }
+	    char chbuf[2];
+	    chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
+	    Tcl_UtfToUniChar(chbuf, &ch);
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else {
 	    int low;
diff --git a/tests/encoding.test b/tests/encoding.test
index 916a84a..270c351 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -762,7 +762,7 @@ test encoding-24.14 {Parse valid or invalid utf-8} {
 } 1
 test encoding-24.15 {Parse valid or invalid utf-8} -constraints deprecated -body {
     encoding convertfrom utf-8 "Z\xE0\x80"
-} -result Z\xE0\x80
+} -result Z\xE0\u20AC
 test encoding-24.16 {Parse valid or invalid utf-8} -constraints testbytestring -body {
     encoding convertto utf-8 [testbytestring "Z\u4343\x80"]
 } -returnCodes 1 -result {expected byte sequence but character 1 was '䍃€' (U+004343)}
@@ -841,6 +841,12 @@ test encoding-24.40 {Try to generate invalid utf-8 with -nocomplain} -body {
 test encoding-24.41 {Parse invalid utf-8 with -strict} -body {
     encoding convertfrom -strict utf-8 \xED\xA0\x80\xED\xB0\x80
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
+test encoding-24.42 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
+    encoding convertfrom -nocomplain utf-8 \xF0\x80\x80\x80
+} -result \xF0\u20AC\u20AC\u20AC€€
+test encoding-24.43 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
+    encoding convertfrom -nocomplain utf-8 \x80
+} -result \u20AC€€
 
 file delete [file join [temporaryDirectory] iso2022.txt]
 
-- 
cgit v0.12


From 0563a789022a80cd7745d596028b570f0fb24cbb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 16 Feb 2023 16:59:10 +0000
Subject: Fix [5e6ae6e05e]: Implement -strict correctly for cesu-8

---
 generic/tclEncoding.c | 24 +++++++++++++++---------
 tests/encoding.test   | 13 ++++++++-----
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index c4db314..73cbc5c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -564,7 +564,7 @@ TclInitEncodingSubsystem(void)
     type.nullSize	= 1;
     type.clientData	= INT2PTR(ENCODING_UTF);
     Tcl_CreateEncoding(&type);
-    type.clientData	= INT2PTR(TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(0);
     type.encodingName	= "cesu-8";
     Tcl_CreateEncoding(&type);
 
@@ -2388,13 +2388,13 @@ UtfToUtfProc(
 
 	    *dst++ = *src++;
 	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd)
-		&& (UCHAR(src[1]) == 0x80) && (flags & ENCODING_UTF) && (!(flags & ENCODING_INPUT)
+		&& (UCHAR(src[1]) == 0x80) && !(flags & TCL_ENCODING_MODIFIED) && (!(flags & ENCODING_INPUT)
 			|| ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
 			|| (flags & ENCODING_FAILINDEX))) {
 	    /*
 	     * If in input mode, and -strict or -failindex is specified: This is an error.
 	     */
-	    if (flags & ENCODING_INPUT) {
+	    if ((STOPONERROR) && (flags & ENCODING_INPUT)) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
@@ -2430,15 +2430,21 @@ UtfToUtfProc(
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else {
 	    int low;
-	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
-	    if ((len < 2) && (ch != 0) && (flags & ENCODING_INPUT)
-		    && (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT))) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
+	    if (flags & ENCODING_INPUT) {
+		if ((len < 2) && (ch != 0)
+			&& ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+		    result = TCL_CONVERT_SYNTAX;
+		    break;
+		} else if ((ch > 0xFFFF) && !(flags & ENCODING_UTF)
+			&& ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+		    result = TCL_CONVERT_SYNTAX;
+		    break;
+		}
 	    }
+	    const char *saveSrc = src;
 	    src += len;
-	    if (!(flags & ENCODING_UTF) && (ch > 0x3FF)) {
+	    if (!(flags & ENCODING_UTF) && !(flags & ENCODING_INPUT) && (ch > 0x3FF)) {
 		if (ch > 0xFFFF) {
 		    /* CESU-8 6-byte sequence for chars > U+FFFF */
 		    ch -= 0x10000;
diff --git a/tests/encoding.test b/tests/encoding.test
index 916a84a..34dfafb 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -459,17 +459,20 @@ test encoding-15.26 {UtfToUtfProc CESU-8} {
     encoding convertfrom cesu-8 \xC0\x80
 } \x00
 test encoding-15.27 {UtfToUtfProc -strict CESU-8} {
-    encoding convertfrom -strict cesu-8 \xC0\x80
+    encoding convertfrom -strict cesu-8 \x00
 } \x00
-test encoding-15.28 {UtfToUtfProc -strict CESU-8} {
+test encoding-15.28 {UtfToUtfProc -strict CESU-8} -body {
     encoding convertfrom -strict cesu-8 \xC0\x80
-} \x00
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xC0'}
 test encoding-15.29 {UtfToUtfProc CESU-8} {
     encoding convertto cesu-8 \x00
-} \xC0\x80
+} \x00
 test encoding-15.30 {UtfToUtfProc -strict CESU-8} {
     encoding convertto -strict cesu-8 \x00
-} \xC0\x80
+} \x00
+test encoding-15.31 {UtfToUtfProc -strict CESU-8 (bytes F0-F4 are invalid)} -body {
+    encoding convertfrom -strict cesu-8 \xF1\x86\x83\x9C
+} -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xF1'}
 
 test encoding-16.1 {Utf16ToUtfProc} -body {
     set val [encoding convertfrom utf-16 NN]
-- 
cgit v0.12


From 684cbb8f5cc3ed03b9349b0d322b04f1c87cc86a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 16 Feb 2023 17:15:35 +0000
Subject: Bit more work on encoding test framework. Long way to go.

---
 generic/tclEncoding.c |  65 ++++----
 tests/cmdAH.test      | 427 ++++++++++++++++++++++++++++++++++----------------
 2 files changed, 324 insertions(+), 168 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 8cd970f..470f8f3 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2368,6 +2368,7 @@ UtfToUtfProc(
     const char *dstStart, *dstEnd;
     int result, numChars, charLimit = INT_MAX;
     int ch;
+    int profile;
 
     result = TCL_OK;
 
@@ -2385,8 +2386,8 @@ UtfToUtfProc(
     flags |= PTR2INT(clientData);
     dstEnd = dst + dstLen - ((flags & ENCODING_UTF) ? TCL_UTF_MAX : 6);
 
+    profile = TCL_ENCODING_PROFILE_GET(flags);
     for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
-	int profile = TCL_ENCODING_PROFILE_GET(flags);
 
 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
 	    /*
@@ -2415,15 +2416,15 @@ UtfToUtfProc(
 		 (!(flags & ENCODING_INPUT) || PROFILE_STRICT(profile) ||
 		  PROFILE_REPLACE(profile))) {
 	    /* Special sequence \xC0\x80 */
-	    if (PROFILE_STRICT(profile)) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
-	    }
-
-	    if (PROFILE_REPLACE(profile)) {
-		dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
-		src += 1; /* C0, 80 handled in next loop iteration
-		             since dst limit has to be checked */
+	    if (flags & ENCODING_INPUT) {
+		if (PROFILE_REPLACE(profile)) {
+		   dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+		   src += 2;
+		} else {
+		   /* PROFILE_STRICT */
+		   result = TCL_CONVERT_SYNTAX;
+		   break;
+		}
 	    } else {
 		/*
 		 * Convert 0xC080 to real nulls when we are in output mode,
@@ -2432,6 +2433,7 @@ UtfToUtfProc(
 		*dst++ = 0;
 		src += 2;
 	    }
+
 	}
 	else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
 	    /*
@@ -2516,32 +2518,37 @@ UtfToUtfProc(
 		/*
 		 * A surrogate character is detected, handle especially.
 		 */
-		/* TODO - what about REPLACE profile? */
 		if (PROFILE_STRICT(profile) && (flags & ENCODING_UTF)) {
 		    result = TCL_CONVERT_UNKNOWN;
 		    src = saveSrc;
 		    break;
 		}
-
-		low = ch;
-		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;
-
-		if ((!LOW_SURROGATE(low)) || (ch & 0x400)) {
-
-		    if (PROFILE_STRICT(profile)) {
-			result = TCL_CONVERT_UNKNOWN;
-			src = saveSrc;
-			break;
+		if (0 && PROFILE_REPLACE(profile)) {
+		    ch = UNICODE_REPLACE_CHAR;
+		    src += len;
+		    // dst += Tcl_UniCharToUtf(ch, dst);
+		}
+		else {
+		    low = ch;
+		    len = (src <= srcEnd - 3) ? TclUtfToUCS4(src, &low) : 0;
+
+		    if ((!LOW_SURROGATE(low)) || (ch & 0x400)) {
+
+			if (PROFILE_STRICT(profile)) {
+			    result = TCL_CONVERT_UNKNOWN;
+			    src = saveSrc;
+			    break;
+			}
+cesu8:
+			*dst++ = (char)(((ch >> 12) | 0xE0) & 0xEF);
+			*dst++ = (char)(((ch >> 6) | 0x80) & 0xBF);
+			*dst++ = (char)((ch | 0x80) & 0xBF);
+			continue;
 		    }
-		cesu8:
-		    *dst++ = (char) (((ch >> 12) | 0xE0) & 0xEF);
-		    *dst++ = (char) (((ch >> 6) | 0x80) & 0xBF);
-		    *dst++ = (char)	 ((ch | 0x80) & 0xBF);
-		    continue;
+		    src += len;
+		    dst += Tcl_UniCharToUtf(ch, dst);
+		    ch = low;
 		}
-		src += len;
-		dst += Tcl_UniCharToUtf(ch, dst);
-		ch = low;
 	    } else if (PROFILE_STRICT(profile) &&
 		       (!(flags & ENCODING_INPUT)) &&
 		       SURROGATE(ch)) {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 6aa3c2e..6386658 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -187,19 +187,18 @@ set encProfiles {tcl8 strict replace}
 # generated based on le/be versions. Also add all ranges from Unicode standard
 # Table 3.7
 set encValidStrings {
-    ascii    ABC                           \x41\x42\x43
-    utf-8    A\u0000\u03A9\u8A9E\U00010384 \x41\x00\xCE\xA9\xE8\xAA\x9E\xF0\x90\x8E\x84
-    utf-16le A\u0000\u03A9\u8A9E\U00010384 \x41\x00\x00\x00\xA9\x03\x9E\x8A\x00\xD8\x84\xDF
-    utf-16be A\u0000\u03A9\u8A9E\U00010384 \x00\x41\x00\x00\x03\xA9\x8A\x9E\xD8\x00\xDF\x84
-    utf-32le A\u0000\u03A9\u8A9E\U00010384 \x41\x00\x00\x00\x00\x00\x00\x00\xA9\x03\x00\x00\x9E\x8A\x00\x00\x84\x03\x01\x00
-    utf-32be A\u0000\u03A9\u8A9E\U00010384 \x00\x00\x00\x41\x00\x00\x00\x00\x00\x00\x03\xA9\x00\x00\x8A\x9E\x00\x01\x03\x84
+    ascii    ABC                           414243
+    utf-8    A\u0000\u03A9\u8A9E\U00010384 4100CEA9E8AA9EF0908E84
+    utf-16le A\u0000\u03A9\u8A9E\U00010384 41000000A9039E8A00D884DF
+    utf-16be A\u0000\u03A9\u8A9E\U00010384 0041000003A98A9ED800DF84
+    utf-32le A\u0000\u03A9\u8A9E\U00010384 4100000000000000A90300009E8A000084030100
+    utf-32be A\u0000\u03A9\u8A9E\U00010384 0000004100000000000003A900008A9E00010384
 }
 
 # Invalid byte sequences. These are driven from a table with format
 #    {encoding bytes profile expectedresult expectedfailindex ctrl comment}
 #
-# Note tag is used in test id generation as well. The combination
-# <enc,profile,tag> should be unique for test ids to be unique. Note utf-16,
+# <enc,bytes,profile> should be unique for test ids to be unique. Note utf-16,
 # utf-32 missing because they are automatically generated based on le/be
 # versions. Each entry potentially results in generation of multiple tests.
 # This is controlled by the ctrl field. This should be a list of
@@ -214,13 +213,15 @@ set encValidStrings {
 
 # TODO - other encodings and test cases
 
-# ascii - Any byte above 127 is invalid
-set encInvalidBytes {
-    ascii 80 default \u20AC -1 {} {map to cp1252}
-    ascii 80 tcl8    \u20AC -1 {} {map to cp1252}
+# ascii - Any byte above 127 is invalid and is mapped
+# to the same numeric code point except for the range
+# 80-9F which is treated as cp1252.
+# This tests the TableToUtfProc code path.
+lappend encInvalidBytes {*}{
+    ascii 80 default \u20AC -1 {knownBug} {map to cp1252}
+    ascii 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
     ascii 80 replace \uFFFD -1 {} {Smallest invalid byte}
     ascii 80 strict  {}      0 {} {Smallest invalid byte}
-
     ascii 81 default \u0081 -1 {knownBug} {map to cp1252}
     ascii 82 default \u201A -1 {knownBug} {map to cp1252}
     ascii 83 default \u0192 -1 {knownBug} {map to cp1252}
@@ -259,25 +260,80 @@ set encInvalidBytes {
     ascii FF strict  {}      0 {} {Largest invalid byte}
 }
 
-# Following invalid sequences based on Table 3.7 in the Unicode standard.
-# utf-8 C0, C1, F5:FF are invalid bytes ANYWHERE.
-# Exception is C080 in non-strict mode.
-# 
+# utf-8 - valid sequences based on Table 3.7 in the Unicode
+# standard.
+#
+# Code Points        First   Second  Third   Fourth Byte
+# U+0000..U+007F     00..7F
+# U+0080..U+07FF     C2..DF  80..BF
+# U+0800..U+0FFF     E0      A0..BF  80..BF
+# U+1000..U+CFFF     E1..EC  80..BF  80..BF
+# U+D000..U+D7FF     ED      80..9F  80..BF
+# U+E000..U+FFFF     EE..EF  80..BF  80..BF
+# U+10000..U+3FFFF   F0      90..BF  80..BF  80..BF
+# U+40000..U+FFFFF   F1..F3  80..BF  80..BF  80..BF
+# U+100000..U+10FFFF F4      80..8F  80..BF  80..BF
+#
+# Tests below are based on the "gaps" in the above table. Note ascii test
+# values are repeated because internally a different code path is used
+# (UtfToUtfProc).
+# Note C0, C1, F5:FF are invalid bytes ANYWHERE. Exception is C080
 lappend encInvalidBytes {*}{
+    utf-8 80 default \u20AC -1 {knownBug} {map to cp1252}
+    utf-8 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
+    utf-8 80 replace \uFFFD -1 {} {Smallest invalid byte}
+    utf-8 80 strict  {}      0 {} {Smallest invalid byte}
+    utf-8 81 default \u0081 -1 {knownBug} {map to cp1252}
+    utf-8 82 default \u201A -1 {knownBug} {map to cp1252}
+    utf-8 83 default \u0192 -1 {knownBug} {map to cp1252}
+    utf-8 84 default \u201E -1 {knownBug} {map to cp1252}
+    utf-8 85 default \u2026 -1 {knownBug} {map to cp1252}
+    utf-8 86 default \u2020 -1 {knownBug} {map to cp1252}
+    utf-8 87 default \u2021 -1 {knownBug} {map to cp1252}
+    utf-8 88 default \u0276 -1 {knownBug} {map to cp1252}
+    utf-8 89 default \u2030 -1 {knownBug} {map to cp1252}
+    utf-8 8A default \u0160 -1 {knownBug} {map to cp1252}
+    utf-8 8B default \u2039 -1 {knownBug} {map to cp1252}
+    utf-8 8C default \u0152 -1 {knownBug} {map to cp1252}
+    utf-8 8D default \u008D -1 {knownBug} {map to cp1252}
+    utf-8 8E default \u017D -1 {knownBug} {map to cp1252}
+    utf-8 8F default \u008F -1 {knownBug} {map to cp1252}
+    utf-8 90 default \u0090 -1 {knownBug} {map to cp1252}
+    utf-8 91 default \u2018 -1 {knownBug} {map to cp1252}
+    utf-8 92 default \u2019 -1 {knownBug} {map to cp1252}
+    utf-8 93 default \u201C -1 {knownBug} {map to cp1252}
+    utf-8 94 default \u201D -1 {knownBug} {map to cp1252}
+    utf-8 95 default \u2022 -1 {knownBug} {map to cp1252}
+    utf-8 96 default \u2013 -1 {knownBug} {map to cp1252}
+    utf-8 97 default \u2014 -1 {knownBug} {map to cp1252}
+    utf-8 98 default \u02DC -1 {knownBug} {map to cp1252}
+    utf-8 99 default \u2122 -1 {knownBug} {map to cp1252}
+    utf-8 9A default \u0161 -1 {knownBug} {map to cp1252}
+    utf-8 9B default \u203A -1 {knownBug} {map to cp1252}
+    utf-8 9C default \u0153 -1 {knownBug} {map to cp1252}
+    utf-8 9D default \u009D -1 {knownBug} {map to cp1252}
+    utf-8 9E default \u017E -1 {knownBug} {map to cp1252}
+    utf-8 9F default \u0178 -1 {knownBug} {map to cp1252}
+
     utf-8 C0 default \u00C0 -1 {} {C0 is invalid anywhere}
     utf-8 C0 tcl8    \u00C0 -1 {} {C0 is invalid anywhere}
-    utf-8 C0 replace \uFFFD -1 {} {C0 is invalid anywhere}
     utf-8 C0 strict  {}      0 {} {C0 is invalid anywhere}
-
+    utf-8 C0 replace \uFFFD -1 {} {C0 is invalid anywhere}
     utf-8 C080 default \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
     utf-8 C080 tcl8    \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
-    utf-8 C080 replace \uFFFD\uFFFD -1 C080 {} {C080 -> U+0 in Tcl's internal modified UTF8}
-    utf-8 C080 strict  {}      0 {} {C080 -> U+0 in Tcl's internal modified UTF8}
-
+    utf-8 C080 strict  {}      0 {} {C080 -> invalid}
+    utf-8 C080 replace \uFFFD -1 {} {C080 -> single replacement char}
     utf-8 C1 default \u00C1 -1 {} {C1 is invalid everywhere}
     utf-8 C1 tcl8    \u00C1 -1 {} {C1 is invalid everywhere}
     utf-8 C1 replace \uFFFD -1 {} {C1 is invalid everywhere}
     utf-8 C1 strict  {}      0 {} {C1 is invalid everywhere}
+
+    utf-8 C1 default \u00C1 -1 {} {Require valid trail byte}
+    utf-8 C1 tcl8    \u00C1 -1 {} {Require valid trail byte}
+    utf-8 C1 replace \uFFFD -1 {} {Require valid trail byte}
+    utf-8 C1 strict  {}      0 {} {Require valid trail byte}
+
+
     utf-8 F5 default \u00F5 -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
@@ -286,14 +342,14 @@ lappend encInvalidBytes {*}{
     utf-8 FF tcl8    \u00FF -1 {} {F5:FF are invalid everywhere}
     utf-8 FF replace \uFFFD -1 {} {F5:FF are invalid everywhere}
     utf-8 FF strict  {}      0 {} {F5:FF are invalid everywhere}
-    utf-8 F5908080 default \u00F5 -1 {knownBug} {F5:FF with trailing bytes}
+
+    utf-8 C0AFE080BFF0818130 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-8}
+    utf-8 EDA080EDBFBFEDAF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {knownBug} {Unicode Table 3-9}
+    utf-8 F4919293FF4180BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0041\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-10}
+    utf-8 E180E2F09192F1BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\x30                         -1 {knownBug} {Unicode Table 3.11}
 }
 
 set xxencInvalidBytes {
-    ascii \x41\xe9\x42 default A\u00E9B     -1 {non-ASCII}
-    ascii \x41\xe9\x42 tcl8    A\u00E9B     -1 {non-ASCII}
-    ascii \x41\xe9\x42 replace A\uFFFDB     -1 {non-ASCII}
-    ascii \x41\xe9\x42 strict  A             1 {non-ASCII}
     
     utf-8 \x41\x80\x42     default   A\u0080B -1 80
     utf-8 \x41\x80\x42     tcl8      A\u0080B -1 80
@@ -343,31 +399,39 @@ set utf32-le-TODO {
 }
 
 # Strings that cannot be encoded for specific encoding / profiles
-# {encoding string profile bytes failindex tag}
-# Note tag is used in test id generation as well. The combination
-# <enc,profile,tag> should be unique for test ids to be unique.
+# {encoding string profile exptedresult expectedfailindex ctrl comment}
+# <enc,string,profile> should be unique for test ids to be unique.
 # Note utf-16, utf-32 missing because they are automatically
 # generated based on le/be versions.
+# Each entry potentially results in generation of multiple tests.
+# This is controlled by the ctrl field. This should be a list of
+# zero or more of the following:
+#   solo - the test data is the string itself
+#   lead - the test data is the string followed by a valid suffix
+#   tail - the test data is the string preceded by a prefix
+#   middle - the test data is the string wrapped by a prefix and suffix
+# If the ctrl field is empty it is treated as all of the above
+# Note if there is any other value by itself, it will cause the test to
+# be skipped. This is intentional to skip known bugs.
 # TODO - other encodings and test cases
 # TODO - out of range code point (note cannot be generated by \U notation)
 set encUnencodableStrings {
-    ascii A\u00e0B default \x41\x3f\x42 -1 non-ASCII
-    ascii A\u00e0B tcl8    \x41\x3f\x42 -1 non-ASCII
-    ascii A\u00e0B strict  \x41          1 non-ASCII
-
-    iso8859-1 A\u0141B default \x41\x3f\x42 -1 unencodable
-    iso8859-1 A\u0141B tcl8    \x41\x3f\x42 -1 unencodable
-    iso8859-1 A\u0141B strict  \x41          0 unencodable
-
-    utf-8 A\uD800B default \x41\xed\xa0\x80\x42 -1 High-surrogate
-    utf-8 A\uD800B tcl8    \x41\xed\xa0\x80\x42 -1 High-surrogate
-    utf-8 A\uD800B strict  \x41                  1 High-surrogate
-    utf-8 A\uDC00B default \x41\xed\xb0\x80\x42 -1 High-surrogate
-    utf-8 A\uDC00B tcl8    \x41\xed\xb0\x80\x42 -1 High-surrogate
-    utf-8 A\uDC00B strict  \x41                  1 High-surrogate
+    ascii \u00e0 default 3f -1 {} {unencodable}
+    ascii \u00e0 tcl8    3f -1 {} {unencodable}
+    ascii \u00e0 strict  {}  0 {} {unencodable}
+
+    iso8859-1 \u0141 default 3f -1 {} unencodable
+    iso8859-1 \u0141 tcl8    3f -1 {} unencodable
+    iso8859-1 \u0141 strict  {}  0 {} unencodable
+
+    utf-8 \uD800 default eda080 -1 {} High-surrogate
+    utf-8 \uD800 tcl8    eda080 -1 {} High-surrogate
+    utf-8 \uD800 strict  {}      0 {} High-surrogate
+    utf-8 \uDC00 default edb080 -1 {} High-surrogate
+    utf-8 \uDC00 tcl8    edb080 -1 {} High-surrogate
+    utf-8 \uDC00 strict  {}      0 {} High-surrogate
 }
 
-
 if {$::tcl_platform(byteOrder) eq "littleEndian"} {
     set endian le
 } else {
@@ -437,6 +501,40 @@ proc testconvert {id body result args} {
         {*}$args
 }
 
+proc testprofile {id converter enc profile data result args} {
+    if {$profile eq "default"} {
+        testconvert $id.$enc.$profile [list encoding $converter $enc $data] $result {*}$args
+        if {[set enc [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc.$profile [list encoding $converter $enc $data] $result {*}$args
+        }
+    } else {
+        testconvert $id.$enc.$profile [list encoding $converter -profile $profile $enc $data] $result {*}$args
+        if {[set enc [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc.$profile [list encoding $converter -profile $profile $enc $data] $result {*}$args
+        }
+    }
+}
+
+
+# Wrapper for verifying -failindex
+proc testfailindex {id converter enc data result {profile default}} {
+    if {$profile eq "default"} {
+        testconvert $id.$enc.$profile "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+        if {[set enc [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc.$profile "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+        }
+    } else {
+        testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+        if {[set enc [endianUtf $enc]] ne ""} {
+            # If utf{16,32}-{le,be}, also do utf{16,32}
+            testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+        }
+    }
+}
+
 test cmdAH-4.1.1 {encoding} -returnCodes error -body {
     encoding
 } -result {wrong # args: should be "encoding subcommand ?arg ...?"}
@@ -492,42 +590,110 @@ testconvert cmdAH-4.3.12 {
     encoding system $system
 }
 
-# Wrapper for verifying -failindex
-proc testfailindex {id converter enc data result {profile default}} {
-    if {$profile eq "default"} {
-        testconvert $id.$enc "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
-        if {[set enc [endianUtf $enc]] ne ""} {
-            # If utf{16,32}-{le,be}, also do utf{16,32}
-            testconvert $id.$enc "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+# convertfrom, convertfrom -profile
+
+# convertfrom ?-profile? : All valid byte sequences should be accepted by all profiles
+foreach {enc str hex} $encValidStrings {
+    set bytes [binary decode hex $hex]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc A]
+    set suffix_bytes [encoding convertto $enc B]
+    foreach profile $encProfiles {
+        testfailindex cmdAH-4.3.13.$hex.solo convertfrom $enc $bytes [list $str -1] $profile
+        testfailindex cmdAH-4.3.13.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $str$suffix -1] $profile
+        testfailindex cmdAH-4.3.13.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $prefix$str -1] $profile
+        testfailindex cmdAH-4.3.13.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $prefix$str$suffix -1] $profile
+    }
+}
+
+# convertfrom ?-profile? : invalid byte sequences
+foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
+    set bytes [binary format H* $hex]
+    set prefix A
+    set suffix B
+    set prefixLen [string length [encoding convertto $enc $prefix]]
+    set result [list $str]
+    # TODO - if the bad byte is unprintable, tcltest errors out when printing a mismatch
+    # so glob it out in error message pattern for now.
+    set errorWithoutPrefix [list "unexpected byte sequence starting at index $failidx: *" -returnCodes error -match glob]
+    set errorWithPrefix [list "unexpected byte sequence starting at index [expr {$failidx+$prefixLen}]: *" -returnCodes error -match glob]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $str]
+        } else {
+            set result $errorWithoutPrefix
         }
-    } else {
-        testconvert $id.$enc "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
-        if {[set enc [endianUtf $enc]] ne ""} {
-            # If utf{16,32}-{le,be}, also do utf{16,32}
-            testconvert $id.$enc "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+        testprofile cmdAH-4.3.15.$hex.solo convertfrom $enc $profile $bytes {*}$result
+    }
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $str$suffix]
+        } else {
+            set result $errorWithoutPrefix
+        }
+        testprofile cmdAH-4.3.15.$hex.lead convertfrom $enc $profile $bytes$suffix {*}$result
+    }
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix$str]
+        } else {
+            set result $errorWithPrefix
+        }
+        testprofile cmdAH-4.3.15.$hex.tail convertfrom $enc $profile $prefix$bytes {*}$result
+    }
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix$str$suffix]
+        } else {
+            set result $errorWithPrefix
         }
+        testprofile cmdAH-4.3.15.$hex.middle convertfrom $enc $profile $prefix$bytes$suffix {*}$result
     }
 }
 
-# -failindex - valid data
-foreach {enc string bytes} $encValidStrings {
-    testfailindex cmdAH-4.3.13.$enc convertfrom $enc $bytes [list $string -1]
-    if {"utf-16$endian" eq $enc} {
-        # utf-16le ->utf-16, utf-32be -> utf32 etc.
-        set enc [string range $enc 0 5]
-        testfailindex cmdAH-4.3.13.$enc convertfrom $enc $bytes [list $string -1]
+proc printable {s} {
+    set print ""
+    foreach c [split $s ""] {
+        set i [scan $c %c]
+        if {[string is print $c] && ($i <= 127)} {
+            append print $c
+        } elseif {$i <= 0xff} {
+            append print \\x[format %02X $i]
+        } elseif {$i <= 0xffff} {
+            append print \\u[format %04X $i]
+        } else {
+            append print \\U[format %08X $i]
+        }
     }
+    return $print
 }
 
-# -failindex - invalid data for each profile
+# convertfrom -failindex - valid data
+foreach {enc str hex} $encValidStrings {
+    set bytes [binary decode hex $hex]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc A]
+    set suffix_bytes [encoding convertto $enc B]
+    foreach profile $encProfiles {
+        testfailindex cmdAH-4.3.13.$hex.solo convertfrom $enc $bytes [list $str -1] $profile
+        testfailindex cmdAH-4.3.13.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $str$suffix -1] $profile
+        testfailindex cmdAH-4.3.13.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $prefix$str -1] $profile
+        testfailindex cmdAH-4.3.13.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $prefix$str$suffix -1] $profile
+    }
+}
+
+
+# convertfrom -failindex, convertfrom -failindex -profile, invalid data
 foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
     # There are multiple test cases based on location of invalid bytes
-    set bytes [binary format H* $hex]
+    set bytes [binary decode hex $hex]
     set prefix A
     set suffix B
     set prefixLen [string length [encoding convertto $enc $prefix]]
     if {$ctrl eq {} || "solo" in $ctrl} {
-        testfailindex xxcmdAH-4.3.14.$profile.$hex.solo convertfrom $enc $bytes [list $str $failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes [list $str $failidx] $profile
     }
     if {$ctrl eq {} || "lead" in $ctrl} {
         if {$failidx == -1} {
@@ -537,7 +703,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
             # Failure expected
             set result ""
         }
-        testfailindex xxcmdAH-4.3.14.$profile.$hex.lead convertfrom $enc $bytes$suffix [list $result $failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix [list $result $failidx] $profile
     }
     if {$ctrl eq {} || "tail" in $ctrl} {
         set expected_failidx $failidx
@@ -547,9 +713,9 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
         } else {
             # Failure expected
             set result $prefix
-            incr expected_failidx [string length [encoding convertto $enc $prefix]]
+            incr expected_failidx $prefixLen
         }
-        testfailindex xxcmdAH-4.3.14.$profile.$hex.tail convertfrom $enc $prefix$bytes [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix$bytes [list $result $expected_failidx] $profile
     }
     if {$ctrl eq {} || "middle" in $ctrl} {
         set expected_failidx $failidx
@@ -559,53 +725,9 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
         } else {
             # Failure expected
             set result $prefix
-            incr expected_failidx [string length [encoding convertto $enc $prefix]]
-        }
-        testfailindex xxcmdAH-4.3.14.$profile.$hex.middle convertfrom $enc $prefix$bytes$suffix [list $result $expected_failidx] $profile
-    }
-}
-
-# -profile
-
-# All valid byte sequences should be accepted by all profiles
-foreach profile $encProfiles {
-    set i 0
-    foreach {enc string bytes} $encValidStrings {
-        testconvert cmdAH-4.3.15.$enc.$profile.[incr i] [list encoding convertfrom $enc $bytes] $string
-        if {"utf-16$endian" eq $enc} {
-            # utf-16le ->utf-16, utf-32be -> utf32 etc.
-            set enc [string range $enc 0 5]
-            testconvert cmdAH-4.3.15.$enc.$profile.[incr i] [list encoding convertfrom $enc $bytes] $string
-        }
-    }
-}
-
-# Cycle through the various combinations of encodings and profiles
-# for invalid byte sequences
-foreach {enc hex profile prefix failidx ctrl comment} $encInvalidBytes {
-    set bytes [binary format H* $hex]
-    if {$failidx eq -1} {
-        set result [list $prefix]
-    } else {
-        set badbyte "'\\x[string toupper [binary encode hex [string index $bytes $failidx]]]'"
-        # TODO - if the bad byte is unprintable, tcltest errors out when printing a mismatch
-        # so glob it out for now.
-        set result [list "unexpected byte sequence starting at index $failidx: *" -returnCodes error -match glob]
-    }
-    if {$profile eq "default"} {
-        testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom $enc $bytes] {*}$result
-        if {"utf-16$endian" eq $enc} {
-            # utf-16le ->utf-16, utf-32be -> utf32 etc.
-            set enc [string range $enc 0 5]
-            testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom $enc $bytes] {*}$result
-        }
-    } else {
-        testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
-        if {"utf-16$endian" eq $enc} {
-            # utf-16le ->utf-16, utf-32be -> utf32 etc.
-            set enc [string range $enc 0 5]
-            testconvert cmdAH-4.3.15.$enc.$profile.$hex [list encoding convertfrom -profile $profile $enc $bytes] {*}$result
+            incr expected_failidx $prefixLen
         }
+        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix$bytes$suffix [list $result $expected_failidx] $profile
     }
 }
 
@@ -646,41 +768,67 @@ testconvert cmdAH-4.4.12 {
 # -failindex - valid data
 foreach {enc string bytes} $encValidStrings {
     testfailindex cmdAH-4.4.13.$enc convertto $enc $string [list $bytes -1]
-    if {"utf-16$endian" eq $enc} {
-        # utf-16le ->utf-16, utf-32be -> utf32 etc.
-        set enc [string range $enc 0 5]
-        testfailindex cmdAH-4.4.13.$enc convertto $enc $string [list $bytes -1]
-    }
 }
 
 # -failindex - invalid data
-foreach {enc string profile bytes failidx tag} $encUnencodableStrings {
-    testfailindex cmdAH-4.4.14.$enc.$profile.$tag convertto $enc $string [list $bytes $failidx] $profile
-    if {"utf-16$endian" eq $enc} {
-        # utf-16le ->utf-16, utf-32be -> utf32 etc.
-        set enc [string range $enc 0 5]
-        testfailindex cmdAH-4.4.14.$enc.$profile.$tag convertto $enc $string [list $bytes $failidx] $profile
+foreach {enc string profile hex failidx ctrl comment} $encUnencodableStrings {
+    set bytes [binary decode hex $hex]
+    set prefix A
+    set suffix B
+    set prefixLen [string length [encoding convertto $enc $prefix]]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        testfailindex cmdAH-4.4.14.$string.solo convertto $enc $string [list $bytes $failidx] $profile
+    }
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            # If success expected
+            set result $bytes$suffix
+        } else {
+            # Failure expected
+            set result ""
+        }
+        testfailindex cmdAH-4.4.14.$string.lead convertto $enc $string$suffix [list $result $failidx] $profile
+    }
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$bytes
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx $prefixLen
+        }
+        testfailindex cmdAH-4.4.14.$string.tail convertto $enc $prefix$string [list $result $expected_failidx] $profile
+    }
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        set expected_failidx $failidx
+        if {$failidx == -1} {
+            # If success expected
+            set result $prefix$bytes$suffix
+        } else {
+            # Failure expected
+            set result $prefix
+            incr expected_failidx $prefixLen
+        }
+        testfailindex cmdAH-4.4.14.$string.middle convertto $enc $prefix$string$suffix [list $result $expected_failidx] $profile
     }
 }
 
-# -profile
+# convertto -profile
 
 # All valid byte sequences should be accepted by all profiles
 foreach profile $encProfiles {
     set i 0
     foreach {enc string bytes} $encValidStrings {
-        testconvert cmdAH-4.4.15.$enc.$profile.[incr i] [list encoding convertto $enc $string] $bytes
-        if {"utf-16$endian" eq $enc} {
-            # utf-16le ->utf-16, utf-32be -> utf32 etc.
-            set enc [string range $enc 0 5]
-            testconvert cmdAH-4.4.15.$enc.$profile.[incr i] [list encoding convertto $enc $string] $bytes
-        }
+        testprofile cmdAH-4.4.15 convertto $enc $profile $string $bytes
     }
 }
 
 # Cycle through the various combinations of encodings and profiles
 # for invalid byte sequences
-foreach {enc string profile bytes failidx tag} $encUnencodableStrings {
+foreach {enc string profile hex failidx ctrl comment} $encUnencodableStrings {
+    set bytes [binary decode hex $hex]
     if {$failidx eq -1} {
         set result [list $bytes]
     } else {
@@ -688,19 +836,20 @@ foreach {enc string profile bytes failidx tag} $encUnencodableStrings {
         # so glob it out for now.
         set result [list "unexpected character at index $failidx: *" -returnCodes error -match glob]
     }
+    #testprofile xx convertto $enc $profile $string {*}$result
     if {$profile eq "default"} {
-        testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
+        # testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
         if {"utf-16$endian" eq $enc} {
             # utf-16le ->utf-16, utf-32be -> utf32 etc.
             set enc [string range $enc 0 5]
-            testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
+          #  xxtestconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
         }
     } else {
-        testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
+        # testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
         if {"utf-16$endian" eq $enc} {
             # utf-16le ->utf-16, utf-32be -> utf32 etc.
             set enc [string range $enc 0 5]
-            testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
+          #  testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
         }
     }
 }
-- 
cgit v0.12


From 6d674a96a1b99426cabf17e5b52272399c73e8bc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 16 Feb 2023 21:29:07 +0000
Subject: Final part of [10c2c17c32]: UTF-LE32 encoder mapping of surrogates.
 Problem was in testcase, not in actual code

---
 tests/encoding.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index ed41937..a46fa5f 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -525,9 +525,9 @@ test encoding-16.13 {Utf16ToUtfProc} -body {
 test encoding-16.14 {Utf16ToUtfProc} -body {
     encoding convertfrom utf-16le \x00\xDC
 } -result \uDC00
-test encoding-16.15 {Utf16ToUtfProc} -constraints knownBug -body {
+test encoding-16.15 {Utf16ToUtfProc} -body {
     encoding convertfrom utf-16le \x00\xD8\x00\xDC
-} -result \uD800\uDC00
+} -result \U010000
 test encoding-16.16 {Utf16ToUtfProc} -body {
     encoding convertfrom utf-16le \x00\xDC\x00\xD8
 } -result \uDC00\uD800
-- 
cgit v0.12


From 45796af99db14504cedf31f0336e108930482ebf Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 16 Feb 2023 21:50:53 +0000
Subject: complete fix

---
 generic/tclEncoding.c | 10 +++++-----
 tests/encoding.test   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index fe78e03..1d3a3eb 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2417,14 +2417,14 @@ UtfToUtfProc(
 		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
-	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX)) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
-	    }
+		if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) || (flags & ENCODING_FAILINDEX)) {
+		    result = TCL_CONVERT_SYNTAX;
+		    break;
+		}
 	    }
 	    char chbuf[2];
 	    chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
-	    Tcl_UtfToUniChar(chbuf, &ch);
+	    TclUtfToUCS4(chbuf, &ch);
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else {
 	    int low;
diff --git a/tests/encoding.test b/tests/encoding.test
index 1b41925..03f0273 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -849,10 +849,10 @@ test encoding-24.41 {Parse invalid utf-8 with -strict} -body {
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
 test encoding-24.42 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
     encoding convertfrom -nocomplain utf-8 \xF0\x80\x80\x80
-} -result \xF0\u20AC\u20AC\u20AC€€
+} -result \xF0\u20AC\u20AC\u20AC
 test encoding-24.43 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
     encoding convertfrom -nocomplain utf-8 \x80
-} -result \u20AC€€
+} -result \u20AC
 
 file delete [file join [temporaryDirectory] iso2022.txt]
 
-- 
cgit v0.12


From fdbb12eced9b528f6246424cf0916b620f1783bc Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 17 Feb 2023 18:59:28 +0000
Subject: Part way through utf-8 test equivalence classes

---
 generic/tclEncoding.c       |   4 +-
 library/tcltest/tcltest.tcl |  37 +++-
 tests/cmdAH.test            | 503 +++++++++++++++++++++++++++-----------------
 3 files changed, 342 insertions(+), 202 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index a11e696..4d5743c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2525,10 +2525,8 @@ UtfToUtfProc(
 		    src = saveSrc;
 		    break;
 		}
-		if (0 && PROFILE_REPLACE(profile)) {
+		if (PROFILE_REPLACE(profile)) {
 		    ch = UNICODE_REPLACE_CHAR;
-		    src += len;
-		    // dst += Tcl_UniCharToUtf(ch, dst);
 		}
 		else {
 		    low = ch;
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 94010a7..9ca7b09 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -1134,6 +1134,39 @@ proc tcltest::SafeFetch {n1 n2 op} {
     }
 }
 
+
+# tcltest::Asciify --
+#
+#       Transforms the passed string to contain only printable ascii characters.
+#       Useful for printing to terminals. Non-printables are mapped to
+#       \x, \u or \U sequences.
+#
+# Arguments:
+#       s - string to transform
+#
+# Results:
+#       The transformed strings
+#
+# Side effects:
+#       None.
+
+proc tcltest::Asciify {s} {
+    set print ""
+    foreach c [split $s ""] {
+        set i [scan $c %c]
+        if {[string is print $c] && ($i <= 127)} {
+            append print $c
+        } elseif {$i <= 0xff} {
+            append print \\x[format %02X $i]
+        } elseif {$i <= 0xffff} {
+            append print \\u[format %04X $i]
+        } else {
+            append print \\U[format %08X $i]
+        }
+    }
+    return $print
+}
+
 # tcltest::ConstraintInitializer --
 #
 #	Get or set a script that when evaluated in the tcltest namespace
@@ -2222,12 +2255,12 @@ proc tcltest::test {name description args} {
 	    puts [outputChannel] "---- Error testing result: $scriptMatch"
 	} else {
             try {
-                puts [outputChannel] "---- Result was:\n$actualAnswer"
+                puts [outputChannel] "---- Result was:\n[Asciify $actualAnswer]"
             } on error {errMsg errCode} {
                 puts [outputChannel] "---- Result was:\n<error printing result: $errMsg ($errCode)>"
             }
 	    puts [outputChannel] "---- Result should have been\
-		    ($match matching):\n$result"
+		    ($match matching):\n[Asciify $result]"
 	}
     }
     if {$errorCodeFailure} {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 6386658..df28b2e 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -181,6 +181,7 @@ set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
 set "numargErrors(encoding profiles)" {wrong # args: should be "encoding profiles"}
 
 set encProfiles {tcl8 strict replace}
+set encDefaultProfile tcl8; # Should reflect the default from implementation
 
 # TODO - valid sequences for different encodings - shiftjis etc.
 # Note utf-16, utf-32 missing because they are automatically
@@ -218,43 +219,41 @@ set encValidStrings {
 # 80-9F which is treated as cp1252.
 # This tests the TableToUtfProc code path.
 lappend encInvalidBytes {*}{
-    ascii 80 default \u20AC -1 {knownBug} {map to cp1252}
     ascii 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
     ascii 80 replace \uFFFD -1 {} {Smallest invalid byte}
     ascii 80 strict  {}      0 {} {Smallest invalid byte}
-    ascii 81 default \u0081 -1 {knownBug} {map to cp1252}
-    ascii 82 default \u201A -1 {knownBug} {map to cp1252}
-    ascii 83 default \u0192 -1 {knownBug} {map to cp1252}
-    ascii 84 default \u201E -1 {knownBug} {map to cp1252}
-    ascii 85 default \u2026 -1 {knownBug} {map to cp1252}
-    ascii 86 default \u2020 -1 {knownBug} {map to cp1252}
-    ascii 87 default \u2021 -1 {knownBug} {map to cp1252}
-    ascii 88 default \u0276 -1 {knownBug} {map to cp1252}
-    ascii 89 default \u2030 -1 {knownBug} {map to cp1252}
-    ascii 8A default \u0160 -1 {knownBug} {map to cp1252}
-    ascii 8B default \u2039 -1 {knownBug} {map to cp1252}
-    ascii 8C default \u0152 -1 {knownBug} {map to cp1252}
-    ascii 8D default \u008D -1 {knownBug} {map to cp1252}
-    ascii 8E default \u017D -1 {knownBug} {map to cp1252}
-    ascii 8F default \u008F -1 {knownBug} {map to cp1252}
-    ascii 90 default \u0090 -1 {knownBug} {map to cp1252}
-    ascii 91 default \u2018 -1 {knownBug} {map to cp1252}
-    ascii 92 default \u2019 -1 {knownBug} {map to cp1252}
-    ascii 93 default \u201C -1 {knownBug} {map to cp1252}
-    ascii 94 default \u201D -1 {knownBug} {map to cp1252}
-    ascii 95 default \u2022 -1 {knownBug} {map to cp1252}
-    ascii 96 default \u2013 -1 {knownBug} {map to cp1252}
-    ascii 97 default \u2014 -1 {knownBug} {map to cp1252}
-    ascii 98 default \u02DC -1 {knownBug} {map to cp1252}
-    ascii 99 default \u2122 -1 {knownBug} {map to cp1252}
-    ascii 9A default \u0161 -1 {knownBug} {map to cp1252}
-    ascii 9B default \u203A -1 {knownBug} {map to cp1252}
-    ascii 9C default \u0153 -1 {knownBug} {map to cp1252}
-    ascii 9D default \u009D -1 {knownBug} {map to cp1252}
-    ascii 9E default \u017E -1 {knownBug} {map to cp1252}
-    ascii 9F default \u0178 -1 {knownBug} {map to cp1252}
-
-    ascii FF default \u00FF -1 {} {Largest invalid byte}
+    ascii 81 tcl8    \u0081 -1 {knownBug} {map to cp1252}
+    ascii 82 tcl8    \u201A -1 {knownBug} {map to cp1252}
+    ascii 83 tcl8    \u0192 -1 {knownBug} {map to cp1252}
+    ascii 84 tcl8    \u201E -1 {knownBug} {map to cp1252}
+    ascii 85 tcl8    \u2026 -1 {knownBug} {map to cp1252}
+    ascii 86 tcl8    \u2020 -1 {knownBug} {map to cp1252}
+    ascii 87 tcl8    \u2021 -1 {knownBug} {map to cp1252}
+    ascii 88 tcl8    \u0276 -1 {knownBug} {map to cp1252}
+    ascii 89 tcl8    \u2030 -1 {knownBug} {map to cp1252}
+    ascii 8A tcl8    \u0160 -1 {knownBug} {map to cp1252}
+    ascii 8B tcl8    \u2039 -1 {knownBug} {map to cp1252}
+    ascii 8C tcl8    \u0152 -1 {knownBug} {map to cp1252}
+    ascii 8D tcl8    \u008D -1 {knownBug} {map to cp1252}
+    ascii 8E tcl8    \u017D -1 {knownBug} {map to cp1252}
+    ascii 8F tcl8    \u008F -1 {knownBug} {map to cp1252}
+    ascii 90 tcl8    \u0090 -1 {knownBug} {map to cp1252}
+    ascii 91 tcl8    \u2018 -1 {knownBug} {map to cp1252}
+    ascii 92 tcl8    \u2019 -1 {knownBug} {map to cp1252}
+    ascii 93 tcl8    \u201C -1 {knownBug} {map to cp1252}
+    ascii 94 tcl8    \u201D -1 {knownBug} {map to cp1252}
+    ascii 95 tcl8    \u2022 -1 {knownBug} {map to cp1252}
+    ascii 96 tcl8    \u2013 -1 {knownBug} {map to cp1252}
+    ascii 97 tcl8    \u2014 -1 {knownBug} {map to cp1252}
+    ascii 98 tcl8    \u02DC -1 {knownBug} {map to cp1252}
+    ascii 99 tcl8    \u2122 -1 {knownBug} {map to cp1252}
+    ascii 9A tcl8    \u0161 -1 {knownBug} {map to cp1252}
+    ascii 9B tcl8    \u203A -1 {knownBug} {map to cp1252}
+    ascii 9C tcl8    \u0153 -1 {knownBug} {map to cp1252}
+    ascii 9D tcl8    \u009D -1 {knownBug} {map to cp1252}
+    ascii 9E tcl8    \u017E -1 {knownBug} {map to cp1252}
+    ascii 9F tcl8    \u0178 -1 {knownBug} {map to cp1252}
+
     ascii FF tcl8    \u00FF -1 {} {Largest invalid byte}
     ascii FF replace \uFFFD -1 {} {Largest invalid byte}
     ascii FF strict  {}      0 {} {Largest invalid byte}
@@ -279,121 +278,188 @@ lappend encInvalidBytes {*}{
 # (UtfToUtfProc).
 # Note C0, C1, F5:FF are invalid bytes ANYWHERE. Exception is C080
 lappend encInvalidBytes {*}{
-    utf-8 80 default \u20AC -1 {knownBug} {map to cp1252}
+    utf-8 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
     utf-8 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
     utf-8 80 replace \uFFFD -1 {} {Smallest invalid byte}
     utf-8 80 strict  {}      0 {} {Smallest invalid byte}
-    utf-8 81 default \u0081 -1 {knownBug} {map to cp1252}
-    utf-8 82 default \u201A -1 {knownBug} {map to cp1252}
-    utf-8 83 default \u0192 -1 {knownBug} {map to cp1252}
-    utf-8 84 default \u201E -1 {knownBug} {map to cp1252}
-    utf-8 85 default \u2026 -1 {knownBug} {map to cp1252}
-    utf-8 86 default \u2020 -1 {knownBug} {map to cp1252}
-    utf-8 87 default \u2021 -1 {knownBug} {map to cp1252}
-    utf-8 88 default \u0276 -1 {knownBug} {map to cp1252}
-    utf-8 89 default \u2030 -1 {knownBug} {map to cp1252}
-    utf-8 8A default \u0160 -1 {knownBug} {map to cp1252}
-    utf-8 8B default \u2039 -1 {knownBug} {map to cp1252}
-    utf-8 8C default \u0152 -1 {knownBug} {map to cp1252}
-    utf-8 8D default \u008D -1 {knownBug} {map to cp1252}
-    utf-8 8E default \u017D -1 {knownBug} {map to cp1252}
-    utf-8 8F default \u008F -1 {knownBug} {map to cp1252}
-    utf-8 90 default \u0090 -1 {knownBug} {map to cp1252}
-    utf-8 91 default \u2018 -1 {knownBug} {map to cp1252}
-    utf-8 92 default \u2019 -1 {knownBug} {map to cp1252}
-    utf-8 93 default \u201C -1 {knownBug} {map to cp1252}
-    utf-8 94 default \u201D -1 {knownBug} {map to cp1252}
-    utf-8 95 default \u2022 -1 {knownBug} {map to cp1252}
-    utf-8 96 default \u2013 -1 {knownBug} {map to cp1252}
-    utf-8 97 default \u2014 -1 {knownBug} {map to cp1252}
-    utf-8 98 default \u02DC -1 {knownBug} {map to cp1252}
-    utf-8 99 default \u2122 -1 {knownBug} {map to cp1252}
-    utf-8 9A default \u0161 -1 {knownBug} {map to cp1252}
-    utf-8 9B default \u203A -1 {knownBug} {map to cp1252}
-    utf-8 9C default \u0153 -1 {knownBug} {map to cp1252}
-    utf-8 9D default \u009D -1 {knownBug} {map to cp1252}
-    utf-8 9E default \u017E -1 {knownBug} {map to cp1252}
-    utf-8 9F default \u0178 -1 {knownBug} {map to cp1252}
-
-    utf-8 C0 default \u00C0 -1 {} {C0 is invalid anywhere}
+    utf-8 81 tcl8    \u0081 -1 {knownBug} {map to cp1252}
+    utf-8 82 tcl8    \u201A -1 {knownBug} {map to cp1252}
+    utf-8 83 tcl8    \u0192 -1 {knownBug} {map to cp1252}
+    utf-8 84 tcl8    \u201E -1 {knownBug} {map to cp1252}
+    utf-8 85 tcl8    \u2026 -1 {knownBug} {map to cp1252}
+    utf-8 86 tcl8    \u2020 -1 {knownBug} {map to cp1252}
+    utf-8 87 tcl8    \u2021 -1 {knownBug} {map to cp1252}
+    utf-8 88 tcl8    \u0276 -1 {knownBug} {map to cp1252}
+    utf-8 89 tcl8    \u2030 -1 {knownBug} {map to cp1252}
+    utf-8 8A tcl8    \u0160 -1 {knownBug} {map to cp1252}
+    utf-8 8B tcl8    \u2039 -1 {knownBug} {map to cp1252}
+    utf-8 8C tcl8    \u0152 -1 {knownBug} {map to cp1252}
+    utf-8 8D tcl8    \u008D -1 {knownBug} {map to cp1252}
+    utf-8 8E tcl8    \u017D -1 {knownBug} {map to cp1252}
+    utf-8 8F tcl8    \u008F -1 {knownBug} {map to cp1252}
+    utf-8 90 tcl8    \u0090 -1 {knownBug} {map to cp1252}
+    utf-8 91 tcl8    \u2018 -1 {knownBug} {map to cp1252}
+    utf-8 92 tcl8    \u2019 -1 {knownBug} {map to cp1252}
+    utf-8 93 tcl8    \u201C -1 {knownBug} {map to cp1252}
+    utf-8 94 tcl8    \u201D -1 {knownBug} {map to cp1252}
+    utf-8 95 tcl8    \u2022 -1 {knownBug} {map to cp1252}
+    utf-8 96 tcl8    \u2013 -1 {knownBug} {map to cp1252}
+    utf-8 97 tcl8    \u2014 -1 {knownBug} {map to cp1252}
+    utf-8 98 tcl8    \u02DC -1 {knownBug} {map to cp1252}
+    utf-8 99 tcl8    \u2122 -1 {knownBug} {map to cp1252}
+    utf-8 9A tcl8    \u0161 -1 {knownBug} {map to cp1252}
+    utf-8 9B tcl8    \u203A -1 {knownBug} {map to cp1252}
+    utf-8 9C tcl8    \u0153 -1 {knownBug} {map to cp1252}
+    utf-8 9D tcl8    \u009D -1 {knownBug} {map to cp1252}
+    utf-8 9E tcl8    \u017E -1 {knownBug} {map to cp1252}
+    utf-8 9F tcl8    \u0178 -1 {knownBug} {map to cp1252}
+
     utf-8 C0 tcl8    \u00C0 -1 {} {C0 is invalid anywhere}
     utf-8 C0 strict  {}      0 {} {C0 is invalid anywhere}
     utf-8 C0 replace \uFFFD -1 {} {C0 is invalid anywhere}
-    utf-8 C080 default \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
     utf-8 C080 tcl8    \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
     utf-8 C080 strict  {}      0 {} {C080 -> invalid}
     utf-8 C080 replace \uFFFD -1 {} {C080 -> single replacement char}
-    utf-8 C1 default \u00C1 -1 {} {C1 is invalid everywhere}
     utf-8 C1 tcl8    \u00C1 -1 {} {C1 is invalid everywhere}
     utf-8 C1 replace \uFFFD -1 {} {C1 is invalid everywhere}
     utf-8 C1 strict  {}      0 {} {C1 is invalid everywhere}
 
-    utf-8 C1 default \u00C1 -1 {} {Require valid trail byte}
-    utf-8 C1 tcl8    \u00C1 -1 {} {Require valid trail byte}
-    utf-8 C1 replace \uFFFD -1 {} {Require valid trail byte}
-    utf-8 C1 strict  {}      0 {} {Require valid trail byte}
-
+    utf-8 C2 tcl8      \u00C2     -1 {} {Missing trail byte}
+    utf-8 C2 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 C2 strict    {}          0 {} {Missing trail byte}
+    utf-8 C27F tcl8    \u00C2\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 C27F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 C27F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 DF tcl8      \u00DF     -1 {} {Missing trail byte}
+    utf-8 DF replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 DF strict    {}          0 {} {Missing trail byte}
+    utf-8 DF7F tcl8    \u00DF\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 DF7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 DF7F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 DFE0A080 tcl8    \u00DF\u0800 -1 {} {Invalid trail byte is start of valid sequence}
+    utf-8 DFE0A080 replace \uFFFD\u0800 -1 {} {Invalid trail byte is start of valid sequence}
+    utf-8 DFE0A080 strict  {}            0 {} {Invalid trail byte is start of valid sequence}
+
+    utf-8 E0 tcl8      \u00E0     -1 {} {Missing trail byte}
+    utf-8 E0 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 E0 strict    {}          0 {} {Missing trail byte}
+    utf-8 E080 tcl8      \u00E0\u20AC   -1 {knownBug} {First trail byte must be A0:BF}
+    utf-8 E080 replace   \uFFFD\uFFFD   -1 {}         {First trail byte must be A0:BF}
+    utf-8 E080 strict    {}              0 {}         {First trail byte must be A0:BF}
+    utf-8 E09F tcl8      \u00E0\u0178   -1 {knownBug} {First trail byte must be A0:BF}
+    utf-8 E09F replace   \uFFFD\uFFFD   -1 {}         {First trail byte must be A0:BF}
+    utf-8 E09F strict    {}              0 {}         {First trail byte must be A0:BF}
+    utf-8 E0A07F tcl8    \u00E0\u00A0\x7F   -1 {}     {Second trail byte must be 80:BF}
+    utf-8 E0A07F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E0A07F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 E0BF7F tcl8    \u00E0\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 E0BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E0BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+
+    utf-8 E1 tcl8      \u00E1     -1 {} {Missing trail byte}
+    utf-8 E1 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 E1 strict    {}          0 {} {Missing trail byte}
+    utf-8 E17F tcl8    \u00E1\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 E17F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 E17F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 E1807F tcl8    \u00E1\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 E1807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E1807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 E1BF7F tcl8    \u00E1\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 E1BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E1BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 EC tcl8      \u00EC     -1 {} {Missing trail byte}
+    utf-8 EC replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 EC strict    {}          0 {} {Missing trail byte}
+    utf-8 EC7F tcl8    \u00EC\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 EC7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 EC7F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 EC807F tcl8    \u00EC\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 EC807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EC807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 ECBF7F tcl8    \u00EC\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 ECBF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ECBF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+
+    utf-8 ED tcl8      \u00ED     -1 {} {Missing trail byte}
+    utf-8 ED replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 ED strict    {}          0 {} {Missing trail byte}
+    utf-8 ED7F tcl8      \u00ED\u7F   -1 {knownBug} {First trail byte must be 80:9F}
+    utf-8 ED7F replace   \uFFFD\u7F   -1 {}         {First trail byte must be 80:9F}
+    utf-8 ED7F strict    {}              0 {}         {First trail byte must be 80:9F}
+    utf-8 EDA0 tcl8      \u00ED\u00A0   -1 {knownBug} {First trail byte must be 80:9F}
+    utf-8 EDA0 replace   \uFFFD\uFFFD   -1 {}         {First trail byte must be 80:9F}
+    utf-8 EDA0 strict    {}              0 {}         {First trail byte must be 80:9F}
+    utf-8 ED807F tcl8    \u00ED\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 ED807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 ED9F7F tcl8    \u00ED\u0178\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 EDA080 tcl8       \uD800             -1 {}         {High surrogate}
+    utf-8 EDA080 replace    \uFFFD             -1 {}         {High surrogate}
+    utf-8 EDA080 strict     {}                  0 {}         {High surrogate}
+    utf-8 EDAFBF tcl8       \uDBFF             -1 {}         {High surrogate}
+    utf-8 EDAFBF replace    \uFFFD             -1 {}         {High surrogate}
+    utf-8 EDAFBF strict     {}                  0 {}         {High surrogate}
+    utf-8 EDB080 tcl8       \uDC00             -1 {}         {Low surrogate}
+    utf-8 EDB080 replace    \uFFFD             -1 {}         {Low surrogate}
+    utf-8 EDB080 strict     {}                  0 {}         {Low surrogate}
+    utf-8 EDBFBF tcl8       \uDFFF             -1 {}         {Low surrogate}
+    utf-8 EDBFBF replace    \uFFFD             -1 {}         {Low surrogate}
+    utf-8 EDBFBF strict     {}                  0 {}         {Low surrogate}
+    utf-8 EDA080EDB080 tcl8 \U00010000         -1 {}         {High low surrogate pair}
+    utf-8 EDA080EDB080 replace \uFFFD\uFFFD         -1 {}         {High low surrogate pair}
+    utf-8 EDA080EDB080 strict {}         0 {}         {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF tcl8 \U0010FFFF           -1 {}         {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF replace \uFFFD\uFFFD           -1 {}         {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF strict {}           0 {}         {High low surrogate pair}
 
-    utf-8 F5 default \u00F5 -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 strict  {}      0 {} {F5:FF are invalid everywhere}
-    utf-8 FF default \u00FF -1 {} {F5:FF are invalid everywhere}
     utf-8 FF tcl8    \u00FF -1 {} {F5:FF are invalid everywhere}
     utf-8 FF replace \uFFFD -1 {} {F5:FF are invalid everywhere}
     utf-8 FF strict  {}      0 {} {F5:FF are invalid everywhere}
 
     utf-8 C0AFE080BFF0818130 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-8}
-    utf-8 EDA080EDBFBFEDAF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {knownBug} {Unicode Table 3-9}
+    utf-8 EDA080EDBFBFEDAF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {knownW3C} {Unicode Table 3-9}
     utf-8 F4919293FF4180BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0041\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-10}
-    utf-8 E180E2F09192F1BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\x30                         -1 {knownBug} {Unicode Table 3.11}
+    utf-8 E180E2F09192F1BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\x30                         -1 {knownW3C} {Unicode Table 3.11}
 }
 
 set xxencInvalidBytes {
     
-    utf-8 \x41\x80\x42     default   A\u0080B -1 80
     utf-8 \x41\x80\x42     tcl8      A\u0080B -1 80
     utf-8 \x41\x80\x42     replace   A\uFFFDB -1 80
     utf-8 \x41\x80\x42     strict    A         1 80
-    utf-8 \x41\xC0\x80\x42 default   A\u0000B -1 C080
     utf-8 \x41\xC0\x80\x42 tcl8      A\u0000B -1 C080
     utf-8 \x41\xC0\x80\x42 strict    A         1 C080
-    utf-8 \x41\xC1\x42     default   A\u00C1B -1 C1
     utf-8 \x41\xC1\x42     tcl8      A\u00C1B -1 C1
     utf-8 \x41\xC1\x42     replace   A\uFFFDB -1 C1
     utf-8 \x41\xC1\x42     strict    A         1 C1
-    utf-8 \x41\xC2\x42     default   A\u00C2B -1 C2-nontrail
     utf-8 \x41\xC2\x42     tcl8      A\u00C2B -1 C2-nontrail
     utf-8 \x41\xC2\x42     replace   A\uFFFDB -1 C2-nontrail
     utf-8 \x41\xC2\x42     strict    A         1 C2-nontrail
-    utf-8 \x41\xC2         default   A\u00C2  -1 C2-incomplete
     utf-8 \x41\xC2         tcl8      A\u00C2  -1 C2-incomplete
     utf-8 \x41\xC2         replace   A\uFFFD  -1 C2-incomplete
     utf-8 \x41\xC2         strict    A         1 C2-incomplete
-    utf-8 A\xed\xa0\x80B   default   A\uD800B -1 High-surrogate
     utf-8 A\xed\xa0\x80B   tcl8      A\uD800B -1 High-surrogate
     utf-8 A\xed\xa0\x80B   strict    A         1 High-surrogate
-    utf-8 A\xed\xb0\x80B   default   A\uDC00B -1 Low-surrogate
     utf-8 A\xed\xb0\x80B   tcl8      A\uDC00B -1 Low-surrogate
     utf-8 A\xed\xb0\x80B   strict    A         1 Low-surrogate
-    utf-8 \xed\xa0\x80\xed\xb0\x80   default   \U00010000 -1 High-low-surrogate
     utf-8 \xed\xa0\x80\xed\xb0\x80   tcl8      \U00010000 -1 High-low-surrogate
     utf-8 \xed\xa0\x80\xed\xb0\x80   strict    {}          0 High-low-surrogate
 }
 set utf32-le-TODO {
-    utf-32le \x00\xD8\x00\x00                                   default  \uD800   -1 {High-surrogate}
     utf-32le \x00\xD8\x00\x00                                   tcl8     \uD800   -1 {High-surrogate}
     utf-32le \x00\xD8\x00\x00                                   strict   ""        0 {High-surrogate}
-    utf-32le \x00\xDC\x00\x00                                   default  \uDC00   -1 {Low-surrogate}
     utf-32le \x00\xDC\x00\x00                                   tcl8     \uDC00   -1 {Low-surrogate}
     utf-32le \x00\xDC\x00\x00                                   strict   ""        0 {Low-surrogate}
-    utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   default  \uD800\uDC00  -1 {High-low-surrogate}
     utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   tcl8     \uD800\uDC00  -1 {High-low-surrogate}
     utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   strict   ""             0 {High-low-surrogate}
-    utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   default  \uDC00\uD800  -1 {High-low-surrogate}
     utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   tcl8     \uDC00\uD800  -1 {High-low-surrogate}
     utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   strict   ""             0 {High-low-surrogate}
-    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   default  A\uD800B -1 {High-surrogate-middle}
     utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   tcl8     A\uD800B -1 {High-surrogate-middle}
     utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   strict   A         4 {High-surrogate-middle}
 }
@@ -416,18 +482,14 @@ set utf32-le-TODO {
 # TODO - other encodings and test cases
 # TODO - out of range code point (note cannot be generated by \U notation)
 set encUnencodableStrings {
-    ascii \u00e0 default 3f -1 {} {unencodable}
     ascii \u00e0 tcl8    3f -1 {} {unencodable}
     ascii \u00e0 strict  {}  0 {} {unencodable}
 
-    iso8859-1 \u0141 default 3f -1 {} unencodable
     iso8859-1 \u0141 tcl8    3f -1 {} unencodable
     iso8859-1 \u0141 strict  {}  0 {} unencodable
 
-    utf-8 \uD800 default eda080 -1 {} High-surrogate
     utf-8 \uD800 tcl8    eda080 -1 {} High-surrogate
     utf-8 \uD800 strict  {}      0 {} High-surrogate
-    utf-8 \uDC00 default edb080 -1 {} High-surrogate
     utf-8 \uDC00 tcl8    edb080 -1 {} High-surrogate
     utf-8 \uDC00 strict  {}      0 {} High-surrogate
 }
@@ -453,6 +515,24 @@ proc endianUtf {enc} {
     return ""
 }
 
+# Map arbitrary strings to printable form in ASCII.
+proc printable {s} {
+    set print ""
+    foreach c [split $s ""] {
+        set i [scan $c %c]
+        if {[string is print $c] && ($i <= 127)} {
+            append print $c
+        } elseif {$i <= 0xff} {
+            append print \\x[format %02X $i]
+        } elseif {$i <= 0xffff} {
+            append print \\u[format %04X $i]
+        } else {
+            append print \\U[format %08X $i]
+        }
+    }
+    return $print
+}
+
 #
 # Check errors for invalid number of arguments
 proc badnumargs {id cmd cmdargs} {
@@ -501,36 +581,45 @@ proc testconvert {id body result args} {
         {*}$args
 }
 
+# Wrapper to verify encoding convert{to,from} ?-profile?
+# Generates tests for compiled and uncompiled implementation.
+# Also generates utf-{16,32} tests if passed encoding is utf-{16,32}{le,be}
+# The enc and profile are appended to id to generate the test id
 proc testprofile {id converter enc profile data result args} {
-    if {$profile eq "default"} {
-        testconvert $id.$enc.$profile [list encoding $converter $enc $data] $result {*}$args
-        if {[set enc [endianUtf $enc]] ne ""} {
-            # If utf{16,32}-{le,be}, also do utf{16,32}
-            testconvert $id.$enc.$profile [list encoding $converter $enc $data] $result {*}$args
-        }
-    } else {
-        testconvert $id.$enc.$profile [list encoding $converter -profile $profile $enc $data] $result {*}$args
-        if {[set enc [endianUtf $enc]] ne ""} {
+    testconvert $id.$enc.$profile [list encoding $converter -profile $profile $enc $data] $result {*}$args
+    if {[set enc2 [endianUtf $enc]] ne ""} {
+        # If utf{16,32}-{le,be}, also do utf{16,32}
+        testconvert $id.$enc2.$profile [list encoding $converter -profile $profile $enc2 $data] $result {*}$args
+    }
+
+    # If this is the default profile, generate a test without specifying profile
+    if {$profile eq $::encDefaultProfile} {
+        testconvert $id.$enc.default [list encoding $converter $enc $data] $result {*}$args
+        if {[set enc2 [endianUtf $enc]] ne ""} {
             # If utf{16,32}-{le,be}, also do utf{16,32}
-            testconvert $id.$enc.$profile [list encoding $converter -profile $profile $enc $data] $result {*}$args
+            testconvert $id.$enc2.default [list encoding $converter $enc2 $data] $result {*}$args
         }
     }
 }
 
 
-# Wrapper for verifying -failindex
+# Wrapper to verify encoding convert{to,from} -failindex ?-profile?
+# Generates tests for compiled and uncompiled implementation.
+# Also generates utf-{16,32} tests if passed encoding is utf-{16,32}{le,be}
+# The enc and profile are appended to id to generate the test id
 proc testfailindex {id converter enc data result {profile default}} {
-    if {$profile eq "default"} {
-        testconvert $id.$enc.$profile "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
-        if {[set enc [endianUtf $enc]] ne ""} {
-            # If utf{16,32}-{le,be}, also do utf{16,32}
-            testconvert $id.$enc.$profile "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
-        }
-    } else {
-        testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
-        if {[set enc [endianUtf $enc]] ne ""} {
+    testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+    if {[set enc2 [endianUtf $enc]] ne ""} {
+        # If utf{16,32}-{le,be}, also do utf{16,32}
+        testconvert $id.$enc2.$profile "list \[encoding $converter -profile $profile -failindex idx $enc2 $data] \[set idx]" $result
+    }
+
+    # If this is the default profile, generate a test without specifying profile
+    if {$profile eq $::encDefaultProfile} {
+        testconvert $id.$enc.default "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+        if {[set enc2 [endianUtf $enc]] ne ""} {
             # If utf{16,32}-{le,be}, also do utf{16,32}
-            testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+            testconvert $id.$enc2.default "list \[encoding $converter -failindex idx $enc2 $data] \[set idx]" $result
         }
     }
 }
@@ -590,9 +679,7 @@ testconvert cmdAH-4.3.12 {
     encoding system $system
 }
 
-# convertfrom, convertfrom -profile
-
-# convertfrom ?-profile? : All valid byte sequences should be accepted by all profiles
+# convertfrom ?-profile? : valid byte sequences
 foreach {enc str hex} $encValidStrings {
     set bytes [binary decode hex $hex]
     set prefix A
@@ -612,7 +699,9 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
     set bytes [binary format H* $hex]
     set prefix A
     set suffix B
-    set prefixLen [string length [encoding convertto $enc $prefix]]
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
+    set prefixLen [string length $prefix_bytes]
     set result [list $str]
     # TODO - if the bad byte is unprintable, tcltest errors out when printing a mismatch
     # so glob it out in error message pattern for now.
@@ -624,7 +713,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
         } else {
             set result $errorWithoutPrefix
         }
-        testprofile cmdAH-4.3.15.$hex.solo convertfrom $enc $profile $bytes {*}$result
+        testprofile cmdAH-4.3.13.$hex.solo convertfrom $enc $profile $bytes {*}$result
     }
     if {$ctrl eq {} || "lead" in $ctrl} {
         if {$failidx == -1} {
@@ -632,7 +721,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
         } else {
             set result $errorWithoutPrefix
         }
-        testprofile cmdAH-4.3.15.$hex.lead convertfrom $enc $profile $bytes$suffix {*}$result
+        testprofile cmdAH-4.3.13.$hex.lead convertfrom $enc $profile $bytes$suffix_bytes {*}$result
     }
     if {$ctrl eq {} || "tail" in $ctrl} {
         if {$failidx == -1} {
@@ -640,7 +729,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
         } else {
             set result $errorWithPrefix
         }
-        testprofile cmdAH-4.3.15.$hex.tail convertfrom $enc $profile $prefix$bytes {*}$result
+        testprofile cmdAH-4.3.13.$hex.tail convertfrom $enc $profile $prefix_bytes$bytes {*}$result
     }
     if {$ctrl eq {} || "middle" in $ctrl} {
         if {$failidx == -1} {
@@ -648,28 +737,11 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
         } else {
             set result $errorWithPrefix
         }
-        testprofile cmdAH-4.3.15.$hex.middle convertfrom $enc $profile $prefix$bytes$suffix {*}$result
+        testprofile cmdAH-4.3.13.$hex.middle convertfrom $enc $profile $prefix_bytes$bytes$suffix_bytes {*}$result
     }
 }
 
-proc printable {s} {
-    set print ""
-    foreach c [split $s ""] {
-        set i [scan $c %c]
-        if {[string is print $c] && ($i <= 127)} {
-            append print $c
-        } elseif {$i <= 0xff} {
-            append print \\x[format %02X $i]
-        } elseif {$i <= 0xffff} {
-            append print \\u[format %04X $i]
-        } else {
-            append print \\U[format %08X $i]
-        }
-    }
-    return $print
-}
-
-# convertfrom -failindex - valid data
+# convertfrom -failindex ?-profile? - valid data
 foreach {enc str hex} $encValidStrings {
     set bytes [binary decode hex $hex]
     set prefix A
@@ -677,15 +749,14 @@ foreach {enc str hex} $encValidStrings {
     set prefix_bytes [encoding convertto $enc A]
     set suffix_bytes [encoding convertto $enc B]
     foreach profile $encProfiles {
-        testfailindex cmdAH-4.3.13.$hex.solo convertfrom $enc $bytes [list $str -1] $profile
-        testfailindex cmdAH-4.3.13.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $str$suffix -1] $profile
-        testfailindex cmdAH-4.3.13.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $prefix$str -1] $profile
-        testfailindex cmdAH-4.3.13.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $prefix$str$suffix -1] $profile
+        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes [list $str -1] $profile
+        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $str$suffix -1] $profile
+        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $prefix$str -1] $profile
+        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $prefix$str$suffix -1] $profile
     }
 }
 
-
-# convertfrom -failindex, convertfrom -failindex -profile, invalid data
+# convertfrom -failindex ?-profile? - invalid data
 foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
     # There are multiple test cases based on location of invalid bytes
     set bytes [binary decode hex $hex]
@@ -765,19 +836,96 @@ testconvert cmdAH-4.4.12 {
     encoding system $system
 }
 
-# -failindex - valid data
-foreach {enc string bytes} $encValidStrings {
-    testfailindex cmdAH-4.4.13.$enc convertto $enc $string [list $bytes -1]
+# convertto ?-profile? : valid byte sequences
+
+foreach {enc str hex} $encValidStrings {
+    set bytes [binary decode hex $hex]
+    set printable [printable $str]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc A]
+    set suffix_bytes [encoding convertto $enc B]
+    foreach profile $encProfiles {
+        testprofile cmdAH-4.4.13.$printable.solo convertto $enc $profile $str $bytes
+        testprofile cmdAH-4.4.13.$printable.lead convertto $enc $profile $str$suffix $bytes$suffix_bytes
+        testprofile cmdAH-4.4.13.$printable.tail convertto $enc $profile $prefix$str $prefix_bytes$bytes
+        testprofile cmdAH-4.4.13.$printable.middle convertto $enc $profile $prefix$str$suffix $prefix_bytes$bytes$suffix_bytes
+    }
+}
+
+# convertto ?-profile? : invalid byte sequences
+foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
+    set bytes [binary decode hex $hex]
+    set printable [printable $str]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
+    set prefixLen [string length $prefix_bytes]
+    set result [list $bytes]
+    # TODO - if the bad byte is unprintable, tcltest errors out when printing a mismatch
+    # so glob it out in error message pattern for now.
+    set errorWithoutPrefix [list "unexpected character at index $failidx: *" -returnCodes error -match glob]
+    set errorWithPrefix [list "unexpected character at index [expr {$failidx+$prefixLen}]: *" -returnCodes error -match glob]
+    if {$ctrl eq {} || "solo" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $bytes]
+        } else {
+            set result $errorWithoutPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.solo convertto $enc $profile $str {*}$result
+    }
+    if {$ctrl eq {} || "lead" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $bytes$suffix_bytes]
+        } else {
+            set result $errorWithoutPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.lead convertto $enc $profile $str$suffix {*}$result
+    }
+    if {$ctrl eq {} || "tail" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix_bytes$bytes]
+        } else {
+            set result $errorWithPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.tail convertto $enc $profile $prefix$str {*}$result
+    }
+    if {$ctrl eq {} || "middle" in $ctrl} {
+        if {$failidx == -1} {
+            set result [list $prefix_bytes$bytes$suffix_bytes]
+        } else {
+            set result $errorWithPrefix
+        }
+        testprofile cmdAH-4.4.13.$printable.middle convertto $enc $profile $prefix$str$suffix {*}$result
+    }
 }
 
-# -failindex - invalid data
-foreach {enc string profile hex failidx ctrl comment} $encUnencodableStrings {
+# convertto -failindex ?-profile? - valid data
+foreach {enc str hex} $encValidStrings {
     set bytes [binary decode hex $hex]
+    set printable [printable $str]
+    set prefix A
+    set suffix B
+    set prefix_bytes [encoding convertto $enc A]
+    set suffix_bytes [encoding convertto $enc B]
+    foreach profile $encProfiles {
+        testfailindex cmdAH-4.4.14.$enc.$printable.solo convertto $enc $str [list $bytes -1] $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.lead convertto $enc $str$suffix [list $bytes$suffix_bytes -1] $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.tail convertto $enc $prefix$str [list $prefix_bytes$bytes -1] $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.middle convertto $enc $prefix$str$suffix [list $prefix_bytes$bytes$suffix_bytes -1] $profile
+    }
+}
+
+# convertto -failindex ?-profile? - invalid data
+foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
+    set bytes [binary decode hex $hex]
+    set printable [printable $str]
     set prefix A
     set suffix B
     set prefixLen [string length [encoding convertto $enc $prefix]]
     if {$ctrl eq {} || "solo" in $ctrl} {
-        testfailindex cmdAH-4.4.14.$string.solo convertto $enc $string [list $bytes $failidx] $profile
+        testfailindex cmdAH-4.4.14.$printable.solo convertto $enc $str [list $bytes $failidx] $profile
     }
     if {$ctrl eq {} || "lead" in $ctrl} {
         if {$failidx == -1} {
@@ -787,7 +935,7 @@ foreach {enc string profile hex failidx ctrl comment} $encUnencodableStrings {
             # Failure expected
             set result ""
         }
-        testfailindex cmdAH-4.4.14.$string.lead convertto $enc $string$suffix [list $result $failidx] $profile
+        testfailindex cmdAH-4.4.14.$printable.lead convertto $enc $str$suffix [list $result $failidx] $profile
     }
     if {$ctrl eq {} || "tail" in $ctrl} {
         set expected_failidx $failidx
@@ -799,7 +947,7 @@ foreach {enc string profile hex failidx ctrl comment} $encUnencodableStrings {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.4.14.$string.tail convertto $enc $prefix$string [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.4.14.$printable.tail convertto $enc $prefix$str [list $result $expected_failidx] $profile
     }
     if {$ctrl eq {} || "middle" in $ctrl} {
         set expected_failidx $failidx
@@ -811,46 +959,7 @@ foreach {enc string profile hex failidx ctrl comment} $encUnencodableStrings {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.4.14.$string.middle convertto $enc $prefix$string$suffix [list $result $expected_failidx] $profile
-    }
-}
-
-# convertto -profile
-
-# All valid byte sequences should be accepted by all profiles
-foreach profile $encProfiles {
-    set i 0
-    foreach {enc string bytes} $encValidStrings {
-        testprofile cmdAH-4.4.15 convertto $enc $profile $string $bytes
-    }
-}
-
-# Cycle through the various combinations of encodings and profiles
-# for invalid byte sequences
-foreach {enc string profile hex failidx ctrl comment} $encUnencodableStrings {
-    set bytes [binary decode hex $hex]
-    if {$failidx eq -1} {
-        set result [list $bytes]
-    } else {
-        # TODO - if the bad char is unprintable, tcltest errors out when printing a mismatch
-        # so glob it out for now.
-        set result [list "unexpected character at index $failidx: *" -returnCodes error -match glob]
-    }
-    #testprofile xx convertto $enc $profile $string {*}$result
-    if {$profile eq "default"} {
-        # testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
-        if {"utf-16$endian" eq $enc} {
-            # utf-16le ->utf-16, utf-32be -> utf32 etc.
-            set enc [string range $enc 0 5]
-          #  xxtestconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto $enc $string] {*}$result
-        }
-    } else {
-        # testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
-        if {"utf-16$endian" eq $enc} {
-            # utf-16le ->utf-16, utf-32be -> utf32 etc.
-            set enc [string range $enc 0 5]
-          #  testconvert cmdAH-4.4.15.$enc.$profile.$tag [list encoding convertto -profile $profile $enc $string] {*}$result
-        }
+        testfailindex cmdAH-4.4.14.$printable.middle convertto $enc $prefix$str$suffix [list $result $expected_failidx] $profile
     }
 }
 
-- 
cgit v0.12


From 3d2dc708451191d04cca00561cbed0295a407b11 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 18 Feb 2023 16:25:57 +0000
Subject: Done with invalid utf-8 table

---
 tests/cmdAH.test | 278 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 241 insertions(+), 37 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index df28b2e..ad315d2 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -344,11 +344,17 @@ lappend encInvalidBytes {*}{
     utf-8 E0 replace   \uFFFD     -1 {} {Missing trail byte}
     utf-8 E0 strict    {}          0 {} {Missing trail byte}
     utf-8 E080 tcl8      \u00E0\u20AC   -1 {knownBug} {First trail byte must be A0:BF}
-    utf-8 E080 replace   \uFFFD\uFFFD   -1 {}         {First trail byte must be A0:BF}
-    utf-8 E080 strict    {}              0 {}         {First trail byte must be A0:BF}
+    utf-8 E080 replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
+    utf-8 E080 strict    {}              0 {} {First trail byte must be A0:BF}
     utf-8 E09F tcl8      \u00E0\u0178   -1 {knownBug} {First trail byte must be A0:BF}
-    utf-8 E09F replace   \uFFFD\uFFFD   -1 {}         {First trail byte must be A0:BF}
-    utf-8 E09F strict    {}              0 {}         {First trail byte must be A0:BF}
+    utf-8 E09F replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
+    utf-8 E09F strict    {}              0 {} {First trail byte must be A0:BF}
+    utf-8 E0A0 tcl8      \u00E0\u00A0   -1 {} {Missing second trail byte}
+    utf-8 E0A0 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E0A0 strict    {}              0 {} {Missing second trail byte}
+    utf-8 E0BF tcl8      \u00E0\u00BF   -1 {} {Missing second trail byte}
+    utf-8 E0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E0BF strict    {}              0 {} {Missing second trail byte}
     utf-8 E0A07F tcl8    \u00E0\u00A0\x7F   -1 {}     {Second trail byte must be 80:BF}
     utf-8 E0A07F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 E0A07F strict  {}                  0 {}         {Second trail byte must be 80:BF}
@@ -362,6 +368,12 @@ lappend encInvalidBytes {*}{
     utf-8 E17F tcl8    \u00E1\x7F -1 {} {Trail byte must be 80:BF}
     utf-8 E17F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
     utf-8 E17F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 E181 tcl8      \u00E1\u0081   -1 {} {Missing second trail byte}
+    utf-8 E181 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E181 strict    {}              0 {} {Missing second trail byte}
+    utf-8 E1BF tcl8      \u00E1\u00BF   -1 {} {Missing second trail byte}
+    utf-8 E1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E1BF strict    {}              0 {} {Missing second trail byte}
     utf-8 E1807F tcl8    \u00E1\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
     utf-8 E1807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 E1807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
@@ -374,6 +386,12 @@ lappend encInvalidBytes {*}{
     utf-8 EC7F tcl8    \u00EC\x7F -1 {} {Trail byte must be 80:BF}
     utf-8 EC7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
     utf-8 EC7F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 EC81 tcl8      \u00EC\u0081   -1 {} {Missing second trail byte}
+    utf-8 EC81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EC81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 ECBF tcl8      \u00EC\u00BF   -1 {} {Missing second trail byte}
+    utf-8 ECBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 ECBF strict    {}              0 {} {Missing second trail byte}
     utf-8 EC807F tcl8    \u00EC\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
     utf-8 EC807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 EC807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
@@ -381,39 +399,225 @@ lappend encInvalidBytes {*}{
     utf-8 ECBF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 ECBF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
 
-    utf-8 ED tcl8      \u00ED     -1 {} {Missing trail byte}
-    utf-8 ED replace   \uFFFD     -1 {} {Missing trail byte}
-    utf-8 ED strict    {}          0 {} {Missing trail byte}
-    utf-8 ED7F tcl8      \u00ED\u7F   -1 {knownBug} {First trail byte must be 80:9F}
-    utf-8 ED7F replace   \uFFFD\u7F   -1 {}         {First trail byte must be 80:9F}
-    utf-8 ED7F strict    {}              0 {}         {First trail byte must be 80:9F}
-    utf-8 EDA0 tcl8      \u00ED\u00A0   -1 {knownBug} {First trail byte must be 80:9F}
-    utf-8 EDA0 replace   \uFFFD\uFFFD   -1 {}         {First trail byte must be 80:9F}
-    utf-8 EDA0 strict    {}              0 {}         {First trail byte must be 80:9F}
-    utf-8 ED807F tcl8    \u00ED\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
-    utf-8 ED807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 ED807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-    utf-8 ED9F7F tcl8    \u00ED\u0178\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
-    utf-8 ED9F7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 ED9F7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-    utf-8 EDA080 tcl8       \uD800             -1 {}         {High surrogate}
-    utf-8 EDA080 replace    \uFFFD             -1 {}         {High surrogate}
-    utf-8 EDA080 strict     {}                  0 {}         {High surrogate}
-    utf-8 EDAFBF tcl8       \uDBFF             -1 {}         {High surrogate}
-    utf-8 EDAFBF replace    \uFFFD             -1 {}         {High surrogate}
-    utf-8 EDAFBF strict     {}                  0 {}         {High surrogate}
-    utf-8 EDB080 tcl8       \uDC00             -1 {}         {Low surrogate}
-    utf-8 EDB080 replace    \uFFFD             -1 {}         {Low surrogate}
-    utf-8 EDB080 strict     {}                  0 {}         {Low surrogate}
-    utf-8 EDBFBF tcl8       \uDFFF             -1 {}         {Low surrogate}
-    utf-8 EDBFBF replace    \uFFFD             -1 {}         {Low surrogate}
-    utf-8 EDBFBF strict     {}                  0 {}         {Low surrogate}
-    utf-8 EDA080EDB080 tcl8 \U00010000         -1 {}         {High low surrogate pair}
-    utf-8 EDA080EDB080 replace \uFFFD\uFFFD         -1 {}         {High low surrogate pair}
-    utf-8 EDA080EDB080 strict {}         0 {}         {High low surrogate pair}
-    utf-8 EDAFBFEDBFBF tcl8 \U0010FFFF           -1 {}         {High low surrogate pair}
-    utf-8 EDAFBFEDBFBF replace \uFFFD\uFFFD           -1 {}         {High low surrogate pair}
-    utf-8 EDAFBFEDBFBF strict {}           0 {}         {High low surrogate pair}
+    utf-8 ED tcl8       \u00ED        -1 {} {Missing trail byte}
+    utf-8 ED replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 ED strict     {}             0 {} {Missing trail byte}
+    utf-8 ED7F tcl8     \u00ED\u7F    -1 {knownBug} {First trail byte must be 80:9F}
+    utf-8 ED7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:9F}
+    utf-8 ED7F strict   {}             0 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 tcl8     \u00ED\u00A0  -1 {knownBug} {First trail byte must be 80:9F}
+    utf-8 EDA0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 strict   {}             0 {} {First trail byte must be 80:9F}
+    utf-8 ED81 tcl8      \u00ED\u0081   -1 {} {Missing second trail byte}
+    utf-8 ED81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 ED81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EDBF tcl8      \u00ED\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EDBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EDBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 ED807F tcl8      \u00ED\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 ED807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 ED9F7F tcl8      \u00ED\u0178\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EDA080 tcl8       \uD800          -1 {}  {High surrogate}
+    utf-8 EDA080 replace    \uFFFD          -1 {}  {High surrogate}
+    utf-8 EDA080 strict     {}               0 {}  {High surrogate}
+    utf-8 EDAFBF tcl8       \uDBFF          -1 {}  {High surrogate}
+    utf-8 EDAFBF replace    \uFFFD          -1 {}  {High surrogate}
+    utf-8 EDAFBF strict     {}               0 {}  {High surrogate}
+    utf-8 EDB080 tcl8       \uDC00          -1 {}  {Low surrogate}
+    utf-8 EDB080 replace    \uFFFD          -1 {}  {Low surrogate}
+    utf-8 EDB080 strict     {}               0 {}  {Low surrogate}
+    utf-8 EDBFBF tcl8       \uDFFF          -1 {}  {Low surrogate}
+    utf-8 EDBFBF replace    \uFFFD          -1 {}  {Low surrogate}
+    utf-8 EDBFBF strict     {}               0 {}  {Low surrogate}
+    utf-8 EDA080EDB080 tcl8 \U00010000      -1 {}  {High low surrogate pair}
+    utf-8 EDA080EDB080 replace \uFFFD\uFFFD -1 {}  {High low surrogate pair}
+    utf-8 EDA080EDB080 strict {}             0 {}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF tcl8 \U0010FFFF      -1 {}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF replace \uFFFD\uFFFD -1 {}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF strict {}             0 {}  {High low surrogate pair}
+
+    utf-8 EE tcl8       \u00EE        -1 {} {Missing trail byte}
+    utf-8 EE replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 EE strict     {}             0 {} {Missing trail byte}
+    utf-8 EE7F tcl8     \u00EE\u7F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EE7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EE7F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EED0 tcl8     \u00EE\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EED0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 EED0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EE81 tcl8      \u00EE\u0081   -1 {} {Missing second trail byte}
+    utf-8 EE81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EE81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EEBF tcl8      \u00EE\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EEBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EEBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EE807F tcl8      \u00EE\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 EE807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EE807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EEBF7F tcl8      \u00EE\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EEBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EEBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EF tcl8       \u00EF        -1 {} {Missing trail byte}
+    utf-8 EF replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 EF strict     {}             0 {} {Missing trail byte}
+    utf-8 EF7F tcl8     \u00EF\u7F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EF7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EF7F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 tcl8     \u00EF\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EFD0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EF81 tcl8      \u00EF\u0081   -1 {} {Missing second trail byte}
+    utf-8 EF81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EF81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EFBF tcl8      \u00EF\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EFBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EFBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EF807F tcl8      \u00EF\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 EF807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EF807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EFBF7F tcl8      \u00EF\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EFBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EFBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+
+    utf-8 F0 tcl8       \u00F0        -1 {} {Missing trail byte}
+    utf-8 F0 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F0 strict     {}             0 {} {Missing trail byte}
+    utf-8 F08F tcl8     \u00F0\u8F    -1 {knownBug} {First trail byte must be 90:BF}
+    utf-8 F08F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
+    utf-8 F08F strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 tcl8     \u00F0\u00D0  -1 {knownBug} {First trail byte must be 90:BF}
+    utf-8 F0D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F090 tcl8      \u00F0\u0090   -1 {} {Missing second trail byte}
+    utf-8 F090 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F090 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F0BF tcl8      \u00F0\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F0BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F0907F tcl8      \u00F0\u0090\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F0907F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F0907F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F0BF7F tcl8      \u00F0\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F0BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F0BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F090BF tcl8      \u00F0\u0090\u00BF   -1 {} {Missing third trail byte}
+    utf-8 F090BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F090BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F0BF81 tcl8      \u00F0\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F0BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F0BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F0BF807F tcl8      \u00F0\u00BF\u20AC\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F0BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F0BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 tcl8      \u00F0\u0090\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F1 tcl8       \u00F1        -1 {} {Missing trail byte}
+    utf-8 F1 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F1 strict     {}             0 {} {Missing trail byte}
+    utf-8 F17F tcl8     \u00F1\u8F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F17F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
+    utf-8 F17F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 tcl8     \u00F1\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F1D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F180 tcl8      \u00F1\u0080   -1 {} {Missing second trail byte}
+    utf-8 F180 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F180 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F1BF tcl8      \u00F1\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F1BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F1807F tcl8      \u00F1\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F1807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F1807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F1BF7F tcl8      \u00F1\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F1BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F1BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F180BF tcl8      \u00F1\u20AC\u00BF   -1 {knownBug} {Missing third trail byte}
+    utf-8 F180BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F180BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F1BF81 tcl8      \u00F1\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F1BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F1BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F1BF807F tcl8      \u00F1\u00BF\u20AC\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F1BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F1BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 tcl8      \u00F1\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F3 tcl8       \u00F3        -1 {} {Missing trail byte}
+    utf-8 F3 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F3 strict     {}             0 {} {Missing trail byte}
+    utf-8 F37F tcl8     \u00F3\u8F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F37F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
+    utf-8 F37F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 tcl8     \u00F3\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F3D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F380 tcl8      \u00F3\u0080   -1 {} {Missing second trail byte}
+    utf-8 F380 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F380 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F3BF tcl8      \u00F3\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F3BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F3BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F3807F tcl8      \u00F3\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F3807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F3807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F3BF7F tcl8      \u00F3\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F3BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F3BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F380BF tcl8      \u00F3\u20AC\u00BF   -1 {knownBug} {Missing third trail byte}
+    utf-8 F380BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F380BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F3BF81 tcl8      \u00F3\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F3BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F3BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F3BF807F tcl8      \u00F3\u00BF\u20AC\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F3BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F3BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 tcl8      \u00F3\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F4 tcl8       \u00F4        -1 {} {Missing trail byte}
+    utf-8 F4 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F4 strict     {}             0 {} {Missing trail byte}
+    utf-8 F47F tcl8     \u00F4\u7F    -1 {knownBug} {First trail byte must be 80:8F}
+    utf-8 F47F replace  \uFFFD\u7F    -1 {knownW3C} {First trail byte must be 80:8F}
+    utf-8 F47F strict   {}             0 {} {First trail byte must be 80:8F}
+    utf-8 F490 tcl8     \u00F4\u0090  -1 {knownBug} {First trail byte must be 80:8F}
+    utf-8 F490 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:8F}
+    utf-8 F490 strict   {}             0 {} {First trail byte must be 80:8F}
+    utf-8 F480 tcl8      \u00F4\u0080   -1 {} {Missing second trail byte}
+    utf-8 F480 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F480 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F48F tcl8      \u00F4\u008F   -1 {} {Missing second trail byte}
+    utf-8 F48F replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F48F strict    {}              0 {} {Missing second trail byte}
+    utf-8 F4807F tcl8      \u00F4\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F4807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F4807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F48F7F tcl8      \u00F4\u008F\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F48F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F48F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F48081 tcl8      \u00F4\u20AC\u0081   -1 {knownBug} {Missing third trail byte}
+    utf-8 F48081 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F48081 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F48F81 tcl8      \u00F4\u008F\u0081   -1 {} {Missing third trail byte}
+    utf-8 F48F81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F48F81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F481817F tcl8      \u00F4\u0081\u0081\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F480817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F480817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 tcl8      \u00F4\u008F\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+
 
     utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
-- 
cgit v0.12


From 41c5d1cd91756ac3614489931ebe22a4095a6cf9 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 18 Feb 2023 17:41:44 +0000
Subject: Minor refactoring/fixes after merge

---
 generic/tclEncoding.c | 42 ++++++++++--------------------------------
 tests/encoding.test   |  4 ++--
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 2095b4c..7e5ec22 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2452,38 +2452,16 @@ UtfToUtfProc(
 			       : TCL_CONVERT_SYNTAX;
 		    break;
 		}
-		if (PROFILE_REPLACE(profile)) {
-		    ch = UNICODE_REPLACE_CHAR;
-                    ++src;
-		} else {
-		    /* TCL_ENCODING_PROFILE_TCL8 */
-		    ch = UCHAR(*src);
-                    char chbuf[2];
-                    chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
-                    TclUtfToUCS4(chbuf, &ch);
-		}
-	    }
-	    else {
-		/*
-		 * Incomplete bytes for real UTF-8 target.
-		 * TODO - no profile check here because did not have any
-		 * checks in the pre-profile code. Why? Is it because on
-		 * output a valid internal utf-8 stream is assumed?
-		 */
-		char chbuf[2];
-		/*
-		 * TODO - this code seems broken to me.
-		 * - it does not check profiles
-		 * - generates invalid output for real UTF-8 target
-		 *   (consider \xC2)
-		 * A possible explanation is this behavior matches the
-		 * Tcl8 decoding behavior of mapping invalid bytes to the same
-		 * code point value. Still, at least strictness checks should
-		 * be made.
-		 */
-		chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
-		TclUtfToUCS4(chbuf, &ch);
-	    }
+            }
+            if (PROFILE_REPLACE(profile)) {
+                ch = UNICODE_REPLACE_CHAR;
+                ++src;
+            } else {
+                /* TCL_ENCODING_PROFILE_TCL8 */
+                char chbuf[2];
+                chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
+                TclUtfToUCS4(chbuf, &ch);
+            }
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
 	else {
diff --git a/tests/encoding.test b/tests/encoding.test
index 36728d1..7199138 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -848,10 +848,10 @@ test encoding-24.41 {Parse invalid utf-8 with -profile strict} -body {
     encoding convertfrom -profile strict utf-8 \xED\xA0\x80\xED\xB0\x80
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\xED'}
 test encoding-24.42 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
-    encoding convertfrom -nocomplain utf-8 \xF0\x80\x80\x80
+    encoding convertfrom -profile tcl8 utf-8 \xF0\x80\x80\x80
 } -result \xF0\u20AC\u20AC\u20AC
 test encoding-24.43 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
-    encoding convertfrom -nocomplain utf-8 \x80
+    encoding convertfrom -profile tcl8 utf-8 \x80
 } -result \u20AC
 
 file delete [file join [temporaryDirectory] iso2022.txt]
-- 
cgit v0.12


From 9f595d2fa36d13395f1bfb16559f7519c08e873f Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 19 Feb 2023 07:40:29 +0000
Subject: Remove knownBug test constraints now that fix has been merged from
 core-8-branch

---
 tests/cmdAH.test | 131 +++++++++++++++++++++++++++----------------------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 11a8188..faa604a 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -278,41 +278,40 @@ lappend encInvalidBytes {*}{
 # (UtfToUtfProc).
 # Note C0, C1, F5:FF are invalid bytes ANYWHERE. Exception is C080
 lappend encInvalidBytes {*}{
-    utf-8 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
-    utf-8 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
+    utf-8 80 tcl8    \u20AC -1 {} {map to cp1252}
     utf-8 80 replace \uFFFD -1 {} {Smallest invalid byte}
     utf-8 80 strict  {}      0 {} {Smallest invalid byte}
-    utf-8 81 tcl8    \u0081 -1 {knownBug} {map to cp1252}
-    utf-8 82 tcl8    \u201A -1 {knownBug} {map to cp1252}
-    utf-8 83 tcl8    \u0192 -1 {knownBug} {map to cp1252}
-    utf-8 84 tcl8    \u201E -1 {knownBug} {map to cp1252}
-    utf-8 85 tcl8    \u2026 -1 {knownBug} {map to cp1252}
-    utf-8 86 tcl8    \u2020 -1 {knownBug} {map to cp1252}
-    utf-8 87 tcl8    \u2021 -1 {knownBug} {map to cp1252}
-    utf-8 88 tcl8    \u0276 -1 {knownBug} {map to cp1252}
-    utf-8 89 tcl8    \u2030 -1 {knownBug} {map to cp1252}
-    utf-8 8A tcl8    \u0160 -1 {knownBug} {map to cp1252}
-    utf-8 8B tcl8    \u2039 -1 {knownBug} {map to cp1252}
-    utf-8 8C tcl8    \u0152 -1 {knownBug} {map to cp1252}
-    utf-8 8D tcl8    \u008D -1 {knownBug} {map to cp1252}
-    utf-8 8E tcl8    \u017D -1 {knownBug} {map to cp1252}
-    utf-8 8F tcl8    \u008F -1 {knownBug} {map to cp1252}
-    utf-8 90 tcl8    \u0090 -1 {knownBug} {map to cp1252}
-    utf-8 91 tcl8    \u2018 -1 {knownBug} {map to cp1252}
-    utf-8 92 tcl8    \u2019 -1 {knownBug} {map to cp1252}
-    utf-8 93 tcl8    \u201C -1 {knownBug} {map to cp1252}
-    utf-8 94 tcl8    \u201D -1 {knownBug} {map to cp1252}
-    utf-8 95 tcl8    \u2022 -1 {knownBug} {map to cp1252}
-    utf-8 96 tcl8    \u2013 -1 {knownBug} {map to cp1252}
-    utf-8 97 tcl8    \u2014 -1 {knownBug} {map to cp1252}
-    utf-8 98 tcl8    \u02DC -1 {knownBug} {map to cp1252}
-    utf-8 99 tcl8    \u2122 -1 {knownBug} {map to cp1252}
-    utf-8 9A tcl8    \u0161 -1 {knownBug} {map to cp1252}
-    utf-8 9B tcl8    \u203A -1 {knownBug} {map to cp1252}
-    utf-8 9C tcl8    \u0153 -1 {knownBug} {map to cp1252}
-    utf-8 9D tcl8    \u009D -1 {knownBug} {map to cp1252}
-    utf-8 9E tcl8    \u017E -1 {knownBug} {map to cp1252}
-    utf-8 9F tcl8    \u0178 -1 {knownBug} {map to cp1252}
+    utf-8 81 tcl8    \u0081 -1 {} {map to cp1252}
+    utf-8 82 tcl8    \u201A -1 {} {map to cp1252}
+    utf-8 83 tcl8    \u0192 -1 {} {map to cp1252}
+    utf-8 84 tcl8    \u201E -1 {} {map to cp1252}
+    utf-8 85 tcl8    \u2026 -1 {} {map to cp1252}
+    utf-8 86 tcl8    \u2020 -1 {} {map to cp1252}
+    utf-8 87 tcl8    \u2021 -1 {} {map to cp1252}
+    utf-8 88 tcl8    \u02C6 -1 {} {map to cp1252}
+    utf-8 89 tcl8    \u2030 -1 {} {map to cp1252}
+    utf-8 8A tcl8    \u0160 -1 {} {map to cp1252}
+    utf-8 8B tcl8    \u2039 -1 {} {map to cp1252}
+    utf-8 8C tcl8    \u0152 -1 {} {map to cp1252}
+    utf-8 8D tcl8    \u008D -1 {} {map to cp1252}
+    utf-8 8E tcl8    \u017D -1 {} {map to cp1252}
+    utf-8 8F tcl8    \u008F -1 {} {map to cp1252}
+    utf-8 90 tcl8    \u0090 -1 {} {map to cp1252}
+    utf-8 91 tcl8    \u2018 -1 {} {map to cp1252}
+    utf-8 92 tcl8    \u2019 -1 {} {map to cp1252}
+    utf-8 93 tcl8    \u201C -1 {} {map to cp1252}
+    utf-8 94 tcl8    \u201D -1 {} {map to cp1252}
+    utf-8 95 tcl8    \u2022 -1 {} {map to cp1252}
+    utf-8 96 tcl8    \u2013 -1 {} {map to cp1252}
+    utf-8 97 tcl8    \u2014 -1 {} {map to cp1252}
+    utf-8 98 tcl8    \u02DC -1 {} {map to cp1252}
+    utf-8 99 tcl8    \u2122 -1 {} {map to cp1252}
+    utf-8 9A tcl8    \u0161 -1 {} {map to cp1252}
+    utf-8 9B tcl8    \u203A -1 {} {map to cp1252}
+    utf-8 9C tcl8    \u0153 -1 {} {map to cp1252}
+    utf-8 9D tcl8    \u009D -1 {} {map to cp1252}
+    utf-8 9E tcl8    \u017E -1 {} {map to cp1252}
+    utf-8 9F tcl8    \u0178 -1 {} {map to cp1252}
 
     utf-8 C0 tcl8    \u00C0 -1 {} {C0 is invalid anywhere}
     utf-8 C0 strict  {}      0 {} {C0 is invalid anywhere}
@@ -343,10 +342,10 @@ lappend encInvalidBytes {*}{
     utf-8 E0 tcl8      \u00E0     -1 {} {Missing trail byte}
     utf-8 E0 replace   \uFFFD     -1 {} {Missing trail byte}
     utf-8 E0 strict    {}          0 {} {Missing trail byte}
-    utf-8 E080 tcl8      \u00E0\u20AC   -1 {knownBug} {First trail byte must be A0:BF}
+    utf-8 E080 tcl8      \u00E0\u20AC   -1 {} {First trail byte must be A0:BF}
     utf-8 E080 replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
     utf-8 E080 strict    {}              0 {} {First trail byte must be A0:BF}
-    utf-8 E09F tcl8      \u00E0\u0178   -1 {knownBug} {First trail byte must be A0:BF}
+    utf-8 E09F tcl8      \u00E0\u0178   -1 {} {First trail byte must be A0:BF}
     utf-8 E09F replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
     utf-8 E09F strict    {}              0 {} {First trail byte must be A0:BF}
     utf-8 E0A0 tcl8      \u00E0\u00A0   -1 {} {Missing second trail byte}
@@ -374,7 +373,7 @@ lappend encInvalidBytes {*}{
     utf-8 E1BF tcl8      \u00E1\u00BF   -1 {} {Missing second trail byte}
     utf-8 E1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 E1BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 E1807F tcl8    \u00E1\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 E1807F tcl8    \u00E1\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
     utf-8 E1807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 E1807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
     utf-8 E1BF7F tcl8    \u00E1\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
@@ -392,7 +391,7 @@ lappend encInvalidBytes {*}{
     utf-8 ECBF tcl8      \u00EC\u00BF   -1 {} {Missing second trail byte}
     utf-8 ECBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 ECBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 EC807F tcl8    \u00EC\u20AC\x7F   -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 EC807F tcl8    \u00EC\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
     utf-8 EC807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 EC807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
     utf-8 ECBF7F tcl8    \u00EC\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
@@ -402,10 +401,10 @@ lappend encInvalidBytes {*}{
     utf-8 ED tcl8       \u00ED        -1 {} {Missing trail byte}
     utf-8 ED replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 ED strict     {}             0 {} {Missing trail byte}
-    utf-8 ED7F tcl8     \u00ED\u7F    -1 {knownBug} {First trail byte must be 80:9F}
+    utf-8 ED7F tcl8     \u00ED\u7F    -1 {} {First trail byte must be 80:9F}
     utf-8 ED7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:9F}
     utf-8 ED7F strict   {}             0 {} {First trail byte must be 80:9F}
-    utf-8 EDA0 tcl8     \u00ED\u00A0  -1 {knownBug} {First trail byte must be 80:9F}
+    utf-8 EDA0 tcl8     \u00ED\u00A0  -1 {} {First trail byte must be 80:9F}
     utf-8 EDA0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:9F}
     utf-8 EDA0 strict   {}             0 {} {First trail byte must be 80:9F}
     utf-8 ED81 tcl8      \u00ED\u0081   -1 {} {Missing second trail byte}
@@ -414,10 +413,10 @@ lappend encInvalidBytes {*}{
     utf-8 EDBF tcl8      \u00ED\u00BF   -1 {} {Missing second trail byte}
     utf-8 EDBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 EDBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 ED807F tcl8      \u00ED\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 ED807F tcl8      \u00ED\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 ED807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 ED807F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 ED9F7F tcl8      \u00ED\u0178\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F tcl8      \u00ED\u0178\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 ED9F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 ED9F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
     utf-8 EDA080 tcl8       \uD800          -1 {}  {High surrogate}
@@ -442,10 +441,10 @@ lappend encInvalidBytes {*}{
     utf-8 EE tcl8       \u00EE        -1 {} {Missing trail byte}
     utf-8 EE replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 EE strict     {}             0 {} {Missing trail byte}
-    utf-8 EE7F tcl8     \u00EE\u7F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EE7F tcl8     \u00EE\u7F    -1 {} {First trail byte must be 80:BF}
     utf-8 EE7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
     utf-8 EE7F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 EED0 tcl8     \u00EE\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EED0 tcl8     \u00EE\u00D0  -1 {} {First trail byte must be 80:BF}
     utf-8 EED0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
     utf-8 EED0 strict   {}             0 {} {First trail byte must be 80:BF}
     utf-8 EE81 tcl8      \u00EE\u0081   -1 {} {Missing second trail byte}
@@ -454,7 +453,7 @@ lappend encInvalidBytes {*}{
     utf-8 EEBF tcl8      \u00EE\u00BF   -1 {} {Missing second trail byte}
     utf-8 EEBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 EEBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 EE807F tcl8      \u00EE\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 EE807F tcl8      \u00EE\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 EE807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 EE807F strict    {}                0 {}  {Second trail byte must be 80:BF}
     utf-8 EEBF7F tcl8      \u00EE\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
@@ -463,10 +462,10 @@ lappend encInvalidBytes {*}{
     utf-8 EF tcl8       \u00EF        -1 {} {Missing trail byte}
     utf-8 EF replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 EF strict     {}             0 {} {Missing trail byte}
-    utf-8 EF7F tcl8     \u00EF\u7F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EF7F tcl8     \u00EF\u7F    -1 {} {First trail byte must be 80:BF}
     utf-8 EF7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
     utf-8 EF7F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 EFD0 tcl8     \u00EF\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 EFD0 tcl8     \u00EF\u00D0  -1 {} {First trail byte must be 80:BF}
     utf-8 EFD0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
     utf-8 EFD0 strict   {}             0 {} {First trail byte must be 80:BF}
     utf-8 EF81 tcl8      \u00EF\u0081   -1 {} {Missing second trail byte}
@@ -475,7 +474,7 @@ lappend encInvalidBytes {*}{
     utf-8 EFBF tcl8      \u00EF\u00BF   -1 {} {Missing second trail byte}
     utf-8 EFBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 EFBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 EF807F tcl8      \u00EF\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 EF807F tcl8      \u00EF\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 EF807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 EF807F strict    {}                0 {}  {Second trail byte must be 80:BF}
     utf-8 EFBF7F tcl8      \u00EF\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
@@ -485,10 +484,10 @@ lappend encInvalidBytes {*}{
     utf-8 F0 tcl8       \u00F0        -1 {} {Missing trail byte}
     utf-8 F0 replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 F0 strict     {}             0 {} {Missing trail byte}
-    utf-8 F08F tcl8     \u00F0\u8F    -1 {knownBug} {First trail byte must be 90:BF}
+    utf-8 F08F tcl8     \u00F0\u8F    -1 {} {First trail byte must be 90:BF}
     utf-8 F08F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
     utf-8 F08F strict   {}             0 {} {First trail byte must be 90:BF}
-    utf-8 F0D0 tcl8     \u00F0\u00D0  -1 {knownBug} {First trail byte must be 90:BF}
+    utf-8 F0D0 tcl8     \u00F0\u00D0  -1 {} {First trail byte must be 90:BF}
     utf-8 F0D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 90:BF}
     utf-8 F0D0 strict   {}             0 {} {First trail byte must be 90:BF}
     utf-8 F090 tcl8      \u00F0\u0090   -1 {} {Missing second trail byte}
@@ -497,7 +496,7 @@ lappend encInvalidBytes {*}{
     utf-8 F0BF tcl8      \u00F0\u00BF   -1 {} {Missing second trail byte}
     utf-8 F0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 F0BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 F0907F tcl8      \u00F0\u0090\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F0907F tcl8      \u00F0\u0090\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 F0907F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 F0907F strict    {}                0 {}  {Second trail byte must be 80:BF}
     utf-8 F0BF7F tcl8      \u00F0\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
@@ -509,7 +508,7 @@ lappend encInvalidBytes {*}{
     utf-8 F0BF81 tcl8      \u00F0\u00BF\u0081   -1 {} {Missing third trail byte}
     utf-8 F0BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
     utf-8 F0BF81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F0BF807F tcl8      \u00F0\u00BF\u20AC\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F0BF807F tcl8      \u00F0\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
     utf-8 F0BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
     utf-8 F0BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
     utf-8 F090BFD0 tcl8      \u00F0\u0090\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
@@ -519,10 +518,10 @@ lappend encInvalidBytes {*}{
     utf-8 F1 tcl8       \u00F1        -1 {} {Missing trail byte}
     utf-8 F1 replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 F1 strict     {}             0 {} {Missing trail byte}
-    utf-8 F17F tcl8     \u00F1\u8F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F17F tcl8     \u00F1\u7F    -1 {} {First trail byte must be 80:BF}
     utf-8 F17F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
     utf-8 F17F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 F1D0 tcl8     \u00F1\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F1D0 tcl8     \u00F1\u00D0  -1 {} {First trail byte must be 80:BF}
     utf-8 F1D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
     utf-8 F1D0 strict   {}             0 {} {First trail byte must be 80:BF}
     utf-8 F180 tcl8      \u00F1\u20AC   -1 {} {Missing second trail byte}
@@ -531,19 +530,19 @@ lappend encInvalidBytes {*}{
     utf-8 F1BF tcl8      \u00F1\u00BF   -1 {} {Missing second trail byte}
     utf-8 F1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 F1BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 F1807F tcl8      \u00F1\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F1807F tcl8      \u00F1\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 F1807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 F1807F strict    {}                0 {}  {Second trail byte must be 80:BF}
     utf-8 F1BF7F tcl8      \u00F1\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 F1BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 F1BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F180BF tcl8      \u00F1\u20AC\u00BF   -1 {knownBug} {Missing third trail byte}
+    utf-8 F180BF tcl8      \u00F1\u20AC\u00BF   -1 {} {Missing third trail byte}
     utf-8 F180BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
     utf-8 F180BF strict    {}              0 {} {Missing third trail byte}
     utf-8 F1BF81 tcl8      \u00F1\u00BF\u0081   -1 {} {Missing third trail byte}
     utf-8 F1BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
     utf-8 F1BF81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F1BF807F tcl8      \u00F1\u00BF\u20AC\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F1BF807F tcl8      \u00F1\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
     utf-8 F1BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
     utf-8 F1BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
     utf-8 F180BFD0 tcl8      \u00F1\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
@@ -552,10 +551,10 @@ lappend encInvalidBytes {*}{
     utf-8 F3 tcl8       \u00F3        -1 {} {Missing trail byte}
     utf-8 F3 replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 F3 strict     {}             0 {} {Missing trail byte}
-    utf-8 F37F tcl8     \u00F3\u8F    -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F37F tcl8     \u00F3\x7F    -1 {} {First trail byte must be 80:BF}
     utf-8 F37F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
     utf-8 F37F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 F3D0 tcl8     \u00F3\u00D0  -1 {knownBug} {First trail byte must be 80:BF}
+    utf-8 F3D0 tcl8     \u00F3\u00D0  -1 {} {First trail byte must be 80:BF}
     utf-8 F3D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
     utf-8 F3D0 strict   {}             0 {} {First trail byte must be 80:BF}
     utf-8 F380 tcl8      \u00F3\u20AC   -1 {} {Missing second trail byte}
@@ -564,19 +563,19 @@ lappend encInvalidBytes {*}{
     utf-8 F3BF tcl8      \u00F3\u00BF   -1 {} {Missing second trail byte}
     utf-8 F3BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 F3BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 F3807F tcl8      \u00F3\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F3807F tcl8      \u00F3\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 F3807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 F3807F strict    {}                0 {}  {Second trail byte must be 80:BF}
     utf-8 F3BF7F tcl8      \u00F3\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 F3BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 F3BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F380BF tcl8      \u00F3\u20AC\u00BF   -1 {knownBug} {Missing third trail byte}
+    utf-8 F380BF tcl8      \u00F3\u20AC\u00BF   -1 {} {Missing third trail byte}
     utf-8 F380BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
     utf-8 F380BF strict    {}              0 {} {Missing third trail byte}
     utf-8 F3BF81 tcl8      \u00F3\u00BF\u0081   -1 {} {Missing third trail byte}
     utf-8 F3BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
     utf-8 F3BF81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F3BF807F tcl8      \u00F3\u00BF\u20AC\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F3BF807F tcl8      \u00F3\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
     utf-8 F3BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
     utf-8 F3BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
     utf-8 F380BFD0 tcl8      \u00F3\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
@@ -586,10 +585,10 @@ lappend encInvalidBytes {*}{
     utf-8 F4 tcl8       \u00F4        -1 {} {Missing trail byte}
     utf-8 F4 replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 F4 strict     {}             0 {} {Missing trail byte}
-    utf-8 F47F tcl8     \u00F4\u7F    -1 {knownBug} {First trail byte must be 80:8F}
+    utf-8 F47F tcl8     \u00F4\u7F    -1 {} {First trail byte must be 80:8F}
     utf-8 F47F replace  \uFFFD\u7F    -1 {knownW3C} {First trail byte must be 80:8F}
     utf-8 F47F strict   {}             0 {} {First trail byte must be 80:8F}
-    utf-8 F490 tcl8     \u00F4\u0090  -1 {knownBug} {First trail byte must be 80:8F}
+    utf-8 F490 tcl8     \u00F4\u0090  -1 {} {First trail byte must be 80:8F}
     utf-8 F490 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:8F}
     utf-8 F490 strict   {}             0 {} {First trail byte must be 80:8F}
     utf-8 F480 tcl8      \u00F4\u20AC   -1 {} {Missing second trail byte}
@@ -598,19 +597,19 @@ lappend encInvalidBytes {*}{
     utf-8 F48F tcl8      \u00F4\u008F   -1 {} {Missing second trail byte}
     utf-8 F48F replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
     utf-8 F48F strict    {}              0 {} {Missing second trail byte}
-    utf-8 F4807F tcl8      \u00F4\u20AC\x7F -1 {knownBug} {Second trail byte must be 80:BF}
+    utf-8 F4807F tcl8      \u00F4\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 F4807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 F4807F strict    {}                0 {}  {Second trail byte must be 80:BF}
     utf-8 F48F7F tcl8      \u00F4\u008F\x7F -1 {} {Second trail byte must be 80:BF}
     utf-8 F48F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
     utf-8 F48F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F48081 tcl8      \u00F4\u20AC\u0081   -1 {knownBug} {Missing third trail byte}
+    utf-8 F48081 tcl8      \u00F4\u20AC\u0081   -1 {} {Missing third trail byte}
     utf-8 F48081 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
     utf-8 F48081 strict    {}              0 {} {Missing third trail byte}
     utf-8 F48F81 tcl8      \u00F4\u008F\u0081   -1 {} {Missing third trail byte}
     utf-8 F48F81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
     utf-8 F48F81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F481817F tcl8      \u00F4\u0081\u0081\x7F   -1 {knownBug} {Third trail byte must be 80:BF}
+    utf-8 F481817F tcl8      \u00F4\u0081\u0081\x7F   -1 {} {Third trail byte must be 80:BF}
     utf-8 F480817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
     utf-8 F480817F strict    {}              0 {} {Third trail byte must be 80:BF}
     utf-8 F48FBFD0 tcl8      \u00F4\u008F\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
-- 
cgit v0.12


From 23d9ca0ec4772f703cd24c476d5fa485fd91e828 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 19 Feb 2023 11:41:44 +0000
Subject: Proposed fix for [5607d6482c]: strict ucs-2 never implemented (TIP
 #346/#656)

---
 generic/tclEncoding.c | 36 ++++++++++++++++++++++++------------
 tests/encoding.test   |  8 +++++++-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 1d3a3eb..d2b0efc 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -573,13 +573,13 @@ TclInitEncodingSubsystem(void)
     type.freeProc	= NULL;
     type.nullSize	= 2;
     type.encodingName   = "ucs-2le";
-    type.clientData	= INT2PTR(TCL_ENCODING_LE|TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(TCL_ENCODING_LE);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2be";
-    type.clientData	= INT2PTR(TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(0);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2";
-    type.clientData	= INT2PTR(isLe.c|TCL_ENCODING_NOCOMPLAIN);
+    type.clientData	= INT2PTR(isLe.c);
     Tcl_CreateEncoding(&type);
 
     type.toUtfProc	= Utf32ToUtfProc;
@@ -601,13 +601,13 @@ TclInitEncodingSubsystem(void)
     type.freeProc	= NULL;
     type.nullSize	= 2;
     type.encodingName   = "utf-16le";
-    type.clientData	= INT2PTR(TCL_ENCODING_LE);
+    type.clientData	= INT2PTR(TCL_ENCODING_LE|ENCODING_UTF);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-16be";
-    type.clientData	= INT2PTR(0);
+    type.clientData	= INT2PTR(ENCODING_UTF);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-16";
-    type.clientData	= INT2PTR(isLe.c);
+    type.clientData	= INT2PTR(isLe.c|ENCODING_UTF);
     Tcl_CreateEncoding(&type);
 
 #ifndef TCL_NO_DEPRECATED
@@ -2984,10 +2984,7 @@ UtfToUcs2Proc(
 				 * output buffer. */
 {
     const char *srcStart, *srcEnd, *srcClose, *dstStart, *dstEnd;
-    int result, numChars;
-#if TCL_UTF_MAX < 4
-    int len;
-#endif
+    int result, numChars, len;
     Tcl_UniChar ch = 0;
 
     flags |= PTR2INT(clientData);
@@ -3017,17 +3014,32 @@ UtfToUcs2Proc(
 	    break;
 	}
 #if TCL_UTF_MAX < 4
-	src += (len = TclUtfToUniChar(src, &ch));
+	len = TclUtfToUniChar(src, &ch);
 	if ((ch >= 0xD800) && (len < 3)) {
+	    if (STOPONERROR) {
+			result = TCL_CONVERT_UNKNOWN;
+			break;
+	    }
+	    src += len;
 	    src += TclUtfToUniChar(src, &ch);
 	    ch = 0xFFFD;
 	}
 #else
-	src += TclUtfToUniChar(src, &ch);
+	len = TclUtfToUniChar(src, &ch);
 	if (ch > 0xFFFF) {
+	    if (STOPONERROR) {
+			result = TCL_CONVERT_UNKNOWN;
+			break;
+	    }
 	    ch = 0xFFFD;
 	}
 #endif
+	if (STOPONERROR && ((ch & ~0x7FF) == 0xD800)) {
+	    result = TCL_CONVERT_SYNTAX;
+	    break;
+	}
+
+	src += len;
 
 	/*
 	 * Need to handle this in a way that won't cause misalignment by
diff --git a/tests/encoding.test b/tests/encoding.test
index 03f0273..83e75be 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -561,7 +561,7 @@ test encoding-16.9 {
 test encoding-17.1 {UtfToUtf16Proc} -body {
     encoding convertto utf-16 "\U460DC"
 } -result "\xD8\xD8\xDC\xDC"
-test encoding-17.2 {UtfToUcs2Proc} -body {
+test encoding-17.2 {UtfToUcs2Proc, invalid testcase, see [5607d6482c]} -constraints deprecated -body {
     encoding convertfrom utf-16 [encoding convertto ucs-2 "\U460DC"]
 } -result "\uFFFD"
 test encoding-17.3 {UtfToUtf16Proc} -body {
@@ -853,6 +853,12 @@ test encoding-24.42 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body
 test encoding-24.43 {Parse invalid utf-8, fallback to cp1252 [885c86a9a0]} -body {
     encoding convertfrom -nocomplain utf-8 \x80
 } -result \u20AC
+test encoding-24.44 {Try to generate invalid ucs-2 with -strict} -body {
+    encoding convertto -strict ucs-2 \uD800
+} -returnCodes 1 -result {unexpected character at index 0: 'U+00D800'}
+test encoding-24.45 {Try to generate invalid ucs-2 with -strict} -body {
+    encoding convertto -strict ucs-2 \U10000
+} -returnCodes 1 -result {unexpected character at index 0: 'U+010000'}
 
 file delete [file join [temporaryDirectory] iso2022.txt]
 
-- 
cgit v0.12


From 41af9f9e84d0b6cee2116ff08e297db05786e6ce Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 20 Feb 2023 15:08:58 +0000
Subject: Add UTF16 and UTF32 tests

---
 tests/cmdAH.test | 193 +++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 137 insertions(+), 56 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index faa604a..1fbe6d2 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -185,15 +185,58 @@ set encDefaultProfile tcl8; # Should reflect the default from implementation
 
 # TODO - valid sequences for different encodings - shiftjis etc.
 # Note utf-16, utf-32 missing because they are automatically
-# generated based on le/be versions. Also add all ranges from Unicode standard
-# Table 3.7
+# generated based on le/be versions.
 set encValidStrings {
-    ascii    ABC                           414243
-    utf-8    A\u0000\u03A9\u8A9E\U00010384 4100CEA9E8AA9EF0908E84
-    utf-16le A\u0000\u03A9\u8A9E\U00010384 41000000A9039E8A00D884DF
-    utf-16be A\u0000\u03A9\u8A9E\U00010384 0041000003A98A9ED800DF84
-    utf-32le A\u0000\u03A9\u8A9E\U00010384 4100000000000000A90300009E8A000084030100
-    utf-32be A\u0000\u03A9\u8A9E\U00010384 0000004100000000000003A900008A9E00010384
+    ascii    \u0000 00 {} {Lowest ASCII}
+    ascii    \u007F 7F knownBug {Highest ASCII}
+
+    utf-8    \u0000 00 {} {Unicode Table 3.7 Row 1}
+    utf-8    \u007F 7F {} {Unicode Table 3.7 Row 1}
+    utf-8    \u0080 C280 {} {Unicode Table 3.7 Row 2}
+    utf-8    \u07FF DFBF {} {Unicode Table 3.7 Row 2}
+    utf-8    \u0800 E0A080 {} {Unicode Table 3.7 Row 3}
+    utf-8    \u0FFF E0BFBF {} {Unicode Table 3.7 Row 3}
+    utf-8    \u1000 E18080 {} {Unicode Table 3.7 Row 4}
+    utf-8    \uCFFF ECBFBF {} {Unicode Table 3.7 Row 4}
+    utf-8    \uD000 ED8080 {} {Unicode Table 3.7 Row 5}
+    utf-8    \uD7FF ED9FBF {} {Unicode Table 3.7 Row 5}
+    utf-8    \uE000 EE8080 {} {Unicode Table 3.7 Row 6}
+    utf-8    \uFFFF EFBFBF {} {Unicode Table 3.7 Row 6}
+    utf-8    \U10000 F0908080 {} {Unicode Table 3.7 Row 7}
+    utf-8    \U3FFFF F0BFBFBF {} {Unicode Table 3.7 Row 7}
+    utf-8    \U40000 F1808080 {} {Unicode Table 3.7 Row 8}
+    utf-8    \UFFFFF F3BFBFBF {} {Unicode Table 3.7 Row 8}
+    utf-8    \U100000 F4808080 {} {Unicode Table 3.7 Row 9}
+    utf-8    \U10FFFF F48FBFBF {} {Unicode Table 3.7 Row 9}
+    utf-8    A\u03A9\u8A9E\U00010384 41CEA9E8AA9EF0908E84 {} {Unicode 2.5}
+
+    utf-16le \u0000 0000 {} {Lowest code unit}
+    utf-16le \uD7FF FFD7 {} {Below high surrogate range}
+    utf-16le \uE000 00E0 {} {Above low surrogate range}
+    utf-16le \uFFFF FFFF {} {Highest code unit}
+    utf-16le \U010000 00D800DC {} {First surrogate pair}
+    utf-16le \U10FFFF FFDBFFDF {} {First surrogate pair}
+    utf-16le A\u03A9\u8A9E\U00010384 4100A9039E8A00D884DF {} {Unicode 2.5}
+
+    utf-16be \u0000 0000 {} {Lowest code unit}
+    utf-16be \uD7FF D7FF {} {Below high surrogate range}
+    utf-16be \uE000 E000 {} {Above low surrogate range}
+    utf-16be \uFFFF FFFF {} {Highest code unit}
+    utf-16be \U010000 D800DC00 {} {First surrogate pair}
+    utf-16be \U10FFFF DBFFDFFF {} {First surrogate pair}
+    utf-16be A\u03A9\u8A9E\U00010384 004103A98A9ED800DF84 {} {Unicode 2.5}
+
+    utf-32le \u0000 00000000 {} {Lowest code unit}
+    utf-32le \uFFFF FFFF0000 {} {Highest BMP}
+    utf-32le \U010000 00000100 {} {First supplementary}
+    utf-32le \U10FFFF ffff1000 {} {Last supplementary}
+    utf-32le A\u03A9\u8A9E\U00010384 41000000A90300009E8A000084030100 {} {Unicode 2.5}
+
+    utf-32be \u0000 00000000 {} {Lowest code unit}
+    utf-32be \uFFFF 0000FFFF {} {Highest BMP}
+    utf-32be \U010000 00010000 {} {First supplementary}
+    utf-32be \U10FFFF 0010FFFF {} {Last supplementary}
+    utf-32be A\u03A9\u8A9E\U00010384 00000041000003A900008A9E00010384 {} {Unicode 2.5}
 }
 
 # Invalid byte sequences. These are driven from a table with format
@@ -211,8 +254,7 @@ set encValidStrings {
 # If the ctrl field is empty it is treated as all of the above
 # Note if there is any other value by itself, it will cause the test to
 # be skipped. This is intentional to skip known bugs.
-
-# TODO - other encodings and test cases
+# TODO - non-UTF encodings
 
 # ascii - Any byte above 127 is invalid and is mapped
 # to the same numeric code point except for the range
@@ -616,8 +658,6 @@ lappend encInvalidBytes {*}{
     utf-8 F48FBFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
     utf-8 F48FBFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
 
-
-
     utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
     utf-8 F5 strict  {}      0 {} {F5:FF are invalid everywhere}
@@ -631,42 +671,73 @@ lappend encInvalidBytes {*}{
     utf-8 E180E2F09192F1BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\x30                         -1 {knownW3C} {Unicode Table 3.11}
 }
 
-set xxencInvalidBytes {
-    
-    utf-8 \x41\x80\x42     tcl8      A\u0080B -1 80
-    utf-8 \x41\x80\x42     replace   A\uFFFDB -1 80
-    utf-8 \x41\x80\x42     strict    A         1 80
-    utf-8 \x41\xC0\x80\x42 tcl8      A\u0000B -1 C080
-    utf-8 \x41\xC0\x80\x42 strict    A         1 C080
-    utf-8 \x41\xC1\x42     tcl8      A\u00C1B -1 C1
-    utf-8 \x41\xC1\x42     replace   A\uFFFDB -1 C1
-    utf-8 \x41\xC1\x42     strict    A         1 C1
-    utf-8 \x41\xC2\x42     tcl8      A\u00C2B -1 C2-nontrail
-    utf-8 \x41\xC2\x42     replace   A\uFFFDB -1 C2-nontrail
-    utf-8 \x41\xC2\x42     strict    A         1 C2-nontrail
-    utf-8 \x41\xC2         tcl8      A\u00C2  -1 C2-incomplete
-    utf-8 \x41\xC2         replace   A\uFFFD  -1 C2-incomplete
-    utf-8 \x41\xC2         strict    A         1 C2-incomplete
-    utf-8 A\xed\xa0\x80B   tcl8      A\uD800B -1 High-surrogate
-    utf-8 A\xed\xa0\x80B   strict    A         1 High-surrogate
-    utf-8 A\xed\xb0\x80B   tcl8      A\uDC00B -1 Low-surrogate
-    utf-8 A\xed\xb0\x80B   strict    A         1 Low-surrogate
-    utf-8 \xed\xa0\x80\xed\xb0\x80   tcl8      \U00010000 -1 High-low-surrogate
-    utf-8 \xed\xa0\x80\xed\xb0\x80   strict    {}          0 High-low-surrogate
+# utf16-le and utf16-be test cases. Note utf16 cases are automatically generated
+# based on these depending on platform endianness. Note truncated tests can only
+# happen when the sequence is at the end (including by itself) Thus {solo tail}
+# in some cases.
+lappend encInvalidBytes {*}{
+    utf-16le 41      tcl8      {}  -1 {solo tail} {Truncated}
+    utf-16le 41      replace   \uFFFD  -1 {solo tail} {Truncated}
+    utf-16le 41      strict    {}   0 {solo tail} {Truncated}
+    utf-16le 00D8    tcl8      \uD800 -1 {} {Missing low surrogate}
+    utf-16le 00D8    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
+    utf-16le 00D8    strict    {}      0 {knownBug} {Missing low surrogate}
+    utf-16le 00DC    tcl8      \uDC00 -1 {} {Missing high surrogate}
+    utf-16le 00DC    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
+    utf-16le 00DC    strict    {}      0 {knownBug} {Missing high surrogate}
 }
-set utf32-le-TODO {
-    utf-32le \x00\xD8\x00\x00                                   tcl8     \uD800   -1 {High-surrogate}
-    utf-32le \x00\xD8\x00\x00                                   strict   ""        0 {High-surrogate}
-    utf-32le \x00\xDC\x00\x00                                   tcl8     \uDC00   -1 {Low-surrogate}
-    utf-32le \x00\xDC\x00\x00                                   strict   ""        0 {Low-surrogate}
-    utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   tcl8     \uD800\uDC00  -1 {High-low-surrogate}
-    utf-32le \x00\xD8\x00\x00\x00\xDC\x00\x00                   strict   ""             0 {High-low-surrogate}
-    utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   tcl8     \uDC00\uD800  -1 {High-low-surrogate}
-    utf-32le \x00\xDC\x00\x00\x00\xD8\x00\x00                   strict   ""             0 {High-low-surrogate}
-    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   tcl8     A\uD800B -1 {High-surrogate-middle}
-    utf-32le \x41\x00\x00\x00\x00\xD8\x00\x00\x42\x00\x00\x00   strict   A         4 {High-surrogate-middle}
+
+# utf32-le and utf32-be test cases. Note utf32 cases are automatically generated
+# based on these depending on platform endianness. Note truncated tests can only
+# happen when the sequence is at the end (including by itself) Thus {solo tail}
+# in some cases.
+lappend encInvalidBytes {*}{
+    utf-32le 41      tcl8      {}  -1 {solo tail} {Truncated}
+    utf-32le 41      replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 41      strict    {}   0 {solo tail} {Truncated}
+    utf-32le 4100    tcl8      {}  -1 {solo tail} {Truncated}
+    utf-32le 4100    replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 4100    strict    {}   0 {solo tail} {Truncated}
+    utf-32le 410000  tcl8      {}  -1 {solo tail} {Truncated}
+    utf-32le 410000  replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 410000  strict    {}   0 {solo tail} {Truncated}
+    utf-32le 00D80000 tcl8     \uD800   -1 {} {High-surrogate}
+    utf-32le 00D80000 replace  \uFFFD   -1 {} {High-surrogate}
+    utf-32le 00D80000 strict   {}        0 {} {High-surrogate}
+    utf-32le 00DC0000 tcl8     \uDC00   -1 {} {Low-surrogate}
+    utf-32le 00DC0000 replace  \uFFFD   -1 {} {Low-surrogate}
+    utf-32le 00DC0000 strict   {}        0 {} {Low-surrogate}
+    utf-32le 00D8000000DC0000 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
+    utf-32le 00D8000000DC0000 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
+    utf-32le 00D8000000DC0000 strict  {}            0 {} {High-low-surrogate-pair}
+    utf-32le 00001100 tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32le 00001100 replace \UFFFD -1 {} {Out of range}
+    utf-32le 00001100 strict {}       0 {} {Out of range}
+    utf-32le FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32le FFFFFFFF replace \UFFFD -1 {} {Out of range}
+    utf-32le FFFFFFFF strict {}       0 {} {Out of range}
+
+    utf-32be 41      tcl8      {}  -1 {solo tail} {Truncated}
+    utf-32be 0041    tcl8      {}  -1 {solo tail} {Truncated}
+    utf-32be 000041  tcl8      {}  -1 {solo tail} {Truncated}
+    utf-32be 0000D800 tcl8     \uD800   -1 {} {High-surrogate}
+    utf-32be 0000D800 replace  \uFFFD   -1 {} {High-surrogate}
+    utf-32be 0000D800 strict   {}        0 {} {High-surrogate}
+    utf-32be 0000DC00 tcl8     \uDC00   -1 {} {Low-surrogate}
+    utf-32be 0000DC00 replace  \uFFFD   -1 {} {Low-surrogate}
+    utf-32be 0000DC00 strict   {}        0 {} {Low-surrogate}
+    utf-32be 0000D8000000DC00 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
+    utf-32be 0000D8000000DC00 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
+    utf-32be 0000D8000000DC00 strict  {}            0 {} {High-low-surrogate-pair}
+    utf-32be 00110000 tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32be 00110000 replace \UFFFD -1 {} {Out of range}
+    utf-32be 00110000 strict {}       0 {} {Out of range}
+    utf-32be FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32be FFFFFFFF replace \UFFFD -1 {} {Out of range}
+    utf-32be FFFFFFFF strict {}       0 {} {Out of range}
 }
 
+
 # Strings that cannot be encoded for specific encoding / profiles
 # {encoding string profile exptedresult expectedfailindex ctrl comment}
 # <enc,string,profile> should be unique for test ids to be unique.
@@ -682,7 +753,7 @@ set utf32-le-TODO {
 # If the ctrl field is empty it is treated as all of the above
 # Note if there is any other value by itself, it will cause the test to
 # be skipped. This is intentional to skip known bugs.
-# TODO - other encodings and test cases
+# TODO - other encodings
 # TODO - out of range code point (note cannot be generated by \U notation)
 set encUnencodableStrings {
     ascii \u00e0 tcl8    3f -1 {} {unencodable}
@@ -883,7 +954,8 @@ testconvert cmdAH-4.3.12 {
 }
 
 # convertfrom ?-profile? : valid byte sequences
-foreach {enc str hex} $encValidStrings {
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
     set bytes [binary decode hex $hex]
     set prefix A
     set suffix B
@@ -899,6 +971,7 @@ foreach {enc str hex} $encValidStrings {
 
 # convertfrom ?-profile? : invalid byte sequences
 foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
+    if {"knownBug" in $ctrl} continue
     set bytes [binary format H* $hex]
     set prefix A
     set suffix B
@@ -945,12 +1018,13 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
 }
 
 # convertfrom -failindex ?-profile? - valid data
-foreach {enc str hex} $encValidStrings {
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
     set bytes [binary decode hex $hex]
     set prefix A
     set suffix B
-    set prefix_bytes [encoding convertto $enc A]
-    set suffix_bytes [encoding convertto $enc B]
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
     foreach profile $encProfiles {
         testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes [list $str -1] $profile
         testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $str$suffix -1] $profile
@@ -961,11 +1035,14 @@ foreach {enc str hex} $encValidStrings {
 
 # convertfrom -failindex ?-profile? - invalid data
 foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
+    if {"knownBug" in $ctrl} continue
     # There are multiple test cases based on location of invalid bytes
     set bytes [binary decode hex $hex]
     set prefix A
     set suffix B
-    set prefixLen [string length [encoding convertto $enc $prefix]]
+    set prefix_bytes [encoding convertto $enc $prefix]
+    set suffix_bytes [encoding convertto $enc $suffix]
+    set prefixLen [string length $prefix_bytes]
     if {$ctrl eq {} || "solo" in $ctrl} {
         testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes [list $str $failidx] $profile
     }
@@ -977,7 +1054,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
             # Failure expected
             set result ""
         }
-        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix [list $result $failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $result $failidx] $profile
     }
     if {$ctrl eq {} || "tail" in $ctrl} {
         set expected_failidx $failidx
@@ -989,7 +1066,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix$bytes [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $result $expected_failidx] $profile
     }
     if {$ctrl eq {} || "middle" in $ctrl} {
         set expected_failidx $failidx
@@ -1001,7 +1078,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix$bytes$suffix [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $result $expected_failidx] $profile
     }
 }
 
@@ -1041,7 +1118,8 @@ testconvert cmdAH-4.4.12 {
 
 # convertto ?-profile? : valid byte sequences
 
-foreach {enc str hex} $encValidStrings {
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
     set bytes [binary decode hex $hex]
     set printable [printable $str]
     set prefix A
@@ -1058,6 +1136,7 @@ foreach {enc str hex} $encValidStrings {
 
 # convertto ?-profile? : invalid byte sequences
 foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
+    if {"knownBug" in $ctrl} continue
     set bytes [binary decode hex $hex]
     set printable [printable $str]
     set prefix A
@@ -1105,7 +1184,8 @@ foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
 }
 
 # convertto -failindex ?-profile? - valid data
-foreach {enc str hex} $encValidStrings {
+foreach {enc str hex ctrl comment} $encValidStrings {
+    if {"knownBug" in $ctrl} continue
     set bytes [binary decode hex $hex]
     set printable [printable $str]
     set prefix A
@@ -1122,6 +1202,7 @@ foreach {enc str hex} $encValidStrings {
 
 # convertto -failindex ?-profile? - invalid data
 foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
+    if {"knownBug" in $ctrl} continue
     set bytes [binary decode hex $hex]
     set printable [printable $str]
     set prefix A
-- 
cgit v0.12


From fa9ac8a850701b20b6c178fdbf30b705148ffd6b Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 20 Feb 2023 15:41:15 +0000
Subject: Fix replace profile handling of truncated surrogates

---
 generic/tclCmdAH.c    |  9 +++++----
 generic/tclEncoding.c | 42 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 692c75b..4dfb541 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -695,7 +695,8 @@ EncodingConvertfromObjCmd(
     }
     result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length,
 	    flags, &ds);
-    if (result != TCL_INDEX_NONE) {
+    if (result != TCL_INDEX_NONE &&
+	TCL_ENCODING_PROFILE_GET(flags) != TCL_ENCODING_PROFILE_TCL8) {
 	if (failVarObj != NULL) {
 	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
 		return TCL_ERROR;
@@ -776,7 +777,8 @@ EncodingConverttoObjCmd(
     stringPtr = TclGetStringFromObj(data, &length);
     result = Tcl_UtfToExternalDStringEx(encoding, stringPtr, length,
 	    flags, &ds);
-    if (result != TCL_INDEX_NONE) {
+    if (result != TCL_INDEX_NONE &&
+	TCL_ENCODING_PROFILE_GET(flags) != TCL_ENCODING_PROFILE_TCL8) {
 	if (failVarObj != NULL) {
 	    /* I hope, wide int will cover size_t data type */
 	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
@@ -795,8 +797,7 @@ EncodingConverttoObjCmd(
 	    Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
-    }
-    else if (failVarObj != NULL) {
+    } else if (failVarObj != NULL) {
 	if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewIntObj(-1), TCL_LEAVE_ERR_MSG) == NULL) {
 	    return TCL_ERROR;
 	}
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 7e5ec22..024570a 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2594,7 +2594,7 @@ Utf32ToUtfProc(
 {
     const char *srcStart, *srcEnd;
     const char *dstEnd, *dstStart;
-    int result, numChars, charLimit = INT_MAX;
+    int result, extra, numChars, charLimit = INT_MAX;
     int ch = 0;
 
     flags |= PTR2INT(clientData);
@@ -2606,8 +2606,9 @@ Utf32ToUtfProc(
     /*
      * Check alignment with utf-32 (4 == sizeof(UTF-32))
      */
-
-    if ((srcLen % 4) != 0) {
+    extra = srcLen % 4;
+    if (extra != 0) {
+	/* We have a truncated code unit */
 	result = TCL_CONVERT_MULTIBYTE;
 	srcLen &= -4;
     }
@@ -2669,13 +2670,27 @@ Utf32ToUtfProc(
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
-	src += sizeof(unsigned int);
+	src += 4;
     }
 
     if ((ch  & ~0x3FF) == 0xD800) {
 	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
 	dst += Tcl_UniCharToUtf(-1, dst);
     }
+    /*
+     * If we had a truncated code unit at the end AND this is the last
+     * fragment AND profile is "replace", stick FFFD in its place.
+     */
+    if (extra && (flags & TCL_ENCODING_END) && PROFILE_REPLACE(flags)) {
+	src += extra; /* Go past truncated code unit */
+	if (dst > dstEnd) {
+	    result = TCL_CONVERT_NOSPACE;
+	} else {
+	    dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+	    result = TCL_OK;
+	}
+    }
+
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = numChars;
@@ -2822,7 +2837,7 @@ Utf16ToUtfProc(
 {
     const char *srcStart, *srcEnd;
     const char *dstEnd, *dstStart;
-    int result, numChars, charLimit = INT_MAX;
+    int result, extra, numChars, charLimit = INT_MAX;
     unsigned short ch = 0;
 
     flags |= PTR2INT(clientData);
@@ -2835,7 +2850,8 @@ Utf16ToUtfProc(
      * Check alignment with utf-16 (2 == sizeof(UTF-16))
      */
 
-    if ((srcLen % 2) != 0) {
+    extra = srcLen % 2;
+    if (extra != 0) {
 	result = TCL_CONVERT_MULTIBYTE;
 	srcLen--;
     }
@@ -2891,6 +2907,20 @@ Utf16ToUtfProc(
 	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
 	dst += Tcl_UniCharToUtf(-1, dst);
     }
+    /*
+     * If we had a truncated code unit at the end AND this is the last
+     * fragment AND profile is "replace", stick FFFD in its place.
+     */
+    if (extra && (flags & TCL_ENCODING_END) && PROFILE_REPLACE(flags)) {
+	++src;/* Go past the truncated code unit */
+	if (dst > dstEnd) {
+	    result = TCL_CONVERT_NOSPACE;
+	} else {
+	    dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+	    result = TCL_OK;
+	}
+    }
+
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = numChars;
-- 
cgit v0.12


From 280034d2ab7356da4aadf99bcade5d106a3da1b2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Feb 2023 20:41:00 +0000
Subject: Proposed fix for [4bea02e811]: encoding convertfrom -strict ascii
 \x7f generates exception

---
 library/encoding/ascii.enc   | 2 +-
 library/encoding/cp1250.enc  | 4 ++--
 library/encoding/cp1251.enc  | 2 +-
 library/encoding/cp1252.enc  | 4 ++--
 library/encoding/cp1253.enc  | 4 ++--
 library/encoding/cp1257.enc  | 4 ++--
 library/encoding/cp1258.enc  | 4 ++--
 library/encoding/cp864.enc   | 2 +-
 library/encoding/cp869.enc   | 4 ++--
 library/encoding/cp874.enc   | 4 ++--
 library/encoding/cp932.enc   | 2 +-
 library/encoding/cp949.enc   | 2 +-
 library/encoding/cp950.enc   | 4 ++--
 library/encoding/tis-620.enc | 2 +-
 tools/encoding/Makefile      | 7 +------
 tools/encoding/ascii.txt     | 1 +
 16 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/library/encoding/ascii.enc b/library/encoding/ascii.enc
index e0320b8..284a9f5 100644
--- a/library/encoding/ascii.enc
+++ b/library/encoding/ascii.enc
@@ -9,7 +9,7 @@ S
 0040004100420043004400450046004700480049004A004B004C004D004E004F
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E0000
+0070007100720073007400750076007700780079007A007B007C007D007E007F
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/cp1250.enc b/library/encoding/cp1250.enc
index 070ad90..f40b485 100644
--- a/library/encoding/cp1250.enc
+++ b/library/encoding/cp1250.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC0081201A0083201E2026202020210088203001602039015A0164017D0179
-009020182019201C201D202220132014009821220161203A015B0165017E017A
+20AC0000201A0000201E2026202020210000203001602039015A0164017D0179
+000020182019201C201D202220132014000021220161203A015B0165017E017A
 00A002C702D8014100A4010400A600A700A800A9015E00AB00AC00AD00AE017B
 00B000B102DB014200B400B500B600B700B80105015F00BB013D02DD013E017C
 015400C100C2010200C40139010600C7010C00C9011800CB011A00CD00CE010E
diff --git a/library/encoding/cp1251.enc b/library/encoding/cp1251.enc
index 376b1b4..f9513c2 100644
--- a/library/encoding/cp1251.enc
+++ b/library/encoding/cp1251.enc
@@ -11,7 +11,7 @@ S
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
 04020403201A0453201E20262020202120AC203004092039040A040C040B040F
-045220182019201C201D202220132014009821220459203A045A045C045B045F
+045220182019201C201D202220132014000021220459203A045A045C045B045F
 00A0040E045E040800A4049000A600A7040100A9040400AB00AC00AD00AE0407
 00B000B104060456049100B500B600B704512116045400BB0458040504550457
 0410041104120413041404150416041704180419041A041B041C041D041E041F
diff --git a/library/encoding/cp1252.enc b/library/encoding/cp1252.enc
index dd525ea..b45a7f8 100644
--- a/library/encoding/cp1252.enc
+++ b/library/encoding/cp1252.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC0081201A0192201E20262020202102C62030016020390152008D017D008F
-009020182019201C201D20222013201402DC21220161203A0153009D017E0178
+20AC0000201A0192201E20262020202102C620300160203901520000017D0000
+000020182019201C201D20222013201402DC21220161203A01530000017E0178
 00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
 00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
 00C000C100C200C300C400C500C600C700C800C900CA00CB00CC00CD00CE00CF
diff --git a/library/encoding/cp1253.enc b/library/encoding/cp1253.enc
index a8754c3..dcc8084 100644
--- a/library/encoding/cp1253.enc
+++ b/library/encoding/cp1253.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC0081201A0192201E20262020202100882030008A2039008C008D008E008F
-009020182019201C201D20222013201400982122009A203A009C009D009E009F
+20AC0000201A0192201E20262020202100002030000020390000000000000000
+000020182019201C201D202220132014000021220000203A0000000000000000
 00A00385038600A300A400A500A600A700A800A9000000AB00AC00AD00AE2015
 00B000B100B200B3038400B500B600B703880389038A00BB038C00BD038E038F
 0390039103920393039403950396039703980399039A039B039C039D039E039F
diff --git a/library/encoding/cp1257.enc b/library/encoding/cp1257.enc
index 4aa135d..42c6905 100644
--- a/library/encoding/cp1257.enc
+++ b/library/encoding/cp1257.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC0081201A0083201E20262020202100882030008A2039008C00A802C700B8
-009020182019201C201D20222013201400982122009A203A009C00AF02DB009F
+20AC0000201A0000201E2026202020210000203000002039000000A802C700B8
+000020182019201C201D202220132014000021220000203A000000AF02DB0000
 00A0000000A200A300A4000000A600A700D800A9015600AB00AC00AD00AE00C6
 00B000B100B200B300B400B500B600B700F800B9015700BB00BC00BD00BE00E6
 0104012E0100010600C400C501180112010C00C90179011601220136012A013B
diff --git a/library/encoding/cp1258.enc b/library/encoding/cp1258.enc
index 95fdef8..bbe2b12 100644
--- a/library/encoding/cp1258.enc
+++ b/library/encoding/cp1258.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC0081201A0192201E20262020202102C62030008A20390152008D008E008F
-009020182019201C201D20222013201402DC2122009A203A0153009D009E0178
+20AC0000201A0192201E20262020202102C62030000020390152000000000000
+000020182019201C201D20222013201402DC21220000203A0153000000000178
 00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
 00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
 00C000C100C2010200C400C500C600C700C800C900CA00CB030000CD00CE00CF
diff --git a/library/encoding/cp864.enc b/library/encoding/cp864.enc
index 71f9e62..dad7c20 100644
--- a/library/encoding/cp864.enc
+++ b/library/encoding/cp864.enc
@@ -11,7 +11,7 @@ S
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
 00B000B72219221A259225002502253C2524252C251C25342510250C25142518
-03B2221E03C600B100BD00BC224800AB00BBFEF7FEF8009B009CFEFBFEFC009F
+03B2221E03C600B100BD00BC224800AB00BBFEF7FEF800000000FEFBFEFC0000
 00A000ADFE8200A300A4FE8400000000FE8EFE8FFE95FE99060CFE9DFEA1FEA5
 0660066106620663066406650666066706680669FED1061BFEB1FEB5FEB9061F
 00A2FE80FE81FE83FE85FECAFE8BFE8DFE91FE93FE97FE9BFE9FFEA3FEA7FEA9
diff --git a/library/encoding/cp869.enc b/library/encoding/cp869.enc
index 9fd2929..4670826 100644
--- a/library/encoding/cp869.enc
+++ b/library/encoding/cp869.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850386008700B700AC00A620182019038820150389
-038A03AA038C00930094038E03AB00A9038F00B200B303AC00A303AD03AE03AF
+0000000000000000000000000386000000B700AC00A620182019038820150389
+038A03AA038C00000000038E03AB00A9038F00B200B303AC00A303AD03AE03AF
 03CA039003CC03CD039103920393039403950396039700BD0398039900AB00BB
 25912592259325022524039A039B039C039D256325512557255D039E039F2510
 25142534252C251C2500253C03A003A1255A25542569256625602550256C03A3
diff --git a/library/encoding/cp874.enc b/library/encoding/cp874.enc
index 0487b97..e2e8433 100644
--- a/library/encoding/cp874.enc
+++ b/library/encoding/cp874.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC008100820083008420260086008700880089008A008B008C008D008E008F
-009020182019201C201D20222013201400980099009A009B009C009D009E009F
+20AC000000000000000020260000000000000000000000000000000000000000
+000020182019201C201D20222013201400000000000000000000000000000000
 00A00E010E020E030E040E050E060E070E080E090E0A0E0B0E0C0E0D0E0E0E0F
 0E100E110E120E130E140E150E160E170E180E190E1A0E1B0E1C0E1D0E1E0E1F
 0E200E210E220E230E240E250E260E270E280E290E2A0E2B0E2C0E2D0E2E0E2F
diff --git a/library/encoding/cp932.enc b/library/encoding/cp932.enc
index 8da8cd6..0699000 100644
--- a/library/encoding/cp932.enc
+++ b/library/encoding/cp932.enc
@@ -10,7 +10,7 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000850086000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
 FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
diff --git a/library/encoding/cp949.enc b/library/encoding/cp949.enc
index 2f3ec39..459dbd9 100644
--- a/library/encoding/cp949.enc
+++ b/library/encoding/cp949.enc
@@ -10,7 +10,7 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/cp950.enc b/library/encoding/cp950.enc
index f33d785..f582bd9 100644
--- a/library/encoding/cp950.enc
+++ b/library/encoding/cp950.enc
@@ -10,8 +10,8 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/tis-620.enc b/library/encoding/tis-620.enc
index 2e9142a..af77326 100644
--- a/library/encoding/tis-620.enc
+++ b/library/encoding/tis-620.enc
@@ -9,7 +9,7 @@ S
 0040004100420043004400450046004700480049004A004B004C004D004E004F
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E0000
+0070007100720073007400750076007700780079007A007B007C007D007E007F
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 00000E010E020E030E040E050E060E070E080E090E0A0E0B0E0C0E0D0E0E0E0F
diff --git a/tools/encoding/Makefile b/tools/encoding/Makefile
index 361239e..7235b47 100644
--- a/tools/encoding/Makefile
+++ b/tools/encoding/Makefile
@@ -67,15 +67,10 @@ encodings: clean txt2enc $(EUC_ENCODINGS)
 	@for p in *.txt; do \
 	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
 	    echo $$enc; \
-	    ./txt2enc -e 0 -u 1 $$p > $$enc; \
+	    ./txt2enc -m $$p > $$enc; \
 	done
 	@echo
 	@echo Compiling special versions of encoding files.
-	@for p in ascii.txt; do \
-	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
-	    echo $$enc; \
-	    ./txt2enc -m $$p > $$enc; \
-	done
 	@for p in jis0208.txt; do \
 	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
 	    echo $$enc; \
diff --git a/tools/encoding/ascii.txt b/tools/encoding/ascii.txt
index 66ba6f3..2afbaab 100644
--- a/tools/encoding/ascii.txt
+++ b/tools/encoding/ascii.txt
@@ -93,3 +93,4 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
\ No newline at end of file
-- 
cgit v0.12


From 8660fd1af23543a70d94adaec5d7b98105ad3ca3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Feb 2023 20:52:06 +0000
Subject: Two more files, re-generated

---
 library/encoding/cp1254.enc | 4 ++--
 library/encoding/cp1255.enc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/encoding/cp1254.enc b/library/encoding/cp1254.enc
index b9e3b3c..4922f3c 100644
--- a/library/encoding/cp1254.enc
+++ b/library/encoding/cp1254.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC0081201A0192201E20262020202102C62030016020390152008D008E008F
-009020182019201C201D20222013201402DC21220161203A0153009D009E0178
+20AC0000201A0192201E20262020202102C62030016020390152000000000000
+000020182019201C201D20222013201402DC21220161203A0153000000000178
 00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
 00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
 00C000C100C200C300C400C500C600C700C800C900CA00CB00CC00CD00CE00CF
diff --git a/library/encoding/cp1255.enc b/library/encoding/cp1255.enc
index 6e78b95..74ef0c1 100644
--- a/library/encoding/cp1255.enc
+++ b/library/encoding/cp1255.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-20AC0081201A0192201E20262020202102C62030008A2039008C008D008E008F
-009020182019201C201D20222013201402DC2122009A203A009C009D009E009F
+20AC0000201A0192201E20262020202102C62030000020390000000000000000
+000020182019201C201D20222013201402DC21220000203A0000000000000000
 00A000A100A200A320AA00A500A600A700A800A900D700AB00AC00AD00AE00AF
 00B000B100B200B300B400B500B600B700B800B900F700BB00BC00BD00BE00BF
 05B005B105B205B305B405B505B605B705B805B9000005BB05BC05BD05BE05BF
-- 
cgit v0.12


From 3315012c955111ef840365ecd7cc4ff46a15e204 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Feb 2023 21:43:29 +0000
Subject: re-generated 8 more encodings

---
 library/encoding/big5.enc     | 4 ++--
 library/encoding/euc-cn.enc   | 4 ++--
 library/encoding/euc-jp.enc   | 4 ++--
 library/encoding/euc-kr.enc   | 4 ++--
 library/encoding/gb1988.enc   | 4 ++--
 library/encoding/jis0201.enc  | 4 ++--
 library/encoding/macJapan.enc | 2 +-
 library/encoding/shiftjis.enc | 2 +-
 tools/encoding/big5.txt       | 1 +
 9 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/library/encoding/big5.enc b/library/encoding/big5.enc
index 26179f4..d6ff760 100644
--- a/library/encoding/big5.enc
+++ b/library/encoding/big5.enc
@@ -10,8 +10,8 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/euc-cn.enc b/library/encoding/euc-cn.enc
index 4b2f8c7..ff0f984 100644
--- a/library/encoding/euc-cn.enc
+++ b/library/encoding/euc-cn.enc
@@ -10,8 +10,8 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/euc-jp.enc b/library/encoding/euc-jp.enc
index db56c88..d4337d9 100644
--- a/library/encoding/euc-jp.enc
+++ b/library/encoding/euc-jp.enc
@@ -10,8 +10,8 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D0000008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/euc-kr.enc b/library/encoding/euc-kr.enc
index 5e9bb93..0433260 100644
--- a/library/encoding/euc-kr.enc
+++ b/library/encoding/euc-kr.enc
@@ -10,8 +10,8 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/gb1988.enc b/library/encoding/gb1988.enc
index 298732c..8254684 100644
--- a/library/encoding/gb1988.enc
+++ b/library/encoding/gb1988.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D203E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
 FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
 FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
diff --git a/library/encoding/jis0201.enc b/library/encoding/jis0201.enc
index 64f423f..70e099d 100644
--- a/library/encoding/jis0201.enc
+++ b/library/encoding/jis0201.enc
@@ -10,8 +10,8 @@ S
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D203E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
 FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
 FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
diff --git a/library/encoding/macJapan.enc b/library/encoding/macJapan.enc
index dba24bd..9f3f03b 100644
--- a/library/encoding/macJapan.enc
+++ b/library/encoding/macJapan.enc
@@ -10,7 +10,7 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 00A0FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
 FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
diff --git a/library/encoding/shiftjis.enc b/library/encoding/shiftjis.enc
index 140aec4..3ba972e 100644
--- a/library/encoding/shiftjis.enc
+++ b/library/encoding/shiftjis.enc
@@ -10,7 +10,7 @@ M
 0050005100520053005400550056005700580059005A005B005C005D005E005F
 0060006100620063006400650066006700680069006A006B006C006D006E006F
 0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000850086008700000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
 FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
diff --git a/tools/encoding/big5.txt b/tools/encoding/big5.txt
index 58cdfe2..06b0fac 100644
--- a/tools/encoding/big5.txt
+++ b/tools/encoding/big5.txt
@@ -185,6 +185,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 0xA140	0x3000	# IDEOGRAPHIC SPACE
 0xA141	0xFF0C	# FULLWIDTH COMMA
 0xA142	0x3001	# IDEOGRAPHIC COMMA
-- 
cgit v0.12


From 4d644dfb73457eb3615b30550dd31d1b48bfa7d4 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 21 Feb 2023 16:03:18 +0000
Subject: Generate test data from ICU UCM data files. SBCS only for now

---
 tools/ucm2tests.tcl | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 tools/ucm2tests.tcl

diff --git a/tools/ucm2tests.tcl b/tools/ucm2tests.tcl
new file mode 100644
index 0000000..22ae529
--- /dev/null
+++ b/tools/ucm2tests.tcl
@@ -0,0 +1,185 @@
+# ucm2tests.tcl
+#
+# Parses given ucm files (from ICU) to generate test data
+# for encodings. The generated scripts are written to stdout.
+#
+#  tclsh ucmtotests.tcl PATH_TO_ICU_UCM_DIRECTORY
+#
+
+namespace eval ucm {
+    # No means to change these currently but ...
+    variable outputChan stdout
+    variable errorChan stderr
+    variable verbose 0
+
+    # Map Tcl encoding name to ICU UCM file name
+    variable encNameMap
+    array set encNameMap {
+        cp1250    glibc-CP1250-2.1.2
+        cp1251    glibc-CP1251-2.1.2
+        cp1252    glibc-CP1252-2.1.2
+        cp1253    glibc-CP1253-2.1.2
+        cp1254    glibc-CP1254-2.1.2
+        cp1255    glibc-CP1255-2.1.2
+        cp1256    glibc-CP1256-2.1.2
+        cp1257    glibc-CP1257-2.1.2
+        cp1258    glibc-CP1258-2.1.2
+        iso8859-1 glibc-ISO_8859_1-2.1.2
+        iso8859-2 glibc-ISO_8859_2-2.1.2
+        iso8859-3 glibc-ISO_8859_3-2.1.2
+        iso8859-4 glibc-ISO_8859_4-2.1.2
+        iso8859-5 glibc-ISO_8859_5-2.1.2
+        iso8859-6 glibc-ISO_8859_6-2.1.2
+        iso8859-7 glibc-ISO_8859_7-2.3.3
+        iso8859-8 glibc-ISO_8859_8-2.3.3
+        iso8859-9 glibc-ISO_8859_9-2.1.2
+        iso8859-10 glibc-ISO_8859_10-2.1.2
+        iso8859-11 glibc-ISO_8859_11-2.1.2
+        iso8859-13 glibc-ISO_8859_13-2.1.2
+        iso8859-14 glibc-ISO_8859_14-2.1.2
+        iso8859-15 glibc-ISO_8859_15-2.1.2
+        iso8859-16 glibc-ISO_8859_16-2.3.3
+    }
+
+    # Dictionary Character map for Tcl encoding
+    variable charMap
+}
+
+proc ucm::abort {msg} {
+    variable errorChan
+    puts $errorChan $msg
+    exit 1
+}
+proc ucm::warn {msg} {
+    variable errorChan
+    puts $errorChan $msg
+}
+proc ucm::log {msg} {
+    variable verbose
+    if {$verbose} {
+        variable errorChan
+        puts $errorChan $msg
+    }
+}
+proc ucm::print {s} {
+    variable outputChan
+    puts $outputChan $s
+}
+
+proc ucm::parse_SBCS {fd} {
+    set result {}
+    while {[gets $fd line] >= 0} {
+        if {[string match #* $line]} {
+            continue
+        }
+        if {[string equal "END CHARMAP" [string trim $line]]} {
+            break
+        }
+        if {![regexp {^\s*<U([[:xdigit:]]{4})>\s*((\\x[[:xdigit:]]{2})+)\s*(\|(0|1|2|3|4))} $line -> unichar bytes - - precision]} {
+            error "Unexpected line parsing SBCS: $line"
+        }
+        set bytes [string map {\\x {}} $bytes]; # \xNN -> NN
+        if {$precision eq "" || $precision eq "0"} {
+            lappend result $unichar $bytes
+        } else {
+            # It is a fallback mapping - ignore
+        }
+    }
+    return $result
+}
+
+proc ucm::generate_tests {} {
+    variable encNameMap
+    variable charMap
+
+    array set tclNames {}
+    foreach encName [encoding names] {
+        set tclNames($encName) ""
+    }
+    foreach encName [lsort [array names encNameMap]] {
+        if {![info exists charMap($encName)]} {
+            warn "No character map read for $encName"
+            continue
+        }
+        unset tclNames($encName)
+        print "\n# $encName (generated from $encNameMap($encName))"
+        print "lappend encValidStrings {*}{"
+        foreach {unich hex} $charMap($encName) {
+            print "    $encName \\u$unich $hex {} {}"
+        }
+        print "}; # $encName"
+    }
+    if {[array size tclNames]} {
+        warn "Missing encoding: [lsort [array names tclNames]]"
+    }
+}
+
+proc ucm::parse_file {encName ucmPath} {
+    variable charMap
+    set fd [open $ucmPath]
+    try {
+        # Parse the metadata
+        unset -nocomplain state
+        while {[gets $fd line] >= 0} {
+            if {[regexp {<(code_set_name|mb_cur_max|mb_cur_min|uconv_class|subchar)>\s+(\S+)} $line -> key val]} {
+                set state($key) $val
+            } elseif {[regexp {^\s*CHARMAP\s*$} $line]} {
+                set state(charmap) ""
+                break
+            } else {
+                # Skip all else
+            }
+        }
+        if {![info exists state(charmap)]} {
+            abort "Error: $path has No CHARMAP line."
+        }
+        foreach key {code_set_name uconv_class} {
+            if {[info exists state($key)]} {
+                set state($key) [string trim $state($key) {"}]
+            }
+        }
+        if {[info exists charMap($encName)]} {
+            abort "Duplicate file for $encName ($path)"
+        }
+        if {![info exists state(uconv_class)]} {
+            abort "Error: $path has no uconv_class definition."
+        }
+        switch -exact -- $state(uconv_class) {
+            SBCS {
+                if {[catch {
+                    set charMap($encName) [parse_SBCS $fd]
+                } result]} {
+                    abort "Could not process $path. $result"
+                }
+            }
+            default {
+                log "Skipping $path -- not SBCS encoding."
+                return
+            }
+        }
+    } finally {
+        close $fd
+    }
+}
+
+proc ucm::expand_paths {patterns} {
+    set expanded {}
+    foreach pat $patterns {
+        # The file join is for \ -> /
+        lappend expanded {*}[glob -nocomplain [file join $pat]]
+    }
+    return $expanded
+}
+
+proc ucm::run {} {
+    variable encNameMap
+    if {[llength $::argv] != 1} {
+        abort "Usage: [info nameofexecutable] $::argv0 PATHTOUCMFILES"
+    }
+    foreach {encName fname} [array get encNameMap] {
+        ucm::parse_file $encName [file join [lindex $::argv 0] ${fname}.ucm]
+    }
+    generate_tests
+}
+
+ucm::run
-- 
cgit v0.12


From 417f86869302e367a498d61a8bed0aa755746517 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Feb 2023 16:09:18 +0000
Subject: Proposed fix for [534172ff5b]: Crash in DeleteReflectedChannelMap
 (introduced via tcllib 1.21)

---
 generic/tclIORChan.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 7ea50c8..8c6f25f 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -1128,8 +1128,8 @@ ReflectClose(
 	/*
 	 * This call comes from TclFinalizeIOSystem. There are no
 	 * interpreters, and therefore we cannot call upon the handler command
-	 * anymore. Threading is irrelevant as well. We simply clean up all
-	 * our C level data structures and leave the Tcl level to the other
+	 * anymore. Threading is irrelevant as well. Simply clean up all
+	 * the C level data structures and leave the Tcl level to the other
 	 * finalization functions.
 	 */
 
@@ -2697,6 +2697,7 @@ DeleteThreadReflectedChannelMap(
     Tcl_ThreadId self = Tcl_GetCurrentThread();
     ReflectedChannelMap *rcmPtr; /* The map */
     ForwardingResult *resultPtr;
+    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     (void)dummy;
 
     /*
@@ -2777,6 +2778,7 @@ DeleteThreadReflectedChannelMap(
      */
 
     rcmPtr = GetThreadReflectedChannelMap();
+    tsdPtr->rcmPtr = NULL;
     for (hPtr = Tcl_FirstHashEntry(&rcmPtr->map, &hSearch);
 	    hPtr != NULL;
 	    hPtr = Tcl_FirstHashEntry(&rcmPtr->map, &hSearch)) {
@@ -3083,10 +3085,10 @@ ForwardProc(
                 (paramPtr->seek.seekMode==SEEK_SET) ? "start" :
                 (paramPtr->seek.seekMode==SEEK_CUR) ? "current" : "end", -1);
 
-        Tcl_IncrRefCount(offObj);
-        Tcl_IncrRefCount(baseObj);
+	Tcl_IncrRefCount(offObj);
+	Tcl_IncrRefCount(baseObj);
 
-        Tcl_Preserve(rcPtr);
+	Tcl_Preserve(rcPtr);
 	if (InvokeTclMethod(rcPtr, METH_SEEK, offObj, baseObj, &resObj)!=TCL_OK){
 	    ForwardSetObjError(paramPtr, resObj);
 	    paramPtr->seek.offset = -1;
-- 
cgit v0.12


From 42956f6f09023c19e2c057150f6584f0f1f40b4c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Feb 2023 16:58:13 +0000
Subject: Some test-cases start failing in 9.0-compatibility-mode
 (-DTCL_NO_DEPRECATED), if the system encoding is one with gaps. So, better
 use iso8859-1 for those testcases

---
 tests/chanio.test | 12 ++++++------
 tests/io.test     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index fb94051..61c168f 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -6736,8 +6736,8 @@ test chan-io-52.5 {TclCopyChannel, all} -constraints {fcopy} -setup {
 } -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2 -size -1 ;# -1 means 'copy all', same as if no -size specified.
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
@@ -6752,8 +6752,8 @@ test chan-io-52.5a {TclCopyChannel, all, other negative value} -setup {
 } -constraints {fcopy} -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2 -size -2 ;# < 0 behaves like -1, copy all
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
@@ -6768,8 +6768,8 @@ test chan-io-52.5b {TclCopyChannel, all, wrap to negative value} -setup {
 } -constraints {fcopy} -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2 -size 3221176172 ;# Wrapped to < 0, behaves like -1, copy all
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
diff --git a/tests/io.test b/tests/io.test
index 7b8182e..aed7f85 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7280,8 +7280,8 @@ test io-52.5 {TclCopyChannel, all} {fcopy} {
     file delete $path(test1)
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation lf -blocking 0
+    fconfigure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    fconfigure $f2 -translation lf -encoding iso8859-1 -blocking 0
     fcopy $f1 $f2 -size -1 ;# -1 means 'copy all', same as if no -size specified.
     set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
     close $f1
@@ -7297,8 +7297,8 @@ test io-52.5a {TclCopyChannel, all, other negative value} {fcopy} {
     file delete $path(test1)
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation lf -blocking 0
+    fconfigure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    fconfigure $f2 -translation lf -encoding iso8859-1 -blocking 0
     fcopy $f1 $f2 -size -2 ;# < 0 behaves like -1, copy all
     set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
     close $f1
@@ -7314,8 +7314,8 @@ test io-52.5b {TclCopyChannel, all, wrap to negative value} {fcopy} {
     file delete $path(test1)
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation lf -blocking 0
+    fconfigure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    fconfigure $f2 -translation lf -encoding iso8859-1 -blocking 0
     fcopy $f1 $f2 -size 3221176172 ;# Wrapped to < 0, behaves like -1, copy all
     set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
     close $f1
-- 
cgit v0.12


From 9b8fa27457c97577817b8f86b0b658a04867d7c7 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 21 Feb 2023 17:27:16 +0000
Subject: Rework ICU tests to check validity of whole charmap in one test, else
 too many tests.

---
 tests/cmdAH.test    |  87 +++++++++++++++++++++++++++-----------------
 tools/ucm2tests.tcl | 101 ++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 144 insertions(+), 44 deletions(-)

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 1fbe6d2..3be2f14 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -186,9 +186,11 @@ set encDefaultProfile tcl8; # Should reflect the default from implementation
 # TODO - valid sequences for different encodings - shiftjis etc.
 # Note utf-16, utf-32 missing because they are automatically
 # generated based on le/be versions.
-set encValidStrings {
+lappend encValidStrings {*}{
     ascii    \u0000 00 {} {Lowest ASCII}
     ascii    \u007F 7F knownBug {Highest ASCII}
+    ascii    \u007D 7D {} {Brace - just to verify test scripts are escaped correctly}
+    ascii    \u007B 7B {} {Terminating brace - just to verify test scripts are escaped correctly}
 
     utf-8    \u0000 00 {} {Unicode Table 3.7 Row 1}
     utf-8    \u007F 7F {} {Unicode Table 3.7 Row 1}
@@ -361,9 +363,28 @@ lappend encInvalidBytes {*}{
     utf-8 C080 tcl8    \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
     utf-8 C080 strict  {}      0 {} {C080 -> invalid}
     utf-8 C080 replace \uFFFD -1 {} {C080 -> single replacement char}
+    utf-8 C0A2 tcl8    \u00C0\u00A2 -1 {} {websec.github.io - A}
+    utf-8 C0A2 replace \uFFFD\uFFFD -1 {} {websec.github.io - A}
+    utf-8 C0A2 strict  {}            0 {} {websec.github.io - A}
+    utf-8 C0A7 tcl8    \u00C0\u00A7 -1 {} {websec.github.io - double quote}
+    utf-8 C0A7 replace \uFFFD\uFFFD -1 {} {websec.github.io - double quote}
+    utf-8 C0A7 strict  {}            0 {} {websec.github.io - double quote}
+    utf-8 C0AE tcl8    \u00C0\u00AE -1 {} {websec.github.io - full stop}
+    utf-8 C0AE replace \uFFFD\uFFFD -1 {} {websec.github.io - full stop}
+    utf-8 C0AE strict  {}            0 {} {websec.github.io - full stop}
+    utf-8 C0AF tcl8    \u00C0\u00AF -1 {} {websec.github.io - solidus}
+    utf-8 C0AF replace \uFFFD\uFFFD -1 {} {websec.github.io - solidus}
+    utf-8 C0AF strict  {}            0 {} {websec.github.io - solidus}
+
     utf-8 C1 tcl8    \u00C1 -1 {} {C1 is invalid everywhere}
     utf-8 C1 replace \uFFFD -1 {} {C1 is invalid everywhere}
     utf-8 C1 strict  {}      0 {} {C1 is invalid everywhere}
+    utf-8 C181 tcl8    \u00C1\u0081 -1 {} {websec.github.io - base test (A)}
+    utf-8 C181 replace \uFFFD\uFFFD -1 {} {websec.github.io - base test (A)}
+    utf-8 C181 strict  {}            0 {} {websec.github.io - base test (A)}
+    utf-8 C19C tcl8    \u00C1\u0153 -1 {} {websec.github.io - reverse solidus}
+    utf-8 C19C replace \uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
+    utf-8 C19C strict  {}            0 {} {websec.github.io - reverse solidus}
 
     utf-8 C2 tcl8      \u00C2     -1 {} {Missing trail byte}
     utf-8 C2 replace   \uFFFD     -1 {} {Missing trail byte}
@@ -387,6 +408,9 @@ lappend encInvalidBytes {*}{
     utf-8 E080 tcl8      \u00E0\u20AC   -1 {} {First trail byte must be A0:BF}
     utf-8 E080 replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
     utf-8 E080 strict    {}              0 {} {First trail byte must be A0:BF}
+    utf-8 E0819C tcl8    \u00E0\u0081\u0153 -1 {} {websec.github.io - reverse solidus}
+    utf-8 E0819C replace \uFFFD\uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
+    utf-8 E0819C strict  {}                  0 {} {websec.github.io - reverse solidus}
     utf-8 E09F tcl8      \u00E0\u0178   -1 {} {First trail byte must be A0:BF}
     utf-8 E09F replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
     utf-8 E09F strict    {}              0 {} {First trail byte must be A0:BF}
@@ -526,6 +550,9 @@ lappend encInvalidBytes {*}{
     utf-8 F0 tcl8       \u00F0        -1 {} {Missing trail byte}
     utf-8 F0 replace    \uFFFD        -1 {} {Missing trail byte}
     utf-8 F0 strict     {}             0 {} {Missing trail byte}
+    utf-8 F080 tcl8     \u00F0\u20AC  -1 {} {First trail byte must be 90:BF}
+    utf-8 F080 replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
+    utf-8 F080 strict   {}             0 {} {First trail byte must be 90:BF}
     utf-8 F08F tcl8     \u00F0\u8F    -1 {} {First trail byte must be 90:BF}
     utf-8 F08F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
     utf-8 F08F strict   {}             0 {} {First trail byte must be 90:BF}
@@ -755,7 +782,7 @@ lappend encInvalidBytes {*}{
 # be skipped. This is intentional to skip known bugs.
 # TODO - other encodings
 # TODO - out of range code point (note cannot be generated by \U notation)
-set encUnencodableStrings {
+lappend encUnencodableStrings {*}{
     ascii \u00e0 tcl8    3f -1 {} {unencodable}
     ascii \u00e0 strict  {}  0 {} {unencodable}
 
@@ -768,12 +795,6 @@ set encUnencodableStrings {
     utf-8 \uDC00 strict  {}      0 {} High-surrogate
 }
 
-if {$::tcl_platform(byteOrder) eq "littleEndian"} {
-    set endian le
-} else {
-    set endian be
-}
-
 # Maps utf-{16,32}{le,be} to utf-16, utf-32 and
 # others to "". Used to test utf-16, utf-32 based
 # on system endianness
@@ -881,19 +902,19 @@ proc testprofile {id converter enc profile data result args} {
 # Generates tests for compiled and uncompiled implementation.
 # Also generates utf-{16,32} tests if passed encoding is utf-{16,32}{le,be}
 # The enc and profile are appended to id to generate the test id
-proc testfailindex {id converter enc data result {profile default}} {
-    testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc $data] \[set idx]" $result
+proc testfailindex {id converter enc data result failidx {profile default}} {
+    testconvert $id.$enc.$profile "list \[encoding $converter -profile $profile -failindex idx $enc [list $data]\] \[set idx\]" [list $result $failidx]
     if {[set enc2 [endianUtf $enc]] ne ""} {
         # If utf{16,32}-{le,be}, also do utf{16,32}
-        testconvert $id.$enc2.$profile "list \[encoding $converter -profile $profile -failindex idx $enc2 $data] \[set idx]" $result
+        testconvert $id.$enc2.$profile "list \[encoding $converter -profile $profile -failindex idx $enc2 [list $data]\] \[set idx]" [list $result $failidx]
     }
 
     # If this is the default profile, generate a test without specifying profile
     if {$profile eq $::encDefaultProfile} {
-        testconvert $id.$enc.default "list \[encoding $converter -failindex idx $enc $data] \[set idx]" $result
+        testconvert $id.$enc.default "list \[encoding $converter -failindex idx $enc [list $data]\] \[set idx]" [list $result $failidx]
         if {[set enc2 [endianUtf $enc]] ne ""} {
             # If utf{16,32}-{le,be}, also do utf{16,32}
-            testconvert $id.$enc2.default "list \[encoding $converter -failindex idx $enc2 $data] \[set idx]" $result
+            testconvert $id.$enc2.default "list \[encoding $converter -failindex idx $enc2 [list $data]\] \[set idx]" [list $result $failidx]
         }
     }
 }
@@ -962,10 +983,10 @@ foreach {enc str hex ctrl comment} $encValidStrings {
     set prefix_bytes [encoding convertto $enc A]
     set suffix_bytes [encoding convertto $enc B]
     foreach profile $encProfiles {
-        testfailindex cmdAH-4.3.13.$hex.solo convertfrom $enc $bytes [list $str -1] $profile
-        testfailindex cmdAH-4.3.13.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $str$suffix -1] $profile
-        testfailindex cmdAH-4.3.13.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $prefix$str -1] $profile
-        testfailindex cmdAH-4.3.13.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $prefix$str$suffix -1] $profile
+        testprofile cmdAH-4.3.13.$hex.solo convertfrom $enc $profile $bytes $str
+        testprofile cmdAH-4.3.13.$hex.lead convertfrom $enc $profile $bytes$suffix_bytes $str$suffix
+        testprofile cmdAH-4.3.13.$hex.tail convertfrom $enc $profile $prefix_bytes$bytes $prefix$str
+        testprofile cmdAH-4.3.13.$hex.middle convertfrom $enc $profile $prefix_bytes$bytes$suffix_bytes $prefix$str$suffix
     }
 }
 
@@ -1026,10 +1047,10 @@ foreach {enc str hex ctrl comment} $encValidStrings {
     set prefix_bytes [encoding convertto $enc $prefix]
     set suffix_bytes [encoding convertto $enc $suffix]
     foreach profile $encProfiles {
-        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes [list $str -1] $profile
-        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $str$suffix -1] $profile
-        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $prefix$str -1] $profile
-        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $prefix$str$suffix -1] $profile
+        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes $str -1 $profile
+        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes $str$suffix -1 $profile
+        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes $prefix$str -1 $profile
+        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes $prefix$str$suffix -1 $profile
     }
 }
 
@@ -1044,7 +1065,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
     set suffix_bytes [encoding convertto $enc $suffix]
     set prefixLen [string length $prefix_bytes]
     if {$ctrl eq {} || "solo" in $ctrl} {
-        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes [list $str $failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.solo convertfrom $enc $bytes $str $failidx $profile
     }
     if {$ctrl eq {} || "lead" in $ctrl} {
         if {$failidx == -1} {
@@ -1054,7 +1075,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
             # Failure expected
             set result ""
         }
-        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes [list $result $failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.lead convertfrom $enc $bytes$suffix_bytes $result $failidx $profile
     }
     if {$ctrl eq {} || "tail" in $ctrl} {
         set expected_failidx $failidx
@@ -1066,7 +1087,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.tail convertfrom $enc $prefix_bytes$bytes $result $expected_failidx $profile
     }
     if {$ctrl eq {} || "middle" in $ctrl} {
         set expected_failidx $failidx
@@ -1078,7 +1099,7 @@ foreach {enc hex profile str failidx ctrl comment} $encInvalidBytes {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.3.14.$hex.middle convertfrom $enc $prefix_bytes$bytes$suffix_bytes $result $expected_failidx $profile
     }
 }
 
@@ -1193,10 +1214,10 @@ foreach {enc str hex ctrl comment} $encValidStrings {
     set prefix_bytes [encoding convertto $enc A]
     set suffix_bytes [encoding convertto $enc B]
     foreach profile $encProfiles {
-        testfailindex cmdAH-4.4.14.$enc.$printable.solo convertto $enc $str [list $bytes -1] $profile
-        testfailindex cmdAH-4.4.14.$enc.$printable.lead convertto $enc $str$suffix [list $bytes$suffix_bytes -1] $profile
-        testfailindex cmdAH-4.4.14.$enc.$printable.tail convertto $enc $prefix$str [list $prefix_bytes$bytes -1] $profile
-        testfailindex cmdAH-4.4.14.$enc.$printable.middle convertto $enc $prefix$str$suffix [list $prefix_bytes$bytes$suffix_bytes -1] $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.solo convertto $enc $str $bytes -1 $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.lead convertto $enc $str$suffix $bytes$suffix_bytes -1 $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.tail convertto $enc $prefix$str $prefix_bytes$bytes -1 $profile
+        testfailindex cmdAH-4.4.14.$enc.$printable.middle convertto $enc $prefix$str$suffix $prefix_bytes$bytes$suffix_bytes -1 $profile
     }
 }
 
@@ -1209,7 +1230,7 @@ foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
     set suffix B
     set prefixLen [string length [encoding convertto $enc $prefix]]
     if {$ctrl eq {} || "solo" in $ctrl} {
-        testfailindex cmdAH-4.4.14.$printable.solo convertto $enc $str [list $bytes $failidx] $profile
+        testfailindex cmdAH-4.4.14.$printable.solo convertto $enc $str $bytes $failidx $profile
     }
     if {$ctrl eq {} || "lead" in $ctrl} {
         if {$failidx == -1} {
@@ -1219,7 +1240,7 @@ foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
             # Failure expected
             set result ""
         }
-        testfailindex cmdAH-4.4.14.$printable.lead convertto $enc $str$suffix [list $result $failidx] $profile
+        testfailindex cmdAH-4.4.14.$printable.lead convertto $enc $str$suffix $result $failidx $profile
     }
     if {$ctrl eq {} || "tail" in $ctrl} {
         set expected_failidx $failidx
@@ -1231,7 +1252,7 @@ foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.4.14.$printable.tail convertto $enc $prefix$str [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.4.14.$printable.tail convertto $enc $prefix$str $result $expected_failidx $profile
     }
     if {$ctrl eq {} || "middle" in $ctrl} {
         set expected_failidx $failidx
@@ -1243,7 +1264,7 @@ foreach {enc str profile hex failidx ctrl comment} $encUnencodableStrings {
             set result $prefix
             incr expected_failidx $prefixLen
         }
-        testfailindex cmdAH-4.4.14.$printable.middle convertto $enc $prefix$str$suffix [list $result $expected_failidx] $profile
+        testfailindex cmdAH-4.4.14.$printable.middle convertto $enc $prefix$str$suffix $result $expected_failidx $profile
     }
 }
 
diff --git a/tools/ucm2tests.tcl b/tools/ucm2tests.tcl
index 22ae529..e971631 100644
--- a/tools/ucm2tests.tcl
+++ b/tools/ucm2tests.tcl
@@ -1,14 +1,15 @@
 # ucm2tests.tcl
 #
 # Parses given ucm files (from ICU) to generate test data
-# for encodings. The generated scripts are written to stdout.
+# for encodings.
 #
-#  tclsh ucmtotests.tcl PATH_TO_ICU_UCM_DIRECTORY
+#  tclsh ucm2tests.tcl PATH_TO_ICU_UCM_DIRECTORY ?OUTPUTPATH?
 #
 
 namespace eval ucm {
     # No means to change these currently but ...
-    variable outputChan stdout
+    variable outputPath
+    variable outputChan
     variable errorChan stderr
     variable verbose 0
 
@@ -24,6 +25,7 @@ namespace eval ucm {
         cp1256    glibc-CP1256-2.1.2
         cp1257    glibc-CP1257-2.1.2
         cp1258    glibc-CP1258-2.1.2
+        gb1988    glibc-GB_1988_80-2.3.3
         iso8859-1 glibc-ISO_8859_1-2.1.2
         iso8859-2 glibc-ISO_8859_2-2.1.2
         iso8859-3 glibc-ISO_8859_3-2.1.2
@@ -91,27 +93,99 @@ proc ucm::parse_SBCS {fd} {
 proc ucm::generate_tests {} {
     variable encNameMap
     variable charMap
+    variable outputPath
+    variable outputChan
+
+    if {[info exists outputPath]} {
+        set outputChan [open $outputPath w]
+    } else {
+        set outputChan stdout
+    }
 
     array set tclNames {}
     foreach encName [encoding names] {
         set tclNames($encName) ""
     }
-    foreach encName [lsort [array names encNameMap]] {
+
+    # Common procedures
+    print {
+# This file is automatically generated by ucm2tests.tcl.
+# Edits will be overwritten on next generation.
+#
+# Generates tests comparing Tcl encodings to ICU.
+# The generated file is NOT standalone. It should be sourced into a test script.
+
+proc ucmConvertfromMismatches {enc map} {
+    set mismatches {}
+    foreach {unihex hex} $map {
+        set unich [subst "\\U$unihex"]
+        if {[encoding convertfrom -profile strict $enc [binary decode hex $hex]] ne $unich} {
+            lappend mismatches "<[printable $unich],$hex>"
+        }
+    }
+    return $mismatches
+}
+proc ucmConverttoMismatches {enc map} {
+    set mismatches {}
+    foreach {unihex hex} $map {
+        set unich [subst "\\U$unihex"]
+        if {[encoding convertto -profile strict $enc $unich] ne [binary decode hex $hex]} {
+            lappend mismatches "<[printable $unich],$hex>"
+        }
+    }
+    return $mismatches
+}
+if {[info commands printable] eq ""} {
+    proc printable {s} {
+        set print ""
+        foreach c [split $s ""] {
+            set i [scan $c %c]
+            if {[string is print $c] && ($i <= 127)} {
+                append print $c
+            } elseif {$i <= 0xff} {
+                append print \\x[format %02X $i]
+            } elseif {$i <= 0xffff} {
+                append print \\u[format %04X $i]
+            } else {
+                append print \\U[format %08X $i]
+            }
+        }
+        return $print
+    }
+}
+    }
+    foreach encName [lsort -dictionary [array names encNameMap]] {
         if {![info exists charMap($encName)]} {
             warn "No character map read for $encName"
             continue
         }
         unset tclNames($encName)
-        print "\n# $encName (generated from $encNameMap($encName))"
-        print "lappend encValidStrings {*}{"
-        foreach {unich hex} $charMap($encName) {
-            print "    $encName \\u$unich $hex {} {}"
+
+        print "\n#\n# $encName (generated from $encNameMap($encName))"
+        print "\ntest encoding-convertfrom-ucmCompare-$encName {Compare against ICU UCM} -body \{"
+        print "    ucmConvertfromMismatches $encName {$charMap($encName)}"
+        print "\} -result {}"
+        print "\ntest encoding-convertto-ucmCompare-$encName {Compare against ICU UCM} -body \{"
+        print "    ucmConverttoMismatches $encName {$charMap($encName)}"
+        print "\} -result {}"
+        if {0} {
+            # This will generate individual tests for every char
+            # and test in lead, tail, middle, solo configurations
+            # but takes considerable time
+            print "lappend encValidStrings {*}{"
+            foreach {unich hex} $charMap($encName) {
+                print "    $encName \\u$unich $hex {} {}"
+            }
+            print "}; # $encName"
         }
-        print "}; # $encName"
     }
     if {[array size tclNames]} {
         warn "Missing encoding: [lsort [array names tclNames]]"
     }
+    if {[info exists outputPath]} {
+        close $outputChan
+        unset outputChan
+    }
 }
 
 proc ucm::parse_file {encName ucmPath} {
@@ -173,8 +247,13 @@ proc ucm::expand_paths {patterns} {
 
 proc ucm::run {} {
     variable encNameMap
-    if {[llength $::argv] != 1} {
-        abort "Usage: [info nameofexecutable] $::argv0 PATHTOUCMFILES"
+    variable outputPath
+    switch [llength $::argv] {
+        2 {set outputPath [lindex $::argv 1]}
+        1 {}
+        default {
+            abort "Usage: [info nameofexecutable] $::argv0 path/to/icu/ucm/data ?outputfile?"
+        }
     }
     foreach {encName fname} [array get encNameMap] {
         ucm::parse_file $encName [file join [lindex $::argv 0] ${fname}.ucm]
-- 
cgit v0.12


From c606ae1574a7d66bcbf8666506e91840875f6d45 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Feb 2023 17:50:36 +0000
Subject: Proposed fix for [d19fe0a5b]: Handling incomplete byte sequences for
 utf-16/utf-32

---
 generic/tclEncoding.c | 27 ++++++++++++++++++++++++---
 tests/encoding.test   |  6 ++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index dfa7907..ecec6e9 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2457,21 +2457,27 @@ UnicodeToUtfProc(
     }
     result = TCL_OK;
 
-    /* check alignment with utf-16 (2 == sizeof(UTF-16)) */
+    /*
+     * Check alignment with utf-16 (2 == sizeof(UTF-16))
+     */
+
     if ((srcLen % 2) != 0) {
 	result = TCL_CONVERT_MULTIBYTE;
 	srcLen--;
     }
 
+#if TCL_UTF_MAX > 3
     /*
-     * If last code point is a high surrogate, we cannot handle that yet.
+     * If last code point is a high surrogate, we cannot handle that yet,
+     * unless we are at the end.
      */
 
-    if ((srcLen >= 2) &&
+    if (!(flags & TCL_ENCODING_END) && (srcLen >= 2) &&
 	    ((src[srcLen - (clientData?1:2)] & 0xFC) == 0xD8)) {
 	result = TCL_CONVERT_MULTIBYTE;
 	srcLen-= 2;
     }
+#endif
 
     srcStart = src;
     srcEnd = src + srcLen;
@@ -2504,6 +2510,21 @@ UnicodeToUtfProc(
 	src += sizeof(unsigned short);
     }
 
+    if ((flags & TCL_ENCODING_END) && (result == TCL_CONVERT_MULTIBYTE)) {
+	/* We have a single byte left-over at the end */
+	if (dst > dstEnd) {
+	    result = TCL_CONVERT_NOSPACE;
+	} else {
+	    /* destination is not full, so we really are at the end now */
+	    if (flags & TCL_ENCODING_STOPONERROR) {
+		result = TCL_CONVERT_SYNTAX;
+	    } else {
+		dst += Tcl_UniCharToUtf(0xFFFD, dst);
+		numChars++;
+		src++;
+	    }
+	}
+    }
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = numChars;
diff --git a/tests/encoding.test b/tests/encoding.test
index f558e01..f6f9abc 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -419,6 +419,12 @@ test encoding-16.3 {UnicodeToUtfProc} -body {
     set val [encoding convertfrom unicode "\xDC\xDC"]
     list $val [format %X [scan $val %c]]
 } -result "\uDCDC DCDC"
+test encoding-16.4 {UnicodeToUtfProc, bug [d19fe0a5b]} -body {
+    encoding convertfrom unicode "\x41\x41\x41"
+} -result \u4141\uFFFD
+test encoding-16.5 {UnicodeToUtfProc, bug [d19fe0a5b]} -constraints ucs2 -body {
+    encoding convertfrom unicode "\xD8\xD8"
+} -result \uD8D8
 
 test encoding-17.1 {UtfToUnicodeProc} -constraints fullutf -body {
     encoding convertto unicode "\U460DC"
-- 
cgit v0.12


From f95599f4d4b6e502a92971909286a8ec6533c8c2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Feb 2023 23:16:14 +0000
Subject: More encoding fixes, e.g. range 0x80-0x9F for dingbats and symbol.
 Remove "-m" option from txt2enc.c tool, since the same is already handled in
 the table encoding code in Tcl itself. This was wat prevent Tcl to handle
 throwing exceptions correctly

---
 library/encoding/dingbats.enc |  4 ++--
 library/encoding/ebcdic.enc   |  1 +
 library/encoding/symbol.enc   |  4 ++--
 tools/encoding/Makefile       |  2 +-
 tools/encoding/dingbats.txt   |  1 +
 tools/encoding/gb1988.txt     |  1 +
 tools/encoding/macTurkish.txt |  1 +
 tools/encoding/macUkraine.txt |  1 +
 tools/encoding/symbol.txt     |  1 +
 tools/encoding/txt2enc.c      | 14 +-------------
 10 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/library/encoding/dingbats.enc b/library/encoding/dingbats.enc
index 9729487..bd466b2 100644
--- a/library/encoding/dingbats.enc
+++ b/library/encoding/dingbats.enc
@@ -10,8 +10,8 @@ S
 2730273127322733273427352736273727382739273A273B273C273D273E273F
 2740274127422743274427452746274727482749274A274B25CF274D25A0274F
 27502751275225B225BC25C6275625D727582759275A275B275C275D275E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000276127622763276427652766276726632666266526602460246124622463
 2464246524662467246824692776277727782779277A277B277C277D277E277F
 2780278127822783278427852786278727882789278A278B278C278D278E278F
diff --git a/library/encoding/ebcdic.enc b/library/encoding/ebcdic.enc
index f451de5..f83ce7d 100644
--- a/library/encoding/ebcdic.enc
+++ b/library/encoding/ebcdic.enc
@@ -1,3 +1,4 @@
+# Encoding file: ebcdic, single-byte
 S
 006F 0 1
 00
diff --git a/library/encoding/symbol.enc b/library/encoding/symbol.enc
index ffda9e3..ebd2f49 100644
--- a/library/encoding/symbol.enc
+++ b/library/encoding/symbol.enc
@@ -10,8 +10,8 @@ S
 03A0039803A103A303A403A503C203A9039E03A80396005B2234005D22A5005F
 F8E503B103B203C703B403B503C603B303B703B903D503BA03BB03BC03BD03BF
 03C003B803C103C303C403C503D603C903BE03C803B6007B007C007D223C007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
 000003D2203222642044221E0192266326662665266021942190219121922193
 00B000B12033226500D7221D2202202200F72260226122482026F8E6F8E721B5
 21352111211C21182297229522052229222A2283228722842282228622082209
diff --git a/tools/encoding/Makefile b/tools/encoding/Makefile
index 7235b47..a2122d5 100644
--- a/tools/encoding/Makefile
+++ b/tools/encoding/Makefile
@@ -67,7 +67,7 @@ encodings: clean txt2enc $(EUC_ENCODINGS)
 	@for p in *.txt; do \
 	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
 	    echo $$enc; \
-	    ./txt2enc -m $$p > $$enc; \
+	    ./txt2enc $$p > $$enc; \
 	done
 	@echo
 	@echo Compiling special versions of encoding files.
diff --git a/tools/encoding/dingbats.txt b/tools/encoding/dingbats.txt
index 334f8d6..93a6081 100644
--- a/tools/encoding/dingbats.txt
+++ b/tools/encoding/dingbats.txt
@@ -155,6 +155,7 @@
 0x7C	0x275C	# HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
 0x7D	0x275D	# HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
 0x7E	0x275E	# HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
+0x7F	0x275E	# DELETE
 0xA1	0x2761	# CURVED STEM PARAGRAPH SIGN ORNAMENT
 0xA2	0x2762	# HEAVY EXCLAMATION MARK ORNAMENT
 0xA3	0x2763	# HEAVY HEART EXCLAMATION MARK ORNAMENT
diff --git a/tools/encoding/gb1988.txt b/tools/encoding/gb1988.txt
index 800cd68..b9197e5 100644
--- a/tools/encoding/gb1988.txt
+++ b/tools/encoding/gb1988.txt
@@ -93,6 +93,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x203E	# OVERLINE
+0x7F	0x007F	# DELETE
 0xA1	0xFF61	# HALFWIDTH IDEOGRAPHIC FULL STOP
 0xA2	0xFF62	# HALFWIDTH LEFT CORNER BRACKET
 0xA3	0xFF63	# HALFWIDTH RIGHT CORNER BRACKET
diff --git a/tools/encoding/macTurkish.txt b/tools/encoding/macTurkish.txt
index 4a1ddab..ca3cda3 100644
--- a/tools/encoding/macTurkish.txt
+++ b/tools/encoding/macTurkish.txt
@@ -203,6 +203,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macUkraine.txt b/tools/encoding/macUkraine.txt
index dba4e10..dc07cdc 100644
--- a/tools/encoding/macUkraine.txt
+++ b/tools/encoding/macUkraine.txt
@@ -148,6 +148,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x0410	# CYRILLIC CAPITAL LETTER A
 0x81	0x0411	# CYRILLIC CAPITAL LETTER BE
diff --git a/tools/encoding/symbol.txt b/tools/encoding/symbol.txt
index 12dcae6..13a3ed8 100644
--- a/tools/encoding/symbol.txt
+++ b/tools/encoding/symbol.txt
@@ -169,6 +169,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x223C	# TILDE OPERATOR
+0x7F	0x007F	# DELETE
 0xA1	0x03D2	# GREEK UPSILON WITH HOOK SYMBOL
 0xA2	0x2032	# PRIME
 0xA3	0x2264	# LESS-THAN OR EQUAL TO
diff --git a/tools/encoding/txt2enc.c b/tools/encoding/txt2enc.c
index 7ee797b..80b44b9 100644
--- a/tools/encoding/txt2enc.c
+++ b/tools/encoding/txt2enc.c
@@ -26,7 +26,7 @@ main(int argc, char **argv)
 {
     FILE *fp;
     Rune *toUnicode[256];
-    int i, multiByte, enc, uni, hi, lo, fixmissing, used, maxEnc;
+    int i, multiByte, enc, uni, hi, lo, used, maxEnc;
     int ch, encColumn, uniColumn, fallbackKnown, width;
     char *fallbackString, *str, *rest, *dot;
     unsigned int magic, type, symbol, fallbackChar;
@@ -43,7 +43,6 @@ main(int argc, char **argv)
     fallbackKnown = 0;
     type = -1;
     symbol = 0;
-    fixmissing = 1;
 
     opterr = 0;
     while (1) {
@@ -89,10 +88,6 @@ main(int argc, char **argv)
 	    symbol = 1;
 	    break;
 
-	case 'm':
-	    fixmissing = 0;
-	    break;
-
 	default:
 	    goto usage;
 	}
@@ -207,13 +202,6 @@ main(int argc, char **argv)
 	for (i = 0; i < 0x20; i++) {
 	    toUnicode[0][i] = i;
 	}
-	if (fixmissing) {
-	    for (i = 0x7F; i < 0xA0; i++) {
-		if (toUnicode[i] == NULL && toUnicode[0][i] == 0) {
-		    toUnicode[0][i] = i;
-		}
-	    }
-	}
     }
 
     printf("# Encoding file: %s, %s-byte\n", argv[argc - 1], typeString[type]);
-- 
cgit v0.12


From a970bffd00117d4e762dfec90e21a94576da94fc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Feb 2023 23:22:45 +0000
Subject: Add 0x7F: DELETE to more mac* encodings (so re-generating doesn't
 remove it again)

---
 tools/encoding/macCentEuro.txt | 1 +
 tools/encoding/macCroatian.txt | 1 +
 tools/encoding/macCyrillic.txt | 1 +
 tools/encoding/macDingbats.txt | 1 +
 tools/encoding/macGreek.txt    | 1 +
 tools/encoding/macIceland.txt  | 1 +
 tools/encoding/macJapan.txt    | 1 +
 tools/encoding/macRoman.txt    | 1 +
 tools/encoding/macRomania.txt  | 1 +
 tools/encoding/macThai.txt     | 1 +
 10 files changed, 10 insertions(+)

diff --git a/tools/encoding/macCentEuro.txt b/tools/encoding/macCentEuro.txt
index bf424c1..aa92908 100644
--- a/tools/encoding/macCentEuro.txt
+++ b/tools/encoding/macCentEuro.txt
@@ -188,6 +188,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x0100	# LATIN CAPITAL LETTER A WITH MACRON
diff --git a/tools/encoding/macCroatian.txt b/tools/encoding/macCroatian.txt
index 538eda3..2eef246 100644
--- a/tools/encoding/macCroatian.txt
+++ b/tools/encoding/macCroatian.txt
@@ -216,6 +216,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macCyrillic.txt b/tools/encoding/macCyrillic.txt
index 695dade..2e9f8e2 100644
--- a/tools/encoding/macCyrillic.txt
+++ b/tools/encoding/macCyrillic.txt
@@ -213,6 +213,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x0410	# CYRILLIC CAPITAL LETTER A
 0x81	0x0411	# CYRILLIC CAPITAL LETTER BE
diff --git a/tools/encoding/macDingbats.txt b/tools/encoding/macDingbats.txt
index 273d526..4b815f4 100644
--- a/tools/encoding/macDingbats.txt
+++ b/tools/encoding/macDingbats.txt
@@ -151,6 +151,7 @@
 0x7C	0x275C	# HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
 0x7D	0x275D	# HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
 0x7E	0x275E	# HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
+0x7F	0x007F	# DELETE
 0x80	0xF8D7	# medium left parenthesis ornament
 0x81	0xF8D8	# medium right parenthesis ornament
 0x82	0xF8D9	# medium flattened left parenthesis ornament
diff --git a/tools/encoding/macGreek.txt b/tools/encoding/macGreek.txt
index 9783259..b960d68 100644
--- a/tools/encoding/macGreek.txt
+++ b/tools/encoding/macGreek.txt
@@ -207,6 +207,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00B9	# SUPERSCRIPT ONE
diff --git a/tools/encoding/macIceland.txt b/tools/encoding/macIceland.txt
index 0a0b27b..c60b8d2 100644
--- a/tools/encoding/macIceland.txt
+++ b/tools/encoding/macIceland.txt
@@ -234,6 +234,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macJapan.txt b/tools/encoding/macJapan.txt
index 7121b3b..3c48c4a 100644
--- a/tools/encoding/macJapan.txt
+++ b/tools/encoding/macJapan.txt
@@ -318,6 +318,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE # Apple change
+0x7F	0x007F	# DELETE
 #
 0x8140	0x3000	# IDEOGRAPHIC SPACE
 0x8141	0x3001	# IDEOGRAPHIC COMMA
diff --git a/tools/encoding/macRoman.txt b/tools/encoding/macRoman.txt
index 7ddcf8d..43ad44b 100644
--- a/tools/encoding/macRoman.txt
+++ b/tools/encoding/macRoman.txt
@@ -233,6 +233,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macRomania.txt b/tools/encoding/macRomania.txt
index 2a84adc..36a0b68 100644
--- a/tools/encoding/macRomania.txt
+++ b/tools/encoding/macRomania.txt
@@ -154,6 +154,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macThai.txt b/tools/encoding/macThai.txt
index b991833..2043621 100644
--- a/tools/encoding/macThai.txt
+++ b/tools/encoding/macThai.txt
@@ -168,6 +168,7 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
+0x7F	0x007F	# DELETE
 #
 0x80	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 0x81	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-- 
cgit v0.12


From 78db448fff66d55223a88f8225976f4324de1b95 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Feb 2023 13:31:41 +0000
Subject: Make txt2enc smarter, so we don't have to add DELETE any more in all
 original tables, better keep them as-is.

---
 tools/encoding/Makefile        |  2 +-
 tools/encoding/ascii.txt       |  1 -
 tools/encoding/big5.txt        |  1 -
 tools/encoding/dingbats.txt    |  1 -
 tools/encoding/gb1988.txt      |  1 -
 tools/encoding/macCentEuro.txt |  1 -
 tools/encoding/macCroatian.txt |  1 -
 tools/encoding/macCyrillic.txt |  1 -
 tools/encoding/macDingbats.txt |  1 -
 tools/encoding/macGreek.txt    |  1 -
 tools/encoding/macIceland.txt  |  1 -
 tools/encoding/macJapan.txt    |  1 -
 tools/encoding/macRoman.txt    |  1 -
 tools/encoding/macRomania.txt  |  1 -
 tools/encoding/macThai.txt     |  1 -
 tools/encoding/macTurkish.txt  |  1 -
 tools/encoding/macUkraine.txt  |  1 -
 tools/encoding/symbol.txt      |  1 -
 tools/encoding/txt2enc.c       | 14 ++++++++++++--
 19 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/tools/encoding/Makefile b/tools/encoding/Makefile
index a2122d5..ff19492 100644
--- a/tools/encoding/Makefile
+++ b/tools/encoding/Makefile
@@ -67,7 +67,7 @@ encodings: clean txt2enc $(EUC_ENCODINGS)
 	@for p in *.txt; do \
 	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
 	    echo $$enc; \
-	    ./txt2enc $$p > $$enc; \
+	    ./txt2enc -e 0 -u 1 $$p > $$enc; \
 	done
 	@echo
 	@echo Compiling special versions of encoding files.
diff --git a/tools/encoding/ascii.txt b/tools/encoding/ascii.txt
index 2afbaab..66ba6f3 100644
--- a/tools/encoding/ascii.txt
+++ b/tools/encoding/ascii.txt
@@ -93,4 +93,3 @@
 0x7C	0x007C	#	VERTICAL LINE
 0x7D	0x007D	#	RIGHT CURLY BRACKET
 0x7E	0x007E	#	TILDE
-0x7F	0x007F	#	DELETE
\ No newline at end of file
diff --git a/tools/encoding/big5.txt b/tools/encoding/big5.txt
index 06b0fac..58cdfe2 100644
--- a/tools/encoding/big5.txt
+++ b/tools/encoding/big5.txt
@@ -185,7 +185,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 0xA140	0x3000	# IDEOGRAPHIC SPACE
 0xA141	0xFF0C	# FULLWIDTH COMMA
 0xA142	0x3001	# IDEOGRAPHIC COMMA
diff --git a/tools/encoding/dingbats.txt b/tools/encoding/dingbats.txt
index 93a6081..334f8d6 100644
--- a/tools/encoding/dingbats.txt
+++ b/tools/encoding/dingbats.txt
@@ -155,7 +155,6 @@
 0x7C	0x275C	# HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
 0x7D	0x275D	# HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
 0x7E	0x275E	# HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
-0x7F	0x275E	# DELETE
 0xA1	0x2761	# CURVED STEM PARAGRAPH SIGN ORNAMENT
 0xA2	0x2762	# HEAVY EXCLAMATION MARK ORNAMENT
 0xA3	0x2763	# HEAVY HEART EXCLAMATION MARK ORNAMENT
diff --git a/tools/encoding/gb1988.txt b/tools/encoding/gb1988.txt
index b9197e5..800cd68 100644
--- a/tools/encoding/gb1988.txt
+++ b/tools/encoding/gb1988.txt
@@ -93,7 +93,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x203E	# OVERLINE
-0x7F	0x007F	# DELETE
 0xA1	0xFF61	# HALFWIDTH IDEOGRAPHIC FULL STOP
 0xA2	0xFF62	# HALFWIDTH LEFT CORNER BRACKET
 0xA3	0xFF63	# HALFWIDTH RIGHT CORNER BRACKET
diff --git a/tools/encoding/macCentEuro.txt b/tools/encoding/macCentEuro.txt
index aa92908..bf424c1 100644
--- a/tools/encoding/macCentEuro.txt
+++ b/tools/encoding/macCentEuro.txt
@@ -188,7 +188,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x0100	# LATIN CAPITAL LETTER A WITH MACRON
diff --git a/tools/encoding/macCroatian.txt b/tools/encoding/macCroatian.txt
index 2eef246..538eda3 100644
--- a/tools/encoding/macCroatian.txt
+++ b/tools/encoding/macCroatian.txt
@@ -216,7 +216,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macCyrillic.txt b/tools/encoding/macCyrillic.txt
index 2e9f8e2..695dade 100644
--- a/tools/encoding/macCyrillic.txt
+++ b/tools/encoding/macCyrillic.txt
@@ -213,7 +213,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x0410	# CYRILLIC CAPITAL LETTER A
 0x81	0x0411	# CYRILLIC CAPITAL LETTER BE
diff --git a/tools/encoding/macDingbats.txt b/tools/encoding/macDingbats.txt
index 4b815f4..273d526 100644
--- a/tools/encoding/macDingbats.txt
+++ b/tools/encoding/macDingbats.txt
@@ -151,7 +151,6 @@
 0x7C	0x275C	# HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
 0x7D	0x275D	# HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
 0x7E	0x275E	# HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
-0x7F	0x007F	# DELETE
 0x80	0xF8D7	# medium left parenthesis ornament
 0x81	0xF8D8	# medium right parenthesis ornament
 0x82	0xF8D9	# medium flattened left parenthesis ornament
diff --git a/tools/encoding/macGreek.txt b/tools/encoding/macGreek.txt
index b960d68..9783259 100644
--- a/tools/encoding/macGreek.txt
+++ b/tools/encoding/macGreek.txt
@@ -207,7 +207,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00B9	# SUPERSCRIPT ONE
diff --git a/tools/encoding/macIceland.txt b/tools/encoding/macIceland.txt
index c60b8d2..0a0b27b 100644
--- a/tools/encoding/macIceland.txt
+++ b/tools/encoding/macIceland.txt
@@ -234,7 +234,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macJapan.txt b/tools/encoding/macJapan.txt
index 3c48c4a..7121b3b 100644
--- a/tools/encoding/macJapan.txt
+++ b/tools/encoding/macJapan.txt
@@ -318,7 +318,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE # Apple change
-0x7F	0x007F	# DELETE
 #
 0x8140	0x3000	# IDEOGRAPHIC SPACE
 0x8141	0x3001	# IDEOGRAPHIC COMMA
diff --git a/tools/encoding/macRoman.txt b/tools/encoding/macRoman.txt
index 43ad44b..7ddcf8d 100644
--- a/tools/encoding/macRoman.txt
+++ b/tools/encoding/macRoman.txt
@@ -233,7 +233,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macRomania.txt b/tools/encoding/macRomania.txt
index 36a0b68..2a84adc 100644
--- a/tools/encoding/macRomania.txt
+++ b/tools/encoding/macRomania.txt
@@ -154,7 +154,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macThai.txt b/tools/encoding/macThai.txt
index 2043621..b991833 100644
--- a/tools/encoding/macThai.txt
+++ b/tools/encoding/macThai.txt
@@ -168,7 +168,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 0x81	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
diff --git a/tools/encoding/macTurkish.txt b/tools/encoding/macTurkish.txt
index ca3cda3..4a1ddab 100644
--- a/tools/encoding/macTurkish.txt
+++ b/tools/encoding/macTurkish.txt
@@ -203,7 +203,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
 0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
diff --git a/tools/encoding/macUkraine.txt b/tools/encoding/macUkraine.txt
index dc07cdc..dba4e10 100644
--- a/tools/encoding/macUkraine.txt
+++ b/tools/encoding/macUkraine.txt
@@ -148,7 +148,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x007E	# TILDE
-0x7F	0x007F	# DELETE
 #
 0x80	0x0410	# CYRILLIC CAPITAL LETTER A
 0x81	0x0411	# CYRILLIC CAPITAL LETTER BE
diff --git a/tools/encoding/symbol.txt b/tools/encoding/symbol.txt
index 13a3ed8..12dcae6 100644
--- a/tools/encoding/symbol.txt
+++ b/tools/encoding/symbol.txt
@@ -169,7 +169,6 @@
 0x7C	0x007C	# VERTICAL LINE
 0x7D	0x007D	# RIGHT CURLY BRACKET
 0x7E	0x223C	# TILDE OPERATOR
-0x7F	0x007F	# DELETE
 0xA1	0x03D2	# GREEK UPSILON WITH HOOK SYMBOL
 0xA2	0x2032	# PRIME
 0xA3	0x2264	# LESS-THAN OR EQUAL TO
diff --git a/tools/encoding/txt2enc.c b/tools/encoding/txt2enc.c
index 80b44b9..32c7344 100644
--- a/tools/encoding/txt2enc.c
+++ b/tools/encoding/txt2enc.c
@@ -26,7 +26,7 @@ main(int argc, char **argv)
 {
     FILE *fp;
     Rune *toUnicode[256];
-    int i, multiByte, enc, uni, hi, lo, used, maxEnc;
+    int i, multiByte, enc, uni, hi, lo, fixmissing, used, maxEnc;
     int ch, encColumn, uniColumn, fallbackKnown, width;
     char *fallbackString, *str, *rest, *dot;
     unsigned int magic, type, symbol, fallbackChar;
@@ -43,6 +43,7 @@ main(int argc, char **argv)
     fallbackKnown = 0;
     type = -1;
     symbol = 0;
+    fixmissing = 1;
 
     opterr = 0;
     while (1) {
@@ -88,6 +89,10 @@ main(int argc, char **argv)
 	    symbol = 1;
 	    break;
 
+	case 'm':
+	    fixmissing = 0;
+	    break;
+
 	default:
 	    goto usage;
 	}
@@ -101,7 +106,7 @@ main(int argc, char **argv)
 	fputs("    -f\tfallback character (default: QUESTION MARK)\n", stderr);
 	fputs("    -t\toverride implicit type with single, double, or multi\n", stderr);
 	fputs("    -s\tsymbol+ascii encoding\n", stderr);
-	fputs("    -m\tdon't implicitly include range 0080 to 00FF\n", stderr);
+	fputs("    -m\tdon't implicitly include 007F\n", stderr);
 	return 1;
     }
 
@@ -202,6 +207,11 @@ main(int argc, char **argv)
 	for (i = 0; i < 0x20; i++) {
 	    toUnicode[0][i] = i;
 	}
+	if (fixmissing) {
+	    if (toUnicode[0x7F] == NULL && toUnicode[0][0x7F] == 0) {
+		toUnicode[0][0x7F] = 0x7F;
+	    }
+	}
     }
 
     printf("# Encoding file: %s, %s-byte\n", argv[argc - 1], typeString[type]);
-- 
cgit v0.12


From 12345dfed8593e385a076594f4edcc545166d9ac Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Feb 2023 13:34:04 +0000
Subject: re-generate macDingbats.enc, so it can now throw exceptions for the
 range 0x8E-0x9F

---
 library/encoding/macDingbats.enc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/encoding/macDingbats.enc b/library/encoding/macDingbats.enc
index 28449cd..9fa47b5 100644
--- a/library/encoding/macDingbats.enc
+++ b/library/encoding/macDingbats.enc
@@ -10,8 +10,8 @@ S
 2730273127322733273427352736273727382739273A273B273C273D273E273F
 2740274127422743274427452746274727482749274A274B25CF274D25A0274F
 27502751275225B225BC25C6275625D727582759275A275B275C275D275E007F
-F8D7F8D8F8D9F8DAF8DBF8DCF8DDF8DEF8DFF8E0F8E1F8E2F8E3F8E4008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
+F8D7F8D8F8D9F8DAF8DBF8DCF8DDF8DEF8DFF8E0F8E1F8E2F8E3F8E400000000
+0000000000000000000000000000000000000000000000000000000000000000
 0000276127622763276427652766276726632666266526602460246124622463
 2464246524662467246824692776277727782779277A277B277C277D277E277F
 2780278127822783278427852786278727882789278A278B278C278D278E278F
-- 
cgit v0.12


From 293504812606130380d7240fddbbdc573b9dae8c Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 22 Feb 2023 13:42:55 +0000
Subject: Add ICU tests for unmapped characters.

---
 tests/cmdAH.test      |    4 +
 tests/icuUcmTests.tcl | 1891 +++++++++++++++++++++++++++++++++++++++++++++++++
 tools/ucm2tests.tcl   |  156 +++-
 3 files changed, 2017 insertions(+), 34 deletions(-)
 create mode 100644 tests/icuUcmTests.tcl

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 3be2f14..cfde678 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -795,6 +795,10 @@ lappend encUnencodableStrings {*}{
     utf-8 \uDC00 strict  {}      0 {} High-surrogate
 }
 
+# Generated tests comparing against ICU
+# TODO - commented out for now as generating a lot of mismatches.
+# source [file join [file dirname [info script]] icuUcmTests.tcl]
+
 # Maps utf-{16,32}{le,be} to utf-16, utf-32 and
 # others to "". Used to test utf-16, utf-32 based
 # on system endianness
diff --git a/tests/icuUcmTests.tcl b/tests/icuUcmTests.tcl
new file mode 100644
index 0000000..0c4071f
--- /dev/null
+++ b/tests/icuUcmTests.tcl
@@ -0,0 +1,1891 @@
+
+# This file is automatically generated by ucm2tests.tcl.
+# Edits will be overwritten on next generation.
+#
+# Generates tests comparing Tcl encodings to ICU.
+# The generated file is NOT standalone. It should be sourced into a test script.
+
+proc ucmConvertfromMismatches {enc map} {
+    set mismatches {}
+    foreach {unihex hex} $map {
+        set unihex [string range 00000000$unihex end-7 end]; # Make 8 digits
+        set unich [subst "\\U$unihex"]
+        if {[encoding convertfrom -profile strict $enc [binary decode hex $hex]] ne $unich} {
+            lappend mismatches "<[printable $unich],$hex>"
+        }
+    }
+    return $mismatches
+}
+proc ucmConverttoMismatches {enc map} {
+    set mismatches {}
+    foreach {unihex hex} $map {
+        set unihex [string range 00000000$unihex end-7 end]; # Make 8 digits
+        set unich [subst "\\U$unihex"]
+        if {[encoding convertto -profile strict $enc $unich] ne [binary decode hex $hex]} {
+            lappend mismatches "<[printable $unich],$hex>"
+        }
+    }
+    return $mismatches
+}
+if {[info commands printable] eq ""} {
+    proc printable {s} {
+        set print ""
+        foreach c [split $s ""] {
+            set i [scan $c %c]
+            if {[string is print $c] && ($i <= 127)} {
+                append print $c
+            } elseif {$i <= 0xff} {
+                append print \\x[format %02X $i]
+            } elseif {$i <= 0xffff} {
+                append print \\u[format %04X $i]
+            } else {
+                append print \\U[format %08X $i]
+            }
+        }
+        return $print
+    }
+}
+    
+
+#
+# cp1250 (generated from glibc-CP1250-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1250 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1250 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00BB BB 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A5 0105 B9 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D BC 013E BE 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A 8C 015B 9C 015E AA 015F BA 0160 8A 0161 9A 0162 DE 0163 FE 0164 8D 0165 9D 016E D9 016F F9 0170 DB 0171 FB 0179 8F 017A 9F 017B AF 017C BF 017D 8E 017E 9E 02C7 A1 02D8 A2 02D9 FF 02DB B2 02DD BD 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1250 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1250 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00BB BB 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A5 0105 B9 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D BC 013E BE 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A 8C 015B 9C 015E AA 015F BA 0160 8A 0161 9A 0162 DE 0163 FE 0164 8D 0165 9D 016E D9 016F F9 0170 DB 0171 FB 0179 8F 017A 9F 017B AF 017C BF 017D 8E 017E 9E 02C7 A1 02D8 A2 02D9 FF 02DB B2 02DD BD 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1250 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1250 81 tcl8    \U00000081 -1 {} {}
+    cp1250 81 replace \uFFFD -1 {} {}
+    cp1250 81 strict  {}       0 {} {}
+    cp1250 83 tcl8    \U00000083 -1 {} {}
+    cp1250 83 replace \uFFFD -1 {} {}
+    cp1250 83 strict  {}       0 {} {}
+    cp1250 88 tcl8    \U00000088 -1 {} {}
+    cp1250 88 replace \uFFFD -1 {} {}
+    cp1250 88 strict  {}       0 {} {}
+    cp1250 90 tcl8    \U00000090 -1 {} {}
+    cp1250 90 replace \uFFFD -1 {} {}
+    cp1250 90 strict  {}       0 {} {}
+    cp1250 98 tcl8    \U00000098 -1 {} {}
+    cp1250 98 replace \uFFFD -1 {} {}
+    cp1250 98 strict  {}       0 {} {}
+}; # cp1250
+
+# cp1250 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1250 \U00000080 tcl8    1A -1 {} {}
+    cp1250 \U00000080 replace 1A -1 {} {}
+    cp1250 \U00000080 strict  {}                      0 {} {}
+    cp1250 \U00000400 tcl8    1A -1 {} {}
+    cp1250 \U00000400 replace 1A -1 {} {}
+    cp1250 \U00000400 strict  {}                      0 {} {}
+    cp1250 \U0000D800 tcl8    1A -1 {} {}
+    cp1250 \U0000D800 replace 1A -1 {} {}
+    cp1250 \U0000D800 strict  {}                      0 {} {}
+    cp1250 \U0000DC00 tcl8    1A -1 {} {}
+    cp1250 \U0000DC00 replace 1A -1 {} {}
+    cp1250 \U0000DC00 strict  {}                      0 {} {}
+    cp1250 \U00010000 tcl8    1A -1 {} {}
+    cp1250 \U00010000 replace 1A -1 {} {}
+    cp1250 \U00010000 strict  {}                      0 {} {}
+    cp1250 \U0010FFFF tcl8    1A -1 {} {}
+    cp1250 \U0010FFFF replace 1A -1 {} {}
+    cp1250 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1250
+
+#
+# cp1251 (generated from glibc-CP1251-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1251 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1251 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B5 B5 00B6 B6 00B7 B7 00BB BB 0401 A8 0402 80 0403 81 0404 AA 0405 BD 0406 B2 0407 AF 0408 A3 0409 8A 040A 8C 040B 8E 040C 8D 040E A1 040F 8F 0410 C0 0411 C1 0412 C2 0413 C3 0414 C4 0415 C5 0416 C6 0417 C7 0418 C8 0419 C9 041A CA 041B CB 041C CC 041D CD 041E CE 041F CF 0420 D0 0421 D1 0422 D2 0423 D3 0424 D4 0425 D5 0426 D6 0427 D7 0428 D8 0429 D9 042A DA 042B DB 042C DC 042D DD 042E DE 042F DF 0430 E0 0431 E1 0432 E2 0433 E3 0434 E4 0435 E5 0436 E6 0437 E7 0438 E8 0439 E9 043A EA 043B EB 043C EC 043D ED 043E EE 043F EF 0440 F0 0441 F1 0442 F2 0443 F3 0444 F4 0445 F5 0446 F6 0447 F7 0448 F8 0449 F9 044A FA 044B FB 044C FC 044D FD 044E FE 044F FF 0451 B8 0452 90 0453 83 0454 BA 0455 BE 0456 B3 0457 BF 0458 BC 0459 9A 045A 9C 045B 9E 045C 9D 045E A2 045F 9F 0490 A5 0491 B4 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 88 2116 B9 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1251 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1251 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B5 B5 00B6 B6 00B7 B7 00BB BB 0401 A8 0402 80 0403 81 0404 AA 0405 BD 0406 B2 0407 AF 0408 A3 0409 8A 040A 8C 040B 8E 040C 8D 040E A1 040F 8F 0410 C0 0411 C1 0412 C2 0413 C3 0414 C4 0415 C5 0416 C6 0417 C7 0418 C8 0419 C9 041A CA 041B CB 041C CC 041D CD 041E CE 041F CF 0420 D0 0421 D1 0422 D2 0423 D3 0424 D4 0425 D5 0426 D6 0427 D7 0428 D8 0429 D9 042A DA 042B DB 042C DC 042D DD 042E DE 042F DF 0430 E0 0431 E1 0432 E2 0433 E3 0434 E4 0435 E5 0436 E6 0437 E7 0438 E8 0439 E9 043A EA 043B EB 043C EC 043D ED 043E EE 043F EF 0440 F0 0441 F1 0442 F2 0443 F3 0444 F4 0445 F5 0446 F6 0447 F7 0448 F8 0449 F9 044A FA 044B FB 044C FC 044D FD 044E FE 044F FF 0451 B8 0452 90 0453 83 0454 BA 0455 BE 0456 B3 0457 BF 0458 BC 0459 9A 045A 9C 045B 9E 045C 9D 045E A2 045F 9F 0490 A5 0491 B4 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 88 2116 B9 2122 99}
+} -result {}
+
+# cp1251 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1251 98 tcl8    \U00000098 -1 {} {}
+    cp1251 98 replace \uFFFD -1 {} {}
+    cp1251 98 strict  {}       0 {} {}
+}; # cp1251
+
+# cp1251 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1251 \U00000080 tcl8    1A -1 {} {}
+    cp1251 \U00000080 replace 1A -1 {} {}
+    cp1251 \U00000080 strict  {}                      0 {} {}
+    cp1251 \U00000400 tcl8    1A -1 {} {}
+    cp1251 \U00000400 replace 1A -1 {} {}
+    cp1251 \U00000400 strict  {}                      0 {} {}
+    cp1251 \U0000D800 tcl8    1A -1 {} {}
+    cp1251 \U0000D800 replace 1A -1 {} {}
+    cp1251 \U0000D800 strict  {}                      0 {} {}
+    cp1251 \U0000DC00 tcl8    1A -1 {} {}
+    cp1251 \U0000DC00 replace 1A -1 {} {}
+    cp1251 \U0000DC00 strict  {}                      0 {} {}
+    cp1251 \U00010000 tcl8    1A -1 {} {}
+    cp1251 \U00010000 replace 1A -1 {} {}
+    cp1251 \U00010000 strict  {}                      0 {} {}
+    cp1251 \U0010FFFF tcl8    1A -1 {} {}
+    cp1251 \U0010FFFF replace 1A -1 {} {}
+    cp1251 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1251
+
+#
+# cp1252 (generated from glibc-CP1252-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1252 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1252 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 8C 0153 9C 0160 8A 0161 9A 0178 9F 017D 8E 017E 9E 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1252 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1252 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 8C 0153 9C 0160 8A 0161 9A 0178 9F 017D 8E 017E 9E 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1252 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1252 81 tcl8    \U00000081 -1 {} {}
+    cp1252 81 replace \uFFFD -1 {} {}
+    cp1252 81 strict  {}       0 {} {}
+    cp1252 8D tcl8    \U0000008D -1 {} {}
+    cp1252 8D replace \uFFFD -1 {} {}
+    cp1252 8D strict  {}       0 {} {}
+    cp1252 8F tcl8    \U0000008F -1 {} {}
+    cp1252 8F replace \uFFFD -1 {} {}
+    cp1252 8F strict  {}       0 {} {}
+    cp1252 90 tcl8    \U00000090 -1 {} {}
+    cp1252 90 replace \uFFFD -1 {} {}
+    cp1252 90 strict  {}       0 {} {}
+    cp1252 9D tcl8    \U0000009D -1 {} {}
+    cp1252 9D replace \uFFFD -1 {} {}
+    cp1252 9D strict  {}       0 {} {}
+}; # cp1252
+
+# cp1252 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1252 \U00000080 tcl8    1A -1 {} {}
+    cp1252 \U00000080 replace 1A -1 {} {}
+    cp1252 \U00000080 strict  {}                      0 {} {}
+    cp1252 \U00000400 tcl8    1A -1 {} {}
+    cp1252 \U00000400 replace 1A -1 {} {}
+    cp1252 \U00000400 strict  {}                      0 {} {}
+    cp1252 \U0000D800 tcl8    1A -1 {} {}
+    cp1252 \U0000D800 replace 1A -1 {} {}
+    cp1252 \U0000D800 strict  {}                      0 {} {}
+    cp1252 \U0000DC00 tcl8    1A -1 {} {}
+    cp1252 \U0000DC00 replace 1A -1 {} {}
+    cp1252 \U0000DC00 strict  {}                      0 {} {}
+    cp1252 \U00010000 tcl8    1A -1 {} {}
+    cp1252 \U00010000 replace 1A -1 {} {}
+    cp1252 \U00010000 strict  {}                      0 {} {}
+    cp1252 \U0010FFFF tcl8    1A -1 {} {}
+    cp1252 \U0010FFFF replace 1A -1 {} {}
+    cp1252 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1252
+
+#
+# cp1253 (generated from glibc-CP1253-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1253 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1253 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00BB BB 00BD BD 0192 83 0384 B4 0385 A1 0386 A2 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2013 96 2014 97 2015 AF 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1253 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1253 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00BB BB 00BD BD 0192 83 0384 B4 0385 A1 0386 A2 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2013 96 2014 97 2015 AF 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1253 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1253 81 tcl8    \U00000081 -1 {} {}
+    cp1253 81 replace \uFFFD -1 {} {}
+    cp1253 81 strict  {}       0 {} {}
+    cp1253 88 tcl8    \U00000088 -1 {} {}
+    cp1253 88 replace \uFFFD -1 {} {}
+    cp1253 88 strict  {}       0 {} {}
+    cp1253 8A tcl8    \U0000008A -1 {} {}
+    cp1253 8A replace \uFFFD -1 {} {}
+    cp1253 8A strict  {}       0 {} {}
+    cp1253 8C tcl8    \U0000008C -1 {} {}
+    cp1253 8C replace \uFFFD -1 {} {}
+    cp1253 8C strict  {}       0 {} {}
+    cp1253 8D tcl8    \U0000008D -1 {} {}
+    cp1253 8D replace \uFFFD -1 {} {}
+    cp1253 8D strict  {}       0 {} {}
+    cp1253 8E tcl8    \U0000008E -1 {} {}
+    cp1253 8E replace \uFFFD -1 {} {}
+    cp1253 8E strict  {}       0 {} {}
+    cp1253 8F tcl8    \U0000008F -1 {} {}
+    cp1253 8F replace \uFFFD -1 {} {}
+    cp1253 8F strict  {}       0 {} {}
+    cp1253 90 tcl8    \U00000090 -1 {} {}
+    cp1253 90 replace \uFFFD -1 {} {}
+    cp1253 90 strict  {}       0 {} {}
+    cp1253 98 tcl8    \U00000098 -1 {} {}
+    cp1253 98 replace \uFFFD -1 {} {}
+    cp1253 98 strict  {}       0 {} {}
+    cp1253 9A tcl8    \U0000009A -1 {} {}
+    cp1253 9A replace \uFFFD -1 {} {}
+    cp1253 9A strict  {}       0 {} {}
+    cp1253 9C tcl8    \U0000009C -1 {} {}
+    cp1253 9C replace \uFFFD -1 {} {}
+    cp1253 9C strict  {}       0 {} {}
+    cp1253 9D tcl8    \U0000009D -1 {} {}
+    cp1253 9D replace \uFFFD -1 {} {}
+    cp1253 9D strict  {}       0 {} {}
+    cp1253 9E tcl8    \U0000009E -1 {} {}
+    cp1253 9E replace \uFFFD -1 {} {}
+    cp1253 9E strict  {}       0 {} {}
+    cp1253 9F tcl8    \U0000009F -1 {} {}
+    cp1253 9F replace \uFFFD -1 {} {}
+    cp1253 9F strict  {}       0 {} {}
+    cp1253 AA tcl8    \U000000AA -1 {} {}
+    cp1253 AA replace \uFFFD -1 {} {}
+    cp1253 AA strict  {}       0 {} {}
+    cp1253 D2 tcl8    \U000000D2 -1 {} {}
+    cp1253 D2 replace \uFFFD -1 {} {}
+    cp1253 D2 strict  {}       0 {} {}
+    cp1253 FF tcl8    \U000000FF -1 {} {}
+    cp1253 FF replace \uFFFD -1 {} {}
+    cp1253 FF strict  {}       0 {} {}
+}; # cp1253
+
+# cp1253 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1253 \U00000080 tcl8    1A -1 {} {}
+    cp1253 \U00000080 replace 1A -1 {} {}
+    cp1253 \U00000080 strict  {}                      0 {} {}
+    cp1253 \U00000400 tcl8    1A -1 {} {}
+    cp1253 \U00000400 replace 1A -1 {} {}
+    cp1253 \U00000400 strict  {}                      0 {} {}
+    cp1253 \U0000D800 tcl8    1A -1 {} {}
+    cp1253 \U0000D800 replace 1A -1 {} {}
+    cp1253 \U0000D800 strict  {}                      0 {} {}
+    cp1253 \U0000DC00 tcl8    1A -1 {} {}
+    cp1253 \U0000DC00 replace 1A -1 {} {}
+    cp1253 \U0000DC00 strict  {}                      0 {} {}
+    cp1253 \U00010000 tcl8    1A -1 {} {}
+    cp1253 \U00010000 replace 1A -1 {} {}
+    cp1253 \U00010000 strict  {}                      0 {} {}
+    cp1253 \U0010FFFF tcl8    1A -1 {} {}
+    cp1253 \U0010FFFF replace 1A -1 {} {}
+    cp1253 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1253
+
+#
+# cp1254 (generated from glibc-CP1254-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1254 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1254 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 0152 8C 0153 9C 015E DE 015F FE 0160 8A 0161 9A 0178 9F 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1254 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1254 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 0152 8C 0153 9C 015E DE 015F FE 0160 8A 0161 9A 0178 9F 0192 83 02C6 88 02DC 98 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1254 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1254 81 tcl8    \U00000081 -1 {} {}
+    cp1254 81 replace \uFFFD -1 {} {}
+    cp1254 81 strict  {}       0 {} {}
+    cp1254 8D tcl8    \U0000008D -1 {} {}
+    cp1254 8D replace \uFFFD -1 {} {}
+    cp1254 8D strict  {}       0 {} {}
+    cp1254 8E tcl8    \U0000008E -1 {} {}
+    cp1254 8E replace \uFFFD -1 {} {}
+    cp1254 8E strict  {}       0 {} {}
+    cp1254 8F tcl8    \U0000008F -1 {} {}
+    cp1254 8F replace \uFFFD -1 {} {}
+    cp1254 8F strict  {}       0 {} {}
+    cp1254 90 tcl8    \U00000090 -1 {} {}
+    cp1254 90 replace \uFFFD -1 {} {}
+    cp1254 90 strict  {}       0 {} {}
+    cp1254 9D tcl8    \U0000009D -1 {} {}
+    cp1254 9D replace \uFFFD -1 {} {}
+    cp1254 9D strict  {}       0 {} {}
+    cp1254 9E tcl8    \U0000009E -1 {} {}
+    cp1254 9E replace \uFFFD -1 {} {}
+    cp1254 9E strict  {}       0 {} {}
+}; # cp1254
+
+# cp1254 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1254 \U00000080 tcl8    1A -1 {} {}
+    cp1254 \U00000080 replace 1A -1 {} {}
+    cp1254 \U00000080 strict  {}                      0 {} {}
+    cp1254 \U00000400 tcl8    1A -1 {} {}
+    cp1254 \U00000400 replace 1A -1 {} {}
+    cp1254 \U00000400 strict  {}                      0 {} {}
+    cp1254 \U0000D800 tcl8    1A -1 {} {}
+    cp1254 \U0000D800 replace 1A -1 {} {}
+    cp1254 \U0000D800 strict  {}                      0 {} {}
+    cp1254 \U0000DC00 tcl8    1A -1 {} {}
+    cp1254 \U0000DC00 replace 1A -1 {} {}
+    cp1254 \U0000DC00 strict  {}                      0 {} {}
+    cp1254 \U00010000 tcl8    1A -1 {} {}
+    cp1254 \U00010000 replace 1A -1 {} {}
+    cp1254 \U00010000 strict  {}                      0 {} {}
+    cp1254 \U0010FFFF tcl8    1A -1 {} {}
+    cp1254 \U0010FFFF replace 1A -1 {} {}
+    cp1254 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1254
+
+#
+# cp1255 (generated from glibc-CP1255-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1255 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1255 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00D7 AA 00F7 BA 0192 83 02C6 88 02DC 98 05B0 C0 05B1 C1 05B2 C2 05B3 C3 05B4 C4 05B5 C5 05B6 C6 05B7 C7 05B8 C8 05B9 C9 05BB CB 05BC CC 05BD CD 05BE CE 05BF CF 05C0 D0 05C1 D1 05C2 D2 05C3 D3 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 05F0 D4 05F1 D5 05F2 D6 05F3 D7 05F4 D8 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AA A4 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1255 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1255 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00D7 AA 00F7 BA 0192 83 02C6 88 02DC 98 05B0 C0 05B1 C1 05B2 C2 05B3 C3 05B4 C4 05B5 C5 05B6 C6 05B7 C7 05B8 C8 05B9 C9 05BB CB 05BC CC 05BD CD 05BE CE 05BF CF 05C0 D0 05C1 D1 05C2 D2 05C3 D3 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 05F0 D4 05F1 D5 05F2 D6 05F3 D7 05F4 D8 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AA A4 20AC 80 2122 99}
+} -result {}
+
+# cp1255 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1255 81 tcl8    \U00000081 -1 {} {}
+    cp1255 81 replace \uFFFD -1 {} {}
+    cp1255 81 strict  {}       0 {} {}
+    cp1255 8A tcl8    \U0000008A -1 {} {}
+    cp1255 8A replace \uFFFD -1 {} {}
+    cp1255 8A strict  {}       0 {} {}
+    cp1255 8C tcl8    \U0000008C -1 {} {}
+    cp1255 8C replace \uFFFD -1 {} {}
+    cp1255 8C strict  {}       0 {} {}
+    cp1255 8D tcl8    \U0000008D -1 {} {}
+    cp1255 8D replace \uFFFD -1 {} {}
+    cp1255 8D strict  {}       0 {} {}
+    cp1255 8E tcl8    \U0000008E -1 {} {}
+    cp1255 8E replace \uFFFD -1 {} {}
+    cp1255 8E strict  {}       0 {} {}
+    cp1255 8F tcl8    \U0000008F -1 {} {}
+    cp1255 8F replace \uFFFD -1 {} {}
+    cp1255 8F strict  {}       0 {} {}
+    cp1255 90 tcl8    \U00000090 -1 {} {}
+    cp1255 90 replace \uFFFD -1 {} {}
+    cp1255 90 strict  {}       0 {} {}
+    cp1255 9A tcl8    \U0000009A -1 {} {}
+    cp1255 9A replace \uFFFD -1 {} {}
+    cp1255 9A strict  {}       0 {} {}
+    cp1255 9C tcl8    \U0000009C -1 {} {}
+    cp1255 9C replace \uFFFD -1 {} {}
+    cp1255 9C strict  {}       0 {} {}
+    cp1255 9D tcl8    \U0000009D -1 {} {}
+    cp1255 9D replace \uFFFD -1 {} {}
+    cp1255 9D strict  {}       0 {} {}
+    cp1255 9E tcl8    \U0000009E -1 {} {}
+    cp1255 9E replace \uFFFD -1 {} {}
+    cp1255 9E strict  {}       0 {} {}
+    cp1255 9F tcl8    \U0000009F -1 {} {}
+    cp1255 9F replace \uFFFD -1 {} {}
+    cp1255 9F strict  {}       0 {} {}
+    cp1255 CA tcl8    \U000000CA -1 {} {}
+    cp1255 CA replace \uFFFD -1 {} {}
+    cp1255 CA strict  {}       0 {} {}
+    cp1255 D9 tcl8    \U000000D9 -1 {} {}
+    cp1255 D9 replace \uFFFD -1 {} {}
+    cp1255 D9 strict  {}       0 {} {}
+    cp1255 DA tcl8    \U000000DA -1 {} {}
+    cp1255 DA replace \uFFFD -1 {} {}
+    cp1255 DA strict  {}       0 {} {}
+    cp1255 DB tcl8    \U000000DB -1 {} {}
+    cp1255 DB replace \uFFFD -1 {} {}
+    cp1255 DB strict  {}       0 {} {}
+    cp1255 DC tcl8    \U000000DC -1 {} {}
+    cp1255 DC replace \uFFFD -1 {} {}
+    cp1255 DC strict  {}       0 {} {}
+    cp1255 DD tcl8    \U000000DD -1 {} {}
+    cp1255 DD replace \uFFFD -1 {} {}
+    cp1255 DD strict  {}       0 {} {}
+    cp1255 DE tcl8    \U000000DE -1 {} {}
+    cp1255 DE replace \uFFFD -1 {} {}
+    cp1255 DE strict  {}       0 {} {}
+    cp1255 DF tcl8    \U000000DF -1 {} {}
+    cp1255 DF replace \uFFFD -1 {} {}
+    cp1255 DF strict  {}       0 {} {}
+    cp1255 FB tcl8    \U000000FB -1 {} {}
+    cp1255 FB replace \uFFFD -1 {} {}
+    cp1255 FB strict  {}       0 {} {}
+    cp1255 FC tcl8    \U000000FC -1 {} {}
+    cp1255 FC replace \uFFFD -1 {} {}
+    cp1255 FC strict  {}       0 {} {}
+    cp1255 FF tcl8    \U000000FF -1 {} {}
+    cp1255 FF replace \uFFFD -1 {} {}
+    cp1255 FF strict  {}       0 {} {}
+}; # cp1255
+
+# cp1255 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1255 \U00000080 tcl8    1A -1 {} {}
+    cp1255 \U00000080 replace 1A -1 {} {}
+    cp1255 \U00000080 strict  {}                      0 {} {}
+    cp1255 \U00000400 tcl8    1A -1 {} {}
+    cp1255 \U00000400 replace 1A -1 {} {}
+    cp1255 \U00000400 strict  {}                      0 {} {}
+    cp1255 \U0000D800 tcl8    1A -1 {} {}
+    cp1255 \U0000D800 replace 1A -1 {} {}
+    cp1255 \U0000D800 strict  {}                      0 {} {}
+    cp1255 \U0000DC00 tcl8    1A -1 {} {}
+    cp1255 \U0000DC00 replace 1A -1 {} {}
+    cp1255 \U0000DC00 strict  {}                      0 {} {}
+    cp1255 \U00010000 tcl8    1A -1 {} {}
+    cp1255 \U00010000 replace 1A -1 {} {}
+    cp1255 \U00010000 strict  {}                      0 {} {}
+    cp1255 \U0010FFFF tcl8    1A -1 {} {}
+    cp1255 \U0010FFFF replace 1A -1 {} {}
+    cp1255 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1255
+
+#
+# cp1256 (generated from glibc-CP1256-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1256 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1256 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 D7 00E0 E0 00E2 E2 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EE EE 00EF EF 00F4 F4 00F7 F7 00F9 F9 00FB FB 00FC FC 0152 8C 0153 9C 0192 83 02C6 88 060C A1 061B BA 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D8 0638 D9 0639 DA 063A DB 0640 DC 0641 DD 0642 DE 0643 DF 0644 E1 0645 E3 0646 E4 0647 E5 0648 E6 0649 EC 064A ED 064B F0 064C F1 064D F2 064E F3 064F F5 0650 F6 0651 F8 0652 FA 0679 8A 067E 81 0686 8D 0688 8F 0691 9A 0698 8E 06A9 98 06AF 90 06BA 9F 06BE AA 06C1 C0 06D2 FF 200C 9D 200D 9E 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1256 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1256 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 D7 00E0 E0 00E2 E2 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EE EE 00EF EF 00F4 F4 00F7 F7 00F9 F9 00FB FB 00FC FC 0152 8C 0153 9C 0192 83 02C6 88 060C A1 061B BA 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D8 0638 D9 0639 DA 063A DB 0640 DC 0641 DD 0642 DE 0643 DF 0644 E1 0645 E3 0646 E4 0647 E5 0648 E6 0649 EC 064A ED 064B F0 064C F1 064D F2 064E F3 064F F5 0650 F6 0651 F8 0652 FA 0679 8A 067E 81 0686 8D 0688 8F 0691 9A 0698 8E 06A9 98 06AF 90 06BA 9F 06BE AA 06C1 C0 06D2 FF 200C 9D 200D 9E 200E FD 200F FE 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1256 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # cp1256
+
+# cp1256 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1256 \U00000080 tcl8    1A -1 {} {}
+    cp1256 \U00000080 replace 1A -1 {} {}
+    cp1256 \U00000080 strict  {}                      0 {} {}
+    cp1256 \U00000400 tcl8    1A -1 {} {}
+    cp1256 \U00000400 replace 1A -1 {} {}
+    cp1256 \U00000400 strict  {}                      0 {} {}
+    cp1256 \U0000D800 tcl8    1A -1 {} {}
+    cp1256 \U0000D800 replace 1A -1 {} {}
+    cp1256 \U0000D800 strict  {}                      0 {} {}
+    cp1256 \U0000DC00 tcl8    1A -1 {} {}
+    cp1256 \U0000DC00 replace 1A -1 {} {}
+    cp1256 \U0000DC00 strict  {}                      0 {} {}
+    cp1256 \U00010000 tcl8    1A -1 {} {}
+    cp1256 \U00010000 replace 1A -1 {} {}
+    cp1256 \U00010000 strict  {}                      0 {} {}
+    cp1256 \U0010FFFF tcl8    1A -1 {} {}
+    cp1256 \U0010FFFF replace 1A -1 {} {}
+    cp1256 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1256
+
+#
+# cp1257 (generated from glibc-CP1257-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1257 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1257 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A8 8D 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF 9D 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 8F 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 02C7 8E 02D9 FF 02DB 9E 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1257 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1257 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A8 8D 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF 9D 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 8F 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 02C7 8E 02D9 FF 02DB 9E 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AC 80 2122 99}
+} -result {}
+
+# cp1257 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1257 81 tcl8    \U00000081 -1 {} {}
+    cp1257 81 replace \uFFFD -1 {} {}
+    cp1257 81 strict  {}       0 {} {}
+    cp1257 83 tcl8    \U00000083 -1 {} {}
+    cp1257 83 replace \uFFFD -1 {} {}
+    cp1257 83 strict  {}       0 {} {}
+    cp1257 88 tcl8    \U00000088 -1 {} {}
+    cp1257 88 replace \uFFFD -1 {} {}
+    cp1257 88 strict  {}       0 {} {}
+    cp1257 8A tcl8    \U0000008A -1 {} {}
+    cp1257 8A replace \uFFFD -1 {} {}
+    cp1257 8A strict  {}       0 {} {}
+    cp1257 8C tcl8    \U0000008C -1 {} {}
+    cp1257 8C replace \uFFFD -1 {} {}
+    cp1257 8C strict  {}       0 {} {}
+    cp1257 90 tcl8    \U00000090 -1 {} {}
+    cp1257 90 replace \uFFFD -1 {} {}
+    cp1257 90 strict  {}       0 {} {}
+    cp1257 98 tcl8    \U00000098 -1 {} {}
+    cp1257 98 replace \uFFFD -1 {} {}
+    cp1257 98 strict  {}       0 {} {}
+    cp1257 9A tcl8    \U0000009A -1 {} {}
+    cp1257 9A replace \uFFFD -1 {} {}
+    cp1257 9A strict  {}       0 {} {}
+    cp1257 9C tcl8    \U0000009C -1 {} {}
+    cp1257 9C replace \uFFFD -1 {} {}
+    cp1257 9C strict  {}       0 {} {}
+    cp1257 9F tcl8    \U0000009F -1 {} {}
+    cp1257 9F replace \uFFFD -1 {} {}
+    cp1257 9F strict  {}       0 {} {}
+    cp1257 A1 tcl8    \U000000A1 -1 {} {}
+    cp1257 A1 replace \uFFFD -1 {} {}
+    cp1257 A1 strict  {}       0 {} {}
+    cp1257 A5 tcl8    \U000000A5 -1 {} {}
+    cp1257 A5 replace \uFFFD -1 {} {}
+    cp1257 A5 strict  {}       0 {} {}
+}; # cp1257
+
+# cp1257 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1257 \U00000080 tcl8    1A -1 {} {}
+    cp1257 \U00000080 replace 1A -1 {} {}
+    cp1257 \U00000080 strict  {}                      0 {} {}
+    cp1257 \U00000400 tcl8    1A -1 {} {}
+    cp1257 \U00000400 replace 1A -1 {} {}
+    cp1257 \U00000400 strict  {}                      0 {} {}
+    cp1257 \U0000D800 tcl8    1A -1 {} {}
+    cp1257 \U0000D800 replace 1A -1 {} {}
+    cp1257 \U0000D800 strict  {}                      0 {} {}
+    cp1257 \U0000DC00 tcl8    1A -1 {} {}
+    cp1257 \U0000DC00 replace 1A -1 {} {}
+    cp1257 \U0000DC00 strict  {}                      0 {} {}
+    cp1257 \U00010000 tcl8    1A -1 {} {}
+    cp1257 \U00010000 replace 1A -1 {} {}
+    cp1257 \U00010000 strict  {}                      0 {} {}
+    cp1257 \U0010FFFF tcl8    1A -1 {} {}
+    cp1257 \U0010FFFF replace 1A -1 {} {}
+    cp1257 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1257
+
+#
+# cp1258 (generated from glibc-CP1258-2.1.2)
+
+test encoding-convertfrom-ucmCompare-cp1258 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches cp1258 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CD CD 00CE CE 00CF CF 00D1 D1 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00ED ED 00EE EE 00EF EF 00F1 F1 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0110 D0 0111 F0 0152 8C 0153 9C 0178 9F 0192 83 01A0 D5 01A1 F5 01AF DD 01B0 FD 02C6 88 02DC 98 0300 CC 0303 DE 0309 D2 0323 F2 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AB FE 20AC 80 2122 99}
+} -result {}
+
+test encoding-convertto-ucmCompare-cp1258 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches cp1258 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CD CD 00CE CE 00CF CF 00D1 D1 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00ED ED 00EE EE 00EF EF 00F1 F1 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0110 D0 0111 F0 0152 8C 0153 9C 0178 9F 0192 83 01A0 D5 01A1 F5 01AF DD 01B0 FD 02C6 88 02DC 98 0300 CC 0303 DE 0309 D2 0323 F2 2013 96 2014 97 2018 91 2019 92 201A 82 201C 93 201D 94 201E 84 2020 86 2021 87 2022 95 2026 85 2030 89 2039 8B 203A 9B 20AB FE 20AC 80 2122 99}
+} -result {}
+
+# cp1258 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    cp1258 81 tcl8    \U00000081 -1 {} {}
+    cp1258 81 replace \uFFFD -1 {} {}
+    cp1258 81 strict  {}       0 {} {}
+    cp1258 8A tcl8    \U0000008A -1 {} {}
+    cp1258 8A replace \uFFFD -1 {} {}
+    cp1258 8A strict  {}       0 {} {}
+    cp1258 8D tcl8    \U0000008D -1 {} {}
+    cp1258 8D replace \uFFFD -1 {} {}
+    cp1258 8D strict  {}       0 {} {}
+    cp1258 8E tcl8    \U0000008E -1 {} {}
+    cp1258 8E replace \uFFFD -1 {} {}
+    cp1258 8E strict  {}       0 {} {}
+    cp1258 8F tcl8    \U0000008F -1 {} {}
+    cp1258 8F replace \uFFFD -1 {} {}
+    cp1258 8F strict  {}       0 {} {}
+    cp1258 90 tcl8    \U00000090 -1 {} {}
+    cp1258 90 replace \uFFFD -1 {} {}
+    cp1258 90 strict  {}       0 {} {}
+    cp1258 9A tcl8    \U0000009A -1 {} {}
+    cp1258 9A replace \uFFFD -1 {} {}
+    cp1258 9A strict  {}       0 {} {}
+    cp1258 9D tcl8    \U0000009D -1 {} {}
+    cp1258 9D replace \uFFFD -1 {} {}
+    cp1258 9D strict  {}       0 {} {}
+    cp1258 9E tcl8    \U0000009E -1 {} {}
+    cp1258 9E replace \uFFFD -1 {} {}
+    cp1258 9E strict  {}       0 {} {}
+    cp1258 EC tcl8    \U000000EC -1 {} {}
+    cp1258 EC replace \uFFFD -1 {} {}
+    cp1258 EC strict  {}       0 {} {}
+}; # cp1258
+
+# cp1258 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    cp1258 \U00000080 tcl8    1A -1 {} {}
+    cp1258 \U00000080 replace 1A -1 {} {}
+    cp1258 \U00000080 strict  {}                      0 {} {}
+    cp1258 \U00000400 tcl8    1A -1 {} {}
+    cp1258 \U00000400 replace 1A -1 {} {}
+    cp1258 \U00000400 strict  {}                      0 {} {}
+    cp1258 \U0000D800 tcl8    1A -1 {} {}
+    cp1258 \U0000D800 replace 1A -1 {} {}
+    cp1258 \U0000D800 strict  {}                      0 {} {}
+    cp1258 \U0000DC00 tcl8    1A -1 {} {}
+    cp1258 \U0000DC00 replace 1A -1 {} {}
+    cp1258 \U0000DC00 strict  {}                      0 {} {}
+    cp1258 \U00010000 tcl8    1A -1 {} {}
+    cp1258 \U00010000 replace 1A -1 {} {}
+    cp1258 \U00010000 strict  {}                      0 {} {}
+    cp1258 \U0010FFFF tcl8    1A -1 {} {}
+    cp1258 \U0010FFFF replace 1A -1 {} {}
+    cp1258 \U0010FFFF strict  {}                      0 {} {}
+}; # cp1258
+
+#
+# gb1988 (generated from glibc-GB_1988_80-2.3.3)
+
+test encoding-convertfrom-ucmCompare-gb1988 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches gb1988 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007F 7F 00A5 24 203E 7E}
+} -result {}
+
+test encoding-convertto-ucmCompare-gb1988 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches gb1988 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007F 7F 00A5 24 203E 7E}
+} -result {}
+
+# gb1988 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    gb1988 80 tcl8    \U00000080 -1 {} {}
+    gb1988 80 replace \uFFFD -1 {} {}
+    gb1988 80 strict  {}       0 {} {}
+    gb1988 81 tcl8    \U00000081 -1 {} {}
+    gb1988 81 replace \uFFFD -1 {} {}
+    gb1988 81 strict  {}       0 {} {}
+    gb1988 82 tcl8    \U00000082 -1 {} {}
+    gb1988 82 replace \uFFFD -1 {} {}
+    gb1988 82 strict  {}       0 {} {}
+    gb1988 83 tcl8    \U00000083 -1 {} {}
+    gb1988 83 replace \uFFFD -1 {} {}
+    gb1988 83 strict  {}       0 {} {}
+    gb1988 84 tcl8    \U00000084 -1 {} {}
+    gb1988 84 replace \uFFFD -1 {} {}
+    gb1988 84 strict  {}       0 {} {}
+    gb1988 85 tcl8    \U00000085 -1 {} {}
+    gb1988 85 replace \uFFFD -1 {} {}
+    gb1988 85 strict  {}       0 {} {}
+    gb1988 86 tcl8    \U00000086 -1 {} {}
+    gb1988 86 replace \uFFFD -1 {} {}
+    gb1988 86 strict  {}       0 {} {}
+    gb1988 87 tcl8    \U00000087 -1 {} {}
+    gb1988 87 replace \uFFFD -1 {} {}
+    gb1988 87 strict  {}       0 {} {}
+    gb1988 88 tcl8    \U00000088 -1 {} {}
+    gb1988 88 replace \uFFFD -1 {} {}
+    gb1988 88 strict  {}       0 {} {}
+    gb1988 89 tcl8    \U00000089 -1 {} {}
+    gb1988 89 replace \uFFFD -1 {} {}
+    gb1988 89 strict  {}       0 {} {}
+    gb1988 8A tcl8    \U0000008A -1 {} {}
+    gb1988 8A replace \uFFFD -1 {} {}
+    gb1988 8A strict  {}       0 {} {}
+    gb1988 8B tcl8    \U0000008B -1 {} {}
+    gb1988 8B replace \uFFFD -1 {} {}
+    gb1988 8B strict  {}       0 {} {}
+    gb1988 8C tcl8    \U0000008C -1 {} {}
+    gb1988 8C replace \uFFFD -1 {} {}
+    gb1988 8C strict  {}       0 {} {}
+    gb1988 8D tcl8    \U0000008D -1 {} {}
+    gb1988 8D replace \uFFFD -1 {} {}
+    gb1988 8D strict  {}       0 {} {}
+    gb1988 8E tcl8    \U0000008E -1 {} {}
+    gb1988 8E replace \uFFFD -1 {} {}
+    gb1988 8E strict  {}       0 {} {}
+    gb1988 8F tcl8    \U0000008F -1 {} {}
+    gb1988 8F replace \uFFFD -1 {} {}
+    gb1988 8F strict  {}       0 {} {}
+    gb1988 90 tcl8    \U00000090 -1 {} {}
+    gb1988 90 replace \uFFFD -1 {} {}
+    gb1988 90 strict  {}       0 {} {}
+    gb1988 91 tcl8    \U00000091 -1 {} {}
+    gb1988 91 replace \uFFFD -1 {} {}
+    gb1988 91 strict  {}       0 {} {}
+    gb1988 92 tcl8    \U00000092 -1 {} {}
+    gb1988 92 replace \uFFFD -1 {} {}
+    gb1988 92 strict  {}       0 {} {}
+    gb1988 93 tcl8    \U00000093 -1 {} {}
+    gb1988 93 replace \uFFFD -1 {} {}
+    gb1988 93 strict  {}       0 {} {}
+    gb1988 94 tcl8    \U00000094 -1 {} {}
+    gb1988 94 replace \uFFFD -1 {} {}
+    gb1988 94 strict  {}       0 {} {}
+    gb1988 95 tcl8    \U00000095 -1 {} {}
+    gb1988 95 replace \uFFFD -1 {} {}
+    gb1988 95 strict  {}       0 {} {}
+    gb1988 96 tcl8    \U00000096 -1 {} {}
+    gb1988 96 replace \uFFFD -1 {} {}
+    gb1988 96 strict  {}       0 {} {}
+    gb1988 97 tcl8    \U00000097 -1 {} {}
+    gb1988 97 replace \uFFFD -1 {} {}
+    gb1988 97 strict  {}       0 {} {}
+    gb1988 98 tcl8    \U00000098 -1 {} {}
+    gb1988 98 replace \uFFFD -1 {} {}
+    gb1988 98 strict  {}       0 {} {}
+    gb1988 99 tcl8    \U00000099 -1 {} {}
+    gb1988 99 replace \uFFFD -1 {} {}
+    gb1988 99 strict  {}       0 {} {}
+    gb1988 9A tcl8    \U0000009A -1 {} {}
+    gb1988 9A replace \uFFFD -1 {} {}
+    gb1988 9A strict  {}       0 {} {}
+    gb1988 9B tcl8    \U0000009B -1 {} {}
+    gb1988 9B replace \uFFFD -1 {} {}
+    gb1988 9B strict  {}       0 {} {}
+    gb1988 9C tcl8    \U0000009C -1 {} {}
+    gb1988 9C replace \uFFFD -1 {} {}
+    gb1988 9C strict  {}       0 {} {}
+    gb1988 9D tcl8    \U0000009D -1 {} {}
+    gb1988 9D replace \uFFFD -1 {} {}
+    gb1988 9D strict  {}       0 {} {}
+    gb1988 9E tcl8    \U0000009E -1 {} {}
+    gb1988 9E replace \uFFFD -1 {} {}
+    gb1988 9E strict  {}       0 {} {}
+    gb1988 9F tcl8    \U0000009F -1 {} {}
+    gb1988 9F replace \uFFFD -1 {} {}
+    gb1988 9F strict  {}       0 {} {}
+    gb1988 A0 tcl8    \U000000A0 -1 {} {}
+    gb1988 A0 replace \uFFFD -1 {} {}
+    gb1988 A0 strict  {}       0 {} {}
+    gb1988 A1 tcl8    \U000000A1 -1 {} {}
+    gb1988 A1 replace \uFFFD -1 {} {}
+    gb1988 A1 strict  {}       0 {} {}
+    gb1988 A2 tcl8    \U000000A2 -1 {} {}
+    gb1988 A2 replace \uFFFD -1 {} {}
+    gb1988 A2 strict  {}       0 {} {}
+    gb1988 A3 tcl8    \U000000A3 -1 {} {}
+    gb1988 A3 replace \uFFFD -1 {} {}
+    gb1988 A3 strict  {}       0 {} {}
+    gb1988 A4 tcl8    \U000000A4 -1 {} {}
+    gb1988 A4 replace \uFFFD -1 {} {}
+    gb1988 A4 strict  {}       0 {} {}
+    gb1988 A5 tcl8    \U000000A5 -1 {} {}
+    gb1988 A5 replace \uFFFD -1 {} {}
+    gb1988 A5 strict  {}       0 {} {}
+    gb1988 A6 tcl8    \U000000A6 -1 {} {}
+    gb1988 A6 replace \uFFFD -1 {} {}
+    gb1988 A6 strict  {}       0 {} {}
+    gb1988 A7 tcl8    \U000000A7 -1 {} {}
+    gb1988 A7 replace \uFFFD -1 {} {}
+    gb1988 A7 strict  {}       0 {} {}
+    gb1988 A8 tcl8    \U000000A8 -1 {} {}
+    gb1988 A8 replace \uFFFD -1 {} {}
+    gb1988 A8 strict  {}       0 {} {}
+    gb1988 A9 tcl8    \U000000A9 -1 {} {}
+    gb1988 A9 replace \uFFFD -1 {} {}
+    gb1988 A9 strict  {}       0 {} {}
+    gb1988 AA tcl8    \U000000AA -1 {} {}
+    gb1988 AA replace \uFFFD -1 {} {}
+    gb1988 AA strict  {}       0 {} {}
+    gb1988 AB tcl8    \U000000AB -1 {} {}
+    gb1988 AB replace \uFFFD -1 {} {}
+    gb1988 AB strict  {}       0 {} {}
+    gb1988 AC tcl8    \U000000AC -1 {} {}
+    gb1988 AC replace \uFFFD -1 {} {}
+    gb1988 AC strict  {}       0 {} {}
+    gb1988 AD tcl8    \U000000AD -1 {} {}
+    gb1988 AD replace \uFFFD -1 {} {}
+    gb1988 AD strict  {}       0 {} {}
+    gb1988 AE tcl8    \U000000AE -1 {} {}
+    gb1988 AE replace \uFFFD -1 {} {}
+    gb1988 AE strict  {}       0 {} {}
+    gb1988 AF tcl8    \U000000AF -1 {} {}
+    gb1988 AF replace \uFFFD -1 {} {}
+    gb1988 AF strict  {}       0 {} {}
+    gb1988 B0 tcl8    \U000000B0 -1 {} {}
+    gb1988 B0 replace \uFFFD -1 {} {}
+    gb1988 B0 strict  {}       0 {} {}
+    gb1988 B1 tcl8    \U000000B1 -1 {} {}
+    gb1988 B1 replace \uFFFD -1 {} {}
+    gb1988 B1 strict  {}       0 {} {}
+    gb1988 B2 tcl8    \U000000B2 -1 {} {}
+    gb1988 B2 replace \uFFFD -1 {} {}
+    gb1988 B2 strict  {}       0 {} {}
+    gb1988 B3 tcl8    \U000000B3 -1 {} {}
+    gb1988 B3 replace \uFFFD -1 {} {}
+    gb1988 B3 strict  {}       0 {} {}
+    gb1988 B4 tcl8    \U000000B4 -1 {} {}
+    gb1988 B4 replace \uFFFD -1 {} {}
+    gb1988 B4 strict  {}       0 {} {}
+    gb1988 B5 tcl8    \U000000B5 -1 {} {}
+    gb1988 B5 replace \uFFFD -1 {} {}
+    gb1988 B5 strict  {}       0 {} {}
+    gb1988 B6 tcl8    \U000000B6 -1 {} {}
+    gb1988 B6 replace \uFFFD -1 {} {}
+    gb1988 B6 strict  {}       0 {} {}
+    gb1988 B7 tcl8    \U000000B7 -1 {} {}
+    gb1988 B7 replace \uFFFD -1 {} {}
+    gb1988 B7 strict  {}       0 {} {}
+    gb1988 B8 tcl8    \U000000B8 -1 {} {}
+    gb1988 B8 replace \uFFFD -1 {} {}
+    gb1988 B8 strict  {}       0 {} {}
+    gb1988 B9 tcl8    \U000000B9 -1 {} {}
+    gb1988 B9 replace \uFFFD -1 {} {}
+    gb1988 B9 strict  {}       0 {} {}
+    gb1988 BA tcl8    \U000000BA -1 {} {}
+    gb1988 BA replace \uFFFD -1 {} {}
+    gb1988 BA strict  {}       0 {} {}
+    gb1988 BB tcl8    \U000000BB -1 {} {}
+    gb1988 BB replace \uFFFD -1 {} {}
+    gb1988 BB strict  {}       0 {} {}
+    gb1988 BC tcl8    \U000000BC -1 {} {}
+    gb1988 BC replace \uFFFD -1 {} {}
+    gb1988 BC strict  {}       0 {} {}
+    gb1988 BD tcl8    \U000000BD -1 {} {}
+    gb1988 BD replace \uFFFD -1 {} {}
+    gb1988 BD strict  {}       0 {} {}
+    gb1988 BE tcl8    \U000000BE -1 {} {}
+    gb1988 BE replace \uFFFD -1 {} {}
+    gb1988 BE strict  {}       0 {} {}
+    gb1988 BF tcl8    \U000000BF -1 {} {}
+    gb1988 BF replace \uFFFD -1 {} {}
+    gb1988 BF strict  {}       0 {} {}
+    gb1988 C0 tcl8    \U000000C0 -1 {} {}
+    gb1988 C0 replace \uFFFD -1 {} {}
+    gb1988 C0 strict  {}       0 {} {}
+    gb1988 C1 tcl8    \U000000C1 -1 {} {}
+    gb1988 C1 replace \uFFFD -1 {} {}
+    gb1988 C1 strict  {}       0 {} {}
+    gb1988 C2 tcl8    \U000000C2 -1 {} {}
+    gb1988 C2 replace \uFFFD -1 {} {}
+    gb1988 C2 strict  {}       0 {} {}
+    gb1988 C3 tcl8    \U000000C3 -1 {} {}
+    gb1988 C3 replace \uFFFD -1 {} {}
+    gb1988 C3 strict  {}       0 {} {}
+    gb1988 C4 tcl8    \U000000C4 -1 {} {}
+    gb1988 C4 replace \uFFFD -1 {} {}
+    gb1988 C4 strict  {}       0 {} {}
+    gb1988 C5 tcl8    \U000000C5 -1 {} {}
+    gb1988 C5 replace \uFFFD -1 {} {}
+    gb1988 C5 strict  {}       0 {} {}
+    gb1988 C6 tcl8    \U000000C6 -1 {} {}
+    gb1988 C6 replace \uFFFD -1 {} {}
+    gb1988 C6 strict  {}       0 {} {}
+    gb1988 C7 tcl8    \U000000C7 -1 {} {}
+    gb1988 C7 replace \uFFFD -1 {} {}
+    gb1988 C7 strict  {}       0 {} {}
+    gb1988 C8 tcl8    \U000000C8 -1 {} {}
+    gb1988 C8 replace \uFFFD -1 {} {}
+    gb1988 C8 strict  {}       0 {} {}
+    gb1988 C9 tcl8    \U000000C9 -1 {} {}
+    gb1988 C9 replace \uFFFD -1 {} {}
+    gb1988 C9 strict  {}       0 {} {}
+    gb1988 CA tcl8    \U000000CA -1 {} {}
+    gb1988 CA replace \uFFFD -1 {} {}
+    gb1988 CA strict  {}       0 {} {}
+    gb1988 CB tcl8    \U000000CB -1 {} {}
+    gb1988 CB replace \uFFFD -1 {} {}
+    gb1988 CB strict  {}       0 {} {}
+    gb1988 CC tcl8    \U000000CC -1 {} {}
+    gb1988 CC replace \uFFFD -1 {} {}
+    gb1988 CC strict  {}       0 {} {}
+    gb1988 CD tcl8    \U000000CD -1 {} {}
+    gb1988 CD replace \uFFFD -1 {} {}
+    gb1988 CD strict  {}       0 {} {}
+    gb1988 CE tcl8    \U000000CE -1 {} {}
+    gb1988 CE replace \uFFFD -1 {} {}
+    gb1988 CE strict  {}       0 {} {}
+    gb1988 CF tcl8    \U000000CF -1 {} {}
+    gb1988 CF replace \uFFFD -1 {} {}
+    gb1988 CF strict  {}       0 {} {}
+    gb1988 D0 tcl8    \U000000D0 -1 {} {}
+    gb1988 D0 replace \uFFFD -1 {} {}
+    gb1988 D0 strict  {}       0 {} {}
+    gb1988 D1 tcl8    \U000000D1 -1 {} {}
+    gb1988 D1 replace \uFFFD -1 {} {}
+    gb1988 D1 strict  {}       0 {} {}
+    gb1988 D2 tcl8    \U000000D2 -1 {} {}
+    gb1988 D2 replace \uFFFD -1 {} {}
+    gb1988 D2 strict  {}       0 {} {}
+    gb1988 D3 tcl8    \U000000D3 -1 {} {}
+    gb1988 D3 replace \uFFFD -1 {} {}
+    gb1988 D3 strict  {}       0 {} {}
+    gb1988 D4 tcl8    \U000000D4 -1 {} {}
+    gb1988 D4 replace \uFFFD -1 {} {}
+    gb1988 D4 strict  {}       0 {} {}
+    gb1988 D5 tcl8    \U000000D5 -1 {} {}
+    gb1988 D5 replace \uFFFD -1 {} {}
+    gb1988 D5 strict  {}       0 {} {}
+    gb1988 D6 tcl8    \U000000D6 -1 {} {}
+    gb1988 D6 replace \uFFFD -1 {} {}
+    gb1988 D6 strict  {}       0 {} {}
+    gb1988 D7 tcl8    \U000000D7 -1 {} {}
+    gb1988 D7 replace \uFFFD -1 {} {}
+    gb1988 D7 strict  {}       0 {} {}
+    gb1988 D8 tcl8    \U000000D8 -1 {} {}
+    gb1988 D8 replace \uFFFD -1 {} {}
+    gb1988 D8 strict  {}       0 {} {}
+    gb1988 D9 tcl8    \U000000D9 -1 {} {}
+    gb1988 D9 replace \uFFFD -1 {} {}
+    gb1988 D9 strict  {}       0 {} {}
+    gb1988 DA tcl8    \U000000DA -1 {} {}
+    gb1988 DA replace \uFFFD -1 {} {}
+    gb1988 DA strict  {}       0 {} {}
+    gb1988 DB tcl8    \U000000DB -1 {} {}
+    gb1988 DB replace \uFFFD -1 {} {}
+    gb1988 DB strict  {}       0 {} {}
+    gb1988 DC tcl8    \U000000DC -1 {} {}
+    gb1988 DC replace \uFFFD -1 {} {}
+    gb1988 DC strict  {}       0 {} {}
+    gb1988 DD tcl8    \U000000DD -1 {} {}
+    gb1988 DD replace \uFFFD -1 {} {}
+    gb1988 DD strict  {}       0 {} {}
+    gb1988 DE tcl8    \U000000DE -1 {} {}
+    gb1988 DE replace \uFFFD -1 {} {}
+    gb1988 DE strict  {}       0 {} {}
+    gb1988 DF tcl8    \U000000DF -1 {} {}
+    gb1988 DF replace \uFFFD -1 {} {}
+    gb1988 DF strict  {}       0 {} {}
+    gb1988 E0 tcl8    \U000000E0 -1 {} {}
+    gb1988 E0 replace \uFFFD -1 {} {}
+    gb1988 E0 strict  {}       0 {} {}
+    gb1988 E1 tcl8    \U000000E1 -1 {} {}
+    gb1988 E1 replace \uFFFD -1 {} {}
+    gb1988 E1 strict  {}       0 {} {}
+    gb1988 E2 tcl8    \U000000E2 -1 {} {}
+    gb1988 E2 replace \uFFFD -1 {} {}
+    gb1988 E2 strict  {}       0 {} {}
+    gb1988 E3 tcl8    \U000000E3 -1 {} {}
+    gb1988 E3 replace \uFFFD -1 {} {}
+    gb1988 E3 strict  {}       0 {} {}
+    gb1988 E4 tcl8    \U000000E4 -1 {} {}
+    gb1988 E4 replace \uFFFD -1 {} {}
+    gb1988 E4 strict  {}       0 {} {}
+    gb1988 E5 tcl8    \U000000E5 -1 {} {}
+    gb1988 E5 replace \uFFFD -1 {} {}
+    gb1988 E5 strict  {}       0 {} {}
+    gb1988 E6 tcl8    \U000000E6 -1 {} {}
+    gb1988 E6 replace \uFFFD -1 {} {}
+    gb1988 E6 strict  {}       0 {} {}
+    gb1988 E7 tcl8    \U000000E7 -1 {} {}
+    gb1988 E7 replace \uFFFD -1 {} {}
+    gb1988 E7 strict  {}       0 {} {}
+    gb1988 E8 tcl8    \U000000E8 -1 {} {}
+    gb1988 E8 replace \uFFFD -1 {} {}
+    gb1988 E8 strict  {}       0 {} {}
+    gb1988 E9 tcl8    \U000000E9 -1 {} {}
+    gb1988 E9 replace \uFFFD -1 {} {}
+    gb1988 E9 strict  {}       0 {} {}
+    gb1988 EA tcl8    \U000000EA -1 {} {}
+    gb1988 EA replace \uFFFD -1 {} {}
+    gb1988 EA strict  {}       0 {} {}
+    gb1988 EB tcl8    \U000000EB -1 {} {}
+    gb1988 EB replace \uFFFD -1 {} {}
+    gb1988 EB strict  {}       0 {} {}
+    gb1988 EC tcl8    \U000000EC -1 {} {}
+    gb1988 EC replace \uFFFD -1 {} {}
+    gb1988 EC strict  {}       0 {} {}
+    gb1988 ED tcl8    \U000000ED -1 {} {}
+    gb1988 ED replace \uFFFD -1 {} {}
+    gb1988 ED strict  {}       0 {} {}
+    gb1988 EE tcl8    \U000000EE -1 {} {}
+    gb1988 EE replace \uFFFD -1 {} {}
+    gb1988 EE strict  {}       0 {} {}
+    gb1988 EF tcl8    \U000000EF -1 {} {}
+    gb1988 EF replace \uFFFD -1 {} {}
+    gb1988 EF strict  {}       0 {} {}
+    gb1988 F0 tcl8    \U000000F0 -1 {} {}
+    gb1988 F0 replace \uFFFD -1 {} {}
+    gb1988 F0 strict  {}       0 {} {}
+    gb1988 F1 tcl8    \U000000F1 -1 {} {}
+    gb1988 F1 replace \uFFFD -1 {} {}
+    gb1988 F1 strict  {}       0 {} {}
+    gb1988 F2 tcl8    \U000000F2 -1 {} {}
+    gb1988 F2 replace \uFFFD -1 {} {}
+    gb1988 F2 strict  {}       0 {} {}
+    gb1988 F3 tcl8    \U000000F3 -1 {} {}
+    gb1988 F3 replace \uFFFD -1 {} {}
+    gb1988 F3 strict  {}       0 {} {}
+    gb1988 F4 tcl8    \U000000F4 -1 {} {}
+    gb1988 F4 replace \uFFFD -1 {} {}
+    gb1988 F4 strict  {}       0 {} {}
+    gb1988 F5 tcl8    \U000000F5 -1 {} {}
+    gb1988 F5 replace \uFFFD -1 {} {}
+    gb1988 F5 strict  {}       0 {} {}
+    gb1988 F6 tcl8    \U000000F6 -1 {} {}
+    gb1988 F6 replace \uFFFD -1 {} {}
+    gb1988 F6 strict  {}       0 {} {}
+    gb1988 F7 tcl8    \U000000F7 -1 {} {}
+    gb1988 F7 replace \uFFFD -1 {} {}
+    gb1988 F7 strict  {}       0 {} {}
+    gb1988 F8 tcl8    \U000000F8 -1 {} {}
+    gb1988 F8 replace \uFFFD -1 {} {}
+    gb1988 F8 strict  {}       0 {} {}
+    gb1988 F9 tcl8    \U000000F9 -1 {} {}
+    gb1988 F9 replace \uFFFD -1 {} {}
+    gb1988 F9 strict  {}       0 {} {}
+    gb1988 FA tcl8    \U000000FA -1 {} {}
+    gb1988 FA replace \uFFFD -1 {} {}
+    gb1988 FA strict  {}       0 {} {}
+    gb1988 FB tcl8    \U000000FB -1 {} {}
+    gb1988 FB replace \uFFFD -1 {} {}
+    gb1988 FB strict  {}       0 {} {}
+    gb1988 FC tcl8    \U000000FC -1 {} {}
+    gb1988 FC replace \uFFFD -1 {} {}
+    gb1988 FC strict  {}       0 {} {}
+    gb1988 FD tcl8    \U000000FD -1 {} {}
+    gb1988 FD replace \uFFFD -1 {} {}
+    gb1988 FD strict  {}       0 {} {}
+    gb1988 FE tcl8    \U000000FE -1 {} {}
+    gb1988 FE replace \uFFFD -1 {} {}
+    gb1988 FE strict  {}       0 {} {}
+    gb1988 FF tcl8    \U000000FF -1 {} {}
+    gb1988 FF replace \uFFFD -1 {} {}
+    gb1988 FF strict  {}       0 {} {}
+}; # gb1988
+
+# gb1988 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    gb1988 \U00000024 tcl8    1A -1 {} {}
+    gb1988 \U00000024 replace 1A -1 {} {}
+    gb1988 \U00000024 strict  {}                      0 {} {}
+    gb1988 \U00000400 tcl8    1A -1 {} {}
+    gb1988 \U00000400 replace 1A -1 {} {}
+    gb1988 \U00000400 strict  {}                      0 {} {}
+    gb1988 \U0000D800 tcl8    1A -1 {} {}
+    gb1988 \U0000D800 replace 1A -1 {} {}
+    gb1988 \U0000D800 strict  {}                      0 {} {}
+    gb1988 \U0000DC00 tcl8    1A -1 {} {}
+    gb1988 \U0000DC00 replace 1A -1 {} {}
+    gb1988 \U0000DC00 strict  {}                      0 {} {}
+    gb1988 \U00010000 tcl8    1A -1 {} {}
+    gb1988 \U00010000 replace 1A -1 {} {}
+    gb1988 \U00010000 strict  {}                      0 {} {}
+    gb1988 \U0010FFFF tcl8    1A -1 {} {}
+    gb1988 \U0010FFFF replace 1A -1 {} {}
+    gb1988 \U0010FFFF strict  {}                      0 {} {}
+}; # gb1988
+
+#
+# iso8859-1 (generated from glibc-ISO_8859_1-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-1 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-1 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-1 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-1 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF}
+} -result {}
+
+# iso8859-1 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-1
+
+# iso8859-1 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-1 \U00000400 tcl8    1A -1 {} {}
+    iso8859-1 \U00000400 replace 1A -1 {} {}
+    iso8859-1 \U00000400 strict  {}                      0 {} {}
+    iso8859-1 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-1 \U0000D800 replace 1A -1 {} {}
+    iso8859-1 \U0000D800 strict  {}                      0 {} {}
+    iso8859-1 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-1 \U0000DC00 replace 1A -1 {} {}
+    iso8859-1 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-1 \U00010000 tcl8    1A -1 {} {}
+    iso8859-1 \U00010000 replace 1A -1 {} {}
+    iso8859-1 \U00010000 strict  {}                      0 {} {}
+    iso8859-1 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-1 \U0010FFFF replace 1A -1 {} {}
+    iso8859-1 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-1
+
+#
+# iso8859-2 (generated from glibc-ISO_8859_2-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-2 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-2 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A1 0105 B1 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D A5 013E B5 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A A6 015B B6 015E AA 015F BA 0160 A9 0161 B9 0162 DE 0163 FE 0164 AB 0165 BB 016E D9 016F F9 0170 DB 0171 FB 0179 AC 017A BC 017B AF 017C BF 017D AE 017E BE 02C7 B7 02D8 A2 02D9 FF 02DB B2 02DD BD}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-2 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-2 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C9 C9 00CB CB 00CD CD 00CE CE 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00DA DA 00DC DC 00DD DD 00DF DF 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E9 E9 00EB EB 00ED ED 00EE EE 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00FA FA 00FC FC 00FD FD 0102 C3 0103 E3 0104 A1 0105 B1 0106 C6 0107 E6 010C C8 010D E8 010E CF 010F EF 0110 D0 0111 F0 0118 CA 0119 EA 011A CC 011B EC 0139 C5 013A E5 013D A5 013E B5 0141 A3 0142 B3 0143 D1 0144 F1 0147 D2 0148 F2 0150 D5 0151 F5 0154 C0 0155 E0 0158 D8 0159 F8 015A A6 015B B6 015E AA 015F BA 0160 A9 0161 B9 0162 DE 0163 FE 0164 AB 0165 BB 016E D9 016F F9 0170 DB 0171 FB 0179 AC 017A BC 017B AF 017C BF 017D AE 017E BE 02C7 B7 02D8 A2 02D9 FF 02DB B2 02DD BD}
+} -result {}
+
+# iso8859-2 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-2
+
+# iso8859-2 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-2 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-2 \U000000A1 replace 1A -1 {} {}
+    iso8859-2 \U000000A1 strict  {}                      0 {} {}
+    iso8859-2 \U00000400 tcl8    1A -1 {} {}
+    iso8859-2 \U00000400 replace 1A -1 {} {}
+    iso8859-2 \U00000400 strict  {}                      0 {} {}
+    iso8859-2 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-2 \U0000D800 replace 1A -1 {} {}
+    iso8859-2 \U0000D800 strict  {}                      0 {} {}
+    iso8859-2 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-2 \U0000DC00 replace 1A -1 {} {}
+    iso8859-2 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-2 \U00010000 tcl8    1A -1 {} {}
+    iso8859-2 \U00010000 replace 1A -1 {} {}
+    iso8859-2 \U00010000 strict  {}                      0 {} {}
+    iso8859-2 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-2 \U0010FFFF replace 1A -1 {} {}
+    iso8859-2 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-2
+
+#
+# iso8859-3 (generated from glibc-ISO_8859_3-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-3 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-3 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B7 B7 00B8 B8 00BD BD 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F9 F9 00FA FA 00FB FB 00FC FC 0108 C6 0109 E6 010A C5 010B E5 011C D8 011D F8 011E AB 011F BB 0120 D5 0121 F5 0124 A6 0125 B6 0126 A1 0127 B1 0130 A9 0131 B9 0134 AC 0135 BC 015C DE 015D FE 015E AA 015F BA 016C DD 016D FD 017B AF 017C BF 02D8 A2 02D9 FF}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-3 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-3 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A4 A4 00A7 A7 00A8 A8 00AD AD 00B0 B0 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B7 B7 00B8 B8 00BD BD 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D7 D7 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F7 F7 00F9 F9 00FA FA 00FB FB 00FC FC 0108 C6 0109 E6 010A C5 010B E5 011C D8 011D F8 011E AB 011F BB 0120 D5 0121 F5 0124 A6 0125 B6 0126 A1 0127 B1 0130 A9 0131 B9 0134 AC 0135 BC 015C DE 015D FE 015E AA 015F BA 016C DD 016D FD 017B AF 017C BF 02D8 A2 02D9 FF}
+} -result {}
+
+# iso8859-3 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-3 A5 tcl8    \U000000A5 -1 {} {}
+    iso8859-3 A5 replace \uFFFD -1 {} {}
+    iso8859-3 A5 strict  {}       0 {} {}
+    iso8859-3 AE tcl8    \U000000AE -1 {} {}
+    iso8859-3 AE replace \uFFFD -1 {} {}
+    iso8859-3 AE strict  {}       0 {} {}
+    iso8859-3 BE tcl8    \U000000BE -1 {} {}
+    iso8859-3 BE replace \uFFFD -1 {} {}
+    iso8859-3 BE strict  {}       0 {} {}
+    iso8859-3 C3 tcl8    \U000000C3 -1 {} {}
+    iso8859-3 C3 replace \uFFFD -1 {} {}
+    iso8859-3 C3 strict  {}       0 {} {}
+    iso8859-3 D0 tcl8    \U000000D0 -1 {} {}
+    iso8859-3 D0 replace \uFFFD -1 {} {}
+    iso8859-3 D0 strict  {}       0 {} {}
+    iso8859-3 E3 tcl8    \U000000E3 -1 {} {}
+    iso8859-3 E3 replace \uFFFD -1 {} {}
+    iso8859-3 E3 strict  {}       0 {} {}
+    iso8859-3 F0 tcl8    \U000000F0 -1 {} {}
+    iso8859-3 F0 replace \uFFFD -1 {} {}
+    iso8859-3 F0 strict  {}       0 {} {}
+}; # iso8859-3
+
+# iso8859-3 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-3 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-3 \U000000A1 replace 1A -1 {} {}
+    iso8859-3 \U000000A1 strict  {}                      0 {} {}
+    iso8859-3 \U00000400 tcl8    1A -1 {} {}
+    iso8859-3 \U00000400 replace 1A -1 {} {}
+    iso8859-3 \U00000400 strict  {}                      0 {} {}
+    iso8859-3 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-3 \U0000D800 replace 1A -1 {} {}
+    iso8859-3 \U0000D800 strict  {}                      0 {} {}
+    iso8859-3 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-3 \U0000DC00 replace 1A -1 {} {}
+    iso8859-3 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-3 \U00010000 tcl8    1A -1 {} {}
+    iso8859-3 \U00010000 replace 1A -1 {} {}
+    iso8859-3 \U00010000 strict  {}                      0 {} {}
+    iso8859-3 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-3 \U0010FFFF replace 1A -1 {} {}
+    iso8859-3 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-3
+
+#
+# iso8859-4 (generated from glibc-ISO_8859_4-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-4 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-4 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00AF AF 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00DA DA 00DB DB 00DC DC 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00FA FA 00FB FB 00FC FC 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 D0 0111 F0 0112 AA 0113 BA 0116 CC 0117 EC 0118 CA 0119 EA 0122 AB 0123 BB 0128 A5 0129 B5 012A CF 012B EF 012E C7 012F E7 0136 D3 0137 F3 0138 A2 013B A6 013C B6 0145 D1 0146 F1 014A BD 014B BF 014C D2 014D F2 0156 A3 0157 B3 0160 A9 0161 B9 0166 AC 0167 BC 0168 DD 0169 FD 016A DE 016B FE 0172 D9 0173 F9 017D AE 017E BE 02C7 B7 02D9 FF 02DB B2}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-4 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-4 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00A7 A7 00A8 A8 00AD AD 00AF AF 00B0 B0 00B4 B4 00B8 B8 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00DA DA 00DB DB 00DC DC 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00FA FA 00FB FB 00FC FC 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 D0 0111 F0 0112 AA 0113 BA 0116 CC 0117 EC 0118 CA 0119 EA 0122 AB 0123 BB 0128 A5 0129 B5 012A CF 012B EF 012E C7 012F E7 0136 D3 0137 F3 0138 A2 013B A6 013C B6 0145 D1 0146 F1 014A BD 014B BF 014C D2 014D F2 0156 A3 0157 B3 0160 A9 0161 B9 0166 AC 0167 BC 0168 DD 0169 FD 016A DE 016B FE 0172 D9 0173 F9 017D AE 017E BE 02C7 B7 02D9 FF 02DB B2}
+} -result {}
+
+# iso8859-4 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-4
+
+# iso8859-4 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-4 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-4 \U000000A1 replace 1A -1 {} {}
+    iso8859-4 \U000000A1 strict  {}                      0 {} {}
+    iso8859-4 \U00000400 tcl8    1A -1 {} {}
+    iso8859-4 \U00000400 replace 1A -1 {} {}
+    iso8859-4 \U00000400 strict  {}                      0 {} {}
+    iso8859-4 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-4 \U0000D800 replace 1A -1 {} {}
+    iso8859-4 \U0000D800 strict  {}                      0 {} {}
+    iso8859-4 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-4 \U0000DC00 replace 1A -1 {} {}
+    iso8859-4 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-4 \U00010000 tcl8    1A -1 {} {}
+    iso8859-4 \U00010000 replace 1A -1 {} {}
+    iso8859-4 \U00010000 strict  {}                      0 {} {}
+    iso8859-4 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-4 \U0010FFFF replace 1A -1 {} {}
+    iso8859-4 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-4
+
+#
+# iso8859-5 (generated from glibc-ISO_8859_5-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-5 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-5 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 FD 00AD AD 0401 A1 0402 A2 0403 A3 0404 A4 0405 A5 0406 A6 0407 A7 0408 A8 0409 A9 040A AA 040B AB 040C AC 040E AE 040F AF 0410 B0 0411 B1 0412 B2 0413 B3 0414 B4 0415 B5 0416 B6 0417 B7 0418 B8 0419 B9 041A BA 041B BB 041C BC 041D BD 041E BE 041F BF 0420 C0 0421 C1 0422 C2 0423 C3 0424 C4 0425 C5 0426 C6 0427 C7 0428 C8 0429 C9 042A CA 042B CB 042C CC 042D CD 042E CE 042F CF 0430 D0 0431 D1 0432 D2 0433 D3 0434 D4 0435 D5 0436 D6 0437 D7 0438 D8 0439 D9 043A DA 043B DB 043C DC 043D DD 043E DE 043F DF 0440 E0 0441 E1 0442 E2 0443 E3 0444 E4 0445 E5 0446 E6 0447 E7 0448 E8 0449 E9 044A EA 044B EB 044C EC 044D ED 044E EE 044F EF 0451 F1 0452 F2 0453 F3 0454 F4 0455 F5 0456 F6 0457 F7 0458 F8 0459 F9 045A FA 045B FB 045C FC 045E FE 045F FF 2116 F0}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-5 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-5 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 FD 00AD AD 0401 A1 0402 A2 0403 A3 0404 A4 0405 A5 0406 A6 0407 A7 0408 A8 0409 A9 040A AA 040B AB 040C AC 040E AE 040F AF 0410 B0 0411 B1 0412 B2 0413 B3 0414 B4 0415 B5 0416 B6 0417 B7 0418 B8 0419 B9 041A BA 041B BB 041C BC 041D BD 041E BE 041F BF 0420 C0 0421 C1 0422 C2 0423 C3 0424 C4 0425 C5 0426 C6 0427 C7 0428 C8 0429 C9 042A CA 042B CB 042C CC 042D CD 042E CE 042F CF 0430 D0 0431 D1 0432 D2 0433 D3 0434 D4 0435 D5 0436 D6 0437 D7 0438 D8 0439 D9 043A DA 043B DB 043C DC 043D DD 043E DE 043F DF 0440 E0 0441 E1 0442 E2 0443 E3 0444 E4 0445 E5 0446 E6 0447 E7 0448 E8 0449 E9 044A EA 044B EB 044C EC 044D ED 044E EE 044F EF 0451 F1 0452 F2 0453 F3 0454 F4 0455 F5 0456 F6 0457 F7 0458 F8 0459 F9 045A FA 045B FB 045C FC 045E FE 045F FF 2116 F0}
+} -result {}
+
+# iso8859-5 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-5
+
+# iso8859-5 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-5 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-5 \U000000A1 replace 1A -1 {} {}
+    iso8859-5 \U000000A1 strict  {}                      0 {} {}
+    iso8859-5 \U00000400 tcl8    1A -1 {} {}
+    iso8859-5 \U00000400 replace 1A -1 {} {}
+    iso8859-5 \U00000400 strict  {}                      0 {} {}
+    iso8859-5 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-5 \U0000D800 replace 1A -1 {} {}
+    iso8859-5 \U0000D800 strict  {}                      0 {} {}
+    iso8859-5 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-5 \U0000DC00 replace 1A -1 {} {}
+    iso8859-5 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-5 \U00010000 tcl8    1A -1 {} {}
+    iso8859-5 \U00010000 replace 1A -1 {} {}
+    iso8859-5 \U00010000 strict  {}                      0 {} {}
+    iso8859-5 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-5 \U0010FFFF replace 1A -1 {} {}
+    iso8859-5 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-5
+
+#
+# iso8859-6 (generated from glibc-ISO_8859_6-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-6 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-6 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00AD AD 060C AC 061B BB 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D7 0638 D8 0639 D9 063A DA 0640 E0 0641 E1 0642 E2 0643 E3 0644 E4 0645 E5 0646 E6 0647 E7 0648 E8 0649 E9 064A EA 064B EB 064C EC 064D ED 064E EE 064F EF 0650 F0 0651 F1 0652 F2}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-6 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-6 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A4 A4 00AD AD 060C AC 061B BB 061F BF 0621 C1 0622 C2 0623 C3 0624 C4 0625 C5 0626 C6 0627 C7 0628 C8 0629 C9 062A CA 062B CB 062C CC 062D CD 062E CE 062F CF 0630 D0 0631 D1 0632 D2 0633 D3 0634 D4 0635 D5 0636 D6 0637 D7 0638 D8 0639 D9 063A DA 0640 E0 0641 E1 0642 E2 0643 E3 0644 E4 0645 E5 0646 E6 0647 E7 0648 E8 0649 E9 064A EA 064B EB 064C EC 064D ED 064E EE 064F EF 0650 F0 0651 F1 0652 F2}
+} -result {}
+
+# iso8859-6 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-6 A1 tcl8    \U000000A1 -1 {} {}
+    iso8859-6 A1 replace \uFFFD -1 {} {}
+    iso8859-6 A1 strict  {}       0 {} {}
+    iso8859-6 A2 tcl8    \U000000A2 -1 {} {}
+    iso8859-6 A2 replace \uFFFD -1 {} {}
+    iso8859-6 A2 strict  {}       0 {} {}
+    iso8859-6 A3 tcl8    \U000000A3 -1 {} {}
+    iso8859-6 A3 replace \uFFFD -1 {} {}
+    iso8859-6 A3 strict  {}       0 {} {}
+    iso8859-6 A5 tcl8    \U000000A5 -1 {} {}
+    iso8859-6 A5 replace \uFFFD -1 {} {}
+    iso8859-6 A5 strict  {}       0 {} {}
+    iso8859-6 A6 tcl8    \U000000A6 -1 {} {}
+    iso8859-6 A6 replace \uFFFD -1 {} {}
+    iso8859-6 A6 strict  {}       0 {} {}
+    iso8859-6 A7 tcl8    \U000000A7 -1 {} {}
+    iso8859-6 A7 replace \uFFFD -1 {} {}
+    iso8859-6 A7 strict  {}       0 {} {}
+    iso8859-6 A8 tcl8    \U000000A8 -1 {} {}
+    iso8859-6 A8 replace \uFFFD -1 {} {}
+    iso8859-6 A8 strict  {}       0 {} {}
+    iso8859-6 A9 tcl8    \U000000A9 -1 {} {}
+    iso8859-6 A9 replace \uFFFD -1 {} {}
+    iso8859-6 A9 strict  {}       0 {} {}
+    iso8859-6 AA tcl8    \U000000AA -1 {} {}
+    iso8859-6 AA replace \uFFFD -1 {} {}
+    iso8859-6 AA strict  {}       0 {} {}
+    iso8859-6 AB tcl8    \U000000AB -1 {} {}
+    iso8859-6 AB replace \uFFFD -1 {} {}
+    iso8859-6 AB strict  {}       0 {} {}
+    iso8859-6 AE tcl8    \U000000AE -1 {} {}
+    iso8859-6 AE replace \uFFFD -1 {} {}
+    iso8859-6 AE strict  {}       0 {} {}
+    iso8859-6 AF tcl8    \U000000AF -1 {} {}
+    iso8859-6 AF replace \uFFFD -1 {} {}
+    iso8859-6 AF strict  {}       0 {} {}
+    iso8859-6 B0 tcl8    \U000000B0 -1 {} {}
+    iso8859-6 B0 replace \uFFFD -1 {} {}
+    iso8859-6 B0 strict  {}       0 {} {}
+    iso8859-6 B1 tcl8    \U000000B1 -1 {} {}
+    iso8859-6 B1 replace \uFFFD -1 {} {}
+    iso8859-6 B1 strict  {}       0 {} {}
+    iso8859-6 B2 tcl8    \U000000B2 -1 {} {}
+    iso8859-6 B2 replace \uFFFD -1 {} {}
+    iso8859-6 B2 strict  {}       0 {} {}
+    iso8859-6 B3 tcl8    \U000000B3 -1 {} {}
+    iso8859-6 B3 replace \uFFFD -1 {} {}
+    iso8859-6 B3 strict  {}       0 {} {}
+    iso8859-6 B4 tcl8    \U000000B4 -1 {} {}
+    iso8859-6 B4 replace \uFFFD -1 {} {}
+    iso8859-6 B4 strict  {}       0 {} {}
+    iso8859-6 B5 tcl8    \U000000B5 -1 {} {}
+    iso8859-6 B5 replace \uFFFD -1 {} {}
+    iso8859-6 B5 strict  {}       0 {} {}
+    iso8859-6 B6 tcl8    \U000000B6 -1 {} {}
+    iso8859-6 B6 replace \uFFFD -1 {} {}
+    iso8859-6 B6 strict  {}       0 {} {}
+    iso8859-6 B7 tcl8    \U000000B7 -1 {} {}
+    iso8859-6 B7 replace \uFFFD -1 {} {}
+    iso8859-6 B7 strict  {}       0 {} {}
+    iso8859-6 B8 tcl8    \U000000B8 -1 {} {}
+    iso8859-6 B8 replace \uFFFD -1 {} {}
+    iso8859-6 B8 strict  {}       0 {} {}
+    iso8859-6 B9 tcl8    \U000000B9 -1 {} {}
+    iso8859-6 B9 replace \uFFFD -1 {} {}
+    iso8859-6 B9 strict  {}       0 {} {}
+    iso8859-6 BA tcl8    \U000000BA -1 {} {}
+    iso8859-6 BA replace \uFFFD -1 {} {}
+    iso8859-6 BA strict  {}       0 {} {}
+    iso8859-6 BC tcl8    \U000000BC -1 {} {}
+    iso8859-6 BC replace \uFFFD -1 {} {}
+    iso8859-6 BC strict  {}       0 {} {}
+    iso8859-6 BD tcl8    \U000000BD -1 {} {}
+    iso8859-6 BD replace \uFFFD -1 {} {}
+    iso8859-6 BD strict  {}       0 {} {}
+    iso8859-6 BE tcl8    \U000000BE -1 {} {}
+    iso8859-6 BE replace \uFFFD -1 {} {}
+    iso8859-6 BE strict  {}       0 {} {}
+    iso8859-6 C0 tcl8    \U000000C0 -1 {} {}
+    iso8859-6 C0 replace \uFFFD -1 {} {}
+    iso8859-6 C0 strict  {}       0 {} {}
+    iso8859-6 DB tcl8    \U000000DB -1 {} {}
+    iso8859-6 DB replace \uFFFD -1 {} {}
+    iso8859-6 DB strict  {}       0 {} {}
+    iso8859-6 DC tcl8    \U000000DC -1 {} {}
+    iso8859-6 DC replace \uFFFD -1 {} {}
+    iso8859-6 DC strict  {}       0 {} {}
+    iso8859-6 DD tcl8    \U000000DD -1 {} {}
+    iso8859-6 DD replace \uFFFD -1 {} {}
+    iso8859-6 DD strict  {}       0 {} {}
+    iso8859-6 DE tcl8    \U000000DE -1 {} {}
+    iso8859-6 DE replace \uFFFD -1 {} {}
+    iso8859-6 DE strict  {}       0 {} {}
+    iso8859-6 DF tcl8    \U000000DF -1 {} {}
+    iso8859-6 DF replace \uFFFD -1 {} {}
+    iso8859-6 DF strict  {}       0 {} {}
+    iso8859-6 F3 tcl8    \U000000F3 -1 {} {}
+    iso8859-6 F3 replace \uFFFD -1 {} {}
+    iso8859-6 F3 strict  {}       0 {} {}
+    iso8859-6 F4 tcl8    \U000000F4 -1 {} {}
+    iso8859-6 F4 replace \uFFFD -1 {} {}
+    iso8859-6 F4 strict  {}       0 {} {}
+    iso8859-6 F5 tcl8    \U000000F5 -1 {} {}
+    iso8859-6 F5 replace \uFFFD -1 {} {}
+    iso8859-6 F5 strict  {}       0 {} {}
+    iso8859-6 F6 tcl8    \U000000F6 -1 {} {}
+    iso8859-6 F6 replace \uFFFD -1 {} {}
+    iso8859-6 F6 strict  {}       0 {} {}
+    iso8859-6 F7 tcl8    \U000000F7 -1 {} {}
+    iso8859-6 F7 replace \uFFFD -1 {} {}
+    iso8859-6 F7 strict  {}       0 {} {}
+    iso8859-6 F8 tcl8    \U000000F8 -1 {} {}
+    iso8859-6 F8 replace \uFFFD -1 {} {}
+    iso8859-6 F8 strict  {}       0 {} {}
+    iso8859-6 F9 tcl8    \U000000F9 -1 {} {}
+    iso8859-6 F9 replace \uFFFD -1 {} {}
+    iso8859-6 F9 strict  {}       0 {} {}
+    iso8859-6 FA tcl8    \U000000FA -1 {} {}
+    iso8859-6 FA replace \uFFFD -1 {} {}
+    iso8859-6 FA strict  {}       0 {} {}
+    iso8859-6 FB tcl8    \U000000FB -1 {} {}
+    iso8859-6 FB replace \uFFFD -1 {} {}
+    iso8859-6 FB strict  {}       0 {} {}
+    iso8859-6 FC tcl8    \U000000FC -1 {} {}
+    iso8859-6 FC replace \uFFFD -1 {} {}
+    iso8859-6 FC strict  {}       0 {} {}
+    iso8859-6 FD tcl8    \U000000FD -1 {} {}
+    iso8859-6 FD replace \uFFFD -1 {} {}
+    iso8859-6 FD strict  {}       0 {} {}
+    iso8859-6 FE tcl8    \U000000FE -1 {} {}
+    iso8859-6 FE replace \uFFFD -1 {} {}
+    iso8859-6 FE strict  {}       0 {} {}
+    iso8859-6 FF tcl8    \U000000FF -1 {} {}
+    iso8859-6 FF replace \uFFFD -1 {} {}
+    iso8859-6 FF strict  {}       0 {} {}
+}; # iso8859-6
+
+# iso8859-6 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-6 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-6 \U000000A1 replace 1A -1 {} {}
+    iso8859-6 \U000000A1 strict  {}                      0 {} {}
+    iso8859-6 \U00000400 tcl8    1A -1 {} {}
+    iso8859-6 \U00000400 replace 1A -1 {} {}
+    iso8859-6 \U00000400 strict  {}                      0 {} {}
+    iso8859-6 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-6 \U0000D800 replace 1A -1 {} {}
+    iso8859-6 \U0000D800 strict  {}                      0 {} {}
+    iso8859-6 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-6 \U0000DC00 replace 1A -1 {} {}
+    iso8859-6 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-6 \U00010000 tcl8    1A -1 {} {}
+    iso8859-6 \U00010000 replace 1A -1 {} {}
+    iso8859-6 \U00010000 strict  {}                      0 {} {}
+    iso8859-6 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-6 \U0010FFFF replace 1A -1 {} {}
+    iso8859-6 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-6
+
+#
+# iso8859-7 (generated from glibc-ISO_8859_7-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-7 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-7 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B7 B7 00BB BB 00BD BD 037A AA 0384 B4 0385 B5 0386 B6 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2015 AF 2018 A1 2019 A2 20AC A4 20AF A5}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-7 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-7 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B7 B7 00BB BB 00BD BD 037A AA 0384 B4 0385 B5 0386 B6 0388 B8 0389 B9 038A BA 038C BC 038E BE 038F BF 0390 C0 0391 C1 0392 C2 0393 C3 0394 C4 0395 C5 0396 C6 0397 C7 0398 C8 0399 C9 039A CA 039B CB 039C CC 039D CD 039E CE 039F CF 03A0 D0 03A1 D1 03A3 D3 03A4 D4 03A5 D5 03A6 D6 03A7 D7 03A8 D8 03A9 D9 03AA DA 03AB DB 03AC DC 03AD DD 03AE DE 03AF DF 03B0 E0 03B1 E1 03B2 E2 03B3 E3 03B4 E4 03B5 E5 03B6 E6 03B7 E7 03B8 E8 03B9 E9 03BA EA 03BB EB 03BC EC 03BD ED 03BE EE 03BF EF 03C0 F0 03C1 F1 03C2 F2 03C3 F3 03C4 F4 03C5 F5 03C6 F6 03C7 F7 03C8 F8 03C9 F9 03CA FA 03CB FB 03CC FC 03CD FD 03CE FE 2015 AF 2018 A1 2019 A2 20AC A4 20AF A5}
+} -result {}
+
+# iso8859-7 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-7 AE tcl8    \U000000AE -1 {} {}
+    iso8859-7 AE replace \uFFFD -1 {} {}
+    iso8859-7 AE strict  {}       0 {} {}
+    iso8859-7 D2 tcl8    \U000000D2 -1 {} {}
+    iso8859-7 D2 replace \uFFFD -1 {} {}
+    iso8859-7 D2 strict  {}       0 {} {}
+    iso8859-7 FF tcl8    \U000000FF -1 {} {}
+    iso8859-7 FF replace \uFFFD -1 {} {}
+    iso8859-7 FF strict  {}       0 {} {}
+}; # iso8859-7
+
+# iso8859-7 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-7 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-7 \U000000A1 replace 1A -1 {} {}
+    iso8859-7 \U000000A1 strict  {}                      0 {} {}
+    iso8859-7 \U00000400 tcl8    1A -1 {} {}
+    iso8859-7 \U00000400 replace 1A -1 {} {}
+    iso8859-7 \U00000400 strict  {}                      0 {} {}
+    iso8859-7 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-7 \U0000D800 replace 1A -1 {} {}
+    iso8859-7 \U0000D800 strict  {}                      0 {} {}
+    iso8859-7 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-7 \U0000DC00 replace 1A -1 {} {}
+    iso8859-7 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-7 \U00010000 tcl8    1A -1 {} {}
+    iso8859-7 \U00010000 replace 1A -1 {} {}
+    iso8859-7 \U00010000 strict  {}                      0 {} {}
+    iso8859-7 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-7 \U0010FFFF replace 1A -1 {} {}
+    iso8859-7 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-7
+
+#
+# iso8859-8 (generated from glibc-ISO_8859_8-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-8 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-8 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 AA 00F7 BA 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 200E FD 200F FE 2017 DF}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-8 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-8 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00D7 AA 00F7 BA 05D0 E0 05D1 E1 05D2 E2 05D3 E3 05D4 E4 05D5 E5 05D6 E6 05D7 E7 05D8 E8 05D9 E9 05DA EA 05DB EB 05DC EC 05DD ED 05DE EE 05DF EF 05E0 F0 05E1 F1 05E2 F2 05E3 F3 05E4 F4 05E5 F5 05E6 F6 05E7 F7 05E8 F8 05E9 F9 05EA FA 200E FD 200F FE 2017 DF}
+} -result {}
+
+# iso8859-8 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-8 A1 tcl8    \U000000A1 -1 {} {}
+    iso8859-8 A1 replace \uFFFD -1 {} {}
+    iso8859-8 A1 strict  {}       0 {} {}
+    iso8859-8 BF tcl8    \U000000BF -1 {} {}
+    iso8859-8 BF replace \uFFFD -1 {} {}
+    iso8859-8 BF strict  {}       0 {} {}
+    iso8859-8 C0 tcl8    \U000000C0 -1 {} {}
+    iso8859-8 C0 replace \uFFFD -1 {} {}
+    iso8859-8 C0 strict  {}       0 {} {}
+    iso8859-8 C1 tcl8    \U000000C1 -1 {} {}
+    iso8859-8 C1 replace \uFFFD -1 {} {}
+    iso8859-8 C1 strict  {}       0 {} {}
+    iso8859-8 C2 tcl8    \U000000C2 -1 {} {}
+    iso8859-8 C2 replace \uFFFD -1 {} {}
+    iso8859-8 C2 strict  {}       0 {} {}
+    iso8859-8 C3 tcl8    \U000000C3 -1 {} {}
+    iso8859-8 C3 replace \uFFFD -1 {} {}
+    iso8859-8 C3 strict  {}       0 {} {}
+    iso8859-8 C4 tcl8    \U000000C4 -1 {} {}
+    iso8859-8 C4 replace \uFFFD -1 {} {}
+    iso8859-8 C4 strict  {}       0 {} {}
+    iso8859-8 C5 tcl8    \U000000C5 -1 {} {}
+    iso8859-8 C5 replace \uFFFD -1 {} {}
+    iso8859-8 C5 strict  {}       0 {} {}
+    iso8859-8 C6 tcl8    \U000000C6 -1 {} {}
+    iso8859-8 C6 replace \uFFFD -1 {} {}
+    iso8859-8 C6 strict  {}       0 {} {}
+    iso8859-8 C7 tcl8    \U000000C7 -1 {} {}
+    iso8859-8 C7 replace \uFFFD -1 {} {}
+    iso8859-8 C7 strict  {}       0 {} {}
+    iso8859-8 C8 tcl8    \U000000C8 -1 {} {}
+    iso8859-8 C8 replace \uFFFD -1 {} {}
+    iso8859-8 C8 strict  {}       0 {} {}
+    iso8859-8 C9 tcl8    \U000000C9 -1 {} {}
+    iso8859-8 C9 replace \uFFFD -1 {} {}
+    iso8859-8 C9 strict  {}       0 {} {}
+    iso8859-8 CA tcl8    \U000000CA -1 {} {}
+    iso8859-8 CA replace \uFFFD -1 {} {}
+    iso8859-8 CA strict  {}       0 {} {}
+    iso8859-8 CB tcl8    \U000000CB -1 {} {}
+    iso8859-8 CB replace \uFFFD -1 {} {}
+    iso8859-8 CB strict  {}       0 {} {}
+    iso8859-8 CC tcl8    \U000000CC -1 {} {}
+    iso8859-8 CC replace \uFFFD -1 {} {}
+    iso8859-8 CC strict  {}       0 {} {}
+    iso8859-8 CD tcl8    \U000000CD -1 {} {}
+    iso8859-8 CD replace \uFFFD -1 {} {}
+    iso8859-8 CD strict  {}       0 {} {}
+    iso8859-8 CE tcl8    \U000000CE -1 {} {}
+    iso8859-8 CE replace \uFFFD -1 {} {}
+    iso8859-8 CE strict  {}       0 {} {}
+    iso8859-8 CF tcl8    \U000000CF -1 {} {}
+    iso8859-8 CF replace \uFFFD -1 {} {}
+    iso8859-8 CF strict  {}       0 {} {}
+    iso8859-8 D0 tcl8    \U000000D0 -1 {} {}
+    iso8859-8 D0 replace \uFFFD -1 {} {}
+    iso8859-8 D0 strict  {}       0 {} {}
+    iso8859-8 D1 tcl8    \U000000D1 -1 {} {}
+    iso8859-8 D1 replace \uFFFD -1 {} {}
+    iso8859-8 D1 strict  {}       0 {} {}
+    iso8859-8 D2 tcl8    \U000000D2 -1 {} {}
+    iso8859-8 D2 replace \uFFFD -1 {} {}
+    iso8859-8 D2 strict  {}       0 {} {}
+    iso8859-8 D3 tcl8    \U000000D3 -1 {} {}
+    iso8859-8 D3 replace \uFFFD -1 {} {}
+    iso8859-8 D3 strict  {}       0 {} {}
+    iso8859-8 D4 tcl8    \U000000D4 -1 {} {}
+    iso8859-8 D4 replace \uFFFD -1 {} {}
+    iso8859-8 D4 strict  {}       0 {} {}
+    iso8859-8 D5 tcl8    \U000000D5 -1 {} {}
+    iso8859-8 D5 replace \uFFFD -1 {} {}
+    iso8859-8 D5 strict  {}       0 {} {}
+    iso8859-8 D6 tcl8    \U000000D6 -1 {} {}
+    iso8859-8 D6 replace \uFFFD -1 {} {}
+    iso8859-8 D6 strict  {}       0 {} {}
+    iso8859-8 D7 tcl8    \U000000D7 -1 {} {}
+    iso8859-8 D7 replace \uFFFD -1 {} {}
+    iso8859-8 D7 strict  {}       0 {} {}
+    iso8859-8 D8 tcl8    \U000000D8 -1 {} {}
+    iso8859-8 D8 replace \uFFFD -1 {} {}
+    iso8859-8 D8 strict  {}       0 {} {}
+    iso8859-8 D9 tcl8    \U000000D9 -1 {} {}
+    iso8859-8 D9 replace \uFFFD -1 {} {}
+    iso8859-8 D9 strict  {}       0 {} {}
+    iso8859-8 DA tcl8    \U000000DA -1 {} {}
+    iso8859-8 DA replace \uFFFD -1 {} {}
+    iso8859-8 DA strict  {}       0 {} {}
+    iso8859-8 DB tcl8    \U000000DB -1 {} {}
+    iso8859-8 DB replace \uFFFD -1 {} {}
+    iso8859-8 DB strict  {}       0 {} {}
+    iso8859-8 DC tcl8    \U000000DC -1 {} {}
+    iso8859-8 DC replace \uFFFD -1 {} {}
+    iso8859-8 DC strict  {}       0 {} {}
+    iso8859-8 DD tcl8    \U000000DD -1 {} {}
+    iso8859-8 DD replace \uFFFD -1 {} {}
+    iso8859-8 DD strict  {}       0 {} {}
+    iso8859-8 DE tcl8    \U000000DE -1 {} {}
+    iso8859-8 DE replace \uFFFD -1 {} {}
+    iso8859-8 DE strict  {}       0 {} {}
+    iso8859-8 FB tcl8    \U000000FB -1 {} {}
+    iso8859-8 FB replace \uFFFD -1 {} {}
+    iso8859-8 FB strict  {}       0 {} {}
+    iso8859-8 FC tcl8    \U000000FC -1 {} {}
+    iso8859-8 FC replace \uFFFD -1 {} {}
+    iso8859-8 FC strict  {}       0 {} {}
+    iso8859-8 FF tcl8    \U000000FF -1 {} {}
+    iso8859-8 FF replace \uFFFD -1 {} {}
+    iso8859-8 FF strict  {}       0 {} {}
+}; # iso8859-8
+
+# iso8859-8 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-8 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-8 \U000000A1 replace 1A -1 {} {}
+    iso8859-8 \U000000A1 strict  {}                      0 {} {}
+    iso8859-8 \U00000400 tcl8    1A -1 {} {}
+    iso8859-8 \U00000400 replace 1A -1 {} {}
+    iso8859-8 \U00000400 strict  {}                      0 {} {}
+    iso8859-8 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-8 \U0000D800 replace 1A -1 {} {}
+    iso8859-8 \U0000D800 strict  {}                      0 {} {}
+    iso8859-8 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-8 \U0000DC00 replace 1A -1 {} {}
+    iso8859-8 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-8 \U00010000 tcl8    1A -1 {} {}
+    iso8859-8 \U00010000 replace 1A -1 {} {}
+    iso8859-8 \U00010000 strict  {}                      0 {} {}
+    iso8859-8 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-8 \U0010FFFF replace 1A -1 {} {}
+    iso8859-8 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-8
+
+#
+# iso8859-9 (generated from glibc-ISO_8859_9-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-9 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-9 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 015E DE 015F FE}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-9 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-9 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A4 A4 00A5 A5 00A6 A6 00A7 A7 00A8 A8 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B4 B4 00B5 B5 00B6 B6 00B7 B7 00B8 B8 00B9 B9 00BA BA 00BB BB 00BC BC 00BD BD 00BE BE 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 011E D0 011F F0 0130 DD 0131 FD 015E DE 015F FE}
+} -result {}
+
+# iso8859-9 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-9
+
+# iso8859-9 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-9 \U000000D0 tcl8    1A -1 {} {}
+    iso8859-9 \U000000D0 replace 1A -1 {} {}
+    iso8859-9 \U000000D0 strict  {}                      0 {} {}
+    iso8859-9 \U00000400 tcl8    1A -1 {} {}
+    iso8859-9 \U00000400 replace 1A -1 {} {}
+    iso8859-9 \U00000400 strict  {}                      0 {} {}
+    iso8859-9 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-9 \U0000D800 replace 1A -1 {} {}
+    iso8859-9 \U0000D800 strict  {}                      0 {} {}
+    iso8859-9 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-9 \U0000DC00 replace 1A -1 {} {}
+    iso8859-9 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-9 \U00010000 tcl8    1A -1 {} {}
+    iso8859-9 \U00010000 replace 1A -1 {} {}
+    iso8859-9 \U00010000 strict  {}                      0 {} {}
+    iso8859-9 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-9 \U0010FFFF replace 1A -1 {} {}
+    iso8859-9 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-9
+
+#
+# iso8859-10 (generated from glibc-ISO_8859_10-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-10 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-10 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00AD AD 00B0 B0 00B7 B7 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00CF CF 00D0 D0 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00EF EF 00F0 F0 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 A9 0111 B9 0112 A2 0113 B2 0116 CC 0117 EC 0118 CA 0119 EA 0122 A3 0123 B3 0128 A5 0129 B5 012A A4 012B B4 012E C7 012F E7 0136 A6 0137 B6 0138 FF 013B A8 013C B8 0145 D1 0146 F1 014A AF 014B BF 014C D2 014D F2 0160 AA 0161 BA 0166 AB 0167 BB 0168 D7 0169 F7 016A AE 016B BE 0172 D9 0173 F9 017D AC 017E BC 2015 BD}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-10 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-10 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00AD AD 00B0 B0 00B7 B7 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C9 C9 00CB CB 00CD CD 00CE CE 00CF CF 00D0 D0 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E9 E9 00EB EB 00ED ED 00EE EE 00EF EF 00F0 F0 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 0100 C0 0101 E0 0104 A1 0105 B1 010C C8 010D E8 0110 A9 0111 B9 0112 A2 0113 B2 0116 CC 0117 EC 0118 CA 0119 EA 0122 A3 0123 B3 0128 A5 0129 B5 012A A4 012B B4 012E C7 012F E7 0136 A6 0137 B6 0138 FF 013B A8 013C B8 0145 D1 0146 F1 014A AF 014B BF 014C D2 014D F2 0160 AA 0161 BA 0166 AB 0167 BB 0168 D7 0169 F7 016A AE 016B BE 0172 D9 0173 F9 017D AC 017E BC 2015 BD}
+} -result {}
+
+# iso8859-10 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-10
+
+# iso8859-10 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-10 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-10 \U000000A1 replace 1A -1 {} {}
+    iso8859-10 \U000000A1 strict  {}                      0 {} {}
+    iso8859-10 \U00000400 tcl8    1A -1 {} {}
+    iso8859-10 \U00000400 replace 1A -1 {} {}
+    iso8859-10 \U00000400 strict  {}                      0 {} {}
+    iso8859-10 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-10 \U0000D800 replace 1A -1 {} {}
+    iso8859-10 \U0000D800 strict  {}                      0 {} {}
+    iso8859-10 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-10 \U0000DC00 replace 1A -1 {} {}
+    iso8859-10 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-10 \U00010000 tcl8    1A -1 {} {}
+    iso8859-10 \U00010000 replace 1A -1 {} {}
+    iso8859-10 \U00010000 strict  {}                      0 {} {}
+    iso8859-10 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-10 \U0010FFFF replace 1A -1 {} {}
+    iso8859-10 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-10
+
+#
+# iso8859-11 (generated from glibc-ISO_8859_11-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-11 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-11 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 0E01 A1 0E02 A2 0E03 A3 0E04 A4 0E05 A5 0E06 A6 0E07 A7 0E08 A8 0E09 A9 0E0A AA 0E0B AB 0E0C AC 0E0D AD 0E0E AE 0E0F AF 0E10 B0 0E11 B1 0E12 B2 0E13 B3 0E14 B4 0E15 B5 0E16 B6 0E17 B7 0E18 B8 0E19 B9 0E1A BA 0E1B BB 0E1C BC 0E1D BD 0E1E BE 0E1F BF 0E20 C0 0E21 C1 0E22 C2 0E23 C3 0E24 C4 0E25 C5 0E26 C6 0E27 C7 0E28 C8 0E29 C9 0E2A CA 0E2B CB 0E2C CC 0E2D CD 0E2E CE 0E2F CF 0E30 D0 0E31 D1 0E32 D2 0E33 D3 0E34 D4 0E35 D5 0E36 D6 0E37 D7 0E38 D8 0E39 D9 0E3A DA 0E3F DF 0E40 E0 0E41 E1 0E42 E2 0E43 E3 0E44 E4 0E45 E5 0E46 E6 0E47 E7 0E48 E8 0E49 E9 0E4A EA 0E4B EB 0E4C EC 0E4D ED 0E4E EE 0E4F EF 0E50 F0 0E51 F1 0E52 F2 0E53 F3 0E54 F4 0E55 F5 0E56 F6 0E57 F7 0E58 F8 0E59 F9 0E5A FA 0E5B FB}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-11 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-11 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 0E01 A1 0E02 A2 0E03 A3 0E04 A4 0E05 A5 0E06 A6 0E07 A7 0E08 A8 0E09 A9 0E0A AA 0E0B AB 0E0C AC 0E0D AD 0E0E AE 0E0F AF 0E10 B0 0E11 B1 0E12 B2 0E13 B3 0E14 B4 0E15 B5 0E16 B6 0E17 B7 0E18 B8 0E19 B9 0E1A BA 0E1B BB 0E1C BC 0E1D BD 0E1E BE 0E1F BF 0E20 C0 0E21 C1 0E22 C2 0E23 C3 0E24 C4 0E25 C5 0E26 C6 0E27 C7 0E28 C8 0E29 C9 0E2A CA 0E2B CB 0E2C CC 0E2D CD 0E2E CE 0E2F CF 0E30 D0 0E31 D1 0E32 D2 0E33 D3 0E34 D4 0E35 D5 0E36 D6 0E37 D7 0E38 D8 0E39 D9 0E3A DA 0E3F DF 0E40 E0 0E41 E1 0E42 E2 0E43 E3 0E44 E4 0E45 E5 0E46 E6 0E47 E7 0E48 E8 0E49 E9 0E4A EA 0E4B EB 0E4C EC 0E4D ED 0E4E EE 0E4F EF 0E50 F0 0E51 F1 0E52 F2 0E53 F3 0E54 F4 0E55 F5 0E56 F6 0E57 F7 0E58 F8 0E59 F9 0E5A FA 0E5B FB}
+} -result {}
+
+# iso8859-11 - invalid byte sequences
+lappend encInvalidBytes {*}{
+    iso8859-11 DB tcl8    \U000000DB -1 {} {}
+    iso8859-11 DB replace \uFFFD -1 {} {}
+    iso8859-11 DB strict  {}       0 {} {}
+    iso8859-11 DC tcl8    \U000000DC -1 {} {}
+    iso8859-11 DC replace \uFFFD -1 {} {}
+    iso8859-11 DC strict  {}       0 {} {}
+    iso8859-11 DD tcl8    \U000000DD -1 {} {}
+    iso8859-11 DD replace \uFFFD -1 {} {}
+    iso8859-11 DD strict  {}       0 {} {}
+    iso8859-11 DE tcl8    \U000000DE -1 {} {}
+    iso8859-11 DE replace \uFFFD -1 {} {}
+    iso8859-11 DE strict  {}       0 {} {}
+    iso8859-11 FC tcl8    \U000000FC -1 {} {}
+    iso8859-11 FC replace \uFFFD -1 {} {}
+    iso8859-11 FC strict  {}       0 {} {}
+    iso8859-11 FD tcl8    \U000000FD -1 {} {}
+    iso8859-11 FD replace \uFFFD -1 {} {}
+    iso8859-11 FD strict  {}       0 {} {}
+    iso8859-11 FE tcl8    \U000000FE -1 {} {}
+    iso8859-11 FE replace \uFFFD -1 {} {}
+    iso8859-11 FE strict  {}       0 {} {}
+    iso8859-11 FF tcl8    \U000000FF -1 {} {}
+    iso8859-11 FF replace \uFFFD -1 {} {}
+    iso8859-11 FF strict  {}       0 {} {}
+}; # iso8859-11
+
+# iso8859-11 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-11 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-11 \U000000A1 replace 1A -1 {} {}
+    iso8859-11 \U000000A1 strict  {}                      0 {} {}
+    iso8859-11 \U00000400 tcl8    1A -1 {} {}
+    iso8859-11 \U00000400 replace 1A -1 {} {}
+    iso8859-11 \U00000400 strict  {}                      0 {} {}
+    iso8859-11 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-11 \U0000D800 replace 1A -1 {} {}
+    iso8859-11 \U0000D800 strict  {}                      0 {} {}
+    iso8859-11 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-11 \U0000DC00 replace 1A -1 {} {}
+    iso8859-11 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-11 \U00010000 tcl8    1A -1 {} {}
+    iso8859-11 \U00010000 replace 1A -1 {} {}
+    iso8859-11 \U00010000 strict  {}                      0 {} {}
+    iso8859-11 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-11 \U0010FFFF replace 1A -1 {} {}
+    iso8859-11 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-11
+
+#
+# iso8859-13 (generated from glibc-ISO_8859_13-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-13 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-13 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 2019 FF 201C B4 201D A1 201E A5}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-13 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-13 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A2 A2 00A3 A3 00A4 A4 00A6 A6 00A7 A7 00A9 A9 00AB AB 00AC AC 00AD AD 00AE AE 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BB BB 00BC BC 00BD BD 00BE BE 00C4 C4 00C5 C5 00C6 AF 00C9 C9 00D3 D3 00D5 D5 00D6 D6 00D7 D7 00D8 A8 00DC DC 00DF DF 00E4 E4 00E5 E5 00E6 BF 00E9 E9 00F3 F3 00F5 F5 00F6 F6 00F7 F7 00F8 B8 00FC FC 0100 C2 0101 E2 0104 C0 0105 E0 0106 C3 0107 E3 010C C8 010D E8 0112 C7 0113 E7 0116 CB 0117 EB 0118 C6 0119 E6 0122 CC 0123 EC 012A CE 012B EE 012E C1 012F E1 0136 CD 0137 ED 013B CF 013C EF 0141 D9 0142 F9 0143 D1 0144 F1 0145 D2 0146 F2 014C D4 014D F4 0156 AA 0157 BA 015A DA 015B FA 0160 D0 0161 F0 016A DB 016B FB 0172 D8 0173 F8 0179 CA 017A EA 017B DD 017C FD 017D DE 017E FE 2019 FF 201C B4 201D A1 201E A5}
+} -result {}
+
+# iso8859-13 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-13
+
+# iso8859-13 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-13 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-13 \U000000A1 replace 1A -1 {} {}
+    iso8859-13 \U000000A1 strict  {}                      0 {} {}
+    iso8859-13 \U00000400 tcl8    1A -1 {} {}
+    iso8859-13 \U00000400 replace 1A -1 {} {}
+    iso8859-13 \U00000400 strict  {}                      0 {} {}
+    iso8859-13 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-13 \U0000D800 replace 1A -1 {} {}
+    iso8859-13 \U0000D800 strict  {}                      0 {} {}
+    iso8859-13 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-13 \U0000DC00 replace 1A -1 {} {}
+    iso8859-13 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-13 \U00010000 tcl8    1A -1 {} {}
+    iso8859-13 \U00010000 replace 1A -1 {} {}
+    iso8859-13 \U00010000 strict  {}                      0 {} {}
+    iso8859-13 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-13 \U0010FFFF replace 1A -1 {} {}
+    iso8859-13 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-13
+
+#
+# iso8859-14 (generated from glibc-ISO_8859_14-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-14 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-14 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A7 A7 00A9 A9 00AD AD 00AE AE 00B6 B6 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FF FF 010A A4 010B A5 0120 B2 0121 B3 0174 D0 0175 F0 0176 DE 0177 FE 0178 AF 1E02 A1 1E03 A2 1E0A A6 1E0B AB 1E1E B0 1E1F B1 1E40 B4 1E41 B5 1E56 B7 1E57 B9 1E60 BB 1E61 BF 1E6A D7 1E6B F7 1E80 A8 1E81 B8 1E82 AA 1E83 BA 1E84 BD 1E85 BE 1EF2 AC 1EF3 BC}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-14 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-14 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A3 A3 00A7 A7 00A9 A9 00AD AD 00AE AE 00B6 B6 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FF FF 010A A4 010B A5 0120 B2 0121 B3 0174 D0 0175 F0 0176 DE 0177 FE 0178 AF 1E02 A1 1E03 A2 1E0A A6 1E0B AB 1E1E B0 1E1F B1 1E40 B4 1E41 B5 1E56 B7 1E57 B9 1E60 BB 1E61 BF 1E6A D7 1E6B F7 1E80 A8 1E81 B8 1E82 AA 1E83 BA 1E84 BD 1E85 BE 1EF2 AC 1EF3 BC}
+} -result {}
+
+# iso8859-14 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-14
+
+# iso8859-14 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-14 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-14 \U000000A1 replace 1A -1 {} {}
+    iso8859-14 \U000000A1 strict  {}                      0 {} {}
+    iso8859-14 \U00000400 tcl8    1A -1 {} {}
+    iso8859-14 \U00000400 replace 1A -1 {} {}
+    iso8859-14 \U00000400 strict  {}                      0 {} {}
+    iso8859-14 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-14 \U0000D800 replace 1A -1 {} {}
+    iso8859-14 \U0000D800 strict  {}                      0 {} {}
+    iso8859-14 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-14 \U0000DC00 replace 1A -1 {} {}
+    iso8859-14 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-14 \U00010000 tcl8    1A -1 {} {}
+    iso8859-14 \U00010000 replace 1A -1 {} {}
+    iso8859-14 \U00010000 strict  {}                      0 {} {}
+    iso8859-14 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-14 \U0010FFFF replace 1A -1 {} {}
+    iso8859-14 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-14
+
+#
+# iso8859-15 (generated from glibc-ISO_8859_15-2.1.2)
+
+test encoding-convertfrom-ucmCompare-iso8859-15 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-15 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A7 A7 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BA BA 00BB BB 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 BC 0153 BD 0160 A6 0161 A8 0178 BE 017D B4 017E B8 20AC A4}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-15 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-15 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A1 A1 00A2 A2 00A3 A3 00A5 A5 00A7 A7 00A9 A9 00AA AA 00AB AB 00AC AC 00AD AD 00AE AE 00AF AF 00B0 B0 00B1 B1 00B2 B2 00B3 B3 00B5 B5 00B6 B6 00B7 B7 00B9 B9 00BA BA 00BB BB 00BF BF 00C0 C0 00C1 C1 00C2 C2 00C3 C3 00C4 C4 00C5 C5 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D0 D0 00D1 D1 00D2 D2 00D3 D3 00D4 D4 00D5 D5 00D6 D6 00D7 D7 00D8 D8 00D9 D9 00DA DA 00DB DB 00DC DC 00DD DD 00DE DE 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E3 E3 00E4 E4 00E5 E5 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F0 F0 00F1 F1 00F2 F2 00F3 F3 00F4 F4 00F5 F5 00F6 F6 00F7 F7 00F8 F8 00F9 F9 00FA FA 00FB FB 00FC FC 00FD FD 00FE FE 00FF FF 0152 BC 0153 BD 0160 A6 0161 A8 0178 BE 017D B4 017E B8 20AC A4}
+} -result {}
+
+# iso8859-15 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-15
+
+# iso8859-15 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-15 \U000000A4 tcl8    1A -1 {} {}
+    iso8859-15 \U000000A4 replace 1A -1 {} {}
+    iso8859-15 \U000000A4 strict  {}                      0 {} {}
+    iso8859-15 \U00000400 tcl8    1A -1 {} {}
+    iso8859-15 \U00000400 replace 1A -1 {} {}
+    iso8859-15 \U00000400 strict  {}                      0 {} {}
+    iso8859-15 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-15 \U0000D800 replace 1A -1 {} {}
+    iso8859-15 \U0000D800 strict  {}                      0 {} {}
+    iso8859-15 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-15 \U0000DC00 replace 1A -1 {} {}
+    iso8859-15 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-15 \U00010000 tcl8    1A -1 {} {}
+    iso8859-15 \U00010000 replace 1A -1 {} {}
+    iso8859-15 \U00010000 strict  {}                      0 {} {}
+    iso8859-15 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-15 \U0010FFFF replace 1A -1 {} {}
+    iso8859-15 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-15
+
+#
+# iso8859-16 (generated from glibc-ISO_8859_16-2.3.3)
+
+test encoding-convertfrom-ucmCompare-iso8859-16 {Compare against ICU UCM} -body {
+    ucmConvertfromMismatches iso8859-16 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00A9 A9 00AB AB 00AD AD 00B0 B0 00B1 B1 00B6 B6 00B7 B7 00BB BB 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0104 A1 0105 A2 0106 C5 0107 E5 010C B2 010D B9 0110 D0 0111 F0 0118 DD 0119 FD 0141 A3 0142 B3 0143 D1 0144 F1 0150 D5 0151 F5 0152 BC 0153 BD 015A D7 015B F7 0160 A6 0161 A8 0170 D8 0171 F8 0178 BE 0179 AC 017A AE 017B AF 017C BF 017D B4 017E B8 0218 AA 0219 BA 021A DE 021B FE 201D B5 201E A5 20AC A4}
+} -result {}
+
+test encoding-convertto-ucmCompare-iso8859-16 {Compare against ICU UCM} -body {
+    ucmConverttoMismatches iso8859-16 {0000 00 0001 01 0002 02 0003 03 0004 04 0005 05 0006 06 0007 07 0008 08 0009 09 000A 0A 000B 0B 000C 0C 000D 0D 000E 0E 000F 0F 0010 10 0011 11 0012 12 0013 13 0014 14 0015 15 0016 16 0017 17 0018 18 0019 19 001A 1A 001B 1B 001C 1C 001D 1D 001E 1E 001F 1F 0020 20 0021 21 0022 22 0023 23 0024 24 0025 25 0026 26 0027 27 0028 28 0029 29 002A 2A 002B 2B 002C 2C 002D 2D 002E 2E 002F 2F 0030 30 0031 31 0032 32 0033 33 0034 34 0035 35 0036 36 0037 37 0038 38 0039 39 003A 3A 003B 3B 003C 3C 003D 3D 003E 3E 003F 3F 0040 40 0041 41 0042 42 0043 43 0044 44 0045 45 0046 46 0047 47 0048 48 0049 49 004A 4A 004B 4B 004C 4C 004D 4D 004E 4E 004F 4F 0050 50 0051 51 0052 52 0053 53 0054 54 0055 55 0056 56 0057 57 0058 58 0059 59 005A 5A 005B 5B 005C 5C 005D 5D 005E 5E 005F 5F 0060 60 0061 61 0062 62 0063 63 0064 64 0065 65 0066 66 0067 67 0068 68 0069 69 006A 6A 006B 6B 006C 6C 006D 6D 006E 6E 006F 6F 0070 70 0071 71 0072 72 0073 73 0074 74 0075 75 0076 76 0077 77 0078 78 0079 79 007A 7A 007B 7B 007C 7C 007D 7D 007E 7E 007F 7F 0080 80 0081 81 0082 82 0083 83 0084 84 0085 85 0086 86 0087 87 0088 88 0089 89 008A 8A 008B 8B 008C 8C 008D 8D 008E 8E 008F 8F 0090 90 0091 91 0092 92 0093 93 0094 94 0095 95 0096 96 0097 97 0098 98 0099 99 009A 9A 009B 9B 009C 9C 009D 9D 009E 9E 009F 9F 00A0 A0 00A7 A7 00A9 A9 00AB AB 00AD AD 00B0 B0 00B1 B1 00B6 B6 00B7 B7 00BB BB 00C0 C0 00C1 C1 00C2 C2 00C4 C4 00C6 C6 00C7 C7 00C8 C8 00C9 C9 00CA CA 00CB CB 00CC CC 00CD CD 00CE CE 00CF CF 00D2 D2 00D3 D3 00D4 D4 00D6 D6 00D9 D9 00DA DA 00DB DB 00DC DC 00DF DF 00E0 E0 00E1 E1 00E2 E2 00E4 E4 00E6 E6 00E7 E7 00E8 E8 00E9 E9 00EA EA 00EB EB 00EC EC 00ED ED 00EE EE 00EF EF 00F2 F2 00F3 F3 00F4 F4 00F6 F6 00F9 F9 00FA FA 00FB FB 00FC FC 00FF FF 0102 C3 0103 E3 0104 A1 0105 A2 0106 C5 0107 E5 010C B2 010D B9 0110 D0 0111 F0 0118 DD 0119 FD 0141 A3 0142 B3 0143 D1 0144 F1 0150 D5 0151 F5 0152 BC 0153 BD 015A D7 015B F7 0160 A6 0161 A8 0170 D8 0171 F8 0178 BE 0179 AC 017A AE 017B AF 017C BF 017D B4 017E B8 0218 AA 0219 BA 021A DE 021B FE 201D B5 201E A5 20AC A4}
+} -result {}
+
+# iso8859-16 - invalid byte sequences
+lappend encInvalidBytes {*}{
+}; # iso8859-16
+
+# iso8859-16 - invalid byte sequences
+lappend encUnencodableStrings {*}{
+    iso8859-16 \U000000A1 tcl8    1A -1 {} {}
+    iso8859-16 \U000000A1 replace 1A -1 {} {}
+    iso8859-16 \U000000A1 strict  {}                      0 {} {}
+    iso8859-16 \U00000400 tcl8    1A -1 {} {}
+    iso8859-16 \U00000400 replace 1A -1 {} {}
+    iso8859-16 \U00000400 strict  {}                      0 {} {}
+    iso8859-16 \U0000D800 tcl8    1A -1 {} {}
+    iso8859-16 \U0000D800 replace 1A -1 {} {}
+    iso8859-16 \U0000D800 strict  {}                      0 {} {}
+    iso8859-16 \U0000DC00 tcl8    1A -1 {} {}
+    iso8859-16 \U0000DC00 replace 1A -1 {} {}
+    iso8859-16 \U0000DC00 strict  {}                      0 {} {}
+    iso8859-16 \U00010000 tcl8    1A -1 {} {}
+    iso8859-16 \U00010000 replace 1A -1 {} {}
+    iso8859-16 \U00010000 strict  {}                      0 {} {}
+    iso8859-16 \U0010FFFF tcl8    1A -1 {} {}
+    iso8859-16 \U0010FFFF replace 1A -1 {} {}
+    iso8859-16 \U0010FFFF strict  {}                      0 {} {}
+}; # iso8859-16
diff --git a/tools/ucm2tests.tcl b/tools/ucm2tests.tcl
index e971631..dc878ef 100644
--- a/tools/ucm2tests.tcl
+++ b/tools/ucm2tests.tcl
@@ -37,14 +37,27 @@ namespace eval ucm {
         iso8859-9 glibc-ISO_8859_9-2.1.2
         iso8859-10 glibc-ISO_8859_10-2.1.2
         iso8859-11 glibc-ISO_8859_11-2.1.2
-        iso8859-13 glibc-ISO_8859_13-2.1.2
+        iso8859-13 glibc-ISO_8859_13-2.3.3
         iso8859-14 glibc-ISO_8859_14-2.1.2
         iso8859-15 glibc-ISO_8859_15-2.1.2
         iso8859-16 glibc-ISO_8859_16-2.3.3
     }
 
-    # Dictionary Character map for Tcl encoding
+    # Array keyed by Tcl encoding name. Each element contains mapping of
+    # Unicode code point -> byte sequence for that encoding as a flat list
+    # (or dictionary). Both are stored as hex strings
     variable charMap
+
+    # Array keyed by Tcl encoding name. List of invalid code sequences
+    # each being a hex string.
+    variable invalidCodeSequences
+
+    # Array keyed by Tcl encoding name. List of unicode code points that are
+    # not mapped, each being a hex string.
+    variable unmappedCodePoints
+
+    # The fallback character per encoding
+    variable encSubchar
 }
 
 proc ucm::abort {msg} {
@@ -68,7 +81,11 @@ proc ucm::print {s} {
     puts $outputChan $s
 }
 
-proc ucm::parse_SBCS {fd} {
+proc ucm::parse_SBCS {encName fd} {
+    variable charMap
+    variable invalidCodeSequences
+    variable unmappedCodePoints
+
     set result {}
     while {[gets $fd line] >= 0} {
         if {[string match #* $line]} {
@@ -87,26 +104,44 @@ proc ucm::parse_SBCS {fd} {
             # It is a fallback mapping - ignore
         }
     }
-    return $result
-}
+    set charMap($encName) $result
 
-proc ucm::generate_tests {} {
-    variable encNameMap
-    variable charMap
-    variable outputPath
-    variable outputChan
-
-    if {[info exists outputPath]} {
-        set outputChan [open $outputPath w]
-    } else {
-        set outputChan stdout
+    # Find out invalid code sequences and unicode code points that are not mapped
+    set valid {}
+    set mapped {}
+    foreach {unich bytes} $result {
+        lappend mapped $unich
+        lappend valid $bytes
+    }
+    set invalidCodeSequences($encName) {}
+    for {set i 0} {$i <= 255} {incr i} {
+        set hex [format %.2X $i]
+        if {[lsearch -exact $valid $hex] < 0} {
+            lappend invalidCodeSequences($encName) $hex
+        }
     }
 
-    array set tclNames {}
-    foreach encName [encoding names] {
-        set tclNames($encName) ""
+    set unmappedCodePoints($encName) {}
+    for {set i 0} {$i <= 65535} {incr i} {
+        set hex [format %.4X $i]
+        if {[lsearch -exact $mapped $hex] < 0} {
+            lappend unmappedCodePoints($encName) $hex
+            # Only look for (at most) one below 256 and one above 1024
+            if {$i < 255} {
+                # Found one so jump past 8 bits
+                set i 255
+            } else {
+                break
+            }
+        }
+        if {$i == 255} {
+            set i 1023
+        }
     }
+    lappend unmappedCodePoints($encName) D800 DC00 10000 10FFFF
+}
 
+proc ucm::generate_boilerplate {} {
     # Common procedures
     print {
 # This file is automatically generated by ucm2tests.tcl.
@@ -118,6 +153,7 @@ proc ucm::generate_tests {} {
 proc ucmConvertfromMismatches {enc map} {
     set mismatches {}
     foreach {unihex hex} $map {
+        set unihex [string range 00000000$unihex end-7 end]; # Make 8 digits
         set unich [subst "\\U$unihex"]
         if {[encoding convertfrom -profile strict $enc [binary decode hex $hex]] ne $unich} {
             lappend mismatches "<[printable $unich],$hex>"
@@ -128,6 +164,7 @@ proc ucmConvertfromMismatches {enc map} {
 proc ucmConverttoMismatches {enc map} {
     set mismatches {}
     foreach {unihex hex} $map {
+        set unihex [string range 00000000$unihex end-7 end]; # Make 8 digits
         set unich [subst "\\U$unihex"]
         if {[encoding convertto -profile strict $enc $unich] ne [binary decode hex $hex]} {
             lappend mismatches "<[printable $unich],$hex>"
@@ -154,6 +191,30 @@ if {[info commands printable] eq ""} {
     }
 }
     }
+} ; # generate_boilerplate
+
+proc ucm::generate_tests {} {
+    variable encNameMap
+    variable charMap
+    variable invalidCodeSequences
+    variable unmappedCodePoints
+    variable outputPath
+    variable outputChan
+    variable encSubchar
+
+    if {[info exists outputPath]} {
+        set outputChan [open $outputPath w]
+        fconfigure $outputChan -translation lf
+    } else {
+        set outputChan stdout
+    }
+
+    array set tclNames {}
+    foreach encName [encoding names] {
+        set tclNames($encName) ""
+    }
+
+    generate_boilerplate
     foreach encName [lsort -dictionary [array names encNameMap]] {
         if {![info exists charMap($encName)]} {
             warn "No character map read for $encName"
@@ -161,6 +222,7 @@ if {[info commands printable] eq ""} {
         }
         unset tclNames($encName)
 
+        # Print the valid tests
         print "\n#\n# $encName (generated from $encNameMap($encName))"
         print "\ntest encoding-convertfrom-ucmCompare-$encName {Compare against ICU UCM} -body \{"
         print "    ucmConvertfromMismatches $encName {$charMap($encName)}"
@@ -172,13 +234,42 @@ if {[info commands printable] eq ""} {
             # This will generate individual tests for every char
             # and test in lead, tail, middle, solo configurations
             # but takes considerable time
-            print "lappend encValidStrings {*}{"
+            print "lappend encValidStrings \{*\}\{"
             foreach {unich hex} $charMap($encName) {
                 print "    $encName \\u$unich $hex {} {}"
             }
-            print "}; # $encName"
+            print "\}; # $encName"
+        }
+
+        # Generate the invalidity checks
+        print "\n# $encName - invalid byte sequences"
+        print "lappend encInvalidBytes \{*\}\{"
+        foreach hex $invalidCodeSequences($encName) {
+            # Map XXXX... to \xXX\xXX...
+            set uhex [regsub -all .. $hex {\\x\0}]
+            set uhex \\U[string range 00000000$hex end-7 end]
+            print "    $encName $hex tcl8    $uhex -1 {} {}"
+            print "    $encName $hex replace \\uFFFD -1 {} {}"
+            print "    $encName $hex strict  {}       0 {} {}"
+        }
+        print "\}; # $encName"
+
+        print "\n# $encName - invalid byte sequences"
+        print "lappend encUnencodableStrings \{*\}\{"
+        if {[info exists encSubchar($encName)]} {
+            set subchar $encSubchar($encName)
+        } else {
+            set subchar "3F"; # Tcl uses ? by default
         }
+        foreach hex $unmappedCodePoints($encName) {
+            set uhex \\U[string range 00000000$hex end-7 end]
+            print "    $encName $uhex tcl8    $subchar -1 {} {}"
+            print "    $encName $uhex replace $subchar -1 {} {}"
+            print "    $encName $uhex strict  {}                      0 {} {}"
+        }
+        print "\}; # $encName"
     }
+
     if {[array size tclNames]} {
         warn "Missing encoding: [lsort [array names tclNames]]"
     }
@@ -190,6 +281,8 @@ if {[info commands printable] eq ""} {
 
 proc ucm::parse_file {encName ucmPath} {
     variable charMap
+    variable encSubchar
+
     set fd [open $ucmPath]
     try {
         # Parse the metadata
@@ -205,7 +298,7 @@ proc ucm::parse_file {encName ucmPath} {
             }
         }
         if {![info exists state(charmap)]} {
-            abort "Error: $path has No CHARMAP line."
+            abort "Error: $ucmPath has No CHARMAP line."
         }
         foreach key {code_set_name uconv_class} {
             if {[info exists state($key)]} {
@@ -216,18 +309,22 @@ proc ucm::parse_file {encName ucmPath} {
             abort "Duplicate file for $encName ($path)"
         }
         if {![info exists state(uconv_class)]} {
-            abort "Error: $path has no uconv_class definition."
+            abort "Error: $ucmPath has no uconv_class definition."
+        }
+        if {[info exists state(subchar)]} {
+            # \xNN\xNN.. -> NNNN..
+            set encSubchar($encName) [string map {\\x {}} $state(subchar)]
         }
         switch -exact -- $state(uconv_class) {
             SBCS {
                 if {[catch {
-                    set charMap($encName) [parse_SBCS $fd]
+                    parse_SBCS $encName $fd
                 } result]} {
-                    abort "Could not process $path. $result"
+                    abort "Could not process $ucmPath. $result"
                 }
             }
             default {
-                log "Skipping $path -- not SBCS encoding."
+                log "Skipping $ucmPath -- not SBCS encoding."
                 return
             }
         }
@@ -236,15 +333,6 @@ proc ucm::parse_file {encName ucmPath} {
     }
 }
 
-proc ucm::expand_paths {patterns} {
-    set expanded {}
-    foreach pat $patterns {
-        # The file join is for \ -> /
-        lappend expanded {*}[glob -nocomplain [file join $pat]]
-    }
-    return $expanded
-}
-
 proc ucm::run {} {
     variable encNameMap
     variable outputPath
-- 
cgit v0.12


From 1d76ffb03b359c7f557943523fd9b0c49a312554 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Feb 2023 20:44:13 +0000
Subject: minor bug-fix in utf-16/utf-32:  2 testcases failed in Tcl 9
 compatibility mode (-DTCL_NO_DEPRECATED)

---
 generic/tclEncoding.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 0490831..8e13b43 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -237,8 +237,13 @@ static Tcl_EncodingConvertProc	Iso88591ToUtfProc;
  */
 
 static const Tcl_ObjType encodingType = {
-    "encoding", FreeEncodingInternalRep, DupEncodingInternalRep, NULL, NULL
+    "encoding",
+    FreeEncodingInternalRep,
+    DupEncodingInternalRep,
+    NULL,
+    NULL
 };
+
 #define EncodingSetInternalRep(objPtr, encoding)				\
     do {								\
 	Tcl_ObjInternalRep ir;						\
@@ -461,7 +466,7 @@ FillEncodingFileMap(void)
     map = Tcl_NewDictObj();
     Tcl_IncrRefCount(map);
 
-    for (i = numDirs-1; i >= 0; i--) {
+    for (i = numDirs-1; i != TCL_INDEX_NONE; i--) {
 	/*
 	 * Iterate backwards through the search path so as we overwrite
 	 * entries found, we favor files earlier on the search path.
@@ -1182,7 +1187,7 @@ Tcl_ExternalToUtfDString(
  * Tcl_ExternalToUtfDStringEx --
  *
  *	Convert a source buffer from the specified encoding into UTF-8.
-*	The parameter flags controls the behavior, if any of the bytes in
+ *	The parameter flags controls the behavior, if any of the bytes in
  *	the source buffer are invalid or cannot be represented in utf-8.
  *	Possible flags values:
  *	TCL_ENCODING_STOPONERROR: don't replace invalid characters/bytes but
@@ -1458,8 +1463,9 @@ Tcl_UtfToExternalDStringEx(
     char *dst;
     Tcl_EncodingState state;
     const Encoding *encodingPtr;
-    int dstLen, result, soFar, srcRead, dstWrote, dstChars;
+    int result, soFar, srcRead, dstWrote, dstChars;
     const char *srcStart = src;
+    int dstLen;
 
     Tcl_DStringInit(dstPtr);
     dst = Tcl_DStringValue(dstPtr);
@@ -2627,9 +2633,10 @@ Utf32ToUtfProc(
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
 	    /* destination is not full, so we really are at the end now */
-	    if (flags & TCL_ENCODING_STOPONERROR) {
+	    if ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) {
 		result = TCL_CONVERT_SYNTAX;
 	    } else {
+		result = TCL_OK;
 		dst += Tcl_UniCharToUtf(0xFFFD, dst);
 		numChars++;
 		src += bytesLeft;
@@ -2854,9 +2861,10 @@ Utf16ToUtfProc(
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
 	    /* destination is not full, so we really are at the end now */
-	    if (flags & TCL_ENCODING_STOPONERROR) {
+	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
 		result = TCL_CONVERT_SYNTAX;
 	    } else {
+		result = TCL_OK;
 		dst += Tcl_UniCharToUtf(0xFFFD, dst);
 		numChars++;
 		src++;
-- 
cgit v0.12


From d1920b380d4a987240715b3ce72f7d68dfca2b09 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 23 Feb 2023 10:22:58 +0000
Subject: Fix gcc warnings and encoding error message (bug [40c61a5d10])

---
 generic/tclCmdAH.c    | 2 +-
 generic/tclEncoding.c | 4 ++--
 tests/cmdAH.test      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 4dfb541..1b74064 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -589,7 +589,7 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 	    interp,
 	    1,
 	    objv,
-	    "??-profile profile? ?-failindex var? ?encoding?? data");
+	    "? ?-profile profile? ?-failindex var? encoding ? data");
 	return TCL_ERROR;
     }
 
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index bc830b4..a877468 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -4265,7 +4265,7 @@ TclEncodingProfileNameToId(
     const char *profileName,	/* Name of profile */
     int *profilePtr)  		/* Output */
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < sizeof(encodingProfiles) / sizeof(encodingProfiles[0]); ++i) {
 	if (!strcmp(profileName, encodingProfiles[i].name)) {
@@ -4305,7 +4305,7 @@ TclEncodingProfileIdToName(
     Tcl_Interp *interp,		/* For error messages. May be NULL */
     int profileValue)		/* Profile #define value */
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < sizeof(encodingProfiles) / sizeof(encodingProfiles[0]); ++i) {
 	if (profileValue == encodingProfiles[i].value) {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index cfde678..d76607c 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -175,8 +175,8 @@ test cmdAH-3.2 {Tcl_ContinueObjCmd, success} {
 # encoding command
 
 set "numargErrors(encoding system)" {^wrong # args: should be "(encoding |::tcl::encoding::)system \?encoding\?"$}
-set "numargErrors(encoding convertfrom)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertfrom \?\?-profile profile\? \?-failindex var\? \?encoding\?\? data"$}
-set "numargErrors(encoding convertto)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertto \?\?-profile profile\? \?-failindex var\? \?encoding\?\? data"$}
+set "numargErrors(encoding convertfrom)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertfrom \? \?-profile profile\? \?-failindex var\? encoding \? data"$}
+set "numargErrors(encoding convertto)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertto \? \?-profile profile\? \?-failindex var\? encoding \? data"$}
 set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
 set "numargErrors(encoding profiles)" {wrong # args: should be "encoding profiles"}
 
-- 
cgit v0.12


From bf7b1adb896dbe4f79efb038aa0ecaebbdd3919c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 23 Feb 2023 10:44:56 +0000
Subject: See [d19fe0a5b] for follow-up to previous commit

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

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index ecec6e9..2b3b614 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2516,13 +2516,10 @@ UnicodeToUtfProc(
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
 	    /* destination is not full, so we really are at the end now */
-	    if (flags & TCL_ENCODING_STOPONERROR) {
-		result = TCL_CONVERT_SYNTAX;
-	    } else {
-		dst += Tcl_UniCharToUtf(0xFFFD, dst);
-		numChars++;
-		src++;
-	    }
+	    result = TCL_OK;
+	    dst += Tcl_UniCharToUtf(0xFFFD, dst);
+	    numChars++;
+	    src++;
 	}
     }
     *srcReadPtr = src - srcStart;
-- 
cgit v0.12


From da915fdadfa41477f967f92d37c63e278621acd7 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 23 Feb 2023 13:19:45 +0000
Subject: New signature for Tcl_ExternalToUtfDStringEx and
 Tcl_UtfToExternalDStringEx as per TIP 656

---
 generic/tcl.decls     |  14 ++--
 generic/tclCmdAH.c    |  99 +++++++++++++++++++++++++---
 generic/tclDecls.h    |  18 +++---
 generic/tclEncoding.c | 174 +++++++++++++++++++++++++++++++++++++++-----------
 tests/cmdAH.test      |  24 +++++--
 5 files changed, 264 insertions(+), 65 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index a48ab02..a789ef6 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2441,13 +2441,17 @@ declare 656 {
 declare 657 {
     int Tcl_UniCharIsUnicode(int ch)
 }
+
+# TIP 656
 declare 658 {
-    Tcl_Size Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
-	    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr)
-}
+    int Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp, Tcl_Encoding encoding,
+        const char *src, int srcLen, int flags, Tcl_DString *dsPtr,
+        Tcl_Size *errorLocationPtr)
+} 
 declare 659 {
-    Tcl_Size Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
-	    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr)
+    int Tcl_UtfToExternalDStringEx(Tcl_Interp *interp, Tcl_Encoding encoding,
+    const char *src, int srcLen, int flags, Tcl_DString *dsPtr,
+    Tcl_Size *errorLocationPtr)
 }
 
 # TIP #511
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 1b74064..24b2038 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -671,6 +671,7 @@ EncodingConvertfromObjCmd(
     int flags;
     int result;
     Tcl_Obj *failVarObj;
+    Tcl_Size errorLocation;
 
     if (EncodingConvertParseOptions(
 	    interp, objc, objv, &encoding, &data, &flags, &failVarObj)
@@ -693,8 +694,47 @@ EncodingConvertfromObjCmd(
     if (bytesPtr == NULL) {
 	return TCL_ERROR;
     }
-    result = Tcl_ExternalToUtfDStringEx(encoding, bytesPtr, length,
-	    flags, &ds);
+    result = Tcl_ExternalToUtfDStringEx(interp, encoding, bytesPtr, length, flags,
+                                        &ds, failVarObj ? &errorLocation : NULL);
+    /* NOTE: ds must be freed beyond this point even on error */
+    switch (result) {
+    case TCL_OK:
+        errorLocation = TCL_INDEX_NONE;
+        break;
+    case TCL_ERROR:
+	/* Error in parameters. Should not happen. interp will have error */
+        Tcl_DStringFree(&ds);
+	return TCL_ERROR;
+    default:
+	/*
+	 * One of the TCL_CONVERT_* errors. If we were not interested in the
+	 * error location, interp result would already have been filled in
+	 * and we can just return the error. Otherwise, we have to return
+	 * what could be decoded and the returned error location.
+	 */
+	if (failVarObj == NULL) {
+            Tcl_DStringFree(&ds);
+	    return TCL_ERROR;
+	}
+        break;
+    }
+
+    /*
+     * TCL_OK or a TCL_CONVERT_* error where the caller wants back as much
+     * data as was converted.
+     */
+    if (failVarObj) {
+	/* I hope, wide int will cover Tcl_Size data type */
+	if (Tcl_ObjSetVar2(interp,
+			   failVarObj,
+			   NULL,
+			   Tcl_NewWideIntObj(errorLocation),
+			   TCL_LEAVE_ERR_MSG) == NULL) {
+            Tcl_DStringFree(&ds);
+	    return TCL_ERROR;
+	}
+    }
+#ifdef OBSOLETE
     if (result != TCL_INDEX_NONE &&
 	TCL_ENCODING_PROFILE_GET(flags) != TCL_ENCODING_PROFILE_TCL8) {
 	if (failVarObj != NULL) {
@@ -717,6 +757,7 @@ EncodingConvertfromObjCmd(
 	    return TCL_ERROR;
 	}
     }
+#endif
 
     /*
      * Note that we cannot use Tcl_DStringResult here because it will
@@ -725,9 +766,7 @@ EncodingConvertfromObjCmd(
 
     Tcl_SetObjResult(interp, Tcl_DStringToObj(&ds));
 
-    /*
-     * We're done with the encoding
-     */
+    /* We're done with the encoding */
 
     Tcl_FreeEncoding(encoding);
     return TCL_OK;
@@ -763,6 +802,7 @@ EncodingConverttoObjCmd(
     int result;
     int flags;
     Tcl_Obj *failVarObj;
+    Tcl_Size errorLocation;
 
     if (EncodingConvertParseOptions(
 	    interp, objc, objv, &encoding, &data, &flags, &failVarObj)
@@ -775,8 +815,47 @@ EncodingConverttoObjCmd(
      */
 
     stringPtr = TclGetStringFromObj(data, &length);
-    result = Tcl_UtfToExternalDStringEx(encoding, stringPtr, length,
-	    flags, &ds);
+    result = Tcl_UtfToExternalDStringEx(interp, encoding, stringPtr, length, flags,
+                                        &ds, failVarObj ? &errorLocation : NULL);
+    /* NOTE: ds must be freed beyond this point even on error */
+
+    switch (result) {
+    case TCL_OK:
+	errorLocation = TCL_INDEX_NONE;
+	break;
+    case TCL_ERROR:
+	/* Error in parameters. Should not happen. interp will have error */
+        Tcl_DStringFree(&ds);
+	return TCL_ERROR;
+    default:
+	/*
+	 * One of the TCL_CONVERT_* errors. If we were not interested in the
+	 * error location, interp result would already have been filled in
+	 * and we can just return the error. Otherwise, we have to return
+	 * what could be decoded and the returned error location.
+	 */
+	if (failVarObj == NULL) {
+            Tcl_DStringFree(&ds);
+	    return TCL_ERROR;
+	}
+        break;
+    }
+    /*
+     * TCL_OK or a TCL_CONVERT_* error where the caller wants back as much
+     * data as was converted.
+     */
+    if (failVarObj) {
+	/* I hope, wide int will cover Tcl_Size data type */
+	if (Tcl_ObjSetVar2(interp,
+			   failVarObj,
+			   NULL,
+			   Tcl_NewWideIntObj(errorLocation),
+			   TCL_LEAVE_ERR_MSG) == NULL) {
+            Tcl_DStringFree(&ds);
+	    return TCL_ERROR;
+	}
+    }
+#ifdef OBSOLETE
     if (result != TCL_INDEX_NONE &&
 	TCL_ENCODING_PROFILE_GET(flags) != TCL_ENCODING_PROFILE_TCL8) {
 	if (failVarObj != NULL) {
@@ -802,14 +881,14 @@ EncodingConverttoObjCmd(
 	    return TCL_ERROR;
 	}
     }
+#endif
+
     Tcl_SetObjResult(interp,
 		     Tcl_NewByteArrayObj((unsigned char*) Tcl_DStringValue(&ds),
 					 Tcl_DStringLength(&ds)));
     Tcl_DStringFree(&ds);
 
-    /*
-     * We're done with the encoding
-     */
+    /* We're done with the encoding */
 
     Tcl_FreeEncoding(encoding);
     return TCL_OK;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 77517e8..fbfa8a1 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1955,13 +1955,15 @@ EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
 /* 657 */
 EXTERN int		Tcl_UniCharIsUnicode(int ch);
 /* 658 */
-EXTERN Tcl_Size		Tcl_ExternalToUtfDStringEx(Tcl_Encoding encoding,
-				const char *src, Tcl_Size srcLen, int flags,
-				Tcl_DString *dsPtr);
+EXTERN int		Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				int srcLen, int flags, Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
 /* 659 */
-EXTERN Tcl_Size		Tcl_UtfToExternalDStringEx(Tcl_Encoding encoding,
-				const char *src, Tcl_Size srcLen, int flags,
-				Tcl_DString *dsPtr);
+EXTERN int		Tcl_UtfToExternalDStringEx(Tcl_Interp *interp,
+				Tcl_Encoding encoding, const char *src,
+				int srcLen, int flags, Tcl_DString *dsPtr,
+				Tcl_Size *errorLocationPtr);
 /* 660 */
 EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
 				int sigNumber);
@@ -2741,8 +2743,8 @@ typedef struct TclStubs {
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
     int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
-    Tcl_Size (*tcl_ExternalToUtfDStringEx) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr); /* 658 */
-    Tcl_Size (*tcl_UtfToExternalDStringEx) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr); /* 659 */
+    int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
+    int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
     int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
     int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *lengthPtr); /* 662 */
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index daab3a9..365aa90 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1203,7 +1203,8 @@ Tcl_ExternalToUtfDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_ExternalToUtfDStringEx(encoding, src, srcLen, TCL_ENCODING_PROFILE_TCL8, dstPtr);
+    Tcl_ExternalToUtfDStringEx(
+	NULL, encoding, src, srcLen, TCL_ENCODING_PROFILE_TCL8, dstPtr, NULL);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1223,29 +1224,49 @@ Tcl_ExternalToUtfDString(
  *	  to TCL_ENCODING_PROFILE_STRICT overriding any specified profile flags
  *	- TCL_ENCODING_MODIFIED: enable Tcl internal conversion mapping \xC0\x80
  *        to 0x00. Only valid for "utf-8" and "cesu-8".
+ *      Any other flag bits will cause an error to be returned (for future
+ *      compatibility)
  *
  * Results:
- *	The converted bytes are stored in the DString, which is then NULL
- *	terminated in an encoding-specific manner. The return value is
- *	the error position in the source string or -1 if no conversion error
- *	is reported.
-  *
+ *      The return value is one of
+ *        TCL_OK: success. Converted string in *dstPtr
+ *        TCL_ERROR: error in passed parameters. Error message in interp
+ *        TCL_CONVERT_MULTIBYTE: source ends in truncated multibyte sequence
+ *        TCL_CONVERT_SYNTAX: source is not conformant to encoding definition
+ *        TCL_CONVERT_UNKNOWN: source contained a character that could not
+ *            be represented in target encoding.
+ *
  * Side effects:
- *	None.
+ *
+ *      TCL_OK: The converted bytes are stored in the DString and NUL
+ *          terminated in an encoding-specific manner.
+ *      TCL_ERROR: an error, message is stored in the interp if not NULL.
+ *      TCL_CONVERT_*: if errorLocPtr is NULL, an error message is stored
+ *          in the interpreter (if not NULL). If errorLocPtr is not NULL,
+ *          no error message is stored as it is expected the caller is
+ *          interested in whatever is decoded so far and not treating this
+ *          as an error condition.
+ *
+ *      In addition, *dstPtr is always initialized and must be cleared
+ *      by the caller irrespective of the return code.
  *
  *-------------------------------------------------------------------------
  */
 
 int
 Tcl_ExternalToUtfDStringEx(
+    Tcl_Interp *interp,         /* For error messages. May be NULL. */
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
 				 * for the default system encoding. */
     const char *src,		/* Source string in specified encoding. */
     int srcLen,			/* Source string length in bytes, or < 0 for
 				 * encoding-specific string length. */
     int flags,			/* Conversion control flags. */
-    Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
+    Tcl_DString *dstPtr,	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
+    Tcl_Size *errorLocPtr)      /* Where to store the error location
+                                   (or TCL_INDEX_NONE if no error). May
+				   be NULL. */
 {
     char *dst;
     Tcl_EncodingState state;
@@ -1253,14 +1274,14 @@ Tcl_ExternalToUtfDStringEx(
     int dstLen, result, soFar, srcRead, dstWrote, dstChars;
     const char *srcStart = src;
 
-    Tcl_DStringInit(dstPtr);
+    Tcl_DStringInit(dstPtr); /* Must always be initialized before returning */
     dst = Tcl_DStringValue(dstPtr);
     dstLen = dstPtr->spaceAvl - 1;
 
     if (encoding == NULL) {
-	encoding = systemEncoding;
+        encoding = systemEncoding;
     }
-    encodingPtr = (Encoding *) encoding;
+    encodingPtr = (Encoding *)encoding;
 
     if (src == NULL) {
 	srcLen = 0;
@@ -1275,26 +1296,53 @@ Tcl_ExternalToUtfDStringEx(
     }
 
     while (1) {
-	result = encodingPtr->toUtfProc(encodingPtr->clientData, src, srcLen,
-		flags, &state, dst, dstLen, &srcRead, &dstWrote, &dstChars);
-	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
+        result = encodingPtr->toUtfProc(encodingPtr->clientData, src,
+                                        srcLen, flags, &state, dst, dstLen,
+                                        &srcRead, &dstWrote, &dstChars);
+        soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
+
+        src += srcRead;
+        if (result != TCL_CONVERT_NOSPACE) {
+            Tcl_Size nBytesProcessed = (Tcl_Size)(src - srcStart);
+
+            Tcl_DStringSetLength(dstPtr, soFar);
+            if (errorLocPtr) {
+                /*
+                 * Do not write error message into interpreter if caller
+                 * wants to know error location.
+                 */
+                *errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
+            }
+            else {
+                /* Caller wants error message on failure */
+                if (result != TCL_OK && interp != NULL) {
+                    char buf[TCL_INTEGER_SPACE];
+                    sprintf(buf, "%u", nBytesProcessed);
+                    Tcl_SetObjResult(
+                        interp,
+                        Tcl_ObjPrintf("unexpected byte sequence starting at index %"
+                                      "u: '\\x%X'",
+                                      nBytesProcessed,
+                                      UCHAR(srcStart[nBytesProcessed])));
+                    Tcl_SetErrorCode(
+                        interp, "TCL", "ENCODING", "ILLEGALSEQUENCE", buf, NULL);
+                }
+            }
+            return result;
+        }
 
-	src += srcRead;
-	if (result != TCL_CONVERT_NOSPACE) {
-	    Tcl_DStringSetLength(dstPtr, soFar);
-	    return (result == TCL_OK) ? TCL_INDEX_NONE : (int)(src - srcStart);
-	}
-	flags &= ~TCL_ENCODING_START;
-	srcLen -= srcRead;
-	if (Tcl_DStringLength(dstPtr) == 0) {
-	    Tcl_DStringSetLength(dstPtr, dstLen);
-	}
-	Tcl_DStringSetLength(dstPtr, 2 * Tcl_DStringLength(dstPtr) + 1);
-	dst = Tcl_DStringValue(dstPtr) + soFar;
-	dstLen = Tcl_DStringLength(dstPtr) - soFar - 1;
+        /* Expand space and continue */
+        flags &= ~TCL_ENCODING_START;
+        srcLen -= srcRead;
+        if (Tcl_DStringLength(dstPtr) == 0) {
+            Tcl_DStringSetLength(dstPtr, dstLen);
+        }
+        Tcl_DStringSetLength(dstPtr, 2 * Tcl_DStringLength(dstPtr) + 1);
+        dst = Tcl_DStringValue(dstPtr) + soFar;
+        dstLen = Tcl_DStringLength(dstPtr) - soFar - 1;
     }
 }
-
+
 /*
  *-------------------------------------------------------------------------
  *
@@ -1441,7 +1489,8 @@ Tcl_UtfToExternalDString(
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    Tcl_UtfToExternalDStringEx(encoding, src, srcLen, TCL_ENCODING_PROFILE_DEFAULT, dstPtr);
+    Tcl_UtfToExternalDStringEx(
+	NULL, encoding, src, srcLen, TCL_ENCODING_PROFILE_DEFAULT, dstPtr, NULL);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1462,27 +1511,45 @@ Tcl_UtfToExternalDString(
  *        of 0x00. Only valid for "utf-8" and "cesu-8".
  *
  * Results:
- *	The converted bytes are stored in the DString, which is then NULL
- *	terminated in an encoding-specific manner. The return value is
- *	the error position in the source string or -1 if no conversion error
- *	is reported.
+ *      The return value is one of
+ *        TCL_OK: success. Converted string in *dstPtr
+ *        TCL_ERROR: error in passed parameters. Error message in interp
+ *        TCL_CONVERT_MULTIBYTE: source ends in truncated multibyte sequence
+ *        TCL_CONVERT_SYNTAX: source is not conformant to encoding definition
+ *        TCL_CONVERT_UNKNOWN: source contained a character that could not
+ *            be represented in target encoding.
  *
  * Side effects:
- *	None.
+ *
+ *      TCL_OK: The converted bytes are stored in the DString and NUL
+ *          terminated in an encoding-specific manner
+ *      TCL_ERROR: an error, message is stored in the interp if not NULL.
+ *      TCL_CONVERT_*: if errorLocPtr is NULL, an error message is stored
+ *          in the interpreter (if not NULL). If errorLocPtr is not NULL,
+ *          no error message is stored as it is expected the caller is
+ *          interested in whatever is decoded so far and not treating this
+ *          as an error condition.
+ *
+ *      In addition, *dstPtr is always initialized and must be cleared
+ *      by the caller irrespective of the return code.
  *
  *-------------------------------------------------------------------------
  */
 
 int
 Tcl_UtfToExternalDStringEx(
+    Tcl_Interp *interp,         /* For error messages. May be NULL. */
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
 				 * NULL for the default system encoding. */
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes, or < 0 for
 				 * strlen(). */
     int flags,			/* Conversion control flags. */
-    Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
+    Tcl_DString *dstPtr,	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
+    Tcl_Size *errorLocPtr)      /* Where to store the error location
+                                   (or TCL_INDEX_NONE if no error). May
+				   be NULL. */
 {
     char *dst;
     Tcl_EncodingState state;
@@ -1505,21 +1572,49 @@ Tcl_UtfToExternalDStringEx(
     } else if (srcLen < 0) {
 	srcLen = strlen(src);
     }
+
     flags = TclEncodingExternalFlagsToInternal(flags);
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     while (1) {
 	result = encodingPtr->fromUtfProc(encodingPtr->clientData, src,
-		srcLen, flags, &state, dst, dstLen,
-		&srcRead, &dstWrote, &dstChars);
+                                          srcLen, flags, &state, dst, dstLen,
+                                          &srcRead, &dstWrote, &dstChars);
 	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
 
 	src += srcRead;
 	if (result != TCL_CONVERT_NOSPACE) {
+            Tcl_Size nBytesProcessed = (Tcl_Size)(src - srcStart);
 	    int i = soFar + encodingPtr->nullSize - 1;
 	    while (i >= soFar) {
 		Tcl_DStringSetLength(dstPtr, i--);
 	    }
-	    return (result == TCL_OK) ? TCL_INDEX_NONE : (int)(src - srcStart);
+            if (errorLocPtr) {
+                /*
+                 * Do not write error message into interpreter if caller
+                 * wants to know error location.
+                 */
+                *errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
+            }
+            else {
+                /* Caller wants error message on failure */
+                if (result != TCL_OK && interp != NULL) {
+                    Tcl_Size pos = Tcl_NumUtfChars(srcStart, nBytesProcessed);
+                    int ucs4;
+                    char buf[TCL_INTEGER_SPACE];
+                    TclUtfToUCS4(&srcStart[nBytesProcessed], &ucs4);
+                    sprintf(buf, "%u", nBytesProcessed);
+		    Tcl_SetObjResult(
+			interp,
+			Tcl_ObjPrintf(
+			    "unexpected character at index %" TCL_Z_MODIFIER
+			    "u: 'U+%06X'",
+			    pos,
+			    ucs4));
+		    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
+                                     buf, NULL);
+                }
+            }
+            return result;
 	}
 
 	flags &= ~TCL_ENCODING_START;
@@ -2682,6 +2777,8 @@ Utf32ToUtfProc(
 	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
 	dst += Tcl_UniCharToUtf(-1, dst);
     }
+    
+
     /*
      * If we had a truncated code unit at the end AND this is the last
      * fragment AND profile is not "strict", stick FFFD in its place.
@@ -2917,6 +3014,7 @@ Utf16ToUtfProc(
 	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
 	dst += Tcl_UniCharToUtf(-1, dst);
     }
+
     /*
      * If we had a truncated code unit at the end AND this is the last
      * fragment AND profile is not "strict", stick FFFD in its place.
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index f8eba4e..471d46a 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -703,15 +703,25 @@ lappend encInvalidBytes {*}{
 # happen when the sequence is at the end (including by itself) Thus {solo tail}
 # in some cases.
 lappend encInvalidBytes {*}{
-    utf-16le 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
-    utf-16le 41      replace   \uFFFD  -1 {solo tail} {Truncated}
-    utf-16le 41      strict    {}   0 {solo tail} {Truncated}
+    utf-16le 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
+    utf-16le 41      replace   \uFFFD -1 {solo tail} {Truncated}
+    utf-16le 41      strict    {}      0 {solo tail} {Truncated}
     utf-16le 00D8    tcl8      \uD800 -1 {} {Missing low surrogate}
     utf-16le 00D8    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
     utf-16le 00D8    strict    {}      0 {knownBug} {Missing low surrogate}
     utf-16le 00DC    tcl8      \uDC00 -1 {} {Missing high surrogate}
     utf-16le 00DC    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
     utf-16le 00DC    strict    {}      0 {knownBug} {Missing high surrogate}
+
+    utf-16be 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
+    utf-16be 41      replace   \uFFFD -1 {solo tail} {Truncated}
+    utf-16be 41      strict    {}      0 {solo tail} {Truncated}
+    utf-16be D800    tcl8      \uD800 -1 {} {Missing low surrogate}
+    utf-16be D800    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
+    utf-16be D800    strict    {}      0 {knownBug} {Missing low surrogate}
+    utf-16be DC00    tcl8      \uDC00 -1 {} {Missing high surrogate}
+    utf-16be DC00    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
+    utf-16be DC00    strict    {}      0 {knownBug} {Missing high surrogate}
 }
 
 # utf32-le and utf32-be test cases. Note utf32 cases are automatically generated
@@ -727,7 +737,7 @@ lappend encInvalidBytes {*}{
     utf-32le 4100    strict    {}   0 {solo tail} {Truncated}
     utf-32le 410000  tcl8      \uFFFD  -1 {solo tail} {Truncated}
     utf-32le 410000  replace   \uFFFD  -1 {solo} {Truncated}
-    utf-32le 410000  strict    {}   0 {solo tail} {Truncated}
+    utf-32le 410000  strict    {}       0 {solo tail} {Truncated}
     utf-32le 00D80000 tcl8     \uD800   -1 {} {High-surrogate}
     utf-32le 00D80000 replace  \uFFFD   -1 {} {High-surrogate}
     utf-32le 00D80000 strict   {}        0 {} {High-surrogate}
@@ -745,8 +755,14 @@ lappend encInvalidBytes {*}{
     utf-32le FFFFFFFF strict {}       0 {} {Out of range}
 
     utf-32be 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 41      replace   \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 41      strict    {}       0 {solo tail} {Truncated}
     utf-32be 0041    tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 0041    replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32be 0041    strict    {}   0 {solo tail} {Truncated}
     utf-32be 000041  tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 000041  replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32be 000041  strict    {}       0 {solo tail} {Truncated}
     utf-32be 0000D800 tcl8     \uD800   -1 {} {High-surrogate}
     utf-32be 0000D800 replace  \uFFFD   -1 {} {High-surrogate}
     utf-32be 0000D800 strict   {}        0 {} {High-surrogate}
-- 
cgit v0.12


From 186cc71273a606360094ccb275bc239c6c17235a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 23 Feb 2023 13:24:58 +0000
Subject: Had forgotten to remove disabled code

---
 generic/tclCmdAH.c | 52 ----------------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 24b2038..93c3416 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -734,31 +734,6 @@ EncodingConvertfromObjCmd(
 	    return TCL_ERROR;
 	}
     }
-#ifdef OBSOLETE
-    if (result != TCL_INDEX_NONE &&
-	TCL_ENCODING_PROFILE_GET(flags) != TCL_ENCODING_PROFILE_TCL8) {
-	if (failVarObj != NULL) {
-	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
-		return TCL_ERROR;
-	    }
-	} else {
-	    char buf[TCL_INTEGER_SPACE];
-	    sprintf(buf, "%u", result);
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected byte sequence starting at index %"
-		    "u: '\\x%X'", result, UCHAR(bytesPtr[result])));
-	    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
-		    buf, NULL);
-	    Tcl_DStringFree(&ds);
-	    return TCL_ERROR;
-	}
-    }
-    else if (failVarObj != NULL) {
-	if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewIntObj(-1), TCL_LEAVE_ERR_MSG) == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-#endif
-
     /*
      * Note that we cannot use Tcl_DStringResult here because it will
      * truncate the string at the first null byte.
@@ -855,33 +830,6 @@ EncodingConverttoObjCmd(
 	    return TCL_ERROR;
 	}
     }
-#ifdef OBSOLETE
-    if (result != TCL_INDEX_NONE &&
-	TCL_ENCODING_PROFILE_GET(flags) != TCL_ENCODING_PROFILE_TCL8) {
-	if (failVarObj != NULL) {
-	    /* I hope, wide int will cover size_t data type */
-	    if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewWideIntObj(result), TCL_LEAVE_ERR_MSG) == NULL) {
-		return TCL_ERROR;
-	    }
-	} else {
-	    size_t pos = Tcl_NumUtfChars(stringPtr, result);
-	    int ucs4;
-	    char buf[TCL_INTEGER_SPACE];
-	    TclUtfToUCS4(&stringPtr[result], &ucs4);
-	    sprintf(buf, "%u", result);
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected character at index %"
-		    TCL_Z_MODIFIER "u: 'U+%06X'", pos, ucs4));
-	    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
-		    buf, NULL);
-	    Tcl_DStringFree(&ds);
-	    return TCL_ERROR;
-	}
-    } else if (failVarObj != NULL) {
-	if (Tcl_ObjSetVar2(interp, failVarObj, NULL, Tcl_NewIntObj(-1), TCL_LEAVE_ERR_MSG) == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-#endif
 
     Tcl_SetObjResult(interp,
 		     Tcl_NewByteArrayObj((unsigned char*) Tcl_DStringValue(&ds),
-- 
cgit v0.12


From 10c559acbfbd8c8848e7f8fb9166e00e2aec2dc5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 23 Feb 2023 21:20:21 +0000
Subject: Remove left-over traces of [0a74820b6d], which was merged into the
 apn-encoding-profile and landed into tip-656. This commit was merged
 premature into core-8-branch, leaving a [dab7fd5973|memory leak]

---
 generic/tclIO.c    |  59 +------
 generic/tclIOCmd.c |  25 +--
 tests/io.test      | 474 +++++++++++------------------------------------------
 3 files changed, 99 insertions(+), 459 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 880b669..b12adf6 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4645,7 +4645,6 @@ Tcl_GetsObj(
 				/* State info for channel */
     ChannelBuffer *bufPtr;
     int inEofChar, skip, copiedTotal, oldFlags, oldRemoved;
-    int reportError = 0;
     int oldLength;
     Tcl_Encoding encoding;
     char *dst, *dstEnd, *eol, *eof;
@@ -4654,7 +4653,6 @@ Tcl_GetsObj(
     if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
 	UpdateInterest(chanPtr);
 	Tcl_SetErrno(EILSEQ);
-	ResetFlag(statePtr, CHANNEL_ENCODING_ERROR);
 	return TCL_INDEX_NONE;
     }
 
@@ -4914,19 +4912,6 @@ Tcl_GetsObj(
 		goto done;
 	    }
 	    goto gotEOL;
-	} else if (gs.bytesWrote == 0
-		&& GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
-	    /* Set eol to the position that caused the encoding error, and then
-	     * coninue to gotEOL, which stores the data that was decoded
-	     * without error to objPtr.  This allows the caller to do something
-	     * useful with the data decoded so far, and also results in the
-	     * position of the file being the first byte that was not
-	     * succesfully decoded, allowing further processing at exactly that
-	     * point, if desired.
-	     */
-	    eol = dstEnd;
-	    reportError = 1;
-	    goto gotEOL;
 	}
 	dst = dstEnd;
     }
@@ -4970,16 +4955,7 @@ Tcl_GetsObj(
     Tcl_SetObjLength(objPtr, eol - objPtr->bytes);
     CommonGetsCleanup(chanPtr);
     ResetFlag(statePtr, CHANNEL_BLOCKED);
-    if (reportError) {
-	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR|CHANNEL_ENCODING_ERROR);
-	/* reset CHANNEL_ENCODING_ERROR to afford a chance to reconfigure
-	 * the channel and try again
-	 */
-	Tcl_SetErrno(EILSEQ);
-	copiedTotal = -1;
-    } else {
-	copiedTotal = gs.totalChars + gs.charsWrote - skip;
-    }
+    copiedTotal = gs.totalChars + gs.charsWrote - skip;
     goto done;
 
     /*
@@ -6007,9 +5983,8 @@ DoReadChars(
     }
 
     if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
-	/* TODO: UpdateInterest not needed here? */
+	/* TODO: We don't need this call? */
 	UpdateInterest(chanPtr);
-
 	Tcl_SetErrno(EILSEQ);
 	return -1;
     }
@@ -6025,7 +6000,7 @@ DoReadChars(
 	assert(statePtr->inputEncodingFlags & TCL_ENCODING_END);
 	assert(!GotFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR));
 
-	/* TODO: UpdateInterest not needed here? */
+	/* TODO: We don't need this call? */
 	UpdateInterest(chanPtr);
 	return 0;
     }
@@ -6039,7 +6014,7 @@ DoReadChars(
 	}
 	ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
-	/* TODO: UpdateInterest not needed here? */
+	/* TODO: We don't need this call? */
 	UpdateInterest(chanPtr);
 	return 0;
     }
@@ -6070,7 +6045,7 @@ DoReadChars(
 	    }
 
 	    /*
-	     * Recycle current buffer if empty.
+	     * If the current buffer is empty recycle it.
 	     */
 
 	    bufPtr = statePtr->inQueueHead;
@@ -6083,24 +6058,6 @@ DoReadChars(
 		    statePtr->inQueueTail = NULL;
 		}
 	    }
-
-	    /*
-	     * If CHANNEL_ENCODING_ERROR and CHANNEL_STICKY_EOF are both set,
-	     * then CHANNEL_ENCODING_ERROR was caused by data that occurred
-	     * after the EOF character was encountered, so it doesn't count as
-	     * a real error.
-	     */
-
-	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
-		    && !GotFlag(statePtr, CHANNEL_STICKY_EOF)
-		    && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
-		/* Channel is synchronous.  Return an error so that callers
-		 * like [read] can return an error.
-		*/
-		Tcl_SetErrno(EILSEQ);
-		copied = -1;
-		goto finish;
-	    }
 	}
 
 	if (copiedNow < 0) {
@@ -6129,7 +6086,6 @@ DoReadChars(
 	}
     }
 
-finish:
     /*
      * Failure to fill a channel buffer may have left channel reporting a
      * "blocked" state, but so long as we fulfilled the request here, the
@@ -6793,14 +6749,11 @@ TranslateInputEOL(
 	 * EOF character was seen in EOL translated range. Leave current file
 	 * position pointing at the EOF character, but don't store the EOF
 	 * character in the output string.
-	 *
-	 * If CHANNEL_ENCODING_ERROR is set, it can only be because of data
-	 * encountered after the EOF character, so it is nonsense.  Unset it.
 	 */
 
 	SetFlag(statePtr, CHANNEL_EOF | CHANNEL_STICKY_EOF);
 	statePtr->inputEncodingFlags |= TCL_ENCODING_END;
-	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR|CHANNEL_ENCODING_ERROR);
+	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR);
     }
 }
 
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 507e06c..e8a534f 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -296,9 +296,6 @@ Tcl_GetsObjCmd(
     int lineLen;		/* Length of line just read. */
     int mode;			/* Mode in which channel is opened. */
     Tcl_Obj *linePtr, *chanObjPtr;
-	/*
-	Tcl_Obj *resultDictPtr, *returnOptsPtr;
-	*/
     int code = TCL_OK;
 
     if ((objc != 2) && (objc != 3)) {
@@ -321,6 +318,7 @@ Tcl_GetsObjCmd(
     lineLen = Tcl_GetsObj(chan, linePtr);
     if (lineLen < 0) {
 	if (!Tcl_Eof(chan) && !Tcl_InputBlocked(chan)) {
+	    Tcl_DecrRefCount(linePtr);
 
 	    /*
 	     * TIP #219.
@@ -334,15 +332,6 @@ Tcl_GetsObjCmd(
 			"error reading \"%s\": %s",
 			TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	    }
-	    /*
-	    resultDictPtr = Tcl_NewDictObj();
-	    Tcl_DictObjPut(NULL, resultDictPtr, Tcl_NewStringObj("read", -1)
-	    , linePtr);
-	    returnOptsPtr = Tcl_NewDictObj();
-	    Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
-	    , resultDictPtr);
-	    Tcl_SetReturnOptions(interp, returnOptsPtr);
-	    */
 	    code = TCL_ERROR;
 	    goto done;
 	}
@@ -393,9 +382,6 @@ Tcl_ReadObjCmd(
     int charactersRead;		/* How many characters were read? */
     int mode;			/* Mode in which channel is opened. */
     Tcl_Obj *resultPtr, *chanObjPtr;
-	/*
-	Tcl_Obj *resultDictPtr, *returnOptsPtr;
-	*/
 
     if ((objc != 2) && (objc != 3)) {
 	Interp *iPtr;
@@ -484,17 +470,8 @@ Tcl_ReadObjCmd(
 		    "error reading \"%s\": %s",
 		    TclGetString(chanObjPtr), Tcl_PosixError(interp)));
 	}
-	/*
-	resultDictPtr = Tcl_NewDictObj();
-	Tcl_DictObjPut(NULL, resultDictPtr, Tcl_NewStringObj("read", -1)
-	    , resultPtr);
-	returnOptsPtr = Tcl_NewDictObj();
-	Tcl_DictObjPut(NULL, returnOptsPtr, Tcl_NewStringObj("-result", -1)
-	    , resultDictPtr);
 	TclChannelRelease(chan);
 	Tcl_DecrRefCount(resultPtr);
-	Tcl_SetReturnOptions(interp, returnOptsPtr);
-	*/
 	return TCL_ERROR;
     }
 
diff --git a/tests/io.test b/tests/io.test
index 0f47a8e..4578a93 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -1547,53 +1547,19 @@ test io-12.8 {ReadChars: multibyte chars split} {
     close $f
     scan [string index $in end] %c
 } 160
-
-
-apply [list {} {
-	set template {
-		test io-12.9.@variant@ {ReadChars: multibyte chars split, default (strict)} -body {
-			set res {}
-			set f [open $path(test1) w]
-			fconfigure $f -translation binary
-			puts -nonewline $f [string repeat a 9]\xC2
-			close $f
-			set f [open $path(test1)]
-			fconfigure $f -encoding utf-8 @strict@ -buffersize 10
-			set status [catch {read $f} cres copts]
-			#set in [dict get $copts -result]
-			#lappend res $in
-			lappend res $status $cres
-			set status [catch {read $f} cres copts]
-			#set in [dict get $copts -result]
-			#lappend res $in
-			lappend res $status $cres
-			set res
-		} -cleanup {
-			catch {close $f}
-		} -match glob\
-	}
-
-	#append template {\
-	#	-result {{read aaaaaaaaa} 1\
-	#		{error reading "*": illegal byte sequence}\
-	#		{read {}} 1 {error reading "*": illegal byte sequence}}
-	#}
-
-	append template {\
-		-result {1\
-			{error reading "*": illegal byte sequence}\
-			1 {error reading "*": illegal byte sequence}}
-	}
-
-	# strict encoding may be the default in Tcl 9, but in 8 it is not
-	foreach variant {encodingstrict} strict {{-encodingprofile strict}} {
-		set script [string map [
-			list @variant@ $variant @strict@ $strict] $template] 
-		uplevel 1 $script
-	}
-} [namespace current]]
-
-
+test io-12.9 {ReadChars: multibyte chars split} -body {
+    set f [open $path(test1) w]
+    fconfigure $f -translation binary
+    puts -nonewline $f [string repeat a 9]\xC2
+    close $f
+    set f [open $path(test1)]
+    fconfigure $f -encoding utf-8 -buffersize 10
+    set in [read $f]
+    close $f
+    scan [string index $in end] %c
+} -cleanup {
+    catch {close $f}
+} -result 194
 test io-12.10 {ReadChars: multibyte chars split} -body {
     set f [open $path(test1) w]
     fconfigure $f -translation binary
@@ -9177,136 +9143,68 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-encodingprofile tcl8)} -s
     removeFile io-75.5
 } -result 4181
 
+test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+    set fn [makeFile {} io-75.6]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f A\x81
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [catch {read $f} msg]
+    close $f
+    lappend hd $msg
+} -cleanup {
+    removeFile io-75.6
+} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-apply [list {} { 
-
-
-    set test {
-	test io-75.6 {invalid utf-8 encoding read is not ignored (-encodingprofile strict)} -setup {
-	    set hd {}
-	    set fn [makeFile {} io-75.6]
-	    set f [open $fn w+]
-	    fconfigure $f -encoding binary
-	    # \x81 is invalid in utf-8
-	    puts -nonewline $f A\x81
-	    flush $f
-	    seek $f 0
-	    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile strict
-	} -body {
-	    set status [catch {read $f} cres copts]
-	    #set d [dict get $copts -result read]
-	    #binary scan $d H* hd
-	    lappend hd $status $cres
-	} -cleanup {
-	    close $f
-	    removeFile io-75.6
-	} -match glob\
-    }
-
-    #append test {\
-    #    -result {41 1 {error reading "*": illegal byte sequence}}
-    #}
-
-    append test {\
-        -result {1 {error reading "*": illegal byte sequence}}
-    }
-
-    uplevel 1 $test
-
-    set test {
-	test io-75.7 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -setup {
-	    set hd {}
-	    set fn [makeFile {} io-75.7]
-	    set f [open $fn w+]
-	    fconfigure $f -encoding binary
-	    # \xA1 is invalid in utf-8. -eofchar is not detected, because it comes later.
-	    puts -nonewline $f A\xA1\x1A
-	    flush $f
-	    seek $f 0
-	    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -encodingprofile strict
-	} -body {
-	    set status [catch {read $f} cres copts]
-	    #set d [dict get $copts -result read]
-	    #binary scan $d H* hd
-	    lappend hd [eof $f]
-	    lappend hd $status
-	    lappend hd $cres
-	    fconfigure $f -encoding iso8859-1
-	    lappend hd [read $f];# We changed encoding, so now we can read the \xA1
-	    close $f
-	    set hd
-	} -cleanup {
-	    removeFile io-75.7
-	} -match glob\
-    }
-
-    #append test {\
-    #    -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
-    #}
-
-    append test {\
-	-result {0 1 {error reading "*": illegal byte sequence} ¡}
-    }
-
-    uplevel 1 $test
-
-
-} [namespace current]]
-
-
-
-test io-75.8.incomplete {
-    incomplete uft-8 char after eof char is not an error (-encodingprofile strict)
-} -setup {
-    set hd {}
-    set fn [makeFile {} io-75.8]
+test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+    set fn [makeFile {} io-75.7]
     set f [open $fn w+]
     fconfigure $f -encoding binary
-    # \x81 is invalid and also incomplete utf-8 data, but because the eof
-    # character \x1A appears first, it's not an error.
-    puts -nonewline $f A\x1A\x81
+    # \xA1 is invalid in utf-8. -eofchar is not detected, because it comes later.
+    puts -nonewline $f A\xA1\x1A
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -encodingprofile strict
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
 } -body {
     set d [read $f]
     binary scan $d H* hd
     lappend hd [eof $f]
-    # there should be no error on additional reads
-    lappend hd [read $f]
+    lappend hd [catch {read $f} msg]
+    lappend hd $msg
+    fconfigure $f -encoding iso8859-1
+    lappend hd [read $f];# We changed encoding, so now we can read the \xA1
     close $f
     set hd
 } -cleanup {
-    removeFile io-75.8
-} -result {41 1 {}}
+    removeFile io-75.7
+} -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
 
-
-test io-75.8.invalid {invalid utf-8 after eof char is not an error  (-encodingprofile strict)} -setup {
-    set res {}
+test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
     fconfigure $f -encoding binary
-    # \xc0\x80 is invalid utf-8 data, but because the eof character \x1A
-    # appears first, it's not an error.
-    puts -nonewline $f A\x1a\xc0\x80
+    # \x81 is invalid in utf-8, but since \x1A comes first, -eofchar takes precedence.
+    puts -nonewline $f A\x1A\x81
     flush $f
     seek $f 0
     fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
-    foreach char [split $d {}] {
-	lappend res [format %x [scan $char %c]]
-    }
-    lappend res [eof $f]
-    # there should be no error on additional reads
-    lappend res [read $f]
+    binary scan $d H* hd
+    lappend hd [eof $f]
+    lappend hd [read $f]
     close $f
-    set res
+    set hd
 } -cleanup {
     removeFile io-75.8
 } -result {41 1 {}}
 
-
 test io-75.9 {unrepresentable character write passes and is replaced by ?} -setup {
     set fn [makeFile {} io-75.9]
     set f [open $fn w+]
@@ -9321,7 +9219,9 @@ test io-75.9 {unrepresentable character write passes and is replaced by ?} -setu
     removeFile io-75.9
 } -match glob -result [list {A} {error writing "*": illegal byte sequence}]
 
-
+# Incomplete sequence test.
+# This error may IMHO only be detected with the close.
+# But the read already returns the incomplete sequence.
 test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
     set fn [makeFile {} io-75.10]
     set f [open $fn w+]
@@ -9329,7 +9229,7 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
     puts -nonewline $f A\xC0
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -encodingprofile tcl8 -buffering none
+    fconfigure $f -encoding utf-8 -buffering none
 } -body {
     set d [read $f]
     close $f
@@ -9338,135 +9238,39 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
 } -cleanup {
     removeFile io-75.10
 } -result 41c0
+# The current result returns the orphan byte as byte.
+# This may be expected due to special utf-8 handling.
 
+# As utf-8 has a special treatment in multi-byte decoding, also test another
+# one.
+test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
+    set fn [makeFile {} io-75.11]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # In shiftjis, \x81 starts a two-byte sequence.
+    # But 2nd byte \xFF is not allowed
+    puts -nonewline $f A\x81\xFFA
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 1
+} -body {
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [catch {set d [read $f]} msg]
+    lappend hd $msg
+} -cleanup {
+    close $f
+    removeFile io-75.11
+} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-apply [list {} {
-
-    set test {
-	test io-75.10_strict {incomplete multibyte encoding read is an error} -setup {
-		set res {}
-	    set fn [makeFile {} io-75.10]
-	    set f [open $fn w+]
-	    fconfigure $f -encoding binary
-	    puts -nonewline $f A\xC0
-	    flush $f
-	    seek $f 0
-	    fconfigure $f -encoding utf-8 -encodingprofile strict -buffering none
-	} -body {
-	    set status [catch {read $f} cres copts]
-
-	    #set d [dict get $copts -result read]
-	    #binary scan $d H* hd
-	    #lappend res $hd $cres
-	    lappend res $cres
-
-	    chan configure $f -encoding iso8859-1
-
-	    set d [read $f]
-	    binary scan $d H* hd
-	    lappend res $hd
-	    close $f
-		return $res
-	} -cleanup {
-	    removeFile io-75.10
-	} -match glob\
-    }
-
-    #append test {\
-    #    -result {41 {error reading "*": illegal byte sequence} c0}
-    #}
-
-    append test {\
-	-result {{error reading "*": illegal byte sequence} c0}
-    }
-
-    uplevel 1 $test
-
-    
-
-    set test {
-	# As utf-8 has a special treatment in multi-byte decoding, also test another
-	# one.
-	test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
-	    set hd {}
-	    set fn [makeFile {} io-75.11]
-	    set f [open $fn w+]
-	    fconfigure $f -encoding binary
-	    # In shiftjis, \x81 starts a two-byte sequence.
-	    # But 2nd byte \xFF is not allowed
-	    puts -nonewline $f A\x81\xFFA
-	    flush $f
-	    seek $f 0
-	    fconfigure $f -encoding shiftjis -buffering none -eofchar "" \
-			-translation lf -encodingprofile strict
-	} -body {
-	    set status [catch {read $f} cres copts]
-	    #set d [dict get $copts -result read]
-	    #binary scan $d H* hd
-	    lappend hd $status
-	    lappend hd $cres
-	} -cleanup {
-	    close $f
-	    removeFile io-75.11
-	} -match glob
-    }
-
-    #append test {\
-    #    -result {41 1 {error reading "*": illegal byte sequence}}
-    #}
-
-    append test {\
-	-result {1 {error reading "*": illegal byte sequence}}
-    }
-
-
-    set test {
-	test io-75.12 {invalid utf-8 encoding read is an error} -setup {
-	    set hd {}
-	    set res {}
-	    set fn [makeFile {} io-75.12]
-	    set f [open $fn w+]
-	    fconfigure $f -encoding binary
-	    puts -nonewline $f A\x81
-	    flush $f
-	    seek $f 0
-	    fconfigure $f -encoding utf-8 -buffering none -eofchar {} -translation lf \
-		-encodingprofile strict
-	} -body {
-	    set status [catch {read $f} cres copts]
-	    #set d [dict get $copts -result read]
-	    #binary scan $d H* hd
-	    #lappend res $hd
-	    lappend res $status $cres
-	    return $res
-	} -cleanup {
-	    catch {close $f}
-	    removeFile io-75.12
-	} -match glob\
-    }
-
-    #append test {\
-    #    -result {41 1 {error reading "*": illegal byte sequence}}
-    #}
-
-
-    append test {\
-	-result {1 {error reading "*": illegal byte sequence}}
-    }
-
-    uplevel 1 $test
-} [namespace current]]
-
-
-test io-75.12_ignore {invalid utf-8 encoding read is ignored} -setup {
+test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
     set fn [makeFile {} io-75.12]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar {} \
-		-translation lf -encodingprofile tcl8
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf
 } -body {
     set d [read $f]
     close $f
@@ -9475,121 +9279,27 @@ test io-75.12_ignore {invalid utf-8 encoding read is ignored} -setup {
 } -cleanup {
     removeFile io-75.12
 } -result 4181
-
-
-apply [list {} {
-
-    set test {
-	test io-75.13 {invalid utf-8 encoding read is not ignored (-encodingprofile strict)} -setup {
-	    set hd {}
-	    set fn [makeFile {} io-75.13]
-	    set f [open $fn w+]
-	    fconfigure $f -encoding binary
-	    # \x81 is invalid in utf-8
-	    puts -nonewline $f A\x81
-	    flush $f
-	    seek $f 0
-	    fconfigure $f -encoding utf-8 -buffering none -eofchar "" \
-		-translation lf -encodingprofile strict
-	} -body {
-	    set status [catch {read $f} cres copts]
-	    #set d [dict get $copts -result read]
-	    #binary scan $d H* hd
-	    lappend hd $status
-	    lappend hd $cres
-	} -cleanup {
-	    catch {close $f}
-	    removeFile io-75.13
-	} -match glob\
-    }
-
-    #append test {\
-    #    -result {41 1 {error reading "*": illegal byte sequence}}
-    #}
- 
-    append test {\
-        -result {1 {error reading "*": illegal byte sequence}}
-    }
-
-    uplevel 1 $test
-
-    set test {
-    }
-
-} [namespace current]]
-
-
-test io-75.14 {
-	invalid utf-8 encoding [gets] continues in non-strict mode after error
-} -setup {
-    set res {} 
-    set fn [makeFile {} io-75.14]
+test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+    set fn [makeFile {} io-75.13]
     set f [open $fn w+]
-    fconfigure $f -translation binary
-    # \xc0 is invalid in utf-8
-    puts -nonewline $f a\nb\xc0\nc\n
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar {} -translation lf -encodingprofile strict
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
 } -body {
-    lappend res [gets $f]
-    set status [catch {gets $f} cres copts]
-    lappend res $status $cres
-    chan configure $f -encodingprofile tcl8
-    lappend res [gets $f]
-    lappend res [gets $f]
-    close $f
-    return $res
+    set d [read $f]
+    binary scan $d H* hd
+    lappend hd [catch {read $f} msg]
+    close $f
+    lappend hd $msg
 } -cleanup {
-    removeFile io-75.14
-} -match glob -result {a 1 {error reading "*": illegal byte sequence} bÀ c}
-
-
-
-apply [list {} {
-    set test {
-	test io-75.15 {invalid utf-8 encoding strict gets should not hang} -setup {
-	    set res {}
-	    set fn [makeFile {} io-75.15]
-	    set chan [open $fn w+]
-	    fconfigure $chan -encoding binary
-	    # This is not valid UTF-8
-	    puts $chan hello\nAB\xc0\x40CD\nEFG
-	    close $chan
-	} -body {
-	    #Now try to read it with [gets]
-	    set chan [open $fn]
-	    fconfigure $chan -encoding utf-8 -encodingprofile strict
-	    lappend res [gets $chan]
-	    set status [catch {gets $chan} cres copts]
-	    lappend res $status $cres
-	    set status [catch {gets $chan} cres copts]
-	    lappend res $status $cres
-	    #lappend res [dict get $copts -result]
-	    chan configur $chan -encoding binary
-	    foreach char [split [read $chan 2] {}] {
-		lappend res [format %x [scan $char %c]]
-	    }
-	    return $res
-	} -cleanup {
-	    close $chan
-	    removeFile io-75.15
-	} -match glob\
-    }
+    removeFile io-75.13
+} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-    #append test {\
-    #    -result {hello 1 {error reading "*": illegal byte sequence}\
-    #        1 {error reading "*": illegal byte sequence} {read AB} c0 40}
-    #}
-
-    append test {\
-	-result {hello 1 {error reading "*": illegal byte sequence}\
-	    1 {error reading "*": illegal byte sequence} c0 40}
-    }
-
-    uplevel 1 $test
+# ### ### ### ######### ######### #########
 
-} [namespace current]]
 
 
 test io-76.0 {channel modes} -setup {
-- 
cgit v0.12


From 6caf48437905145c68bd35e5c12819a86540b235 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 23 Feb 2023 21:31:04 +0000
Subject: -strictencoding 1 -> -encodingprofile strict (since the testcases
 placed back in previous commit didn't have that yet)

---
 tests/io.test | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 4578a93..a8f7bc7 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9143,7 +9143,7 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-encodingprofile tcl8)} -s
     removeFile io-75.5
 } -result 4181
 
-test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+test io-75.6 {invalid utf-8 encoding read is not ignored (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.6]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9151,7 +9151,7 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9162,7 +9162,7 @@ test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -s
     removeFile io-75.6
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+test io-75.7 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.7]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9170,7 +9170,7 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     puts -nonewline $f A\xA1\x1A
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9185,7 +9185,7 @@ test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     removeFile io-75.7
 } -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
 
-test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
+test io-75.8 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9252,7 +9252,7 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9279,7 +9279,7 @@ test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
 } -cleanup {
     removeFile io-75.12
 } -result 4181
-test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
+test io-75.13 {invalid utf-8 encoding read is not ignored (-encodingprofile strict)} -setup {
     set fn [makeFile {} io-75.13]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9287,7 +9287,7 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -
     puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
-- 
cgit v0.12


From 485bc2fd887abb2501321c670e66c849da1b026c Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 24 Feb 2023 03:35:31 +0000
Subject: Bug [40c61a5d10]. Fix syntax error message.

---
 generic/tclCmdAH.c | 11 ++++++-----
 tests/cmdAH.test   |  4 ++--
 tests/safe.test    |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 93c3416..19a5bc3 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -585,11 +585,12 @@ EncodingConvertParseOptions (
 
     if (objc == 1) {
 numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
-	Tcl_WrongNumArgs(
-	    interp,
-	    1,
-	    objv,
-	    "? ?-profile profile? ?-failindex var? encoding ? data");
+	Tcl_WrongNumArgs(interp,
+			 1,
+			 objv,
+			 "?-profile profile? ?-failindex var? encoding data");
+	((Interp *)interp)->flags |= INTERP_ALTERNATE_WRONG_ARGS;
+	Tcl_WrongNumArgs(interp, 1, objv, "data");
 	return TCL_ERROR;
     }
 
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 471d46a..ba78c23 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -175,8 +175,8 @@ test cmdAH-3.2 {Tcl_ContinueObjCmd, success} {
 # encoding command
 
 set "numargErrors(encoding system)" {^wrong # args: should be "(encoding |::tcl::encoding::)system \?encoding\?"$}
-set "numargErrors(encoding convertfrom)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertfrom \? \?-profile profile\? \?-failindex var\? encoding \? data"$}
-set "numargErrors(encoding convertto)" {^wrong # args: should be "(encoding |::tcl::encoding::)convertto \? \?-profile profile\? \?-failindex var\? encoding \? data"$}
+set "numargErrors(encoding convertfrom)" {wrong # args: should be "(encoding |::tcl::encoding::)convertfrom \?-profile profile\? \?-failindex var\? encoding data" or "(encoding |::tcl::encoding::)convertfrom data"}
+set "numargErrors(encoding convertto)" {wrong # args: should be "(encoding |::tcl::encoding::)convertto \?-profile profile\? \?-failindex var\? encoding data" or "(encoding |::tcl::encoding::)convertto data"}
 set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
 set "numargErrors(encoding profiles)" {wrong # args: should be "encoding profiles"}
 
diff --git a/tests/safe.test b/tests/safe.test
index 8c8382a..f3890b7 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1473,7 +1473,7 @@ test safe-11.7 {testing safe encoding} -setup {
     interp eval $i encoding convertfrom
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ??-profile profile? ?-failindex var? ?encoding?? data"}
+} -result {wrong # args: should be "encoding convertfrom ?-profile profile? ?-failindex var? encoding data" or "encoding convertfrom data"}
 test safe-11.7.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1482,7 +1482,7 @@ test safe-11.7.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertfrom ??-profile profile? ?-failindex var? ?encoding?? data"
+} -result {wrong # args: should be "encoding convertfrom ?-profile profile? ?-failindex var? encoding data" or "encoding convertfrom data"
     while executing
 "encoding convertfrom"
     invoked from within
@@ -1495,7 +1495,7 @@ test safe-11.8 {testing safe encoding} -setup {
     interp eval $i encoding convertto
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ??-profile profile? ?-failindex var? ?encoding?? data"}
+} -result {wrong # args: should be "encoding convertto ?-profile profile? ?-failindex var? encoding data" or "encoding convertto data"}
 test safe-11.8.1 {testing safe encoding} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1504,7 +1504,7 @@ test safe-11.8.1 {testing safe encoding} -setup {
 } -match glob -cleanup {
     unset -nocomplain m o
     safe::interpDelete $i
-} -result {wrong # args: should be "encoding convertto ??-profile profile? ?-failindex var? ?encoding?? data"
+} -result {wrong # args: should be "encoding convertto ?-profile profile? ?-failindex var? encoding data" or "encoding convertto data"
     while executing
 "encoding convertto"
     invoked from within
-- 
cgit v0.12


From 1c3c25097b1f63d6b1a0446c2c441833c4ecec11 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 24 Feb 2023 08:25:27 +0000
Subject: int -> Tcl_Size in tclEncoding.c (making the diff between Tcl 8.7 and
 9.0 smaller)

---
 generic/tclEncoding.c | 54 +++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 8e13b43..f32baac 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -36,7 +36,7 @@ typedef struct {
 				 * encoding is deleted. */
     void *clientData;	/* Arbitrary value associated with encoding
 				 * type. Passed to conversion functions. */
-    int nullSize;		/* Number of 0x00 bytes that signify
+    Tcl_Size nullSize;	/* Number of 0x00 bytes that signify
 				 * end-of-string in this encoding. This number
 				 * is used to determine the source string
 				 * length when the srcLen argument is
@@ -374,7 +374,7 @@ int
 Tcl_SetEncodingSearchPath(
     Tcl_Obj *searchPath)
 {
-    int dummy;
+    Tcl_Size dummy;
 
     if (TCL_ERROR == TclListObjLengthM(NULL, searchPath, &dummy)) {
 	return TCL_ERROR;
@@ -421,7 +421,7 @@ void
 TclSetLibraryPath(
     Tcl_Obj *path)
 {
-    int dummy;
+    Tcl_Size dummy;
 
     if (TCL_ERROR == TclListObjLengthM(NULL, path, &dummy)) {
 	return;
@@ -457,7 +457,7 @@ TclSetLibraryPath(
 static void
 FillEncodingFileMap(void)
 {
-    int i, numDirs = 0;
+    Tcl_Size i, numDirs = 0;
     Tcl_Obj *map, *searchPath;
 
     searchPath = Tcl_GetEncodingSearchPath();
@@ -472,7 +472,7 @@ FillEncodingFileMap(void)
 	 * entries found, we favor files earlier on the search path.
 	 */
 
-	int j, numFiles;
+	Tcl_Size j, numFiles;
 	Tcl_Obj *directory, *matchFileList;
 	Tcl_Obj **filev;
 	Tcl_GlobTypeData readableFiles = {
@@ -1005,7 +1005,7 @@ Tcl_GetEncodingNames(
  *
  *---------------------------------------------------------------------------
  */
-int
+Tcl_Size
 Tcl_GetEncodingNulLength(
     Tcl_Encoding encoding)
 {
@@ -1171,7 +1171,7 @@ Tcl_ExternalToUtfDString(
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
 				 * for the default system encoding. */
     const char *src,		/* Source string in specified encoding. */
-    int srcLen,			/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
 				 * encoding-specific string length. */
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
@@ -1210,12 +1210,12 @@ Tcl_ExternalToUtfDString(
  *-------------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_ExternalToUtfDStringEx(
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
 				 * for the default system encoding. */
     const char *src,		/* Source string in specified encoding. */
-    int srcLen,			/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,			/* Source string length in bytes, or < 0 for
 				 * encoding-specific string length. */
     int flags,			/* Conversion control flags. */
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
@@ -1224,7 +1224,8 @@ Tcl_ExternalToUtfDStringEx(
     char *dst;
     Tcl_EncodingState state;
     const Encoding *encodingPtr;
-    int dstLen, result, soFar, srcRead, dstWrote, dstChars;
+    int result, soFar, srcRead, dstWrote, dstChars;
+    Tcl_Size dstLen;
     const char *srcStart = src;
 
     Tcl_DStringInit(dstPtr);
@@ -1255,7 +1256,7 @@ Tcl_ExternalToUtfDStringEx(
 	src += srcRead;
 	if (result != TCL_CONVERT_NOSPACE) {
 	    Tcl_DStringSetLength(dstPtr, soFar);
-	    return (result == TCL_OK) ? TCL_INDEX_NONE : (int)(src - srcStart);
+	    return (result == TCL_OK) ? TCL_INDEX_NONE : (Tcl_Size)(src - srcStart);
 	}
 	flags &= ~TCL_ENCODING_START;
 	srcLen -= srcRead;
@@ -1292,7 +1293,7 @@ Tcl_ExternalToUtf(
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
 				 * for the default system encoding. */
     const char *src,		/* Source string in specified encoding. */
-    int srcLen,			/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
 				 * encoding-specific string length. */
     int flags,			/* Conversion control flags. */
     Tcl_EncodingState *statePtr,/* Place for conversion routine to store state
@@ -1302,7 +1303,7 @@ Tcl_ExternalToUtf(
 				 * routine under control of flags argument. */
     char *dst,			/* Output buffer in which converted string is
 				 * stored. */
-    int dstLen,			/* The maximum length of output buffer in
+    Tcl_Size dstLen,		/* The maximum length of output buffer in
 				 * bytes. */
     int *srcReadPtr,		/* Filled with the number of bytes from the
 				 * source string that were converted. This may
@@ -1409,7 +1410,7 @@ Tcl_UtfToExternalDString(
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
 				 * NULL for the default system encoding. */
     const char *src,		/* Source string in UTF-8. */
-    int srcLen,			/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
 				 * strlen(). */
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
 				 * converted string is stored. */
@@ -1449,12 +1450,12 @@ Tcl_UtfToExternalDString(
  *-------------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_UtfToExternalDStringEx(
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
 				 * NULL for the default system encoding. */
     const char *src,		/* Source string in UTF-8. */
-    int srcLen,			/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
 				 * strlen(). */
     int flags,			/* Conversion control flags. */
     Tcl_DString *dstPtr)	/* Uninitialized or free DString in which the
@@ -1465,7 +1466,7 @@ Tcl_UtfToExternalDStringEx(
     const Encoding *encodingPtr;
     int result, soFar, srcRead, dstWrote, dstChars;
     const char *srcStart = src;
-    int dstLen;
+    Tcl_Size dstLen;
 
     Tcl_DStringInit(dstPtr);
     dst = Tcl_DStringValue(dstPtr);
@@ -1494,7 +1495,7 @@ Tcl_UtfToExternalDStringEx(
 	    while (i >= soFar) {
 		Tcl_DStringSetLength(dstPtr, i--);
 	    }
-	    return (result == TCL_OK) ? TCL_INDEX_NONE : (int)(src - srcStart);
+	    return (result == TCL_OK) ? TCL_INDEX_NONE : (Tcl_Size)(src - srcStart);
 	}
 
 	flags &= ~TCL_ENCODING_START;
@@ -1532,7 +1533,7 @@ Tcl_UtfToExternal(
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
 				 * NULL for the default system encoding. */
     const char *src,		/* Source string in UTF-8. */
-    int srcLen,			/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
 				 * strlen(). */
     int flags,			/* Conversion control flags. */
     Tcl_EncodingState *statePtr,/* Place for conversion routine to store state
@@ -1542,7 +1543,7 @@ Tcl_UtfToExternal(
 				 * routine under control of flags argument. */
     char *dst,			/* Output buffer in which converted string
 				 * is stored. */
-    int dstLen,			/* The maximum length of output buffer in
+    Tcl_Size dstLen,		/* The maximum length of output buffer in
 				 * bytes. */
     int *srcReadPtr,		/* Filled with the number of bytes from the
 				 * source string that were converted. This may
@@ -1653,7 +1654,7 @@ OpenEncodingFileChannel(
     Tcl_Obj *map = TclGetProcessGlobalValue(&encodingFileMap);
     Tcl_Obj **dir, *path, *directory = NULL;
     Tcl_Channel chan = NULL;
-    int i, numDirs;
+    Tcl_Size i, numDirs;
 
     TclListObjGetElementsM(NULL, searchPath, &numDirs, &dir);
     Tcl_IncrRefCount(nameObj);
@@ -1918,7 +1919,7 @@ LoadTableEncoding(
     for (i = 0; i < numPages; i++) {
 	int ch;
 	const char *p;
-	int expected = 3 + 16 * (16 * 4 + 1);
+	Tcl_Size expected = 3 + 16 * (16 * 4 + 1);
 
 	if (Tcl_ReadChars(chan, objPtr, expected, 0) != expected) {
 	    return NULL;
@@ -2154,7 +2155,7 @@ LoadEscapeEncoding(
     Tcl_DStringInit(&escapeData);
 
     while (1) {
-	int argc;
+	Tcl_Size argc;
 	const char **argv;
 	char *line;
 	Tcl_DString lineString;
@@ -3919,8 +3920,7 @@ EscapeFromUtfProc(
 		    result = TCL_CONVERT_NOSPACE;
 		    break;
 		}
-		memcpy(dst, subTablePtr->sequence,
-			subTablePtr->sequenceLen);
+		memcpy(dst, subTablePtr->sequence, subTablePtr->sequenceLen);
 		dst += subTablePtr->sequenceLen;
 	    }
 	}
@@ -4138,11 +4138,11 @@ unilen4(
 static void
 InitializeEncodingSearchPath(
     char **valuePtr,
-    unsigned int *lengthPtr,
+    TCL_HASH_TYPE *lengthPtr,
     Tcl_Encoding *encodingPtr)
 {
     const char *bytes;
-    int i, numDirs, numBytes;
+    Tcl_Size i, numDirs, numBytes;
     Tcl_Obj *libPathObj, *encodingObj, *searchPathObj;
 
     TclNewLiteralStringObj(encodingObj, "encoding");
-- 
cgit v0.12


From 854369a67c1719356d036c3fe11e052a7fe62e80 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 24 Feb 2023 09:35:09 +0000
Subject: Factor out encoding test vectors into separate file so they can be
 used for file IO tests

---
 tests/cmdAH.test          | 634 +-------------------------------------------
 tests/encodingVectors.tcl | 655 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 656 insertions(+), 633 deletions(-)
 create mode 100644 tests/encodingVectors.tcl

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index ba78c23..cec93d2 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -180,640 +180,8 @@ set "numargErrors(encoding convertto)" {wrong # args: should be "(encoding |::tc
 set "numargErrors(encoding names)" {wrong # args: should be "encoding names"}
 set "numargErrors(encoding profiles)" {wrong # args: should be "encoding profiles"}
 
-set encProfiles {tcl8 strict replace}
-set encDefaultProfile tcl8; # Should reflect the default from implementation
-
-# TODO - valid sequences for different encodings - shiftjis etc.
-# Note utf-16, utf-32 missing because they are automatically
-# generated based on le/be versions.
-lappend encValidStrings {*}{
-    ascii    \u0000 00 {} {Lowest ASCII}
-    ascii    \u007F 7F knownBug {Highest ASCII}
-    ascii    \u007D 7D {} {Brace - just to verify test scripts are escaped correctly}
-    ascii    \u007B 7B {} {Terminating brace - just to verify test scripts are escaped correctly}
-
-    utf-8    \u0000 00 {} {Unicode Table 3.7 Row 1}
-    utf-8    \u007F 7F {} {Unicode Table 3.7 Row 1}
-    utf-8    \u0080 C280 {} {Unicode Table 3.7 Row 2}
-    utf-8    \u07FF DFBF {} {Unicode Table 3.7 Row 2}
-    utf-8    \u0800 E0A080 {} {Unicode Table 3.7 Row 3}
-    utf-8    \u0FFF E0BFBF {} {Unicode Table 3.7 Row 3}
-    utf-8    \u1000 E18080 {} {Unicode Table 3.7 Row 4}
-    utf-8    \uCFFF ECBFBF {} {Unicode Table 3.7 Row 4}
-    utf-8    \uD000 ED8080 {} {Unicode Table 3.7 Row 5}
-    utf-8    \uD7FF ED9FBF {} {Unicode Table 3.7 Row 5}
-    utf-8    \uE000 EE8080 {} {Unicode Table 3.7 Row 6}
-    utf-8    \uFFFF EFBFBF {} {Unicode Table 3.7 Row 6}
-    utf-8    \U10000 F0908080 {} {Unicode Table 3.7 Row 7}
-    utf-8    \U3FFFF F0BFBFBF {} {Unicode Table 3.7 Row 7}
-    utf-8    \U40000 F1808080 {} {Unicode Table 3.7 Row 8}
-    utf-8    \UFFFFF F3BFBFBF {} {Unicode Table 3.7 Row 8}
-    utf-8    \U100000 F4808080 {} {Unicode Table 3.7 Row 9}
-    utf-8    \U10FFFF F48FBFBF {} {Unicode Table 3.7 Row 9}
-    utf-8    A\u03A9\u8A9E\U00010384 41CEA9E8AA9EF0908E84 {} {Unicode 2.5}
-
-    utf-16le \u0000 0000 {} {Lowest code unit}
-    utf-16le \uD7FF FFD7 {} {Below high surrogate range}
-    utf-16le \uE000 00E0 {} {Above low surrogate range}
-    utf-16le \uFFFF FFFF {} {Highest code unit}
-    utf-16le \U010000 00D800DC {} {First surrogate pair}
-    utf-16le \U10FFFF FFDBFFDF {} {First surrogate pair}
-    utf-16le A\u03A9\u8A9E\U00010384 4100A9039E8A00D884DF {} {Unicode 2.5}
-
-    utf-16be \u0000 0000 {} {Lowest code unit}
-    utf-16be \uD7FF D7FF {} {Below high surrogate range}
-    utf-16be \uE000 E000 {} {Above low surrogate range}
-    utf-16be \uFFFF FFFF {} {Highest code unit}
-    utf-16be \U010000 D800DC00 {} {First surrogate pair}
-    utf-16be \U10FFFF DBFFDFFF {} {First surrogate pair}
-    utf-16be A\u03A9\u8A9E\U00010384 004103A98A9ED800DF84 {} {Unicode 2.5}
-
-    utf-32le \u0000 00000000 {} {Lowest code unit}
-    utf-32le \uFFFF FFFF0000 {} {Highest BMP}
-    utf-32le \U010000 00000100 {} {First supplementary}
-    utf-32le \U10FFFF ffff1000 {} {Last supplementary}
-    utf-32le A\u03A9\u8A9E\U00010384 41000000A90300009E8A000084030100 {} {Unicode 2.5}
-
-    utf-32be \u0000 00000000 {} {Lowest code unit}
-    utf-32be \uFFFF 0000FFFF {} {Highest BMP}
-    utf-32be \U010000 00010000 {} {First supplementary}
-    utf-32be \U10FFFF 0010FFFF {} {Last supplementary}
-    utf-32be A\u03A9\u8A9E\U00010384 00000041000003A900008A9E00010384 {} {Unicode 2.5}
-}
-
-# Invalid byte sequences. These are driven from a table with format
-#    {encoding bytes profile expectedresult expectedfailindex ctrl comment}
-#
-# <enc,bytes,profile> should be unique for test ids to be unique. Note utf-16,
-# utf-32 missing because they are automatically generated based on le/be
-# versions. Each entry potentially results in generation of multiple tests.
-# This is controlled by the ctrl field. This should be a list of
-# zero or more of the following:
-#   solo - the test data is the string itself
-#   lead - the test data is the string followed by a valid suffix
-#   tail - the test data is the string preceded by a prefix
-#   middle - the test data is the string wrapped by a prefix and suffix
-# If the ctrl field is empty it is treated as all of the above
-# Note if there is any other value by itself, it will cause the test to
-# be skipped. This is intentional to skip known bugs.
-# TODO - non-UTF encodings
-
-# ascii - Any byte above 127 is invalid and is mapped
-# to the same numeric code point except for the range
-# 80-9F which is treated as cp1252.
-# This tests the TableToUtfProc code path.
-lappend encInvalidBytes {*}{
-    ascii 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
-    ascii 80 replace \uFFFD -1 {} {Smallest invalid byte}
-    ascii 80 strict  {}      0 {} {Smallest invalid byte}
-    ascii 81 tcl8    \u0081 -1 {knownBug} {map to cp1252}
-    ascii 82 tcl8    \u201A -1 {knownBug} {map to cp1252}
-    ascii 83 tcl8    \u0192 -1 {knownBug} {map to cp1252}
-    ascii 84 tcl8    \u201E -1 {knownBug} {map to cp1252}
-    ascii 85 tcl8    \u2026 -1 {knownBug} {map to cp1252}
-    ascii 86 tcl8    \u2020 -1 {knownBug} {map to cp1252}
-    ascii 87 tcl8    \u2021 -1 {knownBug} {map to cp1252}
-    ascii 88 tcl8    \u0276 -1 {knownBug} {map to cp1252}
-    ascii 89 tcl8    \u2030 -1 {knownBug} {map to cp1252}
-    ascii 8A tcl8    \u0160 -1 {knownBug} {map to cp1252}
-    ascii 8B tcl8    \u2039 -1 {knownBug} {map to cp1252}
-    ascii 8C tcl8    \u0152 -1 {knownBug} {map to cp1252}
-    ascii 8D tcl8    \u008D -1 {knownBug} {map to cp1252}
-    ascii 8E tcl8    \u017D -1 {knownBug} {map to cp1252}
-    ascii 8F tcl8    \u008F -1 {knownBug} {map to cp1252}
-    ascii 90 tcl8    \u0090 -1 {knownBug} {map to cp1252}
-    ascii 91 tcl8    \u2018 -1 {knownBug} {map to cp1252}
-    ascii 92 tcl8    \u2019 -1 {knownBug} {map to cp1252}
-    ascii 93 tcl8    \u201C -1 {knownBug} {map to cp1252}
-    ascii 94 tcl8    \u201D -1 {knownBug} {map to cp1252}
-    ascii 95 tcl8    \u2022 -1 {knownBug} {map to cp1252}
-    ascii 96 tcl8    \u2013 -1 {knownBug} {map to cp1252}
-    ascii 97 tcl8    \u2014 -1 {knownBug} {map to cp1252}
-    ascii 98 tcl8    \u02DC -1 {knownBug} {map to cp1252}
-    ascii 99 tcl8    \u2122 -1 {knownBug} {map to cp1252}
-    ascii 9A tcl8    \u0161 -1 {knownBug} {map to cp1252}
-    ascii 9B tcl8    \u203A -1 {knownBug} {map to cp1252}
-    ascii 9C tcl8    \u0153 -1 {knownBug} {map to cp1252}
-    ascii 9D tcl8    \u009D -1 {knownBug} {map to cp1252}
-    ascii 9E tcl8    \u017E -1 {knownBug} {map to cp1252}
-    ascii 9F tcl8    \u0178 -1 {knownBug} {map to cp1252}
-
-    ascii FF tcl8    \u00FF -1 {} {Largest invalid byte}
-    ascii FF replace \uFFFD -1 {} {Largest invalid byte}
-    ascii FF strict  {}      0 {} {Largest invalid byte}
-}
-
-# utf-8 - valid sequences based on Table 3.7 in the Unicode
-# standard.
-#
-# Code Points        First   Second  Third   Fourth Byte
-# U+0000..U+007F     00..7F
-# U+0080..U+07FF     C2..DF  80..BF
-# U+0800..U+0FFF     E0      A0..BF  80..BF
-# U+1000..U+CFFF     E1..EC  80..BF  80..BF
-# U+D000..U+D7FF     ED      80..9F  80..BF
-# U+E000..U+FFFF     EE..EF  80..BF  80..BF
-# U+10000..U+3FFFF   F0      90..BF  80..BF  80..BF
-# U+40000..U+FFFFF   F1..F3  80..BF  80..BF  80..BF
-# U+100000..U+10FFFF F4      80..8F  80..BF  80..BF
-#
-# Tests below are based on the "gaps" in the above table. Note ascii test
-# values are repeated because internally a different code path is used
-# (UtfToUtfProc).
-# Note C0, C1, F5:FF are invalid bytes ANYWHERE. Exception is C080
-lappend encInvalidBytes {*}{
-    utf-8 80 tcl8    \u20AC -1 {} {map to cp1252}
-    utf-8 80 replace \uFFFD -1 {} {Smallest invalid byte}
-    utf-8 80 strict  {}      0 {} {Smallest invalid byte}
-    utf-8 81 tcl8    \u0081 -1 {} {map to cp1252}
-    utf-8 82 tcl8    \u201A -1 {} {map to cp1252}
-    utf-8 83 tcl8    \u0192 -1 {} {map to cp1252}
-    utf-8 84 tcl8    \u201E -1 {} {map to cp1252}
-    utf-8 85 tcl8    \u2026 -1 {} {map to cp1252}
-    utf-8 86 tcl8    \u2020 -1 {} {map to cp1252}
-    utf-8 87 tcl8    \u2021 -1 {} {map to cp1252}
-    utf-8 88 tcl8    \u02C6 -1 {} {map to cp1252}
-    utf-8 89 tcl8    \u2030 -1 {} {map to cp1252}
-    utf-8 8A tcl8    \u0160 -1 {} {map to cp1252}
-    utf-8 8B tcl8    \u2039 -1 {} {map to cp1252}
-    utf-8 8C tcl8    \u0152 -1 {} {map to cp1252}
-    utf-8 8D tcl8    \u008D -1 {} {map to cp1252}
-    utf-8 8E tcl8    \u017D -1 {} {map to cp1252}
-    utf-8 8F tcl8    \u008F -1 {} {map to cp1252}
-    utf-8 90 tcl8    \u0090 -1 {} {map to cp1252}
-    utf-8 91 tcl8    \u2018 -1 {} {map to cp1252}
-    utf-8 92 tcl8    \u2019 -1 {} {map to cp1252}
-    utf-8 93 tcl8    \u201C -1 {} {map to cp1252}
-    utf-8 94 tcl8    \u201D -1 {} {map to cp1252}
-    utf-8 95 tcl8    \u2022 -1 {} {map to cp1252}
-    utf-8 96 tcl8    \u2013 -1 {} {map to cp1252}
-    utf-8 97 tcl8    \u2014 -1 {} {map to cp1252}
-    utf-8 98 tcl8    \u02DC -1 {} {map to cp1252}
-    utf-8 99 tcl8    \u2122 -1 {} {map to cp1252}
-    utf-8 9A tcl8    \u0161 -1 {} {map to cp1252}
-    utf-8 9B tcl8    \u203A -1 {} {map to cp1252}
-    utf-8 9C tcl8    \u0153 -1 {} {map to cp1252}
-    utf-8 9D tcl8    \u009D -1 {} {map to cp1252}
-    utf-8 9E tcl8    \u017E -1 {} {map to cp1252}
-    utf-8 9F tcl8    \u0178 -1 {} {map to cp1252}
-
-    utf-8 C0 tcl8    \u00C0 -1 {} {C0 is invalid anywhere}
-    utf-8 C0 strict  {}      0 {} {C0 is invalid anywhere}
-    utf-8 C0 replace \uFFFD -1 {} {C0 is invalid anywhere}
-    utf-8 C080 tcl8    \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
-    utf-8 C080 strict  {}      0 {} {C080 -> invalid}
-    utf-8 C080 replace \uFFFD -1 {} {C080 -> single replacement char}
-    utf-8 C0A2 tcl8    \u00C0\u00A2 -1 {} {websec.github.io - A}
-    utf-8 C0A2 replace \uFFFD\uFFFD -1 {} {websec.github.io - A}
-    utf-8 C0A2 strict  {}            0 {} {websec.github.io - A}
-    utf-8 C0A7 tcl8    \u00C0\u00A7 -1 {} {websec.github.io - double quote}
-    utf-8 C0A7 replace \uFFFD\uFFFD -1 {} {websec.github.io - double quote}
-    utf-8 C0A7 strict  {}            0 {} {websec.github.io - double quote}
-    utf-8 C0AE tcl8    \u00C0\u00AE -1 {} {websec.github.io - full stop}
-    utf-8 C0AE replace \uFFFD\uFFFD -1 {} {websec.github.io - full stop}
-    utf-8 C0AE strict  {}            0 {} {websec.github.io - full stop}
-    utf-8 C0AF tcl8    \u00C0\u00AF -1 {} {websec.github.io - solidus}
-    utf-8 C0AF replace \uFFFD\uFFFD -1 {} {websec.github.io - solidus}
-    utf-8 C0AF strict  {}            0 {} {websec.github.io - solidus}
-
-    utf-8 C1 tcl8    \u00C1 -1 {} {C1 is invalid everywhere}
-    utf-8 C1 replace \uFFFD -1 {} {C1 is invalid everywhere}
-    utf-8 C1 strict  {}      0 {} {C1 is invalid everywhere}
-    utf-8 C181 tcl8    \u00C1\u0081 -1 {} {websec.github.io - base test (A)}
-    utf-8 C181 replace \uFFFD\uFFFD -1 {} {websec.github.io - base test (A)}
-    utf-8 C181 strict  {}            0 {} {websec.github.io - base test (A)}
-    utf-8 C19C tcl8    \u00C1\u0153 -1 {} {websec.github.io - reverse solidus}
-    utf-8 C19C replace \uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
-    utf-8 C19C strict  {}            0 {} {websec.github.io - reverse solidus}
-
-    utf-8 C2 tcl8      \u00C2     -1 {} {Missing trail byte}
-    utf-8 C2 replace   \uFFFD     -1 {} {Missing trail byte}
-    utf-8 C2 strict    {}          0 {} {Missing trail byte}
-    utf-8 C27F tcl8    \u00C2\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 C27F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 C27F strict  {}          0 {} {Trail byte must be 80:BF}
-    utf-8 DF tcl8      \u00DF     -1 {} {Missing trail byte}
-    utf-8 DF replace   \uFFFD     -1 {} {Missing trail byte}
-    utf-8 DF strict    {}          0 {} {Missing trail byte}
-    utf-8 DF7F tcl8    \u00DF\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 DF7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 DF7F strict  {}          0 {} {Trail byte must be 80:BF}
-    utf-8 DFE0A080 tcl8    \u00DF\u0800 -1 {} {Invalid trail byte is start of valid sequence}
-    utf-8 DFE0A080 replace \uFFFD\u0800 -1 {} {Invalid trail byte is start of valid sequence}
-    utf-8 DFE0A080 strict  {}            0 {} {Invalid trail byte is start of valid sequence}
-
-    utf-8 E0 tcl8      \u00E0     -1 {} {Missing trail byte}
-    utf-8 E0 replace   \uFFFD     -1 {} {Missing trail byte}
-    utf-8 E0 strict    {}          0 {} {Missing trail byte}
-    utf-8 E080 tcl8      \u00E0\u20AC   -1 {} {First trail byte must be A0:BF}
-    utf-8 E080 replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
-    utf-8 E080 strict    {}              0 {} {First trail byte must be A0:BF}
-    utf-8 E0819C tcl8    \u00E0\u0081\u0153 -1 {} {websec.github.io - reverse solidus}
-    utf-8 E0819C replace \uFFFD\uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
-    utf-8 E0819C strict  {}                  0 {} {websec.github.io - reverse solidus}
-    utf-8 E09F tcl8      \u00E0\u0178   -1 {} {First trail byte must be A0:BF}
-    utf-8 E09F replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
-    utf-8 E09F strict    {}              0 {} {First trail byte must be A0:BF}
-    utf-8 E0A0 tcl8      \u00E0\u00A0   -1 {} {Missing second trail byte}
-    utf-8 E0A0 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 E0A0 strict    {}              0 {} {Missing second trail byte}
-    utf-8 E0BF tcl8      \u00E0\u00BF   -1 {} {Missing second trail byte}
-    utf-8 E0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 E0BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 E0A07F tcl8    \u00E0\u00A0\x7F   -1 {}     {Second trail byte must be 80:BF}
-    utf-8 E0A07F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 E0A07F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-    utf-8 E0BF7F tcl8    \u00E0\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
-    utf-8 E0BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 E0BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-
-    utf-8 E1 tcl8      \u00E1     -1 {} {Missing trail byte}
-    utf-8 E1 replace   \uFFFD     -1 {} {Missing trail byte}
-    utf-8 E1 strict    {}          0 {} {Missing trail byte}
-    utf-8 E17F tcl8    \u00E1\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 E17F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 E17F strict  {}          0 {} {Trail byte must be 80:BF}
-    utf-8 E181 tcl8      \u00E1\u0081   -1 {} {Missing second trail byte}
-    utf-8 E181 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 E181 strict    {}              0 {} {Missing second trail byte}
-    utf-8 E1BF tcl8      \u00E1\u00BF   -1 {} {Missing second trail byte}
-    utf-8 E1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 E1BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 E1807F tcl8    \u00E1\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
-    utf-8 E1807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 E1807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-    utf-8 E1BF7F tcl8    \u00E1\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
-    utf-8 E1BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 E1BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-    utf-8 EC tcl8      \u00EC     -1 {} {Missing trail byte}
-    utf-8 EC replace   \uFFFD     -1 {} {Missing trail byte}
-    utf-8 EC strict    {}          0 {} {Missing trail byte}
-    utf-8 EC7F tcl8    \u00EC\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 EC7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
-    utf-8 EC7F strict  {}          0 {} {Trail byte must be 80:BF}
-    utf-8 EC81 tcl8      \u00EC\u0081   -1 {} {Missing second trail byte}
-    utf-8 EC81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 EC81 strict    {}              0 {} {Missing second trail byte}
-    utf-8 ECBF tcl8      \u00EC\u00BF   -1 {} {Missing second trail byte}
-    utf-8 ECBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 ECBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 EC807F tcl8    \u00EC\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
-    utf-8 EC807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 EC807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-    utf-8 ECBF7F tcl8    \u00EC\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
-    utf-8 ECBF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 ECBF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
-
-    utf-8 ED tcl8       \u00ED        -1 {} {Missing trail byte}
-    utf-8 ED replace    \uFFFD        -1 {} {Missing trail byte}
-    utf-8 ED strict     {}             0 {} {Missing trail byte}
-    utf-8 ED7F tcl8     \u00ED\u7F    -1 {} {First trail byte must be 80:9F}
-    utf-8 ED7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:9F}
-    utf-8 ED7F strict   {}             0 {} {First trail byte must be 80:9F}
-    utf-8 EDA0 tcl8     \u00ED\u00A0  -1 {} {First trail byte must be 80:9F}
-    utf-8 EDA0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:9F}
-    utf-8 EDA0 strict   {}             0 {} {First trail byte must be 80:9F}
-    utf-8 ED81 tcl8      \u00ED\u0081   -1 {} {Missing second trail byte}
-    utf-8 ED81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 ED81 strict    {}              0 {} {Missing second trail byte}
-    utf-8 EDBF tcl8      \u00ED\u00BF   -1 {} {Missing second trail byte}
-    utf-8 EDBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 EDBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 ED807F tcl8      \u00ED\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 ED807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 ED807F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 ED9F7F tcl8      \u00ED\u0178\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 ED9F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 ED9F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 EDA080 tcl8       \uD800          -1 {}  {High surrogate}
-    utf-8 EDA080 replace    \uFFFD          -1 {}  {High surrogate}
-    utf-8 EDA080 strict     {}               0 {}  {High surrogate}
-    utf-8 EDAFBF tcl8       \uDBFF          -1 {}  {High surrogate}
-    utf-8 EDAFBF replace    \uFFFD          -1 {}  {High surrogate}
-    utf-8 EDAFBF strict     {}               0 {}  {High surrogate}
-    utf-8 EDB080 tcl8       \uDC00          -1 {}  {Low surrogate}
-    utf-8 EDB080 replace    \uFFFD          -1 {}  {Low surrogate}
-    utf-8 EDB080 strict     {}               0 {}  {Low surrogate}
-    utf-8 EDBFBF tcl8       \uDFFF          -1 {}  {Low surrogate}
-    utf-8 EDBFBF replace    \uFFFD          -1 {}  {Low surrogate}
-    utf-8 EDBFBF strict     {}               0 {}  {Low surrogate}
-    utf-8 EDA080EDB080 tcl8 \U00010000      -1 {}  {High low surrogate pair}
-    utf-8 EDA080EDB080 replace \uFFFD\uFFFD -1 {}  {High low surrogate pair}
-    utf-8 EDA080EDB080 strict {}             0 {}  {High low surrogate pair}
-    utf-8 EDAFBFEDBFBF tcl8 \U0010FFFF      -1 {}  {High low surrogate pair}
-    utf-8 EDAFBFEDBFBF replace \uFFFD\uFFFD -1 {}  {High low surrogate pair}
-    utf-8 EDAFBFEDBFBF strict {}             0 {}  {High low surrogate pair}
-
-    utf-8 EE tcl8       \u00EE        -1 {} {Missing trail byte}
-    utf-8 EE replace    \uFFFD        -1 {} {Missing trail byte}
-    utf-8 EE strict     {}             0 {} {Missing trail byte}
-    utf-8 EE7F tcl8     \u00EE\u7F    -1 {} {First trail byte must be 80:BF}
-    utf-8 EE7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
-    utf-8 EE7F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 EED0 tcl8     \u00EE\u00D0  -1 {} {First trail byte must be 80:BF}
-    utf-8 EED0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
-    utf-8 EED0 strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 EE81 tcl8      \u00EE\u0081   -1 {} {Missing second trail byte}
-    utf-8 EE81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 EE81 strict    {}              0 {} {Missing second trail byte}
-    utf-8 EEBF tcl8      \u00EE\u00BF   -1 {} {Missing second trail byte}
-    utf-8 EEBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 EEBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 EE807F tcl8      \u00EE\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 EE807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 EE807F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 EEBF7F tcl8      \u00EE\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 EEBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 EEBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 EF tcl8       \u00EF        -1 {} {Missing trail byte}
-    utf-8 EF replace    \uFFFD        -1 {} {Missing trail byte}
-    utf-8 EF strict     {}             0 {} {Missing trail byte}
-    utf-8 EF7F tcl8     \u00EF\u7F    -1 {} {First trail byte must be 80:BF}
-    utf-8 EF7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
-    utf-8 EF7F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 EFD0 tcl8     \u00EF\u00D0  -1 {} {First trail byte must be 80:BF}
-    utf-8 EFD0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
-    utf-8 EFD0 strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 EF81 tcl8      \u00EF\u0081   -1 {} {Missing second trail byte}
-    utf-8 EF81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 EF81 strict    {}              0 {} {Missing second trail byte}
-    utf-8 EFBF tcl8      \u00EF\u00BF   -1 {} {Missing second trail byte}
-    utf-8 EFBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 EFBF strict    {}              0 {} {Missing second trail byte}
-    utf-8 EF807F tcl8      \u00EF\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 EF807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 EF807F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 EFBF7F tcl8      \u00EF\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 EFBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 EFBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-
-    utf-8 F0 tcl8       \u00F0        -1 {} {Missing trail byte}
-    utf-8 F0 replace    \uFFFD        -1 {} {Missing trail byte}
-    utf-8 F0 strict     {}             0 {} {Missing trail byte}
-    utf-8 F080 tcl8     \u00F0\u20AC  -1 {} {First trail byte must be 90:BF}
-    utf-8 F080 replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
-    utf-8 F080 strict   {}             0 {} {First trail byte must be 90:BF}
-    utf-8 F08F tcl8     \u00F0\u8F    -1 {} {First trail byte must be 90:BF}
-    utf-8 F08F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
-    utf-8 F08F strict   {}             0 {} {First trail byte must be 90:BF}
-    utf-8 F0D0 tcl8     \u00F0\u00D0  -1 {} {First trail byte must be 90:BF}
-    utf-8 F0D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 90:BF}
-    utf-8 F0D0 strict   {}             0 {} {First trail byte must be 90:BF}
-    utf-8 F090 tcl8      \u00F0\u0090   -1 {} {Missing second trail byte}
-    utf-8 F090 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F090 strict    {}              0 {} {Missing second trail byte}
-    utf-8 F0BF tcl8      \u00F0\u00BF   -1 {} {Missing second trail byte}
-    utf-8 F0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F0BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 F0907F tcl8      \u00F0\u0090\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F0907F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F0907F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F0BF7F tcl8      \u00F0\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F0BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F0BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F090BF tcl8      \u00F0\u0090\u00BF   -1 {} {Missing third trail byte}
-    utf-8 F090BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F090BF strict    {}              0 {} {Missing third trail byte}
-    utf-8 F0BF81 tcl8      \u00F0\u00BF\u0081   -1 {} {Missing third trail byte}
-    utf-8 F0BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F0BF81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F0BF807F tcl8      \u00F0\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F0BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F0BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
-    utf-8 F090BFD0 tcl8      \u00F0\u0090\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F090BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F090BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
-
-    utf-8 F1 tcl8       \u00F1        -1 {} {Missing trail byte}
-    utf-8 F1 replace    \uFFFD        -1 {} {Missing trail byte}
-    utf-8 F1 strict     {}             0 {} {Missing trail byte}
-    utf-8 F17F tcl8     \u00F1\u7F    -1 {} {First trail byte must be 80:BF}
-    utf-8 F17F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
-    utf-8 F17F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 F1D0 tcl8     \u00F1\u00D0  -1 {} {First trail byte must be 80:BF}
-    utf-8 F1D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
-    utf-8 F1D0 strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 F180 tcl8      \u00F1\u20AC   -1 {} {Missing second trail byte}
-    utf-8 F180 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F180 strict    {}              0 {} {Missing second trail byte}
-    utf-8 F1BF tcl8      \u00F1\u00BF   -1 {} {Missing second trail byte}
-    utf-8 F1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F1BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 F1807F tcl8      \u00F1\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F1807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F1807F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F1BF7F tcl8      \u00F1\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F1BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F1BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F180BF tcl8      \u00F1\u20AC\u00BF   -1 {} {Missing third trail byte}
-    utf-8 F180BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F180BF strict    {}              0 {} {Missing third trail byte}
-    utf-8 F1BF81 tcl8      \u00F1\u00BF\u0081   -1 {} {Missing third trail byte}
-    utf-8 F1BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F1BF81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F1BF807F tcl8      \u00F1\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F1BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F1BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
-    utf-8 F180BFD0 tcl8      \u00F1\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F180BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F180BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
-    utf-8 F3 tcl8       \u00F3        -1 {} {Missing trail byte}
-    utf-8 F3 replace    \uFFFD        -1 {} {Missing trail byte}
-    utf-8 F3 strict     {}             0 {} {Missing trail byte}
-    utf-8 F37F tcl8     \u00F3\x7F    -1 {} {First trail byte must be 80:BF}
-    utf-8 F37F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
-    utf-8 F37F strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 F3D0 tcl8     \u00F3\u00D0  -1 {} {First trail byte must be 80:BF}
-    utf-8 F3D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
-    utf-8 F3D0 strict   {}             0 {} {First trail byte must be 80:BF}
-    utf-8 F380 tcl8      \u00F3\u20AC   -1 {} {Missing second trail byte}
-    utf-8 F380 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F380 strict    {}              0 {} {Missing second trail byte}
-    utf-8 F3BF tcl8      \u00F3\u00BF   -1 {} {Missing second trail byte}
-    utf-8 F3BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F3BF strict    {}              0 {} {Missing second trail byte}
-    utf-8 F3807F tcl8      \u00F3\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F3807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F3807F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F3BF7F tcl8      \u00F3\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F3BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F3BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F380BF tcl8      \u00F3\u20AC\u00BF   -1 {} {Missing third trail byte}
-    utf-8 F380BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F380BF strict    {}              0 {} {Missing third trail byte}
-    utf-8 F3BF81 tcl8      \u00F3\u00BF\u0081   -1 {} {Missing third trail byte}
-    utf-8 F3BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F3BF81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F3BF807F tcl8      \u00F3\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F3BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F3BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
-    utf-8 F380BFD0 tcl8      \u00F3\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F380BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F380BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
-
-    utf-8 F4 tcl8       \u00F4        -1 {} {Missing trail byte}
-    utf-8 F4 replace    \uFFFD        -1 {} {Missing trail byte}
-    utf-8 F4 strict     {}             0 {} {Missing trail byte}
-    utf-8 F47F tcl8     \u00F4\u7F    -1 {} {First trail byte must be 80:8F}
-    utf-8 F47F replace  \uFFFD\u7F    -1 {knownW3C} {First trail byte must be 80:8F}
-    utf-8 F47F strict   {}             0 {} {First trail byte must be 80:8F}
-    utf-8 F490 tcl8     \u00F4\u0090  -1 {} {First trail byte must be 80:8F}
-    utf-8 F490 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:8F}
-    utf-8 F490 strict   {}             0 {} {First trail byte must be 80:8F}
-    utf-8 F480 tcl8      \u00F4\u20AC   -1 {} {Missing second trail byte}
-    utf-8 F480 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F480 strict    {}              0 {} {Missing second trail byte}
-    utf-8 F48F tcl8      \u00F4\u008F   -1 {} {Missing second trail byte}
-    utf-8 F48F replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
-    utf-8 F48F strict    {}              0 {} {Missing second trail byte}
-    utf-8 F4807F tcl8      \u00F4\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F4807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F4807F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F48F7F tcl8      \u00F4\u008F\x7F -1 {} {Second trail byte must be 80:BF}
-    utf-8 F48F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
-    utf-8 F48F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
-    utf-8 F48081 tcl8      \u00F4\u20AC\u0081   -1 {} {Missing third trail byte}
-    utf-8 F48081 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F48081 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F48F81 tcl8      \u00F4\u008F\u0081   -1 {} {Missing third trail byte}
-    utf-8 F48F81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
-    utf-8 F48F81 strict    {}              0 {} {Missing third trail byte}
-    utf-8 F481817F tcl8      \u00F4\u0081\u0081\x7F   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F480817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F480817F strict    {}              0 {} {Third trail byte must be 80:BF}
-    utf-8 F48FBFD0 tcl8      \u00F4\u008F\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
-    utf-8 F48FBFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
-    utf-8 F48FBFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
-
-    utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
-    utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
-    utf-8 F5 strict  {}      0 {} {F5:FF are invalid everywhere}
-    utf-8 FF tcl8    \u00FF -1 {} {F5:FF are invalid everywhere}
-    utf-8 FF replace \uFFFD -1 {} {F5:FF are invalid everywhere}
-    utf-8 FF strict  {}      0 {} {F5:FF are invalid everywhere}
-
-    utf-8 C0AFE080BFF0818130 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-8}
-    utf-8 EDA080EDBFBFEDAF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {knownW3C} {Unicode Table 3-9}
-    utf-8 F4919293FF4180BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0041\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-10}
-    utf-8 E180E2F09192F1BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\x30                         -1 {knownW3C} {Unicode Table 3.11}
-}
-
-# utf16-le and utf16-be test cases. Note utf16 cases are automatically generated
-# based on these depending on platform endianness. Note truncated tests can only
-# happen when the sequence is at the end (including by itself) Thus {solo tail}
-# in some cases.
-lappend encInvalidBytes {*}{
-    utf-16le 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
-    utf-16le 41      replace   \uFFFD -1 {solo tail} {Truncated}
-    utf-16le 41      strict    {}      0 {solo tail} {Truncated}
-    utf-16le 00D8    tcl8      \uD800 -1 {} {Missing low surrogate}
-    utf-16le 00D8    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
-    utf-16le 00D8    strict    {}      0 {knownBug} {Missing low surrogate}
-    utf-16le 00DC    tcl8      \uDC00 -1 {} {Missing high surrogate}
-    utf-16le 00DC    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
-    utf-16le 00DC    strict    {}      0 {knownBug} {Missing high surrogate}
-
-    utf-16be 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
-    utf-16be 41      replace   \uFFFD -1 {solo tail} {Truncated}
-    utf-16be 41      strict    {}      0 {solo tail} {Truncated}
-    utf-16be D800    tcl8      \uD800 -1 {} {Missing low surrogate}
-    utf-16be D800    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
-    utf-16be D800    strict    {}      0 {knownBug} {Missing low surrogate}
-    utf-16be DC00    tcl8      \uDC00 -1 {} {Missing high surrogate}
-    utf-16be DC00    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
-    utf-16be DC00    strict    {}      0 {knownBug} {Missing high surrogate}
-}
-
-# utf32-le and utf32-be test cases. Note utf32 cases are automatically generated
-# based on these depending on platform endianness. Note truncated tests can only
-# happen when the sequence is at the end (including by itself) Thus {solo tail}
-# in some cases.
-lappend encInvalidBytes {*}{
-    utf-32le 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
-    utf-32le 41      replace   \uFFFD  -1 {solo} {Truncated}
-    utf-32le 41      strict    {}   0 {solo tail} {Truncated}
-    utf-32le 4100    tcl8      \uFFFD  -1 {solo tail} {Truncated}
-    utf-32le 4100    replace   \uFFFD  -1 {solo} {Truncated}
-    utf-32le 4100    strict    {}   0 {solo tail} {Truncated}
-    utf-32le 410000  tcl8      \uFFFD  -1 {solo tail} {Truncated}
-    utf-32le 410000  replace   \uFFFD  -1 {solo} {Truncated}
-    utf-32le 410000  strict    {}       0 {solo tail} {Truncated}
-    utf-32le 00D80000 tcl8     \uD800   -1 {} {High-surrogate}
-    utf-32le 00D80000 replace  \uFFFD   -1 {} {High-surrogate}
-    utf-32le 00D80000 strict   {}        0 {} {High-surrogate}
-    utf-32le 00DC0000 tcl8     \uDC00   -1 {} {Low-surrogate}
-    utf-32le 00DC0000 replace  \uFFFD   -1 {} {Low-surrogate}
-    utf-32le 00DC0000 strict   {}        0 {} {Low-surrogate}
-    utf-32le 00D8000000DC0000 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
-    utf-32le 00D8000000DC0000 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
-    utf-32le 00D8000000DC0000 strict  {}            0 {} {High-low-surrogate-pair}
-    utf-32le 00001100 tcl8 \UFFFD    -1 {} {Out of range}
-    utf-32le 00001100 replace \UFFFD -1 {} {Out of range}
-    utf-32le 00001100 strict {}       0 {} {Out of range}
-    utf-32le FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
-    utf-32le FFFFFFFF replace \UFFFD -1 {} {Out of range}
-    utf-32le FFFFFFFF strict {}       0 {} {Out of range}
-
-    utf-32be 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
-    utf-32be 41      replace   \uFFFD  -1 {solo tail} {Truncated}
-    utf-32be 41      strict    {}       0 {solo tail} {Truncated}
-    utf-32be 0041    tcl8      \uFFFD  -1 {solo tail} {Truncated}
-    utf-32be 0041    replace   \uFFFD  -1 {solo} {Truncated}
-    utf-32be 0041    strict    {}   0 {solo tail} {Truncated}
-    utf-32be 000041  tcl8      \uFFFD  -1 {solo tail} {Truncated}
-    utf-32be 000041  replace   \uFFFD  -1 {solo} {Truncated}
-    utf-32be 000041  strict    {}       0 {solo tail} {Truncated}
-    utf-32be 0000D800 tcl8     \uD800   -1 {} {High-surrogate}
-    utf-32be 0000D800 replace  \uFFFD   -1 {} {High-surrogate}
-    utf-32be 0000D800 strict   {}        0 {} {High-surrogate}
-    utf-32be 0000DC00 tcl8     \uDC00   -1 {} {Low-surrogate}
-    utf-32be 0000DC00 replace  \uFFFD   -1 {} {Low-surrogate}
-    utf-32be 0000DC00 strict   {}        0 {} {Low-surrogate}
-    utf-32be 0000D8000000DC00 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
-    utf-32be 0000D8000000DC00 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
-    utf-32be 0000D8000000DC00 strict  {}            0 {} {High-low-surrogate-pair}
-    utf-32be 00110000 tcl8 \UFFFD    -1 {} {Out of range}
-    utf-32be 00110000 replace \UFFFD -1 {} {Out of range}
-    utf-32be 00110000 strict {}       0 {} {Out of range}
-    utf-32be FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
-    utf-32be FFFFFFFF replace \UFFFD -1 {} {Out of range}
-    utf-32be FFFFFFFF strict {}       0 {} {Out of range}
-}
-
-
-# Strings that cannot be encoded for specific encoding / profiles
-# {encoding string profile exptedresult expectedfailindex ctrl comment}
-# <enc,string,profile> should be unique for test ids to be unique.
-# Note utf-16, utf-32 missing because they are automatically
-# generated based on le/be versions.
-# Each entry potentially results in generation of multiple tests.
-# This is controlled by the ctrl field. This should be a list of
-# zero or more of the following:
-#   solo - the test data is the string itself
-#   lead - the test data is the string followed by a valid suffix
-#   tail - the test data is the string preceded by a prefix
-#   middle - the test data is the string wrapped by a prefix and suffix
-# If the ctrl field is empty it is treated as all of the above
-# Note if there is any other value by itself, it will cause the test to
-# be skipped. This is intentional to skip known bugs.
-# TODO - other encodings
-# TODO - out of range code point (note cannot be generated by \U notation)
-lappend encUnencodableStrings {*}{
-    ascii \u00e0 tcl8    3f -1 {} {unencodable}
-    ascii \u00e0 strict  {}  0 {} {unencodable}
-
-    iso8859-1 \u0141 tcl8    3f -1 {} unencodable
-    iso8859-1 \u0141 strict  {}  0 {} unencodable
-
-    utf-8 \uD800 tcl8    eda080 -1 {} High-surrogate
-    utf-8 \uD800 strict  {}      0 {} High-surrogate
-    utf-8 \uDC00 tcl8    edb080 -1 {} High-surrogate
-    utf-8 \uDC00 strict  {}      0 {} High-surrogate
-}
+source [file join [file dirname [info script]] encodingVectors.tcl]
 
-# Generated tests comparing against ICU
-# TODO - commented out for now as generating a lot of mismatches.
-# source [file join [file dirname [info script]] icuUcmTests.tcl]
 
 # Maps utf-{16,32}{le,be} to utf-16, utf-32 and
 # others to "". Used to test utf-16, utf-32 based
diff --git a/tests/encodingVectors.tcl b/tests/encodingVectors.tcl
new file mode 100644
index 0000000..986e221
--- /dev/null
+++ b/tests/encodingVectors.tcl
@@ -0,0 +1,655 @@
+# This file contains test vectors for verifying various encodings. They are
+# stored in a common file so that they can be sourced into the various test
+# modules that are dependent on encodings. This file contains statically defined
+# test vectors. In addition, it sources the ICU-generated test vectors from
+# icuUcmTests.tcl.
+#
+# Note that sourcing the file will reinitialize any existing encoding test
+# vectors.
+#
+
+# List of defined encoding profiles
+set encProfiles {tcl8 strict replace}
+set encDefaultProfile tcl8; # Should reflect the default from implementation
+
+# encValidStrings - Table of valid strings.
+#
+# Each row is <ENCODING STR BYTES CTRL COMMENT>
+# The pair <ENCODING,STR> should be unique for generated test ids to be unique.
+# STR is a string that can be encoded in the encoding ENCODING resulting
+# in the byte sequence BYTES. The CTRL field is a list that controls test
+# generation. It may contain zero or more of `solo`, `lead`, `tail` and
+# `middle` indicating that the generated tests should include the string
+# by itself, as the lead of a longer string, as the tail of a longer string
+# and in the middle of a longer string. If CTRL is empty, it is treated as
+# containing all four of the above. The CTRL field may also contain the
+# words knownBug or knownW3C which will cause the test generation for that
+# vector to be skipped.
+#
+# utf-16, utf-32 missing because they are automatically
+# generated based on le/be versions.
+set encValidStrings {}; # Reset the table
+
+lappend encValidStrings {*}{
+    ascii    \u0000 00 {} {Lowest ASCII}
+    ascii    \u007F 7F knownBug {Highest ASCII}
+    ascii    \u007D 7D {} {Brace - just to verify test scripts are escaped correctly}
+    ascii    \u007B 7B {} {Terminating brace - just to verify test scripts are escaped correctly}
+
+    utf-8    \u0000 00 {} {Unicode Table 3.7 Row 1}
+    utf-8    \u007F 7F {} {Unicode Table 3.7 Row 1}
+    utf-8    \u0080 C280 {} {Unicode Table 3.7 Row 2}
+    utf-8    \u07FF DFBF {} {Unicode Table 3.7 Row 2}
+    utf-8    \u0800 E0A080 {} {Unicode Table 3.7 Row 3}
+    utf-8    \u0FFF E0BFBF {} {Unicode Table 3.7 Row 3}
+    utf-8    \u1000 E18080 {} {Unicode Table 3.7 Row 4}
+    utf-8    \uCFFF ECBFBF {} {Unicode Table 3.7 Row 4}
+    utf-8    \uD000 ED8080 {} {Unicode Table 3.7 Row 5}
+    utf-8    \uD7FF ED9FBF {} {Unicode Table 3.7 Row 5}
+    utf-8    \uE000 EE8080 {} {Unicode Table 3.7 Row 6}
+    utf-8    \uFFFF EFBFBF {} {Unicode Table 3.7 Row 6}
+    utf-8    \U10000 F0908080 {} {Unicode Table 3.7 Row 7}
+    utf-8    \U3FFFF F0BFBFBF {} {Unicode Table 3.7 Row 7}
+    utf-8    \U40000 F1808080 {} {Unicode Table 3.7 Row 8}
+    utf-8    \UFFFFF F3BFBFBF {} {Unicode Table 3.7 Row 8}
+    utf-8    \U100000 F4808080 {} {Unicode Table 3.7 Row 9}
+    utf-8    \U10FFFF F48FBFBF {} {Unicode Table 3.7 Row 9}
+    utf-8    A\u03A9\u8A9E\U00010384 41CEA9E8AA9EF0908E84 {} {Unicode 2.5}
+
+    utf-16le \u0000 0000 {} {Lowest code unit}
+    utf-16le \uD7FF FFD7 {} {Below high surrogate range}
+    utf-16le \uE000 00E0 {} {Above low surrogate range}
+    utf-16le \uFFFF FFFF {} {Highest code unit}
+    utf-16le \U010000 00D800DC {} {First surrogate pair}
+    utf-16le \U10FFFF FFDBFFDF {} {First surrogate pair}
+    utf-16le A\u03A9\u8A9E\U00010384 4100A9039E8A00D884DF {} {Unicode 2.5}
+
+    utf-16be \u0000 0000 {} {Lowest code unit}
+    utf-16be \uD7FF D7FF {} {Below high surrogate range}
+    utf-16be \uE000 E000 {} {Above low surrogate range}
+    utf-16be \uFFFF FFFF {} {Highest code unit}
+    utf-16be \U010000 D800DC00 {} {First surrogate pair}
+    utf-16be \U10FFFF DBFFDFFF {} {First surrogate pair}
+    utf-16be A\u03A9\u8A9E\U00010384 004103A98A9ED800DF84 {} {Unicode 2.5}
+
+    utf-32le \u0000 00000000 {} {Lowest code unit}
+    utf-32le \uFFFF FFFF0000 {} {Highest BMP}
+    utf-32le \U010000 00000100 {} {First supplementary}
+    utf-32le \U10FFFF ffff1000 {} {Last supplementary}
+    utf-32le A\u03A9\u8A9E\U00010384 41000000A90300009E8A000084030100 {} {Unicode 2.5}
+
+    utf-32be \u0000 00000000 {} {Lowest code unit}
+    utf-32be \uFFFF 0000FFFF {} {Highest BMP}
+    utf-32be \U010000 00010000 {} {First supplementary}
+    utf-32be \U10FFFF 0010FFFF {} {Last supplementary}
+    utf-32be A\u03A9\u8A9E\U00010384 00000041000003A900008A9E00010384 {} {Unicode 2.5}
+}
+
+# encInvalidBytes - Table of invalid byte sequences
+# These are byte sequences that should appear for an encoding. Each row is
+# of the form
+#    <ENCODING BYTES PROFILE EXPECTEDRESULT EXPECTEDFAILINDEX CTRL COMMENT>
+# The triple <ENCODING,BYTES,PROFILE> should be unique for test ids to be
+# unique. BYTES is a byte sequence that is invalid. EXPECTEDRESULT is the
+# expected string when the bytes are decoded using the PROFILE profile.
+# FAILINDEX gives the expected index of the invalid byte under that profile. The
+# CTRL field is a list that controls test generation. It may contain zero or
+# more of `solo`, `lead`, `tail` and `middle` indicating that the generated the
+# tail of a longer and in the middle of a longer string. If empty, it is treated
+# as containing all four of the above. The CTRL field may also contain the words
+# knownBug or knownW3C which will cause the test generation for that vector to
+# be skipped.
+#
+# utf-32 missing because they are automatically generated based on le/be
+# versions.
+set encInvalidBytes {}; # Reset the table
+
+# ascii - Any byte above 127 is invalid and is mapped
+# to the same numeric code point except for the range
+# 80-9F which is treated as cp1252.
+# This tests the TableToUtfProc code path.
+lappend encInvalidBytes {*}{
+    ascii 80 tcl8    \u20AC -1 {knownBug} {map to cp1252}
+    ascii 80 replace \uFFFD -1 {} {Smallest invalid byte}
+    ascii 80 strict  {}      0 {} {Smallest invalid byte}
+    ascii 81 tcl8    \u0081 -1 {knownBug} {map to cp1252}
+    ascii 82 tcl8    \u201A -1 {knownBug} {map to cp1252}
+    ascii 83 tcl8    \u0192 -1 {knownBug} {map to cp1252}
+    ascii 84 tcl8    \u201E -1 {knownBug} {map to cp1252}
+    ascii 85 tcl8    \u2026 -1 {knownBug} {map to cp1252}
+    ascii 86 tcl8    \u2020 -1 {knownBug} {map to cp1252}
+    ascii 87 tcl8    \u2021 -1 {knownBug} {map to cp1252}
+    ascii 88 tcl8    \u0276 -1 {knownBug} {map to cp1252}
+    ascii 89 tcl8    \u2030 -1 {knownBug} {map to cp1252}
+    ascii 8A tcl8    \u0160 -1 {knownBug} {map to cp1252}
+    ascii 8B tcl8    \u2039 -1 {knownBug} {map to cp1252}
+    ascii 8C tcl8    \u0152 -1 {knownBug} {map to cp1252}
+    ascii 8D tcl8    \u008D -1 {knownBug} {map to cp1252}
+    ascii 8E tcl8    \u017D -1 {knownBug} {map to cp1252}
+    ascii 8F tcl8    \u008F -1 {knownBug} {map to cp1252}
+    ascii 90 tcl8    \u0090 -1 {knownBug} {map to cp1252}
+    ascii 91 tcl8    \u2018 -1 {knownBug} {map to cp1252}
+    ascii 92 tcl8    \u2019 -1 {knownBug} {map to cp1252}
+    ascii 93 tcl8    \u201C -1 {knownBug} {map to cp1252}
+    ascii 94 tcl8    \u201D -1 {knownBug} {map to cp1252}
+    ascii 95 tcl8    \u2022 -1 {knownBug} {map to cp1252}
+    ascii 96 tcl8    \u2013 -1 {knownBug} {map to cp1252}
+    ascii 97 tcl8    \u2014 -1 {knownBug} {map to cp1252}
+    ascii 98 tcl8    \u02DC -1 {knownBug} {map to cp1252}
+    ascii 99 tcl8    \u2122 -1 {knownBug} {map to cp1252}
+    ascii 9A tcl8    \u0161 -1 {knownBug} {map to cp1252}
+    ascii 9B tcl8    \u203A -1 {knownBug} {map to cp1252}
+    ascii 9C tcl8    \u0153 -1 {knownBug} {map to cp1252}
+    ascii 9D tcl8    \u009D -1 {knownBug} {map to cp1252}
+    ascii 9E tcl8    \u017E -1 {knownBug} {map to cp1252}
+    ascii 9F tcl8    \u0178 -1 {knownBug} {map to cp1252}
+
+    ascii FF tcl8    \u00FF -1 {} {Largest invalid byte}
+    ascii FF replace \uFFFD -1 {} {Largest invalid byte}
+    ascii FF strict  {}      0 {} {Largest invalid byte}
+}
+
+# utf-8 - valid sequences based on Table 3.7 in the Unicode
+# standard.
+#
+# Code Points        First   Second  Third   Fourth Byte
+# U+0000..U+007F     00..7F
+# U+0080..U+07FF     C2..DF  80..BF
+# U+0800..U+0FFF     E0      A0..BF  80..BF
+# U+1000..U+CFFF     E1..EC  80..BF  80..BF
+# U+D000..U+D7FF     ED      80..9F  80..BF
+# U+E000..U+FFFF     EE..EF  80..BF  80..BF
+# U+10000..U+3FFFF   F0      90..BF  80..BF  80..BF
+# U+40000..U+FFFFF   F1..F3  80..BF  80..BF  80..BF
+# U+100000..U+10FFFF F4      80..8F  80..BF  80..BF
+#
+# Tests below are based on the "gaps" in the above table. Note ascii test
+# values are repeated because internally a different code path is used
+# (UtfToUtfProc).
+# Note C0, C1, F5:FF are invalid bytes ANYWHERE. Exception is C080
+lappend encInvalidBytes {*}{
+    utf-8 80 tcl8    \u20AC -1 {} {map to cp1252}
+    utf-8 80 replace \uFFFD -1 {} {Smallest invalid byte}
+    utf-8 80 strict  {}      0 {} {Smallest invalid byte}
+    utf-8 81 tcl8    \u0081 -1 {} {map to cp1252}
+    utf-8 82 tcl8    \u201A -1 {} {map to cp1252}
+    utf-8 83 tcl8    \u0192 -1 {} {map to cp1252}
+    utf-8 84 tcl8    \u201E -1 {} {map to cp1252}
+    utf-8 85 tcl8    \u2026 -1 {} {map to cp1252}
+    utf-8 86 tcl8    \u2020 -1 {} {map to cp1252}
+    utf-8 87 tcl8    \u2021 -1 {} {map to cp1252}
+    utf-8 88 tcl8    \u02C6 -1 {} {map to cp1252}
+    utf-8 89 tcl8    \u2030 -1 {} {map to cp1252}
+    utf-8 8A tcl8    \u0160 -1 {} {map to cp1252}
+    utf-8 8B tcl8    \u2039 -1 {} {map to cp1252}
+    utf-8 8C tcl8    \u0152 -1 {} {map to cp1252}
+    utf-8 8D tcl8    \u008D -1 {} {map to cp1252}
+    utf-8 8E tcl8    \u017D -1 {} {map to cp1252}
+    utf-8 8F tcl8    \u008F -1 {} {map to cp1252}
+    utf-8 90 tcl8    \u0090 -1 {} {map to cp1252}
+    utf-8 91 tcl8    \u2018 -1 {} {map to cp1252}
+    utf-8 92 tcl8    \u2019 -1 {} {map to cp1252}
+    utf-8 93 tcl8    \u201C -1 {} {map to cp1252}
+    utf-8 94 tcl8    \u201D -1 {} {map to cp1252}
+    utf-8 95 tcl8    \u2022 -1 {} {map to cp1252}
+    utf-8 96 tcl8    \u2013 -1 {} {map to cp1252}
+    utf-8 97 tcl8    \u2014 -1 {} {map to cp1252}
+    utf-8 98 tcl8    \u02DC -1 {} {map to cp1252}
+    utf-8 99 tcl8    \u2122 -1 {} {map to cp1252}
+    utf-8 9A tcl8    \u0161 -1 {} {map to cp1252}
+    utf-8 9B tcl8    \u203A -1 {} {map to cp1252}
+    utf-8 9C tcl8    \u0153 -1 {} {map to cp1252}
+    utf-8 9D tcl8    \u009D -1 {} {map to cp1252}
+    utf-8 9E tcl8    \u017E -1 {} {map to cp1252}
+    utf-8 9F tcl8    \u0178 -1 {} {map to cp1252}
+
+    utf-8 C0 tcl8    \u00C0 -1 {} {C0 is invalid anywhere}
+    utf-8 C0 strict  {}      0 {} {C0 is invalid anywhere}
+    utf-8 C0 replace \uFFFD -1 {} {C0 is invalid anywhere}
+    utf-8 C080 tcl8    \u0000 -1 {} {C080 -> U+0 in Tcl's internal modified UTF8}
+    utf-8 C080 strict  {}      0 {} {C080 -> invalid}
+    utf-8 C080 replace \uFFFD -1 {} {C080 -> single replacement char}
+    utf-8 C0A2 tcl8    \u00C0\u00A2 -1 {} {websec.github.io - A}
+    utf-8 C0A2 replace \uFFFD\uFFFD -1 {} {websec.github.io - A}
+    utf-8 C0A2 strict  {}            0 {} {websec.github.io - A}
+    utf-8 C0A7 tcl8    \u00C0\u00A7 -1 {} {websec.github.io - double quote}
+    utf-8 C0A7 replace \uFFFD\uFFFD -1 {} {websec.github.io - double quote}
+    utf-8 C0A7 strict  {}            0 {} {websec.github.io - double quote}
+    utf-8 C0AE tcl8    \u00C0\u00AE -1 {} {websec.github.io - full stop}
+    utf-8 C0AE replace \uFFFD\uFFFD -1 {} {websec.github.io - full stop}
+    utf-8 C0AE strict  {}            0 {} {websec.github.io - full stop}
+    utf-8 C0AF tcl8    \u00C0\u00AF -1 {} {websec.github.io - solidus}
+    utf-8 C0AF replace \uFFFD\uFFFD -1 {} {websec.github.io - solidus}
+    utf-8 C0AF strict  {}            0 {} {websec.github.io - solidus}
+
+    utf-8 C1 tcl8    \u00C1 -1 {} {C1 is invalid everywhere}
+    utf-8 C1 replace \uFFFD -1 {} {C1 is invalid everywhere}
+    utf-8 C1 strict  {}      0 {} {C1 is invalid everywhere}
+    utf-8 C181 tcl8    \u00C1\u0081 -1 {} {websec.github.io - base test (A)}
+    utf-8 C181 replace \uFFFD\uFFFD -1 {} {websec.github.io - base test (A)}
+    utf-8 C181 strict  {}            0 {} {websec.github.io - base test (A)}
+    utf-8 C19C tcl8    \u00C1\u0153 -1 {} {websec.github.io - reverse solidus}
+    utf-8 C19C replace \uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
+    utf-8 C19C strict  {}            0 {} {websec.github.io - reverse solidus}
+
+    utf-8 C2 tcl8      \u00C2     -1 {} {Missing trail byte}
+    utf-8 C2 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 C2 strict    {}          0 {} {Missing trail byte}
+    utf-8 C27F tcl8    \u00C2\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 C27F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 C27F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 DF tcl8      \u00DF     -1 {} {Missing trail byte}
+    utf-8 DF replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 DF strict    {}          0 {} {Missing trail byte}
+    utf-8 DF7F tcl8    \u00DF\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 DF7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 DF7F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 DFE0A080 tcl8    \u00DF\u0800 -1 {} {Invalid trail byte is start of valid sequence}
+    utf-8 DFE0A080 replace \uFFFD\u0800 -1 {} {Invalid trail byte is start of valid sequence}
+    utf-8 DFE0A080 strict  {}            0 {} {Invalid trail byte is start of valid sequence}
+
+    utf-8 E0 tcl8      \u00E0     -1 {} {Missing trail byte}
+    utf-8 E0 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 E0 strict    {}          0 {} {Missing trail byte}
+    utf-8 E080 tcl8      \u00E0\u20AC   -1 {} {First trail byte must be A0:BF}
+    utf-8 E080 replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
+    utf-8 E080 strict    {}              0 {} {First trail byte must be A0:BF}
+    utf-8 E0819C tcl8    \u00E0\u0081\u0153 -1 {} {websec.github.io - reverse solidus}
+    utf-8 E0819C replace \uFFFD\uFFFD\uFFFD -1 {} {websec.github.io - reverse solidus}
+    utf-8 E0819C strict  {}                  0 {} {websec.github.io - reverse solidus}
+    utf-8 E09F tcl8      \u00E0\u0178   -1 {} {First trail byte must be A0:BF}
+    utf-8 E09F replace   \uFFFD\uFFFD   -1 {} {First trail byte must be A0:BF}
+    utf-8 E09F strict    {}              0 {} {First trail byte must be A0:BF}
+    utf-8 E0A0 tcl8      \u00E0\u00A0   -1 {} {Missing second trail byte}
+    utf-8 E0A0 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E0A0 strict    {}              0 {} {Missing second trail byte}
+    utf-8 E0BF tcl8      \u00E0\u00BF   -1 {} {Missing second trail byte}
+    utf-8 E0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E0BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 E0A07F tcl8    \u00E0\u00A0\x7F   -1 {}     {Second trail byte must be 80:BF}
+    utf-8 E0A07F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E0A07F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 E0BF7F tcl8    \u00E0\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 E0BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E0BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+
+    utf-8 E1 tcl8      \u00E1     -1 {} {Missing trail byte}
+    utf-8 E1 replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 E1 strict    {}          0 {} {Missing trail byte}
+    utf-8 E17F tcl8    \u00E1\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 E17F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 E17F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 E181 tcl8      \u00E1\u0081   -1 {} {Missing second trail byte}
+    utf-8 E181 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E181 strict    {}              0 {} {Missing second trail byte}
+    utf-8 E1BF tcl8      \u00E1\u00BF   -1 {} {Missing second trail byte}
+    utf-8 E1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 E1BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 E1807F tcl8    \u00E1\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
+    utf-8 E1807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E1807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 E1BF7F tcl8    \u00E1\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 E1BF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 E1BF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 EC tcl8      \u00EC     -1 {} {Missing trail byte}
+    utf-8 EC replace   \uFFFD     -1 {} {Missing trail byte}
+    utf-8 EC strict    {}          0 {} {Missing trail byte}
+    utf-8 EC7F tcl8    \u00EC\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 EC7F replace \uFFFD\x7F -1 {} {Trail byte must be 80:BF}
+    utf-8 EC7F strict  {}          0 {} {Trail byte must be 80:BF}
+    utf-8 EC81 tcl8      \u00EC\u0081   -1 {} {Missing second trail byte}
+    utf-8 EC81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EC81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 ECBF tcl8      \u00EC\u00BF   -1 {} {Missing second trail byte}
+    utf-8 ECBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 ECBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EC807F tcl8    \u00EC\u20AC\x7F   -1 {} {Second trail byte must be 80:BF}
+    utf-8 EC807F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EC807F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+    utf-8 ECBF7F tcl8    \u00EC\u00BF\x7F   -1 {}         {Second trail byte must be 80:BF}
+    utf-8 ECBF7F replace \uFFFD\u7F         -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ECBF7F strict  {}                  0 {}         {Second trail byte must be 80:BF}
+
+    utf-8 ED tcl8       \u00ED        -1 {} {Missing trail byte}
+    utf-8 ED replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 ED strict     {}             0 {} {Missing trail byte}
+    utf-8 ED7F tcl8     \u00ED\u7F    -1 {} {First trail byte must be 80:9F}
+    utf-8 ED7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:9F}
+    utf-8 ED7F strict   {}             0 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 tcl8     \u00ED\u00A0  -1 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:9F}
+    utf-8 EDA0 strict   {}             0 {} {First trail byte must be 80:9F}
+    utf-8 ED81 tcl8      \u00ED\u0081   -1 {} {Missing second trail byte}
+    utf-8 ED81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 ED81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EDBF tcl8      \u00ED\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EDBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EDBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 ED807F tcl8      \u00ED\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 ED807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 ED9F7F tcl8      \u00ED\u0178\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 ED9F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EDA080 tcl8       \uD800          -1 {}  {High surrogate}
+    utf-8 EDA080 replace    \uFFFD          -1 {}  {High surrogate}
+    utf-8 EDA080 strict     {}               0 {}  {High surrogate}
+    utf-8 EDAFBF tcl8       \uDBFF          -1 {}  {High surrogate}
+    utf-8 EDAFBF replace    \uFFFD          -1 {}  {High surrogate}
+    utf-8 EDAFBF strict     {}               0 {}  {High surrogate}
+    utf-8 EDB080 tcl8       \uDC00          -1 {}  {Low surrogate}
+    utf-8 EDB080 replace    \uFFFD          -1 {}  {Low surrogate}
+    utf-8 EDB080 strict     {}               0 {}  {Low surrogate}
+    utf-8 EDBFBF tcl8       \uDFFF          -1 {}  {Low surrogate}
+    utf-8 EDBFBF replace    \uFFFD          -1 {}  {Low surrogate}
+    utf-8 EDBFBF strict     {}               0 {}  {Low surrogate}
+    utf-8 EDA080EDB080 tcl8 \U00010000      -1 {}  {High low surrogate pair}
+    utf-8 EDA080EDB080 replace \uFFFD\uFFFD -1 {}  {High low surrogate pair}
+    utf-8 EDA080EDB080 strict {}             0 {}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF tcl8 \U0010FFFF      -1 {}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF replace \uFFFD\uFFFD -1 {}  {High low surrogate pair}
+    utf-8 EDAFBFEDBFBF strict {}             0 {}  {High low surrogate pair}
+
+    utf-8 EE tcl8       \u00EE        -1 {} {Missing trail byte}
+    utf-8 EE replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 EE strict     {}             0 {} {Missing trail byte}
+    utf-8 EE7F tcl8     \u00EE\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EE7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EE7F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EED0 tcl8     \u00EE\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 EED0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 EED0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EE81 tcl8      \u00EE\u0081   -1 {} {Missing second trail byte}
+    utf-8 EE81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EE81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EEBF tcl8      \u00EE\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EEBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EEBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EE807F tcl8      \u00EE\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EE807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EE807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EEBF7F tcl8      \u00EE\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EEBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EEBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EF tcl8       \u00EF        -1 {} {Missing trail byte}
+    utf-8 EF replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 EF strict     {}             0 {} {Missing trail byte}
+    utf-8 EF7F tcl8     \u00EF\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EF7F replace  \uFFFD\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 EF7F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 tcl8     \u00EF\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 EFD0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 EF81 tcl8      \u00EF\u0081   -1 {} {Missing second trail byte}
+    utf-8 EF81 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EF81 strict    {}              0 {} {Missing second trail byte}
+    utf-8 EFBF tcl8      \u00EF\u00BF   -1 {} {Missing second trail byte}
+    utf-8 EFBF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 EFBF strict    {}              0 {} {Missing second trail byte}
+    utf-8 EF807F tcl8      \u00EF\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EF807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EF807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 EFBF7F tcl8      \u00EF\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 EFBF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 EFBF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+
+    utf-8 F0 tcl8       \u00F0        -1 {} {Missing trail byte}
+    utf-8 F0 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F0 strict     {}             0 {} {Missing trail byte}
+    utf-8 F080 tcl8     \u00F0\u20AC  -1 {} {First trail byte must be 90:BF}
+    utf-8 F080 replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
+    utf-8 F080 strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F08F tcl8     \u00F0\u8F    -1 {} {First trail byte must be 90:BF}
+    utf-8 F08F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 90:BF}
+    utf-8 F08F strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 tcl8     \u00F0\u00D0  -1 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 90:BF}
+    utf-8 F0D0 strict   {}             0 {} {First trail byte must be 90:BF}
+    utf-8 F090 tcl8      \u00F0\u0090   -1 {} {Missing second trail byte}
+    utf-8 F090 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F090 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F0BF tcl8      \u00F0\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F0BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F0BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F0907F tcl8      \u00F0\u0090\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F0907F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F0907F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F0BF7F tcl8      \u00F0\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F0BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F0BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F090BF tcl8      \u00F0\u0090\u00BF   -1 {} {Missing third trail byte}
+    utf-8 F090BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F090BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F0BF81 tcl8      \u00F0\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F0BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F0BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F0BF807F tcl8      \u00F0\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F0BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F0BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 tcl8      \u00F0\u0090\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F090BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F1 tcl8       \u00F1        -1 {} {Missing trail byte}
+    utf-8 F1 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F1 strict     {}             0 {} {Missing trail byte}
+    utf-8 F17F tcl8     \u00F1\u7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 F17F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
+    utf-8 F17F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 tcl8     \u00F1\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 F1D0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F180 tcl8      \u00F1\u20AC   -1 {} {Missing second trail byte}
+    utf-8 F180 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F180 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F1BF tcl8      \u00F1\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F1BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F1BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F1807F tcl8      \u00F1\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F1807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F1807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F1BF7F tcl8      \u00F1\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F1BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F1BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F180BF tcl8      \u00F1\u20AC\u00BF   -1 {} {Missing third trail byte}
+    utf-8 F180BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F180BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F1BF81 tcl8      \u00F1\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F1BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F1BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F1BF807F tcl8      \u00F1\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F1BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F1BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 tcl8      \u00F1\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F180BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F3 tcl8       \u00F3        -1 {} {Missing trail byte}
+    utf-8 F3 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F3 strict     {}             0 {} {Missing trail byte}
+    utf-8 F37F tcl8     \u00F3\x7F    -1 {} {First trail byte must be 80:BF}
+    utf-8 F37F replace  \uFFFD        -1 {knownW3C} {First trail byte must be 80:BF}
+    utf-8 F37F strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 tcl8     \u00F3\u00D0  -1 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:BF}
+    utf-8 F3D0 strict   {}             0 {} {First trail byte must be 80:BF}
+    utf-8 F380 tcl8      \u00F3\u20AC   -1 {} {Missing second trail byte}
+    utf-8 F380 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F380 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F3BF tcl8      \u00F3\u00BF   -1 {} {Missing second trail byte}
+    utf-8 F3BF replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F3BF strict    {}              0 {} {Missing second trail byte}
+    utf-8 F3807F tcl8      \u00F3\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F3807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F3807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F3BF7F tcl8      \u00F3\u00BF\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F3BF7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F3BF7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F380BF tcl8      \u00F3\u20AC\u00BF   -1 {} {Missing third trail byte}
+    utf-8 F380BF replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F380BF strict    {}              0 {} {Missing third trail byte}
+    utf-8 F3BF81 tcl8      \u00F3\u00BF\u0081   -1 {} {Missing third trail byte}
+    utf-8 F3BF81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F3BF81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F3BF807F tcl8      \u00F3\u00BF\u20AC\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F3BF817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F3BF817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 tcl8      \u00F3\u20AC\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F380BFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F4 tcl8       \u00F4        -1 {} {Missing trail byte}
+    utf-8 F4 replace    \uFFFD        -1 {} {Missing trail byte}
+    utf-8 F4 strict     {}             0 {} {Missing trail byte}
+    utf-8 F47F tcl8     \u00F4\u7F    -1 {} {First trail byte must be 80:8F}
+    utf-8 F47F replace  \uFFFD\u7F    -1 {knownW3C} {First trail byte must be 80:8F}
+    utf-8 F47F strict   {}             0 {} {First trail byte must be 80:8F}
+    utf-8 F490 tcl8     \u00F4\u0090  -1 {} {First trail byte must be 80:8F}
+    utf-8 F490 replace  \uFFFD\uFFFD  -1 {} {First trail byte must be 80:8F}
+    utf-8 F490 strict   {}             0 {} {First trail byte must be 80:8F}
+    utf-8 F480 tcl8      \u00F4\u20AC   -1 {} {Missing second trail byte}
+    utf-8 F480 replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F480 strict    {}              0 {} {Missing second trail byte}
+    utf-8 F48F tcl8      \u00F4\u008F   -1 {} {Missing second trail byte}
+    utf-8 F48F replace   \uFFFD         -1 {knownW3C} {Missing second trail byte}
+    utf-8 F48F strict    {}              0 {} {Missing second trail byte}
+    utf-8 F4807F tcl8      \u00F4\u20AC\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F4807F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F4807F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F48F7F tcl8      \u00F4\u008F\x7F -1 {} {Second trail byte must be 80:BF}
+    utf-8 F48F7F replace   \uFFFD\u7F       -1 {knownW3C} {Second trail byte must be 80:BF}
+    utf-8 F48F7F strict    {}                0 {}  {Second trail byte must be 80:BF}
+    utf-8 F48081 tcl8      \u00F4\u20AC\u0081   -1 {} {Missing third trail byte}
+    utf-8 F48081 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F48081 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F48F81 tcl8      \u00F4\u008F\u0081   -1 {} {Missing third trail byte}
+    utf-8 F48F81 replace   \uFFFD         -1 {knownW3C} {Missing third trail byte}
+    utf-8 F48F81 strict    {}              0 {} {Missing third trail byte}
+    utf-8 F481817F tcl8      \u00F4\u0081\u0081\x7F   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F480817F replace   \uFFFD\x7F           -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F480817F strict    {}              0 {} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 tcl8      \u00F4\u008F\u00BF\u00D0   -1 {} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 replace   \uFFFD         -1 {knownW3C} {Third trail byte must be 80:BF}
+    utf-8 F48FBFD0 strict    {}              0 {} {Third trail byte must be 80:BF}
+
+    utf-8 F5 tcl8    \u00F5 -1 {} {F5:FF are invalid everywhere}
+    utf-8 F5 replace \uFFFD -1 {} {F5:FF are invalid everywhere}
+    utf-8 F5 strict  {}      0 {} {F5:FF are invalid everywhere}
+    utf-8 FF tcl8    \u00FF -1 {} {F5:FF are invalid everywhere}
+    utf-8 FF replace \uFFFD -1 {} {F5:FF are invalid everywhere}
+    utf-8 FF strict  {}      0 {} {F5:FF are invalid everywhere}
+
+    utf-8 C0AFE080BFF0818130 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-8}
+    utf-8 EDA080EDBFBFEDAF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\x30 -1 {knownW3C} {Unicode Table 3-9}
+    utf-8 F4919293FF4180BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0041\uFFFD\uFFFD\x30 -1 {} {Unicode Table 3-10}
+    utf-8 E180E2F09192F1BF30 replace \uFFFD\uFFFD\uFFFD\uFFFD\x30                         -1 {knownW3C} {Unicode Table 3.11}
+}
+
+# utf16-le and utf16-be test cases. Note utf16 cases are automatically generated
+# based on these depending on platform endianness. Note truncated tests can only
+# happen when the sequence is at the end (including by itself) Thus {solo tail}
+# in some cases.
+lappend encInvalidBytes {*}{
+    utf-16le 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
+    utf-16le 41      replace   \uFFFD -1 {solo tail} {Truncated}
+    utf-16le 41      strict    {}      0 {solo tail} {Truncated}
+    utf-16le 00D8    tcl8      \uD800 -1 {} {Missing low surrogate}
+    utf-16le 00D8    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
+    utf-16le 00D8    strict    {}      0 {knownBug} {Missing low surrogate}
+    utf-16le 00DC    tcl8      \uDC00 -1 {} {Missing high surrogate}
+    utf-16le 00DC    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
+    utf-16le 00DC    strict    {}      0 {knownBug} {Missing high surrogate}
+
+    utf-16be 41      tcl8      \uFFFD -1 {solo tail} {Truncated}
+    utf-16be 41      replace   \uFFFD -1 {solo tail} {Truncated}
+    utf-16be 41      strict    {}      0 {solo tail} {Truncated}
+    utf-16be D800    tcl8      \uD800 -1 {} {Missing low surrogate}
+    utf-16be D800    replace   \uFFFD -1 {knownBug} {Missing low surrogate}
+    utf-16be D800    strict    {}      0 {knownBug} {Missing low surrogate}
+    utf-16be DC00    tcl8      \uDC00 -1 {} {Missing high surrogate}
+    utf-16be DC00    replace   \uFFFD -1 {knownBug} {Missing high surrogate}
+    utf-16be DC00    strict    {}      0 {knownBug} {Missing high surrogate}
+}
+
+# utf32-le and utf32-be test cases. Note utf32 cases are automatically generated
+# based on these depending on platform endianness. Note truncated tests can only
+# happen when the sequence is at the end (including by itself) Thus {solo tail}
+# in some cases.
+lappend encInvalidBytes {*}{
+    utf-32le 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32le 41      replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 41      strict    {}   0 {solo tail} {Truncated}
+    utf-32le 4100    tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32le 4100    replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 4100    strict    {}   0 {solo tail} {Truncated}
+    utf-32le 410000  tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32le 410000  replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32le 410000  strict    {}       0 {solo tail} {Truncated}
+    utf-32le 00D80000 tcl8     \uD800   -1 {} {High-surrogate}
+    utf-32le 00D80000 replace  \uFFFD   -1 {} {High-surrogate}
+    utf-32le 00D80000 strict   {}        0 {} {High-surrogate}
+    utf-32le 00DC0000 tcl8     \uDC00   -1 {} {Low-surrogate}
+    utf-32le 00DC0000 replace  \uFFFD   -1 {} {Low-surrogate}
+    utf-32le 00DC0000 strict   {}        0 {} {Low-surrogate}
+    utf-32le 00D8000000DC0000 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
+    utf-32le 00D8000000DC0000 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
+    utf-32le 00D8000000DC0000 strict  {}            0 {} {High-low-surrogate-pair}
+    utf-32le 00001100 tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32le 00001100 replace \UFFFD -1 {} {Out of range}
+    utf-32le 00001100 strict {}       0 {} {Out of range}
+    utf-32le FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32le FFFFFFFF replace \UFFFD -1 {} {Out of range}
+    utf-32le FFFFFFFF strict {}       0 {} {Out of range}
+
+    utf-32be 41      tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 41      replace   \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 41      strict    {}       0 {solo tail} {Truncated}
+    utf-32be 0041    tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 0041    replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32be 0041    strict    {}   0 {solo tail} {Truncated}
+    utf-32be 000041  tcl8      \uFFFD  -1 {solo tail} {Truncated}
+    utf-32be 000041  replace   \uFFFD  -1 {solo} {Truncated}
+    utf-32be 000041  strict    {}       0 {solo tail} {Truncated}
+    utf-32be 0000D800 tcl8     \uD800   -1 {} {High-surrogate}
+    utf-32be 0000D800 replace  \uFFFD   -1 {} {High-surrogate}
+    utf-32be 0000D800 strict   {}        0 {} {High-surrogate}
+    utf-32be 0000DC00 tcl8     \uDC00   -1 {} {Low-surrogate}
+    utf-32be 0000DC00 replace  \uFFFD   -1 {} {Low-surrogate}
+    utf-32be 0000DC00 strict   {}        0 {} {Low-surrogate}
+    utf-32be 0000D8000000DC00 tcl8 \uD800\uDC00    -1 {} {High-low-surrogate-pair}
+    utf-32be 0000D8000000DC00 replace \uFFFD\uFFFD -1 {} {High-low-surrogate-pair}
+    utf-32be 0000D8000000DC00 strict  {}            0 {} {High-low-surrogate-pair}
+    utf-32be 00110000 tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32be 00110000 replace \UFFFD -1 {} {Out of range}
+    utf-32be 00110000 strict {}       0 {} {Out of range}
+    utf-32be FFFFFFFF tcl8 \UFFFD    -1 {} {Out of range}
+    utf-32be FFFFFFFF replace \UFFFD -1 {} {Out of range}
+    utf-32be FFFFFFFF strict {}       0 {} {Out of range}
+}
+
+# Strings that cannot be encoded for specific encoding / profiles
+# <ENCODING STRING PROFILE EXPECTEDRESULT EXPECTEDFAILINDEX CTRL COMMENT>
+# <ENCODING,STRING,PROFILE> should be unique for test ids to be unique.
+# See earlier comments about CTRL field.
+#
+# Note utf-16, utf-32 missing because they are automatically
+# generated based on le/be versions.
+# TODO - out of range code point (note cannot be generated by \U notation)
+lappend encUnencodableStrings {*}{
+    ascii \u00e0 tcl8    3f -1 {} {unencodable}
+    ascii \u00e0 strict  {}  0 {} {unencodable}
+
+    iso8859-1 \u0141 tcl8    3f -1 {} unencodable
+    iso8859-1 \u0141 strict  {}  0 {} unencodable
+
+    utf-8 \uD800 tcl8    eda080 -1 {} High-surrogate
+    utf-8 \uD800 strict  {}      0 {} High-surrogate
+    utf-8 \uDC00 tcl8    edb080 -1 {} High-surrogate
+    utf-8 \uDC00 strict  {}      0 {} High-surrogate
+}
+
+
+# The icuUcmTests.tcl is generated by the tools/ucm2tests.tcl script
+# and generates test vectors for the above tables for various encodings
+# based on ICU UCM files.
+# TODO - commented out for now as generating a lot of mismatches.
+# source [file join [file dirname [info script]] icuUcmTests.tcl]
-- 
cgit v0.12


From 99a24e7883c680bb555d044a04e458a57be677a1 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 24 Feb 2023 10:32:37 +0000
Subject: Raise error on invalid flags

---
 generic/tclEncoding.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index d969779..00ca5e8 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1275,7 +1275,18 @@ Tcl_ExternalToUtfDStringEx(
     Tcl_Size dstLen;
     const char *srcStart = src;
 
-    Tcl_DStringInit(dstPtr); /* Must always be initialized before returning */
+    /* DO FIRST - Must always be initialized before returning */
+    Tcl_DStringInit(dstPtr);
+
+    if (flags & (TCL_ENCODING_START|TCL_ENCODING_END)) {
+	/* TODO - what other flags are illegal? - See TIP 656 */
+ 	Tcl_SetResult(interp,
+	    "Parameter error: TCL_ENCODING_{START,STOP} bits set in flags.",
+	    TCL_STATIC);
+	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALFLAGS", NULL);
+	return TCL_ERROR;
+    }
+
     dst = Tcl_DStringValue(dstPtr);
     dstLen = dstPtr->spaceAvl - 1;
 
@@ -1559,7 +1570,18 @@ Tcl_UtfToExternalDStringEx(
     const char *srcStart = src;
     Tcl_Size dstLen;
 
+    /* DO FIRST - must always be initialized on return */
     Tcl_DStringInit(dstPtr);
+
+    if (flags & (TCL_ENCODING_START|TCL_ENCODING_END)) {
+	/* TODO - what other flags are illegal? - See TIP 656 */
+ 	Tcl_SetResult(interp,
+	    "Parameter error: TCL_ENCODING_{START,STOP} bits set in flags.",
+	    TCL_STATIC);
+	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALFLAGS", NULL);
+	return TCL_ERROR;
+    }
+
     dst = Tcl_DStringValue(dstPtr);
     dstLen = dstPtr->spaceAvl - 1;
 
-- 
cgit v0.12


From 58db3d68eb1d0fba5c0e0b3ffff602acbfb2a12a Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 24 Feb 2023 13:34:15 +0000
Subject: Add teststringobj newunicode command to test invalid input to
 Tcl_NewUnicodeObj

---
 generic/tclTestObj.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index c9a910a..fa91d67 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1269,7 +1269,7 @@ TeststringobjCmd(
     static const char *const options[] = {
 	"append", "appendstrings", "get", "get2", "length", "length2",
 	"set", "set2", "setlength", "maxchars", "range", "appendself",
-	"appendself2", NULL
+	"appendself2", "newunicode", NULL
     };
 
     if (objc < 3) {
@@ -1513,7 +1513,24 @@ TeststringobjCmd(
 	    Tcl_AppendUnicodeToObj(varPtr[varIndex], unicode + length, size - length);
 	    Tcl_SetObjResult(interp, varPtr[varIndex]);
 	    break;
-    }
+	case 13: /* newunicode*/
+	    unicode = ckalloc((objc - 3) * sizeof(Tcl_UniChar));
+	    for (i = 0; i < (objc - 3); ++i) {
+		int val;
+		if (Tcl_GetIntFromObj(interp, objv[i + 3], &val) != TCL_OK) {
+		    break;
+		}
+		unicode[i] = (Tcl_UniChar)val;
+	    }
+	    if (i < (objc-3)) {
+		ckfree(unicode);
+		return TCL_ERROR;
+	    }
+	    SetVarToObj(varPtr, varIndex, Tcl_NewUnicodeObj(unicode, objc - 3));
+	    Tcl_SetObjResult(interp, varPtr[varIndex]);
+	    ckfree(unicode);
+	    break;
+	}
 
     return TCL_OK;
 }
-- 
cgit v0.12


From 8390c51fcaeaa278ec7ec40ec5d31ee187c25208 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 25 Feb 2023 07:35:21 +0000
Subject: Fix [1d074b177a]. Failure to read .tclshrc

---
 unix/tclAppInit.c | 11 ++++++-----
 win/tclAppInit.c  |  7 +++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index 05d25de..e3d95bc 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -158,15 +158,16 @@ Tcl_AppInit(
      * is the name of the application. If this line is deleted then no
      * user-specific startup file will be run under any conditions.
      */
-
 #ifdef DJGPP
-    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", TCL_INDEX_NONE), NULL,
-	    Tcl_NewStringObj("~/tclsh.rc", TCL_INDEX_NONE), TCL_GLOBAL_ONLY);
+#define INITFILENAME "tclshrc.tcl"
 #else
-    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", TCL_INDEX_NONE), NULL,
-	    Tcl_NewStringObj("~/.tclshrc", TCL_INDEX_NONE), TCL_GLOBAL_ONLY);
+#define INITFILENAME ".tclshrc"
 #endif
 
+    (void)Tcl_EvalEx(interp,
+		     "set tcl_rcFileName [file tildeexpand ~/" INITFILENAME "]",
+		     -1,
+		     TCL_EVAL_GLOBAL);
     return TCL_OK;
 }
 
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 30127fd..077500a 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -215,8 +215,11 @@ Tcl_AppInit(
      * user-specific startup file will be run under any conditions.
      */
 
-    Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", TCL_INDEX_NONE), NULL,
-	    Tcl_NewStringObj("~/tclshrc.tcl", TCL_INDEX_NONE), TCL_GLOBAL_ONLY);
+    (void)Tcl_EvalEx(interp,
+		     "set tcl_rcFileName [file tildeexpand ~/tclshrc.tcl]",
+		     -1,
+		     TCL_EVAL_GLOBAL);
+
     return TCL_OK;
 }
 
-- 
cgit v0.12


From a826e66f11a2823847cb7788a1d929a9799c95ad Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 25 Feb 2023 08:58:31 +0000
Subject: Add tests for Bug [46dda6fc29]

---
 tests/dstring.test | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/dstring.test b/tests/dstring.test
index 314cee8..8699a5e 100644
--- a/tests/dstring.test
+++ b/tests/dstring.test
@@ -211,6 +211,38 @@ test dstring-2.15 {appending list elements} -constraints testdstring -setup {
 } -cleanup {
     testdstring free
 } -result {x  #}
+test dstring-2.16 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\n"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result {}
+test dstring-2.17 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\{"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result {}
+test dstring-2.18 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\}"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result {}
+test dstring-2.19 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\\"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result {}
 
 test dstring-3.1 {nested sublists} -constraints testdstring -setup {
     testdstring free
-- 
cgit v0.12


From aa2b48262b02b2f6f23ba7f032f8ea1fb0bddbe3 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 25 Feb 2023 09:26:06 +0000
Subject: Fix and tests for [46dda6fc29]

---
 generic/tclUtil.c  | 4 ++--
 tests/dstring.test | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index e96a564..8f2c16f 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1143,13 +1143,13 @@ TclScanElement(
 		 */
 
 		requireEscape = 1;
-		length -= (length > 0);
+		length -= (length+1 > 1);
 		p++;
 		break;
 	    }
 	    if ((p[1] == '{') || (p[1] == '}') || (p[1] == '\\')) {
 		extra++;	/* Escape sequences all one byte longer. */
-		length -= (length > 0);
+		length -= (length+1 > 1);
 		p++;
 	    }
 	    forbidNone = 1;
diff --git a/tests/dstring.test b/tests/dstring.test
index 8699a5e..23863d0 100644
--- a/tests/dstring.test
+++ b/tests/dstring.test
@@ -218,7 +218,7 @@ test dstring-2.16 {appending list elements - bug [46dda6fc29] segfault} -constra
     testdstring get
 } -cleanup {
     testdstring free
-} -result {}
+} -result \\\\\\n
 test dstring-2.17 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
     testdstring free
 } -body {
@@ -226,7 +226,7 @@ test dstring-2.17 {appending list elements - bug [46dda6fc29] segfault} -constra
     testdstring get
 } -cleanup {
     testdstring free
-} -result {}
+} -result [list [list \{]]
 test dstring-2.18 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
     testdstring free
 } -body {
@@ -234,7 +234,7 @@ test dstring-2.18 {appending list elements - bug [46dda6fc29] segfault} -constra
     testdstring get
 } -cleanup {
     testdstring free
-} -result {}
+} -result [list [list \}]]
 test dstring-2.19 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
     testdstring free
 } -body {
@@ -242,7 +242,7 @@ test dstring-2.19 {appending list elements - bug [46dda6fc29] segfault} -constra
     testdstring get
 } -cleanup {
     testdstring free
-} -result {}
+} -result [list [list \\]]
 
 test dstring-3.1 {nested sublists} -constraints testdstring -setup {
     testdstring free
-- 
cgit v0.12


From 2a5b403768444ddf2d6379ffe3644e9d5b230e19 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 25 Feb 2023 16:29:09 +0000
Subject: Experimental fix for [fb368527ae] - length truncation

---
 generic/tclEncoding.c | 86 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 67 insertions(+), 19 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index ce5626f..3a39966 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1160,8 +1160,8 @@ Tcl_ExternalToUtfDStringEx(
     char *dst;
     Tcl_EncodingState state;
     const Encoding *encodingPtr;
-    int result, soFar, srcRead, dstWrote, dstChars;
-    Tcl_Size dstLen;
+    int result;
+    Tcl_Size dstLen, soFar;
     const char *srcStart = src;
 
     Tcl_DStringInit(dstPtr);
@@ -1179,23 +1179,47 @@ Tcl_ExternalToUtfDStringEx(
 	srcLen = encodingPtr->lengthProc(src);
     }
 
-    flags |= TCL_ENCODING_START | TCL_ENCODING_END;
+    flags |= TCL_ENCODING_START;
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
 	flags |= ENCODING_INPUT;
     }
 
     while (1) {
-	result = encodingPtr->toUtfProc(encodingPtr->clientData, src, srcLen,
-		flags, &state, dst, dstLen, &srcRead, &dstWrote, &dstChars);
-	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
+	int srcChunkLen, srcChunkRead;
+	int dstChunkLen, dstChunkWrote, dstChunkChars;
+	
+	if (srcLen > INT_MAX) {
+	    srcChunkLen = INT_MAX;
+	} else {
+	    srcChunkLen = srcLen;
+	    flags |= TCL_ENCODING_END; /* Last chunk */
+	}
+	dstChunkLen = dstLen > INT_MAX ? INT_MAX : dstLen;
+
+	result = encodingPtr->toUtfProc(encodingPtr->clientData, src,
+		srcChunkLen, flags, &state, dst, dstChunkLen,
+		&srcChunkRead, &dstChunkWrote, &dstChunkChars);
+	soFar = dst + dstChunkWrote - Tcl_DStringValue(dstPtr);
 
-	src += srcRead;
-	if (result != TCL_CONVERT_NOSPACE) {
+	src += srcChunkRead;
+	srcLen -= srcChunkRead;
+
+	/*
+	 * Keep looping in two case -
+	 *   - our destination buffer did not have enough room
+	 *   - we had not passed in all the data and error indicated fragment
+	 *     of a multibyte character
+	 * In both cases we have to grow buffer, move the input source pointer
+	 * and loop. Otherwise, return the result we got. 
+	 */
+	if ((result != TCL_CONVERT_NOSPACE) &&
+	    !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) {
 	    Tcl_DStringSetLength(dstPtr, soFar);
 	    return (result == TCL_OK) ? TCL_INDEX_NONE : (Tcl_Size)(src - srcStart);
 	}
+
 	flags &= ~TCL_ENCODING_START;
-	srcLen -= srcRead;
+
 	if (Tcl_DStringLength(dstPtr) == 0) {
 	    Tcl_DStringSetLength(dstPtr, dstLen);
 	}
@@ -1398,9 +1422,9 @@ Tcl_UtfToExternalDStringEx(
     char *dst;
     Tcl_EncodingState state;
     const Encoding *encodingPtr;
-    int result, soFar, srcRead, dstWrote, dstChars;
+    int result;
+    Tcl_Size dstLen, soFar;
     const char *srcStart = src;
-    Tcl_Size dstLen;
 
     Tcl_DStringInit(dstPtr);
     dst = Tcl_DStringValue(dstPtr);
@@ -1416,16 +1440,40 @@ Tcl_UtfToExternalDStringEx(
     } else if (srcLen == TCL_INDEX_NONE) {
 	srcLen = strlen(src);
     }
-    flags |= TCL_ENCODING_START | TCL_ENCODING_END;
+    flags |= TCL_ENCODING_START;
     while (1) {
+	int srcChunkLen, srcChunkRead;
+	int dstChunkLen, dstChunkWrote, dstChunkChars;
+
+	if (srcLen > INT_MAX) {
+	    srcChunkLen = INT_MAX;
+	} else {
+	    srcChunkLen = srcLen;
+	    flags |= TCL_ENCODING_END; /* Last chunk */
+	}
+	dstChunkLen = dstLen > INT_MAX ? INT_MAX : dstLen;
+
 	result = encodingPtr->fromUtfProc(encodingPtr->clientData, src,
-		srcLen, flags, &state, dst, dstLen,
-		&srcRead, &dstWrote, &dstChars);
-	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
+		srcChunkLen, flags, &state, dst, dstChunkLen,
+		&srcChunkRead, &dstChunkWrote, &dstChunkChars);
+	soFar = dst + dstChunkWrote - Tcl_DStringValue(dstPtr);
 
-	src += srcRead;
-	if (result != TCL_CONVERT_NOSPACE) {
-	    int i = soFar + encodingPtr->nullSize - 1;
+	/* Move past the part processed in this go around */
+	src += srcChunkRead;
+	srcLen -= srcChunkRead;
+
+	/*
+	 * Keep looping in two case -
+	 *   - our destination buffer did not have enough room
+	 *   - we had not passed in all the data and error indicated fragment
+	 *     of a multibyte character
+	 * In both cases we have to grow buffer, move the input source pointer
+	 * and loop. Otherwise, return the result we got. 
+	 */
+	if ((result != TCL_CONVERT_NOSPACE) &&
+	    !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) {
+	    size_t i = soFar + encodingPtr->nullSize - 1;
+	    /* Loop as DStringSetLength only stores one nul byte at a time */
 	    while (i >= soFar) {
 		Tcl_DStringSetLength(dstPtr, i--);
 	    }
@@ -1433,7 +1481,7 @@ Tcl_UtfToExternalDStringEx(
 	}
 
 	flags &= ~TCL_ENCODING_START;
-	srcLen -= srcRead;
+
 	if (Tcl_DStringLength(dstPtr) == 0) {
 	    Tcl_DStringSetLength(dstPtr, dstLen);
 	}
-- 
cgit v0.12


From 7b0b2ebd37ef0e7ea2e38a394ee476fed9829a35 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 25 Feb 2023 17:23:42 +0000
Subject: Fix large writes to file. Need to break into INT_MAX size chunks.

---
 generic/tclIO.c | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 26d0011..82887d9 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4231,7 +4231,6 @@ Tcl_WriteObj(
     Channel *chanPtr;
     ChannelState *statePtr;	/* State info for channel */
     const char *src;
-    size_t srcLen = 0;
 
     statePtr = ((Channel *) chan)->state;
     chanPtr = statePtr->topChanPtr;
@@ -4240,19 +4239,45 @@ Tcl_WriteObj(
 	return TCL_INDEX_NONE;
     }
     if (statePtr->encoding == NULL) {
-	size_t result;
+	size_t srcLen;
+	size_t totalWritten = 0;
 
 	src = (char *) Tcl_GetByteArrayFromObj(objPtr, &srcLen);
+	/* TODO - refactor common code below */
 	if (src == NULL) {
 	    Tcl_SetErrno(EILSEQ);
-	    result = TCL_INDEX_NONE;
+	    totalWritten = TCL_INDEX_NONE;
 	} else {
-	    result = WriteBytes(chanPtr, src, srcLen);
-	}
-	return result;
+	    int chunkSize = srcLen > INT_MAX ? INT_MAX : srcLen;
+	    int written;
+	    written = WriteBytes(chanPtr, src, chunkSize);
+	    if (written < 0) {
+		return TCL_INDEX_NONE;
+	    }
+	    totalWritten += written;
+	    srcLen -= chunkSize;
+	} while (srcLen);
+		   
+	return totalWritten;
     } else {
+	size_t srcLen;
+	size_t totalWritten = 0;
 	src = Tcl_GetStringFromObj(objPtr, &srcLen);
-	return WriteChars(chanPtr, src, srcLen);
+	/*
+	 * Note original code always called WriteChars even if srcLen 0
+	 * so we will too.
+	 */
+	do {
+	    int chunkSize = srcLen > INT_MAX ? INT_MAX : srcLen;
+	    int written;
+	    written = WriteChars(chanPtr, src, chunkSize);
+	    if (written < 0) {
+		   return TCL_INDEX_NONE;
+	    }
+	    totalWritten += written;
+	    srcLen -= chunkSize;
+	} while (srcLen);
+	return totalWritten;
     }
 }
 
-- 
cgit v0.12


From 2fb6b99620807fff819ce6c0c7ac60ae4774fc73 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 26 Feb 2023 06:26:01 +0000
Subject: Minor refactor, add tests

---
 generic/tclIO.c | 59 ++++++++++++++++++++++++---------------------------------
 tests/io.test   | 29 ++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 82887d9..ff0e7fb 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4238,47 +4238,38 @@ Tcl_WriteObj(
     if (CheckChannelErrors(statePtr, TCL_WRITABLE) != 0) {
 	return TCL_INDEX_NONE;
     }
-    if (statePtr->encoding == NULL) {
-	size_t srcLen;
-	size_t totalWritten = 0;
 
+    size_t srcLen;
+    if (statePtr->encoding == NULL) {
 	src = (char *) Tcl_GetByteArrayFromObj(objPtr, &srcLen);
-	/* TODO - refactor common code below */
 	if (src == NULL) {
 	    Tcl_SetErrno(EILSEQ);
-	    totalWritten = TCL_INDEX_NONE;
-	} else {
-	    int chunkSize = srcLen > INT_MAX ? INT_MAX : srcLen;
-	    int written;
-	    written = WriteBytes(chanPtr, src, chunkSize);
-	    if (written < 0) {
-		return TCL_INDEX_NONE;
-	    }
-	    totalWritten += written;
-	    srcLen -= chunkSize;
-	} while (srcLen);
-		   
-	return totalWritten;
+	    return TCL_INDEX_NONE;
+	}
     } else {
-	size_t srcLen;
-	size_t totalWritten = 0;
 	src = Tcl_GetStringFromObj(objPtr, &srcLen);
-	/*
-	 * Note original code always called WriteChars even if srcLen 0
-	 * so we will too.
-	 */
-	do {
-	    int chunkSize = srcLen > INT_MAX ? INT_MAX : srcLen;
-	    int written;
-	    written = WriteChars(chanPtr, src, chunkSize);
-	    if (written < 0) {
-		   return TCL_INDEX_NONE;
-	    }
-	    totalWritten += written;
-	    srcLen -= chunkSize;
-	} while (srcLen);
-	return totalWritten;
     }
+
+    size_t totalWritten = 0;
+    /*
+     * Note original code always called WriteChars even if srcLen 0
+     * so we will too.
+     */
+    do {
+	int chunkSize = srcLen > INT_MAX ? INT_MAX : srcLen;
+	int written;
+	if (statePtr->encoding == NULL) {
+	    written = WriteBytes(chanPtr, src, chunkSize);
+	} else {
+	    written = WriteChars(chanPtr, src, chunkSize);
+	}
+	if (written < 0) {
+	    return TCL_INDEX_NONE;
+	}
+	totalWritten += written;
+	srcLen -= chunkSize;
+    } while (srcLen);
+    return totalWritten;
 }
 
 static void
diff --git a/tests/io.test b/tests/io.test
index cb1c691..83735c3 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -36,6 +36,7 @@ namespace eval ::tcl::test::io {
     }
     source [file join [file dirname [info script]] tcltests.tcl]
 
+testConstraint pointerIs64bit [expr {$::tcl_platform(pointerSize) >= 8}]
 testConstraint testbytestring [llength [info commands testbytestring]]
 testConstraint testchannel      [llength [info commands testchannel]]
 testConstraint testfevent       [llength [info commands testfevent]]
@@ -194,6 +195,20 @@ test io-1.9 {Tcl_WriteChars: WriteChars} {
     set sizes
 } {19 19 19 19 19}
 
+test io-1.10 {WriteChars: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
+    pointerIs64bit
+} -setup {
+    set tmpfile [file join [temporaryDirectory] io-1.10.tmp]
+} -cleanup {
+    file delete $tmpfile
+} -body {
+    set fd [open $tmpfile w]
+    puts -nonewline $fd [string repeat A 0x80000000]
+    close $fd
+    # TODO - Should really read it back in but large reads are not currently working!
+    file size $tmpfile
+} -result 2147483648
+
 test io-2.1 {WriteBytes} {
     # loop until all bytes are written
 
@@ -236,6 +251,20 @@ test io-2.4 {WriteBytes: reset sawLF after each buffer} {
     lappend x [contents $path(test1)]
 } [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
 
+test io-2.5 {WriteBytes: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
+    pointerIs64bit
+} -setup {
+    set tmpfile [file join [temporaryDirectory] io-2.5.tmp]
+} -cleanup {
+    file delete $tmpfile
+} -body {
+    set fd [open $tmpfile wb]
+    puts -nonewline $fd [string repeat A 0x80000000]
+    close $fd
+    # TODO - Should really read it back in but large reads are not currently working!
+    file size $tmpfile
+} -result 2147483648
+
 test io-3.1 {WriteChars: compatibility with WriteBytes} {
     # loop until all bytes are written
 
-- 
cgit v0.12


From deec081e744286a433ade1f6dad4e8fca0a20705 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 26 Feb 2023 07:15:06 +0000
Subject: Also fix [90ff9b7f73] - writes of exactly 4294967295 bytes

---
 generic/tclIOCmd.c |  6 +++---
 tests/io.test      | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 4ce27bb..9493a67 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -106,7 +106,7 @@ Tcl_PutsObjCmd(
     Tcl_Obj *string;		/* String to write. */
     Tcl_Obj *chanObjPtr = NULL;	/* channel object. */
     int newline;		/* Add a newline at end? */
-    int result;			/* Result of puts operation. */
+    size_t result;		/* Result of puts operation. */
     int mode;			/* Mode in which channel is opened. */
 
     switch (objc) {
@@ -163,12 +163,12 @@ Tcl_PutsObjCmd(
 
     TclChannelPreserve(chan);
     result = Tcl_WriteObj(chan, string);
-    if (result == -1) {
+    if (result == (size_t) -1) {
 	goto error;
     }
     if (newline != 0) {
 	result = Tcl_WriteChars(chan, "\n", 1);
-	if (result == -1) {
+	if (result == (size_t) -1) {
 	    goto error;
 	}
     }
diff --git a/tests/io.test b/tests/io.test
index 83735c3..20b240f 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -208,6 +208,33 @@ test io-1.10 {WriteChars: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
     # TODO - Should really read it back in but large reads are not currently working!
     file size $tmpfile
 } -result 2147483648
+test io-1.11 {WriteChars: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints {
+    pointerIs64bit
+} -setup {
+    set tmpfile [file join [temporaryDirectory] io-1.11.tmp]
+} -cleanup {
+    file delete $tmpfile
+} -body {
+    set fd [open $tmpfile w]
+    puts -nonewline $fd [string repeat A 0x100000000]
+    close $fd
+    # TODO - Should really read it back in but large reads are not currently working!
+    file size $tmpfile
+} -result 4294967296
+test io-1.12 {WriteChars: large file (== UINT_MAX). Bug 90ff9b7f73} -constraints {
+    pointerIs64bit
+} -setup {
+    set tmpfile [file join [temporaryDirectory] io-1.12.tmp]
+} -cleanup {
+    file delete $tmpfile
+} -body {
+    set fd [open $tmpfile w]
+    # *Exactly* UINT_MAX - separate bug from the general large file tests
+    puts -nonewline $fd [string repeat A 0xffffffff]
+    close $fd
+    # TODO - Should really read it back in but large reads are not currently working!
+    file size $tmpfile
+} -result 4294967295
 
 test io-2.1 {WriteBytes} {
     # loop until all bytes are written
@@ -264,6 +291,33 @@ test io-2.5 {WriteBytes: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
     # TODO - Should really read it back in but large reads are not currently working!
     file size $tmpfile
 } -result 2147483648
+test io-2.6 {WriteBytes: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints {
+    pointerIs64bit
+} -setup {
+    set tmpfile [file join [temporaryDirectory] io-2.6.tmp]
+} -cleanup {
+    file delete $tmpfile
+} -body {
+    set fd [open $tmpfile wb]
+    puts -nonewline $fd [string repeat A 0x100000000]
+    close $fd
+    # TODO - Should really read it back in but large reads are not currently working!
+    file size $tmpfile
+} -result 4294967296
+test io-2.7 {WriteBytes: large file (== UINT_MAX). Bug 90ff9b7f73} -constraints {
+    pointerIs64bit
+} -setup {
+    set tmpfile [file join [temporaryDirectory] io-2.7.tmp]
+} -cleanup {
+    file delete $tmpfile
+} -body {
+    set fd [open $tmpfile wb]
+    # *Exactly* UINT_MAX - separate bug from the general large file tests
+    puts -nonewline $fd [string repeat A 0xffffffff]
+    close $fd
+    # TODO - Should really read it back in but large reads are not currently working!
+    file size $tmpfile
+} -result 4294967295
 
 test io-3.1 {WriteChars: compatibility with WriteBytes} {
     # loop until all bytes are written
-- 
cgit v0.12


From 79cbdf745a36be243633e74267ba4dd96e62d8a5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 12:27:43 +0000
Subject: (size_t) -1 -> TCL_INDEX_NONE

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

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 9493a67..197ca32 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -163,12 +163,12 @@ Tcl_PutsObjCmd(
 
     TclChannelPreserve(chan);
     result = Tcl_WriteObj(chan, string);
-    if (result == (size_t) -1) {
+    if (result == TCL_INDEX_NONE) {
 	goto error;
     }
     if (newline != 0) {
 	result = Tcl_WriteChars(chan, "\n", 1);
-	if (result == (size_t) -1) {
+	if (result == TCL_INDEX_NONE) {
 	    goto error;
 	}
     }
-- 
cgit v0.12


From 5ffda39949b785859a8ab5b9b4977536dde6f9f2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 12:56:18 +0000
Subject: Move the "srcLen -= srcChunkRead;" past the "if ((result !=
 TCL_CONVERT_NOSPACE)..." (where it originally was), since this isn't needed
 if the loop ends anyway.

---
 generic/tclEncoding.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 3a39966..a6ecc26 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1187,7 +1187,7 @@ Tcl_ExternalToUtfDStringEx(
     while (1) {
 	int srcChunkLen, srcChunkRead;
 	int dstChunkLen, dstChunkWrote, dstChunkChars;
-	
+
 	if (srcLen > INT_MAX) {
 	    srcChunkLen = INT_MAX;
 	} else {
@@ -1202,7 +1202,6 @@ Tcl_ExternalToUtfDStringEx(
 	soFar = dst + dstChunkWrote - Tcl_DStringValue(dstPtr);
 
 	src += srcChunkRead;
-	srcLen -= srcChunkRead;
 
 	/*
 	 * Keep looping in two case -
@@ -1210,7 +1209,7 @@ Tcl_ExternalToUtfDStringEx(
 	 *   - we had not passed in all the data and error indicated fragment
 	 *     of a multibyte character
 	 * In both cases we have to grow buffer, move the input source pointer
-	 * and loop. Otherwise, return the result we got. 
+	 * and loop. Otherwise, return the result we got.
 	 */
 	if ((result != TCL_CONVERT_NOSPACE) &&
 	    !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) {
@@ -1219,6 +1218,7 @@ Tcl_ExternalToUtfDStringEx(
 	}
 
 	flags &= ~TCL_ENCODING_START;
+	srcLen -= srcChunkRead;
 
 	if (Tcl_DStringLength(dstPtr) == 0) {
 	    Tcl_DStringSetLength(dstPtr, dstLen);
@@ -1460,7 +1460,6 @@ Tcl_UtfToExternalDStringEx(
 
 	/* Move past the part processed in this go around */
 	src += srcChunkRead;
-	srcLen -= srcChunkRead;
 
 	/*
 	 * Keep looping in two case -
@@ -1468,7 +1467,7 @@ Tcl_UtfToExternalDStringEx(
 	 *   - we had not passed in all the data and error indicated fragment
 	 *     of a multibyte character
 	 * In both cases we have to grow buffer, move the input source pointer
-	 * and loop. Otherwise, return the result we got. 
+	 * and loop. Otherwise, return the result we got.
 	 */
 	if ((result != TCL_CONVERT_NOSPACE) &&
 	    !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) {
@@ -1481,6 +1480,7 @@ Tcl_UtfToExternalDStringEx(
 	}
 
 	flags &= ~TCL_ENCODING_START;
+	srcLen -= srcChunkRead;
 
 	if (Tcl_DStringLength(dstPtr) == 0) {
 	    Tcl_DStringSetLength(dstPtr, dstLen);
-- 
cgit v0.12


From 8fdf20ec2b62f7da18e6acb82772c15d7ee2c596 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 16:01:29 +0000
Subject: More dstring testcases, extracted from [46dda6fc29]

---
 tests/dstring.test | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/dstring.test b/tests/dstring.test
index 8a24ebe..6cf4bb8 100644
--- a/tests/dstring.test
+++ b/tests/dstring.test
@@ -211,6 +211,38 @@ test dstring-2.15 {appending list elements} -constraints testdstring -setup {
 } -cleanup {
     testdstring free
 } -result {x  #}
+test dstring-2.16 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\n"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result \\\\\\n
+test dstring-2.17 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\{"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result [list [list \{]]
+test dstring-2.18 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\}"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result [list [list \}]]
+test dstring-2.19 {appending list elements - bug [46dda6fc29] segfault} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring element "\\\\"; # Will setfault
+    testdstring get
+} -cleanup {
+    testdstring free
+} -result [list [list \\]]
 
 test dstring-3.1 {nested sublists} -constraints testdstring -setup {
     testdstring free
-- 
cgit v0.12


From cbda5cb9b212067d1d831ec476057502e3c70531 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 16:41:06 +0000
Subject: Make Tcl_UtfToExternal()/Tcl_ExternalToUtf() report the error, if
 srcLen and dstLen are both > INT_MAX and therefore not all characters can be
 handled by this function.

---
 generic/tclEncoding.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index ce5626f..67e67e9 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1229,7 +1229,7 @@ Tcl_ExternalToUtf(
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
 				 * for the default system encoding. */
     const char *src,		/* Source string in specified encoding. */
-    Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,		/* Source string length in bytes, or TCL_INDEX_NONE for
 				 * encoding-specific string length. */
     int flags,			/* Conversion control flags. */
     Tcl_EncodingState *statePtr,/* Place for conversion routine to store state
@@ -1271,7 +1271,15 @@ Tcl_ExternalToUtf(
 	srcLen = encodingPtr->lengthProc(src);
     }
     if (statePtr == NULL) {
-	flags |= TCL_ENCODING_START | TCL_ENCODING_END;
+	flags |= TCL_ENCODING_START;
+	if (srcLen > INT_MAX) {
+	    srcLen = INT_MAX;
+	} else {
+	    flags |= TCL_ENCODING_END;
+	}
+	if (dstLen > INT_MAX) {
+	    dstLen = INT_MAX;
+	}
 	statePtr = &state;
     }
     if (srcReadPtr == NULL) {
@@ -1467,7 +1475,7 @@ Tcl_UtfToExternal(
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
 				 * NULL for the default system encoding. */
     const char *src,		/* Source string in UTF-8. */
-    Tcl_Size srcLen,		/* Source string length in bytes, or < 0 for
+    Tcl_Size srcLen,		/* Source string length in bytes, or TCL_INDEX_NONE for
 				 * strlen(). */
     int flags,			/* Conversion control flags. */
     Tcl_EncodingState *statePtr,/* Place for conversion routine to store state
@@ -1506,7 +1514,15 @@ Tcl_UtfToExternal(
 	srcLen = strlen(src);
     }
     if (statePtr == NULL) {
-	flags |= TCL_ENCODING_START | TCL_ENCODING_END;
+	flags |= TCL_ENCODING_START;
+	if (srcLen > INT_MAX) {
+	    srcLen = INT_MAX;
+	} else {
+	    flags |= TCL_ENCODING_END;
+	}
+	if (dstLen > INT_MAX) {
+	    dstLen = INT_MAX;
+	}
 	statePtr = &state;
     }
     if (srcReadPtr == NULL) {
-- 
cgit v0.12


From baf9b5e9bb89e1e13583fb510f6cb134d39126ff Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 16:54:02 +0000
Subject: Handle statePtr != NULL as well

---
 generic/tclEncoding.c | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 67e67e9..e639d3a 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1271,17 +1271,16 @@ Tcl_ExternalToUtf(
 	srcLen = encodingPtr->lengthProc(src);
     }
     if (statePtr == NULL) {
-	flags |= TCL_ENCODING_START;
-	if (srcLen > INT_MAX) {
-	    srcLen = INT_MAX;
-	} else {
-	    flags |= TCL_ENCODING_END;
-	}
-	if (dstLen > INT_MAX) {
-	    dstLen = INT_MAX;
-	}
+	flags |= TCL_ENCODING_START | TCL_ENCODING_END;
 	statePtr = &state;
     }
+    if (srcLen > INT_MAX) {
+	srcLen = INT_MAX;
+	flags &= ~TCL_ENCODING_END;
+    }
+    if (dstLen > INT_MAX) {
+	dstLen = INT_MAX;
+    }
     if (srcReadPtr == NULL) {
 	srcReadPtr = &srcRead;
     }
@@ -1514,17 +1513,16 @@ Tcl_UtfToExternal(
 	srcLen = strlen(src);
     }
     if (statePtr == NULL) {
-	flags |= TCL_ENCODING_START;
-	if (srcLen > INT_MAX) {
-	    srcLen = INT_MAX;
-	} else {
-	    flags |= TCL_ENCODING_END;
-	}
-	if (dstLen > INT_MAX) {
-	    dstLen = INT_MAX;
-	}
+	flags |= TCL_ENCODING_START | TCL_ENCODING_END;
 	statePtr = &state;
     }
+    if (srcLen > INT_MAX) {
+	srcLen = INT_MAX;
+	flags &= ~TCL_ENCODING_END;
+    }
+    if (dstLen > INT_MAX) {
+	dstLen = INT_MAX;
+    }
     if (srcReadPtr == NULL) {
 	srcReadPtr = &srcRead;
     }
-- 
cgit v0.12


From 152d7203ac1b3f7f560995985c15f7527f2ecdc9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 17:19:07 +0000
Subject: Handle Tcl_UtfToExternal error in tclZlib.c

---
 generic/tclZlib.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 5a6dbc4..ea18c16 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -444,9 +444,13 @@ GenerateHeader(
 	goto error;
     } else if (value != NULL) {
 	valueStr = Tcl_GetStringFromObj(value, &length);
-	Tcl_UtfToExternal(NULL, latin1enc, valueStr, length, 0, NULL,
+	if (Tcl_UtfToExternal(NULL, latin1enc, valueStr, length, 0, NULL,
 		headerPtr->nativeCommentBuf, MAX_COMMENT_LEN-1, NULL, &len,
-		NULL);
+		NULL) != TCL_OK) {
+	    result = TCL_ERROR;
+	    Tcl_AppendResult(interp, "Cannot encode comment", NULL);
+	    goto error;
+	}
 	headerPtr->nativeCommentBuf[len] = '\0';
 	headerPtr->header.comment = (Bytef *) headerPtr->nativeCommentBuf;
 	if (extraSizePtr != NULL) {
@@ -465,8 +469,13 @@ GenerateHeader(
 	goto error;
     } else if (value != NULL) {
 	valueStr = Tcl_GetStringFromObj(value, &length);
-	Tcl_UtfToExternal(NULL, latin1enc, valueStr, length, 0, NULL,
-		headerPtr->nativeFilenameBuf, MAXPATHLEN-1, NULL, &len, NULL);
+	if (Tcl_UtfToExternal(NULL, latin1enc, valueStr, length, 0, NULL,
+		headerPtr->nativeCommentBuf, MAX_COMMENT_LEN-1, NULL, &len,
+		NULL) != TCL_OK) {
+	    result = TCL_ERROR;
+	    Tcl_AppendResult(interp, "Cannot encode filename", NULL);
+	    goto error;
+	}
 	headerPtr->nativeFilenameBuf[len] = '\0';
 	headerPtr->header.name = (Bytef *) headerPtr->nativeFilenameBuf;
 	if (extraSizePtr != NULL) {
-- 
cgit v0.12


From e7b8b9d2dd7951ecf0e3cbbcb618244fd7c45ebb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 20:12:43 +0000
Subject: Proposed fix for [f9eafc3886]: Error handling in zlib
 comment/filename. With testcases

---
 generic/tclZlib.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 tests/zlib.test   | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 9 deletions(-)

diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 63a25fa..cbff7b7 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -441,10 +441,21 @@ GenerateHeader(
     if (GetValue(interp, dictObj, "comment", &value) != TCL_OK) {
 	goto error;
     } else if (value != NULL) {
+	Tcl_EncodingState state;
 	valueStr = Tcl_GetStringFromObj(value, &len);
-	Tcl_UtfToExternal(NULL, latin1enc, valueStr, len, 0, NULL,
+	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, len,
+		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state,
 		headerPtr->nativeCommentBuf, MAX_COMMENT_LEN-1, NULL, &len,
 		NULL);
+	if (result != TCL_OK) {
+	    if (result == TCL_CONVERT_UNKNOWN) {
+		Tcl_AppendResult(interp, "Comment contains characters > 0xFF", NULL);
+	    } else {
+		Tcl_AppendResult(interp, "Comment too large for zip", NULL);
+	    }
+	    result = TCL_ERROR;
+	    goto error;
+	}
 	headerPtr->nativeCommentBuf[len] = '\0';
 	headerPtr->header.comment = (Bytef *) headerPtr->nativeCommentBuf;
 	if (extraSizePtr != NULL) {
@@ -462,9 +473,21 @@ GenerateHeader(
     if (GetValue(interp, dictObj, "filename", &value) != TCL_OK) {
 	goto error;
     } else if (value != NULL) {
+	Tcl_EncodingState state;
 	valueStr = Tcl_GetStringFromObj(value, &len);
-	Tcl_UtfToExternal(NULL, latin1enc, valueStr, len, 0, NULL,
-		headerPtr->nativeFilenameBuf, MAXPATHLEN-1, NULL, &len, NULL);
+	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, len,
+		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state,
+		headerPtr->nativeFilenameBuf, MAXPATHLEN-1, NULL, &len,
+		NULL);
+	if (result != TCL_OK) {
+	    if (result == TCL_CONVERT_UNKNOWN) {
+		Tcl_AppendResult(interp, "Filename contains characters > 0xFF", NULL);
+	    } else {
+		Tcl_AppendResult(interp, "Filename too large for zip", NULL);
+	    }
+	    result = TCL_ERROR;
+	    goto error;
+	}
 	headerPtr->nativeFilenameBuf[len] = '\0';
 	headerPtr->header.name = (Bytef *) headerPtr->nativeFilenameBuf;
 	if (extraSizePtr != NULL) {
@@ -1189,7 +1212,8 @@ Tcl_ZlibStreamPut(
 {
     ZlibStreamHandle *zshPtr = (ZlibStreamHandle *) zshandle;
     char *dataTmp = NULL;
-    int e, size, outSize, toStore;
+    int e;
+    int size, outSize, toStore;
 
     if (zshPtr->streamEnd) {
 	if (zshPtr->interp) {
@@ -1312,7 +1336,8 @@ Tcl_ZlibStreamGet(
 				 * may get less! */
 {
     ZlibStreamHandle *zshPtr = (ZlibStreamHandle *) zshandle;
-    int e, i, listLen, itemLen, dataPos = 0;
+    int e;
+    int i, listLen, itemLen, dataPos = 0;
     Tcl_Obj *itemObj;
     unsigned char *dataPtr, *itemPtr;
     int existing;
@@ -1561,7 +1586,8 @@ Tcl_ZlibDeflate(
     int level,
     Tcl_Obj *gzipHeaderDictObj)
 {
-    int wbits = 0, inLen = 0, e = 0, extraSize = 0;
+    int wbits = 0, e = 0, extraSize = 0;
+    int inLen = 0;
     Byte *inData = NULL;
     z_stream stream;
     GzipHeader header;
@@ -1711,7 +1737,8 @@ Tcl_ZlibInflate(
     int bufferSize,
     Tcl_Obj *gzipHeaderDictObj)
 {
-    int wbits = 0, inLen = 0, e = 0, newBufferSize;
+    int wbits = 0, e = 0;
+    int inLen = 0, newBufferSize;
     Byte *inData = NULL, *outData = NULL, *newOutData = NULL;
     z_stream stream;
     gz_header header, *headerPtr = NULL;
@@ -2365,7 +2392,8 @@ ZlibPushSubcmd(
     const char *const *pushOptions = pushDecompressOptions;
     enum pushOptions {poDictionary, poHeader, poLevel, poLimit};
     Tcl_Obj *headerObj = NULL, *compDictObj = NULL;
-    int limit = DEFAULT_BUFFER_SIZE, dummy;
+    int limit = DEFAULT_BUFFER_SIZE;
+    int dummy;
 
     if (objc < 4) {
 	Tcl_WrongNumArgs(interp, 2, objv, "mode channel ?options...?");
@@ -2897,7 +2925,8 @@ ZlibTransformClose(
     Tcl_Interp *interp)
 {
     ZlibChannelData *cd = (ZlibChannelData *)instanceData;
-    int e, written, result = TCL_OK;
+    int e, result = TCL_OK;
+    int written;
 
     /*
      * Delete the support timer.
diff --git a/tests/zlib.test b/tests/zlib.test
index 7ddf1d7..c3e344c 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -486,6 +486,54 @@ test zlib-8.18 {Bug dd260aaf: fconfigure} -setup {
     catch {close $inSide}
     catch {close $outSide}
 } -result {{one two} {one two}}
+test zlib-8.19 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+    set file [makeFile {} test.gz]
+} -body {
+    set f [zlib push gzip [open $file w] -header [list comment [string repeat A 500]]]
+    puts $f "ok"
+    close $f
+    set f [zlib push gunzip [open $file]]
+    list [gets $f] [dict get [chan configure $f -header] comment]
+} -cleanup {
+    close $f
+    removeFile $file
+} -returnCodes 1 -result {Comment too large for zip}
+test zlib-8.20 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+    set file [makeFile {} test.gz]
+} -body {
+    set f [zlib push gzip [open $file w] -header [list filename [string repeat A 5000]]]
+    puts $f "ok"
+    close $f
+    set f [zlib push gunzip [open $file]]
+    list [gets $f] [dict get [chan configure $f -header] filename]
+} -cleanup {
+    close $f
+    removeFile $file
+} -returnCodes 1 -result {Filename too large for zip}
+test zlib-8.21 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+    set file [makeFile {} test.gz]
+} -body {
+    set f [zlib push gzip [open $file w] -header [list comment \u100]]
+    puts $f "ok"
+    close $f
+    set f [zlib push gunzip [open $file]]
+    list [gets $f] [dict get [chan configure $f -header] comment]
+} -cleanup {
+    close $f
+    removeFile $file
+} -returnCodes 1 -result {Comment contains characters > 0xFF}
+test zlib-8.22 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+    set file [makeFile {} test.gz]
+} -body {
+    set f [zlib push gzip [open $file w] -header [list filename \u100]]
+    puts $f "ok"
+    close $f
+    set f [zlib push gunzip [open $file]]
+    list [gets $f] [dict get [chan configure $f -header] comment]
+} -cleanup {
+    close $f
+    removeFile $file
+} -returnCodes 1 -result {Filename contains characters > 0xFF}
 
 test zlib-9.1 "check fcopy with push" -constraints zlib -setup {
     set sfile [makeFile {} testsrc.gz]
-- 
cgit v0.12


From 6b172a213198a8d51d9b0b7783e0df3adc71bfe6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Feb 2023 21:37:15 +0000
Subject: fill in bug ticket-nr

---
 tests/zlib.test | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/zlib.test b/tests/zlib.test
index c3e344c..61e14bb 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -486,7 +486,7 @@ test zlib-8.18 {Bug dd260aaf: fconfigure} -setup {
     catch {close $inSide}
     catch {close $outSide}
 } -result {{one two} {one two}}
-test zlib-8.19 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+test zlib-8.19 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list comment [string repeat A 500]]]
@@ -498,7 +498,7 @@ test zlib-8.19 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
     close $f
     removeFile $file
 } -returnCodes 1 -result {Comment too large for zip}
-test zlib-8.20 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+test zlib-8.20 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list filename [string repeat A 5000]]]
@@ -510,7 +510,7 @@ test zlib-8.20 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
     close $f
     removeFile $file
 } -returnCodes 1 -result {Filename too large for zip}
-test zlib-8.21 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+test zlib-8.21 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list comment \u100]]
@@ -522,7 +522,7 @@ test zlib-8.21 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
     close $f
     removeFile $file
 } -returnCodes 1 -result {Comment contains characters > 0xFF}
-test zlib-8.22 {zlib transformation, bug XXXXXXXXXX} -constraints zlib -setup {
+test zlib-8.22 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list filename \u100]]
-- 
cgit v0.12


From ed360ca42f9908e5d8da5e8f4742b07d0b148b17 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 27 Feb 2023 03:13:38 +0000
Subject: Add perf constraint to large io tests to prevent memory faults on
 systems with limited memory

---
 tests/io.test | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 20b240f..c245add 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -196,7 +196,7 @@ test io-1.9 {Tcl_WriteChars: WriteChars} {
 } {19 19 19 19 19}
 
 test io-1.10 {WriteChars: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
-    pointerIs64bit
+    pointerIs64bit perf
 } -setup {
     set tmpfile [file join [temporaryDirectory] io-1.10.tmp]
 } -cleanup {
@@ -209,7 +209,7 @@ test io-1.10 {WriteChars: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
     file size $tmpfile
 } -result 2147483648
 test io-1.11 {WriteChars: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints {
-    pointerIs64bit
+    pointerIs64bit perf
 } -setup {
     set tmpfile [file join [temporaryDirectory] io-1.11.tmp]
 } -cleanup {
@@ -222,7 +222,7 @@ test io-1.11 {WriteChars: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints
     file size $tmpfile
 } -result 4294967296
 test io-1.12 {WriteChars: large file (== UINT_MAX). Bug 90ff9b7f73} -constraints {
-    pointerIs64bit
+    pointerIs64bit perf
 } -setup {
     set tmpfile [file join [temporaryDirectory] io-1.12.tmp]
 } -cleanup {
@@ -279,7 +279,7 @@ test io-2.4 {WriteBytes: reset sawLF after each buffer} {
 } [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
 
 test io-2.5 {WriteBytes: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
-    pointerIs64bit
+    pointerIs64bit perf
 } -setup {
     set tmpfile [file join [temporaryDirectory] io-2.5.tmp]
 } -cleanup {
@@ -292,7 +292,7 @@ test io-2.5 {WriteBytes: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
     file size $tmpfile
 } -result 2147483648
 test io-2.6 {WriteBytes: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints {
-    pointerIs64bit
+    pointerIs64bit perf
 } -setup {
     set tmpfile [file join [temporaryDirectory] io-2.6.tmp]
 } -cleanup {
@@ -305,7 +305,7 @@ test io-2.6 {WriteBytes: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints {
     file size $tmpfile
 } -result 4294967296
 test io-2.7 {WriteBytes: large file (== UINT_MAX). Bug 90ff9b7f73} -constraints {
-    pointerIs64bit
+    pointerIs64bit perf
 } -setup {
     set tmpfile [file join [temporaryDirectory] io-2.7.tmp]
 } -cleanup {
-- 
cgit v0.12


From e2d89615d52e47ed3b683498567e058e809aea39 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 27 Feb 2023 04:15:07 +0000
Subject: Tests for encoding strings > 4GB (under perf constraint)

---
 tests/encoding.test | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/encoding.test b/tests/encoding.test
index e0e1598..8b14353 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -1046,6 +1046,32 @@ test encoding-29.0 {get encoding nul terminator lengths} -constraints {
         [testencoding nullength ksc5601]
 } -result {1 2 4 2 2}
 
+test encoding-30.0 {encoding convertto large strings UINT_MAX} -constraints {
+    perf
+} -body {
+    # Test to ensure not misinterpreted as -1
+    list [string length [set s [string repeat A 0xFFFFFFFF]]] [string equal $s [encoding convertto ascii $s]]
+} -result {4294967295 1}
+
+test encoding-30.1 {encoding convertto large strings > 4GB} -constraints {
+    perf
+} -body {
+    list [string length [set s [string repeat A 0x100000000]]] [string equal $s [encoding convertto ascii $s]]
+} -result {4294967296 1}
+
+test encoding-30.2 {encoding convertfrom large strings UINT_MAX} -constraints {
+    perf
+} -body {
+    # Test to ensure not misinterpreted as -1
+    list [string length [set s [string repeat A 0xFFFFFFFF]]] [string equal $s [encoding convertfrom ascii $s]]
+} -result {4294967295 1}
+
+test encoding-30.3 {encoding convertfrom large strings > 4GB} -constraints {
+    perf
+} -body {
+    list [string length [set s [string repeat A 0x100000000]]] [string equal $s [encoding convertfrom ascii $s]]
+} -result {4294967296 1}
+
 
 # cleanup
 namespace delete ::tcl::test::encoding
-- 
cgit v0.12


From 85bf0db1e84ab483fce7962c151bedeb3f5e0993 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 27 Feb 2023 12:31:49 +0000
Subject: Fix crash. int->size_t needs +1 in comparisons.

---
 generic/tclEncoding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index a6ecc26..d0756c7 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1473,7 +1473,7 @@ Tcl_UtfToExternalDStringEx(
 	    !(result == TCL_CONVERT_MULTIBYTE && (flags & TCL_ENCODING_END))) {
 	    size_t i = soFar + encodingPtr->nullSize - 1;
 	    /* Loop as DStringSetLength only stores one nul byte at a time */
-	    while (i >= soFar) {
+	    while (i+1 >= soFar+1) {
 		Tcl_DStringSetLength(dstPtr, i--);
 	    }
 	    return (result == TCL_OK) ? TCL_INDEX_NONE : (Tcl_Size)(src - srcStart);
-- 
cgit v0.12


From a1fe72fa4a3bf6c99720ce309d0611a5d941ea93 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 27 Feb 2023 20:50:33 +0000
Subject: Fix testcases

---
 tests/zlib.test | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/tests/zlib.test b/tests/zlib.test
index 61e14bb..5312d2b 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -490,48 +490,32 @@ test zlib-8.19 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list comment [string repeat A 500]]]
-    puts $f "ok"
-    close $f
-    set f [zlib push gunzip [open $file]]
-    list [gets $f] [dict get [chan configure $f -header] comment]
 } -cleanup {
-    close $f
+    catch {close $f}
     removeFile $file
 } -returnCodes 1 -result {Comment too large for zip}
 test zlib-8.20 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list filename [string repeat A 5000]]]
-    puts $f "ok"
-    close $f
-    set f [zlib push gunzip [open $file]]
-    list [gets $f] [dict get [chan configure $f -header] filename]
 } -cleanup {
-    close $f
+    catch {close $f}
     removeFile $file
 } -returnCodes 1 -result {Filename too large for zip}
 test zlib-8.21 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list comment \u100]]
-    puts $f "ok"
-    close $f
-    set f [zlib push gunzip [open $file]]
-    list [gets $f] [dict get [chan configure $f -header] comment]
 } -cleanup {
-    close $f
+    catch {close $f}
     removeFile $file
 } -returnCodes 1 -result {Comment contains characters > 0xFF}
 test zlib-8.22 {zlib transformation, bug f9eafc3886} -constraints zlib -setup {
     set file [makeFile {} test.gz]
 } -body {
     set f [zlib push gzip [open $file w] -header [list filename \u100]]
-    puts $f "ok"
-    close $f
-    set f [zlib push gunzip [open $file]]
-    list [gets $f] [dict get [chan configure $f -header] comment]
 } -cleanup {
-    close $f
+    catch {close $f}
     removeFile $file
 } -returnCodes 1 -result {Filename contains characters > 0xFF}
 
-- 
cgit v0.12


From a947270ff77379afdeda26a33f5f444337b820bc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 28 Feb 2023 07:45:27 +0000
Subject: In case of combining TIP #494 (TCL_8_COMPAT) and #628 (building for
 Tcl 8.7 with 9.0 headers), ignore TCL_8_COMPAT  macro. More Tcl_Size usage.

---
 generic/tcl.h      | 14 +++++++-------
 generic/tclDecls.h |  2 +-
 generic/tclTest.c  | 22 +++++++++++-----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index fa4da26..1a1452e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -311,10 +311,10 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
 #define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
 
-#if TCL_MAJOR_VERSION > 8
-typedef size_t Tcl_Size;
-#else
+#if TCL_MAJOR_VERSION < 9
 typedef int Tcl_Size;
+#else
+typedef size_t Tcl_Size;
 #endif
 
 #ifdef _WIN32
@@ -452,17 +452,17 @@ typedef void (Tcl_ThreadCreateProc) (void *clientData);
 
 #if TCL_MAJOR_VERSION > 8
 typedef struct Tcl_RegExpIndices {
-    size_t start;			/* Character offset of first character in
+    Tcl_Size start;			/* Character offset of first character in
 				 * match. */
-    size_t end;			/* Character offset of first character after
+    Tcl_Size end;			/* Character offset of first character after
 				 * the match. */
 } Tcl_RegExpIndices;
 
 typedef struct Tcl_RegExpInfo {
-    size_t nsubs;			/* Number of subexpressions in the compiled
+    Tcl_Size nsubs;			/* Number of subexpressions in the compiled
 				 * expression. */
     Tcl_RegExpIndices *matches;	/* Array of nsubs match offset pairs. */
-    size_t extendStart;		/* The offset at which a subsequent match
+    Tcl_Size extendStart;		/* The offset at which a subsequent match
 				 * might begin. */
 } Tcl_RegExpInfo;
 #else
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index f219500..ed2eb74 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4229,7 +4229,7 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GlobalEvalObj(interp, objPtr) \
     Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL)
 
-#if defined(TCL_8_COMPAT) && !defined(BUILD_tcl)
+#if defined(TCL_8_COMPAT) && !defined(BUILD_tcl) && TCL_MAJOR_VERSION > 8
 #   ifdef USE_TCL_STUBS
 #	undef Tcl_Gets
 #	undef Tcl_GetsObj
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 652c5aa..b6c7f77 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -4105,7 +4105,7 @@ TestregexpObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     int i, indices, stringLength, match, about;
-    size_t ii;
+    Tcl_Size ii;
     int hasxflags, cflags, eflags;
     Tcl_RegExp regExpr;
     const char *string;
@@ -4217,7 +4217,7 @@ TestregexpObjCmd(
 	if (objc > 2 && (cflags&REG_EXPECT) && indices) {
 	    const char *varName;
 	    const char *value;
-	    size_t start, end;
+	    Tcl_Size start, end;
 	    char resinfo[TCL_INTEGER_SPACE * 2];
 
 	    varName = Tcl_GetString(objv[2]);
@@ -4257,11 +4257,11 @@ TestregexpObjCmd(
 
     Tcl_RegExpGetInfo(regExpr, &info);
     for (i = 0; i < objc; i++) {
-	size_t start, end;
+	Tcl_Size start, end;
 	Tcl_Obj *newPtr, *varPtr, *valuePtr;
 
 	varPtr = objv[i];
-	ii = ((cflags&REG_EXPECT) && i == objc-1) ? TCL_INDEX_NONE : (size_t)i;
+	ii = ((cflags&REG_EXPECT) && i == objc-1) ? TCL_INDEX_NONE : (Tcl_Size)i;
 	if (indices) {
 	    Tcl_Obj *objs[2];
 
@@ -6476,10 +6476,10 @@ static int
 TestWrongNumArgsObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    size_t objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    size_t i, length;
+    Tcl_Size i, length;
     const char *msg;
 
     if (objc + 1 < 4) {
@@ -7187,7 +7187,7 @@ TestUtfPrevCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    size_t numBytes, offset;
+    Tcl_Size numBytes, offset;
     char *bytes;
     const char *result;
 
@@ -7228,7 +7228,7 @@ TestNumUtfCharsCmd(
     Tcl_Obj *const objv[])
 {
     if (objc > 1) {
-	size_t numBytes, len, limit = TCL_INDEX_NONE;
+	Tcl_Size numBytes, len, limit = TCL_INDEX_NONE;
 	const char *bytes = Tcl_GetStringFromObj(objv[1], &numBytes);
 
 	if (objc > 2) {
@@ -7296,7 +7296,7 @@ TestGetIntForIndexCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    size_t result;
+    Tcl_Size result;
     Tcl_WideInt endvalue;
 
     if (objc != 3) {
@@ -7415,7 +7415,7 @@ TestHashSystemHashCmd(
 	Tcl_SetHashValue(hPtr, INT2PTR(i+42));
     }
 
-    if (hash.numEntries != (size_t)limit) {
+    if (hash.numEntries != (Tcl_Size)limit) {
 	Tcl_AppendResult(interp, "unexpected maximal size", NULL);
 	Tcl_DeleteHashTable(&hash);
 	return TCL_ERROR;
@@ -8175,7 +8175,7 @@ static int
 InterpCompiledVarResolver(
     TCL_UNUSED(Tcl_Interp *),
     const char *name,
-    TCL_UNUSED(size_t) /*length*/,
+    TCL_UNUSED(Tcl_Size) /*length*/,
     TCL_UNUSED(Tcl_Namespace *),
     Tcl_ResolvedVarInfo **rPtr)
 {
-- 
cgit v0.12


From e743d3e48700a8b562d4a7e3893c856532ca107c Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 28 Feb 2023 09:57:22 +0000
Subject: Fix formatting issue in Tcl.n

---
 doc/Tcl.n | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/Tcl.n b/doc/Tcl.n
index 8e0b342..0f784af 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.n
@@ -156,6 +156,8 @@ special processing.
 The following table lists the backslash sequences that are
 handled specially, along with the value that replaces each sequence.
 .RS
+.RS
+.RS
 .TP 7
 \e\fBa\fR
 Audible alert (bell) (Unicode U+000007).
@@ -222,6 +224,7 @@ inserted, in the range U+000000\(enU+10FFFF.  The parser will stop just
 before this range overflows, or when the maximum of eight digits
 is reached.  The upper bits of the Unicode character will be 0.
 .RE
+.RE
 .PP
 Backslash substitution is not performed on words enclosed in braces,
 except for backslash-newline as described above.
-- 
cgit v0.12


From 8b417f0e1ec2ff11fe856ea3d521356489c8dae0 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 28 Feb 2023 09:59:29 +0000
Subject: Fix formatting issue in Tcl.n

---
 doc/Tcl.n | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/Tcl.n b/doc/Tcl.n
index 8e0b342..0f784af 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.n
@@ -156,6 +156,8 @@ special processing.
 The following table lists the backslash sequences that are
 handled specially, along with the value that replaces each sequence.
 .RS
+.RS
+.RS
 .TP 7
 \e\fBa\fR
 Audible alert (bell) (Unicode U+000007).
@@ -222,6 +224,7 @@ inserted, in the range U+000000\(enU+10FFFF.  The parser will stop just
 before this range overflows, or when the maximum of eight digits
 is reached.  The upper bits of the Unicode character will be 0.
 .RE
+.RE
 .PP
 Backslash substitution is not performed on words enclosed in braces,
 except for backslash-newline as described above.
-- 
cgit v0.12


From 7d6cf09e029257c1c0656f2cd9253a4436e6a27c Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 28 Feb 2023 10:04:49 +0000
Subject: Make the descriptions in doc/Tcl.n more concise and intuitive.

---
 doc/Tcl.n | 315 ++++++++++++++++++++++++--------------------------------------
 1 file changed, 121 insertions(+), 194 deletions(-)

diff --git a/doc/Tcl.n b/doc/Tcl.n
index 0f784af..d13f3ea 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.n
@@ -1,6 +1,7 @@
 '\"
 '\" Copyright (c) 1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
+'\" Copyright (c) 2023 Nathan Coulter
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -16,178 +17,152 @@ Summary of Tcl language syntax.
 .SH DESCRIPTION
 .PP
 The following rules define the syntax and semantics of the Tcl language:
-.IP "[1] \fBCommands.\fR"
-A Tcl script is a string containing one or more commands.
-Semi-colons and newlines are command separators unless quoted as
-described below.
-Close brackets are command terminators during command substitution
-(see below) unless quoted.
-.IP "[2] \fBEvaluation.\fR"
-A command is evaluated in two steps.
-First, the Tcl interpreter breaks the command into \fIwords\fR
-and performs substitutions as described below.
-These substitutions are performed in the same way for all
-commands.
-Secondly, the first word is used to locate a routine to
-carry out the command, and the remaining words of the command are
-passed to that routine.
-The routine is free to interpret each of its words
-in any way it likes, such as an integer, variable name, list,
-or Tcl script.
-Different commands interpret their words differently.
-.IP "[3] \fBWords.\fR"
-Words of a command are separated by white space (except for
-newlines, which are command separators).
-.IP "[4] \fBDouble quotes.\fR"
-If the first character of a word is double-quote
+.
+.IP "[1] \fBScript.\fR"
+A script is composed of zero or more commands delimited by semi-colons or
+newlines.
+.IP "[2] \fBCommand.\fR"
+A command is composed of zero or more words delimited by whitespace.  The
+replacement for a substitution is included verbatim in the word. For example, a
+space in the replacement is included in the word rather than becoming a
+delimiter, and \fI\\\\\fR becomes a single backslash in the word.  Each word is
+processed from left to right and each substitution is performed as soon as it
+is complete.
+For example, the command
+.RS
+.PP
+.CS
+set y [set x 0][incr x][incr x]
+.CE
+.PP
+is composed of three words, and sets the value of \fIy\fR to \fI012\fR.
+.PP
+If hash
+.PQ #
+is the first character of what would otherwise be the first word of a command,
+all characters up to the next newline are ignored.
+.RE
+.
+.IP "[3] \fBBraced word.\fR"
+If a word is enclosed in braces
+.PQ {
+and
+.PQ } ""
+, the braces are removed and the enclosed characters become the word.  No
+substitutions are performed.  Nested pairs of braces may occur within the word.
+A brace preceded by an odd number of backslashes is not considered part of a
+pair, and neither brace nor the backslashes are removed from the word.
+.
+.IP "[4] \fBQuoted word.\fR"
+If a word is enclosed in double quotes
 .PQ \N'34'
-then the word is terminated by the next double-quote character.
-If semi-colons, close brackets, or white space characters
-(including newlines) appear between the quotes then they are treated
-as ordinary characters and included in the word.
-Command substitution, variable substitution, and backslash substitution
-are performed on the characters between the quotes as described below.
-The double-quotes are not retained as part of the word.
-.IP "[5] \fBArgument expansion.\fR"
-If a word starts with the string
-.QW {*}
-followed by a non-whitespace character, then the leading
+, the double quotes are removed and the enclosed characters become the word.
+Substitutions are performed.
+.
+.IP "[5] \fBList.\fR"
+A list has the form of a single command.  Newline is whitespace, and semicolon
+has no special interpretation.  There is no script evaluation so there is no
+argument expansion, variable substitution, or command substitution: Dollar-sign
+and open bracket have no special interpretation, and what would be argument
+expansion in a script is invalid in a list.
+.
+.IP "[6] \fBArgument expansion.\fR"
+If
 .QW {*}
-is removed and the rest of the word is parsed and substituted as any other
-word. After substitution, the word is parsed as a list (without command or
-variable substitutions; backslash substitutions are performed as is normal for
-a list and individual internal words may be surrounded by either braces or
-double-quote characters), and its words are added to the command being
-substituted. For instance,
-.QW "cmd a {*}{b [c]} d {*}{$e f {g h}}"
+prefixes a word, it is removed.  After any remaining enclosing braces or quotes
+are processed and applicable substitutions performed, the word, which must
+be a list, is removed from the command, and in its place each word in the
+list becomes an additional word in the command.  For example,
+.CS
+cmd a {*}{b [c]} d {*}{$e f {g h}}
+.CE
 is equivalent to
-.QW "cmd a b {[c]} d {$e} f {g h}" .
-.IP "[6] \fBBraces.\fR"
-If the first character of a word is an open brace
-.PQ {
-and rule [5] does not apply, then
-the word is terminated by the matching close brace
-.PQ } "" .
-Braces nest within the word: for each additional open
-brace there must be an additional close brace (however,
-if an open brace or close brace within the word is
-quoted with a backslash then it is not counted in locating the
-matching close brace).
-No substitutions are performed on the characters between the
-braces except for backslash-newline substitutions described
-below, nor do semi-colons, newlines, close brackets,
-or white space receive any special interpretation.
-The word will consist of exactly the characters between the
-outer braces, not including the braces themselves.
-.IP "[7] \fBCommand substitution.\fR"
-If a word contains an open bracket
+.CS
+cmd a b {[c]} d {$e} f {g h} .
+.CE
+.
+.IP "[7] \fBEvaluation.\fR"
+To evaluate a script, an interpreter evaluates each successive command.  The
+first word identifies a procedure, and the remaining words are passed to that
+procedure for further evaluation.  The procedure interprets each argument in
+its own way, e.g. as an integer, variable name, list, mathematical expression,
+script, or in some other arbitrary way.  The result of the last command is the
+result of the script.
+.
+.IP "[8] \fBCommand substitution.\fR"
+Each pair of brackets
 .PQ [
-then Tcl performs \fIcommand substitution\fR.
-To do this it invokes the Tcl interpreter recursively to process
-the characters following the open bracket as a Tcl script.
-The script may contain any number of commands and must be terminated
-by a close bracket
-.PQ ] "" .
-The result of the script (i.e. the result of its last command) is
-substituted into the word in place of the brackets and all of the
-characters between them.
-There may be any number of command substitutions in a single word.
-Command substitution is not performed on words enclosed in braces.
-.IP "[8] \fBVariable substitution.\fR"
-If a word contains a dollar-sign
+and 
+.PQ ] ""
+encloses a script and is replaced by the result of that script.
+.IP "[9] \fBVariable substitution.\fR"
+Each of the following forms begins with dollar sign
 .PQ $
-followed by one of the forms
-described below, then Tcl performs \fIvariable
-substitution\fR:  the dollar-sign and the following characters are
-replaced in the word by the value of a variable.
-Variable substitution may take any of the following forms:
+and is replaced by the value of the identified variable.  \fIname\fR names the
+variable and is composed of ASCII letters (\fBA\fR\(en\fBZ\fR and
+\fBa\fR\(en\fBz\fR), digits (\fB0\fR\(en\fB9\fR), underscores, or namespace
+delimiters (two or more colons).  \fIindex\fR is the name of an individual
+variable within an array variable, and may be empty.
 .RS
 .TP 15
 \fB$\fIname\fR
 .
-\fIName\fR is the name of a scalar variable;  the name is a sequence
-of one or more characters that are a letter, digit, underscore,
-or namespace separators (two or more colons).
-Letters and digits are \fIonly\fR the standard ASCII ones (\fB0\fR\(en\fB9\fR,
-\fBA\fR\(en\fBZ\fR and \fBa\fR\(en\fBz\fR).
+\fIname\fR may not be empty.
+
 .TP 15
 \fB$\fIname\fB(\fIindex\fB)\fR
 .
-\fIName\fR gives the name of an array variable and \fIindex\fR gives
-the name of an element within that array.
-\fIName\fR must contain only letters, digits, underscores, and
-namespace separators, and may be an empty string.
-Letters and digits are \fIonly\fR the standard ASCII ones (\fB0\fR\(en\fB9\fR,
-\fBA\fR\(en\fBZ\fR and \fBa\fR\(en\fBz\fR).
-Command substitutions, variable substitutions, and backslash
-substitutions are performed on the characters of \fIindex\fR.
+\fIname\fR may be empty.  Substitutions are performed on \fIindex\fR.
 .TP 15
 \fB${\fIname\fB}\fR
+\fIname\fR may be empty.
+.TP 15
+\fB${\fIname(index)\fB}\fR
 .
-\fIName\fR is the name of a scalar variable or array element.  It may contain
-any characters whatsoever except for close braces.  It indicates an array
-element if \fIname\fR is in the form
-.QW \fIarrayName\fB(\fIindex\fB)\fR
-where \fIarrayName\fR does not contain any open parenthesis characters,
-.QW \fB(\fR ,
-or close brace characters,
-.QW \fB}\fR ,
-and \fIindex\fR can be any sequence of characters except for close brace
-characters.  No further
-substitutions are performed during the parsing of \fIname\fR.
-.PP
-There may be any number of variable substitutions in a single word.
-Variable substitution is not performed on words enclosed in braces.
-.PP
-Note that variables may contain character sequences other than those listed
-above, but in that case other mechanisms must be used to access them (e.g.,
-via the \fBset\fR command's single-argument form).
+\fIname\fR may be empty. No substitutions are performed.
 .RE
-.IP "[9] \fBBackslash substitution.\fR"
-If a backslash
+Variables that are not accessible through one of the forms above may be
+accessed through other mechanisms, e.g. the \fBset\fR command.
+.IP "[10] \fBBackslash substitution.\fR"
+Each backslash
 .PQ \e
-appears within a word then \fIbackslash substitution\fR occurs.
-In all cases but those described below the backslash is dropped and
-the following character is treated as an ordinary
-character and included in the word.
-This allows characters such as double quotes, close brackets,
-and dollar signs to be included in words without triggering
-special processing.
-The following table lists the backslash sequences that are
-handled specially, along with the value that replaces each sequence.
+that is not part of one of the forms listed below is removed, and the next
+character is included in the word verbatim, which allows the inclusion of
+characters that would normally be interpreted, namely whitespace, braces,
+brackets, double quote, dollar sign, and backslash.  The following sequences
+are replaced as described:
 .RS
 .RS
 .RS
 .TP 7
 \e\fBa\fR
-Audible alert (bell) (Unicode U+000007).
+Audible alert (bell) (U+7).
 .TP 7
 \e\fBb\fR
-Backspace (Unicode U+000008).
+Backspace (U+8).
 .TP 7
 \e\fBf\fR
-Form feed (Unicode U+00000C).
+Form feed (U+C).
 .TP 7
 \e\fBn\fR
-Newline (Unicode U+00000A).
+Newline (U+A).
 .TP 7
 \e\fBr\fR
-Carriage-return (Unicode U+00000D).
+Carriage-return (U+D).
 .TP 7
 \e\fBt\fR
-Tab (Unicode U+000009).
+Tab (U+9).
 .TP 7
 \e\fBv\fR
-Vertical tab (Unicode U+00000B).
+Vertical tab (U+B).
 .TP 7
 \e\fB<newline>\fIwhiteSpace\fR
 .
-A single space character replaces the backslash, newline, and all spaces
-and tabs after the newline.  This backslash sequence is unique in that it
-is replaced in a separate pre-pass before the command is actually parsed.
-This means that it will be replaced even when it occurs between braces,
-and the resulting space will be treated as a word separator if it is not
-in braces or quotes.
+Newline preceded by an odd number of backslashes, along with the consecutive
+spaces and tabs that immediately follow it, is replaced by a single space.
+Because this happens before the command is split into words, it occurs even
+within braced words, and if the resulting space may subsequently be treated as
+a word delimiter.
 .TP 7
 \e\e
 Backslash
@@ -195,78 +170,30 @@ Backslash
 .TP 7
 \e\fIooo\fR
 .
-The digits \fIooo\fR (one, two, or three of them) give a eight-bit octal
-value for the Unicode character that will be inserted, in the range
-\fI000\fR\(en\fI377\fR (i.e., the range U+000000\(enU+0000FF).
-The parser will stop just before this range overflows, or when
-the maximum of three digits is reached.  The upper bits of the Unicode
-character will be 0.
+Up to three octal digits form an eight-bit value for a Unicode character in the
+range \fI0\fR\(en\fI377\fR, i.e. U+0\(enU+FF.  Only the digits that result in a
+number in this range are consumed.
 .TP 7
 \e\fBx\fIhh\fR
 .
-The hexadecimal digits \fIhh\fR (one or two of them) give an eight-bit
-hexadecimal value for the Unicode character that will be inserted.  The upper
-bits of the Unicode character will be 0 (i.e., the character will be in the
-range U+000000\(enU+0000FF).
+Up to two hexadecimal digits form an eight-bit value for a Unicode character in
+the range \fI0\fR\(en\fIFF\fR.
 .TP 7
 \e\fBu\fIhhhh\fR
 .
-The hexadecimal digits \fIhhhh\fR (one, two, three, or four of them) give a
-sixteen-bit hexadecimal value for the Unicode character that will be
-inserted.  The upper bits of the Unicode character will be 0 (i.e., the
-character will be in the range U+000000\(enU+00FFFF).
+Up to four hexadecimal digits form a 16-bit value for a Unicode character in
+the range \fI0\fR\(en\fIFFFF\fR.
 .TP 7
 \e\fBU\fIhhhhhhhh\fR
 .
-The hexadecimal digits \fIhhhhhhhh\fR (one up to eight of them) give a
-twenty-one-bit hexadecimal value for the Unicode character that will be
-inserted, in the range U+000000\(enU+10FFFF.  The parser will stop just
-before this range overflows, or when the maximum of eight digits
-is reached.  The upper bits of the Unicode character will be 0.
-.RE
+Up to eight hexadecimal digits form a 21-bit value for a Unicode character in
+the range \fI0\fR\(en\fI10FFFF\fR.  Only the digits that result in a number in
+this range are consumed.
 .RE
-.PP
-Backslash substitution is not performed on words enclosed in braces,
-except for backslash-newline as described above.
 .RE
-.IP "[10] \fBComments.\fR"
-If a hash character
-.PQ #
-appears at a point where Tcl is
-expecting the first character of the first word of a command,
-then the hash character and the characters that follow it, up
-through the next newline, are treated as a comment and ignored.
-The comment character only has significance when it appears
-at the beginning of a command.
-.IP "[11] \fBOrder of substitution.\fR"
-Each character is processed exactly once by the Tcl interpreter
-as part of creating the words of a command.
-For example, if variable substitution occurs then no further
-substitutions are performed on the value of the variable;  the
-value is inserted into the word verbatim.
-If command substitution occurs then the nested command is
-processed entirely by the recursive call to the Tcl interpreter;
-no substitutions are performed before making the recursive
-call and no additional substitutions are performed on the result
-of the nested script.
-.RS
 .PP
-Substitutions take place from left to right, and each substitution is
-evaluated completely before attempting to evaluate the next.  Thus, a
-sequence like
-.PP
-.CS
-set y [set x 0][incr x][incr x]
-.CE
-.PP
-will always set the variable \fIy\fR to the value, \fI012\fR.
 .RE
-.IP "[12] \fBSubstitution and word boundaries.\fR"
-Substitutions do not affect the word boundaries of a command,
-except for argument expansion as specified in rule [5].
-For example, during variable substitution the entire value of
-the variable becomes part of a single word, even if the variable's
-value contains spaces.
+.
 .SH KEYWORDS
 backslash, command, comment, script, substitution, variable
 '\" Local Variables:
-- 
cgit v0.12


From 57d266423a5638cbedc01dc406d5af47a146ca20 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 28 Feb 2023 10:13:25 +0000
Subject: Make the descriptions in doc/Tcl.n more concise and intuitive.

---
 doc/Tcl.n | 315 ++++++++++++++++++++++++--------------------------------------
 1 file changed, 121 insertions(+), 194 deletions(-)

diff --git a/doc/Tcl.n b/doc/Tcl.n
index 0f784af..d13f3ea 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.n
@@ -1,6 +1,7 @@
 '\"
 '\" Copyright (c) 1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
+'\" Copyright (c) 2023 Nathan Coulter
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -16,178 +17,152 @@ Summary of Tcl language syntax.
 .SH DESCRIPTION
 .PP
 The following rules define the syntax and semantics of the Tcl language:
-.IP "[1] \fBCommands.\fR"
-A Tcl script is a string containing one or more commands.
-Semi-colons and newlines are command separators unless quoted as
-described below.
-Close brackets are command terminators during command substitution
-(see below) unless quoted.
-.IP "[2] \fBEvaluation.\fR"
-A command is evaluated in two steps.
-First, the Tcl interpreter breaks the command into \fIwords\fR
-and performs substitutions as described below.
-These substitutions are performed in the same way for all
-commands.
-Secondly, the first word is used to locate a routine to
-carry out the command, and the remaining words of the command are
-passed to that routine.
-The routine is free to interpret each of its words
-in any way it likes, such as an integer, variable name, list,
-or Tcl script.
-Different commands interpret their words differently.
-.IP "[3] \fBWords.\fR"
-Words of a command are separated by white space (except for
-newlines, which are command separators).
-.IP "[4] \fBDouble quotes.\fR"
-If the first character of a word is double-quote
+.
+.IP "[1] \fBScript.\fR"
+A script is composed of zero or more commands delimited by semi-colons or
+newlines.
+.IP "[2] \fBCommand.\fR"
+A command is composed of zero or more words delimited by whitespace.  The
+replacement for a substitution is included verbatim in the word. For example, a
+space in the replacement is included in the word rather than becoming a
+delimiter, and \fI\\\\\fR becomes a single backslash in the word.  Each word is
+processed from left to right and each substitution is performed as soon as it
+is complete.
+For example, the command
+.RS
+.PP
+.CS
+set y [set x 0][incr x][incr x]
+.CE
+.PP
+is composed of three words, and sets the value of \fIy\fR to \fI012\fR.
+.PP
+If hash
+.PQ #
+is the first character of what would otherwise be the first word of a command,
+all characters up to the next newline are ignored.
+.RE
+.
+.IP "[3] \fBBraced word.\fR"
+If a word is enclosed in braces
+.PQ {
+and
+.PQ } ""
+, the braces are removed and the enclosed characters become the word.  No
+substitutions are performed.  Nested pairs of braces may occur within the word.
+A brace preceded by an odd number of backslashes is not considered part of a
+pair, and neither brace nor the backslashes are removed from the word.
+.
+.IP "[4] \fBQuoted word.\fR"
+If a word is enclosed in double quotes
 .PQ \N'34'
-then the word is terminated by the next double-quote character.
-If semi-colons, close brackets, or white space characters
-(including newlines) appear between the quotes then they are treated
-as ordinary characters and included in the word.
-Command substitution, variable substitution, and backslash substitution
-are performed on the characters between the quotes as described below.
-The double-quotes are not retained as part of the word.
-.IP "[5] \fBArgument expansion.\fR"
-If a word starts with the string
-.QW {*}
-followed by a non-whitespace character, then the leading
+, the double quotes are removed and the enclosed characters become the word.
+Substitutions are performed.
+.
+.IP "[5] \fBList.\fR"
+A list has the form of a single command.  Newline is whitespace, and semicolon
+has no special interpretation.  There is no script evaluation so there is no
+argument expansion, variable substitution, or command substitution: Dollar-sign
+and open bracket have no special interpretation, and what would be argument
+expansion in a script is invalid in a list.
+.
+.IP "[6] \fBArgument expansion.\fR"
+If
 .QW {*}
-is removed and the rest of the word is parsed and substituted as any other
-word. After substitution, the word is parsed as a list (without command or
-variable substitutions; backslash substitutions are performed as is normal for
-a list and individual internal words may be surrounded by either braces or
-double-quote characters), and its words are added to the command being
-substituted. For instance,
-.QW "cmd a {*}{b [c]} d {*}{$e f {g h}}"
+prefixes a word, it is removed.  After any remaining enclosing braces or quotes
+are processed and applicable substitutions performed, the word, which must
+be a list, is removed from the command, and in its place each word in the
+list becomes an additional word in the command.  For example,
+.CS
+cmd a {*}{b [c]} d {*}{$e f {g h}}
+.CE
 is equivalent to
-.QW "cmd a b {[c]} d {$e} f {g h}" .
-.IP "[6] \fBBraces.\fR"
-If the first character of a word is an open brace
-.PQ {
-and rule [5] does not apply, then
-the word is terminated by the matching close brace
-.PQ } "" .
-Braces nest within the word: for each additional open
-brace there must be an additional close brace (however,
-if an open brace or close brace within the word is
-quoted with a backslash then it is not counted in locating the
-matching close brace).
-No substitutions are performed on the characters between the
-braces except for backslash-newline substitutions described
-below, nor do semi-colons, newlines, close brackets,
-or white space receive any special interpretation.
-The word will consist of exactly the characters between the
-outer braces, not including the braces themselves.
-.IP "[7] \fBCommand substitution.\fR"
-If a word contains an open bracket
+.CS
+cmd a b {[c]} d {$e} f {g h} .
+.CE
+.
+.IP "[7] \fBEvaluation.\fR"
+To evaluate a script, an interpreter evaluates each successive command.  The
+first word identifies a procedure, and the remaining words are passed to that
+procedure for further evaluation.  The procedure interprets each argument in
+its own way, e.g. as an integer, variable name, list, mathematical expression,
+script, or in some other arbitrary way.  The result of the last command is the
+result of the script.
+.
+.IP "[8] \fBCommand substitution.\fR"
+Each pair of brackets
 .PQ [
-then Tcl performs \fIcommand substitution\fR.
-To do this it invokes the Tcl interpreter recursively to process
-the characters following the open bracket as a Tcl script.
-The script may contain any number of commands and must be terminated
-by a close bracket
-.PQ ] "" .
-The result of the script (i.e. the result of its last command) is
-substituted into the word in place of the brackets and all of the
-characters between them.
-There may be any number of command substitutions in a single word.
-Command substitution is not performed on words enclosed in braces.
-.IP "[8] \fBVariable substitution.\fR"
-If a word contains a dollar-sign
+and 
+.PQ ] ""
+encloses a script and is replaced by the result of that script.
+.IP "[9] \fBVariable substitution.\fR"
+Each of the following forms begins with dollar sign
 .PQ $
-followed by one of the forms
-described below, then Tcl performs \fIvariable
-substitution\fR:  the dollar-sign and the following characters are
-replaced in the word by the value of a variable.
-Variable substitution may take any of the following forms:
+and is replaced by the value of the identified variable.  \fIname\fR names the
+variable and is composed of ASCII letters (\fBA\fR\(en\fBZ\fR and
+\fBa\fR\(en\fBz\fR), digits (\fB0\fR\(en\fB9\fR), underscores, or namespace
+delimiters (two or more colons).  \fIindex\fR is the name of an individual
+variable within an array variable, and may be empty.
 .RS
 .TP 15
 \fB$\fIname\fR
 .
-\fIName\fR is the name of a scalar variable;  the name is a sequence
-of one or more characters that are a letter, digit, underscore,
-or namespace separators (two or more colons).
-Letters and digits are \fIonly\fR the standard ASCII ones (\fB0\fR\(en\fB9\fR,
-\fBA\fR\(en\fBZ\fR and \fBa\fR\(en\fBz\fR).
+\fIname\fR may not be empty.
+
 .TP 15
 \fB$\fIname\fB(\fIindex\fB)\fR
 .
-\fIName\fR gives the name of an array variable and \fIindex\fR gives
-the name of an element within that array.
-\fIName\fR must contain only letters, digits, underscores, and
-namespace separators, and may be an empty string.
-Letters and digits are \fIonly\fR the standard ASCII ones (\fB0\fR\(en\fB9\fR,
-\fBA\fR\(en\fBZ\fR and \fBa\fR\(en\fBz\fR).
-Command substitutions, variable substitutions, and backslash
-substitutions are performed on the characters of \fIindex\fR.
+\fIname\fR may be empty.  Substitutions are performed on \fIindex\fR.
 .TP 15
 \fB${\fIname\fB}\fR
+\fIname\fR may be empty.
+.TP 15
+\fB${\fIname(index)\fB}\fR
 .
-\fIName\fR is the name of a scalar variable or array element.  It may contain
-any characters whatsoever except for close braces.  It indicates an array
-element if \fIname\fR is in the form
-.QW \fIarrayName\fB(\fIindex\fB)\fR
-where \fIarrayName\fR does not contain any open parenthesis characters,
-.QW \fB(\fR ,
-or close brace characters,
-.QW \fB}\fR ,
-and \fIindex\fR can be any sequence of characters except for close brace
-characters.  No further
-substitutions are performed during the parsing of \fIname\fR.
-.PP
-There may be any number of variable substitutions in a single word.
-Variable substitution is not performed on words enclosed in braces.
-.PP
-Note that variables may contain character sequences other than those listed
-above, but in that case other mechanisms must be used to access them (e.g.,
-via the \fBset\fR command's single-argument form).
+\fIname\fR may be empty. No substitutions are performed.
 .RE
-.IP "[9] \fBBackslash substitution.\fR"
-If a backslash
+Variables that are not accessible through one of the forms above may be
+accessed through other mechanisms, e.g. the \fBset\fR command.
+.IP "[10] \fBBackslash substitution.\fR"
+Each backslash
 .PQ \e
-appears within a word then \fIbackslash substitution\fR occurs.
-In all cases but those described below the backslash is dropped and
-the following character is treated as an ordinary
-character and included in the word.
-This allows characters such as double quotes, close brackets,
-and dollar signs to be included in words without triggering
-special processing.
-The following table lists the backslash sequences that are
-handled specially, along with the value that replaces each sequence.
+that is not part of one of the forms listed below is removed, and the next
+character is included in the word verbatim, which allows the inclusion of
+characters that would normally be interpreted, namely whitespace, braces,
+brackets, double quote, dollar sign, and backslash.  The following sequences
+are replaced as described:
 .RS
 .RS
 .RS
 .TP 7
 \e\fBa\fR
-Audible alert (bell) (Unicode U+000007).
+Audible alert (bell) (U+7).
 .TP 7
 \e\fBb\fR
-Backspace (Unicode U+000008).
+Backspace (U+8).
 .TP 7
 \e\fBf\fR
-Form feed (Unicode U+00000C).
+Form feed (U+C).
 .TP 7
 \e\fBn\fR
-Newline (Unicode U+00000A).
+Newline (U+A).
 .TP 7
 \e\fBr\fR
-Carriage-return (Unicode U+00000D).
+Carriage-return (U+D).
 .TP 7
 \e\fBt\fR
-Tab (Unicode U+000009).
+Tab (U+9).
 .TP 7
 \e\fBv\fR
-Vertical tab (Unicode U+00000B).
+Vertical tab (U+B).
 .TP 7
 \e\fB<newline>\fIwhiteSpace\fR
 .
-A single space character replaces the backslash, newline, and all spaces
-and tabs after the newline.  This backslash sequence is unique in that it
-is replaced in a separate pre-pass before the command is actually parsed.
-This means that it will be replaced even when it occurs between braces,
-and the resulting space will be treated as a word separator if it is not
-in braces or quotes.
+Newline preceded by an odd number of backslashes, along with the consecutive
+spaces and tabs that immediately follow it, is replaced by a single space.
+Because this happens before the command is split into words, it occurs even
+within braced words, and if the resulting space may subsequently be treated as
+a word delimiter.
 .TP 7
 \e\e
 Backslash
@@ -195,78 +170,30 @@ Backslash
 .TP 7
 \e\fIooo\fR
 .
-The digits \fIooo\fR (one, two, or three of them) give a eight-bit octal
-value for the Unicode character that will be inserted, in the range
-\fI000\fR\(en\fI377\fR (i.e., the range U+000000\(enU+0000FF).
-The parser will stop just before this range overflows, or when
-the maximum of three digits is reached.  The upper bits of the Unicode
-character will be 0.
+Up to three octal digits form an eight-bit value for a Unicode character in the
+range \fI0\fR\(en\fI377\fR, i.e. U+0\(enU+FF.  Only the digits that result in a
+number in this range are consumed.
 .TP 7
 \e\fBx\fIhh\fR
 .
-The hexadecimal digits \fIhh\fR (one or two of them) give an eight-bit
-hexadecimal value for the Unicode character that will be inserted.  The upper
-bits of the Unicode character will be 0 (i.e., the character will be in the
-range U+000000\(enU+0000FF).
+Up to two hexadecimal digits form an eight-bit value for a Unicode character in
+the range \fI0\fR\(en\fIFF\fR.
 .TP 7
 \e\fBu\fIhhhh\fR
 .
-The hexadecimal digits \fIhhhh\fR (one, two, three, or four of them) give a
-sixteen-bit hexadecimal value for the Unicode character that will be
-inserted.  The upper bits of the Unicode character will be 0 (i.e., the
-character will be in the range U+000000\(enU+00FFFF).
+Up to four hexadecimal digits form a 16-bit value for a Unicode character in
+the range \fI0\fR\(en\fIFFFF\fR.
 .TP 7
 \e\fBU\fIhhhhhhhh\fR
 .
-The hexadecimal digits \fIhhhhhhhh\fR (one up to eight of them) give a
-twenty-one-bit hexadecimal value for the Unicode character that will be
-inserted, in the range U+000000\(enU+10FFFF.  The parser will stop just
-before this range overflows, or when the maximum of eight digits
-is reached.  The upper bits of the Unicode character will be 0.
-.RE
+Up to eight hexadecimal digits form a 21-bit value for a Unicode character in
+the range \fI0\fR\(en\fI10FFFF\fR.  Only the digits that result in a number in
+this range are consumed.
 .RE
-.PP
-Backslash substitution is not performed on words enclosed in braces,
-except for backslash-newline as described above.
 .RE
-.IP "[10] \fBComments.\fR"
-If a hash character
-.PQ #
-appears at a point where Tcl is
-expecting the first character of the first word of a command,
-then the hash character and the characters that follow it, up
-through the next newline, are treated as a comment and ignored.
-The comment character only has significance when it appears
-at the beginning of a command.
-.IP "[11] \fBOrder of substitution.\fR"
-Each character is processed exactly once by the Tcl interpreter
-as part of creating the words of a command.
-For example, if variable substitution occurs then no further
-substitutions are performed on the value of the variable;  the
-value is inserted into the word verbatim.
-If command substitution occurs then the nested command is
-processed entirely by the recursive call to the Tcl interpreter;
-no substitutions are performed before making the recursive
-call and no additional substitutions are performed on the result
-of the nested script.
-.RS
 .PP
-Substitutions take place from left to right, and each substitution is
-evaluated completely before attempting to evaluate the next.  Thus, a
-sequence like
-.PP
-.CS
-set y [set x 0][incr x][incr x]
-.CE
-.PP
-will always set the variable \fIy\fR to the value, \fI012\fR.
 .RE
-.IP "[12] \fBSubstitution and word boundaries.\fR"
-Substitutions do not affect the word boundaries of a command,
-except for argument expansion as specified in rule [5].
-For example, during variable substitution the entire value of
-the variable becomes part of a single word, even if the variable's
-value contains spaces.
+.
 .SH KEYWORDS
 backslash, command, comment, script, substitution, variable
 '\" Local Variables:
-- 
cgit v0.12


From bb2f06fc739eb91a9f1499fbfbc4fa346172660e Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 28 Feb 2023 11:42:15 +0000
Subject: Reverted [d156af9fb76dd2f4] and removed tests io-52.20 io-75.6
 io-75.7, as this commit, intended to fix issue [b8f575aa2398b0e4], breaks the
 semantics of [read] and [gets].  Such a change would require an accepted TIP.
 See [b8f575aa2398b0e4] for further discussion.

jn: @pouryorick See [b8f575aa2398b0e4] for the reason why this commit is not appropriate: It gets core-8-branch back in the buggy state it was, without even providing a real solution everyone agrees on. You shouldn't revert my patch just because I reverted yours.

pooryorick:  As I explained, the reason for this reversion is that it hard-codes an unapproved change in the semantics of [read] and [gets] into the test suite.  Jan, your statement that it's a "revenge" reversion is false.  I spent a month trying to find some alternative to this reversion before actually performing it.  A commit that codifes in its tests changes in semantcs to [read]/[gets] simply shouldn't be on core-8-branch.
---
 generic/tclIO.c |  4 ++--
 tests/io.test   | 63 ---------------------------------------------------------
 2 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 2e0cd1f..c96a406 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7588,7 +7588,7 @@ Tcl_Eof(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of real channel structure. */
 
-    return (GotFlag(statePtr, CHANNEL_EOF) && !GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) ? 1 : 0;
+    return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0;
 }
 
 /*
@@ -8283,7 +8283,7 @@ Tcl_SetChannelOption(
 	statePtr->inputEncodingFlags = TCL_ENCODING_START;
 	statePtr->outputEncodingState = NULL;
 	statePtr->outputEncodingFlags = TCL_ENCODING_START;
-	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
+	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
diff --git a/tests/io.test b/tests/io.test
index 865ff7e..6821ff3 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7609,27 +7609,6 @@ test io-52.19 {coverage of eofChar handling} {
     close $out
     file size $path(test2)
 } 8
-test io-52.20 {TclCopyChannel & encodings} -setup {
-    set out [open $path(utf8-fcopy.txt) w]
-    fconfigure $out -encoding utf-8 -translation lf
-    puts $out "Á"
-    close $out
-} -constraints {fcopy} -body {
-    # binary to encoding => the input has to be
-    # in utf-8 to make sense to the encoder
-
-    set in  [open $path(utf8-fcopy.txt) r]
-    set out [open $path(kyrillic.txt) w]
-
-    # Using "-encoding ascii" means reading the "Á" gives an error
-    fconfigure $in  -encoding ascii -strictencoding 1
-    fconfigure $out -encoding koi8-r -translation lf
-
-    fcopy $in $out
-} -cleanup {
-    close $in
-    close $out
-} -returnCodes 1 -match glob -result {error reading "file*": illegal byte sequence}
 test io-52.21 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -9143,48 +9122,6 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-nocomplainencoding 1)} -s
     removeFile io-75.5
 } -result 4181
 
-test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
-    set fn [makeFile {} io-75.6]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # \x81 is invalid in utf-8
-    puts -nonewline $f A\x81
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
-} -body {
-    set d [read $f]
-    binary scan $d H* hd
-    lappend hd [catch {read $f} msg]
-    close $f
-    lappend hd $msg
-} -cleanup {
-    removeFile io-75.6
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
-
-test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
-    set fn [makeFile {} io-75.7]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # \xA1 is invalid in utf-8. -eofchar is not detected, because it comes later.
-    puts -nonewline $f A\xA1\x1A
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
-} -body {
-    set d [read $f]
-    binary scan $d H* hd
-    lappend hd [eof $f]
-    lappend hd [catch {read $f} msg]
-    lappend hd $msg
-    fconfigure $f -encoding iso8859-1
-    lappend hd [read $f];# We changed encoding, so now we can read the \xA1
-    close $f
-    set hd
-} -cleanup {
-    removeFile io-75.7
-} -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
-
 test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
-- 
cgit v0.12


From 7661972907da4bc9f9d49d64cf6db1c0748936f9 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 28 Feb 2023 11:57:03 +0000
Subject: Reverted [d156af9fb76dd2f4] and removed tests io-52.20 io-75.6
 io-75.7, as this commit, intended to fix issue [b8f575aa2398b0e4], breaks the
 semantics of [read] and [gets].  Such a change would require an accepted TIP.
 See [b8f575aa2398b0e4] for further discussion.

jn: @pouryorick See [b8f575aa2398b0e4] for the reason why this commit is not appropriate: It gets core-8-branch back in the buggy state it was, without even providing a real solution everyone agrees on. You shouldn't revert my patch just because I reverted yours.

pooryorick:  As I explained, the reason for this reversion is that it hard-codes an unapproved change in the semantics of [read] and [gets] into the test suite.  Jan, your statement that it's a "revenge" reversion is false.  I spent a month trying to find some alternative to this reversion before actually performing it.  A commit that codifes in its tests changes in semantcs to [read]/[gets] simply shouldn't be on core-8-branch.
---
 generic/tclIO.c |  4 ++--
 tests/io.test   | 63 ---------------------------------------------------------
 2 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 768a5c5..36889c7 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7552,7 +7552,7 @@ Tcl_Eof(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of real channel structure. */
 
-    return (GotFlag(statePtr, CHANNEL_EOF) && !GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) ? 1 : 0;
+    return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0;
 }
 
 /*
@@ -8223,7 +8223,7 @@ Tcl_SetChannelOption(
 	statePtr->inputEncodingFlags = TCL_ENCODING_START;
 	statePtr->outputEncodingState = NULL;
 	statePtr->outputEncodingFlags = TCL_ENCODING_START;
-	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
+	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
diff --git a/tests/io.test b/tests/io.test
index c245add..59b6c66 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7692,27 +7692,6 @@ test io-52.19 {coverage of eofChar handling} {
     close $out
     file size $path(test2)
 } 8
-test io-52.20 {TclCopyChannel & encodings} -setup {
-    set out [open $path(utf8-fcopy.txt) w]
-    fconfigure $out -encoding utf-8 -translation lf
-    puts $out "Á"
-    close $out
-} -constraints {fcopy} -body {
-    # binary to encoding => the input has to be
-    # in utf-8 to make sense to the encoder
-
-    set in  [open $path(utf8-fcopy.txt) r]
-    set out [open $path(kyrillic.txt) w]
-
-    # Using "-encoding ascii" means reading the "Á" gives an error
-    fconfigure $in  -encoding ascii -strictencoding 1
-    fconfigure $out -encoding koi8-r -translation lf
-
-    fcopy $in $out
-} -cleanup {
-    close $in
-    close $out
-} -returnCodes 1 -match glob -result {error reading "file*": illegal byte sequence}
 test io-52.21 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -9223,48 +9202,6 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-nocomplainencoding 1)} -s
     removeFile io-75.5
 } -result 4181
 
-test io-75.6 {invalid utf-8 encoding read is not ignored (-strictencoding 1)} -setup {
-    set fn [makeFile {} io-75.6]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # \x81 is invalid in utf-8
-    puts -nonewline $f A\x81
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -strictencoding 1
-} -body {
-    set d [read $f]
-    binary scan $d H* hd
-    lappend hd [catch {read $f} msg]
-    close $f
-    lappend hd $msg
-} -cleanup {
-    removeFile io-75.6
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
-
-test io-75.7 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
-    set fn [makeFile {} io-75.7]
-    set f [open $fn w+]
-    fconfigure $f -encoding binary
-    # \xA1 is invalid in utf-8. -eofchar is not detected, because it comes later.
-    puts -nonewline $f A\xA1\x1A
-    flush $f
-    seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -strictencoding 1
-} -body {
-    set d [read $f]
-    binary scan $d H* hd
-    lappend hd [eof $f]
-    lappend hd [catch {read $f} msg]
-    lappend hd $msg
-    fconfigure $f -encoding iso8859-1
-    lappend hd [read $f];# We changed encoding, so now we can read the \xA1
-    close $f
-    set hd
-} -cleanup {
-    removeFile io-75.7
-} -match glob -result {41 0 1 {error reading "*": illegal byte sequence} ¡}
-
 test io-75.8 {invalid utf-8 encoding eof handling (-strictencoding 1)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
-- 
cgit v0.12


From 70e40dd53dda7e7fca32fc8aec28cf6504e7ffec Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 28 Feb 2023 12:16:10 +0000
Subject: Restore previous behavior for non-blocking mode, as for this mode the
 semantics of [read]/[gets] were not broken. This was the 'some agreement'.
 The change in line 8286 is necessary for both blocking and non-blocking mode:
 Whenver the encoding change we need to reset the CHANNEL_ENCODING_ERROR flag.

---
 generic/tclIO.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index c96a406..ae09690 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7588,6 +7588,10 @@ Tcl_Eof(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of real channel structure. */
 
+    if (GotFlag(statePtr, CHANNEL_NONBLOCKING)
+	    && GotFlag(statePtr, CHANNEL_ENCODING_ERROR) {
+	return 0;
+    }
     return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0;
 }
 
@@ -8283,7 +8287,7 @@ Tcl_SetChannelOption(
 	statePtr->inputEncodingFlags = TCL_ENCODING_START;
 	statePtr->outputEncodingState = NULL;
 	statePtr->outputEncodingFlags = TCL_ENCODING_START;
-	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA);
+	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
-- 
cgit v0.12


From 1eac8ab060855f0454c234be78839a46d8a9241e Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 28 Feb 2023 12:25:34 +0000
Subject: Move setting of profile in flags parameter to lower level functions
 in case they are called directly

---
 generic/tclCmdAH.c    | 11 +++--------
 generic/tclEncoding.c | 19 +++++++++++++++----
 generic/tclInt.h      |  2 +-
 generic/tclTestObj.c  |  2 +-
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 19a5bc3..ff0d00f 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -611,16 +611,11 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 	    }
 	    switch (optIndex) {
 	    case PROFILE:
-		if (TclEncodingProfileNameToId(
-			interp, Tcl_GetString(objv[argIndex]), &profile)
-		    != TCL_OK) {
+		if (TclEncodingProfileNameToId(interp,
+					       Tcl_GetString(objv[argIndex]),
+					       &profile) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-#ifdef NOTNEEDED
-		/* TODO - next line probably not needed as the conversion
-		   functions already take care of mapping profile to flags */
-		profile = TclEncodingExternalFlagsToInternal(profile);
-#endif
 		break;
 	    case FAILINDEX:
 		failVarObj = objv[argIndex];
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 00ca5e8..05d231f 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1301,7 +1301,6 @@ Tcl_ExternalToUtfDStringEx(
 	srcLen = encodingPtr->lengthProc(src);
     }
 
-    flags = TclEncodingExternalFlagsToInternal(flags);
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
 	flags |= ENCODING_INPUT;
@@ -1596,7 +1595,6 @@ Tcl_UtfToExternalDStringEx(
 	srcLen = strlen(src);
     }
 
-    flags = TclEncodingExternalFlagsToInternal(flags);
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     while (1) {
 	result = encodingPtr->fromUtfProc(encodingPtr->clientData, src,
@@ -2432,6 +2430,7 @@ BinaryProc(
     if (dstLen < 0) {
 	dstLen = 0;
     }
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_CHAR_LIMIT) && srcLen > *dstCharsPtr) {
 	srcLen = *dstCharsPtr;
     }
@@ -2499,6 +2498,7 @@ UtfToUtfProc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= 6;
     }
@@ -2721,6 +2721,7 @@ Utf32ToUtfProc(
     int result, numChars, charLimit = INT_MAX;
     int ch = 0, bytesLeft = srcLen % 4;
 
+    flags = TclEncodingSetProfileFlags(flags);
     flags |= PTR2INT(clientData);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
@@ -2874,6 +2875,7 @@ UtfToUtf32Proc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -2971,6 +2973,7 @@ Utf16ToUtfProc(
     int result, numChars, charLimit = INT_MAX;
     unsigned short ch = 0;
 
+    flags = TclEncodingSetProfileFlags(flags);
     flags |= PTR2INT(clientData);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
@@ -3110,6 +3113,7 @@ UtfToUtf16Proc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -3215,6 +3219,7 @@ UtfToUcs2Proc(
     int result, numChars, len;
     Tcl_UniChar ch = 0;
 
+    flags = TclEncodingSetProfileFlags(flags);
     flags |= PTR2INT(clientData);
     srcStart = src;
     srcEnd = src + srcLen;
@@ -3337,6 +3342,7 @@ TableToUtfProc(
     const unsigned short *pageZero;
     TableEncodingData *dataPtr = (TableEncodingData *)clientData;
 
+    flags = TclEncodingSetProfileFlags(flags);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
     }
@@ -3464,6 +3470,7 @@ TableFromUtfProc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -3570,6 +3577,7 @@ Iso88591ToUtfProc(
     const char *dstEnd, *dstStart;
     int result, numChars, charLimit = INT_MAX;
 
+    flags = TclEncodingSetProfileFlags(flags);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
     }
@@ -3654,6 +3662,7 @@ Iso88591FromUtfProc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -3801,6 +3810,7 @@ EscapeToUtfProc(
     int state, result, numChars, charLimit = INT_MAX;
     const char *dstStart, *dstEnd;
 
+    flags = TclEncodingSetProfileFlags(flags);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
 	charLimit = *dstCharsPtr;
     }
@@ -4024,6 +4034,7 @@ EscapeFromUtfProc(
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
+    flags = TclEncodingSetProfileFlags(flags);
     if ((flags & TCL_ENCODING_END) == 0) {
 	srcClose -= TCL_UTF_MAX;
     }
@@ -4463,7 +4474,7 @@ TclEncodingProfileIdToName(
 /*
  *------------------------------------------------------------------------
  *
- * TclEncodingExternalFlagsToInternal --
+ * TclEncodingSetProfileFlags --
  *
  *	Maps the flags supported in the encoding C API's to internal flags.
  *
@@ -4482,7 +4493,7 @@ TclEncodingProfileIdToName(
  *
  *------------------------------------------------------------------------
  */
-int TclEncodingExternalFlagsToInternal(int flags)
+int TclEncodingSetProfileFlags(int flags)
 {
     if (flags & TCL_ENCODING_STOPONERROR) {
 	TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 538b177..bf5310b 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2890,7 +2890,7 @@ TclEncodingProfileNameToId(Tcl_Interp *interp,
 			   int *profilePtr);
 MODULE_SCOPE const char *TclEncodingProfileIdToName(Tcl_Interp *interp,
 						    int profileId);
-MODULE_SCOPE int TclEncodingExternalFlagsToInternal(int flags);
+MODULE_SCOPE int TclEncodingSetProfileFlags(int flags);
 MODULE_SCOPE void TclGetEncodingProfiles(Tcl_Interp *interp);
 
 /*
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index fa91d67..4a2032c 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1514,7 +1514,7 @@ TeststringobjCmd(
 	    Tcl_SetObjResult(interp, varPtr[varIndex]);
 	    break;
 	case 13: /* newunicode*/
-	    unicode = ckalloc((objc - 3) * sizeof(Tcl_UniChar));
+	    unicode = (unsigned short *) ckalloc((objc - 3) * sizeof(Tcl_UniChar));
 	    for (i = 0; i < (objc - 3); ++i) {
 		int val;
 		if (Tcl_GetIntFromObj(interp, objv[i + 3], &val) != TCL_OK) {
-- 
cgit v0.12


From bb80189110af1df66a42c1d79285638ebc54f038 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 28 Feb 2023 12:43:53 +0000
Subject: Missing ')'

---
 generic/tclIO.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index ae09690..6da1345 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7589,7 +7589,7 @@ Tcl_Eof(
 				/* State of real channel structure. */
 
     if (GotFlag(statePtr, CHANNEL_NONBLOCKING)
-	    && GotFlag(statePtr, CHANNEL_ENCODING_ERROR) {
+	    && GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
 	return 0;
     }
     return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0;
-- 
cgit v0.12


From 4227ef37bbd67235ead035bb544b3bcf864b1e87 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 28 Feb 2023 13:33:04 +0000
Subject: Put back testcase io-52.20, and re-fix [4a7397e0b3]

---
 generic/tclIO.c |  7 ++++++-
 generic/tclIO.h |  2 ++
 tests/io.test   | 21 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6da1345..da06171 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7588,7 +7588,7 @@ Tcl_Eof(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of real channel structure. */
 
-    if (GotFlag(statePtr, CHANNEL_NONBLOCKING)
+    if (GotFlag(statePtr, CHANNEL_NONBLOCKING|CHANNEL_FCOPY)
 	    && GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
 	return 0;
     }
@@ -9803,6 +9803,7 @@ CopyData(
      * the bottom of the stack.
      */
 
+    SetFlag(inStatePtr, CHANNEL_FCOPY);
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
     sameEncoding = inStatePtr->encoding == outStatePtr->encoding
@@ -9918,6 +9919,7 @@ CopyData(
 		    TclDecrRefCount(bufObj);
 		    bufObj = NULL;
 		}
+		ResetFlag(inStatePtr, CHANNEL_FCOPY);
 		return TCL_OK;
 	    }
 	}
@@ -10009,6 +10011,7 @@ CopyData(
 		TclDecrRefCount(bufObj);
 		bufObj = NULL;
 	    }
+	    ResetFlag(inStatePtr, CHANNEL_FCOPY);
 	    return TCL_OK;
 	}
 
@@ -10031,6 +10034,7 @@ CopyData(
 		TclDecrRefCount(bufObj);
 		bufObj = NULL;
 	    }
+	    ResetFlag(inStatePtr, CHANNEL_FCOPY);
 	    return TCL_OK;
 	}
     } /* while */
@@ -10083,6 +10087,7 @@ CopyData(
 	    }
 	}
     }
+    ResetFlag(inStatePtr, CHANNEL_FCOPY);
     return result;
 }
 
diff --git a/generic/tclIO.h b/generic/tclIO.h
index a69e990..689067f 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -233,6 +233,8 @@ typedef struct ChannelState {
 					 * flushed after every newline. */
 #define CHANNEL_UNBUFFERED	(1<<5)	/* Output to the channel must always
 					 * be flushed immediately. */
+#define CHANNEL_FCOPY	(1<<6)	/* Channel is currently doing an fcopy
+					 * mode. */
 #define BG_FLUSH_SCHEDULED	(1<<7)	/* A background flush of the queued
 					 * output buffers has been
 					 * scheduled. */
diff --git a/tests/io.test b/tests/io.test
index 6821ff3..dd291dd 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7609,6 +7609,27 @@ test io-52.19 {coverage of eofChar handling} {
     close $out
     file size $path(test2)
 } 8
+test io-52.20 {TclCopyChannel & encodings} -setup {
+    set out [open $path(utf8-fcopy.txt) w]
+    fconfigure $out -encoding utf-8 -translation lf
+    puts $out "Á"
+    close $out
+} -constraints {fcopy} -body {
+    # binary to encoding => the input has to be
+    # in utf-8 to make sense to the encoder
+
+    set in  [open $path(utf8-fcopy.txt) r]
+    set out [open $path(kyrillic.txt) w]
+
+    # Using "-encoding ascii" means reading the "Á" gives an error
+    fconfigure $in  -encoding ascii -strictencoding 1
+    fconfigure $out -encoding koi8-r -translation lf
+
+    fcopy $in $out
+} -cleanup {
+    close $in
+    close $out
+} -returnCodes 1 -match glob -result {error reading "file*": illegal byte sequence}
 test io-52.21 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
-- 
cgit v0.12


From 3d177bd8b588eb3f64773a86cabc290208e031a5 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 28 Feb 2023 14:08:19 +0000
Subject: int -> Tcl_Size to match TIP

---
 generic/tcl.decls  |  4 ++--
 generic/tclDecls.h | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index a789ef6..f2ba187 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2445,12 +2445,12 @@ declare 657 {
 # TIP 656
 declare 658 {
     int Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp, Tcl_Encoding encoding,
-        const char *src, int srcLen, int flags, Tcl_DString *dsPtr,
+        const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr,
         Tcl_Size *errorLocationPtr)
 } 
 declare 659 {
     int Tcl_UtfToExternalDStringEx(Tcl_Interp *interp, Tcl_Encoding encoding,
-    const char *src, int srcLen, int flags, Tcl_DString *dsPtr,
+    const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr,
     Tcl_Size *errorLocationPtr)
 }
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index fbfa8a1..adad630 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1957,12 +1957,14 @@ EXTERN int		Tcl_UniCharIsUnicode(int ch);
 /* 658 */
 EXTERN int		Tcl_ExternalToUtfDStringEx(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
-				int srcLen, int flags, Tcl_DString *dsPtr,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
 				Tcl_Size *errorLocationPtr);
 /* 659 */
 EXTERN int		Tcl_UtfToExternalDStringEx(Tcl_Interp *interp,
 				Tcl_Encoding encoding, const char *src,
-				int srcLen, int flags, Tcl_DString *dsPtr,
+				Tcl_Size srcLen, int flags,
+				Tcl_DString *dsPtr,
 				Tcl_Size *errorLocationPtr);
 /* 660 */
 EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
@@ -2743,8 +2745,8 @@ typedef struct TclStubs {
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
     int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
-    int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
-    int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
+    int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
+    int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
     int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
     int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *lengthPtr); /* 662 */
-- 
cgit v0.12


From a6b4ef3d29565b68fb8c7104b11b03a99e0b153e Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 1 Mar 2023 07:56:03 +0000
Subject: Fix [f8ef6b3670] crash. TclpSysAlloc macro was truncating size
 request to 32 bits on Windows.

---
 win/tclWinPort.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 2c01a6b..cc9453b 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -518,11 +518,11 @@ typedef DWORD_PTR * PDWORD_PTR;
  */
 
 #define TclpSysAlloc(size)		((void*)HeapAlloc(GetProcessHeap(), \
-					    (DWORD)0, (DWORD)size))
+					    0, size))
 #define TclpSysFree(ptr)		(HeapFree(GetProcessHeap(), \
-					    (DWORD)0, (HGLOBAL)ptr))
+					    0, (HGLOBAL)ptr))
 #define TclpSysRealloc(ptr, size)	((void*)HeapReAlloc(GetProcessHeap(), \
-					    (DWORD)0, (LPVOID)ptr, (DWORD)size))
+					    0, (LPVOID)ptr, size))
 
 /* This type is not defined in the Windows headers */
 #define socklen_t       int
-- 
cgit v0.12


From 261c174d97c0b75e9c557c4c05514db34e52e58b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 1 Mar 2023 11:06:17 +0000
Subject: Fix msvc build (with OPTS=symbols)

---
 generic/tclZlib.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index a0e79ac..6278628 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -444,8 +444,8 @@ GenerateHeader(
 	goto error;
     } else if (value != NULL) {
 	Tcl_EncodingState state;
-	valueStr = Tcl_GetStringFromObj(value, &len);
-	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, len,
+	valueStr = Tcl_GetStringFromObj(value, &length);
+	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, length,
 		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state,
 		headerPtr->nativeCommentBuf, MAX_COMMENT_LEN-1, NULL, &len,
 		NULL);
@@ -476,8 +476,8 @@ GenerateHeader(
 	goto error;
     } else if (value != NULL) {
 	Tcl_EncodingState state;
-	valueStr = Tcl_GetStringFromObj(value, &len);
-	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, len,
+	valueStr = Tcl_GetStringFromObj(value, &length);
+	result = Tcl_UtfToExternal(NULL, latin1enc, valueStr, length,
 		TCL_ENCODING_START|TCL_ENCODING_END|TCL_ENCODING_STOPONERROR, &state,
 		headerPtr->nativeFilenameBuf, MAXPATHLEN-1, NULL, &len,
 		NULL);
@@ -570,7 +570,7 @@ ExtractHeader(
 	    }
 	}
 
-	Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, -1,
+	(void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, -1,
 		&tmp);
 	SetValue(dictObj, "comment", Tcl_DStringToObj(&tmp));
     }
@@ -587,7 +587,7 @@ ExtractHeader(
 	    }
 	}
 
-	Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, -1,
+	(void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, -1,
 		&tmp);
 	SetValue(dictObj, "filename", Tcl_DStringToObj(&tmp));
     }
-- 
cgit v0.12


From 30a9b333ba194339f5e8f68575626df0701b2a50 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 1 Mar 2023 13:18:17 +0000
Subject: Bug [9a978f8323]: crash reading large files

---
 generic/tclIO.c |  26 ++++++++------
 tests/io.test   | 104 +++++++++++++++++++++++---------------------------------
 2 files changed, 58 insertions(+), 72 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index ff74a99..ce0dcc8 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -191,9 +191,9 @@ static int		DetachChannel(Tcl_Interp *interp, Tcl_Channel chan);
 static void		DiscardInputQueued(ChannelState *statePtr,
 			    int discardSavedBuffers);
 static void		DiscardOutputQueued(ChannelState *chanPtr);
-static int		DoRead(Channel *chanPtr, char *dst, Tcl_Size bytesToRead,
+static Tcl_Size		DoRead(Channel *chanPtr, char *dst, Tcl_Size bytesToRead,
 			    int allowShortReads);
-static int		DoReadChars(Channel *chan, Tcl_Obj *objPtr, Tcl_Size toRead,
+static Tcl_Size		DoReadChars(Channel *chan, Tcl_Obj *objPtr, Tcl_Size toRead,
 			    int appendFlag);
 static int		FilterInputBytes(Channel *chanPtr,
 			    GetsState *statePtr);
@@ -5946,11 +5946,11 @@ Tcl_ReadChars(
  *---------------------------------------------------------------------------
  */
 
-static int
+static Tcl_Size
 DoReadChars(
     Channel *chanPtr,		/* The channel to read. */
     Tcl_Obj *objPtr,		/* Input data is stored in this object. */
-    Tcl_Size toRead,			/* Maximum number of characters to store, or
+    Tcl_Size toRead,		/* Maximum number of characters to store, or
 				 * TCL_INDEX_NONE to read all available data (up to EOF or
 				 * when channel blocks). */
     int appendFlag)		/* If non-zero, data read from the channel
@@ -5961,7 +5961,8 @@ DoReadChars(
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
     ChannelBuffer *bufPtr;
-    int copied, copiedNow, result;
+    Tcl_Size copied;
+    int result;
     Tcl_Encoding encoding = statePtr->encoding;
     int binaryMode;
 #define UTF_EXPANSION_FACTOR	1024
@@ -6046,8 +6047,8 @@ DoReadChars(
     }
     ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
     statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
-    for (copied = 0; toRead > 0; ) {
-	copiedNow = -1;
+    for (copied = 0; toRead > 0 || toRead == TCL_INDEX_NONE; ) {
+	int copiedNow = -1;
 	if (statePtr->inQueueHead != NULL) {
 	    if (binaryMode) {
 		copiedNow = ReadBytes(statePtr, objPtr, toRead);
@@ -6093,7 +6094,9 @@ DoReadChars(
 	    }
 	} else {
 	    copied += copiedNow;
-	    toRead -= copiedNow;
+	    if (toRead != TCL_INDEX_NONE) {
+		toRead -= copiedNow; /* Only decr if not reading whole file */
+	    }
 	}
     }
 
@@ -6269,7 +6272,7 @@ ReadChars(
 	size_t size;
 
 	dst = TclGetStringStorage(objPtr, &size) + numBytes;
-	dstLimit = size - numBytes;
+	dstLimit = (size - numBytes) > INT_MAX ? INT_MAX : (size - numBytes);
     } else {
 	dst = TclGetString(objPtr) + numBytes;
     }
@@ -9671,9 +9674,10 @@ CopyData(
     Tcl_Obj *cmdPtr, *errObj = NULL, *bufObj = NULL, *msg = NULL;
     Tcl_Channel inChan, outChan;
     ChannelState *inStatePtr, *outStatePtr;
-    int result = TCL_OK, size;
+    int result = TCL_OK;
     Tcl_Size sizeb;
     Tcl_WideInt total;
+    Tcl_WideInt size; /* TODO - be careful if total and size are made unsigned  */
     const char *buffer;
     int inBinary, outBinary, sameEncoding;
 				/* Encoding control */
@@ -10011,7 +10015,7 @@ CopyData(
  *----------------------------------------------------------------------
  */
 
-static int
+static Tcl_Size
 DoRead(
     Channel *chanPtr,		/* The channel from which to read. */
     char *dst,			/* Where to store input read. */
diff --git a/tests/io.test b/tests/io.test
index 065eb4c..5b81dde 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -195,46 +195,50 @@ test io-1.9 {Tcl_WriteChars: WriteChars} {
     set sizes
 } {19 19 19 19 19}
 
+proc testreadwrite {size {mode ""} args} {
+    set tmpfile [file join [temporaryDirectory] io-1.10.tmp]
+    set w [string repeat A $size]
+    try {
+        set fd [open $tmpfile w$mode]
+        try {
+            if {[llength $args]} {
+                fconfigure $fd {*}$args
+            }
+            puts -nonewline $fd $w
+        } finally {
+            close $fd
+        }
+        set fd [open $tmpfile r$mode]
+        try {
+            if {[llength $args]} {
+                fconfigure $fd {*}$args
+            }
+            set r [read $fd]
+        } finally {
+            close $fd
+        }
+    } finally {
+        file delete $tmpfile
+    }
+    string equal $w $r
+}
+
 test io-1.10 {WriteChars: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
     pointerIs64bit perf
-} -setup {
-    set tmpfile [file join [temporaryDirectory] io-1.10.tmp]
-} -cleanup {
-    file delete $tmpfile
 } -body {
-    set fd [open $tmpfile w]
-    puts -nonewline $fd [string repeat A 0x80000000]
-    close $fd
-    # TODO - Should really read it back in but large reads are not currently working!
-    file size $tmpfile
-} -result 2147483648
+    testreadwrite 0x80000000
+} -result 1
 test io-1.11 {WriteChars: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints {
     pointerIs64bit perf
-} -setup {
-    set tmpfile [file join [temporaryDirectory] io-1.11.tmp]
-} -cleanup {
-    file delete $tmpfile
 } -body {
-    set fd [open $tmpfile w]
-    puts -nonewline $fd [string repeat A 0x100000000]
-    close $fd
-    # TODO - Should really read it back in but large reads are not currently working!
-    file size $tmpfile
-} -result 4294967296
+    testreadwrite 0x100000000 "" -buffersize 1000000
+} -result 1
 test io-1.12 {WriteChars: large file (== UINT_MAX). Bug 90ff9b7f73} -constraints {
     pointerIs64bit perf
-} -setup {
-    set tmpfile [file join [temporaryDirectory] io-1.12.tmp]
-} -cleanup {
-    file delete $tmpfile
 } -body {
-    set fd [open $tmpfile w]
     # *Exactly* UINT_MAX - separate bug from the general large file tests
-    puts -nonewline $fd [string repeat A 0xffffffff]
-    close $fd
-    # TODO - Should really read it back in but large reads are not currently working!
-    file size $tmpfile
-} -result 4294967295
+    testreadwrite 0xffffffff
+} -result 1
 
 test io-2.1 {WriteBytes} {
     # loop until all bytes are written
@@ -277,47 +281,25 @@ test io-2.4 {WriteBytes: reset sawLF after each buffer} {
     close $f
     lappend x [contents $path(test1)]
 } [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
-
 test io-2.5 {WriteBytes: large file (> INT_MAX). Bug 3d01d51bc4} -constraints {
     pointerIs64bit perf
-} -setup {
-    set tmpfile [file join [temporaryDirectory] io-2.5.tmp]
-} -cleanup {
-    file delete $tmpfile
 } -body {
-    set fd [open $tmpfile wb]
-    puts -nonewline $fd [string repeat A 0x80000000]
-    close $fd
-    # TODO - Should really read it back in but large reads are not currently working!
-    file size $tmpfile
-} -result 2147483648
+    # Binary mode
+    testreadwrite 0x80000000 b
+} -result 1
 test io-2.6 {WriteBytes: large file (> UINT_MAX). Bug 3d01d51bc4} -constraints {
     pointerIs64bit perf
-} -setup {
-    set tmpfile [file join [temporaryDirectory] io-2.6.tmp]
-} -cleanup {
-    file delete $tmpfile
 } -body {
-    set fd [open $tmpfile wb]
-    puts -nonewline $fd [string repeat A 0x100000000]
-    close $fd
-    # TODO - Should really read it back in but large reads are not currently working!
-    file size $tmpfile
-} -result 4294967296
+    # Binary mode
+    testreadwrite 0x100000000 b -buffersize 1000000
+} -result 1
 test io-2.7 {WriteBytes: large file (== UINT_MAX). Bug 90ff9b7f73} -constraints {
     pointerIs64bit perf
-} -setup {
-    set tmpfile [file join [temporaryDirectory] io-2.7.tmp]
-} -cleanup {
-    file delete $tmpfile
 } -body {
-    set fd [open $tmpfile wb]
     # *Exactly* UINT_MAX - separate bug from the general large file tests
-    puts -nonewline $fd [string repeat A 0xffffffff]
-    close $fd
-    # TODO - Should really read it back in but large reads are not currently working!
-    file size $tmpfile
-} -result 4294967295
+    testreadwrite 0xffffffff b
+} -result 1
+
 
 test io-3.1 {WriteChars: compatibility with WriteBytes} {
     # loop until all bytes are written
-- 
cgit v0.12


From 64e7f77040596a0716b5bd1f02942c8eb6124759 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 1 Mar 2023 13:58:52 +0000
Subject: Disable file permission tests under WSL as WSL does not support Unix
 file attrs without special config

---
 tests/fCmd.test | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/tests/fCmd.test b/tests/fCmd.test
index 93793d1..02b70cb 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -42,6 +42,9 @@ if {[testConstraint win]} {
 }
 testConstraint notInCIenv [expr {![info exists ::env(CI)] || !$::env(CI)}]
 
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notInWsl [expr {[llength [array names ::env *WSL*]] == 0}]
+
 set tmpspace /tmp;# default value
 # Find a group that exists on this Unix system, or else skip tests that
 # require Unix groups.
@@ -449,7 +452,7 @@ test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} -setup {
 } -result {1 1}
 test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -returnCodes error -body {
+} -constraints {unix notRoot testchmod notInWsl} -returnCodes error -body {
     file mkdir td1/td2/td3
     testchmod 0 td1/td2
     file mkdir td1/td2/td3/td4
@@ -467,7 +470,7 @@ test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} -setup {
 test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} -setup {
     cleanup
     file delete -force foo
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir foo
     file attr foo -perm 0o40000
     file mkdir foo/tf1
@@ -593,7 +596,7 @@ test fCmd-6.5 {CopyRenameOneFile: lstat(target) != 0} -setup {
 } -result {tf2}
 test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir td1
     testchmod 0 td1
     createfile tf1
@@ -712,7 +715,7 @@ test fCmd-6.22 {CopyRenameOneFile: copy/rename: !S_ISDIR(source)} -setup {
 } -result [file join $tmpspace tf1]
 test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {xdev notRoot} -body {
+} -constraints {xdev notRoot notInWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1 -permissions 0
     file rename td1 $tmpspace
@@ -764,7 +767,7 @@ test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
 } -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": file already exists}
 test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {notRoot xdev} -body {
+} -constraints {notRoot xdev notInWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1/td2/td3 -permissions 0
     file rename td1 $tmpspace
@@ -781,7 +784,7 @@ test fCmd-6.29 {CopyRenameOneFile: TclpCopyDirectory passed} -setup {
 } -result [file join $tmpspace td1 td2]
 test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir foo/bar
     file attr foo -perm 0o40555
     file rename foo/bar $tmpspace
@@ -856,7 +859,7 @@ test fCmd-8.3 {file copy and path translation: ensure correct error} -body {
 
 test fCmd-9.1 {file rename: comprehensive: EACCES} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir td1
     file mkdir td2
     file attr td2 -perm 0o40000
@@ -882,7 +885,7 @@ test fCmd-9.3 {file rename: comprehensive: file to new name} -setup {
 } -result {{tf3 tf4} 1 0}
 test fCmd-9.4 {file rename: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notDarwin9} -body {
+} -constraints {unix notRoot testchmod notDarwin9 notInWsl} -body {
     file mkdir td1 td2
     testchmod 0o555 td2
     file rename td1 td3
@@ -903,7 +906,7 @@ test fCmd-9.5 {file rename: comprehensive: file to self} -setup {
 } -result {tf1 tf2 1 0}
 test fCmd-9.6 {file rename: comprehensive: dir to self} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir td1
     file mkdir td2
     testchmod 0o555 td2
@@ -1097,7 +1100,7 @@ test fCmd-10.2 {file copy: comprehensive: file to new name} -setup {
 } -result {{tf1 tf2 tf3 tf4} tf1 tf2 1 0}
 test fCmd-10.3 {file copy: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir [file join td1 tdx]
     file mkdir [file join td2 tdy]
     testchmod 0o555 td2
@@ -1174,7 +1177,7 @@ test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
 } -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
 test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     cleanup
-} -constraints {notRoot unixOrWin testchmod} -body {
+} -constraints {notRoot unixOrWin testchmod notInWsl} -body {
     file mkdir tds1
     file mkdir tds2
     file mkdir [file join tdd1 tds1 xxx]
@@ -1198,7 +1201,7 @@ test fCmd-10.7 {file rename: comprehensive: file to new name and dir} -setup {
 } -result [subst {{tf1 tf2} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
 test fCmd-10.8 {file rename: comprehensive: dir to new name and dir} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir td1
     file mkdir td2
     file mkdir td3
@@ -1395,7 +1398,7 @@ test fCmd-12.7 {renamefile: renaming directory into offspring} -setup {
 } -result {1}
 test fCmd-12.8 {renamefile: generic error} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     file mkdir tfa/dir
     file attributes tfa -permissions 0o555
@@ -1582,7 +1585,7 @@ test fCmd-14.7 {copyfile: copy directory succeeding} -setup {
 } -result {1 1}
 test fCmd-14.8 {copyfile: copy directory failing} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa/dir/a/b/c
     file attributes tfa/dir -permissions 0
     catch {file copy tfa tfa2}
@@ -1727,7 +1730,7 @@ test fCmd-16.8 {remove a normal file} -constraints {notRoot} -setup {
 } -result {1}
 test fCmd-16.9 {error while deleting file} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     createfile tfa/a
     file attributes tfa -permissions 0o555
@@ -1758,7 +1761,7 @@ test fCmd-16.11 {TclFileDeleteCmd: removing a nonexistant file} -setup {
 # More coverage tests for mkpath()
 test fCmd-17.1 {mkdir stat failing on target but not ENOENT} -setup {
      catch {file delete -force -- tfa1}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
      file mkdir tfa1
      file attributes tfa1 -permissions 0o555
      catch {file mkdir tfa1/tfa2}
@@ -1968,7 +1971,7 @@ test fCmd-19.1 {remove empty directory} -constraints {notRoot} -setup {
 } -result {0}
 test fCmd-19.2 {rmdir error besides EEXIST} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa -permissions 0o555
@@ -1996,7 +1999,7 @@ test fCmd-19.3 {recursive remove} -constraints {notRoot} -setup {
 #
 test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa/a -permissions 00000
-- 
cgit v0.12


From 5a3e0c869ebc400a9f268da243d855daff1bc632 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 1 Mar 2023 14:55:13 +0000
Subject: Cherrypick [f1dd5f1cc7]: constrain tests not supported on WSL

---
 tests/fCmd.test | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/tests/fCmd.test b/tests/fCmd.test
index 8c9f799..e6fa893 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -42,6 +42,9 @@ if {[testConstraint win]} {
 }
 testConstraint notInCIenv [expr {![info exists ::env(CI)] || !$::env(CI)}]
 
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notInWsl [expr {[llength [array names ::env *WSL*]] == 0}]
+
 set tmpspace /tmp;# default value
 # Find a group that exists on this Unix system, or else skip tests that
 # require Unix groups.
@@ -354,7 +357,7 @@ test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} -setup {
 } -result {1 1}
 test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -returnCodes error -body {
+} -constraints {unix notRoot testchmod notInWsl} -returnCodes error -body {
     file mkdir td1/td2/td3
     testchmod 0 td1/td2
     file mkdir td1/td2/td3/td4
@@ -372,7 +375,7 @@ test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} -setup {
 test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} -setup {
     cleanup
     file delete -force foo
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir foo
     file attr foo -perm 0o40000
     file mkdir foo/tf1
@@ -497,7 +500,7 @@ test fCmd-6.5 {CopyRenameOneFile: lstat(target) != 0} -setup {
 } -result {tf2}
 test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir td1
     testchmod 0 td1
     createfile tf1
@@ -616,7 +619,7 @@ test fCmd-6.22 {CopyRenameOneFile: copy/rename: !S_ISDIR(source)} -setup {
 } -result [file join $tmpspace tf1]
 test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {xdev notRoot} -body {
+} -constraints {xdev notRoot notInWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1 -permissions 0
     file rename td1 $tmpspace
@@ -668,7 +671,7 @@ test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
 } -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": file already exists}
 test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {notRoot xdev} -body {
+} -constraints {notRoot xdev notInWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1/td2/td3 -permissions 0
     file rename td1 $tmpspace
@@ -685,7 +688,7 @@ test fCmd-6.29 {CopyRenameOneFile: TclpCopyDirectory passed} -setup {
 } -result [file join $tmpspace td1 td2]
 test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir foo/bar
     file attr foo -perm 0o40555
     file rename foo/bar $tmpspace
@@ -760,7 +763,7 @@ test fCmd-8.3 {file copy and path translation: ensure correct error} -body {
 
 test fCmd-9.1 {file rename: comprehensive: EACCES} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir td1
     file mkdir td2
     file attr td2 -perm 0o40000
@@ -786,7 +789,7 @@ test fCmd-9.3 {file rename: comprehensive: file to new name} -setup {
 } -result {{tf3 tf4} 1 0}
 test fCmd-9.4 {file rename: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notDarwin9} -body {
+} -constraints {unix notRoot testchmod notDarwin9 notInWsl} -body {
     file mkdir td1 td2
     testchmod 0o555 td2
     file rename td1 td3
@@ -807,7 +810,7 @@ test fCmd-9.5 {file rename: comprehensive: file to self} -setup {
 } -result {tf1 tf2 1 0}
 test fCmd-9.6 {file rename: comprehensive: dir to self} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir td1
     file mkdir td2
     testchmod 0o555 td2
@@ -1001,7 +1004,7 @@ test fCmd-10.2 {file copy: comprehensive: file to new name} -setup {
 } -result {{tf1 tf2 tf3 tf4} tf1 tf2 1 0}
 test fCmd-10.3 {file copy: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir [file join td1 tdx]
     file mkdir [file join td2 tdy]
     testchmod 0o555 td2
@@ -1078,7 +1081,7 @@ test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
 } -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
 test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     cleanup
-} -constraints {notRoot unixOrWin testchmod} -body {
+} -constraints {notRoot unixOrWin testchmod notInWsl} -body {
     file mkdir tds1
     file mkdir tds2
     file mkdir [file join tdd1 tds1 xxx]
@@ -1102,7 +1105,7 @@ test fCmd-10.7 {file rename: comprehensive: file to new name and dir} -setup {
 } -result [subst {{tf1 tf2} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
 test fCmd-10.8 {file rename: comprehensive: dir to new name and dir} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notInWsl} -body {
     file mkdir td1
     file mkdir td2
     file mkdir td3
@@ -1299,7 +1302,7 @@ test fCmd-12.7 {renamefile: renaming directory into offspring} -setup {
 } -result {1}
 test fCmd-12.8 {renamefile: generic error} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     file mkdir tfa/dir
     file attributes tfa -permissions 0o555
@@ -1486,7 +1489,7 @@ test fCmd-14.7 {copyfile: copy directory succeeding} -setup {
 } -result {1 1}
 test fCmd-14.8 {copyfile: copy directory failing} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa/dir/a/b/c
     file attributes tfa/dir -permissions 0
     catch {file copy tfa tfa2}
@@ -1628,7 +1631,7 @@ test fCmd-16.8 {remove a normal file} -constraints {notRoot} -setup {
 } -result {1}
 test fCmd-16.9 {error while deleting file} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     createfile tfa/a
     file attributes tfa -permissions 0o555
@@ -1659,7 +1662,7 @@ test fCmd-16.11 {TclFileDeleteCmd: removing a nonexistant file} -setup {
 # More coverage tests for mkpath()
 test fCmd-17.1 {mkdir stat failing on target but not ENOENT} -setup {
      catch {file delete -force -- tfa1}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
      file mkdir tfa1
      file attributes tfa1 -permissions 0o555
      catch {file mkdir tfa1/tfa2}
@@ -1869,7 +1872,7 @@ test fCmd-19.1 {remove empty directory} -constraints {notRoot} -setup {
 } -result {0}
 test fCmd-19.2 {rmdir error besides EEXIST} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa -permissions 0o555
@@ -1897,7 +1900,7 @@ test fCmd-19.3 {recursive remove} -constraints {notRoot} -setup {
 #
 test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notInWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa/a -permissions 00000
-- 
cgit v0.12


From b2cdedcec2bbb94929cef675635c5864db8db8de Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 2 Mar 2023 04:16:44 +0000
Subject: Eliminate TCL_ENCODING_MODIFIED flag

---
 generic/tcl.h         | 13 +++++++------
 generic/tclEncoding.c | 33 +++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 3fc53db..a92680d 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2123,12 +2123,12 @@ typedef struct Tcl_EncodingType {
  *				content.  Otherwise, the number of chars
  *				produced is controlled only by other limiting
  *				factors.
- * TCL_ENCODING_MODIFIED -	Convert NULL bytes to \xC0\x80 in stead of
- *				0x00. Only valid for "utf-8" and "cesu-8".
- *				This flag is implicit for external -> internal conversions,
- *				optional for internal -> external conversions.
  * TCL_ENCODING_PROFILE_* -	Mutually exclusive encoding profile ids. Note
  *				these are bit masks.
+ *
+ * NOTE: THESE BIT DEFINITIONS SHOULD NOT OVERLAP WITH INTERNAL USE BITS 
+ * DEFINED IN tclEncoding.c (ENCODING_INPUT et al). Be cognizant of this
+ * when adding bits.
  */
 
 #define TCL_ENCODING_START		0x01
@@ -2136,8 +2136,9 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_STOPONERROR	0x04
 #define TCL_ENCODING_NO_TERMINATE	0x08
 #define TCL_ENCODING_CHAR_LIMIT		0x10
-#define TCL_ENCODING_MODIFIED		0x20
-/* Reserve top byte for profile values (disjoint) */
+/* Internal use bits, do not define bits in this space. See above comment */
+#define TCL_ENCODING_INTERNAL_USE_MASK  0xFF00
+/* Reserve top byte for profile values (disjoint, not a mask) */
 #define TCL_ENCODING_PROFILE_TCL8     0x01000000
 #define TCL_ENCODING_PROFILE_STRICT   0x02000000
 #define TCL_ENCODING_PROFILE_REPLACE  0x03000000
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 05d231f..1d336f5 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -548,11 +548,16 @@ FillEncodingFileMap(void)
  *---------------------------------------------------------------------------
  */
 
-/* Since TCL_ENCODING_MODIFIED is only used for utf-8/cesu-8 and
- * TCL_ENCODING_LE is only used for  utf-16/utf-32/ucs-2. re-use the same value */
-#define TCL_ENCODING_LE		TCL_ENCODING_MODIFIED	/* Little-endian encoding */
+/* 
+ * NOTE: THESE BIT DEFINITIONS SHOULD NOT OVERLAP WITH INTERNAL USE BITS 
+ * DEFINED IN tcl.h (TCL_ENCODING_* et al). Be cognizant of this
+ * when adding bits. TODO - should really be defined in a single file.
+ * 
+ * To prevent conflicting bits, only define bits within 0xff00 mask here.
+ */
+#define TCL_ENCODING_LE	0x100   /* Used to distinguish LE/BE variants */
 #define ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
-#define ENCODING_INPUT	0x400 /* For UTF-8/CESU-8 encoding, means external -> internal */
+#define ENCODING_INPUT	0x400   /* For UTF-8/CESU-8 encoding, means external -> internal */
 
 void
 TclInitEncodingSubsystem(void)
@@ -565,12 +570,16 @@ TclInitEncodingSubsystem(void)
         char c;
         short s;
     } isLe;
+    int leFlags;
 
     if (encodingsInitialized) {
 	return;
     }
 
-    isLe.s = TCL_ENCODING_LE;
+    /* Note: This DEPENDS on TCL_ENCODING_LE being defined in least sig byte */
+    isLe.s = 1;
+    leFlags = isLe.c ? TCL_ENCODING_LE : 0;
+
     Tcl_MutexLock(&encodingMutex);
     Tcl_InitHashTable(&encodingTable, TCL_STRING_KEYS);
     Tcl_MutexUnlock(&encodingMutex);
@@ -611,7 +620,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(0);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2";
-    type.clientData	= INT2PTR(isLe.c);
+    type.clientData	= INT2PTR(leFlags);
     Tcl_CreateEncoding(&type);
 
     type.toUtfProc	= Utf32ToUtfProc;
@@ -625,7 +634,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(0);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-32";
-    type.clientData	= INT2PTR(isLe.c);
+    type.clientData	= INT2PTR(leFlags);
     Tcl_CreateEncoding(&type);
 
     type.toUtfProc	= Utf16ToUtfProc;
@@ -639,7 +648,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(ENCODING_UTF);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-16";
-    type.clientData	= INT2PTR(isLe.c|ENCODING_UTF);
+    type.clientData	= INT2PTR(leFlags|ENCODING_UTF);
     Tcl_CreateEncoding(&type);
 
 #ifndef TCL_NO_DEPRECATED
@@ -1222,8 +1231,6 @@ Tcl_ExternalToUtfDString(
  *	- *At most one* of TCL_ENCODING_PROFILE{DEFAULT,TCL8,STRICT}
  *	- TCL_ENCODING_STOPONERROR: Backward compatibility. Sets the profile
  *	  to TCL_ENCODING_PROFILE_STRICT overriding any specified profile flags
- *	- TCL_ENCODING_MODIFIED: enable Tcl internal conversion mapping \xC0\x80
- *        to 0x00. Only valid for "utf-8" and "cesu-8".
  *      Any other flag bits will cause an error to be returned (for future
  *      compatibility)
  *
@@ -1518,8 +1525,6 @@ Tcl_UtfToExternalDString(
  *	- *At most one* of TCL_ENCODING_PROFILE{DEFAULT,TCL8,STRICT}
  *	- TCL_ENCODING_STOPONERROR: Backward compatibility. Sets the profile
  *	  to TCL_ENCODING_PROFILE_STRICT overriding any specified profile flags
- *	- TCL_ENCODING_MODIFIED: convert NULL bytes to \xC0\x80 instead
- *        of 0x00. Only valid for "utf-8" and "cesu-8".
  *
  * Results:
  *      The return value is one of
@@ -2466,7 +2471,7 @@ BinaryProc(
 
 static int
 UtfToUtfProc(
-    void *clientData,	/* additional flags, e.g. TCL_ENCODING_MODIFIED */
+    void *clientData,		/* additional flags */
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes. */
     int flags,			/* TCL_ENCODING_* conversion control flags. */
@@ -2536,7 +2541,7 @@ UtfToUtfProc(
 	    *dst++ = *src++;
 	}
 	else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd) &&
-		 (UCHAR(src[1]) == 0x80) && !(flags & TCL_ENCODING_MODIFIED) &&
+		 (UCHAR(src[1]) == 0x80) &&
 		 (!(flags & ENCODING_INPUT) || PROFILE_STRICT(profile) ||
 		  PROFILE_REPLACE(profile))) {
 	    /* Special sequence \xC0\x80 */
-- 
cgit v0.12


From 44fdf09f7bf8a1e0ae30d1eaea83d5cd1d2fdca2 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 2 Mar 2023 06:41:39 +0000
Subject: Bug [e778e3f804]. Fix error message for invalid profile name.

---
 generic/tclEncoding.c | 28 +++++++++++++++++++---------
 tests/encoding.test   |  8 ++++++++
 tests/io.test         |  2 +-
 tests/ioCmd.test      |  4 ++++
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 1d336f5..b32db7c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -188,15 +188,16 @@ static Tcl_Encoding systemEncoding = NULL;
 Tcl_Encoding tclIdentityEncoding = NULL;
 
 /*
- * Names of encoding profiles and corresponding integer values
+ * Names of encoding profiles and corresponding integer values.
+ * Keep alphabetical order for error messages.
  */
 static struct TclEncodingProfiles {
     const char *name;
     int value;
 } encodingProfiles[] = {
-    {"tcl8", TCL_ENCODING_PROFILE_TCL8},
-    {"strict", TCL_ENCODING_PROFILE_STRICT},
     {"replace", TCL_ENCODING_PROFILE_REPLACE},
+    {"strict", TCL_ENCODING_PROFILE_STRICT},
+    {"tcl8", TCL_ENCODING_PROFILE_TCL8},
 };
 #define PROFILE_STRICT(flags_)                                         \
     ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
@@ -4418,19 +4419,28 @@ TclEncodingProfileNameToId(
     int *profilePtr)  		/* Output */
 {
     size_t i;
+    size_t numProfiles = sizeof(encodingProfiles) / sizeof(encodingProfiles[0]);
 
-    for (i = 0; i < sizeof(encodingProfiles) / sizeof(encodingProfiles[0]); ++i) {
+    for (i = 0; i < numProfiles; ++i) {
 	if (!strcmp(profileName, encodingProfiles[i].name)) {
 	    *profilePtr = encodingProfiles[i].value;
 	    return TCL_OK;
 	}
     }
     if (interp) {
-	Tcl_SetObjResult(
-	    interp,
-	    Tcl_ObjPrintf(
-		"bad profile \"%s\". Must be \"tcl8\" or \"strict\".",
-		profileName));
+	Tcl_Obj *errorObj;
+	/* This code assumes at least two profiles :-) */
+	errorObj = 
+	    Tcl_ObjPrintf("bad profile name \"%s\": must be",
+		profileName);
+	for (i = 0; i < (numProfiles - 1); ++i) {
+	    Tcl_AppendStringsToObj(
+		errorObj, " ", encodingProfiles[i].name, ",", NULL);
+	}
+	Tcl_AppendStringsToObj(
+	    errorObj, " or ", encodingProfiles[numProfiles-1].name, NULL);
+
+	Tcl_SetObjResult(interp, errorObj);
 	Tcl_SetErrorCode(
 	    interp, "TCL", "ENCODING", "PROFILE", profileName, NULL);
     }
diff --git a/tests/encoding.test b/tests/encoding.test
index 800d93b..a51b6c0 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -105,6 +105,14 @@ test encoding-3.2 {Tcl_GetEncodingName, non-null} -setup {
 } -cleanup {
     fconfigure stdout -encoding $old
 } -result {jis0208}
+test encoding-3.3 {fconfigure -encodingprofile} -setup {
+    set old [fconfigure stdout -encodingprofile]
+} -body {
+    fconfigure stdout -encodingprofile replace
+    fconfigure stdout -encodingprofile
+} -cleanup {
+    fconfigure stdout -encodingprofile $old
+} -result replace
 
 test encoding-4.1 {Tcl_GetEncodingNames} -constraints {testencoding} -setup {
     cd [makeDirectory tmp]
diff --git a/tests/io.test b/tests/io.test
index 66dee7d..836a9b8 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7622,7 +7622,7 @@ test io-52.20 {TclCopyChannel & encodings} -setup {
     set out [open $path(kyrillic.txt) w]
 
     # Using "-encoding ascii" means reading the "Á" gives an error
-    fconfigure $in  -encoding ascii -strictencoding 1
+    fconfigure $in  -encoding ascii -encodingprofile strict
     fconfigure $out -encoding koi8-r -translation lf
 
     fcopy $in $out
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 8c9d870..23cd67e 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -390,6 +390,10 @@ test iocmd-8.22 {fconfigure command / -nocomplainencoding 0, no error if -strict
 } -result 0
 
 
+test iocmd-8.21 {fconfigure -encodingprofile badprofile} -body {
+    fconfigure stdin -encodingprofile froboz
+} -returnCodes error -result {bad profile name "froboz": must be replace, strict, or tcl8}
+
 test iocmd-9.1 {eof command} {
     list [catch {eof} msg] $msg $::errorCode
 } {1 {wrong # args: should be "eof channelId"} {TCL WRONGARGS}}
-- 
cgit v0.12


From 4d674569535d565275d4a4d4a16a8c63ed7c41f9 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 2 Mar 2023 07:08:48 +0000
Subject: Disable more file permissions tests for WSL (not supported in
 WSL/NTFS)

---
 tests/chanio.test   |  6 ++++--
 tests/cmdAH.test    |  8 +++++---
 tests/fCmd.test     | 38 +++++++++++++++++++-------------------
 tests/io.test       |  6 ++++--
 tests/tcltest.test  | 11 +++++++----
 tests/unixFCmd.test | 12 +++++++-----
 6 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index ae03d71..0176c13 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -50,6 +50,8 @@ namespace eval ::tcl::test::io {
     testConstraint notWinCI       [expr {
 	$::tcl_platform(platform) ne "windows" || ![info exists ::env(CI)]}]
     testConstraint notOSX [expr {$::tcl_platform(os) ne "Darwin"}]
+    # File permissions broken on wsl without some "exotic" wsl configuration
+    testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
     testConstraint specialfiles  [expr {[file exists /dev/zero] || [file exists NUL]}]
 
     # You need a *very* special environment to do some tests.  In particular,
@@ -5348,7 +5350,7 @@ test chan-io-40.1 {POSIX open access modes: RDWR} -setup {
 } -result {zzy abzzy}
 test chan-io-40.2 {POSIX open access modes: CREAT} -setup {
     file delete $path(test3)
-} -constraints {unix} -body {
+} -constraints {unix notWsl} -body {
     set f [open $path(test3) {WRONLY CREAT} 0o600]
     file stat $path(test3) stats
     set x [format 0o%03o [expr {$stats(mode) & 0o777}]]
@@ -5361,7 +5363,7 @@ test chan-io-40.2 {POSIX open access modes: CREAT} -setup {
 } -result {0o600 {line 1}}
 test chan-io-40.3 {POSIX open access modes: CREAT} -setup {
     file delete $path(test3)
-} -constraints {unix umask} -body {
+} -constraints {unix umask notWsl} -body {
     # This test only works if your umask is 2, like ouster's.
     chan close [open $path(test3) {WRONLY CREAT}]
     file stat $path(test3) stats
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index d7a3657..875bacb 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -32,6 +32,8 @@ testConstraint linkDirectory [expr {
      && [lindex [file system [temporaryDirectory]] 1] eq "NTFS")
 }]
 testConstraint notWine [expr {![info exists ::env(CI_USING_WINE)]}]
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 
 global env
 set cmdAHwd [pwd]
@@ -1019,7 +1021,7 @@ test cmdAH-16.2 {Tcl_FileObjCmd: readable} {
     -result 	 1
 }
 test cmdAH-16.3 {Tcl_FileObjCmd: readable} {
-    -constraints {unix notRoot testchmod}
+    -constraints {unix notRoot testchmod notWsl}
     -setup  	 {testchmod 0o333 $gorpfile}
     -body   	 {file readable $gorpfile}
     -result 	 0
@@ -1052,7 +1054,7 @@ set gorpfile [makeFile abcde gorp.file]
 test cmdAH-18.1 {Tcl_FileObjCmd: executable} -returnCodes error -body {
     file executable a b
 } -result {wrong # args: should be "file executable name"}
-test cmdAH-18.2 {Tcl_FileObjCmd: executable} {notRoot} {
+test cmdAH-18.2 {Tcl_FileObjCmd: executable} {notRoot notWsl} {
     file executable $gorpfile
 } 0
 test cmdAH-18.3 {Tcl_FileObjCmd: executable} {unix testchmod} {
@@ -1600,7 +1602,7 @@ test cmdAH-28.4 {Tcl_FileObjCmd: stat} -setup {
     file stat $gorpfile stat
     list $stat(nlink) $stat(size) $stat(type)
 } -result {1 12 file}
-test cmdAH-28.5 {Tcl_FileObjCmd: stat} -constraints {unix} -setup {
+test cmdAH-28.5 {Tcl_FileObjCmd: stat} -constraints {unix notWsl} -setup {
     unset -nocomplain stat
 } -body {
     file stat $gorpfile stat
diff --git a/tests/fCmd.test b/tests/fCmd.test
index e6fa893..13f4cf1 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -43,7 +43,7 @@ if {[testConstraint win]} {
 testConstraint notInCIenv [expr {![info exists ::env(CI)] || !$::env(CI)}]
 
 # File permissions broken on wsl without some "exotic" wsl configuration
-testConstraint notInWsl [expr {[llength [array names ::env *WSL*]] == 0}]
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 
 set tmpspace /tmp;# default value
 # Find a group that exists on this Unix system, or else skip tests that
@@ -357,7 +357,7 @@ test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} -setup {
 } -result {1 1}
 test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notInWsl} -returnCodes error -body {
+} -constraints {unix notRoot testchmod notWsl} -returnCodes error -body {
     file mkdir td1/td2/td3
     testchmod 0 td1/td2
     file mkdir td1/td2/td3/td4
@@ -375,7 +375,7 @@ test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} -setup {
 test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} -setup {
     cleanup
     file delete -force foo
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir foo
     file attr foo -perm 0o40000
     file mkdir foo/tf1
@@ -500,7 +500,7 @@ test fCmd-6.5 {CopyRenameOneFile: lstat(target) != 0} -setup {
 } -result {tf2}
 test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notInWsl} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir td1
     testchmod 0 td1
     createfile tf1
@@ -619,7 +619,7 @@ test fCmd-6.22 {CopyRenameOneFile: copy/rename: !S_ISDIR(source)} -setup {
 } -result [file join $tmpspace tf1]
 test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {xdev notRoot notInWsl} -body {
+} -constraints {xdev notRoot notWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1 -permissions 0
     file rename td1 $tmpspace
@@ -671,7 +671,7 @@ test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
 } -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": file already exists}
 test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {notRoot xdev notInWsl} -body {
+} -constraints {notRoot xdev notWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1/td2/td3 -permissions 0
     file rename td1 $tmpspace
@@ -688,7 +688,7 @@ test fCmd-6.29 {CopyRenameOneFile: TclpCopyDirectory passed} -setup {
 } -result [file join $tmpspace td1 td2]
 test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir foo/bar
     file attr foo -perm 0o40555
     file rename foo/bar $tmpspace
@@ -763,7 +763,7 @@ test fCmd-8.3 {file copy and path translation: ensure correct error} -body {
 
 test fCmd-9.1 {file rename: comprehensive: EACCES} -setup {
     cleanup
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir td1
     file mkdir td2
     file attr td2 -perm 0o40000
@@ -789,7 +789,7 @@ test fCmd-9.3 {file rename: comprehensive: file to new name} -setup {
 } -result {{tf3 tf4} 1 0}
 test fCmd-9.4 {file rename: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notDarwin9 notInWsl} -body {
+} -constraints {unix notRoot testchmod notDarwin9 notWsl} -body {
     file mkdir td1 td2
     testchmod 0o555 td2
     file rename td1 td3
@@ -810,7 +810,7 @@ test fCmd-9.5 {file rename: comprehensive: file to self} -setup {
 } -result {tf1 tf2 1 0}
 test fCmd-9.6 {file rename: comprehensive: dir to self} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notInWsl} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir td1
     file mkdir td2
     testchmod 0o555 td2
@@ -1004,7 +1004,7 @@ test fCmd-10.2 {file copy: comprehensive: file to new name} -setup {
 } -result {{tf1 tf2 tf3 tf4} tf1 tf2 1 0}
 test fCmd-10.3 {file copy: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notInWsl} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir [file join td1 tdx]
     file mkdir [file join td2 tdy]
     testchmod 0o555 td2
@@ -1081,7 +1081,7 @@ test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
 } -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
 test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     cleanup
-} -constraints {notRoot unixOrWin testchmod notInWsl} -body {
+} -constraints {notRoot unixOrWin testchmod notWsl} -body {
     file mkdir tds1
     file mkdir tds2
     file mkdir [file join tdd1 tds1 xxx]
@@ -1105,7 +1105,7 @@ test fCmd-10.7 {file rename: comprehensive: file to new name and dir} -setup {
 } -result [subst {{tf1 tf2} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
 test fCmd-10.8 {file rename: comprehensive: dir to new name and dir} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notInWsl} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir td1
     file mkdir td2
     file mkdir td3
@@ -1302,7 +1302,7 @@ test fCmd-12.7 {renamefile: renaming directory into offspring} -setup {
 } -result {1}
 test fCmd-12.8 {renamefile: generic error} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     file mkdir tfa/dir
     file attributes tfa -permissions 0o555
@@ -1489,7 +1489,7 @@ test fCmd-14.7 {copyfile: copy directory succeeding} -setup {
 } -result {1 1}
 test fCmd-14.8 {copyfile: copy directory failing} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa/dir/a/b/c
     file attributes tfa/dir -permissions 0
     catch {file copy tfa tfa2}
@@ -1631,7 +1631,7 @@ test fCmd-16.8 {remove a normal file} -constraints {notRoot} -setup {
 } -result {1}
 test fCmd-16.9 {error while deleting file} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     createfile tfa/a
     file attributes tfa -permissions 0o555
@@ -1662,7 +1662,7 @@ test fCmd-16.11 {TclFileDeleteCmd: removing a nonexistant file} -setup {
 # More coverage tests for mkpath()
 test fCmd-17.1 {mkdir stat failing on target but not ENOENT} -setup {
      catch {file delete -force -- tfa1}
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
      file mkdir tfa1
      file attributes tfa1 -permissions 0o555
      catch {file mkdir tfa1/tfa2}
@@ -1872,7 +1872,7 @@ test fCmd-19.1 {remove empty directory} -constraints {notRoot} -setup {
 } -result {0}
 test fCmd-19.2 {rmdir error besides EEXIST} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa -permissions 0o555
@@ -1900,7 +1900,7 @@ test fCmd-19.3 {recursive remove} -constraints {notRoot} -setup {
 #
 test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot notInWsl} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa/a -permissions 00000
diff --git a/tests/io.test b/tests/io.test
index dd291dd..04c0cc8 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -48,6 +48,8 @@ testConstraint testservicemode  [llength [info commands testservicemode]]
 testConstraint notWinCI [expr {
     $::tcl_platform(platform) ne "windows" || ![info exists ::env(CI)]}]
 testConstraint notOSX [expr {$::tcl_platform(os) ne "Darwin"}]
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 
 # You need a *very* special environment to do some tests.  In
 # particular, many file systems do not support large-files...
@@ -5813,7 +5815,7 @@ test io-40.1 {POSIX open access modes: RDWR} {
     close $f
     set x
 } {zzy abzzy}
-test io-40.2 {POSIX open access modes: CREAT} {unix} {
+test io-40.2 {POSIX open access modes: CREAT} {unix notWsl} {
     file delete $path(test3)
     set f [open $path(test3) {WRONLY CREAT} 0o600]
     file stat $path(test3) stats
@@ -5825,7 +5827,7 @@ test io-40.2 {POSIX open access modes: CREAT} {unix} {
     close $f
     set x
 } {0o600 {line 1}}
-test io-40.3 {POSIX open access modes: CREAT} {unix umask} {
+test io-40.3 {POSIX open access modes: CREAT} {unix umask notWsl} {
     # This test only works if your umask is 2, like ouster's.
     file delete $path(test3)
     set f [open $path(test3) {WRONLY CREAT}]
diff --git a/tests/tcltest.test b/tests/tcltest.test
index a9ce785..49f31d5 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -22,6 +22,9 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
+
 namespace eval ::tcltest::test {
 
 namespace import ::tcltest::*
@@ -306,7 +309,7 @@ test tcltest-5.3 {testConstraint - constraint empty (tcltest::safeFetch)}  {
 #}
 
 test tcltest-5.5 {InitConstraints: list of built-in constraints} \
-	-constraints {!singleTestInterp} \
+	-constraints {!singleTestInterp notWsl} \
 	-setup {tcltest::InitConstraints} \
 	-body { lsort [array names ::tcltest::testConstraints] } \
 	-result [lsort {
@@ -556,7 +559,7 @@ switch -- $::tcl_platform(platform) {
     }
 }
 test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
-    -constraints {unix notRoot}
+    -constraints {unix notRoot notWsl}
     -body {
 	child msg $a -tmpdir $notReadableDir
 	return $msg
@@ -572,7 +575,7 @@ testConstraint notFAT [expr {
 }]
 # FAT/NTFS permissions are fairly hopeless; ignore this test if that FS is used
 test tcltest-8.4 {tcltest a.tcl -tmpdir notWriteableDir} {
-    -constraints {unixOrWin notRoot notFAT}
+    -constraints {unixOrWin notRoot notFAT notWsl}
     -body {
 	child msg $a -tmpdir $notWriteableDir
 	return $msg
@@ -645,7 +648,7 @@ test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} {
     -result {*not a directory*}
 }
 test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {
-    -constraints {unix notRoot}
+    -constraints {unix notRoot notWsl}
     -body {
 	child msg $a -testdir $notReadableDir
 	return $msg
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index 3eade4a..e1084af 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -18,6 +18,8 @@ if {"::tcltest" ni [namespace children]} {
 catch [list package require -exact tcl::test [info patchlevel]]
 
 testConstraint testchmod [llength [info commands testchmod]]
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 
 # These tests really need to be run from a writable directory, which
 # it is assumed [temporaryDirectory] is.
@@ -94,7 +96,7 @@ if {[testConstraint unix] && [testConstraint notRoot]} {
 
 test unixFCmd-1.1 {TclpRenameFile: EACCES} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1/td2 -permissions 0
     file rename td1/td2/td3 td2
@@ -135,7 +137,7 @@ test unixFCmd-1.6 {TclpRenameFile: ENOTDIR} {emptyTest unix notRoot} {
 } {}
 test unixFCmd-1.7 {TclpRenameFile: EXDEV} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir foo/bar
     file attr foo -perm 0o40555
     file rename foo/bar /tmp
@@ -219,7 +221,7 @@ test unixFCmd-2.4 {TclpCopyFile: src is fifo} -setup {
 } -result {fifo fifo}
 test unixFCmd-2.5 {TclpCopyFile: copy attributes} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     close [open tf1 a]
     file attributes tf1 -permissions 0o472
     file copy tf1 tf2
@@ -334,7 +336,7 @@ test unixFCmd-16.3 {SetOwnerAttribute - invalid owner} -setup {
 
 test unixFCmd-17.1 {SetPermissionsAttribute} -setup {
     catch {file delete -force -- foo.test}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     close [open foo.test w]
     list [file attributes foo.test -permissions 0] \
 	[file attributes foo.test -permissions]
@@ -366,7 +368,7 @@ test unixFCmd-17.4 {SetPermissionsAttribute} -setup {
 close [open foo.test w]
 set ::i 4
 proc permcheck {testnum permList expected} {
-    test $testnum {SetPermissionsAttribute} {unix notRoot} {
+    test $testnum {SetPermissionsAttribute} {unix notRoot notWsl} {
       set result {}
       foreach permstr $permList {
 	file attributes foo.test -permissions $permstr
-- 
cgit v0.12


From d3aa6839f45e33d533ae9525378612cb04ab0dd1 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Fri, 3 Mar 2023 12:15:11 +0000
Subject: Fix Valgrind "still reachable" report in TestcmdtokenCmd().

---
 generic/tclTest.c  | 44 ++++++++++++++++++++++++++++++--------------
 tests/basic.test   |  6 +++---
 tests/cmdInfo.test |  6 +++---
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index f4450ff..fbd4774 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1242,7 +1242,7 @@ TestcmdtokenCmd(
     int argc,			/* Number of arguments. */
     const char **argv)		/* Argument strings. */
 {
-    TestCommandTokenRef *refPtr;
+    TestCommandTokenRef *refPtr, *prevRefPtr;
     char buf[30];
     int id;
 
@@ -1261,9 +1261,7 @@ TestcmdtokenCmd(
 	firstCommandTokenRef = refPtr;
 	sprintf(buf, "%d", refPtr->id);
 	Tcl_AppendResult(interp, buf, NULL);
-    } else if (strcmp(argv[1], "name") == 0) {
-	Tcl_Obj *objPtr;
-
+    } else {
 	if (sscanf(argv[2], "%d", &id) != 1) {
 	    Tcl_AppendResult(interp, "bad command token \"", argv[2],
 		    "\"", NULL);
@@ -1283,18 +1281,36 @@ TestcmdtokenCmd(
 	    return TCL_ERROR;
 	}
 
-	objPtr = Tcl_NewObj();
-	Tcl_GetCommandFullName(interp, refPtr->token, objPtr);
+	if (strcmp(argv[1], "name") == 0) {
+	    Tcl_Obj *objPtr;
 
-	Tcl_AppendElement(interp,
-		Tcl_GetCommandName(interp, refPtr->token));
-	Tcl_AppendElement(interp, Tcl_GetString(objPtr));
-	Tcl_DecrRefCount(objPtr);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create or name", NULL);
-	return TCL_ERROR;
+	    objPtr = Tcl_NewObj();
+	    Tcl_GetCommandFullName(interp, refPtr->token, objPtr);
+
+	    Tcl_AppendElement(interp,
+		    Tcl_GetCommandName(interp, refPtr->token));
+	    Tcl_AppendElement(interp, Tcl_GetString(objPtr));
+	    Tcl_DecrRefCount(objPtr);
+	} else if (strcmp(argv[1], "free") == 0) {
+	    prevRefPtr = NULL;
+	    for (refPtr = firstCommandTokenRef; refPtr != NULL;
+		    refPtr = refPtr->nextPtr) {
+		if (refPtr->id == id) {
+		    if (prevRefPtr != NULL) {
+			prevRefPtr->nextPtr = refPtr->nextPtr;
+		    }
+		    ckfree(refPtr);
+		    break;
+		}
+		prevRefPtr = refPtr;
+	    }
+	} else {
+	    Tcl_AppendResult(interp, "bad option \"", argv[1],
+		    "\": must be create, name, or free", NULL);
+	    return TCL_ERROR;
+	}
     }
+
     return TCL_OK;
 }
 
diff --git a/tests/basic.test b/tests/basic.test
index f4c57fe..de986c7 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -336,19 +336,19 @@ test basic-20.1 {Tcl_GetCommandInfo, names for commands created inside namespace
     }]
     list [testcmdtoken name $x] \
          [rename ::p q] \
-         [testcmdtoken name $x]
+         [testcmdtoken name $x][testcmdtoken free $x]
 } {{p ::p} {} {q ::q}}
 test basic-20.2 {Tcl_GetCommandInfo, names for commands created outside namespaces} {testcmdtoken} {
     catch {rename q ""}
     set x [testcmdtoken create test_ns_basic::test_ns_basic2::p]
     list [testcmdtoken name $x] \
          [rename test_ns_basic::test_ns_basic2::p q] \
-         [testcmdtoken name $x]
+         [testcmdtoken name $x][testcmdtoken free $x]
 } {{p ::test_ns_basic::test_ns_basic2::p} {} {q ::q}}
 test basic-20.3 {Tcl_GetCommandInfo, #-quoting} testcmdtoken {
     catch {rename \# ""}
     set x [testcmdtoken create \#]
-    testcmdtoken name $x
+    return [testcmdtoken name $x][testcmdtoken free $x]
 } {{#} ::#}
 
 test basic-21.1 {Tcl_GetCommandName} {emptyTest} {
diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test
index 37b8a0b..ad564d7 100644
--- a/tests/cmdInfo.test
+++ b/tests/cmdInfo.test
@@ -70,7 +70,7 @@ test cmdinfo-4.1 {Tcl_GetCommandName/Tcl_GetCommandFullName procedures} \
     rename x1 newName
     set y [testcmdtoken name $x]
     rename newName x1
-    lappend y {*}[testcmdtoken name $x]
+    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
 } {newName ::newName x1 ::x1}
 
 catch {rename newTestCmd {}}
@@ -87,7 +87,7 @@ test cmdinfo-5.1 {Names for commands created when inside namespaces} \
     }]
     set y [testcmdtoken name $x]
     rename ::testCmd newTestCmd
-    lappend y {*}[testcmdtoken name $x]
+    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
 } {testCmd ::testCmd newTestCmd ::newTestCmd}
 
 test cmdinfo-6.1 {Names for commands created when outside namespaces} \
@@ -95,7 +95,7 @@ test cmdinfo-6.1 {Names for commands created when outside namespaces} \
     set x [testcmdtoken create cmdInfoNs1::cmdInfoNs2::testCmd]
     set y [testcmdtoken name $x]
     rename cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2
-    lappend y {*}[testcmdtoken name $x]
+    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
 } {testCmd ::cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2 ::newTestCmd2}
 
 # cleanup
-- 
cgit v0.12


From e7b37f1737b55c5d6bfaa56a41432a10e0ed91f9 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Fri, 3 Mar 2023 12:39:09 +0000
Subject: Fix Valgrind "still reachable" report in TestcmdtokenCmd().

---
 generic/tclTest.c  | 44 ++++++++++++++++++++++++++++++--------------
 tests/basic.test   |  6 +++---
 tests/cmdInfo.test |  6 +++---
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index b6c7f77..72eca6c 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1206,7 +1206,7 @@ TestcmdtokenCmd(
     int argc,			/* Number of arguments. */
     const char **argv)		/* Argument strings. */
 {
-    TestCommandTokenRef *refPtr;
+    TestCommandTokenRef *refPtr, *prevRefPtr;
     char buf[30];
     int id;
 
@@ -1225,9 +1225,7 @@ TestcmdtokenCmd(
 	firstCommandTokenRef = refPtr;
 	sprintf(buf, "%d", refPtr->id);
 	Tcl_AppendResult(interp, buf, NULL);
-    } else if (strcmp(argv[1], "name") == 0) {
-	Tcl_Obj *objPtr;
-
+    } else {
 	if (sscanf(argv[2], "%d", &id) != 1) {
 	    Tcl_AppendResult(interp, "bad command token \"", argv[2],
 		    "\"", NULL);
@@ -1247,18 +1245,36 @@ TestcmdtokenCmd(
 	    return TCL_ERROR;
 	}
 
-	objPtr = Tcl_NewObj();
-	Tcl_GetCommandFullName(interp, refPtr->token, objPtr);
+	if (strcmp(argv[1], "name") == 0) {
+	    Tcl_Obj *objPtr;
 
-	Tcl_AppendElement(interp,
-		Tcl_GetCommandName(interp, refPtr->token));
-	Tcl_AppendElement(interp, Tcl_GetString(objPtr));
-	Tcl_DecrRefCount(objPtr);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create or name", NULL);
-	return TCL_ERROR;
+	    objPtr = Tcl_NewObj();
+	    Tcl_GetCommandFullName(interp, refPtr->token, objPtr);
+
+	    Tcl_AppendElement(interp,
+		    Tcl_GetCommandName(interp, refPtr->token));
+	    Tcl_AppendElement(interp, Tcl_GetString(objPtr));
+	    Tcl_DecrRefCount(objPtr);
+	} else if (strcmp(argv[1], "free") == 0) {
+	    prevRefPtr = NULL;
+	    for (refPtr = firstCommandTokenRef; refPtr != NULL;
+		    refPtr = refPtr->nextPtr) {
+		if (refPtr->id == id) {
+		    if (prevRefPtr != NULL) {
+			prevRefPtr->nextPtr = refPtr->nextPtr;
+		    }
+		    ckfree(refPtr);
+		    break;
+		}
+		prevRefPtr = refPtr;
+	    }
+	} else {
+	    Tcl_AppendResult(interp, "bad option \"", argv[1],
+		    "\": must be create, name, or free", NULL);
+	    return TCL_ERROR;
+	}
     }
+
     return TCL_OK;
 }
 
diff --git a/tests/basic.test b/tests/basic.test
index f4c57fe..de986c7 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -336,19 +336,19 @@ test basic-20.1 {Tcl_GetCommandInfo, names for commands created inside namespace
     }]
     list [testcmdtoken name $x] \
          [rename ::p q] \
-         [testcmdtoken name $x]
+         [testcmdtoken name $x][testcmdtoken free $x]
 } {{p ::p} {} {q ::q}}
 test basic-20.2 {Tcl_GetCommandInfo, names for commands created outside namespaces} {testcmdtoken} {
     catch {rename q ""}
     set x [testcmdtoken create test_ns_basic::test_ns_basic2::p]
     list [testcmdtoken name $x] \
          [rename test_ns_basic::test_ns_basic2::p q] \
-         [testcmdtoken name $x]
+         [testcmdtoken name $x][testcmdtoken free $x]
 } {{p ::test_ns_basic::test_ns_basic2::p} {} {q ::q}}
 test basic-20.3 {Tcl_GetCommandInfo, #-quoting} testcmdtoken {
     catch {rename \# ""}
     set x [testcmdtoken create \#]
-    testcmdtoken name $x
+    return [testcmdtoken name $x][testcmdtoken free $x]
 } {{#} ::#}
 
 test basic-21.1 {Tcl_GetCommandName} {emptyTest} {
diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test
index 37b8a0b..ad564d7 100644
--- a/tests/cmdInfo.test
+++ b/tests/cmdInfo.test
@@ -70,7 +70,7 @@ test cmdinfo-4.1 {Tcl_GetCommandName/Tcl_GetCommandFullName procedures} \
     rename x1 newName
     set y [testcmdtoken name $x]
     rename newName x1
-    lappend y {*}[testcmdtoken name $x]
+    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
 } {newName ::newName x1 ::x1}
 
 catch {rename newTestCmd {}}
@@ -87,7 +87,7 @@ test cmdinfo-5.1 {Names for commands created when inside namespaces} \
     }]
     set y [testcmdtoken name $x]
     rename ::testCmd newTestCmd
-    lappend y {*}[testcmdtoken name $x]
+    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
 } {testCmd ::testCmd newTestCmd ::newTestCmd}
 
 test cmdinfo-6.1 {Names for commands created when outside namespaces} \
@@ -95,7 +95,7 @@ test cmdinfo-6.1 {Names for commands created when outside namespaces} \
     set x [testcmdtoken create cmdInfoNs1::cmdInfoNs2::testCmd]
     set y [testcmdtoken name $x]
     rename cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2
-    lappend y {*}[testcmdtoken name $x]
+    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
 } {testCmd ::cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2 ::newTestCmd2}
 
 # cleanup
-- 
cgit v0.12


From 7f3d1257ffc45e37ee8c71b666c37088eb2f1c48 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 3 Mar 2023 13:03:02 +0000
Subject: ckfree() shouldn't be used in Tcl 9 core code any more

---
 generic/tclTest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 72eca6c..a5d2e0b 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1263,7 +1263,7 @@ TestcmdtokenCmd(
 		    if (prevRefPtr != NULL) {
 			prevRefPtr->nextPtr = refPtr->nextPtr;
 		    }
-		    ckfree(refPtr);
+		    Tcl_Free(refPtr);
 		    break;
 		}
 		prevRefPtr = refPtr;
-- 
cgit v0.12


From 8f18e27691fabd477dde7d468fa26440ed5da4c2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 3 Mar 2023 13:04:11 +0000
Subject: Adapt type-casts to Tcl 9.0 signature of
 Tcl_Free/Tcl_Realloc/Tcl_AttemptRealloc

---
 generic/tcl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 1a1452e..ec78052 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2377,9 +2377,9 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
 #   define attemptckalloc Tcl_AttemptAlloc
 #   ifdef _MSC_VER
 	/* Silence invalid C4090 warnings */
-#	define ckfree(a) Tcl_Free((char *)(a))
-#	define ckrealloc(a,b) Tcl_Realloc((char *)(a),(b))
-#	define attemptckrealloc(a,b) Tcl_AttemptRealloc((char *)(a),(b))
+#	define ckfree(a) Tcl_Free((void *)(a))
+#	define ckrealloc(a,b) Tcl_Realloc((void *)(a),(b))
+#	define attemptckrealloc(a,b) Tcl_AttemptRealloc((void *)(a),(b))
 #   else
 #	define ckfree Tcl_Free
 #	define ckrealloc Tcl_Realloc
-- 
cgit v0.12


From 6285c1336732a6a7db1fc3627dad6fe6176fbee6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 4 Mar 2023 10:08:18 +0000
Subject: Fix [1b8df10110]: Tcl_GetTime returns wrong usec value on Windows

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

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 6723069..8fc926c 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4035,7 +4035,7 @@ extern const TclStubs *tclStubsPtr;
 /* Handle Win64 tk.dll being loaded in Cygwin64. */
 #	define Tcl_GetTime(t) \
 		do { \
-		    union { \
+		    struct { \
 			Tcl_Time now; \
 			__int64 reserved; \
 		    } _t; \
-- 
cgit v0.12


From e13edcba869deda8b613854d533c106c9855b61d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 4 Mar 2023 10:18:41 +0000
Subject: Test constraint notInCIenv no longer necessary (due to previous fix)

---
 tests/winTime.test | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/winTime.test b/tests/winTime.test
index 68be966..ed8b625 100644
--- a/tests/winTime.test
+++ b/tests/winTime.test
@@ -19,9 +19,6 @@ if {"::tcltest" ni [namespace children]} {
 catch [list package require -exact Tcltest [info patchlevel]]
 
 testConstraint testwinclock [llength [info commands testwinclock]]
-# Some things fail under all Continuous Integration systems for subtle reasons
-# such as CI often running with elevated privileges in a container.
-testConstraint notInCIenv   [expr {![info exists ::env(CI)]}]
 
 # The next two tests will crash on Windows if the check for negative
 # clock values is not done properly.
@@ -43,7 +40,7 @@ test winTime-1.2 {TclpGetDate} {win} {
 # with the Windows clock.  30 sec really isn't enough,
 # but how much time does a tester have patience for?
 
-test winTime-2.1 {Synchronization of Tcl and Windows clocks} {testwinclock notInCIenv} {
+test winTime-2.1 {Synchronization of Tcl and Windows clocks} testwinclock {
     # May fail due to OS/hardware discrepancies.  See:
     # http://support.microsoft.com/default.aspx?scid=kb;en-us;274323
     set failed {}
-- 
cgit v0.12


From 0229ba1283c2457c63df5674f54831eeb4a120ca Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 4 Mar 2023 12:13:31 +0000
Subject: Bug [9c5a00c69d]. Tilde expansion on Windows

---
 win/tclWinFile.c | 73 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 9a6c5f1..639cd72 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -1458,22 +1458,43 @@ TclpGetUserHome(
     if (domain == NULL) {
 	const char *ptr;
 
-	/*
-	 * No domain. Firstly check it's the current user
-	 */
-
+        /*
+         * Treat the current user as a special case because the general case
+         * below does not properly retrieve the path. The NetUserGetInfo
+         * call returns an empty path and the code defaults to the user's
+         * name in the profiles directory. On modern Windows systems, this
+         * is generally wrong as when the account is a Microsoft account,
+         * for example abcdefghi@outlook.com, the directory name is
+         * abcde and not abcdefghi.
+         *
+         * Note we could have just used env(USERPROFILE) here but
+         * the intent is to retrieve (as on Unix) the system's view
+         * of the home irrespective of environment settings of HOME
+         * and USERPROFILE.
+         *
+         * Fixing this for the general user needs more investigating but
+         * at least for the current user we can use a direct call.
+         */
 	ptr = TclpGetUserName(&ds);
 	if (ptr != NULL && strcasecmp(name, ptr) == 0) {
-	    /*
-	     * Try safest and fastest way to get current user home
-	     */
-
-	    ptr = TclGetEnv("HOME", &ds);
-	    if (ptr != NULL) {
-		Tcl_JoinPath(1, &ptr, bufferPtr);
-		rc = 1;
-		result = Tcl_DStringValue(bufferPtr);
-	    }
+            HANDLE hProcess;
+            WCHAR buf[MAX_PATH];
+            DWORD nChars = sizeof(buf) / sizeof(buf[0]);
+            /* Sadly GetCurrentProcessToken not in Win 7 so slightly longer */
+            hProcess = GetCurrentProcess(); /* Need not be closed */
+            if (hProcess) {
+                HANDLE hToken;
+                if (OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) {
+                    if (GetUserProfileDirectoryW(hToken, buf, &nChars)) {
+                        Tcl_WinTCharToUtf((TCHAR *)buf,
+                                          (nChars-1)*sizeof(WCHAR),
+                                          bufferPtr);
+                        result = Tcl_DStringValue(bufferPtr);
+                        rc = 1;
+                    }
+                    CloseHandle(hToken);
+                }
+            }
 	}
 	Tcl_DStringFree(&ds);
     } else {
@@ -1542,30 +1563,6 @@ TclpGetUserHome(
     if (wDomain != NULL) {
 	NetApiBufferFree((void *) wDomain);
     }
-    if (result == NULL) {
-	/*
-	 * Look in the "Password Lists" section of system.ini for the local
-	 * user. There are also entries in that section that begin with a "*"
-	 * character that are used by Windows for other purposes; ignore user
-	 * names beginning with a "*".
-	 */
-
-	char buf[MAX_PATH];
-
-	if (name[0] != '*') {
-	    if (GetPrivateProfileStringA("Password Lists", name, "", buf,
-		    MAX_PATH, "system.ini") > 0) {
-		/*
-		 * User exists, but there is no such thing as a home directory
-		 * in system.ini. Return "{Windows drive}:/".
-		 */
-
-		GetWindowsDirectoryA(buf, MAX_PATH);
-		Tcl_DStringAppend(bufferPtr, buf, 3);
-		result = Tcl_DStringValue(bufferPtr);
-	    }
-	}
-    }
 
     return result;
 }
-- 
cgit v0.12


From c862e5709590a9330c9b814109a0fbfd70f027cb Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 4 Mar 2023 15:11:01 +0000
Subject: Add test for [9c5a00c69d], tilde expansion of ~user

---
 tests/fileSystem.test | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index f363d86..2de778a 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -277,6 +277,16 @@ test filesystem-1.30.1 {normalisation of existing user} -body {
 test filesystem-1.30.2 {normalisation of nonexistent user specified as user@domain} -body {
     file normalize ~nonexistentuser@nonexistentdomain
 } -returnCodes error -result {user "nonexistentuser@nonexistentdomain" doesn't exist}
+test filesystem-1.30.3 {file normalization should distinguish between ~ and ~user} -setup {
+    set oldhome $::env(HOME)
+    set olduserhome [file normalize ~$::tcl_platform(user)]
+    set ::env(HOME) [file join $oldhome temp]
+} -cleanup {
+    set env(HOME) $oldhome
+} -body {
+    list [string equal [file normalize ~] $::env(HOME)] \
+        [string equal $olduserhome [file normalize ~$::tcl_platform(user)]]
+} -result {1 1}
 test filesystem-1.31 {link normalisation: link near filesystem root} {testsetplatform} {
     testsetplatform unix
     file normalize /foo/../bar
-- 
cgit v0.12


From 7b3ef36925e938aa7a1aff22d3d3e521e32f243d Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 4 Mar 2023 16:26:00 +0000
Subject: Protect zlib errors with check for null interp

---
 generic/tclZlib.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index ce8da3c..cd3b3c5 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -449,12 +449,16 @@ GenerateHeader(
 		headerPtr->nativeCommentBuf, MAX_COMMENT_LEN-1, NULL, &len,
 		NULL);
 	if (result != TCL_OK) {
-	    if (result == TCL_CONVERT_UNKNOWN) {
-		Tcl_AppendResult(interp, "Comment contains characters > 0xFF", NULL);
-	    } else {
-		Tcl_AppendResult(interp, "Comment too large for zip", NULL);
+	    if (interp) {
+		if (result == TCL_CONVERT_UNKNOWN) {
+		    Tcl_AppendResult(
+			interp, "Comment contains characters > 0xFF", NULL);
+		}
+		else {
+		    Tcl_AppendResult(interp, "Comment too large for zip", NULL);
+		}
 	    }
-	    result = TCL_ERROR;
+	    result = TCL_ERROR; /* TCL_CONVERT_* -> TCL_ERROR*/
 	    goto error;
 	}
 	headerPtr->nativeCommentBuf[len] = '\0';
@@ -481,12 +485,17 @@ GenerateHeader(
 		headerPtr->nativeFilenameBuf, MAXPATHLEN-1, NULL, &len,
 		NULL);
 	if (result != TCL_OK) {
-	    if (result == TCL_CONVERT_UNKNOWN) {
-		Tcl_AppendResult(interp, "Filename contains characters > 0xFF", NULL);
-	    } else {
-		Tcl_AppendResult(interp, "Filename too large for zip", NULL);
+	    if (interp) {
+		if (result == TCL_CONVERT_UNKNOWN) {
+		    Tcl_AppendResult(
+			interp, "Filename contains characters > 0xFF", NULL);
+		}
+		else {
+		    Tcl_AppendResult(
+			interp, "Filename too large for zip", NULL);
+		}
 	    }
-	    result = TCL_ERROR;
+	    result = TCL_ERROR; /* TCL_CONVERT_* -> TCL_ERROR*/
 	    goto error;
 	}
 	headerPtr->nativeFilenameBuf[len] = '\0';
-- 
cgit v0.12


From 33d81b98be1160ae0475a3d162cec7359264c8c8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 4 Mar 2023 18:12:49 +0000
Subject: Make dltest/pkg*.c simple example how to use Tcl_Size with
 Tcl_GetStringFromObj()

---
 unix/dltest/pkga.c          | 2 +-
 unix/dltest/pkgua.c         | 2 +-
 "unix/dltest/pkg\317\200.c" | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index 579c323..aacb9cd 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -40,7 +40,7 @@ Pkga_EqObjCmd(
 {
     int result;
     const char *str1, *str2;
-    int len1, len2;
+    Tcl_Size len1, len2;
     (void)dummy;
 
     if (objc != 3) {
diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c
index 16684a8..b14fca8 100644
--- a/unix/dltest/pkgua.c
+++ b/unix/dltest/pkgua.c
@@ -127,7 +127,7 @@ PkguaEqObjCmd(
 {
     int result;
     const char *str1, *str2;
-    int len1, len2;
+    Tcl_Size len1, len2;
     (void)dummy;
 
     if (objc != 3) {
diff --git "a/unix/dltest/pkg\317\200.c" "b/unix/dltest/pkg\317\200.c"
index dc01fbd..58b36db 100644
--- "a/unix/dltest/pkg\317\200.c"
+++ "b/unix/dltest/pkg\317\200.c"
@@ -38,9 +38,6 @@ Pkg\u03C0_\u03A0ObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int result;
-    const char *str1, *str2;
-    int len1, len2;
     (void)dummy;
 
     if (objc != 1) {
-- 
cgit v0.12


From 923ff1e3ca4171dd5d562edfcfc4aaab9dfb8d7a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 5 Mar 2023 00:26:54 +0000
Subject: More -1 -> TCL_INDEX_NONE

---
 generic/tclArithSeries.c     |  4 +--
 generic/tclCkalloc.c         |  2 +-
 generic/tclCompCmds.c        | 32 +++++++++---------
 generic/tclCompCmdsSZ.c      | 10 +++---
 generic/tclCompile.c         |  2 +-
 generic/tclConfig.c          | 12 +++----
 generic/tclDictObj.c         | 10 +++---
 generic/tclEnv.c             |  8 ++---
 generic/tclExecute.c         |  2 +-
 generic/tclFCmd.c            |  4 +--
 generic/tclHistory.c         |  2 +-
 generic/tclIOCmd.c           |  2 +-
 generic/tclLink.c            | 10 +++---
 generic/tclListObj.c         |  2 +-
 generic/tclLiteral.c         |  2 +-
 generic/tclLoad.c            | 26 +++++++--------
 generic/tclLoadNone.c        |  2 +-
 generic/tclOOCall.c          |  2 +-
 generic/tclOOMethod.c        | 10 +++---
 generic/tclPathObj.c         |  2 +-
 generic/tclPkg.c             | 22 ++++++-------
 generic/tclProc.c            | 18 +++++-----
 generic/tclRegexp.c          |  6 ++--
 generic/tclResult.c          |  6 ++--
 generic/tclStrToD.c          |  4 +--
 generic/tclStringObj.c       |  6 ++--
 generic/tclStubInit.c        |  4 +--
 generic/tclTestObj.c         | 42 ++++++++++++------------
 generic/tclTestProcBodyObj.c |  2 +-
 generic/tclThreadTest.c      | 10 +++---
 generic/tclTimer.c           | 28 ++++++++--------
 generic/tclZipfs.c           | 78 ++++++++++++++++++++++----------------------
 generic/tclZlib.c            | 62 +++++++++++++++++------------------
 macosx/tclMacOSXFCmd.c       |  6 ++--
 34 files changed, 220 insertions(+), 220 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 48efa8c..0232746 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -357,7 +357,7 @@ TclNewArithSeriesObj(
     if (TCL_MAJOR_VERSION < 9 && len > ListSizeT_MAX) {
 	Tcl_SetObjResult(
 	    interp,
-	    Tcl_NewStringObj("max length of a Tcl list exceeded", -1));
+	    Tcl_NewStringObj("max length of a Tcl list exceeded", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	return TCL_ERROR;
     }
@@ -865,7 +865,7 @@ TclArithSeriesGetElements(
 		    if (interp) {
 			Tcl_SetObjResult(
 			    interp,
-			    Tcl_NewStringObj("max length of a Tcl list exceeded", -1));
+			    Tcl_NewStringObj("max length of a Tcl list exceeded", TCL_INDEX_NONE));
 			Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 		    }
 		    return TCL_ERROR;
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index f7cab9f..6f31940 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -189,7 +189,7 @@ TclDumpMemoryInfo(
 	fprintf((FILE *)clientData, "%s", buf);
     } else {
 	/* Assume objPtr to append to */
-	Tcl_AppendToObj((Tcl_Obj *) clientData, buf, -1);
+	Tcl_AppendToObj((Tcl_Obj *) clientData, buf, TCL_INDEX_NONE);
     }
     return 1;
 }
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index cb3cf1e..3a61a94 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -2300,7 +2300,7 @@ PrintDictUpdateInfo(
 
     for (i=0 ; i<duiPtr->length ; i++) {
 	if (i) {
-	    Tcl_AppendToObj(appendObj, ", ", -1);
+	    Tcl_AppendToObj(appendObj, ", ", TCL_INDEX_NONE);
 	}
 	Tcl_AppendPrintfToObj(appendObj, "%%v%" TCL_Z_MODIFIER "u", duiPtr->varIndices[i]);
     }
@@ -2322,7 +2322,7 @@ DisassembleDictUpdateInfo(
 	Tcl_ListObjAppendElement(NULL, variables,
 		Tcl_NewWideIntObj(duiPtr->varIndices[i]));
     }
-    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("variables", -1),
+    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("variables", TCL_INDEX_NONE),
 	    variables);
 }
 
@@ -2982,11 +2982,11 @@ PrintForeachInfo(
     ForeachVarList *varsPtr;
     size_t i, j;
 
-    Tcl_AppendToObj(appendObj, "data=[", -1);
+    Tcl_AppendToObj(appendObj, "data=[", TCL_INDEX_NONE);
 
     for (i=0 ; i<infoPtr->numLists ; i++) {
 	if (i) {
-	    Tcl_AppendToObj(appendObj, ", ", -1);
+	    Tcl_AppendToObj(appendObj, ", ", TCL_INDEX_NONE);
 	}
 	Tcl_AppendPrintfToObj(appendObj, "%%v%" TCL_Z_MODIFIER "u",
 		(infoPtr->firstValueTemp + i));
@@ -2995,19 +2995,19 @@ PrintForeachInfo(
 	    infoPtr->loopCtTemp);
     for (i=0 ; i<infoPtr->numLists ; i++) {
 	if (i) {
-	    Tcl_AppendToObj(appendObj, ",", -1);
+	    Tcl_AppendToObj(appendObj, ",", TCL_INDEX_NONE);
 	}
 	Tcl_AppendPrintfToObj(appendObj, "\n\t\t it%%v%" TCL_Z_MODIFIER "u\t[",
 		(infoPtr->firstValueTemp + i));
 	varsPtr = infoPtr->varLists[i];
 	for (j=0 ; j<varsPtr->numVars ; j++) {
 	    if (j) {
-		Tcl_AppendToObj(appendObj, ", ", -1);
+		Tcl_AppendToObj(appendObj, ", ", TCL_INDEX_NONE);
 	    }
 	    Tcl_AppendPrintfToObj(appendObj, "%%v%" TCL_Z_MODIFIER "u",
 		    varsPtr->varIndexes[j]);
 	}
-	Tcl_AppendToObj(appendObj, "]", -1);
+	Tcl_AppendToObj(appendObj, "]", TCL_INDEX_NONE);
     }
 }
 
@@ -3026,18 +3026,18 @@ PrintNewForeachInfo(
 	    infoPtr->loopCtTemp);
     for (i=0 ; i<infoPtr->numLists ; i++) {
 	if (i) {
-	    Tcl_AppendToObj(appendObj, ",", -1);
+	    Tcl_AppendToObj(appendObj, ",", TCL_INDEX_NONE);
 	}
-	Tcl_AppendToObj(appendObj, "[", -1);
+	Tcl_AppendToObj(appendObj, "[", TCL_INDEX_NONE);
 	varsPtr = infoPtr->varLists[i];
 	for (j=0 ; j<varsPtr->numVars ; j++) {
 	    if (j) {
-		Tcl_AppendToObj(appendObj, ",", -1);
+		Tcl_AppendToObj(appendObj, ",", TCL_INDEX_NONE);
 	    }
 	    Tcl_AppendPrintfToObj(appendObj, "%%v%" TCL_Z_MODIFIER "u",
 		    varsPtr->varIndexes[j]);
 	}
-	Tcl_AppendToObj(appendObj, "]", -1);
+	Tcl_AppendToObj(appendObj, "]", TCL_INDEX_NONE);
     }
 }
 
@@ -3062,13 +3062,13 @@ DisassembleForeachInfo(
 	Tcl_ListObjAppendElement(NULL, objPtr,
 		Tcl_NewWideIntObj(infoPtr->firstValueTemp + i));
     }
-    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("data", -1), objPtr);
+    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("data", TCL_INDEX_NONE), objPtr);
 
     /*
      * Loop counter.
      */
 
-    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("loop", -1),
+    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("loop", TCL_INDEX_NONE),
 	   Tcl_NewWideIntObj(infoPtr->loopCtTemp));
 
     /*
@@ -3085,7 +3085,7 @@ DisassembleForeachInfo(
 	}
 	Tcl_ListObjAppendElement(NULL, objPtr, innerPtr);
     }
-    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("assign", -1), objPtr);
+    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("assign", TCL_INDEX_NONE), objPtr);
 }
 
 static void
@@ -3104,7 +3104,7 @@ DisassembleNewForeachInfo(
      * Jump offset.
      */
 
-    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("jumpOffset", -1),
+    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("jumpOffset", TCL_INDEX_NONE),
 	   Tcl_NewWideIntObj(infoPtr->loopCtTemp));
 
     /*
@@ -3121,7 +3121,7 @@ DisassembleNewForeachInfo(
 	}
 	Tcl_ListObjAppendElement(NULL, objPtr, innerPtr);
     }
-    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("assign", -1), objPtr);
+    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("assign", TCL_INDEX_NONE), objPtr);
 }
 
 /*
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 0e98584..b86aa43 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -2604,9 +2604,9 @@ PrintJumptableInfo(
 	offset = PTR2INT(Tcl_GetHashValue(hPtr));
 
 	if (i++) {
-	    Tcl_AppendToObj(appendObj, ", ", -1);
+	    Tcl_AppendToObj(appendObj, ", ", TCL_INDEX_NONE);
 	    if (i%4==0) {
-		Tcl_AppendToObj(appendObj, "\n\t\t", -1);
+		Tcl_AppendToObj(appendObj, "\n\t\t", TCL_INDEX_NONE);
 	    }
 	}
 	Tcl_AppendPrintfToObj(appendObj, "\"%s\"->pc %" TCL_Z_MODIFIER "u",
@@ -2633,10 +2633,10 @@ DisassembleJumptableInfo(
     for (; hPtr ; hPtr = Tcl_NextHashEntry(&search)) {
 	keyPtr = (const char *)Tcl_GetHashKey(&jtPtr->hashTable, hPtr);
 	offset = PTR2INT(Tcl_GetHashValue(hPtr));
-	Tcl_DictObjPut(NULL, mapping, Tcl_NewStringObj(keyPtr, -1),
+	Tcl_DictObjPut(NULL, mapping, Tcl_NewStringObj(keyPtr, TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(offset));
     }
-    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("mapping", -1), mapping);
+    Tcl_DictObjPut(NULL, dictObj, Tcl_NewStringObj("mapping", TCL_INDEX_NONE), mapping);
 }
 
 /*
@@ -4081,7 +4081,7 @@ CompileAssociativeBinaryOpCmd(
 	CompileWord(envPtr, tokenPtr, interp, words);
     }
     if (parsePtr->numWords <= 2) {
-	PushLiteral(envPtr, identity, -1);
+	PushLiteral(envPtr, identity, TCL_INDEX_NONE);
 	words++;
     }
     if (words > 3) {
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 9708255..be308e3 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2161,7 +2161,7 @@ TclCompileScript(
      */
     if (iPtr->numLevels / 5 > iPtr->maxNestingDepth / 4) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-	    "too many nested compilations (infinite loop?)", -1));
+	    "too many nested compilations (infinite loop?)", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "LIMIT", "STACK", NULL);
 	TclCompileSyntaxError(interp, envPtr);
 	return;
diff --git a/generic/tclConfig.c b/generic/tclConfig.c
index 1ece31c..17490bd 100644
--- a/generic/tclConfig.c
+++ b/generic/tclConfig.c
@@ -85,7 +85,7 @@ Tcl_RegisterConfig(
     } else {
 	cdPtr->encoding = NULL;
     }
-    cdPtr->pkg = Tcl_NewStringObj(pkgName, -1);
+    cdPtr->pkg = Tcl_NewStringObj(pkgName, TCL_INDEX_NONE);
 
     /*
      * Phase I: Adding the provided information to the internal database of
@@ -127,7 +127,7 @@ Tcl_RegisterConfig(
      */
 
     for (cfg=configuration ; cfg->key!=NULL && cfg->key[0]!='\0' ; cfg++) {
-	Tcl_DictObjPut(interp, pkgDict, Tcl_NewStringObj(cfg->key, -1),
+	Tcl_DictObjPut(interp, pkgDict, Tcl_NewStringObj(cfg->key, TCL_INDEX_NONE),
 		Tcl_NewByteArrayObj((unsigned char *)cfg->value, strlen(cfg->value)));
     }
 
@@ -144,7 +144,7 @@ Tcl_RegisterConfig(
 
     Tcl_DStringInit(&cmdName);
     TclDStringAppendLiteral(&cmdName, "::");
-    Tcl_DStringAppend(&cmdName, pkgName, -1);
+    Tcl_DStringAppend(&cmdName, pkgName, TCL_INDEX_NONE);
 
     /*
      * The incomplete command name is the name of the namespace to place it
@@ -227,7 +227,7 @@ QueryConfigObjCmd(
 	 * present.
 	 */
 
-	Tcl_SetObjResult(interp, Tcl_NewStringObj("package not known", -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("package not known", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "FATAL", "PKGCFG_BASE",
 		TclGetString(pkgName), NULL);
 	return TCL_ERROR;
@@ -242,7 +242,7 @@ QueryConfigObjCmd(
 
 	if (Tcl_DictObjGet(interp, pkgDict, objv[2], &val) != TCL_OK
 		|| val == NULL) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("key not known", -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("key not known", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CONFIG",
 		    TclGetString(objv[2]), NULL);
 	    return TCL_ERROR;
@@ -279,7 +279,7 @@ QueryConfigObjCmd(
 
 	if (!listPtr) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "insufficient memory to create list", -1));
+		    "insufficient memory to create list", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 	    return TCL_ERROR;
 	}
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 04a909f..5c18c8a 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -717,7 +717,7 @@ SetDictFromAny(
   missingValue:
     if (interp != NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"missing value to go with key", -1));
+		"missing value to go with key", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "VALUE", "DICTIONARY", NULL);
     }
   errorInFindDictElement:
@@ -2119,7 +2119,7 @@ DictInfoCmd(
     }
 
     statsStr = Tcl_HashStats(&dict->table);
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(statsStr, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(statsStr, TCL_INDEX_NONE));
     Tcl_Free(statsStr);
     return TCL_OK;
 }
@@ -2481,7 +2481,7 @@ DictForNRCmd(
     }
     if (varc != 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"must have exactly two variable names", -1));
+		"must have exactly two variable names", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "dict", "for", NULL);
 	return TCL_ERROR;
     }
@@ -2676,7 +2676,7 @@ DictMapNRCmd(
     }
     if (varc != 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"must have exactly two variable names", -1));
+		"must have exactly two variable names", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "dict", "map", NULL);
 	return TCL_ERROR;
     }
@@ -3116,7 +3116,7 @@ DictFilterCmd(
 	}
 	if (varc != 2) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "must have exactly two variable names", -1));
+		    "must have exactly two variable names", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "dict", "filter", NULL);
 	    return TCL_ERROR;
 	}
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 630e89c..6dae72a 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -185,8 +185,8 @@ TclSetupEnv(
 		p1 = "COMSPEC";
 	    }
 #endif
-	    obj1 = Tcl_NewStringObj(p1, -1);
-	    obj2 = Tcl_NewStringObj(p2, -1);
+	    obj1 = Tcl_NewStringObj(p1, TCL_INDEX_NONE);
+	    obj2 = Tcl_NewStringObj(p2, TCL_INDEX_NONE);
 	    Tcl_DStringFree(&envString);
 
 	    Tcl_IncrRefCount(obj1);
@@ -406,7 +406,7 @@ Tcl_PutEnv(
      * name and value parts, and call TclSetEnv to do all of the real work.
      */
 
-    name = Tcl_ExternalToUtfDString(NULL, assignment, -1, &nameString);
+    name = Tcl_ExternalToUtfDString(NULL, assignment, TCL_INDEX_NONE, &nameString);
     value = (char *)strchr(name, '=');
 
     if ((value != NULL) && (value != name)) {
@@ -582,7 +582,7 @@ TclGetEnv(
 	if (*result == '=') {
 	    result++;
 	    Tcl_DStringInit(valuePtr);
-	    Tcl_DStringAppend(valuePtr, result, -1);
+	    Tcl_DStringAppend(valuePtr, result, TCL_INDEX_NONE);
 	    result = Tcl_DStringValue(valuePtr);
 	} else {
 	    result = NULL;
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 1e23517..81ce1a7 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5039,7 +5039,7 @@ TEBCresume(
 
     case INST_LREPLACE4:
 	{
-	Tcl_Size numToDelete, numNewElems;
+	size_t numToDelete, numNewElems;
 	int end_indicator;
 	int haveSecondIndex, flags;
 	Tcl_Obj *fromIdxObj, *toIdxObj;
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 89550d9..c1dbc88 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1042,7 +1042,7 @@ TclFileAttrsCmd(
 	    res = Tcl_FSFileAttrsGet(interp, index, filePtr, &objPtrAttr);
 	    if (res == TCL_OK) {
 		Tcl_Obj *objPtr =
-			Tcl_NewStringObj(attributeStrings[index], -1);
+			Tcl_NewStringObj(attributeStrings[index], TCL_INDEX_NONE);
 
 		Tcl_ListObjAppendElement(interp, listPtr, objPtr);
 		Tcl_ListObjAppendElement(interp, listPtr, objPtrAttr);
@@ -1492,7 +1492,7 @@ TclFileTemporaryCmd(
 	    return TCL_ERROR;
 	}
     }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), TCL_INDEX_NONE));
     return TCL_OK;
 }
 
diff --git a/generic/tclHistory.c b/generic/tclHistory.c
index dc5a67d..8083b4d 100644
--- a/generic/tclHistory.c
+++ b/generic/tclHistory.c
@@ -69,7 +69,7 @@ Tcl_RecordAndEval(
 	 * Call Tcl_RecordAndEvalObj to do the actual work.
 	 */
 
-	cmdPtr = Tcl_NewStringObj(cmd, -1);
+	cmdPtr = Tcl_NewStringObj(cmd, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(cmdPtr);
 	result = Tcl_RecordAndEvalObj(interp, cmdPtr, flags);
 
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 197ca32..2298d48 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1080,7 +1080,7 @@ Tcl_OpenObjCmd(
 	if (objc == 4) {
 	    const char *permString = TclGetString(objv[3]);
 	    int code = TCL_ERROR;
-	    int scanned = TclParseAllWhiteSpace(permString, -1);
+	    int scanned = TclParseAllWhiteSpace(permString, TCL_INDEX_NONE);
 
 	    /*
 	     * Support legacy octal numbers.
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 37c104b..eec778a 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -175,7 +175,7 @@ Tcl_LinkVar(
     linkPtr = (Link *)Tcl_Alloc(sizeof(Link));
     linkPtr->interp = interp;
     linkPtr->nsPtr = NULL;
-    linkPtr->varName = Tcl_NewStringObj(varName, -1);
+    linkPtr->varName = Tcl_NewStringObj(varName, TCL_INDEX_NONE);
     Tcl_IncrRefCount(linkPtr->varName);
     linkPtr->addr = addr;
     linkPtr->type = type & ~TCL_LINK_READ_ONLY;
@@ -256,7 +256,7 @@ Tcl_LinkArray(
 
     if (size < 1) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"wrong array size given", -1));
+		"wrong array size given", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
 
@@ -340,7 +340,7 @@ Tcl_LinkArray(
     default:
 	LinkFree(linkPtr);
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"bad linked array variable type", -1));
+		"bad linked array variable type", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
 
@@ -380,7 +380,7 @@ Tcl_LinkArray(
      */
 
     linkPtr->interp = interp;
-    linkPtr->varName = Tcl_NewStringObj(varName, -1);
+    linkPtr->varName = Tcl_NewStringObj(varName, TCL_INDEX_NONE);
     Tcl_IncrRefCount(linkPtr->varName);
 
     TclGetNamespaceForQualName(interp, varName, NULL, TCL_GLOBAL_ONLY,
@@ -1433,7 +1433,7 @@ ObjValue(
 	    TclNewLiteralStringObj(resultObj, "NULL");
 	    return resultObj;
 	}
-	return Tcl_NewStringObj(p, -1);
+	return Tcl_NewStringObj(p, TCL_INDEX_NONE);
 
     case TCL_LINK_CHARS:
 	if (linkPtr->flags & LINK_ALLOC_LAST) {
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 9102af0..7cf96cb 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -526,7 +526,7 @@ ListLimitExceededError(Tcl_Interp *interp)
     if (interp != NULL) {
 	Tcl_SetObjResult(
 	    interp,
-	    Tcl_NewStringObj("max length of a Tcl list exceeded", -1));
+	    Tcl_NewStringObj("max length of a Tcl list exceeded", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
     }
     return TCL_ERROR;
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index dfb92cb..24e99fc 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -1057,7 +1057,7 @@ TclInvalidateCmdLiteral(
 {
     Interp *iPtr = (Interp *) interp;
     Tcl_Obj *literalObjPtr = TclCreateLiteral(iPtr, name,
-	    strlen(name), -1, NULL, nsPtr, 0, NULL);
+	    strlen(name), TCL_INDEX_NONE, NULL, nsPtr, 0, NULL);
 
     if (literalObjPtr != NULL) {
 	if (TclHasInternalRep(literalObjPtr, &tclCmdNameType)) {
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index fa0b584..b66122d 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -192,7 +192,7 @@ Tcl_LoadObjCmd(
     }
     if ((fullFileName[0] == 0) && (prefix == NULL)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"must specify either file name or prefix", -1));
+		"must specify either file name or prefix", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LOAD", "NOLIBRARY",
 		NULL);
 	code = TCL_ERROR;
@@ -232,9 +232,9 @@ Tcl_LoadObjCmd(
 	    namesMatch = 0;
 	} else {
 	    TclDStringClear(&pfx);
-	    Tcl_DStringAppend(&pfx, prefix, -1);
+	    Tcl_DStringAppend(&pfx, prefix, TCL_INDEX_NONE);
 	    TclDStringClear(&tmp);
-	    Tcl_DStringAppend(&tmp, libraryPtr->prefix, -1);
+	    Tcl_DStringAppend(&tmp, libraryPtr->prefix, TCL_INDEX_NONE);
 	    if (strcmp(Tcl_DStringValue(&tmp),
 		    Tcl_DStringValue(&pfx)) == 0) {
 		namesMatch = 1;
@@ -307,7 +307,7 @@ Tcl_LoadObjCmd(
 	 */
 
 	if (prefix != NULL) {
-	    Tcl_DStringAppend(&pfx, prefix, -1);
+	    Tcl_DStringAppend(&pfx, prefix, TCL_INDEX_NONE);
 	} else {
 	    Tcl_Obj *splitPtr, *pkgGuessPtr;
 	    size_t pElements;
@@ -487,7 +487,7 @@ Tcl_LoadObjCmd(
 	     * this interp are incompatible in their stubs mechanisms, and
 	     * recorded the error in the oldest legacy place we have to do so.
 	     */
-	    Tcl_SetObjResult(target, Tcl_NewStringObj(iPtr->legacyResult, -1));
+	    Tcl_SetObjResult(target, Tcl_NewStringObj(iPtr->legacyResult, TCL_INDEX_NONE));
 	    iPtr->legacyResult = NULL;
 	    iPtr->legacyFreeProc = (void (*) (void))-1;
 	}
@@ -625,7 +625,7 @@ Tcl_UnloadObjCmd(
     }
     if ((fullFileName[0] == 0) && (prefix == NULL)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"must specify either file name or prefix", -1));
+		"must specify either file name or prefix", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "UNLOAD", "NOLIBRARY",
 		NULL);
 	code = TCL_ERROR;
@@ -665,9 +665,9 @@ Tcl_UnloadObjCmd(
 	    namesMatch = 0;
 	} else {
 	    TclDStringClear(&pfx);
-	    Tcl_DStringAppend(&pfx, prefix, -1);
+	    Tcl_DStringAppend(&pfx, prefix, TCL_INDEX_NONE);
 	    TclDStringClear(&tmp);
-	    Tcl_DStringAppend(&tmp, libraryPtr->prefix, -1);
+	    Tcl_DStringAppend(&tmp, libraryPtr->prefix, TCL_INDEX_NONE);
 	    if (strcmp(Tcl_DStringValue(&tmp),
 		    Tcl_DStringValue(&pfx)) == 0) {
 		namesMatch = 1;
@@ -1121,8 +1121,8 @@ TclGetLoadedLibraries(
 	Tcl_MutexLock(&libraryMutex);
 	for (libraryPtr = firstLibraryPtr; libraryPtr != NULL;
 		libraryPtr = libraryPtr->nextPtr) {
-	    pkgDesc[0] = Tcl_NewStringObj(libraryPtr->fileName, -1);
-	    pkgDesc[1] = Tcl_NewStringObj(libraryPtr->prefix, -1);
+	    pkgDesc[0] = Tcl_NewStringObj(libraryPtr->fileName, TCL_INDEX_NONE);
+	    pkgDesc[1] = Tcl_NewStringObj(libraryPtr->prefix, TCL_INDEX_NONE);
 	    Tcl_ListObjAppendElement(NULL, resultObj,
 		    Tcl_NewListObj(2, pkgDesc));
 	}
@@ -1147,7 +1147,7 @@ TclGetLoadedLibraries(
 	    libraryPtr = ipPtr->libraryPtr;
 
 	    if (!strcmp(prefix, libraryPtr->prefix)) {
-		resultObj = Tcl_NewStringObj(libraryPtr->fileName, -1);
+		resultObj = Tcl_NewStringObj(libraryPtr->fileName, TCL_INDEX_NONE);
 		break;
 	    }
 	}
@@ -1166,8 +1166,8 @@ TclGetLoadedLibraries(
     TclNewObj(resultObj);
     for (; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
 	libraryPtr = ipPtr->libraryPtr;
-	pkgDesc[0] = Tcl_NewStringObj(libraryPtr->fileName, -1);
-	pkgDesc[1] = Tcl_NewStringObj(libraryPtr->prefix, -1);
+	pkgDesc[0] = Tcl_NewStringObj(libraryPtr->fileName, TCL_INDEX_NONE);
+	pkgDesc[1] = Tcl_NewStringObj(libraryPtr->prefix, TCL_INDEX_NONE);
 	Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewListObj(2, pkgDesc));
     }
     Tcl_SetObjResult(interp, resultObj);
diff --git a/generic/tclLoadNone.c b/generic/tclLoadNone.c
index f60f843..abf6eda 100644
--- a/generic/tclLoadNone.c
+++ b/generic/tclLoadNone.c
@@ -81,7 +81,7 @@ TclpLoadMemory(
 {
     if (interp) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj("dynamic loading from memory "
-		"is not available on this system", -1));
+		"is not available on this system", TCL_INDEX_NONE));
     }
     return TCL_ERROR;
 }
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 450fc9f..fcf7f2b 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -1848,7 +1848,7 @@ TclOORenderCallChain(
 		? Tcl_GetObjectName(interp,
 			(Tcl_Object) miPtr->mPtr->declaringClassPtr->thisPtr)
 		: objectLiteral;
-	descObjs[3] = Tcl_NewStringObj(miPtr->mPtr->typePtr->name, -1);
+	descObjs[3] = Tcl_NewStringObj(miPtr->mPtr->typePtr->name, TCL_INDEX_NONE);
 
 	objv[i] = Tcl_NewListObj(4, descObjs);
     }
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index 70f9503..2ac21b8 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -387,7 +387,7 @@ TclOONewBasicMethod(
 				/* Name of the method, whether it is public,
 				 * and the function to implement it. */
 {
-    Tcl_Obj *namePtr = Tcl_NewStringObj(dcm->name, -1);
+    Tcl_Obj *namePtr = Tcl_NewStringObj(dcm->name, TCL_INDEX_NONE);
 
     Tcl_IncrRefCount(namePtr);
     TclNewMethod(interp, (Tcl_Class) clsPtr, namePtr,
@@ -1410,7 +1410,7 @@ CloneProcedureMethod(
 
 	    TclNewObj(argObj);
 	    Tcl_ListObjAppendElement(NULL, argObj,
-		    Tcl_NewStringObj(localPtr->name, -1));
+		    Tcl_NewStringObj(localPtr->name, TCL_INDEX_NONE));
 	    if (localPtr->defValuePtr != NULL) {
 		Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
 	    }
@@ -1481,7 +1481,7 @@ TclOONewForwardInstanceMethod(
     }
     if (prefixLen < 1) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"method forward prefix must be non-empty", -1));
+		"method forward prefix must be non-empty", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_FORWARD", NULL);
 	return NULL;
     }
@@ -1520,7 +1520,7 @@ TclOONewForwardMethod(
     }
     if (prefixLen < 1) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"method forward prefix must be non-empty", -1));
+		"method forward prefix must be non-empty", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_FORWARD", NULL);
 	return NULL;
     }
@@ -1707,7 +1707,7 @@ InitEnsembleRewrite(
     int *lengthPtr)		/* Where to write the resulting length of the
 				 * array of rewritten arguments. */
 {
-    unsigned len = rewriteLength + objc - toRewrite;
+    size_t len = rewriteLength + objc - toRewrite;
     Tcl_Obj **argObjs = (Tcl_Obj **)TclStackAlloc(interp, sizeof(Tcl_Obj *) * len);
 
     memcpy(argObjs, rewriteObjs, rewriteLength * sizeof(Tcl_Obj *));
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index d0826b7..19c1b9d 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -751,7 +751,7 @@ GetExtension(
     if (extension == NULL) {
 	TclNewObj(ret);
     } else {
-	ret = Tcl_NewStringObj(extension, -1);
+	ret = Tcl_NewStringObj(extension, TCL_INDEX_NONE);
     }
     Tcl_IncrRefCount(ret);
     return ret;
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 34346f9..132a219 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -165,7 +165,7 @@ Tcl_PkgProvideEx(
 
     pkgPtr = FindPackage(interp, name);
     if (pkgPtr->version == NULL) {
-	pkgPtr->version = Tcl_NewStringObj(version, -1);
+	pkgPtr->version = Tcl_NewStringObj(version, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(pkgPtr->version);
 	pkgPtr->clientData = clientData;
 	return TCL_OK;
@@ -291,7 +291,7 @@ TclPkgFileSeen(
 	} else {
 	    list = (Tcl_Obj *)Tcl_GetHashValue(entry);
 	}
-	Tcl_ListObjAppendElement(interp, list, Tcl_NewStringObj(fileName, -1));
+	Tcl_ListObjAppendElement(interp, list, Tcl_NewStringObj(fileName, TCL_INDEX_NONE));
     }
 }
 
@@ -407,7 +407,7 @@ Tcl_PkgRequireEx(
 		!= CheckVersionAndConvert(interp, version, NULL, NULL)) {
 	    return NULL;
 	}
-	ov = Tcl_NewStringObj(version, -1);
+	ov = Tcl_NewStringObj(version, TCL_INDEX_NONE);
 	if (exact) {
 	    Tcl_AppendStringsToObj(ov, "-", version, NULL);
 	}
@@ -531,7 +531,7 @@ PkgRequireCoreStep1(
      */
 
     Tcl_DStringInit(&command);
-    Tcl_DStringAppend(&command, script, -1);
+    Tcl_DStringAppend(&command, script, TCL_INDEX_NONE);
     Tcl_DStringAppendElement(&command, name);
     AddRequirementsToDString(&command, reqc, reqv);
 
@@ -839,7 +839,7 @@ SelectPackage(
 	Tcl_NRAddCallback(interp,
 		SelectPackageFinal, reqPtr, INT2PTR(reqc), (void *)reqv,
 		data[3]);
-	Tcl_NREvalObj(interp, Tcl_NewStringObj(bestPtr->script, -1),
+	Tcl_NREvalObj(interp, Tcl_NewStringObj(bestPtr->script, TCL_INDEX_NONE),
 		TCL_EVAL_GLOBAL);
     }
     return TCL_OK;
@@ -1200,7 +1200,7 @@ TclNRPackageObjCmd(
 		if (objc == 4) {
 		    Tcl_Free(argv3i);
 		    Tcl_SetObjResult(interp,
-			    Tcl_NewStringObj(availPtr->script, -1));
+			    Tcl_NewStringObj(availPtr->script, TCL_INDEX_NONE));
 		    return TCL_OK;
 		}
 		Tcl_EventuallyFree(availPtr->script, TCL_DYNAMIC);
@@ -1251,7 +1251,7 @@ TclNRPackageObjCmd(
 		pkgPtr = (Package *)Tcl_GetHashValue(hPtr);
 		if ((pkgPtr->version != NULL) || (pkgPtr->availPtr != NULL)) {
 		    Tcl_ListObjAppendElement(NULL,resultObj, Tcl_NewStringObj(
-			    (char *)Tcl_GetHashKey(tablePtr, hPtr), -1));
+			    (char *)Tcl_GetHashKey(tablePtr, hPtr), TCL_INDEX_NONE));
 		}
 	    }
 	    Tcl_SetObjResult(interp, resultObj);
@@ -1353,7 +1353,7 @@ TclNRPackageObjCmd(
 	     * Create a new-style requirement for the exact version.
 	     */
 
-	    ov = Tcl_NewStringObj(version, -1);
+	    ov = Tcl_NewStringObj(version, TCL_INDEX_NONE);
 	    Tcl_AppendStringsToObj(ov, "-", version, NULL);
 	    version = NULL;
 	    argv3 = TclGetString(objv[3]);
@@ -1404,7 +1404,7 @@ TclNRPackageObjCmd(
 	if (objc == 2) {
 	    if (iPtr->packageUnknown != NULL) {
 		Tcl_SetObjResult(interp,
-			Tcl_NewStringObj(iPtr->packageUnknown, -1));
+			Tcl_NewStringObj(iPtr->packageUnknown, TCL_INDEX_NONE));
 	    }
 	} else if (objc == 3) {
 	    if (iPtr->packageUnknown != NULL) {
@@ -1456,7 +1456,7 @@ TclNRPackageObjCmd(
 	 */
 
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj(pkgPreferOptions[iPtr->packagePrefer], -1));
+		Tcl_NewStringObj(pkgPreferOptions[iPtr->packagePrefer], TCL_INDEX_NONE));
 	break;
     }
     case PKG_VCOMPARE:
@@ -1503,7 +1503,7 @@ TclNRPackageObjCmd(
 		for (availPtr = pkgPtr->availPtr; availPtr != NULL;
 			availPtr = availPtr->nextPtr) {
 		    Tcl_ListObjAppendElement(NULL, resultObj,
-			    Tcl_NewStringObj(availPtr->version, -1));
+			    Tcl_NewStringObj(availPtr->version, TCL_INDEX_NONE));
 		}
 	    }
 	    Tcl_SetObjResult(interp, resultObj);
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 01bc337..c8a304a 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -524,9 +524,9 @@ TclCreateProc(
 	}
 	if (fieldCount > 2) {
 	    Tcl_Obj *errorObj = Tcl_NewStringObj(
-		"too many fields in argument specifier \"", -1);
+		"too many fields in argument specifier \"", TCL_INDEX_NONE);
 	    Tcl_AppendObjToObj(errorObj, argArray[i]);
-	    Tcl_AppendToObj(errorObj, "\"", -1);
+	    Tcl_AppendToObj(errorObj, "\"", TCL_INDEX_NONE);
 	    Tcl_SetObjResult(interp, errorObj);
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 		    "FORMALARGUMENTFORMAT", NULL);
@@ -534,7 +534,7 @@ TclCreateProc(
 	}
 	if ((fieldCount == 0) || (Tcl_GetCharLength(fieldValues[0]) == 0)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "argument with no name", -1));
+		    "argument with no name", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 		    "FORMALARGUMENTFORMAT", NULL);
 	    goto procError;
@@ -560,9 +560,9 @@ TclCreateProc(
 		}
 	    } else if (*argnamei == ':' && *(argnamei+1) == ':') {
 		Tcl_Obj *errorObj = Tcl_NewStringObj(
-		    "formal parameter \"", -1);
+		    "formal parameter \"", TCL_INDEX_NONE);
 		Tcl_AppendObjToObj(errorObj, fieldValues[0]);
-		Tcl_AppendToObj(errorObj, "\" is not a simple name", -1);
+		Tcl_AppendToObj(errorObj, "\" is not a simple name", TCL_INDEX_NONE);
 		Tcl_SetObjResult(interp, errorObj);
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 			"FORMALARGUMENTFORMAT", NULL);
@@ -613,7 +613,7 @@ TclCreateProc(
 			    "procedure \"%s\": formal parameter \"", procName);
 		    Tcl_AppendObjToObj(errorObj, fieldValues[0]);
 		    Tcl_AppendToObj(errorObj, "\" has "
-			"default value inconsistent with precompiled body", -1);
+			"default value inconsistent with precompiled body", TCL_INDEX_NONE);
 		    Tcl_SetObjResult(interp, errorObj);
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 			    "BYTECODELIES", NULL);
@@ -1080,7 +1080,7 @@ ProcWrongNumArgs(
 	    sizeof(Tcl_Obj *) * (numArgs+1));
 
     if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) {
-	desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", -1);
+	desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", TCL_INDEX_NONE);
     } else {
 	desiredObjs[0] = framePtr->objv[skip-1];
     }
@@ -1941,7 +1941,7 @@ TclProcCompileProc(
 	if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
 	    if ((Interp *) *codePtr->interpHandle != iPtr) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"a precompiled script jumped interps", -1));
+			"a precompiled script jumped interps", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PROC",
 			"CROSSINTERPBYTECODE", NULL);
 		return TCL_ERROR;
@@ -1969,7 +1969,7 @@ TclProcCompileProc(
 	    TclNewLiteralStringObj(message, "Compiling ");
 	    Tcl_IncrRefCount(message);
 	    Tcl_AppendStringsToObj(message, description, " \"", NULL);
-	    Tcl_AppendLimitedToObj(message, procName, -1, 50, NULL);
+	    Tcl_AppendLimitedToObj(message, procName, TCL_INDEX_NONE, 50, NULL);
 	    fprintf(stdout, "%s\"\n", TclGetString(message));
 	    Tcl_DecrRefCount(message);
 	}
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 4e3c6c5..07beffd 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -221,9 +221,9 @@ Tcl_RegExpExec(
      */
 
     Tcl_DStringInit(&ds);
-    ustr = Tcl_UtfToUniCharDString(text, -1, &ds);
+    ustr = Tcl_UtfToUniCharDString(text, TCL_INDEX_NONE, &ds);
     numChars = Tcl_DStringLength(&ds) / sizeof(Tcl_UniChar);
-    result = RegExpExecUniChar(interp, re, ustr, numChars, -1 /* nmatches */,
+    result = RegExpExecUniChar(interp, re, ustr, numChars, TCL_INDEX_NONE /* nmatches */,
 	    flags);
     Tcl_DStringFree(&ds);
 
@@ -689,7 +689,7 @@ TclRegAbout(
     for (inf=infonames ; inf->bit != 0 ; inf++) {
 	if (regexpPtr->re.re_info & inf->bit) {
 	    Tcl_ListObjAppendElement(NULL, infoObj,
-		    Tcl_NewStringObj(inf->text, -1));
+		    Tcl_NewStringObj(inf->text, TCL_INDEX_NONE));
 	}
     }
     Tcl_ListObjAppendElement(NULL, resultObj, infoObj);
diff --git a/generic/tclResult.c b/generic/tclResult.c
index c0266bc..6a36fdf 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -317,7 +317,7 @@ Tcl_AppendResult(
 	if (bytes == NULL) {
 	    break;
 	}
-	Tcl_AppendToObj(objPtr, bytes, -1);
+	Tcl_AppendToObj(objPtr, bytes, TCL_INDEX_NONE);
     }
     Tcl_SetObjResult(interp, objPtr);
     va_end(argList);
@@ -354,7 +354,7 @@ Tcl_AppendElement(
 				 * to result. */
 {
     Interp *iPtr = (Interp *) interp;
-    Tcl_Obj *elementPtr = Tcl_NewStringObj(element, -1);
+    Tcl_Obj *elementPtr = Tcl_NewStringObj(element, TCL_INDEX_NONE);
     Tcl_Obj *listPtr = Tcl_NewListObj(1, &elementPtr);
     const char *bytes;
     size_t length;
@@ -511,7 +511,7 @@ Tcl_SetErrorCode(
 	if (elem == NULL) {
 	    break;
 	}
-	Tcl_ListObjAppendElement(NULL, errorObj, Tcl_NewStringObj(elem, -1));
+	Tcl_ListObjAppendElement(NULL, errorObj, Tcl_NewStringObj(elem, TCL_INDEX_NONE));
     }
     Tcl_SetObjErrorCode(interp, errorObj);
     va_end(argList);
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 597fe77..2f29617 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -1523,7 +1523,7 @@ TclParseNumber(
 		    expected);
 
 	    Tcl_AppendLimitedToObj(msg, bytes, numBytes, 50, "");
-	    Tcl_AppendToObj(msg, "\"", -1);
+	    Tcl_AppendToObj(msg, "\"", TCL_INDEX_NONE);
 	    Tcl_SetObjResult(interp, msg);
 	    Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
 	}
@@ -4787,7 +4787,7 @@ Tcl_InitBignumFromDouble(
 	if (interp != NULL) {
 	    const char *s = "integer value too large to represent";
 
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
 	}
 	return TCL_ERROR;
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index e1376f4..0acc6e2 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1683,7 +1683,7 @@ AppendUtfToUnicodeRep(
 	return;
     }
 
-    ExtendUnicodeRepWithString(objPtr, bytes, numBytes, -1);
+    ExtendUnicodeRepWithString(objPtr, bytes, numBytes, TCL_INDEX_NONE);
     TclInvalidateStringRep(objPtr);
     stringPtr = GET_STRING(objPtr);
     stringPtr->allocated = 0;
@@ -1812,7 +1812,7 @@ Tcl_AppendStringsToObj(
 	if (bytes == NULL) {
 	    break;
 	}
-	Tcl_AppendToObj(objPtr, bytes, -1);
+	Tcl_AppendToObj(objPtr, bytes, TCL_INDEX_NONE);
     }
     va_end(argList);
 }
@@ -2588,7 +2588,7 @@ Tcl_AppendFormatToObj(
 
   errorMsg:
     if (interp != NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "FORMAT", errCode, NULL);
     }
   error:
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 1186aa3..dbd8b52 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -337,7 +337,7 @@ static int exprInt(Tcl_Interp *interp, const char *expr, int *ptr){
 	    *ptr = (int)longValue;
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "integer value too large to represent", -1));
+		    "integer value too large to represent", TCL_INDEX_NONE));
 	    result = TCL_ERROR;
 	}
     }
@@ -353,7 +353,7 @@ static int exprIntObj(Tcl_Interp *interp, Tcl_Obj*expr, int *ptr){
 	    *ptr = (int)longValue;
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "integer value too large to represent", -1));
+		    "integer value too large to represent", TCL_INDEX_NONE));
 	    result = TCL_ERROR;
 	}
     }
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 131601d..3bf6989 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -180,13 +180,13 @@ TestbignumobjCmd(
 	string = Tcl_GetString(objv[3]);
 	if (mp_init(&bignumValue) != MP_OKAY) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_init", -1));
+		    Tcl_NewStringObj("error in mp_init", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (mp_read_radix(&bignumValue, string, 10) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_read_radix", -1));
+		    Tcl_NewStringObj("error in mp_read_radix", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 
@@ -230,7 +230,7 @@ TestbignumobjCmd(
 	if (mp_mul_d(&bignumValue, 10, &bignumValue) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_mul_d", -1));
+		    Tcl_NewStringObj("error in mp_mul_d", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -255,7 +255,7 @@ TestbignumobjCmd(
 	if (mp_div_d(&bignumValue, 10, &bignumValue, NULL) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_div_d", -1));
+		    Tcl_NewStringObj("error in mp_div_d", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -280,7 +280,7 @@ TestbignumobjCmd(
 	if (mp_mod_2d(&bignumValue, 1, &bignumValue) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_mod_2d", -1));
+		    Tcl_NewStringObj("error in mp_mod_2d", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -598,7 +598,7 @@ TestindexobjCmd(
     }
 
     if (objc < 5) {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", TCL_INDEX_NONE);
 	return TCL_ERROR;
     }
 
@@ -738,7 +738,7 @@ TestintobjCmd(
 	    return TCL_ERROR;
 	}
 	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		((wideValue == WIDE_MAX)? "1" : "0"), -1);
+		((wideValue == WIDE_MAX)? "1" : "0"), TCL_INDEX_NONE);
     } else if (strcmp(subCmd, "get") == 0) {
 	if (objc != 3) {
 	    goto wrongNumArgs;
@@ -754,7 +754,7 @@ TestintobjCmd(
 	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
 	    return TCL_ERROR;
 	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), TCL_INDEX_NONE);
     } else if (strcmp(subCmd, "inttoobigtest") == 0) {
 	/*
 	 * If long ints have more bits than ints on this platform, verify that
@@ -767,7 +767,7 @@ TestintobjCmd(
 	    goto wrongNumArgs;
 	}
 #if (INT_MAX == LONG_MAX)   /* int is same size as long int */
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_INDEX_NONE);
 #else
 	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
 	    Tcl_SetWideIntObj(varPtr[varIndex], LONG_MAX);
@@ -776,10 +776,10 @@ TestintobjCmd(
 	}
 	if (Tcl_GetIntFromObj(interp, varPtr[varIndex], &i) != TCL_OK) {
 	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_INDEX_NONE);
 	    return TCL_OK;
 	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", TCL_INDEX_NONE);
 #endif
     } else if (strcmp(subCmd, "mult10") == 0) {
 	if (objc != 3) {
@@ -1104,7 +1104,7 @@ TestobjCmd(
 	    const char *typeName;
 
 	    if (objv[2]->typePtr == NULL) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
+		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", TCL_INDEX_NONE));
 	    }
 	    else {
 		typeName = objv[2]->typePtr->name;
@@ -1113,7 +1113,7 @@ TestobjCmd(
 #ifndef TCL_WIDE_INT_IS_LONG
 	    else if (!strcmp(typeName, "wideInt")) typeName = "int";
 #endif
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, TCL_INDEX_NONE));
 	    }
 	}
 	return TCL_OK;
@@ -1207,15 +1207,15 @@ TestobjCmd(
 	    goto wrongNumArgs;
 	}
 	if (varPtr[varIndex]->typePtr == NULL) { /* a string! */
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", -1);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", TCL_INDEX_NONE);
 #ifndef TCL_WIDE_INT_IS_LONG
 	} else if (!strcmp(varPtr[varIndex]->typePtr->name, "wideInt")) {
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "int", -1);
+		    "int", TCL_INDEX_NONE);
 #endif
 	} else {
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    varPtr[varIndex]->typePtr->name, -1);
+		    varPtr[varIndex]->typePtr->name, TCL_INDEX_NONE);
 	}
 	break;
     default:
@@ -1346,7 +1346,7 @@ TeststringobjCmd(
 	    if (CheckIfVarUnset(interp, varPtr, varIndex)) {
 		return TCL_ERROR;
 	    }
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), -1);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), TCL_INDEX_NONE);
 	    break;
 	case 4:				/* length */
 	    if (objc != 3) {
@@ -1459,7 +1459,7 @@ TeststringobjCmd(
 	    }
 	    if ((length < 0) || ((Tcl_WideUInt)length > (Tcl_WideUInt)size)) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"index value out of range", -1));
+			"index value out of range", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    }
 
@@ -1490,7 +1490,7 @@ TeststringobjCmd(
 	    }
 	    if ((length < 0) || ((Tcl_WideUInt)length > (Tcl_WideUInt)size)) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"index value out of range", -1));
+			"index value out of range", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    }
 
@@ -1567,7 +1567,7 @@ GetVariableIndex(
     }
     if (index < 0 || index >= NUMBER_OF_OBJECT_VARS) {
 	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", TCL_INDEX_NONE);
 	return TCL_ERROR;
     }
 
@@ -1604,7 +1604,7 @@ CheckIfVarUnset(
 
 	sprintf(buf, "variable %" TCL_Z_MODIFIER "u is unset (NULL)", varIndex);
 	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, TCL_INDEX_NONE);
 	return 1;
     }
     return 0;
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index 6d5e6ec..8d92c6e 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -146,7 +146,7 @@ RegisterCommand(
     if (cmdTablePtr->exportIt) {
 	sprintf(buf, "namespace eval %s { namespace export %s }",
 		namesp, cmdTablePtr->cmdName);
-	if (Tcl_EvalEx(interp, buf, -1, 0) != TCL_OK) {
+	if (Tcl_EvalEx(interp, buf, TCL_INDEX_NONE, 0) != TCL_OK) {
 	    return TCL_ERROR;
 	}
     }
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index 6f37124..5781329 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -607,7 +607,7 @@ NewTestThread(
      */
 
     Tcl_Preserve(tsdPtr->interp);
-    result = Tcl_EvalEx(tsdPtr->interp, threadEvalScript, -1, 0);
+    result = Tcl_EvalEx(tsdPtr->interp, threadEvalScript, TCL_INDEX_NONE, 0);
     if (result != TCL_OK) {
 	ThreadErrorProc(tsdPtr->interp);
     }
@@ -654,10 +654,10 @@ ThreadErrorProc(
     errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY);
     if (errorProcString == NULL) {
 	errChannel = Tcl_GetStdChannel(TCL_STDERR);
-	Tcl_WriteChars(errChannel, "Error from thread ", -1);
-	Tcl_WriteChars(errChannel, buf, -1);
+	Tcl_WriteChars(errChannel, "Error from thread ", TCL_INDEX_NONE);
+	Tcl_WriteChars(errChannel, buf, TCL_INDEX_NONE);
 	Tcl_WriteChars(errChannel, "\n", 1);
-	Tcl_WriteChars(errChannel, errorInfo, -1);
+	Tcl_WriteChars(errChannel, errorInfo, TCL_INDEX_NONE);
 	Tcl_WriteChars(errChannel, "\n", 1);
     } else {
 	argv[0] = errorProcString;
@@ -982,7 +982,7 @@ ThreadCancel(
     Tcl_MutexUnlock(&threadMutex);
     Tcl_ResetResult(interp);
     return Tcl_CancelEval(tsdPtr->interp,
-    	(result != NULL) ? Tcl_NewStringObj(result, -1) : NULL, 0, flags);
+    	(result != NULL) ? Tcl_NewStringObj(result, TCL_INDEX_NONE) : NULL, 0, flags);
 }
 
 /*
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index d49c5c8..3b4741e 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -21,7 +21,7 @@
 typedef struct TimerHandler {
     Tcl_Time time;		/* When timer is to fire. */
     Tcl_TimerProc *proc;	/* Function to call. */
-    ClientData clientData;	/* Argument to pass to proc. */
+    void *clientData;	/* Argument to pass to proc. */
     Tcl_TimerToken token;	/* Identifies handler so it can be deleted. */
     struct TimerHandler *nextPtr;
 				/* Next event in queue, or NULL for end of
@@ -73,7 +73,7 @@ typedef struct AfterAssocData {
 
 typedef struct IdleHandler {
     Tcl_IdleProc *proc;		/* Function to call. */
-    ClientData clientData;	/* Value to pass to proc. */
+    void *clientData;	/* Value to pass to proc. */
     int generation;		/* Used to distinguish older handlers from
 				 * recently-created ones. */
     struct IdleHandler *nextPtr;/* Next in list of active handlers. */
@@ -150,18 +150,18 @@ static Tcl_ThreadDataKey dataKey;
  * Prototypes for functions referenced only in this file:
  */
 
-static void		AfterCleanupProc(ClientData clientData,
+static void		AfterCleanupProc(void *clientData,
 			    Tcl_Interp *interp);
 static int		AfterDelay(Tcl_Interp *interp, Tcl_WideInt ms);
-static void		AfterProc(ClientData clientData);
+static void		AfterProc(void *clientData);
 static void		FreeAfterPtr(AfterInfo *afterPtr);
 static AfterInfo *	GetAfterEvent(AfterAssocData *assocPtr,
 			    Tcl_Obj *commandPtr);
 static ThreadSpecificData *InitTimer(void);
-static void		TimerExitProc(ClientData clientData);
+static void		TimerExitProc(void *clientData);
 static int		TimerHandlerEventProc(Tcl_Event *evPtr, int flags);
-static void		TimerCheckProc(ClientData clientData, int flags);
-static void		TimerSetupProc(ClientData clientData, int flags);
+static void		TimerCheckProc(void *clientData, int flags);
+static void		TimerSetupProc(void *clientData, int flags);
 
 /*
  *----------------------------------------------------------------------
@@ -251,7 +251,7 @@ Tcl_CreateTimerHandler(
     int milliseconds,		/* How many milliseconds to wait before
 				 * invoking proc. */
     Tcl_TimerProc *proc,	/* Function to invoke. */
-    ClientData clientData)	/* Arbitrary data to pass to proc. */
+    void *clientData)	/* Arbitrary data to pass to proc. */
 {
     Tcl_Time time;
 
@@ -292,7 +292,7 @@ Tcl_TimerToken
 TclCreateAbsoluteTimerHandler(
     Tcl_Time *timePtr,
     Tcl_TimerProc *proc,
-    ClientData clientData)
+    void *clientData)
 {
     TimerHandler *timerHandlerPtr, *tPtr2, *prevPtr;
     ThreadSpecificData *tsdPtr = InitTimer();
@@ -619,7 +619,7 @@ TimerHandlerEventProc(
 void
 Tcl_DoWhenIdle(
     Tcl_IdleProc *proc,		/* Function to invoke. */
-    ClientData clientData)	/* Arbitrary value to pass to proc. */
+    void *clientData)	/* Arbitrary value to pass to proc. */
 {
     IdleHandler *idlePtr;
     Tcl_Time blockTime;
@@ -663,7 +663,7 @@ Tcl_DoWhenIdle(
 void
 Tcl_CancelIdleCall(
     Tcl_IdleProc *proc,		/* Function that was previously registered. */
-    ClientData clientData)	/* Arbitrary value to pass to proc. */
+    void *clientData)	/* Arbitrary value to pass to proc. */
 {
     IdleHandler *idlePtr, *prevPtr;
     IdleHandler *nextPtr;
@@ -974,7 +974,7 @@ Tcl_AfterObjCmd(
 	    Tcl_ListObjAppendElement(interp, resultListPtr,
 		    afterPtr->commandPtr);
 	    Tcl_ListObjAppendElement(interp, resultListPtr, Tcl_NewStringObj(
-		    (afterPtr->token == NULL) ? "idle" : "timer", -1));
+		    (afterPtr->token == NULL) ? "idle" : "timer", TCL_INDEX_NONE));
             Tcl_SetObjResult(interp, resultListPtr);
 	}
 	break;
@@ -1149,7 +1149,7 @@ GetAfterEvent(
 
 static void
 AfterProc(
-    ClientData clientData)	/* Describes command to execute. */
+    void *clientData)	/* Describes command to execute. */
 {
     AfterInfo *afterPtr = (AfterInfo *)clientData;
     AfterAssocData *assocPtr = afterPtr->assocPtr;
@@ -1251,7 +1251,7 @@ FreeAfterPtr(
 
 static void
 AfterCleanupProc(
-    ClientData clientData,	/* Points to AfterAssocData for the
+    void *clientData,	/* Points to AfterAssocData for the
 				 * interpreter. */
     TCL_UNUSED(Tcl_Interp *))
 {
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index f284704..1653dbe 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -42,14 +42,14 @@
 #define ZIPFS_ERROR(interp,errstr) \
     do {								\
 	if (interp) {							\
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(errstr, -1));	\
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(errstr, TCL_INDEX_NONE));	\
 	}								\
     } while (0)
 #define ZIPFS_MEM_ERROR(interp) \
     do {								\
 	if (interp) {							\
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(			\
-		    "out of memory", -1));				\
+		    "out of memory", TCL_INDEX_NONE));				\
 	    Tcl_SetErrorCode(interp, "TCL", "MALLOC", NULL);		\
 	}								\
     } while (0)
@@ -1708,8 +1708,8 @@ ZipFSCatalogFilesystem(
 	    Tcl_DString ds2;
 
 	    Tcl_DStringInit(&ds2);
-	    Tcl_DStringAppend(&ds2, "assets/.root/", -1);
-	    Tcl_DStringAppend(&ds2, path, -1);
+	    Tcl_DStringAppend(&ds2, "assets/.root/", TCL_INDEX_NONE);
+	    Tcl_DStringAppend(&ds2, path, TCL_INDEX_NONE);
 	    if (ZipFSLookup(Tcl_DStringValue(&ds2))) {
 		/* should not happen but skip it anyway */
 		Tcl_DStringFree(&ds2);
@@ -1785,7 +1785,7 @@ ZipFSCatalogFilesystem(
 
 	    Tcl_DStringSetLength(&ds, strlen(z->name) + 8);
 	    Tcl_DStringSetLength(&ds, 0);
-	    Tcl_DStringAppend(&ds, z->name, -1);
+	    Tcl_DStringAppend(&ds, z->name, TCL_INDEX_NONE);
 	    dir = Tcl_DStringValue(&ds);
 	    for (endPtr = strrchr(dir, '/'); endPtr && (endPtr != dir);
 		    endPtr = strrchr(dir, '/')) {
@@ -1907,9 +1907,9 @@ ListMountPoints(
 	    hPtr = Tcl_NextHashEntry(&search)) {
 	zf = (ZipFile *) Tcl_GetHashValue(hPtr);
 	Tcl_ListObjAppendElement(NULL, resultList, Tcl_NewStringObj(
-		zf->mountPoint, -1));
+		zf->mountPoint, TCL_INDEX_NONE));
 	Tcl_ListObjAppendElement(NULL, resultList, Tcl_NewStringObj(
-		zf->name, -1));
+		zf->name, TCL_INDEX_NONE));
     }
     Tcl_SetObjResult(interp, resultList);
     return TCL_OK;
@@ -1943,7 +1943,7 @@ DescribeMounted(
 	ZipFile *zf = ZipFSLookupZip(mountPoint);
 
 	if (zf) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(zf->name, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(zf->name, TCL_INDEX_NONE));
 	    return TCL_OK;
 	}
     }
@@ -2237,7 +2237,7 @@ ZipFSMountObjCmd(
 	zipFileObj = Tcl_FSGetNormalizedPath(interp, objv[2]);
 	if (!zipFileObj) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "could not normalize zip filename", -1));
+		    "could not normalize zip filename", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NORMALIZE", NULL);
 	    return TCL_ERROR;
 	}
@@ -2333,7 +2333,7 @@ ZipFSRootObjCmd(
     TCL_UNUSED(int) /*objc*/,
     TCL_UNUSED(Tcl_Obj *const *)) /*objv*/
 {
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(ZIPFS_VOLUME, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(ZIPFS_VOLUME, TCL_INDEX_NONE));
     return TCL_OK;
 }
 
@@ -2451,7 +2451,7 @@ RandomChar(
     double r;
     Tcl_Obj *ret;
 
-    if (Tcl_EvalEx(interp, "::tcl::mathfunc::rand", -1, 0) != TCL_OK) {
+    if (Tcl_EvalEx(interp, "::tcl::mathfunc::rand", TCL_INDEX_NONE, 0) != TCL_OK) {
 	goto failed;
     }
     ret = Tcl_GetObjResult(interp);
@@ -2540,7 +2540,7 @@ ZipAddFile(
      * crazy enough to embed NULs in filenames, they deserve what they get!
      */
 
-    zpathExt = Tcl_UtfToExternalDString(ZipFS.utf8, zpathTcl, -1, &zpathDs);
+    zpathExt = Tcl_UtfToExternalDString(ZipFS.utf8, zpathTcl, TCL_INDEX_NONE, &zpathDs);
     zpathlen = strlen(zpathExt);
     if (zpathlen + ZIP_CENTRAL_HEADER_LEN > bufsize) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -2880,7 +2880,7 @@ ZipFSFind(
     Tcl_Obj *cmd[2];
     int result;
 
-    cmd[0] = Tcl_NewStringObj("::tcl::zipfs::find", -1);
+    cmd[0] = Tcl_NewStringObj("::tcl::zipfs::find", TCL_INDEX_NONE);
     cmd[1] = dirRoot;
     Tcl_IncrRefCount(cmd[0]);
     result = Tcl_EvalObjv(interp, 2, cmd, 0);
@@ -3208,7 +3208,7 @@ ZipFSMkZipOrImg(
 	}
 	z = (ZipEntry *) Tcl_GetHashValue(hPtr);
 
-	name = Tcl_UtfToExternalDString(ZipFS.utf8, z->name, -1, &ds);
+	name = Tcl_UtfToExternalDString(ZipFS.utf8, z->name, TCL_INDEX_NONE, &ds);
 	len = Tcl_DStringLength(&ds);
 	SerializeCentralDirectoryEntry(start, end, (unsigned char *) buf,
 		z, len);
@@ -3628,7 +3628,7 @@ ZipFSCanonicalObjCmd(
 	filename = TclGetString(objv[2]);
 	result = CanonicalPath(mntpoint, filename, &dPath, zipfs);
     }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(result, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(result, TCL_INDEX_NONE));
     return TCL_OK;
 }
 
@@ -3673,7 +3673,7 @@ ZipFSExistsObjCmd(
     filename = TclGetString(objv[1]);
     Tcl_DStringInit(&ds);
     Tcl_DStringAppend(&ds, ZIPFS_VOLUME, ZIPFS_VOLUME_LEN - 1);
-    Tcl_DStringAppend(&ds, filename, -1);
+    Tcl_DStringAppend(&ds, filename, TCL_INDEX_NONE);
     filename = Tcl_DStringValue(&ds);
 
     ReadLock();
@@ -3724,7 +3724,7 @@ ZipFSInfoObjCmd(
 	Tcl_Obj *result = Tcl_GetObjResult(interp);
 
 	Tcl_ListObjAppendElement(interp, result,
-		Tcl_NewStringObj(z->zipFilePtr->name, -1));
+		Tcl_NewStringObj(z->zipFilePtr->name, TCL_INDEX_NONE));
 	Tcl_ListObjAppendElement(interp, result,
 		Tcl_NewWideIntObj(z->numBytes));
 	Tcl_ListObjAppendElement(interp, result,
@@ -3810,7 +3810,7 @@ ZipFSListObjCmd(
 
 	    if (Tcl_StringMatch(z->name, pattern)) {
 		Tcl_ListObjAppendElement(interp, result,
-			Tcl_NewStringObj(z->name, -1));
+			Tcl_NewStringObj(z->name, TCL_INDEX_NONE));
 	    }
 	}
     } else if (regexp) {
@@ -3820,7 +3820,7 @@ ZipFSListObjCmd(
 
 	    if (Tcl_RegExpExec(interp, regexp, z->name, z->name)) {
 		Tcl_ListObjAppendElement(interp, result,
-			Tcl_NewStringObj(z->name, -1));
+			Tcl_NewStringObj(z->name, TCL_INDEX_NONE));
 	    }
 	}
     } else {
@@ -3829,7 +3829,7 @@ ZipFSListObjCmd(
 	    ZipEntry *z = (ZipEntry *) Tcl_GetHashValue(hPtr);
 
 	    Tcl_ListObjAppendElement(interp, result,
-		    Tcl_NewStringObj(z->name, -1));
+		    Tcl_NewStringObj(z->name, TCL_INDEX_NONE));
 	}
     }
     Unlock();
@@ -3873,7 +3873,7 @@ TclZipfs_TclLibrary(void)
      */
 
     if (zipfs_literal_tcl_library) {
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+	return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
     }
 
     /*
@@ -3887,7 +3887,7 @@ TclZipfs_TclLibrary(void)
     Tcl_DecrRefCount(vfsInitScript);
     if (found == TCL_OK) {
 	zipfs_literal_tcl_library = ZIPFS_APP_MOUNT "/tcl_library";
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+	return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
     }
 
     /*
@@ -3906,17 +3906,17 @@ TclZipfs_TclLibrary(void)
 #endif
 
     if (ZipfsAppHookFindTclInit(dllName) == TCL_OK) {
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+	return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
     }
 #elif !defined(NO_DLFCN_H)
     Dl_info dlinfo;
     if (dladdr((const void *)TclZipfs_TclLibrary, &dlinfo) && (dlinfo.dli_fname != NULL)
 	&& (ZipfsAppHookFindTclInit(dlinfo.dli_fname) == TCL_OK)) {
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+	return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
     }
 #else
     if (ZipfsAppHookFindTclInit(CFG_RUNTIME_LIBDIR "/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+	return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
     }
 #endif /* _WIN32 */
 #endif /* !defined(STATIC_BUILD) */
@@ -3927,7 +3927,7 @@ TclZipfs_TclLibrary(void)
      */
 
     if (zipfs_literal_tcl_library) {
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+	return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
     }
     return NULL;
 }
@@ -4936,7 +4936,7 @@ static Tcl_Obj *
 ZipFSFilesystemSeparatorProc(
     TCL_UNUSED(Tcl_Obj *) /*pathPtr*/)
 {
-    return Tcl_NewStringObj("/", -1);
+    return Tcl_NewStringObj("/", TCL_INDEX_NONE);
 }
 
 /*
@@ -4956,11 +4956,11 @@ AppendWithPrefix(
     Tcl_DString *prefix,	/* The prefix to add to the element, or NULL
 				 * for don't do that. */
     const char *name,		/* The name to append. */
-    int nameLen)		/* The length of the name. May be -1 for
+    size_t nameLen)		/* The length of the name. May be TCL_INDEX_NONE for
 				 * append-up-to-NUL-byte. */
 {
     if (prefix) {
-	int prefixLength = Tcl_DStringLength(prefix);
+	size_t prefixLength = Tcl_DStringLength(prefix);
 
 	Tcl_DStringAppend(prefix, name, nameLen);
 	Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj(
@@ -5063,7 +5063,7 @@ ZipFSMatchInDirectoryProc(
 
 	if (z && ((dirOnly < 0) || (!dirOnly && !z->isDirectory)
 		|| (dirOnly && z->isDirectory))) {
-	    AppendWithPrefix(result, prefixBuf, z->name, -1);
+	    AppendWithPrefix(result, prefixBuf, z->name, TCL_INDEX_NONE);
 	}
 	goto end;
     }
@@ -5096,7 +5096,7 @@ ZipFSMatchInDirectoryProc(
 	    continue;
 	}
 	if ((z->depth == scnt) && Tcl_StringCaseMatch(z->name, pat, 0)) {
-	    AppendWithPrefix(result, prefixBuf, z->name + strip, -1);
+	    AppendWithPrefix(result, prefixBuf, z->name + strip, TCL_INDEX_NONE);
 	}
     }
     Tcl_Free(pat);
@@ -5286,7 +5286,7 @@ ZipFSPathInFilesystemProc(
 static Tcl_Obj *
 ZipFSListVolumesProc(void)
 {
-    return Tcl_NewStringObj(ZIPFS_VOLUME, -1);
+    return Tcl_NewStringObj(ZIPFS_VOLUME, TCL_INDEX_NONE);
 }
 
 /*
@@ -5400,10 +5400,10 @@ ZipFSFileAttrsGetProc(
 		z->zipFilePtr->mountPointLen);
 	break;
     case ZIP_ATTR_ARCHIVE:
-	*objPtrRef = Tcl_NewStringObj(z->zipFilePtr->name, -1);
+	*objPtrRef = Tcl_NewStringObj(z->zipFilePtr->name, TCL_INDEX_NONE);
 	break;
     case ZIP_ATTR_PERMISSIONS:
-	*objPtrRef = Tcl_NewStringObj("0o555", -1);
+	*objPtrRef = Tcl_NewStringObj("0o555", TCL_INDEX_NONE);
 	break;
     case ZIP_ATTR_CRC:
 	TclNewIntObj(*objPtrRef, z->crc32);
@@ -5464,7 +5464,7 @@ static Tcl_Obj *
 ZipFSFilesystemPathTypeProc(
     TCL_UNUSED(Tcl_Obj *) /*pathPtr*/)
 {
-    return Tcl_NewStringObj("zip", -1);
+    return Tcl_NewStringObj("zip", TCL_INDEX_NONE);
 }
 
 /*
@@ -5661,7 +5661,7 @@ TclZipfs_Init(
 	Tcl_Command ensemble;
 	Tcl_Obj *mapObj;
 
-	Tcl_EvalEx(interp, findproc, -1, TCL_EVAL_GLOBAL);
+	Tcl_EvalEx(interp, findproc, TCL_INDEX_NONE, TCL_EVAL_GLOBAL);
 	if (!Tcl_IsSafe(interp)) {
 	    Tcl_LinkVar(interp, "::tcl::zipfs::wrmax", (char *) &ZipFS.wrmax,
 		    TCL_LINK_INT);
@@ -5676,8 +5676,8 @@ TclZipfs_Init(
 	 */
 
 	Tcl_GetEnsembleMappingDict(NULL, ensemble, &mapObj);
-	Tcl_DictObjPut(NULL, mapObj, Tcl_NewStringObj("find", -1),
-		Tcl_NewStringObj("::tcl::zipfs::find", -1));
+	Tcl_DictObjPut(NULL, mapObj, Tcl_NewStringObj("find", TCL_INDEX_NONE),
+		Tcl_NewStringObj("::tcl::zipfs::find", TCL_INDEX_NONE));
 	Tcl_CreateObjCommand(interp, "::tcl::zipfs::tcl_library_init",
 		ZipFSTclLibraryObjCmd, NULL, NULL);
 	Tcl_PkgProvide(interp, "tcl::zipfs", "2.0");
@@ -5859,7 +5859,7 @@ TclZipfs_AppHook(
 	Tcl_DString ds;
 
 	Tcl_DStringInit(&ds);
-	archive = Tcl_WCharToUtfDString((*argvPtr)[1], -1, &ds);
+	archive = Tcl_WCharToUtfDString((*argvPtr)[1], TCL_INDEX_NONE, &ds);
 #else /* !_WIN32 */
 	archive = (*argvPtr)[1];
 #endif /* _WIN32 */
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 718feb7..79aa9cb 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -313,7 +313,7 @@ ConvertError(
 	sprintf(codeStrBuf, "%d", code);
 	break;
     }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(zError(code), -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(zError(code), TCL_INDEX_NONE));
 
     /*
      * Tricky point! We might pass NULL twice here (and will when the error
@@ -350,7 +350,7 @@ ConvertErrorToList(
 	return Tcl_NewListObj(3, objv);
     case Z_ERRNO:
 	TclNewLiteralStringObj(objv[2], "POSIX");
-	objv[3] = Tcl_NewStringObj(Tcl_ErrnoId(), -1);
+	objv[3] = Tcl_NewStringObj(Tcl_ErrnoId(), TCL_INDEX_NONE);
 	return Tcl_NewListObj(4, objv);
     case Z_NEED_DICT:
 	TclNewLiteralStringObj(objv[2], "NEED_DICT");
@@ -405,7 +405,7 @@ GetValue(
     const char *nameStr,
     Tcl_Obj **valuePtrPtr)
 {
-    Tcl_Obj *name = Tcl_NewStringObj(nameStr, -1);
+    Tcl_Obj *name = Tcl_NewStringObj(nameStr, TCL_INDEX_NONE);
     int result = Tcl_DictObjGet(interp, dictObj, name, valuePtrPtr);
 
     TclDecrRefCount(name);
@@ -557,7 +557,7 @@ GenerateHeader(
  */
 
 #define SetValue(dictObj, key, value) \
-	Tcl_DictObjPut(NULL, (dictObj), Tcl_NewStringObj((key), -1), (value))
+	Tcl_DictObjPut(NULL, (dictObj), Tcl_NewStringObj((key), TCL_INDEX_NONE), (value))
 
 static void
 ExtractHeader(
@@ -579,7 +579,7 @@ ExtractHeader(
 	    }
 	}
 
-	(void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, -1,
+	(void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->comment, TCL_INDEX_NONE,
 		&tmp);
 	SetValue(dictObj, "comment", Tcl_DStringToObj(&tmp));
     }
@@ -596,7 +596,7 @@ ExtractHeader(
 	    }
 	}
 
-	(void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, -1,
+	(void)Tcl_ExternalToUtfDString(latin1enc, (char *) headerPtr->name, TCL_INDEX_NONE,
 		&tmp);
 	SetValue(dictObj, "filename", Tcl_DStringToObj(&tmp));
     }
@@ -608,7 +608,7 @@ ExtractHeader(
     }
     if (headerPtr->text != Z_UNKNOWN) {
 	SetValue(dictObj, "type",
-		Tcl_NewStringObj(headerPtr->text ? "text" : "binary", -1));
+		Tcl_NewStringObj(headerPtr->text ? "text" : "binary", TCL_INDEX_NONE));
     }
 
     if (latin1enc != NULL) {
@@ -842,7 +842,7 @@ Tcl_ZlibStreamInit(
      */
 
     if (interp != NULL) {
-	if (Tcl_EvalEx(interp, "::incr ::tcl::zlib::cmdcounter", -1, 0) != TCL_OK) {
+	if (Tcl_EvalEx(interp, "::incr ::tcl::zlib::cmdcounter", TCL_INDEX_NONE, 0) != TCL_OK) {
 	    goto error;
 	}
 	Tcl_DStringInit(&cmdname);
@@ -851,7 +851,7 @@ Tcl_ZlibStreamInit(
 	if (Tcl_FindCommand(interp, Tcl_DStringValue(&cmdname),
 		NULL, 0) != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "BUG: Stream command name already exists", -1));
+		    "BUG: Stream command name already exists", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "BUG", "EXISTING_CMD", NULL);
 	    Tcl_DStringFree(&cmdname);
 	    goto error;
@@ -1242,7 +1242,7 @@ Tcl_ZlibStreamPut(
     if (zshPtr->streamEnd) {
 	if (zshPtr->interp) {
 	    Tcl_SetObjResult(zshPtr->interp, Tcl_NewStringObj(
-		    "already past compressed stream end", -1));
+		    "already past compressed stream end", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(zshPtr->interp, "TCL", "ZIP", "CLOSED", NULL);
 	}
 	return TCL_ERROR;
@@ -1473,7 +1473,7 @@ Tcl_ZlibStreamGet(
 		if (zshPtr->interp) {
 		    Tcl_SetObjResult(zshPtr->interp, Tcl_NewStringObj(
 			    "unexpected zlib internal state during"
-			    " decompression", -1));
+			    " decompression", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(zshPtr->interp, "TCL", "ZIP", "STATE",
 			    NULL);
 		}
@@ -2238,7 +2238,7 @@ ZlibCmd(
     return TCL_ERROR;
 
   badLevel:
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9", -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj("level must be 0 to 9", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL", NULL);
     if (extraInfoStr) {
 	Tcl_AddErrorInfo(interp, extraInfoStr);
@@ -2501,13 +2501,13 @@ ZlibPushSubcmd(
 
     if (mode == TCL_ZLIB_STREAM_DEFLATE && !(chanMode & TCL_WRITABLE)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"compression may only be applied to writable channels", -1));
+		"compression may only be applied to writable channels", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ZIP", "UNWRITABLE", NULL);
 	return TCL_ERROR;
     }
     if (mode == TCL_ZLIB_STREAM_INFLATE && !(chanMode & TCL_READABLE)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"decompression may only be applied to readable channels",-1));
+		"decompression may only be applied to readable channels",TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ZIP", "UNREADABLE", NULL);
 	return TCL_ERROR;
     }
@@ -2541,7 +2541,7 @@ ZlibPushSubcmd(
 	    }
 	    if (level < 0 || level > 9) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"level must be 0 to 9", -1));
+			"level must be 0 to 9", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "COMPRESSIONLEVEL",
 			NULL);
 		goto genericOptionError;
@@ -2563,7 +2563,7 @@ ZlibPushSubcmd(
 	    if (format == TCL_ZLIB_FORMAT_GZIP) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"a compression dictionary may not be set in the "
-			"gzip format", -1));
+			"gzip format", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ZIP", "BADOPT", NULL);
 		goto genericOptionError;
 	    }
@@ -2775,7 +2775,7 @@ ZlibStreamAddCmd(
 	    if (i == objc-2) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"\"-buffer\" option must be followed by integer "
-			"decompression buffersize", -1));
+			"decompression buffersize", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
 		return TCL_ERROR;
 	    }
@@ -2794,7 +2794,7 @@ ZlibStreamAddCmd(
 	    if (i == objc-2) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"\"-dictionary\" option must be followed by"
-			" compression dictionary bytes", -1));
+			" compression dictionary bytes", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
 		return TCL_ERROR;
 	    }
@@ -2805,7 +2805,7 @@ ZlibStreamAddCmd(
 	if (flush == -2) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "\"-flush\", \"-fullflush\" and \"-finalize\" options"
-		    " are mutually exclusive", -1));
+		    " are mutually exclusive", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ZIP", "EXCLUSIVE", NULL);
 	    return TCL_ERROR;
 	}
@@ -2902,7 +2902,7 @@ ZlibStreamPutCmd(
 	    if (i == objc-2) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"\"-dictionary\" option must be followed by"
-			" compression dictionary bytes", -1));
+			" compression dictionary bytes", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
 		return TCL_ERROR;
 	    }
@@ -2912,7 +2912,7 @@ ZlibStreamPutCmd(
 	if (flush == -2) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "\"-flush\", \"-fullflush\" and \"-finalize\" options"
-		    " are mutually exclusive", -1));
+		    " are mutually exclusive", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ZIP", "EXCLUSIVE", NULL);
 	    return TCL_ERROR;
 	}
@@ -2960,7 +2960,7 @@ ZlibStreamHeaderCmd(
     } else if (zshPtr->mode != TCL_ZLIB_STREAM_INFLATE
 	    || zshPtr->format != TCL_ZLIB_FORMAT_GZIP) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"only gunzip streams can produce header information", -1));
+		"only gunzip streams can produce header information", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ZIP", "BADOP", NULL);
 	return TCL_ERROR;
     }
@@ -3274,7 +3274,7 @@ ZlibTransformOutput(
     Tcl_ListObjAppendElement(NULL, errObj,
 	    ConvertErrorToList(e, cd->outStream.adler));
     Tcl_ListObjAppendElement(NULL, errObj,
-	    Tcl_NewStringObj(cd->outStream.msg, -1));
+	    Tcl_NewStringObj(cd->outStream.msg, TCL_INDEX_NONE));
     Tcl_SetChannelError(cd->parent, errObj);
     *errorCodePtr = EINVAL;
     return -1;
@@ -3424,7 +3424,7 @@ ZlibTransformSetOption(			/* not used */
 		return TCL_ERROR;
 	    } else if (newLimit < 1 || newLimit > MAX_BUFFER_SIZE) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"-limit must be between 1 and 65536", -1));
+			"-limit must be between 1 and 65536", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "READLIMIT", NULL);
 		return TCL_ERROR;
 	    }
@@ -3498,7 +3498,7 @@ ZlibTransformGetOption(
 	    Tcl_DStringAppendElement(dsPtr, "-checksum");
 	    Tcl_DStringAppendElement(dsPtr, buf);
 	} else {
-	    Tcl_DStringAppend(dsPtr, buf, -1);
+	    Tcl_DStringAppend(dsPtr, buf, TCL_INDEX_NONE);
 	    return TCL_OK;
 	}
     }
@@ -3824,7 +3824,7 @@ ZlibStackChannelTransform(
     }
     cd->chan = chan;
     cd->parent = Tcl_GetStackedChannel(chan);
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_GetChannelName(chan), TCL_INDEX_NONE));
     return chan;
 
   error:
@@ -3954,7 +3954,7 @@ ResultDecompress(
     Tcl_ListObjAppendElement(NULL, errObj,
 	    ConvertErrorToList(e, cd->inStream.adler));
     Tcl_ListObjAppendElement(NULL, errObj,
-	    Tcl_NewStringObj(cd->inStream.msg, -1));
+	    Tcl_NewStringObj(cd->inStream.msg, TCL_INDEX_NONE));
     Tcl_SetChannelError(cd->parent, errObj);
     *errorCodePtr = EINVAL;
     return -1;
@@ -3978,7 +3978,7 @@ TclZlibInit(
      * commands.
      */
 
-    Tcl_EvalEx(interp, "namespace eval ::tcl::zlib {variable cmdcounter 0}", -1, 0);
+    Tcl_EvalEx(interp, "namespace eval ::tcl::zlib {variable cmdcounter 0}", TCL_INDEX_NONE, 0);
 
     /*
      * Create the public scripted interface to this file's functionality.
@@ -4029,7 +4029,7 @@ Tcl_ZlibStreamInit(
     Tcl_ZlibStream *zshandle)
 {
     if (interp) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
     }
     return TCL_ERROR;
@@ -4097,7 +4097,7 @@ Tcl_ZlibDeflate(
     Tcl_Obj *gzipHeaderDictObj)
 {
     if (interp) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
     }
     return TCL_ERROR;
@@ -4112,7 +4112,7 @@ Tcl_ZlibInflate(
     Tcl_Obj *gzipHeaderDictObj)
 {
     if (interp) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
     }
     return TCL_ERROR;
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 7bdc72a..7fc085c 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -203,7 +203,7 @@ TclMacOSXGetFileAttribute(
     return TCL_OK;
 #else
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
-	    "Mac OS X file attributes not supported", -1));
+	    "Mac OS X file attributes not supported", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "TCL", "UNSUPPORTED", NULL);
     return TCL_ERROR;
 #endif /* HAVE_GETATTRLIST */
@@ -335,7 +335,7 @@ TclMacOSXSetFileAttribute(
 
 	    if (newRsrcForkSize != 0) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"setting nonzero rsrclength not supported", -1));
+			"setting nonzero rsrclength not supported", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "UNSUPPORTED", NULL);
 		return TCL_ERROR;
 	    }
@@ -376,7 +376,7 @@ TclMacOSXSetFileAttribute(
     return TCL_OK;
 #else
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
-	    "Mac OS X file attributes not supported", -1));
+	    "Mac OS X file attributes not supported", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "TCL", "UNSUPPORTED", NULL);
     return TCL_ERROR;
 #endif
-- 
cgit v0.12


From 76edd58c3e121255d2dae1c5bc1b2fc86d1ab3fc Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sun, 5 Mar 2023 07:11:15 +0000
Subject: A better fix for Valgrind "still reachable" report in
 TestcmdtokenCmd().

---
 generic/tclTest.c  | 56 ++++++++++++++++++++++++++++++++++++++----------------
 tests/basic.test   |  6 +++---
 tests/cmdInfo.test |  6 +++---
 3 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index fbd4774..5b57157 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -70,6 +70,7 @@ static Tcl_Interp *delInterp;
 typedef struct TestCommandTokenRef {
     int id;			/* Identifier for this reference. */
     Tcl_Command token;		/* Tcl's token for the command. */
+    const char *value;
     struct TestCommandTokenRef *nextPtr;
 				/* Next in list of references. */
 } TestCommandTokenRef;
@@ -1179,6 +1180,18 @@ TestcmdinfoCmd(
 }
 
 static int
+CmdProc0(
+    void *clientData,	/* String to return. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    TCL_UNUSED(int) /*argc*/,
+    TCL_UNUSED(const char **) /*argv*/)
+{
+    TestCommandTokenRef *refPtr = (TestCommandTokenRef *) clientData;
+    Tcl_AppendResult(interp, "CmdProc1 ", refPtr->value, NULL);
+    return TCL_OK;
+}
+
+static int
 CmdProc1(
     void *clientData,	/* String to return. */
     Tcl_Interp *interp,		/* Current interpreter. */
@@ -1189,6 +1202,7 @@ CmdProc1(
     return TCL_OK;
 }
 
+
 static int
 CmdProc2(
     void *clientData,	/* String to return. */
@@ -1201,6 +1215,28 @@ CmdProc2(
 }
 
 static void
+CmdDelProc0(
+    void *clientData)	/* String to save. */
+{
+    TestCommandTokenRef *thisRefPtr, *prevRefPtr = NULL;
+    TestCommandTokenRef *refPtr = (TestCommandTokenRef *) clientData;
+    int id = refPtr->id;
+    for (thisRefPtr = firstCommandTokenRef; refPtr != NULL;
+	thisRefPtr = thisRefPtr->nextPtr) {
+	if (thisRefPtr->id == id) {
+	    if (prevRefPtr != NULL) {
+		prevRefPtr->nextPtr = thisRefPtr->nextPtr;
+	    } else {
+		firstCommandTokenRef = thisRefPtr->nextPtr; 
+	    }
+	    break;
+	}
+	prevRefPtr = thisRefPtr;
+    }
+    ckfree(refPtr);
+}
+
+static void
 CmdDelProc1(
     void *clientData)	/* String to save. */
 {
@@ -1242,7 +1278,7 @@ TestcmdtokenCmd(
     int argc,			/* Number of arguments. */
     const char **argv)		/* Argument strings. */
 {
-    TestCommandTokenRef *refPtr, *prevRefPtr;
+    TestCommandTokenRef *refPtr;
     char buf[30];
     int id;
 
@@ -1253,9 +1289,10 @@ TestcmdtokenCmd(
     }
     if (strcmp(argv[1], "create") == 0) {
 	refPtr = (TestCommandTokenRef *)Tcl_Alloc(sizeof(TestCommandTokenRef));
-	refPtr->token = Tcl_CreateCommand(interp, argv[2], CmdProc1,
-		(void *) "original", NULL);
+	refPtr->token = Tcl_CreateCommand(interp, argv[2], CmdProc0,
+		refPtr, CmdDelProc0);
 	refPtr->id = nextCommandTokenRefId;
+	refPtr->value = "original";
 	nextCommandTokenRefId++;
 	refPtr->nextPtr = firstCommandTokenRef;
 	firstCommandTokenRef = refPtr;
@@ -1291,19 +1328,6 @@ TestcmdtokenCmd(
 		    Tcl_GetCommandName(interp, refPtr->token));
 	    Tcl_AppendElement(interp, Tcl_GetString(objPtr));
 	    Tcl_DecrRefCount(objPtr);
-	} else if (strcmp(argv[1], "free") == 0) {
-	    prevRefPtr = NULL;
-	    for (refPtr = firstCommandTokenRef; refPtr != NULL;
-		    refPtr = refPtr->nextPtr) {
-		if (refPtr->id == id) {
-		    if (prevRefPtr != NULL) {
-			prevRefPtr->nextPtr = refPtr->nextPtr;
-		    }
-		    ckfree(refPtr);
-		    break;
-		}
-		prevRefPtr = refPtr;
-	    }
 	} else {
 	    Tcl_AppendResult(interp, "bad option \"", argv[1],
 		    "\": must be create, name, or free", NULL);
diff --git a/tests/basic.test b/tests/basic.test
index de986c7..c90d80e 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -336,19 +336,19 @@ test basic-20.1 {Tcl_GetCommandInfo, names for commands created inside namespace
     }]
     list [testcmdtoken name $x] \
          [rename ::p q] \
-         [testcmdtoken name $x][testcmdtoken free $x]
+         [testcmdtoken name $x]
 } {{p ::p} {} {q ::q}}
 test basic-20.2 {Tcl_GetCommandInfo, names for commands created outside namespaces} {testcmdtoken} {
     catch {rename q ""}
     set x [testcmdtoken create test_ns_basic::test_ns_basic2::p]
     list [testcmdtoken name $x] \
          [rename test_ns_basic::test_ns_basic2::p q] \
-         [testcmdtoken name $x][testcmdtoken free $x]
+         [testcmdtoken name $x]
 } {{p ::test_ns_basic::test_ns_basic2::p} {} {q ::q}}
 test basic-20.3 {Tcl_GetCommandInfo, #-quoting} testcmdtoken {
     catch {rename \# ""}
     set x [testcmdtoken create \#]
-    return [testcmdtoken name $x][testcmdtoken free $x]
+    return [testcmdtoken name $x]
 } {{#} ::#}
 
 test basic-21.1 {Tcl_GetCommandName} {emptyTest} {
diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test
index ad564d7..37b8a0b 100644
--- a/tests/cmdInfo.test
+++ b/tests/cmdInfo.test
@@ -70,7 +70,7 @@ test cmdinfo-4.1 {Tcl_GetCommandName/Tcl_GetCommandFullName procedures} \
     rename x1 newName
     set y [testcmdtoken name $x]
     rename newName x1
-    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
+    lappend y {*}[testcmdtoken name $x]
 } {newName ::newName x1 ::x1}
 
 catch {rename newTestCmd {}}
@@ -87,7 +87,7 @@ test cmdinfo-5.1 {Names for commands created when inside namespaces} \
     }]
     set y [testcmdtoken name $x]
     rename ::testCmd newTestCmd
-    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
+    lappend y {*}[testcmdtoken name $x]
 } {testCmd ::testCmd newTestCmd ::newTestCmd}
 
 test cmdinfo-6.1 {Names for commands created when outside namespaces} \
@@ -95,7 +95,7 @@ test cmdinfo-6.1 {Names for commands created when outside namespaces} \
     set x [testcmdtoken create cmdInfoNs1::cmdInfoNs2::testCmd]
     set y [testcmdtoken name $x]
     rename cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2
-    lappend y {*}[testcmdtoken name $x][testcmdtoken free $x]
+    lappend y {*}[testcmdtoken name $x]
 } {testCmd ::cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2 ::newTestCmd2}
 
 # cleanup
-- 
cgit v0.12


From e4e106233842d77095bf459f14bb82e953bc8c6f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 5 Mar 2023 19:57:48 +0000
Subject: Another round of -1 -> TCL_INDEX_NONE

---
 generic/tclAssembly.c     |  30 ++++++------
 generic/tclBasic.c        |  72 ++++++++++++++--------------
 generic/tclBinary.c       |  12 ++---
 generic/tclCmdIL.c        |  72 ++++++++++++++--------------
 generic/tclCmdMZ.c        |  30 ++++++------
 generic/tclCompExpr.c     |   8 ++--
 generic/tclDisassemble.c  | 108 +++++++++++++++++++++---------------------
 generic/tclEnsemble.c     |  72 ++++++++++++++--------------
 generic/tclEvent.c        |  30 ++++++------
 generic/tclExecute.c      |  38 +++++++--------
 generic/tclFileName.c     |  28 +++++------
 generic/tclIOGT.c         |  52 ++++++++++-----------
 generic/tclIOSock.c       |   2 +-
 generic/tclIOUtil.c       |  10 ++--
 generic/tclIndexObj.c     |  12 ++---
 generic/tclInterp.c       | 116 +++++++++++++++++++++++-----------------------
 generic/tclNamesp.c       |  58 +++++++++++------------
 generic/tclOO.c           | 106 +++++++++++++++++++++---------------------
 generic/tclOOBasic.c      |  44 +++++++++---------
 generic/tclOODefineCmds.c | 112 ++++++++++++++++++++++----------------------
 generic/tclOOInfo.c       |  36 +++++++-------
 generic/tclObj.c          |  22 ++++-----
 generic/tclParse.c        |  22 ++++-----
 generic/tclPipe.c         |  14 +++---
 generic/tclProcess.c      |  32 ++++++-------
 generic/tclScan.c         |  22 ++++-----
 generic/tclVar.c          |  36 +++++++-------
 unix/dltest/pkgb.c        |   2 +-
 unix/dltest/pkgc.c        |   2 +-
 unix/dltest/pkgd.c        |   2 +-
 unix/dltest/pkge.c        |   2 +-
 unix/tclUnixFCmd.c        |   2 +-
 32 files changed, 603 insertions(+), 603 deletions(-)

diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index a05a4d4..af95312 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -1384,7 +1384,7 @@ AssembleOneLine(
 	}
 	if (opnd < 0 || opnd > 3) {
 	    Tcl_SetObjResult(interp,
-			     Tcl_NewStringObj("operand must be [0..3]", -1));
+			     Tcl_NewStringObj("operand must be [0..3]", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "OPERAND<0,>3", NULL);
 	    goto cleanup;
 	}
@@ -1625,7 +1625,7 @@ AssembleOneLine(
 	if (opnd < 2) {
 	    if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 		Tcl_SetObjResult(interp,
-			Tcl_NewStringObj("operand must be >=2", -1));
+			Tcl_NewStringObj("operand must be >=2", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ASSEM", "OPERAND>=2", NULL);
 	    }
 	    goto cleanup;
@@ -2107,7 +2107,7 @@ GetNextOperand(
 	Tcl_DecrRefCount(operandObj);
 	if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "assembly code may not contain substitutions", -1));
+		    "assembly code may not contain substitutions", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "NOSUBST", NULL);
 	}
 	return TCL_ERROR;
@@ -2330,7 +2330,7 @@ FindLocalVar(
 	if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "cannot use this instruction to create a variable"
-		    " in a non-proc context", -1));
+		    " in a non-proc context", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "LVT", NULL);
 	}
 	return TCL_INDEX_NONE;
@@ -2400,7 +2400,7 @@ CheckOneByte(
     Tcl_Obj* result;		/* Error message */
 
     if (value < 0 || value > 0xFF) {
-	result = Tcl_NewStringObj("operand does not fit in one byte", -1);
+	result = Tcl_NewStringObj("operand does not fit in one byte", TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, result);
 	Tcl_SetErrorCode(interp, "TCL", "ASSEM", "1BYTE", NULL);
 	return TCL_ERROR;
@@ -2435,7 +2435,7 @@ CheckSignedOneByte(
     Tcl_Obj* result;		/* Error message */
 
     if (value > 0x7F || value < -0x80) {
-	result = Tcl_NewStringObj("operand does not fit in one byte", -1);
+	result = Tcl_NewStringObj("operand does not fit in one byte", TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, result);
 	Tcl_SetErrorCode(interp, "TCL", "ASSEM", "1BYTE", NULL);
 	return TCL_ERROR;
@@ -2468,7 +2468,7 @@ CheckNonNegative(
     Tcl_Obj* result;		/* Error message */
 
     if (value < 0) {
-	result = Tcl_NewStringObj("operand must be nonnegative", -1);
+	result = Tcl_NewStringObj("operand must be nonnegative", TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, result);
 	Tcl_SetErrorCode(interp, "TCL", "ASSEM", "NONNEGATIVE", NULL);
 	return TCL_ERROR;
@@ -2501,7 +2501,7 @@ CheckStrictlyPositive(
     Tcl_Obj* result;		/* Error message */
 
     if (value <= 0) {
-	result = Tcl_NewStringObj("operand must be positive", -1);
+	result = Tcl_NewStringObj("operand must be positive", TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, result);
 	Tcl_SetErrorCode(interp, "TCL", "ASSEM", "POSITIVE", NULL);
 	return TCL_ERROR;
@@ -3414,7 +3414,7 @@ StackCheckBasicBlock(
 	}
 	if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "inconsistent stack depths on two execution paths", -1));
+		    "inconsistent stack depths on two execution paths", TCL_INDEX_NONE));
 
 	    /*
 	     * TODO - add execution trace of both paths
@@ -3443,7 +3443,7 @@ StackCheckBasicBlock(
 
     if (initialStackDepth + blockPtr->minStackDepth < 0) {
 	if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("stack underflow", -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("stack underflow", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADSTACK", NULL);
 	    AddBasicBlockRangeToErrorInfo(assemEnvPtr, blockPtr);
 	    Tcl_SetErrorLine(interp, blockPtr->startLine);
@@ -3462,8 +3462,8 @@ StackCheckBasicBlock(
 		+ blockPtr->enclosingCatch->finalStackDepth)) {
 	if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "code pops stack below level of enclosing catch", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADSTACKINCATCH", -1);
+		    "code pops stack below level of enclosing catch", TCL_INDEX_NONE));
+	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADSTACKINCATCH", TCL_INDEX_NONE);
 	    AddBasicBlockRangeToErrorInfo(assemEnvPtr, blockPtr);
 	    Tcl_SetErrorLine(interp, blockPtr->startLine);
 	}
@@ -3734,7 +3734,7 @@ ProcessCatchesInBasicBlock(
 	if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "execution reaches an instruction in inconsistent "
-		    "exception contexts", -1));
+		    "exception contexts", TCL_INDEX_NONE));
 	    Tcl_SetErrorLine(interp, bbPtr->startLine);
 	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADCATCH", NULL);
 	}
@@ -3793,7 +3793,7 @@ ProcessCatchesInBasicBlock(
 	if (enclosing == NULL) {
 	    if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"endCatch without a corresponding beginCatch", -1));
+			"endCatch without a corresponding beginCatch", TCL_INDEX_NONE));
 		Tcl_SetErrorLine(interp, bbPtr->startLine);
 		Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADENDCATCH", NULL);
 	    }
@@ -3868,7 +3868,7 @@ CheckForUnclosedCatches(
     if (assemEnvPtr->curr_bb->catchState >= BBCS_INCATCH) {
 	if (assemEnvPtr->flags & TCL_EVAL_DIRECT) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "catch still active on exit from assembly code", -1));
+		    "catch still active on exit from assembly code", TCL_INDEX_NONE));
 	    Tcl_SetErrorLine(interp,
 		    assemEnvPtr->curr_bb->enclosingCatch->startLine);
 	    Tcl_SetErrorCode(interp, "TCL", "ASSEM", "UNCLOSEDCATCH", NULL);
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 1dbd90b..381d127 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -2152,7 +2152,7 @@ Tcl_HideCommand(
     if (strstr(hiddenCmdToken, "::") != NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"cannot use namespace qualifiers in hidden command"
-		" token (rename)", -1));
+		" token (rename)", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "VALUE", "HIDDENTOKEN", NULL);
 	return TCL_ERROR;
     }
@@ -3188,11 +3188,11 @@ TclRenameCommand(
      */
 
     Tcl_DStringInit(&newFullName);
-    Tcl_DStringAppend(&newFullName, newNsPtr->fullName, -1);
+    Tcl_DStringAppend(&newFullName, newNsPtr->fullName, TCL_INDEX_NONE);
     if (newNsPtr != iPtr->globalNsPtr) {
 	TclDStringAppendLiteral(&newFullName, "::");
     }
-    Tcl_DStringAppend(&newFullName, newTail, -1);
+    Tcl_DStringAppend(&newFullName, newTail, TCL_INDEX_NONE);
     cmdPtr->refCount++;
     CallCommandTraces(iPtr, cmdPtr, TclGetString(oldFullName),
 	    Tcl_DStringValue(&newFullName), TCL_TRACE_RENAME);
@@ -3553,14 +3553,14 @@ Tcl_GetCommandFullName(
 
     if ((cmdPtr != NULL) && TclRoutineHasName(cmdPtr)) {
 	if (cmdPtr->nsPtr != NULL) {
-	    Tcl_AppendToObj(objPtr, cmdPtr->nsPtr->fullName, -1);
+	    Tcl_AppendToObj(objPtr, cmdPtr->nsPtr->fullName, TCL_INDEX_NONE);
 	    if (cmdPtr->nsPtr != iPtr->globalNsPtr) {
 		Tcl_AppendToObj(objPtr, "::", 2);
 	    }
 	}
 	if (cmdPtr->hPtr != NULL) {
 	    name = (char *)Tcl_GetHashKey(cmdPtr->hPtr->tablePtr, cmdPtr->hPtr);
-	    Tcl_AppendToObj(objPtr, name, -1);
+	    Tcl_AppendToObj(objPtr, name, TCL_INDEX_NONE);
 	}
     }
 }
@@ -4061,7 +4061,7 @@ TclInterpReady(
 
     if (iPtr->flags & DELETED) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to call eval in deleted interpreter", -1));
+		"attempt to call eval in deleted interpreter", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "IDELETE",
 		"attempt to call eval in deleted interpreter", NULL);
 	return TCL_ERROR;
@@ -4090,7 +4090,7 @@ TclInterpReady(
     }
 
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
-	    "too many nested evaluations (infinite loop?)", -1));
+	    "too many nested evaluations (infinite loop?)", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "TCL", "LIMIT", "STACK", NULL);
     return TCL_ERROR;
 }
@@ -4224,7 +4224,7 @@ Tcl_Canceled(
             }
         }
 
-        Tcl_SetObjResult(interp, Tcl_NewStringObj(message, -1));
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(message, TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "CANCEL", id, message, NULL);
     }
 
@@ -6361,10 +6361,10 @@ ProcessUnexpectedResult(
     Tcl_ResetResult(interp);
     if (returnCode == TCL_BREAK) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"invoked \"break\" outside of a loop", -1));
+		"invoked \"break\" outside of a loop", TCL_INDEX_NONE));
     } else if (returnCode == TCL_CONTINUE) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"invoked \"continue\" outside of a loop", -1));
+		"invoked \"continue\" outside of a loop", TCL_INDEX_NONE));
     } else {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"command returned bad code: %d", returnCode));
@@ -6410,7 +6410,7 @@ Tcl_ExprLong(
 
 	*ptr = 0;
     } else {
-	exprPtr = Tcl_NewStringObj(exprstring, -1);
+	exprPtr = Tcl_NewStringObj(exprstring, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(exprPtr);
 	result = Tcl_ExprLongObj(interp, exprPtr, ptr);
 	Tcl_DecrRefCount(exprPtr);
@@ -6435,7 +6435,7 @@ Tcl_ExprDouble(
 
 	*ptr = 0.0;
     } else {
-	exprPtr = Tcl_NewStringObj(exprstring, -1);
+	exprPtr = Tcl_NewStringObj(exprstring, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(exprPtr);
 	result = Tcl_ExprDoubleObj(interp, exprPtr, ptr);
 	Tcl_DecrRefCount(exprPtr);
@@ -6460,7 +6460,7 @@ Tcl_ExprBoolean(
 	return TCL_OK;
     } else {
 	int result;
-	Tcl_Obj *exprPtr = Tcl_NewStringObj(exprstring, -1);
+	Tcl_Obj *exprPtr = Tcl_NewStringObj(exprstring, TCL_INDEX_NONE);
 
 	Tcl_IncrRefCount(exprPtr);
 	result = Tcl_ExprBooleanObj(interp, exprPtr, ptr);
@@ -6673,7 +6673,7 @@ TclObjInvoke(
     }
     if ((objc < 1) || (objv == NULL)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "illegal argument vector", -1));
+                "illegal argument vector", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
     if ((flags & TCL_INVOKE_HIDDEN) == 0) {
@@ -6772,7 +6772,7 @@ Tcl_ExprString(
 
 	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(0));
     } else {
-	Tcl_Obj *resultPtr, *exprObj = Tcl_NewStringObj(expr, -1);
+	Tcl_Obj *resultPtr, *exprObj = Tcl_NewStringObj(expr, TCL_INDEX_NONE);
 
 	Tcl_IncrRefCount(exprObj);
 	code = Tcl_ExprObj(interp, exprObj, &resultPtr);
@@ -6886,10 +6886,10 @@ Tcl_VarEval(
 	if (string == NULL) {
 	    break;
 	}
-	Tcl_DStringAppend(&buf, string, -1);
+	Tcl_DStringAppend(&buf, string, TCL_INDEX_NONE);
     }
 
-    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), TCL_INDEX_NONE, 0);
     Tcl_DStringFree(&buf);
     return result;
 }
@@ -7192,7 +7192,7 @@ ExprIsqrtFunc(
 
   negarg:
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
-            "square root of negative argument", -1));
+            "square root of negative argument", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
 	    "domain error: argument not in valid range", NULL);
     return TCL_ERROR;
@@ -8806,7 +8806,7 @@ TclNRTailcallObjCmd(
 
     if (!(iPtr->varFramePtr->isProcCallFrame & 1)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "tailcall can only be called from a proc, lambda or method", -1));
+                "tailcall can only be called from a proc, lambda or method", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "TAILCALL", "ILLEGAL", NULL);
 	return TCL_ERROR;
     }
@@ -8836,7 +8836,7 @@ TclNRTailcallObjCmd(
          * namespace, the rest the command to be tailcalled.
          */
 
-        nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, -1);
+        nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, TCL_INDEX_NONE);
         listPtr = Tcl_NewListObj(objc, objv);
  	TclListObjSetElement(interp, listPtr, 0, nsObjPtr);
 
@@ -8968,7 +8968,7 @@ TclNRYieldObjCmd(
 
     if (!corPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "yield can only be called in a coroutine", -1));
+                "yield can only be called in a coroutine", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", NULL);
 	return TCL_ERROR;
     }
@@ -9001,14 +9001,14 @@ TclNRYieldToObjCmd(
 
     if (!corPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "yieldto can only be called in a coroutine", -1));
+                "yieldto can only be called in a coroutine", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD", NULL);
 	return TCL_ERROR;
     }
 
     if (((Namespace *) nsPtr)->flags & NS_DYING) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"yieldto called in deleted namespace", -1));
+		"yieldto called in deleted namespace", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "YIELDTO_IN_DELETED",
 		NULL);
         return TCL_ERROR;
@@ -9021,7 +9021,7 @@ TclNRYieldToObjCmd(
      */
 
     listPtr = Tcl_NewListObj(objc, objv);
-    nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, -1);
+    nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, TCL_INDEX_NONE);
     TclListObjSetElement(interp, listPtr, 0, nsObjPtr);
 
     /*
@@ -9243,7 +9243,7 @@ TclNRCoroutineActivateCallback(
 
 
             Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                    "cannot yield: C stack busy", -1));
+                    "cannot yield: C stack busy", TCL_INDEX_NONE));
             Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "CANT_YIELD",
                     NULL);
             return TCL_ERROR;
@@ -9332,7 +9332,7 @@ CoroTypeObjCmd(
     cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, objv[1]);
     if ((!cmdPtr) || (cmdPtr->nreProc != TclNRInterpCoroutine)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "can only get coroutine type of a coroutine", -1));
+                "can only get coroutine type of a coroutine", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COROUTINE",
                 TclGetString(objv[1]), NULL);
         return TCL_ERROR;
@@ -9345,7 +9345,7 @@ CoroTypeObjCmd(
 
     corPtr = (CoroutineData *)cmdPtr->objClientData;
     if (!COR_IS_SUSPENDED(corPtr)) {
-        Tcl_SetObjResult(interp, Tcl_NewStringObj("active", -1));
+        Tcl_SetObjResult(interp, Tcl_NewStringObj("active", TCL_INDEX_NONE));
         return TCL_OK;
     }
 
@@ -9356,14 +9356,14 @@ CoroTypeObjCmd(
 
     switch (corPtr->nargs) {
     case COROUTINE_ARGUMENTS_SINGLE_OPTIONAL:
-        Tcl_SetObjResult(interp, Tcl_NewStringObj("yield", -1));
+        Tcl_SetObjResult(interp, Tcl_NewStringObj("yield", TCL_INDEX_NONE));
         return TCL_OK;
     case COROUTINE_ARGUMENTS_ARBITRARY:
-        Tcl_SetObjResult(interp, Tcl_NewStringObj("yieldto", -1));
+        Tcl_SetObjResult(interp, Tcl_NewStringObj("yieldto", TCL_INDEX_NONE));
         return TCL_OK;
     default:
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "unknown coroutine type", -1));
+                "unknown coroutine type", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "BAD_TYPE", NULL);
         return TCL_ERROR;
     }
@@ -9392,7 +9392,7 @@ GetCoroutineFromObj(
     Command *cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, objPtr);
 
     if ((!cmdPtr) || (cmdPtr->nreProc != TclNRInterpCoroutine)) {
-        Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, -1));
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "COROUTINE",
                 TclGetString(objPtr), NULL);
         return NULL;
@@ -9426,7 +9426,7 @@ TclNRCoroInjectObjCmd(
     }
     if (!COR_IS_SUSPENDED(corPtr)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "can only inject a command into a suspended coroutine", -1));
+                "can only inject a command into a suspended coroutine", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", NULL);
         return TCL_ERROR;
     }
@@ -9560,10 +9560,10 @@ InjectHandler(
 
         if (nargs == COROUTINE_ARGUMENTS_SINGLE_OPTIONAL) {
             Tcl_ListObjAppendElement(NULL, listPtr,
-                    Tcl_NewStringObj("yield", -1));
+                    Tcl_NewStringObj("yield", TCL_INDEX_NONE));
         } else if (nargs == COROUTINE_ARGUMENTS_ARBITRARY) {
             Tcl_ListObjAppendElement(NULL, listPtr,
-                    Tcl_NewStringObj("yieldto", -1));
+                    Tcl_NewStringObj("yieldto", TCL_INDEX_NONE));
         } else {
             /*
              * I don't think this is reachable...
@@ -9662,7 +9662,7 @@ NRInjectObjCmd(
     }
     if (!COR_IS_SUSPENDED(corPtr)) {
         Tcl_SetObjResult(interp, Tcl_NewStringObj(
-                "can only inject a command into a suspended coroutine", -1));
+                "can only inject a command into a suspended coroutine", TCL_INDEX_NONE));
         Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ACTIVE", NULL);
         return TCL_ERROR;
     }
@@ -9716,7 +9716,7 @@ TclNRInterpCoroutine(
         if (corPtr->nargs + 1 != (size_t)objc) {
             Tcl_SetObjResult(interp,
                     Tcl_NewStringObj("wrong coro nargs; how did we get here? "
-                    "not implemented!", -1));
+                    "not implemented!", TCL_INDEX_NONE));
             Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
             return TCL_ERROR;
         }
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index e0d99c7..1083533 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -395,7 +395,7 @@ TclGetBytesFromObj(
 
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"byte sequence length exceeds INT_MAX", -1));
+			"byte sequence length exceeds INT_MAX", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "API", "OUTDATED", NULL);
 	    }
 	    return NULL;
@@ -1003,7 +1003,7 @@ BinaryFormatCmd(
 	case 'x':
 	    if (count == BINARY_ALL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"cannot use \"*\" in format string with \"x\"", -1));
+			"cannot use \"*\" in format string with \"x\"", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    } else if (count == BINARY_NOCOUNT) {
 		count = 1;
@@ -1343,7 +1343,7 @@ BinaryFormatCmd(
     }
 
  error:
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, TCL_INDEX_NONE));
     return TCL_ERROR;
 }
 
@@ -1724,7 +1724,7 @@ BinaryScanCmd(
     }
 
  error:
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(errorString, TCL_INDEX_NONE));
     return TCL_ERROR;
 }
 
@@ -2654,7 +2654,7 @@ BinaryEncode64(
 	    }
 	    if (maxlen < 0) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"line length out of range", -1));
+			"line length out of range", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
 			"LINE_LENGTH", NULL);
 		return TCL_ERROR;
@@ -2782,7 +2782,7 @@ BinaryEncodeUu(
 	    }
 	    if (lineLength < 5 || lineLength > 85) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"line length out of range", -1));
+			"line length out of range", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
 			"LINE_LENGTH", NULL);
 		return TCL_ERROR;
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 69d4484..e1949a5 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -504,7 +504,7 @@ InfoArgsCmd(
 	    localPtr = localPtr->nextPtr) {
 	if (TclIsVarArgument(localPtr)) {
 	    Tcl_ListObjAppendElement(interp, listObjPtr,
-		    Tcl_NewStringObj(localPtr->name, -1));
+		    Tcl_NewStringObj(localPtr->name, TCL_INDEX_NONE));
 	}
     }
     Tcl_SetObjResult(interp, listObjPtr);
@@ -716,7 +716,7 @@ InfoCommandsCmd(
 		Tcl_GetCommandFullName(interp, cmd, elemObjPtr);
 	    } else {
 		cmdName = (const char *)Tcl_GetHashKey(&nsPtr->cmdTable, entryPtr);
-		elemObjPtr = Tcl_NewStringObj(cmdName, -1);
+		elemObjPtr = Tcl_NewStringObj(cmdName, TCL_INDEX_NONE);
 	    }
 	    Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
 	    Tcl_SetObjResult(interp, listPtr);
@@ -744,7 +744,7 @@ InfoCommandsCmd(
 	    if (entryPtr != NULL) {
 		cmdName = (const char *)Tcl_GetHashKey(tablePtr, entryPtr);
 		Tcl_ListObjAppendElement(interp, listPtr,
-			Tcl_NewStringObj(cmdName, -1));
+			Tcl_NewStringObj(cmdName, TCL_INDEX_NONE));
 		Tcl_SetObjResult(interp, listPtr);
 		return TCL_OK;
 	    }
@@ -766,7 +766,7 @@ InfoCommandsCmd(
 		    elemObjPtr = Tcl_NewObj();
 		    Tcl_GetCommandFullName(interp, cmd, elemObjPtr);
 		} else {
-		    elemObjPtr = Tcl_NewStringObj(cmdName, -1);
+		    elemObjPtr = Tcl_NewStringObj(cmdName, TCL_INDEX_NONE);
 		}
 		Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
 	    }
@@ -789,7 +789,7 @@ InfoCommandsCmd(
 			|| Tcl_StringMatch(cmdName, simplePattern)) {
 		    if (Tcl_FindHashEntry(&nsPtr->cmdTable,cmdName) == NULL) {
 			Tcl_ListObjAppendElement(interp, listPtr,
-				Tcl_NewStringObj(cmdName, -1));
+				Tcl_NewStringObj(cmdName, TCL_INDEX_NONE));
 		    }
 		}
 		entryPtr = Tcl_NextHashEntry(&search);
@@ -818,7 +818,7 @@ InfoCommandsCmd(
 	    cmdName = (const char *)Tcl_GetHashKey(&nsPtr->cmdTable, entryPtr);
 	    if ((simplePattern == NULL)
 		    || Tcl_StringMatch(cmdName, simplePattern)) {
-		elemObjPtr = Tcl_NewStringObj(cmdName, -1);
+		elemObjPtr = Tcl_NewStringObj(cmdName, TCL_INDEX_NONE);
 		Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
 		(void) Tcl_CreateHashEntry(&addedCommandsTable,
 			elemObjPtr, &isNew);
@@ -844,7 +844,7 @@ InfoCommandsCmd(
 		cmdName = (const char *)Tcl_GetHashKey(&pathNsPtr->cmdTable, entryPtr);
 		if ((simplePattern == NULL)
 			|| Tcl_StringMatch(cmdName, simplePattern)) {
-		    elemObjPtr = Tcl_NewStringObj(cmdName, -1);
+		    elemObjPtr = Tcl_NewStringObj(cmdName, TCL_INDEX_NONE);
 		    (void) Tcl_CreateHashEntry(&addedCommandsTable,
 			    elemObjPtr, &isNew);
 		    if (isNew) {
@@ -871,7 +871,7 @@ InfoCommandsCmd(
 		cmdName = (const char *)Tcl_GetHashKey(&globalNsPtr->cmdTable, entryPtr);
 		if ((simplePattern == NULL)
 			|| Tcl_StringMatch(cmdName, simplePattern)) {
-		    elemObjPtr = Tcl_NewStringObj(cmdName, -1);
+		    elemObjPtr = Tcl_NewStringObj(cmdName, TCL_INDEX_NONE);
 		    if (Tcl_FindHashEntry(&addedCommandsTable,
 			    (char *) elemObjPtr) == NULL) {
 			Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
@@ -1291,7 +1291,7 @@ TclInfoFrame(
 	 * str.
 	 */
 
-	ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1));
+	ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], TCL_INDEX_NONE));
 	if (framePtr->line) {
 	    ADD_PAIR("line", Tcl_NewWideIntObj(framePtr->line[0]));
 	} else {
@@ -1305,7 +1305,7 @@ TclInfoFrame(
 	 * Precompiled. Result contains the type as signal, nothing else.
 	 */
 
-	ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1));
+	ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], TCL_INDEX_NONE));
 	break;
 
     case TCL_LOCATION_BC: {
@@ -1330,7 +1330,7 @@ TclInfoFrame(
 	 * Possibly modified: type, path!
 	 */
 
-	ADD_PAIR("type", Tcl_NewStringObj(typeString[fPtr->type], -1));
+	ADD_PAIR("type", Tcl_NewStringObj(typeString[fPtr->type], TCL_INDEX_NONE));
 	if (fPtr->line) {
 	    ADD_PAIR("line", Tcl_NewWideIntObj(fPtr->line[0]));
 	}
@@ -1358,7 +1358,7 @@ TclInfoFrame(
 	 * Evaluation of a script file.
 	 */
 
-	ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], -1));
+	ADD_PAIR("type", Tcl_NewStringObj(typeString[framePtr->type], TCL_INDEX_NONE));
 	ADD_PAIR("line", Tcl_NewWideIntObj(framePtr->line[0]));
 	ADD_PAIR("file", framePtr->data.eval.path);
 
@@ -1404,7 +1404,7 @@ TclInfoFrame(
 	     */
 
 	    for (i=0 ; i<efiPtr->length ; i++) {
-		lv[lc++] = Tcl_NewStringObj(efiPtr->fields[i].name, -1);
+		lv[lc++] = Tcl_NewStringObj(efiPtr->fields[i].name, TCL_INDEX_NONE);
 		if (efiPtr->fields[i].proc) {
 		    lv[lc++] =
 			efiPtr->fields[i].proc(efiPtr->fields[i].clientData);
@@ -1492,7 +1492,7 @@ InfoFunctionsCmd(
 "		    }\n"
 "		}\n"
 "		::return $cmds\n"
-"	    } [::namespace current]] ", -1);
+"	    } [::namespace current]] ", TCL_INDEX_NONE);
 
     if (objc == 2) {
 	Tcl_Obj *arg = Tcl_NewListObj(1, &(objv[1]));
@@ -1545,12 +1545,12 @@ InfoHostnameCmd(
 
     name = Tcl_GetHostName();
     if (name) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(name, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(name, TCL_INDEX_NONE));
 	return TCL_OK;
     }
 
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
-	    "unable to determine name of host", -1));
+	    "unable to determine name of host", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "TCL", "OPERATION", "HOSTNAME", "UNKNOWN", NULL);
     return TCL_ERROR;
 }
@@ -1665,12 +1665,12 @@ InfoLibraryCmd(
 
     libDirName = Tcl_GetVar2(interp, "tcl_library", NULL, TCL_GLOBAL_ONLY);
     if (libDirName != NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(libDirName, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(libDirName, TCL_INDEX_NONE));
 	return TCL_OK;
     }
 
     Tcl_SetObjResult(interp, Tcl_NewStringObj(
-	    "no library has been specified for Tcl", -1));
+	    "no library has been specified for Tcl", TCL_INDEX_NONE));
     Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARIABLE", "tcl_library",NULL);
     return TCL_ERROR;
 }
@@ -1797,7 +1797,7 @@ InfoPatchLevelCmd(
     patchlevel = Tcl_GetVar2(interp, "tcl_patchLevel", NULL,
 	    (TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
     if (patchlevel != NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(patchlevel, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(patchlevel, TCL_INDEX_NONE));
 	return TCL_OK;
     }
     return TCL_ERROR;
@@ -1910,7 +1910,7 @@ InfoProcsCmd(
 		    Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr,
 			    elemObjPtr);
 		} else {
-		    elemObjPtr = Tcl_NewStringObj(simplePattern, -1);
+		    elemObjPtr = Tcl_NewStringObj(simplePattern, TCL_INDEX_NONE);
 		}
 		Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
 	    }
@@ -1938,7 +1938,7 @@ InfoProcsCmd(
 			Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr,
 				elemObjPtr);
 		    } else {
-			elemObjPtr = Tcl_NewStringObj(cmdName, -1);
+			elemObjPtr = Tcl_NewStringObj(cmdName, TCL_INDEX_NONE);
 		    }
 		    Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
 		}
@@ -1977,7 +1977,7 @@ InfoProcsCmd(
 			if (TclIsProc(cmdPtr) || ((realCmdPtr != NULL)
 				&& TclIsProc(realCmdPtr))) {
 			    Tcl_ListObjAppendElement(interp, listPtr,
-				    Tcl_NewStringObj(cmdName, -1));
+				    Tcl_NewStringObj(cmdName, TCL_INDEX_NONE));
 			}
 		    }
 		}
@@ -2075,7 +2075,7 @@ InfoSharedlibCmd(
     }
 
 #ifdef TCL_SHLIB_EXT
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(TCL_SHLIB_EXT, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(TCL_SHLIB_EXT, TCL_INDEX_NONE));
 #endif
     return TCL_OK;
 }
@@ -2172,7 +2172,7 @@ InfoCmdTypeCmd(
 	Tcl_AppendResult(interp, "native", NULL);
     } else {
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj(TclGetCommandTypeName(command), -1));
+		Tcl_NewStringObj(TclGetCommandTypeName(command), TCL_INDEX_NONE));
     }
     return TCL_OK;
 }
@@ -2652,7 +2652,7 @@ Tcl_LpopObjCmd(
 	if (!listLen) {
 	    /* empty list, throw the same error as with index "end" */
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"index \"end\" out of range", -1));
+		"index \"end\" out of range", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "VALUE", "INDEX"
 		"OUTOFRANGE", NULL);
 	    return TCL_ERROR;
@@ -3374,7 +3374,7 @@ Tcl_LsearchObjCmd(
 	    }
 	    if (i + 4 > (size_t)objc) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing starting index", -1));
+			"missing starting index", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 		result = TCL_ERROR;
 		goto done;
@@ -3398,7 +3398,7 @@ Tcl_LsearchObjCmd(
 	    if (i + 4 > (size_t)objc) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"\"-stride\" option must be "
-			"followed by stride length", -1));
+			"followed by stride length", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 		result = TCL_ERROR;
 		goto done;
@@ -3409,7 +3409,7 @@ Tcl_LsearchObjCmd(
 	    }
 	    if (wide < 1) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"stride length must be at least 1", -1));
+			"stride length must be at least 1", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
 			"BADSTRIDE", NULL);
 		result = TCL_ERROR;
@@ -3499,7 +3499,7 @@ Tcl_LsearchObjCmd(
 
     if (returnSubindices && sortInfo.indexc==0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"-subindices cannot be used without -index option", -1));
+		"-subindices cannot be used without -index option", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
 		"BAD_OPTION_MIX", NULL);
 	result = TCL_ERROR;
@@ -3508,7 +3508,7 @@ Tcl_LsearchObjCmd(
 
     if (bisect && (allMatches || negatedMatch)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"-bisect is not compatible with -all or -not", -1));
+		"-bisect is not compatible with -all or -not", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
 		"BAD_OPTION_MIX", NULL);
 	result = TCL_ERROR;
@@ -3578,7 +3578,7 @@ Tcl_LsearchObjCmd(
 	    if (groupOffset >= groupSize) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"when used with \"-stride\", the leading \"-index\""
-			" value must be within the group", -1));
+			" value must be within the group", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
 			"BADINDEX", NULL);
 		result = TCL_ERROR;
@@ -4551,7 +4551,7 @@ Tcl_LsortObjCmd(
 	    if (i + 2 == (size_t)objc) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"\"-command\" option must be followed "
-			"by comparison command", -1));
+			"by comparison command", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 		sortInfo.resultCode = TCL_ERROR;
 		goto done;
@@ -4638,7 +4638,7 @@ Tcl_LsortObjCmd(
 	    if (i + 2 == (size_t)objc) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"\"-stride\" option must be "
-			"followed by stride length", -1));
+			"followed by stride length", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 		sortInfo.resultCode = TCL_ERROR;
 		goto done;
@@ -4649,7 +4649,7 @@ Tcl_LsortObjCmd(
 	    }
 	    if (wide < 2) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"stride length must be at least 2", -1));
+			"stride length must be at least 2", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT",
 			"BADSTRIDE", NULL);
 		sortInfo.resultCode = TCL_ERROR;
@@ -4771,7 +4771,7 @@ Tcl_LsortObjCmd(
 	    if (groupOffset >= groupSize) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"when used with \"-stride\", the leading \"-index\""
-			" value must be within the group", -1));
+			" value must be within the group", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT",
 			"BADINDEX", NULL);
 		sortInfo.resultCode = TCL_ERROR;
@@ -5298,7 +5298,7 @@ SortCompare(
 	if (TclGetIntFromObj(infoPtr->interp,
 		Tcl_GetObjResult(infoPtr->interp), &order) != TCL_OK) {
 	    Tcl_SetObjResult(infoPtr->interp, Tcl_NewStringObj(
-		    "-compare command returned non-integer result", -1));
+		    "-compare command returned non-integer result", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(infoPtr->interp, "TCL", "OPERATION", "LSORT",
 		    "COMPARISONFAILED", NULL);
 	    infoPtr->resultCode = TCL_ERROR;
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index f497f59..77c8cb4 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -227,7 +227,7 @@ Tcl_RegexpObjCmd(
 
     if (doinline && ((objc - 2) != 0)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"regexp match variables not allowed when using -inline", -1));
+		"regexp match variables not allowed when using -inline", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "REGEXP",
 		"MIX_VAR_INLINE", NULL);
 	goto optionError;
@@ -1695,7 +1695,7 @@ StringIsCmd(
 	    goto str_is_done;
 	}
 	end = string1 + length1;
-	if (TclParseNumber(NULL, objPtr, NULL, NULL, -1,
+	if (TclParseNumber(NULL, objPtr, NULL, NULL, TCL_INDEX_NONE,
 		(const char **) &stop, 0) != TCL_OK) {
 	    result = 0;
 	    failat = 0;
@@ -1725,7 +1725,7 @@ StringIsCmd(
 	    goto str_is_done;
 	}
 	end = string1 + length1;
-	if (TclParseNumber(NULL, objPtr, NULL, NULL, -1,
+	if (TclParseNumber(NULL, objPtr, NULL, NULL, TCL_INDEX_NONE,
 		(const char **) &stop, TCL_PARSE_INTEGER_ONLY) == TCL_OK) {
 	    if (stop == end) {
 		/*
@@ -1776,7 +1776,7 @@ StringIsCmd(
 	    break;
 	}
 	end = string1 + length1;
-	if (TclParseNumber(NULL, objPtr, NULL, NULL, -1,
+	if (TclParseNumber(NULL, objPtr, NULL, NULL, TCL_INDEX_NONE,
 		(const char **) &stop, TCL_PARSE_INTEGER_ONLY) == TCL_OK) {
 	    if (stop == end) {
 		/*
@@ -2047,7 +2047,7 @@ StringMapCmd(
 	     */
 
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("char map list unbalanced", -1));
+		    Tcl_NewStringObj("char map list unbalanced", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "MAP",
 		    "UNBALANCED", NULL);
 	    return TCL_ERROR;
@@ -2933,7 +2933,7 @@ StringLowerCmd(
 	length2 = Tcl_UtfToLower(string2);
 	Tcl_SetObjLength(resultPtr, length2 + (start - string1));
 
-	Tcl_AppendToObj(resultPtr, end, -1);
+	Tcl_AppendToObj(resultPtr, end, TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, resultPtr);
     }
 
@@ -3018,7 +3018,7 @@ StringUpperCmd(
 	length2 = Tcl_UtfToUpper(string2);
 	Tcl_SetObjLength(resultPtr, length2 + (start - string1));
 
-	Tcl_AppendToObj(resultPtr, end, -1);
+	Tcl_AppendToObj(resultPtr, end, TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, resultPtr);
     }
 
@@ -3103,7 +3103,7 @@ StringTitleCmd(
 	length2 = Tcl_UtfToTitle(string2);
 	Tcl_SetObjLength(resultPtr, length2 + (start - string1));
 
-	Tcl_AppendToObj(resultPtr, end, -1);
+	Tcl_AppendToObj(resultPtr, end, TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, resultPtr);
     }
 
@@ -3612,7 +3612,7 @@ TclNRSwitchObjCmd(
     if (objc % 2) {
 	Tcl_ResetResult(interp);
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"extra switch pattern with no body", -1));
+		"extra switch pattern with no body", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "SWITCH", "BADARM",
 		NULL);
 
@@ -3630,7 +3630,7 @@ TclNRSwitchObjCmd(
 		    Tcl_AppendToObj(Tcl_GetObjResult(interp),
 			    ", this may be due to a comment incorrectly"
 			    " placed outside of a switch body - see the"
-			    " \"switch\" documentation", -1);
+			    " \"switch\" documentation", TCL_INDEX_NONE);
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "SWITCH",
 			    "BADARM", "COMMENT?", NULL);
 		    break;
@@ -3980,7 +3980,7 @@ Tcl_ThrowObjCmd(
 	return TCL_ERROR;
     } else if (len < 1) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"type must be non-empty list", -1));
+		"type must be non-empty list", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "THROW", "BADEXCEPTION",
 		NULL);
 	return TCL_ERROR;
@@ -4718,7 +4718,7 @@ TclNRTryObjCmd(
 	case TryFinally:	/* finally script */
 	    if (i < objc-2) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"finally clause must be last", -1));
+			"finally clause must be last", TCL_INDEX_NONE));
 		Tcl_DecrRefCount(handlersObj);
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "FINALLY",
 			"NONTERMINAL", NULL);
@@ -4726,7 +4726,7 @@ TclNRTryObjCmd(
 	    } else if (i == objc-1) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"wrong # args to finally clause: must be"
-			" \"... finally script\"", -1));
+			" \"... finally script\"", TCL_INDEX_NONE));
 		Tcl_DecrRefCount(handlersObj);
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "FINALLY",
 			"ARGUMENT", NULL);
@@ -4739,7 +4739,7 @@ TclNRTryObjCmd(
 	    if (i > objc-4) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"wrong # args to on clause: must be \"... on code"
-			" variableList script\"", -1));
+			" variableList script\"", TCL_INDEX_NONE));
 		Tcl_DecrRefCount(handlersObj);
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "ON",
 			"ARGUMENT", NULL);
@@ -4800,7 +4800,7 @@ TclNRTryObjCmd(
     }
     if (bodyShared) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"last non-finally clause must not have a body of \"-\"", -1));
+		"last non-finally clause must not have a body of \"-\"", TCL_INDEX_NONE));
 	Tcl_DecrRefCount(handlersObj);
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "BADFALLTHROUGH",
 		NULL);
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index b7bcf7c..c503304 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -798,14 +798,14 @@ ParseExpr(
 			    switch (start[1]) {
 			    case 'b':
 				Tcl_AppendToObj(post,
-					" (invalid binary number?)", -1);
+					" (invalid binary number?)", TCL_INDEX_NONE);
 				parsePtr->errorType = TCL_PARSE_BAD_NUMBER;
 				errCode = "BADNUMBER";
 				subErrCode = "BINARY";
 				break;
 			    case 'o':
 				Tcl_AppendToObj(post,
-					" (invalid octal number?)", -1);
+					" (invalid octal number?)", TCL_INDEX_NONE);
 				parsePtr->errorType = TCL_PARSE_BAD_NUMBER;
 				errCode = "BADNUMBER";
 				subErrCode = "OCTAL";
@@ -813,7 +813,7 @@ ParseExpr(
 			    default:
 				if (isdigit(UCHAR(start[1]))) {
 				    Tcl_AppendToObj(post,
-					    " (invalid octal number?)", -1);
+					    " (invalid octal number?)", TCL_INDEX_NONE);
 				    parsePtr->errorType = TCL_PARSE_BAD_NUMBER;
 				    errCode = "BADNUMBER";
 				    subErrCode = "OCTAL";
@@ -1462,7 +1462,7 @@ ParseExpr(
 	 */
 
 	if (post != NULL) {
-	    Tcl_AppendToObj(msg, ";\n", -1);
+	    Tcl_AppendToObj(msg, ";\n", TCL_INDEX_NONE);
 	    Tcl_AppendObjToObj(msg, post);
 	    Tcl_DecrRefCount(post);
 	}
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 57adcf0..c06731f 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -280,7 +280,7 @@ DisassembleByteCodeObj(
     Tcl_AppendPrintfToObj(bufferObj,
 	    "ByteCode %p, refCt %" TCL_Z_MODIFIER "u, epoch %" TCL_Z_MODIFIER "u, interp %p (epoch %" TCL_Z_MODIFIER "u)\n",
 	    codePtr, codePtr->refCount, codePtr->compileEpoch, iPtr, iPtr->compileEpoch);
-    Tcl_AppendToObj(bufferObj, "  Source ", -1);
+    Tcl_AppendToObj(bufferObj, "  Source ", TCL_INDEX_NONE);
     PrintSourceToObj(bufferObj, codePtr->source,
 	    TclMin(codePtr->numSrcBytes, 55));
     GetLocationInformation(codePtr->procPtr, &fileObj, &line);
@@ -339,7 +339,7 @@ DisassembleByteCodeObj(
 			(localPtr->flags & VAR_TEMPORARY) ? ", temp" : "",
 			(localPtr->flags & VAR_RESOLVED) ? ", resolved" : "");
 		if (TclIsVarTemporary(localPtr)) {
-		    Tcl_AppendToObj(bufferObj, "\n", -1);
+		    Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
 		} else {
 		    Tcl_AppendPrintfToObj(bufferObj, ", \"%s\"\n",
 			    localPtr->name);
@@ -389,7 +389,7 @@ DisassembleByteCodeObj(
     if (numCmds == 0) {
 	pc = codeStart;
 	while (pc < codeLimit) {
-	    Tcl_AppendToObj(bufferObj, "    ", -1);
+	    Tcl_AppendToObj(bufferObj, "    ", TCL_INDEX_NONE);
 	    pc += FormatInstruction(codePtr, pc, bufferObj);
 	}
 	return bufferObj;
@@ -451,7 +451,7 @@ DisassembleByteCodeObj(
 		srcOffset, (srcOffset + srcLen - 1));
     }
     if (numCmds > 0) {
-	Tcl_AppendToObj(bufferObj, "\n", -1);
+	Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
     }
 
     /*
@@ -500,14 +500,14 @@ DisassembleByteCodeObj(
 	 */
 
 	while ((pc-codeStart) < codeOffset) {
-	    Tcl_AppendToObj(bufferObj, "    ", -1);
+	    Tcl_AppendToObj(bufferObj, "    ", TCL_INDEX_NONE);
 	    pc += FormatInstruction(codePtr, pc, bufferObj);
 	}
 
 	Tcl_AppendPrintfToObj(bufferObj, "  Command %d: ", i+1);
 	PrintSourceToObj(bufferObj, (codePtr->source + srcOffset),
 		TclMin(srcLen, 55));
-	Tcl_AppendToObj(bufferObj, "\n", -1);
+	Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
     }
     if (pc < codeLimit) {
 	/*
@@ -515,7 +515,7 @@ DisassembleByteCodeObj(
 	 */
 
 	while (pc < codeLimit) {
-	    Tcl_AppendToObj(bufferObj, "    ", -1);
+	    Tcl_AppendToObj(bufferObj, "    ", TCL_INDEX_NONE);
 	    pc += FormatInstruction(codePtr, pc, bufferObj);
 	}
     }
@@ -654,7 +654,7 @@ FormatInstruction(
 	const char *bytes;
 	size_t length;
 
-	Tcl_AppendToObj(bufferObj, "\t# ", -1);
+	Tcl_AppendToObj(bufferObj, "\t# ", TCL_INDEX_NONE);
 	bytes = Tcl_GetStringFromObj(codePtr->objArrayPtr[opnd], &length);
 	PrintSourceToObj(bufferObj, bytes, TclMin(length, 40));
     } else if (suffixBuffer[0]) {
@@ -663,12 +663,12 @@ FormatInstruction(
 	    PrintSourceToObj(bufferObj, suffixSrc, 40);
 	}
     }
-    Tcl_AppendToObj(bufferObj, "\n", -1);
+    Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
     if (auxPtr && auxPtr->type->printProc) {
-	Tcl_AppendToObj(bufferObj, "\t\t[", -1);
+	Tcl_AppendToObj(bufferObj, "\t\t[", TCL_INDEX_NONE);
 	auxPtr->type->printProc(auxPtr->clientData, bufferObj, codePtr,
 		pcOffset);
-	Tcl_AppendToObj(bufferObj, "]\n", -1);
+	Tcl_AppendToObj(bufferObj, "]\n", TCL_INDEX_NONE);
     }
     return numBytes;
 }
@@ -866,11 +866,11 @@ PrintSourceToObj(
     size_t i = 0, len;
 
     if (stringPtr == NULL) {
-	Tcl_AppendToObj(appendObj, "\"\"", -1);
+	Tcl_AppendToObj(appendObj, "\"\"", TCL_INDEX_NONE);
 	return;
     }
 
-    Tcl_AppendToObj(appendObj, "\"", -1);
+    Tcl_AppendToObj(appendObj, "\"", TCL_INDEX_NONE);
     p = stringPtr;
     for (;  (*p != '\0') && (i < maxChars);  p+=len) {
 	int ucs4;
@@ -878,27 +878,27 @@ PrintSourceToObj(
 	len = TclUtfToUCS4(p, &ucs4);
 	switch (ucs4) {
 	case '"':
-	    Tcl_AppendToObj(appendObj, "\\\"", -1);
+	    Tcl_AppendToObj(appendObj, "\\\"", TCL_INDEX_NONE);
 	    i += 2;
 	    continue;
 	case '\f':
-	    Tcl_AppendToObj(appendObj, "\\f", -1);
+	    Tcl_AppendToObj(appendObj, "\\f", TCL_INDEX_NONE);
 	    i += 2;
 	    continue;
 	case '\n':
-	    Tcl_AppendToObj(appendObj, "\\n", -1);
+	    Tcl_AppendToObj(appendObj, "\\n", TCL_INDEX_NONE);
 	    i += 2;
 	    continue;
 	case '\r':
-	    Tcl_AppendToObj(appendObj, "\\r", -1);
+	    Tcl_AppendToObj(appendObj, "\\r", TCL_INDEX_NONE);
 	    i += 2;
 	    continue;
 	case '\t':
-	    Tcl_AppendToObj(appendObj, "\\t", -1);
+	    Tcl_AppendToObj(appendObj, "\\t", TCL_INDEX_NONE);
 	    i += 2;
 	    continue;
 	case '\v':
-	    Tcl_AppendToObj(appendObj, "\\v", -1);
+	    Tcl_AppendToObj(appendObj, "\\v", TCL_INDEX_NONE);
 	    i += 2;
 	    continue;
 	default:
@@ -916,9 +916,9 @@ PrintSourceToObj(
 	}
     }
     if (*p != '\0') {
-	Tcl_AppendToObj(appendObj, "...", -1);
+	Tcl_AppendToObj(appendObj, "...", TCL_INDEX_NONE);
     }
-    Tcl_AppendToObj(appendObj, "\"", -1);
+    Tcl_AppendToObj(appendObj, "\"", TCL_INDEX_NONE);
 }
 
 /*
@@ -972,33 +972,33 @@ DisassembleByteCodeAsDicts(
 	    TclNewObj(descriptor[0]);
 	    if (!(localPtr->flags & (VAR_ARRAY|VAR_LINK))) {
 		Tcl_ListObjAppendElement(NULL, descriptor[0],
-			Tcl_NewStringObj("scalar", -1));
+			Tcl_NewStringObj("scalar", TCL_INDEX_NONE));
 	    }
 	    if (localPtr->flags & VAR_ARRAY) {
 		Tcl_ListObjAppendElement(NULL, descriptor[0],
-			Tcl_NewStringObj("array", -1));
+			Tcl_NewStringObj("array", TCL_INDEX_NONE));
 	    }
 	    if (localPtr->flags & VAR_LINK) {
 		Tcl_ListObjAppendElement(NULL, descriptor[0],
-			Tcl_NewStringObj("link", -1));
+			Tcl_NewStringObj("link", TCL_INDEX_NONE));
 	    }
 	    if (localPtr->flags & VAR_ARGUMENT) {
 		Tcl_ListObjAppendElement(NULL, descriptor[0],
-			Tcl_NewStringObj("arg", -1));
+			Tcl_NewStringObj("arg", TCL_INDEX_NONE));
 	    }
 	    if (localPtr->flags & VAR_TEMPORARY) {
 		Tcl_ListObjAppendElement(NULL, descriptor[0],
-			Tcl_NewStringObj("temp", -1));
+			Tcl_NewStringObj("temp", TCL_INDEX_NONE));
 	    }
 	    if (localPtr->flags & VAR_RESOLVED) {
 		Tcl_ListObjAppendElement(NULL, descriptor[0],
-			Tcl_NewStringObj("resolved", -1));
+			Tcl_NewStringObj("resolved", TCL_INDEX_NONE));
 	    }
 	    if (localPtr->flags & VAR_TEMPORARY) {
 		Tcl_ListObjAppendElement(NULL, variables,
 			Tcl_NewListObj(1, descriptor));
 	    } else {
-		descriptor[1] = Tcl_NewStringObj(localPtr->name, -1);
+		descriptor[1] = Tcl_NewStringObj(localPtr->name, TCL_INDEX_NONE);
 		Tcl_ListObjAppendElement(NULL, variables,
 			Tcl_NewListObj(2, descriptor));
 	    }
@@ -1016,7 +1016,7 @@ DisassembleByteCodeAsDicts(
 
 	TclNewObj(inst);
 	Tcl_ListObjAppendElement(NULL, inst, Tcl_NewStringObj(
-		instDesc->name, -1));
+		instDesc->name, TCL_INDEX_NONE));
 	opnd = pc + 1;
 	for (i=0 ; i<instDesc->numOperands ; i++) {
 	    switch (instDesc->opTypes[i]) {
@@ -1082,7 +1082,7 @@ DisassembleByteCodeAsDicts(
 			    ".%d", val));
 		} else if (val == -2) {
 		    Tcl_ListObjAppendElement(NULL, inst, Tcl_NewStringObj(
-			    ".end", -1));
+			    ".end", TCL_INDEX_NONE));
 		} else {
 		    Tcl_ListObjAppendElement(NULL, inst, Tcl_ObjPrintf(
 			    ".end-%d", -2-val));
@@ -1115,13 +1115,13 @@ DisassembleByteCodeAsDicts(
     TclNewObj(aux);
     for (i=0 ; i<(int)codePtr->numAuxDataItems ; i++) {
 	AuxData *auxData = &codePtr->auxDataArrayPtr[i];
-	Tcl_Obj *auxDesc = Tcl_NewStringObj(auxData->type->name, -1);
+	Tcl_Obj *auxDesc = Tcl_NewStringObj(auxData->type->name, TCL_INDEX_NONE);
 
 	if (auxData->type->disassembleProc) {
 	    Tcl_Obj *desc;
 
 	    TclNewObj(desc);
-	    Tcl_DictObjPut(NULL, desc, Tcl_NewStringObj("name", -1), auxDesc);
+	    Tcl_DictObjPut(NULL, desc, Tcl_NewStringObj("name", TCL_INDEX_NONE), auxDesc);
 	    auxDesc = desc;
 	    auxData->type->disassembleProc(auxData->clientData, auxDesc,
 		    codePtr, 0);
@@ -1188,9 +1188,9 @@ DisassembleByteCodeAsDicts(
 	sourceOffset += Decode(srcOffPtr);
 	sourceLength = Decode(srcLenPtr);
 	TclNewObj(cmd);
-	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codefrom", -1),
+	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codefrom", TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(codeOffset));
-	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codeto", -1),
+	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codeto", TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(codeOffset + codeLength - 1));
 
 	/*
@@ -1198,13 +1198,13 @@ DisassembleByteCodeAsDicts(
 	 * characters are present in the source!
 	 */
 
-	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptfrom", -1),
+	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptfrom", TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(Tcl_NumUtfChars(codePtr->source,
 			sourceOffset)));
-	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptto", -1),
+	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptto", TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(Tcl_NumUtfChars(codePtr->source,
 			sourceOffset + sourceLength - 1)));
-	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("script", -1),
+	Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("script", TCL_INDEX_NONE),
 		Tcl_NewStringObj(codePtr->source+sourceOffset, sourceLength));
 	Tcl_ListObjAppendElement(NULL, commands, cmd);
     }
@@ -1223,32 +1223,32 @@ DisassembleByteCodeAsDicts(
      */
 
     TclNewObj(description);
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("literals", -1),
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("literals", TCL_INDEX_NONE),
 	    literals);
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("variables", -1),
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("variables", TCL_INDEX_NONE),
 	    variables);
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exception", -1), exn);
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("instructions", -1),
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exception", TCL_INDEX_NONE), exn);
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("instructions", TCL_INDEX_NONE),
 	    instructions);
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("auxiliary", -1), aux);
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("commands", -1),
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("auxiliary", TCL_INDEX_NONE), aux);
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("commands", TCL_INDEX_NONE),
 	    commands);
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("script", -1),
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("script", TCL_INDEX_NONE),
 	    Tcl_NewStringObj(codePtr->source, codePtr->numSrcBytes));
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("namespace", -1),
-	    Tcl_NewStringObj(codePtr->nsPtr->fullName, -1));
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("stackdepth", -1),
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("namespace", TCL_INDEX_NONE),
+	    Tcl_NewStringObj(codePtr->nsPtr->fullName, TCL_INDEX_NONE));
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("stackdepth", TCL_INDEX_NONE),
 	    Tcl_NewWideIntObj(codePtr->maxStackDepth));
-    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exceptdepth", -1),
+    Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exceptdepth", TCL_INDEX_NONE),
 	    Tcl_NewWideIntObj(codePtr->maxExceptDepth));
     if (line >= 0) {
 	Tcl_DictObjPut(NULL, description,
-		Tcl_NewStringObj("initiallinenumber", -1),
+		Tcl_NewStringObj("initiallinenumber", TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(line));
     }
     if (file) {
 	Tcl_DictObjPut(NULL, description,
-		Tcl_NewStringObj("sourcefile", -1), file);
+		Tcl_NewStringObj("sourcefile", TCL_INDEX_NONE), file);
     }
     return description;
 }
@@ -1410,7 +1410,7 @@ Tcl_DisassembleObjCmd(
 	procPtr = TclOOGetProcFromMethod(methodPtr);
 	if (procPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "body not available for this kind of constructor", -1));
+		    "body not available for this kind of constructor", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
 		    "METHODTYPE", NULL);
 	    return TCL_ERROR;
@@ -1475,7 +1475,7 @@ Tcl_DisassembleObjCmd(
 	procPtr = TclOOGetProcFromMethod(methodPtr);
 	if (procPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "body not available for this kind of destructor", -1));
+		    "body not available for this kind of destructor", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
 		    "METHODTYPE", NULL);
 	    return TCL_ERROR;
@@ -1565,7 +1565,7 @@ Tcl_DisassembleObjCmd(
 	procPtr = TclOOGetProcFromMethod((Method *)Tcl_GetHashValue(hPtr));
 	if (procPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "body not available for this kind of method", -1));
+		    "body not available for this kind of method", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
 		    "METHODTYPE", NULL);
 	    return TCL_ERROR;
@@ -1602,7 +1602,7 @@ Tcl_DisassembleObjCmd(
 
     if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"may not disassemble prebuilt bytecode", -1));
+		"may not disassemble prebuilt bytecode", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
 		"BYTECODE", NULL);
 	return TCL_ERROR;
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index a84b188..98f4ae0 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -125,7 +125,7 @@ NewNsObj(
     if (namespacePtr == TclGetGlobalNamespace(nsPtr->interp)) {
 	return Tcl_NewStringObj("::", 2);
     }
-    return Tcl_NewStringObj(nsPtr->fullName, -1);
+    return Tcl_NewStringObj(nsPtr->fullName, TCL_INDEX_NONE);
 }
 
 /*
@@ -289,7 +289,7 @@ TclNamespaceEnsembleCmd(
 		    if (len < 1) {
 			Tcl_SetObjResult(interp, Tcl_NewStringObj(
 				"ensemble subcommand implementations "
-				"must be non-empty lists", -1));
+				"must be non-empty lists", TCL_INDEX_NONE));
 			Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
 				"EMPTY_TARGET", NULL);
 			Tcl_DictObjDone(&search);
@@ -460,7 +460,7 @@ TclNamespaceEnsembleCmd(
 
 	    /* -map option */
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    Tcl_NewStringObj(ensembleConfigOptions[CONF_MAP], -1));
+		    Tcl_NewStringObj(ensembleConfigOptions[CONF_MAP], TCL_INDEX_NONE));
 	    Tcl_GetEnsembleMappingDict(NULL, token, &tmpObj);
 	    Tcl_ListObjAppendElement(NULL, resultObj,
 		    (tmpObj != NULL) ? tmpObj : Tcl_NewObj());
@@ -475,14 +475,14 @@ TclNamespaceEnsembleCmd(
 
 	    /* -parameters option */
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    Tcl_NewStringObj(ensembleConfigOptions[CONF_PARAM], -1));
+		    Tcl_NewStringObj(ensembleConfigOptions[CONF_PARAM], TCL_INDEX_NONE));
 	    Tcl_GetEnsembleParameterList(NULL, token, &tmpObj);
 	    Tcl_ListObjAppendElement(NULL, resultObj,
 		    (tmpObj != NULL) ? tmpObj : Tcl_NewObj());
 
 	    /* -prefix option */
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    Tcl_NewStringObj(ensembleConfigOptions[CONF_PREFIX], -1));
+		    Tcl_NewStringObj(ensembleConfigOptions[CONF_PREFIX], TCL_INDEX_NONE));
 	    Tcl_GetEnsembleFlags(NULL, token, &flags);
 	    Tcl_ListObjAppendElement(NULL, resultObj,
 		    Tcl_NewBooleanObj(flags & TCL_ENSEMBLE_PREFIX));
@@ -577,7 +577,7 @@ TclNamespaceEnsembleCmd(
 			if (len < 1) {
 			    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 				    "ensemble subcommand implementations "
-				    "must be non-empty lists", -1));
+				    "must be non-empty lists", TCL_INDEX_NONE));
 			    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE",
 				    "EMPTY_TARGET", NULL);
 			    Tcl_DictObjDone(&search);
@@ -625,7 +625,7 @@ TclNamespaceEnsembleCmd(
 		}
 		case CONF_NAMESPACE:
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "option -namespace is read-only", -1));
+			    "option -namespace is read-only", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "READ_ONLY",
 			    NULL);
 		    goto freeMapAndError;
@@ -798,7 +798,7 @@ Tcl_SetEnsembleSubcommandList(
 
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"command is not an ensemble", -1));
+		"command is not an ensemble", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	return TCL_ERROR;
     }
@@ -874,7 +874,7 @@ Tcl_SetEnsembleParameterList(
 
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"command is not an ensemble", -1));
+		"command is not an ensemble", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	return TCL_ERROR;
     }
@@ -950,7 +950,7 @@ Tcl_SetEnsembleMappingDict(
 
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"command is not an ensemble", -1));
+		"command is not an ensemble", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	return TCL_ERROR;
     }
@@ -1050,7 +1050,7 @@ Tcl_SetEnsembleUnknownHandler(
 
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"command is not an ensemble", -1));
+		"command is not an ensemble", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	return TCL_ERROR;
     }
@@ -1116,7 +1116,7 @@ Tcl_SetEnsembleFlags(
 
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"command is not an ensemble", -1));
+		"command is not an ensemble", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	return TCL_ERROR;
     }
@@ -1193,7 +1193,7 @@ Tcl_GetEnsembleSubcommandList(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "command is not an ensemble", -1));
+		    "command is not an ensemble", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	}
 	return TCL_ERROR;
@@ -1235,7 +1235,7 @@ Tcl_GetEnsembleParameterList(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "command is not an ensemble", -1));
+		    "command is not an ensemble", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	}
 	return TCL_ERROR;
@@ -1277,7 +1277,7 @@ Tcl_GetEnsembleMappingDict(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "command is not an ensemble", -1));
+		    "command is not an ensemble", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	}
 	return TCL_ERROR;
@@ -1318,7 +1318,7 @@ Tcl_GetEnsembleUnknownHandler(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "command is not an ensemble", -1));
+		    "command is not an ensemble", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	}
 	return TCL_ERROR;
@@ -1359,7 +1359,7 @@ Tcl_GetEnsembleFlags(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "command is not an ensemble", -1));
+		    "command is not an ensemble", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	}
 	return TCL_ERROR;
@@ -1400,7 +1400,7 @@ Tcl_GetEnsembleNamespace(
     if (cmdPtr->objProc != TclEnsembleImplementationCmd) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "command is not an ensemble", -1));
+		    "command is not an ensemble", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "NOT_ENSEMBLE", NULL);
 	}
 	return TCL_ERROR;
@@ -1549,7 +1549,7 @@ TclMakeEnsemble(
     Tcl_DStringInit(&buf);
     Tcl_DStringInit(&hiddenBuf);
     TclDStringAppendLiteral(&hiddenBuf, "tcl:");
-    Tcl_DStringAppend(&hiddenBuf, name, -1);
+    Tcl_DStringAppend(&hiddenBuf, name, TCL_INDEX_NONE);
     TclDStringAppendLiteral(&hiddenBuf, ":");
     hiddenLen = Tcl_DStringLength(&hiddenBuf);
     if (name[0] == ':' && name[1] == ':') {
@@ -1558,7 +1558,7 @@ TclMakeEnsemble(
 	 */
 
 	cmdName = name;
-	Tcl_DStringAppend(&buf, name, -1);
+	Tcl_DStringAppend(&buf, name, TCL_INDEX_NONE);
 	ensembleFlags = TCL_ENSEMBLE_PREFIX;
     } else {
 	/*
@@ -1574,7 +1574,7 @@ TclMakeEnsemble(
 
 	for (i = 0; i < nameCount; ++i) {
 	    TclDStringAppendLiteral(&buf, "::");
-	    Tcl_DStringAppend(&buf, nameParts[i], -1);
+	    Tcl_DStringAppend(&buf, nameParts[i], TCL_INDEX_NONE);
 	}
     }
 
@@ -1619,10 +1619,10 @@ TclMakeEnsemble(
 	TclDStringAppendLiteral(&buf, "::");
 	TclNewObj(mapDict);
 	for (i=0 ; map[i].name != NULL ; i++) {
-	    fromObj = Tcl_NewStringObj(map[i].name, -1);
+	    fromObj = Tcl_NewStringObj(map[i].name, TCL_INDEX_NONE);
 	    TclNewStringObj(toObj, Tcl_DStringValue(&buf),
 		    Tcl_DStringLength(&buf));
-	    Tcl_AppendToObj(toObj, map[i].name, -1);
+	    Tcl_AppendToObj(toObj, map[i].name, TCL_INDEX_NONE);
 	    Tcl_DictObjPut(NULL, mapDict, fromObj, toObj);
 
 	    if (map[i].proc || map[i].nreProc) {
@@ -1640,7 +1640,7 @@ TclMakeEnsemble(
 			    map[i].nreProc, map[i].clientData, NULL);
 		    Tcl_DStringSetLength(&hiddenBuf, hiddenLen);
 		    if (Tcl_HideCommand(interp, "___tmp",
-			    Tcl_DStringAppend(&hiddenBuf, map[i].name, -1))) {
+			    Tcl_DStringAppend(&hiddenBuf, map[i].name, TCL_INDEX_NONE))) {
 			Tcl_Panic("%s", Tcl_GetStringResult(interp));
 		    }
 		} else {
@@ -1737,7 +1737,7 @@ NsEnsembleImplementationCmdNR(
 	Tcl_DStringInit(&buf);
 	if (ensemblePtr->parameterList) {
 	    Tcl_DStringAppend(&buf,
-		    TclGetString(ensemblePtr->parameterList), -1);
+		    TclGetString(ensemblePtr->parameterList), TCL_INDEX_NONE);
 	    TclDStringAppendLiteral(&buf, " ");
 	}
 	TclDStringAppendLiteral(&buf, "subcommand ?arg ...?");
@@ -1754,7 +1754,7 @@ NsEnsembleImplementationCmdNR(
 
 	if (!Tcl_InterpDeleted(interp)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "ensemble activated for deleted namespace", -1));
+		    "ensemble activated for deleted namespace", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "DEAD", NULL);
 	}
 	return TCL_ERROR;
@@ -1869,7 +1869,7 @@ NsEnsembleImplementationCmdNR(
 	 * Record the spelling correction for usage message.
 	 */
 
-	fix = Tcl_NewStringObj(fullName, -1);
+	fix = Tcl_NewStringObj(fullName, TCL_INDEX_NONE);
 
 	/*
 	 * Cache for later in the subcommand object.
@@ -1980,12 +1980,12 @@ NsEnsembleImplementationCmdNR(
 	    (ensemblePtr->flags & TCL_ENSEMBLE_PREFIX ? " or ambiguous" : ""),
 	    TclGetString(subObj));
     if (ensemblePtr->subcommandTable.numEntries == 1) {
-	Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[0], -1);
+	Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[0], TCL_INDEX_NONE);
     } else {
 	size_t i;
 
 	for (i=0 ; i<ensemblePtr->subcommandTable.numEntries-1 ; i++) {
-	    Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[i], -1);
+	    Tcl_AppendToObj(errorObj, ensemblePtr->subcommandArrayPtr[i], TCL_INDEX_NONE);
 	    Tcl_AppendToObj(errorObj, ", ", 2);
 	}
 	Tcl_AppendPrintfToObj(errorObj, "or %s",
@@ -2326,7 +2326,7 @@ EnsembleUnknownCallback(
     if ((result == TCL_OK) && (ensemblePtr->flags & ENSEMBLE_DEAD)) {
 	if (!Tcl_InterpDeleted(interp)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "unknown subcommand handler deleted its ensemble", -1));
+		    "unknown subcommand handler deleted its ensemble", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ENSEMBLE", "UNKNOWN_DELETED",
 		    NULL);
 	}
@@ -2374,16 +2374,16 @@ EnsembleUnknownCallback(
 	if (result != TCL_ERROR) {
 	    Tcl_ResetResult(interp);
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "unknown subcommand handler returned bad code: ", -1));
+		    "unknown subcommand handler returned bad code: ", TCL_INDEX_NONE));
 	    switch (result) {
 	    case TCL_RETURN:
-		Tcl_AppendToObj(Tcl_GetObjResult(interp), "return", -1);
+		Tcl_AppendToObj(Tcl_GetObjResult(interp), "return", TCL_INDEX_NONE);
 		break;
 	    case TCL_BREAK:
-		Tcl_AppendToObj(Tcl_GetObjResult(interp), "break", -1);
+		Tcl_AppendToObj(Tcl_GetObjResult(interp), "break", TCL_INDEX_NONE);
 		break;
 	    case TCL_CONTINUE:
-		Tcl_AppendToObj(Tcl_GetObjResult(interp), "continue", -1);
+		Tcl_AppendToObj(Tcl_GetObjResult(interp), "continue", TCL_INDEX_NONE);
 		break;
 	    default:
 		Tcl_AppendPrintfToObj(Tcl_GetObjResult(interp), "%d", result);
@@ -2625,7 +2625,7 @@ BuildEnsembleConfig(
                 name = TclGetString(subv[i+1]);
                 hPtr = Tcl_CreateHashEntry(hash, name, &isNew);
                 if (isNew) {
-                    cmdObj = Tcl_NewStringObj(name, -1);
+                    cmdObj = Tcl_NewStringObj(name, TCL_INDEX_NONE);
                     cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
                     Tcl_SetHashValue(hPtr, cmdPrefixObj);
                     Tcl_IncrRefCount(cmdPrefixObj);
@@ -2663,7 +2663,7 @@ BuildEnsembleConfig(
 		 * programmer (or [::unknown] of course) to provide the procedure.
                  */
 
-                cmdObj = Tcl_NewStringObj(name, -1);
+                cmdObj = Tcl_NewStringObj(name, TCL_INDEX_NONE);
                 cmdPrefixObj = Tcl_NewListObj(1, &cmdObj);
                 Tcl_SetHashValue(hPtr, cmdPrefixObj);
                 Tcl_IncrRefCount(cmdPrefixObj);
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 4a61d60..64935e6 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -281,7 +281,7 @@ HandleBgErrors(
 		Tcl_DecrRefCount(keyPtr);
 
 		Tcl_WriteChars(errChannel,
-			"error in background error handler:\n", -1);
+			"error in background error handler:\n", TCL_INDEX_NONE);
 		if (valuePtr) {
 		    Tcl_WriteObj(errChannel, valuePtr);
 		} else {
@@ -343,7 +343,7 @@ TclDefaultBgErrorHandlerObjCmd(
     Tcl_DecrRefCount(keyPtr);
     if (result != TCL_OK || valuePtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"missing return option \"-level\"", -1));
+		"missing return option \"-level\"", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 	return TCL_ERROR;
     }
@@ -356,7 +356,7 @@ TclDefaultBgErrorHandlerObjCmd(
     Tcl_DecrRefCount(keyPtr);
     if (result != TCL_OK || valuePtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"missing return option \"-code\"", -1));
+		"missing return option \"-code\"", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 	return TCL_ERROR;
     }
@@ -474,17 +474,17 @@ TclDefaultBgErrorHandlerObjCmd(
 		    Tcl_RestoreInterpState(interp, saved);
 		    Tcl_WriteObj(errChannel, Tcl_GetVar2Ex(interp,
 			    "errorInfo", NULL, TCL_GLOBAL_ONLY));
-		    Tcl_WriteChars(errChannel, "\n", -1);
+		    Tcl_WriteChars(errChannel, "\n", TCL_INDEX_NONE);
 		} else {
 		    Tcl_DiscardInterpState(saved);
 		    Tcl_WriteChars(errChannel,
-			    "bgerror failed to handle background error.\n",-1);
-		    Tcl_WriteChars(errChannel, "    Original error: ", -1);
+			    "bgerror failed to handle background error.\n", TCL_INDEX_NONE);
+		    Tcl_WriteChars(errChannel, "    Original error: ", TCL_INDEX_NONE);
 		    Tcl_WriteObj(errChannel, tempObjv[1]);
-		    Tcl_WriteChars(errChannel, "\n", -1);
-		    Tcl_WriteChars(errChannel, "    Error in bgerror: ", -1);
+		    Tcl_WriteChars(errChannel, "\n", TCL_INDEX_NONE);
+		    Tcl_WriteChars(errChannel, "    Error in bgerror: ", TCL_INDEX_NONE);
 		    Tcl_WriteObj(errChannel, resultPtr);
-		    Tcl_WriteChars(errChannel, "\n", -1);
+		    Tcl_WriteChars(errChannel, "\n", TCL_INDEX_NONE);
 		}
 		Tcl_DecrRefCount(resultPtr);
 		Tcl_Flush(errChannel);
@@ -1572,7 +1572,7 @@ Tcl_VwaitObjCmd(
 	    if (timeout < 0) {
 		Tcl_ResetResult(interp);
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"timeout must be positive", -1));
+			"timeout must be positive", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "EVENT", "NEGTIME", NULL);
 		result = TCL_ERROR;
 		goto done;
@@ -1652,7 +1652,7 @@ Tcl_VwaitObjCmd(
     if ((mask & (TCL_FILE_EVENTS | TCL_IDLE_EVENTS |
 		 TCL_TIMER_EVENTS | TCL_WINDOW_EVENTS)) == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"can't wait: would block forever", -1));
+		"can't wait: would block forever", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "EVENT", "NO_SOURCES", NULL);
 	result = TCL_ERROR;
 	goto done;
@@ -1660,7 +1660,7 @@ Tcl_VwaitObjCmd(
 
     if ((timeout > 0) && ((mask & TCL_TIMER_EVENTS) == 0)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"timer events disabled with timeout specified", -1));
+		"timer events disabled with timeout specified", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "EVENT", "NO_TIME", NULL);
 	result = TCL_ERROR;
 	goto done;
@@ -1688,7 +1688,7 @@ Tcl_VwaitObjCmd(
 	for (i = 0; i < numItems; i++) {
 	    if (vwaitItems[i].mask) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"file events disabled with channel(s) specified", -1));
+			"file events disabled with channel(s) specified", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "EVENT", "NO_FILE_EVENT", NULL);
 		result = TCL_ERROR;
 		goto done;
@@ -1727,7 +1727,7 @@ Tcl_VwaitObjCmd(
 	}
 	if (Tcl_LimitExceeded(interp)) {
 	    Tcl_ResetResult(interp);
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "EVENT", "LIMIT", NULL);
 	    break;
 	}
@@ -1975,7 +1975,7 @@ Tcl_UpdateObjCmd(
 	}
 	if (Tcl_LimitExceeded(interp)) {
 	    Tcl_ResetResult(interp);
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("limit exceeded", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
     }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 81ce1a7..97122b9 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2377,7 +2377,7 @@ TEBCresume(
 	if (!corPtr) {
 	    TRACE_APPEND(("ERROR: yield outside coroutine\n"));
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "yield can only be called in a coroutine", -1));
+		    "yield can only be called in a coroutine", TCL_INDEX_NONE));
 	    DECACHE_STACK_INFO();
 	    Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD",
 		    NULL);
@@ -2408,7 +2408,7 @@ TEBCresume(
 	    TRACE(("[%.30s] => ERROR: yield outside coroutine\n",
 		    O2S(valuePtr)));
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "yieldto can only be called in a coroutine", -1));
+		    "yieldto can only be called in a coroutine", TCL_INDEX_NONE));
 	    DECACHE_STACK_INFO();
 	    Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "ILLEGAL_YIELD",
 		    NULL);
@@ -2419,7 +2419,7 @@ TEBCresume(
 	    TRACE(("[%.30s] => ERROR: yield in deleted\n",
 		    O2S(valuePtr)));
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "yieldto called in deleted namespace", -1));
+		    "yieldto called in deleted namespace", TCL_INDEX_NONE));
 	    DECACHE_STACK_INFO();
 	    Tcl_SetErrorCode(interp, "TCL", "COROUTINE", "YIELDTO_IN_DELETED",
 		    NULL);
@@ -2482,7 +2482,7 @@ TEBCresume(
 	if (!(iPtr->varFramePtr->isProcCallFrame & 1)) {
 	    TRACE(("%d => ERROR: tailcall in non-proc context\n", opnd));
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "tailcall can only be called from a proc or lambda", -1));
+		    "tailcall can only be called from a proc or lambda", TCL_INDEX_NONE));
 	    DECACHE_STACK_INFO();
 	    Tcl_SetErrorCode(interp, "TCL", "TAILCALL", "ILLEGAL", NULL);
 	    CACHE_STACK_INFO();
@@ -2511,7 +2511,7 @@ TEBCresume(
 	 */
 
 	listPtr = Tcl_NewListObj(opnd, &OBJ_AT_DEPTH(opnd-1));
-	nsObjPtr = Tcl_NewStringObj(iPtr->varFramePtr->nsPtr->fullName, -1);
+	nsObjPtr = Tcl_NewStringObj(iPtr->varFramePtr->nsPtr->fullName, TCL_INDEX_NONE);
 	TclListObjSetElement(interp, listPtr, 0, nsObjPtr);
 	if (iPtr->varFramePtr->tailcallPtr) {
 	    Tcl_DecrRefCount(iPtr->varFramePtr->tailcallPtr);
@@ -5150,7 +5150,7 @@ TEBCresume(
 	{
 	    int checkEq = ((*pc == INST_EQ) || (*pc == INST_NEQ)
 		    || (*pc == INST_STR_EQ) || (*pc == INST_STR_NEQ));
-	    match = TclStringCmp(valuePtr, value2Ptr, checkEq, 0, -1);
+	    match = TclStringCmp(valuePtr, value2Ptr, checkEq, 0, TCL_INDEX_NONE);
 	}
 
 	/*
@@ -5844,7 +5844,7 @@ TEBCresume(
 	    case INST_RSHIFT:
 		if (w2 < 0) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "negative shift argument", -1));
+			    "negative shift argument", TCL_INDEX_NONE));
 #ifdef ERROR_CODE_FOR_EARLY_DETECTED_ARITH_ERROR
 		    DECACHE_STACK_INFO();
 		    Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
@@ -5893,7 +5893,7 @@ TEBCresume(
 	    case INST_LSHIFT:
 		if (w2 < 0) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "negative shift argument", -1));
+			    "negative shift argument", TCL_INDEX_NONE));
 #ifdef ERROR_CODE_FOR_EARLY_DETECTED_ARITH_ERROR
 		    DECACHE_STACK_INFO();
 		    Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
@@ -5916,7 +5916,7 @@ TEBCresume(
 		     */
 
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "integer value too large to represent", -1));
+			    "integer value too large to represent", TCL_INDEX_NONE));
 #ifdef ERROR_CODE_FOR_EARLY_DETECTED_ARITH_ERROR
 		    DECACHE_STACK_INFO();
 		    Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW",
@@ -7422,14 +7422,14 @@ TEBCresume(
 	 */
 
     divideByZero:
-	Tcl_SetObjResult(interp, Tcl_NewStringObj("divide by zero", -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("divide by zero", TCL_INDEX_NONE));
 	DECACHE_STACK_INFO();
 	Tcl_SetErrorCode(interp, "ARITH", "DIVZERO", "divide by zero", NULL);
 	CACHE_STACK_INFO();
 	goto gotError;
 
     outOfMemory:
-	Tcl_SetObjResult(interp, Tcl_NewStringObj("out of memory", -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("out of memory", TCL_INDEX_NONE));
 	DECACHE_STACK_INFO();
 	Tcl_SetErrorCode(interp, "ARITH", "OUTOFMEMORY", "out of memory", NULL);
 	CACHE_STACK_INFO();
@@ -7442,7 +7442,7 @@ TEBCresume(
 
     exponOfZero:
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"exponentiation of zero by negative power", -1));
+		"exponentiation of zero by negative power", TCL_INDEX_NONE));
 	DECACHE_STACK_INFO();
 	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN",
 		"exponentiation of zero by negative power", NULL);
@@ -8003,7 +8003,7 @@ ExecuteExtendedBinaryMathOp(
 	}
 	if (invalid) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "negative shift argument", -1));
+		    "negative shift argument", TCL_INDEX_NONE));
 	    return GENERAL_ARITHMETIC_ERROR;
 	}
 
@@ -8034,7 +8034,7 @@ ExecuteExtendedBinaryMathOp(
 		 */
 
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"integer value too large to represent", -1));
+			"integer value too large to represent", TCL_INDEX_NONE));
 		return GENERAL_ARITHMETIC_ERROR;
 	    }
 	    shift = (int)(*((const Tcl_WideInt *)ptr2));
@@ -8282,7 +8282,7 @@ ExecuteExtendedBinaryMathOp(
 
 	if (type2 != TCL_NUMBER_INT) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "exponent too large", -1));
+		    "exponent too large", TCL_INDEX_NONE));
 	    return GENERAL_ARITHMETIC_ERROR;
 	}
 
@@ -8362,7 +8362,7 @@ ExecuteExtendedBinaryMathOp(
 		|| (value2Ptr->typePtr != &tclIntType.objType)
 		|| (Tcl_WideUInt)w2 >= (1<<28)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "exponent too large", -1));
+		    "exponent too large", TCL_INDEX_NONE));
 	    return GENERAL_ARITHMETIC_ERROR;
 	}
 	Tcl_TakeBignumFromObj(NULL, valuePtr, &big1);
@@ -9369,16 +9369,16 @@ TclExprFloatError(
 
     if ((errno == EDOM) || isnan(value)) {
 	s = "domain error: argument not in valid range";
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", s, NULL);
     } else if ((errno == ERANGE) || isinf(value)) {
 	if (value == 0.0) {
 	    s = "floating-point value too small to represent";
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", s, NULL);
 	} else {
 	    s = "floating-point value too large to represent";
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", s, NULL);
 	}
     } else {
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 168355a..2581d37 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -537,7 +537,7 @@ Tcl_SplitPath(
      * Perform the splitting, using objectified, vfs-aware code.
      */
 
-    tmpPtr = Tcl_NewStringObj(path, -1);
+    tmpPtr = Tcl_NewStringObj(path, TCL_INDEX_NONE);
     Tcl_IncrRefCount(tmpPtr);
     resultPtr = Tcl_FSSplitPath(tmpPtr, argcPtr);
     Tcl_IncrRefCount(resultPtr);
@@ -943,7 +943,7 @@ Tcl_JoinPath(
     TclNewObj(listObj);
     for (i = 0; i < argc; i++) {
 	Tcl_ListObjAppendElement(NULL, listObj,
-		Tcl_NewStringObj(argv[i], -1));
+		Tcl_NewStringObj(argv[i], TCL_INDEX_NONE));
     }
 
     /*
@@ -1003,7 +1003,7 @@ Tcl_TranslateFileName(
     Tcl_DString *bufferPtr)	/* Uninitialized or free DString filled with
 				 * name. */
 {
-    Tcl_Obj *path = Tcl_NewStringObj(name, -1);
+    Tcl_Obj *path = Tcl_NewStringObj(name, TCL_INDEX_NONE);
     Tcl_Obj *transPtr;
 
     Tcl_IncrRefCount(path);
@@ -1171,7 +1171,7 @@ Tcl_GlobObjCmd(
 	case GLOB_DIR:				/* -dir */
 	    if (i == (objc-1)) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing argument to \"-directory\"", -1));
+			"missing argument to \"-directory\"", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 		return TCL_ERROR;
 	    }
@@ -1199,7 +1199,7 @@ Tcl_GlobObjCmd(
 	case GLOB_PATH:				/* -path */
 	    if (i == (objc-1)) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing argument to \"-path\"", -1));
+			"missing argument to \"-path\"", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 		return TCL_ERROR;
 	    }
@@ -1220,7 +1220,7 @@ Tcl_GlobObjCmd(
 	case GLOB_TYPE:				/* -types */
 	    if (i == (objc-1)) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing argument to \"-types\"", -1));
+			"missing argument to \"-types\"", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
 		return TCL_ERROR;
 	    }
@@ -1240,7 +1240,7 @@ Tcl_GlobObjCmd(
     if ((globFlags & TCL_GLOBMODE_TAILS) && (pathOrDir == NULL)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"\"-tails\" must be used with either "
-		"\"-directory\" or \"-path\"", -1));
+		"\"-directory\" or \"-path\"", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
 		"BADOPTIONCOMBINATION", NULL);
 	return TCL_ERROR;
@@ -1291,7 +1291,7 @@ Tcl_GlobObjCmd(
 		 * in TclGlob requires a non-NULL pathOrDir.
 		 */
 
-		Tcl_DStringAppend(&pref, first, -1);
+		Tcl_DStringAppend(&pref, first, TCL_INDEX_NONE);
 		globFlags &= ~TCL_GLOBMODE_TAILS;
 		pathOrDir = NULL;
 	    } else {
@@ -1330,7 +1330,7 @@ Tcl_GlobObjCmd(
 		}
 	    }
 	    if (*search != '\0') {
-		Tcl_DStringAppend(&prefix, search, -1);
+		Tcl_DStringAppend(&prefix, search, TCL_INDEX_NONE);
 	    }
 	    Tcl_DStringFree(&pref);
 	}
@@ -1460,7 +1460,7 @@ Tcl_GlobObjCmd(
 	    badMacTypesArg:
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"only one MacOS type or creator argument"
-			" to \"-types\" allowed", -1));
+			" to \"-types\" allowed", TCL_INDEX_NONE));
 		result = TCL_ERROR;
 		Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "BAD", NULL);
 		join = 0;
@@ -1642,7 +1642,7 @@ TclGlob(
 		|| (tail[0] == '\\' && tail[1] == '\\'))) {
 	    size_t driveNameLen;
 	    Tcl_Obj *driveName;
-	    Tcl_Obj *temp = Tcl_NewStringObj(tail, -1);
+	    Tcl_Obj *temp = Tcl_NewStringObj(tail, TCL_INDEX_NONE);
 	    Tcl_IncrRefCount(temp);
 
 	    switch (TclGetPathType(temp, NULL, &driveNameLen, &driveName)) {
@@ -2033,14 +2033,14 @@ DoGlob(
 		break;
 	    }
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "unmatched open-brace in file name", -1));
+		    "unmatched open-brace in file name", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
 		    NULL);
 	    return TCL_ERROR;
 
 	} else if (*p == '}') {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "unmatched close-brace in file name", -1));
+		    "unmatched close-brace in file name", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB", "BALANCE",
 		    NULL);
 	    return TCL_ERROR;
@@ -2072,7 +2072,7 @@ DoGlob(
 	    SkipToChar(&p, ',');
 	    Tcl_DStringSetLength(&newName, baseLength);
 	    Tcl_DStringAppend(&newName, element, p-element);
-	    Tcl_DStringAppend(&newName, closeBrace+1, -1);
+	    Tcl_DStringAppend(&newName, closeBrace+1, TCL_INDEX_NONE);
 	    result = DoGlob(interp, matchesObj, separators, pathPtr, flags,
 		    Tcl_DStringValue(&newName), types);
 	    if (result != TCL_OK) {
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index 868791a..532adbd 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -19,25 +19,25 @@
  * the transformation.
  */
 
-static int		TransformBlockModeProc(ClientData instanceData,
+static int		TransformBlockModeProc(void *instanceData,
 			    int mode);
-static int		TransformCloseProc(ClientData instanceData,
+static int		TransformCloseProc(void *instanceData,
 			    Tcl_Interp *interp, int flags);
-static int		TransformInputProc(ClientData instanceData, char *buf,
+static int		TransformInputProc(void *instanceData, char *buf,
 			    int toRead, int *errorCodePtr);
-static int		TransformOutputProc(ClientData instanceData,
+static int		TransformOutputProc(void *instanceData,
 			    const char *buf, int toWrite, int *errorCodePtr);
-static int		TransformSetOptionProc(ClientData instanceData,
+static int		TransformSetOptionProc(void *instanceData,
 			    Tcl_Interp *interp, const char *optionName,
 			    const char *value);
-static int		TransformGetOptionProc(ClientData instanceData,
+static int		TransformGetOptionProc(void *instanceData,
 			    Tcl_Interp *interp, const char *optionName,
 			    Tcl_DString *dsPtr);
-static void		TransformWatchProc(ClientData instanceData, int mask);
-static int		TransformGetFileHandleProc(ClientData instanceData,
-			    int direction, ClientData *handlePtr);
-static int		TransformNotifyProc(ClientData instanceData, int mask);
-static long long	TransformWideSeekProc(ClientData instanceData,
+static void		TransformWatchProc(void *instanceData, int mask);
+static int		TransformGetFileHandleProc(void *instanceData,
+			    int direction, void **handlePtr);
+static int		TransformNotifyProc(void *instanceData, int mask);
+static long long	TransformWideSeekProc(void *instanceData,
 			    long long offset, int mode, int *errorCodePtr);
 
 /*
@@ -45,7 +45,7 @@ static long long	TransformWideSeekProc(ClientData instanceData,
  * handling and generating fileeevents.
  */
 
-static void		TransformChannelHandlerTimer(ClientData clientData);
+static void		TransformChannelHandlerTimer(void *clientData);
 
 /*
  * Forward declarations of internal procedures. Third, helper procedures
@@ -268,7 +268,7 @@ TclChannelTransform(
 
     if (TCL_OK != TclListObjLengthM(interp, cmdObjPtr, &objc)) {
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("-command value is not a list", -1));
+		Tcl_NewStringObj("-command value is not a list", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
 
@@ -397,7 +397,7 @@ ExecuteCallback(
     }
 
     Tcl_IncrRefCount(command);
-    Tcl_ListObjAppendElement(NULL, command, Tcl_NewStringObj((char *) op, -1));
+    Tcl_ListObjAppendElement(NULL, command, Tcl_NewStringObj((char *) op, TCL_INDEX_NONE));
 
     /*
      * Use a byte-array to prevent the misinterpretation of binary data coming
@@ -510,7 +510,7 @@ ExecuteCallback(
 
 static int
 TransformBlockModeProc(
-    ClientData instanceData,	/* State of transformation. */
+    void *instanceData,	/* State of transformation. */
     int mode)			/* New blocking mode. */
 {
     TransformChannelData *dataPtr = (TransformChannelData *)instanceData;
@@ -542,7 +542,7 @@ TransformBlockModeProc(
 
 static int
 TransformCloseProc(
-    ClientData instanceData,
+    void *instanceData,
     Tcl_Interp *interp,
 	int flags)
 {
@@ -626,7 +626,7 @@ TransformCloseProc(
 
 static int
 TransformInputProc(
-    ClientData instanceData,
+    void *instanceData,
     char *buf,
     int toRead,
     int *errorCodePtr)
@@ -793,7 +793,7 @@ TransformInputProc(
 
 static int
 TransformOutputProc(
-    ClientData instanceData,
+    void *instanceData,
     const char *buf,
     int toWrite,
     int *errorCodePtr)
@@ -845,7 +845,7 @@ TransformOutputProc(
 
 static long long
 TransformWideSeekProc(
-    ClientData instanceData,	/* The channel to manipulate. */
+    void *instanceData,	/* The channel to manipulate. */
     long long offset,		/* Size of movement. */
     int mode,			/* How to move. */
     int *errorCodePtr)		/* Location of error flag. */
@@ -923,7 +923,7 @@ TransformWideSeekProc(
 
 static int
 TransformSetOptionProc(
-    ClientData instanceData,
+    void *instanceData,
     Tcl_Interp *interp,
     const char *optionName,
     const char *value)
@@ -961,7 +961,7 @@ TransformSetOptionProc(
 
 static int
 TransformGetOptionProc(
-    ClientData instanceData,
+    void *instanceData,
     Tcl_Interp *interp,
     const char *optionName,
     Tcl_DString *dsPtr)
@@ -1008,7 +1008,7 @@ TransformGetOptionProc(
 
 static void
 TransformWatchProc(
-    ClientData instanceData,	/* Channel to watch. */
+    void *instanceData,	/* Channel to watch. */
     int mask)			/* Events of interest. */
 {
     TransformChannelData *dataPtr = (TransformChannelData *)instanceData;
@@ -1086,9 +1086,9 @@ TransformWatchProc(
 
 static int
 TransformGetFileHandleProc(
-    ClientData instanceData,	/* Channel to query. */
+    void *instanceData,	/* Channel to query. */
     int direction,		/* Direction of interest. */
-    ClientData *handlePtr)	/* Place to store the handle into. */
+    void **handlePtr)	/* Place to store the handle into. */
 {
     TransformChannelData *dataPtr = (TransformChannelData *)instanceData;
 
@@ -1120,7 +1120,7 @@ TransformGetFileHandleProc(
 
 static int
 TransformNotifyProc(
-    ClientData clientData,	/* The state of the notified
+    void *clientData,	/* The state of the notified
 				 * transformation. */
     int mask)			/* The mask of occuring events. */
 {
@@ -1165,7 +1165,7 @@ TransformNotifyProc(
 
 static void
 TransformChannelHandlerTimer(
-    ClientData clientData)	/* Transformation to query. */
+    void *clientData)	/* Transformation to query. */
 {
     TransformChannelData *dataPtr = (TransformChannelData *)clientData;
 
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index f14c5c1..a925c3d 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -317,7 +317,7 @@ Tcl_OpenTcpServer(
     int port,
     const char *host,
     Tcl_TcpAcceptProc *acceptProc,
-    ClientData callbackData)
+    void *callbackData)
 {
     char portbuf[TCL_INTEGER_SPACE];
 
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 470977e..436d364 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1756,7 +1756,7 @@ Tcl_FSEvalFileEx(
      * Otherwise, replace them. [Bug 3466099]
      */
 
-    if (Tcl_ReadChars(chan, objPtr, -1,
+    if (Tcl_ReadChars(chan, objPtr, TCL_INDEX_NONE,
 	    memcmp(string, "\xEF\xBB\xBF", 3)) == TCL_IO_FAILURE) {
 	Tcl_CloseEx(interp, chan, 0);
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -1893,7 +1893,7 @@ TclNREvalFile(
      * Otherwise, replace them. [Bug 3466099]
      */
 
-    if (Tcl_ReadChars(chan, objPtr, -1,
+    if (Tcl_ReadChars(chan, objPtr, TCL_INDEX_NONE,
 	    memcmp(string, "\xEF\xBB\xBF", 3)) == TCL_IO_FAILURE) {
 	Tcl_CloseEx(interp, chan, 0);
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -2459,7 +2459,7 @@ TclFSFileAttrIndex(
 	 * It's a constant attribute table, so use T_GIFO.
 	 */
 
-	Tcl_Obj *tmpObj = Tcl_NewStringObj(attributeName, -1);
+	Tcl_Obj *tmpObj = Tcl_NewStringObj(attributeName, TCL_INDEX_NONE);
 	int result;
 
 	result = Tcl_GetIndexFromObj(NULL, tmpObj, attrTable, NULL, TCL_EXACT,
@@ -3292,7 +3292,7 @@ Tcl_LoadFile(
 	Tcl_DecrRefCount(copyToPtr);
 	if (interp) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "couldn't load from current filesystem", -1));
+		    "couldn't load from current filesystem", TCL_INDEX_NONE));
 	}
 	return TCL_ERROR;
     }
@@ -4612,7 +4612,7 @@ Tcl_FSFileSystemInfo(
 
     resPtr = Tcl_NewListObj(0, NULL);
     Tcl_ListObjAppendElement(NULL, resPtr,
-	    Tcl_NewStringObj(fsPtr->typeName, -1));
+	    Tcl_NewStringObj(fsPtr->typeName, TCL_INDEX_NONE));
 
     if (fsPtr->filesystemPathTypeProc != NULL) {
 	Tcl_Obj *typePtr = fsPtr->filesystemPathTypeProc(pathPtr);
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 58bcc04..66d7f30 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -533,7 +533,7 @@ PrefixMatchObjCmd(
 	case PRFMATCH_MESSAGE:
 	    if (i > objc-4) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing value for -message", -1));
+			"missing value for -message", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NOARG", NULL);
 		return TCL_ERROR;
 	    }
@@ -543,7 +543,7 @@ PrefixMatchObjCmd(
 	case PRFMATCH_ERROR:
 	    if (i > objc-4) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing value for -error", -1));
+			"missing value for -error", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NOARG", NULL);
 		return TCL_ERROR;
 	    }
@@ -819,9 +819,9 @@ Tcl_WrongNumArgs(
     if (iPtr->flags & INTERP_ALTERNATE_WRONG_ARGS) {
 	iPtr->flags &= ~INTERP_ALTERNATE_WRONG_ARGS;
 	Tcl_AppendObjToObj(objPtr, Tcl_GetObjResult(interp));
-	Tcl_AppendToObj(objPtr, " or \"", -1);
+	Tcl_AppendToObj(objPtr, " or \"", TCL_INDEX_NONE);
     } else {
-	Tcl_AppendToObj(objPtr, "wrong # args: should be \"", -1);
+	Tcl_AppendToObj(objPtr, "wrong # args: should be \"", TCL_INDEX_NONE);
     }
 
     /*
@@ -1289,7 +1289,7 @@ PrintUsage(
      * Now add the option information, with pretty-printing.
      */
 
-    msg = Tcl_NewStringObj("Command-specific options:", -1);
+    msg = Tcl_NewStringObj("Command-specific options:", TCL_INDEX_NONE);
     for (infoPtr = argTable; infoPtr->type != TCL_ARGV_END; infoPtr++) {
 	if ((infoPtr->type == TCL_ARGV_HELP) && (infoPtr->keyStr == NULL)) {
 	    Tcl_AppendPrintfToObj(msg, "\n%s", infoPtr->helpStr);
@@ -1305,7 +1305,7 @@ PrintUsage(
 	    }
 	    numSpaces -= NUM_SPACES;
 	}
-	Tcl_AppendToObj(msg, infoPtr->helpStr, -1);
+	Tcl_AppendToObj(msg, infoPtr->helpStr, TCL_INDEX_NONE);
 	switch (infoPtr->type) {
 	case TCL_ARGV_INT:
 	    Tcl_AppendPrintfToObj(msg, "\n\t\tDefault value: %d",
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 416f74e..ecc6e15 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -186,7 +186,7 @@ struct LimitHandler {
     int flags;			/* The state of this particular handler. */
     Tcl_LimitHandlerProc *handlerProc;
 				/* The handler callback. */
-    ClientData clientData;	/* Opaque argument to the handler callback. */
+    void *clientData;	/* Opaque argument to the handler callback. */
     Tcl_LimitHandlerDeleteProc *deleteProc;
 				/* How to delete the clientData. */
     LimitHandler *prevPtr;	/* Previous item in linked list of
@@ -265,12 +265,12 @@ static void		InheritLimitsFromParent(Tcl_Interp *childInterp,
 			    Tcl_Interp *parentInterp);
 static void		SetScriptLimitCallback(Tcl_Interp *interp, int type,
 			    Tcl_Interp *targetInterp, Tcl_Obj *scriptObj);
-static void		CallScriptLimitCallback(ClientData clientData,
+static void		CallScriptLimitCallback(void *clientData,
 			    Tcl_Interp *interp);
-static void		DeleteScriptLimitCallback(ClientData clientData);
+static void		DeleteScriptLimitCallback(void *clientData);
 static void		RunLimitHandlers(LimitHandler *handlerPtr,
 			    Tcl_Interp *interp);
-static void		TimeLimitCallback(ClientData clientData);
+static void		TimeLimitCallback(void *clientData);
 
 /* NRE enabling */
 static Tcl_NRPostProc	NRPostInvokeHidden;
@@ -339,7 +339,7 @@ Tcl_Init(
     pkgName.nextPtr = *names;
     *names = &pkgName;
     if (tclPreInitScript != NULL) {
-	if (Tcl_EvalEx(interp, tclPreInitScript, -1, 0) == TCL_ERROR) {
+	if (Tcl_EvalEx(interp, tclPreInitScript, TCL_INDEX_NONE, 0) == TCL_ERROR) {
 	    goto end;
 	}
     }
@@ -449,7 +449,7 @@ Tcl_Init(
 "    error $msg\n"
 "  }\n"
 "}\n"
-"tclInit", -1, 0);
+"tclInit", TCL_INDEX_NONE, 0);
 
 end:
     *names = (*names)->nextPtr;
@@ -601,7 +601,7 @@ InterpInfoDeleteProc(
 
 int
 Tcl_InterpObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,			/* Current interpreter. */
     int objc,				/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument objects. */
@@ -837,7 +837,7 @@ NRInterpCmd(
 		    break;
 		}
 	    }
-	    childPtr = Tcl_NewStringObj(buf, -1);
+	    childPtr = Tcl_NewStringObj(buf, TCL_INDEX_NONE);
 	}
 	if (ChildCreate(interp, childPtr, safe) == NULL) {
 	    if (buf[0] != '\0') {
@@ -872,7 +872,7 @@ NRInterpCmd(
 		return TCL_ERROR;
 	    } else if (childInterp == interp) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"cannot delete the current interpreter", -1));
+			"cannot delete the current interpreter", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			"DELETESELF", NULL);
 		return TCL_ERROR;
@@ -1053,7 +1053,7 @@ NRInterpCmd(
 	for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&hashSearch)) {
 	    string = (char *)Tcl_GetHashKey(&iiPtr->parent.childTable, hPtr);
 	    Tcl_ListObjAppendElement(NULL, resultPtr,
-		    Tcl_NewStringObj(string, -1));
+		    Tcl_NewStringObj(string, TCL_INDEX_NONE));
 	}
 	Tcl_SetObjResult(interp, resultPtr);
 	return TCL_OK;
@@ -1207,14 +1207,14 @@ Tcl_CreateAlias(
 
     objv = (Tcl_Obj **)TclStackAlloc(childInterp, sizeof(Tcl_Obj *) * argc);
     for (i = 0; i < argc; i++) {
-	objv[i] = Tcl_NewStringObj(argv[i], -1);
+	objv[i] = Tcl_NewStringObj(argv[i], TCL_INDEX_NONE);
 	Tcl_IncrRefCount(objv[i]);
     }
 
-    childObjPtr = Tcl_NewStringObj(childCmd, -1);
+    childObjPtr = Tcl_NewStringObj(childCmd, TCL_INDEX_NONE);
     Tcl_IncrRefCount(childObjPtr);
 
-    targetObjPtr = Tcl_NewStringObj(targetCmd, -1);
+    targetObjPtr = Tcl_NewStringObj(targetCmd, TCL_INDEX_NONE);
     Tcl_IncrRefCount(targetObjPtr);
 
     result = AliasCreate(childInterp, childInterp, targetInterp, childObjPtr,
@@ -1258,10 +1258,10 @@ Tcl_CreateAliasObj(
     Tcl_Obj *childObjPtr, *targetObjPtr;
     int result;
 
-    childObjPtr = Tcl_NewStringObj(childCmd, -1);
+    childObjPtr = Tcl_NewStringObj(childCmd, TCL_INDEX_NONE);
     Tcl_IncrRefCount(childObjPtr);
 
-    targetObjPtr = Tcl_NewStringObj(targetCmd, -1);
+    targetObjPtr = Tcl_NewStringObj(targetCmd, TCL_INDEX_NONE);
     Tcl_IncrRefCount(targetObjPtr);
 
     result = AliasCreate(childInterp, childInterp, targetInterp, childObjPtr,
@@ -1820,7 +1820,7 @@ AliasList(
 
 static int
 AliasNRCmd(
-    ClientData clientData,	/* Alias record. */
+    void *clientData,	/* Alias record. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument vector. */
@@ -1873,7 +1873,7 @@ AliasNRCmd(
 
 int
 TclAliasObjCmd(
-    ClientData clientData,	/* Alias record. */
+    void *clientData,	/* Alias record. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument vector. */
@@ -1964,7 +1964,7 @@ TclAliasObjCmd(
 
 int
 TclLocalAliasObjCmd(
-    ClientData clientData,	/* Alias record. */
+    void *clientData,	/* Alias record. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument vector. */
@@ -2049,7 +2049,7 @@ TclLocalAliasObjCmd(
 
 static void
 AliasObjCmdDeleteProc(
-    ClientData clientData)	/* The alias record for this alias. */
+    void *clientData)	/* The alias record for this alias. */
 {
     Alias *aliasPtr = (Alias *)clientData;
     Target *targetPtr;
@@ -2116,7 +2116,7 @@ Tcl_CreateChild(
     Tcl_Obj *pathPtr;
     Tcl_Interp *childInterp;
 
-    pathPtr = Tcl_NewStringObj(childPath, -1);
+    pathPtr = Tcl_NewStringObj(childPath, TCL_INDEX_NONE);
     childInterp = ChildCreate(interp, pathPtr, isSafe);
     Tcl_DecrRefCount(pathPtr);
 
@@ -2147,7 +2147,7 @@ Tcl_GetChild(
     Tcl_Obj *pathPtr;
     Tcl_Interp *childInterp;
 
-    pathPtr = Tcl_NewStringObj(childPath, -1);
+    pathPtr = Tcl_NewStringObj(childPath, TCL_INDEX_NONE);
     childInterp = GetInterp(interp, pathPtr);
     Tcl_DecrRefCount(pathPtr);
 
@@ -2293,7 +2293,7 @@ Tcl_GetInterpPath(
     }
     Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp),
 	    Tcl_NewStringObj((const char *)Tcl_GetHashKey(&iiPtr->parent.childTable,
-		    iiPtr->child.childEntryPtr), -1));
+		    iiPtr->child.childEntryPtr), TCL_INDEX_NONE));
     return TCL_OK;
 }
 
@@ -2386,7 +2386,7 @@ ChildBgerror(
 	if (TCL_ERROR == TclListObjLengthM(NULL, objv[0], &length)
 		|| (length < 1)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "cmdPrefix must be list of length >= 1", -1));
+		    "cmdPrefix must be list of length >= 1", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 		    "BGERRORFORMAT", NULL);
 	    return TCL_ERROR;
@@ -2552,7 +2552,7 @@ ChildCreate(
 
 int
 TclChildObjCmd(
-    ClientData clientData,	/* Child interpreter. */
+    void *clientData,	/* Child interpreter. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2562,7 +2562,7 @@ TclChildObjCmd(
 
 static int
 NRChildCmd(
-    ClientData clientData,	/* Child interpreter. */
+    void *clientData,	/* Child interpreter. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2766,7 +2766,7 @@ NRChildCmd(
 
 static void
 ChildObjCmdDeleteProc(
-    ClientData clientData)	/* The ChildRecord for the command. */
+    void *clientData)	/* The ChildRecord for the command. */
 {
     Child *childPtr;		/* Interim storage for Child record. */
     Tcl_Interp *childInterp = (Tcl_Interp *)clientData;
@@ -2831,7 +2831,7 @@ ChildDebugCmd(
     if (objc == 0) {
 	TclNewObj(resultPtr);
 	Tcl_ListObjAppendElement(NULL, resultPtr,
-		Tcl_NewStringObj("-frame", -1));
+		Tcl_NewStringObj("-frame", TCL_INDEX_NONE));
 	Tcl_ListObjAppendElement(NULL, resultPtr,
 		Tcl_NewBooleanObj(iPtr->flags & INTERP_DEBUG_FRAME));
 	Tcl_SetObjResult(interp, resultPtr);
@@ -3001,7 +3001,7 @@ ChildRecursionLimit(
     if (objc) {
 	if (Tcl_IsSafe(interp)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj("permission denied: "
-		    "safe interpreters cannot change recursion limit", -1));
+		    "safe interpreters cannot change recursion limit", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		    NULL);
 	    return TCL_ERROR;
@@ -3020,7 +3020,7 @@ ChildRecursionLimit(
 	iPtr = (Interp *) childInterp;
 	if (interp == childInterp && iPtr->numLevels > (size_t)limit) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "falling back due to new recursion limit", -1));
+		    "falling back due to new recursion limit", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "RECURSION", NULL);
 	    return TCL_ERROR;
 	}
@@ -3110,7 +3110,7 @@ ChildHidden(
 		hPtr != NULL;
 		hPtr = Tcl_NextHashEntry(&hSearch)) {
 	    Tcl_ListObjAppendElement(NULL, listObjPtr,
-		    Tcl_NewStringObj((const char *)Tcl_GetHashKey(hTblPtr, hPtr), -1));
+		    Tcl_NewStringObj((const char *)Tcl_GetHashKey(hTblPtr, hPtr), TCL_INDEX_NONE));
 	}
     }
     Tcl_SetObjResult(interp, listObjPtr);
@@ -3183,7 +3183,7 @@ ChildInvokeHidden(
 
 static int
 NRPostInvokeHidden(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -3299,7 +3299,7 @@ TclMakeSafe(
 	 */
 
 	(void) Tcl_EvalEx(interp,
-		"namespace eval ::tcl {namespace eval mathfunc {}}", -1, 0);
+		"namespace eval ::tcl {namespace eval mathfunc {}}", TCL_INDEX_NONE, 0);
     }
 
     iPtr->flags |= SAFE_INTERP;
@@ -3479,7 +3479,7 @@ Tcl_LimitCheck(
 	    iPtr->limit.exceeded &= ~TCL_LIMIT_COMMANDS;
 	} else if (iPtr->limit.exceeded & TCL_LIMIT_COMMANDS) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "command count limit exceeded", -1));
+		    "command count limit exceeded", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "LIMIT", "COMMANDS", NULL);
 	    Tcl_Release(interp);
 	    return TCL_ERROR;
@@ -3505,7 +3505,7 @@ Tcl_LimitCheck(
 		iPtr->limit.exceeded &= ~TCL_LIMIT_TIME;
 	    } else if (iPtr->limit.exceeded & TCL_LIMIT_TIME) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"time limit exceeded", -1));
+			"time limit exceeded", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "LIMIT", "TIME", NULL);
 		Tcl_Release(interp);
 		return TCL_ERROR;
@@ -3608,7 +3608,7 @@ Tcl_LimitAddHandler(
     Tcl_Interp *interp,
     int type,
     Tcl_LimitHandlerProc *handlerProc,
-    ClientData clientData,
+    void *clientData,
     Tcl_LimitHandlerDeleteProc *deleteProc)
 {
     Interp *iPtr = (Interp *) interp;
@@ -3682,7 +3682,7 @@ Tcl_LimitRemoveHandler(
     Tcl_Interp *interp,
     int type,
     Tcl_LimitHandlerProc *handlerProc,
-    ClientData clientData)
+    void *clientData)
 {
     Interp *iPtr = (Interp *) interp;
     LimitHandler *handlerPtr;
@@ -4081,7 +4081,7 @@ Tcl_LimitSetTime(
 
 static void
 TimeLimitCallback(
-    ClientData clientData)
+    void *clientData)
 {
     Tcl_Interp *interp = (Tcl_Interp *)clientData;
     Interp *iPtr = (Interp *)clientData;
@@ -4225,7 +4225,7 @@ Tcl_LimitGetGranularity(
 
 static void
 DeleteScriptLimitCallback(
-    ClientData clientData)
+    void *clientData)
 {
     ScriptLimitCallback *limitCBPtr = (ScriptLimitCallback *)clientData;
 
@@ -4256,7 +4256,7 @@ DeleteScriptLimitCallback(
 
 static void
 CallScriptLimitCallback(
-    ClientData clientData,
+    void *clientData,
     TCL_UNUSED(Tcl_Interp *))
 {
     ScriptLimitCallback *limitCBPtr = (ScriptLimitCallback *)clientData;
@@ -4508,7 +4508,7 @@ ChildCommandLimitCmd(
 
     if (interp == childInterp) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"limits on current interpreter inaccessible", -1));
+		"limits on current interpreter inaccessible", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", NULL);
 	return TCL_ERROR;
     }
@@ -4523,7 +4523,7 @@ ChildCommandLimitCmd(
 	if (hPtr != NULL) {
 	    limitCBPtr = (ScriptLimitCallback *)Tcl_GetHashValue(hPtr);
 	    if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
-		Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], -1),
+		Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], TCL_INDEX_NONE),
 			limitCBPtr->scriptObj);
 	    } else {
 		goto putEmptyCommandInDict;
@@ -4534,21 +4534,21 @@ ChildCommandLimitCmd(
 	putEmptyCommandInDict:
 	    TclNewObj(empty);
 	    Tcl_DictObjPut(NULL, dictPtr,
-		    Tcl_NewStringObj(options[0], -1), empty);
+		    Tcl_NewStringObj(options[0], TCL_INDEX_NONE), empty);
 	}
-	Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], -1),
+	Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(Tcl_LimitGetGranularity(childInterp,
 		TCL_LIMIT_COMMANDS)));
 
 	if (Tcl_LimitTypeEnabled(childInterp, TCL_LIMIT_COMMANDS)) {
-	    Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], -1),
+	    Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], TCL_INDEX_NONE),
 		    Tcl_NewWideIntObj(Tcl_LimitGetCommands(childInterp)));
 	} else {
 	    Tcl_Obj *empty;
 
 	    TclNewObj(empty);
 	    Tcl_DictObjPut(NULL, dictPtr,
-		    Tcl_NewStringObj(options[2], -1), empty);
+		    Tcl_NewStringObj(options[2], TCL_INDEX_NONE), empty);
 	}
 	Tcl_SetObjResult(interp, dictPtr);
 	return TCL_OK;
@@ -4607,7 +4607,7 @@ ChildCommandLimitCmd(
 		}
 		if (gran < 1) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "granularity must be at least 1", -1));
+			    "granularity must be at least 1", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			    "BADVALUE", NULL);
 		    return TCL_ERROR;
@@ -4624,7 +4624,7 @@ ChildCommandLimitCmd(
 		}
 		if (limit < 0) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "command limit value must be at least 0", -1));
+			    "command limit value must be at least 0", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			    "BADVALUE", NULL);
 		    return TCL_ERROR;
@@ -4696,7 +4696,7 @@ ChildTimeLimitCmd(
 
     if (interp == childInterp) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"limits on current interpreter inaccessible", -1));
+		"limits on current interpreter inaccessible", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "SELF", NULL);
 	return TCL_ERROR;
     }
@@ -4711,7 +4711,7 @@ ChildTimeLimitCmd(
 	if (hPtr != NULL) {
 	    limitCBPtr = (ScriptLimitCallback *)Tcl_GetHashValue(hPtr);
 	    if (limitCBPtr != NULL && limitCBPtr->scriptObj != NULL) {
-		Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], -1),
+		Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[0], TCL_INDEX_NONE),
 			limitCBPtr->scriptObj);
 	    } else {
 		goto putEmptyCommandInDict;
@@ -4721,9 +4721,9 @@ ChildTimeLimitCmd(
 	putEmptyCommandInDict:
 	    TclNewObj(empty);
 	    Tcl_DictObjPut(NULL, dictPtr,
-		    Tcl_NewStringObj(options[0], -1), empty);
+		    Tcl_NewStringObj(options[0], TCL_INDEX_NONE), empty);
 	}
-	Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], -1),
+	Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[1], TCL_INDEX_NONE),
 		Tcl_NewWideIntObj(Tcl_LimitGetGranularity(childInterp,
 		TCL_LIMIT_TIME)));
 
@@ -4731,18 +4731,18 @@ ChildTimeLimitCmd(
 	    Tcl_Time limitMoment;
 
 	    Tcl_LimitGetTime(childInterp, &limitMoment);
-	    Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], -1),
+	    Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[2], TCL_INDEX_NONE),
 		    Tcl_NewWideIntObj(limitMoment.usec/1000));
-	    Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[3], -1),
+	    Tcl_DictObjPut(NULL, dictPtr, Tcl_NewStringObj(options[3], TCL_INDEX_NONE),
 		    Tcl_NewWideIntObj(limitMoment.sec));
 	} else {
 	    Tcl_Obj *empty;
 
 	    TclNewObj(empty);
 	    Tcl_DictObjPut(NULL, dictPtr,
-		    Tcl_NewStringObj(options[2], -1), empty);
+		    Tcl_NewStringObj(options[2], TCL_INDEX_NONE), empty);
 	    Tcl_DictObjPut(NULL, dictPtr,
-		    Tcl_NewStringObj(options[3], -1), empty);
+		    Tcl_NewStringObj(options[3], TCL_INDEX_NONE), empty);
 	}
 	Tcl_SetObjResult(interp, dictPtr);
 	return TCL_OK;
@@ -4816,7 +4816,7 @@ ChildTimeLimitCmd(
 		}
 		if (gran < 1) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "granularity must be at least 1", -1));
+			    "granularity must be at least 1", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			    "BADVALUE", NULL);
 		    return TCL_ERROR;
@@ -4870,7 +4870,7 @@ ChildTimeLimitCmd(
 		if (secObj != NULL && secLen == 0 && milliLen > 0) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "may only set -milliseconds if -seconds is not "
-			    "also being reset", -1));
+			    "also being reset", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			    "BADUSAGE", NULL);
 		    return TCL_ERROR;
@@ -4878,7 +4878,7 @@ ChildTimeLimitCmd(
 		if (milliLen == 0 && (secObj == NULL || secLen > 0)) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "may only reset -milliseconds if -seconds is "
-			    "also being reset", -1));
+			    "also being reset", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP",
 			    "BADUSAGE", NULL);
 		    return TCL_ERROR;
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 65e2a77..924ffd5 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -71,26 +71,26 @@ typedef struct {
  * Declarations for functions local to this file:
  */
 
-static void		DeleteImportedCmd(ClientData clientData);
+static void		DeleteImportedCmd(void *clientData);
 static int		DoImport(Tcl_Interp *interp,
 			    Namespace *nsPtr, Tcl_HashEntry *hPtr,
 			    const char *cmdName, const char *pattern,
 			    Namespace *importNsPtr, int allowOverwrite);
 static void		DupNsNameInternalRep(Tcl_Obj *objPtr,Tcl_Obj *copyPtr);
-static char *		ErrorCodeRead(ClientData clientData,Tcl_Interp *interp,
+static char *		ErrorCodeRead(void *clientData,Tcl_Interp *interp,
 			    const char *name1, const char *name2, int flags);
-static char *		ErrorInfoRead(ClientData clientData,Tcl_Interp *interp,
+static char *		ErrorInfoRead(void *clientData,Tcl_Interp *interp,
 			    const char *name1, const char *name2, int flags);
-static char *		EstablishErrorCodeTraces(ClientData clientData,
+static char *		EstablishErrorCodeTraces(void *clientData,
 			    Tcl_Interp *interp, const char *name1,
 			    const char *name2, int flags);
-static char *		EstablishErrorInfoTraces(ClientData clientData,
+static char *		EstablishErrorInfoTraces(void *clientData,
 			    Tcl_Interp *interp, const char *name1,
 			    const char *name2, int flags);
 static void		FreeNsNameInternalRep(Tcl_Obj *objPtr);
 static int		GetNamespaceFromObj(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr);
-static int		InvokeImportedNRCmd(ClientData clientData,
+static int		InvokeImportedNRCmd(void *clientData,
 			    Tcl_Interp *interp,int objc,Tcl_Obj *const objv[]);
 static Tcl_ObjCmdProc	NamespaceChildrenCmd;
 static Tcl_ObjCmdProc	NamespaceCodeCmd;
@@ -653,7 +653,7 @@ Tcl_CreateNamespace(
     const char *name,		/* Name for the new namespace. May be a
 				 * qualified name with names of ancestor
 				 * namespaces separated by "::"s. */
-    ClientData clientData,	/* One-word value to store with namespace. */
+    void *clientData,	/* One-word value to store with namespace. */
     Tcl_NamespaceDeleteProc *deleteProc)
 				/* Function called to delete client data when
 				 * the namespace is deleted. NULL if no
@@ -698,7 +698,7 @@ Tcl_CreateNamespace(
     if (deleteProc != NULL) {
 	nameStr = name + strlen(name) - 2;
 	if (nameStr >= name && nameStr[1] == ':' && nameStr[0] == ':') {
-	    Tcl_DStringAppend(&tmpBuffer, name, -1);
+	    Tcl_DStringAppend(&tmpBuffer, name, TCL_INDEX_NONE);
 	    while ((nameLen = Tcl_DStringLength(&tmpBuffer)) > 0
 		    && Tcl_DStringValue(&tmpBuffer)[nameLen-1] == ':') {
 		Tcl_DStringSetLength(&tmpBuffer, nameLen-1);
@@ -715,7 +715,7 @@ Tcl_CreateNamespace(
 
     if (*name == '\0') {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj("can't create namespace"
-                " \"\": only global namespace can have empty name", -1));
+                " \"\": only global namespace can have empty name", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NAMESPACE",
 		"CREATEGLOBAL", NULL);
 	Tcl_DStringFree(&tmpBuffer);
@@ -833,7 +833,7 @@ Tcl_CreateNamespace(
 	    Tcl_DString *tempPtr = namePtr;
 
 	    TclDStringAppendLiteral(buffPtr, "::");
-	    Tcl_DStringAppend(buffPtr, ancestorPtr->name, -1);
+	    Tcl_DStringAppend(buffPtr, ancestorPtr->name, TCL_INDEX_NONE);
 	    TclDStringAppendDString(buffPtr, namePtr);
 
 	    /*
@@ -1542,7 +1542,7 @@ Tcl_AppendExportList(
 
     for (i = 0;  i < nsPtr->numExportPatterns;  i++) {
 	result = Tcl_ListObjAppendElement(interp, objPtr,
-		Tcl_NewStringObj(nsPtr->exportArrayPtr[i], -1));
+		Tcl_NewStringObj(nsPtr->exportArrayPtr[i], TCL_INDEX_NONE));
 	if (result != TCL_OK) {
 	    return result;
 	}
@@ -1621,7 +1621,7 @@ Tcl_Import(
 	int result;
 
 	TclNewLiteralStringObj(objv[0], "auto_import");
-	objv[1] = Tcl_NewStringObj(pattern, -1);
+	objv[1] = Tcl_NewStringObj(pattern, TCL_INDEX_NONE);
 
 	Tcl_IncrRefCount(objv[0]);
 	Tcl_IncrRefCount(objv[1]);
@@ -1762,11 +1762,11 @@ DoImport(
 	ImportRef *refPtr;
 
 	Tcl_DStringInit(&ds);
-	Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
+	Tcl_DStringAppend(&ds, nsPtr->fullName, TCL_INDEX_NONE);
 	if (nsPtr != ((Interp *) interp)->globalNsPtr) {
 	    TclDStringAppendLiteral(&ds, "::");
 	}
-	Tcl_DStringAppend(&ds, cmdName, -1);
+	Tcl_DStringAppend(&ds, cmdName, TCL_INDEX_NONE);
 
 	/*
 	 * Check whether creating the new imported command in the current
@@ -2036,7 +2036,7 @@ TclGetOriginalCommand(
 
 static int
 InvokeImportedNRCmd(
-    ClientData clientData,	/* Points to the imported command's
+    void *clientData,	/* Points to the imported command's
 				 * ImportedCmdData structure. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2051,7 +2051,7 @@ InvokeImportedNRCmd(
 
 int
 TclInvokeImportedCmd(
-    ClientData clientData,	/* Points to the imported command's
+    void *clientData,	/* Points to the imported command's
 				 * ImportedCmdData structure. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2084,7 +2084,7 @@ TclInvokeImportedCmd(
 
 static void
 DeleteImportedCmd(
-    ClientData clientData)	/* Points to the imported command's
+    void *clientData)	/* Points to the imported command's
 				 * ImportedCmdData structure. */
 {
     ImportedCmdData *dataPtr = (ImportedCmdData *)clientData;
@@ -3049,11 +3049,11 @@ NamespaceChildrenCmd(
 	if ((*name == ':') && (*(name+1) == ':')) {
 	    pattern = name;
 	} else {
-	    Tcl_DStringAppend(&buffer, nsPtr->fullName, -1);
+	    Tcl_DStringAppend(&buffer, nsPtr->fullName, TCL_INDEX_NONE);
 	    if (nsPtr != globalNsPtr) {
 		TclDStringAppendLiteral(&buffer, "::");
 	    }
-	    Tcl_DStringAppend(&buffer, name, -1);
+	    Tcl_DStringAppend(&buffer, name, TCL_INDEX_NONE);
 	    pattern = Tcl_DStringValue(&buffer);
 	}
     }
@@ -3079,7 +3079,7 @@ NamespaceChildrenCmd(
 #endif
 	) {
 	    Tcl_ListObjAppendElement(interp, listPtr,
-		    Tcl_NewStringObj(pattern, -1));
+		    Tcl_NewStringObj(pattern, TCL_INDEX_NONE));
 	}
 	goto searchDone;
     }
@@ -3095,7 +3095,7 @@ NamespaceChildrenCmd(
 	childNsPtr = (Namespace *)Tcl_GetHashValue(entryPtr);
 	if ((pattern == NULL)
 		|| Tcl_StringMatch(childNsPtr->fullName, pattern)) {
-	    elemPtr = Tcl_NewStringObj(childNsPtr->fullName, -1);
+	    elemPtr = Tcl_NewStringObj(childNsPtr->fullName, TCL_INDEX_NONE);
 	    Tcl_ListObjAppendElement(interp, listPtr, elemPtr);
 	}
 	entryPtr = Tcl_NextHashEntry(&search);
@@ -3185,7 +3185,7 @@ NamespaceCodeCmd(
     if (currNsPtr == (Namespace *) TclGetGlobalNamespace(interp)) {
 	TclNewLiteralStringObj(objPtr, "::");
     } else {
-	objPtr = Tcl_NewStringObj(currNsPtr->fullName, -1);
+	objPtr = Tcl_NewStringObj(currNsPtr->fullName, TCL_INDEX_NONE);
     }
     Tcl_ListObjAppendElement(interp, listPtr, objPtr);
 
@@ -3243,7 +3243,7 @@ NamespaceCurrentCmd(
     if (currNsPtr == (Namespace *) TclGetGlobalNamespace(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj("::", 2));
     } else {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(currNsPtr->fullName, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(currNsPtr->fullName, TCL_INDEX_NONE));
     }
     return TCL_OK;
 }
@@ -3358,7 +3358,7 @@ NamespaceDeleteCmd(
 
 static int
 NamespaceEvalCmd(
-    ClientData clientData,	/* Arbitrary value passed to cmd. */
+    void *clientData,	/* Arbitrary value passed to cmd. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3451,7 +3451,7 @@ NRNamespaceEvalCmd(
 
 static int
 NsEval_Callback(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -3807,7 +3807,7 @@ NamespaceImportCmd(
 
 static int
 NamespaceInscopeCmd(
-    ClientData clientData,	/* Arbitrary value passed to cmd. */
+    void *clientData,	/* Arbitrary value passed to cmd. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -3999,7 +3999,7 @@ NamespaceParentCmd(
 
     if (nsPtr->parentPtr != NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		nsPtr->parentPtr->fullName, -1));
+		nsPtr->parentPtr->fullName, TCL_INDEX_NONE));
     }
     return TCL_OK;
 }
@@ -4060,7 +4060,7 @@ NamespacePathCmd(
 	for (i=0 ; i<nsPtr->commandPathLength ; i++) {
 	    if (nsPtr->commandPathArray[i].nsPtr != NULL) {
 		Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-			nsPtr->commandPathArray[i].nsPtr->fullName, -1));
+			nsPtr->commandPathArray[i].nsPtr->fullName, TCL_INDEX_NONE));
 	    }
 	}
 	Tcl_SetObjResult(interp, resultObj);
@@ -4544,7 +4544,7 @@ NamespaceTailCmd(
     }
 
     if (p >= name) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(p, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(p, TCL_INDEX_NONE));
     }
     return TCL_OK;
 }
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 0d9c7da..bee06e2 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -67,9 +67,9 @@ static int		CloneClassMethod(Tcl_Interp *interp, Class *clsPtr,
 			    Method **newMPtrPtr);
 static int		CloneObjectMethod(Tcl_Interp *interp, Object *oPtr,
 			    Method *mPtr, Tcl_Obj *namePtr);
-static void		DeletedDefineNamespace(ClientData clientData);
-static void		DeletedObjdefNamespace(ClientData clientData);
-static void		DeletedHelpersNamespace(ClientData clientData);
+static void		DeletedDefineNamespace(void *clientData);
+static void		DeletedObjdefNamespace(void *clientData);
+static void		DeletedHelpersNamespace(void *clientData);
 static Tcl_NRPostProc	FinalizeAlloc;
 static Tcl_NRPostProc	FinalizeNext;
 static Tcl_NRPostProc	FinalizeObjectCall;
@@ -78,23 +78,23 @@ static void		InitClassSystemRoots(Tcl_Interp *interp,
 			    Foundation *fPtr);
 static int		InitFoundation(Tcl_Interp *interp);
 static Tcl_InterpDeleteProc	KillFoundation;
-static void		MyDeleted(ClientData clientData);
-static void		ObjectNamespaceDeleted(ClientData clientData);
+static void		MyDeleted(void *clientData);
+static void		ObjectNamespaceDeleted(void *clientData);
 static Tcl_CommandTraceProc	ObjectRenamedTrace;
-static inline void	RemoveClass(Class **list, int num, int idx);
-static inline void	RemoveObject(Object **list, int num, int idx);
+static inline void	RemoveClass(Class **list, size_t num, size_t idx);
+static inline void	RemoveObject(Object **list, size_t num, size_t idx);
 static inline void	SquelchCachedName(Object *oPtr);
 
-static int		PublicNRObjectCmd(ClientData clientData,
+static int		PublicNRObjectCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const *objv);
-static int		PrivateNRObjectCmd(ClientData clientData,
+static int		PrivateNRObjectCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const *objv);
-static int		MyClassNRObjCmd(ClientData clientData,
+static int		MyClassNRObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const *objv);
-static void		MyClassDeleted(ClientData clientData);
+static void		MyClassDeleted(void *clientData);
 
 /*
  * Methods in the oo::object and oo::class classes. First, we define a helper
@@ -201,10 +201,10 @@ MODULE_SCOPE const TclOOStubs tclOOStubs;
 static inline void
 RemoveClass(
     Class **list,
-    int num,
-    int idx)
+    size_t num,
+    size_t idx)
 {
-    for (; idx < num - 1; idx++) {
+    for (; idx + 1 < num; idx++) {
 	list[idx] = list[idx + 1];
     }
     list[idx] = NULL;
@@ -213,10 +213,10 @@ RemoveClass(
 static inline void
 RemoveObject(
     Object **list,
-    int num,
-    int idx)
+    size_t num,
+    size_t idx)
 {
-    for (; idx < num - 1; idx++) {
+    for (; idx + 1 < num; idx++) {
 	list[idx] = list[idx + 1];
     }
     list[idx] = NULL;
@@ -256,7 +256,7 @@ TclOOInit(
      * to be fully provided.
      */
 
-    if (Tcl_EvalEx(interp, initScript, -1, 0) != TCL_OK) {
+    if (Tcl_EvalEx(interp, initScript, TCL_INDEX_NONE, 0) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -352,14 +352,14 @@ InitFoundation(
     Tcl_DStringInit(&buffer);
     for (i = 0 ; defineCmds[i].name ; i++) {
 	TclDStringAppendLiteral(&buffer, "::oo::define::");
-	Tcl_DStringAppend(&buffer, defineCmds[i].name, -1);
+	Tcl_DStringAppend(&buffer, defineCmds[i].name, TCL_INDEX_NONE);
 	Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer),
 		defineCmds[i].objProc, INT2PTR(defineCmds[i].flag), NULL);
 	Tcl_DStringFree(&buffer);
     }
     for (i = 0 ; objdefCmds[i].name ; i++) {
 	TclDStringAppendLiteral(&buffer, "::oo::objdefine::");
-	Tcl_DStringAppend(&buffer, objdefCmds[i].name, -1);
+	Tcl_DStringAppend(&buffer, objdefCmds[i].name, TCL_INDEX_NONE);
 	Tcl_CreateObjCommand(interp, Tcl_DStringValue(&buffer),
 		objdefCmds[i].objProc, INT2PTR(objdefCmds[i].flag), NULL);
 	Tcl_DStringFree(&buffer);
@@ -429,7 +429,7 @@ InitFoundation(
      * Evaluate the remaining definitions, which are a compiled-in Tcl script.
      */
 
-    return Tcl_EvalEx(interp, tclOOSetupScript, -1, 0);
+    return Tcl_EvalEx(interp, tclOOSetupScript, TCL_INDEX_NONE, 0);
 }
 
 /*
@@ -535,7 +535,7 @@ InitClassSystemRoots(
 
 static void
 DeletedDefineNamespace(
-    ClientData clientData)
+    void *clientData)
 {
     Foundation *fPtr = (Foundation *)clientData;
 
@@ -544,7 +544,7 @@ DeletedDefineNamespace(
 
 static void
 DeletedObjdefNamespace(
-    ClientData clientData)
+    void *clientData)
 {
     Foundation *fPtr = (Foundation *)clientData;
 
@@ -553,7 +553,7 @@ DeletedObjdefNamespace(
 
 static void
 DeletedHelpersNamespace(
-    ClientData clientData)
+    void *clientData)
 {
     Foundation *fPtr = (Foundation *)clientData;
 
@@ -789,7 +789,7 @@ SquelchCachedName(
 
 static void
 MyDeleted(
-    ClientData clientData)	/* Reference to the object whose [my] has been
+    void *clientData)	/* Reference to the object whose [my] has been
 				 * squelched. */
 {
     Object *oPtr = (Object *)clientData;
@@ -799,7 +799,7 @@ MyDeleted(
 
 static void
 MyClassDeleted(
-    ClientData clientData)
+    void *clientData)
 {
     Object *oPtr = (Object *)clientData;
     oPtr->myclassCommand = NULL;
@@ -820,7 +820,7 @@ MyClassDeleted(
 
 static void
 ObjectRenamedTrace(
-    ClientData clientData,	/* The object being deleted. */
+    void *clientData,	/* The object being deleted. */
     TCL_UNUSED(Tcl_Interp *),
     TCL_UNUSED(const char *) /*oldName*/,
     TCL_UNUSED(const char *) /*newName*/,
@@ -1038,7 +1038,7 @@ TclOOReleaseClassContents(
 
     if (clsPtr->metadataPtr != NULL) {
 	Tcl_ObjectMetadataType *metadataTypePtr;
-	ClientData value;
+	void *value;
 
 	FOREACH_HASH(metadataTypePtr, value, clsPtr->metadataPtr) {
 	    metadataTypePtr->deleteProc(value);
@@ -1110,7 +1110,7 @@ TclOOReleaseClassContents(
 
 static void
 ObjectNamespaceDeleted(
-    ClientData clientData)	/* Pointer to the class whose namespace is
+    void *clientData)	/* Pointer to the class whose namespace is
 				 * being deleted. */
 {
     Object *oPtr = (Object *)clientData;
@@ -1261,7 +1261,7 @@ ObjectNamespaceDeleted(
 
     if (oPtr->metadataPtr != NULL) {
 	Tcl_ObjectMetadataType *metadataTypePtr;
-	ClientData value;
+	void *value;
 
 	FOREACH_HASH(metadataTypePtr, value, oPtr->metadataPtr) {
 	    metadataTypePtr->deleteProc(value);
@@ -1675,7 +1675,7 @@ Tcl_NewObjectInstance(
 {
     Class *classPtr = (Class *) cls;
     Object *oPtr;
-    ClientData clientData[4];
+    void *clientData[4];
 
     oPtr = TclNewObjectInstanceCommon(interp, classPtr, nameStr, nsNameStr);
     if (oPtr == NULL) {
@@ -1854,7 +1854,7 @@ TclNewObjectInstanceCommon(
 
 static int
 FinalizeAlloc(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -1870,7 +1870,7 @@ FinalizeAlloc(
 
     if (result != TCL_ERROR && Destructing(oPtr)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"object deleted in constructor", -1));
+		"object deleted in constructor", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "STILLBORN", NULL);
 	result = TCL_ERROR;
     }
@@ -1941,7 +1941,7 @@ Tcl_CopyObjectInstance(
 
     if (IsRootClass(oPtr)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"may not clone the class of classes", -1));
+		"may not clone the class of classes", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "CLONING_CLASS", NULL);
 	return NULL;
     }
@@ -1951,8 +1951,8 @@ Tcl_CopyObjectInstance(
      */
 
     o2Ptr = (Object *) Tcl_NewObjectInstance(interp,
-	    (Tcl_Class) oPtr->selfCls, targetName, targetNamespaceName, -1,
-	    NULL, -1);
+	    (Tcl_Class) oPtr->selfCls, targetName, targetNamespaceName, TCL_INDEX_NONE,
+	    NULL, TCL_INDEX_NONE);
     if (o2Ptr == NULL) {
 	return NULL;
     }
@@ -2037,7 +2037,7 @@ Tcl_CopyObjectInstance(
 
     if (oPtr->metadataPtr != NULL) {
 	Tcl_ObjectMetadataType *metadataTypePtr;
-	ClientData value, duplicate;
+	void *value, *duplicate;
 
 	FOREACH_HASH(metadataTypePtr, value, oPtr->metadataPtr) {
 	    if (metadataTypePtr->cloneProc == NULL) {
@@ -2182,7 +2182,7 @@ Tcl_CopyObjectInstance(
 
 	if (clsPtr->metadataPtr != NULL) {
 	    Tcl_ObjectMetadataType *metadataTypePtr;
-	    ClientData value, duplicate;
+	    void *value, *duplicate;
 
 	    FOREACH_HASH(metadataTypePtr, value, clsPtr->metadataPtr) {
 		if (metadataTypePtr->cloneProc == NULL) {
@@ -2254,7 +2254,7 @@ CloneObjectMethod(
 	TclNewInstanceMethod(interp, (Tcl_Object) oPtr, namePtr,
 		mPtr->flags & PUBLIC_METHOD, NULL, NULL);
     } else if (mPtr->typePtr->cloneProc) {
-	ClientData newClientData;
+	void *newClientData;
 
 	if (mPtr->typePtr->cloneProc(interp, mPtr->clientData,
 		&newClientData) != TCL_OK) {
@@ -2283,7 +2283,7 @@ CloneClassMethod(
 	m2Ptr = (Method *) TclNewMethod(interp, (Tcl_Class) clsPtr,
 		namePtr, mPtr->flags & PUBLIC_METHOD, NULL, NULL);
     } else if (mPtr->typePtr->cloneProc) {
-	ClientData newClientData;
+	void *newClientData;
 
 	if (mPtr->typePtr->cloneProc(interp, mPtr->clientData,
 		&newClientData) != TCL_OK) {
@@ -2329,7 +2329,7 @@ CloneClassMethod(
  * ----------------------------------------------------------------------
  */
 
-ClientData
+void *
 Tcl_ClassGetMetadata(
     Tcl_Class clazz,
     const Tcl_ObjectMetadataType *typePtr)
@@ -2366,7 +2366,7 @@ void
 Tcl_ClassSetMetadata(
     Tcl_Class clazz,
     const Tcl_ObjectMetadataType *typePtr,
-    ClientData metadata)
+    void *metadata)
 {
     Class *clsPtr = (Class *) clazz;
     Tcl_HashEntry *hPtr;
@@ -2409,7 +2409,7 @@ Tcl_ClassSetMetadata(
     Tcl_SetHashValue(hPtr, metadata);
 }
 
-ClientData
+void *
 Tcl_ObjectGetMetadata(
     Tcl_Object object,
     const Tcl_ObjectMetadataType *typePtr)
@@ -2446,7 +2446,7 @@ void
 Tcl_ObjectSetMetadata(
     Tcl_Object object,
     const Tcl_ObjectMetadataType *typePtr,
-    ClientData metadata)
+    void *metadata)
 {
     Object *oPtr = (Object *) object;
     Tcl_HashEntry *hPtr;
@@ -2504,7 +2504,7 @@ Tcl_ObjectSetMetadata(
 
 int
 TclOOPublicObjectCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2514,7 +2514,7 @@ TclOOPublicObjectCmd(
 
 static int
 PublicNRObjectCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2525,7 +2525,7 @@ PublicNRObjectCmd(
 
 int
 TclOOPrivateObjectCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2535,7 +2535,7 @@ TclOOPrivateObjectCmd(
 
 static int
 PrivateNRObjectCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2586,7 +2586,7 @@ TclOOInvokeObject(
 
 int
 TclOOMyClassObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2596,7 +2596,7 @@ TclOOMyClassObjCmd(
 
 static int
 MyClassNRObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2749,7 +2749,7 @@ TclOOObjectCmdCore(
 	}
 	if (contextPtr->index >= contextPtr->callPtr->numChain) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "no valid method implementation", -1));
+		    "no valid method implementation", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
 		    TclGetString(methodNamePtr), NULL);
 	    TclOODeleteContext(contextPtr);
@@ -2768,7 +2768,7 @@ TclOOObjectCmdCore(
 
 static int
 FinalizeObjectCall(
-    ClientData data[],
+    void *data[],
     TCL_UNUSED(Tcl_Interp *),
     int result)
 {
@@ -2929,7 +2929,7 @@ TclNRObjectContextInvokeNext(
 
 static int
 FinalizeNext(
-    ClientData data[],
+    void *data[],
     TCL_UNUSED(Tcl_Interp *),
     int result)
 {
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index ef554d7..d8ef59b 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -99,10 +99,10 @@ TclOO_Class_Constructor(
      * here (and the class definition delegate doesn't run any constructors).
      */
 
-    nameObj = Tcl_NewStringObj(oPtr->namespacePtr->fullName, -1);
-    Tcl_AppendToObj(nameObj, ":: oo ::delegate", -1);
+    nameObj = Tcl_NewStringObj(oPtr->namespacePtr->fullName, TCL_INDEX_NONE);
+    Tcl_AppendToObj(nameObj, ":: oo ::delegate", TCL_INDEX_NONE);
     Tcl_NewObjectInstance(interp, (Tcl_Class) oPtr->fPtr->classCls,
-	    TclGetString(nameObj), NULL, -1, NULL, -1);
+	    TclGetString(nameObj), NULL, TCL_INDEX_NONE, NULL, TCL_INDEX_NONE);
     Tcl_DecrRefCount(nameObj);
 
     /*
@@ -147,7 +147,7 @@ DecrRefsPostClassConstructor(
     TclDecrRefCount(invoke[0]);
     TclDecrRefCount(invoke[1]);
     TclDecrRefCount(invoke[2]);
-    invoke[0] = Tcl_NewStringObj("::oo::MixinClassDelegates", -1);
+    invoke[0] = Tcl_NewStringObj("::oo::MixinClassDelegates", TCL_INDEX_NONE);
     invoke[1] = TclOOObjectName(interp, oPtr);
     Tcl_IncrRefCount(invoke[0]);
     Tcl_IncrRefCount(invoke[1]);
@@ -213,7 +213,7 @@ TclOO_Class_Create(
 	    objv[Tcl_ObjectContextSkippedArgs(context)], &len);
     if (len == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"object name must not be empty", -1));
+		"object name must not be empty", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
 	return TCL_ERROR;
     }
@@ -278,7 +278,7 @@ TclOO_Class_CreateNs(
 	    objv[Tcl_ObjectContextSkippedArgs(context)], &len);
     if (len == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"object name must not be empty", -1));
+		"object name must not be empty", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
 	return TCL_ERROR;
     }
@@ -286,7 +286,7 @@ TclOO_Class_CreateNs(
 	    objv[Tcl_ObjectContextSkippedArgs(context)+1], &len);
     if (len == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"namespace name must not be empty", -1));
+		"namespace name must not be empty", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
 	return TCL_ERROR;
     }
@@ -598,14 +598,14 @@ TclOO_Object_Unknown(
 	    TclGetString(objv[skip]));
     for (i=0 ; i<numMethodNames-1 ; i++) {
 	if (i) {
-	    Tcl_AppendToObj(errorMsg, ", ", -1);
+	    Tcl_AppendToObj(errorMsg, ", ", TCL_INDEX_NONE);
 	}
-	Tcl_AppendToObj(errorMsg, methodNames[i], -1);
+	Tcl_AppendToObj(errorMsg, methodNames[i], TCL_INDEX_NONE);
     }
     if (i) {
-	Tcl_AppendToObj(errorMsg, " or ", -1);
+	Tcl_AppendToObj(errorMsg, " or ", TCL_INDEX_NONE);
     }
-    Tcl_AppendToObj(errorMsg, methodNames[i], -1);
+    Tcl_AppendToObj(errorMsg, methodNames[i], TCL_INDEX_NONE);
     Tcl_Free((void *)methodNames);
     Tcl_SetObjResult(interp, errorMsg);
     Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
@@ -814,7 +814,7 @@ TclOO_Object_VarName(
 	    }
 	}
 
-	varNamePtr = Tcl_NewStringObj(namespacePtr->fullName, -1);
+	varNamePtr = Tcl_NewStringObj(namespacePtr->fullName, TCL_INDEX_NONE);
 	Tcl_AppendToObj(varNamePtr, "::", 2);
 	Tcl_AppendObjToObj(varNamePtr, argPtr);
     }
@@ -840,10 +840,10 @@ TclOO_Object_VarName(
 	 * WARNING! This code pokes inside the implementation of hash tables!
 	 */
 
-	Tcl_AppendToObj(varNamePtr, "(", -1);
+	Tcl_AppendToObj(varNamePtr, "(", TCL_INDEX_NONE);
 	Tcl_AppendObjToObj(varNamePtr, ((VarInHash *)
 		varPtr)->entry.key.objPtr);
-	Tcl_AppendToObj(varNamePtr, ")", -1);
+	Tcl_AppendToObj(varNamePtr, ")", TCL_INDEX_NONE);
     } else {
 	Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr, varNamePtr);
     }
@@ -1097,7 +1097,7 @@ TclOOSelfObjCmd(
 
 	if (clsPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "method not defined by a class", -1));
+		    "method not defined by a class", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OO", "UNMATCHED_CONTEXT", NULL);
 	    return TCL_ERROR;
 	}
@@ -1118,7 +1118,7 @@ TclOOSelfObjCmd(
     case SELF_FILTER:
 	if (!CurrentlyInvoked(contextPtr).isFilter) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "not inside a filtering context", -1));
+		    "not inside a filtering context", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OO", "UNMATCHED_CONTEXT", NULL);
 	    return TCL_ERROR;
 	} else {
@@ -1135,7 +1135,7 @@ TclOOSelfObjCmd(
 	    }
 
 	    result[0] = TclOOObjectName(interp, oPtr);
-	    result[1] = Tcl_NewStringObj(type, -1);
+	    result[1] = Tcl_NewStringObj(type, TCL_INDEX_NONE);
 	    result[2] = miPtr->mPtr->namePtr;
 	    Tcl_SetObjResult(interp, Tcl_NewListObj(3, result));
 	    return TCL_OK;
@@ -1144,7 +1144,7 @@ TclOOSelfObjCmd(
 	if ((framePtr->callerVarPtr == NULL) ||
 		!(framePtr->callerVarPtr->isProcCallFrame & FRAME_IS_METHOD)){
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "caller is not an object", -1));
+		    "caller is not an object", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OO", "CONTEXT_REQUIRED", NULL);
 	    return TCL_ERROR;
 	} else {
@@ -1162,7 +1162,7 @@ TclOOSelfObjCmd(
 		 */
 
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"method without declarer!", -1));
+			"method without declarer!", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    }
 
@@ -1194,7 +1194,7 @@ TclOOSelfObjCmd(
 		 */
 
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"method without declarer!", -1));
+			"method without declarer!", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    }
 
@@ -1212,7 +1212,7 @@ TclOOSelfObjCmd(
     case SELF_TARGET:
 	if (!CurrentlyInvoked(contextPtr).isFilter) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "not inside a filtering context", -1));
+		    "not inside a filtering context", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OO", "UNMATCHED_CONTEXT", NULL);
 	    return TCL_ERROR;
 	} else {
@@ -1239,7 +1239,7 @@ TclOOSelfObjCmd(
 		 */
 
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"method without declarer!", -1));
+			"method without declarer!", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    }
 	    result[0] = TclOOObjectName(interp, declarerPtr);
diff --git a/generic/tclOODefineCmds.c b/generic/tclOODefineCmds.c
index 63aca58..796a22f 100644
--- a/generic/tclOODefineCmds.c
+++ b/generic/tclOODefineCmds.c
@@ -78,49 +78,49 @@ static inline void	RecomputeClassCacheFlag(Object *oPtr);
 static int		RenameDeleteMethod(Tcl_Interp *interp, Object *oPtr,
 			    int useClass, Tcl_Obj *const fromPtr,
 			    Tcl_Obj *const toPtr);
-static int		ClassFilterGet(ClientData clientData,
+static int		ClassFilterGet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ClassFilterSet(ClientData clientData,
+static int		ClassFilterSet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ClassMixinGet(ClientData clientData,
+static int		ClassMixinGet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ClassMixinSet(ClientData clientData,
+static int		ClassMixinSet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ClassSuperGet(ClientData clientData,
+static int		ClassSuperGet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ClassSuperSet(ClientData clientData,
+static int		ClassSuperSet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ClassVarsGet(ClientData clientData,
+static int		ClassVarsGet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ClassVarsSet(ClientData clientData,
+static int		ClassVarsSet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ObjFilterGet(ClientData clientData,
+static int		ObjFilterGet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ObjFilterSet(ClientData clientData,
+static int		ObjFilterSet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ObjMixinGet(ClientData clientData,
+static int		ObjMixinGet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ObjMixinSet(ClientData clientData,
+static int		ObjMixinSet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ObjVarsGet(ClientData clientData,
+static int		ObjVarsGet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ObjVarsSet(ClientData clientData,
+static int		ObjVarsSet(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
-static int		ResolveClass(ClientData clientData,
+static int		ResolveClass(void *clientData,
 			    Tcl_Interp *interp, Tcl_ObjectContext context,
 			    int objc, Tcl_Obj *const *objv);
 
@@ -633,7 +633,7 @@ RenameDeleteMethod(
 	    if (hPtr == newHPtr) {
 	    renameToSelf:
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"cannot rename method to itself", -1));
+			"cannot rename method to itself", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OO", "RENAME_TO_SELF", NULL);
 		return TCL_ERROR;
 	    } else if (!isNew) {
@@ -709,7 +709,7 @@ TclOOUnknownDefinition(
 
     if (objc < 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"bad call of unknown handler", -1));
+		"bad call of unknown handler", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "BAD_UNKNOWN", NULL);
 	return TCL_ERROR;
     }
@@ -743,7 +743,7 @@ TclOOUnknownDefinition(
 		TclStackAlloc(interp, sizeof(Tcl_Obj*) * (objc - 1));
 	int result;
 
-	newObjv[0] = Tcl_NewStringObj(matchedStr, -1);
+	newObjv[0] = Tcl_NewStringObj(matchedStr, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(newObjv[0]);
 	if (objc > 2) {
 	    memcpy(newObjv + 1, objv + 2, sizeof(Tcl_Obj *) * (objc - 2));
@@ -846,7 +846,7 @@ InitDefineContext(
 
     if (namespacePtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"no definition namespace available", -1));
+		"no definition namespace available", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -887,7 +887,7 @@ TclOOGetDefineCmdContext(
 	    && iPtr->varFramePtr->isProcCallFrame != PRIVATE_FRAME)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"this command may only be called from within the context of"
-		" an ::oo::define or ::oo::objdefine command", -1));
+		" an ::oo::define or ::oo::objdefine command", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return NULL;
     }
@@ -895,7 +895,7 @@ TclOOGetDefineCmdContext(
     if (Tcl_ObjectDeleted(object)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"this command cannot be called when the object has been"
-		" deleted", -1));
+		" deleted", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return NULL;
     }
@@ -938,7 +938,7 @@ GetClassInOuterContext(
 	return NULL;
     }
     if (oPtr->classPtr == NULL) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, -1));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(errMsg, TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CLASS",
 		TclGetString(className), NULL);
 	return NULL;
@@ -1344,7 +1344,7 @@ TclOODefineObjSelfObjCmd(
 
 int
 TclOODefinePrivateObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1437,13 +1437,13 @@ TclOODefineClassObjCmd(
     }
     if (oPtr->flags & ROOT_OBJECT) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"may not modify the class of the root object class", -1));
+		"may not modify the class of the root object class", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
     if (oPtr->flags & ROOT_CLASS) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"may not modify the class of the class of classes", -1));
+		"may not modify the class of the class of classes", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -1463,7 +1463,7 @@ TclOODefineClassObjCmd(
     }
     if (oPtr == clsPtr->thisPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"may not change classes into an instance of themselves", -1));
+		"may not change classes into an instance of themselves", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -1616,7 +1616,7 @@ TclOODefineDefnNsObjCmd(
     }
     if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -1647,7 +1647,7 @@ TclOODefineDefnNsObjCmd(
 	if (nsPtr == NULL) {
 	    return TCL_ERROR;
 	}
-	nsNamePtr = Tcl_NewStringObj(nsPtr->fullName, -1);
+	nsNamePtr = Tcl_NewStringObj(nsPtr->fullName, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(nsNamePtr);
     }
 
@@ -1680,7 +1680,7 @@ TclOODefineDefnNsObjCmd(
 
 int
 TclOODefineDeleteMethodObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1700,7 +1700,7 @@ TclOODefineDeleteMethodObjCmd(
     }
     if (!isInstanceDeleteMethod && !oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -1802,7 +1802,7 @@ TclOODefineDestructorObjCmd(
 
 int
 TclOODefineExportObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1826,7 +1826,7 @@ TclOODefineExportObjCmd(
     clsPtr = oPtr->classPtr;
     if (!isInstanceExport && !clsPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -1898,7 +1898,7 @@ TclOODefineExportObjCmd(
 
 int
 TclOODefineForwardObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1920,7 +1920,7 @@ TclOODefineForwardObjCmd(
     }
     if (!isInstanceForward && !oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -1962,7 +1962,7 @@ TclOODefineForwardObjCmd(
 
 int
 TclOODefineMethodObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -1998,7 +1998,7 @@ TclOODefineMethodObjCmd(
     }
     if (!isInstanceMethod && !oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -2058,7 +2058,7 @@ TclOODefineMethodObjCmd(
 
 int
 TclOODefineRenameMethodObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2077,7 +2077,7 @@ TclOODefineRenameMethodObjCmd(
     }
     if (!isInstanceRenameMethod && !oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -2115,7 +2115,7 @@ TclOODefineRenameMethodObjCmd(
 
 int
 TclOODefineUnexportObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const *objv)
@@ -2139,7 +2139,7 @@ TclOODefineUnexportObjCmd(
     clsPtr = oPtr->classPtr;
     if (!isInstanceUnexport && !clsPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -2268,13 +2268,13 @@ TclOODefineSlots(
     Foundation *fPtr)
 {
     const struct DeclaredSlot *slotInfoPtr;
-    Tcl_Obj *getName = Tcl_NewStringObj("Get", -1);
-    Tcl_Obj *setName = Tcl_NewStringObj("Set", -1);
-    Tcl_Obj *resolveName = Tcl_NewStringObj("Resolve", -1);
+    Tcl_Obj *getName = Tcl_NewStringObj("Get", TCL_INDEX_NONE);
+    Tcl_Obj *setName = Tcl_NewStringObj("Set", TCL_INDEX_NONE);
+    Tcl_Obj *resolveName = Tcl_NewStringObj("Resolve", TCL_INDEX_NONE);
     Class *slotCls;
 
     slotCls = ((Object *) Tcl_NewObjectInstance(fPtr->interp, (Tcl_Class)
-	    fPtr->classCls, "::oo::Slot", NULL, -1, NULL, 0))->classPtr;
+	    fPtr->classCls, "::oo::Slot", NULL, TCL_INDEX_NONE, NULL, 0))->classPtr;
     if (slotCls == NULL) {
 	return TCL_ERROR;
     }
@@ -2283,7 +2283,7 @@ TclOODefineSlots(
     Tcl_IncrRefCount(resolveName);
     for (slotInfoPtr = slots ; slotInfoPtr->name ; slotInfoPtr++) {
 	Tcl_Object slotObject = Tcl_NewObjectInstance(fPtr->interp,
-		(Tcl_Class) slotCls, slotInfoPtr->name, NULL, -1, NULL, 0);
+		(Tcl_Class) slotCls, slotInfoPtr->name, NULL, TCL_INDEX_NONE, NULL, 0);
 
 	if (slotObject == NULL) {
 	    continue;
@@ -2335,7 +2335,7 @@ ClassFilterGet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -2371,7 +2371,7 @@ ClassFilterSet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     } else if (TclListObjGetElementsM(interp, objv[0], &filterc,
@@ -2416,7 +2416,7 @@ ClassMixinGet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -2455,7 +2455,7 @@ ClassMixinSet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     } else if (TclListObjGetElementsM(interp, objv[0], &mixinc,
@@ -2474,7 +2474,7 @@ ClassMixinSet(
 	}
 	if (TclOOIsReachable(oPtr->classPtr, mixins[i])) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "may not mix a class into itself", -1));
+		    "may not mix a class into itself", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OO", "SELF_MIXIN", NULL);
 	    goto freeAndError;
 	}
@@ -2522,7 +2522,7 @@ ClassSuperGet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -2561,12 +2561,12 @@ ClassSuperSet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     } else if (oPtr == oPtr->fPtr->objectCls->thisPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"may not modify the superclass of the root object", -1));
+		"may not modify the superclass of the root object", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     } else if (TclListObjGetElementsM(interp, objv[0], &superc,
@@ -2614,7 +2614,7 @@ ClassSuperSet(
 	    }
 	    if (TclOOIsReachable(oPtr->classPtr, superclasses[i])) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"attempt to form circular dependency graph", -1));
+			"attempt to form circular dependency graph", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OO", "CIRCULARITY", NULL);
 	    failedAfterAlloc:
 		for (; i-- > 0 ;) {
@@ -2689,7 +2689,7 @@ ClassVarsGet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     }
@@ -2736,7 +2736,7 @@ ClassVarsSet(
 	return TCL_ERROR;
     } else if (!oPtr->classPtr) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"attempt to misuse API", -1));
+		"attempt to misuse API", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "MONKEY_BUSINESS", NULL);
 	return TCL_ERROR;
     } else if (TclListObjGetElementsM(interp, objv[0], &varc,
diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c
index b4f9c56..a49282c 100644
--- a/generic/tclOOInfo.c
+++ b/generic/tclOOInfo.c
@@ -120,10 +120,10 @@ TclOOInitInfo(
     infoCmd = Tcl_FindCommand(interp, "info", NULL, TCL_GLOBAL_ONLY);
     if (infoCmd) {
 	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_DictObjPut(NULL, mapDict, Tcl_NewStringObj("object", TCL_INDEX_NONE),
+		Tcl_NewStringObj("::oo::InfoObject", TCL_INDEX_NONE));
+	Tcl_DictObjPut(NULL, mapDict, Tcl_NewStringObj("class", TCL_INDEX_NONE),
+		Tcl_NewStringObj("::oo::InfoClass", TCL_INDEX_NONE));
 	Tcl_SetEnsembleMappingDict(interp, infoCmd, mapDict);
     }
 }
@@ -264,7 +264,7 @@ InfoObjectDefnCmd(
     procPtr = TclOOGetProcFromMethod((Method *)Tcl_GetHashValue(hPtr));
     if (procPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"definition not available for this kind of method", -1));
+		"definition not available for this kind of method", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
 		TclGetString(objv[2]), NULL);
 	return TCL_ERROR;
@@ -278,7 +278,7 @@ InfoObjectDefnCmd(
 
 	    TclNewObj(argObj);
 	    Tcl_ListObjAppendElement(NULL, argObj,
-		    Tcl_NewStringObj(localPtr->name, -1));
+		    Tcl_NewStringObj(localPtr->name, TCL_INDEX_NONE));
 	    if (localPtr->defValuePtr != NULL) {
 		Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
 	    }
@@ -610,7 +610,7 @@ InfoObjectMethodsCmd(
 
 	for (i=0 ; i<numNames ; i++) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    Tcl_NewStringObj(names[i], -1));
+		    Tcl_NewStringObj(names[i], TCL_INDEX_NONE));
 	}
 	if (numNames > 0) {
 	    Tcl_Free((void *)names);
@@ -679,7 +679,7 @@ InfoObjectMethodTypeCmd(
 	goto unknownMethod;
     }
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, TCL_INDEX_NONE));
     return TCL_OK;
 }
 
@@ -787,7 +787,7 @@ InfoObjectNsCmd(
     }
 
     Tcl_SetObjResult(interp,
-	    Tcl_NewStringObj(oPtr->namespacePtr->fullName, -1));
+	    Tcl_NewStringObj(oPtr->namespacePtr->fullName, TCL_INDEX_NONE));
     return TCL_OK;
 }
 
@@ -943,7 +943,7 @@ InfoClassConstrCmd(
     procPtr = TclOOGetProcFromMethod(clsPtr->constructorPtr);
     if (procPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"definition not available for this kind of method", -1));
+		"definition not available for this kind of method", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", NULL);
 	return TCL_ERROR;
     }
@@ -956,7 +956,7 @@ InfoClassConstrCmd(
 
 	    TclNewObj(argObj);
 	    Tcl_ListObjAppendElement(NULL, argObj,
-		    Tcl_NewStringObj(localPtr->name, -1));
+		    Tcl_NewStringObj(localPtr->name, TCL_INDEX_NONE));
 	    if (localPtr->defValuePtr != NULL) {
 		Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
 	    }
@@ -1010,7 +1010,7 @@ InfoClassDefnCmd(
     procPtr = TclOOGetProcFromMethod((Method *)Tcl_GetHashValue(hPtr));
     if (procPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"definition not available for this kind of method", -1));
+		"definition not available for this kind of method", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD",
 		TclGetString(objv[2]), NULL);
 	return TCL_ERROR;
@@ -1024,7 +1024,7 @@ InfoClassDefnCmd(
 
 	    TclNewObj(argObj);
 	    Tcl_ListObjAppendElement(NULL, argObj,
-		    Tcl_NewStringObj(localPtr->name, -1));
+		    Tcl_NewStringObj(localPtr->name, TCL_INDEX_NONE));
 	    if (localPtr->defValuePtr != NULL) {
 		Tcl_ListObjAppendElement(NULL, argObj, localPtr->defValuePtr);
 	    }
@@ -1121,7 +1121,7 @@ InfoClassDestrCmd(
     procPtr = TclOOGetProcFromMethod(clsPtr->destructorPtr);
     if (procPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"definition not available for this kind of method", -1));
+		"definition not available for this kind of method", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", NULL);
 	return TCL_ERROR;
     }
@@ -1365,7 +1365,7 @@ InfoClassMethodsCmd(
 
 	for (i=0 ; i<numNames ; i++) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    Tcl_NewStringObj(names[i], -1));
+		    Tcl_NewStringObj(names[i], TCL_INDEX_NONE));
 	}
 	if (numNames > 0) {
 	    Tcl_Free((void *)names);
@@ -1431,7 +1431,7 @@ InfoClassMethodTypeCmd(
 
 	goto unknownMethod;
     }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(mPtr->typePtr->name, TCL_INDEX_NONE));
     return TCL_OK;
 }
 
@@ -1663,7 +1663,7 @@ InfoObjectCallCmd(
 	    NULL);
     if (contextPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"cannot construct any call chain", -1));
+		"cannot construct any call chain", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp,
@@ -1708,7 +1708,7 @@ InfoClassCallCmd(
     callPtr = TclOOGetStereotypeCallChain(clsPtr, objv[2], PUBLIC_METHOD);
     if (callPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"cannot construct any call chain", -1));
+		"cannot construct any call chain", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, TclOORenderCallChain(interp, callPtr));
diff --git a/generic/tclObj.c b/generic/tclObj.c
index eaa6766..16b9ca1 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -867,7 +867,7 @@ Tcl_AppendAllObjTypes(
     for (hPtr = Tcl_FirstHashEntry(&typeTable, &search);
 	    hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
 	Tcl_ListObjAppendElement(NULL, objPtr,
-		Tcl_NewStringObj((char *)Tcl_GetHashKey(&typeTable, hPtr), -1));
+		Tcl_NewStringObj((char *)Tcl_GetHashKey(&typeTable, hPtr), TCL_INDEX_NONE));
     }
     Tcl_MutexUnlock(&tableMutex);
     return TCL_OK;
@@ -2009,7 +2009,7 @@ Tcl_GetBoolFromObj(
 	if (interp) {
 	    TclNewObj(objPtr);
 	    TclParseNumber(interp, objPtr, (flags & TCL_NULL_OK)
-		    ? "boolean value or \"\"" : "boolean value", NULL, -1, NULL, 0);
+		    ? "boolean value or \"\"" : "boolean value", NULL, TCL_INDEX_NONE, NULL, 0);
 	    Tcl_DecrRefCount(objPtr);
 	}
 	return TCL_ERROR;
@@ -2132,7 +2132,7 @@ TclSetBooleanFromAny(
 
 	TclNewLiteralStringObj(msg, "expected boolean value but got \"");
 	Tcl_AppendLimitedToObj(msg, str, length, 50, "");
-	Tcl_AppendToObj(msg, "\"", -1);
+	Tcl_AppendToObj(msg, "\"", TCL_INDEX_NONE);
 	Tcl_SetObjResult(interp, msg);
 	Tcl_SetErrorCode(interp, "TCL", "VALUE", "BOOLEAN", NULL);
     }
@@ -2421,7 +2421,7 @@ Tcl_GetDoubleFromObj(
 	    if (isnan(objPtr->internalRep.doubleValue)) {
 		if (interp != NULL) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "floating point value is Not a Number", -1));
+			    "floating point value is Not a Number", TCL_INDEX_NONE));
                     Tcl_SetErrorCode(interp, "TCL", "VALUE", "DOUBLE", "NAN",
                             NULL);
 		}
@@ -2553,7 +2553,7 @@ Tcl_GetIntFromObj(
 	if (interp != NULL) {
 	    const char *s =
 		    "integer value too large to represent";
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(s, TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
 	}
 	return TCL_ERROR;
@@ -2718,7 +2718,7 @@ Tcl_GetLongFromObj(
 #endif
 	    if (interp != NULL) {
 		const char *s = "integer value too large to represent";
-		Tcl_Obj *msg = Tcl_NewStringObj(s, -1);
+		Tcl_Obj *msg = Tcl_NewStringObj(s, TCL_INDEX_NONE);
 
 		Tcl_SetObjResult(interp, msg);
 		Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
@@ -2953,7 +2953,7 @@ Tcl_GetWideIntFromObj(
 	    }
 	    if (interp != NULL) {
 		const char *s = "integer value too large to represent";
-		Tcl_Obj *msg = Tcl_NewStringObj(s, -1);
+		Tcl_Obj *msg = Tcl_NewStringObj(s, TCL_INDEX_NONE);
 
 		Tcl_SetObjResult(interp, msg);
 		Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
@@ -3037,7 +3037,7 @@ Tcl_GetWideUIntFromObj(
 
 	    if (interp != NULL) {
 		const char *s = "integer value too large to represent";
-		Tcl_Obj *msg = Tcl_NewStringObj(s, -1);
+		Tcl_Obj *msg = Tcl_NewStringObj(s, TCL_INDEX_NONE);
 
 		Tcl_SetObjResult(interp, msg);
 		Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, NULL);
@@ -4539,12 +4539,12 @@ Tcl_RepresentationCmd(
     }
 
     if (objv[1]->bytes) {
-        Tcl_AppendToObj(descObj, ", string representation \"", -1);
+        Tcl_AppendToObj(descObj, ", string representation \"", TCL_INDEX_NONE);
 	Tcl_AppendLimitedToObj(descObj, objv[1]->bytes, objv[1]->length,
                 16, "...");
-	Tcl_AppendToObj(descObj, "\"", -1);
+	Tcl_AppendToObj(descObj, "\"", TCL_INDEX_NONE);
     } else {
-	Tcl_AppendToObj(descObj, ", no string representation", -1);
+	Tcl_AppendToObj(descObj, ", no string representation", TCL_INDEX_NONE);
     }
 
     Tcl_SetObjResult(interp, descObj);
diff --git a/generic/tclParse.c b/generic/tclParse.c
index 1209a3b..75ffa26 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -228,7 +228,7 @@ Tcl_ParseCommand(
     if ((start == NULL) && (numBytes != 0)) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "can't parse a NULL pointer", -1));
+		    "can't parse a NULL pointer", TCL_INDEX_NONE));
 	}
 	return TCL_ERROR;
     }
@@ -282,13 +282,13 @@ Tcl_ParseCommand(
 	    if (src[-1] == '"') {
 		if (interp != NULL) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "extra characters after close-quote", -1));
+			    "extra characters after close-quote", TCL_INDEX_NONE));
 		}
 		parsePtr->errorType = TCL_PARSE_QUOTE_EXTRA;
 	    } else {
 		if (interp != NULL) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "extra characters after close-brace", -1));
+			    "extra characters after close-brace", TCL_INDEX_NONE));
 		}
 		parsePtr->errorType = TCL_PARSE_BRACE_EXTRA;
 	    }
@@ -1179,7 +1179,7 @@ ParseTokens(
 		if (numBytes == 0) {
 		    if (parsePtr->interp != NULL) {
 			Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
-				"missing close-bracket", -1));
+				"missing close-bracket", TCL_INDEX_NONE));
 		    }
 		    parsePtr->errorType = TCL_PARSE_MISSING_BRACKET;
 		    parsePtr->term = tokenPtr->start;
@@ -1425,7 +1425,7 @@ Tcl_ParseVarName(
 	if (numBytes == 0) {
 	    if (parsePtr->interp != NULL) {
 		Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
-			"missing close-brace for variable name", -1));
+			"missing close-brace for variable name", TCL_INDEX_NONE));
 	    }
 	    parsePtr->errorType = TCL_PARSE_MISSING_VAR_BRACE;
 	    parsePtr->term = tokenPtr->start-1;
@@ -1483,7 +1483,7 @@ Tcl_ParseVarName(
 	    if (parsePtr->term == src+numBytes){
 		if (parsePtr->interp != NULL) {
 		    Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
-			    "missing )", -1));
+			    "missing )", TCL_INDEX_NONE));
 		}
 		parsePtr->errorType = TCL_PARSE_MISSING_PAREN;
 		parsePtr->term = src;
@@ -1492,7 +1492,7 @@ Tcl_ParseVarName(
 	    } else if ((*parsePtr->term != ')')){
 		if (parsePtr->interp != NULL) {
 		    Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
-			    "invalid character in array index", -1));
+			    "invalid character in array index", TCL_INDEX_NONE));
 		}
 		parsePtr->errorType = TCL_PARSE_SYNTAX;
 		parsePtr->term = src;
@@ -1558,7 +1558,7 @@ Tcl_ParseVar(
     int code;
     Tcl_Parse *parsePtr = (Tcl_Parse *)TclStackAlloc(interp, sizeof(Tcl_Parse));
 
-    if (Tcl_ParseVarName(interp, start, -1, parsePtr, 0) != TCL_OK) {
+    if (Tcl_ParseVarName(interp, start, TCL_INDEX_NONE, parsePtr, 0) != TCL_OK) {
 	TclStackFree(interp, parsePtr);
 	return NULL;
     }
@@ -1765,7 +1765,7 @@ Tcl_ParseBraces(
     }
 
     Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
-	    "missing close-brace", -1));
+	    "missing close-brace", TCL_INDEX_NONE));
 
     /*
      * Guess if the problem is due to comments by searching the source string
@@ -1788,7 +1788,7 @@ Tcl_ParseBraces(
 	    case '#' :
 		if (openBrace && TclIsSpaceProcM(src[-1])) {
 		    Tcl_AppendToObj(Tcl_GetObjResult(parsePtr->interp),
-			    ": possible unbalanced brace in comment", -1);
+			    ": possible unbalanced brace in comment", TCL_INDEX_NONE);
 		    goto error;
 		}
 		break;
@@ -1867,7 +1867,7 @@ Tcl_ParseQuotedString(
     if (*parsePtr->term != '"') {
 	if (parsePtr->interp != NULL) {
 	    Tcl_SetObjResult(parsePtr->interp, Tcl_NewStringObj(
-		    "missing \"", -1));
+		    "missing \"", TCL_INDEX_NONE));
 	}
 	parsePtr->errorType = TCL_PARSE_MISSING_QUOTE;
 	parsePtr->term = start;
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 137b415..b18b789 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -335,7 +335,7 @@ TclCleanupChildren(
 
 	    Tcl_Seek(errorChan, 0, SEEK_SET);
 	    TclNewObj(objPtr);
-	    count = Tcl_ReadChars(errorChan, objPtr, -1, 0);
+	    count = Tcl_ReadChars(errorChan, objPtr, TCL_INDEX_NONE, 0);
 	    if (count == -1) {
 		result = TCL_ERROR;
 		Tcl_DecrRefCount(objPtr);
@@ -361,7 +361,7 @@ TclCleanupChildren(
 
     if ((abnormalExit != 0) && (anyErrorInfo == 0) && (interp != NULL)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"child process exited abnormally", -1));
+		"child process exited abnormally", TCL_INDEX_NONE));
     }
     return result;
 }
@@ -512,7 +512,7 @@ TclCreatePipeline(
 	    if (*p == '\0') {
 		if ((i == (lastBar + 1)) || (i == (argc - 1))) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "illegal use of | or |& in command", -1));
+			    "illegal use of | or |& in command", TCL_INDEX_NONE));
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
 			    "PIPESYNTAX", NULL);
 		    goto error;
@@ -700,7 +700,7 @@ TclCreatePipeline(
 	 */
 
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"illegal use of | or |& in command", -1));
+		"illegal use of | or |& in command", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC", "PIPESYNTAX",
 		NULL);
 	goto error;
@@ -1054,7 +1054,7 @@ Tcl_OpenCommandChannel(
 	if ((flags & TCL_STDOUT) && (outPipe == NULL)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "can't read output from command:"
-		    " standard output was redirected", -1));
+		    " standard output was redirected", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
 		    "BADREDIRECT", NULL);
 	    goto error;
@@ -1062,7 +1062,7 @@ Tcl_OpenCommandChannel(
 	if ((flags & TCL_STDIN) && (inPipe == NULL)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "can't write input to command:"
-		    " standard input was redirected", -1));
+		    " standard input was redirected", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC",
 		    "BADREDIRECT", NULL);
 	    goto error;
@@ -1074,7 +1074,7 @@ Tcl_OpenCommandChannel(
 
     if (channel == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"pipe for command could not be created", -1));
+		"pipe for command could not be created", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "EXEC", "NOPIPE", NULL);
 	goto error;
     }
diff --git a/generic/tclProcess.c b/generic/tclProcess.c
index 075877e..0dad7c4 100644
--- a/generic/tclProcess.c
+++ b/generic/tclProcess.c
@@ -233,9 +233,9 @@ WaitProcessStatus(
 	if (msgObjPtr) *msgObjPtr = Tcl_ObjPrintf(
 		"error waiting for process to exit: %s", msg);
 	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("POSIX", -1);
-	    errorStrings[1] = Tcl_NewStringObj(Tcl_ErrnoId(), -1);
-	    errorStrings[2] = Tcl_NewStringObj(msg, -1);
+	    errorStrings[0] = Tcl_NewStringObj("POSIX", TCL_INDEX_NONE);
+	    errorStrings[1] = Tcl_NewStringObj(Tcl_ErrnoId(), TCL_INDEX_NONE);
+	    errorStrings[2] = Tcl_NewStringObj(msg, TCL_INDEX_NONE);
 	    *errorObjPtr = Tcl_NewListObj(3, errorStrings);
 	}
 	return TCL_PROCESS_ERROR;
@@ -256,9 +256,9 @@ WaitProcessStatus(
 	     */
 
 	    if (msgObjPtr) *msgObjPtr = Tcl_NewStringObj(
-		    "child process exited abnormally", -1);
+		    "child process exited abnormally", TCL_INDEX_NONE);
 	    if (errorObjPtr) {
-		errorStrings[0] = Tcl_NewStringObj("CHILDSTATUS", -1);
+		errorStrings[0] = Tcl_NewStringObj("CHILDSTATUS", TCL_INDEX_NONE);
 		TclNewIntObj(errorStrings[1], resolvedPid);
 		TclNewIntObj(errorStrings[2], WEXITSTATUS(waitStatus));
 		*errorObjPtr = Tcl_NewListObj(3, errorStrings);
@@ -277,10 +277,10 @@ WaitProcessStatus(
 	if (msgObjPtr) *msgObjPtr = Tcl_ObjPrintf(
 		"child killed: %s", msg);
 	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("CHILDKILLED", -1);
+	    errorStrings[0] = Tcl_NewStringObj("CHILDKILLED", TCL_INDEX_NONE);
 	    TclNewIntObj(errorStrings[1], resolvedPid);
-	    errorStrings[2] = Tcl_NewStringObj(Tcl_SignalId(WTERMSIG(waitStatus)), -1);
-	    errorStrings[3] = Tcl_NewStringObj(msg, -1);
+	    errorStrings[2] = Tcl_NewStringObj(Tcl_SignalId(WTERMSIG(waitStatus)), TCL_INDEX_NONE);
+	    errorStrings[3] = Tcl_NewStringObj(msg, TCL_INDEX_NONE);
 	    *errorObjPtr = Tcl_NewListObj(4, errorStrings);
 	}
 	return TCL_PROCESS_SIGNALED;
@@ -296,10 +296,10 @@ WaitProcessStatus(
 	if (msgObjPtr) *msgObjPtr = Tcl_ObjPrintf(
 		"child suspended: %s", msg);
 	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("CHILDSUSP", -1);
+	    errorStrings[0] = Tcl_NewStringObj("CHILDSUSP", TCL_INDEX_NONE);
 	    TclNewIntObj(errorStrings[1], resolvedPid);
-	    errorStrings[2] = Tcl_NewStringObj(Tcl_SignalId(WSTOPSIG(waitStatus)), -1);
-	    errorStrings[3] = Tcl_NewStringObj(msg, -1);
+	    errorStrings[2] = Tcl_NewStringObj(Tcl_SignalId(WSTOPSIG(waitStatus)), TCL_INDEX_NONE);
+	    errorStrings[3] = Tcl_NewStringObj(msg, TCL_INDEX_NONE);
 	    *errorObjPtr = Tcl_NewListObj(4, errorStrings);
 	}
 	return TCL_PROCESS_STOPPED;
@@ -312,12 +312,12 @@ WaitProcessStatus(
 
 	if (codePtr) *codePtr = waitStatus;
 	if (msgObjPtr) *msgObjPtr = Tcl_NewStringObj(
-		"child wait status didn't make sense\n", -1);
+		"child wait status didn't make sense\n", TCL_INDEX_NONE);
 	if (errorObjPtr) {
-	    errorStrings[0] = Tcl_NewStringObj("TCL", -1);
-	    errorStrings[1] = Tcl_NewStringObj("OPERATION", -1);
-	    errorStrings[2] = Tcl_NewStringObj("EXEC", -1);
-	    errorStrings[3] = Tcl_NewStringObj("ODDWAITRESULT", -1);
+	    errorStrings[0] = Tcl_NewStringObj("TCL", TCL_INDEX_NONE);
+	    errorStrings[1] = Tcl_NewStringObj("OPERATION", TCL_INDEX_NONE);
+	    errorStrings[2] = Tcl_NewStringObj("EXEC", TCL_INDEX_NONE);
+	    errorStrings[3] = Tcl_NewStringObj("ODDWAITRESULT", TCL_INDEX_NONE);
 	    TclNewIntObj(errorStrings[4], resolvedPid);
 	    *errorObjPtr = Tcl_NewListObj(5, errorStrings);
 	}
diff --git a/generic/tclScan.c b/generic/tclScan.c
index ee18174..6a5bfb7 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -397,9 +397,9 @@ ValidateFormat(
 	    invalidFieldSize:
 		buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
 		errorMsg = Tcl_NewStringObj(
-			"field size modifier may not be specified in %", -1);
-		Tcl_AppendToObj(errorMsg, buf, -1);
-		Tcl_AppendToObj(errorMsg, " conversion", -1);
+			"field size modifier may not be specified in %", TCL_INDEX_NONE);
+		Tcl_AppendToObj(errorMsg, buf, TCL_INDEX_NONE);
+		Tcl_AppendToObj(errorMsg, " conversion", TCL_INDEX_NONE);
 		Tcl_SetObjResult(interp, errorMsg);
 		Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADSIZE", NULL);
 		goto error;
@@ -452,15 +452,15 @@ ValidateFormat(
 	    break;
 	badSet:
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "unmatched [ in format string", -1));
+		    "unmatched [ in format string", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BRACKET", NULL);
 	    goto error;
 	default:
 	    buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
 	    errorMsg = Tcl_NewStringObj(
-		    "bad scan conversion character \"", -1);
-	    Tcl_AppendToObj(errorMsg, buf, -1);
-	    Tcl_AppendToObj(errorMsg, "\"", -1);
+		    "bad scan conversion character \"", TCL_INDEX_NONE);
+	    Tcl_AppendToObj(errorMsg, buf, TCL_INDEX_NONE);
+	    Tcl_AppendToObj(errorMsg, "\"", TCL_INDEX_NONE);
 	    Tcl_SetObjResult(interp, errorMsg);
 	    Tcl_SetErrorCode(interp, "TCL", "FORMAT", "BADTYPE", NULL);
 	    goto error;
@@ -531,7 +531,7 @@ ValidateFormat(
   badIndex:
     if (gotXpg) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"\"%n$\" argument index out of range", -1));
+		"\"%n$\" argument index out of range", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "FORMAT", "INDEXRANGE", NULL);
     } else {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -926,7 +926,7 @@ Tcl_ScanObjCmd(
 		    mp_int big;
 		    if (mp_init_u64(&big, (Tcl_WideUInt)wideValue) != MP_OKAY) {
 			Tcl_SetObjResult(interp, Tcl_NewStringObj(
-				"insufficient memory to create bignum", -1));
+				"insufficient memory to create bignum", TCL_INDEX_NONE));
 			Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 			return TCL_ERROR;
 		    } else {
@@ -953,7 +953,7 @@ Tcl_ScanObjCmd(
 			}
 			Tcl_DecrRefCount(objPtr);
 			Tcl_SetObjResult(interp, Tcl_NewStringObj(
-				"unsigned bignum scans are invalid", -1));
+				"unsigned bignum scans are invalid", TCL_INDEX_NONE));
 			Tcl_SetErrorCode(interp, "TCL", "FORMAT",
 				"BADUNSIGNED",NULL);
 			return TCL_ERROR;
@@ -972,7 +972,7 @@ Tcl_ScanObjCmd(
 		    mp_int big;
 		    if (mp_init_u64(&big, (unsigned long)value) != MP_OKAY) {
 			Tcl_SetObjResult(interp, Tcl_NewStringObj(
-				"insufficient memory to create bignum", -1));
+				"insufficient memory to create bignum", TCL_INDEX_NONE));
 			Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 			return TCL_ERROR;
 		    } else {
diff --git a/generic/tclVar.c b/generic/tclVar.c
index f7ec7c8..bc94e73 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -301,7 +301,7 @@ TclVarHashCreateVar(
     Tcl_Obj *keyPtr;
     Var *varPtr;
 
-    keyPtr = Tcl_NewStringObj(key, -1);
+    keyPtr = Tcl_NewStringObj(key, TCL_INDEX_NONE);
     Tcl_IncrRefCount(keyPtr);
     varPtr = VarHashCreateVar(tablePtr, keyPtr, newPtr);
     Tcl_DecrRefCount(keyPtr);
@@ -469,7 +469,7 @@ TclLookupVar(
 				 * is set to NULL. */
 {
     Var *varPtr;
-    Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, -1);
+    Tcl_Obj *part1Ptr = Tcl_NewStringObj(part1, TCL_INDEX_NONE);
 
     if (createPart1) {
 	Tcl_IncrRefCount(part1Ptr);
@@ -551,7 +551,7 @@ TclObjLookupVar(
     Var *resPtr;
 
     if (part2) {
-	part2Ptr = Tcl_NewStringObj(part2, -1);
+	part2Ptr = Tcl_NewStringObj(part2, TCL_INDEX_NONE);
 	if (createPart2) {
 	    Tcl_IncrRefCount(part2Ptr);
 	}
@@ -949,7 +949,7 @@ TclLookupSimpleVar(
 		return NULL;
 	    }
 	    if (tail != varName) {
-		tailPtr = Tcl_NewStringObj(tail, -1);
+		tailPtr = Tcl_NewStringObj(tail, TCL_INDEX_NONE);
 	    } else {
 		tailPtr = varNamePtr;
 	    }
@@ -1173,10 +1173,10 @@ Tcl_GetVar2(
 				 * bits. */
 {
     Tcl_Obj *resultPtr;
-    Tcl_Obj *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, -1);
+    Tcl_Obj *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, TCL_INDEX_NONE);
 
     if (part2) {
-	part2Ptr = Tcl_NewStringObj(part2, -1);
+	part2Ptr = Tcl_NewStringObj(part2, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(part2Ptr);
     }
 
@@ -1226,10 +1226,10 @@ Tcl_GetVar2Ex(
     int flags)			/* OR-ed combination of TCL_GLOBAL_ONLY, and
 				 * TCL_LEAVE_ERR_MSG bits. */
 {
-    Tcl_Obj *resPtr, *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, -1);
+    Tcl_Obj *resPtr, *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, TCL_INDEX_NONE);
 
     if (part2) {
-	part2Ptr = Tcl_NewStringObj(part2, -1);
+	part2Ptr = Tcl_NewStringObj(part2, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(part2Ptr);
     }
 
@@ -1547,7 +1547,7 @@ Tcl_SetVar2(
 				 * TCL_LEAVE_ERR_MSG. */
 {
     Tcl_Obj *varValuePtr = Tcl_SetVar2Ex(interp, part1, part2,
-	    Tcl_NewStringObj(newValue, -1), flags);
+	    Tcl_NewStringObj(newValue, TCL_INDEX_NONE), flags);
 
     if (varValuePtr == NULL) {
 	return NULL;
@@ -1607,11 +1607,11 @@ Tcl_SetVar2Ex(
 				 * TCL_APPEND_VALUE, TCL_LIST_ELEMENT or
 				 * TCL_LEAVE_ERR_MSG. */
 {
-    Tcl_Obj *resPtr, *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, -1);
+    Tcl_Obj *resPtr, *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, TCL_INDEX_NONE);
 
     Tcl_IncrRefCount(part1Ptr);
     if (part2) {
-	part2Ptr = Tcl_NewStringObj(part2, -1);
+	part2Ptr = Tcl_NewStringObj(part2, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(part2Ptr);
     }
 
@@ -2291,10 +2291,10 @@ Tcl_UnsetVar2(
 				 * TCL_LEAVE_ERR_MSG. */
 {
     int result;
-    Tcl_Obj *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, -1);
+    Tcl_Obj *part2Ptr = NULL, *part1Ptr = Tcl_NewStringObj(part1, TCL_INDEX_NONE);
 
     if (part2) {
-	part2Ptr = Tcl_NewStringObj(part2, -1);
+	part2Ptr = Tcl_NewStringObj(part2, TCL_INDEX_NONE);
     }
 
     /*
@@ -3070,7 +3070,7 @@ ArrayForNRCmd(
 
     if (numVars != 2) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"must have two variable names", -1));
+		"must have two variable names", TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "SYNTAX", "array", "for", NULL);
 	return TCL_ERROR;
     }
@@ -3168,7 +3168,7 @@ ArrayForLoopCallback(
 	Tcl_ResetResult(interp);
 	if (done == TCL_ERROR) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "array changed during iteration", -1));
+		    "array changed during iteration", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "READ", "array", "for", NULL);
 	    varPtr->flags |= TCL_LEAVE_ERR_MSG;
 	    result = done;
@@ -4048,7 +4048,7 @@ ArraySetCmd(
 	}
 	if (elemLen & 1) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "list must have an even number of elements", -1));
+		    "list must have an even number of elements", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "FORMAT", NULL);
 	    return TCL_ERROR;
 	}
@@ -4218,10 +4218,10 @@ ArrayStatsCmd(
     stats = Tcl_HashStats((Tcl_HashTable *) varPtr->value.tablePtr);
     if (stats == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"error reading array statistics", -1));
+		"error reading array statistics", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(stats, -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(stats, TCL_INDEX_NONE));
     Tcl_Free(stats);
     return TCL_OK;
 }
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 651c132..750d270 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -84,7 +84,7 @@ Pkgb_UnsafeObjCmd(
     (void)objc;
     (void)objv;
 
-    return Tcl_EvalEx(interp, "list unsafe command invoked", -1, TCL_EVAL_GLOBAL);
+    return Tcl_EvalEx(interp, "list unsafe command invoked", TCL_INDEX_NONE, TCL_EVAL_GLOBAL);
 }
 
 static int
diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c
index 8e9c829..582d457 100644
--- a/unix/dltest/pkgc.c
+++ b/unix/dltest/pkgc.c
@@ -81,7 +81,7 @@ Pkgc_UnsafeObjCmd(
     (void)objc;
     (void)objv;
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", TCL_INDEX_NONE));
     return TCL_OK;
 }
 
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
index 1b97d4c..52ba968 100644
--- a/unix/dltest/pkgd.c
+++ b/unix/dltest/pkgd.c
@@ -81,7 +81,7 @@ Pkgd_UnsafeObjCmd(
     (void)objc;
     (void)objv;
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", TCL_INDEX_NONE));
     return TCL_OK;
 }
 
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
index 26a4b79..5f0db9b 100644
--- a/unix/dltest/pkge.c
+++ b/unix/dltest/pkge.c
@@ -41,5 +41,5 @@ Pkge_Init(
     if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
-    return Tcl_EvalEx(interp, script, -1, 0);
+    return Tcl_EvalEx(interp, script, TCL_INDEX_NONE, 0);
 }
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index b205061..c9d7c45 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -1648,7 +1648,7 @@ SetPermissionsAttribute(
 	Tcl_Obj *modeObj;
 
 	TclNewLiteralStringObj(modeObj, "0o");
-	Tcl_AppendToObj(modeObj, modeStringPtr+scanned+1, -1);
+	Tcl_AppendToObj(modeObj, modeStringPtr+scanned+1, TCL_INDEX_NONE);
 	result = Tcl_GetWideIntFromObj(NULL, modeObj, &mode);
 	Tcl_DecrRefCount(modeObj);
     }
-- 
cgit v0.12


From 9d2cc36a0e82c13737990341fdb1bb9cb8fa68ca Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 5 Mar 2023 21:09:46 +0000
Subject: Fix [57bfcf43dd]: Remove unreachable code in Tcl_SetWideIntObj()

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

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 531a256..a6e7698 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3040,19 +3040,13 @@ Tcl_SetWideIntObj(
 	Tcl_Panic("%s called with shared object", "Tcl_SetWideIntObj");
     }
 
-    if ((wideValue >= (Tcl_WideInt) LONG_MIN)
-	    && (wideValue <= (Tcl_WideInt) LONG_MAX)) {
-	TclSetLongObj(objPtr, (long) wideValue);
-    } else {
 #ifndef TCL_WIDE_INT_IS_LONG
+    if ((wideValue < (Tcl_WideInt) LONG_MIN)
+	    || (wideValue > (Tcl_WideInt) LONG_MAX)) {
 	TclSetWideIntObj(objPtr, wideValue);
-#else
-	mp_int big;
-
-	TclBNInitBignumFromWideInt(&big, wideValue);
-	Tcl_SetBignumObj(objPtr, &big);
+    } else
 #endif
-    }
+    TclSetLongObj(objPtr, (long) wideValue);
 }
 
 /*
-- 
cgit v0.12


From 40e214cd76ab0f9fe274bb7a27b56a40194254f7 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 6 Mar 2023 06:58:13 +0000
Subject: Add new valgrind suppression items.

---
 tools/valgrind_suppress | 137 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/tools/valgrind_suppress b/tools/valgrind_suppress
index fb7f173..11ca880 100644
--- a/tools/valgrind_suppress
+++ b/tools/valgrind_suppress
@@ -1,3 +1,17 @@
+#{
+#    Tcl_GetChannelOption/TcpGetOptionProc/TcphostPortList/getnameinfo/gethostbyaddr_r
+#    Memcheck:Leak
+#    match-leak-kinds: reachable
+#    fun:malloc
+#    fun:strdup
+#    ...
+#    fun:module_load
+#    ...
+#    fun:getnameinfo
+#    ...
+#    fun:Tcl_GetChannelOption
+#}
+
 {
    TclCreatesocketAddress/getaddrinfo/calloc
    Memcheck:Leak
@@ -11,6 +25,16 @@
 {
    TclCreatesocketAddress/getaddrinfo/malloc
    Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   ...
+   fun:getaddrinfo
+   fun:TclCreateSocketAddress
+}
+
+{
+   TclCreatesocketAddress/getaddrinfo/malloc
+   Memcheck:Leak
    match-leak-kinds: reachable
    fun:malloc
    ...
@@ -19,6 +43,18 @@
 }
 
 {
+   TclpDlopen/decompose_rpath
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:decompose_rpath
+   ...
+   fun:dlopen_doit
+   ...
+   fun:TclpDlopen
+}
+
+{
    TclpDlopen/load
    Memcheck:Leak
    match-leak-kinds: reachable
@@ -72,6 +108,46 @@
 }
 
 {
+    TclpGeHostByName/gethostbyname_r/strdup/malloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    fun:strdup
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
+    TclpGeHostByName/gethostbyname_r/calloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:calloc
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
+    TclpGeHostByName/gethostbyname_r/malloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
    TclpGetPwNam/getpwname_r/__nss_next2/calloc
    Memcheck:Leak
    match-leak-kinds: reachable
@@ -105,6 +181,57 @@
 }
 
 {
+    TclpGetGrGid/getgrgid_r/module_load
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:calloc
+    ...
+    fun:module_load
+    ...
+    fun:TclpGetGrGid
+}
+
+{
+    TclpGetGrGid/getgrgid_r/module_load
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    ...
+    fun:module_load
+    ...
+    fun:TclpGetGrGid
+}
+
+{
+    TcphostPortList/getnameinfo/module_load/calloc
+    Memcheck:Leak
+    match-leak-kinds: definite,reachable
+    fun:calloc
+    ...
+    fun:dl_open_worker_begin
+    ...
+    fun:module_load
+    ...
+    fun:getnameinfo
+    fun:TcpHostPortList
+}
+
+{
+    # see sourceware glibc Bug 14984 - getnameinfo() might be leaking memory
+    TcphostPortList/getnameinfo/module_load/mallco
+    Memcheck:Leak
+    match-leak-kinds: definite,reachable
+    fun:malloc
+    ...
+    fun:dl_open_worker_begin
+    ...
+    fun:module_load
+    ...
+    fun:getnameinfo
+    fun:TcpHostPortList
+}
+
+{
 	TclpThreadExit/pthread_exit/calloc
     Memcheck:Leak
     match-leak-kinds: reachable
@@ -124,3 +251,13 @@
 	fun:TclpThreadExit
 }
 
+{
+	TclpThreadExit/pthread_exit/malloc
+    Memcheck:Leak
+    match-leak-kinds: definite
+	fun:malloc
+	...
+	fun:pthread_exit
+	fun:TclpThreadExit
+}
+
-- 
cgit v0.12


From fa795b478ac557afbf6511559553e279a046862a Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 6 Mar 2023 06:59:52 +0000
Subject: Add new valgrind suppression items.

---
 tools/valgrind_suppress | 137 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/tools/valgrind_suppress b/tools/valgrind_suppress
index fb7f173..11ca880 100644
--- a/tools/valgrind_suppress
+++ b/tools/valgrind_suppress
@@ -1,3 +1,17 @@
+#{
+#    Tcl_GetChannelOption/TcpGetOptionProc/TcphostPortList/getnameinfo/gethostbyaddr_r
+#    Memcheck:Leak
+#    match-leak-kinds: reachable
+#    fun:malloc
+#    fun:strdup
+#    ...
+#    fun:module_load
+#    ...
+#    fun:getnameinfo
+#    ...
+#    fun:Tcl_GetChannelOption
+#}
+
 {
    TclCreatesocketAddress/getaddrinfo/calloc
    Memcheck:Leak
@@ -11,6 +25,16 @@
 {
    TclCreatesocketAddress/getaddrinfo/malloc
    Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   ...
+   fun:getaddrinfo
+   fun:TclCreateSocketAddress
+}
+
+{
+   TclCreatesocketAddress/getaddrinfo/malloc
+   Memcheck:Leak
    match-leak-kinds: reachable
    fun:malloc
    ...
@@ -19,6 +43,18 @@
 }
 
 {
+   TclpDlopen/decompose_rpath
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:decompose_rpath
+   ...
+   fun:dlopen_doit
+   ...
+   fun:TclpDlopen
+}
+
+{
    TclpDlopen/load
    Memcheck:Leak
    match-leak-kinds: reachable
@@ -72,6 +108,46 @@
 }
 
 {
+    TclpGeHostByName/gethostbyname_r/strdup/malloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    fun:strdup
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
+    TclpGeHostByName/gethostbyname_r/calloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:calloc
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
+    TclpGeHostByName/gethostbyname_r/malloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
    TclpGetPwNam/getpwname_r/__nss_next2/calloc
    Memcheck:Leak
    match-leak-kinds: reachable
@@ -105,6 +181,57 @@
 }
 
 {
+    TclpGetGrGid/getgrgid_r/module_load
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:calloc
+    ...
+    fun:module_load
+    ...
+    fun:TclpGetGrGid
+}
+
+{
+    TclpGetGrGid/getgrgid_r/module_load
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    ...
+    fun:module_load
+    ...
+    fun:TclpGetGrGid
+}
+
+{
+    TcphostPortList/getnameinfo/module_load/calloc
+    Memcheck:Leak
+    match-leak-kinds: definite,reachable
+    fun:calloc
+    ...
+    fun:dl_open_worker_begin
+    ...
+    fun:module_load
+    ...
+    fun:getnameinfo
+    fun:TcpHostPortList
+}
+
+{
+    # see sourceware glibc Bug 14984 - getnameinfo() might be leaking memory
+    TcphostPortList/getnameinfo/module_load/mallco
+    Memcheck:Leak
+    match-leak-kinds: definite,reachable
+    fun:malloc
+    ...
+    fun:dl_open_worker_begin
+    ...
+    fun:module_load
+    ...
+    fun:getnameinfo
+    fun:TcpHostPortList
+}
+
+{
 	TclpThreadExit/pthread_exit/calloc
     Memcheck:Leak
     match-leak-kinds: reachable
@@ -124,3 +251,13 @@
 	fun:TclpThreadExit
 }
 
+{
+	TclpThreadExit/pthread_exit/malloc
+    Memcheck:Leak
+    match-leak-kinds: definite
+	fun:malloc
+	...
+	fun:pthread_exit
+	fun:TclpThreadExit
+}
+
-- 
cgit v0.12


From 296e4767eaa58abc7f46c676e80546de26a997a2 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 6 Mar 2023 07:00:48 +0000
Subject: Add new valgrind suppression items.

---
 tools/valgrind_suppress | 137 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/tools/valgrind_suppress b/tools/valgrind_suppress
index fb7f173..11ca880 100644
--- a/tools/valgrind_suppress
+++ b/tools/valgrind_suppress
@@ -1,3 +1,17 @@
+#{
+#    Tcl_GetChannelOption/TcpGetOptionProc/TcphostPortList/getnameinfo/gethostbyaddr_r
+#    Memcheck:Leak
+#    match-leak-kinds: reachable
+#    fun:malloc
+#    fun:strdup
+#    ...
+#    fun:module_load
+#    ...
+#    fun:getnameinfo
+#    ...
+#    fun:Tcl_GetChannelOption
+#}
+
 {
    TclCreatesocketAddress/getaddrinfo/calloc
    Memcheck:Leak
@@ -11,6 +25,16 @@
 {
    TclCreatesocketAddress/getaddrinfo/malloc
    Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   ...
+   fun:getaddrinfo
+   fun:TclCreateSocketAddress
+}
+
+{
+   TclCreatesocketAddress/getaddrinfo/malloc
+   Memcheck:Leak
    match-leak-kinds: reachable
    fun:malloc
    ...
@@ -19,6 +43,18 @@
 }
 
 {
+   TclpDlopen/decompose_rpath
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:decompose_rpath
+   ...
+   fun:dlopen_doit
+   ...
+   fun:TclpDlopen
+}
+
+{
    TclpDlopen/load
    Memcheck:Leak
    match-leak-kinds: reachable
@@ -72,6 +108,46 @@
 }
 
 {
+    TclpGeHostByName/gethostbyname_r/strdup/malloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    fun:strdup
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
+    TclpGeHostByName/gethostbyname_r/calloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:calloc
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
+    TclpGeHostByName/gethostbyname_r/malloc
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    ...
+    fun:dl_open_worker
+    ...
+    fun:do_dlopen
+    ...
+    fun:TclpGetHostByName
+}
+
+{
    TclpGetPwNam/getpwname_r/__nss_next2/calloc
    Memcheck:Leak
    match-leak-kinds: reachable
@@ -105,6 +181,57 @@
 }
 
 {
+    TclpGetGrGid/getgrgid_r/module_load
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:calloc
+    ...
+    fun:module_load
+    ...
+    fun:TclpGetGrGid
+}
+
+{
+    TclpGetGrGid/getgrgid_r/module_load
+    Memcheck:Leak
+    match-leak-kinds: reachable
+    fun:malloc
+    ...
+    fun:module_load
+    ...
+    fun:TclpGetGrGid
+}
+
+{
+    TcphostPortList/getnameinfo/module_load/calloc
+    Memcheck:Leak
+    match-leak-kinds: definite,reachable
+    fun:calloc
+    ...
+    fun:dl_open_worker_begin
+    ...
+    fun:module_load
+    ...
+    fun:getnameinfo
+    fun:TcpHostPortList
+}
+
+{
+    # see sourceware glibc Bug 14984 - getnameinfo() might be leaking memory
+    TcphostPortList/getnameinfo/module_load/mallco
+    Memcheck:Leak
+    match-leak-kinds: definite,reachable
+    fun:malloc
+    ...
+    fun:dl_open_worker_begin
+    ...
+    fun:module_load
+    ...
+    fun:getnameinfo
+    fun:TcpHostPortList
+}
+
+{
 	TclpThreadExit/pthread_exit/calloc
     Memcheck:Leak
     match-leak-kinds: reachable
@@ -124,3 +251,13 @@
 	fun:TclpThreadExit
 }
 
+{
+	TclpThreadExit/pthread_exit/malloc
+    Memcheck:Leak
+    match-leak-kinds: definite
+	fun:malloc
+	...
+	fun:pthread_exit
+	fun:TclpThreadExit
+}
+
-- 
cgit v0.12


From cfa443421bcf235f75def81bc137774aa0f20387 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 6 Mar 2023 10:24:15 +0000
Subject: Tcl_WinTCharToUtf() is deprecated, so use Tcl_WCharToUtfDString() in
 stead.

---
 win/tclWinFile.c | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index a54077d..c7159b7 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -1476,24 +1476,22 @@ TclpGetUserHome(
          */
 	ptr = TclpGetUserName(&ds);
 	if (ptr != NULL && strcasecmp(name, ptr) == 0) {
-            HANDLE hProcess;
-            WCHAR buf[MAX_PATH];
-            DWORD nChars = sizeof(buf) / sizeof(buf[0]);
-            /* Sadly GetCurrentProcessToken not in Win 7 so slightly longer */
-            hProcess = GetCurrentProcess(); /* Need not be closed */
-            if (hProcess) {
-                HANDLE hToken;
-                if (OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) {
-                    if (GetUserProfileDirectoryW(hToken, buf, &nChars)) {
-                        Tcl_WinTCharToUtf((TCHAR *)buf,
-                                          (nChars-1)*sizeof(WCHAR),
-                                          bufferPtr);
-                        result = Tcl_DStringValue(bufferPtr);
-                        rc = 1;
-                    }
-                    CloseHandle(hToken);
-                }
-            }
+	    HANDLE hProcess;
+	    WCHAR buf[MAX_PATH];
+	    DWORD nChars = sizeof(buf) / sizeof(buf[0]);
+	    /* Sadly GetCurrentProcessToken not in Win 7 so slightly longer */
+	    hProcess = GetCurrentProcess(); /* Need not be closed */
+	    if (hProcess) {
+		HANDLE hToken;
+		if (OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) {
+		    if (GetUserProfileDirectoryW(hToken, buf, &nChars)) {
+			Tcl_DStringInit(bufferPtr);
+			result = Tcl_WCharToUtfDString(buf, nChars-1, (bufferPtr));
+			rc = 1;
+		    }
+		    CloseHandle(hToken);
+		}
+	    }
 	}
 	Tcl_DStringFree(&ds);
     } else {
-- 
cgit v0.12


From 3eb68691b82d5c02de6081180225f886b140926c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 6 Mar 2023 10:30:41 +0000
Subject: ckfree() -> Tcl_Free()

---
 generic/tclTest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 6399e37..06d5064 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1197,7 +1197,7 @@ CmdDelProc0(
 	}
 	prevRefPtr = thisRefPtr;
     }
-    ckfree(refPtr);
+    Tcl_Free(refPtr);
 }
 
 static void
-- 
cgit v0.12


From 5e095a3a4d445694e0a618ed20fe92d8fd34b637 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 6 Mar 2023 18:17:19 +0000
Subject: [b4af93cd9f] Proposed fix from apnadkarni.  It works!

---
 unix/tclUnixSock.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 70dfc61..0be10ad 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1033,10 +1033,10 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'k') &&
 	    (strncmp(optionName, "-keepalive", len) == 0))) {
+	int opt = 0;
 #if defined(SO_KEEPALIVE)
-	socklen_t size;
+	socklen_t size = sizeof(opt);
 #endif
-	int opt = 0;
 
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-keepalive");
@@ -1053,10 +1053,10 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
 	    (strncmp(optionName, "-nodelay", len) == 0))) {
+	int opt = 0;
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
-	socklen_t size;
+	socklen_t size = sizeof(opt);
 #endif
-	int opt = 0;
 
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-nodelay");
-- 
cgit v0.12


From f4450abcf989ed7ce06a977c8c12483762f00512 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 6 Mar 2023 19:58:53 +0000
Subject: Proposed fix for [f3cb2a32d6]: uninitialized value in format-2.18

---
 generic/tclStringObj.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 723d2e5..328e410 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -4849,6 +4849,7 @@ ExtendStringRepWithUnicode(
 
   copyBytes:
     dst = objPtr->bytes + origLength;
+    *dst = '\0';
     for (i = 0; i < numChars; i++) {
 	dst += Tcl_UniCharToUtf(unicode[i], dst);
     }
-- 
cgit v0.12


From f5ba8a8478a966af91228ad54eb264c04c21b11d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 6 Mar 2023 21:01:45 +0000
Subject: Proposed fix for [95e287b956]: uninit value use in stringObj-4.2

---
 tests/stringObj.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/stringObj.test b/tests/stringObj.test
index dce932b..da379ba 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -66,8 +66,8 @@ test stringObj-4.2 {Tcl_SetObjLength procedure, string gets longer} testobj {
     testobj freeallvars
     teststringobj set 1 abcdef
     teststringobj setlength 1 10
-    list [teststringobj length 1] [teststringobj length2 1]
-} {10 10}
+    list [teststringobj length 1]
+} 10
 test stringObj-4.3 {Tcl_SetObjLength procedure, string gets longer} testobj {
     testobj freeallvars
     teststringobj set 1 abcdef
-- 
cgit v0.12

-- 
cgit v0.12


From 1f6cec5ff3943450001a29bea3371dea9f23db7f Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 7 Mar 2023 02:52:26 +0000
Subject: Fix testchmod and associated tests that always failed on Windows

---
 tests/fCmd.test    |  18 ++-
 tests/tcltest.test |   2 +-
 tests/winFCmd.test | 112 ++++++++++---------
 win/tclWinTest.c   | 316 ++++++++++++++++++++++++++++-------------------------
 4 files changed, 239 insertions(+), 209 deletions(-)

diff --git a/tests/fCmd.test b/tests/fCmd.test
index dad1af9..ecb1d04 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -1065,6 +1065,7 @@ test fCmd-10.3.1 {file copy: comprehensive: dir to new name} -setup {
     file mkdir [file join td1 tdx]
     file mkdir [file join td2 tdy]
     testchmod 0o555 td2
+    testchmod 0o555 td2/tdy; # Above line removes inherited perms. So restore.
     file copy td1 td3
     file copy td2 td4
     list [lsort [glob td*]] [glob -directory td3 t*] \
@@ -1086,10 +1087,19 @@ test fCmd-10.4 {file copy: comprehensive: file to existing file} -setup {
     createfile tfd2
     createfile tfd3
     createfile tfd4
-    testchmod 0o444 tfs3
-    testchmod 0o444 tfs4
-    testchmod 0o444 tfd2
-    testchmod 0o444 tfd4
+    if {$::tcl_platform(platform) eq "windows"} {
+        # On Windows testchmode will attach an ACL which file copy cannot handle
+        # so use good old attributes which file copy does understand
+        file attribute tfs3 -readonly 1
+        file attribute tfs4 -readonly 1
+        file attribute tfd2 -readonly 1
+        file attribute tfd4 -readonly 1
+    } else {
+        testchmod 0o444 tfs3
+        testchmod 0o444 tfs4
+        testchmod 0o444 tfd2
+        testchmod 0o444 tfd4
+    }
     set msg [list [catch {file copy tf1 tf2} msg] $msg]
     file copy -force tfs1 tfd1
     file copy -force tfs2 tfd2
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 8a0174d..9da14de 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -552,7 +552,7 @@ switch -- $::tcl_platform(platform) {
     default {
 	# note in FAT/NTFS we won't be able to protect directory with read-only attribute...
 	catch {file attributes $notWriteableDir -readonly 1}
-	catch {testchmod 0 $notWriteableDir}
+	catch {testchmod 0o444 $notWriteableDir}
     }
 }
 test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 500b114..b146253 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -47,15 +47,20 @@ proc contents {file} {
     set r
 }
 
+proc cleanupRecurse {args} {
+    # Assumes no loops via links!
+    # Need to change permissions BEFORE deletion
+    testchmod 0o777 {*}$args
+    foreach victim $args {
+        if {[file isdirectory $victim]} {
+            cleanupRecurse {*}[glob -nocomplain -directory $victim td* tf* Test*]
+        }
+        file delete -force $victim
+    }
+}
 proc cleanup {args} {
-    foreach p ". $args" {
-	set x ""
-	catch {
-	    set x [glob -directory $p tf* td*]
-	}
-	if {$x != ""} {
-	    catch {file delete -force -- {*}$x}
-	}
+    foreach p [list [pwd] {*}$args] {
+        cleanupRecurse {*}[glob -nocomplain -directory $p tf* td*]
     }
 }
 
@@ -415,12 +420,12 @@ test winFCmd-1.38 {TclpRenameFile: check rename of conflicting inodes} -setup {
     cleanup
 } -constraints {win winNonZeroInodes notInCIenv} -body {
     file mkdir td1
-    foreach {a b} [MakeFiles td1] break
+    lassign [MakeFiles td1] a b
     file rename -force $a $b
     file exists $a
 } -cleanup {
     cleanup
-} -result {0}
+} -result 0
 
 
 test winFCmd-2.1 {TclpCopyFile: errno: EACCES} -setup {
@@ -496,11 +501,11 @@ test winFCmd-2.12 {TclpCopyFile: CopyFile succeeds} -setup {
     cleanup
 } -constraints {win testfile} -body {
     createfile tf1 tf1
-    testchmod 0 tf1
+    file attribute tf1 -readonly 1
     testfile cp tf1 tf2
     list [contents tf2] [file writable tf2]
 } -cleanup {
-    catch {testchmod 0o666 tf1}
+    testchmod 0o660 tf1
     cleanup
 } -result {tf1 0}
 test winFCmd-2.13 {TclpCopyFile: CopyFile fails} -setup {
@@ -542,11 +547,10 @@ test winFCmd-2.17 {TclpCopyFile: dst is readonly} -setup {
 } -constraints {win testfile testchmod} -body {
     createfile tf1 tf1
     createfile tf2 tf2
-    testchmod 0 tf2
+    file attribute tf2 -readonly 1
     testfile cp tf1 tf2
     list [file writable tf2] [contents tf2]
 } -cleanup {
-    catch {testchmod 0o666 tf2}
     cleanup
 } -result {1 tf1}
 
@@ -624,7 +628,6 @@ test winFCmd-3.11 {TclpDeleteFile: still can't remove path} -setup {
     testfile rm tf1
 } -cleanup {
     close $fd
-    catch {testchmod 0o666 tf1}
     cleanup
 } -returnCodes error -result EACCES
 
@@ -664,14 +667,17 @@ test winFCmd-5.1 {TclpCopyDirectory: calls TraverseWinTree} -setup {
 test winFCmd-6.1 {TclpRemoveDirectory: errno: EACCES} -setup {
     cleanup
 } -constraints {winVista testfile testchmod notInCIenv} -body {
-    file mkdir td1
-    testchmod 0 td1
-    testfile rmdir td1
-    file exists td1
+    # Parent's FILE_DELETE_CHILD setting permits deletion of subdir
+    # even when subdir DELETE mask is clear. So we need an intermediate
+    # parent td0 with FILE_DELETE_CHILD turned off while allowing R/W.
+    file mkdir td0/td1
+    testchmod 0o777 td0
+    testchmod 0 td0/td1
+    testfile rmdir td0/td1
+    file exists td0/td1
 } -returnCodes error -cleanup {
-    catch {testchmod 0o666 td1}
     cleanup
-} -result {td1 EACCES}
+} -result {td0/td1 EACCES}
 # This next test has a very hokey way of matching...
 test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} -setup {
     cleanup
@@ -679,7 +685,7 @@ test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} -setup {
     file mkdir td1/td2
     list [catch {testfile rmdir td1} msg] [file tail $msg]
 } -result {1 {td1 EEXIST}}
-test winFCmd-6.3 {TclpRemoveDirectory: errno: EACCES} {win emptyTest} {
+test winFCmd-6.3 {TclpRemoveDirectory: errno: EACCES} {win emptyTest trashSystem} {
     # can't test this w/o removing everything on your hard disk first!
     # testfile rmdir /
 } {}
@@ -715,17 +721,7 @@ test winFCmd-6.8 {TclpRemoveDirectory: RemoveDirectory fails} -setup {
     createfile tf1
     list [catch {testfile rmdir tf1} msg] [file tail $msg]
 } -result {1 {tf1 ENOTDIR}}
-test winFCmd-6.9 {TclpRemoveDirectory: errno == EACCES} -setup {
-    cleanup
-} -constraints {winVista testfile testchmod notInCIenv} -body {
-    file mkdir td1
-    testchmod 0 td1
-    testfile rmdir td1
-    file exists td1
-} -returnCodes error -cleanup {
-    catch {testchmod 0o666 td1}
-    cleanup
-} -result {td1 EACCES}
+# winFCmd-6.9 removed - was exact dup of winFCmd-6.1
 test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} -setup {
     cleanup
 } -constraints {win nt testfile} -body {
@@ -736,14 +732,18 @@ test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} -setup {
 test winFCmd-6.13 {TclpRemoveDirectory: write-protected} -setup {
     cleanup
 } -constraints {winVista testfile testchmod notInCIenv} -body {
-    file mkdir td1
-    testchmod 0 td1
-    testfile rmdir td1
-    file exists td1
-} -cleanup {
-    catch {testchmod 0o666 td1}
-    cleanup
-} -returnCodes error -result {td1 EACCES}
+    # Parent's FILE_DELETE_CHILD setting permits deletion of subdir
+    # even when subdir DELETE mask is clear. So we need an intermediate
+    # parent td0 with FILE_DELETE_CHILD turned off while allowing R/W.
+    file mkdir td0/td1
+    testchmod 0o770 td0
+    testchmod 0o444 td0/td1
+    testfile rmdir td0/td1
+    file exists td0/td1
+} -cleanup {
+    testchmod 0o770 td0/td1
+    cleanup
+} -returnCodes error -result {td0/td1 EACCES}
 # This next test has a very hokey way of matching...
 test winFCmd-6.15 {TclpRemoveDirectory: !recursive} -setup {
     cleanup
@@ -837,11 +837,12 @@ test winFCmd-7.11 {TraverseWinTree: call TraversalCopy: DOTREE_PRED} -setup {
 } -constraints {win testfile testchmod} -body {
     file mkdir td1
     createfile td1/tf1 tf1
-    testchmod 0 td1
+    testchmod 0o770 td1/tf1; # Else tf2 will have no ACL after td1 testchmod
+    testchmod 0o400 td1
     testfile cpdir td1 td2
     list [file exists td2] [file writable td2]
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o660 td1
     cleanup
 } -result {1 1}
 test winFCmd-7.12 {TraverseWinTree: call TraversalDelete: DOTREE_PRED} -setup {
@@ -908,11 +909,12 @@ test winFCmd-7.19 {TraverseWinTree: call TraversalCopy: DOTREE_POSTD} -setup {
 } -constraints {win testfile testchmod} -body {
     file mkdir td1
     createfile td1/tf1 tf1
-    testchmod 0 td1
+    testchmod 0o770 td1/tf1; # Else tf2 will have no ACL after td1 testchmod
+    testchmod 0o400 td1
     testfile cpdir td1 td2
     list [file exists td2] [file writable td2]
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o660 td1
     cleanup
 } -result {1 1}
 test winFCmd-7.20 {TraverseWinTree: call TraversalDelete: DOTREE_POSTD} -setup {
@@ -939,11 +941,12 @@ test winFCmd-8.2 {TraversalCopy: DOTREE_PRED} -setup {
     cleanup
 } -constraints {win testfile testchmod} -body {
     file mkdir td1/td2
-    testchmod 0 td1
+    testchmod 0o770 td1/td2; # Else td2 will have no ACL after td1 testchmod
+    testchmod 0o400 td1
     testfile cpdir td1 td2
     list [file writable td1] [file writable td1/td2]
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o660 td1
     cleanup
 } -result {0 1}
 test winFCmd-8.3 {TraversalCopy: DOTREE_POSTD} -setup {
@@ -965,14 +968,18 @@ test winFCmd-9.1 {TraversalDelete: DOTREE_F} -setup {
 test winFCmd-9.3 {TraversalDelete: DOTREE_PRED} -setup {
     cleanup
 } -constraints {winVista testfile testchmod notInCIenv} -body {
-    file mkdir td1/td2
-    testchmod 0 td1
-    testfile rmdir -force td1
+    # Parent's FILE_DELETE_CHILD setting permits deletion of subdir
+    # even when subdir DELETE mask is clear. So we need an intermediate
+    # parent td0 with FILE_DELETE_CHILD turned off while allowing R/W.
+    file mkdir td0/td1/td2
+    testchmod 0o770 td0
+    testchmod 0o400 td0/td1
+    testfile rmdir -force td0/td1
     file exists td1
 } -cleanup {
-    catch {testchmod 0o666 td1}
+    testchmod 0o770 td0/td1
     cleanup
-} -returnCodes error -result {td1 EACCES}
+} -returnCodes error -result {td0/td1 EACCES}
 test winFCmd-9.4 {TraversalDelete: DOTREE_POSTD} -setup {
     cleanup
 } -constraints {win testfile} -body {
@@ -1471,7 +1478,6 @@ test winFCmd-19.9 {Windows devices path names} -constraints {win nt} -body {
 #    }
 #}
 
-# cleanup
 cleanup
 ::tcltest::cleanupTests
 return
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 357bbc5..0b4c8f6 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -17,9 +17,8 @@
 /*
  * For TestplatformChmod on Windows
  */
-#ifdef _WIN32
 #include <aclapi.h>
-#endif
+#include <sddl.h>
 
 /*
  * MinGW 3.4.2 does not define this.
@@ -416,176 +415,190 @@ TestExceptionCmd(
     return TCL_OK;
 }
 
+/*
+ * This "chmod" works sufficiently for test script purposes. Do not expect
+ * it to be exact emulation of Unix chmod (not sure if that's even possible)
+ */
 static int
 TestplatformChmod(
     const char *nativePath,
     int pmode)
 {
-    static const SECURITY_INFORMATION infoBits = OWNER_SECURITY_INFORMATION
-	    | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
-    /* don't reset change permissions mask (WRITE_DAC, allow test-cases restore it to cleanup) */
-    static const DWORD readOnlyMask = FILE_DELETE_CHILD | FILE_ADD_FILE
-	    | FILE_ADD_SUBDIRECTORY | FILE_WRITE_EA | FILE_APPEND_DATA
-	    | FILE_WRITE_DATA
-	    | DELETE;
-
-    /*
-     * References to security functions (only available on NT and later).
+    /* 
+     * Note FILE_DELETE_CHILD missing from dirWriteMask because we do
+     * not want overriding of child's delete setting when testing
      */
-
-    const BOOL set_readOnly = !(pmode & 0222);
-    BOOL acl_readOnly_found = FALSE, curAclPresent, curAclDefaulted;
-    SID_IDENTIFIER_AUTHORITY userSidAuthority = {
-	SECURITY_WORLD_SID_AUTHORITY
-    };
-    BYTE *secDesc = 0;
-    DWORD secDescLen, attr, newAclSize;
-    ACL_SIZE_INFORMATION ACLSize;
-    PACL curAcl, newAcl = 0;
-    WORD j;
-    SID *userSid = 0;
-    char *userDomain = 0;
+    static const DWORD dirWriteMask =
+	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA |
+	FILE_ADD_FILE | FILE_ADD_SUBDIRECTORY | STANDARD_RIGHTS_WRITE | DELETE |
+	SYNCHRONIZE;
+    static const DWORD dirReadMask = 
+	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_LIST_DIRECTORY |
+	STANDARD_RIGHTS_READ | SYNCHRONIZE;
+    /* Note - default user privileges allow ignoring TRAVERSE setting */
+    static const DWORD dirExecuteMask =
+	FILE_TRAVERSE | STANDARD_RIGHTS_READ | SYNCHRONIZE;
+
+    static const DWORD fileWriteMask =
+	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_WRITE_DATA |
+	FILE_APPEND_DATA | STANDARD_RIGHTS_WRITE | DELETE | SYNCHRONIZE;
+    static const DWORD fileReadMask = 
+	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_READ_DATA |
+	STANDARD_RIGHTS_READ | SYNCHRONIZE;
+    static const DWORD fileExecuteMask =
+	FILE_EXECUTE | STANDARD_RIGHTS_READ | SYNCHRONIZE;
+
+    DWORD attr, newAclSize;
+    PACL newAcl = NULL;
     int res = 0;
-
-    /*
-     * Process the chmod request.
-     */
+    SID_IDENTIFIER_AUTHORITY worldAuthority = SECURITY_WORLD_SID_AUTHORITY;
+
+    HANDLE hToken = NULL;
+    int i;
+    int nSids = 0;
+    struct {
+	PSID pSid;
+	DWORD mask;
+	DWORD sidLen;
+    } aceEntry[3];
+    DWORD dw;
+    int isDir;
+    TOKEN_USER *pTokenUser = NULL;
+
+    res = -1; /* Assume failure */
 
     attr = GetFileAttributesA(nativePath);
-
-    /*
-     * nativePath not found
-     */
-
     if (attr == 0xFFFFFFFF) {
-	res = -1;
-	goto done;
+	goto done; /* Not found */
     }
 
-    /*
-     * If nativePath is not a directory, there is no special handling.
-     */
+    isDir = (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
 
-    if (!(attr & FILE_ATTRIBUTE_DIRECTORY)) {
+    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) {
 	goto done;
     }
-
-    /*
-     * Set the result to error, if the ACL change is successful it will be
-     * reset to 0.
-     */
-
-    res = -1;
-
-    /*
-     * Read the security descriptor for the directory. Note the first call
-     * obtains the size of the security descriptor.
-     */
-
-    if (!GetFileSecurityA(nativePath, infoBits, NULL, 0, &secDescLen)) {
-	DWORD secDescLen2 = 0;
-
-	if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-	    goto done;
-	}
-
-	secDesc = ckalloc(secDescLen);
-	if (!GetFileSecurityA(nativePath, infoBits,
-		(PSECURITY_DESCRIPTOR) secDesc, secDescLen, &secDescLen2)
-		|| (secDescLen < secDescLen2)) {
-	    goto done;
-	}
-    }
-
-    /*
-     * Get the World SID.
-     */
-
-    userSid = ckalloc(GetSidLengthRequired((UCHAR) 1));
-    InitializeSid(userSid, &userSidAuthority, (BYTE) 1);
-    *(GetSidSubAuthority(userSid, 0)) = SECURITY_WORLD_RID;
-
-    /*
-     * If curAclPresent == false then curAcl and curAclDefaulted not valid.
-     */
-
-    if (!GetSecurityDescriptorDacl((PSECURITY_DESCRIPTOR) secDesc,
-	    &curAclPresent, &curAcl, &curAclDefaulted)) {
+    
+    /* Get process SID */
+    if (!GetTokenInformation(hToken, TokenUser, NULL, 0, &dw) &&
+	GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	goto done;
     }
-    if (!curAclPresent || !curAcl) {
-	ACLSize.AclBytesInUse = 0;
-	ACLSize.AceCount = 0;
-    } else if (!GetAclInformation(curAcl, &ACLSize, sizeof(ACLSize),
-	    AclSizeInformation)) {
+    pTokenUser = ckalloc(dw);
+    if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dw, &dw)) {
 	goto done;
     }
-
-    /*
-     * Allocate memory for the new ACL.
-     */
-
-    newAclSize = ACLSize.AclBytesInUse + sizeof(ACCESS_DENIED_ACE)
-	    + GetLengthSid(userSid) - sizeof(DWORD);
-    newAcl = ckalloc(newAclSize);
-
-    /*
-     * Initialize the new ACL.
-     */
-
-    if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
+    aceEntry[nSids].sidLen = GetLengthSid(pTokenUser->User.Sid);
+    aceEntry[nSids].pSid = ckalloc(aceEntry[nSids].sidLen);
+    if (!CopySid(aceEntry[nSids].sidLen,
+		 aceEntry[nSids].pSid,
+		 pTokenUser->User.Sid)) {
+	ckfree(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
 	goto done;
     }
-
-    /*
-     * Add denied to make readonly, this will be known as a "read-only tag".
+    /* 
+     * Always include DACL modify rights so we don't get locked out
      */
-
-    if (set_readOnly && !AddAccessDeniedAce(newAcl, ACL_REVISION,
-	    readOnlyMask, userSid)) {
-	goto done;
+    aceEntry[nSids].mask = READ_CONTROL | WRITE_DAC | WRITE_OWNER | SYNCHRONIZE |
+			   FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES;
+    if (pmode & 0700) {
+	/* Owner permissions. Assumes current process is owner */
+	if (pmode & 0400) {
+	    aceEntry[nSids].mask |= isDir ? dirReadMask : fileReadMask;
+	}
+	if (pmode & 0200) {
+	    aceEntry[nSids].mask |= isDir ? dirWriteMask : fileWriteMask;
+	}
+	if (pmode & 0100) {
+	    aceEntry[nSids].mask |= isDir ? dirExecuteMask : fileExecuteMask;
+	}
     }
+    ++nSids;
+
+    if (pmode & 0070) {
+	/* Group permissions. */
 
-    acl_readOnly_found = FALSE;
-    for (j = 0; j < ACLSize.AceCount; j++) {
-	LPVOID pACE2;
-	ACE_HEADER *phACE2;
+	TOKEN_PRIMARY_GROUP *pTokenGroup;
 
-	if (!GetAce(curAcl, j, &pACE2)) {
+	/* Get primary group SID */
+	if (!GetTokenInformation(
+		hToken, TokenPrimaryGroup, NULL, 0, &dw) &&
+		GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	    goto done;
 	}
+	pTokenGroup = ckalloc(dw);
+	if (!GetTokenInformation(hToken, TokenPrimaryGroup, pTokenGroup, dw, &dw)) {
+	    ckfree(pTokenGroup);
+	    goto done;
+	}
+	aceEntry[nSids].sidLen = GetLengthSid(pTokenGroup->PrimaryGroup);
+	aceEntry[nSids].pSid = ckalloc(aceEntry[nSids].sidLen);
+	if (!CopySid(aceEntry[nSids].sidLen, aceEntry[nSids].pSid, pTokenGroup->PrimaryGroup)) {
+	    ckfree(pTokenGroup);
+	    ckfree(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
+	    goto done;
+	}
+	ckfree(pTokenGroup);
 
-	phACE2 = (ACE_HEADER *) pACE2;
+	/* Generate mask for group ACL */
 
-	/*
-	 * Do NOT propagate inherited ACEs.
-	 */
-
-	if (phACE2->AceFlags & INHERITED_ACE) {
-	    continue;
+	aceEntry[nSids].mask = 0;
+	if (pmode & 0040) {
+	    aceEntry[nSids].mask |= isDir ? dirReadMask : fileReadMask;
+	}
+	if (pmode & 0020) {
+	    aceEntry[nSids].mask |= isDir ? dirWriteMask : fileWriteMask;
+	}
+	if (pmode & 0010) {
+	    aceEntry[nSids].mask |= isDir ? dirExecuteMask : fileExecuteMask;
 	}
+	++nSids;
+    }
 
-	/*
-	 * Skip the "read-only tag" restriction (either added above, or it is
-	 * being removed).
-	 */
+    if (pmode & 0007) {
+	/* World permissions */
+	PSID pWorldSid;
+	if (!ConvertStringSidToSidA("S-1-1-0", &pWorldSid)) {
+	    goto done;
+	}
+	aceEntry[nSids].sidLen = GetLengthSid(pWorldSid);
+	aceEntry[nSids].pSid = ckalloc(aceEntry[nSids].sidLen);
+	if (!CopySid(aceEntry[nSids].sidLen, aceEntry[nSids].pSid, pWorldSid)) {
+	    LocalFree(pWorldSid);
+	    ckfree(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
+	    goto done;
+	}
+	LocalFree(pWorldSid);
 
-	if (phACE2->AceType == ACCESS_DENIED_ACE_TYPE) {
-	    ACCESS_DENIED_ACE *pACEd = (ACCESS_DENIED_ACE *) phACE2;
+	/* Generate mask for world ACL */
 
-	    if (pACEd->Mask == readOnlyMask
-		    && EqualSid(userSid, (PSID) &pACEd->SidStart)) {
-		acl_readOnly_found = TRUE;
-		continue;
-	    }
+	aceEntry[nSids].mask = 0;
+	if (pmode & 0004) {
+	    aceEntry[nSids].mask |= isDir ? dirReadMask : fileReadMask;
 	}
+	if (pmode & 0002) {
+	    aceEntry[nSids].mask |= isDir ? dirWriteMask : fileWriteMask;
+	}
+	if (pmode & 0001) {
+	    aceEntry[nSids].mask |= isDir ? dirExecuteMask : fileExecuteMask;
+	}
+	++nSids;
+    }
 
-	/*
-	 * Copy the current ACE from the old to the new ACL.
-	 */
+    /* Allocate memory and initialize the new ACL. */
 
-	if (!AddAce(newAcl, ACL_REVISION, MAXDWORD, (PACL *) pACE2,
-		((PACE_HEADER) pACE2)->AceSize)) {
+    newAclSize = sizeof(ACL);
+    /* Add in size required for each ACE entry in the ACL */
+    for (i = 0; i < nSids; ++i) {
+	newAclSize +=
+	    offsetof(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen;
+    }
+    newAcl = ckalloc(newAclSize);
+    if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
+	goto done;
+    }
+
+    for (i = 0; i < nSids; ++i) {
+	if (!AddAccessAllowedAce(newAcl, ACL_REVISION, aceEntry[i].mask, aceEntry[i].pSid)) {
 	    goto done;
 	}
     }
@@ -595,35 +608,36 @@ TestplatformChmod(
      * to remove inherited ACL (we need to overwrite the default ACL's in this case)
      */
 
-    if (set_readOnly == acl_readOnly_found || SetNamedSecurityInfoA(
-	    (LPSTR) nativePath, SE_FILE_OBJECT,
-	    DACL_SECURITY_INFORMATION /*| PROTECTED_DACL_SECURITY_INFORMATION*/,
-	    NULL, NULL, newAcl, NULL) == ERROR_SUCCESS) {
+    if (SetNamedSecurityInfoA((LPSTR)nativePath,
+			      SE_FILE_OBJECT,
+			      DACL_SECURITY_INFORMATION |
+				  PROTECTED_DACL_SECURITY_INFORMATION,
+			      NULL,
+			      NULL,
+			      newAcl,
+			      NULL) == ERROR_SUCCESS) {
 	res = 0;
     }
 
   done:
-    if (secDesc) {
-	ckfree(secDesc);
+    if (pTokenUser) {
+	ckfree(pTokenUser);
+    }
+    if (hToken) {
+	CloseHandle(hToken);
     }
     if (newAcl) {
 	ckfree(newAcl);
     }
-    if (userSid) {
-	ckfree(userSid);
-    }
-    if (userDomain) {
-	ckfree(userDomain);
+    for (i = 0; i < nSids; ++i) {
+	ckfree(aceEntry[i].pSid);
     }
 
     if (res != 0) {
 	return res;
     }
 
-    /*
-     * Run normal chmod command.
-     */
-
+    /* Run normal chmod command */
     return chmod(nativePath, pmode);
 }
 
-- 
cgit v0.12


From 5cf1eed9106acd1a6e751b414506b0e38f6a79a7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 7 Mar 2023 17:56:45 +0000
Subject: Fix a few -Wconversion warnings

---
 generic/tclDecls.h  |  2 +-
 win/tclWin32Dll.c   |  8 +++---
 win/tclWinChan.c    | 47 +++++++++++++++++++---------------
 win/tclWinConsole.c | 20 ++++++++++-----
 win/tclWinFile.c    | 74 ++++++++++++++++++++++++++---------------------------
 5 files changed, 81 insertions(+), 70 deletions(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8fc926c..6c109de 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4042,7 +4042,7 @@ extern const TclStubs *tclStubsPtr;
 		    _t.reserved = -1; \
 		    tclStubsPtr->tcl_GetTime((&_t.now)); \
 		    if (_t.reserved != -1) { \
-			_t.now.usec = _t.reserved; \
+			_t.now.usec = (long) _t.reserved; \
 		    } \
 		    *(t) = _t.now; \
 		} while (0)
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 9e83b46..d418b56 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -433,7 +433,7 @@ TclWinDriveLetterForVolMountPoint(
 	    if (!alreadyStored) {
 		dlPtr2 = (MountPointMap *)ckalloc(sizeof(MountPointMap));
 		dlPtr2->volumeName = (WCHAR *)TclNativeDupInternalRep(Target);
-		dlPtr2->driveLetter = (char) drive[0];
+		dlPtr2->driveLetter = (WCHAR) drive[0];
 		dlPtr2->nextPtr = driveLetterLookup;
 		driveLetterLookup = dlPtr2;
 	    }
@@ -459,7 +459,7 @@ TclWinDriveLetterForVolMountPoint(
 
     dlPtr2 = (MountPointMap *)ckalloc(sizeof(MountPointMap));
     dlPtr2->volumeName = (WCHAR *)TclNativeDupInternalRep((void *)mountPoint);
-    dlPtr2->driveLetter = -1;
+    dlPtr2->driveLetter = (WCHAR)-1;
     dlPtr2->nextPtr = driveLetterLookup;
     driveLetterLookup = dlPtr2;
     Tcl_MutexUnlock(&mountPointMap);
@@ -600,7 +600,7 @@ Tcl_WinTCharToUtf(
 	return NULL;
     }
     if (len < 0) {
-	len = wcslen((WCHAR *)string);
+	len = (int)wcslen((WCHAR *)string);
     } else {
 	len /= 2;
     }
@@ -663,7 +663,7 @@ TclWinCPUID(
 
 #if defined(HAVE_INTRIN_H) && defined(_WIN64) && defined(HAVE_CPUID)
 
-    __cpuid((int *)regsPtr, index);
+    __cpuid((int *)regsPtr, (int)index);
     status = TCL_OK;
 
 #elif defined(__GNUC__) && defined(HAVE_CPUID)
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 573ac7d..3a3eba4 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -174,6 +174,8 @@ static void
 FileChannelExitHandler(
     ClientData clientData)	/* Old window proc */
 {
+    (void)clientData;
+
     Tcl_DeleteEventSource(FileSetupProc, FileCheckProc, NULL);
 }
 
@@ -202,6 +204,7 @@ FileSetupProc(
     FileInfo *infoPtr;
     Tcl_Time blockTime = { 0, 0 };
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
+    (void)data;
 
     if (!(flags & TCL_FILE_EVENTS)) {
 	return;
@@ -245,6 +248,7 @@ FileCheckProc(
     FileEvent *evPtr;
     FileInfo *infoPtr;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
+    (void)data;
 
     if (!(flags & TCL_FILE_EVENTS)) {
 	return;
@@ -259,7 +263,7 @@ FileCheckProc(
 	    infoPtr = infoPtr->nextPtr) {
 	if (infoPtr->watchMask && !(infoPtr->flags & FILE_PENDING)) {
 	    infoPtr->flags |= FILE_PENDING;
-	    evPtr = ckalloc(sizeof(FileEvent));
+	    evPtr = (FileEvent *)ckalloc(sizeof(FileEvent));
 	    evPtr->header.proc = FileEventProc;
 	    evPtr->infoPtr = infoPtr;
 	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
@@ -342,7 +346,7 @@ FileBlockProc(
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
 
     /*
      * Files on Windows can not be switched between blocking and nonblocking,
@@ -380,10 +384,11 @@ FileCloseProc(
     ClientData instanceData,	/* Pointer to FileInfo structure. */
     Tcl_Interp *interp)		/* Not used. */
 {
-    FileInfo *fileInfoPtr = instanceData;
+    FileInfo *fileInfoPtr = (FileInfo *)instanceData;
     FileInfo *infoPtr;
     ThreadSpecificData *tsdPtr;
     int errorCode = 0;
+    (void)interp;
 
     /*
      * Remove the file from the watch list.
@@ -467,7 +472,7 @@ FileSeekProc(
     int mode,			/* Relative to where should we seek? */
     int *errorCodePtr)		/* To store error code. */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
     LONG newPos, newPosHigh, oldPos, oldPosHigh;
     DWORD moveMethod;
 
@@ -485,7 +490,7 @@ FileSeekProc(
      */
 
     oldPosHigh = 0;
-    oldPos = SetFilePointer(infoPtr->handle, 0, &oldPosHigh, FILE_CURRENT);
+    oldPos = (int)SetFilePointer(infoPtr->handle, 0, &oldPosHigh, FILE_CURRENT);
     if (oldPos == (LONG)INVALID_SET_FILE_POINTER) {
 	DWORD winError = GetLastError();
 
@@ -497,7 +502,7 @@ FileSeekProc(
     }
 
     newPosHigh = (offset < 0 ? -1 : 0);
-    newPos = SetFilePointer(infoPtr->handle, offset, &newPosHigh, moveMethod);
+    newPos = (int)SetFilePointer(infoPtr->handle, offset, &newPosHigh, moveMethod);
     if (newPos == (LONG)INVALID_SET_FILE_POINTER) {
 	DWORD winError = GetLastError();
 
@@ -545,7 +550,7 @@ FileWideSeekProc(
     int mode,			/* Relative to where should we seek? */
     int *errorCodePtr)		/* To store error code. */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
     DWORD moveMethod;
     LONG newPos, newPosHigh;
 
@@ -559,7 +564,7 @@ FileWideSeekProc(
     }
 
     newPosHigh = Tcl_WideAsLong(offset >> 32);
-    newPos = SetFilePointer(infoPtr->handle, Tcl_WideAsLong(offset),
+    newPos = (int)SetFilePointer(infoPtr->handle, Tcl_WideAsLong(offset),
 	    &newPosHigh, moveMethod);
     if (newPos == (LONG)INVALID_SET_FILE_POINTER) {
 	DWORD winError = GetLastError();
@@ -594,7 +599,7 @@ FileTruncateProc(
     ClientData instanceData,	/* File state. */
     Tcl_WideInt length)		/* Length to truncate at. */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
     LONG newPos, newPosHigh, oldPos, oldPosHigh;
 
     /*
@@ -602,7 +607,7 @@ FileTruncateProc(
      */
 
     oldPosHigh = 0;
-    oldPos = SetFilePointer(infoPtr->handle, 0, &oldPosHigh, FILE_CURRENT);
+    oldPos = (int)SetFilePointer(infoPtr->handle, 0, &oldPosHigh, FILE_CURRENT);
     if (oldPos == (LONG)INVALID_SET_FILE_POINTER) {
 	DWORD winError = GetLastError();
 	if (winError != NO_ERROR) {
@@ -616,7 +621,7 @@ FileTruncateProc(
      */
 
     newPosHigh = Tcl_WideAsLong(length >> 32);
-    newPos = SetFilePointer(infoPtr->handle, Tcl_WideAsLong(length),
+    newPos = (int)SetFilePointer(infoPtr->handle, Tcl_WideAsLong(length),
 	    &newPosHigh, FILE_BEGIN);
     if (newPos == (LONG)INVALID_SET_FILE_POINTER) {
 	DWORD winError = GetLastError();
@@ -670,7 +675,7 @@ FileInputProc(
     int bufSize,		/* Num bytes available in buffer. */
     int *errorCode)		/* Where to store error code. */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
     DWORD bytesRead;
 
     *errorCode = 0;
@@ -689,7 +694,7 @@ FileInputProc(
 
     if (ReadFile(infoPtr->handle, (LPVOID) buf, (DWORD) bufSize, &bytesRead,
 	    (LPOVERLAPPED) NULL) != FALSE) {
-	return bytesRead;
+	return (int)bytesRead;
     }
 
     TclWinConvertError(GetLastError());
@@ -725,7 +730,7 @@ FileOutputProc(
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
     DWORD bytesWritten;
 
     *errorCode = 0;
@@ -746,7 +751,7 @@ FileOutputProc(
 	return -1;
     }
     infoPtr->dirty = 1;
-    return bytesWritten;
+    return (int)bytesWritten;
 }
 
 /*
@@ -772,7 +777,7 @@ FileWatchProc(
 				 * of TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
     Tcl_Time blockTime = { 0, 0 };
 
     /*
@@ -810,7 +815,7 @@ FileGetHandleProc(
     int direction,		/* TCL_READABLE or TCL_WRITABLE */
     ClientData *handlePtr)	/* Where to store the handle.  */
 {
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = (FileInfo *)instanceData;
 
     if (direction & infoPtr->validMask) {
 	*handlePtr = (ClientData) infoPtr->handle;
@@ -855,7 +860,7 @@ TclpOpenFileChannel(
     char channelName[16 + TCL_INTEGER_SPACE];
     TclFile readFile = NULL, writeFile = NULL;
 
-    nativeName = Tcl_FSGetNativePath(pathPtr);
+    nativeName = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
     if (nativeName == NULL) {
 	if (interp != (Tcl_Interp *) NULL) {
 	    Tcl_AppendResult(interp, "couldn't open \"",
@@ -1363,7 +1368,7 @@ TclWinOpenFileChannel(
 	}
     }
 
-    infoPtr = ckalloc(sizeof(FileInfo));
+    infoPtr = (FileInfo *)ckalloc(sizeof(FileInfo));
 
     /*
      * TIP #218. Removed the code inserting the new structure into the global
@@ -1454,7 +1459,7 @@ FileThreadActionProc(
     int action)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    FileInfo *infoPtr = instanceData;
+    FileInfo *infoPtr = ( FileInfo *)instanceData;
 
     if (action == TCL_CHANNEL_THREAD_INSERT) {
 	infoPtr->nextPtr = tsdPtr->firstFilePtr;
@@ -1557,7 +1562,7 @@ NativeIsComPort(
     const WCHAR *nativePath)	/* Path of file to access, native encoding. */
 {
     const WCHAR *p = (const WCHAR *) nativePath;
-    int i, len = wcslen(p);
+    int i, len = (int)wcslen(p);
 
     /*
      * 1. Look for com[1-9]:?
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index bb5166b..41a05ad 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -312,6 +312,8 @@ static void
 ConsoleExitHandler(
     ClientData clientData)	/* Old window proc. */
 {
+    (void)clientData;
+
     Tcl_DeleteEventSource(ConsoleSetupProc, ConsoleCheckProc, NULL);
 }
 
@@ -336,6 +338,8 @@ static void
 ProcExitHandler(
     ClientData clientData)	/* Old window proc. */
 {
+    (void)clientData;
+
     Tcl_MutexLock(&consoleMutex);
     initialized = 0;
     Tcl_MutexUnlock(&consoleMutex);
@@ -367,6 +371,7 @@ ConsoleSetupProc(
     Tcl_Time blockTime = { 0, 0 };
     int block = 1;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
+    (void)data;
 
     if (!(flags & TCL_FILE_EVENTS)) {
 	return;
@@ -737,7 +742,7 @@ ConsoleOutputProc(
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
 {
-    ConsoleInfo *infoPtr = instanceData;
+    ConsoleInfo *infoPtr = (ConsoleInfo *)instanceData;
     ConsoleThreadInfo *threadInfo = &infoPtr->writer;
     DWORD bytesWritten, timeout;
 
@@ -781,7 +786,7 @@ ConsoleOutputProc(
 		ckfree(infoPtr->writeBuf);
 	    }
 	    infoPtr->writeBufLen = toWrite;
-	    infoPtr->writeBuf = ckalloc(toWrite);
+	    infoPtr->writeBuf = (char *)ckalloc(toWrite);
 	}
 	memcpy(infoPtr->writeBuf, buf, toWrite);
 	infoPtr->toWrite = toWrite;
@@ -922,7 +927,7 @@ ConsoleWatchProc(
 				 * TCL_EXCEPTION. */
 {
     ConsoleInfo **nextPtrPtr, *ptr;
-    ConsoleInfo *infoPtr = instanceData;
+    ConsoleInfo *infoPtr = (ConsoleInfo *)instanceData;
     int oldMask = infoPtr->watchMask;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
@@ -980,7 +985,8 @@ ConsoleGetHandleProc(
     int direction,		/* TCL_READABLE or TCL_WRITABLE. */
     ClientData *handlePtr)	/* Where to store the handle. */
 {
-    ConsoleInfo *infoPtr = instanceData;
+    ConsoleInfo *infoPtr = (ConsoleInfo *)instanceData;
+    (void)direction;
 
     *handlePtr = infoPtr->handle;
     return TCL_OK;
@@ -1014,7 +1020,7 @@ WaitForRead(
 				 * or not. */
 {
     DWORD timeout, count;
-    HANDLE *handle = infoPtr->handle;
+    HANDLE *handle = (HANDLE *)infoPtr->handle;
     ConsoleThreadInfo *threadInfo = &infoPtr->reader;
     INPUT_RECORD input;
 
@@ -1315,7 +1321,7 @@ TclWinOpenConsoleChannel(
      * See if a channel with this handle already exists.
      */
 
-    infoPtr = ckalloc(sizeof(ConsoleInfo));
+    infoPtr = (ConsoleInfo *)ckalloc(sizeof(ConsoleInfo));
     memset(infoPtr, 0, sizeof(ConsoleInfo));
 
     infoPtr->validMask = permissions;
@@ -1397,7 +1403,7 @@ ConsoleThreadActionProc(
     ClientData instanceData,
     int action)
 {
-    ConsoleInfo *infoPtr = instanceData;
+    ConsoleInfo *infoPtr = (ConsoleInfo *)instanceData;
 
     /*
      * We do not access firstConsolePtr in the thread structures. This is not
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 639cd72..a6f27c9 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -987,7 +987,7 @@ TclpMatchInDirectory(
 	 * Verify that the specified path exists and is actually a directory.
 	 */
 
-	native = Tcl_FSGetNativePath(pathPtr);
+	native = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
 	if (native == NULL) {
 	    return TCL_OK;
 	}
@@ -1477,24 +1477,23 @@ TclpGetUserHome(
          */
 	ptr = TclpGetUserName(&ds);
 	if (ptr != NULL && strcasecmp(name, ptr) == 0) {
-            HANDLE hProcess;
-            WCHAR buf[MAX_PATH];
-            DWORD nChars = sizeof(buf) / sizeof(buf[0]);
-            /* Sadly GetCurrentProcessToken not in Win 7 so slightly longer */
-            hProcess = GetCurrentProcess(); /* Need not be closed */
-            if (hProcess) {
-                HANDLE hToken;
-                if (OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) {
-                    if (GetUserProfileDirectoryW(hToken, buf, &nChars)) {
-                        Tcl_WinTCharToUtf((TCHAR *)buf,
-                                          (nChars-1)*sizeof(WCHAR),
-                                          bufferPtr);
-                        result = Tcl_DStringValue(bufferPtr);
-                        rc = 1;
-                    }
-                    CloseHandle(hToken);
-                }
-            }
+	    HANDLE hProcess;
+	    WCHAR buf[MAX_PATH];
+	    DWORD nChars = sizeof(buf) / sizeof(buf[0]);
+	    /* Sadly GetCurrentProcessToken not in Win 7 so slightly longer */
+	    hProcess = GetCurrentProcess(); /* Need not be closed */
+	    if (hProcess) {
+		HANDLE hToken;
+		if (OpenProcessToken(hProcess, TOKEN_QUERY, &hToken)) {
+		    if (GetUserProfileDirectoryW(hToken, buf, &nChars)) {
+			Tcl_WinTCharToUtf((TCHAR *)buf,
+				(nChars-1)*sizeof(WCHAR), bufferPtr);
+			result = Tcl_DStringValue(bufferPtr);
+			rc = 1;
+		    }
+		    CloseHandle(hToken);
+		}
+	    }
 	}
 	Tcl_DStringFree(&ds);
     } else {
@@ -1524,7 +1523,7 @@ TclpGetUserHome(
 	    if (rc != 0) {
 		break;
 	    }
-	    domain = INT2PTR(-1); /* repeat once */
+	    domain = (const char *)INT2PTR(-1); /* repeat once */
 	}
 	if (rc == 0) {
 	    DWORD i, size = MAX_PATH;
@@ -1919,7 +1918,7 @@ TclpObjChdir(
     int result;
     const WCHAR *nativePath;
 
-    nativePath = Tcl_FSGetNativePath(pathPtr);
+    nativePath = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
 
     if (!nativePath) {
 	return -1;
@@ -2011,7 +2010,7 @@ TclpObjStat(
 
     TclWinFlushDirtyChannels();
 
-    return NativeStat(Tcl_FSGetNativePath(pathPtr), statPtr, 0);
+    return NativeStat((const WCHAR *)Tcl_FSGetNativePath(pathPtr), statPtr, 0);
 }
 
 /*
@@ -2204,7 +2203,7 @@ NativeDev(
 	p = strchr(p + 1, '\\');
 	if (p == NULL) {
 	    /*
-	     * Add terminating backslash to fullpath or GetVolumeInformation()
+	     * Add terminating backslash to fullpath or GetVolumeInformationW()
 	     * won't work.
 	     */
 
@@ -2380,7 +2379,7 @@ TclpObjAccess(
     Tcl_Obj *pathPtr,
     int mode)
 {
-    return NativeAccess(Tcl_FSGetNativePath(pathPtr), mode);
+    return NativeAccess((const WCHAR *)Tcl_FSGetNativePath(pathPtr), mode);
 }
 
 int
@@ -2396,7 +2395,7 @@ TclpObjLstat(
 
     TclWinFlushDirtyChannels();
 
-    return NativeStat(Tcl_FSGetNativePath(pathPtr), statPtr, 1);
+    return NativeStat((const WCHAR *)Tcl_FSGetNativePath(pathPtr), statPtr, 1);
 }
 
 #ifdef S_IFLNK
@@ -2409,14 +2408,14 @@ TclpObjLink(
     if (toPtr != NULL) {
 	int res;
 	const WCHAR *LinkTarget;
-	const WCHAR *LinkSource = Tcl_FSGetNativePath(pathPtr);
+	const WCHAR *LinkSource = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
 	Tcl_Obj *normalizedToPtr = Tcl_FSGetNormalizedPath(NULL, toPtr);
 
 	if (normalizedToPtr == NULL) {
 	    return NULL;
 	}
 
-	LinkTarget = Tcl_FSGetNativePath(normalizedToPtr);
+	LinkTarget = (const WCHAR *)Tcl_FSGetNativePath(normalizedToPtr);
 
 	if (LinkSource == NULL || LinkTarget == NULL) {
 	    return NULL;
@@ -2428,7 +2427,7 @@ TclpObjLink(
 	    return NULL;
 	}
     } else {
-	const WCHAR *LinkSource = Tcl_FSGetNativePath(pathPtr);
+	const WCHAR *LinkSource = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
 
 	if (LinkSource == NULL) {
 	    return NULL;
@@ -2477,13 +2476,13 @@ TclpFilesystemPathType(
 
     firstSeparator = strchr(path, '/');
     if (firstSeparator == NULL) {
-	found = GetVolumeInformationW(Tcl_FSGetNativePath(pathPtr),
+	found = GetVolumeInformationW((const WCHAR *)Tcl_FSGetNativePath(pathPtr),
 		NULL, 0, NULL, NULL, NULL, volType, VOL_BUF_SIZE);
     } else {
 	Tcl_Obj *driveName = Tcl_NewStringObj(path, firstSeparator - path+1);
 
 	Tcl_IncrRefCount(driveName);
-	found = GetVolumeInformationW(Tcl_FSGetNativePath(driveName),
+	found = GetVolumeInformationW((const WCHAR *)Tcl_FSGetNativePath(driveName),
 		NULL, 0, NULL, NULL, NULL, volType, VOL_BUF_SIZE);
 	Tcl_DecrRefCount(driveName);
     }
@@ -2536,7 +2535,7 @@ TclpFilesystemPathType(
 
 int
 TclpObjNormalizePath(
-    Tcl_Interp *interp,
+    Tcl_Interp *interp, /* not used */
     Tcl_Obj *pathPtr,	        /* An unshared object containing the path to
 				 * normalize */
     int nextCheckpoint)	        /* offset to start at in pathPtr */
@@ -2547,6 +2546,7 @@ TclpObjNormalizePath(
     Tcl_Obj *temp = NULL;
     int isDrive = 1;
     Tcl_DString ds;		/* Some workspace. */
+    (void)interp;
 
     Tcl_DStringInit(&dsNorm);
     path = Tcl_GetString(pathPtr);
@@ -2584,7 +2584,7 @@ TclpObjNormalizePath(
 			int i;
 
 			for (i=0 ; i<len ; i++) {
-			    WCHAR wc = ((WCHAR *) nativePath)[i];
+			    WCHAR wc = ((WCHAR *)nativePath)[i];
 
 			    if (wc >= 'a') {
 				wc -= ('a' - 'A');
@@ -3101,7 +3101,7 @@ TclNativeCreateNativeRep(
      * Overallocate 6 chars, making some room for extended paths
      */
 
-    wp = nativePathPtr = ckalloc((len + 6) * sizeof(WCHAR));
+    wp = nativePathPtr = (WCHAR *)ckalloc((len + 6) * sizeof(WCHAR));
     if (nativePathPtr==0) {
       goto done;
     }
@@ -3200,7 +3200,7 @@ TclNativeDupInternalRep(
 
     len = sizeof(WCHAR) * (wcslen((const WCHAR *) clientData) + 1);
 
-    copy = ckalloc(len);
+    copy = (char *)ckalloc(len);
     memcpy(copy, clientData, len);
     return copy;
 }
@@ -3237,7 +3237,7 @@ TclpUtime(
     FromCTime(tval->actime, &lastAccessTime);
     FromCTime(tval->modtime, &lastModTime);
 
-    native = Tcl_FSGetNativePath(pathPtr);
+    native = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
 
     attr = GetFileAttributesW(native);
 
@@ -3288,7 +3288,7 @@ TclWinFileOwned(
     DWORD bufsz;
     int owned = 0;
 
-    native = Tcl_FSGetNativePath(pathPtr);
+    native = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
 
     if (GetNamedSecurityInfoW((LPWSTR) native, SE_FILE_OBJECT,
 	    OWNER_SECURITY_INFORMATION, &ownerSid, NULL, NULL, NULL,
@@ -3316,7 +3316,7 @@ TclWinFileOwned(
         bufsz = 0;
         GetTokenInformation(token, TokenUser, NULL, 0, &bufsz);
         if (bufsz) {
-            buf = ckalloc(bufsz);
+            buf = (LPBYTE)ckalloc(bufsz);
             if (GetTokenInformation(token, TokenUser, buf, bufsz, &bufsz)) {
                 owned = EqualSid(ownerSid, ((PTOKEN_USER) buf)->User.Sid);
             }
-- 
cgit v0.12


From 3203978c65afb3d5f284741440e6276f13d01e63 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 8 Mar 2023 11:02:27 +0000
Subject: Add "teststringobj newunicode". Not used in testcases yet.

---
 generic/tclTestObj.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index c9a910a..66657d9 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1269,7 +1269,7 @@ TeststringobjCmd(
     static const char *const options[] = {
 	"append", "appendstrings", "get", "get2", "length", "length2",
 	"set", "set2", "setlength", "maxchars", "range", "appendself",
-	"appendself2", NULL
+	"appendself2", "newunicode", NULL
     };
 
     if (objc < 3) {
@@ -1513,7 +1513,24 @@ TeststringobjCmd(
 	    Tcl_AppendUnicodeToObj(varPtr[varIndex], unicode + length, size - length);
 	    Tcl_SetObjResult(interp, varPtr[varIndex]);
 	    break;
-    }
+	case 13: /* newunicode*/
+	    unicode = (unsigned short *) ckalloc((objc - 3) * sizeof(unsigned short));
+	    for (i = 0; i < (objc - 3); ++i) {
+		int val;
+		if (Tcl_GetIntFromObj(interp, objv[i + 3], &val) != TCL_OK) {
+		    break;
+		}
+		unicode[i] = (unsigned short)val;
+	    }
+	    if (i < (objc-3)) {
+		ckfree(unicode);
+		return TCL_ERROR;
+	    }
+	    SetVarToObj(varPtr, varIndex, Tcl_NewUnicodeObj(unicode, objc - 3));
+	    Tcl_SetObjResult(interp, varPtr[varIndex]);
+	    ckfree(unicode);
+	    break;
+	}
 
     return TCL_OK;
 }
-- 
cgit v0.12


From 10f4d4565dc1c86e6b26623c99d5709cac033f0f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 8 Mar 2023 15:01:20 +0000
Subject: More -Wconversion warning fixes

---
 generic/tclIOCmd.c    |  8 +++----
 generic/tclOOBasic.c  | 40 ++++++++++++++++---------------
 generic/tclPathObj.c  | 10 ++++----
 generic/tclPkg.c      | 52 ++++++++++++++++++++--------------------
 generic/tclPreserve.c |  8 +++----
 tests/fCmd.test       |  4 ++--
 unix/tclSelectNotfy.c | 10 ++++----
 unix/tclUnixFile.c    | 20 ++++++++--------
 unix/tclUnixNotfy.c   |  6 ++---
 unix/tclUnixThrd.c    |  2 +-
 win/tclWinFile.c      | 20 ++++++++--------
 win/tclWinLoad.c      |  2 +-
 win/tclWinNotify.c    | 16 ++++++-------
 win/tclWinPipe.c      | 20 ++++++++--------
 win/tclWinSerial.c    | 66 +++++++++++++++++++++++++--------------------------
 win/tclWinThrd.c      |  8 +++----
 16 files changed, 147 insertions(+), 145 deletions(-)

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 2298d48..6ec5891 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -44,7 +44,7 @@ static void			RegisterTcpServerInterpCleanup(
 				    Tcl_Interp *interp,
 				    AcceptCallback *acceptCallbackPtr);
 static Tcl_InterpDeleteProc	TcpAcceptCallbacksDeleteProc;
-static void		TcpServerCloseProc(ClientData callbackData);
+static void		TcpServerCloseProc(void *callbackData);
 static void		UnregisterTcpServerInterpCleanupProc(
 			    Tcl_Interp *interp,
 			    AcceptCallback *acceptCallbackPtr);
@@ -1183,7 +1183,7 @@ Tcl_OpenObjCmd(
 
 static void
 TcpAcceptCallbacksDeleteProc(
-    ClientData clientData,	/* Data which was passed when the assocdata
+    void *clientData,	/* Data which was passed when the assocdata
 				 * was registered. */
     TCL_UNUSED(Tcl_Interp *))
 {
@@ -1311,7 +1311,7 @@ UnregisterTcpServerInterpCleanupProc(
 
 static void
 AcceptCallbackProc(
-    ClientData callbackData,	/* The data stored when the callback was
+    void *callbackData,	/* The data stored when the callback was
 				 * created in the call to
 				 * Tcl_OpenTcpServer. */
     Tcl_Channel chan,		/* Channel for the newly accepted
@@ -1402,7 +1402,7 @@ AcceptCallbackProc(
 
 static void
 TcpServerCloseProc(
-    ClientData callbackData)	/* The data passed in the call to
+    void *callbackData)	/* The data passed in the call to
 				 * Tcl_CreateCloseHandler. */
 {
     AcceptCallback *acceptCallbackPtr = (AcceptCallback *)callbackData;
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index d8ef59b..1ad351d 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -52,7 +52,7 @@ AddConstructionFinalizer(
 
 static int
 FinalizeConstruction(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -86,11 +86,12 @@ TclOO_Class_Constructor(
     Object *oPtr = (Object *) Tcl_ObjectContextObject(context);
     Tcl_Obj **invoke, *nameObj;
 
-    if (objc-1 > (int)Tcl_ObjectContextSkippedArgs(context)) {
-	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
+    size_t skip = Tcl_ObjectContextSkippedArgs(context);
+    if ((size_t)objc > skip + 1) {
+	Tcl_WrongNumArgs(interp, skip, objv,
 		"?definitionScript?");
 	return TCL_ERROR;
-    } else if (objc == (int)Tcl_ObjectContextSkippedArgs(context)) {
+    } else if ((size_t)objc == skip) {
 	return TCL_OK;
     }
 
@@ -135,7 +136,7 @@ TclOO_Class_Constructor(
 
 static int
 DecrRefsPostClassConstructor(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -204,7 +205,7 @@ TclOO_Class_Create(
      * Check we have the right number of (sensible) arguments.
      */
 
-    if (objc - Tcl_ObjectContextSkippedArgs(context) < 1) {
+    if ((size_t)objc < 1 + Tcl_ObjectContextSkippedArgs(context)) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
 		"objectName ?arg ...?");
 	return TCL_ERROR;
@@ -269,7 +270,7 @@ TclOO_Class_CreateNs(
      * Check we have the right number of (sensible) arguments.
      */
 
-    if (objc - Tcl_ObjectContextSkippedArgs(context) < 2) {
+    if ((size_t)objc + 1 < Tcl_ObjectContextSkippedArgs(context) + 3) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
 		"objectName namespaceName ?arg ...?");
 	return TCL_ERROR;
@@ -393,7 +394,7 @@ TclOO_Object_Destroy(
 
 static int
 AfterNRDestructor(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -427,12 +428,12 @@ TclOO_Object_Eval(
 {
     CallContext *contextPtr = (CallContext *) context;
     Tcl_Object object = Tcl_ObjectContextObject(context);
-    const int skip = Tcl_ObjectContextSkippedArgs(context);
+    size_t skip = Tcl_ObjectContextSkippedArgs(context);
     CallFrame *framePtr, **framePtrPtr = &framePtr;
     Tcl_Obj *scriptPtr;
     CmdFrame *invoker;
 
-    if (objc-1 < skip) {
+    if ((size_t)objc < skip + 1) {
 	Tcl_WrongNumArgs(interp, skip, objv, "arg ?arg ...?");
 	return TCL_ERROR;
     }
@@ -460,7 +461,7 @@ TclOO_Object_Eval(
      * object when it decrements its refcount after eval'ing it.
      */
 
-    if (objc != skip+1) {
+    if ((size_t)objc != skip+1) {
 	scriptPtr = Tcl_ConcatObj(objc-skip, objv+skip);
 	invoker = NULL;
     } else {
@@ -479,7 +480,7 @@ TclOO_Object_Eval(
 
 static int
 FinalizeEval(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -531,7 +532,8 @@ TclOO_Object_Unknown(
     Class *callerCls = NULL;
     Object *oPtr = contextPtr->oPtr;
     const char **methodNames;
-    int numMethodNames, i, skip = Tcl_ObjectContextSkippedArgs(context);
+    int numMethodNames, i;
+    size_t skip = Tcl_ObjectContextSkippedArgs(context);
     CallFrame *framePtr = ((Interp *) interp)->varFramePtr;
     Tcl_Obj *errorMsg;
 
@@ -541,7 +543,7 @@ TclOO_Object_Unknown(
      * name without an error).
      */
 
-    if (objc < skip+1) {
+    if ((size_t)objc < skip+1) {
 	Tcl_WrongNumArgs(interp, skip, objv, "method ?arg ...?");
 	return TCL_ERROR;
     }
@@ -635,7 +637,7 @@ TclOO_Object_LinkVar(
     Interp *iPtr = (Interp *) interp;
     Tcl_Object object = Tcl_ObjectContextObject(context);
     Namespace *savedNsPtr;
-    int i;
+    size_t i;
 
     if ((size_t)objc < Tcl_ObjectContextSkippedArgs(context)) {
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
@@ -653,7 +655,7 @@ TclOO_Object_LinkVar(
 	return TCL_OK;
     }
 
-    for (i=Tcl_ObjectContextSkippedArgs(context) ; i<objc ; i++) {
+    for (i = Tcl_ObjectContextSkippedArgs(context) ; i < (size_t)objc ; i++) {
 	Var *varPtr, *aryPtr;
 	const char *varName = TclGetString(objv[i]);
 
@@ -1007,7 +1009,7 @@ TclOONextToObjCmd(
 
 static int
 NextRestoreFrame(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
@@ -1016,7 +1018,7 @@ NextRestoreFrame(
 
     iPtr->varFramePtr = (CallFrame *)data[0];
     if (contextPtr != NULL) {
-	contextPtr->index = PTR2INT(data[2]);
+	contextPtr->index = PTR2UINT(data[2]);
     }
     return result;
 }
@@ -1090,7 +1092,7 @@ TclOOSelfObjCmd(
 	return TCL_OK;
     case SELF_NS:
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		contextPtr->oPtr->namespacePtr->fullName,-1));
+		contextPtr->oPtr->namespacePtr->fullName, TCL_INDEX_NONE));
 	return TCL_OK;
     case SELF_CLASS: {
 	Class *clsPtr = CurrentlyInvoked(contextPtr).mPtr->declaringClassPtr;
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 19c1b9d..b14fd8a 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -65,7 +65,7 @@ typedef struct {
 				 *  normPathPtr exists and is absolute. */
     int flags;			/* Flags to describe interpretation - see
 				 * below. */
-    ClientData nativePathPtr;	/* Native representation of this path, which
+    void *nativePathPtr;	/* Native representation of this path, which
 				 * is filesystem dependent. */
     size_t filesystemEpoch;	/* Used to ensure the path representation was
 				 * generated during the correct filesystem
@@ -1489,7 +1489,7 @@ MakePathFromNormalized(
 Tcl_Obj *
 Tcl_FSNewNativePath(
     const Tcl_Filesystem *fromFilesystem,
-    ClientData clientData)
+    void *clientData)
 {
     Tcl_Obj *pathPtr = NULL;
     FsPath *fsPathPtr;
@@ -1927,7 +1927,7 @@ Tcl_FSGetNormalizedPath(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 Tcl_FSGetInternalRep(
     Tcl_Obj *pathPtr,
     const Tcl_Filesystem *fsPtr)
@@ -2074,7 +2074,7 @@ void
 TclFSSetPathDetails(
     Tcl_Obj *pathPtr,
     const Tcl_Filesystem *fsPtr,
-    ClientData clientData)
+    void *clientData)
 {
     FsPath *srcFsPathPtr;
 
@@ -2368,7 +2368,7 @@ UpdateStringOfFsPath(
 int
 TclNativePathInFilesystem(
     Tcl_Obj *pathPtr,
-    TCL_UNUSED(ClientData *))
+    TCL_UNUSED(void **))
 {
     /*
      * A special case is required to handle the empty path "". This is a valid
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 132a219..989f133 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -96,15 +96,15 @@ static void		AddRequirementsToResult(Tcl_Interp *interp, int reqc,
 static void		AddRequirementsToDString(Tcl_DString *dstring,
 			    int reqc, Tcl_Obj *const reqv[]);
 static Package *	FindPackage(Tcl_Interp *interp, const char *name);
-static int		PkgRequireCore(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreFinal(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreCleanup(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreStep1(ClientData data[], Tcl_Interp *interp, int result);
-static int		PkgRequireCoreStep2(ClientData data[], Tcl_Interp *interp, int result);
-static int		TclNRPkgRequireProc(ClientData clientData, Tcl_Interp *interp, int reqc, Tcl_Obj *const reqv[]);
-static int		SelectPackage(ClientData data[], Tcl_Interp *interp, int result);
-static int		SelectPackageFinal(ClientData data[], Tcl_Interp *interp, int result);
-static int		TclNRPackageObjCmdCleanup(ClientData data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCore(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreFinal(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreCleanup(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreStep1(void *data[], Tcl_Interp *interp, int result);
+static int		PkgRequireCoreStep2(void *data[], Tcl_Interp *interp, int result);
+static int		TclNRPkgRequireProc(void *clientData, Tcl_Interp *interp, int reqc, Tcl_Obj *const reqv[]);
+static int		SelectPackage(void *data[], Tcl_Interp *interp, int result);
+static int		SelectPackageFinal(void *data[], Tcl_Interp *interp, int result);
+static int		TclNRPackageObjCmdCleanup(void *data[], Tcl_Interp *interp, int result);
 
 /*
  * Helper macros.
@@ -225,7 +225,7 @@ Tcl_PkgProvideEx(
 
 static void
 PkgFilesCleanupProc(
-    ClientData clientData,
+    void *clientData,
     TCL_UNUSED(Tcl_Interp *))
 {
     PkgFiles *pkgFiles = (PkgFiles *) clientData;
@@ -442,7 +442,7 @@ Tcl_PkgRequireProc(
 
 static int
 TclNRPkgRequireProc(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,
     int reqc,
     Tcl_Obj *const reqv[])
@@ -457,12 +457,12 @@ TclNRPkgRequireProc(
 
 static int
 PkgRequireCore(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
     const char *name = (const char *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **reqv = (Tcl_Obj **)data[2];
     int code = CheckAllRequirements(interp, reqc, reqv);
     Require *reqPtr;
@@ -488,14 +488,14 @@ PkgRequireCore(
 
 static int
 PkgRequireCoreStep1(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
     Tcl_DString command;
     char *script;
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name /* Name of desired package. */;
 
@@ -547,12 +547,12 @@ PkgRequireCoreStep1(
 
 static int
 PkgRequireCoreStep2(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name; /* Name of desired package. */
 
@@ -582,12 +582,12 @@ PkgRequireCoreStep2(
 
 static int
 PkgRequireCoreFinal(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]), satisfies;
+    int reqc = (int)PTR2INT(data[1]), satisfies;
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     char *pkgVersionI;
     void *clientDataPtr = reqPtr->clientDataPtr;
@@ -634,7 +634,7 @@ PkgRequireCoreFinal(
 
 static int
 PkgRequireCoreCleanup(
-    ClientData data[],
+    void *data[],
     TCL_UNUSED(Tcl_Interp *),
     int result)
 {
@@ -644,7 +644,7 @@ PkgRequireCoreCleanup(
 
 static int
 SelectPackage(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     TCL_UNUSED(int))
 {
@@ -653,7 +653,7 @@ SelectPackage(
 				/* Internal rep. of versions */
     int availStable, satisfies;
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name;
     Package *pkgPtr = reqPtr->pkgPtr;
@@ -847,12 +847,12 @@ SelectPackage(
 
 static int
 SelectPackageFinal(
-    ClientData data[],
+    void *data[],
     Tcl_Interp *interp,
     int result)
 {
     Require *reqPtr = (Require *)data[0];
-    int reqc = PTR2INT(data[1]);
+    int reqc = (int)PTR2INT(data[1]);
     Tcl_Obj **const reqv = (Tcl_Obj **)data[2];
     const char *name = reqPtr->name;
     char *versionToProvide = reqPtr->versionToProvide;
@@ -1053,7 +1053,7 @@ Tcl_PkgPresentEx(
  */
 int
 Tcl_PackageObjCmd(
-    ClientData clientData,
+    void *clientData,
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1539,7 +1539,7 @@ TclNRPackageObjCmd(
 
 static int
 TclNRPackageObjCmdCleanup(
-    ClientData data[],
+    void *data[],
     TCL_UNUSED(Tcl_Interp *),
     int result)
 {
diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c
index 5bc0a1a..ff4b45b 100644
--- a/generic/tclPreserve.c
+++ b/generic/tclPreserve.c
@@ -21,7 +21,7 @@
  */
 
 typedef struct {
-    ClientData clientData;	/* Address of preserved block. */
+    void *clientData;	/* Address of preserved block. */
     size_t refCount;		/* Number of Tcl_Preserve calls in effect for
 				 * block. */
     int mustFree;		/* Non-zero means Tcl_EventuallyFree was
@@ -117,7 +117,7 @@ TclFinalizePreserve(void)
 
 void
 Tcl_Preserve(
-    ClientData clientData)	/* Pointer to malloc'ed block of memory. */
+    void *clientData)	/* Pointer to malloc'ed block of memory. */
 {
     Reference *refPtr;
     size_t i;
@@ -180,7 +180,7 @@ Tcl_Preserve(
 
 void
 Tcl_Release(
-    ClientData clientData)	/* Pointer to malloc'ed block of memory. */
+    void *clientData)	/* Pointer to malloc'ed block of memory. */
 {
     Reference *refPtr;
     size_t i;
@@ -259,7 +259,7 @@ Tcl_Release(
 
 void
 Tcl_EventuallyFree(
-    ClientData clientData,	/* Pointer to malloc'ed block of memory. */
+    void *clientData,	/* Pointer to malloc'ed block of memory. */
     Tcl_FreeProc *freeProc)	/* Function to actually do free. */
 {
     Reference *refPtr;
diff --git a/tests/fCmd.test b/tests/fCmd.test
index d60e58c..dcfe270 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -136,7 +136,7 @@ proc gethomedirglob {user} {
             set sid [string trim $sid]
             # Get path from the Windows registry
             set home [registry get "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\$sid" ProfileImagePath]
-            set home [string trim $home]
+            set home [string trim [string tolower $home]]
         } result]} {
             if {$home ne ""} {
                 # file join for \ -> /
@@ -147,7 +147,7 @@ proc gethomedirglob {user} {
 
     # Caller will need to use glob matching and hope user
     # name is in the home directory path
-    return *$user*
+    return *[string tolower $user]*
 }
 
 proc createfile {file {string a}} {
diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c
index 7d14c26..feabfa8 100644
--- a/unix/tclSelectNotfy.c
+++ b/unix/tclSelectNotfy.c
@@ -32,7 +32,7 @@ typedef struct FileHandler {
 				 * for this file. */
     Tcl_FileProc *proc;		/* Function to call, in the style of
 				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
+    void *clientData;	/* Argument to pass to proc. */
     struct FileHandler *nextPtr;/* Next in list of all files we care about. */
 } FileHandler;
 
@@ -214,7 +214,7 @@ static sigset_t allSigMask;
  */
 
 #if TCL_THREADS
-static TCL_NORETURN void NotifierThreadProc(ClientData clientData);
+static TCL_NORETURN void NotifierThreadProc(void *clientData);
 #if defined(HAVE_PTHREAD_ATFORK)
 static int atForkInit = 0;
 static void		AtForkChild(void);
@@ -313,7 +313,7 @@ static unsigned int __stdcall	NotifierProc(void *hwnd, unsigned int message,
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpInitNotifier(void)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -480,7 +480,7 @@ TclpCreateFileHandler(
 				 * called. */
     Tcl_FileProc *proc,		/* Function to call for each selected
 				 * event. */
-    ClientData clientData)	/* Arbitrary data to pass to proc. */
+    void *clientData)	/* Arbitrary data to pass to proc. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     FileHandler *filePtr = LookUpFileHandler(tsdPtr, fd, NULL);
@@ -1179,7 +1179,7 @@ NotifierThreadProc(
 	 */
 
 	do {
-	    i = read(receivePipe, buf, 1);
+	    i = (int)read(receivePipe, buf, 1);
 	    if (i <= 0) {
 		break;
 	    } else if ((i == 0) || ((i == 1) && (buf[0] == 'q'))) {
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 830ed6f..673aa72 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -709,9 +709,9 @@ TclpObjLstat(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpGetNativeCwd(
-    ClientData clientData)
+    void *clientData)
 {
     char buffer[MAXPATHLEN+1];
 
@@ -813,7 +813,7 @@ TclpReadlink(
 {
 #ifndef DJGPP
     char link[MAXPATHLEN];
-    int length;
+    ssize_t length;
     const char *native;
     Tcl_DString ds;
 
@@ -825,7 +825,7 @@ TclpReadlink(
 	return NULL;
     }
 
-    Tcl_ExternalToUtfDStringEx(NULL, link, length, TCL_ENCODING_NOCOMPLAIN, linkPtr);
+    Tcl_ExternalToUtfDStringEx(NULL, link, (size_t)length, TCL_ENCODING_NOCOMPLAIN, linkPtr);
     return Tcl_DStringValue(linkPtr);
 #else
     return NULL;
@@ -979,7 +979,7 @@ TclpObjLink(
 	Tcl_Obj *linkPtr = NULL;
 
 	char link[MAXPATHLEN];
-	int length;
+	ssize_t length;
 	Tcl_DString ds;
 	Tcl_Obj *transPtr;
 
@@ -994,7 +994,7 @@ TclpObjLink(
 	    return NULL;
 	}
 
-	Tcl_ExternalToUtfDStringEx(NULL, link, length, TCL_ENCODING_NOCOMPLAIN, &ds);
+	Tcl_ExternalToUtfDStringEx(NULL, link, (size_t)length, TCL_ENCODING_NOCOMPLAIN, &ds);
 	linkPtr = Tcl_DStringToObj(&ds);
 	Tcl_IncrRefCount(linkPtr);
 	return linkPtr;
@@ -1055,7 +1055,7 @@ TclpFilesystemPathType(
 
 Tcl_Obj *
 TclpNativeToNormalized(
-    ClientData clientData)
+    void *clientData)
 {
     Tcl_DString ds;
 
@@ -1079,7 +1079,7 @@ TclpNativeToNormalized(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclNativeCreateNativeRep(
     Tcl_Obj *pathPtr)
 {
@@ -1146,9 +1146,9 @@ TclNativeCreateNativeRep(
  *---------------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclNativeDupInternalRep(
-    ClientData clientData)
+    void *clientData)
 {
     char *copy;
     size_t len;
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 943e7d7..6ecde5d 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -27,7 +27,7 @@ static int		FileHandlerEventProc(Tcl_Event *evPtr, int flags);
 # define NOTIFIER_SELECT
 #elif !defined(NOTIFIER_EPOLL) && !defined(NOTIFIER_KQUEUE)
 # define NOTIFIER_SELECT
-static TCL_NORETURN void NotifierThreadProc(ClientData clientData);
+static TCL_NORETURN void NotifierThreadProc(void *clientData);
 # if defined(HAVE_PTHREAD_ATFORK)
 static void		AtForkChild(void);
 # endif /* HAVE_PTHREAD_ATFORK */
@@ -497,13 +497,13 @@ AtForkChild(void)
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpNotifierData(void)
 {
 #if defined(NOTIFIER_EPOLL) || defined(NOTIFIER_KQUEUE)
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
-    return (ClientData) tsdPtr;
+    return (void *) tsdPtr;
 #else
     return NULL;
 #endif
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 36f0648..cf3b7a1 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -213,7 +213,7 @@ int
 TclpThreadCreate(
     Tcl_ThreadId *idPtr,	/* Return, the ID of the thread */
     Tcl_ThreadCreateProc *proc,	/* Main() function of the thread */
-    ClientData clientData,	/* The one argument to Main() */
+    void *clientData,	/* The one argument to Main() */
     size_t stackSize,		/* Size of stack for the new thread */
     int flags)			/* Flags controlling behaviour of the new
 				 * thread. */
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 4c63222..b16a707 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -170,7 +170,7 @@ static int		NativeWriteReparse(const WCHAR *LinkDirectory,
 static int		NativeMatchType(int isDrive, DWORD attr,
 			    const WCHAR *nativeName, Tcl_GlobTypeData *types);
 static int		WinIsDrive(const char *name, size_t nameLen);
-static Tcl_Size		WinIsReserved(const char *path);
+static size_t		WinIsReserved(const char *path);
 static Tcl_Obj *	WinReadLink(const WCHAR *LinkSource);
 static Tcl_Obj *	WinReadLinkDirectory(const WCHAR *LinkDirectory);
 static int		WinLink(const WCHAR *LinkSource,
@@ -921,7 +921,7 @@ TclpMatchInDirectory(
 
 	    DWORD attr;
 	    WIN32_FILE_ATTRIBUTE_DATA data;
-	    Tcl_Size len = 0;
+	    size_t len = 0;
 	    const char *str = Tcl_GetStringFromObj(norm, &len);
 
 	    native = (const WCHAR *)Tcl_FSGetNativePath(pathPtr);
@@ -943,7 +943,7 @@ TclpMatchInDirectory(
 	WIN32_FIND_DATAW data;
 	const char *dirName;	/* UTF-8 dir name, later with pattern
 				 * appended. */
-	Tcl_Size dirLength;
+	size_t dirLength;
 	int matchSpecialDots;
 	Tcl_DString ds;		/* Native encoding of dir, also used
 				 * temporarily for other things. */
@@ -1226,7 +1226,7 @@ WinIsDrive(
  * (not any trailing :).
  */
 
-static Tcl_Size
+static size_t
 WinIsReserved(
     const char *path)		/* Path in UTF-8 */
 {
@@ -2560,14 +2560,14 @@ TclpObjNormalizePath(
 		 */
 
 		if (isDrive) {
-		    Tcl_Size len = WinIsReserved(path);
+		    size_t len = WinIsReserved(path);
 
 		    if (len > 0) {
 			/*
 			 * Actually it does exist - COM1, etc.
 			 */
 
-			Tcl_Size i;
+			size_t i;
 
 			for (i=0 ; i<len ; i++) {
 			    WCHAR wc = ((WCHAR *)nativePath)[i];
@@ -2796,7 +2796,7 @@ TclpObjNormalizePath(
 	     */
 
 	    Tcl_Obj *tmpPathPtr;
-	    Tcl_Size len;
+	    size_t len;
 
 	    tmpPathPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds),
 		    nextCheckpoint);
@@ -2885,7 +2885,7 @@ TclWinVolumeRelativeNormalize(
 	 * also on drive C.
 	 */
 
-	Tcl_Size cwdLen;
+	size_t cwdLen;
 	const char *drive = Tcl_GetStringFromObj(useThisCwd, &cwdLen);
 	char drive_cur = path[0];
 
@@ -2959,7 +2959,7 @@ TclpNativeToNormalized(
 {
     Tcl_DString ds;
     Tcl_Obj *objPtr;
-    Tcl_Size len;
+    size_t len;
     char *copy, *p;
 
     Tcl_DStringInit(&ds);
@@ -3022,7 +3022,7 @@ TclNativeCreateNativeRep(
     WCHAR *nativePathPtr = NULL;
     const char *str;
     Tcl_Obj *validPathPtr;
-    Tcl_Size len;
+    size_t len;
     WCHAR *wp;
 
     if (TclFSCwdIsNative()) {
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index ccedb9d..893313c 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -175,7 +175,7 @@ TclpDlopen(
      */
 
     handlePtr = (Tcl_LoadHandle)Tcl_Alloc(sizeof(struct Tcl_LoadHandle_));
-    handlePtr->clientData = (ClientData) hInstance;
+    handlePtr->clientData = (void *)hInstance;
     handlePtr->findSymbolProcPtr = &FindSymbol;
     handlePtr->unloadFileProcPtr = &UnloadFile;
     *loadHandle = handlePtr;
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index ec6fd51..bcb4e08 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -76,7 +76,7 @@ static LRESULT CALLBACK		NotifierProc(HWND hwnd, UINT message,
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpInitNotifier(void)
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -148,7 +148,7 @@ TclpInitNotifier(void)
 
 void
 TclpFinalizeNotifier(
-    ClientData clientData)	/* Pointer to notifier data. */
+    void *clientData)	/* Pointer to notifier data. */
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
 
@@ -218,7 +218,7 @@ TclpFinalizeNotifier(
 
 void
 TclpAlertNotifier(
-    ClientData clientData)	/* Pointer to thread data. */
+    void *clientData)	/* Pointer to thread data. */
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
 
@@ -287,7 +287,7 @@ TclpSetTimer(
 	 * Windows seems to get confused by zero length timers.
 	 */
 
-	timeout = timePtr->sec * 1000 + timePtr->usec / 1000;
+	timeout = (UINT)timePtr->sec * 1000 + (unsigned long)timePtr->usec / 1000;
 	if (timeout == 0) {
 	    timeout = 1;
 	}
@@ -437,7 +437,7 @@ NotifierProc(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 TclpNotifierData(void)
 {
     return NULL;
@@ -490,7 +490,7 @@ TclpWaitForEvent(
 	    TclScaleTime(&myTime);
 	}
 
-	timeout = myTime.sec * 1000 + myTime.usec / 1000;
+	timeout = (DWORD)myTime.sec * 1000 + (unsigned long)myTime.usec / 1000;
     } else {
 	timeout = INFINITE;
     }
@@ -610,7 +610,7 @@ Tcl_Sleep(
      */
 
     TclScaleTime(&vdelay);
-    sleepTime = vdelay.sec * 1000 + vdelay.usec / 1000;
+    sleepTime = (DWORD)vdelay.sec * 1000 + (unsigned long)vdelay.usec / 1000;
 
     for (;;) {
 	SleepEx(sleepTime, TRUE);
@@ -625,7 +625,7 @@ Tcl_Sleep(
 	vdelay.usec = desired.usec - now.usec;
 
 	TclScaleTime(&vdelay);
-	sleepTime = vdelay.sec * 1000 + vdelay.usec / 1000;
+	sleepTime = (DWORD)vdelay.sec * 1000 + (unsigned long)vdelay.usec / 1000;
     }
 }
 
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index b7949d1..84e6ab0 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -104,7 +104,7 @@ typedef struct PipeInfo {
     TclFile readFile;		/* Output from pipe. */
     TclFile writeFile;		/* Input from pipe. */
     TclFile errorFile;		/* Error output from pipe. */
-    Tcl_Size numPids;		/* Number of processes attached to pipe. */
+    size_t numPids;		/* Number of processes attached to pipe. */
     Tcl_Pid *pidPtr;		/* Pids of attached processes. */
     Tcl_ThreadId threadId;	/* Thread to which events should be reported.
 				 * This value is used by the reader/writer
@@ -171,7 +171,7 @@ typedef struct {
 
 static int		ApplicationType(Tcl_Interp *interp,
 			    const char *fileName, char *fullName);
-static void		BuildCommandLine(const char *executable, Tcl_Size argc,
+static void		BuildCommandLine(const char *executable, size_t argc,
 			    const char **argv, Tcl_DString *linePtr);
 static BOOL		HasConsole(void);
 static int		PipeBlockModeProc(void *instanceData, int mode);
@@ -859,7 +859,7 @@ TclpCloseFile(
  *--------------------------------------------------------------------------
  */
 
-Tcl_Size
+size_t
 TclpGetPid(
     Tcl_Pid pid)		/* The HANDLE of the child process. */
 {
@@ -911,7 +911,7 @@ TclpCreateProcess(
 				 * occurred when creating the child process.
 				 * Error messages from the child process
 				 * itself are sent to errorFile. */
-    Tcl_Size argc,			/* Number of arguments in following array. */
+    size_t argc,			/* Number of arguments in following array. */
     const char **argv,		/* Array of argument strings. argv[0] contains
 				 * the name of the executable converted to
 				 * native format (using the
@@ -1536,14 +1536,14 @@ static void
 BuildCommandLine(
     const char *executable,	/* Full path of executable (including
 				 * extension). Replacement for argv[0]. */
-    Tcl_Size argc,			/* Number of arguments. */
+    size_t argc,			/* Number of arguments. */
     const char **argv,		/* Argument strings in UTF. */
     Tcl_DString *linePtr)	/* Initialized Tcl_DString that receives the
 				 * command line (WCHAR). */
 {
     const char *arg, *start, *special, *bspos;
     int quote = 0;
-    Tcl_Size i;
+    size_t i;
     Tcl_DString ds;
     static const char specMetaChars[] = "&|^<>!()%";
 				/* Characters to enclose in quotes if unpaired
@@ -1760,7 +1760,7 @@ TclpCreateCommandChannel(
     TclFile writeFile,		/* If non-null, gives the file for writing. */
     TclFile errorFile,		/* If non-null, gives the file where errors
 				 * can be read. */
-    Tcl_Size numPids,		/* The number of pids in the pid array. */
+    size_t numPids,		/* The number of pids in the pid array. */
     Tcl_Pid *pidPtr)		/* An array of process identifiers. */
 {
     char channelName[16 + TCL_INTEGER_SPACE];
@@ -1900,7 +1900,7 @@ TclGetAndDetachPids(
     PipeInfo *pipePtr;
     const Tcl_ChannelType *chanTypePtr;
     Tcl_Obj *pidsObj;
-    Tcl_Size i;
+    size_t i;
 
     /*
      * Punt if the channel is not a command channel.
@@ -2744,7 +2744,7 @@ Tcl_PidObjCmd(
     Tcl_Channel chan;
     const Tcl_ChannelType *chanTypePtr;
     PipeInfo *pipePtr;
-    Tcl_Size i;
+    size_t i;
     Tcl_Obj *resultPtr;
 
     if (objc > 2) {
@@ -3191,7 +3191,7 @@ TclpOpenTemporaryFile(
     char *namePtr;
     HANDLE handle;
     DWORD flags = FILE_ATTRIBUTE_TEMPORARY;
-    Tcl_Size length;
+    size_t length;
     int counter, counter2;
     Tcl_DString buf;
 
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 3db36d5..78b47b9 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -85,7 +85,7 @@ typedef struct SerialInfo {
     int readable;		/* Flag that the channel is readable. */
     int writable;		/* Flag that the channel is writable. */
     int blockTime;		/* Maximum blocktime in msec. */
-    unsigned int lastEventTime;	/* Time in milliseconds since last readable
+    unsigned long long lastEventTime;	/* Time in milliseconds since last readable
 				 * event. */
 				/* Next readable event only after blockTime */
     DWORD error;		/* pending error code returned by
@@ -165,30 +165,30 @@ static COMMTIMEOUTS no_timeout = {
  * Declarations for functions used only in this file.
  */
 
-static int		SerialBlockProc(ClientData instanceData, int mode);
-static void		SerialCheckProc(ClientData clientData, int flags);
-static int		SerialCloseProc(ClientData instanceData,
+static int		SerialBlockProc(void *instanceData, int mode);
+static void		SerialCheckProc(void *clientData, int flags);
+static int		SerialCloseProc(void *instanceData,
 			    Tcl_Interp *interp, int flags);
 static int		SerialEventProc(Tcl_Event *evPtr, int flags);
-static void		SerialExitHandler(ClientData clientData);
-static int		SerialGetHandleProc(ClientData instanceData,
-			    int direction, ClientData *handlePtr);
+static void		SerialExitHandler(void *clientData);
+static int		SerialGetHandleProc(void *instanceData,
+			    int direction, void **handlePtr);
 static ThreadSpecificData *SerialInit(void);
-static int		SerialInputProc(ClientData instanceData, char *buf,
+static int		SerialInputProc(void *instanceData, char *buf,
 			    int toRead, int *errorCode);
-static int		SerialOutputProc(ClientData instanceData,
+static int		SerialOutputProc(void *instanceData,
 			    const char *buf, int toWrite, int *errorCode);
-static void		SerialSetupProc(ClientData clientData, int flags);
-static void		SerialWatchProc(ClientData instanceData, int mask);
-static void		ProcExitHandler(ClientData clientData);
-static int		SerialGetOptionProc(ClientData instanceData,
+static void		SerialSetupProc(void *clientData, int flags);
+static void		SerialWatchProc(void *instanceData, int mask);
+static void		ProcExitHandler(void *clientData);
+static int		SerialGetOptionProc(void *instanceData,
 			    Tcl_Interp *interp, const char *optionName,
 			    Tcl_DString *dsPtr);
-static int		SerialSetOptionProc(ClientData instanceData,
+static int		SerialSetOptionProc(void *instanceData,
 			    Tcl_Interp *interp, const char *optionName,
 			    const char *value);
 static DWORD WINAPI	SerialWriterThread(LPVOID arg);
-static void		SerialThreadActionProc(ClientData instanceData,
+static void		SerialThreadActionProc(void *instanceData,
 			    int action);
 static int		SerialBlockingRead(SerialInfo *infoPtr, LPVOID buf,
 			    DWORD bufSize, LPDWORD lpRead, LPOVERLAPPED osPtr);
@@ -373,14 +373,14 @@ SerialBlockTime(
  *----------------------------------------------------------------------
  */
 
-static unsigned int
+static unsigned long long
 SerialGetMilliseconds(void)
 {
     Tcl_Time time;
 
     Tcl_GetTime(&time);
 
-    return (time.sec * 1000 + time.usec / 1000);
+    return ((unsigned long long)time.sec * 1000 + (unsigned long)time.usec / 1000);
 }
 
 /*
@@ -469,7 +469,7 @@ SerialCheckProc(
     int needEvent;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     COMSTAT cStat;
-    unsigned int time;
+    unsigned long long time;
 
     if (!(flags & TCL_FILE_EVENTS)) {
 	return;
@@ -519,8 +519,8 @@ SerialCheckProc(
 			    (infoPtr->error & SERIAL_READ_ERRORS)) {
 			infoPtr->readable = 1;
 			time = SerialGetMilliseconds();
-			if ((unsigned int) (time - infoPtr->lastEventTime)
-				>= (unsigned int) infoPtr->blockTime) {
+			if ((time - infoPtr->lastEventTime)
+				>= (unsigned long long) infoPtr->blockTime) {
 			    needEvent = 1;
 			    infoPtr->lastEventTime = time;
 			}
@@ -561,7 +561,7 @@ SerialCheckProc(
 
 static int
 SerialBlockProc(
-    ClientData instanceData,    /* Instance data for channel. */
+    void *instanceData,    /* Instance data for channel. */
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
@@ -600,7 +600,7 @@ SerialBlockProc(
 
 static int
 SerialCloseProc(
-    ClientData instanceData,    /* Pointer to SerialInfo structure. */
+    void *instanceData,    /* Pointer to SerialInfo structure. */
     TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
@@ -796,7 +796,7 @@ SerialBlockingWrite(
     LeaveCriticalSection(&infoPtr->csWrite);
 
     if (result == FALSE) {
-	int err = GetLastError();
+	DWORD err = GetLastError();
 
 	switch (err) {
 	case ERROR_IO_PENDING:
@@ -855,7 +855,7 @@ SerialBlockingWrite(
 
 static int
 SerialInputProc(
-    ClientData instanceData,	/* Serial state. */
+    void *instanceData,	/* Serial state. */
     char *buf,			/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -918,7 +918,7 @@ SerialInputProc(
     }
 
     if (bufSize == 0) {
-	return bytesRead = 0;
+	return 0;
     }
 
     /*
@@ -962,7 +962,7 @@ SerialInputProc(
 
 static int
 SerialOutputProc(
-    ClientData instanceData,	/* Serial state. */
+    void *instanceData,	/* Serial state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -1192,7 +1192,7 @@ SerialEventProc(
 
 static void
 SerialWatchProc(
-    ClientData instanceData,	/* Serial state. */
+    void *instanceData,	/* Serial state. */
     int mask)			/* What events to watch for, OR-ed combination
 				 * of TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -1249,13 +1249,13 @@ SerialWatchProc(
 
 static int
 SerialGetHandleProc(
-    ClientData instanceData,	/* The serial state. */
+    void *instanceData,	/* The serial state. */
     TCL_UNUSED(int) /*direction*/,
-    ClientData *handlePtr)	/* Where to store the handle. */
+    void **handlePtr)	/* Where to store the handle. */
 {
     SerialInfo *infoPtr = (SerialInfo *) instanceData;
 
-    *handlePtr = (ClientData) infoPtr->handle;
+    *handlePtr = (void *) infoPtr->handle;
     return TCL_OK;
 }
 
@@ -1613,7 +1613,7 @@ SerialModemStatusStr(
 
 static int
 SerialSetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Which option to set? */
     const char *value)		/* New value for option. */
@@ -2037,7 +2037,7 @@ SerialSetOptionProc(
 
 static int
 SerialGetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Option to get. */
     Tcl_DString *dsPtr)		/* Where to store value(s). */
@@ -2274,7 +2274,7 @@ SerialGetOptionProc(
 
 static void
 SerialThreadActionProc(
-    ClientData instanceData,
+    void *instanceData,
     int action)
 {
     SerialInfo *infoPtr = (SerialInfo *) instanceData;
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index 841a854..0195895 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -203,7 +203,7 @@ int
 TclpThreadCreate(
     Tcl_ThreadId *idPtr,	/* Return, the ID of the thread. */
     Tcl_ThreadCreateProc *proc,	/* Main() function of the thread. */
-    ClientData clientData,	/* The one argument to Main(). */
+    void *clientData,	/* The one argument to Main(). */
     size_t stackSize,		/* Size of stack for the new thread. */
     int flags)			/* Flags controlling behaviour of the new
 				 * thread. */
@@ -535,7 +535,7 @@ TclFinalizeLock(void)
 #if TCL_THREADS
 
 /* locally used prototype */
-static void		FinalizeConditionEvent(ClientData data);
+static void		FinalizeConditionEvent(void *data);
 
 /*
  *----------------------------------------------------------------------
@@ -725,7 +725,7 @@ Tcl_ConditionWait(
     if (timePtr == NULL) {
 	wtime = INFINITE;
     } else {
-	wtime = timePtr->sec * 1000 + timePtr->usec / 1000;
+	wtime = (DWORD)timePtr->sec * 1000 + (unsigned long)timePtr->usec / 1000;
     }
 
     /*
@@ -880,7 +880,7 @@ Tcl_ConditionNotify(
 
 static void
 FinalizeConditionEvent(
-    ClientData data)
+    void *data)
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) data;
 
-- 
cgit v0.12


From 7ed7017d94b407f12d57a464cd46a4bf1f2f976b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 8 Mar 2023 19:58:08 +0000
Subject: Add "notWsl" test constraints. Clean up many testcases

---
 tests/chanio.test   | 285 +++++++++++++++++++++++++++-------------------------
 tests/cmdAH.test    |  17 ++--
 tests/fCmd.test     | 105 ++++++++++---------
 tests/tcltest.test  |  15 +--
 tests/unixFCmd.test |  12 ++-
 win/tclWinTest.c    |  31 +++---
 6 files changed, 241 insertions(+), 224 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index 1c689fb..81c31d8 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -8,7 +8,7 @@
 #
 # Copyright (c) 1991-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright (c) 1998-1999 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -45,6 +45,8 @@ namespace eval ::tcl::test::io {
     testConstraint notWinCI       [expr {
 	$::tcl_platform(platform) ne "windows" || ![info exists ::env(CI)]}]
     testConstraint notOSX [expr {$::tcl_platform(os) ne "Darwin"}]
+    # File permissions broken on wsl without some "exotic" wsl configuration
+    testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 
     # You need a *very* special environment to do some tests.  In particular,
     # many file systems do not support large-files...
@@ -74,7 +76,7 @@ namespace eval ::tcl::test::io {
 	if {$argv != ""} {
 	    set f [open [lindex $argv 0]]
 	}
-	chan configure $f -encoding binary -translation lf -blocking 0 -eofchar \x1a
+	chan configure $f -encoding binary -translation lf -blocking 0 -eofchar \x1A
 	chan configure stdout -encoding binary -translation lf -buffering none
 	chan event $f readable "foo $f"
 	proc foo {f} {
@@ -110,17 +112,17 @@ set path(test1) [makeFile {} test1]
 test chan-io-1.6 {Tcl_WriteChars: WriteBytes} {
     set f [open $path(test1) w]
     chan configure $f -encoding binary
-    chan puts -nonewline $f "a\u4e4d\0"
+    chan puts -nonewline $f a\u4E4D\x00
     chan close $f
     contents $path(test1)
-} "a\x4d\x00"
+} aM\x00
 test chan-io-1.7 {Tcl_WriteChars: WriteChars} {
     set f [open $path(test1) w]
     chan configure $f -encoding shiftjis
-    chan puts -nonewline $f "a\u4e4d\0"
+    chan puts -nonewline $f "a\u4E4D\0"
     chan close $f
     contents $path(test1)
-} "a\x93\xe1\x00"
+} "a\x93\xE1\x00"
 set path(test2) [makeFile {} test2]
 test chan-io-1.8 {Tcl_WriteChars: WriteChars} {
     # This test written for SF bug #506297.
@@ -133,7 +135,7 @@ test chan-io-1.8 {Tcl_WriteChars: WriteChars} {
     chan puts -nonewline $f [format %s%c [string repeat " " 4] 12399]
     chan close           $f
     contents $path(test2)
-} "    \x1b\$B\$O\x1b(B"
+} "    \x1B\$B\$O\x1B(B"
 test chan-io-1.9 {Tcl_WriteChars: WriteChars} {
     # When closing a channel with an encoding that appends escape bytes, check
     # for the case where the escape bytes overflow the current IO buffer. The
@@ -243,7 +245,7 @@ test chan-io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} -bod
 } -cleanup {
     chan close $f
 } -result "\r\n12"
-test chan-io-3.4 {WriteChars: loop over stage buffer} {
+test chan-io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
     set f [open $path(test1) w]
     chan configure $f -encoding jis0208 -buffersize 16
@@ -251,8 +253,10 @@ test chan-io-3.4 {WriteChars: loop over stage buffer} {
     set x [list [contents $path(test1)]]
     chan close $f
     lappend x [contents $path(test1)]
-} [list "!)!)!)!)!)!)!)!)" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
-test chan-io-3.5 {WriteChars: saved != 0} {
+} -cleanup {
+    catch {chan close $f}
+} -result [list "!)!)!)!)!)!)!)!)" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
+test chan-io-3.5 {WriteChars: saved != 0} -body {
     # Bytes produced by UtfToExternal from end of last channel buffer had to
     # be moved to beginning of next channel buffer to preserve requested
     # buffersize.
@@ -262,24 +266,28 @@ test chan-io-3.5 {WriteChars: saved != 0} {
     set x [list [contents $path(test1)]]
     chan close $f
     lappend x [contents $path(test1)]
-} [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
-test chan-io-3.6 {WriteChars: (stageRead + dstWrote == 0)} {
+} -cleanup {
+    catch {chan close $f}
+} -result [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
+test chan-io-3.6 {WriteChars: (stageRead + dstWrote == 0)} -body {
     # One incomplete UTF-8 character at end of staging buffer. Backup in src
     # to the beginning of that UTF-8 character and try again.
     #
     # Translate the first 16 bytes, produce 14 bytes of output, 2 left over
-    # (first two bytes of \uff21 in UTF-8). Given those two bytes try
+    # (first two bytes of \uFF21 in UTF-8). Given those two bytes try
     # translating them again, find that no bytes are read produced, and break
     # to outer loop where those two bytes will have the remaining 4 bytes (the
-    # last byte of \uff21 plus the all of \uff22) appended.
+    # last byte of \uFF21 plus the all of \uFF22) appended.
     set f [open $path(test1) w]
     chan configure $f -encoding shiftjis -buffersize 16
-    chan puts -nonewline $f "12345678901234\uff21\uff22"
+    chan puts -nonewline $f 12345678901234\uFF21\uFF22
     set x [list [contents $path(test1)]]
     chan close $f
     lappend x [contents $path(test1)]
-} [list "12345678901234\x82\x60" "12345678901234\x82\x60\x82\x61"]
-test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} {
+} -cleanup {
+    catch {chan close $f}
+} -result [list "12345678901234\x82\x60" "12345678901234\x82\x60\x82\x61"]
+test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # When translating UTF-8 to external, the produced bytes went past end of
     # the channel buffer. This is done on purpose - we then truncate the bytes
     # at the end of the partial character to preserve the requested blocksize
@@ -291,8 +299,10 @@ test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} {
     set x [list [contents $path(test1)]]
     chan close $f
     lappend x [contents $path(test1)]
-} [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
-test chan-io-3.8 {WriteChars: reset sawLF after each buffer} {
+} -cleanup {
+    catch {chan close $f}
+} -result [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
+test chan-io-3.8 {WriteChars: reset sawLF after each buffer} -body {
     set f [open $path(test1) w]
     chan configure $f -encoding ascii -buffering line -translation lf \
 	     -buffersize 16
@@ -300,7 +310,9 @@ test chan-io-3.8 {WriteChars: reset sawLF after each buffer} {
     set x [list [contents $path(test1)]]
     chan close $f
     lappend x [contents $path(test1)]
-} [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
+} -cleanup {
+    catch {chan close $f}
+} -result [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
 
 test chan-io-4.1 {TranslateOutputEOL: lf} {
     # search for \n
@@ -416,7 +428,7 @@ test chan-io-6.3 {Tcl_GetsObj: how many have we used?} -body {
 test chan-io-6.4 {Tcl_GetsObj: encoding == NULL} -body {
     set f [open $path(test1) w]
     chan configure $f -translation binary
-    chan puts $f "\x81\u1234\0"
+    chan puts $f "\x81\u1234\x00"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -translation binary
@@ -427,14 +439,14 @@ test chan-io-6.4 {Tcl_GetsObj: encoding == NULL} -body {
 test chan-io-6.5 {Tcl_GetsObj: encoding != NULL} -body {
     set f [open $path(test1) w]
     chan configure $f -translation binary
-    chan puts $f "\x88\xea\x92\x9a"
+    chan puts $f "\x88\xEA\x92\x9A"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -encoding shiftjis
     list [chan gets $f line] $line
 } -cleanup {
     chan close $f
-} -result [list 2 "\u4e00\u4e01"]
+} -result [list 2 "\u4E00\u4E01"]
 set a "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
 append a $a
 append a $a
@@ -462,20 +474,20 @@ test chan-io-6.7 {Tcl_GetsObj: error in input} -constraints stdio -body {
 } -result {-1}
 test chan-io-6.8 {Tcl_GetsObj: remember if EOF is seen} -body {
     set f [open $path(test1) w]
-    chan puts $f "abcdef\x1aghijk\nwombat"
+    chan puts $f "abcdef\x1Aghijk\nwombat"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1a
+    chan configure $f -eofchar \x1A
     list [chan gets $f line] $line [chan gets $f line] $line
 } -cleanup {
     chan close $f
 } -result {6 abcdef -1 {}}
 test chan-io-6.9 {Tcl_GetsObj: remember if EOF is seen} -body {
     set f [open $path(test1) w]
-    chan puts $f "abcdefghijk\nwom\u001abat"
+    chan puts $f "abcdefghijk\nwom\u001Abat"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1a
+    chan configure $f -eofchar \x1A
     list [chan gets $f line] $line [chan gets $f line] $line
 } -cleanup {
     chan close $f
@@ -860,7 +872,7 @@ test chan-io-6.43 {Tcl_GetsObj: input saw cr} -setup {
     chan configure $f -blocking 0
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
     chan configure $f -blocking 1
-    chan puts -nonewline $f "\nabcd\refg\x1a"
+    chan puts -nonewline $f "\nabcd\refg\x1A"
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
     lappend x [chan gets $f line] $line
 } -cleanup {
@@ -878,7 +890,7 @@ test chan-io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} -setup {
     chan configure $f -blocking 0
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
     chan configure $f -blocking 1
-    chan puts -nonewline $f "abcd\refg\x1a"
+    chan puts -nonewline $f "abcd\refg\x1A"
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
     lappend x [chan gets $f line] $line
 } -cleanup {
@@ -914,7 +926,7 @@ test chan-io-6.46 {Tcl_GetsObj: input saw cr, followed by just \n should give eo
     chan configure $f -blocking 0
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
     chan configure $f -blocking 1
-    chan puts -nonewline $f "\n\x1a"
+    chan puts -nonewline $f "\n\x1A"
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
 } -cleanup {
     chan close $f
@@ -980,10 +992,10 @@ test chan-io-6.52 {Tcl_GetsObj: saw EOF character} -constraints {testchannel} -b
     # if (eof != NULL)
     set f [open $path(test1) w]
     chan configure $f -translation lf
-    chan puts -nonewline $f "123456\x1ak9012345\r"
+    chan puts -nonewline $f "123456\x1Ak9012345\r"
     chan close $f
     set f [open $path(test1)]
-    chan configure $f -eofchar \x1a
+    chan configure $f -eofchar \x1A
     list [chan gets $f] [testchannel queuedcr $f] [chan tell $f] [chan gets $f]
 } -cleanup {
     chan close $f
@@ -1011,14 +1023,14 @@ test chan-io-6.55 {Tcl_GetsObj: overconverted} -body {
     # Tcl_ExternalToUtf(), make sure state updated
     set f [open $path(test1) w]
     chan configure $f -encoding iso2022-jp
-    chan puts $f "there\u4e00ok\n\u4e01more bytes\nhere"
+    chan puts $f "there\u4E00ok\n\u4E01more bytes\nhere"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -encoding iso2022-jp
     list [chan gets $f line] $line [chan gets $f line] $line [chan gets $f line] $line
 } -cleanup {
     chan close $f
-} -result [list 8 "there\u4e00ok" 11 "\u4e01more bytes" 4 "here"]
+} -result [list 8 "there\u4E00ok" 11 "\u4E01more bytes" 4 "here"]
 test chan-io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} -setup {
     update
     variable x {}
@@ -1052,19 +1064,19 @@ test chan-io-7.1 {FilterInputBytes: split up character at end of buffer} -body {
     # (result == TCL_CONVERT_MULTIBYTE)
     set f [open $path(test1) w]
     chan configure $f -encoding shiftjis
-    chan puts $f "1234567890123\uff10\uff11\uff12\uff13\uff14\nend"
+    chan puts $f "1234567890123\uFF10\uFF11\uFF12\uFF13\uFF14\nend"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -encoding shiftjis -buffersize 16
     chan gets $f
 } -cleanup {
     chan close $f
-} -result "1234567890123\uff10\uff11\uff12\uff13\uff14"
+} -result "1234567890123\uFF10\uFF11\uFF12\uFF13\uFF14"
 test chan-io-7.2 {FilterInputBytes: split up character in middle of buffer} -body {
     # (bufPtr->nextAdded < bufPtr->bufLength)
     set f [open $path(test1) w]
     chan configure $f -encoding binary
-    chan puts -nonewline $f "1234567890\n123\x82\x4f\x82\x50\x82"
+    chan puts -nonewline $f "1234567890\n123\x82\x4F\x82\x50\x82"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -encoding shiftjis
@@ -1077,7 +1089,7 @@ test chan-io-7.3 {FilterInputBytes: split up character at EOF} -setup {
 } -constraints {testchannel} -body {
     set f [open $path(test1) w]
     chan configure $f -encoding binary
-    chan puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82"
+    chan puts -nonewline $f "1234567890123\x82\x4F\x82\x50\x82"
     chan close $f
     set f [open $path(test1)]
     chan configure $f -encoding shiftjis
@@ -1086,13 +1098,13 @@ test chan-io-7.3 {FilterInputBytes: split up character at EOF} -setup {
     lappend x [chan gets $f line] $line
 } -cleanup {
     chan close $f
-} -result [list 15 "1234567890123\uff10\uff11" 18 0 1 -1 ""]
+} -result [list 15 "1234567890123\uFF10\uFF11" 18 0 1 -1 ""]
 test chan-io-7.4 {FilterInputBytes: recover from split up character} -setup {
     variable x ""
 } -constraints {stdio fileevent} -body {
     set f [openpipe w+ $path(cat)]
     chan configure $f -encoding binary -buffering none
-    chan puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82"
+    chan puts -nonewline $f "1234567890123\x82\x4F\x82\x50\x82"
     chan configure $f -encoding shiftjis -blocking 0
     chan event $f read [namespace code {
 	lappend x [chan gets $f line] $line [chan blocked $f]
@@ -1105,7 +1117,7 @@ test chan-io-7.4 {FilterInputBytes: recover from split up character} -setup {
     return $x
 } -cleanup {
     chan close $f
-} -result [list -1 "" 1 17 "1234567890123\uff10\uff11\uff12\uff13" 0]
+} -result [list -1 "" 1 17 "1234567890123\uFF10\uFF11\uFF12\uFF13" 0]
 
 test chan-io-8.1 {PeekAhead: only go to device if no more cached data} -constraints {testchannel} -body {
     # (bufPtr->nextPtr == NULL)
@@ -1200,7 +1212,7 @@ test chan-io-8.7 {PeekAhead: cleanup} -setup {
     chan puts -nonewline $f "abcdefghijklmno\r"
     # here
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
-    chan puts -nonewline $f "\x1a"
+    chan puts -nonewline $f \x1A
     lappend x [chan gets $f line] $line
 } -cleanup {
     chan close $f
@@ -1356,22 +1368,22 @@ test chan-io-12.4 {ReadChars: split-up char} -setup {
     chan configure $f -encoding shiftjis
     vwait [namespace which -variable x]
     chan configure $f -encoding binary -blocking 1
-    chan puts -nonewline $f "\x7b"
+    chan puts -nonewline $f \x7B
     after 500			;# Give the cat process time to catch up
     chan configure $f -encoding shiftjis -blocking 0
     vwait [namespace which -variable x]
     return $x
 } -cleanup {
     chan close $f
-} -result [list "123456789012345" 1 "\u672c" 0]
+} -result [list "123456789012345" 1 \u672C 0]
 test chan-io-12.5 {ReadChars: chan events on partial characters} -setup {
     variable x {}
 } -constraints {stdio fileevent} -body {
     set path(test1) [makeFile {
 	chan configure stdout -encoding binary -buffering none
-	chan gets stdin; chan puts -nonewline "\xe7"
-	chan gets stdin; chan puts -nonewline "\x89"
-	chan gets stdin; chan puts -nonewline "\xa6"
+	chan gets stdin; chan puts -nonewline \xE7
+	chan gets stdin; chan puts -nonewline \x89
+	chan gets stdin; chan puts -nonewline \xA6
     } test1]
     set f [openpipe r+ $path(test1)]
     chan event $f readable [namespace code {
@@ -1525,7 +1537,7 @@ test chan-io-13.10 {TranslateInputEOL: auto mode: \n} -body {
     chan close $f
 } -result "abcd\ndef"
 test chan-io-13.11 {TranslateInputEOL: EOF char} -body {
-    # (*chanPtr->inEofChar != '\0')
+    # (*chanPtr->inEofChar != '\x00')
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "abcd\ndefgh"
@@ -1537,7 +1549,7 @@ test chan-io-13.11 {TranslateInputEOL: EOF char} -body {
     chan close $f
 } -result "abcd\nd"
 test chan-io-13.12 {TranslateInputEOL: find EOF char in src} -body {
-    # (*chanPtr->inEofChar != '\0')
+    # (*chanPtr->inEofChar != '\x00')
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "\r\n\r\n\r\nab\r\n\r\ndef\r\n\r\n\r\n"
@@ -1873,7 +1885,7 @@ test chan-io-20.2 {Tcl_CreateChannel: initial settings} -constraints {win} -body
     list [chan configure $f -eofchar] [chan configure $f -translation]
 } -cleanup {
     chan close $f
-} -result [list [list \x1a ""] {auto crlf}]
+} -result [list [list \x1A ""] {auto crlf}]
 test chan-io-20.3 {Tcl_CreateChannel: initial settings} -constraints {unix} -body {
     set f [open $path(test1) w+]
     list [chan configure $f -eofchar] [chan configure $f -translation]
@@ -3086,10 +3098,10 @@ test chan-io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} -setup {
 } -body {
     set f [open $path(test1) w]
     chan configure $f -translation lf
-    chan puts -nonewline $f hello\nthere\nand\rhere\n\x1a
+    chan puts -nonewline $f hello\nthere\nand\rhere\n\x1A
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     chan read $f
 } -cleanup {
     chan close $f
@@ -3102,11 +3114,11 @@ test chan-io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} -setup {
     file delete $path(test1)
 } -constraints {win} -body {
     set f [open $path(test1) w]
-    chan configure $f -eofchar \x1a -translation lf
+    chan configure $f -translation lf -eofchar \x1A
     chan puts $f hello\nthere\nand\rhere
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     chan read $f
 } -cleanup {
     chan close $f
@@ -3124,7 +3136,7 @@ test chan-io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $s
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     set l ""
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3145,7 +3157,7 @@ test chan-io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} -setup {
     chan puts $f $s
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     set l ""
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3178,7 +3190,7 @@ test chan-io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} -setup {
     lappend l [chan eof $f]
 } -cleanup {
     chan close $f
-} -result "abc def 0 \x1aghi 0 qrs 0 {} 1"
+} -result "abc def 0 \x1Aghi 0 qrs 0 {} 1"
 test chan-io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} -setup {
     file delete $path(test1)
     set l ""
@@ -3190,7 +3202,7 @@ test chan-io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} -setup {
     set f [open $path(test1) r]
     chan configure $f -translation cr -eofchar {}
     set x [chan gets $f]
-    lappend l [string equal $x "abc\ndef\n\x1aghi\nqrs\n"]
+    lappend l [string equal $x "abc\ndef\n\x1Aghi\nqrs\n"]
     lappend l [chan eof $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3208,7 +3220,7 @@ test chan-io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} -setup {
     set f [open $path(test1) r]
     chan configure $f -translation crlf -eofchar {}
     set x [chan gets $f]
-    lappend l [string equal $x "abc\ndef\n\x1aghi\nqrs\n"]
+    lappend l [string equal $x "abc\ndef\n\x1Aghi\nqrs\n"]
     lappend l [chan eof $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3223,7 +3235,7 @@ test chan-io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f [format abc\ndef\n%cqrs\ntuv 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3237,7 +3249,7 @@ test chan-io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1a
+    chan configure $f -translation lf -eofchar \x1A
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3251,7 +3263,7 @@ test chan-io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3265,7 +3277,7 @@ test chan-io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1a
+    chan configure $f -translation cr -eofchar \x1A
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3279,7 +3291,7 @@ test chan-io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3293,7 +3305,7 @@ test chan-io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} -setup {
     chan puts $f $c
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1a
+    chan configure $f -translation crlf -eofchar \x1A
     list [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -3644,7 +3656,7 @@ test chan-io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} -setup {
     chan puts $f [format "hello\nthere\nand\rhere\n\%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3660,11 +3672,11 @@ test chan-io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} -setup {
     set l ""
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -eofchar \x1a -translation lf
+    chan configure $f -translation lf -eofchar \x1A
     chan puts $f hello\nthere\nand\rhere
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan gets $f]
@@ -3684,8 +3696,7 @@ test chan-io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a
-    chan configure $f -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3703,7 +3714,7 @@ test chan-io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar}
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3733,7 +3744,7 @@ test chan-io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} -setup {
     lappend l [chan eof $f]
 } -cleanup {
     chan close $f
-} -result "abc def 0 \x1aqrs 0 tuv 0 {} 1"
+} -result "abc def 0 \x1Aqrs 0 tuv 0 {} 1"
 test chan-io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} -setup {
     file delete $path(test1)
     set l ""
@@ -3755,7 +3766,7 @@ test chan-io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} -setup {
     lappend l [chan eof $f]
 } -cleanup {
     chan close $f
-} -result "abc def 0 \x1aqrs 0 tuv 0 {} 1"
+} -result "abc def 0 \x1Aqrs 0 tuv 0 {} 1"
 test chan-io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} -setup {
     file delete $path(test1)
     set l ""
@@ -3777,7 +3788,7 @@ test chan-io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} -setup {
     lappend l [chan eof $f]
 } -cleanup {
     chan close $f
-} -result "abc def 0 \x1aqrs 0 tuv 0 {} 1"
+} -result "abc def 0 \x1Aqrs 0 tuv 0 {} 1"
 test chan-io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} -setup {
     file delete $path(test1)
     set l ""
@@ -3787,7 +3798,7 @@ test chan-io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3805,7 +3816,7 @@ test chan-io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1a
+    chan configure $f -translation lf -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3823,7 +3834,7 @@ test chan-io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3841,7 +3852,7 @@ test chan-io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1a
+    chan configure $f -translation cr -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3859,7 +3870,7 @@ test chan-io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -3877,7 +3888,7 @@ test chan-io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} -setup {
     chan puts $f [format "abc\ndef\n%cqrs\ntuv" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1a
+    chan configure $f -translation crlf -eofchar \x1A
     lappend l [chan gets $f]
     lappend l [chan gets $f]
     lappend l [chan eof $f]
@@ -4633,12 +4644,12 @@ test chan-io-35.6 {Tcl_Eof, eof char, lf write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1a
+    chan configure $f -translation lf -eofchar \x1A
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4647,12 +4658,12 @@ test chan-io-35.7 {Tcl_Eof, eof char, lf write, lf read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation lf -eofchar \x1a
+    chan configure $f -translation lf -eofchar \x1A
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1a
+    chan configure $f -translation lf -eofchar \x1A
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4661,12 +4672,12 @@ test chan-io-35.8 {Tcl_Eof, eof char, cr write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation cr -eofchar \x1a
+    chan configure $f -translation cr -eofchar \x1A
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4675,12 +4686,12 @@ test chan-io-35.9 {Tcl_Eof, eof char, cr write, cr read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation cr -eofchar \x1a
+    chan configure $f -translation cr -eofchar \x1A
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1a
+    chan configure $f -translation cr -eofchar \x1A
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4689,12 +4700,12 @@ test chan-io-35.10 {Tcl_Eof, eof char, crlf write, auto read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation crlf -eofchar \x1a
+    chan configure $f -translation crlf -eofchar \x1A
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4703,12 +4714,12 @@ test chan-io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -translation crlf -eofchar \x1a
+    chan configure $f -translation crlf -eofchar \x1A
     chan puts $f abc\ndef
     chan close $f
     set s [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1a
+    chan configure $f -translation crlf -eofchar \x1A
     list $s [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4722,7 +4733,7 @@ test chan-io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4736,7 +4747,7 @@ test chan-io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1a
+    chan configure $f -translation lf -eofchar \x1A
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4750,7 +4761,7 @@ test chan-io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4764,7 +4775,7 @@ test chan-io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1a
+    chan configure $f -translation cr -eofchar \x1A
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4778,7 +4789,7 @@ test chan-io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -4792,7 +4803,7 @@ test chan-io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} -setup {
     chan close $f
     set c [file size $path(test1)]
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1a
+    chan configure $f -translation crlf -eofchar \x1A
     list $c [string length [chan read $f]] [chan eof $f]
 } -cleanup {
     chan close $f
@@ -5162,7 +5173,7 @@ test chan-io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} -setup {
 } -body {
     set f [open $path(test1) w]
     chan configure $f -encoding {}
-    chan puts -nonewline $f \xe7\x89\xa6
+    chan puts -nonewline $f \xE7\x89\xA6
     chan close $f
     set f [open $path(test1) r]
     chan configure $f -encoding utf-8
@@ -5175,7 +5186,7 @@ test chan-io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} -setup {
 } -body {
     set f [open $path(test1) w]
     chan configure $f -encoding binary
-    chan puts -nonewline $f \xe7\x89\xa6
+    chan puts -nonewline $f \xE7\x89\xA6
     chan close $f
     set f [open $path(test1) r]
     chan configure $f -encoding utf-8
@@ -5196,7 +5207,7 @@ test chan-io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_
 } -constraints {stdio fileevent} -body {
     set f [openpipe r+ $path(cat)]
     chan configure $f -encoding binary
-    chan puts -nonewline $f "\xe7"
+    chan puts -nonewline $f \xE7
     chan flush $f
     chan configure $f -encoding utf-8 -blocking 0
     chan event $f readable [namespace code { lappend x [chan read $f] }]
@@ -5214,7 +5225,7 @@ test chan-io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_
     return $x
 } -cleanup {
     chan close $f
-} -result "{} timeout {} timeout \xe7 timeout"
+} -result "{} timeout {} timeout \xE7 timeout"
 test chan-io-39.18 {Tcl_SetChannelOption, setting read mode independently} \
 	-constraints {socket} -body {
     proc accept {s a p} {chan close $s}
@@ -5333,7 +5344,7 @@ test chan-io-40.1 {POSIX open access modes: RDWR} -setup {
 } -result {zzy abzzy}
 test chan-io-40.2 {POSIX open access modes: CREAT} -setup {
     file delete $path(test3)
-} -constraints {unix} -body {
+} -constraints {unix notWsl} -body {
     set f [open $path(test3) {WRONLY CREAT} 0o600]
     file stat $path(test3) stats
     set x [format 0o%03o [expr {$stats(mode) & 0o777}]]
@@ -5346,11 +5357,11 @@ test chan-io-40.2 {POSIX open access modes: CREAT} -setup {
 } -result {0o600 {line 1}}
 test chan-io-40.3 {POSIX open access modes: CREAT} -setup {
     file delete $path(test3)
-} -constraints {unix umask} -body {
+} -constraints {unix umask notWsl} -body {
     # This test only works if your umask is 2, like ouster's.
     chan close [open $path(test3) {WRONLY CREAT}]
     file stat $path(test3) stats
-    format "0o%03o" [expr {$stats(mode) & 0o777}]
+    format 0o%03o [expr {$stats(mode) & 0o777}]
 } -result [format 0o%03o [expr {0o666 & ~ $umaskValue}]]
 test chan-io-40.4 {POSIX open access modes: CREAT} -setup {
     file delete $path(test3)
@@ -5528,11 +5539,11 @@ test chan-io-42.2 {Tcl_FileeventCmd: replacing} {fileevent} {
 } {{first script} {new script} {yet another} {}}
 test chan-io-42.3 {Tcl_FileeventCmd: replacing, with NULL chars in script} {fileevent} {
     set result {}
-    chan event $f r "first scr\0ipt"
+    chan event $f r "first scr\x00ipt"
     lappend result [string length [chan event $f readable]]
-    chan event $f r "new scr\0ipt"
+    chan event $f r "new scr\x00ipt"
     lappend result [string length [chan event $f readable]]
-    chan event $f r "yet ano\0ther"
+    chan event $f r "yet ano\x00ther"
     lappend result [string length [chan event $f readable]]
     chan event $f r ""
     lappend result [chan event $f readable]
@@ -5978,7 +5989,7 @@ test chan-io-48.4 {lf write, testing readability, ^Z termination, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6002,7 +6013,7 @@ test chan-io-48.5 {lf write, testing readability, ^Z in middle, auto read mode}
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6026,7 +6037,7 @@ test chan-io-48.6 {cr write, testing readability, ^Z termination, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6050,7 +6061,7 @@ test chan-io-48.7 {cr write, testing readability, ^Z in middle, auto read mode}
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6074,7 +6085,7 @@ test chan-io-48.8 {crlf write, testing readability, ^Z termination, auto read mo
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation auto -eofchar \x1a
+    chan configure $f -translation auto -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6098,7 +6109,7 @@ test chan-io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation auto
+    chan configure $f -translation auto -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6122,7 +6133,7 @@ test chan-io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation lf
+    chan configure $f -translation lf -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6146,7 +6157,7 @@ test chan-io-48.11 {lf write, testing readability, ^Z termination, lf read mode}
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation lf -eofchar \x1a
+    chan configure $f -translation lf -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6170,7 +6181,7 @@ test chan-io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation cr
+    chan configure $f -translation cr -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6194,7 +6205,7 @@ test chan-io-48.13 {cr write, testing readability, ^Z termination, cr read mode}
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation cr -eofchar \x1a
+    chan configure $f -translation cr -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6218,7 +6229,7 @@ test chan-io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mod
     chan puts -nonewline $f [format "abc\ndef\n%cfoo\nbar\n" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -eofchar \x1a -translation crlf
+    chan configure $f -translation crlf -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6242,7 +6253,7 @@ test chan-io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} -
     chan puts -nonewline $f [format "abc\ndef\n%c" 26]
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf -eofchar \x1a
+    chan configure $f -translation crlf -eofchar \x1A
     chan event $f readable [namespace code {
 	if {[chan eof $f]} {
 	   set x done
@@ -6636,8 +6647,8 @@ test chan-io-52.3 {TclCopyChannel} -constraints {fcopy} -setup {
 } -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation cr -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation cr -encoding iso8859-1 -blocking 0
     set s0 [chan copy $f1 $f2]
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
@@ -6667,8 +6678,8 @@ test chan-io-52.5 {TclCopyChannel, all} -constraints {fcopy} -setup {
 } -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2 -size -1 ;# -1 means 'copy all', same as if no -size specified.
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
@@ -6683,8 +6694,8 @@ test chan-io-52.5a {TclCopyChannel, all, other negative value} -setup {
 } -constraints {fcopy} -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2 -size -2 ;# < 0 behaves like -1, copy all
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
@@ -6699,8 +6710,8 @@ test chan-io-52.5b {TclCopyChannel, all, wrap to negative value} -setup {
 } -constraints {fcopy} -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2 -size 3221176172 ;# Wrapped to < 0, behaves like -1, copy all
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
@@ -6715,8 +6726,8 @@ test chan-io-52.6 {TclCopyChannel} -setup {
 } -constraints {fcopy} -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     set s0 [chan copy $f1 $f2 -size [expr {[file size $thisScript] + 5}]]
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     chan close $f1
@@ -6733,8 +6744,8 @@ test chan-io-52.7 {TclCopyChannel} -constraints {fcopy} -setup {
 } -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation lf -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation lf -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     if {[file size $thisScript] == [file size $path(test1)]} {
@@ -6779,7 +6790,7 @@ set path(utf8-rp.txt)    [makeFile {} utf8-rp.txt]
 # Create kyrillic file, use lf translation to avoid os eol issues
 set out [open $path(kyrillic.txt) w]
 chan configure $out -encoding koi8-r -translation lf
-chan puts       $out "\u0410\u0410"
+chan puts       $out \u0410\u0410
 chan close      $out
 test chan-io-52.9 {TclCopyChannel & encodings} {fcopy} {
     # Copy kyrillic to UTF-8, using chan copy.
@@ -6817,7 +6828,7 @@ test chan-io-52.10 {TclCopyChannel & encodings} {fcopy} {
 test chan-io-52.11 {TclCopyChannel & encodings} -setup {
     set f [open $path(utf8-fcopy.txt) w]
     fconfigure $f -encoding utf-8 -translation lf
-    puts $f "\u0410\u0410"
+    puts $f \u0410\u0410
     close $f
 } -constraints {fcopy} -body {
     # binary to encoding => the input has to be in utf-8 to make sense to the
@@ -6851,8 +6862,8 @@ test chan-io-53.2 {CopyData} -setup {
 } -constraints {fcopy} -body {
     set f1 [open $thisScript]
     set f2 [open $path(test1) w]
-    chan configure $f1 -translation lf -blocking 0
-    chan configure $f2 -translation cr -blocking 0
+    chan configure $f1 -translation lf -encoding iso8859-1 -blocking 0
+    chan configure $f2 -translation cr -encoding iso8859-1 -blocking 0
     chan copy $f1 $f2 -command [namespace code {set s0}]
     set result [list [chan configure $f1 -blocking] [chan configure $f2 -blocking]]
     variable s0
@@ -7491,7 +7502,7 @@ test chan-io-60.1 {writing illegal utf sequences} {fileevent testbytestring} {
     set out [open $path(script) w]
     chan puts $out "catch {load $::tcltestlib Tcltest}"
     chan puts $out {
-	chan puts [testbytestring \xe2]
+	chan puts [testbytestring \xE2]
 	exit 1
     }
     proc readit {pipe} {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index bb3ad98..8d36594 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -4,8 +4,8 @@
 # commands. Sourcing this file into Tcl runs the tests and generates output
 # for errors. No output means no errors were found.
 #
-# Copyright (c) 1996-1998 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright (c) 1996-1998 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -30,6 +30,7 @@ testConstraint linkDirectory [expr {
     ($::tcl_platform(osVersion) >= 5.0
      && [lindex [file system [temporaryDirectory]] 1] eq "NTFS")
 }]
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 
 global env
 set cmdAHwd [pwd]
@@ -148,10 +149,10 @@ test cmdAH-2.6.2 {cd} -constraints {unix nonPortable} -setup {
 test cmdAH-2.6.3 {Tcl_CdObjCmd, bug #3118489} -setup {
     set dir [pwd]
 } -returnCodes error -body {
-    cd .\0
+    cd .\x00
 } -cleanup {
     cd $dir
-} -match glob -result "couldn't change working directory to \".\0\": *"
+} -match glob -result "couldn't change working directory to \".\x00\": *"
 test cmdAH-2.7 {Tcl_ConcatObjCmd} {
     concat
 } {}
@@ -261,7 +262,7 @@ test cmdAH-6.3 {Tcl_FileObjCmd: volumes} -constraints unix -body {
 test cmdAH-6.4 {Tcl_FileObjCmd: volumes} -constraints win -body {
     set volumeList [string tolower [file volumes]]
     set element [lsearch -exact $volumeList "c:/"]
-    list [expr {$element>-1}] [glob -nocomplain [lindex $volumeList $element]*]
+    list [expr {$element>=0}] [glob -nocomplain [lindex $volumeList $element]*]
 } -match glob -result {1 *}
 
 # attributes
@@ -849,7 +850,7 @@ test cmdAH-16.2 {Tcl_FileObjCmd: readable} {
     -result 	 1
 }
 test cmdAH-16.3 {Tcl_FileObjCmd: readable} {
-    -constraints {unix notRoot testchmod}
+    -constraints {unix notRoot testchmod notWsl}
     -setup  	 {testchmod 0o333 $gorpfile}
     -body   	 {file readable $gorpfile}
     -result 	 0
@@ -882,7 +883,7 @@ set gorpfile [makeFile abcde gorp.file]
 test cmdAH-18.1 {Tcl_FileObjCmd: executable} -returnCodes error -body {
     file executable a b
 } -result {wrong # args: should be "file executable name"}
-test cmdAH-18.2 {Tcl_FileObjCmd: executable} {notRoot} {
+test cmdAH-18.2 {Tcl_FileObjCmd: executable} {notRoot notWsl} {
     file executable $gorpfile
 } 0
 test cmdAH-18.3 {Tcl_FileObjCmd: executable} {unix testchmod} {
@@ -1430,7 +1431,7 @@ test cmdAH-28.4 {Tcl_FileObjCmd: stat} -setup {
     file stat $gorpfile stat
     list $stat(nlink) $stat(size) $stat(type)
 } -result {1 12 file}
-test cmdAH-28.5 {Tcl_FileObjCmd: stat} -constraints {unix} -setup {
+test cmdAH-28.5 {Tcl_FileObjCmd: stat} -constraints {unix notWsl} -setup {
     unset -nocomplain stat
 } -body {
     file stat $gorpfile stat
diff --git a/tests/fCmd.test b/tests/fCmd.test
index ecb1d04..fcf5cbe 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -5,7 +5,7 @@
 # for errors. No output means no errors were found.
 #
 # Copyright (c) 1996-1997 Sun Microsystems, Inc.
-# Copyright (c) 1999 by Scriptics Corporation.
+# Copyright (c) 1999 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -29,7 +29,7 @@ testConstraint winLessThan10 0
 testConstraint notNetworkFilesystem 0
 testConstraint reg 0
 if {[testConstraint win]} {
-    catch {
+    if {[catch {
 	# Is the registry extension already static to this shell?
 	try {
 	    load {} Registry
@@ -40,9 +40,14 @@ if {[testConstraint win]} {
 	    load $::reglib Registry
 	}
 	testConstraint reg 1
+    } regError]} {
+        catch {package require registry; testConstraint reg 1}
     }
 }
 
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
+
 set tmpspace /tmp;# default value
 # Find a group that exists on this Unix system, or else skip tests that
 # require Unix groups.
@@ -281,7 +286,7 @@ test fCmd-3.14 {FileCopyRename: FileBasename fails} -setup {
     file mkdir td1
     file rename ~_totally_bogus_user td1
 } -result {user "_totally_bogus_user" doesn't exist}
-test fCmd-3.15 {FileCopyRename: source[0] == '\0'} -setup {
+test fCmd-3.15 {FileCopyRename: source[0] == '\x00'} -setup {
     cleanup
 } -constraints {notRoot unixOrWin} -returnCodes error -body {
     file mkdir td1
@@ -323,7 +328,7 @@ test fCmd-4.4 {TclFileMakeDirsCmd: Tcl_TranslateFileName fails} -setup {
 } -constraints {notRoot} -returnCodes error -body {
     file mkdir ~_totally_bogus_user
 } -result {user "_totally_bogus_user" doesn't exist}
-test fCmd-4.5 {TclFileMakeDirsCmd: Tcl_SplitPath returns 0: *name == '\0'} -setup {
+test fCmd-4.5 {TclFileMakeDirsCmd: Tcl_SplitPath returns 0: *name == '\x00'} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     file mkdir ""
@@ -364,7 +369,7 @@ test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} -setup {
 } -result {1 1}
 test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -returnCodes error -body {
+} -constraints {unix notRoot testchmod notWsl} -returnCodes error -body {
     file mkdir td1/td2/td3
     testchmod 0 td1/td2
     file mkdir td1/td2/td3/td4
@@ -382,7 +387,7 @@ test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} -setup {
 test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} -setup {
     cleanup
     file delete -force foo
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir foo
     file attr foo -perm 0o40000
     file mkdir foo/tf1
@@ -394,7 +399,7 @@ test fCmd-4.16 {TclFileMakeDirsCmd: TclpCreateDirectory succeeds} -setup {
 } -constraints {notRoot} -body {
     file mkdir tf1
     file exists tf1
-} -result {1}
+} -result 1
 
 test fCmd-5.1 {TclFileDeleteCmd: FileForceOption fails} -constraints {notRoot} -body {
     file delete -xyz
@@ -507,7 +512,7 @@ test fCmd-6.5 {CopyRenameOneFile: lstat(target) != 0} -setup {
 } -result {tf2}
 test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir td1
     testchmod 0 td1
     createfile tf1
@@ -626,7 +631,7 @@ test fCmd-6.22 {CopyRenameOneFile: copy/rename: !S_ISDIR(source)} -setup {
 } -result [file join $tmpspace tf1]
 test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {xdev notRoot} -body {
+} -constraints {xdev notRoot notWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1 -permissions 0o000
     file rename td1 $tmpspace
@@ -678,7 +683,7 @@ test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
 } -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": file already exists}
 test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {notRoot xdev} -body {
+} -constraints {notRoot xdev notWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1/td2/td3 -permissions 0o000
     file rename td1 $tmpspace
@@ -695,7 +700,7 @@ test fCmd-6.29 {CopyRenameOneFile: TclpCopyDirectory passed} -setup {
 } -result [file join $tmpspace td1 td2]
 test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} -setup {
     cleanup $tmpspace
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir foo/bar
     file attr foo -perm 0o40555
     file rename foo/bar $tmpspace
@@ -770,7 +775,7 @@ test fCmd-8.3 {file copy and path translation: ensure correct error} -body {
 
 test fCmd-9.1 {file rename: comprehensive: EACCES} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir td1
     file mkdir td2
     file attr td2 -perm 0o40000
@@ -807,7 +812,7 @@ test fCmd-9.4.a {file rename: comprehensive: dir to new name} -setup {
 } -result {{td3 td4} 1 0}
 test fCmd-9.4.b {file rename: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod notDarwin9} -body {
+} -constraints {unix notRoot testchmod notDarwin9 notWsl} -body {
     file mkdir td1 td2
     testchmod 0o555 td2
     file rename td1 td3
@@ -838,7 +843,7 @@ test fCmd-9.6.a {file rename: comprehensive: dir to self} -setup {
 } -result {{td1 td2} 1 0}
 test fCmd-9.6.b {file rename: comprehensive: dir to self} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir td1
     file mkdir td2
     testchmod 0o555 td2
@@ -1046,7 +1051,7 @@ test fCmd-10.2 {file copy: comprehensive: file to new name} -setup {
 } -result {{tf1 tf2 tf3 tf4} tf1 tf2 1 0}
 test fCmd-10.3 {file copy: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir [file join td1 tdx]
     file mkdir [file join td2 tdy]
     testchmod 0o555 td2
@@ -1133,7 +1138,7 @@ test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
 } -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
 test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     cleanup
-} -constraints {notRoot unixOrWin testchmod} -body {
+} -constraints {notRoot unixOrWin testchmod notWsl} -body {
     file mkdir tds1
     file mkdir tds2
     file mkdir [file join tdd1 tds1 xxx]
@@ -1157,7 +1162,7 @@ test fCmd-10.7 {file rename: comprehensive: file to new name and dir} -setup {
 } -result [subst {{tf1 tf2} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
 test fCmd-10.8 {file rename: comprehensive: dir to new name and dir} -setup {
     cleanup
-} -constraints {unix notRoot testchmod} -body {
+} -constraints {unix notRoot testchmod notWsl} -body {
     file mkdir td1
     file mkdir td2
     file mkdir td3
@@ -1249,7 +1254,7 @@ test fCmd-11.5 {TclFileRenameCmd: > 1 source & target is not a dir} -setup {
     catch {file rename tfa1 tfa2 tfa3}
 } -cleanup {
     file delete tfa1 tfa2 tfa3
-} -result {1}
+} -result 1
 test fCmd-11.6 {TclFileRenameCmd: : single file into directory} -setup {
     catch {file delete -force -- tfa1 tfad}
 } -constraints {notRoot} -body {
@@ -1294,7 +1299,7 @@ test fCmd-12.1 {renamefile: source filename translation failing} -setup {
     catch {file rename ~/tfa1 tfa2}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-12.2 {renamefile: src filename translation failing} -setup {
     set temp $::env(HOME)
 } -constraints {notRoot} -body {
@@ -1306,7 +1311,7 @@ test fCmd-12.2 {renamefile: src filename translation failing} -setup {
 } -cleanup {
     set ::env(HOME) $temp
     file delete -force tfad
-} -result {1}
+} -result 1
 test fCmd-12.3 {renamefile: stat failing on source} -setup {
     catch {file delete -force -- tfa1 tfa2}
 } -constraints {notRoot} -body {
@@ -1351,10 +1356,10 @@ test fCmd-12.7 {renamefile: renaming directory into offspring} -setup {
     catch {file rename tfad tfad/dir}
 } -cleanup {
     file delete -force tfad
-} -result {1}
+} -result 1
 test fCmd-12.8 {renamefile: generic error} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     file mkdir tfa/dir
     file attributes tfa -permissions 0o555
@@ -1362,7 +1367,7 @@ test fCmd-12.8 {renamefile: generic error} -setup {
 } -cleanup {
     catch {file attributes tfa -permissions 0o777}
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-12.9 {renamefile: moving a file across volumes} -setup {
     cleanup $tmpspace
 } -constraints {unix notRoot} -body {
@@ -1424,7 +1429,7 @@ test fCmd-13.5 {TclCopyFilesCmd: target filename translation failing} -setup {
     catch { file copy tfa ~/foobar }
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-13.6 {TclCopyFilesCmd: > 1 source & target is not a dir} -setup {
     catch {file delete -force -- tfa1 tfa2 tfa3}
 } -constraints {notRoot} -body {
@@ -1434,7 +1439,7 @@ test fCmd-13.6 {TclCopyFilesCmd: > 1 source & target is not a dir} -setup {
     catch {file copy tfa1 tfa2 tfa3}
 } -cleanup {
     file delete tfa1 tfa2 tfa3
-} -result {1}
+} -result 1
 test fCmd-13.7 {TclCopyFilesCmd: single file into directory} -setup {
     catch {file delete -force -- tfa1 tfad}
 } -constraints {notRoot} -body {
@@ -1480,7 +1485,7 @@ test fCmd-14.1 {copyfile: source filename translation failing} -setup {
     catch {file copy ~/tfa1 tfa2}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-14.2 {copyfile: dst filename translation failing} -setup {
     set temp $::env(HOME)
 } -constraints {notRoot} -body {
@@ -1541,14 +1546,14 @@ test fCmd-14.7 {copyfile: copy directory succeeding} -setup {
 } -result {1 1}
 test fCmd-14.8 {copyfile: copy directory failing} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa/dir/a/b/c
     file attributes tfa/dir -permissions 0o000
     catch {file copy tfa tfa2}
 } -cleanup {
     file attributes tfa/dir -permissions 0o777
     file delete -force tfa tfa2
-} -result {1}
+} -result 1
 
 #
 # Coverage tests for TclMkdirCmd()
@@ -1561,7 +1566,7 @@ test fCmd-15.1 {TclMakeDirsCmd: target filename translation failing} -setup {
     catch {file mkdir ~/tfa}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 #
 # Can Tcl_SplitPath return argc == 0? If so them we need a test for that code.
 #
@@ -1572,7 +1577,7 @@ test fCmd-15.2 {TclMakeDirsCmd - one directory} -setup {
     file isdirectory tfa
 } -cleanup {
     file delete tfa
-} -result {1}
+} -result 1
 test fCmd-15.3 {TclMakeDirsCmd: - two directories} -setup {
     catch {file delete -force -- tfa1 tfa2}
 } -constraints {notRoot} -body {
@@ -1591,7 +1596,7 @@ test fCmd-15.4 {TclMakeDirsCmd - stat failing} -setup {
 } -cleanup {
     file attributes tfa -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-15.5 {TclMakeDirsCmd: - making a directory several levels deep} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1599,7 +1604,7 @@ test fCmd-15.5 {TclMakeDirsCmd: - making a directory several levels deep} -setup
     file isdir tfa/a/b/c
 } -cleanup {
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-15.6 {TclMakeDirsCmd: - trying to overwrite a file} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1623,7 +1628,7 @@ test fCmd-15.8 {TclFileMakeDirsCmd: trying to create an existing dir} -body {
     file isdir tfa
 } -constraints {notRoot} -cleanup {
     file delete tfa
-} -result {1}
+} -result 1
 
 # Coverage tests for TclDeleteFilesCommand()
 test fCmd-16.1 {test the -- argument} -constraints {notRoot} -setup {
@@ -1647,7 +1652,7 @@ test fCmd-16.3 {test bad option} -constraints {notRoot} -setup {
     catch {file delete -dog tfa}
 } -cleanup {
     file delete tfa
-} -result {1}
+} -result 1
 test fCmd-16.4 {accept zero files (TIP 323)} -body {
     file delete
 } -result {}
@@ -1662,7 +1667,7 @@ test fCmd-16.6 {delete: source filename translation failing} -setup {
     catch {file delete ~/tfa}
 } -cleanup {
     set ::env(HOME) $temp
-} -result {1}
+} -result 1
 test fCmd-16.7 {remove a non-empty directory without -force} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1671,7 +1676,7 @@ test fCmd-16.7 {remove a non-empty directory without -force} -setup {
     catch {file delete tfa}
 } -cleanup {
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-16.8 {remove a normal file} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa}
 } -body {
@@ -1680,10 +1685,10 @@ test fCmd-16.8 {remove a normal file} -constraints {notRoot} -setup {
     catch {file delete tfa}
 } -cleanup {
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-16.9 {error while deleting file} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     createfile tfa/a
     file attributes tfa -permissions 0o555
@@ -1696,7 +1701,7 @@ test fCmd-16.9 {error while deleting file} -setup {
 } -cleanup {
     file attributes tfa -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-16.10 {deleting multiple files} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa1 tfa2}
 } -body {
@@ -1714,14 +1719,14 @@ test fCmd-16.11 {TclFileDeleteCmd: removing a nonexistant file} -setup {
 # More coverage tests for mkpath()
 test fCmd-17.1 {mkdir stat failing on target but not ENOENT} -setup {
      catch {file delete -force -- tfa1}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
      file mkdir tfa1
      file attributes tfa1 -permissions 0o555
      catch {file mkdir tfa1/tfa2}
 } -cleanup {
      file attributes tfa1 -permissions 0o777
      file delete -force tfa1
-} -result {1}
+} -result 1
 test fCmd-17.2 {mkdir several levels deep - relative} -setup {
     catch {file delete -force -- tfa}
 } -constraints {notRoot} -body {
@@ -1738,7 +1743,7 @@ test fCmd-17.3 {mkdir several levels deep - absolute} -setup {
     file isdir $f
 } -cleanup {
     file delete $f [file join [pwd] tfa]
-} -result {1}
+} -result 1
 
 #
 # Functionality tests for TclFileRenameCmd()
@@ -1899,7 +1904,7 @@ test fCmd-18.15 {TclFileRenameCmd : rename a file to a symlink dir} -setup {
     checkcontent tfa1/tfa2 $s
 } -cleanup {
     file delete -force tfa1 tfalink
-} -result {1}
+} -result 1
 test fCmd-18.16 {TclFileRenameCmd: rename a dangling symlink} -setup {
     catch {file delete -force -- tfa1 tfalink}
 } -constraints {unix notRoot} -body {
@@ -1924,7 +1929,7 @@ test fCmd-19.1 {remove empty directory} -constraints {notRoot} -setup {
 } -result {0}
 test fCmd-19.2 {rmdir error besides EEXIST} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa -permissions 0o555
@@ -1932,7 +1937,7 @@ test fCmd-19.2 {rmdir error besides EEXIST} -setup {
 } -cleanup {
     file attributes tfa -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-19.3 {recursive remove} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa}
 } -body {
@@ -1952,7 +1957,7 @@ test fCmd-19.3 {recursive remove} -constraints {notRoot} -setup {
 #
 test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory} -setup {
     catch {file delete -force -- tfa}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir tfa
     file mkdir tfa/a
     file attributes tfa/a -permissions 0o000
@@ -1960,7 +1965,7 @@ test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory} -se
 } -cleanup {
     file attributes tfa/a -permissions 0o777
     file delete -force tfa
-} -result {1}
+} -result 1
 test fCmd-20.2 {TraverseUnixTree : recursive delete of large directory: Bug 1034337} -setup {
     catch {file delete -force -- tfa}
 } -constraints {unix notRoot} -body {
@@ -2013,7 +2018,7 @@ test fCmd-21.4 {copy : more than one source and target is not a directory} -setu
     catch {file copy tfa1 tfa2 tfa3}
 } -cleanup {
     file delete tfa1 tfa2 tfa3
-} -result {1}
+} -result 1
 test fCmd-21.5 {copy : multiple files into directory} -constraints {notRoot} -setup {
     catch {file delete -force -- tfa1 tfa2 tfad}
 } -body {
@@ -2138,7 +2143,7 @@ test fCmd-22.2 {TclpRenameFile: attempt to overwrite itself} -setup {
     checkcontent tfa1 $s
 } -cleanup {
     file delete tfa1
-} -result {1}
+} -result 1
 test fCmd-22.3 {TclpRenameFile: rename dir to existing dir} -setup {
     catch {file delete -force -- d1 tfad}
 } -constraints {notRoot} -body {
@@ -2598,7 +2603,7 @@ test fCmd-30.2 {file readable on 'NTUSER.DAT'} -constraints {win} -body {
     expr {[info exists env(USERPROFILE)]
           && [file exists $env(USERPROFILE)/NTUSER.DAT]
           && [file readable $env(USERPROFILE)/NTUSER.DAT]}
-} -result {1}
+} -result 1
 # At least one CI environment (GitHub Actions) is set up with the page file in
 # an unusual location; skip the test if that is so.
 test fCmd-30.3 {file readable on 'pagefile.sys'} -constraints {
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 9da14de..750a20d 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -2,8 +2,8 @@
 # built-in commands.  Sourcing this file into Tcl runs the tests and
 # generates output for errors.  No output means no errors were found.
 #
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# Copyright (c) 2000 by Ajuba Solutions
+# Copyright (c) 1998-1999 Scriptics Corporation.
+# Copyright (c) 2000 Ajuba Solutions
 # All rights reserved.
 
 # Note that there are several places where the value of
@@ -22,6 +22,9 @@ if {[catch {package require tcltest 2.1}]} {
     return
 }
 
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
+
 namespace eval ::tcltest::test {
 
 namespace import ::tcltest::*
@@ -306,7 +309,7 @@ test tcltest-5.3 {testConstraint - constraint empty (tcltest::safeFetch)}  {
 #}
 
 test tcltest-5.5 {InitConstraints: list of built-in constraints} \
-	-constraints {!singleTestInterp} \
+	-constraints {!singleTestInterp notWsl} \
 	-setup {tcltest::InitConstraints} \
 	-body { lsort [array names ::tcltest::testConstraints] } \
 	-result [lsort {
@@ -556,7 +559,7 @@ switch -- $::tcl_platform(platform) {
     }
 }
 test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
-    -constraints {unix notRoot}
+    -constraints {unix notRoot notWsl}
     -body {
 	child msg $a -tmpdir $notReadableDir
 	return $msg
@@ -572,7 +575,7 @@ testConstraint notFAT [expr {
 }]
 # FAT/NTFS permissions are fairly hopeless; ignore this test if that FS is used
 test tcltest-8.4 {tcltest a.tcl -tmpdir notWriteableDir} {
-    -constraints {unixOrWin notRoot notFAT}
+    -constraints {unixOrWin notRoot notFAT notWsl}
     -body {
 	child msg $a -tmpdir $notWriteableDir
 	return $msg
@@ -645,7 +648,7 @@ test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} {
     -result {*not a directory*}
 }
 test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {
-    -constraints {unix notRoot}
+    -constraints {unix notRoot notWsl}
     -body {
 	child msg $a -testdir $notReadableDir
 	return $msg
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index 4b1687f..7389cc7 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -18,6 +18,8 @@ if {"::tcltest" ni [namespace children]} {
 catch [list package require -exact Tcltest [info patchlevel]]
 
 testConstraint testchmod [llength [info commands testchmod]]
+# File permissions broken on wsl without some "exotic" wsl configuration
+testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 
 # These tests really need to be run from a writable directory, which
 # it is assumed [temporaryDirectory] is.
@@ -94,7 +96,7 @@ if {[testConstraint unix] && [testConstraint notRoot]} {
 
 test unixFCmd-1.1 {TclpRenameFile: EACCES} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir td1/td2/td3
     file attributes td1/td2 -permissions 0o000
     file rename td1/td2/td3 td2
@@ -135,7 +137,7 @@ test unixFCmd-1.6 {TclpRenameFile: ENOTDIR} {emptyTest unix notRoot} {
 } {}
 test unixFCmd-1.7 {TclpRenameFile: EXDEV} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     file mkdir foo/bar
     file attr foo -perm 0o40555
     file rename foo/bar /tmp
@@ -219,7 +221,7 @@ test unixFCmd-2.4 {TclpCopyFile: src is fifo} -setup {
 } -result {fifo fifo}
 test unixFCmd-2.5 {TclpCopyFile: copy attributes} -setup {
     cleanup
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     close [open tf1 a]
     file attributes tf1 -permissions 0o472
     file copy tf1 tf2
@@ -334,7 +336,7 @@ test unixFCmd-16.3 {SetOwnerAttribute - invalid owner} -setup {
 
 test unixFCmd-17.1 {SetPermissionsAttribute} -setup {
     catch {file delete -force -- foo.test}
-} -constraints {unix notRoot} -body {
+} -constraints {unix notRoot notWsl} -body {
     close [open foo.test w]
     list [file attributes foo.test -permissions 0o000] \
 	[format 0o%03o [file attributes foo.test -permissions]]
@@ -366,7 +368,7 @@ test unixFCmd-17.4 {SetPermissionsAttribute} -setup {
 close [open foo.test w]
 set ::i 4
 proc permcheck {testnum permList expected} {
-    test $testnum {SetPermissionsAttribute} {unix notRoot} {
+    test $testnum {SetPermissionsAttribute} {unix notRoot notWsl} {
       set result {}
       foreach permstr $permList {
 	file attributes foo.test -permissions $permstr
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 0b4c8f6..d70d217 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -31,21 +31,14 @@
  * Forward declarations of functions defined later in this file:
  */
 
-static int		TesteventloopCmd(ClientData dummy, Tcl_Interp* interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		TestvolumetypeCmd(ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
-static int		TestwinclockCmd(ClientData dummy, Tcl_Interp* interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		TestwinsleepCmd(ClientData dummy, Tcl_Interp* interp,
-			    int objc, Tcl_Obj *const objv[]);
-static int		TestSizeCmd(ClientData dummy, Tcl_Interp* interp,
-			    int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc	TesteventloopCmd;
+static Tcl_ObjCmdProc	TestvolumetypeCmd;
+static Tcl_ObjCmdProc	TestwinclockCmd;
+static Tcl_ObjCmdProc	TestwinsleepCmd;
+static Tcl_ObjCmdProc	TestSizeCmd;
 static Tcl_ObjCmdProc	TestExceptionCmd;
 static int		TestplatformChmod(const char *nativePath, int pmode);
-static int		TestchmodCmd(ClientData dummy, Tcl_Interp* interp,
-			    int objc, Tcl_Obj *const objv[]);
+static Tcl_ObjCmdProc	TestchmodCmd;
 
 /*
  *----------------------------------------------------------------------
@@ -111,6 +104,7 @@ TesteventloopCmd(
     static int *framePtr = NULL;/* Pointer to integer on stack frame of
 				 * innermost invocation of the "wait"
 				 * subcommand. */
+    (void)clientData;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ...");
@@ -300,6 +294,7 @@ TestwinsleepCmd(
     Tcl_Obj *const * objv)	/* Parameter vector */
 {
     int ms;
+    (void)clientData;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "ms");
@@ -385,6 +380,7 @@ TestExceptionCmd(
 	EXCEPTION_GUARD_PAGE, EXCEPTION_INVALID_HANDLE, CONTROL_C_EXIT
     };
     int cmd;
+    (void)dummy;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 0, objv, "<type-of-exception>");
@@ -411,7 +407,6 @@ TestExceptionCmd(
     /* SMASH! */
     RaiseException(exceptions[cmd], EXCEPTION_NONCONTINUABLE, 0, NULL);
 
-    /* NOTREACHED */
     return TCL_OK;
 }
 
@@ -451,7 +446,6 @@ TestplatformChmod(
     DWORD attr, newAclSize;
     PACL newAcl = NULL;
     int res = 0;
-    SID_IDENTIFIER_AUTHORITY worldAuthority = SECURITY_WORLD_SID_AUTHORITY;
 
     HANDLE hToken = NULL;
     int i;
@@ -483,7 +477,7 @@ TestplatformChmod(
 	GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	goto done;
     }
-    pTokenUser = ckalloc(dw);
+    pTokenUser = (TOKEN_USER *)ckalloc(dw);
     if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dw, &dw)) {
 	goto done;
     }
@@ -525,7 +519,7 @@ TestplatformChmod(
 		GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
 	    goto done;
 	}
-	pTokenGroup = ckalloc(dw);
+	pTokenGroup = (TOKEN_PRIMARY_GROUP *)ckalloc(dw);
 	if (!GetTokenInformation(hToken, TokenPrimaryGroup, pTokenGroup, dw, &dw)) {
 	    ckfree(pTokenGroup);
 	    goto done;
@@ -592,7 +586,7 @@ TestplatformChmod(
 	newAclSize +=
 	    offsetof(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen;
     }
-    newAcl = ckalloc(newAclSize);
+    newAcl = (PACL)ckalloc(newAclSize);
     if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) {
 	goto done;
     }
@@ -668,6 +662,7 @@ TestchmodCmd(
     Tcl_Obj *const * objv)	/* Parameter vector */
 {
     int i, mode;
+    (void)dummy;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "mode file ?file ...?");
-- 
cgit v0.12


From 38555b60a2647d88236a922f72741a3f4611ccd2 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 9 Mar 2023 02:47:53 +0000
Subject: winFCmd-1.24 has different error code on Win 11

---
 tests/winFCmd.test | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index b146253..83dfbf7 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -286,8 +286,9 @@ test winFCmd-1.23 {TclpRenameFile: move dir into self} -setup {
 test winFCmd-1.24 {TclpRenameFile: move a root dir} -setup {
     cleanup
 } -constraints {win testfile} -body {
+    # Error code depends on Windows version
     testfile mv / c:/
-} -returnCodes error -result EINVAL
+} -returnCodes error -result {^(EINVAL|ENOENT)$} -match regexp
 test winFCmd-1.25 {TclpRenameFile: cross file systems} -setup {
     cleanup
 } -constraints {win cdrom testfile} -body {
-- 
cgit v0.12


From a1fb5545852518890326ddcf62f18e05de2425e3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 9 Mar 2023 09:39:59 +0000
Subject: Fix  tests/tcltest.test testcases (missing "namespace import")

---
 tests/tcltest.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/tcltest.test b/tests/tcltest.test
index 750a20d..075cdf6 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -17,9 +17,9 @@
 # interfere with the [test] doing the testing.
 #
 
-if {[catch {package require tcltest 2.1}]} {
-    puts stderr "Skipping tests in [info script].  tcltest 2.1 required."
-    return
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.1
+    namespace import -force ::tcltest::*
 }
 
 # File permissions broken on wsl without some "exotic" wsl configuration
-- 
cgit v0.12


From 5b0be625362e6884c5276718ba911a3d292cf1c1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 9 Mar 2023 10:08:02 +0000
Subject: Adapt 2 testcases (io-39.16/io-39.16a), showing that "-encoding" can
 be shortened to "-en", but not to "-e" (because there is -eofchar too)

---
 tests/io.test | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index ca7bd0c..6d556da 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -5607,13 +5607,20 @@ test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
     close $f
     set x
 } \u7266
-test io-39.16 {Tcl_SetChannelOption: -encoding, errors} {
+test io-39.16 {Tcl_SetChannelOption: -encoding (shortened to "-en"), errors} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
-    set result [list [catch {fconfigure $f -encoding foobar} msg] $msg]
+    fconfigure $f -en foobar
+} -cleanup {
     close $f
-    set result
-} {1 {unknown encoding "foobar"}}
+} -returnCodes 1 -result {unknown encoding "foobar"}
+test io-39.16a {Tcl_SetChannelOption: -encoding (invalid shortening to "-e"), errors} -body {
+    file delete $path(test1)
+    set f [open $path(test1) w]
+    fconfigure $f -e foobar
+} -cleanup {
+    close $f
+} -returnCodes 1 -result {bad option "-e": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}
 test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio fileevent} {
     set f [open "|[list [interpreter] $path(cat)]" r+]
     fconfigure $f -encoding binary
-- 
cgit v0.12


From 56f5c7751c0f9e4da9c1a40ee533ce392a43e4a2 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 9 Mar 2023 10:47:12 +0000
Subject: Fix SetChannelOption parsing of -encoding* to match GetChannelOption

---
 generic/tclIO.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 97ca8d0..4a6dbf4 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8194,7 +8194,7 @@ Tcl_SetChannelOption(
 	}
 	Tcl_SetChannelBufferSize(chan, newBufferSize);
 	return TCL_OK;
-    } else if (HaveOpt(2, "-encoding")) {
+    } else if (HaveOpt(8, "-encoding")) {
 	Tcl_Encoding encoding;
 	int profile;
 
@@ -8230,6 +8230,15 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
+    } else if (HaveOpt(9, "-encodingprofile")) {
+	int profile;
+	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
+	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
+	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
 	if (!newValue[0] || (!(newValue[0] & 0x80) && !newValue[1])) {
 	    if (GotFlag(statePtr, TCL_READABLE)) {
@@ -8285,15 +8294,6 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
-    } else if (HaveOpt(1, "-encodingprofile")) {
-	int profile;
-	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
-	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
-	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
-	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
 
-- 
cgit v0.12


From 494b4c8127e703f7b20f85dbb342921e36a8b557 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 9 Mar 2023 20:55:43 +0000
Subject: Fix cmdAH-4.3.13.00D80000.solo.utf-32le.tcl8.a testcase from
 tip-656-tcl9 branch, when TCL_UTF_MAX=3

---
 generic/tclEncoding.c | 39 ++++++++++++++++++++++++++++++++++++---
 win/tclWinTest.c      | 10 +++++-----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 61e3236..fc3397a 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2545,7 +2545,7 @@ Utf32ToUtfProc(
     const char *srcStart, *srcEnd;
     const char *dstEnd, *dstStart;
     int result, numChars, charLimit = INT_MAX;
-    int ch, bytesLeft = srcLen % 4;
+    int ch = 0, bytesLeft = srcLen % 4;
 
     flags |= PTR2INT(clientData);
     if (flags & TCL_ENCODING_CHAR_LIMIT) {
@@ -2562,6 +2562,21 @@ Utf32ToUtfProc(
 	srcLen -= bytesLeft;
     }
 
+#if TCL_UTF_MAX < 4
+    /*
+     * If last code point is a high surrogate, we cannot handle that yet,
+     * unless we are at the end.
+     */
+
+    if (!(flags & TCL_ENCODING_END) && (srcLen >= 4) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?3:2)] & 0xFC) == 0xD8) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?2:3)]) == 0) &&
+	    ((src[srcLen - ((flags & TCL_ENCODING_LE)?1:4)]) == 0)) {
+	result = TCL_CONVERT_MULTIBYTE;
+	srcLen-= 4;
+    }
+#endif
+
     srcStart = src;
     srcEnd = src + srcLen;
 
@@ -2574,21 +2589,33 @@ Utf32ToUtfProc(
 	    break;
 	}
 
+#if TCL_UTF_MAX < 4
+	int prev = ch;
+#endif
 	if (flags & TCL_ENCODING_LE) {
 	    ch = (src[3] & 0xFF) << 24 | (src[2] & 0xFF) << 16 | (src[1] & 0xFF) << 8 | (src[0] & 0xFF);
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
-	if  ((unsigned)ch > 0x10FFFF) {
+#if TCL_UTF_MAX < 4
+	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
+	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
+	    dst += Tcl_UniCharToUtf(-1, dst);
+	}
+#endif
+	if ((unsigned)ch > 0x10FFFF) {
+	    ch = 0xFFFD;
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
-	    ch = 0xFFFD;
 	} else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
 		&& ((ch  & ~0x7FF) == 0xD800)) {
 	    if (STOPONERROR) {
 		result = TCL_CONVERT_SYNTAX;
+#if TCL_UTF_MAX < 4
+		ch = 0;
+#endif
 		break;
 	    }
 	}
@@ -2606,6 +2633,12 @@ Utf32ToUtfProc(
 	src += sizeof(unsigned int);
     }
 
+#if TCL_UTF_MAX < 4
+    if ((ch  & ~0x3FF) == 0xD800) {
+	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
+	dst += Tcl_UniCharToUtf(-1, dst);
+    }
+#endif
     if ((flags & TCL_ENCODING_END) && (result == TCL_CONVERT_MULTIBYTE)) {
 	/* We have a single byte left-over at the end */
 	if (dst > dstEnd) {
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index c7abcdc..29bdfe4 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -398,7 +398,7 @@ TestplatformChmod(
     const char *nativePath,
     int pmode)
 {
-    /* 
+    /*
      * Note FILE_DELETE_CHILD missing from dirWriteMask because we do
      * not want overriding of child's delete setting when testing
      */
@@ -406,7 +406,7 @@ TestplatformChmod(
 	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA |
 	FILE_ADD_FILE | FILE_ADD_SUBDIRECTORY | STANDARD_RIGHTS_WRITE | DELETE |
 	SYNCHRONIZE;
-    static const DWORD dirReadMask = 
+    static const DWORD dirReadMask =
 	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_LIST_DIRECTORY |
 	STANDARD_RIGHTS_READ | SYNCHRONIZE;
     /* Note - default user privileges allow ignoring TRAVERSE setting */
@@ -416,7 +416,7 @@ TestplatformChmod(
     static const DWORD fileWriteMask =
 	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_WRITE_DATA |
 	FILE_APPEND_DATA | STANDARD_RIGHTS_WRITE | DELETE | SYNCHRONIZE;
-    static const DWORD fileReadMask = 
+    static const DWORD fileReadMask =
 	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_READ_DATA |
 	STANDARD_RIGHTS_READ | SYNCHRONIZE;
     static const DWORD fileExecuteMask =
@@ -450,7 +450,7 @@ TestplatformChmod(
     if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) {
 	goto done;
     }
-    
+
     /* Get process SID */
     if (!GetTokenInformation(hToken, TokenUser, NULL, 0, &dw) &&
 	GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
@@ -468,7 +468,7 @@ TestplatformChmod(
 	Tcl_Free(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
 	goto done;
     }
-    /* 
+    /*
      * Always include DACL modify rights so we don't get locked out
      */
     aceEntry[nSids].mask = READ_CONTROL | WRITE_DAC | WRITE_OWNER | SYNCHRONIZE |
-- 
cgit v0.12


From 93bf87ed859e04b2fc9b197239ad6838e761e85d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 10 Mar 2023 13:32:47 +0000
Subject: Make test less fragile to changing set of options.

---
 tests/io.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/io.test b/tests/io.test
index 6d556da..181d028 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -5620,7 +5620,7 @@ test io-39.16a {Tcl_SetChannelOption: -encoding (invalid shortening to "-e"), er
     fconfigure $f -e foobar
 } -cleanup {
     close $f
-} -returnCodes 1 -result {bad option "-e": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -translation}
+} -returnCodes 1 -match glob -result {bad option "-e": should be one of *}
 test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio fileevent} {
     set f [open "|[list [interpreter] $path(cat)]" r+]
     fconfigure $f -encoding binary
-- 
cgit v0.12


From 6f85588bab4bad23425a2fea4e953546b8fa7ca3 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 11 Mar 2023 16:43:36 +0000
Subject: Add testencoding Tcl_ExternalToUtf/Tcl_UtfToExternal for raw testing
 of corresponding C functions

---
 generic/tclTest.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 157 insertions(+), 2 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index b3df8ec..a398797 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2016,6 +2016,156 @@ static void SpecialFree(
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * UtfTransformFn --
+ *
+ *    Implements a direct call into Tcl_UtfToExternal and Tcl_ExternalToUtf
+ *    as otherwise there is no script level command that directly exercises
+ *    these functions (i/o command cannot test all combinations)
+ *    The arguments at the script level are roughly those of the above
+ *    functions:
+ *        encodingname srcbytes flags state dstlen ?srcreadvar? ?dstwrotevar? ?dstcharsvar?
+ *
+ * Results:
+ *    TCL_OK or TCL_ERROR. This any errors running the test, NOT the
+ *    result of Tcl_UtfToExternal or Tcl_ExternalToUtf.
+ *
+ * Side effects: 
+ *    The result in the interpreter is a list of the return code from the
+ *    Tcl_UtfToExternal/Tcl_ExternalToUtf functions, the encoding state, and
+ *    the encoded binary string. If any of the srcreadvar, dstwrotevar and 
+ *    dstcharsvar are specified and not empty, they are treated as names
+ *    of variables where the *srcRead, *dstWrote and *dstChars output
+ *    from the functions are stored.
+ *------------------------------------------------------------------------
+ */
+typedef int
+UtfTransformFn(Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr,
+               char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
+static int UtfExtWrapper(
+    Tcl_Interp *interp, UtfTransformFn *transformer, int objc, Tcl_Obj *const objv[])
+{
+    Tcl_Encoding encoding;
+    int encStateValue; /* Assumes Tcl_EncodingState points to integer!!! */
+    Tcl_EncodingState encState;
+    int flags;
+    Tcl_Size srcLen, bufLen;
+    const unsigned char *bytes;
+    unsigned char *bufPtr;
+    int srcRead, dstLen, dstWrote, dstChars;
+    Tcl_Obj *srcReadVar, *dstWroteVar, *dstCharsVar;
+    int result;
+
+    if (objc < 7 || objc > 10) {
+        Tcl_WrongNumArgs(interp,
+                         2,
+                         objv,
+                         "encoding srcbytes flags state dstlen ?srcreadvar? ?dstwrotevar? ?dstcharsvar?");
+        return TCL_ERROR;
+    }
+    if (Tcl_GetEncodingFromObj(interp, objv[2], &encoding) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetIntFromObj(interp, objv[4], &flags) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    /* Assumes state is integer if not "" */
+    if (Tcl_GetIntFromObj(interp, objv[5], &encStateValue) == TCL_OK) {
+        encState = (Tcl_EncodingState)&encStateValue;
+    } else if (Tcl_GetCharLength(objv[5]) == 0) {
+        encState = NULL;
+    } else {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetIntFromObj(interp, objv[6], &dstLen) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    srcReadVar = NULL;
+    dstWroteVar = NULL;
+    dstCharsVar = NULL;
+    if (objc > 7) {
+	/* Has caller requested srcRead? */
+	if (Tcl_GetCharLength(objv[7])) {
+	    srcReadVar = objv[7];
+	}
+	if (objc > 8) {
+	    /* Ditto for dstWrote */
+            if (Tcl_GetCharLength(objv[8])) {
+                dstWroteVar = objv[8];
+            }
+	    if (objc > 9) {
+                if (Tcl_GetCharLength(objv[9])) {
+                    dstCharsVar = objv[9];
+                }
+	    }
+	}
+    }
+
+    bufLen = dstLen + 4; /* 4 -> overflow detection */
+    bufPtr = ckalloc(bufLen);
+    memmove(bufPtr + dstLen, "\xAB\xCD\xEF\x00", 4); /* overflow detection */
+    bytes = Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
+    result = (*transformer)(interp, encoding, bytes, srcLen, flags,
+                               &encState, bufPtr, dstLen,
+                               srcReadVar ? &srcRead : NULL,
+                               &dstWrote,
+                               dstCharsVar ? &dstChars : NULL);
+    if (memcmp(bufPtr + bufLen - 4, "\xAB\xCD\xEF\x00", 4)) {
+        Tcl_SetResult(interp,
+                      "Tcl_ExternalToUtf wrote past output buffer",
+                      TCL_STATIC);
+        result = TCL_ERROR;
+    } else {
+        Tcl_Obj *resultObjs[3];
+        switch (result) {
+        case TCL_OK:
+            resultObjs[0] = Tcl_NewStringObj("ok", -1);
+            break;
+        case TCL_CONVERT_MULTIBYTE:
+            resultObjs[0] = Tcl_NewStringObj("multibyte", -1);
+            break;
+        case TCL_CONVERT_SYNTAX:
+            resultObjs[0] = Tcl_NewStringObj("syntax", -1);
+            break;
+        case TCL_CONVERT_UNKNOWN:
+            resultObjs[0] = Tcl_NewStringObj("unknown", -1);
+            break;
+        case TCL_CONVERT_NOSPACE:
+            resultObjs[0] = Tcl_NewStringObj("nospace", -1);
+            break;
+        default:
+            resultObjs[0] = Tcl_NewIntObj(result);
+            break;
+        }
+        result = TCL_OK;
+        resultObjs[1] =
+            encState ? Tcl_NewIntObj(encStateValue) : Tcl_NewObj();
+        resultObjs[2] = Tcl_NewByteArrayObj(bufPtr, dstWrote);
+        if (srcReadVar) {
+            if (Tcl_ObjSetVar2(interp, srcReadVar, NULL, Tcl_NewIntObj(srcRead), 0) == NULL) {
+                result = TCL_ERROR;
+            }
+        }
+        if (dstWroteVar) {
+            if (Tcl_ObjSetVar2(interp, dstWroteVar, NULL, Tcl_NewIntObj(dstWrote), 0) == NULL) {
+                result = TCL_ERROR;
+            }
+        }
+        if (dstCharsVar) {
+            if (Tcl_ObjSetVar2(interp, dstCharsVar, NULL, Tcl_NewIntObj(dstChars), 0) == NULL) {
+                result = TCL_ERROR;
+            }
+        }
+        Tcl_SetObjResult(interp, Tcl_NewListObj(3, resultObjs));
+    }
+
+    ckfree(bufPtr);
+    Tcl_FreeEncoding(encoding); /* Free returned reference */
+    return result;
+}
+
+/*
  *----------------------------------------------------------------------
  *
  * TestencodingCmd --
@@ -2044,10 +2194,10 @@ TestencodingObjCmd(
     const char *string;
     TclEncoding *encodingPtr;
     static const char *const optionStrings[] = {
-	"create", "delete", "nullength", NULL
+	"create", "delete", "nullength", "Tcl_ExternalToUtf", "Tcl_UtfToExternal", NULL
     };
     enum options {
-	ENC_CREATE, ENC_DELETE, ENC_NULLENGTH
+	ENC_CREATE, ENC_DELETE, ENC_NULLENGTH, ENC_EXTTOUTF, ENC_UTFTOEXT
     };
 
     if (objc < 2) {
@@ -2116,6 +2266,11 @@ TestencodingObjCmd(
 	Tcl_SetObjResult(interp,
 			 Tcl_NewIntObj(Tcl_GetEncodingNulLength(encoding)));
 	Tcl_FreeEncoding(encoding);
+        break;
+    case ENC_EXTTOUTF:
+        return UtfExtWrapper(interp,Tcl_ExternalToUtf,objc,objv);
+    case ENC_UTFTOEXT:
+        return UtfExtWrapper(interp,Tcl_UtfToExternal,objc,objv);
     }
     return TCL_OK;
 }
-- 
cgit v0.12


From 1889ded1144a4dbd44d0c6f03e72a01d70115a51 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 11 Mar 2023 22:00:29 +0000
Subject: Proposed fix for [db7a085bd9]: encoding convertfrom -strict utf-16
 accepts partial surrogates. TODO: testcases, and implement for 8.7 too

---
 generic/tclCmdAH.c    |  2 +-
 generic/tclEncoding.c | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 4df1216..ac504d0 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -514,7 +514,7 @@ EncodingConvertfromObjCmd(
 	    char buf[TCL_INTEGER_SPACE];
 	    sprintf(buf, "%" TCL_Z_MODIFIER "u", result);
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected byte sequence starting at index %"
-		    TCL_Z_MODIFIER "u: '\\x%X'", result, UCHAR(bytesPtr[result])));
+		    TCL_Z_MODIFIER "u: '\\x%02X'", result, UCHAR(bytesPtr[result])));
 	    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
 		    buf, NULL);
 	    Tcl_DStringFree(&ds);
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index fc3397a..4f334bb 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2603,6 +2603,7 @@ Utf32ToUtfProc(
 	    dst += Tcl_UniCharToUtf(-1, dst);
 	}
 #endif
+
 	if ((unsigned)ch > 0x10FFFF) {
 	    ch = 0xFFFD;
 	    if (STOPONERROR) {
@@ -2639,6 +2640,7 @@ Utf32ToUtfProc(
 	dst += Tcl_UniCharToUtf(-1, dst);
     }
 #endif
+
     if ((flags & TCL_ENCODING_END) && (result == TCL_CONVERT_MULTIBYTE)) {
 	/* We have a single byte left-over at the end */
 	if (dst > dstEnd) {
@@ -2846,6 +2848,13 @@ Utf16ToUtfProc(
 	    ch = (src[0] & 0xFF) << 8 | (src[1] & 0xFF);
 	}
 	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
+	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+		result = TCL_CONVERT_UNKNOWN;
+		src -= 2; /* Go back to before the high surrogate */
+		dst--; /* Also undo writing a single byte too much */
+		numChars--;
+		break;
+	    }
 	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
 	    dst += Tcl_UniCharToUtf(-1, dst);
 	}
@@ -2855,17 +2864,30 @@ Utf16ToUtfProc(
 	 * unsigned short-size data.
 	 */
 
-	if (ch && ch < 0x80) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (ch & 0xFF);
-	} else {
+	} else if (((prev  & ~0x3FF) == 0xD800) || ((ch  & ~0x3FF) == 0xD800)) {
 	    dst += Tcl_UniCharToUtf(ch | TCL_COMBINE, dst);
+	} else if (((ch  & ~0x3FF) == 0xDC00) && ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
+	    /* Lo surrogate not preceded by Hi surrogate */
+	    result = TCL_CONVERT_UNKNOWN;
+	    break;
+	} else {
+	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
 	src += sizeof(unsigned short);
     }
 
     if ((ch  & ~0x3FF) == 0xD800) {
-	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
-	dst += Tcl_UniCharToUtf(-1, dst);
+	if ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) {
+	    result = TCL_CONVERT_UNKNOWN;
+	    src -= 2;
+	    dst--;
+	    numChars--;
+	} else {
+	    /* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
+	    dst += Tcl_UniCharToUtf(-1, dst);
+	}
     }
     if ((flags & TCL_ENCODING_END) && (result == TCL_CONVERT_MULTIBYTE)) {
 	/* We have a single byte left-over at the end */
-- 
cgit v0.12


From 8c5fc11b5ac89e8e6fd57484c9221a5e70c3c145 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Mar 2023 10:49:18 +0000
Subject: Always output 2 hex characters in "unexpected byte sequence"
 exception message. make testcases io-38.3/chan-io-38.3 independant from
 system encoding

---
 generic/tclCmdAH.c | 2 +-
 tests/chanio.test  | 2 +-
 tests/io.test      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 4f743cc..c2424d6 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -656,7 +656,7 @@ EncodingConvertfromObjCmd(
 	    char buf[TCL_INTEGER_SPACE];
 	    sprintf(buf, "%u", result);
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("unexpected byte sequence starting at index %"
-		    "u: '\\x%X'", result, UCHAR(bytesPtr[result])));
+		    "u: '\\x%02X'", result, UCHAR(bytesPtr[result])));
 	    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
 		    buf, NULL);
 	    Tcl_DStringFree(&ds);
diff --git a/tests/chanio.test b/tests/chanio.test
index 2915fc5..6814224 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -4982,7 +4982,7 @@ test chan-io-38.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} -setup {
 test chan-io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} {
     # This test crashes the interp if Bug #427196 is not fixed
     set chan [open [info script] r]
-    chan configure $chan -buffersize 10
+    chan configure $chan -buffersize 10 -encoding utf-8
     set var [chan read $chan 2]
     chan configure $chan -buffersize 32
     append var [chan read $chan]
diff --git a/tests/io.test b/tests/io.test
index e762bba..3c0ec2e 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -5476,7 +5476,7 @@ test io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} {
     # This test crashes the interp if Bug #427196 is not fixed
 
     set chan [open [info script] r]
-    fconfigure $chan -buffersize 10
+    fconfigure $chan -buffersize 10 -encoding utf-8
     set var [read $chan 2]
     fconfigure $chan -buffersize 32
     append var [read $chan]
-- 
cgit v0.12


From b7f151f1268d4b49953da193f135d52e6e52f841 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Mar 2023 11:24:24 +0000
Subject: Make test-output more readable when it contains non-printable
 characters (stolen from TIP #656 impl, thanks Ashok!) tcltest -> 2.5.6

---
 library/manifest.txt         |  2 +-
 library/tcltest/pkgIndex.tcl |  2 +-
 library/tcltest/tcltest.tcl  | 39 ++++++++++++++++++++++++++++++++++++---
 unix/Makefile.in             |  4 ++--
 win/Makefile.in              |  4 ++--
 5 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/library/manifest.txt b/library/manifest.txt
index cc1e223..5a999f4 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -12,7 +12,7 @@ apply {{dir} {
     0 tcl::idna       1.0.1  {cookiejar idna.tcl}
     0 platform        1.0.19 {platform platform.tcl}
     0 platform::shell 1.1.4  {platform shell.tcl}
-    1 tcltest         2.5.5  {tcltest tcltest.tcl}
+    1 tcltest         2.5.6  {tcltest tcltest.tcl}
   } {
     if {$isafe && !$safe} continue
     package ifneeded $package $version  [list source [file join $dir {*}$file]]
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl
index 18b05e5..9903e32 100644
--- a/library/tcltest/pkgIndex.tcl
+++ b/library/tcltest/pkgIndex.tcl
@@ -9,4 +9,4 @@
 # full path name of this file's directory.
 
 if {![package vsatisfies [package provide Tcl] 8.5-]} {return}
-package ifneeded tcltest 2.5.5 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.5.6 [list source [file join $dir tcltest.tcl]]
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 7344f9f..19b7d64 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -22,7 +22,7 @@ namespace eval tcltest {
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.  When the minor version
     # changes (new feature) be sure to update the man page as well.
-    variable Version 2.5.5
+    variable Version 2.5.6
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -1134,6 +1134,39 @@ proc tcltest::SafeFetch {n1 n2 op} {
     }
 }
 
+
+# tcltest::Asciify --
+#
+#       Transforms the passed string to contain only printable ascii characters.
+#       Useful for printing to terminals. Non-printables are mapped to
+#       \x, \u or \U sequences.
+#
+# Arguments:
+#       s - string to transform
+#
+# Results:
+#       The transformed strings
+#
+# Side effects:
+#       None.
+
+proc tcltest::Asciify {s} {
+    set print ""
+    foreach c [split $s ""] {
+        set i [scan $c %c]
+        if {[string is print $c] && ($i <= 127) && ($i > 0)} {
+            append print $c
+        } elseif {$i <= 0xFF} {
+            append print \\x[format %02X $i]
+        } elseif {$i <= 0xFFFF} {
+            append print \\u[format %04X $i]
+        } else {
+            append print \\U[format %08X $i]
+        }
+    }
+    return $print
+}
+
 # tcltest::ConstraintInitializer --
 #
 #	Get or set a script that when evaluated in the tcltest namespace
@@ -2221,9 +2254,9 @@ proc tcltest::test {name description args} {
 	if {$scriptCompare} {
 	    puts [outputChannel] "---- Error testing result: $scriptMatch"
 	} else {
-	    puts [outputChannel] "---- Result was:\n$actualAnswer"
+	    puts [outputChannel] "---- Result was:\n[Asciify $actualAnswer]"
 	    puts [outputChannel] "---- Result should have been\
-		    ($match matching):\n$result"
+		    ($match matching):\n[Asciify $result]"
 	}
     }
     if {$errorCodeFailure} {
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 1b2718e..da057d8 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1071,9 +1071,9 @@ install-libraries: libraries
 	@echo "Installing package msgcat 1.7.1 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
 		"$(MODULE_INSTALL_DIR)/8.7/msgcat-1.7.1.tm"
-	@echo "Installing package tcltest 2.5.5 as a Tcl Module"
+	@echo "Installing package tcltest 2.5.6 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
-		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm"
+		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.6.tm"
 	@echo "Installing package platform 1.0.19 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
 		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm"
diff --git a/win/Makefile.in b/win/Makefile.in
index 6d7bb7d..202b860 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -889,8 +889,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    done;
 	@echo "Installing package msgcat 1.7.1 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.7/msgcat-1.7.1.tm";
-	@echo "Installing package tcltest 2.5.5 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm";
+	@echo "Installing package tcltest 2.5.6 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.6.tm";
 	@echo "Installing package platform 1.0.19 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm";
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
-- 
cgit v0.12


From 8bf2e2ace2224e4066dfe647f47b531591fe8666 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Mar 2023 11:32:52 +0000
Subject: Forgot that \x00 is not printable anyway

---
 library/tcltest/tcltest.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 19b7d64..6cb7d92 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -1154,7 +1154,7 @@ proc tcltest::Asciify {s} {
     set print ""
     foreach c [split $s ""] {
         set i [scan $c %c]
-        if {[string is print $c] && ($i <= 127) && ($i > 0)} {
+        if {[string is print $c] && ($i <= 127)} {
             append print $c
         } elseif {$i <= 0xFF} {
             append print \\x[format %02X $i]
-- 
cgit v0.12


From 131176ce2f937173892c6e7e3a78978f6e8da2b5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Mar 2023 16:37:12 +0000
Subject: Backport [6fb14ee3e876978c]. Add testcases

---
 generic/tclEncoding.c | 12 +++++-------
 tests/encoding.test   | 12 ++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index b3409d6..27f11d8 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2605,17 +2605,15 @@ Utf32ToUtfProc(
 
 	if ((unsigned)ch > 0x10FFFF) {
 	    ch = 0xFFFD;
-	    if (STOPONERROR) {
+	    if ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) {
 		result = TCL_CONVERT_SYNTAX;
 		break;
 	    }
 	} else if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)
 		&& ((ch  & ~0x7FF) == 0xD800)) {
-	    if (STOPONERROR) {
-		result = TCL_CONVERT_SYNTAX;
-		ch = 0;
-		break;
-	    }
+	    result = TCL_CONVERT_SYNTAX;
+	    ch = 0;
+	    break;
 	}
 
 	/*
@@ -2845,7 +2843,7 @@ Utf16ToUtfProc(
 	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
 	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
 		result = TCL_CONVERT_UNKNOWN;
-		src -= 2; /* Go back to before the high surrogate */
+		src -= 2; /* Go back to beginning of high surrogate */
 		dst--; /* Also undo writing a single byte too much */
 		numChars--;
 		break;
diff --git a/tests/encoding.test b/tests/encoding.test
index 0fe64ce..cf63211 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -568,6 +568,12 @@ test encoding-16.22 {Utf16ToUtfProc, strict, bug [db7a085bd9]} -body {
 test encoding-16.23 {Utf16ToUtfProc, strict, bug [db7a085bd9]} -body {
     encoding convertfrom -strict utf-16le \x00\xDC
 } -returnCodes 1 -result {unexpected byte sequence starting at index 0: '\x00'}
+test encoding-16.24 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32 "\xFF\xFF\xFF\xFF"
+} -result \uFFFD
+test encoding-16.25 {Utf32ToUtfProc} -body {
+    encoding convertfrom utf-32 "\x01\x00\x00\x01"
+} -result \uFFFD
 
 test encoding-17.1 {UtfToUtf16Proc} -body {
     encoding convertto utf-16 "\U460DC"
@@ -599,6 +605,12 @@ test encoding-17.9 {Utf32ToUtfProc} -body {
 test encoding-17.10 {Utf32ToUtfProc} -body {
     encoding convertfrom -nocomplain utf-32 "\xFF\xFF\xFF\xFF"
 } -result \uFFFD
+test encoding-17.11 {Utf32ToUtfProc} -body {
+    encoding convertfrom -strict utf-32le "\x00\xD8\x00\x00"
+} -returnCodes error -result {unexpected byte sequence starting at index 0: '\x00'}
+test encoding-17.12 {Utf32ToUtfProc} -body {
+    encoding convertfrom -strict utf-32le "\x00\xDC\x00\x00"
+} -returnCodes error -result {unexpected byte sequence starting at index 0: '\x00'}
 
 test encoding-18.1 {TableToUtfProc on invalid input} -constraints deprecated -body {
 	list [catch {encoding convertto jis0208 \\} res] $res
-- 
cgit v0.12


From 22239fb7d2e4d9fae7bc87076d655170b791c46b Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 12 Mar 2023 16:47:08 +0000
Subject: Start on Tcl_ExternalToUtf/Tcl_UtfToExternal tests

---
 generic/tclTest.c | 124 +++++++++++++++++++++++++++++++++++++++++++++---------
 tests/utfext.test |  96 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+), 21 deletions(-)
 create mode 100644 tests/utfext.test

diff --git a/generic/tclTest.c b/generic/tclTest.c
index a398797..eab3eab 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2032,12 +2032,21 @@ static void SpecialFree(
  *    result of Tcl_UtfToExternal or Tcl_ExternalToUtf.
  *
  * Side effects: 
+ *
  *    The result in the interpreter is a list of the return code from the
  *    Tcl_UtfToExternal/Tcl_ExternalToUtf functions, the encoding state, and
- *    the encoded binary string. If any of the srcreadvar, dstwrotevar and 
+ *    an encoded binary string of length dstLen. Note the string is the
+ *    entire output buffer, not just the part containing the decoded
+ *    portion. This allows for additional checks at test script level.
+ * 
+ *    If any of the srcreadvar, dstwrotevar and 
  *    dstcharsvar are specified and not empty, they are treated as names
  *    of variables where the *srcRead, *dstWrote and *dstChars output
  *    from the functions are stored.
+ * 
+ *    The function also checks internally whether nuls are correctly
+ *    appended as requested but the TCL_ENCODING_NO_TERMINATE flag
+ *    and that no buffer overflows occur.
  *------------------------------------------------------------------------
  */
 typedef int
@@ -2049,13 +2058,15 @@ static int UtfExtWrapper(
     Tcl_Encoding encoding;
     int encStateValue; /* Assumes Tcl_EncodingState points to integer!!! */
     Tcl_EncodingState encState;
-    int flags;
     Tcl_Size srcLen, bufLen;
     const unsigned char *bytes;
     unsigned char *bufPtr;
     int srcRead, dstLen, dstWrote, dstChars;
     Tcl_Obj *srcReadVar, *dstWroteVar, *dstCharsVar;
     int result;
+    int flags;
+    Tcl_Obj **flagObjs;
+    int nflags;
 
     if (objc < 7 || objc > 10) {
         Tcl_WrongNumArgs(interp,
@@ -2067,9 +2078,48 @@ static int UtfExtWrapper(
     if (Tcl_GetEncodingFromObj(interp, objv[2], &encoding) != TCL_OK) {
         return TCL_ERROR;
     }
-    if (Tcl_GetIntFromObj(interp, objv[4], &flags) != TCL_OK) {
-        return TCL_ERROR;
+
+    /* Flags may be specified as list of integers and keywords */
+    flags = 0;
+    if (Tcl_ListObjGetElements(interp, objv[4], &nflags, &flagObjs) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    struct {
+	const char *flagKey;
+	int flag;
+    } flagMap[] = {
+	{"start", TCL_ENCODING_START},
+	{"end", TCL_ENCODING_END},
+	{"stoponerror", TCL_ENCODING_STOPONERROR},
+	{"noterminate", TCL_ENCODING_NO_TERMINATE},
+	{"charlimit", TCL_ENCODING_CHAR_LIMIT},
+	{"profiletcl8", TCL_ENCODING_PROFILE_TCL8},
+	{"profilestrict", TCL_ENCODING_PROFILE_STRICT},
+	{"profilereplace", TCL_ENCODING_PROFILE_REPLACE},
+	{NULL, 0}
+    };
+    int i;
+    for (i = 0; i < nflags; ++i) {
+	int flag;
+	if (Tcl_GetIntFromObj(NULL, flagObjs[i], &flag) == TCL_OK) {
+	    flags |= flag;
+	}
+	else {
+	    int idx;
+	    if (Tcl_GetIndexFromObjStruct(interp,
+					  flagObjs[i],
+					  flagMap,
+					  sizeof(flagMap[0]),
+					  "flag",
+					  0,
+					  &idx) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    flags |= flagMap[idx].flag;
+	}
     }
+
     /* Assumes state is integer if not "" */
     if (Tcl_GetIntFromObj(interp, objv[5], &encStateValue) == TCL_OK) {
         encState = (Tcl_EncodingState)&encStateValue;
@@ -2097,27 +2147,47 @@ static int UtfExtWrapper(
 	    if (objc > 9) {
                 if (Tcl_GetCharLength(objv[9])) {
                     dstCharsVar = objv[9];
-                }
+		}
 	    }
 	}
     }
+    if (flags & TCL_ENCODING_CHAR_LIMIT) {
+	/* Caller should have specified the dest char limit */
+	Tcl_Obj *valueObj;
+	if (dstCharsVar == NULL ||
+	    (valueObj = Tcl_ObjGetVar2(interp, dstCharsVar, NULL, 0)) == NULL
+	) {
+	    Tcl_SetResult(interp,
+			 "dstCharsVar must be specified with integer value if "
+			 "TCL_ENCODING_CHAR_LIMIT set in flags.", TCL_STATIC);
+	    return TCL_ERROR;
+	}
+	if (Tcl_GetIntFromObj(interp, dstCharsVar, &dstChars) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+    } else {
+	dstChars = 0; /* Only used for output */
+    }
 
     bufLen = dstLen + 4; /* 4 -> overflow detection */
     bufPtr = ckalloc(bufLen);
-    memmove(bufPtr + dstLen, "\xAB\xCD\xEF\x00", 4); /* overflow detection */
+    memset(bufPtr, 0xFF, dstLen); /* Need to check nul terminator */
+    memmove(bufPtr + dstLen, "\xAB\xCD\xEF\xAB", 4);   /* overflow detection */
     bytes = Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
     result = (*transformer)(interp, encoding, bytes, srcLen, flags,
                                &encState, bufPtr, dstLen,
                                srcReadVar ? &srcRead : NULL,
                                &dstWrote,
                                dstCharsVar ? &dstChars : NULL);
-    if (memcmp(bufPtr + bufLen - 4, "\xAB\xCD\xEF\x00", 4)) {
+    if (memcmp(bufPtr + bufLen - 4, "\xAB\xCD\xEF\xAB", 4)) {
         Tcl_SetResult(interp,
                       "Tcl_ExternalToUtf wrote past output buffer",
                       TCL_STATIC);
         result = TCL_ERROR;
-    } else {
+    } else if (result != TCL_ERROR) {
+
         Tcl_Obj *resultObjs[3];
+	
         switch (result) {
         case TCL_OK:
             resultObjs[0] = Tcl_NewStringObj("ok", -1);
@@ -2141,22 +2211,34 @@ static int UtfExtWrapper(
         result = TCL_OK;
         resultObjs[1] =
             encState ? Tcl_NewIntObj(encStateValue) : Tcl_NewObj();
-        resultObjs[2] = Tcl_NewByteArrayObj(bufPtr, dstWrote);
+        resultObjs[2] = Tcl_NewByteArrayObj(bufPtr, dstLen);
         if (srcReadVar) {
-            if (Tcl_ObjSetVar2(interp, srcReadVar, NULL, Tcl_NewIntObj(srcRead), 0) == NULL) {
-                result = TCL_ERROR;
-            }
-        }
+	    if (Tcl_ObjSetVar2(interp,
+			       srcReadVar,
+			       NULL,
+			       Tcl_NewIntObj(srcRead),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
         if (dstWroteVar) {
-            if (Tcl_ObjSetVar2(interp, dstWroteVar, NULL, Tcl_NewIntObj(dstWrote), 0) == NULL) {
-                result = TCL_ERROR;
-            }
-        }
+	    if (Tcl_ObjSetVar2(interp,
+			       dstWroteVar,
+			       NULL,
+			       Tcl_NewIntObj(dstWrote),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
         if (dstCharsVar) {
-            if (Tcl_ObjSetVar2(interp, dstCharsVar, NULL, Tcl_NewIntObj(dstChars), 0) == NULL) {
-                result = TCL_ERROR;
-            }
-        }
+	    if (Tcl_ObjSetVar2(interp,
+			       dstCharsVar,
+			       NULL,
+			       Tcl_NewIntObj(dstChars),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
         Tcl_SetObjResult(interp, Tcl_NewListObj(3, resultObjs));
     }
 
diff --git a/tests/utfext.test b/tests/utfext.test
new file mode 100644
index 0000000..61e36b8
--- /dev/null
+++ b/tests/utfext.test
@@ -0,0 +1,96 @@
+# This file contains a collection of tests for Tcl_UtfToExternal and
+# Tcl_UtfToExternal. Sourcing this file into Tcl runs the tests and generates
+# errors. No output means no errors found.
+#
+# Copyright (c) 2023 Ashok P. Nadkarni
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
+
+::tcltest::loadTestedCommands
+catch [list package require -exact tcl::test [info patchlevel]]
+
+testConstraint testbytestring [llength [info commands testbytestring]]
+testConstraint testencoding [llength [info commands testencoding]]
+
+# Maps encoded bytes string to utf-8 equivalents, both in hex
+# encoding utf-8 encdata
+lappend utfExtMap {*}{
+    ascii 414243 414243
+}
+
+if {[info commands printable] eq ""} {
+    proc printable {s} {
+        set print ""
+        foreach c [split $s ""] {
+            set i [scan $c %c]
+            if {[string is print $c] && ($i <= 127)} {
+                append print $c
+            } elseif {$i <= 0xff} {
+                append print \\x[format %02X $i]
+            } elseif {$i <= 0xffff} {
+                append print \\u[format %04X $i]
+            } else {
+                append print \\U[format %08X $i]
+            }
+        }
+        return $print
+    }
+}
+
+# Simple test with basic flags
+proc testbasic {direction enc hexin hexout {flags {start end}}} {
+    if {$direction eq "toutf"} {
+        set cmd Tcl_ExternalToUtf
+    } else {
+        set cmd Tcl_UtfToExternal
+    }
+    set in [binary decode hex $hexin]
+    set out [binary decode hex $hexout]
+    set dstlen 40 ;# Should be enough for all encoding tests
+
+    # The C wrapper fills entire destination buffer with FF.
+    # Anything beyond expected output should have FF's
+    set filler [string repeat \xFF $dstlen]
+    set result [string range "$out$filler" 0 $dstlen-1]
+    test $cmd-$enc-$hexin-[join $flags -] "$cmd - $enc - $hexin - $flags" -body \
+        [list testencoding $cmd $enc $in $flags {} $dstlen] \
+        -result [list ok {} $result]
+    foreach profile [encoding profiles] {
+        set flags2 [linsert $flags end profile$profile]
+        test $cmd-$enc-$hexin-[join $flags2 -] "$cmd - $enc - $hexin - $flags" -body \
+            [list testencoding $cmd $enc $in $flags2 {} $dstlen] \
+            -result [list ok {} $result]
+    }
+}
+
+#
+# Basic tests
+foreach {enc utfhex hex} $utfExtMap {
+    # Basic test - TCL_ENCODING_START|TCL_ENCODING_END
+    # Note by default output should be terminated with \0
+    testbasic toutf $enc $hex ${utfhex}00 {start end}
+    testbasic fromutf $enc $utfhex ${hex}00 {start end}
+
+    # Test TCL_ENCODING_NO_TERMINATE
+    testbasic toutf $enc $hex $utfhex {start end noterminate}
+    # knownBug - noterminate not obeyed by fromutf
+    # testbasic fromutf $enc $utfhex $hex {start end noterminate}
+}
+
+# Test for insufficient space
+test xx-bufferoverflow {buffer overflow Tcl_ExternalToUtf} -body {
+    testencoding Tcl_UtfToExternal unicode A {start end} {} 1
+} -result {nospace {} {}}
+
+::tcltest::cleanupTests
+return
+
+# Local Variables:
+# mode: tcl
+# End:
-- 
cgit v0.12


From 967e55306e7bb0a58a7cf2c5b905a2608f395875 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 13 Mar 2023 12:22:06 +0000
Subject: Fix for issue [ea69b0258a9833cb], crash when using a channel
 transformation on TCP client socket.

---
 generic/tclIO.c    | 38 ++++++++++++++----------
 tests/ioTrans.test | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 107 insertions(+), 17 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 85ff39b..715f8c7 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8551,6 +8551,7 @@ UpdateInterest(
 	    mask &= ~TCL_EXCEPTION;
 
 	    if (!statePtr->timer) {
+		TclChannelPreserve((Tcl_Channel)chanPtr);
 		statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
                         ChannelTimerProc, chanPtr);
 	    }
@@ -8584,23 +8585,28 @@ ChannelTimerProc(
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
 
-    if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
-	    && (statePtr->interestMask & TCL_READABLE)
-	    && (statePtr->inQueueHead != NULL)
-	    && IsBufferReady(statePtr->inQueueHead)) {
-	/*
-	 * Restart the timer in case a channel handler reenters the event loop
-	 * before UpdateInterest gets called by Tcl_NotifyChannel.
-	 */
-
-	statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-                ChannelTimerProc,chanPtr);
-	Tcl_Preserve(statePtr);
-	Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
-	Tcl_Release(statePtr);
+    if (chanPtr->typePtr == NULL) {
+	TclChannelRelease((Tcl_Channel)chanPtr);
     } else {
-	statePtr->timer = NULL;
-	UpdateInterest(chanPtr);
+	if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
+		&& (statePtr->interestMask & TCL_READABLE)
+		&& (statePtr->inQueueHead != NULL)
+		&& IsBufferReady(statePtr->inQueueHead)) {
+	    /*
+	     * Restart the timer in case a channel handler reenters the event loop
+	     * before UpdateInterest gets called by Tcl_NotifyChannel.
+	     */
+
+	    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
+		    ChannelTimerProc,chanPtr);
+	    Tcl_Preserve(statePtr);
+	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
+	    Tcl_Release(statePtr);
+	} else {
+	    statePtr->timer = NULL;
+	    UpdateInterest(chanPtr);
+	    TclChannelRelease((Tcl_Channel)chanPtr);
+	}
     }
 }
 
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index f185117..130ff80 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -634,6 +634,58 @@ test iortrans-4.9 {chan read, gets, bug 2921116} -setup {
         }
     }
 
+
+
+namespace eval reflector {
+    proc initialize {_ chan mode} {
+	return {initialize finalize watch read}
+    }
+
+
+    proc finalize {_ chan} {
+	namespace delete $_
+    }
+
+
+    proc read {_ chan count} {
+	namespace upvar $_ source source
+	set res [string range $source 0 $count-1]
+	set source [string range $source $count end]
+	return $res
+    }
+
+
+    proc watch {_ chan events} {
+	after 0 [list chan postevent $chan read]
+	return read
+    }
+
+    namespace ensemble create -parameters _
+    namespace export *
+}
+
+
+
+
+namespace eval inputfilter {
+    proc initialize {chan mode} {
+	return {initialize finalize read}
+    }
+    
+    proc read {chan buffer} {
+	return $buffer
+    }
+
+    proc finalize chan {
+	namespace delete $chan
+    }
+
+    namespace ensemble create
+    namespace export *
+}
+
+
+
 # Channel read transform that is just the identity - pass all through
     proc idxform {cmd handle args} {
       switch -- $cmd {
@@ -2089,7 +2141,39 @@ test iortrans.tf-11.1 {origin thread of moved transform destroyed during access}
     thread::release $tidb
 } -result {Owner lost}
 
-# ### ### ### ######### ######### #########
+
+test iortrans-ea69b0258a9833cb {
+    Crash when using a channel transformation on TCP client socket
+
+    "line two" does not make it into result.  This issue should probably be
+    addressed, but it is outside the scope of this test.
+} -setup {
+    set res {}
+    set read 0
+} -body {
+    namespace eval reflector1 {
+	variable source "line one\nline two"
+	interp alias {} [namespace current]::dispatch {} [
+	    namespace parent]::reflector [namespace current]
+    }
+    set chan [chan create read [namespace which reflector1::dispatch]]
+    chan configure $chan -blocking 0
+    chan push $chan inputfilter
+    chan event $chan read [list ::apply [list chan {
+	variable res
+	variable read
+	set gets [gets $chan]
+	append res $gets
+	incr read
+    } [namespace current]] $chan]
+    vwait [namespace current]::read
+    chan pop $chan
+    vwait [namespace current]::read
+    return $res
+} -cleanup {
+    catch {unset read}
+    close $chan
+} -result {line one}
 
 cleanupTests
 return
-- 
cgit v0.12


From df8a3a6ea4a6ede9d9be56eacae69d8f40d624ca Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 13 Mar 2023 13:36:52 +0000
Subject: Fix for issue [ea69b0258a9833cb], crash when using a channel
 transformation on TCP client socket.

---
 generic/tclIO.c    | 67 +++++++++++++++++++++++++-----------------
 tests/ioTrans.test | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 125 insertions(+), 28 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index da06171..58137a5 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8804,6 +8804,7 @@ UpdateInterest(
 	    mask &= ~TCL_EXCEPTION;
 
 	    if (!statePtr->timer) {
+		TclChannelPreserve((Tcl_Channel)chanPtr);
 		statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
                         ChannelTimerProc, chanPtr);
 	    }
@@ -8814,6 +8815,7 @@ UpdateInterest(
 	&& mask & TCL_WRITABLE
 	&& GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
 
+	TclChannelPreserve((Tcl_Channel)chanPtr);
 	statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
 	    ChannelTimerProc,chanPtr);
     }
@@ -8848,44 +8850,55 @@ ChannelTimerProc(
     /* State info for channel */
     ChannelState *statePtr = chanPtr->state;
 
-	/* Preserve chanPtr to guard against deallocation in Tcl_NotifyChannel. */
-    TclChannelPreserve((Tcl_Channel)chanPtr);
-    Tcl_Preserve(statePtr);
-    statePtr->timer = NULL;
-    if (statePtr->interestMask & TCL_WRITABLE
-	&& GotFlag(statePtr, CHANNEL_NONBLOCKING)
-	&& !GotFlag(statePtr, BG_FLUSH_SCHEDULED)
-	) {
-	/*
-	 * Restart the timer in case a channel handler reenters the event loop
-	 * before UpdateInterest gets called by Tcl_NotifyChannel.
-	 */
-	statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-                ChannelTimerProc,chanPtr);
-	Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_WRITABLE);
-    }
+    /* TclChannelPreserve() must be called before the current function was
+     * scheduled, is already in effect.  In this function it guards against
+     * deallocation in Tcl_NotifyChannel and also keps the channel preserved
+     * until ChannelTimerProc is later called again.
+     */
 
-    /* The channel may have just been closed from within Tcl_NotifyChannel */
-    if (!GotFlag(statePtr, CHANNEL_INCLOSE)) {
-	if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
-		&& (statePtr->interestMask & TCL_READABLE)
-		&& (statePtr->inQueueHead != NULL)
-		&& IsBufferReady(statePtr->inQueueHead)) {
+    if (chanPtr->typePtr == NULL) {
+	TclChannelRelease((Tcl_Channel)chanPtr);
+    } else {
+	Tcl_Preserve(statePtr);
+	statePtr->timer = NULL;
+	if (statePtr->interestMask & TCL_WRITABLE
+	    && GotFlag(statePtr, CHANNEL_NONBLOCKING)
+	    && !GotFlag(statePtr, BG_FLUSH_SCHEDULED)
+	    ) {
 	    /*
 	     * Restart the timer in case a channel handler reenters the event loop
 	     * before UpdateInterest gets called by Tcl_NotifyChannel.
 	     */
-
 	    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
 		    ChannelTimerProc,chanPtr);
-	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
+	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_WRITABLE);
 	} else {
-	    UpdateInterest(chanPtr);
+	    /* The channel may have just been closed from within Tcl_NotifyChannel */
+	    if (!GotFlag(statePtr, CHANNEL_INCLOSE)) {
+		if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
+			&& (statePtr->interestMask & TCL_READABLE)
+			&& (statePtr->inQueueHead != NULL)
+			&& IsBufferReady(statePtr->inQueueHead)) {
+		    /*
+		     * Restart the timer in case a channel handler reenters the event loop
+		     * before UpdateInterest gets called by Tcl_NotifyChannel.
+		     */
+
+		    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
+			    ChannelTimerProc,chanPtr);
+		    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
+		} else {
+		    TclChannelRelease((Tcl_Channel)chanPtr);
+		    UpdateInterest(chanPtr);
+		}
+	    } else {
+		TclChannelRelease((Tcl_Channel)chanPtr);
+	    }
 	}
+
+	Tcl_Release(statePtr);
     }
 
-    Tcl_Release(statePtr);
-    TclChannelRelease((Tcl_Channel)chanPtr);
 }
 
 /*
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 79493e0..f481a17 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -634,6 +634,58 @@ test iortrans-4.9 {chan read, gets, bug 2921116} -setup {
         }
     }
 
+
+
+namespace eval reflector {
+    proc initialize {_ chan mode} {
+	return {initialize finalize watch read}
+    }
+
+
+    proc finalize {_ chan} {
+	namespace delete $_
+    }
+
+
+    proc read {_ chan count} {
+	namespace upvar $_ source source
+	set res [string range $source 0 $count-1]
+	set source [string range $source $count end]
+	return $res
+    }
+
+
+    proc watch {_ chan events} {
+	after 0 [list chan postevent $chan read]
+	return read
+    }
+
+    namespace ensemble create -parameters _
+    namespace export *
+}
+
+
+
+
+namespace eval inputfilter {
+    proc initialize {chan mode} {
+	return {initialize finalize read}
+    }
+    
+    proc read {chan buffer} {
+	return $buffer
+    }
+
+    proc finalize chan {
+	namespace delete $chan
+    }
+
+    namespace ensemble create
+    namespace export *
+}
+
+
+
 # Channel read transform that is just the identity - pass all through
     proc idxform {cmd handle args} {
       switch -- $cmd {
@@ -2089,7 +2141,39 @@ test iortrans.tf-11.1 {origin thread of moved transform destroyed during access}
     thread::release $tidb
 } -result {Owner lost}
 
-# ### ### ### ######### ######### #########
+
+test iortrans-ea69b0258a9833cb {
+    Crash when using a channel transformation on TCP client socket
+
+    "line two" does not make it into result.  This issue should probably be
+    addressed, but it is outside the scope of this test.
+} -setup {
+    set res {}
+    set read 0
+} -body {
+    namespace eval reflector1 {
+	variable source "line one\nline two"
+	interp alias {} [namespace current]::dispatch {} [
+	    namespace parent]::reflector [namespace current]
+    }
+    set chan [chan create read [namespace which reflector1::dispatch]]
+    chan configure $chan -blocking 0
+    chan push $chan inputfilter
+    chan event $chan read [list ::apply [list chan {
+	variable res
+	variable read
+	set gets [gets $chan]
+	append res $gets
+	incr read
+    } [namespace current]] $chan]
+    vwait [namespace current]::read
+    chan pop $chan
+    vwait [namespace current]::read
+    return $res
+} -cleanup {
+    catch {unset read}
+    close $chan
+} -result {line one}
 
 cleanupTests
 return
-- 
cgit v0.12


From 6d7423228211f312016f0c62ce1bc86c3d3777db Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 13 Mar 2023 13:44:35 +0000
Subject: Bug [183a1adcc0]. Buffer overflow in Tcl_UtfToExternal

---
 generic/tclEncoding.c |  14 +++
 generic/tclTest.c     | 236 +++++++++++++++++++++++++++++++++++++++++++++++++-
 tests/encoding.test   |  35 ++++++++
 3 files changed, 283 insertions(+), 2 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 2b3b614..92217f3 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1233,6 +1233,9 @@ Tcl_ExternalToUtf(
     }
 
     if (!noTerminate) {
+        if (dstLen < 1) {
+            return TCL_CONVERT_NOSPACE;
+        }
 	/*
 	 * If there are any null characters in the middle of the buffer,
 	 * they will converted to the UTF-8 null character (\xC080). To get
@@ -1241,6 +1244,10 @@ Tcl_ExternalToUtf(
 	 */
 
 	dstLen--;
+    } else {
+        if (dstLen < 0) {
+            return TCL_CONVERT_NOSPACE;
+        }
     }
     do {
 	Tcl_EncodingState savedState = *statePtr;
@@ -1415,10 +1422,17 @@ Tcl_UtfToExternal(
 	dstCharsPtr = &dstChars;
     }
 
+    if (dstLen < encodingPtr->nullSize) {
+        return TCL_CONVERT_NOSPACE;
+    }
     dstLen -= encodingPtr->nullSize;
     result = encodingPtr->fromUtfProc(encodingPtr->clientData, src, srcLen,
 	    flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr,
 	    dstCharsPtr);
+    /*
+     * Buffer is terminated irrespective of result. Not sure this is
+     * reasonable but keep for historical/compatibility reasons.
+     */
     if (encodingPtr->nullSize == 2) {
 	dst[*dstWrotePtr + 1] = '\0';
     }
diff --git a/generic/tclTest.c b/generic/tclTest.c
index bc51c99..c2b7144 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1817,6 +1817,234 @@ static void SpecialFree(blockPtr)
 }
 
 /*
+ *------------------------------------------------------------------------
+ *
+ * UtfTransformFn --
+ *
+ *    Implements a direct call into Tcl_UtfToExternal and Tcl_ExternalToUtf
+ *    as otherwise there is no script level command that directly exercises
+ *    these functions (i/o command cannot test all combinations)
+ *    The arguments at the script level are roughly those of the above
+ *    functions:
+ *        encodingname srcbytes flags state dstlen ?srcreadvar? ?dstwrotevar? ?dstcharsvar?
+ *
+ * Results:
+ *    TCL_OK or TCL_ERROR. This any errors running the test, NOT the
+ *    result of Tcl_UtfToExternal or Tcl_ExternalToUtf.
+ *
+ * Side effects:
+ *
+ *    The result in the interpreter is a list of the return code from the
+ *    Tcl_UtfToExternal/Tcl_ExternalToUtf functions, the encoding state, and
+ *    an encoded binary string of length dstLen. Note the string is the
+ *    entire output buffer, not just the part containing the decoded
+ *    portion. This allows for additional checks at test script level.
+ *
+ *    If any of the srcreadvar, dstwrotevar and
+ *    dstcharsvar are specified and not empty, they are treated as names
+ *    of variables where the *srcRead, *dstWrote and *dstChars output
+ *    from the functions are stored.
+ *
+ *    The function also checks internally whether nuls are correctly
+ *    appended as requested but the TCL_ENCODING_NO_TERMINATE flag
+ *    and that no buffer overflows occur.
+ *------------------------------------------------------------------------
+ */
+typedef int
+UtfTransformFn(Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, int srcLen, int flags, Tcl_EncodingState *statePtr,
+               char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr);
+static int UtfExtWrapper(
+    Tcl_Interp *interp, UtfTransformFn *transformer, int objc, Tcl_Obj *const objv[])
+{
+    Tcl_Encoding encoding;
+    Tcl_EncodingState encState, *encStatePtr;
+    int srcLen, bufLen;
+    const char *bytes;
+    char *bufPtr;
+    int srcRead, dstLen, dstWrote, dstChars;
+    Tcl_Obj *srcReadVar, *dstWroteVar, *dstCharsVar;
+    int result;
+    int flags;
+    Tcl_Obj **flagObjs;
+    int nflags;
+
+    if (objc < 7 || objc > 10) {
+        Tcl_WrongNumArgs(interp,
+                         2,
+                         objv,
+                         "encoding srcbytes flags state dstlen ?srcreadvar? ?dstwrotevar? ?dstcharsvar?");
+        return TCL_ERROR;
+    }
+    if (Tcl_GetEncodingFromObj(interp, objv[2], &encoding) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    /* Flags may be specified as list of integers and keywords */
+    flags = 0;
+    if (Tcl_ListObjGetElements(interp, objv[4], &nflags, &flagObjs) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    struct {
+	const char *flagKey;
+	int flag;
+    } flagMap[] = {
+	{"start", TCL_ENCODING_START},
+	{"end", TCL_ENCODING_END},
+	{"stoponerror", TCL_ENCODING_STOPONERROR},
+	{"noterminate", TCL_ENCODING_NO_TERMINATE},
+	{"charlimit", TCL_ENCODING_CHAR_LIMIT},
+	{NULL, 0}
+    };
+    int i;
+    for (i = 0; i < nflags; ++i) {
+	int flag;
+	if (Tcl_GetIntFromObj(NULL, flagObjs[i], &flag) == TCL_OK) {
+	    flags |= flag;
+	}
+	else {
+	    int idx;
+	    if (Tcl_GetIndexFromObjStruct(interp,
+					  flagObjs[i],
+					  flagMap,
+					  sizeof(flagMap[0]),
+					  "flag",
+					  0,
+					  &idx) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    flags |= flagMap[idx].flag;
+	}
+    }
+
+    /* Assumes state is integer if not "" */
+    Tcl_WideInt wide;
+    if (Tcl_GetWideIntFromObj(interp, objv[5], &wide) == TCL_OK) {
+        encState = (Tcl_EncodingState) wide;
+        encStatePtr = &encState;
+    } else if (Tcl_GetCharLength(objv[5]) == 0) {
+        encStatePtr = NULL;
+    } else {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetIntFromObj(interp, objv[6], &dstLen) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    srcReadVar = NULL;
+    dstWroteVar = NULL;
+    dstCharsVar = NULL;
+    if (objc > 7) {
+	/* Has caller requested srcRead? */
+	if (Tcl_GetCharLength(objv[7])) {
+	    srcReadVar = objv[7];
+	}
+	if (objc > 8) {
+	    /* Ditto for dstWrote */
+            if (Tcl_GetCharLength(objv[8])) {
+                dstWroteVar = objv[8];
+            }
+	    if (objc > 9) {
+                if (Tcl_GetCharLength(objv[9])) {
+                    dstCharsVar = objv[9];
+		}
+	    }
+	}
+    }
+    if (flags & TCL_ENCODING_CHAR_LIMIT) {
+	/* Caller should have specified the dest char limit */
+	Tcl_Obj *valueObj;
+	if (dstCharsVar == NULL ||
+	    (valueObj = Tcl_ObjGetVar2(interp, dstCharsVar, NULL, 0)) == NULL
+	) {
+	    Tcl_SetResult(interp,
+			 "dstCharsVar must be specified with integer value if "
+			 "TCL_ENCODING_CHAR_LIMIT set in flags.", TCL_STATIC);
+	    return TCL_ERROR;
+	}
+	if (Tcl_GetIntFromObj(interp, valueObj, &dstChars) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+    } else {
+	dstChars = 0; /* Only used for output */
+    }
+
+    bufLen = dstLen + 4; /* 4 -> overflow detection */
+    bufPtr = ckalloc(bufLen);
+    memset(bufPtr, 0xFF, dstLen); /* Need to check nul terminator */
+    memmove(bufPtr + dstLen, "\xAB\xCD\xEF\xAB", 4);   /* overflow detection */
+    bytes = (char *) Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
+    result = (*transformer)(interp, encoding, bytes, srcLen, flags,
+                               encStatePtr, bufPtr, dstLen,
+                               srcReadVar ? &srcRead : NULL,
+                               &dstWrote,
+                               dstCharsVar ? &dstChars : NULL);
+    if (memcmp(bufPtr + bufLen - 4, "\xAB\xCD\xEF\xAB", 4)) {
+        Tcl_SetResult(interp,
+                      "Tcl_ExternalToUtf wrote past output buffer",
+                      TCL_STATIC);
+        result = TCL_ERROR;
+    } else if (result != TCL_ERROR) {
+        Tcl_Obj *resultObjs[3];
+        switch (result) {
+        case TCL_OK:
+            resultObjs[0] = Tcl_NewStringObj("ok", -1);
+            break;
+        case TCL_CONVERT_MULTIBYTE:
+            resultObjs[0] = Tcl_NewStringObj("multibyte", -1);
+            break;
+        case TCL_CONVERT_SYNTAX:
+            resultObjs[0] = Tcl_NewStringObj("syntax", -1);
+            break;
+        case TCL_CONVERT_UNKNOWN:
+            resultObjs[0] = Tcl_NewStringObj("unknown", -1);
+            break;
+        case TCL_CONVERT_NOSPACE:
+            resultObjs[0] = Tcl_NewStringObj("nospace", -1);
+            break;
+        default:
+            resultObjs[0] = Tcl_NewIntObj(result);
+            break;
+        }
+        result = TCL_OK;
+        resultObjs[1] =
+            encStatePtr ? Tcl_NewWideIntObj((Tcl_WideInt)encState) : Tcl_NewObj();
+        resultObjs[2] = Tcl_NewByteArrayObj((unsigned char *)bufPtr, dstLen);
+        if (srcReadVar) {
+	    if (Tcl_ObjSetVar2(interp,
+			       srcReadVar,
+			       NULL,
+			       Tcl_NewIntObj(srcRead),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
+        if (dstWroteVar) {
+	    if (Tcl_ObjSetVar2(interp,
+			       dstWroteVar,
+			       NULL,
+			       Tcl_NewIntObj(dstWrote),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
+        if (dstCharsVar) {
+	    if (Tcl_ObjSetVar2(interp,
+			       dstCharsVar,
+			       NULL,
+			       Tcl_NewIntObj(dstChars),
+			       TCL_LEAVE_ERR_MSG) == NULL) {
+		result = TCL_ERROR;
+	    }
+	}
+        Tcl_SetObjResult(interp, Tcl_NewListObj(3, resultObjs));
+    }
+
+    ckfree(bufPtr);
+    Tcl_FreeEncoding(encoding); /* Free returned reference */
+    return result;
+}
+
+/*
  *----------------------------------------------------------------------
  *
  * TestencodingCmd --
@@ -1845,10 +2073,10 @@ TestencodingObjCmd(
     const char *string;
     TclEncoding *encodingPtr;
     static const char *const optionStrings[] = {
-	"create",	"delete",	NULL
+	"create", "delete", "Tcl_ExternalToUtf", "Tcl_UtfToExternal", NULL
     };
     enum options {
-	ENC_CREATE,	ENC_DELETE
+	ENC_CREATE, ENC_DELETE, ENC_EXTTOUTF, ENC_UTFTOEXT
     };
 
     if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
@@ -1894,6 +2122,10 @@ TestencodingObjCmd(
 	Tcl_FreeEncoding(encoding);
 	Tcl_FreeEncoding(encoding);
 	break;
+    case ENC_EXTTOUTF:
+        return UtfExtWrapper(interp,Tcl_ExternalToUtf,objc,objv);
+    case ENC_UTFTOEXT:
+        return UtfExtWrapper(interp,Tcl_UtfToExternal,objc,objv);
     }
     return TCL_OK;
 }
diff --git a/tests/encoding.test b/tests/encoding.test
index f6f9abc..26efb19 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -739,6 +739,41 @@ test encoding-28.0 {all encodings load} -body {
 
 runtests
 
+test encoding-bug-183a1adcc0-1 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal unicode A {start end} {} 1} result] $result
+} -result [list 0 [list nospace {} \xff]]
+
+test encoding-bug-183a1adcc0-2 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal unicode A {start end} {} 0} result] $result
+} -result [list 0 [list nospace {} {}]]
+
+test encoding-bug-183a1adcc0-3 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal unicode A {start end} {} 2} result] $result
+} -result [list 0 [list nospace {} \x00\x00]]
+
+test encoding-bug-183a1adcc0-4 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal unicode A {start end} {} 3} result] $result
+} -result [list 0 [list nospace {} \x00\x00\xff]]
+
+test encoding-bug-183a1adcc0-5 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
+    testencoding
+} -body {
+    # Note - buffers are initialized to \xff
+    list [catch {testencoding Tcl_UtfToExternal unicode A {start end} {} 4} result] $result
+} -result [list 0 [list ok {} [expr {$::tcl_platform(byteOrder) eq "littleEndian" ? "\x41\x00" : "\x00\x41"}]\x00\x00]]
+
 }
 
 # cleanup
-- 
cgit v0.12


From 95158a2d57b3724c868c22025657b56c2812f4d5 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 13 Mar 2023 16:32:55 +0000
Subject: Fix passing of encoding state in testencoding Tcl_UtfToExternal

---
 generic/tclTest.c | 30 ++++++++++++++++--------------
 tests/utfext.test |  5 +++++
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index eab3eab..6860e53 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2031,19 +2031,19 @@ static void SpecialFree(
  *    TCL_OK or TCL_ERROR. This any errors running the test, NOT the
  *    result of Tcl_UtfToExternal or Tcl_ExternalToUtf.
  *
- * Side effects: 
+ * Side effects:
  *
  *    The result in the interpreter is a list of the return code from the
  *    Tcl_UtfToExternal/Tcl_ExternalToUtf functions, the encoding state, and
  *    an encoded binary string of length dstLen. Note the string is the
  *    entire output buffer, not just the part containing the decoded
  *    portion. This allows for additional checks at test script level.
- * 
- *    If any of the srcreadvar, dstwrotevar and 
+ *
+ *    If any of the srcreadvar, dstwrotevar and
  *    dstcharsvar are specified and not empty, they are treated as names
  *    of variables where the *srcRead, *dstWrote and *dstChars output
  *    from the functions are stored.
- * 
+ *
  *    The function also checks internally whether nuls are correctly
  *    appended as requested but the TCL_ENCODING_NO_TERMINATE flag
  *    and that no buffer overflows occur.
@@ -2056,8 +2056,7 @@ static int UtfExtWrapper(
     Tcl_Interp *interp, UtfTransformFn *transformer, int objc, Tcl_Obj *const objv[])
 {
     Tcl_Encoding encoding;
-    int encStateValue; /* Assumes Tcl_EncodingState points to integer!!! */
-    Tcl_EncodingState encState;
+    Tcl_EncodingState encState, *encStatePtr;
     Tcl_Size srcLen, bufLen;
     const unsigned char *bytes;
     unsigned char *bufPtr;
@@ -2121,13 +2120,16 @@ static int UtfExtWrapper(
     }
 
     /* Assumes state is integer if not "" */
-    if (Tcl_GetIntFromObj(interp, objv[5], &encStateValue) == TCL_OK) {
-        encState = (Tcl_EncodingState)&encStateValue;
+    Tcl_WideInt wide;
+    if (Tcl_GetWideIntFromObj(interp, objv[5], &wide) == TCL_OK) {
+        encState = (Tcl_EncodingState) wide;
+        encStatePtr = &encState;
     } else if (Tcl_GetCharLength(objv[5]) == 0) {
-        encState = NULL;
+        encStatePtr = NULL;
     } else {
         return TCL_ERROR;
     }
+
     if (Tcl_GetIntFromObj(interp, objv[6], &dstLen) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -2162,7 +2164,7 @@ static int UtfExtWrapper(
 			 "TCL_ENCODING_CHAR_LIMIT set in flags.", TCL_STATIC);
 	    return TCL_ERROR;
 	}
-	if (Tcl_GetIntFromObj(interp, dstCharsVar, &dstChars) != TCL_OK) {
+	if (Tcl_GetIntFromObj(interp, valueObj, &dstChars) != TCL_OK) {
 	    return TCL_ERROR;
 	}
     } else {
@@ -2170,12 +2172,12 @@ static int UtfExtWrapper(
     }
 
     bufLen = dstLen + 4; /* 4 -> overflow detection */
-    bufPtr = ckalloc(bufLen);
+    bufPtr = (unsigned char *) ckalloc(bufLen);
     memset(bufPtr, 0xFF, dstLen); /* Need to check nul terminator */
     memmove(bufPtr + dstLen, "\xAB\xCD\xEF\xAB", 4);   /* overflow detection */
     bytes = Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
-    result = (*transformer)(interp, encoding, bytes, srcLen, flags,
-                               &encState, bufPtr, dstLen,
+    result = (*transformer)(interp, encoding, (const char *)bytes, srcLen, flags,
+                            encStatePtr, (char *) bufPtr, dstLen,
                                srcReadVar ? &srcRead : NULL,
                                &dstWrote,
                                dstCharsVar ? &dstChars : NULL);
@@ -2210,7 +2212,7 @@ static int UtfExtWrapper(
         }
         result = TCL_OK;
         resultObjs[1] =
-            encState ? Tcl_NewIntObj(encStateValue) : Tcl_NewObj();
+            encStatePtr ? Tcl_NewWideIntObj((Tcl_WideInt)encState) : Tcl_NewObj();
         resultObjs[2] = Tcl_NewByteArrayObj(bufPtr, dstLen);
         if (srcReadVar) {
 	    if (Tcl_ObjSetVar2(interp,
diff --git a/tests/utfext.test b/tests/utfext.test
index 61e36b8..6cf3dd7 100644
--- a/tests/utfext.test
+++ b/tests/utfext.test
@@ -88,6 +88,11 @@ test xx-bufferoverflow {buffer overflow Tcl_ExternalToUtf} -body {
     testencoding Tcl_UtfToExternal unicode A {start end} {} 1
 } -result {nospace {} {}}
 
+# Another bug - char limit not obeyed
+# % set cv 2
+# % testencoding Tcl_ExternalToUtf utf-8 abcdefgh {start end noterminate charlimit} {} 20 rv wv cv
+# nospace {} abcÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
+
 ::tcltest::cleanupTests
 return
 
-- 
cgit v0.12


From 18a99f2522b77516b62a0d44dca1c90b3479bda1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 14 Mar 2023 10:05:24 +0000
Subject: Add "ucs-2" constraint to encoding-bug-183a1adcc0-5 testcase,
 otherwise it fails with TCL_UTF_MAX>3. Broken by [47857515422b8519|this]
 commit

---
 tests/encoding.test |  2 +-
 tests/ioTrans.test  |  2 +-
 win/tclWinTest.c    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index 26efb19..bac80c9 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -768,7 +768,7 @@ test encoding-bug-183a1adcc0-4 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExtern
 } -result [list 0 [list nospace {} \x00\x00\xff]]
 
 test encoding-bug-183a1adcc0-5 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
-    testencoding
+    testencoding ucs-2
 } -body {
     # Note - buffers are initialized to \xff
     list [catch {testencoding Tcl_UtfToExternal unicode A {start end} {} 4} result] $result
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 130ff80..3a23e61 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -671,7 +671,7 @@ namespace eval inputfilter {
     proc initialize {chan mode} {
 	return {initialize finalize read}
     }
-    
+
     proc read {chan buffer} {
 	return $buffer
     }
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index d70d217..6ca49f6 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -419,7 +419,7 @@ TestplatformChmod(
     const char *nativePath,
     int pmode)
 {
-    /* 
+    /*
      * Note FILE_DELETE_CHILD missing from dirWriteMask because we do
      * not want overriding of child's delete setting when testing
      */
@@ -427,7 +427,7 @@ TestplatformChmod(
 	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA |
 	FILE_ADD_FILE | FILE_ADD_SUBDIRECTORY | STANDARD_RIGHTS_WRITE | DELETE |
 	SYNCHRONIZE;
-    static const DWORD dirReadMask = 
+    static const DWORD dirReadMask =
 	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_LIST_DIRECTORY |
 	STANDARD_RIGHTS_READ | SYNCHRONIZE;
     /* Note - default user privileges allow ignoring TRAVERSE setting */
@@ -437,7 +437,7 @@ TestplatformChmod(
     static const DWORD fileWriteMask =
 	FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_WRITE_DATA |
 	FILE_APPEND_DATA | STANDARD_RIGHTS_WRITE | DELETE | SYNCHRONIZE;
-    static const DWORD fileReadMask = 
+    static const DWORD fileReadMask =
 	FILE_READ_ATTRIBUTES | FILE_READ_EA | FILE_READ_DATA |
 	STANDARD_RIGHTS_READ | SYNCHRONIZE;
     static const DWORD fileExecuteMask =
@@ -471,7 +471,7 @@ TestplatformChmod(
     if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) {
 	goto done;
     }
-    
+
     /* Get process SID */
     if (!GetTokenInformation(hToken, TokenUser, NULL, 0, &dw) &&
 	GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
@@ -489,7 +489,7 @@ TestplatformChmod(
 	ckfree(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
 	goto done;
     }
-    /* 
+    /*
      * Always include DACL modify rights so we don't get locked out
      */
     aceEntry[nSids].mask = READ_CONTROL | WRITE_DAC | WRITE_OWNER | SYNCHRONIZE |
-- 
cgit v0.12


From 3aef0c58f9614b4dd1b9eb4201238789cd9022fa Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 14 Mar 2023 20:27:04 +0000
Subject: Further fix for issue [ea69b0258a9833cb], crash when using a channel
 transformation on TCP client socket.

---
 generic/tclIO.c | 30 +++++++++++++++++++++++-------
 generic/tclIO.h |  3 +++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 715f8c7..55b6bdc 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1699,6 +1699,7 @@ Tcl_CreateChannel(
     statePtr->scriptRecordPtr	= NULL;
     statePtr->bufSize		= CHANNELBUFFER_DEFAULT_SIZE;
     statePtr->timer		= NULL;
+    statePtr->timerChanPtr	= NULL;
     statePtr->csPtrR		= NULL;
     statePtr->csPtrW		= NULL;
     statePtr->outputStage	= NULL;
@@ -3093,7 +3094,13 @@ CloseChannel(
      * Cancel any outstanding timer.
      */
 
-    Tcl_DeleteTimerHandler(statePtr->timer);
+    if (statePtr->timer != NULL) {
+	Tcl_DeleteTimerHandler(statePtr->timer);
+	statePtr->timer = NULL;
+	TclChannelRelease((Tcl_Channel)statePtr->timerChanPtr);
+	statePtr->timerChanPtr = NULL;
+    }
+
 
     /*
      * Mark the channel as deleted by clearing the type structure.
@@ -3912,7 +3919,12 @@ Tcl_ClearChannelHandlers(
      * Cancel any outstanding timer.
      */
 
-    Tcl_DeleteTimerHandler(statePtr->timer);
+    if (statePtr->timer != NULL) {
+	Tcl_DeleteTimerHandler(statePtr->timer);
+	statePtr->timer = NULL;
+	TclChannelRelease((Tcl_Channel)statePtr->timerChanPtr);
+	statePtr->timerChanPtr = NULL;
+    }
 
     /*
      * Remove any references to channel handlers for this channel that may be
@@ -8552,8 +8564,9 @@ UpdateInterest(
 
 	    if (!statePtr->timer) {
 		TclChannelPreserve((Tcl_Channel)chanPtr);
+		statePtr->timerChanPtr = chanPtr;
 		statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-                        ChannelTimerProc, chanPtr);
+		    ChannelTimerProc, chanPtr);
 	    }
 	}
     }
@@ -8582,11 +8595,13 @@ ChannelTimerProc(
     ClientData clientData)
 {
     Channel *chanPtr = (Channel *)clientData;
+    /* State info for channel */
     ChannelState *statePtr = chanPtr->state;
-				/* State info for channel */
 
     if (chanPtr->typePtr == NULL) {
-	TclChannelRelease((Tcl_Channel)chanPtr);
+	statePtr->timer = NULL;
+	TclChannelRelease((Tcl_Channel)statePtr->timerChanPtr);
+	statePtr->timerChanPtr = NULL;
     } else {
 	if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
 		&& (statePtr->interestMask & TCL_READABLE)
@@ -8598,14 +8613,15 @@ ChannelTimerProc(
 	     */
 
 	    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-		    ChannelTimerProc,chanPtr);
+		ChannelTimerProc,chanPtr);
 	    Tcl_Preserve(statePtr);
 	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
 	    Tcl_Release(statePtr);
 	} else {
 	    statePtr->timer = NULL;
 	    UpdateInterest(chanPtr);
-	    TclChannelRelease((Tcl_Channel)chanPtr);
+	    TclChannelRelease((Tcl_Channel)statePtr->timerChanPtr);
+	    statePtr->timerChanPtr = NULL;
 	}
     }
 }
diff --git a/generic/tclIO.h b/generic/tclIO.h
index eccc7a9..03bbce8 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -188,6 +188,9 @@ typedef struct ChannelState {
 				 * handlers ("fileevent") on this channel. */
     int bufSize;		/* What size buffers to allocate? */
     Tcl_TimerToken timer;	/* Handle to wakeup timer for this channel. */
+    Channel *timerChanPtr;	/* Needed in order to decrement the refCount of
+				   the right channel when the timer is
+				   deleted. */
     struct CopyState *csPtrR;	/* State of background copy for which channel
 				 * is input, or NULL. */
     struct CopyState *csPtrW;	/* State of background copy for which channel
-- 
cgit v0.12


From 6ded4b92be27dd73c424f6d524d1a0578621c126 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 15 Mar 2023 08:42:11 +0000
Subject: Further fix for issue [ea69b0258a9833cb], crash when using a channel
 transformation on TCP client socket.

---
 generic/tclIO.c | 52 ++++++++++++++++++++++++++++++++++++----------------
 generic/tclIO.h |  3 +++
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 58137a5..08c52a7 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -165,6 +165,7 @@ static int		CheckForDeadChannel(Tcl_Interp *interp,
 static void		CheckForStdChannelsBeingClosed(Tcl_Channel chan);
 static void		CleanupChannelHandlers(Tcl_Interp *interp,
 			    Channel *chanPtr);
+static void		CleanupTimerHandler(ChannelState *statePtr);
 static int		CloseChannel(Tcl_Interp *interp, Channel *chanPtr,
 			    int errorCode);
 static int		CloseChannelPart(Tcl_Interp *interp, Channel *chanPtr,
@@ -172,6 +173,7 @@ static int		CloseChannelPart(Tcl_Interp *interp, Channel *chanPtr,
 static int		CloseWrite(Tcl_Interp *interp, Channel *chanPtr);
 static void		CommonGetsCleanup(Channel *chanPtr);
 static int		CopyData(CopyState *csPtr, int mask);
+static void		DeleteTimerHandler(ChannelState *statePtr);
 static int		MoveBytes(CopyState *csPtr);
 
 static void		MBCallback(CopyState *csPtr, Tcl_Obj *errObj);
@@ -1730,6 +1732,7 @@ Tcl_CreateChannel(
     statePtr->scriptRecordPtr	= NULL;
     statePtr->bufSize		= CHANNELBUFFER_DEFAULT_SIZE;
     statePtr->timer		= NULL;
+    statePtr->timerChanPtr	= NULL;
     statePtr->csPtrR		= NULL;
     statePtr->csPtrW		= NULL;
     statePtr->outputStage	= NULL;
@@ -3187,8 +3190,8 @@ CloseChannel(
     /*
      * Cancel any outstanding timer.
      */
+    DeleteTimerHandler(statePtr);
 
-    Tcl_DeleteTimerHandler(statePtr->timer);
 
     /*
      * Mark the channel as deleted by clearing the type structure.
@@ -3540,7 +3543,7 @@ Tcl_Close(
     /*
      * Cancel any outstanding timer.
      */
-    Tcl_DeleteTimerHandler(statePtr->timer);
+    DeleteTimerHandler(statePtr);
 
     /*
      * Invoke the registered close callbacks and delete their records.
@@ -4015,8 +4018,7 @@ Tcl_ClearChannelHandlers(
     /*
      * Cancel any outstanding timer.
      */
-
-    Tcl_DeleteTimerHandler(statePtr->timer);
+    DeleteTimerHandler(statePtr);
 
     /*
      * Remove any references to channel handlers for this channel that may be
@@ -8805,8 +8807,9 @@ UpdateInterest(
 
 	    if (!statePtr->timer) {
 		TclChannelPreserve((Tcl_Channel)chanPtr);
+		statePtr->timerChanPtr = chanPtr;
 		statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-                        ChannelTimerProc, chanPtr);
+		    ChannelTimerProc, chanPtr);
 	    }
 	}
     }
@@ -8816,6 +8819,7 @@ UpdateInterest(
 	&& GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
 
 	TclChannelPreserve((Tcl_Channel)chanPtr);
+	statePtr->timerChanPtr = chanPtr;
 	statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
 	    ChannelTimerProc,chanPtr);
     }
@@ -8846,7 +8850,6 @@ ChannelTimerProc(
     void *clientData)
 {
     Channel *chanPtr = (Channel *)clientData;
-
     /* State info for channel */
     ChannelState *statePtr = chanPtr->state;
 
@@ -8857,7 +8860,7 @@ ChannelTimerProc(
      */
 
     if (chanPtr->typePtr == NULL) {
-	TclChannelRelease((Tcl_Channel)chanPtr);
+	CleanupTimerHandler(statePtr);
     } else {
 	Tcl_Preserve(statePtr);
 	statePtr->timer = NULL;
@@ -8870,35 +8873,52 @@ ChannelTimerProc(
 	     * before UpdateInterest gets called by Tcl_NotifyChannel.
 	     */
 	    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-		    ChannelTimerProc,chanPtr);
+		ChannelTimerProc,chanPtr);
 	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_WRITABLE);
 	} else {
 	    /* The channel may have just been closed from within Tcl_NotifyChannel */
 	    if (!GotFlag(statePtr, CHANNEL_INCLOSE)) {
 		if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
-			&& (statePtr->interestMask & TCL_READABLE)
-			&& (statePtr->inQueueHead != NULL)
-			&& IsBufferReady(statePtr->inQueueHead)) {
+		    && (statePtr->interestMask & TCL_READABLE)
+		    && (statePtr->inQueueHead != NULL)
+		    && IsBufferReady(statePtr->inQueueHead)) {
 		    /*
 		     * Restart the timer in case a channel handler reenters the event loop
 		     * before UpdateInterest gets called by Tcl_NotifyChannel.
 		     */
 
 		    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-			    ChannelTimerProc,chanPtr);
+			ChannelTimerProc,chanPtr);
 		    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
 		} else {
-		    TclChannelRelease((Tcl_Channel)chanPtr);
+		    CleanupTimerHandler(statePtr);
 		    UpdateInterest(chanPtr);
 		}
 	    } else {
-		TclChannelRelease((Tcl_Channel)chanPtr);
+		CleanupTimerHandler(statePtr);
 	    }
 	}
-
 	Tcl_Release(statePtr);
     }
-
+}
+
+static void
+DeleteTimerHandler(
+    ChannelState *statePtr
+)
+{
+    if (statePtr->timer != NULL) {
+	Tcl_DeleteTimerHandler(statePtr->timer);
+	CleanupTimerHandler(statePtr);
+    }
+}
+static void
+CleanupTimerHandler(
+    ChannelState *statePtr
+){
+    TclChannelRelease((Tcl_Channel)statePtr->timerChanPtr);
+    statePtr->timer = NULL;
+    statePtr->timerChanPtr = NULL;
 }
 
 /*
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 689067f..bfaf416 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -188,6 +188,9 @@ typedef struct ChannelState {
 				 * handlers ("fileevent") on this channel. */
     Tcl_Size bufSize;		/* What size buffers to allocate? */
     Tcl_TimerToken timer;	/* Handle to wakeup timer for this channel. */
+    Channel *timerChanPtr;	/* Needed in order to decrement the refCount of
+				   the right channel when the timer is
+				   deleted. */
     struct CopyState *csPtrR;	/* State of background copy for which channel
 				 * is input, or NULL. */
     struct CopyState *csPtrW;	/* State of background copy for which channel
-- 
cgit v0.12


From 6bd8763c2db23d253082f9e4d79e53e60a77e856 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 15 Mar 2023 12:53:03 +0000
Subject: Misspelled constraint created testing noise.

---
 tests/encoding.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/encoding.test b/tests/encoding.test
index bac80c9..dc50f24 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -768,7 +768,7 @@ test encoding-bug-183a1adcc0-4 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExtern
 } -result [list 0 [list nospace {} \x00\x00\xff]]
 
 test encoding-bug-183a1adcc0-5 {Bug [183a1adcc0] Buffer overflow Tcl_UtfToExternal} -constraints {
-    testencoding ucs-2
+    testencoding ucs2
 } -body {
     # Note - buffers are initialized to \xff
     list [catch {testencoding Tcl_UtfToExternal unicode A {start end} {} 4} result] $result
-- 
cgit v0.12


From e0e09638fece9ca63daad3b3675dc7bfb1ede7d3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 15 Mar 2023 16:21:53 +0000
Subject: Remove _LARGEFILE_SOURCE64 usage. See [d690400d07]

---
 unix/configure      | 105 ----------------------------------------------------
 unix/tcl.m4         |   3 --
 unix/tclConfig.h.in |   3 --
 3 files changed, 111 deletions(-)

diff --git a/unix/configure b/unix/configure
index 94ecfc6..2ebb2ea 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9318,111 +9318,6 @@ _ACEOF
 	tcl_flags="$tcl_flags _LARGEFILE64_SOURCE"
     fi
 
-
-    if test "${tcl_cv_flag__largefile_source64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/stat.h>
-int
-main ()
-{
-char *p = (char *)open64;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_flag__largefile_source64=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#define _LARGEFILE_SOURCE64 1
-#include <sys/stat.h>
-int
-main ()
-{
-char *p = (char *)open64;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_flag__largefile_source64=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_flag__largefile_source64=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-    if test "x${tcl_cv_flag__largefile_source64}" = "xyes" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define _LARGEFILE_SOURCE64 1
-_ACEOF
-
-	tcl_flags="$tcl_flags _LARGEFILE_SOURCE64"
-    fi
-
     if test "x${tcl_flags}" = "x" ; then
 	echo "$as_me:$LINENO: result: none" >&5
 echo "${ECHO_T}none" >&6
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6cee92c..d9d0a71 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2472,7 +2472,6 @@ AC_DEFUN([SC_TCL_LINK_LIBS], [
 #	Might define the following vars:
 #		_ISOC99_SOURCE
 #		_LARGEFILE64_SOURCE
-#		_LARGEFILE_SOURCE64
 #
 #--------------------------------------------------------------------
 
@@ -2496,8 +2495,6 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[
 	[char *p = (char *)strtoll; char *q = (char *)strtoull;])
     SC_TCL_EARLY_FLAG(_LARGEFILE64_SOURCE,[#include <sys/stat.h>],
 	[struct stat64 buf; int i = stat64("/", &buf);])
-    SC_TCL_EARLY_FLAG(_LARGEFILE_SOURCE64,[#include <sys/stat.h>],
-	[char *p = (char *)open64;])
     if test "x${tcl_flags}" = "x" ; then
 	AC_MSG_RESULT([none])
     else
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 0b7ed35..6d559d1 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -463,9 +463,6 @@
 /* Add the _LARGEFILE64_SOURCE flag when building */
 #undef _LARGEFILE64_SOURCE
 
-/* Add the _LARGEFILE_SOURCE64 flag when building */
-#undef _LARGEFILE_SOURCE64
-
 /* # needed in sys/socket.h Should OS/390 do the right thing with sockets? */
 #undef _OE_SOCKETS
 
-- 
cgit v0.12


From 70cf69246f83c91f78fd4de65ac48fa39aa634d4 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 15 Mar 2023 20:13:22 +0000
Subject: New script used in the "valgrind_each" target in Makefile.in

---
 tools/valgrind_check_success | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 tools/valgrind_check_success

diff --git a/tools/valgrind_check_success b/tools/valgrind_check_success
new file mode 100644
index 0000000..24830d5
--- /dev/null
+++ b/tools/valgrind_check_success
@@ -0,0 +1,30 @@
+#! /usr/bin/env tclsh
+
+
+proc main {sourcetype source} {
+	switch $sourcetype {
+		file {
+			set chan [open $source]
+			try {
+				set data [read $chan]
+			} finally {
+				close $chan
+			}
+		}
+		string {
+			set data $source
+		}
+		default {
+			error [list {wrong # args}]
+		}
+	}
+	set found [regexp -inline -all {blocks are\
+	    (?:(?:(?:definitely|indirectly|possibly) lost)|still reachable)} $data]
+	if {[llength $found]} {
+		puts 0
+	} else {
+		puts 1
+	}
+	flush stdout
+}
+main {*}$argv
-- 
cgit v0.12


From a3c59e320df775f0d6849e5d3163292280b3b386 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 16 Mar 2023 03:08:12 +0000
Subject: Change -encodingprofile to -profile

---
 generic/tclIO.c       | 58 +++++++++++++++++++++++++--------------------------
 tests/chanio.test     |  6 +++---
 tests/encoding.test   | 10 ++++-----
 tests/io.test         | 44 +++++++++++++++++++-------------------
 tests/ioCmd.test      | 26 +++++++++++------------
 tests/winConsole.test | 14 ++++++-------
 tests/zlib.test       |  4 ++--
 7 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index f24eaa0..dbdbda5 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7810,7 +7810,7 @@ Tcl_BadChannelOption(
 {
     if (interp != NULL) {
 	const char *genericopt =
-		"blocking buffering buffersize encoding encodingprofile eofchar translation";
+		"blocking buffering buffersize encoding eofchar profile translation";
 	const char **argv;
 	int argc, i;
 	Tcl_DString ds;
@@ -7951,7 +7951,7 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(8, "-encoding")) {
+    if (len == 0 || HaveOpt(2, "-encoding")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-encoding");
 	}
@@ -7965,23 +7965,6 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
-    if (len == 0 || HaveOpt(9, "-encodingprofile")) {
-	int profile;
-	const char *profileName;
-	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-encodingprofile");
-	}
-	/* Note currently input and output profiles are same */
-	profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
-	profileName = TclEncodingProfileIdToName(interp, profile);
-	if (profileName == NULL) {
-	    return TCL_ERROR;
-	}
-	Tcl_DStringAppendElement(dsPtr, profileName);
-	if (len > 0) {
-	    return TCL_OK;
-	}
-    }
     if (len == 0 || HaveOpt(2, "-eofchar")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-eofchar");
@@ -8025,6 +8008,23 @@ Tcl_GetChannelOption(
 	    return TCL_OK;
 	}
     }
+    if (len == 0 || HaveOpt(1, "-profile")) {
+	int profile;
+	const char *profileName;
+	if (len == 0) {
+	    Tcl_DStringAppendElement(dsPtr, "-profile");
+	}
+	/* Note currently input and output profiles are same */
+	profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
+	profileName = TclEncodingProfileIdToName(interp, profile);
+	if (profileName == NULL) {
+	    return TCL_ERROR;
+	}
+	Tcl_DStringAppendElement(dsPtr, profileName);
+	if (len > 0) {
+	    return TCL_OK;
+	}
+    }
     if (len == 0 || HaveOpt(1, "-translation")) {
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-translation");
@@ -8194,7 +8194,7 @@ Tcl_SetChannelOption(
 	}
 	Tcl_SetChannelBufferSize(chan, newBufferSize);
 	return TCL_OK;
-    } else if (HaveOpt(8, "-encoding")) {
+    } else if (HaveOpt(2, "-encoding")) {
 	Tcl_Encoding encoding;
 	int profile;
 
@@ -8230,15 +8230,6 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
-    } else if (HaveOpt(9, "-encodingprofile")) {
-	int profile;
-	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
-	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
-	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
-	return TCL_OK;
     } else if (HaveOpt(2, "-eofchar")) {
 	if (!newValue[0] || (!(newValue[0] & 0x80) && !newValue[1])) {
 	    if (GotFlag(statePtr, TCL_READABLE)) {
@@ -8294,6 +8285,15 @@ Tcl_SetChannelOption(
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
 	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
+    } else if (HaveOpt(1, "-profile")) {
+	int profile;
+	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
+	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
+	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
 
diff --git a/tests/chanio.test b/tests/chanio.test
index 6da6305..d2008e6 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -254,7 +254,7 @@ test chan-io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} -bod
 test chan-io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 16 -encodingprofile tcl8
+    chan configure $f -encoding jis0208 -buffersize 16 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -267,7 +267,7 @@ test chan-io-3.5 {WriteChars: saved != 0} -body {
     # be moved to beginning of next channel buffer to preserve requested
     # buffersize.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 -encodingprofile tcl8
+    chan configure $f -encoding jis0208 -buffersize 17 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -300,7 +300,7 @@ test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # on flush. The truncated bytes are moved to the beginning of the next
     # channel buffer.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 -encodingprofile tcl8
+    chan configure $f -encoding jis0208 -buffersize 17 -profile tcl8
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
diff --git a/tests/encoding.test b/tests/encoding.test
index 1af5a26..31f966c 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -105,13 +105,13 @@ test encoding-3.2 {Tcl_GetEncodingName, non-null} -setup {
 } -cleanup {
     fconfigure stdout -encoding $old
 } -result {jis0208}
-test encoding-3.3 {fconfigure -encodingprofile} -setup {
-    set old [fconfigure stdout -encodingprofile]
+test encoding-3.3 {fconfigure -profile} -setup {
+    set old [fconfigure stdout -profile]
 } -body {
-    fconfigure stdout -encodingprofile replace
-    fconfigure stdout -encodingprofile
+    fconfigure stdout -profile replace
+    fconfigure stdout -profile
 } -cleanup {
-    fconfigure stdout -encodingprofile $old
+    fconfigure stdout -profile $old
 } -result replace
 
 test encoding-4.1 {Tcl_GetEncodingNames} -constraints {testencoding} -setup {
diff --git a/tests/io.test b/tests/io.test
index fc126de..c3c0cdd 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -274,7 +274,7 @@ test io-3.4 {WriteChars: loop over stage buffer} -body {
     # stage buffer maps to more than can be queued at once.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 16 -encodingprofile tcl8
+    fconfigure $f -encoding jis0208 -buffersize 16 -profile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -288,7 +288,7 @@ test io-3.5 {WriteChars: saved != 0} -body {
     # requested buffersize.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 -encodingprofile tcl8
+    fconfigure $f -encoding jis0208 -buffersize 17 -profile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -321,7 +321,7 @@ test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} -body {
     # of the next channel buffer.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 -encodingprofile tcl8
+    fconfigure $f -encoding jis0208 -buffersize 17 -profile tcl8
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -7634,7 +7634,7 @@ test io-52.20 {TclCopyChannel & encodings} -setup {
     set out [open $path(kyrillic.txt) w]
 
     # Using "-encoding ascii" means reading the "Á" gives an error
-    fconfigure $in  -encoding ascii -encodingprofile strict
+    fconfigure $in  -encoding ascii -profile strict
     fconfigure $out -encoding koi8-r -translation lf
 
     fcopy $in $out
@@ -7656,7 +7656,7 @@ test io-52.21 {TclCopyChannel & encodings} -setup {
 
     # Using "-encoding ascii" means writing the "Á" gives an error
     fconfigure $in  -encoding utf-8
-    fconfigure $out -encoding ascii -translation lf -encodingprofile strict
+    fconfigure $out -encoding ascii -translation lf -profile strict
 
     fcopy $in $out
 } -cleanup {
@@ -7676,7 +7676,7 @@ test io-52.22 {TclCopyChannel & encodings} -setup {
     set out [open $path(kyrillic.txt) w]
 
     # Using "-encoding ascii" means reading the "Á" gives an error
-    fconfigure $in  -encoding ascii -encodingprofile strict
+    fconfigure $in  -encoding ascii -profile strict
     fconfigure $out -encoding koi8-r -translation lf
     proc ::xxx args {
         set ::s0 $args
@@ -7704,7 +7704,7 @@ test io-52.23 {TclCopyChannel & encodings} -setup {
 
     # Using "-encoding ascii" means writing the "Á" gives an error
     fconfigure $in  -encoding utf-8
-    fconfigure $out -encoding ascii -translation lf -encodingprofile strict
+    fconfigure $out -encoding ascii -translation lf -profile strict
     proc ::xxx args {
         set ::s0 $args
     }
@@ -9073,7 +9073,7 @@ test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\xC0\x40
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -encodingprofile tcl8 -buffering none
+    fconfigure $f -encoding utf-8 -profile tcl8 -buffering none
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9083,10 +9083,10 @@ test io-75.1 {multibyte encoding error read results in raw bytes} -setup {
     removeFile io-75.1
 } -result 41c040
 
-test io-75.2 {unrepresentable character write passes and is replaced by ? (-encodingprofile tcl8)} -setup {
+test io-75.2 {unrepresentable character write passes and is replaced by ? (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.2]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1 -encodingprofile tcl8
+    fconfigure $f -encoding iso8859-1 -profile tcl8
 } -body {
     puts -nonewline $f A\u2022
     flush $f
@@ -9100,14 +9100,14 @@ test io-75.2 {unrepresentable character write passes and is replaced by ? (-enco
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
 # But the read already returns the incomplete sequence.
-test io-75.3 {incomplete multibyte encoding read is ignored (-encodingprofile tcl8)} -setup {
+test io-75.3 {incomplete multibyte encoding read is ignored (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.3]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f "A\xC0"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -encodingprofile tcl8
+    fconfigure $f -encoding utf-8 -buffering none -profile tcl8
 } -body {
     set d [read $f]
     close $f
@@ -9119,7 +9119,7 @@ test io-75.3 {incomplete multibyte encoding read is ignored (-encodingprofile tc
 
 # As utf-8 has a special treatment in multi-byte decoding, also test another
 # one.
-test io-75.4 {shiftjis encoding error read results in raw bytes (-encodingprofile tcl8)} -setup {
+test io-75.4 {shiftjis encoding error read results in raw bytes (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.4]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9128,7 +9128,7 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-encodingprofil
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -encodingprofile tcl8
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -profile tcl8
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9138,14 +9138,14 @@ test io-75.4 {shiftjis encoding error read results in raw bytes (-encodingprofil
     removeFile io-75.4
 } -result 4181ff41
 
-test io-75.5 {invalid utf-8 encoding read is ignored (-encodingprofile tcl8)} -setup {
+test io-75.5 {invalid utf-8 encoding read is ignored (-profile tcl8)} -setup {
     set fn [makeFile {} io-75.5]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     puts -nonewline $f A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile tcl8
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile tcl8
 } -body {
     set d [read $f]
     close $f
@@ -9155,7 +9155,7 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-encodingprofile tcl8)} -s
     removeFile io-75.5
 } -result 4181
 
-test io-75.8 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -setup {
+test io-75.8 {invalid utf-8 encoding eof handling (-profile strict)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9163,7 +9163,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -se
     puts -nonewline $f A\x1A\x81
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -encodingprofile strict
+    fconfigure $f -encoding utf-8 -buffering none -eofchar \x1A -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9178,7 +9178,7 @@ test io-75.8 {invalid utf-8 encoding eof handling (-encodingprofile strict)} -se
 test io-75.9 {unrepresentable character write passes and is replaced by ?} -setup {
     set fn [makeFile {} io-75.9]
     set f [open $fn w+]
-    fconfigure $f -encoding iso8859-1 -encodingprofile strict
+    fconfigure $f -encoding iso8859-1 -profile strict
 } -body {
     catch {puts -nonewline $f "A\u2022"} msg
     flush $f
@@ -9222,7 +9222,7 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -encodingprofile strict
+    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9249,7 +9249,7 @@ test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
 } -cleanup {
     removeFile io-75.12
 } -result 4181
-test io-75.13 {invalid utf-8 encoding read is not ignored (-encodingprofile strict)} -setup {
+test io-75.13 {invalid utf-8 encoding read is not ignored (-profile strict)} -setup {
     set fn [makeFile {} io-75.13]
     set f [open $fn w+]
     fconfigure $f -encoding binary
@@ -9257,7 +9257,7 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-encodingprofile stri
     puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -encodingprofile strict
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 23cd67e..aeb9f87 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -207,7 +207,7 @@ test iocmd-7.5 {close command} -setup {
 
 proc expectedOpts {got extra} {
     set basicOpts {
-	-blocking -buffering -buffersize -encoding -encodingprofile -eofchar -translation
+	-blocking -buffering -buffersize -encoding -eofchar -profile -translation
     }
     set opts [list {*}$basicOpts {*}$extra]
     lset opts end [string cat "or " [lindex $opts end]]
@@ -240,33 +240,33 @@ test iocmd-8.7 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
     set f1 [open $path(test1) w]
-    fconfigure $f1 -translation lf -eofchar {} -encoding utf-16 -encodingprofile tcl8
+    fconfigure $f1 -translation lf -eofchar {} -encoding utf-16 -profile tcl8
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -encodingprofile tcl8 -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering full -buffersize 4096 -encoding utf-16 -eofchar {} -profile tcl8 -translation lf}
 test iocmd-8.8 {fconfigure command} -setup {
     file delete $path(test1)
     set x {}
 } -body {
     set f1 [open $path(test1) w]
     fconfigure $f1 -translation lf -buffering line -buffersize 3030 \
-		-eofchar {} -encoding utf-16 -encodingprofile tcl8
+		-eofchar {} -encoding utf-16 -profile tcl8
     lappend x [fconfigure $f1 -buffering]
     lappend x [fconfigure $f1]
 } -cleanup {
     catch {close $f1}
-} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -encodingprofile tcl8 -eofchar {} -translation lf}}
+} -result {line {-blocking 1 -buffering line -buffersize 3030 -encoding utf-16 -eofchar {} -profile tcl8 -translation lf}}
 test iocmd-8.9 {fconfigure command} -setup {
     file delete $path(test1)
 } -body {
     set f1 [open $path(test1) w]
     fconfigure $f1 -translation binary -buffering none -buffersize 4040 \
-		-eofchar {} -encoding binary -encodingprofile tcl8
+		-eofchar {} -encoding binary -profile tcl8
     fconfigure $f1
 } -cleanup {
     catch {close $f1}
-} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -encodingprofile tcl8 -eofchar {} -translation lf}
+} -result {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -profile tcl8 -translation lf}
 test iocmd-8.10 {fconfigure command} -returnCodes error -body {
     fconfigure a b
 } -result {can not find channel named "a"}
@@ -378,7 +378,7 @@ test iocmd-8.21 {fconfigure command / -nocomplainencoding 0 error} -constraints
 } -returnCodes error -result "bad value for -nocomplainencoding: only true allowed"
 test iocmd-8.22 {fconfigure command / -nocomplainencoding 0, no error if -strictencoding already defined} -setup {
     set console stdin
-    set oldprofile [fconfigure $console -encodingprofile]
+    set oldprofile [fconfigure $console -profile]
 } -constraints {
     obsolete
 } -body {
@@ -390,8 +390,8 @@ test iocmd-8.22 {fconfigure command / -nocomplainencoding 0, no error if -strict
 } -result 0
 
 
-test iocmd-8.21 {fconfigure -encodingprofile badprofile} -body {
-    fconfigure stdin -encodingprofile froboz
+test iocmd-8.21 {fconfigure -profile badprofile} -body {
+    fconfigure stdin -profile froboz
 } -returnCodes error -result {bad profile name "froboz": must be replace, strict, or tcl8}
 
 test iocmd-9.1 {eof command} {
@@ -1387,7 +1387,7 @@ test iocmd-25.1 {chan configure, cgetall, standard options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -encodingprofile * -eofchar {{} {}} -translation {auto *}}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -profile * -translation {auto *}}}
 test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     set res {}
     proc foo {args} {oninit cget cgetall; onfinal; track; return ""}
@@ -1396,7 +1396,7 @@ test iocmd-25.2 {chan configure, cgetall, no options} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -encodingprofile * -eofchar {{} {}} -translation {auto *}}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -profile * -translation {auto *}}}
 test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     set res {}
     proc foo {args} {
@@ -1408,7 +1408,7 @@ test iocmd-25.3 {chan configure, cgetall, regular result} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -encodingprofile * -eofchar {{} {}} -translation {auto *} -bar foo -snarf x}}
+} -result {{cgetall rc*} {-blocking 1 -buffering full -buffersize 4096 -encoding * -eofchar {{} {}} -profile * -translation {auto *} -bar foo -snarf x}}
 test iocmd-25.4 {chan configure, cgetall, bad result, list of uneven length} -match glob -body {
     set res {}
     proc foo {args} {
diff --git a/tests/winConsole.test b/tests/winConsole.test
index 62dfbf3..f030444 100644
--- a/tests/winConsole.test
+++ b/tests/winConsole.test
@@ -198,7 +198,7 @@ test console-fconfigure-get-1.0 {
     Console get stdin configuration
 } -constraints {win interactive} -body {
     lsort [dict keys [fconfigure stdin]]
-} -result {-blocking -buffering -buffersize -encoding -encodingprofile -eofchar -inputmode -translation}
+} -result {-blocking -buffering -buffersize -encoding -eofchar -inputmode -profile -translation}
 
 set testnum 0
 foreach {opt result} {
@@ -224,7 +224,7 @@ test console-fconfigure-get-1.[incr testnum] {
     fconfigure -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure get stdout/stderr
 foreach chan {stdout stderr} major {2 3} {
@@ -232,7 +232,7 @@ foreach chan {stdout stderr} major {2 3} {
         win interactive
     } -body {
         lsort [dict keys [fconfigure $chan]]
-    } -result {-blocking -buffering -buffersize -encoding -encodingprofile -eofchar -translation -winsize}
+    } -result {-blocking -buffering -buffersize -encoding -eofchar -profile -translation -winsize}
     set testnum 0
     foreach {opt result} {
         -blocking 1
@@ -260,7 +260,7 @@ foreach chan {stdout stderr} major {2 3} {
         fconfigure -inputmode
     } -constraints {win interactive} -body {
         fconfigure $chan -inputmode
-    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, -translation, or -winsize} -returnCodes error
+    } -result {bad option "-inputmode": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, -translation, or -winsize} -returnCodes error
 
 }
 
@@ -330,7 +330,7 @@ test console-fconfigure-set-1.3 {
     fconfigure stdin -winsize
 } -constraints {win interactive} -body {
     fconfigure stdin -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, -translation, or -inputmode} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, -translation, or -inputmode} -returnCodes error
 
 ## fconfigure set stdout,stderr
 
@@ -338,13 +338,13 @@ test console-fconfigure-set-2.0 {
     fconfigure stdout -winsize
 } -constraints {win interactive} -body {
     fconfigure stdout -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -profile, or -translation} -returnCodes error
 
 test console-fconfigure-set-3.0 {
     fconfigure stderr -winsize
 } -constraints {win interactive} -body {
     fconfigure stderr -winsize {10 30}
-} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -encodingprofile, -eofchar, or -translation} -returnCodes error
+} -result {bad option "-winsize": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, or -profile, -translation} -returnCodes error
 
 # Multiple threads
 
diff --git a/tests/zlib.test b/tests/zlib.test
index 0566b8b..42d9e9c 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -292,7 +292,7 @@ test zlib-8.6 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf -checksum 1 -dictionary {}} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf}}
 test zlib-8.7 {transformation and fconfigure} -setup {
     set file [makeFile {} test.gz]
     set fd [open $file wb]
@@ -302,7 +302,7 @@ test zlib-8.7 {transformation and fconfigure} -setup {
 } -cleanup {
     catch {close $fd}
     removeFile $file
-} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -encodingprofile {} -eofchar {} -translation lf}}
+} -result {{-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf -checksum 0} {-blocking 1 -buffering full -buffersize 4096 -encoding binary -eofchar {} -profile tcl8 -translation lf}}
 # Input is headers from fetching SPDY draft
 # Dictionary is that which is proposed _in_ SPDY draft
 set spdyHeaders "HTTP/1.0 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nX-Robots-Tag: noarchive\r\nLast-Modified: Tue, 05 Jun 2012 02:43:25 GMT\r\nETag: \"1338864205129|#public|0|en|||0\"\r\nExpires: Tue, 05 Jun 2012 16:17:11 GMT\r\nDate: Tue, 05 Jun 2012 16:17:06 GMT\r\nCache-Control: public, max-age=5\r\nX-Content-Type-Options: nosniff\r\nX-XSS-Protection: 1; mode=block\r\nServer: GSE\r\n"
-- 
cgit v0.12


From 5846b1666f9fda4d12d9cc46f8bd2050b1ed4ef4 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Thu, 16 Mar 2023 08:15:03 +0000
Subject: Make valgrind_foreach target in Makefile.in properly handle
 interrupted tests.

---
 unix/Makefile.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index da057d8..e092a2d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -956,7 +956,8 @@ testresults/valgrind/%.result: ${TCL_EXE} ${TCLTEST_EXE}
 	@mkdir -p testresults/valgrind
 	$(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \
 		$(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \
-		-file $(basename $(notdir $@)) > $@ 2>&1
+		-file $(basename $(notdir $@)) > $@.tmp 2>&1
+	@mv $@.tmp $@
 .PRECIOUS: testresults/valgrind/%.result
 
 
@@ -966,7 +967,7 @@ testresults/valgrind/%.success: testresults/valgrind/%.result
 	@printf '\n >&2'
 	@status=$$(./${TCLTEST_EXE} $(TOP_DIR)/tools/valgrind_check_success \
 		file $(basename $@).result); \
-	if [ "$$status" -eq 1 ]; then exit 0; else exit 1; fi
+	if [ "$$status" -eq 1 ]; then touch $@; exit 0; else exit 1; fi
 
 valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\
 	$(wildcard $(TOP_DIR)/tests/*.test))))
-- 
cgit v0.12


From e019e5bd1d3ddb51539ca9e4872e6c9d310dd390 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 16 Mar 2023 11:29:14 +0000
Subject: Fix (minor) warning on 32-bit platforms

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

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 668a05a..15eaa56 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2119,7 +2119,7 @@ static int UtfExtWrapper(
     /* Assumes state is integer if not "" */
     Tcl_WideInt wide;
     if (Tcl_GetWideIntFromObj(interp, objv[5], &wide) == TCL_OK) {
-        encState = (Tcl_EncodingState) wide;
+        encState = (Tcl_EncodingState)(size_t)wide;
         encStatePtr = &encState;
     } else if (Tcl_GetCharLength(objv[5]) == 0) {
         encStatePtr = NULL;
@@ -2209,7 +2209,7 @@ static int UtfExtWrapper(
         }
         result = TCL_OK;
         resultObjs[1] =
-            encStatePtr ? Tcl_NewWideIntObj((Tcl_WideInt)encState) : Tcl_NewObj();
+            encStatePtr ? Tcl_NewWideIntObj((Tcl_WideInt)(size_t)encState) : Tcl_NewObj();
         resultObjs[2] = Tcl_NewByteArrayObj(bufPtr, dstLen);
         if (srcReadVar) {
 	    if (Tcl_ObjSetVar2(interp,
-- 
cgit v0.12


From 1a6f1d5c40570e83189a91e4301d9e89369ce00e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 16 Mar 2023 15:12:17 +0000
Subject: Add some undocumented stub functions. Those can prevent a crash like
 [http://paste.tclers.tk/5763|this] example, when compiled with 8.7 headers
 but running it in Tcl 8.6.

---
 generic/tcl.decls      | 16 +++++++++++++--
 generic/tclDecls.h     | 30 +++++++++++++++++++---------
 generic/tclPlatDecls.h | 19 ++++++++++--------
 generic/tclStubInit.c  | 54 +++++++++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 95 insertions(+), 24 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index d20a945..7f734c6 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2326,6 +2326,18 @@ declare 630 {
 
 # ----- BASELINE -- FOR -- 8.6.0 ----- #
 
+# TIP #481 (undocumented stub entries)
+declare 651 {
+    char *TclGetStringFromObj_(Tcl_Obj *objPtr, size_t *lengthPtr)
+}
+declare 652 {
+    unsigned short *TclGetUnicodeFromObj_(Tcl_Obj *objPtr, size_t *lengthPtr)
+}
+# Only available in Tcl 8.x, NULL in Tcl 9.0
+declare 653 {
+    unsigned char *TclGetByteArrayFromObj_(Tcl_Obj *objPtr, size_t *numBytesPtr)
+}
+
 declare 687 {
     void TclUnusedStubEntry(void)
 }
@@ -2355,7 +2367,7 @@ declare 1 win {
     char *Tcl_WinTCharToUtf(const TCHAR *str, int len, Tcl_DString *dsPtr)
 }
 declare 3 win {
-    void TclUnusedStubEntry(void)
+    void TclWinConvertError_(unsigned errCode)
 }
 
 ################################
@@ -2372,7 +2384,7 @@ declare 1 macosx {
 	    int hasResourceFile, int maxPathLen, char *libraryPath)
 }
 declare 2 macosx {
-    void TclUnusedStubEntry(void)
+    void TclMacOSXNotifierAddRunLoopMode_(const void *runLoopMode)
 }
 
 ##############################################################################
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 6c109de..551a5b6 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1835,9 +1835,15 @@ EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
 /* Slot 648 is reserved */
 /* Slot 649 is reserved */
 /* Slot 650 is reserved */
-/* Slot 651 is reserved */
-/* Slot 652 is reserved */
-/* Slot 653 is reserved */
+/* 651 */
+EXTERN char *		TclGetStringFromObj_(Tcl_Obj *objPtr,
+				size_t *lengthPtr);
+/* 652 */
+EXTERN unsigned short *	 TclGetUnicodeFromObj_(Tcl_Obj *objPtr,
+				size_t *lengthPtr);
+/* 653 */
+EXTERN unsigned char *	TclGetByteArrayFromObj_(Tcl_Obj *objPtr,
+				size_t *numBytesPtr);
 /* Slot 654 is reserved */
 /* Slot 655 is reserved */
 /* Slot 656 is reserved */
@@ -2559,9 +2565,9 @@ typedef struct TclStubs {
     void (*reserved648)(void);
     void (*reserved649)(void);
     void (*reserved650)(void);
-    void (*reserved651)(void);
-    void (*reserved652)(void);
-    void (*reserved653)(void);
+    char * (*tclGetStringFromObj_) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */
+    unsigned short * (*tclGetUnicodeFromObj_) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */
+    unsigned char * (*tclGetByteArrayFromObj_) (Tcl_Obj *objPtr, size_t *numBytesPtr); /* 653 */
     void (*reserved654)(void);
     void (*reserved655)(void);
     void (*reserved656)(void);
@@ -3908,9 +3914,12 @@ extern const TclStubs *tclStubsPtr;
 /* Slot 648 is reserved */
 /* Slot 649 is reserved */
 /* Slot 650 is reserved */
-/* Slot 651 is reserved */
-/* Slot 652 is reserved */
-/* Slot 653 is reserved */
+#define TclGetStringFromObj_ \
+	(tclStubsPtr->tclGetStringFromObj_) /* 651 */
+#define TclGetUnicodeFromObj_ \
+	(tclStubsPtr->tclGetUnicodeFromObj_) /* 652 */
+#define TclGetByteArrayFromObj_ \
+	(tclStubsPtr->tclGetByteArrayFromObj_) /* 653 */
 /* Slot 654 is reserved */
 /* Slot 655 is reserved */
 /* Slot 656 is reserved */
@@ -3984,6 +3993,9 @@ extern const TclStubs *tclStubsPtr;
 
 #undef Tcl_SeekOld
 #undef Tcl_TellOld
+#undef TclGetStringFromObj_
+#undef TclGetUnicodeFromObj_
+#undef TclGetByteArrayFromObj_
 
 #undef Tcl_PkgPresent
 #define Tcl_PkgPresent(interp, name, version, exact) \
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index cb420fd..46181a1 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -59,7 +59,7 @@ EXTERN char *		Tcl_WinTCharToUtf(const TCHAR *str, int len,
 				Tcl_DString *dsPtr);
 /* Slot 2 is reserved */
 /* 3 */
-EXTERN void		TclUnusedStubEntry(void);
+EXTERN void		TclWinConvertError_(unsigned errCode);
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 /* 0 */
@@ -73,7 +73,8 @@ EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				int hasResourceFile, int maxPathLen,
 				char *libraryPath);
 /* 2 */
-EXTERN void		TclUnusedStubEntry(void);
+EXTERN void		TclMacOSXNotifierAddRunLoopMode_(
+				const void *runLoopMode);
 #endif /* MACOSX */
 
 typedef struct TclPlatStubs {
@@ -84,12 +85,12 @@ typedef struct TclPlatStubs {
     TCHAR * (*tcl_WinUtfToTChar) (const char *str, int len, Tcl_DString *dsPtr); /* 0 */
     char * (*tcl_WinTCharToUtf) (const TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */
     void (*reserved2)(void);
-    void (*tclUnusedStubEntry) (void); /* 3 */
+    void (*tclWinConvertError_) (unsigned errCode); /* 3 */
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
     int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
     int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */
-    void (*tclUnusedStubEntry) (void); /* 2 */
+    void (*tclMacOSXNotifierAddRunLoopMode_) (const void *runLoopMode); /* 2 */
 #endif /* MACOSX */
 } TclPlatStubs;
 
@@ -111,16 +112,16 @@ extern const TclPlatStubs *tclPlatStubsPtr;
 #define Tcl_WinTCharToUtf \
 	(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */
 /* Slot 2 is reserved */
-#define TclUnusedStubEntry \
-	(tclPlatStubsPtr->tclUnusedStubEntry) /* 3 */
+#define TclWinConvertError_ \
+	(tclPlatStubsPtr->tclWinConvertError_) /* 3 */
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
 #define Tcl_MacOSXOpenBundleResources \
 	(tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */
 #define Tcl_MacOSXOpenVersionedBundleResources \
 	(tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */
-#define TclUnusedStubEntry \
-	(tclPlatStubsPtr->tclUnusedStubEntry) /* 2 */
+#define TclMacOSXNotifierAddRunLoopMode_ \
+	(tclPlatStubsPtr->tclMacOSXNotifierAddRunLoopMode_) /* 2 */
 #endif /* MACOSX */
 
 #endif /* defined(USE_TCL_STUBS) */
@@ -128,6 +129,8 @@ extern const TclPlatStubs *tclPlatStubsPtr;
 /* !END!: Do not edit above this line. */
 
 #undef TclUnusedStubEntry
+#undef TclMacOSXNotifierAddRunLoopMode_
+#undef TclWinConvertError_
 #ifdef MAC_OSX_TCL /* MACOSX */
 #undef Tcl_MacOSXOpenBundleResources
 #define Tcl_MacOSXOpenBundleResources(a,b,c,d,e) Tcl_MacOSXOpenVersionedBundleResources(a,b,NULL,c,d,e)
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index ee0412a..565dd8c 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -59,6 +59,7 @@
 #define TclBN_mp_tc_or TclBN_mp_or
 #define TclBN_mp_tc_xor TclBN_mp_xor
 #define TclStaticPackage Tcl_StaticPackage
+#define TclMacOSXNotifierAddRunLoopMode_ TclMacOSXNotifierAddRunLoopMode
 #define TclUnusedStubEntry 0
 
 /* See bug 510001: TclSockMinimumBuffers needs plat imp */
@@ -138,12 +139,55 @@ static const char *TclGetStartupScriptFileName(void)
     return Tcl_GetString(path);
 }
 
+#define TclGetStringFromObj_ getStringFromObj
+static char *
+TclGetStringFromObj_(
+    Tcl_Obj *objPtr,
+    size_t *lengthPtr)
+{
+    int length;
+    char *result = Tcl_GetStringFromObj(objPtr, &length);
+    *lengthPtr = (size_t)length;
+    return result;
+}
+
+#define TclGetUnicodeFromObj_ getUnicodeFromObj
+static unsigned short *
+TclGetUnicodeFromObj_(
+    Tcl_Obj *objPtr,
+    size_t *lengthPtr)
+{
+    int length;
+    Tcl_UniChar *result = Tcl_GetUnicodeFromObj(objPtr, &length);
+    *lengthPtr = (size_t)length;
+    return result;
+}
+
+#define TclGetByteArrayFromObj_ getByteArrayFromObj
+static unsigned char *
+TclGetByteArrayFromObj_(
+    Tcl_Obj *objPtr,
+    size_t *numBytesPtr)
+{
+    int numBytes;
+    unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &numBytes);
+    *numBytesPtr = (size_t)numBytes;
+    return result;
+}
+
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 #undef TclWinNToHS
 #define TclWinNToHS winNToHS
 static unsigned short TclWinNToHS(unsigned short ns) {
 	return ntohs(ns);
 }
+#define TclWinConvertError_ winConvertError
+static void
+TclWinConvertError_(unsigned errCode) {
+    return TclWinConvertError(errCode);
+}
+
 #endif
 
 #define TclpCreateTempFile_ TclpCreateTempFile
@@ -865,12 +909,12 @@ static const TclPlatStubs tclPlatStubs = {
     Tcl_WinUtfToTChar, /* 0 */
     Tcl_WinTCharToUtf, /* 1 */
     0, /* 2 */
-    TclUnusedStubEntry, /* 3 */
+    TclWinConvertError_, /* 3 */
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
     Tcl_MacOSXOpenBundleResources, /* 0 */
     Tcl_MacOSXOpenVersionedBundleResources, /* 1 */
-    TclUnusedStubEntry, /* 2 */
+    TclMacOSXNotifierAddRunLoopMode_, /* 2 */
 #endif /* MACOSX */
 };
 
@@ -1644,9 +1688,9 @@ const TclStubs tclStubs = {
     0, /* 648 */
     0, /* 649 */
     0, /* 650 */
-    0, /* 651 */
-    0, /* 652 */
-    0, /* 653 */
+    TclGetStringFromObj_, /* 651 */
+    TclGetUnicodeFromObj_, /* 652 */
+    TclGetByteArrayFromObj_, /* 653 */
     0, /* 654 */
     0, /* 655 */
     0, /* 656 */
-- 
cgit v0.12


From 05262be3319aa7027310e8a53e32d0cf63f501d0 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Thu, 16 Mar 2023 16:24:04 +0000
Subject: Update manpages in anticipation of TIP 656

---
 doc/Encoding.3   |  87 +++++++++++++++------
 doc/chan.n       |  10 +++
 doc/encoding.n   | 231 ++++++++++++++++++++++++++++++++++---------------------
 doc/fconfigure.n |  37 +++------
 4 files changed, 225 insertions(+), 140 deletions(-)

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 9b88c11..76ea193 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -8,7 +8,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_GetEncoding, Tcl_FreeEncoding, Tcl_GetEncodingFromObj, Tcl_ExternalToUtfDString, Tcl_ExternalToUtf, Tcl_UtfToExternalDString, Tcl_UtfToExternal, Tcl_GetEncodingName, Tcl_SetSystemEncoding, Tcl_GetEncodingNameFromEnvironment, Tcl_GetEncodingNames, Tcl_CreateEncoding, Tcl_GetEncodingSearchPath, Tcl_SetEncodingSearchPath, Tcl_GetDefaultEncodingDir, Tcl_SetDefaultEncodingDir \- procedures for creating and using encodings
+Tcl_GetEncoding, Tcl_FreeEncoding, Tcl_GetEncodingFromObj, Tcl_ExternalToUtfDString, Tcl_UtfToExternalDStringEx, Tcl_ExternalToUtf, Tcl_UtfToExternalDString, Tcl_UtfToExternalDStringEx, Tcl_UtfToExternal, Tcl_GetEncodingName, Tcl_SetSystemEncoding, Tcl_GetEncodingNameFromEnvironment, Tcl_GetEncodingNames, Tcl_CreateEncoding, Tcl_GetEncodingSearchPath, Tcl_SetEncodingSearchPath, Tcl_GetDefaultEncodingDir, Tcl_SetDefaultEncodingDir \- procedures for creating and using encodings
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -26,13 +26,13 @@ char *
 \fBTcl_ExternalToUtfDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
 .sp
 int
-\fBTcl_ExternalToUtfDStringEx\fR(\fIencoding, src, srcLen, flags, dstPtr\fR)
+\fBTcl_ExternalToUtfDStringEx\fR(\fIinterp, encoding, src, srcLen, flags, dstPtr, errorIdxPtr\fR)
 .sp
 char *
 \fBTcl_UtfToExternalDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
 .sp
 int
-\fBTcl_UtfToExternalDStringEx\fR(\fIencoding, src, srcLen, flags, dstPtr\fR)
+\fBTcl_UtfToExternalDStringEx\fR(\fIinterp, encoding, src, srcLen, flags, dstPtr, errorIdxPtr\fR)
 .sp
 int
 \fBTcl_ExternalToUtf\fR(\fIinterp, encoding, src, srcLen, flags, statePtr,
@@ -105,7 +105,7 @@ encoding-specific length of the string is used.
 Pointer to an uninitialized or free \fBTcl_DString\fR in which the converted
 result will be stored.
 .AP int flags in
-Various flag bits OR-ed together.
+This is a bit mask passed in to control the operation of the encoding functions.
 \fBTCL_ENCODING_START\fR signifies that the
 source buffer is the first block in a (potentially multi-block) input
 stream, telling the conversion routine to reset to an initial state and
@@ -113,16 +113,15 @@ perform any initialization that needs to occur before the first byte is
 converted. \fBTCL_ENCODING_END\fR signifies that the source buffer is the last
 block in a (potentially multi-block) input stream, telling the conversion
 routine to perform any finalization that needs to occur after the last
-byte is converted and then to reset to an initial state.
-\fBTCL_ENCODING_STOPONERROR\fR signifies that the conversion routine should
-return immediately upon reading a source character that does not exist in
-the target encoding; otherwise a default fallback character will
-automatically be substituted. The flag \fBTCL_ENCODING_STRICT\fR makes the
-encoder/decoder more strict in what it considers to be an invalid byte
-sequence. The flag \fBTCL_ENCODING_NOCOMPLAIN\fR has
-no effect, it is reserved for Tcl 9.0. The flag \fBTCL_ENCODING_MODIFIED\fR makes
-\fBTcl_UtfToExternalDStringEx\fR and \fBTcl_UtfToExternal\fR produce the
-byte sequence \exC0\ex80 in stead of \ex00, for the utf-8/cesu-8 encoders.
+byte is converted and then to reset to an initial state. The
+\fBTCL_PROFILE_*\fR bits defined in the \fBPROFILES\fR section below
+control the encoding profile to be used for dealing with invalid data or
+other errors in the encoding transform.
+\fBTCL_ENCODING_STOPONERROR\fR is present for backward compatibility with
+Tcl 8.6 and forces the encoding profile to \fBstrict\fR.
+
+Some flags bits may not be usable with some functions as noted in the
+function descriptions below.
 .AP Tcl_EncodingState *statePtr in/out
 Used when converting a (generally long or indefinite length) byte stream
 in a piece-by-piece fashion.  The conversion routine stores its current
@@ -148,6 +147,9 @@ buffer as a result of the conversion.  May be NULL.
 .AP int *dstCharsPtr out
 Filled with the number of characters that correspond to the number of bytes
 stored in the output buffer.  May be NULL.
+.AP Tcl_Size *errorIdxPtr out
+Filled with the index of the byte or character that caused the encoding transform
+to fail. May be NULL.
 .AP Tcl_DString *bufPtr out
 Storage for the prescribed system encoding name.
 .AP "const Tcl_EncodingType" *typePtr in
@@ -221,11 +223,30 @@ call \fBTcl_DStringFree\fR to free any information stored in \fIdstPtr\fR.
 When converting, if any of the characters in the source buffer cannot be
 represented in the target encoding, a default fallback character will be
 used.  The return value is a pointer to the value stored in the DString.
-.PP
-\fBTcl_ExternalToUtfDStringEx\fR is the same as \fBTcl_ExternalToUtfDString\fR,
-but it has an additional flags parameter.  The return value is the index of
-the first byte in the input string causing a conversion error.
-Or TCL_INDEX_NONE if all is OK.
+
+.PP
+\fBTcl_ExternalToUtfDStringEx\fR is a more flexible version of older
+\fBTcl_ExternalToUtfDString\fR function. It takes three additional parameters,
+\fBinterp\fR, \fBflags\fR and \fBerrorIdxPtr\fR. The \fBflags\fR parameter may
+be used to specify the profile to be used for the transform. The
+\fBTCL_ENCODING_START\fR and \fBTCL_ENCODING_END\fR bits in \fBflags\fR are
+ignored as the function assumes the entire source string to be decoded is passed
+into the function. On success, the function returns \fBTCL_ERROR\fR with the
+converted string stored in \fB*dstPtr\fR. For errors other than conversion
+errors, such as invalid flags, the function returns \fBTCL_OK\fR with an error
+message in \fBinterp\fR if it is not NULL.
+
+For conversion errors, \fBTcl_ExternalToUtfDStringEx\fR returns one
+of the \fBTCL_CONVERT_*\fR errors listed below for \fBTcl_ExternalToUtf\fR.
+When one of these conversion errors is returned, an error message is
+stored in \fBinterp\fR only if \fBerrorIdxPtr\fR is NULL. Otherwise, no error message
+is stored as the function expects the caller is interested whatever is
+decoded to that point and not treating this as an immediate error condition.
+The index of the error location is stored in \fB*errorIdxPtr\fR.
+
+The caller must call \fBTcl_DStringFree\fR to free up the \fB*dstPtr\fR resources
+irrespective of the return value from the function.
+
 .PP
 \fBTcl_ExternalToUtf\fR converts a source buffer \fIsrc\fR from the specified
 \fIencoding\fR into UTF-8.  Up to \fIsrcLen\fR bytes are converted from the
@@ -248,12 +269,12 @@ the unconverted bytes that remained in \fIsrc\fR plus some further bytes
 from the source stream to properly convert the formerly split-up multibyte
 sequence.
 .IP \fBTCL_CONVERT_SYNTAX\fR 29
-The source buffer contained an invalid character sequence.  This may occur
+The source buffer contained an invalid byte or character sequence.  This may occur
 if the input stream has been damaged or if the input encoding method was
 misidentified.
 .IP \fBTCL_CONVERT_UNKNOWN\fR 29
 The source buffer contained a character that could not be represented in
-the target encoding and \fBTCL_ENCODING_STOPONERROR\fR was specified.
+the target encoding.
 .RE
 .LP
 \fBTcl_UtfToExternalDString\fR converts a source buffer \fIsrc\fR from UTF-8
@@ -265,10 +286,14 @@ characters in the source buffer cannot be represented in the target
 encoding, a default fallback character will be used.  The return value is
 a pointer to the value stored in the DString.
 .PP
-\fBTcl_UtfToExternalDStringEx\fR is the same as \fBTcl_UtfToExternalDString\fR,
-but it has an additional flags parameter.  The return value is the index of
-the first byte of an utf-8 byte-sequence in the input string causing a
-conversion error. Or TCL_INDEX_NONE if all is OK.
+\fBTcl_UtfToExternalDStringEx\fR is an enhanced version of
+\fBTcl_UtfToExternalDString\fR that transforms UTF-8 encoded source data to a specified
+\fIencoding\fR. Except for the direction of the transform, the parameters and
+return values are identical to those of \fBTcl_ExternalToUtfDStringEx\fR. See
+that function above for details about the same.
+
+Irrespective of the return code from the function, the caller must free
+resources associated with \fB*dstPtr\fR when the function returns.
 .PP
 \fBTcl_UtfToExternal\fR converts a source buffer \fIsrc\fR from UTF-8 into
 the specified \fIencoding\fR.  Up to \fIsrcLen\fR bytes are converted from
@@ -592,6 +617,18 @@ to the object, it will be deleted.
 .PP
 \fBTcl_GetEncodingSearchPath\fR returns an object with a reference count of at
 least 1.
+.SH "PROFILES"
+Encoding profiles define the manner in which errors in the encoding transforms
+are handled by the encoding functions. An application can specify the profile
+to be used by OR-ing the \fBflags\fR parameter passed to the function
+with at most one of \fBTCL_ENCODING_PROFILE_TCL8\fR,
+\fBTCL_ENCODING_PROFILE_STRICT\fR or \fBTCL_ENCODING_PROFILE_REPLACE\fR.
+These correspond to the \fBtcl8\fR, \fBstrict\fR and \fBreplace\fR profiles
+respectively. If none are specified, a version-dependent default profile is used.
+For Tcl 8.7, the default profile is \fBtcl8\fR.
+
+For details about profiles, see the \fBPROFILES\fR section in
+the documentation of the \fBencoding\fR command.
 .SH "SEE ALSO"
 encoding(n)
 .SH KEYWORDS
diff --git a/doc/chan.n b/doc/chan.n
index bf6c85c..1ecef4c 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -156,6 +156,16 @@ applied to input only.
 The default value is the empty string, except that under Windows the default
 value for reading is Control-z (\ex1A).  The acceptable range is \ex01 -
 \ex7f.  A value outside this range results in an error.
+.VS "TCL8.7 TIP656"
+.TP
+\fB\-profile\fR \fIprofile\fR
+.
+Specifies the encoding profile to be used on the channel. The encoding
+transforms in use for the channel's input and output will then be subject to the
+rules of that profile. Any failures will result in a channel error. See
+\fBPROFILES\fR in the \fBencoding(n)\fR documentation for details about encoding
+profiles.
+.VE "TCL8.7 TIP656"
 .TP
 \fB\-translation\fR \fItranslation\fR
 .TP
diff --git a/doc/encoding.n b/doc/encoding.n
index 4ad2824..9bb6e93 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -28,71 +28,41 @@ formats.
 Performs one of several encoding related operations, depending on
 \fIoption\fR.  The legal \fIoption\fRs are:
 .TP
-\fBencoding convertfrom\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
-\fBencoding convertfrom\fR \fB-nocomplain\fR ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertfrom\fR ?\fIencoding\fR? \fIdata\fR
+.TP
+\fBencoding convertfrom\fR ?\fB-profile \fIprofile\fR? ?\fB-failindex var\fR? \fIencoding\fR \fIdata\fR
 .
-Convert \fIdata\fR to a Unicode string from the specified \fIencoding\fR.  The
-characters in \fIdata\fR are 8 bit binary data.  The resulting
-sequence of bytes is a string created by applying the given \fIencoding\fR
-to the data. If \fIencoding\fR is not specified, the current
+Converts \fIdata\fR, which should be in binary string encoded as per
+\fIencoding\fR, to a Tcl string. If \fIencoding\fR is not specified, the current
 system encoding is used.
-.VS "TCL8.7 TIP346, TIP607, TIP601"
-.PP
-.RS
-The command does not fail on encoding errors (unless \fB-strict\fR is specified).
-Instead, any not convertable bytes (like incomplete UTF-8  sequences, see example
-below) are put as byte values into the output stream.
-.PP
-If the option \fB-failindex\fR with a variable name is given, the error reporting
-is changed in the following manner:
-in case of a conversion error, the position of the input byte causing the error
-is returned in the given variable.  The return value of the command are the
-converted characters until the first error position.
-In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
-.PP
-The option \fB-nocomplain\fR has no effect, but assures to get the same result
-in Tcl 9.
-.PP
-The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows invalid byte sequences and surrogates (which -
-otherwise - are just passed through).  This option may not be used together
-with \fB-nocomplain\fR.
-.VE "TCL8.7 TIP346, TIP607, TIP601"
-.RE
+
+.VS "TCL8.7 TIP607, TIP656"
+The \fB-profile\fR option determines the command behavior in the presence
+of conversion errors. See \fBPROFILES\fR for details. Any premature
+termination of processing due to errors is reported through an exception if
+the \fB-failindex\fR option is not specified.
+
+If the \fB-failindex\fR is specified, instead of an exception being raised
+on premature termination, the result of the conversion up to the point of the
+error is returned as the result of the command. In addition, the index
+of the source byte triggering the error is stored in \fBvar\fR. If no
+errors are encountered, the entire result of the conversion is returned and
+the value \fB-1\fR is stored in \fBvar\fR.
+.VE "TCL8.7 TIP607, TIP656"
+.TP
+\fBencoding convertto\fR ?\fIencoding\fR? \fIdata\fR
 .TP
-\fBencoding convertto\fR ?\fB-strict\fR? ?\fB-failindex var\fR? ?\fIencoding\fR? \fIdata\fR
-\fBencoding convertto\fR \fB-nocomplain\fR ?\fIencoding\fR? \fIdata\fR
+\fBencoding convertto\fR ?\fB-profile \fIprofile\fR? ?\fB-failindex var\fR? \fIencoding\fR \fIdata\fR
 .
-Convert \fIstring\fR from Unicode to the specified \fIencoding\fR.
-The result is a sequence of bytes that represents the converted
-string.  Each byte is stored in the lower 8-bits of a Unicode
-character (indeed, the resulting string is a binary string as far as
-Tcl is concerned, at least initially).  If \fIencoding\fR is not
-specified, the current system encoding is used.
-.VS "TCL8.7 TIP346, TIP607, TIP601"
-.PP
-.RS
-The command does not fail on encoding errors (unless \fB-strict\fR is specified).
-Instead, the replacement character \fB?\fR is output for any not representable
-character (like the dot \fB\\U2022\fR in \fBiso-8859-1\fR encoding, see example below).
-.PP
-If the option \fB-failindex\fR with a variable name is given, the error reporting
-is changed in the following manner:
-in case of a conversion error, the position of the input character causing the error
-is returned in the given variable.  The return value of the command are the
-converted bytes until the first error position. No error condition is raised.
-In case of no error, the value \fI-1\fR is written to the variable.  This option
-may not be used together with \fB-nocomplain\fR.
-.PP
-The option \fB-nocomplain\fR has no effect, but assures to get the same result
-in Tcl 9.
-.PP
-The \fB-strict\fR option follows more strict rules in conversion.  For the \fButf-8\fR
-encoder, it disallows surrogates (which - otherwise - are just passed through).  This
-option may not be used together with \fB-nocomplain\fR.
-.VE "TCL8.7 TIP346, TIP607, TIP601"
-.RE
+Convert \fIstring\fR to the specified \fIencoding\fR. The result is a Tcl binary
+string that contains the sequence of bytes representing the converted string in
+the specified encoding. If \fIencoding\fR is not specified, the current system
+encoding is used.
+
+.VS "TCL8.7 TIP607, TIP656"
+The \fB-profile\fR and \fB-failindex\fR options have the same effect as
+described for the \fBencoding convertfrom\fR command.
+.VE "TCL8.7 TIP607, TIP656"
 .TP
 \fBencoding dirs\fR ?\fIdirectoryList\fR?
 .
@@ -121,55 +91,140 @@ are guaranteed to be present in the list.
 Set the system encoding to \fIencoding\fR. If \fIencoding\fR is
 omitted then the command returns the current system encoding.  The
 system encoding is used whenever Tcl passes strings to system calls.
-.SH EXAMPLE
+.TP
+.VS "TCL8.7 TIP656"
+\fBencoding profiles\fR
+Returns a list of the names of encoding profiles. See \fBPROFILES\fR below.
+.VE "TCL8.7 TIP656"
+\" Do not put .VS on whole section as that messes up the bullet list alignment
+.SH PROFILES
+.PP
+.VS "TCL8.7 TIP656"
+Operations involving encoding transforms may encounter several types of
+errors such as invalid sequences in the source data, characters that
+cannot be encoded in the target encoding and so on.
+A \fIprofile\fR prescribes the strategy for dealing with such errors
+in one of two ways:
+.VE "TCL8.7 TIP656"
+.
+.IP \(bu
+.VS "TCL8.7 TIP656"
+Terminating further processing of the source data. The profile does not
+determine how this premature termination is conveyed to the caller. By default,
+this is signalled by raising an exception. If the \fB-failindex\fR option
+is specified, errors are reported through that mechanism.
+.VE "TCL8.7 TIP656"
+.IP \(bu
+.VS "TCL8.7 TIP656"
+Continue further processing of the source data using a fallback strategy such
+as replacing or discarding the offending bytes in a profile-defined manner.
+.VE "TCL8.7 TIP656"
+.PP
+The following profiles are currently implemented with \fBtcl8\fR being
+the default if the \fB-profile\fR is not specified.
+.VS "TCL8.7 TIP656"
+.TP
+\fBtcl8\fR
+.
+The \fBtcl8\fR profile always follows the first strategy above and corresponds
+to the behavior of encoding transforms in Tcl 8.6. When converting from an
+external encoding \fBother than utf-8\fR to Tcl strings with the \fBencoding
+convertfrom\fR command, invalid bytes are mapped to their numerically equivalent
+code points. For example, the byte 0x80 which is invalid in ASCII would be
+mapped to code point U+0080. When converting from \fButf-8\fR, invalid bytes
+that are defined in CP1252 are mapped to their Unicode equivalents while those
+that are not fall back to the numerical equivalents. For example, byte 0x80 is
+defined by CP1252 and is therefore mapped to its Unicode equivalent U+20AC while
+byte 0x81 which is not defined by CP1252 is mapped to U+0081. As an additional
+special case, the sequence 0xC0 0x80 is mapped to U+0000.
+
+When converting from Tcl strings to an external encoding format using
+\fBencoding convertto\fR, characters that cannot be represented in the
+target encoding are replaced by an encoding-dependent character, usually
+the question mark \fB?\fR.
+.TP
+\fBstrict\fR
+.
+The \fBstrict\fR profile always stops processing when an conversion error is
+encountered. The error is signalled via an exception or the \fB-failindex\fR
+option mechanism. The \fBstrict\fR profile implements a Unicode standard
+conformant behavior.
+.TP
+\fBreplace\fR
+.
+Like the \fBtcl8\fR profile, the \fBreplace\fR profile always continues
+processing on conversion errors but follows a Unicode standard conformant
+method for error handling.
+
+When converting an encoded byte sequence to a Tcl string using
+\fBencoding convertfrom\fR, invalid bytes
+are replaced by the U+FFFD REPLACEMENT CHARACTER code point.
+
+When encoding a Tcl string with \fBencoding convertto\fR,
+code points that cannot be represented in the
+target encoding are transformed to an encoding-specific fallback character,
+U+FFFD REPLACEMENT CHARACTER for UTF targets and generally `?` for other
+encodings.
+.VE "TCL8.7 TIP656"
+.SH EXAMPLES
+.PP
+These examples use the utility proc below that prints the Unicode code points
+comprising a Tcl string.
+.PP
+.CS
+proc codepoints {s} {join [lmap c [split $s ""] {
+    string cat U+ [format %.6X [scan $c %c]]}]
+}
+.CE
 .PP
 Example 1: convert a byte sequence in Japanese euc-jp encoding to a TCL string:
 .PP
 .CS
-set s [\fBencoding convertfrom\fR euc-jp "\exA4\exCF"]
+% codepoints [\fBencoding convertfrom\fR euc-jp "\exA4\exCF"]
+U+00306F
 .CE
 .PP
-The result is the unicode codepoint:
+The result is the unicode codepoint
 .QW "\eu306F" ,
 which is the Hiragana letter HA.
-.VS "TCL8.7 TIP346, TIP607, TIP601"
+.VS "TCL8.7 TIP607, TIP656"
 .PP
-Example 2: detect the error location in an incomplete UTF-8 sequence:
+Example 2: Error handling based on profiles:
 .PP
+The letter \fBA\fR is Unicode character U+0041 and the byte "\ex80" is invalid
+in ASCII encoding.
 .CS
-% set s [\fBencoding convertfrom\fR -failindex i utf-8 "A\exC3"]
-A
-% set i
-1
-.CE
-.PP
-Example 3: return the incomplete UTF-8 sequence by raw bytes:
 .PP
-.CS
-% set s [\fBencoding convertfrom\fR -nocomplain utf-8 "A\exC3"]
+% codepoints [encoding convertfrom -profile tcl8 ascii A\ex80]
+U+000041 U+000080
+% codepoints [encoding convertfrom -profile replace ascii A\ex80]
+U+000041 U+00FFFD
+% codepoints [encoding convertfrom -profile strict ascii A\ex80]
+unexpected byte sequence starting at index 1: '\ex80'
 .CE
-The result is "A" followed by the byte \exC3.  The option \fB-nocomplain\fR
-has no effect, but assures to get the same result with TCL9.
 .PP
-Example 4: detect the error location while transforming to ISO8859-1
-(ISO-Latin 1):
+Example 3: Get partial data and the error location:
 .PP
 .CS
-% set s [\fBencoding convertto\fR -failindex i iso8859-1 "A\eu0141"]
-A
-% set i
-1
+% codepoints [encoding convertfrom -profile strict -failindex idx ascii AB\ex80]
+U+000041 U+000042
+% set idx
+2
 .CE
 .PP
-Example 5: replace a not representable character by the replacement character:
+Example 4: Encode a character that is not representable in ISO8859-1:
 .PP
 .CS
-% set s [\fBencoding convertto\fR -nocomplain iso8859-1 "A\eu0141"]
+% encoding convertto iso8859-1 A\eu0141
 A?
+% encoding convertto -profile strict iso8859-1 A\eu0141
+unexpected character at index 1: 'U+000141'
+% encoding convertto -profile strict -failindex idx iso8859-1 A\eu0141
+A
+% set idx
+1
 .CE
-The option \fB-nocomplain\fR has no effect, but assures to get the same result
-in Tcl 9.
-.VE "TCL8.7 TIP346, TIP607, TIP601"
+.VE "TCL8.7 TIP607, TIP656"
 .PP
 .SH "SEE ALSO"
 Tcl_GetEncoding(3), fconfigure(n)
diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 9061161..526c5ad 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -101,8 +101,6 @@ locale-dependent system encoding used for interfacing with the operating
 system, as returned by \fBencoding system\fR.
 .RE
 .TP
-\fB\-eofchar\fR \fIchar\fR
-.TP
 \fB\-eofchar\fR \fB{\fIchar outChar\fB}\fR
 .
 This option supports DOS file systems that use Control-z (\ex1A) as an
@@ -122,31 +120,16 @@ reading and the empty string for writing.
 The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7F;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
 generate an error.
-.VS "TCL8.7 TIP633"
+.VS "TCL8.7 TIP656"
 .TP
-\fB\-nocomplainencoding\fR \fIbool\fR
+\fB\-profile\fR \fIprofile\fR
 .
-Reporting mode of encoding errors.
-If set to a \fItrue\fR value, encoding errors are resolved by a replacement
-character (output) or verbatim bytes (input). No error is thrown.
-This is the only available mode in Tcl 8.7.
-.RS
-.PP
-Starting from TCL 9.0, this value may be set to a \fIfalse\fR value to throw errors
-in case of encoding errors.
-.RE
-.VE "TCL8.7 TIP633"
-.VS "TCL8.7 TIP346"
-.TP
-\fB\-strictencoding\fR \fIbool\fR
-.
-Activate additional stricter encoding application rules.
-Default value is \fIfalse\fR.
-.RS
-.PP
-See the \fI\-strict\fR option of the \fBencoding\fR command for more information.
-.VE "TCL8.7 TIP346"
-.RE
+Specifies the encoding profile to be used on the channel. The encoding
+transforms in use for the channel's input and output will then be subject to the
+rules of that profile. Any failures will result in a channel error. See
+\fBPROFILES\fR in the \fBencoding(n)\fR documentation for details about encoding
+profiles.
+.VE "TCL8.7 TIP656"
 .TP
 \fB\-translation\fR \fImode\fR
 .TP
@@ -303,11 +286,11 @@ set data [read $f $numDataBytes]
 close $f
 .CE
 .SH "SEE ALSO"
-close(n), flush(n), gets(n), open(n), puts(n), read(n), socket(n),
+close(n), encoding(n), flush(n), gets(n), open(n), puts(n), read(n), socket(n),
 Tcl_StandardChannels(3)
 .SH KEYWORDS
 blocking, buffering, carriage return, end of line, flushing, linemode,
-newline, nonblocking, platform, translation, encoding, filter, byte array,
+newline, nonblocking, platform, profile, translation, encoding, filter, byte array,
 binary
 '\" Local Variables:
 '\" mode: nroff
-- 
cgit v0.12


From 3129864cc27566ec6c62c86299d366812f9ce82c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 16 Mar 2023 20:12:23 +0000
Subject: If TCL_UTF_MAX=4, don't set 'exact' to 1

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

diff --git a/generic/tcl.h b/generic/tcl.h
index 7a8c8a8..82430ba 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2425,7 +2425,7 @@ const char *		TclTomMathInitializeStubs(Tcl_Interp *interp,
 # else
 #   define Tcl_InitStubs(interp, version, exact) \
 	(Tcl_InitStubs)(interp, TCL_PATCH_LEVEL, \
-	    1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
+	    (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \
 	    TCL_STUB_MAGIC)
 # endif
 #else
-- 
cgit v0.12


From 9c8a1292c0c8aba0cd2c718d12e953c86af6cd7d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 17 Mar 2023 07:57:14 +0000
Subject: Don't introduce size_t in a header-file which didn't use it before.
 Make more clear that those are unsupported internal functions.

---
 generic/tcl.decls     | 13 ++++++-------
 generic/tclDecls.h    | 12 ++++++------
 generic/tclStubInit.c | 14 ++++++++------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 7f734c6..b50f775 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2326,24 +2326,23 @@ declare 630 {
 
 # ----- BASELINE -- FOR -- 8.6.0 ----- #
 
-# TIP #481 (undocumented stub entries)
+# (unsupported in Tcl 8.6)
 declare 651 {
-    char *TclGetStringFromObj_(Tcl_Obj *objPtr, size_t *lengthPtr)
+    char *TclGetStringFromObj_(Tcl_Obj *objPtr, void *lengthPtr)
 }
 declare 652 {
-    unsigned short *TclGetUnicodeFromObj_(Tcl_Obj *objPtr, size_t *lengthPtr)
+    unsigned short *TclGetUnicodeFromObj_(Tcl_Obj *objPtr, void *lengthPtr)
 }
-# Only available in Tcl 8.x, NULL in Tcl 9.0
 declare 653 {
-    unsigned char *TclGetByteArrayFromObj_(Tcl_Obj *objPtr, size_t *numBytesPtr)
+    unsigned char *TclGetByteArrayFromObj_(Tcl_Obj *objPtr, void *numBytesPtr)
 }
 
+# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
+
 declare 687 {
     void TclUnusedStubEntry(void)
 }
 
-# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
-
 ##############################################################################
 
 # Define the platform specific public Tcl interface. These functions are only
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 551a5b6..078974c 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1837,13 +1837,13 @@ EXTERN void		Tcl_ZlibStreamSetCompressionDictionary(
 /* Slot 650 is reserved */
 /* 651 */
 EXTERN char *		TclGetStringFromObj_(Tcl_Obj *objPtr,
-				size_t *lengthPtr);
+				void *lengthPtr);
 /* 652 */
 EXTERN unsigned short *	 TclGetUnicodeFromObj_(Tcl_Obj *objPtr,
-				size_t *lengthPtr);
+				void *lengthPtr);
 /* 653 */
 EXTERN unsigned char *	TclGetByteArrayFromObj_(Tcl_Obj *objPtr,
-				size_t *numBytesPtr);
+				void *numBytesPtr);
 /* Slot 654 is reserved */
 /* Slot 655 is reserved */
 /* Slot 656 is reserved */
@@ -2565,9 +2565,9 @@ typedef struct TclStubs {
     void (*reserved648)(void);
     void (*reserved649)(void);
     void (*reserved650)(void);
-    char * (*tclGetStringFromObj_) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */
-    unsigned short * (*tclGetUnicodeFromObj_) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */
-    unsigned char * (*tclGetByteArrayFromObj_) (Tcl_Obj *objPtr, size_t *numBytesPtr); /* 653 */
+    char * (*tclGetStringFromObj_) (Tcl_Obj *objPtr, void *lengthPtr); /* 651 */
+    unsigned short * (*tclGetUnicodeFromObj_) (Tcl_Obj *objPtr, void *lengthPtr); /* 652 */
+    unsigned char * (*tclGetByteArrayFromObj_) (Tcl_Obj *objPtr, void *numBytesPtr); /* 653 */
     void (*reserved654)(void);
     void (*reserved655)(void);
     void (*reserved656)(void);
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 565dd8c..ff3a099 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -139,15 +139,17 @@ static const char *TclGetStartupScriptFileName(void)
     return Tcl_GetString(path);
 }
 
+# (unsupported in Tcl 8.6)
+
 #define TclGetStringFromObj_ getStringFromObj
 static char *
 TclGetStringFromObj_(
     Tcl_Obj *objPtr,
-    size_t *lengthPtr)
+    void *lengthPtr)
 {
     int length;
     char *result = Tcl_GetStringFromObj(objPtr, &length);
-    *lengthPtr = (size_t)length;
+    *(size_t *)lengthPtr = (size_t)length;
     return result;
 }
 
@@ -155,11 +157,11 @@ TclGetStringFromObj_(
 static unsigned short *
 TclGetUnicodeFromObj_(
     Tcl_Obj *objPtr,
-    size_t *lengthPtr)
+    void *lengthPtr)
 {
     int length;
     Tcl_UniChar *result = Tcl_GetUnicodeFromObj(objPtr, &length);
-    *lengthPtr = (size_t)length;
+    *(size_t *)lengthPtr = (size_t)length;
     return result;
 }
 
@@ -167,11 +169,11 @@ TclGetUnicodeFromObj_(
 static unsigned char *
 TclGetByteArrayFromObj_(
     Tcl_Obj *objPtr,
-    size_t *numBytesPtr)
+    void *numBytesPtr)
 {
     int numBytes;
     unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &numBytes);
-    *numBytesPtr = (size_t)numBytes;
+    *(size_t *)numBytesPtr = (size_t)numBytes;
     return result;
 }
 
-- 
cgit v0.12


From 4aa63fcc254f450717aba4c135f87fedcfdd38cc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 17 Mar 2023 08:24:59 +0000
Subject: Don't return from a void function

---
 generic/tclStubInit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index ff3a099..1ef7f17 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -187,7 +187,7 @@ static unsigned short TclWinNToHS(unsigned short ns) {
 #define TclWinConvertError_ winConvertError
 static void
 TclWinConvertError_(unsigned errCode) {
-    return TclWinConvertError(errCode);
+    TclWinConvertError(errCode);
 }
 
 #endif
-- 
cgit v0.12


From 87b64566847ce5fda7292ec8b2d2de3739e7e680 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 17 Mar 2023 12:35:51 +0000
Subject: unbreak the build

---
 generic/tclStubInit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 1ef7f17..c504586 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -139,7 +139,7 @@ static const char *TclGetStartupScriptFileName(void)
     return Tcl_GetString(path);
 }
 
-# (unsupported in Tcl 8.6)
+/* (unsupported in Tcl 8.6) */
 
 #define TclGetStringFromObj_ getStringFromObj
 static char *
-- 
cgit v0.12


From 13b1529c7b6f4da55532170ee08ac047581b6300 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 17 Mar 2023 14:22:44 +0000
Subject: Clean up after events to avoid errors in later tests that use an
 event loop.

---
 tests/ioTrans.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 3a23e61..44e7d64 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -643,6 +643,9 @@ namespace eval reflector {
 
 
     proc finalize {_ chan} {
+	foreach id [after info] {
+	    after cancel $id
+	}
 	namespace delete $_
     }
 
-- 
cgit v0.12


From e9ccf557eb23f66c28210e967e344a61fef2ed58 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 17 Mar 2023 16:12:23 +0000
Subject: Fix [6390566ecd]: Testcase cmdAH-4.3.13.00DC0000.tail.utf-32.tcl8.a
 fails sometimes

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

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index f15b479..5a89644 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2635,9 +2635,12 @@ Utf32ToUtfProc(
 	 * unsigned short-size data.
 	 */
 
-	if ((ch > 0) && (ch < 0x80)) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (ch & 0xFF);
 	} else {
+	    if (((prev  & ~0x3FF) != 0xD800) && ((ch  & ~0x3FF) == 0xDC00)) {
+		*dst = 0; /* In case of lower surrogate, don't try to combine */
+	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
 	src += sizeof(unsigned int);
@@ -2856,7 +2859,7 @@ Utf16ToUtfProc(
 	}
 	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
 	    if (((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
-		result = TCL_CONVERT_UNKNOWN;
+		result = TCL_CONVERT_SYNTAX;
 		src -= 2; /* Go back to beginning of high surrogate */
 		dst--; /* Also undo writing a single byte too much */
 		numChars--;
@@ -2877,7 +2880,7 @@ Utf16ToUtfProc(
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else if (((ch  & ~0x3FF) == 0xDC00) && ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT)) {
 	    /* Lo surrogate not preceded by Hi surrogate */
-	    result = TCL_CONVERT_UNKNOWN;
+	    result = TCL_CONVERT_SYNTAX;
 	    break;
 	} else {
 	    *dst = 0; /* In case of lower surrogate, don't try to combine */
@@ -2888,7 +2891,7 @@ Utf16ToUtfProc(
 
     if ((ch  & ~0x3FF) == 0xD800) {
 	if ((flags & TCL_ENCODING_STRICT) == TCL_ENCODING_STRICT) {
-	    result = TCL_CONVERT_UNKNOWN;
+	    result = TCL_CONVERT_SYNTAX;
 	    src -= 2;
 	    dst--;
 	    numChars--;
-- 
cgit v0.12


From 453c27a88e9da3cb50fefe2c4a5fb7a7d09b8afc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 17 Mar 2023 20:04:48 +0000
Subject: arm64e -> arm64, since arm64e is not available yet on MacOS (Thanks
 to Stefan Sobernig)

---
 unix/configure | 24 ++++++++++++------------
 unix/tcl.m4    | 16 ++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/unix/configure b/unix/configure
index 2ebb2ea..16210e6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7669,15 +7669,15 @@ echo "${ECHO_T}$tcl_cv_cc_arch_x86_64" >&6
 
 fi
 ;;
-		    arm64|arm64e)
-			echo "$as_me:$LINENO: checking if compiler accepts -arch arm64e flag" >&5
-echo $ECHO_N "checking if compiler accepts -arch arm64e flag... $ECHO_C" >&6
-if test "${tcl_cv_cc_arch_arm64e+set}" = set; then
+		    arm64)
+			echo "$as_me:$LINENO: checking if compiler accepts -arch arm64 flag" >&5
+echo $ECHO_N "checking if compiler accepts -arch arm64 flag... $ECHO_C" >&6
+if test "${tcl_cv_cc_arch_arm64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 			    hold_cflags=$CFLAGS
-			    CFLAGS="$CFLAGS -arch arm64e"
+			    CFLAGS="$CFLAGS -arch arm64"
 			    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7715,22 +7715,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  tcl_cv_cc_arch_arm64e=yes
+  tcl_cv_cc_arch_arm64=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-tcl_cv_cc_arch_arm64e=no
+tcl_cv_cc_arch_arm64=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 			    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_arm64e" >&5
-echo "${ECHO_T}$tcl_cv_cc_arch_arm64e" >&6
-			if test $tcl_cv_cc_arch_arm64e = yes; then
+echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_arm64" >&5
+echo "${ECHO_T}$tcl_cv_cc_arch_arm64" >&6
+			if test $tcl_cv_cc_arch_arm64 = yes; then
 
-			    CFLAGS="$CFLAGS -arch arm64e"
+			    CFLAGS="$CFLAGS -arch arm64"
 			    do64bit_ok=yes
 
 fi
@@ -7743,7 +7743,7 @@ echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&
 else
 
 		# Check for combined 32-bit and 64-bit fat build
-		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64e) ' \
+		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64) ' \
 		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '; then
 
 		    fat_32_64=yes
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index d9d0a71..0ef9f3d 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1541,16 +1541,16 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 			    CFLAGS="$CFLAGS -arch x86_64"
 			    do64bit_ok=yes
 			]);;
-		    arm64|arm64e)
-			AC_CACHE_CHECK([if compiler accepts -arch arm64e flag],
-				tcl_cv_cc_arch_arm64e, [
+		    arm64)
+			AC_CACHE_CHECK([if compiler accepts -arch arm64 flag],
+				tcl_cv_cc_arch_arm64, [
 			    hold_cflags=$CFLAGS
-			    CFLAGS="$CFLAGS -arch arm64e"
+			    CFLAGS="$CFLAGS -arch arm64"
 			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-				    [tcl_cv_cc_arch_arm64e=yes],[tcl_cv_cc_arch_arm64e=no])
+				    [tcl_cv_cc_arch_arm64=yes],[tcl_cv_cc_arch_arm64=no])
 			    CFLAGS=$hold_cflags])
-			AS_IF([test $tcl_cv_cc_arch_arm64e = yes], [
-			    CFLAGS="$CFLAGS -arch arm64e"
+			AS_IF([test $tcl_cv_cc_arch_arm64 = yes], [
+			    CFLAGS="$CFLAGS -arch arm64"
 			    do64bit_ok=yes
 			]);;
 		    *)
@@ -1558,7 +1558,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		esac
 	    ], [
 		# Check for combined 32-bit and 64-bit fat build
-		AS_IF([echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64e) ' \
+		AS_IF([echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64) ' \
 		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '], [
 		    fat_32_64=yes])
 	    ])
-- 
cgit v0.12


From bdad96ab6988802901289f1b4d1f366a2002f023 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 17 Mar 2023 20:10:29 +0000
Subject: Few more arm64e -> arm64

---
 macosx/Tcl.xcodeproj/project.pbxproj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 4143128..68b9418 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -2132,7 +2132,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
 			};
@@ -2517,7 +2517,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				GCC_VERSION = 4.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
@@ -2555,7 +2555,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC = "llvm-gcc";
 				GCC_OPTIMIZATION_LEVEL = 4;
@@ -2695,7 +2695,7 @@
 				ARCHS = (
 					"$(NATIVE_ARCH_64_BIT)",
 				);
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC = clang;
 				GCC_OPTIMIZATION_LEVEL = 4;
@@ -2762,7 +2762,7 @@
 			baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+				CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
 				CPPFLAGS = "-isysroot $(SDKROOT) $(CPPFLAGS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PREBINDING = NO;
-- 
cgit v0.12


From 5fbaf44ecf9e3c77c88088e83c53b51cd8af05db Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 18 Mar 2023 08:42:39 +0000
Subject: Manpage fixes

---
 doc/Encoding.3   | 10 ++++------
 doc/encoding.n   |  2 +-
 doc/fconfigure.n |  6 ++++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 76ea193..7453549 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -8,7 +8,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_GetEncoding, Tcl_FreeEncoding, Tcl_GetEncodingFromObj, Tcl_ExternalToUtfDString, Tcl_UtfToExternalDStringEx, Tcl_ExternalToUtf, Tcl_UtfToExternalDString, Tcl_UtfToExternalDStringEx, Tcl_UtfToExternal, Tcl_GetEncodingName, Tcl_SetSystemEncoding, Tcl_GetEncodingNameFromEnvironment, Tcl_GetEncodingNames, Tcl_CreateEncoding, Tcl_GetEncodingSearchPath, Tcl_SetEncodingSearchPath, Tcl_GetDefaultEncodingDir, Tcl_SetDefaultEncodingDir \- procedures for creating and using encodings
+Tcl_GetEncoding, Tcl_FreeEncoding, Tcl_GetEncodingFromObj, Tcl_ExternalToUtfDString, Tcl_ExternalToUtfDStringEx, Tcl_ExternalToUtf, Tcl_UtfToExternalDString, Tcl_UtfToExternalDStringEx, Tcl_UtfToExternal, Tcl_GetEncodingName, Tcl_SetSystemEncoding, Tcl_GetEncodingNameFromEnvironment, Tcl_GetEncodingNames, Tcl_CreateEncoding, Tcl_GetEncodingSearchPath, Tcl_SetEncodingSearchPath, Tcl_GetDefaultEncodingDir, Tcl_SetDefaultEncodingDir \- procedures for creating and using encodings
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -223,7 +223,6 @@ call \fBTcl_DStringFree\fR to free any information stored in \fIdstPtr\fR.
 When converting, if any of the characters in the source buffer cannot be
 represented in the target encoding, a default fallback character will be
 used.  The return value is a pointer to the value stored in the DString.
-
 .PP
 \fBTcl_ExternalToUtfDStringEx\fR is a more flexible version of older
 \fBTcl_ExternalToUtfDString\fR function. It takes three additional parameters,
@@ -235,7 +234,7 @@ into the function. On success, the function returns \fBTCL_ERROR\fR with the
 converted string stored in \fB*dstPtr\fR. For errors other than conversion
 errors, such as invalid flags, the function returns \fBTCL_OK\fR with an error
 message in \fBinterp\fR if it is not NULL.
-
+.PP
 For conversion errors, \fBTcl_ExternalToUtfDStringEx\fR returns one
 of the \fBTCL_CONVERT_*\fR errors listed below for \fBTcl_ExternalToUtf\fR.
 When one of these conversion errors is returned, an error message is
@@ -243,10 +242,9 @@ stored in \fBinterp\fR only if \fBerrorIdxPtr\fR is NULL. Otherwise, no error me
 is stored as the function expects the caller is interested whatever is
 decoded to that point and not treating this as an immediate error condition.
 The index of the error location is stored in \fB*errorIdxPtr\fR.
-
+.PP
 The caller must call \fBTcl_DStringFree\fR to free up the \fB*dstPtr\fR resources
 irrespective of the return value from the function.
-
 .PP
 \fBTcl_ExternalToUtf\fR converts a source buffer \fIsrc\fR from the specified
 \fIencoding\fR into UTF-8.  Up to \fIsrcLen\fR bytes are converted from the
@@ -626,7 +624,7 @@ with at most one of \fBTCL_ENCODING_PROFILE_TCL8\fR,
 These correspond to the \fBtcl8\fR, \fBstrict\fR and \fBreplace\fR profiles
 respectively. If none are specified, a version-dependent default profile is used.
 For Tcl 8.7, the default profile is \fBtcl8\fR.
-
+.PP
 For details about profiles, see the \fBPROFILES\fR section in
 the documentation of the \fBencoding\fR command.
 .SH "SEE ALSO"
diff --git a/doc/encoding.n b/doc/encoding.n
index 7266311..8ede974 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -85,8 +85,8 @@ The encodings
 and
 .QW iso8859-1
 are guaranteed to be present in the list.
-.TP
 .VS "TCL8.7 TIP656"
+.TP
 \fBencoding profiles\fR
 Returns a list of the names of encoding profiles. See \fBPROFILES\fR below.
 .VE "TCL8.7 TIP656"
diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 526c5ad..3de22eb 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -101,6 +101,8 @@ locale-dependent system encoding used for interfacing with the operating
 system, as returned by \fBencoding system\fR.
 .RE
 .TP
+\fB\-eofchar\fR \fIchar\fR
+.TP
 \fB\-eofchar\fR \fB{\fIchar outChar\fB}\fR
 .
 This option supports DOS file systems that use Control-z (\ex1A) as an
@@ -111,8 +113,8 @@ If \fIchar\fR is the empty string, then there is no special end of file
 character marker.  For read-write channels, a two-element list specifies
 the end of file marker for input and output, respectively.  As a
 convenience, when setting the end-of-file character for a read-write
-channel you can specify a single value that will apply to both reading
-and writing.  When querying the end-of-file character of a read-write
+channel you can specify a single value that will apply to reading
+only.  When querying the end-of-file character of a read-write
 channel, a two-element list will always be returned.  The default value
 for \fB\-eofchar\fR is the empty string in all cases except for files
 under Windows.  In that case the \fB\-eofchar\fR is Control-z (\ex1A) for
-- 
cgit v0.12


From 278b807336757abd553f464b172b6d751f92b3c9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 18 Mar 2023 08:50:34 +0000
Subject: Make "tcltest" package use "-profile tcl8" internally, irrespective
 of what the default profile is

---
 library/tcltest/tcltest.tcl | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index dbe1eae..278a4e0 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -400,7 +400,7 @@ namespace eval tcltest {
 	    default {
 		set outputChannel [open $filename a]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $outputChannel -encoding utf-8
+		    fconfigure $outputChannel -profile tcl8 -encoding utf-8
 		}
 		set ChannelsWeOpened($outputChannel) 1
 
@@ -447,7 +447,7 @@ namespace eval tcltest {
 	    default {
 		set errorChannel [open $filename a]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $errorChannel -encoding utf-8
+		    fconfigure $errorChannel -profile tcl8 -encoding utf-8
 		}
 		set ChannelsWeOpened($errorChannel) 1
 
@@ -792,7 +792,7 @@ namespace eval tcltest {
 	if {$Option(-loadfile) eq {}} {return}
 	set tmp [open $Option(-loadfile) r]
 	if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	    fconfigure $tmp -encoding utf-8
+	    fconfigure $tmp -profile tcl8 -encoding utf-8
 	}
 	loadScript [read $tmp]
 	close $tmp
@@ -1372,7 +1372,7 @@ proc tcltest::DefineConstraintInitializers {} {
 	set code 0
 	if {![catch {set f [open "|[list [interpreter]]" w]}]} {
 	    if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		fconfigure $f -encoding utf-8
+		fconfigure $f -profile tcl8 -encoding utf-8
 	    }
 	    if {![catch {puts $f exit}]} {
 		if {![catch {close $f}]} {
@@ -2222,7 +2222,7 @@ proc tcltest::test {name description args} {
 	    if {[file readable $testFile]} {
 		set testFd [open $testFile r]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $testFd -encoding utf-8
+		    fconfigure $testFd -profile tcl8 -encoding utf-8
 		}
 		set testLine [expr {[lsearch -regexp \
 			[split [read $testFd] "\n"] \
@@ -2253,7 +2253,11 @@ proc tcltest::test {name description args} {
 	if {$scriptCompare} {
 	    puts [outputChannel] "---- Error testing result: $scriptMatch"
 	} else {
-	    puts [outputChannel] "---- Result was:\n[Asciify $actualAnswer]"
+	    if {[catch {
+		puts [outputChannel] "---- Result was:\n[Asciify $actualAnswer]"
+	    } errMsg]} {
+		puts [outputChannel] "\n---- Result was:\n<error printing result: $errMsg>"
+	    }
 	    puts [outputChannel] "---- Result should have been\
 		    ($match matching):\n[Asciify $result]"
 	}
@@ -2933,7 +2937,7 @@ proc tcltest::runAllTests { {shell ""} } {
 		incr numTestFiles
 		set pipeFd [open $cmd "r"]
 		if {[package vsatisfies [package provide Tcl] 8.7-]} {
-		    fconfigure $pipeFd -encoding utf-8
+		    fconfigure $pipeFd -profile tcl8 -encoding utf-8
 		}
 		while {[gets $pipeFd line] >= 0} {
 		    if {[regexp [join {
@@ -3133,7 +3137,7 @@ proc tcltest::makeFile {contents name {directory ""}} {
     set fd [open $fullName w]
     fconfigure $fd -translation lf
     if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	fconfigure $fd -encoding utf-8
+	fconfigure $fd -profile tcl8 -encoding utf-8
     }
     if {[string index $contents end] eq "\n"} {
 	puts -nonewline $fd $contents
@@ -3284,7 +3288,7 @@ proc tcltest::viewFile {name {directory ""}} {
     set fullName [file join $directory $name]
     set f [open $fullName]
     if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	fconfigure $f -encoding utf-8
+	fconfigure $f -profile tcl8 -encoding utf-8
     }
     set data [read -nonewline $f]
     close $f
-- 
cgit v0.12


From 5e2a39d6265fa8f5f2931a5823910a6c6cc002ae Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 18 Mar 2023 09:02:15 +0000
Subject: Make http package use "-profile tcl8", irrespective of the default
 profile in Tcl, until decided differently

---
 library/http/http.tcl | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 1f476f3..4ef6c73 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1746,6 +1746,9 @@ proc http::OpenSocket {token DoLater} {
 	    }
 	    fconfigure $sock -translation {auto crlf} \
 			     -buffersize $state(-blocksize)
+	    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+		fconfigure $sock -profile tcl8 \
+	    }
 	    ##Log socket opened, DONE fconfigure - token $token
         }
 
@@ -2164,6 +2167,9 @@ proc http::Connected {token proto phost srvurl} {
     lassign [fconfigure $sock -translation] trRead trWrite
     fconfigure $sock -translation [list $trRead crlf] \
 		     -buffersize $state(-blocksize)
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	fconfigure $sock -profile tcl8 \
+    }
 
     # The following is disallowed in safe interpreters, but the socket is
     # already in non-blocking mode in that case.
@@ -2554,6 +2560,9 @@ proc http::ReceiveResponse {token} {
     lassign [fconfigure $sock -translation] trRead trWrite
     fconfigure $sock -translation [list auto $trWrite] \
 		     -buffersize $state(-blocksize)
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	fconfigure $sock -profile tcl8 \
+    }
     Log ^D$tk begin receiving response - token $token
 
     coroutine ${token}--EventCoroutine http::Event $sock $token
@@ -4545,7 +4554,11 @@ proc http::Eot {token {reason {}}} {
 
 	    set enc [CharsetToEncoding $state(charset)]
 	    if {$enc ne "binary"} {
-		set state(body) [encoding convertfrom $enc $state(body)]
+		if {[package vsatisfies [package provide Tcl] 9.0-]} {
+		    set state(body) [encoding convertfrom -profile tcl8 $enc $state(body)]
+		} else {
+		    set state(body) [encoding convertfrom $enc $state(body)]
+		}
 	    }
 
 	    # Translate text line endings.
@@ -4628,7 +4641,11 @@ proc http::GuessType {token} {
     if {$enc eq "binary"} {
         return 0
     }
-    set state(body) [encoding convertfrom $enc $state(body)]
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	set state(body) [encoding convertfrom -profile tcl8 $enc $state(body)]
+    } else {
+	set state(body) [encoding convertfrom -profile tcl8 $enc $state(body)]
+    }
     set state(body) [string map {\r\n \n \r \n} $state(body)]
     set state(type) application/xml
     set state(binary) 0
@@ -4709,7 +4726,11 @@ proc http::quoteString {string} {
     # a pre-computed map and [string map] to do the conversion (much faster
     # than [regsub]/[subst]). [Bug 1020491]
 
-    set string [encoding convertto $http(-urlencoding) $string]
+    if {[package vsatisfies [package provide Tcl] 9.0-]} {
+	set string [encoding convertto -profile tcl8 $http(-urlencoding) $string]
+    } else {
+	set string [encoding convertto $http(-urlencoding) $string]
+    }
     return [string map $formMap $string]
 }
 
-- 
cgit v0.12


From 7834acd2e42f731cb81a37176d8c8cbc371e43f0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 18 Mar 2023 09:07:20 +0000
Subject: one too much "-profile tcl8"

---
 library/http/http.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index 4ef6c73..c0f6e5d 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -4644,7 +4644,7 @@ proc http::GuessType {token} {
     if {[package vsatisfies [package provide Tcl] 9.0-]} {
 	set state(body) [encoding convertfrom -profile tcl8 $enc $state(body)]
     } else {
-	set state(body) [encoding convertfrom -profile tcl8 $enc $state(body)]
+	set state(body) [encoding convertfrom $enc $state(body)]
     }
     set state(body) [string map {\r\n \n \r \n} $state(body)]
     set state(type) application/xml
-- 
cgit v0.12


From 291ff6db1bd984a81e33e093fce433f8a4967f33 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 19 Mar 2023 11:44:38 +0000
Subject: Remove unneeded backslash

---
 library/http/http.tcl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/http/http.tcl b/library/http/http.tcl
index c0f6e5d..79f876a 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1747,7 +1747,7 @@ proc http::OpenSocket {token DoLater} {
 	    fconfigure $sock -translation {auto crlf} \
 			     -buffersize $state(-blocksize)
 	    if {[package vsatisfies [package provide Tcl] 9.0-]} {
-		fconfigure $sock -profile tcl8 \
+		fconfigure $sock -profile tcl8
 	    }
 	    ##Log socket opened, DONE fconfigure - token $token
         }
@@ -2168,7 +2168,7 @@ proc http::Connected {token proto phost srvurl} {
     fconfigure $sock -translation [list $trRead crlf] \
 		     -buffersize $state(-blocksize)
     if {[package vsatisfies [package provide Tcl] 9.0-]} {
-	fconfigure $sock -profile tcl8 \
+	fconfigure $sock -profile tcl8
     }
 
     # The following is disallowed in safe interpreters, but the socket is
@@ -2561,7 +2561,7 @@ proc http::ReceiveResponse {token} {
     fconfigure $sock -translation [list auto $trWrite] \
 		     -buffersize $state(-blocksize)
     if {[package vsatisfies [package provide Tcl] 9.0-]} {
-	fconfigure $sock -profile tcl8 \
+	fconfigure $sock -profile tcl8
     }
     Log ^D$tk begin receiving response - token $token
 
-- 
cgit v0.12


From 800d78f04d79def339bde5edb9042b6288524460 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 19 Mar 2023 11:56:58 +0000
Subject: Don't let httpd11 depend on the system encoding any more: All text
 files are now stored in utf-8.

---
 tests/httpd11.tcl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/httpd11.tcl b/tests/httpd11.tcl
index b605005..e97f403 100644
--- a/tests/httpd11.tcl
+++ b/tests/httpd11.tcl
@@ -150,7 +150,11 @@ proc Service {chan addr port} {
         if {[file exists $path] && [file isfile $path]} {
             foreach {what type} [mime-type $path] break
             set f [open $path r]
-            if {$what eq "binary"} {chan configure $f -translation binary}
+            if {$what eq "binary"} {
+                chan configure $f -translation binary}
+            } else {
+                chan configure $f -encoding utf-8}
+            }
             set data [read $f]
             close $f
             set code "200 OK"
-- 
cgit v0.12


From 2d9a47cff10b0ed3a76254dbeb03b5ec987170f4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 19 Mar 2023 21:51:50 +0000
Subject: Possible fix for [d7fd37ebd9]: handling leftover prefix in table
 encoding

---
 generic/tclEncoding.c | 30 +++++++++++++++++-------------
 tests/chanio.test     |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 0478519..69b7b6c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3413,18 +3413,22 @@ TableToUtfProc(
 	if (prefixBytes[byte]) {
 	    src++;
 	    if (src >= srcEnd) {
-		/*
-		 * TODO - this is broken. For consistency with other
-		 * decoders, an error should be raised only if strict.
-		 * However, doing that check cause a whole bunch of test
-		 * failures. Need to verify if those tests are in fact
-		 * correct.
-		 */
-		src--;
-		result = TCL_CONVERT_MULTIBYTE;
-		break;
+		if (!(flags & TCL_ENCODING_END)) {
+		    src--;
+		    result = TCL_CONVERT_MULTIBYTE;
+		    break;
+		} else if (PROFILE_STRICT(flags)) {
+		    src--;
+		    result = TCL_CONVERT_SYNTAX;
+		    break;
+		} else if (PROFILE_REPLACE(flags)) {
+		    ch = UNICODE_REPLACE_CHAR;
+		} else {
+		    ch = (Tcl_UniChar)byte;
+		}
+	    } else {
+		ch = toUnicode[byte][*((unsigned char *)src)];
 	    }
-	    ch = toUnicode[byte][*((unsigned char *)src)];
 	} else {
 	    ch = pageZero[byte];
 	}
@@ -3447,7 +3451,7 @@ TableToUtfProc(
 	 * Special case for 1-byte utf chars for speed.
 	 */
 
-	if (ch && ch < 0x80) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (char) ch;
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
@@ -3648,7 +3652,7 @@ Iso88591ToUtfProc(
 	 * Special case for 1-byte utf chars for speed.
 	 */
 
-	if (ch && ch < 0x80) {
+	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (char) ch;
 	} else {
 	    dst += Tcl_UniCharToUtf(ch, dst);
diff --git a/tests/chanio.test b/tests/chanio.test
index d2008e6..7221141 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -1104,7 +1104,7 @@ test chan-io-7.3 {FilterInputBytes: split up character at EOF} -setup {
     lappend x [chan gets $f line] $line
 } -cleanup {
     chan close $f
-} -result [list 15 "1234567890123０１" 18 0 1 -1 ""]
+} -result [list 16 "1234567890123０１\x82" 18 0 1 -1 ""]
 test chan-io-7.4 {FilterInputBytes: recover from split up character} -setup {
     variable x ""
 } -constraints {stdio fileevent} -body {
-- 
cgit v0.12


From 75664c655d15e9308cf62fcdaee3bed1c4545c63 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 20 Mar 2023 02:36:36 +0000
Subject: Fix http11 test hang caused by trailing brace in previous commit

---
 tests/httpd11.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/httpd11.tcl b/tests/httpd11.tcl
index e97f403..9e0edcd 100644
--- a/tests/httpd11.tcl
+++ b/tests/httpd11.tcl
@@ -151,9 +151,9 @@ proc Service {chan addr port} {
             foreach {what type} [mime-type $path] break
             set f [open $path r]
             if {$what eq "binary"} {
-                chan configure $f -translation binary}
+                chan configure $f -translation binary
             } else {
-                chan configure $f -encoding utf-8}
+                chan configure $f -encoding utf-8
             }
             set data [read $f]
             close $f
-- 
cgit v0.12


From b273a9c1d4c036fce56101f8723037d491d6618f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Mar 2023 11:40:25 +0000
Subject: Use TclNewIndexObj() in stead of Tcl_NewWideIntObj(), which -
 actually - does the same but better for debugging.

---
 generic/tclCmdAH.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index ff0d00f..6c46c8e 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -720,13 +720,14 @@ EncodingConvertfromObjCmd(
      * data as was converted.
      */
     if (failVarObj) {
-	/* I hope, wide int will cover Tcl_Size data type */
+	Tcl_Obj *failIndex;
+	TclNewIndexObj(failIndex, errorLocation);
 	if (Tcl_ObjSetVar2(interp,
 			   failVarObj,
 			   NULL,
-			   Tcl_NewWideIntObj(errorLocation),
+			   failIndex,
 			   TCL_LEAVE_ERR_MSG) == NULL) {
-            Tcl_DStringFree(&ds);
+	    Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
     }
@@ -816,13 +817,14 @@ EncodingConverttoObjCmd(
      * data as was converted.
      */
     if (failVarObj) {
-	/* I hope, wide int will cover Tcl_Size data type */
+	Tcl_Obj *failIndex;
+	TclNewIndexObj(failIndex, errorLocation);
 	if (Tcl_ObjSetVar2(interp,
 			   failVarObj,
 			   NULL,
-			   Tcl_NewWideIntObj(errorLocation),
+			   failIndex,
 			   TCL_LEAVE_ERR_MSG) == NULL) {
-            Tcl_DStringFree(&ds);
+	    Tcl_DStringFree(&ds);
 	    return TCL_ERROR;
 	}
     }
@@ -2952,7 +2954,7 @@ EachloopCmd(
 		result = TCL_ERROR;
 		goto done;
 	    }
-	    /* Don't compute values here, wait until the last momement */
+	    /* Don't compute values here, wait until the last moment */
 	    statePtr->argcList[i] = TclArithSeriesObjLength(statePtr->aCopyList[i]);
 	} else {
 	    /* List values */
-- 
cgit v0.12


From 5319a7d93f431d1921f3c93112027d79e43b988a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Mar 2023 14:18:47 +0000
Subject: Fix [bdcb5126c0]: Failed assertion in test chan-io-7.3

---
 generic/tclEncoding.c | 3 ++-
 tests/chanio.test     | 2 +-
 tests/io.test         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 35b74c7..93e4171 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3424,7 +3424,8 @@ TableToUtfProc(
 		} else if (PROFILE_REPLACE(flags)) {
 		    ch = UNICODE_REPLACE_CHAR;
 		} else {
-		    numChars++; /* Silently consume */
+		    src--; /* See bug [bdcb5126c0] */
+		    result = TCL_CONVERT_MULTIBYTE;
 		    break;
 		}
 	    } else {
diff --git a/tests/chanio.test b/tests/chanio.test
index b73e681..d2008e6 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -1104,7 +1104,7 @@ test chan-io-7.3 {FilterInputBytes: split up character at EOF} -setup {
     lappend x [chan gets $f line] $line
 } -cleanup {
     chan close $f
-} -result [list 15 "1234567890123０１" 17 1 1 -1 ""]
+} -result [list 15 "1234567890123０１" 18 0 1 -1 ""]
 test chan-io-7.4 {FilterInputBytes: recover from split up character} -setup {
     variable x ""
 } -constraints {stdio fileevent} -body {
diff --git a/tests/io.test b/tests/io.test
index eb4abbd..c3c0cdd 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -1136,7 +1136,7 @@ test io-7.3 {FilterInputBytes: split up character at EOF} {testchannel} {
     lappend x [gets $f line] $line
     close $f
     set x
-} [list 15 "1234567890123０１" 17 1 1 -1 ""]
+} [list 15 "1234567890123０１" 18 0 1 -1 ""]
 test io-7.4 {FilterInputBytes: recover from split up character} {stdio fileevent} {
     set f [open "|[list [interpreter] $path(cat)]" w+]
     fconfigure $f -encoding binary -buffering none
-- 
cgit v0.12


From 8133df3b6d12fd4fa798c7917979517d34f97996 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 20 Mar 2023 16:39:06 +0000
Subject: Duplicate test name

---
 tests/ioCmd.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index aeb9f87..61b3bdd 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -390,7 +390,7 @@ test iocmd-8.22 {fconfigure command / -nocomplainencoding 0, no error if -strict
 } -result 0
 
 
-test iocmd-8.21 {fconfigure -profile badprofile} -body {
+test iocmd-8.23 {fconfigure -profile badprofile} -body {
     fconfigure stdin -profile froboz
 } -returnCodes error -result {bad profile name "froboz": must be replace, strict, or tcl8}
 
-- 
cgit v0.12


From 88f18252321544193f8c2aae0eb23f43da96968b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 20 Mar 2023 18:45:28 +0000
Subject: Candidate fix for [f3cb2a32d6] Add initialization to allocation of
 string rep buffer to resolve valgrind reports on use of uninitialized memory

---
 generic/tclStringObj.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 328e410..322aed5 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -339,6 +339,7 @@ GrowStringBuffer(
     }
     objPtr->bytes = ptr;
     stringPtr->allocated = attempt;
+    memset(ptr + objPtr->length, 0, attempt + 1U - objPtr->length);
 }
 
 static void
-- 
cgit v0.12


From 4ea926a40b6c03000b32b4765503b75a3909dbc0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Mar 2023 22:53:33 +0000
Subject: Proposed fix for [154ed7ce56]: Tcl 9: [gets] on -strictencoding 1
 configured channel. Extracted from TIP #657 branch (better keeping bug-fix
 separate from enhancements)

---
 generic/tclIO.c | 26 +++++++++++++++++++-------
 generic/tclIO.h |  2 --
 tests/io.test   | 20 ++++++++++++++++++--
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 3f7fe86..9944787 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -4914,6 +4914,19 @@ Tcl_GetsObj(
 		goto done;
 	    }
 	    goto gotEOL;
+	} else if (gs.bytesWrote == 0
+		&& GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
+		&& !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
+	    /* Set eol to the position that caused the encoding error, and then
+	     * coninue to gotEOL, which stores the data that was decoded
+	     * without error to objPtr.  This allows the caller to do something
+	     * useful with the data decoded so far, and also results in the
+	     * position of the file being the first byte that was not
+	     * succesfully decoded, allowing further processing at exactly that
+	     * point, if desired.
+	     */
+	    eol = dstEnd;
+	    goto gotEOL;
 	}
 	dst = dstEnd;
     }
@@ -5030,6 +5043,11 @@ Tcl_GetsObj(
     }
     UpdateInterest(chanPtr);
     TclChannelRelease((Tcl_Channel)chanPtr);
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR) &&
+	    (copiedTotal == 0 || !GotFlag(statePtr, CHANNEL_NONBLOCKING))) {
+	Tcl_SetErrno(EILSEQ);
+	copiedTotal = -1;
+    }
     return copiedTotal;
 }
 
@@ -7534,8 +7552,7 @@ Tcl_Eof(
     ChannelState *statePtr = ((Channel *) chan)->state;
 				/* State of real channel structure. */
 
-    if (GotFlag(statePtr, CHANNEL_NONBLOCKING|CHANNEL_FCOPY)
-	    && GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
 	return 0;
     }
     return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0;
@@ -9751,7 +9768,6 @@ CopyData(
      * the bottom of the stack.
      */
 
-    SetFlag(inStatePtr, CHANNEL_FCOPY);
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
     sameEncoding = inStatePtr->encoding == outStatePtr->encoding
@@ -9867,7 +9883,6 @@ CopyData(
 		    TclDecrRefCount(bufObj);
 		    bufObj = NULL;
 		}
-		ResetFlag(inStatePtr, CHANNEL_FCOPY);
 		return TCL_OK;
 	    }
 	}
@@ -9959,7 +9974,6 @@ CopyData(
 		TclDecrRefCount(bufObj);
 		bufObj = NULL;
 	    }
-	    ResetFlag(inStatePtr, CHANNEL_FCOPY);
 	    return TCL_OK;
 	}
 
@@ -9982,7 +9996,6 @@ CopyData(
 		TclDecrRefCount(bufObj);
 		bufObj = NULL;
 	    }
-	    ResetFlag(inStatePtr, CHANNEL_FCOPY);
 	    return TCL_OK;
 	}
     } /* while */
@@ -10035,7 +10048,6 @@ CopyData(
 	    }
 	}
     }
-    ResetFlag(inStatePtr, CHANNEL_FCOPY);
     return result;
 }
 
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 109c770..cdd96ff 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -236,8 +236,6 @@ typedef struct ChannelState {
 					 * flushed after every newline. */
 #define CHANNEL_UNBUFFERED	(1<<5)	/* Output to the channel must always
 					 * be flushed immediately. */
-#define CHANNEL_FCOPY	(1<<6)	/* Channel is currently doing an fcopy
-					 * mode. */
 #define BG_FLUSH_SCHEDULED	(1<<7)	/* A background flush of the queued
 					 * output buffers has been
 					 * scheduled. */
diff --git a/tests/io.test b/tests/io.test
index c3c0cdd..cf90936 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9155,6 +9155,22 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-profile tcl8)} -setup {
     removeFile io-75.5
 } -result 4181
 
+test io-75.6 {invalid utf-8 encoding gets is not ignored (-profile strict)} -setup {
+    set fn [makeFile {} io-75.6]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f A\x81
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile strict
+} -body {
+    gets $f
+} -cleanup {
+    close $f
+    removeFile io-75.6
+} -match glob -returnCodes 1 -result {error reading "*": illegal byte sequence}
+
 test io-75.8 {invalid utf-8 encoding eof handling (-profile strict)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
@@ -9243,10 +9259,10 @@ test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.12
 } -result 4181
 test io-75.13 {invalid utf-8 encoding read is not ignored (-profile strict)} -setup {
@@ -9262,9 +9278,9 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-profile strict)} -se
     set d [read $f]
     binary scan $d H* hd
     lappend hd [catch {read $f} msg]
-    close $f
     lappend hd $msg
 } -cleanup {
+    close $f
     removeFile io-75.13
 } -match glob -result {41 1 {error reading "*": illegal byte sequence}}
 
-- 
cgit v0.12


From f5c47e4402864aa6d6f5f120c231c39423dcc360 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 20 Mar 2023 23:17:11 +0000
Subject: Proposed fix for [1bedc53c8c]: synchronous [read] with
 -strictencoding does not produce an error on invalid input

---
 generic/tclIO.c | 28 +++++++++++++++++++++++++++-
 tests/io.test   | 16 ++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 9944787..7f74e2e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -6078,6 +6078,23 @@ DoReadChars(
 		    statePtr->inQueueTail = NULL;
 		}
 	    }
+
+	    /*
+	     * If CHANNEL_ENCODING_ERROR and CHANNEL_STICKY_EOF are both set,
+	     * then CHANNEL_ENCODING_ERROR was caused by data that occurred
+	     * after the EOF character was encountered, so it doesn't count as
+	     * a real error.
+	     */
+
+	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
+		    && !GotFlag(statePtr, CHANNEL_STICKY_EOF)
+		    && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
+		/* Channel is blocking.  Return an error so that callers
+		 * like [read] can return an error.
+		*/
+		Tcl_SetErrno(EILSEQ);
+		goto finish;
+	    }
 	}
 
 	if (copiedNow < 0) {
@@ -6106,6 +6123,7 @@ DoReadChars(
 	}
     }
 
+finish:
     /*
      * Failure to fill a channel buffer may have left channel reporting a
      * "blocked" state, but so long as we fulfilled the request here, the
@@ -6139,6 +6157,11 @@ DoReadChars(
     assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED)
             == (CHANNEL_EOF|CHANNEL_BLOCKED)));
     UpdateInterest(chanPtr);
+    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
+	    && (!copied || !GotFlag(statePtr, CHANNEL_NONBLOCKING))) {
+	Tcl_SetErrno(EILSEQ);
+	copied = -1;
+    }
     TclChannelRelease((Tcl_Channel)chanPtr);
     return copied;
 }
@@ -6769,11 +6792,14 @@ TranslateInputEOL(
 	 * EOF character was seen in EOL translated range. Leave current file
 	 * position pointing at the EOF character, but don't store the EOF
 	 * character in the output string.
+	 *
+	 * If CHANNEL_ENCODING_ERROR is set, it can only be because of data
+	 * encountered after the EOF character, so it is nonsense.  Unset it.
 	 */
 
 	SetFlag(statePtr, CHANNEL_EOF | CHANNEL_STICKY_EOF);
 	statePtr->inputEncodingFlags |= TCL_ENCODING_END;
-	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR);
+	ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR|CHANNEL_ENCODING_ERROR);
     }
 }
 
diff --git a/tests/io.test b/tests/io.test
index cf90936..9246bd8 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9171,6 +9171,22 @@ test io-75.6 {invalid utf-8 encoding gets is not ignored (-profile strict)} -set
     removeFile io-75.6
 } -match glob -returnCodes 1 -result {error reading "*": illegal byte sequence}
 
+test io-75.7 {invalid utf-8 encoding gets is not ignored (-profile strict)} -setup {
+    set fn [makeFile {} io-75.7]
+    set f [open $fn w+]
+    fconfigure $f -encoding binary
+    # \x81 is invalid in utf-8
+    puts -nonewline $f A\x81
+    flush $f
+    seek $f 0
+    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile strict
+} -body {
+    read $f
+} -cleanup {
+    close $f
+    removeFile io-75.7
+} -match glob -returnCodes 1 -result {error reading "*": illegal byte sequence}
+
 test io-75.8 {invalid utf-8 encoding eof handling (-profile strict)} -setup {
     set fn [makeFile {} io-75.8]
     set f [open $fn w+]
-- 
cgit v0.12


From 48dcbfcc5b65ce91d157d0faa2db21f6035879e9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Mar 2023 11:11:02 +0000
Subject: Some test-cases, which test for partial read without throwing EILSEQ
 immediately, only work with ""-blocking 0". That's expected.

---
 tests/io.test | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 9246bd8..58d276b 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9110,10 +9110,10 @@ test io-75.3 {incomplete multibyte encoding read is ignored (-profile tcl8)} -se
     fconfigure $f -encoding utf-8 -buffering none -profile tcl8
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.3
 } -result 41c0
 
@@ -9148,10 +9148,10 @@ test io-75.5 {invalid utf-8 encoding read is ignored (-profile tcl8)} -setup {
     fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile tcl8
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.5
 } -result 4181
 
@@ -9234,10 +9234,10 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
     fconfigure $f -encoding utf-8 -buffering none
 } -body {
     set d [read $f]
-    close $f
     binary scan $d H* hd
     set hd
 } -cleanup {
+    close $f
     removeFile io-75.10
 } -result 41c0
 # The current result returns the orphan byte as byte.
@@ -9254,7 +9254,7 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
     puts -nonewline $f A\x81\xFFA
     flush $f
     seek $f 0
-    fconfigure $f -encoding shiftjis -buffering none -eofchar "" -translation lf -profile strict
+    fconfigure $f -encoding shiftjis -blocking 0 -eofchar "" -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
@@ -9289,7 +9289,7 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-profile strict)} -se
     puts -nonewline $f "A\x81"
     flush $f
     seek $f 0
-    fconfigure $f -encoding utf-8 -buffering none -eofchar "" -translation lf -profile strict
+    fconfigure $f -encoding utf-8 -blocking 0 -eofchar "" -translation lf -profile strict
 } -body {
     set d [read $f]
     binary scan $d H* hd
-- 
cgit v0.12


From d63d524e1d45f80c027a4a10aa4f2a51fd8e3f04 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Mar 2023 16:26:30 +0000
Subject: Fix indenting. More use of TCL_INDEX_NONE

---
 generic/tclEncoding.c | 282 ++++++++++++++++++++++++--------------------------
 1 file changed, 136 insertions(+), 146 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 93e4171..7c04a61 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -801,7 +801,7 @@ Tcl_SetDefaultEncodingDir(
     const char *path)
 {
     Tcl_Obj *searchPath = Tcl_GetEncodingSearchPath();
-    Tcl_Obj *directory = Tcl_NewStringObj(path, -1);
+    Tcl_Obj *directory = Tcl_NewStringObj(path, TCL_INDEX_NONE);
 
     searchPath = Tcl_DuplicateObj(searchPath);
     Tcl_ListObjReplace(NULL, searchPath, 0, 0, 1, &directory);
@@ -997,7 +997,7 @@ Tcl_GetEncodingNames(
 	Encoding *encodingPtr = (Encoding *)Tcl_GetHashValue(hPtr);
 
 	Tcl_CreateHashEntry(&table,
-		Tcl_NewStringObj(encodingPtr->name, -1), &dummy);
+		Tcl_NewStringObj(encodingPtr->name, TCL_INDEX_NONE), &dummy);
     }
     Tcl_MutexUnlock(&encodingMutex);
 
@@ -1261,7 +1261,7 @@ Tcl_ExternalToUtfDString(
  *-------------------------------------------------------------------------
  */
 
-Tcl_Size
+int
 Tcl_ExternalToUtfDStringEx(
     Tcl_Interp *interp,         /* For error messages. May be NULL. */
     Tcl_Encoding encoding,	/* The encoding for the source string, or NULL
@@ -1279,8 +1279,8 @@ Tcl_ExternalToUtfDStringEx(
     char *dst;
     Tcl_EncodingState state;
     const Encoding *encodingPtr;
-    int result, soFar, srcRead, dstWrote, dstChars;
-    Tcl_Size dstLen;
+    int result, srcRead, dstWrote, dstChars;
+    Tcl_Size dstLen, soFar;
     const char *srcStart = src;
 
     /* DO FIRST - Must always be initialized before returning */
@@ -1292,7 +1292,7 @@ Tcl_ExternalToUtfDStringEx(
 	    interp,
 	    Tcl_NewStringObj(
 		"Parameter error: TCL_ENCODING_{START,STOP} bits set in flags.",
-		-1));
+		TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALFLAGS", NULL);
 	return TCL_ERROR;
     }
@@ -1301,7 +1301,7 @@ Tcl_ExternalToUtfDStringEx(
     dstLen = dstPtr->spaceAvl - 1;
 
     if (encoding == NULL) {
-        encoding = systemEncoding;
+	encoding = systemEncoding;
     }
     encodingPtr = (Encoding *)encoding;
 
@@ -1317,50 +1317,49 @@ Tcl_ExternalToUtfDStringEx(
     }
 
     while (1) {
-        result = encodingPtr->toUtfProc(encodingPtr->clientData, src,
-                                        srcLen, flags, &state, dst, dstLen,
-                                        &srcRead, &dstWrote, &dstChars);
-        soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
-
-        src += srcRead;
-        if (result != TCL_CONVERT_NOSPACE) {
-            Tcl_Size nBytesProcessed = (src - srcStart);
-
-            Tcl_DStringSetLength(dstPtr, soFar);
-            if (errorLocPtr) {
-                /*
-                 * Do not write error message into interpreter if caller
-                 * wants to know error location.
-                 */
-                *errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
-            }
-            else {
-                /* Caller wants error message on failure */
-                if (result != TCL_OK && interp != NULL) {
-                    char buf[TCL_INTEGER_SPACE];
-                    sprintf(buf, "%u", nBytesProcessed);
-                    Tcl_SetObjResult(
-                        interp,
-                        Tcl_ObjPrintf("unexpected byte sequence starting at index %"
-                                      "u: '\\x%02X'",
-                                      nBytesProcessed,
-                                      UCHAR(srcStart[nBytesProcessed])));
-                    Tcl_SetErrorCode(
-                        interp, "TCL", "ENCODING", "ILLEGALSEQUENCE", buf, NULL);
-                }
-            }
-            return result;
-        }
-
-        /* Expand space and continue */
-        flags &= ~TCL_ENCODING_START;
-        srcLen -= srcRead;
-        if (Tcl_DStringLength(dstPtr) == 0) {
-            Tcl_DStringSetLength(dstPtr, dstLen);
-        }
-        Tcl_DStringSetLength(dstPtr, 2 * Tcl_DStringLength(dstPtr) + 1);
-        dst = Tcl_DStringValue(dstPtr) + soFar;
-        dstLen = Tcl_DStringLength(dstPtr) - soFar - 1;
+	result = encodingPtr->toUtfProc(encodingPtr->clientData, src,
+					srcLen, flags, &state, dst, dstLen,
+					&srcRead, &dstWrote, &dstChars);
+	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
+
+	src += srcRead;
+	if (result != TCL_CONVERT_NOSPACE) {
+	    Tcl_Size nBytesProcessed = (src - srcStart);
+
+	    Tcl_DStringSetLength(dstPtr, soFar);
+	    if (errorLocPtr) {
+		/*
+		 * Do not write error message into interpreter if caller
+		 * wants to know error location.
+		 */
+		*errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
+	    } else {
+		/* Caller wants error message on failure */
+		if (result != TCL_OK && interp != NULL) {
+		    char buf[TCL_INTEGER_SPACE];
+		    sprintf(buf, "%u", nBytesProcessed);
+		    Tcl_SetObjResult(
+			interp,
+			Tcl_ObjPrintf("unexpected byte sequence starting at index %"
+				      "u: '\\x%02X'",
+				      nBytesProcessed,
+				      UCHAR(srcStart[nBytesProcessed])));
+		    Tcl_SetErrorCode(
+			interp, "TCL", "ENCODING", "ILLEGALSEQUENCE", buf, NULL);
+		}
+	    }
+	    return result;
+	}
+
+	/* Expand space and continue */
+	flags &= ~TCL_ENCODING_START;
+	srcLen -= srcRead;
+	if (Tcl_DStringLength(dstPtr) == 0) {
+	    Tcl_DStringSetLength(dstPtr, dstLen);
+	}
+	Tcl_DStringSetLength(dstPtr, 2 * Tcl_DStringLength(dstPtr) + 1);
+	dst = Tcl_DStringValue(dstPtr) + soFar;
+	dstLen = Tcl_DStringLength(dstPtr) - soFar - 1;
     }
 }
 
@@ -1447,9 +1446,9 @@ Tcl_ExternalToUtf(
     }
 
     if (!noTerminate) {
-        if (dstLen < 1) {
-            return TCL_CONVERT_NOSPACE;
-        }
+	if (dstLen < 1) {
+	    return TCL_CONVERT_NOSPACE;
+	}
 	/*
 	 * If there are any null characters in the middle of the buffer,
 	 * they will converted to the UTF-8 null character (\xC0\x80). To get
@@ -1459,9 +1458,9 @@ Tcl_ExternalToUtf(
 
 	dstLen--;
     } else {
-        if (dstLen < 0) {
-            return TCL_CONVERT_NOSPACE;
-        }
+	if (dstLen < 0) {
+	    return TCL_CONVERT_NOSPACE;
+	}
     }
     if (encodingPtr->toUtfProc == UtfToUtfProc) {
 	flags |= ENCODING_INPUT;
@@ -1518,7 +1517,7 @@ Tcl_UtfToExternalDString(
 				 * converted string is stored. */
 {
     Tcl_UtfToExternalDStringEx(
-	NULL, encoding, src, srcLen, TCL_ENCODING_PROFILE_DEFAULT, dstPtr, NULL);
+	NULL, encoding, src, srcLen, TCL_ENCODING_PROFILE_TCL8, dstPtr, NULL);
     return Tcl_DStringValue(dstPtr);
 }
 
@@ -1562,7 +1561,7 @@ Tcl_UtfToExternalDString(
  *-------------------------------------------------------------------------
  */
 
-Tcl_Size
+int
 Tcl_UtfToExternalDStringEx(
     Tcl_Interp *interp,         /* For error messages. May be NULL. */
     Tcl_Encoding encoding,	/* The encoding for the converted string, or
@@ -1580,9 +1579,9 @@ Tcl_UtfToExternalDStringEx(
     char *dst;
     Tcl_EncodingState state;
     const Encoding *encodingPtr;
-    int result, soFar, srcRead, dstWrote, dstChars;
+    int result, srcRead, dstWrote, dstChars;
     const char *srcStart = src;
-    Tcl_Size dstLen;
+    Tcl_Size dstLen, soFar;
 
     /* DO FIRST - must always be initialized on return */
     Tcl_DStringInit(dstPtr);
@@ -1593,7 +1592,7 @@ Tcl_UtfToExternalDStringEx(
 	    interp,
 	    Tcl_NewStringObj(
 		"Parameter error: TCL_ENCODING_{START,STOP} bits set in flags.",
-		-1));
+		TCL_INDEX_NONE));
 	Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALFLAGS", NULL);
 	return TCL_ERROR;
     }
@@ -1615,32 +1614,31 @@ Tcl_UtfToExternalDStringEx(
     flags |= TCL_ENCODING_START | TCL_ENCODING_END;
     while (1) {
 	result = encodingPtr->fromUtfProc(encodingPtr->clientData, src,
-                                          srcLen, flags, &state, dst, dstLen,
-                                          &srcRead, &dstWrote, &dstChars);
+					  srcLen, flags, &state, dst, dstLen,
+					  &srcRead, &dstWrote, &dstChars);
 	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
 
 	src += srcRead;
 	if (result != TCL_CONVERT_NOSPACE) {
-            Tcl_Size nBytesProcessed = (src - srcStart);
+	    Tcl_Size nBytesProcessed = (src - srcStart);
 	    int i = soFar + encodingPtr->nullSize - 1;
 	    while (i >= soFar) {
 		Tcl_DStringSetLength(dstPtr, i--);
 	    }
-            if (errorLocPtr) {
-                /*
-                 * Do not write error message into interpreter if caller
-                 * wants to know error location.
-                 */
-                *errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
-            }
-            else {
-                /* Caller wants error message on failure */
-                if (result != TCL_OK && interp != NULL) {
-                    int pos = Tcl_NumUtfChars(srcStart, nBytesProcessed);
-                    int ucs4;
-                    char buf[TCL_INTEGER_SPACE];
-                    TclUtfToUCS4(&srcStart[nBytesProcessed], &ucs4);
-                    sprintf(buf, "%u", nBytesProcessed);
+	    if (errorLocPtr) {
+		/*
+		 * Do not write error message into interpreter if caller
+		 * wants to know error location.
+		 */
+		*errorLocPtr = result == TCL_OK ? TCL_INDEX_NONE : nBytesProcessed;
+	    } else {
+		/* Caller wants error message on failure */
+		if (result != TCL_OK && interp != NULL) {
+		    int pos = Tcl_NumUtfChars(srcStart, nBytesProcessed);
+		    int ucs4;
+		    char buf[TCL_INTEGER_SPACE];
+		    TclUtfToUCS4(&srcStart[nBytesProcessed], &ucs4);
+		    sprintf(buf, "%u", nBytesProcessed);
 		    Tcl_SetObjResult(
 			interp,
 			Tcl_ObjPrintf(
@@ -1648,10 +1646,10 @@ Tcl_UtfToExternalDStringEx(
 			    pos,
 			    ucs4));
 		    Tcl_SetErrorCode(interp, "TCL", "ENCODING", "ILLEGALSEQUENCE",
-                                     buf, NULL);
-                }
-            }
-            return result;
+				     buf, NULL);
+		}
+	    }
+	    return result;
 	}
 
 	flags &= ~TCL_ENCODING_START;
@@ -1742,7 +1740,7 @@ Tcl_UtfToExternal(
     }
 
     if (dstLen < encodingPtr->nullSize) {
-        return TCL_CONVERT_NOSPACE;
+	return TCL_CONVERT_NOSPACE;
     }
     dstLen -= encodingPtr->nullSize;
     result = encodingPtr->fromUtfProc(encodingPtr->clientData, src, srcLen,
@@ -1811,7 +1809,7 @@ OpenEncodingFileChannel(
     const char *name)		/* The name of the encoding file on disk and
 				 * also the name for new encoding. */
 {
-    Tcl_Obj *nameObj = Tcl_NewStringObj(name, -1);
+    Tcl_Obj *nameObj = Tcl_NewStringObj(name, TCL_INDEX_NONE);
     Tcl_Obj *fileNameObj = Tcl_DuplicateObj(nameObj);
     Tcl_Obj *searchPath = Tcl_DuplicateObj(Tcl_GetEncodingSearchPath());
     Tcl_Obj *map = TclGetProcessGlobalValue(&encodingFileMap);
@@ -1821,7 +1819,7 @@ OpenEncodingFileChannel(
 
     TclListObjGetElementsM(NULL, searchPath, &numDirs, &dir);
     Tcl_IncrRefCount(nameObj);
-    Tcl_AppendToObj(fileNameObj, ".enc", -1);
+    Tcl_AppendToObj(fileNameObj, ".enc", TCL_INDEX_NONE);
     Tcl_IncrRefCount(fileNameObj);
     Tcl_DictObjGet(NULL, map, nameObj, &directory);
 
@@ -2551,19 +2549,16 @@ UtfToUtfProc(
 	}
 	if (UCHAR(*src) < 0x80 && !((UCHAR(*src) == 0) && (flags & ENCODING_INPUT))) {
 	    /*
-	     * Copy 7bit characters, but skip null-bytes when target encoding
-	     * is Tcl's "modified" UTF-8. These need to be converted to
-	     * \xC0\x80 as is done in a later branch.
+	     * Copy 7bit characters, but skip null-bytes when we are in input
+	     * mode, so that they get converted to \xC0\x80.
 	     */
-
 	    *dst++ = *src++;
-	}
-	else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd) &&
+	} else if ((UCHAR(*src) == 0xC0) && (src + 1 < srcEnd) &&
 		 (UCHAR(src[1]) == 0x80) &&
 		 (!(flags & ENCODING_INPUT) || PROFILE_STRICT(profile) ||
 		  PROFILE_REPLACE(profile))) {
 	    /* Special sequence \xC0\x80 */
-            if ((PROFILE_STRICT(profile) || PROFILE_REPLACE(profile)) && (flags & ENCODING_INPUT)) {
+	    if ((PROFILE_STRICT(profile) || PROFILE_REPLACE(profile)) && (flags & ENCODING_INPUT)) {
 		if (PROFILE_REPLACE(profile)) {
 		   dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
 		   src += 2;
@@ -2581,8 +2576,7 @@ UtfToUtfProc(
 		src += 2;
 	    }
 
-	}
-	else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
+	} else if (!Tcl_UtfCharComplete(src, srcEnd - src)) {
 	    /*
 	     * Incomplete byte sequence.
 	     * Always check before using TclUtfToUCS4. Not doing can so
@@ -2599,34 +2593,32 @@ UtfToUtfProc(
 			       : TCL_CONVERT_SYNTAX;
 		    break;
 		}
-            }
-            if (PROFILE_REPLACE(profile)) {
-                ch = UNICODE_REPLACE_CHAR;
-                ++src;
-            } else {
-                /* TCL_ENCODING_PROFILE_TCL8 */
-                char chbuf[2];
-                chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
-                TclUtfToUCS4(chbuf, &ch);
-            }
+	    }
+	    if (PROFILE_REPLACE(profile)) {
+		ch = UNICODE_REPLACE_CHAR;
+		++src;
+	    } else {
+		/* TCL_ENCODING_PROFILE_TCL8 */
+		char chbuf[2];
+		chbuf[0] = UCHAR(*src++); chbuf[1] = 0;
+		TclUtfToUCS4(chbuf, &ch);
+	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
-	}
-	else {
+	} else {
 	    int low;
-            int isInvalid = 0;
+	    int isInvalid = 0;
 	    size_t len = TclUtfToUCS4(src, &ch);
 	    if (flags & ENCODING_INPUT) {
 		if ((len < 2) && (ch != 0)) {
-                    isInvalid = 1;
+		    isInvalid = 1;
 		} else if ((ch > 0xFFFF) && !(flags & ENCODING_UTF)) {
-                    isInvalid = 1;
+		    isInvalid = 1;
 		}
 		if (isInvalid) {
 		    if (PROFILE_STRICT(profile)) {
 			result = TCL_CONVERT_SYNTAX;
 			break;
-		    }
-		    else if (PROFILE_REPLACE(profile)) {
+		    } else if (PROFILE_REPLACE(profile)) {
 			ch = UNICODE_REPLACE_CHAR;
 		    }
 		}
@@ -2655,8 +2647,7 @@ UtfToUtfProc(
 		}
 		if (PROFILE_REPLACE(profile)) {
 		    ch = UNICODE_REPLACE_CHAR;
-		}
-		else {
+		} else {
 		    low = ch;
 		    len = (src <= srcEnd - 3) ? TclUtfToUCS4(src, &low) : 0;
 
@@ -2684,7 +2675,7 @@ cesu8:
 		src = saveSrc;
 		break;
 	    } else if (PROFILE_STRICT(profile) &&
-	               (flags & ENCODING_INPUT) &&
+		       (flags & ENCODING_INPUT) &&
 		       SURROGATE(ch)) {
 		result = TCL_CONVERT_SYNTAX;
 		src = saveSrc;
@@ -2755,7 +2746,7 @@ Utf32ToUtfProc(
      * Check alignment with utf-32 (4 == sizeof(UTF-32))
      */
     if (bytesLeft != 0) {
-        /* We have a truncated code unit */
+	/* We have a truncated code unit */
 	result = TCL_CONVERT_MULTIBYTE;
 	srcLen -= bytesLeft;
     }
@@ -2832,21 +2823,21 @@ Utf32ToUtfProc(
     }
 
     if ((flags & TCL_ENCODING_END) && (result == TCL_CONVERT_MULTIBYTE)) {
-        /* We have a code fragment left-over at the end */
+	/* We have a code fragment left-over at the end */
 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
 	    /* destination is not full, so we really are at the end now */
-            if (PROFILE_STRICT(flags)) {
-                result = TCL_CONVERT_SYNTAX;
-            } else {
-                /* PROFILE_REPLACE or PROFILE_TCL8 */
-                result = TCL_OK;
-                dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
-                numChars++;
-                src += bytesLeft; /* Go past truncated code unit */
-            }
-        }
+	    if (PROFILE_STRICT(flags)) {
+		result = TCL_CONVERT_SYNTAX;
+	    } else {
+		/* PROFILE_REPLACE or PROFILE_TCL8 */
+		result = TCL_OK;
+		dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+		numChars++;
+		src += bytesLeft; /* Go past truncated code unit */
+	    }
+	}
     }
 
     *srcReadPtr = src - srcStart;
@@ -3096,16 +3087,16 @@ Utf16ToUtfProc(
 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
-            if (PROFILE_STRICT(flags)) {
-                result = TCL_CONVERT_SYNTAX;
-            } else {
-                /* PROFILE_REPLACE or PROFILE_TCL8 */
-                result = TCL_OK;
-                dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
-                numChars++;
-                src++; /* Go past truncated code unit */
-            }
-        }
+	    if (PROFILE_STRICT(flags)) {
+		result = TCL_CONVERT_SYNTAX;
+	    } else {
+		/* PROFILE_REPLACE or PROFILE_TCL8 */
+		result = TCL_OK;
+		dst += Tcl_UniCharToUtf(UNICODE_REPLACE_CHAR, dst);
+		numChars++;
+		src++; /* Go past truncated code unit */
+	    }
+	}
     }
 
     *srcReadPtr = src - srcStart;
@@ -3297,8 +3288,8 @@ UtfToUcs2Proc(
 	len = TclUtfToUniChar(src, &ch);
 	if ((ch >= 0xD800) && (len < 3)) {
 	    if (PROFILE_STRICT(flags)) {
-                result = TCL_CONVERT_UNKNOWN;
-                break;
+		result = TCL_CONVERT_UNKNOWN;
+		break;
 	    }
 	    src += len;
 	    src += TclUtfToUniChar(src, &ch);
@@ -3308,8 +3299,8 @@ UtfToUcs2Proc(
 	len = TclUtfToUniChar(src, &ch);
 	if (ch > 0xFFFF) {
 	    if (PROFILE_STRICT(flags)) {
-                result = TCL_CONVERT_UNKNOWN;
-                break;
+		result = TCL_CONVERT_UNKNOWN;
+		break;
 	    }
 	    ch = UNICODE_REPLACE_CHAR;
 	}
@@ -4559,8 +4550,7 @@ int TclEncodingSetProfileFlags(int flags)
 {
     if (flags & TCL_ENCODING_STOPONERROR) {
 	TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
-    }
-    else {
+    } else {
 	int profile = TCL_ENCODING_PROFILE_GET(flags);
 	switch (profile) {
 	case TCL_ENCODING_PROFILE_TCL8:
@@ -4594,13 +4584,13 @@ int TclEncodingSetProfileFlags(int flags)
 void
 TclGetEncodingProfiles(Tcl_Interp *interp)
 {
-    int i, n;
+    size_t i, n;
     Tcl_Obj *objPtr;
     n = sizeof(encodingProfiles) / sizeof(encodingProfiles[0]);
     objPtr = Tcl_NewListObj(n, NULL);
     for (i = 0; i < n; ++i) {
 	Tcl_ListObjAppendElement(
-	    interp, objPtr, Tcl_NewStringObj(encodingProfiles[i].name, -1));
+	    interp, objPtr, Tcl_NewStringObj(encodingProfiles[i].name, TCL_INDEX_NONE));
     }
     Tcl_SetObjResult(interp, objPtr);
 }
-- 
cgit v0.12


From 0fcb3ce5dcddcc07e9c3f294dc146a4442e9efbb Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 21 Mar 2023 23:49:01 +0000
Subject: Remove unneeded Tcl_IncrRefCount and TclDecrRefCount. TclPtrSetVarIdx
 takes ownership of newValuePtr if its refCount is 0, and either stores or
 frees it.

---
 generic/tclExecute.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 7ee5471..41ce6f0 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -3585,10 +3585,8 @@ TEBCresume(
 		}
 	    }
 	    DECACHE_STACK_INFO();
-	    Tcl_IncrRefCount(valueToAssign);
 	    objResultPtr = TclPtrSetVarIdx(interp, varPtr, arrayPtr, part1Ptr,
 		    part2Ptr, valueToAssign, TCL_LEAVE_ERR_MSG, opnd);
-	    TclDecrRefCount(valueToAssign);
 	    CACHE_STACK_INFO();
 	    if (!objResultPtr) {
 	    errorInLappendListPtr:
-- 
cgit v0.12


From 133af7524b7bdfc62eb504a932faef09a0ae03e9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Mar 2023 08:32:10 +0000
Subject: Since TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_TCL8 (on
 Tcl 8), we can simplify.

---
 generic/tcl.h         |  5 -----
 generic/tclCmdAH.c    |  4 ----
 generic/tclEncoding.c | 10 +++-------
 generic/tclIO.c       |  4 ++--
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index e66607b..4da5f43 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2149,12 +2149,7 @@ typedef struct Tcl_EncodingType {
 	(flags_) &= ~TCL_ENCODING_PROFILE_MASK;    \
 	(flags_) |= profile_;                      \
     } while (0)
-/* Still being argued - For Tcl9, is the default strict? TODO */
-#if TCL_MAJOR_VERSION < 9
 #define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8
-#else
-#define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8 /* STRICT? REPLACE? TODO */
-#endif
 
 /*
  * The following definitions are the error codes returned by the conversion
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 6c46c8e..1a1b060 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -567,11 +567,7 @@ EncodingConvertParseOptions (
     Tcl_Encoding encoding;
     Tcl_Obj *dataObj;
     Tcl_Obj *failVarObj;
-#if TCL_MAJOR_VERSION > 8 || defined(TCL_NO_DEPRECATED)
-    int profile = TCL_ENCODING_PROFILE_TCL8; /* TODO - default for Tcl9? */
-#else
     int profile = TCL_ENCODING_PROFILE_TCL8;
-#endif
 
     /*
      * Possible combinations:
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 7c04a61..fc62d7c 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -200,14 +200,10 @@ static struct TclEncodingProfiles {
     {"tcl8", TCL_ENCODING_PROFILE_TCL8},
 };
 #define PROFILE_STRICT(flags_)                                         \
-    ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT) \
-     || (TCL_ENCODING_PROFILE_GET(flags_) == 0                         \
-	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_STRICT))
+    (TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT)
 
 #define PROFILE_REPLACE(flags_)                                         \
-    ((TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE) \
-     || (TCL_ENCODING_PROFILE_GET(flags_) == 0                          \
-	 && TCL_ENCODING_PROFILE_DEFAULT == TCL_ENCODING_PROFILE_REPLACE))
+    (TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE)
 
 #define UNICODE_REPLACE_CHAR ((Tcl_UniChar)0xFFFD)
 #define SURROGATE(c_)      (((c_) & ~0x7FF) == 0xD800)
@@ -4559,7 +4555,7 @@ int TclEncodingSetProfileFlags(int flags)
 	    break;
 	case 0: /* Unspecified by caller */
 	default:
-	    TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_DEFAULT);
+	    TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_TCL8);
 	    break;
 	}
     }
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 7f74e2e..b574e0d 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1703,11 +1703,11 @@ Tcl_CreateChannel(
     statePtr->inputEncodingState  = NULL;
     statePtr->inputEncodingFlags  = TCL_ENCODING_START;
     TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags,
-			     TCL_ENCODING_PROFILE_DEFAULT);
+			     TCL_ENCODING_PROFILE_TCL8);
     statePtr->outputEncodingState = NULL;
     statePtr->outputEncodingFlags = TCL_ENCODING_START;
     TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags,
-			     TCL_ENCODING_PROFILE_DEFAULT);
+			     TCL_ENCODING_PROFILE_TCL8);
 
     /*
      * Set the channel up initially in AUTO input translation mode to accept
-- 
cgit v0.12


From 44357a25341fc6b531fda7e2d69f83c05ad7702d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Mar 2023 09:41:00 +0000
Subject: code cleanup: use more *SURROGATE() macro's

---
 generic/tclEncoding.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index fc62d7c..fc9d241 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2778,7 +2778,7 @@ Utf32ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
-	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
+	if (HIGH_SURROGATE(prev) && !LOW_SURROGATE(ch)) {
 	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
 	    dst += Tcl_UniCharToUtf(-1, dst);
 	}
@@ -2805,7 +2805,7 @@ Utf32ToUtfProc(
 	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (ch & 0xFF);
 	} else {
-	    if (((prev  & ~0x3FF) != 0xD800) && ((ch  & ~0x3FF) == 0xDC00)) {
+	    if (!HIGH_SURROGATE(prev) && LOW_SURROGATE(ch)) {
 		*dst = 0; /* In case of lower surrogate, don't try to combine */
 	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
@@ -2813,7 +2813,7 @@ Utf32ToUtfProc(
 	src += 4;
     }
 
-    if ((ch  & ~0x3FF) == 0xD800) {
+    if (HIGH_SURROGATE(ch)) {
 	/* Bug [10c2c17c32]. If Hi surrogate, finish 3-byte UTF-8 */
 	dst += Tcl_UniCharToUtf(-1, dst);
     }
@@ -3031,7 +3031,7 @@ Utf16ToUtfProc(
 	} else {
 	    ch = (src[0] & 0xFF) << 8 | (src[1] & 0xFF);
 	}
-	if (((prev  & ~0x3FF) == 0xD800) && ((ch  & ~0x3FF) != 0xDC00)) {
+	if (HIGH_SURROGATE(prev) && !LOW_SURROGATE(ch)) {
 	    if (PROFILE_STRICT(flags)) {
 		result = TCL_CONVERT_SYNTAX;
 		src -= 2; /* Go back to beginning of high surrogate */
@@ -3050,9 +3050,9 @@ Utf16ToUtfProc(
 
 	if ((unsigned)ch - 1 < 0x7F) {
 	    *dst++ = (ch & 0xFF);
-	} else if (((prev  & ~0x3FF) == 0xD800) || ((ch  & ~0x3FF) == 0xD800)) {
+	} else if (HIGH_SURROGATE(prev) || HIGH_SURROGATE(ch)) {
 	    dst += Tcl_UniCharToUtf(ch, dst);
-	} else if (((ch  & ~0x3FF) == 0xDC00) && PROFILE_STRICT(flags)) {
+	} else if (LOW_SURROGATE(ch) && PROFILE_STRICT(flags)) {
 	    /* Lo surrogate not preceded by Hi surrogate */
 	    result = TCL_CONVERT_SYNTAX;
 	    break;
@@ -3063,7 +3063,7 @@ Utf16ToUtfProc(
 	src += sizeof(unsigned short);
     }
 
-    if ((ch  & ~0x3FF) == 0xD800) {
+    if (HIGH_SURROGATE(ch)) {
 	if (PROFILE_STRICT(flags)) {
 	    result = TCL_CONVERT_SYNTAX;
 	    src -= 2;
@@ -3301,7 +3301,7 @@ UtfToUcs2Proc(
 	    ch = UNICODE_REPLACE_CHAR;
 	}
 #endif
-	if (PROFILE_STRICT(flags) && ((ch & ~0x7FF) == 0xD800)) {
+	if (PROFILE_STRICT(flags) && SURROGATE(ch)) {
 	    result = TCL_CONVERT_SYNTAX;
 	    break;
 	}
-- 
cgit v0.12


From f1fafe7c16c654a9f7f65644db877071980b8a5d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Mar 2023 11:44:33 +0000
Subject: Move (TCL_ENCODING_PROFILE_MASK|GET|SET) from tcl.h to tclIO.h, since
 those are not public. Some formatting.

---
 generic/tcl.h         |  7 -------
 generic/tclCmdAH.c    |  5 ++---
 generic/tclEncoding.c | 12 ++++++------
 generic/tclExecute.c  |  6 ++----
 generic/tclIO.c       | 24 ++++++++++++------------
 generic/tclIO.h       |  7 +++++++
 generic/tclTest.c     |  3 +--
 generic/tclTestObj.c  |  3 +--
 generic/tclZlib.c     |  6 ++----
 win/tclWinConsole.c   |  3 +--
 10 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 4da5f43..9140ec4 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2142,13 +2142,6 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_PROFILE_TCL8     0x01000000
 #define TCL_ENCODING_PROFILE_STRICT   0x02000000
 #define TCL_ENCODING_PROFILE_REPLACE  0x03000000
-#define TCL_ENCODING_PROFILE_MASK     0xFF000000
-#define TCL_ENCODING_PROFILE_GET(flags_)  ((flags_) & TCL_ENCODING_PROFILE_MASK)
-#define TCL_ENCODING_PROFILE_SET(flags_, profile_) \
-    do {                                           \
-	(flags_) &= ~TCL_ENCODING_PROFILE_MASK;    \
-	(flags_) |= profile_;                      \
-    } while (0)
 #define TCL_ENCODING_PROFILE_DEFAULT  TCL_ENCODING_PROFILE_TCL8
 
 /*
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 1a1b060..5c27bbc 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -675,11 +675,10 @@ EncodingConvertfromObjCmd(
      * Convert the string into a byte array in 'ds'.
      */
 #if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-    if (TCL_ENCODING_PROFILE_GET(flags) == TCL_ENCODING_PROFILE_TCL8) {
+    if (CHANNEL_PROFILE_GET(flags) == TCL_ENCODING_PROFILE_TCL8) {
 	/* Permits high bits to be non-0 in byte array (Tcl 8 style) */
 	bytesPtr = (char *) Tcl_GetByteArrayFromObj(data, &length);
-    }
-    else
+    } else
 #endif
 	bytesPtr = (char *) TclGetBytesFromObj(interp, data, &length);
 
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index fc9d241..b472db3 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -200,10 +200,10 @@ static struct TclEncodingProfiles {
     {"tcl8", TCL_ENCODING_PROFILE_TCL8},
 };
 #define PROFILE_STRICT(flags_)                                         \
-    (TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT)
+    (CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT)
 
 #define PROFILE_REPLACE(flags_)                                         \
-    (TCL_ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE)
+    (CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE)
 
 #define UNICODE_REPLACE_CHAR ((Tcl_UniChar)0xFFFD)
 #define SURROGATE(c_)      (((c_) & ~0x7FF) == 0xD800)
@@ -2527,7 +2527,7 @@ UtfToUtfProc(
     flags |= PTR2INT(clientData);
     dstEnd = dst + dstLen - ((flags & ENCODING_UTF) ? TCL_UTF_MAX : 6);
 
-    profile = TCL_ENCODING_PROFILE_GET(flags);
+    profile = CHANNEL_PROFILE_GET(flags);
     for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
 
 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
@@ -4545,9 +4545,9 @@ TclEncodingProfileIdToName(
 int TclEncodingSetProfileFlags(int flags)
 {
     if (flags & TCL_ENCODING_STOPONERROR) {
-	TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
+	CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
     } else {
-	int profile = TCL_ENCODING_PROFILE_GET(flags);
+	int profile = CHANNEL_PROFILE_GET(flags);
 	switch (profile) {
 	case TCL_ENCODING_PROFILE_TCL8:
 	case TCL_ENCODING_PROFILE_STRICT:
@@ -4555,7 +4555,7 @@ int TclEncodingSetProfileFlags(int flags)
 	    break;
 	case 0: /* Unspecified by caller */
 	default:
-	    TCL_ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_TCL8);
+	    CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_TCL8);
 	    break;
 	}
     }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 41ce6f0..d4e9796 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5279,8 +5279,7 @@ TEBCresume(
 	}
 	if (fromIdx == TCL_INDEX_NONE) {
 	    fromIdx = 0;
-	}
-	else if (fromIdx > length) {
+	} else if (fromIdx > length) {
 	    fromIdx = length;
 	}
 	numToDelete = 0;
@@ -5317,8 +5316,7 @@ TEBCresume(
 	    }
 	    TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
 	    NEXT_INST_V(6, opnd, 1);
-	}
-	else {
+	} else {
 	    if (Tcl_ListObjReplace(interp,
 				   valuePtr,
 				   fromIdx,
diff --git a/generic/tclIO.c b/generic/tclIO.c
index b574e0d..6207f6e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1702,11 +1702,11 @@ Tcl_CreateChannel(
     }
     statePtr->inputEncodingState  = NULL;
     statePtr->inputEncodingFlags  = TCL_ENCODING_START;
-    TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags,
+    CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags,
 			     TCL_ENCODING_PROFILE_TCL8);
     statePtr->outputEncodingState = NULL;
     statePtr->outputEncodingFlags = TCL_ENCODING_START;
-    TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags,
+    CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags,
 			     TCL_ENCODING_PROFILE_TCL8);
 
     /*
@@ -8060,7 +8060,7 @@ Tcl_GetChannelOption(
 	    Tcl_DStringAppendElement(dsPtr, "-profile");
 	}
 	/* Note currently input and output profiles are same */
-	profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
+	profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
 	profileName = TclEncodingProfileIdToName(interp, profile);
 	if (profileName == NULL) {
 	    return TCL_ERROR;
@@ -8266,12 +8266,12 @@ Tcl_SetChannelOption(
 	Tcl_FreeEncoding(statePtr->encoding);
 	statePtr->encoding = encoding;
 	statePtr->inputEncodingState = NULL;
-	profile = TCL_ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
+	profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
 	statePtr->inputEncodingFlags = TCL_ENCODING_START;
-	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
 	statePtr->outputEncodingState = NULL;
 	statePtr->outputEncodingFlags = TCL_ENCODING_START;
-	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
+	CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
@@ -8335,8 +8335,8 @@ Tcl_SetChannelOption(
 	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	TCL_ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
-	TCL_ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
+	CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile);
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
@@ -9468,8 +9468,8 @@ TclCopyChannel(
 	    && inStatePtr->inputTranslation == TCL_TRANSLATE_LF
 	    && outStatePtr->outputTranslation == TCL_TRANSLATE_LF
 	    && inStatePtr->encoding == outStatePtr->encoding
-	    && TCL_ENCODING_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
-	    && TCL_ENCODING_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
+	    && CHANNEL_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
+	    && CHANNEL_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
 
     /*
      * Allocate a new CopyState to maintain info about the current copy in
@@ -9797,8 +9797,8 @@ CopyData(
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
     sameEncoding = inStatePtr->encoding == outStatePtr->encoding
-	    && TCL_ENCODING_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
-	    && TCL_ENCODING_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
+	    && CHANNEL_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
+	    && CHANNEL_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
 
     if (!(inBinary || sameEncoding)) {
 	TclNewObj(bufObj);
diff --git a/generic/tclIO.h b/generic/tclIO.h
index cdd96ff..5d02569 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -286,6 +286,13 @@ typedef struct ChannelState {
 #define CHANNEL_CLOSEDWRITE	(1<<21)	/* Channel write side has been closed.
 					 * No further Tcl-level write IO on
 					 * the channel is allowed. */
+#define CHANNEL_PROFILE_MASK     0xFF000000
+#define CHANNEL_PROFILE_GET(flags_)  ((flags_) & CHANNEL_PROFILE_MASK)
+#define CHANNEL_PROFILE_SET(flags_, profile_) \
+    do {                                           \
+	(flags_) &= ~CHANNEL_PROFILE_MASK;    \
+	(flags_) |= profile_;                      \
+    } while (0)
 
 /*
  * The length of time to wait between synthetic timer events. Must be zero or
diff --git a/generic/tclTest.c b/generic/tclTest.c
index f68029a..442260b 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2103,8 +2103,7 @@ static int UtfExtWrapper(
 	int flag;
 	if (Tcl_GetIntFromObj(NULL, flagObjs[i], &flag) == TCL_OK) {
 	    flags |= flag;
-	}
-	else {
+	} else {
 	    int idx;
 	    if (Tcl_GetIndexFromObjStruct(interp,
 					  flagObjs[i],
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 66657d9..b4c6ac3 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1113,8 +1113,7 @@ TestobjCmd(
 
 	    if (objv[2]->typePtr == NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
-	    }
-	    else {
+	    } else {
 		typeName = objv[2]->typePtr->name;
 		if (!strcmp(typeName, "utf32string"))
 		    typeName = "string";
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 3182c27..5afe1ed 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -453,8 +453,7 @@ GenerateHeader(
 		if (result == TCL_CONVERT_UNKNOWN) {
 		    Tcl_AppendResult(
 			interp, "Comment contains characters > 0xFF", NULL);
-		}
-		else {
+		} else {
 		    Tcl_AppendResult(interp, "Comment too large for zip", NULL);
 		}
 	    }
@@ -489,8 +488,7 @@ GenerateHeader(
 		if (result == TCL_CONVERT_UNKNOWN) {
 		    Tcl_AppendResult(
 			interp, "Filename contains characters > 0xFF", NULL);
-		}
-		else {
+		} else {
 		    Tcl_AppendResult(
 			interp, "Filename too large for zip", NULL);
 		}
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 6688ab1..c93c3e4 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -882,8 +882,7 @@ ConsoleCheckProc(
 	     */
 	    handleInfoPtr->flags |= CONSOLE_DATA_AWAITED;
 	    WakeConditionVariable(&handleInfoPtr->consoleThreadCV);
-	}
-	else if (chanInfoPtr->watchMask & TCL_WRITABLE) {
+	} else if (chanInfoPtr->watchMask & TCL_WRITABLE) {
 	    if (RingBufferHasFreeSpace(&handleInfoPtr->buffer)) {
 		needEvent = 1; /* Output space available */
 	    }
-- 
cgit v0.12


From 636a6d0ea9adb390d44601c064d8e9e134d83583 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Mar 2023 16:36:22 +0000
Subject: Proposed fix for [0265750233]: invalid read in
 cmdAH-4.3.13.C1.solo.utf-8.tcl8.

---
 generic/tclUtf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index cb8bb3e..f0135e4 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -464,7 +464,7 @@ Tcl_UtfToUniChar(
 	}
 	return 1;
     } else if (byte < 0xE0) {
-	if ((src[1] & 0xC0) == 0x80) {
+	if ((byte != 0xC1) && (src[1] & 0xC0) == 0x80) {
 	    /*
 	     * Two-byte-character lead-byte followed by a trail-byte.
 	     */
-- 
cgit v0.12


From 17937238e2e0cd2560c5fdaa676ce36b64ab450e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Mar 2023 20:09:09 +0000
Subject: One missing int -> Tcl_Size change

---
 generic/tcl.decls      | 2 +-
 generic/tclPlatDecls.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 51d9ee5..7f7fafb 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2610,7 +2610,7 @@ declare 0 macosx {
 declare 1 macosx {
     int Tcl_MacOSXOpenVersionedBundleResources(Tcl_Interp *interp,
 	    const char *bundleName, const char *bundleVersion,
-	    int hasResourceFile, int maxPathLen, char *libraryPath)
+	    int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath)
 }
 declare 2 macosx {
     void Tcl_MacOSXNotifierAddRunLoopMode(const void *runLoopMode)
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index f2bc0da..659c3e6 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -78,7 +78,7 @@ EXTERN int		Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp,
 EXTERN int		Tcl_MacOSXOpenVersionedBundleResources(
 				Tcl_Interp *interp, const char *bundleName,
 				const char *bundleVersion,
-				int hasResourceFile, int maxPathLen,
+				int hasResourceFile, Tcl_Size maxPathLen,
 				char *libraryPath);
 /* 2 */
 EXTERN void		Tcl_MacOSXNotifierAddRunLoopMode(
@@ -97,7 +97,7 @@ typedef struct TclPlatStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TCL /* MACOSX */
     int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */
-    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */
+    int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, Tcl_Size maxPathLen, char *libraryPath); /* 1 */
     void (*tcl_MacOSXNotifierAddRunLoopMode) (const void *runLoopMode); /* 2 */
 #endif /* MACOSX */
 } TclPlatStubs;
-- 
cgit v0.12


From 4dcd70c967a3cecc535854cfe982c8180ffdf30a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 22 Mar 2023 21:11:12 +0000
Subject: Remove knownProfileBug constraint: this is already fixed

---
 tests/io.test | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 58d276b..a085976 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -5677,10 +5677,7 @@ test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
     close $f
     set x
 } 牦
-# Remove knownProfileBug constraint below post TIP656- TODO
-test io-39.16 {Tcl_SetChannelOption: -encoding (shortened to "-en"), errors} -constraints {
-    knownProfileBug
-} -body {
+test io-39.16 {Tcl_SetChannelOption: -encoding (shortened to "-en"), errors} -body {
     file delete $path(test1)
     set f [open $path(test1) w]
     fconfigure $f -en foobar
-- 
cgit v0.12


From 5e0c34678e24c5ffe05c8a04f4395416067cefc1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 23 Mar 2023 15:48:54 +0000
Subject: Resolve C warnings on 32-bit platforms. More code cleanup.

---
 generic/tclTest.c | 237 +++++++++++++++++++++++++++---------------------------
 1 file changed, 119 insertions(+), 118 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index c2b7144..2b4b24f 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -9,7 +9,7 @@
  * Copyright (c) 1993-1994 The Regents of the University of California.
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
  * Copyright (c) 1998-2000 Ajuba Solutions.
- * Copyright (c) 2003 by Kevin B. Kenny.  All rights reserved.
+ * Copyright (c) 2003 Kevin B. Kenny.  All rights reserved.
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -569,9 +569,9 @@ Tcltest_Init(
     Tcl_CreateCommand(interp, "testsetnoerr", TestsetCmd,
 	    NULL, NULL);
     Tcl_CreateCommand(interp, "testseterr", TestsetCmd,
-	    (ClientData) TCL_LEAVE_ERR_MSG, NULL);
+	    INT2PTR(TCL_LEAVE_ERR_MSG), NULL);
     Tcl_CreateCommand(interp, "testset2", Testset2Cmd,
-	    (ClientData) TCL_LEAVE_ERR_MSG, NULL);
+	    INT2PTR(TCL_LEAVE_ERR_MSG), NULL);
     Tcl_CreateCommand(interp, "testseterrorcode", TestseterrorcodeCmd,
 	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testsetobjerrorcode",
@@ -1212,11 +1212,11 @@ TestcmdtraceCmd(
 	deleteCalled = 0;
 	cmdTrace = Tcl_CreateObjTrace(interp, 50000,
 		TCL_ALLOW_INLINE_COMPILATION, ObjTraceProc,
-		(ClientData) &deleteCalled, ObjTraceDeleteProc);
+		&deleteCalled, ObjTraceDeleteProc);
 	result = Tcl_Eval(interp, argv[2]);
 	Tcl_DeleteTrace(interp, cmdTrace);
 	if (!deleteCalled) {
-	    Tcl_SetResult(interp, "Delete wasn't called", TCL_STATIC);
+	    Tcl_AppendResult(interp, "Delete wasn't called", NULL);
 	    return TCL_ERROR;
 	} else {
 	    return result;
@@ -1456,10 +1456,10 @@ TestdcallCmd(
 	}
 	if (id < 0) {
 	    Tcl_DontCallWhenDeleted(delInterp, DelCallbackProc,
-		    (ClientData) INT2PTR(-id));
+		    INT2PTR(-id));
 	} else {
 	    Tcl_CallWhenDeleted(delInterp, DelCallbackProc,
-		    (ClientData) INT2PTR(id));
+		    INT2PTR(id));
 	}
     }
     Tcl_DeleteInterp(delInterp);
@@ -1514,7 +1514,7 @@ TestdelCmd(
     Tcl_Interp *child;
 
     if (argc != 4) {
-	Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
+	Tcl_AppendResult(interp, "wrong # args", NULL);
 	return TCL_ERROR;
     }
 
@@ -1528,7 +1528,7 @@ TestdelCmd(
     dPtr->deleteCmd = (char *)ckalloc(strlen(argv[3]) + 1);
     strcpy(dPtr->deleteCmd, argv[3]);
 
-    Tcl_CreateCommand(child, argv[2], DelCmdProc, (ClientData) dPtr,
+    Tcl_CreateCommand(child, argv[2], DelCmdProc, dPtr,
 	    DelDeleteProc);
     return TCL_OK;
 }
@@ -1616,14 +1616,11 @@ TestdelassocdataCmd(
  */
 
 static int
-TestdoubledigitsObjCmd(ClientData unused,
-				/* NULL */
-		       Tcl_Interp* interp,
-				/* Tcl interpreter */
-		       int objc,
-				/* Parameter count */
-		       Tcl_Obj* const objv[])
-				/* Parameter vector */
+TestdoubledigitsObjCmd(
+    ClientData unused, /* NULL */
+    Tcl_Interp* interp,		/* Tcl interpreter */
+    int objc,			/* Parameter count */
+    Tcl_Obj* const objv[])	/* Parameter vector */
 {
     static const char *options[] = {
 	"shortest",
@@ -1646,7 +1643,7 @@ TestdoubledigitsObjCmd(ClientData unused,
     int type;
     int decpt;
     int signum;
-    char * str;
+    char *str;
     char *endPtr;
     Tcl_Obj* strObj;
     Tcl_Obj* retval;
@@ -1718,7 +1715,7 @@ TestdstringCmd(
 
     if (argc < 2) {
 	wrongNumArgs:
-	Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
+	Tcl_AppendResult(interp, "wrong # args", NULL);
 	return TCL_ERROR;
     }
     if (strcmp(argv[1], "append") == 0) {
@@ -1754,11 +1751,11 @@ TestdstringCmd(
 	    goto wrongNumArgs;
 	}
 	if (strcmp(argv[2], "staticsmall") == 0) {
-	    Tcl_SetResult(interp, "short", TCL_STATIC);
+	    Tcl_AppendResult(interp, "short", NULL);
 	} else if (strcmp(argv[2], "staticlarge") == 0) {
-	    Tcl_SetResult(interp, "first0 first1 first2 first3 first4 first5 first6 first7 first8 first9\nsecond0 second1 second2 second3 second4 second5 second6 second7 second8 second9\nthird0 third1 third2 third3 third4 third5 third6 third7 third8 third9\nfourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9\nfifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9\nsixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9\nseventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9\n", TCL_STATIC);
+	    Tcl_AppendResult(interp, "first0 first1 first2 first3 first4 first5 first6 first7 first8 first9\nsecond0 second1 second2 second3 second4 second5 second6 second7 second8 second9\nthird0 third1 third2 third3 third4 third5 third6 third7 third8 third9\nfourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9\nfifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9\nsixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9\nseventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9\n", NULL);
 	} else if (strcmp(argv[2], "free") == 0) {
-	    char *s = ckalloc(100);
+	    char *s = (char *)ckalloc(100);
 	    strcpy(s, "This is a malloc-ed string");
 	    Tcl_SetResult(interp, s, TCL_DYNAMIC);
 	} else if (strcmp(argv[2], "special") == 0) {
@@ -1810,9 +1807,9 @@ TestdstringCmd(
  * Tcl_DStringGetResult handles freeProc's other than free.
  */
 
-static void SpecialFree(blockPtr)
-    char *blockPtr;			/* Block to free. */
-{
+static void SpecialFree(
+    char *blockPtr			/* Block to free. */
+) {
     ckfree(blockPtr - 16);
 }
 
@@ -1859,8 +1856,8 @@ static int UtfExtWrapper(
     Tcl_Encoding encoding;
     Tcl_EncodingState encState, *encStatePtr;
     int srcLen, bufLen;
-    const char *bytes;
-    char *bufPtr;
+    const unsigned char *bytes;
+    unsigned char *bufPtr;
     int srcRead, dstLen, dstWrote, dstChars;
     Tcl_Obj *srcReadVar, *dstWroteVar, *dstCharsVar;
     int result;
@@ -1901,8 +1898,7 @@ static int UtfExtWrapper(
 	int flag;
 	if (Tcl_GetIntFromObj(NULL, flagObjs[i], &flag) == TCL_OK) {
 	    flags |= flag;
-	}
-	else {
+	} else {
 	    int idx;
 	    if (Tcl_GetIndexFromObjStruct(interp,
 					  flagObjs[i],
@@ -1920,13 +1916,14 @@ static int UtfExtWrapper(
     /* Assumes state is integer if not "" */
     Tcl_WideInt wide;
     if (Tcl_GetWideIntFromObj(interp, objv[5], &wide) == TCL_OK) {
-        encState = (Tcl_EncodingState) wide;
+        encState = (Tcl_EncodingState)(size_t)wide;
         encStatePtr = &encState;
     } else if (Tcl_GetCharLength(objv[5]) == 0) {
         encStatePtr = NULL;
     } else {
         return TCL_ERROR;
     }
+
     if (Tcl_GetIntFromObj(interp, objv[6], &dstLen) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -1969,12 +1966,12 @@ static int UtfExtWrapper(
     }
 
     bufLen = dstLen + 4; /* 4 -> overflow detection */
-    bufPtr = ckalloc(bufLen);
+    bufPtr = (unsigned char *) ckalloc(bufLen);
     memset(bufPtr, 0xFF, dstLen); /* Need to check nul terminator */
     memmove(bufPtr + dstLen, "\xAB\xCD\xEF\xAB", 4);   /* overflow detection */
-    bytes = (char *) Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
-    result = (*transformer)(interp, encoding, bytes, srcLen, flags,
-                               encStatePtr, bufPtr, dstLen,
+    bytes = Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
+    result = (*transformer)(interp, encoding, (const char *)bytes, srcLen, flags,
+                               encStatePtr, (char *) bufPtr, dstLen,
                                srcReadVar ? &srcRead : NULL,
                                &dstWrote,
                                dstCharsVar ? &dstChars : NULL);
@@ -2007,8 +2004,8 @@ static int UtfExtWrapper(
         }
         result = TCL_OK;
         resultObjs[1] =
-            encStatePtr ? Tcl_NewWideIntObj((Tcl_WideInt)encState) : Tcl_NewObj();
-        resultObjs[2] = Tcl_NewByteArrayObj((unsigned char *)bufPtr, dstLen);
+            encStatePtr ? Tcl_NewWideIntObj((Tcl_WideInt)(size_t)encState) : Tcl_NewObj();
+        resultObjs[2] = Tcl_NewByteArrayObj(bufPtr, dstLen);
         if (srcReadVar) {
 	    if (Tcl_ObjSetVar2(interp,
 			       srcReadVar,
@@ -2079,6 +2076,11 @@ TestencodingObjCmd(
 	ENC_CREATE, ENC_DELETE, ENC_EXTTOUTF, ENC_UTFTOEXT
     };
 
+    if (objc < 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "command ?args?");
+	return TCL_ERROR;
+    }
+
     if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
@@ -2089,6 +2091,7 @@ TestencodingObjCmd(
 	Tcl_EncodingType type;
 
 	if (objc != 5) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "name toutfcmd fromutfcmd");
 	    return TCL_ERROR;
 	}
 	encodingPtr = (TclEncoding *)ckalloc(sizeof(TclEncoding));
@@ -2108,7 +2111,7 @@ TestencodingObjCmd(
 	type.toUtfProc = EncodingToUtfProc;
 	type.fromUtfProc = EncodingFromUtfProc;
 	type.freeProc = EncodingFreeProc;
-	type.clientData = (ClientData) encodingPtr;
+	type.clientData = encodingPtr;
 	type.nullSize = 1;
 
 	Tcl_CreateEncoding(&type);
@@ -2118,9 +2121,11 @@ TestencodingObjCmd(
 	if (objc != 3) {
 	    return TCL_ERROR;
 	}
-	encoding = Tcl_GetEncoding(NULL, Tcl_GetString(objv[2]));
-	Tcl_FreeEncoding(encoding);
-	Tcl_FreeEncoding(encoding);
+	if (TCL_OK != Tcl_GetEncodingFromObj(interp, objv[2], &encoding)) {
+	    return TCL_ERROR;
+	}
+	Tcl_FreeEncoding(encoding);	/* Free returned reference */
+	Tcl_FreeEncoding(encoding);	/* Free to match CREATE */
 	break;
     case ENC_EXTTOUTF:
         return UtfExtWrapper(interp,Tcl_ExternalToUtf,objc,objv);
@@ -2147,7 +2152,7 @@ EncodingToUtfProc(
     TclEncoding *encodingPtr;
 
     encodingPtr = (TclEncoding *) clientData;
-    Tcl_EvalEx(encodingPtr->interp,encodingPtr->toUtfCmd,-1,TCL_EVAL_GLOBAL);
+    Tcl_EvalEx(encodingPtr->interp, encodingPtr->toUtfCmd, -1, TCL_EVAL_GLOBAL);
 
     len = strlen(Tcl_GetStringResult(encodingPtr->interp));
     if (len > dstLen) {
@@ -2179,7 +2184,7 @@ EncodingFromUtfProc(
     TclEncoding *encodingPtr;
 
     encodingPtr = (TclEncoding *) clientData;
-    Tcl_EvalEx(encodingPtr->interp, encodingPtr->fromUtfCmd,-1,TCL_EVAL_GLOBAL);
+    Tcl_EvalEx(encodingPtr->interp, encodingPtr->fromUtfCmd, -1, TCL_EVAL_GLOBAL);
 
     len = strlen(Tcl_GetStringResult(encodingPtr->interp));
     if (len > dstLen) {
@@ -2514,10 +2519,10 @@ TestexithandlerCmd(
     }
     if (strcmp(argv[1], "create") == 0) {
 	Tcl_CreateExitHandler((value & 1) ? ExitProcOdd : ExitProcEven,
-		(ClientData) INT2PTR(value));
+		INT2PTR(value));
     } else if (strcmp(argv[1], "delete") == 0) {
 	Tcl_DeleteExitHandler((value & 1) ? ExitProcOdd : ExitProcEven,
-		(ClientData) INT2PTR(value));
+		INT2PTR(value));
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
 		"\": must be create or delete", NULL);
@@ -2587,7 +2592,7 @@ TestexprlongCmd(
 		" expression\"", NULL);
 	return TCL_ERROR;
     }
-    Tcl_SetResult(interp, "This is a result", TCL_STATIC);
+    Tcl_AppendResult(interp, "This is a result", NULL);
     result = Tcl_ExprLong(interp, argv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
@@ -2629,7 +2634,7 @@ TestexprlongobjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "expression");
 	return TCL_ERROR;
     }
-    Tcl_SetResult(interp, "This is a result", TCL_STATIC);
+    Tcl_AppendResult(interp, "This is a result", NULL);
     result = Tcl_ExprLongObj(interp, objv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
@@ -2672,7 +2677,7 @@ TestexprdoubleCmd(
 		" expression\"", NULL);
 	return TCL_ERROR;
     }
-    Tcl_SetResult(interp, "This is a result", TCL_STATIC);
+    Tcl_AppendResult(interp, "This is a result", NULL);
     result = Tcl_ExprDouble(interp, argv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
@@ -2715,7 +2720,7 @@ TestexprdoubleobjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "expression");
 	return TCL_ERROR;
     }
-    Tcl_SetResult(interp, "This is a result", TCL_STATIC);
+    Tcl_AppendResult(interp, "This is a result", NULL);
     result = Tcl_ExprDoubleObj(interp, objv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
@@ -2969,7 +2974,7 @@ TestlinkCmd(
     static int intVar = 43;
     static int boolVar = 4;
     static double realVar = 1.23;
-    static Tcl_WideInt wideVar = Tcl_LongAsWide(79);
+    static Tcl_WideInt wideVar = 79;
     static char *stringVar = NULL;
     static char charVar = '@';
     static unsigned char ucharVar = 130;
@@ -2979,7 +2984,7 @@ TestlinkCmd(
     static long longVar = 123456789L;
     static unsigned long ulongVar = 3456789012UL;
     static float floatVar = 4.5;
-    static Tcl_WideUInt uwideVar = (Tcl_WideUInt) Tcl_LongAsWide(123);
+    static Tcl_WideUInt uwideVar = 123;
     static int created = 0;
     char buffer[2*TCL_DOUBLE_SPACE];
     int writable, flag;
@@ -3019,112 +3024,112 @@ TestlinkCmd(
 	if (Tcl_GetBoolean(interp, argv[2], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "int", (char *) &intVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "int", (char *)&intVar,
 		TCL_LINK_INT | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[3], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "real", (char *) &realVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "real", (char *)&realVar,
 		TCL_LINK_DOUBLE | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[4], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "bool", (char *) &boolVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "bool", (char *)&boolVar,
 		TCL_LINK_BOOLEAN | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[5], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "string", (char *) &stringVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "string", (char *)&stringVar,
 		TCL_LINK_STRING | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[6], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "wide", (char *) &wideVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "wide", (char *)&wideVar,
 			TCL_LINK_WIDE_INT | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[7], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "char", (char *) &charVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "char", (char *)&charVar,
 		TCL_LINK_CHAR | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[8], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "uchar", (char *) &ucharVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "uchar", (char *)&ucharVar,
 		TCL_LINK_UCHAR | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[9], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "short", (char *) &shortVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "short", (char *)&shortVar,
 		TCL_LINK_SHORT | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[10], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "ushort", (char *) &ushortVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "ushort", (char *)&ushortVar,
 		TCL_LINK_USHORT | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[11], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "uint", (char *) &uintVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "uint", (char *)&uintVar,
 		TCL_LINK_UINT | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[12], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "long", (char *) &longVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "long", (char *)&longVar,
 		TCL_LINK_LONG | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[13], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "ulong", (char *) &ulongVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "ulong", (char *)&ulongVar,
 		TCL_LINK_ULONG | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[14], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "float", (char *) &floatVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "float", (char *)&floatVar,
 		TCL_LINK_FLOAT | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[15], &writable) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "uwide", (char *) &uwideVar,
+	flag = writable ? 0 : TCL_LINK_READ_ONLY;
+	if (Tcl_LinkVar(interp, "uwide", (char *)&uwideVar,
 		TCL_LINK_WIDE_UINT | flag) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -3624,6 +3629,7 @@ TestMathFunc2(
  *
  *----------------------------------------------------------------------
  */
+
 static void
 CleanupTestSetassocdataTests(
     ClientData clientData,	/* Data to be released. */
@@ -3977,7 +3983,7 @@ TestregexpObjCmd(
 	"-xflags",
 	"--",		NULL
     };
-    enum options {
+    enum optionsEnum {
 	REGEXP_INDICES, REGEXP_NOCASE,	REGEXP_ABOUT,	REGEXP_EXPANDED,
 	REGEXP_MULTI,	REGEXP_NOCROSS,	REGEXP_NEWL,
 	REGEXP_XFLAGS,
@@ -4002,7 +4008,7 @@ TestregexpObjCmd(
 		&index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	switch ((enum options) index) {
+	switch ((enum optionsEnum) index) {
 	case REGEXP_INDICES:
 	    indices = 1;
 	    break;
@@ -4325,7 +4331,7 @@ TestsetassocdataCmd(
 	return TCL_ERROR;
     }
 
-    buf = ckalloc(strlen(argv[2]) + 1);
+    buf = (char *)ckalloc(strlen(argv[2]) + 1);
     strcpy(buf, argv[2]);
 
     /*
@@ -4338,8 +4344,7 @@ TestsetassocdataCmd(
 	ckfree(oldData);
     }
 
-    Tcl_SetAssocData(interp, argv[1], CleanupTestSetassocdataTests,
-	(ClientData) buf);
+    Tcl_SetAssocData(interp, argv[1], CleanupTestSetassocdataTests,	buf);
     return TCL_OK;
 }
 
@@ -4562,7 +4567,7 @@ TestseterrorcodeCmd(
     const char **argv)		/* Argument strings. */
 {
     if (argc > 6) {
-	Tcl_SetResult(interp, "too many args", TCL_STATIC);
+	Tcl_AppendResult(interp, "too many args", NULL);
 	return TCL_ERROR;
     }
     switch (argc) {
@@ -4913,10 +4918,10 @@ GetTimesObjCmd(
 
     /* alloc 5000 times */
     fprintf(stderr, "alloc 5000 6 word items\n");
-    objv = (Tcl_Obj **) ckalloc(5000 * sizeof(Tcl_Obj *));
+    objv = (Tcl_Obj **)ckalloc(5000 * sizeof(Tcl_Obj *));
     Tcl_GetTime(&start);
     for (i = 0;  i < 5000;  i++) {
-	objv[i] = (Tcl_Obj *) ckalloc(sizeof(Tcl_Obj));
+	objv[i] = (Tcl_Obj *)ckalloc(sizeof(Tcl_Obj));
     }
     Tcl_GetTime(&stop);
     timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
@@ -5299,7 +5304,7 @@ TestsetCmd(
     const char *value;
 
     if (argc == 2) {
-	Tcl_SetResult(interp, "before get", TCL_STATIC);
+	Tcl_AppendResult(interp, "before get", NULL);
 	value = Tcl_GetVar2(interp, argv[1], NULL, flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5307,7 +5312,7 @@ TestsetCmd(
 	Tcl_AppendElement(interp, value);
 	return TCL_OK;
     } else if (argc == 3) {
-	Tcl_SetResult(interp, "before set", TCL_STATIC);
+	Tcl_AppendResult(interp, "before set", NULL);
 	value = Tcl_SetVar2(interp, argv[1], NULL, argv[2], flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5331,7 +5336,7 @@ Testset2Cmd(
     const char *value;
 
     if (argc == 3) {
-	Tcl_SetResult(interp, "before get", TCL_STATIC);
+	Tcl_AppendResult(interp, "before get", NULL);
 	value = Tcl_GetVar2(interp, argv[1], argv[2], flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5339,7 +5344,7 @@ Testset2Cmd(
 	Tcl_AppendElement(interp, value);
 	return TCL_OK;
     } else if (argc == 4) {
-	Tcl_SetResult(interp, "before set", TCL_STATIC);
+	Tcl_AppendResult(interp, "before set", NULL);
 	value = Tcl_SetVar2(interp, argv[1], argv[2], argv[3], flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5516,7 +5521,7 @@ TestmainthreadCmd(
 	Tcl_SetObjResult(interp, idObj);
 	return TCL_OK;
     } else {
-	Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
+	Tcl_AppendResult(interp, "wrong # args", NULL);
 	return TCL_ERROR;
     }
 }
@@ -5571,9 +5576,9 @@ TestsetmainloopCmd(
     int argc,			/* Number of arguments. */
     const char **argv)		/* Argument strings. */
 {
-  exitMainLoop = 0;
-  Tcl_SetMainLoop(MainLoop);
-  return TCL_OK;
+    exitMainLoop = 0;
+    Tcl_SetMainLoop(MainLoop);
+    return TCL_OK;
 }
 
 /*
@@ -5600,8 +5605,8 @@ TestexitmainloopCmd(
     int argc,			/* Number of arguments. */
     const char **argv)		/* Argument strings. */
 {
-  exitMainLoop = 1;
-  return TCL_OK;
+    exitMainLoop = 1;
+    return TCL_OK;
 }
 
 /*
@@ -5688,7 +5693,7 @@ TestChannelCmd(
 
     if ((cmdName[0] == 's') && (strncmp(cmdName, "setchannelerror", len) == 0)) {
 
-	Tcl_Obj *msg = Tcl_NewStringObj(argv[3],-1);
+	Tcl_Obj *msg = Tcl_NewStringObj(argv[3], -1);
 
 	Tcl_IncrRefCount(msg);
 	Tcl_SetChannelError(chan, msg);
@@ -5701,7 +5706,7 @@ TestChannelCmd(
     }
     if ((cmdName[0] == 's') && (strncmp(cmdName, "setchannelerrorinterp", len) == 0)) {
 
-	Tcl_Obj *msg = Tcl_NewStringObj(argv[3],-1);
+	Tcl_Obj *msg = Tcl_NewStringObj(argv[3], -1);
 
 	Tcl_IncrRefCount(msg);
 	Tcl_SetChannelErrorInterp(interp, msg);
@@ -6133,8 +6138,7 @@ TestChannelEventCmd(
 	    return TCL_ERROR;
 	}
 
-	esPtr = (EventScriptRecord *) ckalloc((unsigned)
-		sizeof(EventScriptRecord));
+	esPtr = (EventScriptRecord *)ckalloc(sizeof(EventScriptRecord));
 	esPtr->nextPtr = statePtr->scriptRecordPtr;
 	statePtr->scriptRecordPtr = esPtr;
 
@@ -6145,7 +6149,7 @@ TestChannelEventCmd(
 	Tcl_IncrRefCount(esPtr->scriptPtr);
 
 	Tcl_CreateChannelHandler((Tcl_Channel) chanPtr, mask,
-		TclChannelEventScriptInvoker, (ClientData) esPtr);
+		TclChannelEventScriptInvoker, esPtr);
 
 	return TCL_OK;
     }
@@ -6189,7 +6193,7 @@ TestChannelEventCmd(
 	    prevEsPtr->nextPtr = esPtr->nextPtr;
 	}
 	Tcl_DeleteChannelHandler((Tcl_Channel) chanPtr,
-		TclChannelEventScriptInvoker, (ClientData) esPtr);
+		TclChannelEventScriptInvoker, esPtr);
 	Tcl_DecrRefCount(esPtr->scriptPtr);
 	ckfree(esPtr);
 
@@ -6230,7 +6234,7 @@ TestChannelEventCmd(
 	     esPtr = nextEsPtr) {
 	    nextEsPtr = esPtr->nextPtr;
 	    Tcl_DeleteChannelHandler((Tcl_Channel) chanPtr,
-		    TclChannelEventScriptInvoker, (ClientData) esPtr);
+		    TclChannelEventScriptInvoker, esPtr);
 	    Tcl_DecrRefCount(esPtr->scriptPtr);
 	    ckfree(esPtr);
 	}
@@ -6276,7 +6280,7 @@ TestChannelEventCmd(
 	}
 	esPtr->mask = mask;
 	Tcl_CreateChannelHandler((Tcl_Channel) chanPtr, mask,
-		TclChannelEventScriptInvoker, (ClientData) esPtr);
+		TclChannelEventScriptInvoker, esPtr);
 	return TCL_OK;
     }
     Tcl_AppendResult(interp, "bad command ", cmd, ", must be one of "
@@ -6359,12 +6363,7 @@ TestWrongNumArgsObjCmd(
     const char *msg;
 
     if (objc < 3) {
-	/*
-	 * Don't use Tcl_WrongNumArgs here, as that is the function
-	 * we want to test!
-	 */
-	Tcl_SetResult(interp, "insufficient arguments", TCL_STATIC);
-	return TCL_ERROR;
+	goto insufArgs;
     }
 
     if (Tcl_GetIntFromObj(interp, objv[1], &i) != TCL_OK) {
@@ -6380,7 +6379,8 @@ TestWrongNumArgsObjCmd(
 	/*
 	 * Asked for more arguments than were given.
 	 */
-	Tcl_SetResult(interp, "insufficient arguments", TCL_STATIC);
+    insufArgs:
+	Tcl_AppendResult(interp, "insufficient arguments", NULL);
 	return TCL_ERROR;
     }
 
@@ -6479,7 +6479,7 @@ TestFilesystemObjCmd(
 	return TCL_ERROR;
     }
     if (boolVal) {
-	res = Tcl_FSRegister((ClientData)interp, &testReportingFilesystem);
+	res = Tcl_FSRegister(interp, &testReportingFilesystem);
 	msg = (res == TCL_OK) ? "registered" : "failed";
     } else {
 	res = Tcl_FSUnregister(&testReportingFilesystem);
@@ -6514,7 +6514,7 @@ TestReportInFilesystem(
 	return -1;
     }
     lastPathPtr = NULL;
-    *clientDataPtr = (ClientData) newPathPtr;
+    *clientDataPtr = newPathPtr;
     return TCL_OK;
 }
 
@@ -6850,7 +6850,7 @@ TestSimpleFilesystemObjCmd(
 	return TCL_ERROR;
     }
     if (boolVal) {
-	res = Tcl_FSRegister((ClientData)interp, &simpleFilesystem);
+	res = Tcl_FSRegister(interp, &simpleFilesystem);
 	msg = (res == TCL_OK) ? "registered" : "failed";
     } else {
 	res = Tcl_FSUnregister(&simpleFilesystem);
@@ -6883,7 +6883,7 @@ SimpleRedirect(
 	Tcl_IncrRefCount(pathPtr);
 	return pathPtr;
     }
-    origPtr = Tcl_NewStringObj(str+10,-1);
+    origPtr = Tcl_NewStringObj(str+10, -1);
     Tcl_IncrRefCount(origPtr);
     return origPtr;
 }
@@ -7282,7 +7282,7 @@ TestHashSystemHashCmd(
 	hPtr = Tcl_CreateHashEntry(&hash, INT2PTR(i), &isNew);
 	if (!isNew) {
 	    Tcl_SetObjResult(interp, Tcl_NewIntObj(i));
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," creation problem",-1);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," creation problem", -1);
 	    Tcl_DeleteHashTable(&hash);
 	    return TCL_ERROR;
 	}
@@ -7805,6 +7805,7 @@ InterpCmdResolver(
     Namespace *callerNsPtr = varFramePtr->nsPtr;
     Tcl_Command resolvedCmdPtr = NULL;
     (void)dummy;
+    (void)flags;
 
     /*
      * Just do something special on a cmd literal "z" in two cases:
@@ -7864,7 +7865,7 @@ InterpCmdResolver(
              */
 
             CallFrame *parentFramePtr = varFramePtr->callerPtr;
-            char *context = parentFramePtr != NULL ? parentFramePtr->nsPtr->name : "(NULL)";
+            const char *context = parentFramePtr != NULL ? parentFramePtr->nsPtr->name : "(NULL)";
 
             if (strcmp(context, "ctx1") == 0 && (name[0] == 'z') && (name[1] == '\0')) {
                 resolvedCmdPtr = Tcl_FindCommand(interp, "y", NULL, TCL_GLOBAL_ONLY);
@@ -7986,7 +7987,7 @@ InterpCompiledVarResolver(
     Tcl_ResolvedVarInfo **rPtr)
 {
     if (*name == 'T') {
- 	MyResolvedVarInfo *resVarInfo = ckalloc(sizeof(MyResolvedVarInfo));
+ 	MyResolvedVarInfo *resVarInfo = (MyResolvedVarInfo *)ckalloc(sizeof(MyResolvedVarInfo));
 
  	resVarInfo->vInfo.fetchProc = MyCompiledVarFetch;
  	resVarInfo->vInfo.deleteProc = MyCompiledVarFree;
-- 
cgit v0.12


From e27c66d81aa3904b675aa2851d14444b44c9555e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 24 Mar 2023 20:19:49 +0000
Subject: Fix [15e74a2fe6]: Fix various typos

---
 generic/tclBasic.c      |  4 ++--
 generic/tclCompCmds.c   |  2 +-
 generic/tclCompCmdsSZ.c |  6 +++---
 generic/tclEvent.c      |  2 +-
 generic/tclExecute.c    |  4 ++--
 generic/tclFCmd.c       |  2 +-
 generic/tclInterp.c     |  2 +-
 generic/tclListObj.c    |  2 +-
 generic/tclObj.c        | 10 +++++-----
 generic/tclStringObj.c  |  4 ++--
 generic/tclUtil.c       |  8 ++++----
 library/clock.tcl       |  2 +-
 unix/configure          |  2 +-
 unix/configure.in       |  2 +-
 unix/tclUnixTime.c      |  4 ++--
 15 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 9243539..e075701 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -3525,7 +3525,7 @@ TclCleanupCommand(
  *	the builtin functions. Redefining a builtin function forces all
  *	existing code to be invalidated since that code may be compiled using
  *	an instruction specific to the replaced function. In addition,
- *	redefioning a non-builtin function will force existing code to be
+ *	redefining a non-builtin function will force existing code to be
  *	invalidated if the number of arguments has changed.
  *
  *----------------------------------------------------------------------
@@ -3536,7 +3536,7 @@ Tcl_CreateMathFunc(
     Tcl_Interp *interp,		/* Interpreter in which function is to be
 				 * available. */
     const char *name,		/* Name of function (e.g. "sin"). */
-    int numArgs,		/* Nnumber of arguments required by
+    int numArgs,		/* Number of arguments required by
 				 * function. */
     Tcl_ValueType *argTypes,	/* Array of types acceptable for each
 				 * argument. */
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 306334b..1486920 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -3334,7 +3334,7 @@ TclCompileFormatCmd(
  * 	then return -1.
  *
  * Side effects:
- *	May add an entery into the table of compiled locals.
+ *	May add an entry into the table of compiled locals.
  *
  *----------------------------------------------------------------------
  */
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 70d8909..db01dcd 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -4039,7 +4039,7 @@ CompileAssociativeBinaryOpCmd(
     if (words > 3) {
 	/*
 	 * Reverse order of arguments to get precise agreement with [expr] in
-	 * calcuations, including roundoff errors.
+	 * calculations, including roundoff errors.
 	 */
 
 	OP4(	REVERSE, words-1);
@@ -4472,7 +4472,7 @@ TclCompileMinusOpCmd(
 
     /*
      * Reverse order of arguments to get precise agreement with [expr] in
-     * calcuations, including roundoff errors.
+     * calculations, including roundoff errors.
      */
 
     TclEmitInstInt4(INST_REVERSE, words-1, envPtr);
@@ -4517,7 +4517,7 @@ TclCompileDivOpCmd(
 
     /*
      * Reverse order of arguments to get precise agreement with [expr] in
-     * calcuations, including roundoff errors.
+     * calculations, including roundoff errors.
      */
 
     TclEmitInstInt4(INST_REVERSE, words-1, envPtr);
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 3c4ff74..8cbb55b 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -947,7 +947,7 @@ Tcl_Exit(
     /*
      * Warning: this function SHOULD NOT return, as there is code that depends
      * on Tcl_Exit never returning. In fact, we will Tcl_Panic if anyone
-     * returns, so critical is this dependcy.
+     * returns, so critical is this dependency.
      *
      * If subsystems are not (yet) initialized, proper Tcl-finalization is
      * impossible, so fallback to system exit, see bug-[f8a33ce3db5d8cc2].
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index a16334a..a9f4326 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1859,7 +1859,7 @@ TclCompileObj(
  *	of course).
  *
  * Side effects:
- *	valuePtr gets the new incrmented value.
+ *	valuePtr gets the new incremented value.
  *
  *----------------------------------------------------------------------
  */
@@ -2800,7 +2800,7 @@ TEBCresume(
 	/*
 	 * If the first object is shared, we need a new obj for the result;
 	 * otherwise, we can reuse the first object. In any case, make sure it
-	 * has enough room to accomodate all the concatenated bytes. Note that
+	 * has enough room to accommodate all the concatenated bytes. Note that
 	 * if it is unshared its bytes are copied by ckrealloc, so that we set
 	 * the loop parameters to avoid copying them again: p points to the
 	 * end of the already copied bytes, currPtr to the second object.
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index d58d02d..dbb8994 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -425,7 +425,7 @@ TclFileDeleteCmd(
     if (result != TCL_OK) {
 	if (errfile == NULL) {
 	    /*
-	     * We try to accomodate poor error results from our Tcl_FS calls.
+	     * We try to accommodate poor error results from our Tcl_FS calls.
 	     */
 
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 2633a18..3ba27a1 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -60,7 +60,7 @@ typedef struct Alias {
     Tcl_Obj *objPtr;		/* The first actual prefix object - the target
 				 * command name; this has to be at the end of
 				 * the structure, which will be extended to
-				 * accomodate the remaining objects in the
+				 * accommodate the remaining objects in the
 				 * prefix. */
 } Alias;
 
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index a994fd7..964f596 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -93,7 +93,7 @@ NewListInternalRep(
     List *listRepPtr;
 
     if (objc <= 0) {
-	Tcl_Panic("NewListInternalRep: expects postive element count");
+	Tcl_Panic("NewListInternalRep: expects positive element count");
     }
 
     /*
diff --git a/generic/tclObj.c b/generic/tclObj.c
index a6e7698..0fce557 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1040,7 +1040,7 @@ TclDbDumpActiveObjects(
  *
  *	Called via the TclNewObj or TclDbNewObj macros when TCL_MEM_DEBUG is
  *	enabled. This function will initialize the members of a Tcl_Obj
- *	struct. Initilization would be done inline via the TclNewObj macro
+ *	struct. Initialization would be done inline via the TclNewObj macro
  *	when compiling without TCL_MEM_DEBUG.
  *
  * Results:
@@ -3204,7 +3204,7 @@ FreeBignum(
  *	None.
  *
  * Side effects:
- *	The destination object receies a copy of the source object
+ *	The destination object receives a copy of the source object
  *
  *----------------------------------------------------------------------
  */
@@ -3285,7 +3285,7 @@ UpdateStringOfBignum(
  *
  * Tcl_NewBignumObj --
  *
- *	Creates an initializes a bignum object.
+ *	Creates and initializes a bignum object.
  *
  * Results:
  *	Returns the newly created object.
@@ -4208,7 +4208,7 @@ Tcl_GetCommandFromObj(
  *	None.
  *
  * Side effects:
- *	The object's old internal rep is freed. It's string rep is not
+ *	The object's old internal rep is freed. Its string rep is not
  *	changed. The refcount in the Command structure is incremented to keep
  *	it from being freed if the command is later deleted until
  *	TclNRExecuteByteCode has a chance to recognize that it was deleted.
@@ -4505,7 +4505,7 @@ Tcl_RepresentationCmd(
     /*
      * This is a workaround to silence reports from `make valgrind`
      * on 64-bit systems.  The problem is that the test suite
-     * includes calling the [represenation] command on values of
+     * includes calling the [representation] command on values of
      * &tclDoubleType.  When these values are created, the "doubleValue"
      * is set, but when the "twoPtrValue" is examined, its "ptr2"
      * field has never been initialized.  Since [representation]
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index b109808..720ed44 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -3046,7 +3046,7 @@ TclStringReverse(
  * FillUnicodeRep --
  *
  *	Populate the Unicode internal rep with the Unicode form of its string
- *	rep. The object must alread have a "String" internal rep.
+ *	rep. The object must already have a "String" internal rep.
  *
  * Results:
  *	None.
@@ -3228,7 +3228,7 @@ DupStringInternalRep(
  *	This operation always succeeds and returns TCL_OK.
  *
  * Side effects:
- *	Any old internal reputation for objPtr is freed and the internal
+ *	Any old internal representation for objPtr is freed and the internal
  *	representation is set to "String".
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index a8bf795..aee2b15 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -2649,7 +2649,7 @@ Tcl_DStringInit(
  * Side effects:
  *	Length bytes from "bytes" (or all of "bytes" if length is less than
  *	zero) are added to the current value of the string. Memory gets
- *	reallocated if needed to accomodate the string's new size.
+ *	reallocated if needed to accommodate the string's new size.
  *
  *----------------------------------------------------------------------
  */
@@ -2753,7 +2753,7 @@ TclDStringAppendDString(
  *
  * Side effects:
  *	String is reformatted as a list element and added to the current value
- *	of the string. Memory gets reallocated if needed to accomodate the
+ *	of the string. Memory gets reallocated if needed to accommodate the
  *	string's new size.
  *
  *----------------------------------------------------------------------
@@ -3958,12 +3958,12 @@ TclIndexEncode(
          */
         if (idx > 0) {
             /*
-             * All end+postive or end-negative expressions
+             * All end+positive or end-negative expressions
              * always indicate "after the end".
              */
             idx = after;
         } else if (idx < INT_MIN - TCL_INDEX_END) {
-            /* These indices always indicate "before the beginning */
+            /* These indices always indicate "before the beginning" */
             idx = before;
         } else {
             /* Encoded end-positive (or end+negative) are offset */
diff --git a/library/clock.tcl b/library/clock.tcl
index aa5d228..b51f86f 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -223,7 +223,7 @@ proc ::tcl::clock::Initialize {} {
 
     ::msgcat::mcset ru GREGORIAN_CHANGE_DATE 2421639
 
-    # Romania (Transylvania changed earler - perhaps de_RO should show the
+    # Romania (Transylvania changed earlier - perhaps de_RO should show the
     # earlier date?)
 
     ::msgcat::mcset ro GREGORIAN_CHANGE_DATE 2422063
diff --git a/unix/configure b/unix/configure
index 16210e6..13877ad 100755
--- a/unix/configure
+++ b/unix/configure
@@ -15109,7 +15109,7 @@ fi
 
 
 #--------------------------------------------------------------------
-#	On some systems strstr is broken: it returns a pointer even even if
+#	On some systems strstr is broken: it returns a pointer even if
 #	the original string is empty.
 #--------------------------------------------------------------------
 
diff --git a/unix/configure.in b/unix/configure.in
index 55f09eb..f84720e 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -341,7 +341,7 @@ AC_CHECK_FUNC(memmove, , [
     AC_DEFINE(NO_STRING_H, 1, [Do we have <string.h>?]) ])
 
 #--------------------------------------------------------------------
-#	On some systems strstr is broken: it returns a pointer even even if
+#	On some systems strstr is broken: it returns a pointer even if
 #	the original string is empty.
 #--------------------------------------------------------------------
 
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 3694ba2..85a31e1 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -113,7 +113,7 @@ TclpGetMicroseconds(void)
  * TclpGetClicks --
  *
  *	This procedure returns a value that represents the highest resolution
- *	clock available on the system. There are no garantees on what the
+ *	clock available on the system. There are no guarantees on what the
  *	resolution will be. In Tcl we will call this value a "click". The
  *	start time is also system dependent.
  *
@@ -162,7 +162,7 @@ TclpGetClicks(void)
  * TclpGetWideClicks --
  *
  *	This procedure returns a WideInt value that represents the highest
- *	resolution clock available on the system. There are no garantees on
+ *	resolution clock available on the system. There are no guarantees on
  *	what the resolution will be. In Tcl we will call this value a "click".
  *	The start time is also system dependent.
  *
-- 
cgit v0.12


From 414896d31fc17726a8380347db1f306066ca6c70 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 24 Mar 2023 21:08:11 +0000
Subject: Fix [68417a8bb3]: No result/LF printed for 64-bit integer type check

---
 unix/configure | 6 ++++--
 unix/tcl.m4    | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/unix/configure b/unix/configure
index 685911b..05fd35a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7641,8 +7641,8 @@ printf "%s\n" "${tcl_flags}" >&6; }
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit integer type" >&5
-printf %s "checking for 64-bit integer type... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if 'long' and 'long long' have the same size (64-bit)?" >&5
+printf %s "checking if 'long' and 'long long' have the same size (64-bit)?... " >&6; }
     if test ${tcl_cv_type_64bit+y}
 then :
   printf %s "(cached) " >&6
@@ -7679,6 +7679,8 @@ printf "%s\n" "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	# Now check for auxiliary declarations
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
 printf %s "checking for struct dirent64... " >&6; }
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 4e205fd..3717893 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2378,7 +2378,7 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[
 #--------------------------------------------------------------------
 
 AC_DEFUN([SC_TCL_64BIT_FLAGS], [
-    AC_MSG_CHECKING([for 64-bit integer type])
+    AC_MSG_CHECKING([if 'long' and 'long long' have the same size (64-bit)?])
     AC_CACHE_VAL(tcl_cv_type_64bit,[
 	tcl_cv_type_64bit=none
 	# See if we could use long anyway  Note that we substitute in the
@@ -2388,9 +2388,10 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
             case 1: case (sizeof(long long)==sizeof(long)): ;
         }]])],[tcl_cv_type_64bit="long long"],[])])
     if test "${tcl_cv_type_64bit}" = none ; then
-	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Do 'long' and 'long long' have the same size (64-bit)?])
+	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, ['long' and 'long long' have the same size])
 	AC_MSG_RESULT([yes])
     else
+	AC_MSG_RESULT([no])
 	# Now check for auxiliary declarations
 	AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
 	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-- 
cgit v0.12


From 5c40bd9a6cf398d2e031d37b77e670b2babf9020 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 25 Mar 2023 20:00:58 +0000
Subject: Experimental fix for [fa128568a5]: EOVERFLOW does not necessarily
 mean "file too big" Let's synchronize the POSIX error-messages with what
 Linux gives nowadays.

---
 doc/SetErrno.3        |   2 +-
 doc/package.n         |   2 +-
 doc/safe.n            |   2 +-
 doc/tclvars.n         |   2 +-
 generic/tclCmdAH.c    |   2 +-
 generic/tclFCmd.c     |   6 +-
 generic/tclIOCmd.c    |   2 +-
 generic/tclInterp.c   |   8 +-
 generic/tclPosixStr.c | 276 +++++++++++++++++++++++++-------------------------
 generic/tclResult.c   |   2 +-
 generic/tclZipfs.c    |   2 +-
 library/http/http.tcl |   8 +-
 library/init.tcl      |   4 +-
 library/safe.tcl      |  22 ++--
 tests/chanio.test     |  16 +--
 tests/cmdAH.test      |  42 ++++----
 tests/cmdMZ.test      |   2 +-
 tests/event.test      |   4 +-
 tests/exec.test       |  32 +++---
 tests/fCmd.test       |  78 +++++++-------
 tests/fileName.test   |   4 +-
 tests/fileSystem.test |  36 +++----
 tests/http.test       |   2 +-
 tests/interp.test     |  20 ++--
 tests/io.test         |  36 +++----
 tests/ioCmd.test      |  22 ++--
 tests/load.test       |   8 +-
 tests/macOSXFCmd.test |   4 +-
 tests/result.test     |   2 +-
 tests/safe-stock.test |   2 +-
 tests/safe.test       |  28 ++---
 tests/socket.test     |  24 ++---
 tests/source.test     |   4 +-
 tests/unixFCmd.test   |  24 ++---
 tests/winFCmd.test    |  10 +-
 unix/tclUnixInit.c    |   2 +-
 win/tclWinFCmd.c      |   2 +-
 37 files changed, 374 insertions(+), 370 deletions(-)

diff --git a/doc/SetErrno.3 b/doc/SetErrno.3
index c202e2e..3cc0dbc 100644
--- a/doc/SetErrno.3
+++ b/doc/SetErrno.3
@@ -55,7 +55,7 @@ returns a machine-readable textual identifier such as
 .QW EACCES
 that corresponds to the current value of \fBerrno\fR.
 \fBTcl_ErrnoMsg\fR returns a human-readable string such as
-.QW "permission denied"
+.QW "Permission denied"
 that corresponds to the value of its
 \fIerrorCode\fR argument.  The \fIerrorCode\fR argument is
 typically the value returned by \fBTcl_GetErrno\fR.
diff --git a/doc/package.n b/doc/package.n
index 5687480..820938c 100644
--- a/doc/package.n
+++ b/doc/package.n
@@ -286,7 +286,7 @@ then the attempt to set it back to
 is ineffective and the mode value remains
 .QW latest .
 .PP
-When passed any other value as an argument, raise an invalid argument
+When passed any other value as an argument, raise an Invalid argument
 error.
 .PP
 When an interpreter is created, its initial selection mode value is set to
diff --git a/doc/safe.n b/doc/safe.n
index 6e0d948..86f58bc 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -191,7 +191,7 @@ the file was not found:
 NOTICE for child interp10 : Created
 NOTICE for child interp10 : Setting accessPath=(/foo/bar) staticsok=1 nestedok=0 deletehook=()
 NOTICE for child interp10 : auto_path in interp10 has been set to {$p(:0:)}
-ERROR for child interp10 : /foo/bar/init.tcl: no such file or directory
+ERROR for child interp10 : /foo/bar/init.tcl: No such file or directory
 .CE
 .RE
 .SS OPTIONS
diff --git a/doc/tclvars.n b/doc/tclvars.n
index 4d1413c..6e41405 100644
--- a/doc/tclvars.n
+++ b/doc/tclvars.n
@@ -197,7 +197,7 @@ of the error that occurred, such as \fBENOENT\fR; this will
 be one of the values defined in the include file errno.h.
 The \fImsg\fR element will be a human-readable
 message corresponding to \fIerrName\fR, such as
-.QW "no such file or directory"
+.QW "No such file or directory"
 for the \fBENOENT\fR case.
 .TP
 \fBTCL\fR ...
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 5c27bbc..f2d8904 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -2201,7 +2201,7 @@ PathSplitCmd(
     res = Tcl_FSSplitPath(objv[1], (int *)NULL);
     if (res == NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"could not read \"%s\": no such file or directory",
+		"could not read \"%s\": No such file or directory",
 		TclGetString(objv[1])));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "PATHSPLIT", "NONESUCH",
 		NULL);
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index ea8f715..daddbf2 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1225,8 +1225,8 @@ TclFileLinkCmd(
 
 	    if (errno == EEXIST) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"could not create new link \"%s\": that path already"
-			" exists", TclGetString(objv[index])));
+			"could not create new link \"%s\": File exists",
+			TclGetString(objv[index])));
 		Tcl_PosixError(interp);
 	    } else if (errno == ENOENT) {
 		/*
@@ -1245,7 +1245,7 @@ TclFileLinkCmd(
 		Tcl_DecrRefCount(dirPtr);
 		if (access != 0) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "could not create new link \"%s\": no such file"
+			    "could not create new link \"%s\": No such file"
 			    " or directory", TclGetString(objv[index])));
 		    Tcl_PosixError(interp);
 		} else {
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index e8a534f..1c9909c 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -442,7 +442,7 @@ Tcl_ReadObjCmd(
 	    if (strcmp(TclGetString(objv[i]), "nonewline") != 0) {
 #endif
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"expected non-negative integer but got \"%s\"",
+			"Expected non-negative integer but got \"%s\"",
 			TclGetString(objv[i])));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
 		return TCL_ERROR;
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 70cf8fa..302ac17 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -2950,7 +2950,7 @@ ChildExpose(
 
     if (Tcl_IsSafe(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"permission denied: safe interpreter cannot expose commands",
+		"Permission denied: safe interpreter cannot expose commands",
 		-1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		NULL);
@@ -2995,7 +2995,7 @@ ChildRecursionLimit(
 
     if (objc) {
 	if (Tcl_IsSafe(interp)) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("permission denied: "
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("Permission denied: "
 		    "safe interpreters cannot change recursion limit", -1));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		    NULL);
@@ -3056,7 +3056,7 @@ ChildHide(
 
     if (Tcl_IsSafe(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"permission denied: safe interpreter cannot hide commands",
+		"Permission denied: safe interpreter cannot hide commands",
 		-1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		NULL);
@@ -3218,7 +3218,7 @@ ChildMarkTrusted(
 {
     if (Tcl_IsSafe(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"permission denied: safe interpreter cannot mark trusted",
+		"Permission denied: safe interpreter cannot mark trusted",
 		-1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		NULL);
diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index ecdf652..c4647d9 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -496,447 +496,451 @@ const char *
 Tcl_ErrnoMsg(
      int err)			/* Error number (such as in errno variable). */
 {
+#ifndef _WIN32
+    return strerror(err);
+#else
     switch (err) {
 #if defined(E2BIG) && (!defined(EOVERFLOW) || (E2BIG != EOVERFLOW))
-    case E2BIG: return "argument list too long";
+    case E2BIG: return "Argument list too long";
 #endif
 #ifdef EACCES
-    case EACCES: return "permission denied";
+    case EACCES: return "Permission denied";
 #endif
 #ifdef EADDRINUSE
-    case EADDRINUSE: return "address already in use";
+    case EADDRINUSE: return "Address in use";
 #endif
 #ifdef EADDRNOTAVAIL
-    case EADDRNOTAVAIL: return "cannot assign requested address";
+    case EADDRNOTAVAIL: return "Address not available";
 #endif
 #ifdef EADV
-    case EADV: return "advertise error";
+    case EADV: return "Advertise error";
 #endif
 #ifdef EAFNOSUPPORT
-    case EAFNOSUPPORT: return "address family not supported by protocol";
+    case EAFNOSUPPORT: return "Address family not supported";
 #endif
 #ifdef EAGAIN
-    case EAGAIN: return "resource temporarily unavailable";
+    case EAGAIN: return "Resource unavailable, try again";
 #endif
 #ifdef EALIGN
     case EALIGN: return "EALIGN";
 #endif
 #if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY))
-    case EALREADY: return "operation already in progress";
+    case EALREADY: return "Connection already in progress";
 #endif
 #ifdef EBADE
-    case EBADE: return "bad exchange descriptor";
+    case EBADE: return "Bad exchange descriptor";
 #endif
 #ifdef EBADF
-    case EBADF: return "bad file number";
+    case EBADF: return "Bad file descriptor";
 #endif
 #ifdef EBADFD
-    case EBADFD: return "file descriptor in bad state";
+    case EBADFD: return "File descriptor in bad state";
 #endif
 #ifdef EBADMSG
-    case EBADMSG: return "not a data message";
-#endif
-#ifdef ECANCELED
-    case ECANCELED: return "operation canceled";
+    case EBADMSG: return "Bad message";
 #endif
 #ifdef EBADR
-    case EBADR: return "bad request descriptor";
+    case EBADR: return "Bad request descriptor";
 #endif
 #ifdef EBADRPC
     case EBADRPC: return "RPC structure is bad";
 #endif
 #ifdef EBADRQC
-    case EBADRQC: return "bad request code";
+    case EBADRQC: return "Bad request code";
 #endif
 #ifdef EBADSLT
-    case EBADSLT: return "invalid slot";
+    case EBADSLT: return "Invalid slot";
 #endif
 #ifdef EBFONT
-    case EBFONT: return "bad font file format";
+    case EBFONT: return "Bad font file format";
 #endif
 #ifdef EBUSY
-    case EBUSY: return "file busy";
+    case EBUSY: return "Device or resource busy";
+#endif
+#ifdef ECANCELED
+    case ECANCELED: return "Operation canceled";
 #endif
 #ifdef ECHILD
-    case ECHILD: return "no children";
+    case ECHILD: return "No child processes";
 #endif
 #ifdef ECHRNG
-    case ECHRNG: return "channel number out of range";
+    case ECHRNG: return "Channel number out of range";
 #endif
 #ifdef ECOMM
-    case ECOMM: return "communication error on send";
+    case ECOMM: return "Communication error on send";
 #endif
 #ifdef ECONNABORTED
-    case ECONNABORTED: return "software caused connection abort";
+    case ECONNABORTED: return "Connection aborted";
 #endif
 #ifdef ECONNREFUSED
-    case ECONNREFUSED: return "connection refused";
+    case ECONNREFUSED: return "Connection refused";
 #endif
 #ifdef ECONNRESET
-    case ECONNRESET: return "connection reset by peer";
+    case ECONNRESET: return "Connection reset";
 #endif
 #if defined(EDEADLK) && (!defined(EWOULDBLOCK) || (EDEADLK != EWOULDBLOCK))
-    case EDEADLK: return "resource deadlock avoided";
+    case EDEADLK: return "Resource deadlock would occur";
 #endif
 #if defined(EDEADLOCK) && (!defined(EDEADLK) || (EDEADLOCK != EDEADLK))
-    case EDEADLOCK: return "resource deadlock avoided";
+    case EDEADLOCK: return "Resource deadlock would occur";
 #endif
 #ifdef EDESTADDRREQ
-    case EDESTADDRREQ: return "destination address required";
+    case EDESTADDRREQ: return "Destination address required";
 #endif
 #ifdef EDIRTY
-    case EDIRTY: return "mounting a dirty fs w/o force";
+    case EDIRTY: return "Mounting a dirty fs w/o force";
 #endif
 #ifdef EDOM
-    case EDOM: return "math argument out of range";
+    case EDOM: return "Mathematics argument out of domain of function";
 #endif
 #ifdef EDOTDOT
-    case EDOTDOT: return "cross mount point";
+    case EDOTDOT: return "Cross mount point";
 #endif
 #ifdef EDQUOT
-    case EDQUOT: return "disk quota exceeded";
+    case EDQUOT: return "Disk quota exceeded";
 #endif
 #ifdef EDUPPKG
-    case EDUPPKG: return "duplicate package name";
+    case EDUPPKG: return "Duplicate package name";
 #endif
 #ifdef EEXIST
-    case EEXIST: return "file already exists";
+    case EEXIST: return "File exists";
 #endif
 #ifdef EFAULT
-    case EFAULT: return "bad address in system call argument";
+    case EFAULT: return "Bad address";
 #endif
 #ifdef EFBIG
-    case EFBIG: return "file too large";
+    case EFBIG: return "File too large";
 #endif
 #ifdef EHOSTDOWN
-    case EHOSTDOWN: return "host is down";
+    case EHOSTDOWN: return "Host is down";
 #endif
 #ifdef EHOSTUNREACH
-    case EHOSTUNREACH: return "host is unreachable";
+    case EHOSTUNREACH: return "Host is unreachable";
 #endif
 #if defined(EIDRM) && (!defined(EINPROGRESS) || (EIDRM != EINPROGRESS))
-    case EIDRM: return "identifier removed";
+    case EIDRM: return "Identifier removed";
 #endif
 #ifdef EINIT
-    case EINIT: return "initialization error";
+    case EINIT: return "Initialization error";
 #endif
 #ifdef EILSEQ
-    case EILSEQ: return "illegal byte sequence";
+    case EILSEQ: return "Invalid or incomplete multibyte or wide character";
 #endif
 #ifdef EINPROGRESS
-    case EINPROGRESS: return "operation now in progress";
+    case EINPROGRESS: return "Operation in progress";
 #endif
 #ifdef EINTR
-    case EINTR: return "interrupted system call";
+    case EINTR: return "Interrupted function";
 #endif
 #ifdef EINVAL
-    case EINVAL: return "invalid argument";
+    case EINVAL: return "Invalid argument";
 #endif
 #ifdef EIO
     case EIO: return "I/O error";
 #endif
 #ifdef EISCONN
-    case EISCONN: return "socket is already connected";
+    case EISCONN: return "Socket is connected";
 #endif
 #ifdef EISDIR
-    case EISDIR: return "illegal operation on a directory";
+    case EISDIR: return "Is a directory";
 #endif
 #ifdef EISNAME
-    case EISNAM: return "is a name file";
+    case EISNAM: return "Is a name file";
 #endif
 #ifdef ELBIN
     case ELBIN: return "ELBIN";
 #endif
 #ifdef EL2HLT
-    case EL2HLT: return "level 2 halted";
+    case EL2HLT: return "Level 2 halted";
 #endif
 #ifdef EL2NSYNC
-    case EL2NSYNC: return "level 2 not synchronized";
+    case EL2NSYNC: return "Level 2 not synchronized";
 #endif
 #ifdef EL3HLT
-    case EL3HLT: return "level 3 halted";
+    case EL3HLT: return "Level 3 halted";
 #endif
 #ifdef EL3RST
-    case EL3RST: return "level 3 reset";
+    case EL3RST: return "Level 3 reset";
 #endif
 #ifdef ELIBACC
-    case ELIBACC: return "cannot access a needed shared library";
+    case ELIBACC: return "Cannot access a needed shared library";
 #endif
 #ifdef ELIBBAD
-    case ELIBBAD: return "accessing a corrupted shared library";
+    case ELIBBAD: return "Accessing a corrupted shared library";
 #endif
 #ifdef ELIBEXEC
-    case ELIBEXEC: return "cannot exec a shared library directly";
+    case ELIBEXEC: return "Cannot exec a shared library directly";
 #endif
 #if defined(ELIBMAX) && (!defined(ECANCELED) || (ELIBMAX != ECANCELED))
     case ELIBMAX: return
-	    "attempting to link in more shared libraries than system limit";
+	    "Attempting to link in more shared libraries than system limit";
 #endif
 #ifdef ELIBSCN
     case ELIBSCN: return ".lib section in a.out corrupted";
 #endif
 #ifdef ELNRNG
-    case ELNRNG: return "link number out of range";
+    case ELNRNG: return "Link number out of range";
 #endif
 #if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
-    case ELOOP: return "too many levels of symbolic links";
+    case ELOOP: return "Too many levels of symbolic links";
 #endif
 #ifdef EMFILE
-    case EMFILE: return "too many open files";
+    case EMFILE: return "File descriptor value too large";
 #endif
 #ifdef EMLINK
-    case EMLINK: return "too many links";
+    case EMLINK: return "Too many links";
 #endif
 #ifdef EMSGSIZE
-    case EMSGSIZE: return "message too long";
+    case EMSGSIZE: return "Message too large";
 #endif
 #ifdef EMULTIHOP
-    case EMULTIHOP: return "multihop attempted";
+    case EMULTIHOP: return "Multihop attempted";
 #endif
 #ifdef ENAMETOOLONG
-    case ENAMETOOLONG: return "file name too long";
+    case ENAMETOOLONG: return "Filename too long";
 #endif
 #ifdef ENAVAIL
-    case ENAVAIL: return "not available";
+    case ENAVAIL: return "Not available";
 #endif
 #ifdef ENET
     case ENET: return "ENET";
 #endif
 #ifdef ENETDOWN
-    case ENETDOWN: return "network is down";
+    case ENETDOWN: return "Network is down";
 #endif
 #ifdef ENETRESET
-    case ENETRESET: return "network dropped connection on reset";
+    case ENETRESET: return "Network dropped connection on reset";
 #endif
 #ifdef ENETUNREACH
-    case ENETUNREACH: return "network is unreachable";
+    case ENETUNREACH: return "Network is unreachable";
 #endif
 #ifdef ENFILE
-    case ENFILE: return "file table overflow";
+    case ENFILE: return "Too many files open in system";
 #endif
 #ifdef ENOANO
-    case ENOANO: return "anode table overflow";
+    case ENOANO: return "Anode table overflow";
 #endif
 #if defined(ENOBUFS) && (!defined(ENOSR) || (ENOBUFS != ENOSR))
-    case ENOBUFS: return "no buffer space available";
+    case ENOBUFS: return "No buffer space available";
 #endif
 #ifdef ENOCSI
-    case ENOCSI: return "no CSI structure available";
+    case ENOCSI: return "No CSI structure available";
 #endif
 #if defined(ENODATA) && (!defined(ECONNREFUSED) || (ENODATA != ECONNREFUSED))
-    case ENODATA: return "no data available";
+    case ENODATA: return "No data available";
 #endif
 #ifdef ENODEV
-    case ENODEV: return "no such device";
+    case ENODEV: return "No such device";
 #endif
 #ifdef ENOENT
-    case ENOENT: return "no such file or directory";
+    case ENOENT: return "No such file or directory";
 #endif
 #ifdef ENOEXEC
-    case ENOEXEC: return "exec format error";
+    case ENOEXEC: return "Executable format error";
 #endif
 #ifdef ENOLCK
-    case ENOLCK: return "no locks available";
+    case ENOLCK: return "No locks available";
 #endif
 #ifdef ENOLINK
-    case ENOLINK: return "link has been severed";
+    case ENOLINK: return "Link has been severed";
 #endif
 #ifdef ENOMEM
-    case ENOMEM: return "not enough memory";
+    case ENOMEM: return "Not enough space";
 #endif
 #ifdef ENOMSG
-    case ENOMSG: return "no message of desired type";
+    case ENOMSG: return "No message of desired type";
 #endif
 #ifdef ENONET
-    case ENONET: return "machine is not on the network";
+    case ENONET: return "Machine is not on the network";
 #endif
 #ifdef ENOPKG
-    case ENOPKG: return "package not installed";
+    case ENOPKG: return "Package not installed";
 #endif
 #ifdef ENOPROTOOPT
-    case ENOPROTOOPT: return "bad protocol option";
+    case ENOPROTOOPT: return "Protocol not available";
 #endif
 #ifdef ENOSPC
-    case ENOSPC: return "no space left on device";
+    case ENOSPC: return "No space left on device";
 #endif
 #if defined(ENOSR) && (!defined(ENAMETOOLONG) || (ENAMETOOLONG != ENOSR))
-    case ENOSR: return "out of stream resources";
+    case ENOSR: return "No stream resources";
 #endif
 #if defined(ENOSTR) && (!defined(ENOTTY) || (ENOTTY != ENOSTR))
-    case ENOSTR: return "not a stream device";
+    case ENOSTR: return "Not a stream";
 #endif
 #ifdef ENOSYM
-    case ENOSYM: return "unresolved symbol name";
+    case ENOSYM: return "Unresolved symbol name";
 #endif
 #ifdef ENOSYS
-    case ENOSYS: return "function not implemented";
+    case ENOSYS: return "Functionality not supported";
 #endif
 #ifdef ENOTBLK
-    case ENOTBLK: return "block device required";
+    case ENOTBLK: return "Block device required";
 #endif
 #ifdef ENOTCONN
-    case ENOTCONN: return "socket is not connected";
+    case ENOTCONN: return "Transport endpoint is not connected";
 #endif
 #ifdef ENOTRECOVERABLE
-    case ENOTRECOVERABLE: return "state not recoverable";
+    case ENOTRECOVERABLE: return "State not recoverable";
 #endif
 #ifdef ENOTDIR
-    case ENOTDIR: return "not a directory";
+    case ENOTDIR: return "Not a directory or a symbolic link to a directory";
 #endif
 #if defined(ENOTEMPTY) && (!defined(EEXIST) || (ENOTEMPTY != EEXIST))
-    case ENOTEMPTY: return "directory not empty";
+    case ENOTEMPTY: return "Directory not empty";
 #endif
 #ifdef ENOTNAM
-    case ENOTNAM: return "not a name file";
+    case ENOTNAM: return "Not a name file";
 #endif
 #ifdef ENOTSOCK
-    case ENOTSOCK: return "socket operation on non-socket";
+    case ENOTSOCK: return "Not a socket";
 #endif
 #ifdef ENOTSUP
-    case ENOTSUP: return "operation not supported";
+    case ENOTSUP: return "Not supported";
 #endif
 #ifdef ENOTTY
-    case ENOTTY: return "inappropriate device for ioctl";
+    case ENOTTY: return "Inappropriate I/O control operation";
 #endif
 #ifdef ENOTUNIQ
-    case ENOTUNIQ: return "name not unique on network";
+    case ENOTUNIQ: return "Name not unique on network";
 #endif
 #ifdef ENXIO
-    case ENXIO: return "no such device or address";
+    case ENXIO: return "No such device or address";
 #endif
 #if defined(EOPNOTSUPP) &&  (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
-    case EOPNOTSUPP: return "operation not supported on socket";
+    case EOPNOTSUPP: return "Operation not supported on socket";
 #endif
 #ifdef EOTHER
-    case EOTHER: return "other error";
+    case EOTHER: return "Other error";
 #endif
 #if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
-    case EOVERFLOW: return "file too big";
+    case EOVERFLOW: return "Value too large to be stored in data type";
 #endif
 #ifdef EOWNERDEAD
-    case EOWNERDEAD: return "owner died";
+    case EOWNERDEAD: return "Previous owner died";
 #endif
 #ifdef EPERM
-    case EPERM: return "not owner";
+    case EPERM: return "Operation not permitted";
 #endif
 #if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
-    case EPFNOSUPPORT: return "protocol family not supported";
+    case EPFNOSUPPORT: return "Protocol family not supported";
 #endif
 #ifdef EPIPE
-    case EPIPE: return "broken pipe";
+    case EPIPE: return "Broken pipe";
 #endif
 #ifdef EPROCLIM
-    case EPROCLIM: return "too many processes";
+    case EPROCLIM: return "Too many processes";
 #endif
 #ifdef EPROCUNAVAIL
-    case EPROCUNAVAIL: return "bad procedure for program";
+    case EPROCUNAVAIL: return "Bad procedure for program";
 #endif
 #ifdef EPROGMISMATCH
-    case EPROGMISMATCH: return "program version wrong";
+    case EPROGMISMATCH: return "Program version wrong";
 #endif
 #ifdef EPROGUNAVAIL
     case EPROGUNAVAIL: return "RPC program not available";
 #endif
 #ifdef EPROTO
-    case EPROTO: return "protocol error";
+    case EPROTO: return "Protocol error";
 #endif
 #ifdef EPROTONOSUPPORT
-    case EPROTONOSUPPORT: return "protocol not supported";
+    case EPROTONOSUPPORT: return "Protocol not supported";
 #endif
 #ifdef EPROTOTYPE
-    case EPROTOTYPE: return "protocol wrong type for socket";
+    case EPROTOTYPE: return "Protocol wrong type for socket";
 #endif
 #ifdef ERANGE
-    case ERANGE: return "math result unrepresentable";
+    case ERANGE: return "Result too large";
 #endif
 #if defined(EREFUSED) && (!defined(ECONNREFUSED) || (EREFUSED != ECONNREFUSED))
     case EREFUSED: return "EREFUSED";
 #endif
 #ifdef EREMCHG
-    case EREMCHG: return "remote address changed";
+    case EREMCHG: return "Remote address changed";
 #endif
 #ifdef EREMDEV
-    case EREMDEV: return "remote device";
+    case EREMDEV: return "Remote device";
 #endif
 #ifdef EREMOTE
-    case EREMOTE: return "pathname hit remote file system";
+    case EREMOTE: return "Pathname hit remote file system";
 #endif
 #ifdef EREMOTEIO
-    case EREMOTEIO: return "remote i/o error";
+    case EREMOTEIO: return "Remote i/o error";
 #endif
 #ifdef EREMOTERELEASE
     case EREMOTERELEASE: return "EREMOTERELEASE";
 #endif
 #ifdef EROFS
-    case EROFS: return "read-only file system";
+    case EROFS: return "Read-only file system";
 #endif
 #ifdef ERPCMISMATCH
     case ERPCMISMATCH: return "RPC version is wrong";
 #endif
 #ifdef ERREMOTE
-    case ERREMOTE: return "object is remote";
+    case ERREMOTE: return "Object is remote";
 #endif
 #ifdef ESHUTDOWN
-    case ESHUTDOWN: return "cannot send after socket shutdown";
+    case ESHUTDOWN: return "Cannot send after socket shutdown";
 #endif
 #ifdef ESOCKTNOSUPPORT
-    case ESOCKTNOSUPPORT: return "socket type not supported";
+    case ESOCKTNOSUPPORT: return "Socket type not supported";
 #endif
 #ifdef ESPIPE
-    case ESPIPE: return "invalid seek";
+    case ESPIPE: return "Invalid seek";
 #endif
 #ifdef ESRCH
-    case ESRCH: return "no such process";
+    case ESRCH: return "No such process";
 #endif
 #ifdef ESRMNT
-    case ESRMNT: return "srmount error";
+    case ESRMNT: return "Srmount error";
 #endif
 #ifdef ESTALE
-    case ESTALE: return "stale remote file handle";
+    case ESTALE: return "Stale remote file handle";
 #endif
 #ifdef ESUCCESS
     case ESUCCESS: return "Error 0";
 #endif
 #if defined(ETIME) && (!defined(ELOOP) || (ETIME != ELOOP))
-    case ETIME: return "timer expired";
+    case ETIME: return "Timer expired";
 #endif
 #if defined(ETIMEDOUT) && (!defined(ENOSTR) || (ETIMEDOUT != ENOSTR))
-    case ETIMEDOUT: return "connection timed out";
+    case ETIMEDOUT: return "Connection timed out";
 #endif
 #ifdef ETOOMANYREFS
-    case ETOOMANYREFS: return "too many references: cannot splice";
+    case ETOOMANYREFS: return "Too many references: cannot splice";
 #endif
 #ifdef ETXTBSY
-    case ETXTBSY: return "text file or pseudo-device busy";
+    case ETXTBSY: return "Text file busy";
 #endif
 #ifdef EUCLEAN
-    case EUCLEAN: return "structure needs cleaning";
+    case EUCLEAN: return "Structure needs cleaning";
 #endif
 #ifdef EUNATCH
-    case EUNATCH: return "protocol driver not attached";
+    case EUNATCH: return "Protocol driver not attached";
 #endif
 #ifdef EUSERS
-    case EUSERS: return "too many users";
+    case EUSERS: return "Too many users";
 #endif
 #ifdef EVERSION
-    case EVERSION: return "version mismatch";
+    case EVERSION: return "Version mismatch";
 #endif
 #if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
-    case EWOULDBLOCK: return "operation would block";
+    case EWOULDBLOCK: return "Operation would block";
 #endif
 #ifdef EXDEV
-    case EXDEV: return "cross-domain link";
+    case EXDEV: return "Cross-domain link";
 #endif
 #ifdef EXFULL
-    case EXFULL: return "message tables full";
+    case EXFULL: return "Message tables full";
 #endif
     default:
 #ifdef NO_STRERROR
-	return "unknown POSIX error";
+	return "Unknown POSIX error";
 #else
 	return strerror(err);
 #endif
     }
+#endif
 }
 
 /*
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 7e108e9..620c939 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -1474,7 +1474,7 @@ TclMergeReturnOptions(
 	     */
 
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                    "bad -level value: expected non-negative integer but got"
+                    "bad -level value: Expected non-negative integer but got"
                     " \"%s\"", TclGetString(valuePtr)));
 	    Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_LEVEL", NULL);
 	    goto error;
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 1b602ea..014d95e 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -2569,7 +2569,7 @@ ZipAddFile(
 	Tcl_DStringFree(&zpathDs);
 #ifdef _WIN32
 	/* hopefully a directory */
-	if (strcmp("permission denied", Tcl_PosixError(interp)) == 0) {
+	if (strcmp("Permission denied", Tcl_PosixError(interp)) == 0) {
 	    Tcl_Close(interp, in);
 	    return TCL_OK;
 	}
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 79f876a..d744433 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1773,7 +1773,7 @@ proc http::OpenSocket {token DoLater} {
 	    set socketPlayCmd($state(socketinfo)) [list ReplayIfClose Wready {} $socketPhQueue($sockOld)]
 	    set socketPhQueue($sockOld) {}
 	}
-        if {[string range $result 0 20] eq {proxy connect failed:}} {
+        if {[string range $result 0 20] eq {Proxy connect failed:}} {
 	    # - The HTTPS proxy did not create a socket.  The pre-existing value
 	    #   (a "placeholder socket") is unchanged.
 	    # - The proxy returned a valid HTTP response to the failed CONNECT
@@ -1786,7 +1786,7 @@ proc http::OpenSocket {token DoLater} {
 	Finish $token $result
 	# Because socket creation failed, the placeholder "socket" must be
 	# "closed" and (if persistent) removed from the persistent sockets
-	# table.  In the {proxy connect failed:} case Finish does this because
+	# table.  In the {Proxy connect failed:} case Finish does this because
 	# the value of ${token}(connection) is "close". In the other cases here,
 	# it does so because $result is non-empty.
     }
@@ -3392,7 +3392,7 @@ proc http::Connect {token proto phost srvurl} {
 	    # If any other requests are in flight or pipelined/queued, they will
 	    # be discarded.
 	}
-	Finish $token "connect failed $err"
+	Finish $token "Connect failed: $err"
     return
 }
 
@@ -5135,7 +5135,7 @@ proc http::SecureProxyConnect {args} {
             }
         }
         set state(connection) close
-        set msg "proxy connect failed: $code"
+        set msg "Proxy connect failed: $code"
 	# - This error message will be detected by http::OpenSocket and will
 	#   cause it to present the proxy's HTTP response as that of the
 	#   original $token transaction, identified only by state(proxyUsed)
diff --git a/library/init.tcl b/library/init.tcl
index bbff158..22579c2 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -726,7 +726,7 @@ proc tcl::CopyDirectory {action src dest} {
 	    # the following code is now commented out.
 	    #
 	    # return -code error "error $action \"$src\" to\
-	    # \"$dest\": file already exists"
+	    # \"$dest\": File exists"
 	} else {
 	    # Depending on the platform, and on the current
 	    # working directory, the directories '.', '..'
@@ -738,7 +738,7 @@ proc tcl::CopyDirectory {action src dest} {
 	    foreach s $existing {
 		if {[file tail $s] ni {. ..}} {
 		    return -code error "error $action \"$src\" to\
-		      \"$dest\": file already exists"
+		      \"$dest\": File exists"
 		}
 	    }
 	}
diff --git a/library/safe.tcl b/library/safe.tcl
index 7fc2b5c..c5546e5 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -818,7 +818,7 @@ proc ::safe::CheckFileName {child file} {
 
     if {![file exists $file]} {
 	# don't tell the file path
-	return -code error "no such file or directory"
+	return -code error "No such file or directory"
     }
 
     if {![file readable $file]} {
@@ -908,7 +908,7 @@ proc ::safe::AliasGlob {child args} {
 	} on error msg {
 	    Log $child $msg
 	    if {$got(-nocomplain)} return
-	    return -code error "permission denied"
+	    return -code error "Permission denied"
 	}
 	if {$got(--)} {
 	    set cmd [linsert $cmd end-1 -directory $dir]
@@ -921,7 +921,7 @@ proc ::safe::AliasGlob {child args} {
 	# return now and reduce the number of cases to be considered later.
 	Log $child {option -directory must be supplied}
 	if {$got(-nocomplain)} return
-	return -code error "permission denied"
+	return -code error "Permission denied"
     }
 
     # Apply the -join semantics ourselves (hence -join not copied to $cmd)
@@ -980,7 +980,7 @@ proc ::safe::AliasGlob {child args} {
 	} on error msg {
 	    Log $child $msg
 	    if {$got(-nocomplain)} continue
-	    return -code error "permission denied"
+	    return -code error "Permission denied"
 	}
 	lappend cmd $opt
     }
@@ -1034,7 +1034,7 @@ proc ::safe::AliasSource {child args} {
 	set at 2
 	if {$encoding eq "identity"} {
 	    Log $child "attempt to use the identity encoding"
-	    return -code error "permission denied"
+	    return -code error "Permission denied"
 	}
     } else {
 	set at 0
@@ -1052,7 +1052,7 @@ proc ::safe::AliasSource {child args} {
 	set realfile [TranslatePath $child $file]
     } msg]} {
 	Log $child $msg
-	return -code error "permission denied"
+	return -code error "Permission denied"
     }
 
     # check that the path is in the access path of that child
@@ -1060,7 +1060,7 @@ proc ::safe::AliasSource {child args} {
 	FileInAccessPath $child $realfile
     } msg]} {
 	Log $child $msg
-	return -code error "permission denied"
+	return -code error "Permission denied"
     }
 
     # Check that the filename exists and is readable.  If it is not, deliver
@@ -1124,7 +1124,7 @@ proc ::safe::AliasLoad {child file args} {
 	if {!$state(nestedok)} {
 	    Log $child "loading to a sub interp (nestedok)\
 			disabled (trying to load $prefix to $target)"
-	    return -code error "permission denied (nested load)"
+	    return -code error "Permission denied (nested load)"
 	}
     }
 
@@ -1139,7 +1139,7 @@ proc ::safe::AliasLoad {child file args} {
 	if {!$state(staticsok)} {
 	    Log $child "static loading disabled\
 			(trying to load $prefix to $target)"
-	    return -code error "permission denied (static library)"
+	    return -code error "Permission denied (static library)"
 	}
     } else {
 	# file loading
@@ -1149,7 +1149,7 @@ proc ::safe::AliasLoad {child file args} {
 	    set file [TranslatePath $child $file]
 	} on error msg {
 	    Log $child $msg
-	    return -code error "permission denied"
+	    return -code error "Permission denied"
 	}
 
 	# check the translated path
@@ -1157,7 +1157,7 @@ proc ::safe::AliasLoad {child file args} {
 	    FileInAccessPath $child $file
 	} on error msg {
 	    Log $child $msg
-	    return -code error "permission denied (path)"
+	    return -code error "Permission denied (path)"
 	}
     }
 
diff --git a/tests/chanio.test b/tests/chanio.test
index d2008e6..4ad5e3a 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -2676,8 +2676,8 @@ test chan-io-29.27 {Tcl_Flush on chan closed pipeline} -setup {
     } else {
 	set x {this was supposed to fail and did not}
     }
-    string tolower $x
-} -match glob -result {1 {error flushing "*": broken pipe} {posix epipe {broken pipe}}}
+    set x
+} -match glob -result {1 {error flushing "*": Broken pipe} {POSIX EPIPE {Broken pipe}}}
 test chan-io-29.28 {Tcl_WriteChars, lf mode} -setup {
     file delete $path(test1)
 } -body {
@@ -3958,7 +3958,7 @@ test chan-io-32.3 {Tcl_Read, negative byte count} -setup {
     chan read $f -1
 } -returnCodes error -cleanup {
     chan close $f
-} -result {expected non-negative integer but got "-1"}
+} -result {Expected non-negative integer but got "-1"}
 test chan-io-32.4 {Tcl_Read, positive byte count} -body {
     set f [open $path(longfile) r]
     string length [chan read $f 1024]
@@ -4363,7 +4363,7 @@ test chan-io-34.8 {Tcl_Seek on pipes: not supported} -setup {
     chan seek $pipe 0 current
 } -returnCodes error -cleanup {
     chan close $pipe
-} -match glob -result {error during seek on "*": invalid argument}
+} -match glob -result {error during seek on "*": Invalid argument}
 test chan-io-34.9 {Tcl_Seek, testing buffered input flushing} -setup {
     file delete $path(test3)
 } -body {
@@ -5462,11 +5462,11 @@ test chan-io-40.10 {POSIX open access modes: RDONLY} -body {
 test chan-io-40.11 {POSIX open access modes: RDONLY} -match regexp -body {
     file delete $path(test3)
     open $path(test3) RDONLY
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test chan-io-40.12 {POSIX open access modes: WRONLY} -match regexp -body {
     file delete $path(test3)
     open $path(test3) WRONLY
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test chan-io-40.13 {POSIX open access modes: WRONLY} -body {
     makeFile xyzzy test3
     set f [open $path(test3) WRONLY]
@@ -5480,7 +5480,7 @@ test chan-io-40.13 {POSIX open access modes: WRONLY} -body {
 test chan-io-40.14 {POSIX open access modes: RDWR} -match regexp -body {
     file delete $path(test3)
     open $path(test3) RDWR
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test chan-io-40.15 {POSIX open access modes: RDWR} {
     makeFile xyzzy test3
     set f [open $path(test3) RDWR]
@@ -7585,7 +7585,7 @@ test chan-io-60.1 {writing illegal utf sequences} {fileevent testbytestring} {
     # cut of the remainder of the error stack, especially the filename
     set result [lreplace $result 3 3 [lindex [split [lindex $result 3] \n] 0]]
     list $x $result
-} {1 {gets {} catch {error writing "stdout": illegal byte sequence}}}
+} {1 {gets {} catch {error writing "stdout": Invalid or incomplete multibyte or wide character}}}
 
 test chan-io-61.1 {Reset eof state after changing the eof char} -setup {
     set datafile [makeFile {} eofchar]
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 01a4a36..a417e34 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -137,10 +137,10 @@ test cmdAH-2.5 {Tcl_CdObjCmd} -returnCodes error -body {
 } -result {user "~" doesn't exist}
 test cmdAH-2.6 {Tcl_CdObjCmd} -returnCodes error -body {
     cd _foobar
-} -result {couldn't change working directory to "_foobar": no such file or directory}
+} -result {couldn't change working directory to "_foobar": No such file or directory}
 test cmdAH-2.6.1 {Tcl_CdObjCmd} -returnCodes error -body {
     cd ""
-} -result {couldn't change working directory to "": no such file or directory}
+} -result {couldn't change working directory to "": No such file or directory}
 test cmdAH-2.6.2 {cd} -constraints {unix nonPortable} -setup {
     set dir [pwd]
 } -body {
@@ -1459,8 +1459,8 @@ test cmdAH-20.2 {Tcl_FileObjCmd: atime} -setup {
 	    [expr {[file atime $gorpfile] == $stat(atime)}]
 } -result {1 1}
 test cmdAH-20.3 {Tcl_FileObjCmd: atime} {
-    list [catch {file atime _bogus_} msg] [string tolower $msg] $errorCode
-} {1 {could not read "_bogus_": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+    list [catch {file atime _bogus_} msg] $msg $errorCode
+} {1 {could not read "_bogus_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test cmdAH-20.4 {Tcl_FileObjCmd: atime} -returnCodes error -body {
     file atime $file notint
 } -result {expected integer but got "notint"}
@@ -1525,7 +1525,7 @@ test cmdAH-22.3 {Tcl_FileObjCmd: isfile} {file isfile $dirfile} 0
 catch {file link -symbolic $linkfile $gorpfile}
 test cmdAH-23.1 {Tcl_FileObjCmd: lstat} -returnCodes error -body {
     file lstat a
-} -result {could not read "a": no such file or directory}
+} -result {could not read "a": No such file or directory}
 test cmdAH-23.2 {Tcl_FileObjCmd: lstat} -returnCodes error -body {
     file lstat a b c
 } -result {wrong # args: should be "file lstat name ?varName?"}
@@ -1542,9 +1542,9 @@ test cmdAH-23.4 {Tcl_FileObjCmd: lstat} -setup {
     list $stat(nlink) [expr {$stat(mode) & 0o777}] $stat(type)
 } -result {1 511 link}
 test cmdAH-23.5 {Tcl_FileObjCmd: lstat errors} {nonPortable} {
-    list [catch {file lstat _bogus_ stat} msg] [string tolower $msg] \
+    list [catch {file lstat _bogus_ stat} msg] $msg \
 	$errorCode
-} {1 {could not read "_bogus_": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+} {1 {could not read "_bogus_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test cmdAH-23.6 {Tcl_FileObjCmd: lstat errors} -setup {
     unset -nocomplain x
 } -body {
@@ -1634,8 +1634,8 @@ test cmdAH-24.3 {Tcl_FileObjCmd: mtime} -setup {
 	    [expr {[file atime $gorpfile] == $stat(atime)}]
 } -result {1 1}
 test cmdAH-24.4 {Tcl_FileObjCmd: mtime} {
-    list [catch {file mtime _bogus_} msg] [string tolower $msg] $errorCode
-} {1 {could not read "_bogus_": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+    list [catch {file mtime _bogus_} msg] $msg $errorCode
+} {1 {could not read "_bogus_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test cmdAH-24.5 {Tcl_FileObjCmd: mtime} -setup {
     # Under Unix, use a file in /tmp to avoid clock skew due to NFS. On other
     # platforms, just use a file in the local directory.
@@ -1814,11 +1814,11 @@ test cmdAH-26.2 {Tcl_FileObjCmd: readlink} {unix nonPortable} {
     file readlink $linkfile
 } $gorpfile
 test cmdAH-26.3 {Tcl_FileObjCmd: readlink errors} {unix nonPortable} {
-    list [catch {file readlink _bogus_} msg] [string tolower $msg] $errorCode
-} {1 {could not readlink "_bogus_": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+    list [catch {file readlink _bogus_} msg] $msg $errorCode
+} {1 {could not readlink "_bogus_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test cmdAH-26.5 {Tcl_FileObjCmd: readlink errors} {win nonPortable} {
-    list [catch {file readlink _bogus_} msg] [string tolower $msg] $errorCode
-} {1 {could not readlink "_bogus_": invalid argument} {POSIX EINVAL {invalid argument}}}
+    list [catch {file readlink _bogus_} msg] $msg $errorCode
+} {1 {could not readlink "_bogus_": Invalid argument} {POSIX EINVAL {Invalid argument}}}
 
 # size
 test cmdAH-27.1 {Tcl_FileObjCmd: size} -returnCodes error -body {
@@ -1833,8 +1833,8 @@ test cmdAH-27.2 {Tcl_FileObjCmd: size} {
     expr {[file size $gorpfile] - $oldsize}
 } {10}
 test cmdAH-27.3 {Tcl_FileObjCmd: size} {
-    list [catch {file size _bogus_} msg] [string tolower $msg] $errorCode
-} {1 {could not read "_bogus_": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+    list [catch {file size _bogus_} msg] $msg $errorCode
+} {1 {could not read "_bogus_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test cmdAH-27.4 {
     Tcl_FileObjCmd: size (built-in Windows names)
 } -constraints {win} -body {
@@ -1884,8 +1884,8 @@ test cmdAH-28.5 {Tcl_FileObjCmd: stat} -constraints {unix notWsl} -setup {
     format 0o%03o [expr {$stat(mode) & 0o777}]
 } -result 0o765
 test cmdAH-28.6 {Tcl_FileObjCmd: stat} {
-    list [catch {file stat _bogus_ stat} msg] [string tolower $msg] $errorCode
-} {1 {could not read "_bogus_": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+    list [catch {file stat _bogus_ stat} msg] $msg $errorCode
+} {1 {could not read "_bogus_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test cmdAH-28.7 {Tcl_FileObjCmd: stat} -setup {
     unset -nocomplain x
 } -returnCodes error -body {
@@ -2006,8 +2006,8 @@ test cmdAH-29.4.1 {Tcl_FileObjCmd: type} -constraints {linkDirectory notWine} -s
     removeDirectory $tempdir
 } -result link
 test cmdAH-29.5 {Tcl_FileObjCmd: type} {
-    list [catch {file type _bogus_} msg] [string tolower $msg] $errorCode
-} {1 {could not read "_bogus_": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+    list [catch {file type _bogus_} msg] $msg $errorCode
+} {1 {could not read "_bogus_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test cmdAH-29.6 {
     Tcl_FileObjCmd: type (built-in Windows names)
 } -constraints {win} -body {
@@ -2206,7 +2206,7 @@ test cmdAH-33.6 {file tempdir: missing parent dir} -setup {
     file tempdir $base/quux/
 } -cleanup {
     catch {file delete -force $base}
-} -result {can't create temporary directory: no such file or directory}
+} -result {can't create temporary directory: No such file or directory}
 test cmdAH-33.7 {file tempdir: missing parent dir} -setup {
     set base [file join [temporaryDirectory] gorp]
     file mkdir $base
@@ -2214,7 +2214,7 @@ test cmdAH-33.7 {file tempdir: missing parent dir} -setup {
     file tempdir $base/quux/foobar
 } -cleanup {
     catch {file delete -force $base}
-} -result {can't create temporary directory: no such file or directory}
+} -result {can't create temporary directory: No such file or directory}
 
 # This shouldn't work, but just in case a test above failed...
 catch {close $newFileId}
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index a7aa36c..27ec3bf 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -64,7 +64,7 @@ test cmdMZ-1.4 {Tcl_PwdObjCmd: failure} -setup {
 } -returnCodes error -cleanup {
     cd $cwd
     file delete -force $foodir
-} -result {error getting working directory name: permission denied}
+} -result {error getting working directory name: Permission denied}
 
 # The tests for Tcl_RegexpObjCmd, Tcl_RegsubObjCmd are in regexp.test
 
diff --git a/tests/event.test b/tests/event.test
index 16cbc24..163a6f9 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -184,10 +184,10 @@ test event-5.1 {Tcl_BackgroundError, HandleBgErrors procedures} -setup {
 } -result {{{a simple error} {a simple error
     while executing
 "error "a simple error""
-    ("after" script)} NONE} {{couldn't open "non_existent": no such file or directory} {couldn't open "non_existent": no such file or directory
+    ("after" script)} NONE} {{couldn't open "non_existent": No such file or directory} {couldn't open "non_existent": No such file or directory
     while executing
 "open non_existent"
-    ("after" script)} {POSIX ENOENT {no such file or directory}}}}
+    ("after" script)} {POSIX ENOENT {No such file or directory}}}}
 test event-5.2 {Tcl_BackgroundError, HandleBgErrors procedures} -setup {
     catch {rename bgerror {}}
 } -body {
diff --git a/tests/exec.test b/tests/exec.test
index d1ef418..888042e 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -333,11 +333,11 @@ test exec-8.2 {long input and output} {exec} {
 
 test exec-9.1 {commands returning errors} {exec notValgrind} {
     set x [catch {exec gorp456} msg]
-    list $x [string tolower $msg] [string tolower $errorCode]
-} {1 {couldn't execute "gorp456": no such file or directory} {posix enoent {no such file or directory}}}
+    list $x $msg $errorCode
+} {1 {couldn't execute "gorp456": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test exec-9.2 {commands returning errors} {exec notValgrind} {
-    string tolower [list [catch {exec [interpreter] echo foo | foo123} msg] $msg $errorCode]
-} {1 {couldn't execute "foo123": no such file or directory} {posix enoent {no such file or directory}}}
+    list [catch {exec [interpreter] echo foo | foo123} msg] $msg $errorCode
+} {1 {couldn't execute "foo123": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test exec-9.3 {commands returning errors} -constraints {exec stdio} -body {
     exec [interpreter] $path(sleep) 1 | [interpreter] $path(exit) 43 | [interpreter] $path(sleep) 1
 } -returnCodes error -result {child process exited abnormally}
@@ -347,7 +347,7 @@ test exec-9.4 {commands returning errors} -constraints {exec stdio} -body {
 child process exited abnormally}
 test exec-9.5 {commands returning errors} -constraints {exec stdio notValgrind} -body {
     exec gorp456 | [interpreter] echo a b c
-} -returnCodes error -result {couldn't execute "gorp456": no such file or directory}
+} -returnCodes error -result {couldn't execute "gorp456": No such file or directory}
 test exec-9.6 {commands returning errors} -constraints {exec} -body {
     exec [interpreter] $path(sh) -c "\"$path(echo)\" error msg 1>&2"
 } -returnCodes error -result {error msg}
@@ -417,13 +417,13 @@ test exec-10.14 {errors in exec invocation} -constraints {exec} -body {
 } -returnCodes error -result {can't specify "<@" as last word in command}
 test exec-10.15 {errors in exec invocation} -constraints {exec} -body {
     exec cat < a/b/c
-} -returnCodes error -result {couldn't read file "a/b/c": no such file or directory}
+} -returnCodes error -result {couldn't read file "a/b/c": No such file or directory}
 test exec-10.16 {errors in exec invocation} -constraints {exec} -body {
     exec cat << foo > a/b/c
-} -returnCodes error -result {couldn't write file "a/b/c": no such file or directory}
+} -returnCodes error -result {couldn't write file "a/b/c": No such file or directory}
 test exec-10.17 {errors in exec invocation} -constraints {exec} -body {
     exec cat << foo > a/b/c
-} -returnCodes error -result {couldn't write file "a/b/c": no such file or directory}
+} -returnCodes error -result {couldn't write file "a/b/c": No such file or directory}
 set f [open $path(gorp.file) w]
 test exec-10.18 {errors in exec invocation} -constraints {exec} -body {
     exec cat <@ $f
@@ -511,16 +511,16 @@ test exec-12.3 {reaping background processes} {exec unix nonPortable} {
 # Make sure "errorCode" is set correctly.
 
 test exec-13.1 {setting errorCode variable} {exec} {
-    list [catch {exec [interpreter] $path(cat) < a/b/c} msg] [string tolower $errorCode]
-} {1 {posix enoent {no such file or directory}}}
+    list [catch {exec [interpreter] $path(cat) < a/b/c} msg] $errorCode
+} {1 {POSIX ENOENT {No such file or directory}}}
 test exec-13.2 {setting errorCode variable} {exec} {
-    list [catch {exec [interpreter] $path(cat) > a/b/c} msg] [string tolower $errorCode]
-} {1 {posix enoent {no such file or directory}}}
+    list [catch {exec [interpreter] $path(cat) > a/b/c} msg] $errorCode
+} {1 {POSIX ENOENT {No such file or directory}}}
 test exec-13.3 {setting errorCode variable} {exec notValgrind} {
     set x [catch {exec _weird_cmd_} msg]
-    list $x [string tolower $msg] [lindex $errorCode 0] \
-	    [string tolower [lrange $errorCode 2 end]]
-} {1 {couldn't execute "_weird_cmd_": no such file or directory} POSIX {{no such file or directory}}}
+    list $x $msg [lindex $errorCode 0] \
+	    [lrange $errorCode 2 end]
+} {1 {couldn't execute "_weird_cmd_": No such file or directory} POSIX {{No such file or directory}}}
 test exec-13.4 {extended exit result codes} -setup {
     set tmp [makeFile {exit 0x00000101} tmpfile.exec-13.4]
 } -constraints {win} -body {
@@ -556,7 +556,7 @@ test exec-14.3 {unknown switch} -constraints {exec} -body {
 } -returnCodes error -result {bad option "-gorp": must be -ignorestderr, -keepnewline, or --}
 test exec-14.4 {-- switch} -constraints {exec notValgrind} -body {
     exec -- -gorp
-} -returnCodes error -result {couldn't execute "-gorp": no such file or directory}
+} -returnCodes error -result {couldn't execute "-gorp": No such file or directory}
 test exec-14.5 {-ignorestderr switch} {exec} {
     # Alas, the use of -ignorestderr is buried here :-(
     exec [interpreter] $path(sh2) -c [list $path(echo2) foo bar] 2>@1
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 22ac7b8..9c4ba21 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -246,7 +246,7 @@ test fCmd-3.4 {FileCopyRename: Tcl_TranslateFileName passes} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     file copy tf1 ~
-} -result {error copying "tf1": no such file or directory}
+} -result {error copying "tf1": No such file or directory}
 test fCmd-3.5 {FileCopyRename: target doesn't exist: stat(target) != 0} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
@@ -321,7 +321,7 @@ test fCmd-3.15 {FileCopyRename: source[0] == '\x00'} -setup {
 } -constraints {notRoot unixOrWin} -returnCodes error -body {
     file mkdir td1
     file rename / td1
-} -result {error renaming "/" to "td1": file already exists}
+} -result {error renaming "/" to "td1": File exists}
 test fCmd-3.16 {FileCopyRename: break on first error} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
@@ -332,7 +332,7 @@ test fCmd-3.16 {FileCopyRename: break on first error} -setup {
     file mkdir td1
     createfile [file join td1 tf3]
     file rename tf1 tf2 tf3 tf4 td1
-} -result [subst {error renaming "tf3" to "[file join td1 tf3]": file already exists}]
+} -result [subst {error renaming "tf3" to "[file join td1 tf3]": File exists}]
 
 test fCmd-4.1 {TclFileMakeDirsCmd: make each dir: 1 dir} -setup {
     cleanup
@@ -362,7 +362,7 @@ test fCmd-4.5 {TclFileMakeDirsCmd: Tcl_SplitPath returns 0: *name == '\x00'} -se
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     file mkdir ""
-} -result {can't create directory "": no such file or directory}
+} -result {can't create directory "": No such file or directory}
 test fCmd-4.6 {TclFileMakeDirsCmd: one level deep} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -388,7 +388,7 @@ test fCmd-4.9 {TclFileMakeDirsCmd: exists, not dir} -setup {
 } -constraints {notRoot} -returnCodes error -body {
     createfile tf1
     file mkdir tf1
-} -result [subst {can't create directory "[file join tf1]": file already exists}]
+} -result [subst {can't create directory "[file join tf1]": File exists}]
 test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -406,7 +406,7 @@ test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} -setup {
 } -cleanup {
     testchmod 0o755 td1/td2
     cleanup
-} -result {can't create directory "td1/td2/td3": permission denied}
+} -result {can't create directory "td1/td2/td3": Permission denied}
 test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -423,7 +423,7 @@ test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} -setup {
     file mkdir foo/tf1
 } -returnCodes error -cleanup {
     file delete -force foo
-} -result {can't create directory "foo/tf1": permission denied}
+} -result {can't create directory "foo/tf1": Permission denied}
 test fCmd-4.16 {TclFileMakeDirsCmd: TclpCreateDirectory succeeds} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -525,7 +525,7 @@ test fCmd-6.3 {CopyRenameOneFile: lstat(source) != 0} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     file rename tf1 tf2
-} -result {error renaming "tf1": no such file or directory}
+} -result {error renaming "tf1": No such file or directory}
 test fCmd-6.4 {CopyRenameOneFile: lstat(source) == 0} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -549,7 +549,7 @@ test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} -setup {
     file rename tf1 td1
 } -returnCodes error -cleanup {
     testchmod 0o755 td1
-} -result {error renaming "tf1" to "td1/tf1": permission denied}
+} -result {error renaming "tf1" to "td1/tf1": Permission denied}
 test fCmd-6.9 {CopyRenameOneFile: errno == ENOENT} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
@@ -563,14 +563,14 @@ test fCmd-6.10 {CopyRenameOneFile: lstat(target) == 0} -setup {
     createfile tf1
     createfile tf2
     file rename tf1 tf2
-} -result {error renaming "tf1" to "tf2": file already exists}
+} -result {error renaming "tf1" to "tf2": File exists}
 test fCmd-6.11 {CopyRenameOneFile: force == 0} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     createfile tf1
     createfile tf2
     file rename tf1 tf2
-} -result {error renaming "tf1" to "tf2": file already exists}
+} -result {error renaming "tf1" to "tf2": File exists}
 test fCmd-6.12 {CopyRenameOneFile: force != 0} -setup {
     cleanup
 } -constraints {notRoot} -body {
@@ -668,7 +668,7 @@ test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
 } -returnCodes error -cleanup {
     file attributes td1 -permissions 0o755
     cleanup
-} -match regexp -result {^error renaming "td1"( to "/tmp/tcl\d+/td1")?: permission denied$}
+} -match regexp -result {^error renaming "td1"( to "/tmp/tcl\d+/td1")?: Permission denied$}
 test fCmd-6.24 {CopyRenameOneFile: error uses original name} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
@@ -679,7 +679,7 @@ test fCmd-6.24 {CopyRenameOneFile: error uses original name} -setup {
 } -returnCodes error -cleanup {
     file attributes $td1name -permissions 0o755
     file delete -force ~/td1
-} -result {error copying "~/td1": permission denied}
+} -result {error copying "~/td1": Permission denied}
 test fCmd-6.25 {CopyRenameOneFile: error uses original name} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
@@ -691,7 +691,7 @@ test fCmd-6.25 {CopyRenameOneFile: error uses original name} -setup {
 } -returnCodes error -cleanup {
     file attributes $td1name -permissions 0o755
     file delete -force ~/td1
-} -result {error copying "td2" to "~/td1/td2": permission denied}
+} -result {error copying "td2" to "~/td1/td2": Permission denied}
 test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
@@ -702,7 +702,7 @@ test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} -setup {
 } -returnCodes error -cleanup {
     file attributes $td2name -permissions 0o755
     file delete -force ~/td1
-} -result "error copying \"~/td1\" to \"td1\": \"[file join $::env(HOME) td1 td2]\": permission denied"
+} -result "error copying \"~/td1\" to \"td1\": \"[file join $::env(HOME) td1 td2]\": Permission denied"
 test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
 } -constraints {notRoot xdev} -returnCodes error -body {
@@ -710,7 +710,7 @@ test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     file mkdir [file join $tmpspace td1]
     createfile [file join $tmpspace td1 tf1]
     file rename -force td1 $tmpspace
-} -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": file already exists}
+} -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": File exists}
 test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
     cleanup $tmpspace
 } -constraints {notRoot xdev notWsl} -body {
@@ -720,7 +720,7 @@ test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} -setup {
 } -returnCodes error -cleanup {
     file attributes td1/td2/td3 -permissions 0o755
     cleanup $tmpspace
-} -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": "td1/td2/td3": permission denied}
+} -match glob -result {error renaming "td1" to "/tmp/tcl*/td1": "td1/td2/td3": Permission denied}
 test fCmd-6.29 {CopyRenameOneFile: TclpCopyDirectory passed} -setup {
     cleanup $tmpspace
 } -constraints {notRoot xdev} -body {
@@ -738,7 +738,7 @@ test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} -setup {
     catch {file delete [file join $tmpspace bar]}
     catch {file attr foo -perm 0o40777}
     catch {file delete -force foo}
-} -match glob -result {*: permission denied}
+} -match glob -result {*: Permission denied}
 test fCmd-6.31 {CopyRenameOneFile: TclpDeleteFile passed} -setup {
     cleanup $tmpspace
 } -constraints {notRoot xdev} -body {
@@ -751,7 +751,7 @@ test fCmd-6.32 {CopyRenameOneFile: copy} -constraints {notRoot} -setup {
     cleanup
 } -returnCodes error -body {
     file copy tf1 tf2
-} -result {error copying "tf1": no such file or directory}
+} -result {error copying "tf1": No such file or directory}
 
 test fCmd-7.1 {FileForceOption: none} -constraints {notRoot} -setup {
     cleanup
@@ -793,7 +793,7 @@ test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
     file rename ~$user td1
 } -returnCodes error -cleanup {
     file delete -force td1
-} -result "error renaming \"~$user\" to \"td1/[file tail ~$user]\": permission denied"
+} -result "error renaming \"~$user\" to \"td1/[file tail ~$user]\": Permission denied"
 test fCmd-8.2 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
 	-constraints {unix notRoot} -body {
     string equal [file tail ~$user] ~$user
@@ -801,7 +801,7 @@ test fCmd-8.2 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
 test fCmd-8.3 {file copy and path translation: ensure correct error} -body {
     file copy ~ [file join this file doesnt exist]
 } -returnCodes error -result [subst \
-	{error copying "~" to "[file join this file doesnt exist]": no such file or directory}]
+	{error copying "~" to "[file join this file doesnt exist]": No such file or directory}]
 
 test fCmd-9.1 {file rename: comprehensive: EACCES} -setup {
     cleanup
@@ -813,12 +813,12 @@ test fCmd-9.1 {file rename: comprehensive: EACCES} -setup {
 } -returnCodes error -cleanup {
     file delete -force td2
     file delete -force td1
-} -result {error renaming "td1" to "td2/td1": permission denied}
+} -result {error renaming "td1" to "td2/td1": Permission denied}
 test fCmd-9.2 {file rename: comprehensive: source doesn't exist} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     file rename tf1 tf2
-} -result {error renaming "tf1": no such file or directory}
+} -result {error renaming "tf1": No such file or directory}
 test fCmd-9.3 {file rename: comprehensive: file to new name} -setup {
     cleanup
 } -constraints {notRoot testchmod} -body {
@@ -883,7 +883,7 @@ test fCmd-9.7 {file rename: comprehensive: file to existing file} -setup {
     file rename -force tfs3 tfd3
     file rename -force tfs4 tfd4
     list [lsort [glob tf*]] $msg [file writable tfd1] [file writable tfd2] [file writable tfd3] [file writable tfd4]
-} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4} {1 {error renaming "tf1" to "tf2": file already exists}} 1 1 0 0}
+} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4} {1 {error renaming "tf1" to "tf2": File exists}} 1 1 0 0}
 test fCmd-9.8 {file rename: comprehensive: dir to empty dir} -setup {
     cleanup
 } -constraints {notRoot testchmod notNetworkFilesystem} -body {
@@ -919,7 +919,7 @@ test fCmd-9.8 {file rename: comprehensive: dir to empty dir} -setup {
     }
     list [lsort [glob td*]] $msg [file writable [file join tdd1 tds1]] \
     [file writable [file join tdd2 tds2]] $w3 $w4
-} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4} {1 {error renaming "td1" to "[file join td2 td1]": file already exists}} 1 1 0 0}]
+} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4} {1 {error renaming "td1" to "[file join td2 td1]": File exists}} 1 1 0 0}]
 # Test can hit EEXIST or EBUSY, depending on underlying filesystem
 test fCmd-9.9 {file rename: comprehensive: dir to non-empty dir} -setup {
     cleanup
@@ -969,7 +969,7 @@ test fCmd-9.12 {file rename: comprehensive: target exists} -setup {
 	[catch {file rename td1 td2} msg] $msg
 } -cleanup {
     testchmod 0o755 [file join td2 td1]
-} -result [subst {0 1 1 {error renaming "td1" to "[file join td2 td1]": file already exists}}]
+} -result [subst {0 1 1 {error renaming "td1" to "[file join td2 td1]": File exists}}]
 # Test can hit EEXIST or EBUSY, depending on underlying filesystem
 test fCmd-9.13 {file rename: comprehensive: can't overwrite target} -setup {
     cleanup
@@ -1001,7 +1001,7 @@ test fCmd-9.14.2 {file rename: comprehensive: dir into self} -setup {
     file rename [file join .. td1] [file join .. td1x]
 } -returnCodes error -cleanup {
     cd $dir
-} -result [subst {error renaming "[file join .. td1]" to "[file join .. td1x]": permission denied}]
+} -result [subst {error renaming "[file join .. td1]" to "[file join .. td1x]": Permission denied}]
 test fCmd-9.14.3 {file rename: comprehensive: dir into self} -setup {
     cleanup
     set dir [pwd]
@@ -1033,7 +1033,7 @@ test fCmd-10.1 {file copy: comprehensive: source doesn't exist} -setup {
     cleanup
 } -constraints {notRoot} -returnCodes error -body {
     file copy tf1 tf2
-} -result {error copying "tf1": no such file or directory}
+} -result {error copying "tf1": No such file or directory}
 test fCmd-10.2 {file copy: comprehensive: file to new name} -setup {
     cleanup
 } -constraints {notRoot testchmod} -body {
@@ -1106,7 +1106,7 @@ test fCmd-10.4 {file copy: comprehensive: file to existing file} -setup {
     file copy -force tfs3 tfd3
     file copy -force tfs4 tfd4
     list [lsort [glob tf*]] $msg [file writable tfd1] [file writable tfd2] [file writable tfd3] [file writable tfd4]
-} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4 tfs1 tfs2 tfs3 tfs4} {1 {error copying "tf1" to "tf2": file already exists}} 1 1 0 0}
+} -result {{tf1 tf2 tfd1 tfd2 tfd3 tfd4 tfs1 tfs2 tfs3 tfs4} {1 {error copying "tf1" to "tf2": File exists}} 1 1 0 0}
 test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
     cleanup
 } -constraints {notRoot testchmod} -body {
@@ -1130,7 +1130,7 @@ test fCmd-10.5 {file copy: comprehensive: dir to empty dir} -setup {
     set a4 [catch {file copy -force tds3 tdd3}]
     set a5 [catch {file copy -force tds4 tdd4}]
     list [lsort [glob td*]] $a1 $a2 $a3 $a4 $a5
-} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
+} -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": File exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": File exists}} 1 1 1}]
 test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     cleanup
 } -constraints {notRoot unixOrWin testchmod notWsl} -body {
@@ -1142,7 +1142,7 @@ test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     set a1 [list [catch {file copy -force tds1 tdd1} msg] $msg]
     set a2 [list [catch {file copy -force tds2 tdd2} msg] $msg]
     list [lsort [glob td*]] $a1 $a2 [file writable tds1] [file writable tds2]
-} -result [subst {{tdd1 tdd2 tds1 tds2} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} {1 {error copying "tds2" to "[file join tdd2 tds2]": file already exists}} 1 0}]
+} -result [subst {{tdd1 tdd2 tds1 tds2} {1 {error copying "tds1" to "[file join tdd1 tds1]": File exists}} {1 {error copying "tds2" to "[file join tdd2 tds2]": File exists}} 1 0}]
 test fCmd-10.7 {file rename: comprehensive: file to new name and dir} -setup {
     cleanup
 } -constraints {notRoot testchmod} -body {
@@ -1199,13 +1199,13 @@ test fCmd-10.11 {file copy: copy to empty file name} -setup {
 } -returnCodes error -body {
     createfile tf1
     file copy tf1 ""
-} -result {error copying "tf1" to "": no such file or directory}
+} -result {error copying "tf1" to "": No such file or directory}
 test fCmd-10.12 {file rename: rename to empty file name} -setup {
     cleanup
 } -returnCodes error -body {
     createfile tf1
     file rename tf1 ""
-} -result {error renaming "tf1" to "": no such file or directory}
+} -result {error renaming "tf1" to "": No such file or directory}
 cleanup
 
 # old tests
@@ -2354,21 +2354,21 @@ test fCmd-28.5 {file link: source already exists} -setup {
     file link abc.dir abc2.dir
 } -returnCodes error -cleanup {
     cd [workingDirectory]
-} -result {could not create new link "abc.dir": that path already exists}
+} -result {could not create new link "abc.dir": File exists}
 test fCmd-28.6 {file link: unsupported operation} -setup {
     cd [temporaryDirectory]
 } -constraints {linkDirectory win} -body {
     file link -hard abc.link abc.dir
 } -returnCodes error -cleanup {
     cd [workingDirectory]
-} -result {could not create new link "abc.link" pointing to "abc.dir": illegal operation on a directory}
+} -result {could not create new link "abc.link" pointing to "abc.dir": Is a directory}
 test fCmd-28.7 {file link: source already exists} -setup {
     cd [temporaryDirectory]
 } -constraints {linkFile} -body {
     file link abc.file abc2.file
 } -returnCodes error -cleanup {
     cd [workingDirectory]
-} -result {could not create new link "abc.file": that path already exists}
+} -result {could not create new link "abc.file": File exists}
 # In Windows 10 developer mode, we _can_ create symbolic links to files!
 test fCmd-28.8 {file link} -constraints {linkFile winLessThan10} -setup {
     cd [temporaryDirectory]
@@ -2377,7 +2377,7 @@ test fCmd-28.8 {file link} -constraints {linkFile winLessThan10} -setup {
 } -cleanup {
     file delete -force abc.link
     cd [workingDirectory]
-} -returnCodes error -result {could not create new link "abc.link" pointing to "abc.file": invalid argument}
+} -returnCodes error -result {could not create new link "abc.link" pointing to "abc.file": Invalid argument}
 test fCmd-28.9 {file link: success with file} -constraints {linkFile} -setup {
     cd [temporaryDirectory]
     file delete -force abc.link
@@ -2416,7 +2416,7 @@ test fCmd-28.10.1 {file link: linking to nonexistent path} -setup {
     file link doesnt/abc.link abc.dir
 } -returnCodes error -cleanup {
     cd [workingDirectory]
-} -result {could not create new link "doesnt/abc.link": no such file or directory}
+} -result {could not create new link "doesnt/abc.link": No such file or directory}
 test fCmd-28.11 {file link: success with directory} -setup {
     cd [temporaryDirectory]
     file delete -force abc.link
@@ -2463,7 +2463,7 @@ test fCmd-28.13 {file link} -constraints {linkDirectory notWine} -setup {
 } -returnCodes error -cleanup {
     file delete -force abc.link
     cd [workingDirectory]
-} -result {could not create new link "abc.link": that path already exists}
+} -result {could not create new link "abc.link": File exists}
 test fCmd-28.14 {file link: deletes link not dir} -setup {
     cd [temporaryDirectory]
 } -constraints {linkDirectory} -body {
diff --git a/tests/fileName.test b/tests/fileName.test
index 575a17f..6f8966f 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -1331,8 +1331,8 @@ unset globname
 
 catch {file attributes globTest/a1 -permissions 0}
 test filename-15.1 {unix specific globbing} {unix nonPortable} {
-    string tolower [list [catch {glob globTest/a1/*} msg] $msg $errorCode]
-} {1 {couldn't read directory "globtest/a1": permission denied} {posix eacces {permission denied}}}
+    list [catch {glob globTest/a1/*} msg] $msg $errorCode
+} {1 {couldn't read directory "globtest/a1": Permission denied} {POSIX EACCES {Permission denied}}}
 test filename-15.2 {unix specific no complain: no errors} {unix nonPortable} {
     glob -nocomplain globTest/a1/*
 } {}
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 0b6fa1d..40746be 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -498,19 +498,19 @@ test filesystem-5.1 {cache and ~} -constraints testfilesystem -setup {
 
 test filesystem-6.1 {empty file name} -returnCodes error -body {
     open ""
-} -result {couldn't open "": no such file or directory}
+} -result {couldn't open "": No such file or directory}
 test filesystem-6.2 {empty file name} -returnCodes error -body {
     file stat "" arr
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.3 {empty file name} -returnCodes error -body {
     file atime ""
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.4 {empty file name} -returnCodes error -body {
     file attributes ""
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.5 {empty file name} -returnCodes error -body {
     file copy "" ""
-} -result {error copying "": no such file or directory}
+} -result {error copying "": No such file or directory}
 test filesystem-6.6 {empty file name} {file delete ""} {}
 test filesystem-6.7 {empty file name} {file dirname ""} .
 test filesystem-6.8 {empty file name} {file executable ""} 0
@@ -521,19 +521,19 @@ test filesystem-6.12 {empty file name} {file isfile ""} 0
 test filesystem-6.13 {empty file name} {file join ""} {}
 test filesystem-6.14 {empty file name} -returnCodes error -body {
     file link ""
-} -result {could not read link "": no such file or directory}
+} -result {could not read link "": No such file or directory}
 test filesystem-6.15 {empty file name} -returnCodes error -body {
     file lstat "" arr
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.16 {empty file name} -returnCodes error -body {
     file mtime ""
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.17 {empty file name} -returnCodes error -body {
     file mtime "" 0
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.18 {empty file name} -returnCodes error -body {
     file mkdir ""
-} -result {can't create directory "": no such file or directory}
+} -result {can't create directory "": No such file or directory}
 test filesystem-6.19 {empty file name} {file nativename ""} {}
 test filesystem-6.20 {empty file name} {file normalize ""} {}
 test filesystem-6.21 {empty file name} {file owned ""} 0
@@ -541,17 +541,17 @@ test filesystem-6.22 {empty file name} {file pathtype ""} relative
 test filesystem-6.23 {empty file name} {file readable ""} 0
 test filesystem-6.24 {empty file name} -returnCodes error -body {
     file readlink ""
-} -result {could not read link "": no such file or directory}
+} -result {could not read link "": No such file or directory}
 test filesystem-6.25 {empty file name} -returnCodes error -body {
     file rename "" ""
-} -result {error renaming "": no such file or directory}
+} -result {error renaming "": No such file or directory}
 test filesystem-6.26 {empty file name} {file rootname ""} {}
 test filesystem-6.27 {empty file name} -returnCodes error -body {
     file separator ""
 } -result {unrecognised path}
 test filesystem-6.28 {empty file name} -returnCodes error -body {
     file size ""
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.29 {empty file name} {file split ""} {}
 test filesystem-6.30 {empty file name} -returnCodes error -body {
     file system ""
@@ -559,7 +559,7 @@ test filesystem-6.30 {empty file name} -returnCodes error -body {
 test filesystem-6.31 {empty file name} {file tail ""} {}
 test filesystem-6.32 {empty file name} -returnCodes error -body {
     file type ""
-} -result {could not read "": no such file or directory}
+} -result {could not read "": No such file or directory}
 test filesystem-6.33 {empty file name} {file writable ""} 0
 test filesystem-6.34 {file name with (invalid) nul character} {
     list [catch "open foo\x00" msg] $msg
@@ -692,7 +692,7 @@ test filesystem-7.4 {cross-filesystem file copy with -force} -setup {
     file delete -force simplefile
     file delete -force file2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": file already exists} 0 {} 1}
+} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": File exists} 0 {} 1}
 test filesystem-7.5 {cross-filesystem file copy with -force} -setup {
     set dir [pwd]
     cd [tcltest::temporaryDirectory]
@@ -717,7 +717,7 @@ test filesystem-7.5 {cross-filesystem file copy with -force} -setup {
     file delete -force simplefile
     file delete -force file2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": file already exists} 0 {} 1}
+} -result {0 {} 1 {error copying "simplefs:/simplefile" to "file2": File exists} 0 {} 1}
 test filesystem-7.6 {cross-filesystem dir copy with -force} -setup {
     set dir [pwd]
     cd [tcltest::temporaryDirectory]
@@ -745,7 +745,7 @@ test filesystem-7.6 {cross-filesystem dir copy with -force} -setup {
     file delete -force simpledir
     file delete -force dir2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": file already exists} 0 {} 1 1}
+} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": File exists} 0 {} 1 1}
 test filesystem-7.7 {cross-filesystem dir copy with -force} -setup {
     set dir [pwd]
     cd [tcltest::temporaryDirectory]
@@ -775,7 +775,7 @@ test filesystem-7.7 {cross-filesystem dir copy with -force} -setup {
     file delete -force simpledir
     file delete -force dir2
     cd $dir
-} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": file already exists} 0 {} 1 1}
+} -result {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": File exists} 0 {} 1 1}
 removeFile gorp.file
 test filesystem-7.8 {vfs cd} -setup {
     set dir [pwd]
diff --git a/tests/http.test b/tests/http.test
index 587e6e4..6e973d0 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -630,7 +630,7 @@ test http-4.14.$ThreadLevel {http::Event} -body {
     lindex [http::error $token] 0
 } -cleanup {
     catch {http::cleanup $token}
-} -result {connect failed connection refused}
+} -result {Connect failed: Connection refused}
 
 # Bogus host
 test http-4.15.$ThreadLevel {http::Event} -body {
diff --git a/tests/interp.test b/tests/interp.test
index fa263e2..20fa50a 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -1214,7 +1214,7 @@ test interp-20.23 {interp hide vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {1 {permission denied: safe interpreter cannot hide commands}}
+} {1 {Permission denied: safe interpreter cannot hide commands}}
 test interp-20.24 {interp hide vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1224,7 +1224,7 @@ test interp-20.24 {interp hide vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {1 {permission denied: safe interpreter cannot hide commands}}
+} {1 {Permission denied: safe interpreter cannot hide commands}}
 test interp-20.25 {interp hide vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1267,7 +1267,7 @@ test interp-20.28 {interp expose vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
+} {0 {} 1 {Permission denied: safe interpreter cannot expose commands}}
 test interp-20.29 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1278,7 +1278,7 @@ test interp-20.29 {interp expose vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
+} {0 {} 1 {Permission denied: safe interpreter cannot expose commands}}
 test interp-20.30 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1290,7 +1290,7 @@ test interp-20.30 {interp expose vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
+} {0 {} 1 {Permission denied: safe interpreter cannot expose commands}}
 test interp-20.31 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1767,7 +1767,7 @@ test interp-22.5 {testing interp marktrusted} {
     catch {a eval {interp marktrusted b}} msg
     interp delete a
     set msg
-} {permission denied: safe interpreter cannot mark trusted}
+} {Permission denied: safe interpreter cannot mark trusted}
 test interp-22.6 {testing interp marktrusted} {
     catch {interp delete a}
     interp create a -safe
@@ -1775,7 +1775,7 @@ test interp-22.6 {testing interp marktrusted} {
     catch {a eval {b marktrusted}} msg
     interp delete a
     set msg
-} {permission denied: safe interpreter cannot mark trusted}
+} {Permission denied: safe interpreter cannot mark trusted}
 test interp-22.7 {testing interp marktrusted} {
     catch {interp delete a}
     interp create a -safe
@@ -3004,7 +3004,7 @@ test interp-29.6.8 {safe interpreter recursion limit} {
     set n [catch {child eval {interp recursionlimit {} 42}} msg]
     interp delete child
     list $n $msg
-} {1 {permission denied: safe interpreters cannot change recursion limit}}
+} {1 {Permission denied: safe interpreters cannot change recursion limit}}
 test interp-29.6.9 {safe interpreter recursion limit} {
     interp create child -safe
     set result [
@@ -3018,7 +3018,7 @@ test interp-29.6.9 {safe interpreter recursion limit} {
     ]
     interp delete child
     set result
-} {1 {permission denied: safe interpreters cannot change recursion limit}}
+} {1 {Permission denied: safe interpreters cannot change recursion limit}}
 test interp-29.6.10 {safe interpreter recursion limit} {
     interp create child -safe
     set result [
@@ -3032,7 +3032,7 @@ test interp-29.6.10 {safe interpreter recursion limit} {
     ]
     interp delete child
     set result
-} {1 {permission denied: safe interpreters cannot change recursion limit}}
+} {1 {Permission denied: safe interpreters cannot change recursion limit}}
 
 
 #    # Deep recursion (into interps when the regular one fails):
diff --git a/tests/io.test b/tests/io.test
index a085976..b9426b5 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -2855,8 +2855,8 @@ test io-29.27 {Tcl_Flush on closed pipeline} stdio {
 	}
     }
     regsub {".*":} $x {"":} x
-    string tolower $x
-} {1 {error flushing "": broken pipe} {posix epipe {broken pipe}}}
+    set x
+} {1 {error flushing "": Broken pipe} {POSIX EPIPE {Broken pipe}}}
 test io-29.28 {Tcl_WriteChars, lf mode} {
     file delete $path(test1)
     set f [open $path(test1) w]
@@ -4211,7 +4211,7 @@ test io-32.3 {Tcl_Read, negative byte count} {
     set l [list [catch {read $f -1} msg] $msg]
     close $f
     set l
-} {1 {expected non-negative integer but got "-1"}}
+} {1 {Expected non-negative integer but got "-1"}}
 test io-32.4 {Tcl_Read, positive byte count} {
     set f [open $path(longfile) r]
     set x [read $f 1024]
@@ -4753,8 +4753,8 @@ test io-34.8 {Tcl_Seek on pipes: not supported} stdio {
     set x [list [catch {seek $f1 0 current} msg] $msg]
     close $f1
     regsub {".*":} $x {"":} x
-    string tolower $x
-} {1 {error during seek on "": invalid argument}}
+    set x
+} {1 {error during seek on "": Invalid argument}}
 test io-34.9 {Tcl_Seek, testing buffered input flushing} {
     file delete $path(test3)
     set f [open $path(test3) w]
@@ -5931,11 +5931,11 @@ test io-40.10 {POSIX open access modes: RDONLY} {
 test io-40.11 {POSIX open access modes: RDONLY} -match regexp -body {
     file delete $path(test3)
     open $path(test3) RDONLY
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test io-40.12 {POSIX open access modes: WRONLY} -match regexp -body {
     file delete $path(test3)
     open $path(test3) WRONLY
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test io-40.13 {POSIX open access modes: WRONLY} {
     makeFile xyzzy test3
     set f [open $path(test3) WRONLY]
@@ -5951,7 +5951,7 @@ test io-40.13 {POSIX open access modes: WRONLY} {
 test io-40.14 {POSIX open access modes: RDWR} -match regexp -body {
     file delete $path(test3)
     open $path(test3) RDWR
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test io-40.15 {POSIX open access modes: RDWR} {
     makeFile xyzzy test3
     set f [open $path(test3) RDWR]
@@ -7638,7 +7638,7 @@ test io-52.20 {TclCopyChannel & encodings} -setup {
 } -cleanup {
     close $in
     close $out
-} -returnCodes 1 -match glob -result {error reading "file*": illegal byte sequence}
+} -returnCodes 1 -match glob -result {error reading "file*": Invalid or incomplete multibyte or wide character}
 test io-52.21 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -7659,7 +7659,7 @@ test io-52.21 {TclCopyChannel & encodings} -setup {
 } -cleanup {
     close $in
     close $out
-} -returnCodes 1 -match glob -result {error writing "file*": illegal byte sequence}
+} -returnCodes 1 -match glob -result {error writing "file*": Invalid or incomplete multibyte or wide character}
 test io-52.22 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -7686,7 +7686,7 @@ test io-52.22 {TclCopyChannel & encodings} -setup {
     close $in
     close $out
     unset ::s0
-} -match glob -result {0 {error reading "file*": illegal byte sequence}}
+} -match glob -result {0 {error reading "file*": Invalid or incomplete multibyte or wide character}}
 test io-52.23 {TclCopyChannel & encodings} -setup {
     set out [open $path(utf8-fcopy.txt) w]
     fconfigure $out -encoding utf-8 -translation lf
@@ -7713,7 +7713,7 @@ test io-52.23 {TclCopyChannel & encodings} -setup {
     close $in
     close $out
     unset ::s0
-} -match glob -result {0 {error writing "file*": illegal byte sequence}}
+} -match glob -result {0 {error writing "file*": Invalid or incomplete multibyte or wide character}}
 
 
 test io-53.1 {CopyData} {fcopy} {
@@ -8696,7 +8696,7 @@ test io-60.1 {writing illegal utf sequences} {fileevent testbytestring} {
     # cut of the remainder of the error stack, especially the filename
     set result [lreplace $result 3 3 [lindex [split [lindex $result 3] \n] 0]]
     list $x $result
-} {1 {gets ABC catch {error writing "stdout": illegal byte sequence}}}
+} {1 {gets ABC catch {error writing "stdout": Invalid or incomplete multibyte or wide character}}}
 
 test io-61.1 {Reset eof state after changing the eof char} -setup {
     set datafile [makeFile {} eofchar]
@@ -9166,7 +9166,7 @@ test io-75.6 {invalid utf-8 encoding gets is not ignored (-profile strict)} -set
 } -cleanup {
     close $f
     removeFile io-75.6
-} -match glob -returnCodes 1 -result {error reading "*": illegal byte sequence}
+} -match glob -returnCodes 1 -result {error reading "*": Invalid or incomplete multibyte or wide character}
 
 test io-75.7 {invalid utf-8 encoding gets is not ignored (-profile strict)} -setup {
     set fn [makeFile {} io-75.7]
@@ -9182,7 +9182,7 @@ test io-75.7 {invalid utf-8 encoding gets is not ignored (-profile strict)} -set
 } -cleanup {
     close $f
     removeFile io-75.7
-} -match glob -returnCodes 1 -result {error reading "*": illegal byte sequence}
+} -match glob -returnCodes 1 -result {error reading "*": Invalid or incomplete multibyte or wide character}
 
 test io-75.8 {invalid utf-8 encoding eof handling (-profile strict)} -setup {
     set fn [makeFile {} io-75.8]
@@ -9216,7 +9216,7 @@ test io-75.9 {unrepresentable character write passes and is replaced by ?} -setu
 } -cleanup {
     close $f
     removeFile io-75.9
-} -match glob -result [list {A} {error writing "*": illegal byte sequence}]
+} -match glob -result [list {A} {error writing "*": Invalid or incomplete multibyte or wide character}]
 
 # Incomplete sequence test.
 # This error may IMHO only be detected with the close.
@@ -9260,7 +9260,7 @@ test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
 } -cleanup {
     close $f
     removeFile io-75.11
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+} -match glob -result {41 1 {error reading "*": Invalid or incomplete multibyte or wide character}}
 
 test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
     set fn [makeFile {} io-75.12]
@@ -9295,7 +9295,7 @@ test io-75.13 {invalid utf-8 encoding read is not ignored (-profile strict)} -se
 } -cleanup {
     close $f
     removeFile io-75.13
-} -match glob -result {41 1 {error reading "*": illegal byte sequence}}
+} -match glob -result {41 1 {error reading "*": Invalid or incomplete multibyte or wide character}}
 
 # ### ### ### ######### ######### #########
 
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 61b3bdd..6054cc9 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -138,7 +138,7 @@ test iocmd-4.8 {read command with incorrect combination of arguments} {
 } {1 {wrong # args: should be "read channelId ?numChars?" or "read ?-nonewline? channelId"} {TCL WRONGARGS}}
 test iocmd-4.9 {read command} {
     list [catch {read stdin foo} msg] $msg $::errorCode
-} {1 {expected non-negative integer but got "foo"} {TCL VALUE NUMBER}}
+} {1 {Expected non-negative integer but got "foo"} {TCL VALUE NUMBER}}
 test iocmd-4.10 {read command} {
     list [catch {read file107} msg] $msg $::errorCode
 } {1 {can not find channel named "file107"} {TCL LOOKUP CHANNEL file107}}
@@ -156,7 +156,7 @@ test iocmd-4.12 {read command} -setup {
     read $f 12z
 } -cleanup {
     close $f
-} -result {expected non-negative integer but got "12z"} -errorCode {TCL VALUE NUMBER}
+} -result {Expected non-negative integer but got "12z"} -errorCode {TCL VALUE NUMBER}
 
 test iocmd-5.1 {seek command} -returnCodes error -body {
     seek
@@ -439,7 +439,7 @@ test iocmd-11.3 {I/O to command pipelines} {unixOrWin unixExecs} {
 } {1 {can't read output from command: standard output was redirected} {TCL OPERATION EXEC BADREDIRECT}}
 test iocmd-11.4 {I/O to command pipelines} {notValgrind unixOrWin} {
     list [catch {open "| no_such_command_exists" rb} msg] $msg $::errorCode
-} {1 {couldn't execute "no_such_command_exists": no such file or directory} {POSIX ENOENT {no such file or directory}}}
+} {1 {couldn't execute "no_such_command_exists": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 
 test iocmd-12.1 {POSIX open access modes: RDONLY} {
     file delete $path(test1)
@@ -456,11 +456,11 @@ test iocmd-12.1 {POSIX open access modes: RDONLY} {
 test iocmd-12.2 {POSIX open access modes: RDONLY} -match regexp -body {
     file delete $path(test3)
     open $path(test3) RDONLY
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test iocmd-12.3 {POSIX open access modes: WRONLY} -match regexp -body {
     file delete $path(test3)
     open $path(test3) WRONLY
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 #
 # Test 13.4 relies on assigning the same channel name twice.
 #
@@ -486,7 +486,7 @@ test iocmd-12.4 {POSIX open access modes: WRONLY} {unix} {
 test iocmd-12.5 {POSIX open access modes: RDWR} -match regexp -body {
     file delete $path(test3)
     open $path(test3) RDWR
-} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory}
+} -returnCodes error -result {(?i)couldn't open ".*test3": No such file or directory}
 test iocmd-12.6 {POSIX open access modes: errors} {
     concat [catch {open $path(test3) "FOO \{BAR BAZ"} msg] $msg\n$::errorInfo
 } "1 unmatched open brace in list
@@ -545,8 +545,8 @@ test iocmd-13.5 {errors in open command} {
 test iocmd-13.6 {errors in open command} {
     set msg [list [catch {open _non_existent_} msg] $msg $::errorCode]
     regsub [file join {} _non_existent_] $msg "_non_existent_" msg
-    string tolower $msg
-} {1 {couldn't open "_non_existent_": no such file or directory} {posix enoent {no such file or directory}}}
+    set msg
+} {1 {couldn't open "_non_existent_": No such file or directory} {POSIX ENOENT {No such file or directory}}}
 test iocmd-13.7 {errors in open command} {
     list [catch {open $path(test1) b} msg] $msg
 } {1 {illegal access mode "b"}}
@@ -884,7 +884,7 @@ test iocmd-21.22 {[close] in [read] segfaults} -setup {
 } -returnCodes error -cleanup {
     catch {close $ch}
     rename foo {}
-} -match glob -result {*invalid argument*}
+} -match glob -result {*Invalid argument*}
 test iocmd-21.23 {[close] in [gets] segfaults} -setup {
     proc foo {method chan args} {
 	switch -- $method initialize {
@@ -1743,7 +1743,7 @@ test iocmd-28.10 {chan seek, not supported by handler} -match glob -body {
     close $c
     rename foo {}
     set res
-} -result {1 {error during seek on "rc*": invalid argument}}
+} -result {1 {error during seek on "rc*": Invalid argument}}
 test iocmd-28.11 {chan seek, error return} -match glob -body {
     set res {}
     proc foo {args} {oninit seek; onfinal; track; return -code error BOOM!}
@@ -3433,7 +3433,7 @@ test iocmd.tf-28.10 {chan seek, not supported by handler} -match glob -body {
     } c]
     rename foo {}
     set res
-} -result {1 {error during seek on "rc*": invalid argument}} \
+} -result {1 {error during seek on "rc*": Invalid argument}} \
     -constraints {testchannel thread}
 test iocmd.tf-28.11 {chan seek, error return} -match glob -body {
     set res {}
diff --git a/tests/load.test b/tests/load.test
index 005c451..32b1c3b 100644
--- a/tests/load.test
+++ b/tests/load.test
@@ -96,13 +96,13 @@ test load-3.1 {error in _Init procedure, same interpreter} \
 	[list $dll $loaded] {
     list [catch {load [file join $testDir pkge$ext] pkge} msg] \
 	    $msg $::errorInfo $::errorCode
-} {1 {couldn't open "non_existent": no such file or directory} {couldn't open "non_existent": no such file or directory
+} {1 {couldn't open "non_existent": No such file or directory} {couldn't open "non_existent": No such file or directory
     while executing
 "open non_existent"
     invoked from within
 "if 44 {open non_existent}"
     invoked from within
-"load [file join $testDir pkge$ext] pkge"} {POSIX ENOENT {no such file or directory}}}
+"load [file join $testDir pkge$ext] pkge"} {POSIX ENOENT {No such file or directory}}}
 test load-3.2 {error in _Init procedure, child interpreter} \
 	[list $dll $loaded] {
     catch {interp delete x}
@@ -113,13 +113,13 @@ test load-3.2 {error in _Init procedure, child interpreter} \
 	    $msg $::errorInfo $::errorCode]
     interp delete x
     set result
-} {1 {couldn't open "non_existent": no such file or directory} {couldn't open "non_existent": no such file or directory
+} {1 {couldn't open "non_existent": No such file or directory} {couldn't open "non_existent": No such file or directory
     while executing
 "open non_existent"
     invoked from within
 "if 44 {open non_existent}"
     invoked from within
-"load [file join $testDir pkge$ext] pkge x"} {POSIX ENOENT {no such file or directory}}}
+"load [file join $testDir pkge$ext] pkge x"} {POSIX ENOENT {No such file or directory}}}
 
 test load-4.1 {reloading package into same interpreter} [list $dll $loaded] {
     list [catch {load [file join $testDir pkga$ext] pkga} msg] $msg
diff --git a/tests/macOSXFCmd.test b/tests/macOSXFCmd.test
index 5a62a2a..dc0eca0 100644
--- a/tests/macOSXFCmd.test
+++ b/tests/macOSXFCmd.test
@@ -34,7 +34,7 @@ if {[testConstraint unix] && $tcl_platform(os) eq "Darwin"} {
 test macOSXFCmd-1.1 {MacOSXGetFileAttribute - file not found} {macosxFileAttr notRoot} {
     catch {file delete -force -- foo.test}
     list [catch {file attributes foo.test -creator} msg] $msg
-} {1 {could not read "foo.test": no such file or directory}}
+} {1 {could not read "foo.test": No such file or directory}}
 test macOSXFCmd-1.2 {MacOSXGetFileAttribute - creator} {macosxFileAttr notRoot} {
     catch {file delete -force -- foo.test}
     close [open foo.test w]
@@ -63,7 +63,7 @@ test macOSXFCmd-1.5 {MacOSXGetFileAttribute - rsrclength} {macosxFileAttr notRoo
 test macOSXFCmd-2.1 {MacOSXSetFileAttribute - file not found} {macosxFileAttr notRoot} {
     catch {file delete -force -- foo.test}
     list [catch {file attributes foo.test -creator FOOC} msg] $msg
-} {1 {could not read "foo.test": no such file or directory}}
+} {1 {could not read "foo.test": No such file or directory}}
 test macOSXFCmd-2.2 {MacOSXSetFileAttribute - creator} {macosxFileAttr notRoot} {
     catch {file delete -force -- foo.test}
     close [open foo.test w]
diff --git a/tests/result.test b/tests/result.test
index 5ae29b2..3a86930 100644
--- a/tests/result.test
+++ b/tests/result.test
@@ -62,7 +62,7 @@ test result-2.1 {Tcl_RestoreInterpResult} {testsaveresult} {
 
 test result-3.1 {Tcl_DiscardInterpResult} -constraints testsaveresult -body {
     testsaveresult append {cd _foobar} 1
-} -returnCodes error -result {couldn't change working directory to "_foobar": no such file or directory}
+} -returnCodes error -result {couldn't change working directory to "_foobar": No such file or directory}
 test result-3.2 {Tcl_DiscardInterpResult} {testsaveresult} {
     testsaveresult free {set x 42} 1
 } {42}
diff --git a/tests/safe-stock.test b/tests/safe-stock.test
index d23d86e..f79db4f 100644
--- a/tests/safe-stock.test
+++ b/tests/safe-stock.test
@@ -45,7 +45,7 @@ foreach i [interp children] {
 if {[string match *zipfs:/* [info library]]} {
     # pkgIndex.tcl is in [info library]
     # file to be sourced is in [info library]/opt*
-    set pkgOptErrMsg {permission denied}
+    set pkgOptErrMsg {Permission denied}
 } else {
     # pkgIndex.tcl and file to be sourced are
     # both in [info library]/opt*
diff --git a/tests/safe.test b/tests/safe.test
index f3890b7..8efed54 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -549,7 +549,7 @@ test safe-8.3 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result {1 {permission denied} {{ERROR for child a : ".": is a directory}}}
+} -result {1 {Permission denied} {{ERROR for child a : ".": is a directory}}}
 test safe-8.4 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -565,7 +565,7 @@ test safe-8.4 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result {1 {permission denied} {{ERROR for child a : "/abc/def": not in access_path}}}
+} -result {1 {Permission denied} {{ERROR for child a : "/abc/def": not in access_path}}}
 test safe-8.5 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -585,7 +585,7 @@ test safe-8.5 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result [list 1 {no such file or directory} [list "ERROR for child a : [file join [info library] blah]:no such file or directory"]]
+} -result [list 1 {No such file or directory} [list "ERROR for child a : [file join [info library] blah]:No such file or directory"]]
 test safe-8.6 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -603,7 +603,7 @@ test safe-8.6 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result [list 1 {no such file or directory} [list "ERROR for child a : [file join [info library] blah.tcl]:no such file or directory"]]
+} -result [list 1 {No such file or directory} [list "ERROR for child a : [file join [info library] blah.tcl]:No such file or directory"]]
 test safe-8.7 {safe source control on file} -setup {
     set i "a"
     catch {safe::interpDelete $i}
@@ -623,7 +623,7 @@ test safe-8.7 {safe source control on file} -setup {
     safe::interpDelete $i
     rename safe-test-log {}
     unset i log
-} -result [list 1 {no such file or directory} [list "ERROR for child a : [file join [info library] xxxxxxxxxxx.tcl]:no such file or directory"]]
+} -result [list 1 {No such file or directory} [list "ERROR for child a : [file join [info library] xxxxxxxxxxx.tcl]:No such file or directory"]]
 test safe-8.8 {safe source forbids -rsrc} emptyTest {
     # Disabled this test.  It was only useful for long unsupported
     # Mac OS 9 systems. [Bug 860a9f1945]
@@ -1389,14 +1389,14 @@ test safe-10.2 {testing statics loading / -nostatics} -constraints tcl::test -bo
     interp eval $i {load {} Safepfx1}
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {permission denied (static library)}
+} -result {Permission denied (static library)}
 test safe-10.3 {testing nested statics loading / no nested by default} -setup {
     set i [safe::interpCreate]
 } -constraints tcl::test -body {
     interp eval $i {interp create x; load {} Safepfx1 x}
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {permission denied (nested load)}
+} -result {Permission denied (nested load)}
 test safe-10.4 {testing nested statics loading / -nestedloadok} -constraints tcl::test -body {
     set i [safe::interpCreate -nestedloadok]
     interp eval $i {interp create x; load {} Safepfx1 x}
@@ -1521,21 +1521,21 @@ test safe-12.1 {glob is restricted [Bug 2906841]} -setup {
     $i eval glob ../*
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result "permission denied"
+} -result "Permission denied"
 test safe-12.2 {glob is restricted [Bug 2906841]} -setup {
     set i [safe::interpCreate]
 } -body {
     $i eval glob -directory .. *
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result "permission denied"
+} -result "Permission denied"
 test safe-12.3 {glob is restricted [Bug 2906841]} -setup {
     set i [safe::interpCreate]
 } -body {
     $i eval glob -join .. *
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result "permission denied"
+} -result "Permission denied"
 test safe-12.4 {glob is restricted [Bug 2906841]} -setup {
     set i [safe::interpCreate]
 } -body {
@@ -1563,7 +1563,7 @@ test safe-12.7 {glob is restricted} -setup {
     $i eval glob *
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {permission denied}
+} -result {Permission denied}
 
 ### 13. More tests for Safe base glob, with patches @ Bug 2964715
 ###     More tests of glob in sections 12, 16.
@@ -1590,7 +1590,7 @@ test safe-13.1 {glob is restricted [Bug 2964715]} -setup {
     $i eval glob *
 } -returnCodes error -cleanup {
     safe::interpDelete $i
-} -result {permission denied}
+} -result {Permission denied}
 test safe-13.2 {mimic the valid glob call by ::tcl::tm::UnknownHandler [Bug 2964715]} -setup {
     set i [safe::interpCreate]
     buildEnvironment deleteme.tm
@@ -1614,7 +1614,7 @@ test safe-13.3 {cf 13.2 but test glob failure when -directory is outside access
 } -returnCodes error -cleanup {
     safe::interpDelete $i
     removeDirectory $testdir
-} -result {permission denied}
+} -result {Permission denied}
 test safe-13.4 {another valid glob call [Bug 2964715]} -setup {
     set i [safe::interpCreate]
     buildEnvironment deleteme.tm
@@ -1642,7 +1642,7 @@ test safe-13.5 {as 13.4 but test glob failure when -directory is outside access
 } -returnCodes error -cleanup {
     safe::interpDelete $i
     removeDirectory $testdir
-} -result {permission denied}
+} -result {Permission denied}
 test safe-13.6 {as 13.4 but test silent failure when result is outside access_path [Bug 2964715]} -setup {
     set i [safe::interpCreate]
     buildEnvironment deleteme.tm
diff --git a/tests/socket.test b/tests/socket.test
index b1435be..5e6ba66 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -645,7 +645,7 @@ test socket_$af-2.9 {socket conflict} -constraints [list socket supported_$af st
     close $f
 } -returnCodes error -cleanup {
     close $s
-} -match glob -result {couldn't open socket: address already in use*}
+} -match glob -result {couldn't open socket: Address in use*}
 test socket_$af-2.10 {close on accept, accepted socket lives} -setup {
     set done 0
     set timer [after 20000 "set done timed_out"]
@@ -802,7 +802,7 @@ test socket_$af-3.1 {socket conflict} -constraints [list socket supported_$af st
 } -cleanup {
     puts $f bye
     close $f
-} -returnCodes error -result {couldn't open socket: address already in use}
+} -returnCodes error -result {couldn't open socket: Address in use}
 test socket_$af-3.2 {server with several clients} -setup {
     file delete $path(script)
     set f [open $path(script) w]
@@ -1397,7 +1397,7 @@ test socket_$af-11.6 {socket conflict} -setup {
     list [getPort $s2] [close $s2]
 } -cleanup {
     close $s1
-} -returnCodes error -result {couldn't open socket: address already in use}
+} -returnCodes error -result {couldn't open socket: Address in use}
 test socket_$af-11.7 {server with several clients} -setup {
     set port [sendCommand {
 	set server [socket -server accept 0]
@@ -2041,7 +2041,7 @@ test socket-14.1 {[socket -async] fileevent while still connecting} \
         close $client
         unset x
     } -result {{} ok}
-test socket-14.2 {[socket -async] fileevent connection refused} \
+test socket-14.2 {[socket -async] fileevent Connection refused} \
     -constraints {socket} \
     -body {
         set client [socket -async localhost [randport]]
@@ -2054,7 +2054,7 @@ test socket-14.2 {[socket -async] fileevent connection refused} \
         after cancel $after
         close $client
         unset x after client
-    } -result {ok {connection refused}}
+    } -result {ok {Connection refused}}
 test socket-14.3 {[socket -async] when server only listens on IPv6} \
     -constraints {socket supported_inet6 localhost_v6} \
     -setup {
@@ -2113,7 +2113,7 @@ test socket-14.5 {[socket -async] which fails before any connect() can be made}
         socket -async -myaddr 192.0.2.42 127.0.0.1 [randport]
     } \
     -returnCodes 1 \
-    -result {couldn't open socket: cannot assign requested address}
+    -result {couldn't open socket: Cannot assign requested address}
 test socket-14.6.0 {[socket -async] with no event loop and server listening on IPv4} \
     -constraints {socket supported_inet localhost_v4} \
     -setup {
@@ -2226,7 +2226,7 @@ test socket-14.7.2 {pending [socket -async] and blocking [gets], no listener} \
         list $x [fconfigure $sock -error] [fconfigure $sock -error]
     } -cleanup {
         close $sock
-    } -match glob -result {{error reading "sock*": socket is not connected} {connection refused} {}}
+    } -match glob -result {{error reading "sock*": Transport endpoint is not connected} {Connection refused} {}}
 test socket-14.8.0 {pending [socket -async] and nonblocking [gets], server is IPv4} \
     -constraints {socket supported_inet localhost_v4} \
     -setup {
@@ -2291,7 +2291,7 @@ test socket-14.8.2 {pending [socket -async] and nonblocking [gets], no listener}
         list $x [fconfigure $sock -error] [fconfigure $sock -error]
     } -cleanup {
         close $sock
-    } -match glob -result {{error reading "sock*": socket is not connected} {connection refused} {}}
+    } -match glob -result {{error reading "sock*": Transport endpoint is not connected} {Connection refused} {}}
 test socket-14.9.0 {pending [socket -async] and blocking [puts], server is IPv4} \
     -constraints {socket supported_inet localhost_v4} \
     -setup {
@@ -2406,7 +2406,7 @@ test socket-14.11.0 {pending [socket -async] and nonblocking [puts], no listener
     } -cleanup {
         catch {close $sock}
         unset x
-    } -result {socket is not connected} -returnCodes 1
+    } -result {Transport endpoint is not connected} -returnCodes 1
 test socket-14.11.1 {pending [socket -async] and nonblocking [puts], no listener, flush} \
     -constraints {socket testsocket_testflags} \
     -body {
@@ -2425,7 +2425,7 @@ test socket-14.11.1 {pending [socket -async] and nonblocking [puts], no listener
     } -cleanup {
         catch {close $sock}
         catch {unset x}
-    } -result {socket is not connected} -returnCodes 1
+    } -result {Transport endpoint is not connected} -returnCodes 1
 test socket-14.12 {[socket -async] background progress triggered by [fconfigure -error]} \
     -constraints {socket} \
     -body {
@@ -2439,7 +2439,7 @@ test socket-14.12 {[socket -async] background progress triggered by [fconfigure
     } -cleanup {
         close $s
         unset x s
-    } -result {connection refused}
+    } -result {Connection refused}
 
 test socket-14.13 {testing writable event when quick failure} \
     -constraints {socket win supported_inet notWine} \
@@ -2543,7 +2543,7 @@ set num 0
 set x {localhost {socket} 127.0.0.1 {supported_inet} ::1 {supported_inet6}}
 set resultok {-result "sock*" -match glob}
 set resulterr {
-    -result {couldn't open socket: connection refused}
+    -result {couldn't open socket: Connection refused}
     -returnCodes 1
 }
 foreach {servip sc} $x {
diff --git a/tests/source.test b/tests/source.test
index f5f9f0f..59a9d1a 100644
--- a/tests/source.test
+++ b/tests/source.test
@@ -104,8 +104,8 @@ test source-2.6 {source error conditions} -setup {
     removeFile _non_existent_
 } -body {
     source $sourcefile
-} -match glob -result {couldn't read file "*_non_existent_": no such file or directory} \
-	-errorCode {POSIX ENOENT {no such file or directory}}
+} -match glob -result {couldn't read file "*_non_existent_": No such file or directory} \
+	-errorCode {POSIX ENOENT {No such file or directory}}
 test source-2.7 {utf-8 with BOM} -setup {
     set sourcefile [makeFile {} source.file]
 } -body {
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index e1084af..4f5d8f4 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -103,7 +103,7 @@ test unixFCmd-1.1 {TclpRenameFile: EACCES} -setup {
 } -returnCodes error -cleanup {
     file attributes td1/td2 -permissions 0o755
     cleanup
-} -result {error renaming "td1/td2/td3": permission denied}
+} -result {error renaming "td1/td2/td3": Permission denied}
 test unixFCmd-1.2 {TclpRenameFile: EEXIST} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
@@ -112,7 +112,7 @@ test unixFCmd-1.2 {TclpRenameFile: EEXIST} -setup {
     file rename td2 td1
 } -returnCodes error -cleanup {
     cleanup
-} -result {error renaming "td2" to "td1/td2": file already exists}
+} -result {error renaming "td2" to "td1/td2": File exists}
 test unixFCmd-1.3 {TclpRenameFile: EINVAL} -setup {
     cleanup
 } -constraints {unix notRoot} -body {
@@ -131,7 +131,7 @@ test unixFCmd-1.5 {TclpRenameFile: ENOENT} -setup {
     file rename td2 td1
 } -returnCodes error -cleanup {
     cleanup
-} -result {error renaming "td2": no such file or directory}
+} -result {error renaming "td2": No such file or directory}
 test unixFCmd-1.6 {TclpRenameFile: ENOTDIR} {emptyTest unix notRoot} {
     # can't make it happen
 } {}
@@ -145,7 +145,7 @@ test unixFCmd-1.7 {TclpRenameFile: EXDEV} -setup {
     catch {file delete /tmp/bar}
     catch {file attr foo -perm 0o40777}
     catch {file delete -force foo}
-} -match glob -result {*: permission denied}
+} -match glob -result {*: Permission denied}
 test unixFCmd-1.8 {Checking EINTR Bug} {unix notRoot nonPortable} {
     testalarm
     after 2000
@@ -261,7 +261,7 @@ test unixFCmd-12.1 {GetGroupAttribute - file not found} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -returnCodes error -body {
     file attributes foo.test -group
-} -result {could not read "foo.test": no such file or directory}
+} -result {could not read "foo.test": No such file or directory}
 test unixFCmd-12.2 {GetGroupAttribute - file found} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -body {
@@ -275,7 +275,7 @@ test unixFCmd-13.1 {GetOwnerAttribute - file not found} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -returnCodes error -body {
     file attributes foo.test -group
-} -result {could not read "foo.test": no such file or directory}
+} -result {could not read "foo.test": No such file or directory}
 test unixFCmd-13.2 {GetOwnerAttribute} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -body {
@@ -289,7 +289,7 @@ test unixFCmd-14.1 {GetPermissionsAttribute - file not found} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -returnCodes error -body {
     file attributes foo.test -permissions
-} -result {could not read "foo.test": no such file or directory}
+} -result {could not read "foo.test": No such file or directory}
 test unixFCmd-14.2 {GetPermissionsAttribute} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -body {
@@ -311,7 +311,7 @@ test unixFCmd-15.2 {SetGroupAttribute - invalid file} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot foundGroup} -returnCodes error -body {
     file attributes foo.test -group $group
-} -result {could not set group for file "foo.test": no such file or directory}
+} -result {could not set group for file "foo.test": No such file or directory}
 
 #changing owners hard to do
 test unixFCmd-16.1 {SetOwnerAttribute - current owner} -setup {
@@ -327,7 +327,7 @@ test unixFCmd-16.2 {SetOwnerAttribute - invalid file} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -returnCodes error -body {
     file attributes foo.test -owner $user
-} -result {could not set owner for file "foo.test": no such file or directory}
+} -result {could not set owner for file "foo.test": No such file or directory}
 test unixFCmd-16.3 {SetOwnerAttribute - invalid owner} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -returnCodes error -body {
@@ -347,7 +347,7 @@ test unixFCmd-17.2 {SetPermissionsAttribute} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -returnCodes error -body {
     file attributes foo.test -permissions 0
-} -result {could not set permissions for file "foo.test": no such file or directory}
+} -result {could not set permissions for file "foo.test": No such file or directory}
 test unixFCmd-17.3 {SetPermissionsAttribute} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot} -body {
@@ -404,7 +404,7 @@ test unixFCmd-19.1 {GetReadOnlyAttribute - file not found} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot readonlyAttr} -returnCodes error -body {
     file attributes foo.test -readonly
-} -result {could not read "foo.test": no such file or directory}
+} -result {could not read "foo.test": No such file or directory}
 test unixFCmd-19.2 {GetReadOnlyAttribute} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot readonlyAttr} -body {
@@ -430,7 +430,7 @@ test unixFCmd-20.2 {SetReadOnlyAttribute} -setup {
     catch {file delete -force -- foo.test}
 } -constraints {unix notRoot readonlyAttr} -returnCodes error -body {
     file attributes foo.test -readonly 1
-} -result {could not read "foo.test": no such file or directory}
+} -result {could not read "foo.test": No such file or directory}
 
 # cleanup
 cleanup
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 3be1920..6848f21 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -946,12 +946,12 @@ test winFCmd-10.1 {AttributesPosixError - get} -constraints {win} -setup {
     cleanup
 } -body {
     file attributes td1 -archive
-} -returnCodes error -result {could not read "td1": no such file or directory}
+} -returnCodes error -result {could not read "td1": No such file or directory}
 test winFCmd-10.2 {AttributesPosixError - set} -constraints {win} -setup {
     cleanup
 } -body {
     file attributes td1 -archive 0
-} -returnCodes error -result {could not read "td1": no such file or directory}
+} -returnCodes error -result {could not read "td1": No such file or directory}
 
 test winFCmd-11.1 {GetWinFileAttributes} -constraints {win} -setup {
     cleanup
@@ -1098,7 +1098,7 @@ test winFCmd-15.1 {SetWinFileAttributes} -constraints {win} -setup {
     cleanup
 } -body {
     file attributes td1 -archive 0
-} -returnCodes error -result {could not read "td1": no such file or directory}
+} -returnCodes error -result {could not read "td1": No such file or directory}
 test winFCmd-15.2 {SetWinFileAttributes - archive} -constraints {win} -setup {
     cleanup
 } -body {
@@ -1268,11 +1268,11 @@ test winFCmd-17.1 {Windows bad permissions cd} -constraints win -body {
 	regsub ".*: " $err "" err
 	set err
     } else {
-        set err "permission denied"
+        set err "Permission denied"
     }
 } -cleanup {
     cd $pwd
-} -result "permission denied"
+} -result "Permission denied"
 
 cd $pwd
 unset d dd pwd
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 7396258..5cd6b7db 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -380,7 +380,7 @@ TclpInitPlatform(void)
     }
 
     /*
-     * The code below causes SIGPIPE (broken pipe) errors to be ignored. This
+     * The code below causes SIGPIPE (Broken pipe) errors to be ignored. This
      * is needed so that Tcl processes don't die if they create child
      * processes (e.g. using "exec" or "open") that terminate prematurely.
      * The signal handler is only set up when the first interpreter is
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 7f8cfd1..19411e8 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -1603,7 +1603,7 @@ ConvertFileNameFormat(
     if (splitPath == NULL || pathc == 0) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "could not read \"%s\": no such file or directory",
+		    "could not read \"%s\": No such file or directory",
 		    Tcl_GetString(fileName)));
 	    errno = ENOENT;
 	    Tcl_PosixError(interp);
-- 
cgit v0.12


From 2122f0eb09d729bfbfbdbbf1540fa26bbfa42453 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sun, 26 Mar 2023 14:55:23 +0000
Subject: Failing test for [6d4e9d1af5bf5b7d].

---
 tests/fileName.test | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/tcltests.tcl  | 12 +++++++++++
 2 files changed, 73 insertions(+)

diff --git a/tests/fileName.test b/tests/fileName.test
index 575a17f..09662ff 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -18,6 +18,7 @@ if {"::tcltest" ni [namespace children]} {
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact tcl::test [info patchlevel]]
+source [file join [file dirname [info script]] tcltests.tcl]
 
 testConstraint testsetplatform [llength [info commands testsetplatform]]
 testConstraint testtranslatefilename [llength [info commands testtranslatefilename]]
@@ -1629,6 +1630,66 @@ test fileName-20.10 {globbing for special chars} -setup {
     removeFile fileName-20.10 $s
     removeDirectory sub ~
 } -result ~/sub/fileName-20.10
+
+
+apply [list {} {
+    test fileName-6d4e9d1af5bf5b7d {
+	memory leak in SetFsPathFromAny
+
+	Runs under both a TCL_DEBUG_MEM build and a -DPURIFY build for
+	valgrind, which is useful since Valgrind provides information about the
+	error location, but [memory] doesn't.
+    } -setup {
+	makeFile {puts "In script"} script
+
+	if {[namespace which ::memory] eq {}} {
+	    set memcheckcmd [list ::apply [list script {
+		uplevel 1 $script
+		return 0
+	    } [namespace current]]]
+	} else {
+	    set memcheckcmd ::tcltests::scriptmemcheck
+	}
+    } -body {
+	{*}$memcheckcmd {
+	    set interp [interp create]
+	    interp eval $interp {
+		apply [list {} {
+		    upvar 1 f f 
+
+		    # A unique name so that no internal representation of this
+		    # literal value has been picked up from any other script
+		    # that has alredy been sourced into this interpreter.
+		    set variableUniqueInTheEntireTclCodebase a
+		    set name variableUniqueInTheEntireTclCodebase
+
+		    # give the Tcl_Obj for "var1" an internal representation of
+		    # type 'localVarNameType'.
+		    set $name
+
+		    set f [open variableUniqueInTheEntireTclCodebase w]
+			try {
+				puts $f {some data}
+			} finally {
+				close $f
+			}
+
+		    set f [open variableUniqueInTheEntireTclCodebase]
+			try {
+				read $f
+			} finally {
+				catch {file delete variableUniqueInTheEntireTclCodebase}
+				close $f
+			}
+		} [namespace current]]
+	    }
+	    interp delete $interp
+	}
+    } -result 0
+} [namespace current]]
+    
+
+
 
 # cleanup
 catch {file delete -force C:/globTest}
diff --git a/tests/tcltests.tcl b/tests/tcltests.tcl
index a2251bf..61366a4 100644
--- a/tests/tcltests.tcl
+++ b/tests/tcltests.tcl
@@ -34,6 +34,18 @@ namespace eval ::tcltests {
     }
 
 
+    # Stolen from dict.test
+    proc scriptmemcheck script {
+	set end [lindex [split [memory info] \n] 3 3]
+	for {set i 0} {$i < 5} {incr i} {
+	    uplevel 1 $script
+	    set tmp $end
+	    set end [lindex [split [memory info] \n] 3 3]
+	}
+	expr {$end - $tmp}
+    }
+
+
     proc tempdir_alternate {} {
 	close [file tempfile tempfile]
 	set tmpdir [file dirname $tempfile]
-- 
cgit v0.12


From 2002e0f0f0b3cb11791ef5c3c7d651af68d82d84 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sun, 26 Mar 2023 15:02:55 +0000
Subject: Fix for [6d4e9d1af5bf5b7d]: Memory leak: SetFsPathFromAny, assisted
 by the global literal table, causes a Tcl_Obj to reference itself.

---
 generic/tclPathObj.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 87aed3a..aefc84f 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2350,6 +2350,8 @@ SetFsPathFromAny(
     fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath));
 
     if (transPtr == pathPtr) {
+	Tcl_GetStringFromObj(pathPtr, NULL);
+	TclFreeInternalRep(pathPtr);
         transPtr = Tcl_DuplicateObj(pathPtr);
         fsPathPtr->filesystemEpoch = 0;
     } else {
-- 
cgit v0.12

-- 
cgit v0.12


From e18f32780895d872f1cf09c8d12ba2afaf75ae53 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Mar 2023 17:13:55 +0000
Subject: Update to tzdata 2023b

---
 library/tzdata/Africa/Cairo          | 154 ++++++++++++++++++++
 library/tzdata/Africa/Casablanca     |  20 +--
 library/tzdata/Africa/El_Aaiun       |  20 +--
 library/tzdata/America/Ciudad_Juarez | 223 +++++++++++++++++++++++++++++
 library/tzdata/America/Nuuk          | 155 +++++++++++++++++++-
 library/tzdata/America/Yellowknife   | 267 +----------------------------------
 library/tzdata/Asia/Beirut           |   2 +-
 library/tzdata/Asia/Gaza             |  97 ++++++++++---
 library/tzdata/Asia/Hebron           |  97 ++++++++++---
 library/tzdata/Europe/Kirov          |  92 ++++++------
 library/tzdata/Europe/Volgograd      |  98 ++++++-------
 11 files changed, 806 insertions(+), 419 deletions(-)
 create mode 100644 library/tzdata/America/Ciudad_Juarez

diff --git a/library/tzdata/Africa/Cairo b/library/tzdata/Africa/Cairo
index aaeec54..3acbd5e 100644
--- a/library/tzdata/Africa/Cairo
+++ b/library/tzdata/Africa/Cairo
@@ -129,4 +129,158 @@ set TZData(:Africa/Cairo) {
     {1403816400 7200 0 EET}
     {1406844000 10800 1 EEST}
     {1411678800 7200 0 EET}
+    {1682632800 10800 1 EEST}
+    {1698354000 7200 0 EET}
+    {1714082400 10800 1 EEST}
+    {1730408400 7200 0 EET}
+    {1745532000 10800 1 EEST}
+    {1761858000 7200 0 EET}
+    {1776981600 10800 1 EEST}
+    {1793307600 7200 0 EET}
+    {1809036000 10800 1 EEST}
+    {1824757200 7200 0 EET}
+    {1840485600 10800 1 EEST}
+    {1856206800 7200 0 EET}
+    {1871935200 10800 1 EEST}
+    {1887656400 7200 0 EET}
+    {1903384800 10800 1 EEST}
+    {1919710800 7200 0 EET}
+    {1934834400 10800 1 EEST}
+    {1951160400 7200 0 EET}
+    {1966888800 10800 1 EEST}
+    {1982610000 7200 0 EET}
+    {1998338400 10800 1 EEST}
+    {2014059600 7200 0 EET}
+    {2029788000 10800 1 EEST}
+    {2045509200 7200 0 EET}
+    {2061237600 10800 1 EEST}
+    {2076958800 7200 0 EET}
+    {2092687200 10800 1 EEST}
+    {2109013200 7200 0 EET}
+    {2124136800 10800 1 EEST}
+    {2140462800 7200 0 EET}
+    {2156191200 10800 1 EEST}
+    {2171912400 7200 0 EET}
+    {2187640800 10800 1 EEST}
+    {2203362000 7200 0 EET}
+    {2219090400 10800 1 EEST}
+    {2234811600 7200 0 EET}
+    {2250540000 10800 1 EEST}
+    {2266866000 7200 0 EET}
+    {2281989600 10800 1 EEST}
+    {2298315600 7200 0 EET}
+    {2313439200 10800 1 EEST}
+    {2329765200 7200 0 EET}
+    {2345493600 10800 1 EEST}
+    {2361214800 7200 0 EET}
+    {2376943200 10800 1 EEST}
+    {2392664400 7200 0 EET}
+    {2408392800 10800 1 EEST}
+    {2424114000 7200 0 EET}
+    {2439842400 10800 1 EEST}
+    {2456168400 7200 0 EET}
+    {2471292000 10800 1 EEST}
+    {2487618000 7200 0 EET}
+    {2503346400 10800 1 EEST}
+    {2519067600 7200 0 EET}
+    {2534796000 10800 1 EEST}
+    {2550517200 7200 0 EET}
+    {2566245600 10800 1 EEST}
+    {2581966800 7200 0 EET}
+    {2597695200 10800 1 EEST}
+    {2614021200 7200 0 EET}
+    {2629144800 10800 1 EEST}
+    {2645470800 7200 0 EET}
+    {2660594400 10800 1 EEST}
+    {2676920400 7200 0 EET}
+    {2692648800 10800 1 EEST}
+    {2708370000 7200 0 EET}
+    {2724098400 10800 1 EEST}
+    {2739819600 7200 0 EET}
+    {2755548000 10800 1 EEST}
+    {2771269200 7200 0 EET}
+    {2786997600 10800 1 EEST}
+    {2803323600 7200 0 EET}
+    {2818447200 10800 1 EEST}
+    {2834773200 7200 0 EET}
+    {2850501600 10800 1 EEST}
+    {2866222800 7200 0 EET}
+    {2881951200 10800 1 EEST}
+    {2897672400 7200 0 EET}
+    {2913400800 10800 1 EEST}
+    {2929122000 7200 0 EET}
+    {2944850400 10800 1 EEST}
+    {2960571600 7200 0 EET}
+    {2976300000 10800 1 EEST}
+    {2992626000 7200 0 EET}
+    {3007749600 10800 1 EEST}
+    {3024075600 7200 0 EET}
+    {3039804000 10800 1 EEST}
+    {3055525200 7200 0 EET}
+    {3071253600 10800 1 EEST}
+    {3086974800 7200 0 EET}
+    {3102703200 10800 1 EEST}
+    {3118424400 7200 0 EET}
+    {3134152800 10800 1 EEST}
+    {3150478800 7200 0 EET}
+    {3165602400 10800 1 EEST}
+    {3181928400 7200 0 EET}
+    {3197052000 10800 1 EEST}
+    {3213378000 7200 0 EET}
+    {3229106400 10800 1 EEST}
+    {3244827600 7200 0 EET}
+    {3260556000 10800 1 EEST}
+    {3276277200 7200 0 EET}
+    {3292005600 10800 1 EEST}
+    {3307726800 7200 0 EET}
+    {3323455200 10800 1 EEST}
+    {3339781200 7200 0 EET}
+    {3354904800 10800 1 EEST}
+    {3371230800 7200 0 EET}
+    {3386959200 10800 1 EEST}
+    {3402680400 7200 0 EET}
+    {3418408800 10800 1 EEST}
+    {3434130000 7200 0 EET}
+    {3449858400 10800 1 EEST}
+    {3465579600 7200 0 EET}
+    {3481308000 10800 1 EEST}
+    {3497634000 7200 0 EET}
+    {3512757600 10800 1 EEST}
+    {3529083600 7200 0 EET}
+    {3544207200 10800 1 EEST}
+    {3560533200 7200 0 EET}
+    {3576261600 10800 1 EEST}
+    {3591982800 7200 0 EET}
+    {3607711200 10800 1 EEST}
+    {3623432400 7200 0 EET}
+    {3639160800 10800 1 EEST}
+    {3654882000 7200 0 EET}
+    {3670610400 10800 1 EEST}
+    {3686936400 7200 0 EET}
+    {3702060000 10800 1 EEST}
+    {3718386000 7200 0 EET}
+    {3734114400 10800 1 EEST}
+    {3749835600 7200 0 EET}
+    {3765564000 10800 1 EEST}
+    {3781285200 7200 0 EET}
+    {3797013600 10800 1 EEST}
+    {3812734800 7200 0 EET}
+    {3828463200 10800 1 EEST}
+    {3844184400 7200 0 EET}
+    {3859912800 10800 1 EEST}
+    {3876238800 7200 0 EET}
+    {3891362400 10800 1 EEST}
+    {3907688400 7200 0 EET}
+    {3923416800 10800 1 EEST}
+    {3939138000 7200 0 EET}
+    {3954866400 10800 1 EEST}
+    {3970587600 7200 0 EET}
+    {3986316000 10800 1 EEST}
+    {4002037200 7200 0 EET}
+    {4017765600 10800 1 EEST}
+    {4034091600 7200 0 EET}
+    {4049215200 10800 1 EEST}
+    {4065541200 7200 0 EET}
+    {4080664800 10800 1 EEST}
+    {4096990800 7200 0 EET}
 }
diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index cb60740..05ae49f 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -66,7 +66,7 @@ set TZData(:Africa/Casablanca) {
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682820000 3600 0 +01}
+    {1682215200 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -82,7 +82,7 @@ set TZData(:Africa/Casablanca) {
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927764000 3600 0 +01}
+    {1927159200 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -98,7 +98,7 @@ set TZData(:Africa/Casablanca) {
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172708000 3600 0 +01}
+    {2172103200 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -114,7 +114,7 @@ set TZData(:Africa/Casablanca) {
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417652000 3600 0 +01}
+    {2417047200 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -130,7 +130,7 @@ set TZData(:Africa/Casablanca) {
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2662596000 3600 0 +01}
+    {2661991200 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -146,7 +146,7 @@ set TZData(:Africa/Casablanca) {
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2907540000 3600 0 +01}
+    {2906935200 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
@@ -162,7 +162,7 @@ set TZData(:Africa/Casablanca) {
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3152484000 3600 0 +01}
+    {3151879200 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
@@ -178,7 +178,7 @@ set TZData(:Africa/Casablanca) {
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3397428000 3600 0 +01}
+    {3396823200 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
@@ -188,13 +188,13 @@ set TZData(:Africa/Casablanca) {
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3550442400 3600 0 +01}
+    {3549837600 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3642372000 3600 0 +01}
+    {3641767200 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
diff --git a/library/tzdata/Africa/El_Aaiun b/library/tzdata/Africa/El_Aaiun
index fd3e88f..8dbbdea 100644
--- a/library/tzdata/Africa/El_Aaiun
+++ b/library/tzdata/Africa/El_Aaiun
@@ -55,7 +55,7 @@ set TZData(:Africa/El_Aaiun) {
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682820000 3600 0 +01}
+    {1682215200 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -71,7 +71,7 @@ set TZData(:Africa/El_Aaiun) {
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927764000 3600 0 +01}
+    {1927159200 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -87,7 +87,7 @@ set TZData(:Africa/El_Aaiun) {
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172708000 3600 0 +01}
+    {2172103200 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -103,7 +103,7 @@ set TZData(:Africa/El_Aaiun) {
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417652000 3600 0 +01}
+    {2417047200 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -119,7 +119,7 @@ set TZData(:Africa/El_Aaiun) {
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2662596000 3600 0 +01}
+    {2661991200 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -135,7 +135,7 @@ set TZData(:Africa/El_Aaiun) {
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2907540000 3600 0 +01}
+    {2906935200 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
@@ -151,7 +151,7 @@ set TZData(:Africa/El_Aaiun) {
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3152484000 3600 0 +01}
+    {3151879200 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
@@ -167,7 +167,7 @@ set TZData(:Africa/El_Aaiun) {
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3397428000 3600 0 +01}
+    {3396823200 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
@@ -177,13 +177,13 @@ set TZData(:Africa/El_Aaiun) {
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3550442400 3600 0 +01}
+    {3549837600 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3642372000 3600 0 +01}
+    {3641767200 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
diff --git a/library/tzdata/America/Ciudad_Juarez b/library/tzdata/America/Ciudad_Juarez
new file mode 100644
index 0000000..5a27e80
--- /dev/null
+++ b/library/tzdata/America/Ciudad_Juarez
@@ -0,0 +1,223 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:America/Ciudad_Juarez) {
+    {-9223372036854775808 -25556 0 LMT}
+    {-1514739600 -25200 0 MST}
+    {-1343066400 -21600 0 CST}
+    {-1234807200 -25200 0 MST}
+    {-1220292000 -21600 1 MDT}
+    {-1207159200 -25200 0 MST}
+    {-1191344400 -21600 0 CST}
+    {820476000 -21600 0 CST}
+    {828864000 -18000 1 CDT}
+    {846399600 -21600 0 CST}
+    {860313600 -18000 1 CDT}
+    {877849200 -21600 0 CST}
+    {883634400 -21600 0 CST}
+    {891766800 -21600 0 MDT}
+    {909302400 -25200 0 MST}
+    {923216400 -21600 1 MDT}
+    {941356800 -25200 0 MST}
+    {954666000 -21600 1 MDT}
+    {972806400 -25200 0 MST}
+    {989139600 -21600 1 MDT}
+    {1001836800 -25200 0 MST}
+    {1018170000 -21600 1 MDT}
+    {1035705600 -25200 0 MST}
+    {1049619600 -21600 1 MDT}
+    {1067155200 -25200 0 MST}
+    {1081069200 -21600 1 MDT}
+    {1099209600 -25200 0 MST}
+    {1112518800 -21600 1 MDT}
+    {1130659200 -25200 0 MST}
+    {1143968400 -21600 1 MDT}
+    {1162108800 -25200 0 MST}
+    {1175418000 -21600 1 MDT}
+    {1193558400 -25200 0 MST}
+    {1207472400 -21600 1 MDT}
+    {1225008000 -25200 0 MST}
+    {1238922000 -21600 1 MDT}
+    {1256457600 -25200 0 MST}
+    {1262329200 -25200 0 MST}
+    {1268557200 -21600 1 MDT}
+    {1289116800 -25200 0 MST}
+    {1300006800 -21600 1 MDT}
+    {1320566400 -25200 0 MST}
+    {1331456400 -21600 1 MDT}
+    {1352016000 -25200 0 MST}
+    {1362906000 -21600 1 MDT}
+    {1383465600 -25200 0 MST}
+    {1394355600 -21600 1 MDT}
+    {1414915200 -25200 0 MST}
+    {1425805200 -21600 1 MDT}
+    {1446364800 -25200 0 MST}
+    {1457859600 -21600 1 MDT}
+    {1478419200 -25200 0 MST}
+    {1489309200 -21600 1 MDT}
+    {1509868800 -25200 0 MST}
+    {1520758800 -21600 1 MDT}
+    {1541318400 -25200 0 MST}
+    {1552208400 -21600 1 MDT}
+    {1572768000 -25200 0 MST}
+    {1583658000 -21600 1 MDT}
+    {1604217600 -25200 0 MST}
+    {1615712400 -21600 1 MDT}
+    {1636272000 -25200 0 MST}
+    {1647162000 -21600 1 MDT}
+    {1667120400 -21600 0 CST}
+    {1669788000 -25200 0 MST}
+    {1678611600 -21600 1 MDT}
+    {1699171200 -25200 0 MST}
+    {1710061200 -21600 1 MDT}
+    {1730620800 -25200 0 MST}
+    {1741510800 -21600 1 MDT}
+    {1762070400 -25200 0 MST}
+    {1772960400 -21600 1 MDT}
+    {1793520000 -25200 0 MST}
+    {1805014800 -21600 1 MDT}
+    {1825574400 -25200 0 MST}
+    {1836464400 -21600 1 MDT}
+    {1857024000 -25200 0 MST}
+    {1867914000 -21600 1 MDT}
+    {1888473600 -25200 0 MST}
+    {1899363600 -21600 1 MDT}
+    {1919923200 -25200 0 MST}
+    {1930813200 -21600 1 MDT}
+    {1951372800 -25200 0 MST}
+    {1962867600 -21600 1 MDT}
+    {1983427200 -25200 0 MST}
+    {1994317200 -21600 1 MDT}
+    {2014876800 -25200 0 MST}
+    {2025766800 -21600 1 MDT}
+    {2046326400 -25200 0 MST}
+    {2057216400 -21600 1 MDT}
+    {2077776000 -25200 0 MST}
+    {2088666000 -21600 1 MDT}
+    {2109225600 -25200 0 MST}
+    {2120115600 -21600 1 MDT}
+    {2140675200 -25200 0 MST}
+    {2152170000 -21600 1 MDT}
+    {2172729600 -25200 0 MST}
+    {2183619600 -21600 1 MDT}
+    {2204179200 -25200 0 MST}
+    {2215069200 -21600 1 MDT}
+    {2235628800 -25200 0 MST}
+    {2246518800 -21600 1 MDT}
+    {2267078400 -25200 0 MST}
+    {2277968400 -21600 1 MDT}
+    {2298528000 -25200 0 MST}
+    {2309418000 -21600 1 MDT}
+    {2329977600 -25200 0 MST}
+    {2341472400 -21600 1 MDT}
+    {2362032000 -25200 0 MST}
+    {2372922000 -21600 1 MDT}
+    {2393481600 -25200 0 MST}
+    {2404371600 -21600 1 MDT}
+    {2424931200 -25200 0 MST}
+    {2435821200 -21600 1 MDT}
+    {2456380800 -25200 0 MST}
+    {2467270800 -21600 1 MDT}
+    {2487830400 -25200 0 MST}
+    {2499325200 -21600 1 MDT}
+    {2519884800 -25200 0 MST}
+    {2530774800 -21600 1 MDT}
+    {2551334400 -25200 0 MST}
+    {2562224400 -21600 1 MDT}
+    {2582784000 -25200 0 MST}
+    {2593674000 -21600 1 MDT}
+    {2614233600 -25200 0 MST}
+    {2625123600 -21600 1 MDT}
+    {2645683200 -25200 0 MST}
+    {2656573200 -21600 1 MDT}
+    {2677132800 -25200 0 MST}
+    {2688627600 -21600 1 MDT}
+    {2709187200 -25200 0 MST}
+    {2720077200 -21600 1 MDT}
+    {2740636800 -25200 0 MST}
+    {2751526800 -21600 1 MDT}
+    {2772086400 -25200 0 MST}
+    {2782976400 -21600 1 MDT}
+    {2803536000 -25200 0 MST}
+    {2814426000 -21600 1 MDT}
+    {2834985600 -25200 0 MST}
+    {2846480400 -21600 1 MDT}
+    {2867040000 -25200 0 MST}
+    {2877930000 -21600 1 MDT}
+    {2898489600 -25200 0 MST}
+    {2909379600 -21600 1 MDT}
+    {2929939200 -25200 0 MST}
+    {2940829200 -21600 1 MDT}
+    {2961388800 -25200 0 MST}
+    {2972278800 -21600 1 MDT}
+    {2992838400 -25200 0 MST}
+    {3003728400 -21600 1 MDT}
+    {3024288000 -25200 0 MST}
+    {3035782800 -21600 1 MDT}
+    {3056342400 -25200 0 MST}
+    {3067232400 -21600 1 MDT}
+    {3087792000 -25200 0 MST}
+    {3098682000 -21600 1 MDT}
+    {3119241600 -25200 0 MST}
+    {3130131600 -21600 1 MDT}
+    {3150691200 -25200 0 MST}
+    {3161581200 -21600 1 MDT}
+    {3182140800 -25200 0 MST}
+    {3193030800 -21600 1 MDT}
+    {3213590400 -25200 0 MST}
+    {3225085200 -21600 1 MDT}
+    {3245644800 -25200 0 MST}
+    {3256534800 -21600 1 MDT}
+    {3277094400 -25200 0 MST}
+    {3287984400 -21600 1 MDT}
+    {3308544000 -25200 0 MST}
+    {3319434000 -21600 1 MDT}
+    {3339993600 -25200 0 MST}
+    {3350883600 -21600 1 MDT}
+    {3371443200 -25200 0 MST}
+    {3382938000 -21600 1 MDT}
+    {3403497600 -25200 0 MST}
+    {3414387600 -21600 1 MDT}
+    {3434947200 -25200 0 MST}
+    {3445837200 -21600 1 MDT}
+    {3466396800 -25200 0 MST}
+    {3477286800 -21600 1 MDT}
+    {3497846400 -25200 0 MST}
+    {3508736400 -21600 1 MDT}
+    {3529296000 -25200 0 MST}
+    {3540186000 -21600 1 MDT}
+    {3560745600 -25200 0 MST}
+    {3572240400 -21600 1 MDT}
+    {3592800000 -25200 0 MST}
+    {3603690000 -21600 1 MDT}
+    {3624249600 -25200 0 MST}
+    {3635139600 -21600 1 MDT}
+    {3655699200 -25200 0 MST}
+    {3666589200 -21600 1 MDT}
+    {3687148800 -25200 0 MST}
+    {3698038800 -21600 1 MDT}
+    {3718598400 -25200 0 MST}
+    {3730093200 -21600 1 MDT}
+    {3750652800 -25200 0 MST}
+    {3761542800 -21600 1 MDT}
+    {3782102400 -25200 0 MST}
+    {3792992400 -21600 1 MDT}
+    {3813552000 -25200 0 MST}
+    {3824442000 -21600 1 MDT}
+    {3845001600 -25200 0 MST}
+    {3855891600 -21600 1 MDT}
+    {3876451200 -25200 0 MST}
+    {3887341200 -21600 1 MDT}
+    {3907900800 -25200 0 MST}
+    {3919395600 -21600 1 MDT}
+    {3939955200 -25200 0 MST}
+    {3950845200 -21600 1 MDT}
+    {3971404800 -25200 0 MST}
+    {3982294800 -21600 1 MDT}
+    {4002854400 -25200 0 MST}
+    {4013744400 -21600 1 MDT}
+    {4034304000 -25200 0 MST}
+    {4045194000 -21600 1 MDT}
+    {4065753600 -25200 0 MST}
+    {4076643600 -21600 1 MDT}
+    {4097203200 -25200 0 MST}
+}
diff --git a/library/tzdata/America/Nuuk b/library/tzdata/America/Nuuk
index d010cab..06b472c 100644
--- a/library/tzdata/America/Nuuk
+++ b/library/tzdata/America/Nuuk
@@ -89,5 +89,158 @@ set TZData(:America/Nuuk) {
     {1635642000 -10800 0 -03}
     {1648342800 -7200 1 -02}
     {1667091600 -10800 0 -03}
-    {1679792400 -7200 0 -02}
+    {1679792400 -7200 1 -02}
+    {1698541200 -7200 0 -02}
+    {1711846800 -3600 1 -01}
+    {1729990800 -7200 0 -02}
+    {1743296400 -3600 1 -01}
+    {1761440400 -7200 0 -02}
+    {1774746000 -3600 1 -01}
+    {1792890000 -7200 0 -02}
+    {1806195600 -3600 1 -01}
+    {1824944400 -7200 0 -02}
+    {1837645200 -3600 1 -01}
+    {1856394000 -7200 0 -02}
+    {1869094800 -3600 1 -01}
+    {1887843600 -7200 0 -02}
+    {1901149200 -3600 1 -01}
+    {1919293200 -7200 0 -02}
+    {1932598800 -3600 1 -01}
+    {1950742800 -7200 0 -02}
+    {1964048400 -3600 1 -01}
+    {1982797200 -7200 0 -02}
+    {1995498000 -3600 1 -01}
+    {2014246800 -7200 0 -02}
+    {2026947600 -3600 1 -01}
+    {2045696400 -7200 0 -02}
+    {2058397200 -3600 1 -01}
+    {2077146000 -7200 0 -02}
+    {2090451600 -3600 1 -01}
+    {2108595600 -7200 0 -02}
+    {2121901200 -3600 1 -01}
+    {2140045200 -7200 0 -02}
+    {2153350800 -3600 1 -01}
+    {2172099600 -7200 0 -02}
+    {2184800400 -3600 1 -01}
+    {2203549200 -7200 0 -02}
+    {2216250000 -3600 1 -01}
+    {2234998800 -7200 0 -02}
+    {2248304400 -3600 1 -01}
+    {2266448400 -7200 0 -02}
+    {2279754000 -3600 1 -01}
+    {2297898000 -7200 0 -02}
+    {2311203600 -3600 1 -01}
+    {2329347600 -7200 0 -02}
+    {2342653200 -3600 1 -01}
+    {2361402000 -7200 0 -02}
+    {2374102800 -3600 1 -01}
+    {2392851600 -7200 0 -02}
+    {2405552400 -3600 1 -01}
+    {2424301200 -7200 0 -02}
+    {2437606800 -3600 1 -01}
+    {2455750800 -7200 0 -02}
+    {2469056400 -3600 1 -01}
+    {2487200400 -7200 0 -02}
+    {2500506000 -3600 1 -01}
+    {2519254800 -7200 0 -02}
+    {2531955600 -3600 1 -01}
+    {2550704400 -7200 0 -02}
+    {2563405200 -3600 1 -01}
+    {2582154000 -7200 0 -02}
+    {2595459600 -3600 1 -01}
+    {2613603600 -7200 0 -02}
+    {2626909200 -3600 1 -01}
+    {2645053200 -7200 0 -02}
+    {2658358800 -3600 1 -01}
+    {2676502800 -7200 0 -02}
+    {2689808400 -3600 1 -01}
+    {2708557200 -7200 0 -02}
+    {2721258000 -3600 1 -01}
+    {2740006800 -7200 0 -02}
+    {2752707600 -3600 1 -01}
+    {2771456400 -7200 0 -02}
+    {2784762000 -3600 1 -01}
+    {2802906000 -7200 0 -02}
+    {2816211600 -3600 1 -01}
+    {2834355600 -7200 0 -02}
+    {2847661200 -3600 1 -01}
+    {2866410000 -7200 0 -02}
+    {2879110800 -3600 1 -01}
+    {2897859600 -7200 0 -02}
+    {2910560400 -3600 1 -01}
+    {2929309200 -7200 0 -02}
+    {2942010000 -3600 1 -01}
+    {2960758800 -7200 0 -02}
+    {2974064400 -3600 1 -01}
+    {2992208400 -7200 0 -02}
+    {3005514000 -3600 1 -01}
+    {3023658000 -7200 0 -02}
+    {3036963600 -3600 1 -01}
+    {3055712400 -7200 0 -02}
+    {3068413200 -3600 1 -01}
+    {3087162000 -7200 0 -02}
+    {3099862800 -3600 1 -01}
+    {3118611600 -7200 0 -02}
+    {3131917200 -3600 1 -01}
+    {3150061200 -7200 0 -02}
+    {3163366800 -3600 1 -01}
+    {3181510800 -7200 0 -02}
+    {3194816400 -3600 1 -01}
+    {3212960400 -7200 0 -02}
+    {3226266000 -3600 1 -01}
+    {3245014800 -7200 0 -02}
+    {3257715600 -3600 1 -01}
+    {3276464400 -7200 0 -02}
+    {3289165200 -3600 1 -01}
+    {3307914000 -7200 0 -02}
+    {3321219600 -3600 1 -01}
+    {3339363600 -7200 0 -02}
+    {3352669200 -3600 1 -01}
+    {3370813200 -7200 0 -02}
+    {3384118800 -3600 1 -01}
+    {3402867600 -7200 0 -02}
+    {3415568400 -3600 1 -01}
+    {3434317200 -7200 0 -02}
+    {3447018000 -3600 1 -01}
+    {3465766800 -7200 0 -02}
+    {3479072400 -3600 1 -01}
+    {3497216400 -7200 0 -02}
+    {3510522000 -3600 1 -01}
+    {3528666000 -7200 0 -02}
+    {3541971600 -3600 1 -01}
+    {3560115600 -7200 0 -02}
+    {3573421200 -3600 1 -01}
+    {3592170000 -7200 0 -02}
+    {3604870800 -3600 1 -01}
+    {3623619600 -7200 0 -02}
+    {3636320400 -3600 1 -01}
+    {3655069200 -7200 0 -02}
+    {3668374800 -3600 1 -01}
+    {3686518800 -7200 0 -02}
+    {3699824400 -3600 1 -01}
+    {3717968400 -7200 0 -02}
+    {3731274000 -3600 1 -01}
+    {3750022800 -7200 0 -02}
+    {3762723600 -3600 1 -01}
+    {3781472400 -7200 0 -02}
+    {3794173200 -3600 1 -01}
+    {3812922000 -7200 0 -02}
+    {3825622800 -3600 1 -01}
+    {3844371600 -7200 0 -02}
+    {3857677200 -3600 1 -01}
+    {3875821200 -7200 0 -02}
+    {3889126800 -3600 1 -01}
+    {3907270800 -7200 0 -02}
+    {3920576400 -3600 1 -01}
+    {3939325200 -7200 0 -02}
+    {3952026000 -3600 1 -01}
+    {3970774800 -7200 0 -02}
+    {3983475600 -3600 1 -01}
+    {4002224400 -7200 0 -02}
+    {4015530000 -3600 1 -01}
+    {4033674000 -7200 0 -02}
+    {4046979600 -3600 1 -01}
+    {4065123600 -7200 0 -02}
+    {4078429200 -3600 1 -01}
+    {4096573200 -7200 0 -02}
 }
diff --git a/library/tzdata/America/Yellowknife b/library/tzdata/America/Yellowknife
index 65ddbb6..69e171d 100644
--- a/library/tzdata/America/Yellowknife
+++ b/library/tzdata/America/Yellowknife
@@ -1,266 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Yellowknife) {
-    {-9223372036854775808 0 0 -00}
-    {-1104537600 -25200 0 MST}
-    {-880210800 -21600 1 MWT}
-    {-769395600 -21600 1 MPT}
-    {-765388800 -25200 0 MST}
-    {73472400 -21600 1 MDT}
-    {89193600 -25200 0 MST}
-    {104922000 -21600 1 MDT}
-    {120643200 -25200 0 MST}
-    {136371600 -21600 1 MDT}
-    {152092800 -25200 0 MST}
-    {167821200 -21600 1 MDT}
-    {183542400 -25200 0 MST}
-    {199270800 -21600 1 MDT}
-    {215596800 -25200 0 MST}
-    {230720400 -21600 1 MDT}
-    {247046400 -25200 0 MST}
-    {262774800 -21600 1 MDT}
-    {278496000 -25200 0 MST}
-    {294224400 -21600 1 MDT}
-    {309945600 -25200 0 MST}
-    {315558000 -25200 0 MST}
-    {325674000 -21600 1 MDT}
-    {341395200 -25200 0 MST}
-    {357123600 -21600 1 MDT}
-    {372844800 -25200 0 MST}
-    {388573200 -21600 1 MDT}
-    {404899200 -25200 0 MST}
-    {420022800 -21600 1 MDT}
-    {436348800 -25200 0 MST}
-    {452077200 -21600 1 MDT}
-    {467798400 -25200 0 MST}
-    {483526800 -21600 1 MDT}
-    {499248000 -25200 0 MST}
-    {514976400 -21600 1 MDT}
-    {530697600 -25200 0 MST}
-    {544611600 -21600 1 MDT}
-    {562147200 -25200 0 MST}
-    {576061200 -21600 1 MDT}
-    {594201600 -25200 0 MST}
-    {607510800 -21600 1 MDT}
-    {625651200 -25200 0 MST}
-    {638960400 -21600 1 MDT}
-    {657100800 -25200 0 MST}
-    {671014800 -21600 1 MDT}
-    {688550400 -25200 0 MST}
-    {702464400 -21600 1 MDT}
-    {720000000 -25200 0 MST}
-    {733914000 -21600 1 MDT}
-    {752054400 -25200 0 MST}
-    {765363600 -21600 1 MDT}
-    {783504000 -25200 0 MST}
-    {796813200 -21600 1 MDT}
-    {814953600 -25200 0 MST}
-    {828867600 -21600 1 MDT}
-    {846403200 -25200 0 MST}
-    {860317200 -21600 1 MDT}
-    {877852800 -25200 0 MST}
-    {891766800 -21600 1 MDT}
-    {909302400 -25200 0 MST}
-    {923216400 -21600 1 MDT}
-    {941356800 -25200 0 MST}
-    {954666000 -21600 1 MDT}
-    {972806400 -25200 0 MST}
-    {986115600 -21600 1 MDT}
-    {1004256000 -25200 0 MST}
-    {1018170000 -21600 1 MDT}
-    {1035705600 -25200 0 MST}
-    {1049619600 -21600 1 MDT}
-    {1067155200 -25200 0 MST}
-    {1081069200 -21600 1 MDT}
-    {1099209600 -25200 0 MST}
-    {1112518800 -21600 1 MDT}
-    {1130659200 -25200 0 MST}
-    {1143968400 -21600 1 MDT}
-    {1162108800 -25200 0 MST}
-    {1173603600 -21600 1 MDT}
-    {1194163200 -25200 0 MST}
-    {1205053200 -21600 1 MDT}
-    {1225612800 -25200 0 MST}
-    {1236502800 -21600 1 MDT}
-    {1257062400 -25200 0 MST}
-    {1268557200 -21600 1 MDT}
-    {1289116800 -25200 0 MST}
-    {1300006800 -21600 1 MDT}
-    {1320566400 -25200 0 MST}
-    {1331456400 -21600 1 MDT}
-    {1352016000 -25200 0 MST}
-    {1362906000 -21600 1 MDT}
-    {1383465600 -25200 0 MST}
-    {1394355600 -21600 1 MDT}
-    {1414915200 -25200 0 MST}
-    {1425805200 -21600 1 MDT}
-    {1446364800 -25200 0 MST}
-    {1457859600 -21600 1 MDT}
-    {1478419200 -25200 0 MST}
-    {1489309200 -21600 1 MDT}
-    {1509868800 -25200 0 MST}
-    {1520758800 -21600 1 MDT}
-    {1541318400 -25200 0 MST}
-    {1552208400 -21600 1 MDT}
-    {1572768000 -25200 0 MST}
-    {1583658000 -21600 1 MDT}
-    {1604217600 -25200 0 MST}
-    {1615712400 -21600 1 MDT}
-    {1636272000 -25200 0 MST}
-    {1647162000 -21600 1 MDT}
-    {1667721600 -25200 0 MST}
-    {1678611600 -21600 1 MDT}
-    {1699171200 -25200 0 MST}
-    {1710061200 -21600 1 MDT}
-    {1730620800 -25200 0 MST}
-    {1741510800 -21600 1 MDT}
-    {1762070400 -25200 0 MST}
-    {1772960400 -21600 1 MDT}
-    {1793520000 -25200 0 MST}
-    {1805014800 -21600 1 MDT}
-    {1825574400 -25200 0 MST}
-    {1836464400 -21600 1 MDT}
-    {1857024000 -25200 0 MST}
-    {1867914000 -21600 1 MDT}
-    {1888473600 -25200 0 MST}
-    {1899363600 -21600 1 MDT}
-    {1919923200 -25200 0 MST}
-    {1930813200 -21600 1 MDT}
-    {1951372800 -25200 0 MST}
-    {1962867600 -21600 1 MDT}
-    {1983427200 -25200 0 MST}
-    {1994317200 -21600 1 MDT}
-    {2014876800 -25200 0 MST}
-    {2025766800 -21600 1 MDT}
-    {2046326400 -25200 0 MST}
-    {2057216400 -21600 1 MDT}
-    {2077776000 -25200 0 MST}
-    {2088666000 -21600 1 MDT}
-    {2109225600 -25200 0 MST}
-    {2120115600 -21600 1 MDT}
-    {2140675200 -25200 0 MST}
-    {2152170000 -21600 1 MDT}
-    {2172729600 -25200 0 MST}
-    {2183619600 -21600 1 MDT}
-    {2204179200 -25200 0 MST}
-    {2215069200 -21600 1 MDT}
-    {2235628800 -25200 0 MST}
-    {2246518800 -21600 1 MDT}
-    {2267078400 -25200 0 MST}
-    {2277968400 -21600 1 MDT}
-    {2298528000 -25200 0 MST}
-    {2309418000 -21600 1 MDT}
-    {2329977600 -25200 0 MST}
-    {2341472400 -21600 1 MDT}
-    {2362032000 -25200 0 MST}
-    {2372922000 -21600 1 MDT}
-    {2393481600 -25200 0 MST}
-    {2404371600 -21600 1 MDT}
-    {2424931200 -25200 0 MST}
-    {2435821200 -21600 1 MDT}
-    {2456380800 -25200 0 MST}
-    {2467270800 -21600 1 MDT}
-    {2487830400 -25200 0 MST}
-    {2499325200 -21600 1 MDT}
-    {2519884800 -25200 0 MST}
-    {2530774800 -21600 1 MDT}
-    {2551334400 -25200 0 MST}
-    {2562224400 -21600 1 MDT}
-    {2582784000 -25200 0 MST}
-    {2593674000 -21600 1 MDT}
-    {2614233600 -25200 0 MST}
-    {2625123600 -21600 1 MDT}
-    {2645683200 -25200 0 MST}
-    {2656573200 -21600 1 MDT}
-    {2677132800 -25200 0 MST}
-    {2688627600 -21600 1 MDT}
-    {2709187200 -25200 0 MST}
-    {2720077200 -21600 1 MDT}
-    {2740636800 -25200 0 MST}
-    {2751526800 -21600 1 MDT}
-    {2772086400 -25200 0 MST}
-    {2782976400 -21600 1 MDT}
-    {2803536000 -25200 0 MST}
-    {2814426000 -21600 1 MDT}
-    {2834985600 -25200 0 MST}
-    {2846480400 -21600 1 MDT}
-    {2867040000 -25200 0 MST}
-    {2877930000 -21600 1 MDT}
-    {2898489600 -25200 0 MST}
-    {2909379600 -21600 1 MDT}
-    {2929939200 -25200 0 MST}
-    {2940829200 -21600 1 MDT}
-    {2961388800 -25200 0 MST}
-    {2972278800 -21600 1 MDT}
-    {2992838400 -25200 0 MST}
-    {3003728400 -21600 1 MDT}
-    {3024288000 -25200 0 MST}
-    {3035782800 -21600 1 MDT}
-    {3056342400 -25200 0 MST}
-    {3067232400 -21600 1 MDT}
-    {3087792000 -25200 0 MST}
-    {3098682000 -21600 1 MDT}
-    {3119241600 -25200 0 MST}
-    {3130131600 -21600 1 MDT}
-    {3150691200 -25200 0 MST}
-    {3161581200 -21600 1 MDT}
-    {3182140800 -25200 0 MST}
-    {3193030800 -21600 1 MDT}
-    {3213590400 -25200 0 MST}
-    {3225085200 -21600 1 MDT}
-    {3245644800 -25200 0 MST}
-    {3256534800 -21600 1 MDT}
-    {3277094400 -25200 0 MST}
-    {3287984400 -21600 1 MDT}
-    {3308544000 -25200 0 MST}
-    {3319434000 -21600 1 MDT}
-    {3339993600 -25200 0 MST}
-    {3350883600 -21600 1 MDT}
-    {3371443200 -25200 0 MST}
-    {3382938000 -21600 1 MDT}
-    {3403497600 -25200 0 MST}
-    {3414387600 -21600 1 MDT}
-    {3434947200 -25200 0 MST}
-    {3445837200 -21600 1 MDT}
-    {3466396800 -25200 0 MST}
-    {3477286800 -21600 1 MDT}
-    {3497846400 -25200 0 MST}
-    {3508736400 -21600 1 MDT}
-    {3529296000 -25200 0 MST}
-    {3540186000 -21600 1 MDT}
-    {3560745600 -25200 0 MST}
-    {3572240400 -21600 1 MDT}
-    {3592800000 -25200 0 MST}
-    {3603690000 -21600 1 MDT}
-    {3624249600 -25200 0 MST}
-    {3635139600 -21600 1 MDT}
-    {3655699200 -25200 0 MST}
-    {3666589200 -21600 1 MDT}
-    {3687148800 -25200 0 MST}
-    {3698038800 -21600 1 MDT}
-    {3718598400 -25200 0 MST}
-    {3730093200 -21600 1 MDT}
-    {3750652800 -25200 0 MST}
-    {3761542800 -21600 1 MDT}
-    {3782102400 -25200 0 MST}
-    {3792992400 -21600 1 MDT}
-    {3813552000 -25200 0 MST}
-    {3824442000 -21600 1 MDT}
-    {3845001600 -25200 0 MST}
-    {3855891600 -21600 1 MDT}
-    {3876451200 -25200 0 MST}
-    {3887341200 -21600 1 MDT}
-    {3907900800 -25200 0 MST}
-    {3919395600 -21600 1 MDT}
-    {3939955200 -25200 0 MST}
-    {3950845200 -21600 1 MDT}
-    {3971404800 -25200 0 MST}
-    {3982294800 -21600 1 MDT}
-    {4002854400 -25200 0 MST}
-    {4013744400 -21600 1 MDT}
-    {4034304000 -25200 0 MST}
-    {4045194000 -21600 1 MDT}
-    {4065753600 -25200 0 MST}
-    {4076643600 -21600 1 MDT}
-    {4097203200 -25200 0 MST}
+if {![info exists TZData(America/Edmonton)]} {
+    LoadTimeZoneFile America/Edmonton
 }
+set TZData(:America/Yellowknife) $TZData(:America/Edmonton)
diff --git a/library/tzdata/Asia/Beirut b/library/tzdata/Asia/Beirut
index ac0a64e..a01a53a 100644
--- a/library/tzdata/Asia/Beirut
+++ b/library/tzdata/Asia/Beirut
@@ -113,7 +113,7 @@ set TZData(:Asia/Beirut) {
     {1635627600 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1667077200 7200 0 EET}
-    {1679781600 10800 1 EEST}
+    {1682028000 10800 1 EEST}
     {1698526800 7200 0 EET}
     {1711836000 10800 1 EEST}
     {1729976400 7200 0 EET}
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 1ceb680..d3789d3 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -127,11 +127,11 @@ set TZData(:Asia/Gaza) {
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1666998000 7200 0 EET}
-    {1679702400 10800 1 EEST}
+    {1682726400 10800 1 EEST}
     {1698447600 7200 0 EET}
-    {1711756800 10800 1 EEST}
+    {1712966400 10800 1 EEST}
     {1729897200 7200 0 EET}
-    {1743206400 10800 1 EEST}
+    {1743811200 10800 1 EEST}
     {1761346800 7200 0 EET}
     {1774656000 10800 1 EEST}
     {1792796400 7200 0 EET}
@@ -154,48 +154,80 @@ set TZData(:Asia/Gaza) {
     {2058307200 10800 1 EEST}
     {2077052400 7200 0 EET}
     {2090361600 10800 1 EEST}
-    {2108502000 7200 0 EET}
+    {2107897200 7200 0 EET}
     {2121811200 10800 1 EEST}
-    {2139951600 7200 0 EET}
+    {2138742000 7200 0 EET}
     {2153260800 10800 1 EEST}
-    {2172006000 7200 0 EET}
+    {2168982000 7200 0 EET}
     {2184710400 10800 1 EEST}
+    {2199826800 7200 0 EET}
+    {2202854400 10800 1 EEST}
     {2203455600 7200 0 EET}
     {2216160000 10800 1 EEST}
+    {2230066800 7200 0 EET}
+    {2233699200 10800 1 EEST}
     {2234905200 7200 0 EET}
     {2248214400 10800 1 EEST}
+    {2260911600 7200 0 EET}
+    {2263939200 10800 1 EEST}
     {2266354800 7200 0 EET}
     {2279664000 10800 1 EEST}
+    {2291756400 7200 0 EET}
+    {2294784000 10800 1 EEST}
     {2297804400 7200 0 EET}
     {2311113600 10800 1 EEST}
+    {2321996400 7200 0 EET}
+    {2325628800 10800 1 EEST}
     {2329254000 7200 0 EET}
     {2342563200 10800 1 EEST}
+    {2352841200 7200 0 EET}
+    {2355868800 10800 1 EEST}
     {2361308400 7200 0 EET}
     {2374012800 10800 1 EEST}
+    {2383686000 7200 0 EET}
+    {2386713600 10800 1 EEST}
     {2392758000 7200 0 EET}
     {2405462400 10800 1 EEST}
+    {2413926000 7200 0 EET}
+    {2417558400 10800 1 EEST}
     {2424207600 7200 0 EET}
     {2437516800 10800 1 EEST}
+    {2444770800 7200 0 EET}
+    {2447798400 10800 1 EEST}
     {2455657200 7200 0 EET}
     {2468966400 10800 1 EEST}
+    {2475010800 7200 0 EET}
+    {2478643200 10800 1 EEST}
     {2487106800 7200 0 EET}
     {2500416000 10800 1 EEST}
+    {2505855600 7200 0 EET}
+    {2508883200 10800 1 EEST}
     {2519161200 7200 0 EET}
     {2531865600 10800 1 EEST}
+    {2536700400 7200 0 EET}
+    {2539728000 10800 1 EEST}
     {2550610800 7200 0 EET}
     {2563315200 10800 1 EEST}
+    {2566940400 7200 0 EET}
+    {2570572800 10800 1 EEST}
     {2582060400 7200 0 EET}
     {2595369600 10800 1 EEST}
+    {2597785200 7200 0 EET}
+    {2600812800 10800 1 EEST}
     {2613510000 7200 0 EET}
     {2626819200 10800 1 EEST}
+    {2628025200 7200 0 EET}
+    {2631657600 10800 1 EEST}
     {2644959600 7200 0 EET}
     {2658268800 10800 1 EEST}
+    {2658870000 7200 0 EET}
+    {2662502400 10800 1 EEST}
     {2676409200 7200 0 EET}
-    {2689718400 10800 1 EEST}
+    {2692742400 10800 1 EEST}
     {2708463600 7200 0 EET}
-    {2721168000 10800 1 EEST}
+    {2723587200 10800 1 EEST}
     {2739913200 7200 0 EET}
-    {2752617600 10800 1 EEST}
+    {2753827200 10800 1 EEST}
     {2771362800 7200 0 EET}
     {2784672000 10800 1 EEST}
     {2802812400 7200 0 EET}
@@ -218,42 +250,69 @@ set TZData(:Asia/Gaza) {
     {3068323200 10800 1 EEST}
     {3087068400 7200 0 EET}
     {3099772800 10800 1 EEST}
-    {3118518000 7200 0 EET}
+    {3117913200 7200 0 EET}
     {3131827200 10800 1 EEST}
-    {3149967600 7200 0 EET}
+    {3148758000 7200 0 EET}
     {3163276800 10800 1 EEST}
-    {3181417200 7200 0 EET}
+    {3179602800 7200 0 EET}
     {3194726400 10800 1 EEST}
-    {3212866800 7200 0 EET}
+    {3209842800 7200 0 EET}
     {3226176000 10800 1 EEST}
-    {3244921200 7200 0 EET}
-    {3257625600 10800 1 EEST}
-    {3276370800 7200 0 EET}
-    {3289075200 10800 1 EEST}
-    {3307820400 7200 0 EET}
-    {3321129600 10800 1 EEST}
+    {3240687600 7200 0 EET}
+    {3243715200 10800 1 EEST}
+    {3257622000 10800 1 EEST}
+    {3271532400 7200 0 EET}
+    {3274560000 10800 1 EEST}
+    {3289071600 10800 1 EEST}
+    {3301772400 7200 0 EET}
+    {3305404800 10800 1 EEST}
+    {3321126000 10800 1 EEST}
+    {3332617200 7200 0 EET}
+    {3335644800 10800 1 EEST}
     {3339270000 7200 0 EET}
     {3352579200 10800 1 EEST}
+    {3362857200 7200 0 EET}
+    {3366489600 10800 1 EEST}
     {3370719600 7200 0 EET}
     {3384028800 10800 1 EEST}
+    {3393702000 7200 0 EET}
+    {3397334400 10800 1 EEST}
     {3402774000 7200 0 EET}
     {3415478400 10800 1 EEST}
+    {3424546800 7200 0 EET}
+    {3427574400 10800 1 EEST}
     {3434223600 7200 0 EET}
     {3446928000 10800 1 EEST}
+    {3454786800 7200 0 EET}
+    {3458419200 10800 1 EEST}
     {3465673200 7200 0 EET}
     {3478982400 10800 1 EEST}
+    {3485631600 7200 0 EET}
+    {3488659200 10800 1 EEST}
     {3497122800 7200 0 EET}
     {3510432000 10800 1 EEST}
+    {3516476400 7200 0 EET}
+    {3519504000 10800 1 EEST}
     {3528572400 7200 0 EET}
     {3541881600 10800 1 EEST}
+    {3546716400 7200 0 EET}
+    {3550348800 10800 1 EEST}
     {3560022000 7200 0 EET}
     {3573331200 10800 1 EEST}
+    {3577561200 7200 0 EET}
+    {3580588800 10800 1 EEST}
     {3592076400 7200 0 EET}
     {3604780800 10800 1 EEST}
+    {3607801200 7200 0 EET}
+    {3611433600 10800 1 EEST}
     {3623526000 7200 0 EET}
     {3636230400 10800 1 EEST}
+    {3638646000 7200 0 EET}
+    {3642278400 10800 1 EEST}
     {3654975600 7200 0 EET}
     {3668284800 10800 1 EEST}
+    {3669490800 7200 0 EET}
+    {3672518400 10800 1 EEST}
     {3686425200 7200 0 EET}
     {3699734400 10800 1 EEST}
     {3717874800 7200 0 EET}
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index b92db8d..140c841 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -126,11 +126,11 @@ set TZData(:Asia/Hebron) {
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1666998000 7200 0 EET}
-    {1679702400 10800 1 EEST}
+    {1682726400 10800 1 EEST}
     {1698447600 7200 0 EET}
-    {1711756800 10800 1 EEST}
+    {1712966400 10800 1 EEST}
     {1729897200 7200 0 EET}
-    {1743206400 10800 1 EEST}
+    {1743811200 10800 1 EEST}
     {1761346800 7200 0 EET}
     {1774656000 10800 1 EEST}
     {1792796400 7200 0 EET}
@@ -153,48 +153,80 @@ set TZData(:Asia/Hebron) {
     {2058307200 10800 1 EEST}
     {2077052400 7200 0 EET}
     {2090361600 10800 1 EEST}
-    {2108502000 7200 0 EET}
+    {2107897200 7200 0 EET}
     {2121811200 10800 1 EEST}
-    {2139951600 7200 0 EET}
+    {2138742000 7200 0 EET}
     {2153260800 10800 1 EEST}
-    {2172006000 7200 0 EET}
+    {2168982000 7200 0 EET}
     {2184710400 10800 1 EEST}
+    {2199826800 7200 0 EET}
+    {2202854400 10800 1 EEST}
     {2203455600 7200 0 EET}
     {2216160000 10800 1 EEST}
+    {2230066800 7200 0 EET}
+    {2233699200 10800 1 EEST}
     {2234905200 7200 0 EET}
     {2248214400 10800 1 EEST}
+    {2260911600 7200 0 EET}
+    {2263939200 10800 1 EEST}
     {2266354800 7200 0 EET}
     {2279664000 10800 1 EEST}
+    {2291756400 7200 0 EET}
+    {2294784000 10800 1 EEST}
     {2297804400 7200 0 EET}
     {2311113600 10800 1 EEST}
+    {2321996400 7200 0 EET}
+    {2325628800 10800 1 EEST}
     {2329254000 7200 0 EET}
     {2342563200 10800 1 EEST}
+    {2352841200 7200 0 EET}
+    {2355868800 10800 1 EEST}
     {2361308400 7200 0 EET}
     {2374012800 10800 1 EEST}
+    {2383686000 7200 0 EET}
+    {2386713600 10800 1 EEST}
     {2392758000 7200 0 EET}
     {2405462400 10800 1 EEST}
+    {2413926000 7200 0 EET}
+    {2417558400 10800 1 EEST}
     {2424207600 7200 0 EET}
     {2437516800 10800 1 EEST}
+    {2444770800 7200 0 EET}
+    {2447798400 10800 1 EEST}
     {2455657200 7200 0 EET}
     {2468966400 10800 1 EEST}
+    {2475010800 7200 0 EET}
+    {2478643200 10800 1 EEST}
     {2487106800 7200 0 EET}
     {2500416000 10800 1 EEST}
+    {2505855600 7200 0 EET}
+    {2508883200 10800 1 EEST}
     {2519161200 7200 0 EET}
     {2531865600 10800 1 EEST}
+    {2536700400 7200 0 EET}
+    {2539728000 10800 1 EEST}
     {2550610800 7200 0 EET}
     {2563315200 10800 1 EEST}
+    {2566940400 7200 0 EET}
+    {2570572800 10800 1 EEST}
     {2582060400 7200 0 EET}
     {2595369600 10800 1 EEST}
+    {2597785200 7200 0 EET}
+    {2600812800 10800 1 EEST}
     {2613510000 7200 0 EET}
     {2626819200 10800 1 EEST}
+    {2628025200 7200 0 EET}
+    {2631657600 10800 1 EEST}
     {2644959600 7200 0 EET}
     {2658268800 10800 1 EEST}
+    {2658870000 7200 0 EET}
+    {2662502400 10800 1 EEST}
     {2676409200 7200 0 EET}
-    {2689718400 10800 1 EEST}
+    {2692742400 10800 1 EEST}
     {2708463600 7200 0 EET}
-    {2721168000 10800 1 EEST}
+    {2723587200 10800 1 EEST}
     {2739913200 7200 0 EET}
-    {2752617600 10800 1 EEST}
+    {2753827200 10800 1 EEST}
     {2771362800 7200 0 EET}
     {2784672000 10800 1 EEST}
     {2802812400 7200 0 EET}
@@ -217,42 +249,69 @@ set TZData(:Asia/Hebron) {
     {3068323200 10800 1 EEST}
     {3087068400 7200 0 EET}
     {3099772800 10800 1 EEST}
-    {3118518000 7200 0 EET}
+    {3117913200 7200 0 EET}
     {3131827200 10800 1 EEST}
-    {3149967600 7200 0 EET}
+    {3148758000 7200 0 EET}
     {3163276800 10800 1 EEST}
-    {3181417200 7200 0 EET}
+    {3179602800 7200 0 EET}
     {3194726400 10800 1 EEST}
-    {3212866800 7200 0 EET}
+    {3209842800 7200 0 EET}
     {3226176000 10800 1 EEST}
-    {3244921200 7200 0 EET}
-    {3257625600 10800 1 EEST}
-    {3276370800 7200 0 EET}
-    {3289075200 10800 1 EEST}
-    {3307820400 7200 0 EET}
-    {3321129600 10800 1 EEST}
+    {3240687600 7200 0 EET}
+    {3243715200 10800 1 EEST}
+    {3257622000 10800 1 EEST}
+    {3271532400 7200 0 EET}
+    {3274560000 10800 1 EEST}
+    {3289071600 10800 1 EEST}
+    {3301772400 7200 0 EET}
+    {3305404800 10800 1 EEST}
+    {3321126000 10800 1 EEST}
+    {3332617200 7200 0 EET}
+    {3335644800 10800 1 EEST}
     {3339270000 7200 0 EET}
     {3352579200 10800 1 EEST}
+    {3362857200 7200 0 EET}
+    {3366489600 10800 1 EEST}
     {3370719600 7200 0 EET}
     {3384028800 10800 1 EEST}
+    {3393702000 7200 0 EET}
+    {3397334400 10800 1 EEST}
     {3402774000 7200 0 EET}
     {3415478400 10800 1 EEST}
+    {3424546800 7200 0 EET}
+    {3427574400 10800 1 EEST}
     {3434223600 7200 0 EET}
     {3446928000 10800 1 EEST}
+    {3454786800 7200 0 EET}
+    {3458419200 10800 1 EEST}
     {3465673200 7200 0 EET}
     {3478982400 10800 1 EEST}
+    {3485631600 7200 0 EET}
+    {3488659200 10800 1 EEST}
     {3497122800 7200 0 EET}
     {3510432000 10800 1 EEST}
+    {3516476400 7200 0 EET}
+    {3519504000 10800 1 EEST}
     {3528572400 7200 0 EET}
     {3541881600 10800 1 EEST}
+    {3546716400 7200 0 EET}
+    {3550348800 10800 1 EEST}
     {3560022000 7200 0 EET}
     {3573331200 10800 1 EEST}
+    {3577561200 7200 0 EET}
+    {3580588800 10800 1 EEST}
     {3592076400 7200 0 EET}
     {3604780800 10800 1 EEST}
+    {3607801200 7200 0 EET}
+    {3611433600 10800 1 EEST}
     {3623526000 7200 0 EET}
     {3636230400 10800 1 EEST}
+    {3638646000 7200 0 EET}
+    {3642278400 10800 1 EEST}
     {3654975600 7200 0 EET}
     {3668284800 10800 1 EEST}
+    {3669490800 7200 0 EET}
+    {3672518400 10800 1 EEST}
     {3686425200 7200 0 EET}
     {3699734400 10800 1 EEST}
     {3717874800 7200 0 EET}
diff --git a/library/tzdata/Europe/Kirov b/library/tzdata/Europe/Kirov
index 8762d22..9d2afa5 100644
--- a/library/tzdata/Europe/Kirov
+++ b/library/tzdata/Europe/Kirov
@@ -20,51 +20,51 @@ set TZData(:Europe/Kirov) {
     {559692000 14400 0 +04}
     {575416800 18000 1 +05}
     {591141600 14400 0 +04}
-    {606866400 10800 0 +04}
-    {606870000 14400 1 +04}
-    {622594800 10800 0 +03}
-    {638319600 14400 1 +04}
-    {654649200 10800 0 +03}
+    {606866400 10800 0 MSD}
+    {606870000 14400 1 MSD}
+    {622594800 10800 0 MSK}
+    {638319600 14400 1 MSD}
+    {654649200 10800 0 MSK}
     {670374000 14400 0 +04}
-    {701820000 10800 0 +04}
-    {701823600 14400 1 +04}
-    {717548400 10800 0 +03}
-    {733273200 14400 1 +04}
-    {748998000 10800 0 +03}
-    {764722800 14400 1 +04}
-    {780447600 10800 0 +03}
-    {796172400 14400 1 +04}
-    {811897200 10800 0 +03}
-    {828226800 14400 1 +04}
-    {846370800 10800 0 +03}
-    {859676400 14400 1 +04}
-    {877820400 10800 0 +03}
-    {891126000 14400 1 +04}
-    {909270000 10800 0 +03}
-    {922575600 14400 1 +04}
-    {941324400 10800 0 +03}
-    {954025200 14400 1 +04}
-    {972774000 10800 0 +03}
-    {985474800 14400 1 +04}
-    {1004223600 10800 0 +03}
-    {1017529200 14400 1 +04}
-    {1035673200 10800 0 +03}
-    {1048978800 14400 1 +04}
-    {1067122800 10800 0 +03}
-    {1080428400 14400 1 +04}
-    {1099177200 10800 0 +03}
-    {1111878000 14400 1 +04}
-    {1130626800 10800 0 +03}
-    {1143327600 14400 1 +04}
-    {1162076400 10800 0 +03}
-    {1174777200 14400 1 +04}
-    {1193526000 10800 0 +03}
-    {1206831600 14400 1 +04}
-    {1224975600 10800 0 +03}
-    {1238281200 14400 1 +04}
-    {1256425200 10800 0 +03}
-    {1269730800 14400 1 +04}
-    {1288479600 10800 0 +03}
-    {1301180400 14400 0 +04}
-    {1414274400 10800 0 +03}
+    {701820000 10800 0 MSD}
+    {701823600 14400 1 MSD}
+    {717548400 10800 0 MSK}
+    {733273200 14400 1 MSD}
+    {748998000 10800 0 MSK}
+    {764722800 14400 1 MSD}
+    {780447600 10800 0 MSK}
+    {796172400 14400 1 MSD}
+    {811897200 10800 0 MSK}
+    {828226800 14400 1 MSD}
+    {846370800 10800 0 MSK}
+    {859676400 14400 1 MSD}
+    {877820400 10800 0 MSK}
+    {891126000 14400 1 MSD}
+    {909270000 10800 0 MSK}
+    {922575600 14400 1 MSD}
+    {941324400 10800 0 MSK}
+    {954025200 14400 1 MSD}
+    {972774000 10800 0 MSK}
+    {985474800 14400 1 MSD}
+    {1004223600 10800 0 MSK}
+    {1017529200 14400 1 MSD}
+    {1035673200 10800 0 MSK}
+    {1048978800 14400 1 MSD}
+    {1067122800 10800 0 MSK}
+    {1080428400 14400 1 MSD}
+    {1099177200 10800 0 MSK}
+    {1111878000 14400 1 MSD}
+    {1130626800 10800 0 MSK}
+    {1143327600 14400 1 MSD}
+    {1162076400 10800 0 MSK}
+    {1174777200 14400 1 MSD}
+    {1193526000 10800 0 MSK}
+    {1206831600 14400 1 MSD}
+    {1224975600 10800 0 MSK}
+    {1238281200 14400 1 MSD}
+    {1256425200 10800 0 MSK}
+    {1269730800 14400 1 MSD}
+    {1288479600 10800 0 MSK}
+    {1301180400 14400 0 MSK}
+    {1414274400 10800 0 MSK}
 }
diff --git a/library/tzdata/Europe/Volgograd b/library/tzdata/Europe/Volgograd
index 2ce2dfe..00c3cb3 100644
--- a/library/tzdata/Europe/Volgograd
+++ b/library/tzdata/Europe/Volgograd
@@ -19,55 +19,55 @@ set TZData(:Europe/Volgograd) {
     {528242400 14400 0 +04}
     {543967200 18000 1 +05}
     {559692000 14400 0 +04}
-    {575416800 10800 0 +04}
-    {575420400 14400 1 +04}
-    {591145200 10800 0 +03}
-    {606870000 14400 1 +04}
-    {622594800 10800 0 +03}
-    {638319600 14400 1 +04}
-    {654649200 10800 0 +03}
+    {575416800 10800 0 MSD}
+    {575420400 14400 1 MSD}
+    {591145200 10800 0 MSK}
+    {606870000 14400 1 MSD}
+    {622594800 10800 0 MSK}
+    {638319600 14400 1 MSD}
+    {654649200 10800 0 MSK}
     {670374000 14400 0 +04}
-    {701820000 10800 0 +04}
-    {701823600 14400 1 +04}
-    {717548400 10800 0 +03}
-    {733273200 14400 1 +04}
-    {748998000 10800 0 +03}
-    {764722800 14400 1 +04}
-    {780447600 10800 0 +03}
-    {796172400 14400 1 +04}
-    {811897200 10800 0 +03}
-    {828226800 14400 1 +04}
-    {846370800 10800 0 +03}
-    {859676400 14400 1 +04}
-    {877820400 10800 0 +03}
-    {891126000 14400 1 +04}
-    {909270000 10800 0 +03}
-    {922575600 14400 1 +04}
-    {941324400 10800 0 +03}
-    {954025200 14400 1 +04}
-    {972774000 10800 0 +03}
-    {985474800 14400 1 +04}
-    {1004223600 10800 0 +03}
-    {1017529200 14400 1 +04}
-    {1035673200 10800 0 +03}
-    {1048978800 14400 1 +04}
-    {1067122800 10800 0 +03}
-    {1080428400 14400 1 +04}
-    {1099177200 10800 0 +03}
-    {1111878000 14400 1 +04}
-    {1130626800 10800 0 +03}
-    {1143327600 14400 1 +04}
-    {1162076400 10800 0 +03}
-    {1174777200 14400 1 +04}
-    {1193526000 10800 0 +03}
-    {1206831600 14400 1 +04}
-    {1224975600 10800 0 +03}
-    {1238281200 14400 1 +04}
-    {1256425200 10800 0 +03}
-    {1269730800 14400 1 +04}
-    {1288479600 10800 0 +03}
-    {1301180400 14400 0 +04}
-    {1414274400 10800 0 +03}
+    {701820000 10800 0 MSD}
+    {701823600 14400 1 MSD}
+    {717548400 10800 0 MSK}
+    {733273200 14400 1 MSD}
+    {748998000 10800 0 MSK}
+    {764722800 14400 1 MSD}
+    {780447600 10800 0 MSK}
+    {796172400 14400 1 MSD}
+    {811897200 10800 0 MSK}
+    {828226800 14400 1 MSD}
+    {846370800 10800 0 MSK}
+    {859676400 14400 1 MSD}
+    {877820400 10800 0 MSK}
+    {891126000 14400 1 MSD}
+    {909270000 10800 0 MSK}
+    {922575600 14400 1 MSD}
+    {941324400 10800 0 MSK}
+    {954025200 14400 1 MSD}
+    {972774000 10800 0 MSK}
+    {985474800 14400 1 MSD}
+    {1004223600 10800 0 MSK}
+    {1017529200 14400 1 MSD}
+    {1035673200 10800 0 MSK}
+    {1048978800 14400 1 MSD}
+    {1067122800 10800 0 MSK}
+    {1080428400 14400 1 MSD}
+    {1099177200 10800 0 MSK}
+    {1111878000 14400 1 MSD}
+    {1130626800 10800 0 MSK}
+    {1143327600 14400 1 MSD}
+    {1162076400 10800 0 MSK}
+    {1174777200 14400 1 MSD}
+    {1193526000 10800 0 MSK}
+    {1206831600 14400 1 MSD}
+    {1224975600 10800 0 MSK}
+    {1238281200 14400 1 MSD}
+    {1256425200 10800 0 MSK}
+    {1269730800 14400 1 MSD}
+    {1288479600 10800 0 MSK}
+    {1301180400 14400 0 MSK}
+    {1414274400 10800 0 MSK}
     {1540681200 14400 0 +04}
-    {1609020000 10800 0 +03}
+    {1609020000 10800 0 MSK}
 }
-- 
cgit v0.12


From d2fc2aa765cea8a44d1d40502629a88c09bbfd41 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 26 Mar 2023 18:41:13 +0000
Subject: Sync all error-messages with modern Linux

---
 generic/tclPosixStr.c | 100 ++++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index c4647d9..d4c20fa 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -496,9 +496,6 @@ const char *
 Tcl_ErrnoMsg(
      int err)			/* Error number (such as in errno variable). */
 {
-#ifndef _WIN32
-    return strerror(err);
-#else
     switch (err) {
 #if defined(E2BIG) && (!defined(EOVERFLOW) || (E2BIG != EOVERFLOW))
     case E2BIG: return "Argument list too long";
@@ -507,28 +504,28 @@ Tcl_ErrnoMsg(
     case EACCES: return "Permission denied";
 #endif
 #ifdef EADDRINUSE
-    case EADDRINUSE: return "Address in use";
+    case EADDRINUSE: return "Address already in use";
 #endif
 #ifdef EADDRNOTAVAIL
-    case EADDRNOTAVAIL: return "Address not available";
+    case EADDRNOTAVAIL: return "Cannot assign requested address";
 #endif
 #ifdef EADV
     case EADV: return "Advertise error";
 #endif
 #ifdef EAFNOSUPPORT
-    case EAFNOSUPPORT: return "Address family not supported";
+    case EAFNOSUPPORT: return "Address family not supported by protocol";
 #endif
 #ifdef EAGAIN
-    case EAGAIN: return "Resource unavailable, try again";
+    case EAGAIN: return "Resource temporarily unavailable";
 #endif
 #ifdef EALIGN
     case EALIGN: return "EALIGN";
 #endif
 #if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY))
-    case EALREADY: return "Connection already in progress";
+    case EALREADY: return "Operation already in progress";
 #endif
 #ifdef EBADE
-    case EBADE: return "Bad exchange descriptor";
+    case EBADE: return "Invalid exchange";
 #endif
 #ifdef EBADF
     case EBADF: return "Bad file descriptor";
@@ -540,13 +537,13 @@ Tcl_ErrnoMsg(
     case EBADMSG: return "Bad message";
 #endif
 #ifdef EBADR
-    case EBADR: return "Bad request descriptor";
+    case EBADR: return "Invalid request descriptor";
 #endif
 #ifdef EBADRPC
     case EBADRPC: return "RPC structure is bad";
 #endif
 #ifdef EBADRQC
-    case EBADRQC: return "Bad request code";
+    case EBADRQC: return "Invalid request code";
 #endif
 #ifdef EBADSLT
     case EBADSLT: return "Invalid slot";
@@ -570,19 +567,19 @@ Tcl_ErrnoMsg(
     case ECOMM: return "Communication error on send";
 #endif
 #ifdef ECONNABORTED
-    case ECONNABORTED: return "Connection aborted";
+    case ECONNABORTED: return "Software caused connection abort";
 #endif
 #ifdef ECONNREFUSED
     case ECONNREFUSED: return "Connection refused";
 #endif
 #ifdef ECONNRESET
-    case ECONNRESET: return "Connection reset";
+    case ECONNRESET: return "Connection reset by peer";
 #endif
 #if defined(EDEADLK) && (!defined(EWOULDBLOCK) || (EDEADLK != EWOULDBLOCK))
-    case EDEADLK: return "Resource deadlock would occur";
+    case EDEADLK: return "Resource deadlock avoided";
 #endif
 #if defined(EDEADLOCK) && (!defined(EDEADLK) || (EDEADLOCK != EDEADLK))
-    case EDEADLOCK: return "Resource deadlock would occur";
+    case EDEADLOCK: return "Resource deadlock avoided";
 #endif
 #ifdef EDESTADDRREQ
     case EDESTADDRREQ: return "Destination address required";
@@ -591,10 +588,10 @@ Tcl_ErrnoMsg(
     case EDIRTY: return "Mounting a dirty fs w/o force";
 #endif
 #ifdef EDOM
-    case EDOM: return "Mathematics argument out of domain of function";
+    case EDOM: return "Numerical argument out of domain";
 #endif
 #ifdef EDOTDOT
-    case EDOTDOT: return "Cross mount point";
+    case EDOTDOT: return "RFS specific error";
 #endif
 #ifdef EDQUOT
     case EDQUOT: return "Disk quota exceeded";
@@ -615,7 +612,7 @@ Tcl_ErrnoMsg(
     case EHOSTDOWN: return "Host is down";
 #endif
 #ifdef EHOSTUNREACH
-    case EHOSTUNREACH: return "Host is unreachable";
+    case EHOSTUNREACH: return "No route to host";
 #endif
 #if defined(EIDRM) && (!defined(EINPROGRESS) || (EIDRM != EINPROGRESS))
     case EIDRM: return "Identifier removed";
@@ -627,19 +624,19 @@ Tcl_ErrnoMsg(
     case EILSEQ: return "Invalid or incomplete multibyte or wide character";
 #endif
 #ifdef EINPROGRESS
-    case EINPROGRESS: return "Operation in progress";
+    case EINPROGRESS: return "Operation now in progress";
 #endif
 #ifdef EINTR
-    case EINTR: return "Interrupted function";
+    case EINTR: return "Interrupted system call";
 #endif
 #ifdef EINVAL
     case EINVAL: return "Invalid argument";
 #endif
 #ifdef EIO
-    case EIO: return "I/O error";
+    case EIO: return "Input/output error";
 #endif
 #ifdef EISCONN
-    case EISCONN: return "Socket is connected";
+    case EISCONN: return "Transport endpoint is already connected";
 #endif
 #ifdef EISDIR
     case EISDIR: return "Is a directory";
@@ -663,7 +660,7 @@ Tcl_ErrnoMsg(
     case EL3RST: return "Level 3 reset";
 #endif
 #ifdef ELIBACC
-    case ELIBACC: return "Cannot access a needed shared library";
+    case ELIBACC: return "Can not access a needed shared library";
 #endif
 #ifdef ELIBBAD
     case ELIBBAD: return "Accessing a corrupted shared library";
@@ -673,7 +670,7 @@ Tcl_ErrnoMsg(
 #endif
 #if defined(ELIBMAX) && (!defined(ECANCELED) || (ELIBMAX != ECANCELED))
     case ELIBMAX: return
-	    "Attempting to link in more shared libraries than system limit";
+	    "Attempting to link in too many shared libraries";
 #endif
 #ifdef ELIBSCN
     case ELIBSCN: return ".lib section in a.out corrupted";
@@ -685,22 +682,22 @@ Tcl_ErrnoMsg(
     case ELOOP: return "Too many levels of symbolic links";
 #endif
 #ifdef EMFILE
-    case EMFILE: return "File descriptor value too large";
+    case EMFILE: return "Too many open files";
 #endif
 #ifdef EMLINK
     case EMLINK: return "Too many links";
 #endif
 #ifdef EMSGSIZE
-    case EMSGSIZE: return "Message too large";
+    case EMSGSIZE: return "Message too long";
 #endif
 #ifdef EMULTIHOP
     case EMULTIHOP: return "Multihop attempted";
 #endif
 #ifdef ENAMETOOLONG
-    case ENAMETOOLONG: return "Filename too long";
+    case ENAMETOOLONG: return "File name too long";
 #endif
 #ifdef ENAVAIL
-    case ENAVAIL: return "Not available";
+    case ENAVAIL: return "No XENIX semaphores available";
 #endif
 #ifdef ENET
     case ENET: return "ENET";
@@ -715,10 +712,10 @@ Tcl_ErrnoMsg(
     case ENETUNREACH: return "Network is unreachable";
 #endif
 #ifdef ENFILE
-    case ENFILE: return "Too many files open in system";
+    case ENFILE: return "Too many open files in system";
 #endif
 #ifdef ENOANO
-    case ENOANO: return "Anode table overflow";
+    case ENOANO: return "No anode";
 #endif
 #if defined(ENOBUFS) && (!defined(ENOSR) || (ENOBUFS != ENOSR))
     case ENOBUFS: return "No buffer space available";
@@ -736,7 +733,7 @@ Tcl_ErrnoMsg(
     case ENOENT: return "No such file or directory";
 #endif
 #ifdef ENOEXEC
-    case ENOEXEC: return "Executable format error";
+    case ENOEXEC: return "Exec format error";
 #endif
 #ifdef ENOLCK
     case ENOLCK: return "No locks available";
@@ -745,7 +742,7 @@ Tcl_ErrnoMsg(
     case ENOLINK: return "Link has been severed";
 #endif
 #ifdef ENOMEM
-    case ENOMEM: return "Not enough space";
+    case ENOMEM: return "Cannot allocate memory";
 #endif
 #ifdef ENOMSG
     case ENOMSG: return "No message of desired type";
@@ -763,16 +760,16 @@ Tcl_ErrnoMsg(
     case ENOSPC: return "No space left on device";
 #endif
 #if defined(ENOSR) && (!defined(ENAMETOOLONG) || (ENAMETOOLONG != ENOSR))
-    case ENOSR: return "No stream resources";
+    case ENOSR: return "Out of streams resources";
 #endif
 #if defined(ENOSTR) && (!defined(ENOTTY) || (ENOTTY != ENOSTR))
-    case ENOSTR: return "Not a stream";
+    case ENOSTR: return "Device not a stream";
 #endif
 #ifdef ENOSYM
     case ENOSYM: return "Unresolved symbol name";
 #endif
 #ifdef ENOSYS
-    case ENOSYS: return "Functionality not supported";
+    case ENOSYS: return "Function not implemented";
 #endif
 #ifdef ENOTBLK
     case ENOTBLK: return "Block device required";
@@ -784,22 +781,22 @@ Tcl_ErrnoMsg(
     case ENOTRECOVERABLE: return "State not recoverable";
 #endif
 #ifdef ENOTDIR
-    case ENOTDIR: return "Not a directory or a symbolic link to a directory";
+    case ENOTDIR: return "Not a directory";
 #endif
 #if defined(ENOTEMPTY) && (!defined(EEXIST) || (ENOTEMPTY != EEXIST))
     case ENOTEMPTY: return "Directory not empty";
 #endif
 #ifdef ENOTNAM
-    case ENOTNAM: return "Not a name file";
+    case ENOTNAM: return "Not a XENIX named type file";
 #endif
 #ifdef ENOTSOCK
-    case ENOTSOCK: return "Not a socket";
+    case ENOTSOCK: return "Socket operation on non-socket";
 #endif
 #ifdef ENOTSUP
-    case ENOTSUP: return "Not supported";
+    case ENOTSUP: return "Operation not supported";
 #endif
 #ifdef ENOTTY
-    case ENOTTY: return "Inappropriate I/O control operation";
+    case ENOTTY: return "Inappropriate ioctl for device";
 #endif
 #ifdef ENOTUNIQ
     case ENOTUNIQ: return "Name not unique on network";
@@ -814,10 +811,10 @@ Tcl_ErrnoMsg(
     case EOTHER: return "Other error";
 #endif
 #if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
-    case EOVERFLOW: return "Value too large to be stored in data type";
+    case EOVERFLOW: return "Value too large for defined data type";
 #endif
 #ifdef EOWNERDEAD
-    case EOWNERDEAD: return "Previous owner died";
+    case EOWNERDEAD: return "Owner died";
 #endif
 #ifdef EPERM
     case EPERM: return "Operation not permitted";
@@ -850,7 +847,7 @@ Tcl_ErrnoMsg(
     case EPROTOTYPE: return "Protocol wrong type for socket";
 #endif
 #ifdef ERANGE
-    case ERANGE: return "Result too large";
+    case ERANGE: return "Numerical result out of range";
 #endif
 #if defined(EREFUSED) && (!defined(ECONNREFUSED) || (EREFUSED != ECONNREFUSED))
     case EREFUSED: return "EREFUSED";
@@ -862,10 +859,10 @@ Tcl_ErrnoMsg(
     case EREMDEV: return "Remote device";
 #endif
 #ifdef EREMOTE
-    case EREMOTE: return "Pathname hit remote file system";
+    case EREMOTE: return "Object is remote";
 #endif
 #ifdef EREMOTEIO
-    case EREMOTEIO: return "Remote i/o error";
+    case EREMOTEIO: return "Remote I/O error";
 #endif
 #ifdef EREMOTERELEASE
     case EREMOTERELEASE: return "EREMOTERELEASE";
@@ -880,13 +877,13 @@ Tcl_ErrnoMsg(
     case ERREMOTE: return "Object is remote";
 #endif
 #ifdef ESHUTDOWN
-    case ESHUTDOWN: return "Cannot send after socket shutdown";
+    case ESHUTDOWN: return "Cannot send after transport endpoint shutdown";
 #endif
 #ifdef ESOCKTNOSUPPORT
     case ESOCKTNOSUPPORT: return "Socket type not supported";
 #endif
 #ifdef ESPIPE
-    case ESPIPE: return "Invalid seek";
+    case ESPIPE: return "Illegal seek";
 #endif
 #ifdef ESRCH
     case ESRCH: return "No such process";
@@ -895,10 +892,10 @@ Tcl_ErrnoMsg(
     case ESRMNT: return "Srmount error";
 #endif
 #ifdef ESTALE
-    case ESTALE: return "Stale remote file handle";
+    case ESTALE: return "Stale file handle";
 #endif
 #ifdef ESUCCESS
-    case ESUCCESS: return "Error 0";
+    case ESUCCESS: return "Success";
 #endif
 #if defined(ETIME) && (!defined(ELOOP) || (ETIME != ELOOP))
     case ETIME: return "Timer expired";
@@ -928,10 +925,10 @@ Tcl_ErrnoMsg(
     case EWOULDBLOCK: return "Operation would block";
 #endif
 #ifdef EXDEV
-    case EXDEV: return "Cross-domain link";
+    case EXDEV: return "Invalid cross-device link";
 #endif
 #ifdef EXFULL
-    case EXFULL: return "Message tables full";
+    case EXFULL: return "Exchange full";
 #endif
     default:
 #ifdef NO_STRERROR
@@ -940,7 +937,6 @@ Tcl_ErrnoMsg(
 	return strerror(err);
 #endif
     }
-#endif
 }
 
 /*
-- 
cgit v0.12


From 38a87927cf6adb2f3db0ee2a9ac195e4dd7853d4 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sun, 26 Mar 2023 22:18:05 +0000
Subject: Update reference-counting advice for Tcl_ObjSetVar2 and friends.

---
 doc/SetVar.3 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/SetVar.3 b/doc/SetVar.3
index eb8333b..d061a2b 100644
--- a/doc/SetVar.3
+++ b/doc/SetVar.3
@@ -250,18 +250,18 @@ and \fBTcl_ObjGetVar2\fR is (if non-NULL) a value with a reference of at least
 operated upon.
 .PP
 The \fInewValuePtr\fR argument to \fBTcl_SetVar2Ex\fR and \fBTcl_ObjSetVar2\fR
-may be an arbitrary reference count value; its reference count will be
-incremented on success. However, it is recommended to not use a zero reference
-count value, as that makes correct handling of the error case tricky.
+may be an arbitrary reference count value.  Its reference count is
+incremented on success.  On failure, if is reference count is zero, it is
+decremented and freed so the caller need do nothing with it.
 .PP
-The \fIpart1\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR can
-have any reference count; these functions never modify it. It is recommended
-to not use a zero reference count for this argument.
+The \fIpart1Ptr\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR can
+have any reference count.  These functions never modify it.
 .PP
-The \fIpart2\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR, if
+The \fIpart2Ptr\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR, if
 non-NULL, should not have a zero reference count as these functions may
-retain a reference to it (particularly when it is used to create an array
-element that did not previously exist).
+retain a reference to it, particularly when it is used to create an array
+element that did not previously exist, and decrementing the reference count
+later would leave them pointing to a freed Tcl_Obj.
 
 .SH "SEE ALSO"
 Tcl_GetObjResult, Tcl_GetStringResult, Tcl_TraceVar
-- 
cgit v0.12


From 49b6ecfb4e17876dec5c9f9edad8d5e0a44cb52c Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Sun, 26 Mar 2023 22:29:05 +0000
Subject: Fix some formatting errors.

---
 doc/encoding.n | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index 8ede974..e02f316 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -96,7 +96,7 @@ Returns a list of the names of encoding profiles. See \fBPROFILES\fR below.
 Set the system encoding to \fIencoding\fR. If \fIencoding\fR is
 omitted then the command returns the current system encoding.  The
 system encoding is used whenever Tcl passes strings to system calls.
-\" Do not put .VS on whole section as that messes up the bullet list alignment
+.\" Do not put .VS on whole section as that messes up the bullet list alignment
 .SH PROFILES
 .PP
 .VS "TCL8.7 TIP656"
@@ -172,7 +172,7 @@ These examples use the utility proc below that prints the Unicode code points
 comprising a Tcl string.
 .PP
 .CS
-proc codepoints {s} {join [lmap c [split $s ""] {
+proc codepoints s {join [lmap c [split $s {}] {
     string cat U+ [format %.6X [scan $c %c]]}]
 }
 .CE
@@ -193,8 +193,8 @@ Example 2: Error handling based on profiles:
 .PP
 The letter \fBA\fR is Unicode character U+0041 and the byte "\ex80" is invalid
 in ASCII encoding.
-.CS
 .PP
+.CS
 % codepoints [encoding convertfrom -profile tcl8 ascii A\ex80]
 U+000041 U+000080
 % codepoints [encoding convertfrom -profile replace ascii A\ex80]
-- 
cgit v0.12


From 587c1ebdba4cb0f92dcd91478ce711833552fd48 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 27 Mar 2023 11:14:50 +0000
Subject: Avoid msvc "illegal indirection" error.

---
 generic/tclPathObj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index aefc84f..64b79ed 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2350,7 +2350,7 @@ SetFsPathFromAny(
     fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath));
 
     if (transPtr == pathPtr) {
-	Tcl_GetStringFromObj(pathPtr, NULL);
+	(void) Tcl_GetStringFromObj(pathPtr, NULL);
 	TclFreeInternalRep(pathPtr);
         transPtr = Tcl_DuplicateObj(pathPtr);
         fsPathPtr->filesystemEpoch = 0;
-- 
cgit v0.12


From 2524a62bb6b65a0b183dc413dd13ebbae997a537 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 27 Mar 2023 11:35:58 +0000
Subject: More (internal) usage of TclGetString() and TclGetStringFromObj()
 macro's

---
 generic/tclClock.c       |  2 +-
 generic/tclCmdAH.c       |  6 +++---
 generic/tclCmdMZ.c       |  4 ++--
 generic/tclCompCmds.c    |  6 +++---
 generic/tclCompExpr.c    |  2 +-
 generic/tclDate.c        |  2 +-
 generic/tclDictObj.c     |  4 ++--
 generic/tclDisassemble.c |  2 +-
 generic/tclEncoding.c    |  2 +-
 generic/tclEvent.c       |  2 +-
 generic/tclExecute.c     |  2 +-
 generic/tclFCmd.c        |  2 +-
 generic/tclFileName.c    |  6 +++---
 generic/tclGetDate.y     |  2 +-
 generic/tclIOCmd.c       |  2 +-
 generic/tclIOUtil.c      |  2 +-
 generic/tclInterp.c      |  2 +-
 generic/tclOOBasic.c     |  6 +++---
 generic/tclOOMethod.c    |  6 +++---
 generic/tclPathObj.c     |  4 ++--
 generic/tclProc.c        |  2 +-
 generic/tclStringObj.c   | 14 +++++++-------
 generic/tclZipfs.c       | 18 +++++++++---------
 23 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/generic/tclClock.c b/generic/tclClock.c
index d1f08c1..dd3e1c9 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -1918,7 +1918,7 @@ ClockParseformatargsObjCmd(
 	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
 		&optionIndex) != TCL_OK) {
 	    Tcl_SetErrorCode(interp, "CLOCK", "badOption",
-		    Tcl_GetString(objv[i]), NULL);
+		    TclGetString(objv[i]), NULL);
 	    return TCL_ERROR;
 	}
 	switch (optionIndex) {
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 5c27bbc..2f50959 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -608,7 +608,7 @@ numArgsError: /* ONLY jump here if nothing needs to be freed!!! */
 	    switch (optIndex) {
 	    case PROFILE:
 		if (TclEncodingProfileNameToId(interp,
-					       Tcl_GetString(objv[argIndex]),
+					       TclGetString(objv[argIndex]),
 					       &profile) != TCL_OK) {
 		    return TCL_ERROR;
 		}
@@ -2054,7 +2054,7 @@ PathFilesystemCmd(
     if (fsInfo == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj("unrecognised path", -1));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "FILESYSTEM",
-		Tcl_GetString(objv[1]), NULL);
+		TclGetString(objv[1]), NULL);
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, fsInfo);
@@ -2306,7 +2306,7 @@ FilesystemSeparatorCmd(
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "unrecognised path", -1));
 	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "FILESYSTEM",
-		    Tcl_GetString(objv[1]), NULL);
+		    TclGetString(objv[1]), NULL);
 	    return TCL_ERROR;
 	}
 	Tcl_SetObjResult(interp, separatorObj);
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 817416a..4a802c9 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -4793,7 +4793,7 @@ TclNRTryObjCmd(
 	    if (TclListObjLengthM(NULL, objv[i+1], &dummy) != TCL_OK) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"bad prefix '%s': must be a list",
-			Tcl_GetString(objv[i+1])));
+			TclGetString(objv[i+1])));
 		Tcl_DecrRefCount(handlersObj);
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "TRY", "TRAP",
 			"EXNFORMAT", NULL);
@@ -5333,7 +5333,7 @@ TclListLines(
     Tcl_Obj *const *elems)      /* The list elems as Tcl_Obj*, in need of
 				 * derived continuation data */
 {
-    const char *listStr = Tcl_GetString(listObj);
+    const char *listStr = TclGetString(listObj);
     const char *listHead = listStr;
     int i, length = strlen(listStr);
     const char *element = NULL, *next = NULL;
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index e5b20a9..dacb72a 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -3187,7 +3187,7 @@ TclCompileFormatCmd(
      * the format is broken). Do the format now.
      */
 
-    tmpObj = Tcl_Format(interp, Tcl_GetString(formatObj),
+    tmpObj = Tcl_Format(interp, TclGetString(formatObj),
 	    parsePtr->numWords-2, objv);
     for (; --i>=0 ;) {
 	Tcl_DecrRefCount(objv[i]);
@@ -3231,7 +3231,7 @@ TclCompileFormatCmd(
      * Now scan through and check for non-%s and non-%% substitutions.
      */
 
-    for (bytes = Tcl_GetString(formatObj) ; *bytes ; bytes++) {
+    for (bytes = TclGetString(formatObj) ; *bytes ; bytes++) {
 	if (*bytes == '%') {
 	    bytes++;
 	    if (*bytes == 's') {
@@ -3264,7 +3264,7 @@ TclCompileFormatCmd(
     i = 0;			/* The count of things to concat. */
     j = 2;			/* The index into the argument tokens, for
 				 * TIP#280 handling. */
-    start = Tcl_GetString(formatObj);
+    start = TclGetString(formatObj);
 				/* The start of the currently-scanned literal
 				 * in the format string. */
     TclNewObj(tmpObj);	/* The buffer used to accumulate the literal
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index ded32aa..8808024 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2565,7 +2565,7 @@ CompileExprTree(
 			Tcl_Obj *tableValue;
 			int numBytes;
 			const char *bytes
-				= Tcl_GetStringFromObj(objPtr, &numBytes);
+				= TclGetStringFromObj(objPtr, &numBytes);
 
 			idx = TclRegisterLiteral(envPtr, bytes, numBytes, 0);
 			tableValue = TclFetchLiteral(envPtr, idx);
diff --git a/generic/tclDate.c b/generic/tclDate.c
index edf069a..97675fb 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -2760,7 +2760,7 @@ TclClockOldscanObjCmd(
 	return TCL_ERROR;
     }
 
-    yyInput = Tcl_GetString( objv[1] );
+    yyInput = TclGetString( objv[1] );
     dateInfo.dateStart = yyInput;
 
     yyHaveDate = 0;
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 55664ce..ab66186 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -635,7 +635,7 @@ SetDictFromAny(
 		 * convert back.
 		 */
 
-		(void) Tcl_GetString(objPtr);
+		(void) TclGetString(objPtr);
 
 		TclDecrRefCount(discardedValue);
 	    }
@@ -3308,7 +3308,7 @@ DictUpdateCmd(
 	}
 	if (objPtr == NULL) {
 	    /* ??? */
-	    Tcl_UnsetVar2(interp, Tcl_GetString(objv[i+1]), NULL, 0);
+	    Tcl_UnsetVar2(interp, TclGetString(objv[i+1]), NULL, 0);
 	} else if (Tcl_ObjSetVar2(interp, objv[i+1], NULL, objPtr,
 		TCL_LEAVE_ERR_MSG) == NULL) {
 	    TclDecrRefCount(dictPtr);
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 0bc3de1..10404e9 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -286,7 +286,7 @@ DisassembleByteCodeObj(
     GetLocationInformation(codePtr->procPtr, &fileObj, &line);
     if (line >= 0 && fileObj != NULL) {
 	Tcl_AppendPrintfToObj(bufferObj, "\n  File \"%s\" Line %d",
-		Tcl_GetString(fileObj), line);
+		TclGetString(fileObj), line);
     }
     Tcl_AppendPrintfToObj(bufferObj,
 	    "\n  Cmds %d, src %d, inst %d, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index b472db3..fc2835d 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -4423,7 +4423,7 @@ InitializeEncodingSearchPath(
     if (*encodingPtr) {
 	((Encoding *)(*encodingPtr))->refCount++;
     }
-    bytes = Tcl_GetStringFromObj(searchPathObj, &numBytes);
+    bytes = TclGetStringFromObj(searchPathObj, &numBytes);
 
     *lengthPtr = numBytes;
     *valuePtr = (char *)ckalloc(numBytes + 1);
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 8729add..e28128f 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1522,7 +1522,7 @@ Tcl_VwaitObjCmd(
 	OPT_TIMEOUT, OPT_VARIABLE, OPT_WRITABLE, OPT_LAST
     } index;
 
-    if ((objc == 2) && (strcmp(Tcl_GetString(objv[1]), "--") != 0)) {
+    if ((objc == 2) && (strcmp(TclGetString(objv[1]), "--") != 0)) {
 	/*
 	 * Legacy "vwait" syntax, skip option handling.
 	 */
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index e8aca32..4c6c088 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -3788,7 +3788,7 @@ TEBCresume(
 	arrayPtr = NULL;
 	part1Ptr = part2Ptr = NULL;
 	cleanup = 0;
-	TRACE(("%u %s => ", opnd, Tcl_GetString(incrPtr)));
+	TRACE(("%u %s => ", opnd, TclGetString(incrPtr)));
 
     doIncrVar:
 	if (TclIsVarDirectModifyable2(varPtr, arrayPtr)) {
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index ea8f715..bfc3f43 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1679,7 +1679,7 @@ TclFileHomeCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "?user?");
 	return TCL_ERROR;
     }
-    homeDirObj = TclGetHomeDirObj(interp, objc == 1 ? NULL : Tcl_GetString(objv[1]));
+    homeDirObj = TclGetHomeDirObj(interp, objc == 1 ? NULL : TclGetString(objv[1]));
     if (homeDirObj == NULL) {
 	return TCL_ERROR;
     }
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 3ca1ab5..7b3b03f 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -502,11 +502,11 @@ TclpNativeSplitPath(
 
     switch (tclPlatform) {
     case TCL_PLATFORM_UNIX:
-	resultPtr = SplitUnixPath(Tcl_GetString(pathPtr));
+	resultPtr = SplitUnixPath(TclGetString(pathPtr));
 	break;
 
     case TCL_PLATFORM_WINDOWS:
-	resultPtr = SplitWinPath(Tcl_GetString(pathPtr));
+	resultPtr = SplitWinPath(TclGetString(pathPtr));
 	break;
     }
 
@@ -919,7 +919,7 @@ TclpNativeJoinPath(
 	 */
 
 	Tcl_SetObjLength(prefix, length + (int) strlen(p));
-	dest = Tcl_GetString(prefix) + length;
+	dest = TclGetString(prefix) + length;
 	for (; *p != '\0'; p++) {
 	    if ((*p == '/') || (*p == '\\')) {
 		while ((p[1] == '/') || (p[1] == '\\')) {
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
index e85184b..08c0193 100644
--- a/generic/tclGetDate.y
+++ b/generic/tclGetDate.y
@@ -976,7 +976,7 @@ TclClockOldscanObjCmd(
 	return TCL_ERROR;
     }
 
-    yyInput = Tcl_GetString( objv[1] );
+    yyInput = TclGetString( objv[1] );
     dateInfo.dateStart = yyInput;
 
     yyHaveDate = 0;
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index e8a534f..40f0090 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1485,7 +1485,7 @@ Tcl_SocketObjCmd(
     TclInitSockets();
 
     for (a = 1; a < objc; a++) {
-	const char *arg = Tcl_GetString(objv[a]);
+	const char *arg = TclGetString(objv[a]);
 
 	if (arg[0] != '-') {
 	    break;
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index d1589c1..9a3ddfb 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1338,7 +1338,7 @@ TclFSNormalizeToUniquePath(
      * We check these first to avoid useless calls to the native filesystem's
      * normalizePathProc.
      */
-    path = Tcl_GetStringFromObj(pathPtr, &i);
+    path = TclGetStringFromObj(pathPtr, &i);
 
     if ( (i >= 3) && ( (path[0] == '/' && path[1] == '/')
 		    || (path[0] == '\\' && path[1] == '\\') ) ) {
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 70cf8fa..e743931 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -1111,7 +1111,7 @@ NRInterpCmd(
 	if (hPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "alias \"%s\" in path \"%s\" not found",
-		    aliasName, Tcl_GetString(objv[2])));
+		    aliasName, TclGetString(objv[2])));
 	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "ALIAS", aliasName,
 		    NULL);
 	    return TCL_ERROR;
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index 3593193..9b72060 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -208,7 +208,7 @@ TclOO_Class_Create(
 		"objectName ?arg ...?");
 	return TCL_ERROR;
     }
-    objName = Tcl_GetStringFromObj(
+    objName = TclGetStringFromObj(
 	    objv[Tcl_ObjectContextSkippedArgs(context)], &len);
     if (len == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -273,7 +273,7 @@ TclOO_Class_CreateNs(
 		"objectName namespaceName ?arg ...?");
 	return TCL_ERROR;
     }
-    objName = Tcl_GetStringFromObj(
+    objName = TclGetStringFromObj(
 	    objv[Tcl_ObjectContextSkippedArgs(context)], &len);
     if (len == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -281,7 +281,7 @@ TclOO_Class_CreateNs(
 	Tcl_SetErrorCode(interp, "TCL", "OO", "EMPTY_NAME", NULL);
 	return TCL_ERROR;
     }
-    nsName = Tcl_GetStringFromObj(
+    nsName = TclGetStringFromObj(
 	    objv[Tcl_ObjectContextSkippedArgs(context)+1], &len);
     if (len == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index 73368e4..a613fb4 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -1286,7 +1286,7 @@ MethodErrorHandler(
 	kindName = "class";
     }
 
-    objectName = Tcl_GetStringFromObj(TclOOObjectName(interp, declarerPtr),
+    objectName = TclGetStringFromObj(TclOOObjectName(interp, declarerPtr),
 	    &objectNameLen);
     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 	    "\n    (%s \"%.*s%s\" method \"%.*s%s\" line %d)",
@@ -1317,7 +1317,7 @@ ConstructorErrorHandler(
 	kindName = "class";
     }
 
-    objectName = Tcl_GetStringFromObj(TclOOObjectName(interp, declarerPtr),
+    objectName = TclGetStringFromObj(TclOOObjectName(interp, declarerPtr),
 	    &objectNameLen);
     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 	    "\n    (%s \"%.*s%s\" constructor line %d)", kindName,
@@ -1347,7 +1347,7 @@ DestructorErrorHandler(
 	kindName = "class";
     }
 
-    objectName = Tcl_GetStringFromObj(TclOOObjectName(interp, declarerPtr),
+    objectName = TclGetStringFromObj(TclOOObjectName(interp, declarerPtr),
 	    &objectNameLen);
     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 	    "\n    (%s \"%.*s%s\" destructor line %d)", kindName,
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 64b79ed..e67ae64 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2350,7 +2350,7 @@ SetFsPathFromAny(
     fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath));
 
     if (transPtr == pathPtr) {
-	(void) Tcl_GetStringFromObj(pathPtr, NULL);
+	(void)TclGetString(pathPtr);
 	TclFreeInternalRep(pathPtr);
         transPtr = Tcl_DuplicateObj(pathPtr);
         fsPathPtr->filesystemEpoch = 0;
@@ -2691,7 +2691,7 @@ TclResolveTildePath(
     int split;
     Tcl_DString resolvedPath;
 
-    path = Tcl_GetStringFromObj(pathObj, &len);
+    path = TclGetStringFromObj(pathObj, &len);
     if (path[0] != '~') {
 	return pathObj;
     }
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 3ada9ea..d02cac2 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -538,7 +538,7 @@ TclCreateProc(
 	    goto procError;
 	}
 
-	argname = Tcl_GetStringFromObj(fieldValues[0], &nameLength);
+	argname = TclGetStringFromObj(fieldValues[0], &nameLength);
 
 	/*
 	 * Check that the formal parameter name is a scalar.
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 708c157..e1f5160 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -3368,7 +3368,7 @@ TclStringRepeat(
 	TclGetUnicodeFromObj_(objPtr, &length);
     } else {
 	/* Result will be concat of string reps. Pre-size it. */
-	Tcl_GetStringFromObj(objPtr, &length);
+	TclGetStringFromObj(objPtr, &length);
     }
 
     if (length == 0) {
@@ -3618,7 +3618,7 @@ TclStringCat(
 		    /* No string rep; Take the chance we can avoid making it */
 		    pendingPtr = objPtr;
 		} else {
-		    Tcl_GetStringFromObj(objPtr, &length); /* PANIC? */
+		    TclGetStringFromObj(objPtr, &length); /* PANIC? */
 		}
 	    } while (--oc && (length == 0) && (pendingPtr == NULL));
 
@@ -3644,14 +3644,14 @@ TclStringCat(
 
 		do {
 		    Tcl_Obj *objPtr = *ov++;
-		    Tcl_GetStringFromObj(objPtr, &numBytes); /* PANIC? */
+		    TclGetStringFromObj(objPtr, &numBytes); /* PANIC? */
 		} while (--oc && numBytes == 0 && pendingPtr->bytes == NULL);
 
 		if (numBytes) {
 		    last = objc -oc -1;
 		}
 		if (oc || numBytes) {
-		    Tcl_GetStringFromObj(pendingPtr, &length);
+		    TclGetStringFromObj(pendingPtr, &length);
 		}
 		if (length == 0) {
 		    if (numBytes) {
@@ -3670,7 +3670,7 @@ TclStringCat(
 
 	    /* assert ( length > 0 && pendingPtr == NULL )  */
 
-	    Tcl_GetStringFromObj(objPtr, &numBytes); /* PANIC? */
+	    TclGetStringFromObj(objPtr, &numBytes); /* PANIC? */
 	    if (numBytes) {
 		last = objc - oc;
 		if (numBytes > INT_MAX - length) {
@@ -3785,7 +3785,7 @@ TclStringCat(
 
 	    objResultPtr = *objv++; objc--;
 
-	    Tcl_GetStringFromObj(objResultPtr, &start);
+	    TclGetStringFromObj(objResultPtr, &start);
 	    if (0 == Tcl_AttemptSetObjLength(objResultPtr, length)) {
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3818,7 +3818,7 @@ TclStringCat(
 
 	    if ((objPtr->bytes == NULL) || (objPtr->length)) {
 		int more;
-		char *src = Tcl_GetStringFromObj(objPtr, &more);
+		char *src = TclGetStringFromObj(objPtr, &more);
 
 		memcpy(dst, src, more);
 		dst += more;
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 1b602ea..d834847 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -2415,7 +2415,7 @@ ZipFSMkKeyObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "password");
 	return TCL_ERROR;
     }
-    pw = Tcl_GetStringFromObj(objv[1], &len);
+    pw = TclGetStringFromObj(objv[1], &len);
     if (len == 0) {
 	return TCL_OK;
     }
@@ -2942,7 +2942,7 @@ ComputeNameInArchive(
     if (directNameObj) {
 	name = Tcl_GetString(directNameObj);
     } else {
-	name = Tcl_GetStringFromObj(pathObj, &len);
+	name = TclGetStringFromObj(pathObj, &len);
 	if (slen > 0) {
 	    if ((len <= slen) || (strncmp(strip, name, slen) != 0)) {
 		/*
@@ -3028,7 +3028,7 @@ ZipFSMkZipOrImg(
 
     passBuf[0] = 0;
     if (passwordObj != NULL) {
-	pw = Tcl_GetStringFromObj(passwordObj, &pwlen);
+	pw = TclGetStringFromObj(passwordObj, &pwlen);
 	if (IsPasswordValid(interp, pw, pwlen) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -3188,7 +3188,7 @@ ZipFSMkZipOrImg(
 
     Tcl_InitHashTable(&fileHash, TCL_STRING_KEYS);
     if (mappingList == NULL && stripPrefix != NULL) {
-	strip = Tcl_GetStringFromObj(stripPrefix, &slen);
+	strip = TclGetStringFromObj(stripPrefix, &slen);
 	if (!slen) {
 	    strip = NULL;
 	}
@@ -5045,13 +5045,13 @@ ZipFSMatchInDirectoryProc(
      * The prefix that gets prepended to results.
      */
 
-    prefix = Tcl_GetStringFromObj(pathPtr, &prefixLen);
+    prefix = TclGetStringFromObj(pathPtr, &prefixLen);
 
     /*
      * The (normalized) path we're searching.
      */
 
-    path = Tcl_GetStringFromObj(normPathPtr, &len);
+    path = TclGetStringFromObj(normPathPtr, &len);
 
     Tcl_DStringInit(&dsPref);
     if (strcmp(prefix, path) == 0) {
@@ -5166,7 +5166,7 @@ ZipFSMatchMountPoints(
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
     int l, normLength;
-    const char *path = Tcl_GetStringFromObj(normPathPtr, &normLength);
+    const char *path = TclGetStringFromObj(normPathPtr, &normLength);
     size_t len = (size_t) normLength;
 
     if (len < 1) {
@@ -5253,7 +5253,7 @@ ZipFSPathInFilesystemProc(
     if (!pathPtr) {
 	return -1;
     }
-    path = Tcl_GetStringFromObj(pathPtr, &len);
+    path = TclGetStringFromObj(pathPtr, &len);
     if (strncmp(path, ZIPFS_VOLUME, ZIPFS_VOLUME_LEN) != 0) {
 	return -1;
     }
@@ -5401,7 +5401,7 @@ ZipFSFileAttrsGetProc(
     if (!pathPtr) {
 	return -1;
     }
-    path = Tcl_GetStringFromObj(pathPtr, &len);
+    path = TclGetStringFromObj(pathPtr, &len);
     ReadLock();
     z = ZipFSLookup(path);
     if (!z) {
-- 
cgit v0.12


From 3faf228237dd3d33b2f726b1145f8f70f1327180 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 27 Mar 2023 12:14:03 +0000
Subject: Make the documentation of [encoding] more concise and readable.

---
 doc/encoding.n | 183 ++++++++++++++++++++++++---------------------------------
 1 file changed, 78 insertions(+), 105 deletions(-)

diff --git a/doc/encoding.n b/doc/encoding.n
index e02f316..c881d26 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -8,78 +8,81 @@
 .so man.macros
 .BS
 .SH NAME
-encoding \- Manipulate encodings
+encoding \- Work with encodings
 .SH SYNOPSIS
-\fBencoding \fIoption\fR ?\fIarg arg ...\fR?
+\fBencoding \fIoperation\fR ?\fIarg arg ...\fR?
 .BE
 .SH INTRODUCTION
 .PP
-Strings in Tcl are logically a sequence of Unicode characters.
-These strings are represented in memory as a sequence of bytes that
-may be in one of several encodings: modified UTF\-8 (which uses 1 to 4
-bytes per character), or a custom encoding start as 8 bit binary data.
-.PP
-Different operating system interfaces or applications may generate
-strings in other encodings such as Shift\-JIS.  The \fBencoding\fR
-command helps to bridge the gap between Unicode and these other
-formats.
+In Tcl every string is composed of Unicode values.  Text may be encoded into an
+encoding such as cp1252, iso8859-1, Shitf\-JIS, utf-8, utf-16, etc. Not every
+Unicode vealue is encodable in every encoding, and some encodings can encode
+values that are not available in Unicode.
+.PP
+Even though Unicode is for encoding the written texts of human languages, any
+sequence of bytes can be encoded as the first 255 Unicode values.  iso8859-1 an
+encoding for a subset of Unicode in which each byte is a Unicode value of 255
+or less.  Thus, any sequence of bytes can be considered to be a Unicode string
+encoded in iso8859-1.  To work with binary data in Tcl, decode it from
+iso8859-1 when reading it in, and encode it into iso8859-1 when writing it out,
+ensuring that each character in the string has a value of 255 or less.
+Decoding such a string does nothing, and encoding encoding such a string also
+does nothing.
+.PP
+For example, the following is true:
+.CS
+set text {In Tcl binary data is treated as Unicode text and it just works.}
+set encoded [encoding convertto iso8859-1 $text]
+expr {$text eq $encoded}; #-> 1
+.CE
+The following is also true:
+.CS
+set decoded [encoding convertfrom iso8859-1 $text]
+expr {$text eq $decoded}; #-> 1
+.CE
 .SH DESCRIPTION
 .PP
-Performs one of several encoding related operations, depending on
-\fIoption\fR.  The legal \fIoption\fRs are:
+Performs one of the following encoding \fIoperations\fR:
 .TP
 \fBencoding convertfrom\fR ?\fIencoding\fR? \fIdata\fR
 .TP
 \fBencoding convertfrom\fR ?\fB-profile \fIprofile\fR? ?\fB-failindex var\fR? \fIencoding\fR \fIdata\fR
 .
-Converts \fIdata\fR, which should be in binary string encoded as per
-\fIencoding\fR, to a Tcl string. If \fIencoding\fR is not specified, the current
-system encoding is used.
+Decodes \fIdata\fR encoded in \fIencoding\fR. If \fIencoding\fR is not
+specified the current system encoding is used.
 
 .VS "TCL8.7 TIP607, TIP656"
-The \fB-profile\fR option determines the command behavior in the presence
-of conversion errors. See the \fBPROFILES\fR section below for details. Any premature
-termination of processing due to errors is reported through an exception if
-the \fB-failindex\fR option is not specified.
-
-If the \fB-failindex\fR is specified, instead of an exception being raised
-on premature termination, the result of the conversion up to the point of the
-error is returned as the result of the command. In addition, the index
-of the source byte triggering the error is stored in \fBvar\fR. If no
-errors are encountered, the entire result of the conversion is returned and
-the value \fB-1\fR is stored in \fBvar\fR.
+\fB-profile\fR determines how invalid data for the encoding are handled.  See
+the \fBPROFILES\fR section below for details.  Returns an error if decoding
+fails.  However, if \fB-failindex\fR given, returns the result of the
+conversion up to the point of termination, and stores in \fBvar\fR the index of
+the character that could not be converted. If no errors are encountered the
+entire result of the conversion is returned and the value \fB-1\fR is stored in
+\fBvar\fR.
 .VE "TCL8.7 TIP607, TIP656"
 .TP
 \fBencoding convertto\fR ?\fIencoding\fR? \fIdata\fR
 .TP
 \fBencoding convertto\fR ?\fB-profile \fIprofile\fR? ?\fB-failindex var\fR? \fIencoding\fR \fIdata\fR
 .
-Convert \fIstring\fR to the specified \fIencoding\fR. The result is a Tcl binary
-string that contains the sequence of bytes representing the converted string in
-the specified encoding. If \fIencoding\fR is not specified, the current system
-encoding is used.
+Converts \fIstring\fR to \fIencoding\fR.  If \fIencoding\fR is not given, the
+current system encoding is used.
 
 .VS "TCL8.7 TIP607, TIP656"
-The \fB-profile\fR and \fB-failindex\fR options have the same effect as
-described for the \fBencoding convertfrom\fR command.
+See \fBencoding convertfrom\fR for the meaning of \fB-profile\fR and \fB-failindex\fR.
 .VE "TCL8.7 TIP607, TIP656"
 .TP
 \fBencoding dirs\fR ?\fIdirectoryList\fR?
 .
-Tcl can load encoding data files from the file system that describe
-additional encodings for it to work with. This command sets the search
-path for \fB*.enc\fR encoding data files to the list of directories
-\fIdirectoryList\fR. If \fIdirectoryList\fR is omitted then the
-command returns the current list of directories that make up the
-search path. It is an error for \fIdirectoryList\fR to not be a valid
-list. If, when a search for an encoding data file is happening, an
-element in \fIdirectoryList\fR does not refer to a readable,
-searchable directory, that element is ignored.
+Sets the search path for \fB*.enc\fR encoding data files to the list of
+directories given by \fIdirectoryList\fR.  If \fIdirectoryList\fR is not given,
+returns the current list of directories that make up the search path.  It is
+not an error for an item in \fIdirectoryList\fR to not refer to a readable,
+searchable directory.
 .TP
 \fBencoding names\fR
 .
-Returns a list containing the names of all of the encodings that are
-currently available.
+Returns a list of the names of available encodings.
 The encodings
 .QW utf-8
 and
@@ -88,88 +91,58 @@ are guaranteed to be present in the list.
 .VS "TCL8.7 TIP656"
 .TP
 \fBencoding profiles\fR
-Returns a list of the names of encoding profiles. See \fBPROFILES\fR below.
+Returns a list of names of available encoding profiles. See \fBPROFILES\fR
+below.
 .VE "TCL8.7 TIP656"
 .TP
 \fBencoding system\fR ?\fIencoding\fR?
 .
-Set the system encoding to \fIencoding\fR. If \fIencoding\fR is
-omitted then the command returns the current system encoding.  The
-system encoding is used whenever Tcl passes strings to system calls.
+Sets the system encoding to \fIencoding\fR. If \fIencoding\fR is not given,
+returns the current system encoding.  The system encoding is used to pass
+strings to system calls.
 .\" Do not put .VS on whole section as that messes up the bullet list alignment
 .SH PROFILES
 .PP
 .VS "TCL8.7 TIP656"
-Operations involving encoding transforms may encounter several types of
-errors such as invalid sequences in the source data, characters that
-cannot be encoded in the target encoding and so on.
-A \fIprofile\fR prescribes the strategy for dealing with such errors
-in one of two ways:
-.VE "TCL8.7 TIP656"
-.
-.IP \(bu
-.VS "TCL8.7 TIP656"
-Terminating further processing of the source data. The profile does not
-determine how this premature termination is conveyed to the caller. By default,
-this is signalled by raising an exception. If the \fB-failindex\fR option
-is specified, errors are reported through that mechanism.
-.VE "TCL8.7 TIP656"
-.IP \(bu
-.VS "TCL8.7 TIP656"
-Continue further processing of the source data using a fallback strategy such
-as replacing or discarding the offending bytes in a profile-defined manner.
-.VE "TCL8.7 TIP656"
+Each \fIprofile\fR is a distinct strategy for dealing with invalid data for an
+encoding.
 .PP
-The following profiles are currently implemented with \fBtcl8\fR being
-the default if the \fB-profile\fR is not specified.
+The following profiles are currently implemented.
 .VS "TCL8.7 TIP656"
 .TP
 \fBtcl8\fR
 .
-The \fBtcl8\fR profile always follows the first strategy above and corresponds
-to the behavior of encoding transforms in Tcl 8.6. When converting from an
-external encoding \fBother than utf-8\fR to Tcl strings with the \fBencoding
-convertfrom\fR command, invalid bytes are mapped to their numerically equivalent
-code points. For example, the byte 0x80 which is invalid in ASCII would be
-mapped to code point U+0080. When converting from \fButf-8\fR, invalid bytes
-that are defined in CP1252 are mapped to their Unicode equivalents while those
-that are not fall back to the numerical equivalents. For example, byte 0x80 is
-defined by CP1252 and is therefore mapped to its Unicode equivalent U+20AC while
-byte 0x81 which is not defined by CP1252 is mapped to U+0081. As an additional
-special case, the sequence 0xC0 0x80 is mapped to U+0000.
+The default profile.  Provides for behaviour identical to that of Tcl 8.6: When
+decoding, for encodings \fBother than utf-8\fR, each invalid byte is interpreted
+as the Unicode value given by that one byte. For example, the byte 0x80, which
+is invalid in the ASCII encoding would be mapped to the Unicode value U+0080.
+For \fButf-8\fR, each invalid byte that is a valid CP1252 character is
+interpreted as the Unicode value for that character, while each byte that is
+not is treated as the Unicode value given by that one byte. For example, byte
+0x80 is defined by CP1252 and is therefore mapped to its Unicode equivalent
+U+20AC while byte 0x81 which is not defined by CP1252 is mapped to U+0081. As
+an additional special case, the sequence 0xC0 0x80 is mapped to U+0000.
 
-When converting from Tcl strings to an external encoding format using
-\fBencoding convertto\fR, characters that cannot be represented in the
-target encoding are replaced by an encoding-dependent character, usually
-the question mark \fB?\fR.
+When encoding, each character that cannot be represented in the encoding is
+replaced by an encoding-dependent character, usually the question mark \fB?\fR.
 .TP
 \fBstrict\fR
 .
-The \fBstrict\fR profile always stops processing when an conversion error is
-encountered. The error is signalled via an exception or the \fB-failindex\fR
-option mechanism. The \fBstrict\fR profile implements a Unicode standard
-conformant behavior.
+The operation fails when invalid data for the encoding are encountered.
 .TP
 \fBreplace\fR
 .
-Like the \fBtcl8\fR profile, the \fBreplace\fR profile always continues
-processing on conversion errors but follows a Unicode standard conformant
-method for substitution of invalid source data.
-
-When converting an encoded byte sequence to a Tcl string using
-\fBencoding convertfrom\fR, invalid bytes
-are replaced by the U+FFFD REPLACEMENT CHARACTER code point.
+When decoding, invalid bytes are replaced by U+FFFD, the Unicode REPLACEMENT
+CHARACTER.
 
-When encoding a Tcl string with \fBencoding convertto\fR,
-code points that cannot be represented in the
-target encoding are transformed to an encoding-specific fallback character,
-U+FFFD REPLACEMENT CHARACTER for UTF targets and generally `?` for other
-encodings.
+When encoding, Unicode values that cannot be represented in the target encoding
+are transformed to an encoding-specific fallback character, U+FFFD REPLACEMENT
+CHARACTER for UTF targets, and generally `?` for other encodings.
 .VE "TCL8.7 TIP656"
 .SH EXAMPLES
 .PP
-These examples use the utility proc below that prints the Unicode code points
-comprising a Tcl string.
+These examples use the utility proc below that prints the Unicode value for
+each character in a string.
 .PP
 .CS
 proc codepoints s {join [lmap c [split $s {}] {
@@ -177,14 +150,14 @@ proc codepoints s {join [lmap c [split $s {}] {
 }
 .CE
 .PP
-Example 1: convert a byte sequence in Japanese euc-jp encoding to a TCL string:
+Example 1: Convert from euc-jp:
 .PP
 .CS
-% codepoints [\fBencoding convertfrom\fR euc-jp "\exA4\exCF"]
+% codepoints [\fBencoding convertfrom\fR euc-jp \exA4\exCF]
 U+00306F
 .CE
 .PP
-The result is the unicode codepoint
+The result is the Unicode value
 .QW "\eu306F" ,
 which is the Hiragana letter HA.
 .VS "TCL8.7 TIP607, TIP656"
-- 
cgit v0.12


From ac324e9b0b92af99acbeed747c9aea9de4cc40f6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 27 Mar 2023 14:42:18 +0000
Subject: spacing

---
 tests/fileName.test | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/fileName.test b/tests/fileName.test
index 09662ff..9c54edd 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -1655,7 +1655,7 @@ apply [list {} {
 	    set interp [interp create]
 	    interp eval $interp {
 		apply [list {} {
-		    upvar 1 f f 
+		    upvar 1 f f
 
 		    # A unique name so that no internal representation of this
 		    # literal value has been picked up from any other script
@@ -1687,9 +1687,6 @@ apply [list {} {
 	}
     } -result 0
 } [namespace current]]
-    
-
-
 
 # cleanup
 catch {file delete -force C:/globTest}
-- 
cgit v0.12


From 7f39dac888fd3fa2493dfbb85b06080b1ac7487e Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Mon, 27 Mar 2023 17:23:48 +0000
Subject: test hygiene cleaning up created files.

---
 tests/fileName.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/fileName.test b/tests/fileName.test
index 9c54edd..ebdda11 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -1650,6 +1650,8 @@ apply [list {} {
 	} else {
 	    set memcheckcmd ::tcltests::scriptmemcheck
 	}
+    } -cleanup {
+	removeFile script
     } -body {
 	{*}$memcheckcmd {
 	    set interp [interp create]
-- 
cgit v0.12


From bc060f980cb4e43d0aa03762c8a9cd6110faddbc Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Mon, 27 Mar 2023 19:56:36 +0000
Subject: Remove unneeded parts from test in fileName.test.

---
 tests/fileName.test | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/fileName.test b/tests/fileName.test
index ebdda11..d70c09c 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -1640,8 +1640,6 @@ apply [list {} {
 	valgrind, which is useful since Valgrind provides information about the
 	error location, but [memory] doesn't.
     } -setup {
-	makeFile {puts "In script"} script
-
 	if {[namespace which ::memory] eq {}} {
 	    set memcheckcmd [list ::apply [list script {
 		uplevel 1 $script
@@ -1650,8 +1648,6 @@ apply [list {} {
 	} else {
 	    set memcheckcmd ::tcltests::scriptmemcheck
 	}
-    } -cleanup {
-	removeFile script
     } -body {
 	{*}$memcheckcmd {
 	    set interp [interp create]
-- 
cgit v0.12


From 91fa419271d52aee3aaa718839eca26fa168d494 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 27 Mar 2023 20:24:09 +0000
Subject: More text fixes

---
 generic/tclPosixStr.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index ad3c26d..c31ab81 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -182,7 +182,7 @@ Tcl_ErrnoId(void)
 #ifdef EISDIR
     case EISDIR: return "EISDIR";
 #endif
-#ifdef EISNAME
+#ifdef EISNAM
     case EISNAM: return "EISNAM";
 #endif
 #ifdef EL2HLT
@@ -221,6 +221,9 @@ Tcl_ErrnoId(void)
 #if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
     case ELOOP: return "ELOOP";
 #endif
+#ifdef EMEDIUMTYPE
+    case EMEDIUMTYPE: return "EMEDIUMTYPE";
+#endif
 #ifdef EMFILE
     case EMFILE: return "EMFILE";
 #endif
@@ -413,6 +416,9 @@ Tcl_ErrnoId(void)
 #ifdef EREMOTERELEASE
     case EREMOTERELEASE: return "EREMOTERELEASE";
 #endif
+#ifdef ERESTART
+    case ERESTART: return "ERESTART";
+#endif
 #ifdef EROFS
     case EROFS: return "EROFS";
 #endif
@@ -653,8 +659,8 @@ Tcl_ErrnoMsg(
 #ifdef EISDIR
     case EISDIR: return "is a directory";
 #endif
-#ifdef EISNAME
-    case EISNAM: return "is a name file";
+#ifdef EISNAM
+    case EISNAM: return "is a named type file";
 #endif
 #ifdef EL2HLT
     case EL2HLT: return "level 2 halted";
@@ -693,6 +699,9 @@ Tcl_ErrnoMsg(
 #if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
     case ELOOP: return "too many levels of symbolic links";
 #endif
+#ifdef EMEDIUMTYPE
+    case EMEDIUMTYPE: return "wrong medium type";
+#endif
 #ifdef EMFILE
     case EMFILE: return "too many open files";
 #endif
@@ -757,7 +766,7 @@ Tcl_ErrnoMsg(
     case ENOMEM: return "cannot allocate memory";
 #endif
 #ifdef ENOMEDIUM
-    case ENOMEDIUM: return "no medium";
+    case ENOMEDIUM: return "no medium found";
 #endif
 #ifdef ENOMSG
     case ENOMSG: return "no message of desired type";
@@ -885,6 +894,9 @@ Tcl_ErrnoMsg(
 #ifdef EREMOTERELEASE
     case EREMOTERELEASE: return "remote peer released connection";
 #endif
+#ifdef ERESTART
+    case ERESTART: return "interrupted system call should be restarted";
+#endif
 #ifdef EROFS
     case EROFS: return "read-only file system";
 #endif
-- 
cgit v0.12


From 82098d2dca6d710372f2cc12757f9295971c837f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 27 Mar 2023 20:56:28 +0000
Subject: Fix some typo's in POSIX error-messages, and add missing ones
 (ESTRPIPE, ERESTART, ENOSHARE, ENOMEDIUM, ENMFILE, EMEDIUMTYPE, EFTYPE,
 ECASECLASH)

---
 generic/tclPosixStr.c | 83 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index c817faa..6a30e0e 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -74,9 +74,6 @@ Tcl_ErrnoId(void)
 #ifdef EBADMSG
     case EBADMSG: return "EBADMSG";
 #endif
-#ifdef ECANCELED
-    case ECANCELED: return "ECANCELED";
-#endif
 #ifdef EBADR
     case EBADR: return "EBADR";
 #endif
@@ -95,6 +92,12 @@ Tcl_ErrnoId(void)
 #ifdef EBUSY
     case EBUSY: return "EBUSY";
 #endif
+#ifdef ECANCELED
+    case ECANCELED: return "ECANCELED";
+#endif
+#ifdef ECASECLASH
+    case ECASECLASH: return "ECASECLASH";
+#endif
 #ifdef ECHILD
     case ECHILD: return "ECHILD";
 #endif
@@ -146,6 +149,9 @@ Tcl_ErrnoId(void)
 #ifdef EFBIG
     case EFBIG: return "EFBIG";
 #endif
+#ifdef EFTYPE
+    case EFTYPE: return "EFTYPE";
+#endif
 #ifdef EHOSTDOWN
     case EHOSTDOWN: return "EHOSTDOWN";
 #endif
@@ -179,12 +185,9 @@ Tcl_ErrnoId(void)
 #ifdef EISDIR
     case EISDIR: return "EISDIR";
 #endif
-#ifdef EISNAME
+#ifdef EISNAM
     case EISNAM: return "EISNAM";
 #endif
-#ifdef ELBIN
-    case ELBIN: return "ELBIN";
-#endif
 #ifdef EL2HLT
     case EL2HLT: return "EL2HLT";
 #endif
@@ -197,6 +200,9 @@ Tcl_ErrnoId(void)
 #ifdef EL3RST
     case EL3RST: return "EL3RST";
 #endif
+#ifdef ELBIN
+    case ELBIN: return "ELBIN";
+#endif
 #ifdef ELIBACC
     case ELIBACC: return "ELIBACC";
 #endif
@@ -218,6 +224,9 @@ Tcl_ErrnoId(void)
 #if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
     case ELOOP: return "ELOOP";
 #endif
+#ifdef EMEDIUMTYPE
+    case EMEDIUMTYPE: return "EMEDIUMTYPE";
+#endif
 #ifdef EMFILE
     case EMFILE: return "EMFILE";
 #endif
@@ -251,6 +260,9 @@ Tcl_ErrnoId(void)
 #ifdef ENFILE
     case ENFILE: return "ENFILE";
 #endif
+#ifdef ENMFILE
+    case ENMFILE: return "ENMFILE";
+#endif
 #ifdef ENOANO
     case ENOANO: return "ENOANO";
 #endif
@@ -281,6 +293,9 @@ Tcl_ErrnoId(void)
 #ifdef ENOMEM
     case ENOMEM: return "ENOMEM";
 #endif
+#ifdef ENOMEDIUM
+    case ENOMEDIUM: return "ENOMEDIUM";
+#endif
 #ifdef ENOMSG
     case ENOMSG: return "ENOMSG";
 #endif
@@ -293,6 +308,9 @@ Tcl_ErrnoId(void)
 #ifdef ENOPROTOOPT
     case ENOPROTOOPT: return "ENOPROTOOPT";
 #endif
+#ifdef ENOSHARE
+    case ENOSHARE: return "ENOSHARE";
+#endif
 #ifdef ENOSPC
     case ENOSPC: return "ENOSPC";
 #endif
@@ -404,6 +422,9 @@ Tcl_ErrnoId(void)
 #ifdef EREMOTERELEASE
     case EREMOTERELEASE: return "EREMOTERELEASE";
 #endif
+#ifdef ERESTART
+    case ERESTART: return "ERESTART";
+#endif
 #ifdef EROFS
     case EROFS: return "EROFS";
 #endif
@@ -536,9 +557,6 @@ Tcl_ErrnoMsg(
 #ifdef EBADMSG
     case EBADMSG: return "not a data message";
 #endif
-#ifdef ECANCELED
-    case ECANCELED: return "operation canceled";
-#endif
 #ifdef EBADR
     case EBADR: return "bad request descriptor";
 #endif
@@ -557,6 +575,12 @@ Tcl_ErrnoMsg(
 #ifdef EBUSY
     case EBUSY: return "file busy";
 #endif
+#ifdef ECANCELED
+    case ECANCELED: return "operation canceled";
+#endif
+#ifdef ECASECLASH
+    case ECASECLASH: return "filename exists with different case";
+#endif
 #ifdef ECHILD
     case ECHILD: return "no children";
 #endif
@@ -608,6 +632,9 @@ Tcl_ErrnoMsg(
 #ifdef EFBIG
     case EFBIG: return "file too large";
 #endif
+#ifdef EFTYPE
+    case EFTYPE: return "inappropriate file type or format";
+#endif
 #ifdef EHOSTDOWN
     case EHOSTDOWN: return "host is down";
 #endif
@@ -641,12 +668,9 @@ Tcl_ErrnoMsg(
 #ifdef EISDIR
     case EISDIR: return "illegal operation on a directory";
 #endif
-#ifdef EISNAME
+#ifdef EISNAM
     case EISNAM: return "is a name file";
 #endif
-#ifdef ELBIN
-    case ELBIN: return "ELBIN";
-#endif
 #ifdef EL2HLT
     case EL2HLT: return "level 2 halted";
 #endif
@@ -659,6 +683,9 @@ Tcl_ErrnoMsg(
 #ifdef EL3RST
     case EL3RST: return "level 3 reset";
 #endif
+#ifdef ELBIN
+    case ELBIN: return "inode is remote";
+#endif
 #ifdef ELIBACC
     case ELIBACC: return "cannot access a needed shared library";
 #endif
@@ -681,6 +708,9 @@ Tcl_ErrnoMsg(
 #if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
     case ELOOP: return "too many levels of symbolic links";
 #endif
+#ifdef EMEDIUMTYPE
+    case EMEDIUMTYPE: return "wrong medium type";
+#endif
 #ifdef EMFILE
     case EMFILE: return "too many open files";
 #endif
@@ -714,6 +744,9 @@ Tcl_ErrnoMsg(
 #ifdef ENFILE
     case ENFILE: return "file table overflow";
 #endif
+#ifdef ENMFILE
+    case ENMFILE: return "no more files";
+#endif
 #ifdef ENOANO
     case ENOANO: return "anode table overflow";
 #endif
@@ -744,6 +777,9 @@ Tcl_ErrnoMsg(
 #ifdef ENOMEM
     case ENOMEM: return "not enough memory";
 #endif
+#ifdef ENOMEDIUM
+    case ENOMEDIUM: return "no medium found";
+#endif
 #ifdef ENOMSG
     case ENOMSG: return "no message of desired type";
 #endif
@@ -756,6 +792,9 @@ Tcl_ErrnoMsg(
 #ifdef ENOPROTOOPT
     case ENOPROTOOPT: return "bad protocol option";
 #endif
+#ifdef ENOSHARE
+    case ENOSHARE: return "no such host or network path";
+#endif
 #ifdef ENOSPC
     case ENOSPC: return "no space left on device";
 #endif
@@ -777,9 +816,6 @@ Tcl_ErrnoMsg(
 #ifdef ENOTCONN
     case ENOTCONN: return "socket is not connected";
 #endif
-#ifdef ENOTRECOVERABLE
-    case ENOTRECOVERABLE: return "state not recoverable";
-#endif
 #ifdef ENOTDIR
     case ENOTDIR: return "not a directory";
 #endif
@@ -789,6 +825,9 @@ Tcl_ErrnoMsg(
 #ifdef ENOTNAM
     case ENOTNAM: return "not a name file";
 #endif
+#ifdef ENOTRECOVERABLE
+    case ENOTRECOVERABLE: return "state not recoverable";
+#endif
 #ifdef ENOTSOCK
     case ENOTSOCK: return "socket operation on non-socket";
 #endif
@@ -850,7 +889,7 @@ Tcl_ErrnoMsg(
     case ERANGE: return "math result unrepresentable";
 #endif
 #if defined(EREFUSED) && (!defined(ECONNREFUSED) || (EREFUSED != ECONNREFUSED))
-    case EREFUSED: return "EREFUSED";
+    case EREFUSED: return "connection refused";
 #endif
 #ifdef EREMCHG
     case EREMCHG: return "remote address changed";
@@ -865,7 +904,10 @@ Tcl_ErrnoMsg(
     case EREMOTEIO: return "remote i/o error";
 #endif
 #ifdef EREMOTERELEASE
-    case EREMOTERELEASE: return "EREMOTERELEASE";
+    case EREMOTERELEASE: return "remote peer released connection";
+#endif
+#ifdef ERESTART
+    case ERESTART: return "interrupted system call should be restarted";
 #endif
 #ifdef EROFS
     case EROFS: return "read-only file system";
@@ -894,6 +936,9 @@ Tcl_ErrnoMsg(
 #ifdef ESTALE
     case ESTALE: return "stale remote file handle";
 #endif
+#ifdef ESTRPIPE
+    case ESTRPIPE: return "streams pipe error";
+#endif
 #ifdef ESUCCESS
     case ESUCCESS: return "Error 0";
 #endif
-- 
cgit v0.12


From 2616ef0ef16085f9c15283dfb56c9ccfd3f2da5d Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 28 Mar 2023 04:47:00 +0000
Subject: Fix irritating gcc warning for minizip

---
 compat/zlib/contrib/minizip/minizip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat/zlib/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c
index e03e2b1..be1774f 100644
--- a/compat/zlib/contrib/minizip/minizip.c
+++ b/compat/zlib/contrib/minizip/minizip.c
@@ -365,7 +365,7 @@ void addFileToZip(zipFile zf, const char *filenameinzip, const char *password, i
 void addPathToZip(zipFile zf, const char *filenameinzip, const char *password, int opt_exclude_path,int opt_compress_level) {
     tinydir_dir dir;
     int i;
-    char newname[512];
+    char newname[MAXFILENAME+1+MAXFILENAME+1];
 
     tinydir_open_sorted(&dir, filenameinzip);
 
@@ -375,7 +375,7 @@ void addPathToZip(zipFile zf, const char *filenameinzip, const char *password, i
         tinydir_readfile_n(&dir, &file, i);
         if(strcmp(file.name,".")==0) continue;
         if(strcmp(file.name,"..")==0) continue;
-        sprintf(newname,"%s/%s",dir.path,file.name);
+        sprintf(newname,"%.*s/%.*s", MAXFILENAME, dir.path, MAXFILENAME, file.name);
         if (file.is_dir)
         {
             addPathToZip(zf,newname,password,opt_exclude_path,opt_compress_level);
-- 
cgit v0.12


From ef16c107bff799cc8c7d9e3d2010edc6cd84d7f1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 29 Mar 2023 08:32:52 +0000
Subject: typo

---
 doc/SetVar.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/SetVar.3 b/doc/SetVar.3
index d061a2b..9d8e0b7 100644
--- a/doc/SetVar.3
+++ b/doc/SetVar.3
@@ -251,7 +251,7 @@ operated upon.
 .PP
 The \fInewValuePtr\fR argument to \fBTcl_SetVar2Ex\fR and \fBTcl_ObjSetVar2\fR
 may be an arbitrary reference count value.  Its reference count is
-incremented on success.  On failure, if is reference count is zero, it is
+incremented on success.  On failure, if its reference count is zero, it is
 decremented and freed so the caller need do nothing with it.
 .PP
 The \fIpart1Ptr\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR can
-- 
cgit v0.12


From 784535a35c779f46886fe9a880b706c979efdd77 Mon Sep 17 00:00:00 2001
From: max <max@tclers.tk>
Date: Thu, 30 Mar 2023 08:46:27 +0000
Subject: Allow empty mode list in [chan create], so that refchans are able to
 mimic the behavior of channels created by [socket -server].

---
 doc/refchan.n        |  4 ++--
 generic/tclIORChan.c | 21 ++++++++++-----------
 tests/ioCmd.test     | 10 +++++-----
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/doc/refchan.n b/doc/refchan.n
index 8737556..1e7e733 100644
--- a/doc/refchan.n
+++ b/doc/refchan.n
@@ -53,8 +53,8 @@ here, then the \fBfinalize\fR subcommand will not be called.
 .PP
 The \fImode\fR argument tells the handler whether the channel was
 opened for reading, writing, or both. It is a list containing any of
-the strings \fBread\fR or \fBwrite\fR. The list will always
-contain at least one element.
+the strings \fBread\fR or \fBwrite\fR. The list may be empty, but
+will usually contain at least one element. 
 .PP
 The subcommand must throw an error if the chosen mode is not
 supported by the \fIcmdPrefix\fR.
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 8c6f25f..482b0d5 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -532,7 +532,7 @@ TclChanCreateObjCmd(
 
     /*
      * First argument is a list of modes. Allowed entries are "read", "write".
-     * Expect at least one list element. Abbreviations are ok.
+     * Empty list is uncommon, but allowed. Abbreviations are ok.
      */
 
     modeObj = objv[MODE];
@@ -905,6 +905,11 @@ TclChanPostEventObjCmd(
     if (EncodeEventMask(interp, "event", objv[EVENT], &events) != TCL_OK) {
 	return TCL_ERROR;
     }
+    if (events == 0) {
+	Tcl_SetObjResult(interp,
+		Tcl_NewStringObj("bad event list: is empty", -1));
+	return TCL_ERROR;
+    }
 
     /*
      * Check that the channel is actually interested in the provided events.
@@ -2007,10 +2012,10 @@ ReflectGetOption(
  * EncodeEventMask --
  *
  *	This function takes a list of event items and constructs the
- *	equivalent internal bitmask. The list must contain at least one
- *	element. Elements are "read", "write", or any unique abbreviation of
- *	them. Note that the bitmask is not changed if problems are
- *	encountered.
+ *	equivalent internal bitmask. The list may be empty but will usually
+ *	contain at least one element. Valid elements are "read", "write", or
+ *	any unique abbreviation of them. Note that the bitmask is not changed
+ *	if problems are encountered.
  *
  * Results:
  *	A standard Tcl error code. A bitmask where TCL_READABLE and/or
@@ -2040,12 +2045,6 @@ EncodeEventMask(
 	return TCL_ERROR;
     }
 
-    if (listc < 1) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                "bad %s list: is empty", objName));
-	return TCL_ERROR;
-    }
-
     events = 0;
     while (listc > 0) {
 	if (Tcl_GetIndexFromObj(interp, listv[listc-1], eventOptions,
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index d17dce3..b0dd1d7 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -670,12 +670,12 @@ test iocmd-21.1 {chan create, wrong#args, too many} {
     catch {chan create a b c} msg
     set msg
 } {wrong # args: should be "chan create mode cmdprefix"}
-test iocmd-21.2 {chan create, invalid r/w mode, empty} {
-    proc foo {} {}
-    catch {chan create {} foo} msg
+test iocmd-21.2 {chan create, r/w mode empty} {
+    proc foo {cmd args} { return {initialize finalize watch} }
+    set chan [chan create {} foo]
+    close $chan
     rename foo {}
-    set msg
-} {bad mode list: is empty}
+} {}
 test iocmd-21.3 {chan create, invalid r/w mode, bad string} {
     proc foo {} {}
     catch {chan create {c} foo} msg
-- 
cgit v0.12


From 191fecdc87592dfea94718bc716551c72f072c33 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 30 Mar 2023 15:19:44 +0000
Subject: Fix [0cb3554903]: macOS 13 SDK deprecates sprintf(). But better not
 use it on other platforms either.

---
 compat/zlib/contrib/minizip/minizip.c |  5 ++-
 doc/refchan.n                         |  2 +-
 generic/regcomp.c                     |  4 +-
 generic/regerror.c                    |  6 +--
 generic/tcl.h                         |  2 +-
 generic/tclBasic.c                    |  4 +-
 generic/tclCkalloc.c                  |  2 +-
 generic/tclClock.c                    |  6 +--
 generic/tclCompCmdsSZ.c               |  6 +--
 generic/tclCompile.h                  |  2 +-
 generic/tclDisassemble.c              | 20 +++++-----
 generic/tclHash.c                     |  8 ++--
 generic/tclIO.c                       | 12 +++---
 generic/tclIORChan.c                  |  2 +-
 generic/tclInt.h                      |  1 +
 generic/tclInterp.c                   |  2 +-
 generic/tclLiteral.c                  |  8 ++--
 generic/tclOO.c                       |  2 +-
 generic/tclObj.c                      |  8 ++--
 generic/tclPipe.c                     |  4 +-
 generic/tclRegexp.c                   |  2 +-
 generic/tclStrToD.c                   |  2 +-
 generic/tclStringObj.c                |  6 +--
 generic/tclTest.c                     | 54 +++++++++++++--------------
 generic/tclTestObj.c                  |  2 +-
 generic/tclTestProcBodyObj.c          |  4 +-
 generic/tclThreadAlloc.c              |  4 +-
 generic/tclThreadTest.c               |  4 +-
 generic/tclUtil.c                     |  4 +-
 generic/tclZlib.c                     |  6 +--
 unix/dltest/pkgb.c                    |  5 ++-
 unix/tclUnixChan.c                    | 12 +++---
 unix/tclUnixInit.c                    |  4 +-
 unix/tclUnixPipe.c                    |  6 +--
 unix/tclUnixSock.c                    |  8 ++--
 unix/tclUnixTest.c                    |  2 +-
 unix/tclUnixThrd.c                    |  2 +-
 win/tclWinChan.c                      |  5 ++-
 win/tclWinConsole.c                   | 17 ++++-----
 win/tclWinFCmd.c                      | 18 ++++-----
 win/tclWinFile.c                      |  2 +-
 win/tclWinInit.c                      | 70 ++++++-----------------------------
 win/tclWinInt.h                       |  2 -
 win/tclWinPipe.c                      | 22 +++++------
 win/tclWinReg.c                       |  4 +-
 win/tclWinSerial.c                    | 27 +++++++-------
 win/tclWinSock.c                      |  8 ++--
 win/tclWinThrd.c                      | 14 +++----
 48 files changed, 192 insertions(+), 230 deletions(-)

diff --git a/compat/zlib/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c
index be1774f..0f0112b 100644
--- a/compat/zlib/contrib/minizip/minizip.c
+++ b/compat/zlib/contrib/minizip/minizip.c
@@ -66,6 +66,9 @@
 #ifdef _WIN32
         #define USEWIN32IOAPI
         #include "iowin32.h"
+#       if defined(_MSC_VER)
+#           define snprintf _snprintf
+#       endif
 #endif
 
 
@@ -375,7 +378,7 @@ void addPathToZip(zipFile zf, const char *filenameinzip, const char *password, i
         tinydir_readfile_n(&dir, &file, i);
         if(strcmp(file.name,".")==0) continue;
         if(strcmp(file.name,"..")==0) continue;
-        sprintf(newname,"%.*s/%.*s", MAXFILENAME, dir.path, MAXFILENAME, file.name);
+        snprintf(newname, sizeof(newname), "%.*s/%.*s", MAXFILENAME, dir.path, MAXFILENAME, file.name);
         if (file.is_dir)
         {
             addPathToZip(zf,newname,password,opt_exclude_path,opt_compress_level);
diff --git a/doc/refchan.n b/doc/refchan.n
index 1e7e733..edc9974 100644
--- a/doc/refchan.n
+++ b/doc/refchan.n
@@ -54,7 +54,7 @@ here, then the \fBfinalize\fR subcommand will not be called.
 The \fImode\fR argument tells the handler whether the channel was
 opened for reading, writing, or both. It is a list containing any of
 the strings \fBread\fR or \fBwrite\fR. The list may be empty, but
-will usually contain at least one element. 
+will usually contain at least one element.
 .PP
 The subcommand must throw an error if the chosen mode is not
 supported by the \fIcmdPrefix\fR.
diff --git a/generic/regcomp.c b/generic/regcomp.c
index d828b44..1d13876 100644
--- a/generic/regcomp.c
+++ b/generic/regcomp.c
@@ -2186,9 +2186,9 @@ stid(
 	return "unable";
     }
     if (t->id != 0) {
-	sprintf(buf, "%d", t->id);
+	snprintf(buf, bufsize, "%d", t->id);
     } else {
-	sprintf(buf, "%p", t);
+	snprintf(buf, bufsize, "%p", t);
     }
     return buf;
 }
diff --git a/generic/regerror.c b/generic/regerror.c
index f783217..361bd29 100644
--- a/generic/regerror.c
+++ b/generic/regerror.c
@@ -74,7 +74,7 @@ regerror(
 		break;
 	    }
 	}
-	sprintf(convbuf, "%d", r->code); /* -1 for unknown */
+	snprintf(convbuf, sizeof(convbuf), "%d", r->code); /* -1 for unknown */
 	msg = convbuf;
 	break;
     case REG_ITOA:		/* Convert number to name */
@@ -87,7 +87,7 @@ regerror(
 	if (r->code >= 0) {
 	    msg = r->name;
 	} else {		/* Unknown; tell him the number */
-	    sprintf(convbuf, "REG_%u", (unsigned)icode);
+	    snprintf(convbuf, sizeof(convbuf), "REG_%u", (unsigned)icode);
 	    msg = convbuf;
 	}
 	break;
@@ -100,7 +100,7 @@ regerror(
 	if (r->code >= 0) {
 	    msg = r->explain;
 	} else {		/* Unknown; say so */
-	    sprintf(convbuf, unk, code);
+	    snprintf(convbuf, sizeof(convbuf), unk, code);
 	    msg = convbuf;
 	}
 	break;
diff --git a/generic/tcl.h b/generic/tcl.h
index 8b7c4ed..942ca72 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -393,7 +393,7 @@ typedef long LONG;
  *
  * Note on converting between Tcl_WideInt and strings. This implementation (in
  * tclObj.c) depends on the function
- * sprintf(...,"%" TCL_LL_MODIFIER "d",...).
+ * snprintf(...,"%" TCL_LL_MODIFIER "d",...).
  */
 
 #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index e075701..63e7d75 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -1090,7 +1090,7 @@ Tcl_CallWhenDeleted(
     AssocData *dPtr = (AssocData *)ckalloc(sizeof(AssocData));
     Tcl_HashEntry *hPtr;
 
-    sprintf(buffer, "Assoc Data Key #%d", *assocDataCounterPtr);
+    snprintf(buffer, sizeof(buffer), "Assoc Data Key #%d", *assocDataCounterPtr);
     (*assocDataCounterPtr)++;
 
     if (iPtr->assocData == NULL) {
@@ -6348,7 +6348,7 @@ ProcessUnexpectedResult(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"command returned bad code: %d", returnCode));
     }
-    sprintf(buf, "%d", returnCode);
+    snprintf(buf, sizeof(buf), "%d", returnCode);
     Tcl_SetErrorCode(interp, "TCL", "UNEXPECTED_RESULT_CODE", buf, NULL);
 }
 
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 20285eb..986798d 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -183,7 +183,7 @@ TclDumpMemoryInfo(
     if (clientData == NULL) {
         return 0;
     }
-    sprintf(buf,
+    snprintf(buf, sizeof(buf),
 	    "total mallocs             %10d\n"
 	    "total frees               %10d\n"
 	    "current packets allocated %10d\n"
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 13a5c65..d379762 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -1105,12 +1105,12 @@ ConvertUTCToLocalUsingC(
     } else {
 	*buffer = '+';
     }
-    sprintf(buffer+1, "%02d", diff / 3600);
+    snprintf(buffer+1, sizeof(buffer) - 1, "%02d", diff / 3600);
     diff %= 3600;
-    sprintf(buffer+3, "%02d", diff / 60);
+    snprintf(buffer+3, sizeof(buffer) - 3, "%02d", diff / 60);
     diff %= 60;
     if (diff > 0) {
-	sprintf(buffer+5, "%02d", diff);
+	snprintf(buffer+5, sizeof(buffer) - 5, "%02d", diff);
     }
     fields->tzName = Tcl_NewStringObj(buffer, -1);
     Tcl_IncrRefCount(fields->tzName);
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index db01dcd..5c2a0b6 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -837,7 +837,7 @@ TclCompileStringLenCmd(
 	char buf[TCL_INTEGER_SPACE];
 	int len = Tcl_GetCharLength(objPtr);
 
-	len = sprintf(buf, "%d", len);
+	len = snprintf(buf, sizeof(buf), "%d", len);
 	PushLiteral(envPtr, buf, len);
     } else {
 	SetLineInformation(1);
@@ -3073,7 +3073,7 @@ IssueTryClausesInstructions(
 
     for (i=0 ; i<numHandlers ; i++) {
 	noError[i] = -1;
-	sprintf(buf, "%d", matchCodes[i]);
+	snprintf(buf, sizeof(buf), "%d", matchCodes[i]);
 	OP(				DUP);
 	PushLiteral(envPtr, buf, strlen(buf));
 	OP(				EQ);
@@ -3285,7 +3285,7 @@ IssueTryClausesFinallyInstructions(
 	int noTrapError, trapError;
 	const char *p;
 
-	sprintf(buf, "%d", matchCodes[i]);
+	snprintf(buf, sizeof(buf), "%d", matchCodes[i]);
 	OP(				DUP);
 	PushLiteral(envPtr, buf, strlen(buf));
 	OP(				EQ);
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 997f08e..bf814e8 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1841,7 +1841,7 @@ MODULE_SCOPE void TclDTraceInfo(Tcl_Obj *info, const char **args, int *argsi);
     FILE *tclDTraceDebugLog = NULL;				\
     void TclDTraceOpenDebugLog(void) {				\
 	char n[35];						\
-	sprintf(n, "/tmp/tclDTraceDebug-%lu.log",		\
+	snprintf(n, sizeof(n), "/tmp/tclDTraceDebug-%lu.log",		\
 		(unsigned long) getpid());			\
 	tclDTraceDebugLog = fopen(n, "a");			\
     }
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 4a61f69..4cae594 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -267,8 +267,8 @@ DisassembleByteCodeObj(
      * Print header lines describing the ByteCode.
      */
 
-    sprintf(ptrBuf1, "%p", codePtr);
-    sprintf(ptrBuf2, "%p", iPtr);
+    snprintf(ptrBuf1, sizeof(ptrBuf1), "%p", codePtr);
+    snprintf(ptrBuf2, sizeof(ptrBuf1), "%p", iPtr);
     Tcl_AppendPrintfToObj(bufferObj,
 	    "ByteCode 0x%s, refCt %u, epoch %u, interp 0x%s (epoch %u)\n",
 	    ptrBuf1, codePtr->refCount, codePtr->compileEpoch, ptrBuf2,
@@ -314,7 +314,7 @@ DisassembleByteCodeObj(
 	Proc *procPtr = codePtr->procPtr;
 	int numCompiledLocals = procPtr->numCompiledLocals;
 
-	sprintf(ptrBuf1, "%p", procPtr);
+	snprintf(ptrBuf1, sizeof(ptrBuf1), "%p", procPtr);
 	Tcl_AppendPrintfToObj(bufferObj,
 		"  Proc 0x%s, refCt %d, args %d, compiled locals %d\n",
 		ptrBuf1, procPtr->refCount, procPtr->numArgs,
@@ -564,22 +564,22 @@ FormatInstruction(
 	case OPERAND_UINT4:
 	    opnd = TclGetUInt4AtPtr(pc+numBytes); numBytes += 4;
 	    if (opCode == INST_START_CMD) {
-		sprintf(suffixBuffer+strlen(suffixBuffer),
+		snprintf(suffixBuffer+strlen(suffixBuffer), sizeof(suffixBuffer) - strlen(suffixBuffer),
 			", %u cmds start here", opnd);
 	    }
 	    Tcl_AppendPrintfToObj(bufferObj, "%u ", (unsigned) opnd);
 	    break;
 	case OPERAND_OFFSET1:
 	    opnd = TclGetInt1AtPtr(pc+numBytes); numBytes++;
-	    sprintf(suffixBuffer, "pc %u", pcOffset+opnd);
+	    snprintf(suffixBuffer, sizeof(suffixBuffer), "pc %u", pcOffset+opnd);
 	    Tcl_AppendPrintfToObj(bufferObj, "%+d ", opnd);
 	    break;
 	case OPERAND_OFFSET4:
 	    opnd = TclGetInt4AtPtr(pc+numBytes); numBytes += 4;
 	    if (opCode == INST_START_CMD) {
-		sprintf(suffixBuffer, "next cmd at pc %u", pcOffset+opnd);
+		snprintf(suffixBuffer, sizeof(suffixBuffer), "next cmd at pc %u", pcOffset+opnd);
 	    } else {
-		sprintf(suffixBuffer, "pc %u", pcOffset+opnd);
+		snprintf(suffixBuffer, sizeof(suffixBuffer), "pc %u", pcOffset+opnd);
 	    }
 	    Tcl_AppendPrintfToObj(bufferObj, "%+d ", opnd);
 	    break;
@@ -625,9 +625,9 @@ FormatInstruction(
 		    localPtr = localPtr->nextPtr;
 		}
 		if (TclIsVarTemporary(localPtr)) {
-		    sprintf(suffixBuffer, "temp var %u", (unsigned) opnd);
+		    snprintf(suffixBuffer, sizeof(suffixBuffer), "temp var %u", (unsigned) opnd);
 		} else {
-		    sprintf(suffixBuffer, "var ");
+		    snprintf(suffixBuffer, sizeof(suffixBuffer), "var ");
 		    suffixSrc = localPtr->name;
 		}
 	    }
@@ -827,7 +827,7 @@ UpdateStringOfInstName(
     int len;
 
     if ((inst < 0) || (inst > LAST_INST_OPCODE)) {
-        sprintf(buf, "inst_%d", inst);
+        snprintf(buf, sizeof(buf), "inst_%d", inst);
         s = buf;
     } else {
         s = (char *) tclInstructionTable[objPtr->internalRep.longValue].name;
diff --git a/generic/tclHash.c b/generic/tclHash.c
index 709831d..f4b0a47 100644
--- a/generic/tclHash.c
+++ b/generic/tclHash.c
@@ -678,18 +678,18 @@ Tcl_HashStats(
      */
 
     result = ckalloc((NUM_COUNTERS * 60) + 300);
-    sprintf(result, "%d entries in table, %d buckets\n",
+    snprintf(result, 60, "%d entries in table, %d buckets\n",
 	    tablePtr->numEntries, tablePtr->numBuckets);
     p = result + strlen(result);
     for (i = 0; i < NUM_COUNTERS; i++) {
-	sprintf(p, "number of buckets with %d entries: %d\n",
+	snprintf(p, 60, "number of buckets with %d entries: %d\n",
 		i, count[i]);
 	p += strlen(p);
     }
-    sprintf(p, "number of buckets with %d or more entries: %d\n",
+    snprintf(p, 60, "number of buckets with %d or more entries: %d\n",
 	    NUM_COUNTERS, overflow);
     p += strlen(p);
-    sprintf(p, "average search distance for entry: %.1f", average);
+    snprintf(p, 60, "average search distance for entry: %.1f", average);
     return result;
 }
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 55b6bdc..b9223d9 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -7752,7 +7752,7 @@ Tcl_GetChannelOption(
     Tcl_DString *dsPtr)		/* Where to store value(s). */
 {
     size_t len;			/* Length of optionName string. */
-    char optionVal[128];	/* Buffer for sprintf. */
+    char optionVal[128];	/* Buffer for snprintf. */
     Channel *chanPtr = (Channel *) chan;
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
@@ -7859,9 +7859,10 @@ Tcl_GetChannelOption(
 	    if (statePtr->inEofChar == 0) {
 		Tcl_DStringAppendElement(dsPtr, "");
 	    } else {
-		char buf[4];
+		char buf[2];
 
-		sprintf(buf, "%c", statePtr->inEofChar);
+		buf[1] = '\0';
+		buf[0] = statePtr->inEofChar;
 		Tcl_DStringAppendElement(dsPtr, buf);
 	    }
 	}
@@ -7869,9 +7870,10 @@ Tcl_GetChannelOption(
 	    if (statePtr->outEofChar == 0) {
 		Tcl_DStringAppendElement(dsPtr, "");
 	    } else {
-		char buf[4];
+		char buf[2];
 
-		sprintf(buf, "%c", statePtr->outEofChar);
+		buf[1] = '\0';
+		buf[0] = statePtr->outEofChar;
 		Tcl_DStringAppendElement(dsPtr, buf);
 	    }
 	}
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 482b0d5..c43cde8 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -3209,7 +3209,7 @@ ForwardProc(
 		 */
 
 		char *buf = (char *)ckalloc(200);
-		sprintf(buf,
+		snprintf(buf, 200,
 			"{Expected list with even number of elements, got %d %s instead}",
 			listc, (listc == 1 ? "element" : "elements"));
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 3fa9a11..0a48039 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -121,6 +121,7 @@ typedef int ptrdiff_t;
 
 #if defined(_WIN32) && defined(_MSC_VER)
 #   define vsnprintf _vsnprintf
+#   define snprintf _snprintf
 #endif
 
 /*
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 3ba27a1..62feaf1 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -803,7 +803,7 @@ NRInterpCmd(
 	    for (i = 0; ; i++) {
 		Tcl_CmdInfo cmdInfo;
 
-		sprintf(buf, "interp%d", i);
+		snprintf(buf, sizeof(buf), "interp%d", i);
 		if (Tcl_GetCommandInfo(interp, buf, &cmdInfo) == 0) {
 		    break;
 		}
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 35c54be..5dab6d1 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -1120,18 +1120,18 @@ TclLiteralStats(
      */
 
     result = (char *)ckalloc(NUM_COUNTERS*60 + 300);
-    sprintf(result, "%d entries in table, %d buckets\n",
+    snprintf(result, 60, "%d entries in table, %d buckets\n",
 	    tablePtr->numEntries, tablePtr->numBuckets);
     p = result + strlen(result);
     for (i=0 ; i<NUM_COUNTERS ; i++) {
-	sprintf(p, "number of buckets with %d entries: %d\n",
+	snprintf(p, 60, "number of buckets with %d entries: %d\n",
 		i, count[i]);
 	p += strlen(p);
     }
-    sprintf(p, "number of buckets with %d or more entries: %d\n",
+    snprintf(p, 60, "number of buckets with %d or more entries: %d\n",
 	    NUM_COUNTERS, overflow);
     p += strlen(p);
-    sprintf(p, "average search distance for entry: %.1f", average);
+    snprintf(p, 60, "average search distance for entry: %.1f", average);
     return result;
 }
 #endif /*TCL_COMPILE_STATS*/
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 043aa4c..b28efd8 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -661,7 +661,7 @@ AllocObject(
     while (1) {
 	char objName[10 + TCL_INTEGER_SPACE];
 
-	sprintf(objName, "::oo::Obj%d", ++fPtr->tsdPtr->nsCount);
+	snprintf(objName, sizeof(objName), "::oo::Obj%d", ++fPtr->tsdPtr->nsCount);
 	oPtr->namespacePtr = Tcl_CreateNamespace(interp, objName, oPtr, NULL);
 	if (oPtr->namespacePtr != NULL) {
 	    creationEpoch = fPtr->tsdPtr->nsCount;
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 0fce557..fde12f6 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -2877,13 +2877,13 @@ UpdateStringOfWideInt(
     Tcl_WideInt wideVal = objPtr->internalRep.wideValue;
 
     /*
-     * Note that sprintf will generate a compiler warning under Mingw claiming
+     * Note that snprintf will generate a compiler warning under Mingw claiming
      * %I64 is an unknown format specifier. Just ignore this warning. We can't
      * use %L as the format specifier since that gets printed as a 32 bit
      * value.
      */
 
-    sprintf(buffer, "%" TCL_LL_MODIFIER "d", wideVal);
+    snprintf(buffer, sizeof(buffer), "%" TCL_LL_MODIFIER "d", wideVal);
     len = strlen(buffer);
     objPtr->bytes = (char *)ckalloc(len + 1);
     memcpy(objPtr->bytes, buffer, len + 1);
@@ -4496,7 +4496,7 @@ Tcl_RepresentationCmd(
      * "1872361827361287"
      */
 
-    sprintf(ptrBuffer, "%p", (void *) objv[1]);
+    snprintf(ptrBuffer, sizeof(ptrBuffer), "%p", (void *) objv[1]);
     descObj = Tcl_ObjPrintf("value is a %s with a refcount of %d,"
             " object pointer at %s",
             objv[1]->typePtr ? objv[1]->typePtr->name : "pure string",
@@ -4521,7 +4521,7 @@ Tcl_RepresentationCmd(
 	objv[1]->internalRep.twoPtrValue.ptr2 = NULL;
     }
     if (objv[1]->typePtr) {
-	sprintf(ptrBuffer, "%p:%p",
+	snprintf(ptrBuffer, sizeof(ptrBuffer), "%p:%p",
 		(void *) objv[1]->internalRep.twoPtrValue.ptr1,
 		(void *) objv[1]->internalRep.twoPtrValue.ptr2);
 	Tcl_AppendPrintfToObj(descObj, ", internal representation %s",
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index f5c82f1..9bb8997 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -323,10 +323,10 @@ TclCleanupChildren(
 	    char msg1[TCL_INTEGER_SPACE], msg2[TCL_INTEGER_SPACE];
 
 	    result = TCL_ERROR;
-	    sprintf(msg1, "%lu", resolvedPid);
+	    snprintf(msg1, sizeof(msg1), "%lu", resolvedPid);
 	    if (WIFEXITED(waitStatus)) {
 		if (interp != NULL) {
-		    sprintf(msg2, "%u", WEXITSTATUS(waitStatus));
+		    snprintf(msg2, sizeof(msg2), "%u", WEXITSTATUS(waitStatus));
 		    Tcl_SetErrorCode(interp, "CHILDSTATUS", msg1, msg2, NULL);
 		}
 		abnormalExit = 1;
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index bd923ba..3259b48 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -730,7 +730,7 @@ TclRegError(
     p = (n > sizeof(buf)) ? "..." : "";
     Tcl_SetObjResult(interp, Tcl_ObjPrintf("%s%s%s", msg, buf, p));
 
-    sprintf(cbuf, "%d", status);
+    snprintf(cbuf, sizeof(cbuf), "%d", status);
     (void) TclReError(REG_ITOA, cbuf, sizeof(cbuf));
     Tcl_SetErrorCode(interp, "REGEXP", cbuf, buf, NULL);
 }
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index c55554c..fd3170a 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -5145,7 +5145,7 @@ TclFormatNaN(
     *buffer++ = 'N';
     bitwhack.iv &= (((Tcl_WideUInt) 1) << 51) - 1;
     if (bitwhack.iv != 0) {
-	sprintf(buffer, "(%" TCL_LL_MODIFIER "x)", bitwhack.iv);
+	snprintf(buffer, TCL_DOUBLE_SPACE, "(%" TCL_LL_MODIFIER "x)", bitwhack.iv);
     } else {
 	*buffer = '\0';
     }
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 720ed44..b42eeb3 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2483,14 +2483,14 @@ Tcl_AppendFormatToObj(
 		*p++ = '+';
 	    }
 	    if (width) {
-		p += sprintf(p, "%d", width);
+		p += snprintf(p, TCL_INTEGER_SPACE, "%d", width);
 		if (width > length) {
 		    length = width;
 		}
 	    }
 	    if (gotPrecision) {
 		*p++ = '.';
-		p += sprintf(p, "%d", precision);
+		p += snprintf(p, TCL_INTEGER_SPACE, "%d", precision);
 		if (precision > INT_MAX - length) {
 		    msg = overflow;
 		    errCode = "OVERFLOW";
@@ -2514,7 +2514,7 @@ Tcl_AppendFormatToObj(
 		goto errorMsg;
 	    }
 	    bytes = TclGetString(segment);
-	    if (!Tcl_AttemptSetObjLength(segment, sprintf(bytes, spec, d))) {
+	    if (!Tcl_AttemptSetObjLength(segment, snprintf(bytes, segment->length, spec, d))) {
 		msg = overflow;
 		errCode = "OVERFLOW";
 		goto errorMsg;
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 2b4b24f..e7af185 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1110,7 +1110,7 @@ TestcmdtokenCmd(
     if (strcmp(argv[1], "create") == 0) {
 	token = Tcl_CreateCommand(interp, argv[2], CmdProc1,
 		(ClientData) "original", NULL);
-	sprintf(buf, "%p", (void *)token);
+	snprintf(buf, sizeof(buf), "%p", (void *)token);
 	Tcl_SetResult(interp, buf, TCL_VOLATILE);
     } else if (strcmp(argv[1], "name") == 0) {
 	Tcl_Obj *objPtr;
@@ -1864,6 +1864,19 @@ static int UtfExtWrapper(
     int flags;
     Tcl_Obj **flagObjs;
     int nflags;
+    static const struct {
+	const char *flagKey;
+	int flag;
+    } flagMap[] = {
+	{"start", TCL_ENCODING_START},
+	{"end", TCL_ENCODING_END},
+	{"stoponerror", TCL_ENCODING_STOPONERROR},
+	{"noterminate", TCL_ENCODING_NO_TERMINATE},
+	{"charlimit", TCL_ENCODING_CHAR_LIMIT},
+	{NULL, 0}
+    };
+    int i;
+    Tcl_WideInt wide;
 
     if (objc < 7 || objc > 10) {
         Tcl_WrongNumArgs(interp,
@@ -1882,18 +1895,6 @@ static int UtfExtWrapper(
 	return TCL_ERROR;
     }
 
-    struct {
-	const char *flagKey;
-	int flag;
-    } flagMap[] = {
-	{"start", TCL_ENCODING_START},
-	{"end", TCL_ENCODING_END},
-	{"stoponerror", TCL_ENCODING_STOPONERROR},
-	{"noterminate", TCL_ENCODING_NO_TERMINATE},
-	{"charlimit", TCL_ENCODING_CHAR_LIMIT},
-	{NULL, 0}
-    };
-    int i;
     for (i = 0; i < nflags; ++i) {
 	int flag;
 	if (Tcl_GetIntFromObj(NULL, flagObjs[i], &flag) == TCL_OK) {
@@ -1914,7 +1915,6 @@ static int UtfExtWrapper(
     }
 
     /* Assumes state is integer if not "" */
-    Tcl_WideInt wide;
     if (Tcl_GetWideIntFromObj(interp, objv[5], &wide) == TCL_OK) {
         encState = (Tcl_EncodingState)(size_t)wide;
         encStatePtr = &encState;
@@ -2538,7 +2538,7 @@ ExitProcOdd(
     char buf[16 + TCL_INTEGER_SPACE];
     int len;
 
-    sprintf(buf, "odd %d\n", (int)PTR2INT(clientData));
+    snprintf(buf, sizeof(buf), "odd %d\n", (int)PTR2INT(clientData));
     len = strlen(buf);
     if (len != (int) write(1, buf, len)) {
 	Tcl_Panic("ExitProcOdd: unable to write to stdout");
@@ -2552,7 +2552,7 @@ ExitProcEven(
     char buf[16 + TCL_INTEGER_SPACE];
     int len;
 
-    sprintf(buf, "even %d\n", (int)PTR2INT(clientData));
+    snprintf(buf, sizeof(buf), "even %d\n", (int)PTR2INT(clientData));
     len = strlen(buf);
     if (len != (int) write(1, buf, len)) {
 	Tcl_Panic("ExitProcEven: unable to write to stdout");
@@ -2597,7 +2597,7 @@ TestexprlongCmd(
     if (result != TCL_OK) {
 	return result;
     }
-    sprintf(buf, ": %ld", exprResult);
+    snprintf(buf, sizeof(buf), ": %ld", exprResult);
     Tcl_AppendResult(interp, buf, NULL);
     return TCL_OK;
 }
@@ -2639,7 +2639,7 @@ TestexprlongobjCmd(
     if (result != TCL_OK) {
 	return result;
     }
-    sprintf(buf, ": %ld", exprResult);
+    snprintf(buf, sizeof(buf), ": %ld", exprResult);
     Tcl_AppendResult(interp, buf, NULL);
     return TCL_OK;
 }
@@ -4089,7 +4089,7 @@ TestregexpObjCmd(
 
 	    varName = Tcl_GetString(objv[2]);
 	    TclRegExpRangeUniChar(regExpr, -1, &start, &end);
-	    sprintf(resinfo, "%d %d", start, end-1);
+	    snprintf(resinfo, sizeof(resinfo), "%d %d", start, end-1);
 	    value = Tcl_SetVar(interp, varName, resinfo, 0);
 	    if (value == NULL) {
 		Tcl_AppendResult(interp, "couldn't set variable \"",
@@ -4103,7 +4103,7 @@ TestregexpObjCmd(
 
 	    Tcl_RegExpGetInfo(regExpr, &info);
 	    varName = Tcl_GetString(objv[2]);
-	    sprintf(resinfo, "%ld", info.extendStart);
+	    snprintf(resinfo, sizeof(resinfo), "%ld", info.extendStart);
 	    value = Tcl_SetVar(interp, varName, resinfo, 0);
 	    if (value == NULL) {
 		Tcl_AppendResult(interp, "couldn't set variable \"",
@@ -4998,15 +4998,15 @@ GetTimesObjCmd(
     fprintf(stderr, "   %.3f usec per Tcl_GetInt of \"12345\"\n",
 	    timePer/100000);
 
-    /* sprintf 100000 times */
-    fprintf(stderr, "sprintf of 12345 100000 times\n");
+    /* snprintf 100000 times */
+    fprintf(stderr, "snprintf of 12345 100000 times\n");
     Tcl_GetTime(&start);
     for (i = 0;  i < 100000;  i++) {
-	sprintf(newString, "%d", 12345);
+	snprintf(newString, sizeof(newString), "%d", 12345);
     }
     Tcl_GetTime(&stop);
     timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per sprintf of 12345\n",
+    fprintf(stderr, "   %.3f usec per snprintf of 12345\n",
 	    timePer/100000);
 
     /* hashtable lookup 100000 times */
@@ -5642,7 +5642,7 @@ TestChannelCmd(
     Tcl_Channel chan;		/* The opaque type. */
     size_t len;			/* Length of subcommand string. */
     int IOQueued;		/* How much IO is queued inside channel? */
-    char buf[TCL_INTEGER_SPACE];/* For sprintf. */
+    char buf[TCL_INTEGER_SPACE];/* For snprintf. */
     int mode;			/* rw mode of the channel */
 
     if (argc < 2) {
@@ -6432,10 +6432,10 @@ TestGetIndexFromObjStructObjCmd(
     }
     if (idx != target) {
 	char buffer[64];
-	sprintf(buffer, "%d", idx);
+	snprintf(buffer, sizeof(buffer), "%d", idx);
 	Tcl_AppendResult(interp, "index value comparison failed: got ",
 		buffer, NULL);
-	sprintf(buffer, "%d", target);
+	snprintf(buffer, sizeof(buffer), "%d", target);
 	Tcl_AppendResult(interp, " when ", buffer, " expected", NULL);
 	return TCL_ERROR;
     }
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index b1a0afa..8d8c0c8 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1535,7 +1535,7 @@ CheckIfVarUnset(
     if (varPtr[varIndex] == NULL) {
 	char buf[32 + TCL_INTEGER_SPACE];
 
-	sprintf(buf, "variable %d is unset (NULL)", varIndex);
+	snprintf(buf, sizeof(buf), "variable %d is unset (NULL)", varIndex);
 	Tcl_ResetResult(interp);
 	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
 	return 1;
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index fba2844..45dea21 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -146,14 +146,14 @@ RegisterCommand(
     char buf[128];
 
     if (cmdTablePtr->exportIt) {
-	sprintf(buf, "namespace eval %s { namespace export %s }",
+	snprintf(buf, sizeof(buf), "namespace eval %s { namespace export %s }",
 		namespace, cmdTablePtr->cmdName);
 	if (Tcl_EvalEx(interp, buf, -1, 0) != TCL_OK) {
 	    return TCL_ERROR;
 	}
     }
 
-    sprintf(buf, "%s::%s", namespace, cmdTablePtr->cmdName);
+    snprintf(buf, sizeof(buf), "%s::%s", namespace, cmdTablePtr->cmdName);
     Tcl_CreateObjCommand(interp, buf, cmdTablePtr->proc, 0, 0);
     return TCL_OK;
 }
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 5a1e8ca..33dc480 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -676,11 +676,11 @@ Tcl_GetMemoryInfo(
 	if (cachePtr == sharedPtr) {
 	    Tcl_DStringAppendElement(dsPtr, "shared");
 	} else {
-	    sprintf(buf, "thread%p", cachePtr->owner);
+	    snprintf(buf, sizeof(buf), "thread%p", cachePtr->owner);
 	    Tcl_DStringAppendElement(dsPtr, buf);
 	}
 	for (n = 0; n < NBUCKETS; ++n) {
-	    sprintf(buf, "%lu %ld %ld %ld %ld %ld %ld",
+	    snprintf(buf, sizeof(buf), "%lu %ld %ld %ld %ld %ld %ld",
 		    (unsigned long) bucketInfo[n].blockSize,
 		    cachePtr->buckets[n].numFree,
 		    cachePtr->buckets[n].numRemoves,
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index ff18077..4493822 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -371,7 +371,7 @@ ThreadObjCmd(
 	} else {
 	    char buf[20];
 
-	    sprintf(buf, "%" TCL_LL_MODIFIER "d", id);
+	    snprintf(buf, sizeof(buf), "%" TCL_LL_MODIFIER "d", id);
 	    Tcl_AppendResult(interp, "cannot join thread ", buf, NULL);
 	}
 	return result;
@@ -654,7 +654,7 @@ ThreadErrorProc(
     char *script;
     char buf[TCL_DOUBLE_SPACE+1];
 
-    sprintf(buf, "%" TCL_LL_MODIFIER "d", (Tcl_WideInt)(size_t)Tcl_GetCurrentThread());
+    snprintf(buf, sizeof(buf), "%" TCL_LL_MODIFIER "d", (Tcl_WideInt)(size_t)Tcl_GetCurrentThread());
 
     errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
     if (errorProcString == NULL) {
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index aee2b15..d3e88d4 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3320,9 +3320,9 @@ Tcl_PrintDouble(
 	 */
 
 	if (*precisionPtr == 0) {
-	    sprintf(dst, "e%+d", exponent);
+	    snprintf(dst, TCL_DOUBLE_SPACE, "e%+d", exponent);
 	} else {
-	    sprintf(dst, "e%+03d", exponent);
+	    snprintf(dst, TCL_DOUBLE_SPACE, "e%+03d", exponent);
 	}
     } else {
 	/*
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index cbff7b7..c9b4cbc 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -289,7 +289,7 @@ ConvertError(
     case Z_NEED_DICT:
 	codeStr = "NEED_DICT";
 	codeStr2 = codeStrBuf;
-	sprintf(codeStrBuf, "%lu", adler);
+	snprintf(codeStrBuf, sizeof(codeStrBuf), "%lu", adler);
 	break;
 
 	/*
@@ -310,7 +310,7 @@ ConvertError(
     default:
 	codeStr = "UNKNOWN";
 	codeStr2 = codeStrBuf;
-	sprintf(codeStrBuf, "%d", code);
+	snprintf(codeStrBuf, sizeof(codeStrBuf), "%d", code);
 	break;
     }
     Tcl_SetObjResult(interp, Tcl_NewStringObj(zError(code), -1));
@@ -3419,7 +3419,7 @@ ZlibTransformGetOption(
 	    crc = cd->inStream.adler;
 	}
 
-	sprintf(buf, "%lu", crc);
+	snprintf(buf, sizeof(buf), "%lu", crc);
 	if (optionName == NULL) {
 	    Tcl_DStringAppendElement(dsPtr, "-checksum");
 	    Tcl_DStringAppendElement(dsPtr, buf);
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 8d8d123..e66c9ec 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -13,6 +13,9 @@
 
 #undef STATIC_BUILD
 #include "tcl.h"
+#if defined(_WIN32) && defined(_MSC_VER)
+#   define snprintf _snprintf
+#endif
 
 /*
  * Prototypes for procedures defined later in this file:
@@ -63,7 +66,7 @@ Pkgb_SubObjCmd(
     if ((Tcl_GetIntFromObj(interp, objv[1], &first) != TCL_OK)
 	    || (Tcl_GetIntFromObj(interp, objv[2], &second) != TCL_OK)) {
 	char buf[TCL_INTEGER_SPACE];
-	sprintf(buf, "%d", Tcl_GetErrorLine(interp));
+	snprintf(buf, sizeof(buf), "%d", Tcl_GetErrorLine(interp));
 	Tcl_AppendResult(interp, " in line: ", buf, NULL);
 	return TCL_ERROR;
     }
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index b49dde7..9330207 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -838,7 +838,7 @@ TtyGetOptionProc(
 
 	valid = 1;
 	TtyGetAttributes(fsPtr->fd, &tty);
-	sprintf(buf, "%d,%c,%d,%d", tty.baud, tty.parity, tty.data, tty.stop);
+	snprintf(buf, sizeof(buf), "%d,%c,%d,%d", tty.baud, tty.parity, tty.data, tty.stop);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
@@ -885,9 +885,9 @@ TtyGetOptionProc(
 	inBuffered = Tcl_InputBuffered(fsPtr->channel);
 	outBuffered = Tcl_OutputBuffered(fsPtr->channel);
 
-	sprintf(buf, "%d", inBuffered+inQueue);
+	snprintf(buf, sizeof(buf), "%d", inBuffered+inQueue);
 	Tcl_DStringAppendElement(dsPtr, buf);
-	sprintf(buf, "%d", outBuffered+outQueue);
+	snprintf(buf, sizeof(buf), "%d", outBuffered+outQueue);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
@@ -1439,7 +1439,7 @@ TclpOpenFileChannel(
 
     fcntl(fd, F_SETFD, FD_CLOEXEC);
 
-    sprintf(channelName, "file%d", fd);
+    snprintf(channelName, sizeof(channelName), "file%d", fd);
 
 #ifdef SUPPORTS_TTY
     if (strcmp(native, "/dev/tty") != 0 && isatty(fd)) {
@@ -1531,7 +1531,7 @@ Tcl_MakeFileChannel(
 #ifdef SUPPORTS_TTY
     if (isatty(fd)) {
 	channelTypePtr = &ttyChannelType;
-	sprintf(channelName, "serial%d", fd);
+	snprintf(channelName, sizeof(channelName), "serial%d", fd);
     } else
 #endif /* SUPPORTS_TTY */
     if ((getsockname(fd, (struct sockaddr *)&sockaddr, &sockaddrLen) == 0)
@@ -1540,7 +1540,7 @@ Tcl_MakeFileChannel(
 	return TclpMakeTcpClientChannelMode(INT2PTR(fd), mode);
     } else {
 	channelTypePtr = &fileChannelType;
-	sprintf(channelName, "file%d", fd);
+	snprintf(channelName, sizeof(channelName), "file%d", fd);
     }
 
     fsPtr = ckalloc(sizeof(FileState));
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 47b8df3..2aae158 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -500,7 +500,7 @@ TclpInitLibraryPath(
 	 * installed.
 	 */
 
-	sprintf(installLib, "lib/tcl%s", TCL_VERSION);
+	snprintf(installLib, sizeof(installLib), "lib/tcl%s", TCL_VERSION);
 
 	/*
 	 * If TCL_LIBRARY is set, search there.
@@ -899,7 +899,7 @@ TclpSetVariables(
 	osInfo.dwMajorVersion = 11;
     }
     Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY);
-    sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
+    snprintf(buffer, sizeof(buffer), "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sysInfo.wProcessorArchitecture < NUMPROCESSORS) {
 	Tcl_SetVar2(interp, "tcl_platform", "machine",
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index d5cb765..9d27632 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -475,7 +475,7 @@ TclpCreateProcess(
 		|| (!joinThisError && !SetupStdFile(errorFile, TCL_STDERR))
 		|| (joinThisError &&
 			((dup2(1,2) == -1) || (fcntl(2, F_SETFD, 0) != 0)))) {
-	    sprintf(errSpace,
+	    snprintf(errSpace, sizeof(errSpace),
 		    "%dforked process couldn't set up input/output", errno);
 	    len = strlen(errSpace);
 	    if (len != (size_t) write(fd, errSpace, len)) {
@@ -490,7 +490,7 @@ TclpCreateProcess(
 
 	RestoreSignals();
 	execvp(newArgv[0], newArgv);			/* INTL: Native. */
-	sprintf(errSpace, "%dcouldn't execute \"%.150s\"", errno, argv[0]);
+	snprintf(errSpace, sizeof(errSpace), "%dcouldn't execute \"%.150s\"", errno, argv[0]);
 	len = strlen(errSpace);
 	if (len != (size_t) write(fd, errSpace, len)) {
 	    Tcl_Panic("TclpCreateProcess: unable to write to errPipeOut");
@@ -782,7 +782,7 @@ TclpCreateCommandChannel(
      * natural to use "pipe%d".
      */
 
-    sprintf(channelName, "file%d", channelId);
+    snprintf(channelName, sizeof(channelName), "file%d", channelId);
     statePtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
 	    statePtr, mode);
     return statePtr->channel;
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index ffb70e1..3c56a5e 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1428,7 +1428,7 @@ Tcl_OpenTcpClient(
         return NULL;
     }
 
-    sprintf(channelName, SOCK_TEMPLATE, (long)statePtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, (long)statePtr);
 
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
             statePtr, TCL_READABLE | TCL_WRITABLE);
@@ -1495,7 +1495,7 @@ TclpMakeTcpClientChannelMode(
     statePtr->fds.fd = PTR2INT(sock);
     statePtr->flags = 0;
 
-    sprintf(channelName, SOCK_TEMPLATE, (long)statePtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, (long)statePtr);
 
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    statePtr, mode);
@@ -1654,7 +1654,7 @@ Tcl_OpenTcpServer(
             memset(statePtr, 0, sizeof(TcpState));
             statePtr->acceptProc = acceptProc;
             statePtr->acceptProcData = acceptProcData;
-            sprintf(channelName, SOCK_TEMPLATE, (long) statePtr);
+            snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, (long) statePtr);
             newfds = &statePtr->fds;
         } else {
             newfds = (TcpFdList *)ckalloc(sizeof(TcpFdList));
@@ -1747,7 +1747,7 @@ TcpAccept(
     newSockState->flags = 0;
     newSockState->fds.fd = newsock;
 
-    sprintf(channelName, SOCK_TEMPLATE, (long)newSockState);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, (long)newSockState);
     newSockState->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    newSockState, TCL_READABLE | TCL_WRITABLE);
 
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index c5ac52a..9b89b2f 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -202,7 +202,7 @@ TestfilehandlerCmd(
 		    argv[0], " counts index\"", NULL);
 	    return TCL_ERROR;
 	}
-	sprintf(buf, "%d %d", pipePtr->readCount, pipePtr->writeCount);
+	snprintf(buf, sizeof(buf), "%d %d", pipePtr->readCount, pipePtr->writeCount);
 	Tcl_AppendResult(interp, buf, NULL);
     } else if (strcmp(argv[1], "create") == 0) {
 	if (argc != 5) {
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index afb795d..e4a3c68 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -667,7 +667,7 @@ TclpInetNtoa(
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     unsigned char *b = (unsigned char*) &addr.s_addr;
 
-    sprintf(tsdPtr->nabuf, "%u.%u.%u.%u", b[0], b[1], b[2], b[3]);
+    snprintf(tsdPtr->nabuf, sizeof(tsdPtr->nabuf), "%u.%u.%u.%u", b[0], b[1], b[2], b[3]);
     return tsdPtr->nabuf;
 #else
     return inet_ntoa(addr);
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 3a3eba4..72a71ab 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -98,6 +98,9 @@ static int		FileTruncateProc(ClientData instanceData,
 			    Tcl_WideInt length);
 static DWORD		FileGetType(HANDLE handle);
 static int		NativeIsComPort(const WCHAR *nativeName);
+static Tcl_Channel TclWinOpenFileChannel(HANDLE handle, char *channelName,
+			    int permissions, int appendMode);
+
 /*
  * This structure describes the channel type structure for file based IO.
  */
@@ -1382,7 +1385,7 @@ TclWinOpenFileChannel(
     infoPtr->flags = appendMode;
     infoPtr->handle = handle;
     infoPtr->dirty = 0;
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, 16 + TCL_INTEGER_SPACE, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
 
     infoPtr->channel = Tcl_CreateChannel(&fileChannelType, channelName,
 	    infoPtr, permissions);
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 41a05ad..b9b81f8 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -460,7 +460,7 @@ ConsoleCheckProc(
 	}
 
 	if (needEvent) {
-	    ConsoleEvent *evPtr = ckalloc(sizeof(ConsoleEvent));
+	    ConsoleEvent *evPtr = (ConsoleEvent *)ckalloc(sizeof(ConsoleEvent));
 
 	    infoPtr->flags |= CONSOLE_PENDING;
 	    evPtr->header.proc = ConsoleEventProc;
@@ -492,7 +492,7 @@ ConsoleBlockModeProc(
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
-    ConsoleInfo *infoPtr = instanceData;
+    ConsoleInfo *infoPtr = (ConsoleInfo *)instanceData;
 
     /*
      * Consoles on Windows can not be switched between blocking and
@@ -531,7 +531,7 @@ ConsoleCloseProc(
     ClientData instanceData,	/* Pointer to ConsoleInfo structure. */
     Tcl_Interp *interp)		/* For error reporting. */
 {
-    ConsoleInfo *consolePtr = instanceData;
+    ConsoleInfo *consolePtr = (ConsoleInfo *)instanceData;
     int errorCode = 0;
     ConsoleInfo *infoPtr, **nextPtrPtr;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
@@ -650,7 +650,7 @@ ConsoleInputProc(
 				 * buffer? */
     int *errorCode)		/* Where to store error code. */
 {
-    ConsoleInfo *infoPtr = instanceData;
+    ConsoleInfo *infoPtr = (ConsoleInfo *)instanceData;
     DWORD count, bytesRead = 0;
     int result;
 
@@ -1121,7 +1121,7 @@ ConsoleReaderThread(
 {
     TclPipeThreadInfo *pipeTI = (TclPipeThreadInfo *)arg;
     ConsoleInfo *infoPtr = NULL; /* access info only after success init/wait */
-    HANDLE *handle = NULL;
+    HANDLE handle = NULL;
     ConsoleThreadInfo *threadInfo = NULL;
     int done = 0;
 
@@ -1218,7 +1218,7 @@ ConsoleWriterThread(
 {
     TclPipeThreadInfo *pipeTI = (TclPipeThreadInfo *)arg;
     ConsoleInfo *infoPtr = NULL; /* access info only after success init/wait */
-    HANDLE *handle = NULL;
+    HANDLE handle = NULL;
     ConsoleThreadInfo *threadInfo = NULL;
     DWORD count, toWrite;
     char *buf;
@@ -1311,7 +1311,6 @@ TclWinOpenConsoleChannel(
     char *channelName,
     int permissions)
 {
-    char encoding[4 + TCL_INTEGER_SPACE];
     ConsoleInfo *infoPtr;
     DWORD modes;
 
@@ -1328,8 +1327,6 @@ TclWinOpenConsoleChannel(
     infoPtr->handle = handle;
     infoPtr->channel = (Tcl_Channel) NULL;
 
-    wsprintfA(encoding, "cp%d", GetConsoleCP());
-
     infoPtr->threadId = Tcl_GetCurrentThread();
 
     /*
@@ -1338,7 +1335,7 @@ TclWinOpenConsoleChannel(
      * for instance).
      */
 
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, TCL_INTEGER_SPACE + 4, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
 
     infoPtr->channel = Tcl_CreateChannel(&consoleChannelType, channelName,
 	    infoPtr, permissions);
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 86fea7e..595f6b7 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -145,8 +145,8 @@ TclpObjRenameFile(
     Tcl_Obj *srcPathPtr,
     Tcl_Obj *destPathPtr)
 {
-    return DoRenameFile(Tcl_FSGetNativePath(srcPathPtr),
-	    Tcl_FSGetNativePath(destPathPtr));
+    return DoRenameFile((WCHAR *)Tcl_FSGetNativePath(srcPathPtr),
+	    (WCHAR *)Tcl_FSGetNativePath(destPathPtr));
 }
 
 static int
@@ -534,8 +534,8 @@ TclpObjCopyFile(
     Tcl_Obj *srcPathPtr,
     Tcl_Obj *destPathPtr)
 {
-    return DoCopyFile(Tcl_FSGetNativePath(srcPathPtr),
-	    Tcl_FSGetNativePath(destPathPtr));
+    return DoCopyFile((WCHAR *)Tcl_FSGetNativePath(srcPathPtr),
+	    (WCHAR *)Tcl_FSGetNativePath(destPathPtr));
 }
 
 static int
@@ -749,7 +749,7 @@ TclpDeleteFile(
     const void *nativePath)	/* Pathname of file to be removed (native). */
 {
     DWORD attr;
-    const WCHAR *path = nativePath;
+    const WCHAR *path = (const WCHAR *)nativePath;
 
     /*
      * The DeleteFile API acts differently under Win95/98 and NT WRT NULL and
@@ -854,7 +854,7 @@ int
 TclpObjCreateDirectory(
     Tcl_Obj *pathPtr)
 {
-    return DoCreateDirectory(Tcl_FSGetNativePath(pathPtr));
+    return DoCreateDirectory((WCHAR *)Tcl_FSGetNativePath(pathPtr));
 }
 
 static int
@@ -988,7 +988,7 @@ TclpObjRemoveDirectory(
 	ret = DoRemoveDirectory(&native, recursive, &ds);
 	Tcl_DStringFree(&native);
     } else {
-	ret = DoRemoveJustDirectory(Tcl_FSGetNativePath(pathPtr), 0, &ds);
+	ret = DoRemoveJustDirectory((WCHAR *)Tcl_FSGetNativePath(pathPtr), 0, &ds);
     }
 
     if (ret != TCL_OK) {
@@ -1506,7 +1506,7 @@ GetWinFileAttributes(
     const WCHAR *nativeName;
     int attr;
 
-    nativeName = Tcl_FSGetNativePath(fileName);
+    nativeName = (WCHAR *)Tcl_FSGetNativePath(fileName);
     result = GetFileAttributesW(nativeName);
 
     if (result == 0xFFFFFFFF) {
@@ -1833,7 +1833,7 @@ SetWinFileAttributes(
     int yesNo, result;
     const WCHAR *nativeName;
 
-    nativeName = Tcl_FSGetNativePath(fileName);
+    nativeName = (WCHAR *)Tcl_FSGetNativePath(fileName);
     fileAttributes = old = GetFileAttributesW(nativeName);
 
     if (fileAttributes == 0xFFFFFFFF) {
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index a6f27c9..efd2104 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -946,7 +946,7 @@ TclpMatchInDirectory(
 	    WIN32_FILE_ATTRIBUTE_DATA data;
 	    const char *str = Tcl_GetStringFromObj(norm,&len);
 
-	    native = Tcl_FSGetNativePath(pathPtr);
+	    native = (WCHAR *)Tcl_FSGetNativePath(pathPtr);
 
 	    if (GetFileAttributesExW(native,
 		    GetFileExInfoStandard, &data) != TRUE) {
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 582c700..3aadf7a 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -4,7 +4,7 @@
  *	Contains the Windows-specific interpreter initialization functions.
  *
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * Copyright (c) 1998-1999 Scriptics Corporation.
  * All rights reserved.
  *
  * See the file "license.terms" for information on usage and redistribution of
@@ -64,12 +64,6 @@ static ProcessGlobalValue sourceLibraryDir =
 	{0, 0, NULL, NULL, InitializeSourceLibraryDir, NULL, NULL};
 
 static void		AppendEnvironment(Tcl_Obj *listPtr, const char *lib);
-
-#if TCL_UTF_MAX < 4
-static void		ToUtf(const WCHAR *wSrc, char *dst);
-#else
-#define ToUtf(wSrc, dst) WideCharToMultiByte(CP_UTF8, 0, wSrc, -1, dst, MAX_PATH * TCL_UTF_MAX, NULL, NULL)
-#endif
 
 /*
  *---------------------------------------------------------------------------
@@ -163,7 +157,7 @@ TclpInitLibraryPath(
      * installed DLL.
      */
 
-    sprintf(installLib, "lib/tcl%s", TCL_VERSION);
+    snprintf(installLib, sizeof(installLib), "lib/tcl%s", TCL_VERSION);
 
     /*
      * Look for the library relative to the TCL_LIBRARY env variable. If the
@@ -250,12 +244,8 @@ AppendEnvironment(
      * this is a unicode string.
      */
 
-    if (GetEnvironmentVariableW(L"TCL_LIBRARY", wBuf, MAX_PATH) == 0) {
-	buf[0] = '\0';
-	GetEnvironmentVariableA("TCL_LIBRARY", buf, MAX_PATH);
-    } else {
-	ToUtf(wBuf, buf);
-    }
+    GetEnvironmentVariableW(L"TCL_LIBRARY", wBuf, MAX_PATH);
+    WideCharToMultiByte(CP_UTF8, 0, wBuf, -1, buf, MAX_PATH * 3, NULL, NULL);
 
     if (buf[0] != '\0') {
 	objPtr = Tcl_NewStringObj(buf, -1);
@@ -317,11 +307,8 @@ InitializeDefaultLibraryDir(
     char name[(MAX_PATH + LIBRARY_SIZE) * 3];
     char *end, *p;
 
-    if (GetModuleFileNameW(hModule, wName, sizeof(wName)/sizeof(WCHAR)) == 0) {
-	GetModuleFileNameA(hModule, name, sizeof(name));
-    } else {
-	ToUtf(wName, name);
-    }
+    GetModuleFileNameW(hModule, wName, sizeof(wName)/sizeof(WCHAR));
+    WideCharToMultiByte(CP_UTF8, 0, wName, -1, name, sizeof(name), NULL, NULL);
 
     end = strrchr(name, '\\');
     *end = '\0';
@@ -332,7 +319,7 @@ InitializeDefaultLibraryDir(
     *end = '\\';
 
     TclWinNoBackslash(name);
-    sprintf(end + 1, "lib/tcl%s", TCL_VERSION);
+    snprintf(end + 1, LIBRARY_SIZE, "lib/tcl%s", TCL_VERSION);
     *lengthPtr = strlen(name);
     *valuePtr = (char *)ckalloc(*lengthPtr + 1);
     *encodingPtr = NULL;
@@ -368,11 +355,8 @@ InitializeSourceLibraryDir(
     char name[(MAX_PATH + LIBRARY_SIZE) * 3];
     char *end, *p;
 
-    if (GetModuleFileNameW(hModule, wName, sizeof(wName)/sizeof(WCHAR)) == 0) {
-	GetModuleFileNameA(hModule, name, sizeof(name));
-    } else {
-	ToUtf(wName, name);
-    }
+    GetModuleFileNameW(hModule, wName, sizeof(wName)/sizeof(WCHAR));
+    WideCharToMultiByte(CP_UTF8, 0, wName, -1, name, sizeof(name), NULL, NULL);
 
     end = strrchr(name, '\\');
     *end = '\0';
@@ -383,7 +367,7 @@ InitializeSourceLibraryDir(
     *end = '\\';
 
     TclWinNoBackslash(name);
-    sprintf(end + 1, "../library");
+    snprintf(end + 1, LIBRARY_SIZE, "../library");
     *lengthPtr = strlen(name);
     *valuePtr = (char *)ckalloc(*lengthPtr + 1);
     *encodingPtr = NULL;
@@ -393,36 +377,6 @@ InitializeSourceLibraryDir(
 /*
  *---------------------------------------------------------------------------
  *
- * ToUtf --
- *
- *	Convert a wchar string to a UTF string.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-#if TCL_UTF_MAX < 4
-static void
-ToUtf(
-    const WCHAR *wSrc,
-    char *dst)
-{
-    while (*wSrc != '\0') {
-	dst += Tcl_UniCharToUtf(*wSrc, dst);
-	wSrc++;
-    }
-    *dst = '\0';
-}
-#endif
-
-/*
- *---------------------------------------------------------------------------
- *
  * TclpSetInitialEncodings --
  *
  *	Based on the locale, determine the encoding of the operating system
@@ -471,7 +425,7 @@ Tcl_GetEncodingNameFromEnvironment(
 	Tcl_DStringAppend(bufPtr, "utf-8", 5);
     } else {
 	Tcl_DStringSetLength(bufPtr, 2+TCL_INTEGER_SPACE);
-	wsprintfA(Tcl_DStringValue(bufPtr), "cp%d", GetACP());
+	snprintf(Tcl_DStringValue(bufPtr), 2+TCL_INTEGER_SPACE, "cp%d", GetACP());
 	Tcl_DStringSetLength(bufPtr, strlen(Tcl_DStringValue(bufPtr)));
     }
     return Tcl_DStringValue(bufPtr);
@@ -555,7 +509,7 @@ TclpSetVariables(
     if (osInfo.dwMajorVersion == 10 && osInfo.dwBuildNumber >= 22000) {
 	osInfo.dwMajorVersion = 11;
     }
-    wsprintfA(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
+    snprintf(buffer, sizeof(buffer), "%ld.%ld", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
     Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
     if (sys.oemId.wProcessorArchitecture < NUMPROCESSORS) {
 	Tcl_SetVar2(interp, "tcl_platform", "machine",
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 7aac7d0..b7974b8 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -79,8 +79,6 @@ MODULE_SCOPE void	TclWinInit(HINSTANCE hInst);
 MODULE_SCOPE TclFile	TclWinMakeFile(HANDLE handle);
 MODULE_SCOPE Tcl_Channel TclWinOpenConsoleChannel(HANDLE handle,
 			    char *channelName, int permissions);
-MODULE_SCOPE Tcl_Channel TclWinOpenFileChannel(HANDLE handle, char *channelName,
-			    int permissions, int appendMode);
 MODULE_SCOPE Tcl_Channel TclWinOpenSerialChannel(HANDLE handle,
 			    char *channelName, int permissions);
 MODULE_SCOPE HANDLE	TclWinSerialOpen(HANDLE handle, const WCHAR *name,
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 00bc9fe..6c1331f 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -402,7 +402,7 @@ PipeCheckProc(
 
 	if (needEvent) {
 	    infoPtr->flags |= PIPE_PENDING;
-	    evPtr = ckalloc(sizeof(PipeEvent));
+	    evPtr = (PipeEvent *)ckalloc(sizeof(PipeEvent));
 	    evPtr->header.proc = PipeEventProc;
 	    evPtr->infoPtr = infoPtr;
 	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
@@ -433,7 +433,7 @@ TclWinMakeFile(
 {
     WinFile *filePtr;
 
-    filePtr = ckalloc(sizeof(WinFile));
+    filePtr = (WinFile *)ckalloc(sizeof(WinFile));
     filePtr->type = WIN_FILE;
     filePtr->handle = handle;
 
@@ -1775,7 +1775,7 @@ TclpCreateCommandChannel(
     Tcl_Pid *pidPtr)		/* An array of process identifiers. */
 {
     char channelName[16 + TCL_INTEGER_SPACE];
-    PipeInfo *infoPtr = ckalloc(sizeof(PipeInfo));
+    PipeInfo *infoPtr = (PipeInfo *)ckalloc(sizeof(PipeInfo));
 
     PipeInit();
 
@@ -1834,7 +1834,7 @@ TclpCreateCommandChannel(
      * unique, in case channels share handles (stdin/stdout).
      */
 
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, sizeof(channelName), "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
     infoPtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
 	    infoPtr, infoPtr->validMask);
 
@@ -1929,7 +1929,7 @@ TclGetAndDetachPids(
 	return;
     }
 
-    pipePtr = Tcl_GetChannelInstanceData(chan);
+    pipePtr = (PipeInfo *)Tcl_GetChannelInstanceData(chan);
     TclNewObj(pidsObj);
     for (i = 0; i < pipePtr->numPids; i++) {
 	Tcl_ListObjAppendElement(NULL, pidsObj,
@@ -2315,7 +2315,7 @@ PipeOutputProc(
 		ckfree(infoPtr->writeBuf);
 	    }
 	    infoPtr->writeBufLen = toWrite;
-	    infoPtr->writeBuf = ckalloc(toWrite);
+	    infoPtr->writeBuf = (char *)ckalloc(toWrite);
 	}
 	memcpy(infoPtr->writeBuf, buf, toWrite);
 	infoPtr->toWrite = toWrite;
@@ -2723,7 +2723,7 @@ TclWinAddProcess(
     void *hProcess,		/* Handle to process */
     unsigned long id)		/* Global process identifier */
 {
-    ProcInfo *procPtr = ckalloc(sizeof(ProcInfo));
+    ProcInfo *procPtr = (ProcInfo *)ckalloc(sizeof(ProcInfo));
 
     PipeInit();
 
@@ -2823,7 +2823,7 @@ WaitForRead(
 				 * or not. */
 {
     DWORD timeout, count;
-    HANDLE *handle = ((WinFile *) infoPtr->readFile)->handle;
+    HANDLE handle = ((WinFile *) infoPtr->readFile)->handle;
 
     while (1) {
 	/*
@@ -3243,7 +3243,7 @@ TclpOpenTemporaryFile(
     do {
 	char number[TCL_INTEGER_SPACE + 4];
 
-	sprintf(number, "%d.TMP", counter);
+	snprintf(number, sizeof(number), "%d.TMP", counter);
 	counter = (unsigned short) (counter + 1);
 	Tcl_WinUtfToTChar(number, strlen(number), &buf);
 	Tcl_DStringSetLength(&buf, Tcl_DStringLength(&buf) + 1);
@@ -3295,9 +3295,9 @@ TclPipeThreadCreateTI(
 {
     TclPipeThreadInfo *pipeTI;
 #ifndef _PTI_USE_CKALLOC
-    pipeTI = malloc(sizeof(TclPipeThreadInfo));
+    pipeTI = (TclPipeThreadInfo *)malloc(sizeof(TclPipeThreadInfo));
 #else
-    pipeTI = ckalloc(sizeof(TclPipeThreadInfo));
+    pipeTI = (TclPipeThreadInfo *)ckalloc(sizeof(TclPipeThreadInfo));
 #endif /* !_PTI_USE_CKALLOC */
     pipeTI->evControl = CreateEventW(NULL, FALSE, FALSE, NULL);
     pipeTI->state = PTI_STATE_IDLE;
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index cd4ab33..87b33e1 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -1498,7 +1498,7 @@ AppendSystemError(
 	    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *) tMsgPtrPtr,
 	    0, NULL);
     if (length == 0) {
-	sprintf(msgBuf, "unknown error: %ld", error);
+	snprintf(msgBuf, sizeof(msgBuf), "unknown error: %ld", error);
 	msg = msgBuf;
     } else {
 	char *msgPtr;
@@ -1524,7 +1524,7 @@ AppendSystemError(
 	msg = msgPtr;
     }
 
-    sprintf(id, "%ld", error);
+    snprintf(id, sizeof(id), "%ld", error);
     Tcl_SetErrorCode(interp, "WINDOWS", id, msg, NULL);
     Tcl_AppendToObj(resultPtr, msg, length);
     Tcl_SetObjResult(interp, resultPtr);
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index d7fa9f5..53d2daf 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -524,7 +524,7 @@ SerialCheckProc(
 
 	if (needEvent) {
 	    infoPtr->flags |= SERIAL_PENDING;
-	    evPtr = ckalloc(sizeof(SerialEvent));
+	    evPtr = (SerialEvent *)ckalloc(sizeof(SerialEvent));
 	    evPtr->header.proc = SerialEventProc;
 	    evPtr->infoPtr = infoPtr;
 	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
@@ -1036,7 +1036,7 @@ SerialOutputProc(
 		ckfree(infoPtr->writeBuf);
 	    }
 	    infoPtr->writeBufLen = toWrite;
-	    infoPtr->writeBuf = ckalloc(toWrite);
+	    infoPtr->writeBuf = (char *)ckalloc(toWrite);
 	}
 	memcpy(infoPtr->writeBuf, buf, toWrite);
 	infoPtr->toWrite = toWrite;
@@ -1435,7 +1435,7 @@ TclWinOpenSerialChannel(
 
     SerialInit();
 
-    infoPtr = ckalloc(sizeof(SerialInfo));
+    infoPtr = (SerialInfo *)ckalloc(sizeof(SerialInfo));
     memset(infoPtr, 0, sizeof(SerialInfo));
 
     infoPtr->validMask = permissions;
@@ -1456,7 +1456,7 @@ TclWinOpenSerialChannel(
      * are shared between multiple channels (stdin/stdout).
      */
 
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, 16 + TCL_INTEGER_SPACE, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
 
     infoPtr->channel = Tcl_CreateChannel(&serialChannelType, channelName,
 	    infoPtr, permissions);
@@ -1544,7 +1544,7 @@ SerialErrorStr(
     if (error & ~((DWORD) (SERIAL_READ_ERRORS | SERIAL_WRITE_ERRORS))) {
 	char buf[TCL_INTEGER_SPACE + 1];
 
-	wsprintfA(buf, "%d", error);
+	snprintf(buf, sizeof(buf), "%ld", error);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 }
@@ -2041,7 +2041,7 @@ SerialGetOptionProc(
 	stop = (dcb.StopBits == ONESTOPBIT) ? "1" :
 		(dcb.StopBits == ONE5STOPBITS) ? "1.5" : "2";
 
-	wsprintfA(buf, "%d,%c,%d,%s", dcb.BaudRate, parity,
+	snprintf(buf, sizeof(buf), "%ld,%c,%d,%s", dcb.BaudRate, parity,
 		dcb.ByteSize, stop);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
@@ -2057,7 +2057,7 @@ SerialGetOptionProc(
 	char buf[TCL_INTEGER_SPACE + 1];
 
 	valid = 1;
-	wsprintfA(buf, "%d", infoPtr->blockTime);
+	snprintf(buf, sizeof(buf), "%d", infoPtr->blockTime);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
@@ -2073,9 +2073,9 @@ SerialGetOptionProc(
 	char buf[TCL_INTEGER_SPACE + 1];
 	valid = 1;
 
-	wsprintfA(buf, "%d", infoPtr->sysBufRead);
+	snprintf(buf, sizeof(buf), "%ld", infoPtr->sysBufRead);
 	Tcl_DStringAppendElement(dsPtr, buf);
-	wsprintfA(buf, "%d", infoPtr->sysBufWrite);
+	snprintf(buf, sizeof(buf), "%ld", infoPtr->sysBufWrite);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
     if (len == 0) {
@@ -2102,9 +2102,10 @@ SerialGetOptionProc(
 	    }
 	    return TCL_ERROR;
 	}
-	sprintf(buf, "%c", dcb.XonChar);
+	buf[1] = '\0';
+	buf[0] = dcb.XonChar;
 	Tcl_DStringAppendElement(dsPtr, buf);
-	sprintf(buf, "%c", dcb.XoffChar);
+	buf[0] = dcb.XoffChar;
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
     if (len == 0) {
@@ -2156,9 +2157,9 @@ SerialGetOptionProc(
 	count = (int) cStat.cbOutQue + infoPtr->writeQueue;
 	LeaveCriticalSection(&infoPtr->csWrite);
 
-	wsprintfA(buf, "%d", inBuffered + cStat.cbInQue);
+	snprintf(buf, sizeof(buf), "%ld", inBuffered + cStat.cbInQue);
 	Tcl_DStringAppendElement(dsPtr, buf);
-	wsprintfA(buf, "%d", outBuffered + count);
+	snprintf(buf, sizeof(buf), "%d", outBuffered + count);
 	Tcl_DStringAppendElement(dsPtr, buf);
     }
 
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 09b5d52..1c13479 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -2072,7 +2072,7 @@ Tcl_OpenTcpClient(
 	return NULL;
     }
 
-    sprintf(channelName, SOCK_TEMPLATE, statePtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, statePtr);
 
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    statePtr, (TCL_READABLE | TCL_WRITABLE));
@@ -2133,7 +2133,7 @@ Tcl_MakeTcpClientChannel(
     statePtr->selectEvents = FD_READ | FD_CLOSE | FD_WRITE;
     SendSelectMessage(tsdPtr, SELECT, statePtr);
 
-    sprintf(channelName, SOCK_TEMPLATE, statePtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, statePtr);
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    statePtr, (TCL_READABLE | TCL_WRITABLE));
     Tcl_SetChannelOption(NULL, statePtr->channel, "-translation", "auto crlf");
@@ -2296,7 +2296,7 @@ Tcl_OpenTcpServer(
 
 	statePtr->acceptProc = acceptProc;
 	statePtr->acceptProcData = acceptProcData;
-	sprintf(channelName, SOCK_TEMPLATE, statePtr);
+	snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, statePtr);
 	statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 		statePtr, 0);
 	/*
@@ -2381,7 +2381,7 @@ TcpAccept(
     newInfoPtr->selectEvents = (FD_READ | FD_WRITE | FD_CLOSE);
     SendSelectMessage(tsdPtr, SELECT, newInfoPtr);
 
-    sprintf(channelName, SOCK_TEMPLATE, newInfoPtr);
+    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, newInfoPtr);
     newInfoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
 	    newInfoPtr, (TCL_READABLE | TCL_WRITABLE));
     if (Tcl_SetChannelOption(NULL, newInfoPtr->channel, "-translation",
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index 44b5f6c..65c4b3c 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -574,7 +574,7 @@ Tcl_MutexLock(
 	 */
 
 	if (*mutexPtr == NULL) {
-	    csPtr = ckalloc(sizeof(CRITICAL_SECTION));
+	    csPtr = (CRITICAL_SECTION *)ckalloc(sizeof(CRITICAL_SECTION));
 	    InitializeCriticalSection(csPtr);
 	    *mutexPtr = (Tcl_Mutex)csPtr;
 	    TclRememberMutex(mutexPtr);
@@ -717,7 +717,7 @@ Tcl_ConditionWait(
 	 */
 
 	if (*condPtr == NULL) {
-	    winCondPtr = ckalloc(sizeof(WinCondition));
+	    winCondPtr = (WinCondition *)ckalloc(sizeof(WinCondition));
 	    InitializeCriticalSection(&winCondPtr->condLock);
 	    winCondPtr->firstPtr = NULL;
 	    winCondPtr->lastPtr = NULL;
@@ -946,7 +946,7 @@ TclpNewAllocMutex(void)
 {
     struct allocMutex *lockPtr;
 
-    lockPtr = malloc(sizeof(struct allocMutex));
+    lockPtr = (struct allocMutex *)malloc(sizeof(struct allocMutex));
     if (lockPtr == NULL) {
 	Tcl_Panic("could not allocate lock");
     }
@@ -1045,7 +1045,7 @@ TclpThreadCreateKey(void)
 {
     DWORD *key;
 
-    key = TclpSysAlloc(sizeof *key, 0);
+    key = (DWORD *)TclpSysAlloc(sizeof *key, 0);
     if (key == NULL) {
 	Tcl_Panic("unable to allocate thread key!");
     }
@@ -1063,7 +1063,7 @@ void
 TclpThreadDeleteKey(
     void *keyPtr)
 {
-    DWORD *key = keyPtr;
+    DWORD *key = (DWORD *)keyPtr;
 
     if (!TlsFree(*key)) {
 	Tcl_Panic("unable to delete key");
@@ -1077,7 +1077,7 @@ TclpThreadSetGlobalTSD(
     void *tsdKeyPtr,
     void *ptr)
 {
-    DWORD *key = tsdKeyPtr;
+    DWORD *key = (DWORD *)tsdKeyPtr;
 
     if (!TlsSetValue(*key, ptr)) {
 	Tcl_Panic("unable to set global TSD value");
@@ -1088,7 +1088,7 @@ void *
 TclpThreadGetGlobalTSD(
     void *tsdKeyPtr)
 {
-    DWORD *key = tsdKeyPtr;
+    DWORD *key = (DWORD *)tsdKeyPtr;
 
     return TlsGetValue(*key);
 }
-- 
cgit v0.12


From ed24f448c79bc5af4c0f6fd77826a6552271dd9c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 30 Mar 2023 22:06:00 +0000
Subject: One more snprintf

---
 win/tclWinChan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index f0ee718..c764dd2 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -1391,7 +1391,7 @@ TclWinOpenFileChannel(
     infoPtr->flags = appendMode;
     infoPtr->handle = handle;
     infoPtr->dirty = 0;
-    sprintf(channelName, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
+    snprintf(channelName, 16 + TCL_INTEGER_SPACE, "file%" TCL_Z_MODIFIER "x", (size_t) infoPtr);
 
     infoPtr->channel = Tcl_CreateChannel(&fileChannelType, channelName,
 	    infoPtr, permissions);
-- 
cgit v0.12


From 726c679083b19bf2674ff2afeffc9e9405d5800e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 31 Mar 2023 07:49:39 +0000
Subject: Rename TclWinOpenFileChannel to OpenFileChannel, because it's static
 now.

---
 win/tclWinChan.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 72a71ab..5604204 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -98,7 +98,7 @@ static int		FileTruncateProc(ClientData instanceData,
 			    Tcl_WideInt length);
 static DWORD		FileGetType(HANDLE handle);
 static int		NativeIsComPort(const WCHAR *nativeName);
-static Tcl_Channel TclWinOpenFileChannel(HANDLE handle, char *channelName,
+static Tcl_Channel OpenFileChannel(HANDLE handle, char *channelName,
 			    int permissions, int appendMode);
 
 /*
@@ -1030,7 +1030,7 @@ TclpOpenFileChannel(
     case FILE_TYPE_CHAR:
     case FILE_TYPE_DISK:
     case FILE_TYPE_UNKNOWN:
-	channel = TclWinOpenFileChannel(handle, channelName,
+	channel = OpenFileChannel(handle, channelName,
 		channelPermissions, (mode & O_APPEND) ? FILE_APPEND : 0);
 	break;
 
@@ -1107,7 +1107,7 @@ Tcl_MakeFileChannel(
 
     case FILE_TYPE_DISK:
     case FILE_TYPE_CHAR:
-	channel = TclWinOpenFileChannel(handle, channelName, mode, 0);
+	channel = OpenFileChannel(handle, channelName, mode, 0);
 	break;
 
     case FILE_TYPE_UNKNOWN:
@@ -1241,7 +1241,7 @@ Tcl_MakeFileChannel(
 	 * is valid to something.
 	 */
 
-	channel = TclWinOpenFileChannel(handle, channelName, mode, 0);
+	channel = OpenFileChannel(handle, channelName, mode, 0);
     }
 
     return channel;
@@ -1330,7 +1330,7 @@ TclpGetDefaultStdChannel(
 /*
  *----------------------------------------------------------------------
  *
- * TclWinOpenFileChannel --
+ * OpenFileChannel --
  *
  *	Constructs a File channel for the specified standard OS handle. This
  *	is a helper function to break up the construction of channels into
@@ -1347,7 +1347,7 @@ TclpGetDefaultStdChannel(
  */
 
 Tcl_Channel
-TclWinOpenFileChannel(
+OpenFileChannel(
     HANDLE handle,		/* Win32 HANDLE to swallow */
     char *channelName,		/* Buffer to receive channel name */
     int permissions,		/* OR'ed combination of TCL_READABLE,
-- 
cgit v0.12


From 6bdd668a7ce4815e5beb82b3fe15262f99d44987 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 31 Mar 2023 07:57:12 +0000
Subject: Update to tzdata 2023c (which is identical to 2023a, due to the
 summertime situation in Libanon)

---
 library/tzdata/Asia/Beirut | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/tzdata/Asia/Beirut b/library/tzdata/Asia/Beirut
index a01a53a..ac0a64e 100644
--- a/library/tzdata/Asia/Beirut
+++ b/library/tzdata/Asia/Beirut
@@ -113,7 +113,7 @@ set TZData(:Asia/Beirut) {
     {1635627600 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1667077200 7200 0 EET}
-    {1682028000 10800 1 EEST}
+    {1679781600 10800 1 EEST}
     {1698526800 7200 0 EET}
     {1711836000 10800 1 EEST}
     {1729976400 7200 0 EET}
-- 
cgit v0.12


From fc78297f13c393edaa5b39e0fa3c1af3e26b0cfc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 31 Mar 2023 19:24:35 +0000
Subject: Backport CHANNEL_PROFILE_GET() usage fix from 9.0

---
 generic/tclIO.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index db66b7a..d4e562c 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -9461,17 +9461,12 @@ TclCopyChannel(
      * of the bytes themselves.
      */
 
-    /*
-     * TODO - should really only allow lossless profiles. Below reflects
-     * Tcl 8.7 alphas prior to encoding profiles
-     */
-
     moveBytes = inStatePtr->inEofChar == '\0'	/* No eofChar to stop input */
 	    && inStatePtr->inputTranslation == TCL_TRANSLATE_LF
 	    && outStatePtr->outputTranslation == TCL_TRANSLATE_LF
 	    && inStatePtr->encoding == outStatePtr->encoding
-	    && CHANNEL_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
-	    && CHANNEL_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
+	    && CHANNEL_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
+	    && CHANNEL_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
 
     /*
      * Allocate a new CopyState to maintain info about the current copy in
@@ -9799,8 +9794,8 @@ CopyData(
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
     sameEncoding = inStatePtr->encoding == outStatePtr->encoding
-	    && CHANNEL_PROFILE_GET(inStatePtr->flags) != TCL_ENCODING_PROFILE_STRICT
-	    && CHANNEL_PROFILE_GET(outStatePtr->flags) == TCL_ENCODING_PROFILE_TCL8;
+	    && CHANNEL_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
+	    && CHANNEL_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
 
     if (!(inBinary || sameEncoding)) {
 	TclNewObj(bufObj);
-- 
cgit v0.12


From 21c787abd0afa5749ea87aff6da4fff2cb8e30b0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 31 Mar 2023 21:41:03 +0000
Subject: Restore iogt-2.3 expectation expectation to what it was in Tcl 8.6
 (due to previous bug-fix)

---
 tests/iogt.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/iogt.test b/tests/iogt.test
index 279a0dd..d397ccb 100644
--- a/tests/iogt.test
+++ b/tests/iogt.test
@@ -575,11 +575,11 @@ read {%^&*()_+-=
 }
 query/maxRead {} -1
 flush/read {} {}
-query/maxRead {} -1
 write %^&*()_+-= %^&*()_+-=
 write {
 } {
 }
+query/maxRead {} -1
 delete/read {} *ignored*
 flush/write {} {}
 delete/write {} *ignored*}
-- 
cgit v0.12


From 7d1613ac75f237ba9375c3cf93b2755f8f193402 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 1 Apr 2023 07:27:28 +0000
Subject: Improve tcltest package: Don't use 'scan' for printable characters,
 and don't print lf as \x0A any more (as in Tcl 8.6)

---
 library/tcltest/tcltest.tcl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 278a4e0..6a161a3 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -1152,15 +1152,14 @@ proc tcltest::SafeFetch {n1 n2 op} {
 proc tcltest::Asciify {s} {
     set print ""
     foreach c [split $s ""] {
-        set i [scan $c %c]
-        if {[string is print $c] && ($i <= 127)} {
+        if {[string is print $c] && (($c <= "\x7E") || ($c == "\n"))} {
             append print $c
-        } elseif {$i <= 0xFF} {
-            append print \\x[format %02X $i]
-        } elseif {$i <= 0xFFFF} {
-            append print \\u[format %04X $i]
+        } elseif {$c <= "\xFF"} {
+            append print \\x[format %02X [scan $c %c]]
+        } elseif {$c <= "\xFFFF"} {
+            append print \\u[format %04X [scan $c %c]]
         } else {
-            append print \\U[format %08X $i]
+            append print \\U[format %08X [scan $c %c]]
         }
     }
     return $print
-- 
cgit v0.12


From 0726ae90dbb3936ca4f841850bf791bc9a9b07ab Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 1 Apr 2023 07:45:22 +0000
Subject: New "pkgt" for testing TIP #627

---
 unix/dltest/Makefile.in |  13 +++++-
 unix/dltest/pkgt.c      | 108 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 unix/dltest/pkgt.c

diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 500bf97..a99fd0b 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -25,11 +25,11 @@ LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
 CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
 	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
-all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX} pkgooa${SHLIB_SUFFIX}
+all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgt${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX} pkgooa${SHLIB_SUFFIX}
 	@if test -n "$(DLTEST_SUFFIX)"; then $(MAKE) dltest_suffix; fi
 	@touch ../dltest.marker
 
-dltest_suffix: pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX} pkgd${DLTEST_SUFFIX} pkge${DLTEST_SUFFIX} pkgua${DLTEST_SUFFIX} pkgooa${DLTEST_SUFFIX}
+dltest_suffix: pkga${DLTEST_SUFFIX} pkgb${DLTEST_SUFFIX} pkgc${DLTEST_SUFFIX} pkgd${DLTEST_SUFFIX} pkge${DLTEST_SUFFIX} pkgt${DLTEST_SUFFIX} pkgua${DLTEST_SUFFIX} pkgooa${DLTEST_SUFFIX}
 	@touch ../dltest.marker
 
 pkga.o: $(SRC_DIR)/pkga.c
@@ -47,6 +47,9 @@ pkgd.o: $(SRC_DIR)/pkgd.c
 pkge.o: $(SRC_DIR)/pkge.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkge.c
 
+pkgt.o: $(SRC_DIR)/pkgt.c
+	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgt.c
+
 pkgua.o: $(SRC_DIR)/pkgua.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgua.c
 
@@ -68,6 +71,9 @@ pkgd${SHLIB_SUFFIX}: pkgd.o
 pkge${SHLIB_SUFFIX}: pkge.o
 	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
 
+pkgt${SHLIB_SUFFIX}: pkgt.o
+	${SHLIB_LD} -o pkgt${SHLIB_SUFFIX} pkgt.o ${SHLIB_LD_LIBS}
+
 pkgua${SHLIB_SUFFIX}: pkgua.o
 	${SHLIB_LD} -o pkgua${SHLIB_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
 
@@ -89,6 +95,9 @@ pkgd${DLTEST_SUFFIX}: pkgd.o
 pkge${DLTEST_SUFFIX}: pkge.o
 	${DLTEST_LD} -o pkge${DLTEST_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
 
+pkgt${DLTEST_SUFFIX}: pkgt.o
+	${DLTEST_LD} -o pkgt${DLTEST_SUFFIX} pkgt.o ${SHLIB_LD_LIBS}
+
 pkgua${DLTEST_SUFFIX}: pkgua.o
 	${DLTEST_LD} -o pkgua${DLTEST_SUFFIX} pkgua.o ${SHLIB_LD_LIBS}
 
diff --git a/unix/dltest/pkgt.c b/unix/dltest/pkgt.c
new file mode 100644
index 0000000..4a02665
--- /dev/null
+++ b/unix/dltest/pkgt.c
@@ -0,0 +1,108 @@
+/*
+ * pkgt.c --
+ *
+ *	This file contains a simple Tcl package "pkgt" that is intended for
+ *	testing the Tcl dynamic loading facilities.
+ *
+ * Copyright © 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.
+ */
+
+#undef STATIC_BUILD
+#include "tcl.h"
+
+static int TraceProc2 (
+    void *clientData,
+    Tcl_Interp *interp,
+	size_t level,
+    const char *command,
+    Tcl_Command commandInfo,
+    size_t objc,
+	struct Tcl_Obj *const *objv)
+{
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Pkgt_EqObjCmd2 --
+ *
+ *	This procedure is invoked to process the "pkgt_eq" Tcl command. It
+ *	expects two arguments and returns 1 if they are the same, 0 if they
+ *	are different.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	See the user documentation.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+Pkgt_EqObjCmd2(
+    void *dummy,		/* Not used. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    size_t objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
+{
+    Tcl_WideInt result;
+    const char *str1, *str2;
+    size_t len1, len2;
+    (void)dummy;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs(interp, 1, objv,  "string1 string2");
+	return TCL_ERROR;
+    }
+
+    str1 = Tcl_GetStringFromObj(objv[1], &len1);
+    str2 = Tcl_GetStringFromObj(objv[2], &len2);
+    if (len1 == len2) {
+	result = (Tcl_UtfNcmp(str1, str2, len1) == 0);
+    } else {
+	result = 0;
+    }
+    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(result));
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Pkgt_Init --
+ *
+ *	This is a package initialization procedure, which is called by Tcl
+ *	when this package is to be added to an interpreter.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+DLLEXPORT int
+Pkgt_Init(
+    Tcl_Interp *interp)		/* Interpreter in which the package is to be
+				 * made available. */
+{
+    int code;
+
+    if (Tcl_InitStubs(interp, "8.7-", 0) == NULL) {
+	return TCL_ERROR;
+    }
+    code = Tcl_PkgProvide(interp, "pkgt", "1.0");
+    if (code != TCL_OK) {
+	return code;
+    }
+    Tcl_CreateObjCommand2(interp, "pkgt_eq", Pkgt_EqObjCmd2, NULL, NULL);
+    Tcl_CreateObjTrace2(interp, 0, 0, TraceProc2, NULL, NULL);
+    return TCL_OK;
+}
-- 
cgit v0.12


From 81999e05543a471cc0a666354120aa83c2bcc7f4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 1 Apr 2023 14:52:08 +0000
Subject: Add -Wall -Wextra -Wc++-compat -Wconversion -Werror to CFLAGS in
 unix/dltest/Makefile.in, and minimal changes to make it work warning-free.
 Fix indenting

---
 unix/dltest/Makefile.in |  2 +-
 unix/dltest/pkga.c      |  2 +-
 unix/dltest/pkgb.c      |  2 +-
 unix/dltest/pkgooa.c    |  9 +++++++++
 unix/dltest/pkgt.c      | 12 ++++++++++--
 unix/dltest/pkgua.c     |  2 +-
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index a99fd0b..b1b483b 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -17,7 +17,7 @@ TCL_VERSION=		@TCL_VERSION@
 
 CFLAGS_DEBUG		= @CFLAGS_DEBUG@
 CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
-CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_NO_DEPRECATED=1
+CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_NO_DEPRECATED=1 -Wall -Wextra -Wc++-compat -Wconversion -Werror
 LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
 LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
 LDFLAGS			= @LDFLAGS_DEFAULT@ @LDFLAGS@
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index 579c323..d24a23e 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -51,7 +51,7 @@ Pkga_EqObjCmd(
     str1 = Tcl_GetStringFromObj(objv[1], &len1);
     str2 = Tcl_GetStringFromObj(objv[2], &len2);
     if (len1 == len2) {
-	result = (Tcl_UtfNcmp(str1, str2, len1) == 0);
+	result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0);
     } else {
 	result = 0;
     }
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 41bfdcd..c16a362 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -112,7 +112,7 @@ Pkgb_DemoObjCmd(
     if (Tcl_GetWideIntFromObj(interp, objv[3], &numChars) != TCL_OK) {
 	return TCL_ERROR;
     }
-    result = Tcl_UtfNcmp(Tcl_GetString(objv[1]), Tcl_GetString(objv[2]), numChars);
+    result = Tcl_UtfNcmp(Tcl_GetString(objv[1]), Tcl_GetString(objv[2]), (size_t)numChars);
     Tcl_SetObjResult(interp, Tcl_NewIntObj(result));
     return TCL_OK;
 }
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index ec9fbfd..444bb81 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -94,6 +94,15 @@ static TclOOStubs stubsCopy = {
 #ifdef Tcl_GetObjectClassName
     ,NULL
 #endif
+#ifdef Tcl_MethodIsType2
+    ,NULL
+#endif
+#ifdef Tcl_NewInstanceMethod2
+    ,NULL
+#endif
+#ifdef Tcl_NewMethod2
+    ,NULL
+#endif
 };
 
 DLLEXPORT int
diff --git a/unix/dltest/pkgt.c b/unix/dltest/pkgt.c
index 4a02665..e8047db 100644
--- a/unix/dltest/pkgt.c
+++ b/unix/dltest/pkgt.c
@@ -16,12 +16,20 @@
 static int TraceProc2 (
     void *clientData,
     Tcl_Interp *interp,
-	size_t level,
+    size_t level,
     const char *command,
     Tcl_Command commandInfo,
     size_t objc,
-	struct Tcl_Obj *const *objv)
+    struct Tcl_Obj *const *objv)
 {
+    (void)clientData;
+    (void)interp;
+    (void)level;
+    (void)command;
+    (void)commandInfo;
+    (void)objc;
+    (void)objv;
+
     return TCL_OK;
 }
 
diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c
index 16684a8..409d7c1 100644
--- a/unix/dltest/pkgua.c
+++ b/unix/dltest/pkgua.c
@@ -138,7 +138,7 @@ PkguaEqObjCmd(
     str1 = Tcl_GetStringFromObj(objv[1], &len1);
     str2 = Tcl_GetStringFromObj(objv[2], &len2);
     if (len1 == len2) {
-	result = (Tcl_UtfNcmp(str1, str2, len1) == 0);
+	result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0);
     } else {
 	result = 0;
     }
-- 
cgit v0.12


From 8528cc532386d9ff80380afeb132f82c6a2cf25b Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Tue, 4 Apr 2023 16:26:18 +0000
Subject: Fix for [9ca87e6286262a62], sync fcopy buffers input in ReadChars().

---
 generic/tclIO.c | 12 +++++++-----
 tests/io.test   | 28 +++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index d4e562c..1c43360 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -196,7 +196,7 @@ static void		DiscardOutputQueued(ChannelState *chanPtr);
 static int		DoRead(Channel *chanPtr, char *dst, int bytesToRead,
 			    int allowShortReads);
 static int		DoReadChars(Channel *chan, Tcl_Obj *objPtr, int toRead,
-			    int appendFlag);
+			    int allowShortReads, int appendFlag);
 static int		FilterInputBytes(Channel *chanPtr,
 			    GetsState *statePtr);
 static int		FlushChannel(Tcl_Interp *interp, Channel *chanPtr,
@@ -5931,7 +5931,7 @@ Tcl_ReadChars(
 	return TCL_INDEX_NONE;
     }
 
-    return DoReadChars(chanPtr, objPtr, toRead, appendFlag);
+    return DoReadChars(chanPtr, objPtr, toRead, 0, appendFlag);
 }
 /*
  *---------------------------------------------------------------------------
@@ -5962,6 +5962,7 @@ DoReadChars(
     int toRead,			/* Maximum number of characters to store, or
 				 * TCL_INDEX_NONE to read all available data (up to EOF or
 				 * when channel blocks). */
+    int allowShortReads,	/* Allow half-blocking (pipes,sockets) */
     int appendFlag)		/* If non-zero, data read from the channel
 				 * will be appended to the object. Otherwise,
 				 * the data will replace the existing contents
@@ -6101,8 +6102,8 @@ DoReadChars(
 	    if (GotFlag(statePtr, CHANNEL_EOF)) {
 		break;
 	    }
-	    if (GotFlag(statePtr, CHANNEL_NONBLOCKING|CHANNEL_BLOCKED)
-		    == (CHANNEL_NONBLOCKING|CHANNEL_BLOCKED)) {
+	    if ((GotFlag(statePtr, CHANNEL_NONBLOCKING) || allowShortReads)
+		    && GotFlag(statePtr, CHANNEL_BLOCKED)) {
 		break;
 	    }
 	    result = GetInput(chanPtr);
@@ -9853,7 +9854,8 @@ CopyData(
                               !GotFlag(inStatePtr, CHANNEL_NONBLOCKING));
 	    } else {
 		size = DoReadChars(inStatePtr->topChanPtr, bufObj, sizeb,
-			0 /* No append */);
+			!GotFlag(inStatePtr, CHANNEL_NONBLOCKING)
+			,0 /* No append */);
 	    }
 	    underflow = (size >= 0) && (size < sizeb);	/* Input underflow */
 	}
diff --git a/tests/io.test b/tests/io.test
index 7c80f9b..fdcc52a 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -8211,7 +8211,7 @@ test io-53.11 {Bug 2895565} -setup {
     removeFile out
     removeFile in
 } -result {40 bytes copied}
-test io-53.12 {CopyData: foreground short reads, aka bug 3096275} {stdio unix fcopy} {
+test io-53.12.0 {CopyData: foreground short reads, aka bug 3096275} {stdio unix fcopy} {
     file delete $path(pipe)
     set f1 [open $path(pipe) w]
     puts -nonewline $f1 {
@@ -8230,6 +8230,32 @@ test io-53.12 {CopyData: foreground short reads, aka bug 3096275} {stdio unix fc
     close $f1
     list $::done $ch
 } {ok A}
+test io-53.12.1 {
+    Issue 9ca87e6286262a62.
+    CopyData: foreground short reads via ReadChars().
+    Related to report 3096275 for ReadBytes().
+
+    Prior to the fix this test waited forever for read() to return.
+} {stdio unix fcopy} {
+    file delete $path(output)
+    set f1 [open $path(output) w]
+    puts -nonewline $f1 {
+	chan configure stdin -encoding iso8859-1 -translation lf -buffering none
+	fcopy stdin stdout
+    }
+    close $f1
+    set f1 [open "|[list [info nameofexecutable] $path(output)]" r+]
+    try {
+	chan configure $f1 -encoding utf-8  -buffering none
+	puts -nonewline $f1 A
+	set ch [read $f1 1]
+    } finally {
+	if {$f1 in [chan names]} {
+	    close $f1
+	}
+    }
+    lindex $ch
+} A
 test io-53.13 {TclCopyChannel: read error reporting} -setup {
     proc driver {cmd args} {
         variable buffer
-- 
cgit v0.12


From d206ee3c75c6f7e11fcc83dcc0152edf9dd94831 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 4 Apr 2023 21:54:35 +0000
Subject: Starting with [51d813943bcaf835], chan-io-52.10 and  io-52.10 are
 failing on the Windows (with Visual Studio) environment. For now, disable the
 testcases.

---
 tests/chanio.test | 2 +-
 tests/io.test     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/chanio.test b/tests/chanio.test
index d6a969a..5c0dba4 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -6873,7 +6873,7 @@ test chan-io-52.9 {TclCopyChannel & encodings} {fcopy} {
 	    [file size $path(utf8-fcopy.txt)] \
 	    [file size $path(utf8-rp.txt)]
 } {3 5 5}
-test chan-io-52.10 {TclCopyChannel & encodings} {fcopy} {
+test chan-io-52.10 {TclCopyChannel & encodings} {fcopy notWinCI} {
     # encoding to binary (=> implies that the internal utf-8 is written)
     set in  [open $path(kyrillic.txt) r]
     set out [open $path(utf8-fcopy.txt) w]
diff --git a/tests/io.test b/tests/io.test
index fdcc52a..88ad425 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -7435,7 +7435,7 @@ test io-52.9 {TclCopyChannel & encodings} {fcopy} {
 	    [file size $path(utf8-fcopy.txt)] \
 	    [file size $path(utf8-rp.txt)]
 } {3 5 5}
-test io-52.10 {TclCopyChannel & encodings} {fcopy} {
+test io-52.10 {TclCopyChannel & encodings} {fcopy notWinCI} {
     # encoding to binary (=> implies that the
     # internal utf-8 is written)
 
-- 
cgit v0.12


From 1ab82013f2c14f4c0627dfa13fb18970b9c1db49 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 5 Apr 2023 06:40:43 +0000
Subject: Tcl_GetSizeIntFromObj

---
 generic/tcl.decls     |  6 ++++++
 generic/tclDecls.h    |  9 ++++++---
 generic/tclObj.c      | 25 +++++++++++++++++++++++++
 generic/tclStubInit.c |  2 +-
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 7f7fafb..3dfa8dd 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2567,6 +2567,12 @@ declare 685 {
     Tcl_Obj *Tcl_DStringToObj(Tcl_DString *dsPtr)
 }
 
+# TIP 660
+declare 686 {
+    int Tcl_GetSizeIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+	    Tcl_Size *sizePtr)
+}
+
 # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
 
 declare 687 {
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index bee2ae2..bcec388 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -2049,7 +2049,9 @@ EXTERN int		Tcl_GetWideUIntFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr);
 /* 685 */
 EXTERN Tcl_Obj *	Tcl_DStringToObj(Tcl_DString *dsPtr);
-/* Slot 686 is reserved */
+/* 686 */
+EXTERN int		Tcl_GetSizeIntFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Tcl_Size *sizePtr);
 /* 687 */
 EXTERN void		TclUnusedStubEntry(void);
 
@@ -2773,7 +2775,7 @@ typedef struct TclStubs {
     Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
     int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
     Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */
-    void (*reserved686)(void);
+    int (*tcl_GetSizeIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size *sizePtr); /* 686 */
     void (*tclUnusedStubEntry) (void); /* 687 */
 } TclStubs;
 
@@ -4177,7 +4179,8 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_GetWideUIntFromObj) /* 684 */
 #define Tcl_DStringToObj \
 	(tclStubsPtr->tcl_DStringToObj) /* 685 */
-/* Slot 686 is reserved */
+#define Tcl_GetSizeIntFromObj \
+	(tclStubsPtr->tcl_GetSizeIntFromObj) /* 686 */
 #define TclUnusedStubEntry \
 	(tclStubsPtr->tclUnusedStubEntry) /* 687 */
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 99368fe..9d6cd2d 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3555,6 +3555,31 @@ TclGetWideBitsFromObj(
 /*
  *----------------------------------------------------------------------
  *
+ * Tcl_GetSizeIntFromObj --
+ *
+ *	Attempt to return a Tcl_Size from the Tcl object "objPtr".
+ *
+ * Results:
+ *  TCL_OK - the converted Tcl_Size value is stored in *sizePtr
+ *  TCL_ERROR - the error message is stored in interp
+ *
+ * Side effects:
+ *	The function may free up any existing internal representation.
+ *
+ *----------------------------------------------------------------------
+ */
+int
+Tcl_GetSizeIntFromObj(
+    Tcl_Interp *interp, /* Used for error reporting if not NULL. */
+    Tcl_Obj *objPtr,	/* The object from which to get a int. */
+    Tcl_Size *sizePtr)  /* Place to store resulting int. */
+{
+    return Tcl_GetIntFromObj(interp, objPtr, sizePtr);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * FreeBignum --
  *
  *	This function frees the internal rep of a bignum.
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index ddc0bc9..6d29465 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2057,7 +2057,7 @@ const TclStubs tclStubs = {
     Tcl_GetEncodingNulLength, /* 683 */
     Tcl_GetWideUIntFromObj, /* 684 */
     Tcl_DStringToObj, /* 685 */
-    0, /* 686 */
+    Tcl_GetSizeIntFromObj, /* 686 */
     TclUnusedStubEntry, /* 687 */
 };
 
-- 
cgit v0.12


From 3c2a7e1741bd4cba6bab6deae6c97256b04a6d79 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 5 Apr 2023 11:03:35 +0000
Subject: Add TCL_SIZE_MAX and TCL_SIZE_MODIFIER

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

diff --git a/generic/tcl.h b/generic/tcl.h
index 9140ec4..7ef4180 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -399,16 +399,31 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #	define TCL_Z_MODIFIER	""
 #   endif
 #endif /* !TCL_Z_MODIFIER */
+#ifndef TCL_T_MODIFIER
+#   if defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_T_MODIFIER	"t"
+#   elif defined(_WIN64)
+#	define TCL_T_MODIFIER	TCL_LL_MODIFIER
+#   else
+#	define TCL_T_MODIFIER	TCL_Z_MODIFIER
+#   endif
+#endif /* !TCL_T_MODIFIER */
+
 #define Tcl_WideAsLong(val)	((long)((Tcl_WideInt)(val)))
 #define Tcl_LongAsWide(val)	((Tcl_WideInt)((long)(val)))
 #define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
 #define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
 
-#if TCL_MAJOR_VERSION > 8
-typedef size_t Tcl_Size;
+
+#if TCL_MAJOR_VERSION < 9
+    typedef int Tcl_Size;
+#   define TCL_SIZE_MAX INT_MAX
+#   define TCL_SIZE_MODIFIER ""
 #else
-typedef int Tcl_Size;
-#endif
+    typedef ptrdiff_t Tcl_Size;
+#   define TCL_SIZE_MAX PTRDIFF_MAX
+#   define TCL_SIZE_MODIFIER TCL_T_MODIFIER
+#endif /* TCL_MAJOR_VERSION */
 
 #ifdef _WIN32
 #   if TCL_MAJOR_VERSION > 8 || defined(_WIN64) || defined(_USE_64BIT_TIME_T)
-- 
cgit v0.12


From 4df4a598eb231cdc6d925b2330d883786b448e71 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 5 Apr 2023 14:19:45 +0000
Subject: Use Tcl_GetIntForIndex() in testcases (tclTestObj.c) in stead of
 Tcl_GetWideIntFromObj(). Meant for Ashok, to show that we already have
 Tcl_GetSizeIntFromObj(). (I already planned this conversion for a long time,
 thanks, Ashok for reminding me) Also some other cleanups

---
 generic/tclDecls.h    |   6 +--
 generic/tclIndexObj.c |  63 +++++++++++++-------------
 generic/tclInt.decls  |   2 +-
 generic/tclIntDecls.h |   4 +-
 generic/tclTestObj.c  | 120 +++++++++++++++++++++++++-------------------------
 5 files changed, 99 insertions(+), 96 deletions(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index bee2ae2..84c2b4d 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4366,11 +4366,11 @@ extern const TclStubs *tclStubsPtr;
 #	define Tcl_UniCharNcmp(ucs,uct,n) \
 		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))tclStubsPtr->tcl_UniCharNcmp)(ucs,uct,(unsigned int)(n))
 #	define Tcl_UtfNcmp(s1,s2,n) \
-		((int(*)(const char*,const char*,unsigned int))tclStubsPtr->tcl_UtfNcmp)(s1,s2,(unsigned int)(n))
+		((int(*)(const char*,const char*,unsigned int))(void *)tclStubsPtr->tcl_UtfNcmp)(s1,s2,(unsigned int)(n))
 #	define Tcl_UtfNcasecmp(s1,s2,n) \
-		((int(*)(const char*,const char*,unsigned int))tclStubsPtr->tcl_UtfNcasecmp)(s1,s2,(unsigned int)(n))
+		((int(*)(const char*,const char*,unsigned int))(void *)tclStubsPtr->tcl_UtfNcasecmp)(s1,s2,(unsigned int)(n))
 #	define Tcl_UniCharNcasecmp(ucs,uct,n) \
-		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))tclStubsPtr->tcl_UniCharNcasecmp)(ucs,uct,(unsigned int)(n))
+		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))(void *)tclStubsPtr->tcl_UniCharNcasecmp)(ucs,uct,(unsigned int)(n))
 #   endif
 #endif
 
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 79be731..2474c97 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -54,8 +54,8 @@ static const Tcl_ObjType indexType = {
 
 typedef struct {
     void *tablePtr;		/* Pointer to the table of strings */
-    int offset;			/* Offset between table entries */
-    int index;			/* Selected index into table. */
+    Tcl_Size offset;	/* Offset between table entries */
+    Tcl_Size index;		/* Selected index into table. */
 } IndexRep;
 
 /*
@@ -175,7 +175,8 @@ GetIndexFromObjList(
     int *indexPtr)		/* Place to store resulting integer index. */
 {
 
-    int objc, result, t;
+    Tcl_Size objc, t;
+    int result;
     Tcl_Obj **objv;
     const char **tablePtr;
 
@@ -260,7 +261,7 @@ Tcl_GetIndexFromObjStruct(
     int flags,			/* 0, TCL_EXACT, TCL_NULL_OK or TCL_INDEX_TEMP_TABLE */
     void *indexPtr)		/* Place to store resulting index. */
 {
-    int index, idx, numAbbrev;
+    Tcl_Size index, idx, numAbbrev;
     const char *key, *p1;
     const char *p2;
     const char *const *entryPtr;
@@ -295,7 +296,7 @@ Tcl_GetIndexFromObjStruct(
      */
 
     key = objPtr ? TclGetString(objPtr) : "";
-    index = -1;
+    index = TCL_INDEX_NONE;
     numAbbrev = 0;
 
     if (!*key && (flags & TCL_NULL_OK)) {
@@ -568,8 +569,8 @@ PrefixMatchObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int flags = 0, result, index;
-    int dummyLength, i, errorLength;
+    int flags = 0, result, index, i;
+    Tcl_Size dummyLength, errorLength;
     Tcl_Obj *errorPtr = NULL;
     const char *message = "option";
     Tcl_Obj *tablePtr, *objPtr, *resultPtr;
@@ -597,7 +598,7 @@ PrefixMatchObjCmd(
 	case PRFMATCH_MESSAGE:
 	    if (i > objc-4) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing value for -message", -1));
+			"missing value for -message", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NOARG", NULL);
 		return TCL_ERROR;
 	    }
@@ -607,7 +608,7 @@ PrefixMatchObjCmd(
 	case PRFMATCH_ERROR:
 	    if (i > objc-4) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"missing value for -error", -1));
+			"missing value for -error", TCL_INDEX_NONE));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NOARG", NULL);
 		return TCL_ERROR;
 	    }
@@ -692,7 +693,8 @@ PrefixAllObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int tableObjc, result, t, length, elemLength;
+    int result;
+    Tcl_Size length, elemLength, tableObjc, t;
     const char *string, *elemString;
     Tcl_Obj **tableObjv, *resultPtr;
 
@@ -749,7 +751,8 @@ PrefixLongestObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int tableObjc, result, i, t, length, elemLength, resultLength;
+    int result;
+    Tcl_Size i, length, elemLength, resultLength, tableObjc, t;
     const char *string, *elemString, *resultString;
     Tcl_Obj **tableObjv;
 
@@ -864,7 +867,7 @@ PrefixLongestObjCmd(
 void
 Tcl_WrongNumArgs(
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments to print from objv. */
+    Tcl_Size objc,			/* Number of arguments to print from objv. */
     Tcl_Obj *const objv[],	/* Initial argument objects, which should be
 				 * included in the error message. */
     const char *message)	/* Error message to print after the leading
@@ -872,7 +875,7 @@ Tcl_WrongNumArgs(
 				 * NULL. */
 {
     Tcl_Obj *objPtr;
-    int i, len, elemLen;
+    Tcl_Size i, len, elemLen;
     char flags;
     Interp *iPtr = (Interp *)interp;
     const char *elementStr;
@@ -904,9 +907,9 @@ Tcl_WrongNumArgs(
     if (iPtr->flags & INTERP_ALTERNATE_WRONG_ARGS) {
 	iPtr->flags &= ~INTERP_ALTERNATE_WRONG_ARGS;
 	Tcl_AppendObjToObj(objPtr, Tcl_GetObjResult(interp));
-	Tcl_AppendToObj(objPtr, " or \"", -1);
+	Tcl_AppendToObj(objPtr, " or \"", TCL_INDEX_NONE);
     } else {
-	Tcl_AppendToObj(objPtr, "wrong # args: should be \"", -1);
+	Tcl_AppendToObj(objPtr, "wrong # args: should be \"", TCL_INDEX_NONE);
     }
 
     /*
@@ -915,8 +918,8 @@ Tcl_WrongNumArgs(
      */
 
     if (iPtr->ensembleRewrite.sourceObjs != NULL) {
-	int toSkip = iPtr->ensembleRewrite.numInsertedObjs;
-	int toPrint = iPtr->ensembleRewrite.numRemovedObjs;
+	Tcl_Size toSkip = iPtr->ensembleRewrite.numInsertedObjs;
+	Tcl_Size toPrint = iPtr->ensembleRewrite.numRemovedObjs;
 	Tcl_Obj *const *origObjv = TclEnsembleGetRewriteValues(interp);
 
 	/*
@@ -938,7 +941,7 @@ Tcl_WrongNumArgs(
 	objc -= toSkip;
 
 	/*
-	 * We assume no object is of index type.
+	 * Assume no object is of index type.
 	 */
 
 	for (i=0 ; i<toPrint ; i++) {
@@ -976,7 +979,7 @@ Tcl_WrongNumArgs(
 	     * moderately complex condition here).
 	     */
 
-	    if (i<toPrint-1 || objc!=0 || message!=NULL) {
+	    if (i + 1 < toPrint || objc!=0 || message!=NULL) {
 		Tcl_AppendStringsToObj(objPtr, " ", NULL);
 	    }
 	}
@@ -990,7 +993,7 @@ Tcl_WrongNumArgs(
   addNormalArgumentsToMessage:
     for (i = 0; i < objc; i++) {
 	/*
-	 * If the object is an index type use the index table which allows for
+	 * If the object is an index type, use the index table which allows for
 	 * the correct error message even if the subcommand was abbreviated.
 	 * Otherwise, just use the string rep.
 	 */
@@ -1028,7 +1031,7 @@ Tcl_WrongNumArgs(
 	 * (either another element from objv, or the message string).
 	 */
 
-	if (i<objc-1 || message!=NULL) {
+	if (i + 1 < objc || message!=NULL) {
 	    Tcl_AppendStringsToObj(objPtr, " ", NULL);
 	}
     }
@@ -1088,7 +1091,7 @@ Tcl_ParseArgsObjv(
     Tcl_Obj **leftovers;	/* Array to write back to remObjv on
 				 * successful exit. Will include the name of
 				 * the command. */
-    int nrem;			/* Size of leftovers.*/
+    Tcl_Size nrem;		/* Size of leftovers.*/
     const Tcl_ArgvInfo *infoPtr;
 				/* Pointer to the current entry in the table
 				 * of argument descriptions. */
@@ -1100,13 +1103,13 @@ Tcl_ParseArgsObjv(
 				 * quick check for matching; use 2nd char.
 				 * because first char. will almost always be
 				 * '-'). */
-    int srcIndex;		/* Location from which to read next argument
+    Tcl_Size srcIndex;	/* Location from which to read next argument
 				 * from objv. */
-    int dstIndex;		/* Used to keep track of current arguments
+    Tcl_Size dstIndex;	/* Used to keep track of current arguments
 				 * being processed, primarily for error
 				 * reporting. */
-    int objc;			/* # arguments in objv still to process. */
-    int length;			/* Number of characters in current argument */
+    Tcl_Size objc;		/* # arguments in objv still to process. */
+    Tcl_Size length;		/* Number of characters in current argument */
 
     if (remObjv != NULL) {
 	/*
@@ -1143,7 +1146,7 @@ Tcl_ParseArgsObjv(
 	}
 
 	/*
-	 * Loop throught the argument descriptors searching for one with the
+	 * Loop through the argument descriptors searching for one with the
 	 * matching key string. If found, leave a pointer to it in matchPtr.
 	 */
 
@@ -1357,7 +1360,7 @@ PrintUsage(
 
     width = 4;
     for (infoPtr = argTable; infoPtr->type != TCL_ARGV_END; infoPtr++) {
-	int length;
+	Tcl_Size length;
 
 	if (infoPtr->keyStr == NULL) {
 	    continue;
@@ -1372,7 +1375,7 @@ PrintUsage(
      * Now add the option information, with pretty-printing.
      */
 
-    msg = Tcl_NewStringObj("Command-specific options:", -1);
+    msg = Tcl_NewStringObj("Command-specific options:", TCL_INDEX_NONE);
     for (infoPtr = argTable; infoPtr->type != TCL_ARGV_END; infoPtr++) {
 	if ((infoPtr->type == TCL_ARGV_HELP) && (infoPtr->keyStr == NULL)) {
 	    Tcl_AppendPrintfToObj(msg, "\n%s", infoPtr->helpStr);
@@ -1388,7 +1391,7 @@ PrintUsage(
 	    }
 	    numSpaces -= NUM_SPACES;
 	}
-	Tcl_AppendToObj(msg, infoPtr->helpStr, -1);
+	Tcl_AppendToObj(msg, infoPtr->helpStr, TCL_INDEX_NONE);
 	switch (infoPtr->type) {
 	case TCL_ARGV_INT:
 	    Tcl_AppendPrintfToObj(msg, "\n\t\tDefault value: %d",
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 4db3919..1ae651d 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -184,7 +184,7 @@ declare 77 {deprecated {}} {
     void TclpGetTime(Tcl_Time *time)
 }
 declare 81 {
-    void *TclpRealloc(void *ptr, unsigned int size)
+    void *TclpRealloc(void *ptr, TCL_HASH_TYPE size)
 }
 declare 88 {deprecated {}} {
     char *TclPrecTraceProc(void *clientData, Tcl_Interp *interp,
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index ffd559d..e4c0b19 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -227,7 +227,7 @@ void			TclpGetTime(Tcl_Time *time);
 /* Slot 79 is reserved */
 /* Slot 80 is reserved */
 /* 81 */
-EXTERN void *		TclpRealloc(void *ptr, unsigned int size);
+EXTERN void *		TclpRealloc(void *ptr, TCL_HASH_TYPE size);
 /* Slot 82 is reserved */
 /* Slot 83 is reserved */
 /* Slot 84 is reserved */
@@ -751,7 +751,7 @@ typedef struct TclIntStubs {
     void (*reserved78)(void);
     void (*reserved79)(void);
     void (*reserved80)(void);
-    void * (*tclpRealloc) (void *ptr, unsigned int size); /* 81 */
+    void * (*tclpRealloc) (void *ptr, TCL_HASH_TYPE size); /* 81 */
     void (*reserved82)(void);
     void (*reserved83)(void);
     void (*reserved84)(void);
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index e5b8a55..6c056da 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -38,10 +38,10 @@
  * Forward declarations for functions defined later in this file:
  */
 
-static int		CheckIfVarUnset(Tcl_Interp *interp, Tcl_Obj **varPtr, size_t varIndex);
+static int		CheckIfVarUnset(Tcl_Interp *interp, Tcl_Obj **varPtr, Tcl_Size varIndex);
 static int		GetVariableIndex(Tcl_Interp *interp,
-			    Tcl_Obj *obj, size_t *indexPtr);
-static void		SetVarToObj(Tcl_Obj **varPtr, size_t varIndex, Tcl_Obj *objPtr);
+			    Tcl_Obj *obj, Tcl_Size *indexPtr);
+static void		SetVarToObj(Tcl_Obj **varPtr, Tcl_Size varIndex, Tcl_Obj *objPtr);
 static Tcl_ObjCmdProc	TestbignumobjCmd;
 static Tcl_ObjCmdProc	TestbooleanobjCmd;
 static Tcl_ObjCmdProc	TestdoubleobjCmd;
@@ -161,7 +161,7 @@ TestbignumobjCmd(
 	BIGNUM_RADIXSIZE
     };
     int index;
-    size_t varIndex;
+    Tcl_Size varIndex;
     const char *string;
     mp_int bignumValue;
     Tcl_Obj **varPtr;
@@ -188,13 +188,13 @@ TestbignumobjCmd(
 	string = Tcl_GetString(objv[3]);
 	if (mp_init(&bignumValue) != MP_OKAY) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_init", -1));
+		    Tcl_NewStringObj("error in mp_init", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (mp_read_radix(&bignumValue, string, 10) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_read_radix", -1));
+		    Tcl_NewStringObj("error in mp_read_radix", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 
@@ -238,7 +238,7 @@ TestbignumobjCmd(
 	if (mp_mul_d(&bignumValue, 10, &bignumValue) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_mul_d", -1));
+		    Tcl_NewStringObj("error in mp_mul_d", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -263,7 +263,7 @@ TestbignumobjCmd(
 	if (mp_div_d(&bignumValue, 10, &bignumValue, NULL) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_div_d", -1));
+		    Tcl_NewStringObj("error in mp_div_d", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -288,7 +288,7 @@ TestbignumobjCmd(
 	if (mp_mod_2d(&bignumValue, 1, &bignumValue) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_mod_2d", -1));
+		    Tcl_NewStringObj("error in mp_mod_2d", TCL_INDEX_NONE));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -352,7 +352,7 @@ TestbooleanobjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    size_t varIndex;
+    Tcl_Size varIndex;
     int boolValue;
     const char *subCmd;
     Tcl_Obj **varPtr;
@@ -452,7 +452,7 @@ TestdoubleobjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    size_t varIndex;
+    Tcl_Size varIndex;
     double doubleValue;
     const char *subCmd;
     Tcl_Obj **varPtr;
@@ -569,7 +569,7 @@ TestindexobjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     int allowAbbrev, index, setError, i, result;
-    Tcl_WideInt index2;
+    Tcl_Size index2;
     const char **argv;
     static const char *const tablePtr[] = {"a", "b", "check", NULL};
 
@@ -578,8 +578,8 @@ TestindexobjCmd(
      */
     struct IndexRep {
 	void *tablePtr;		/* Pointer to the table of strings. */
-	TCL_HASH_TYPE offset;		/* Offset between table entries. */
-	TCL_HASH_TYPE index;		/* Selected index into table. */
+	Tcl_Size offset;		/* Offset between table entries. */
+	Tcl_Size index;		/* Selected index into table. */
     } *indexRep;
 
     if ((objc == 3) && (strcmp(Tcl_GetString(objv[1]),
@@ -590,7 +590,7 @@ TestindexobjCmd(
 	 * lookups.
 	 */
 
-	if (Tcl_GetWideIntFromObj(interp, objv[2], &index2) != TCL_OK) {
+	if (Tcl_GetIntForIndex(interp, objv[2], TCL_INDEX_NONE, &index2) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
@@ -606,7 +606,7 @@ TestindexobjCmd(
     }
 
     if (objc < 5) {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", TCL_INDEX_NONE);
 	return TCL_ERROR;
     }
 
@@ -617,7 +617,7 @@ TestindexobjCmd(
 	return TCL_ERROR;
     }
 
-    argv = (const char **)ckalloc((objc-3) * sizeof(char *));
+    argv = (const char **)ckalloc(((unsigned)objc-3) * sizeof(char *));
     for (i = 4; i < objc; i++) {
 	argv[i-4] = Tcl_GetString(objv[i]);
     }
@@ -658,7 +658,7 @@ TestintobjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    size_t varIndex;
+    Tcl_Size varIndex;
 #if (INT_MAX != LONG_MAX)   /* int is not the same size as long */
     int i;
 #endif
@@ -746,7 +746,7 @@ TestintobjCmd(
 	    return TCL_ERROR;
 	}
 	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		((wideValue == WIDE_MAX)? "1" : "0"), -1);
+		((wideValue == WIDE_MAX)? "1" : "0"), TCL_INDEX_NONE);
     } else if (strcmp(subCmd, "get") == 0) {
 	if (objc != 3) {
 	    goto wrongNumArgs;
@@ -762,7 +762,7 @@ TestintobjCmd(
 	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
 	    return TCL_ERROR;
 	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), TCL_INDEX_NONE);
     } else if (strcmp(subCmd, "inttoobigtest") == 0) {
 	/*
 	 * If long ints have more bits than ints on this platform, verify that
@@ -775,7 +775,7 @@ TestintobjCmd(
 	    goto wrongNumArgs;
 	}
 #if (INT_MAX == LONG_MAX)   /* int is same size as long int */
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_INDEX_NONE);
 #else
 	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
 	    Tcl_SetWideIntObj(varPtr[varIndex], LONG_MAX);
@@ -784,10 +784,10 @@ TestintobjCmd(
 	}
 	if (Tcl_GetIntFromObj(interp, varPtr[varIndex], &i) != TCL_OK) {
 	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_INDEX_NONE);
 	    return TCL_OK;
 	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", TCL_INDEX_NONE);
 #endif
     } else if (strcmp(subCmd, "mult10") == 0) {
 	if (objc != 3) {
@@ -903,9 +903,9 @@ TestlistobjCmd(
 	LISTOBJ_GETELEMENTSMEMCHECK,
     } cmdIndex;
 
-    size_t varIndex;		/* Variable number converted to binary */
-    Tcl_WideInt first;			/* First index in the list */
-    Tcl_WideInt count;			/* Count of elements in a list */
+    Tcl_Size varIndex;		/* Variable number converted to binary */
+    Tcl_Size first;			/* First index in the list */
+    Tcl_Size count;			/* Count of elements in a list */
     Tcl_Obj **varPtr;
     int i, len;
 
@@ -948,8 +948,8 @@ TestlistobjCmd(
 			     "varIndex start count ?element...?");
 	    return TCL_ERROR;
 	}
-	if (Tcl_GetWideIntFromObj(interp, objv[3], &first) != TCL_OK
-	    || Tcl_GetWideIntFromObj(interp, objv[4], &count) != TCL_OK) {
+	if (Tcl_GetIntForIndex(interp, objv[3], TCL_INDEX_NONE, &first) != TCL_OK
+	    || Tcl_GetIntForIndex(interp, objv[4], TCL_INDEX_NONE, &count) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (Tcl_IsShared(varPtr[varIndex])) {
@@ -1036,7 +1036,7 @@ TestobjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    size_t varIndex, destIndex;
+    Tcl_Size varIndex, destIndex;
     int i;
     const Tcl_ObjType *targetType;
     Tcl_Obj **varPtr;
@@ -1112,7 +1112,7 @@ TestobjCmd(
 	    const char *typeName;
 
 	    if (objv[2]->typePtr == NULL) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
+		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", TCL_INDEX_NONE));
 	    } else {
 		typeName = objv[2]->typePtr->name;
 		if (!strcmp(typeName, "utf32string"))
@@ -1120,7 +1120,7 @@ TestobjCmd(
 #ifndef TCL_WIDE_INT_IS_LONG
 	    else if (!strcmp(typeName, "wideInt")) typeName = "int";
 #endif
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, -1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, TCL_INDEX_NONE));
 	    }
 	}
 	return TCL_OK;
@@ -1214,15 +1214,15 @@ TestobjCmd(
 	    goto wrongNumArgs;
 	}
 	if (varPtr[varIndex]->typePtr == NULL) { /* a string! */
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", -1);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", TCL_INDEX_NONE);
 #ifndef TCL_WIDE_INT_IS_LONG
 	} else if (!strcmp(varPtr[varIndex]->typePtr->name, "wideInt")) {
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "int", -1);
+		    "int", TCL_INDEX_NONE);
 #endif
 	} else {
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    varPtr[varIndex]->typePtr->name, -1);
+		    varPtr[varIndex]->typePtr->name, TCL_INDEX_NONE);
 	}
 	break;
     default:
@@ -1258,9 +1258,9 @@ TeststringobjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     unsigned short *unicode;
-    size_t varIndex;
-    int size, option, i;
-    Tcl_WideInt length;
+    Tcl_Size size, varIndex;
+    int option, i;
+    Tcl_Size length;
 #define MAX_STRINGS 11
     const char *string, *strings[MAX_STRINGS+1];
     String *strPtr;
@@ -1291,7 +1291,7 @@ TeststringobjCmd(
 	    if (objc != 5) {
 		goto wrongNumArgs;
 	    }
-	    if (Tcl_GetWideIntFromObj(interp, objv[4], &length) != TCL_OK) {
+	    if (Tcl_GetIntForIndex(interp, objv[4], TCL_INDEX_NONE, &length) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (varPtr[varIndex] == NULL) {
@@ -1353,7 +1353,7 @@ TeststringobjCmd(
 	    if (CheckIfVarUnset(interp, varPtr, varIndex)) {
 		return TCL_ERROR;
 	    }
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), -1);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), TCL_INDEX_NONE);
 	    break;
 	case 4:				/* length */
 	    if (objc != 3) {
@@ -1413,7 +1413,7 @@ TeststringobjCmd(
 	    if (objc != 4) {
 		goto wrongNumArgs;
 	    }
-	    if (Tcl_GetWideIntFromObj(interp, objv[3], &length) != TCL_OK) {
+	    if (Tcl_GetIntForIndex(interp, objv[3], TCL_INDEX_NONE, &length) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (varPtr[varIndex] != NULL) {
@@ -1439,12 +1439,12 @@ TeststringobjCmd(
 	    Tcl_SetWideIntObj(Tcl_GetObjResult(interp), length);
 	    break;
 	case 10: {				/* range */
-	    int first, last;
+	    Tcl_Size first, last;
 	    if (objc != 5) {
 		goto wrongNumArgs;
 	    }
-	    if ((Tcl_GetIntFromObj(interp, objv[3], &first) != TCL_OK)
-		    || (Tcl_GetIntFromObj(interp, objv[4], &last) != TCL_OK)) {
+	    if ((Tcl_GetIntForIndex(interp, objv[3], TCL_INDEX_NONE, &first) != TCL_OK)
+		    || (Tcl_GetIntForIndex(interp, objv[4], TCL_INDEX_NONE, &last) != TCL_OK)) {
 		return TCL_ERROR;
 	    }
 	    Tcl_SetObjResult(interp, Tcl_GetRange(varPtr[varIndex], first, last));
@@ -1469,12 +1469,12 @@ TeststringobjCmd(
 
 	    string = Tcl_GetStringFromObj(varPtr[varIndex], &size);
 
-	    if (Tcl_GetWideIntFromObj(interp, objv[3], &length) != TCL_OK) {
+	    if (Tcl_GetIntForIndex(interp, objv[3], size-1, &length) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    if ((length < 0) || (length > size)) {
+	    if (length == TCL_INDEX_NONE) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"index value out of range", -1));
+			"index value out of range", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    }
 
@@ -1500,12 +1500,12 @@ TeststringobjCmd(
 
 	    unicode = Tcl_GetUnicodeFromObj(varPtr[varIndex], &size);
 
-	    if (Tcl_GetWideIntFromObj(interp, objv[3], &length) != TCL_OK) {
+	    if (Tcl_GetIntForIndex(interp, objv[3], size-1, &length) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    if ((length < 0) || (length > size)) {
+	    if (length == TCL_INDEX_NONE) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"index value out of range", -1));
+			"index value out of range", TCL_INDEX_NONE));
 		return TCL_ERROR;
 	    }
 
@@ -1513,7 +1513,7 @@ TeststringobjCmd(
 	    Tcl_SetObjResult(interp, varPtr[varIndex]);
 	    break;
 	case 13: /* newunicode*/
-	    unicode = (unsigned short *) ckalloc((objc - 3) * sizeof(unsigned short));
+	    unicode = (unsigned short *) ckalloc(((unsigned)objc - 3) * sizeof(unsigned short));
 	    for (i = 0; i < (objc - 3); ++i) {
 		int val;
 		if (Tcl_GetIntFromObj(interp, objv[i + 3], &val) != TCL_OK) {
@@ -1529,7 +1529,7 @@ TeststringobjCmd(
 	    Tcl_SetObjResult(interp, varPtr[varIndex]);
 	    ckfree(unicode);
 	    break;
-	}
+    }
 
     return TCL_OK;
 }
@@ -1556,7 +1556,7 @@ TeststringobjCmd(
 static void
 SetVarToObj(
     Tcl_Obj **varPtr,
-    size_t varIndex,		/* Designates the assignment variable. */
+    Tcl_Size varIndex,		/* Designates the assignment variable. */
     Tcl_Obj *objPtr)		/* Points to object to assign to var. */
 {
     if (varPtr[varIndex] != NULL) {
@@ -1590,16 +1590,16 @@ GetVariableIndex(
     Tcl_Obj *obj,		/* The variable index
 				 * specified as a nonnegative number less than
 				 * NUMBER_OF_OBJECT_VARS. */
-    size_t *indexPtr)		/* Place to store converted result. */
+    Tcl_Size *indexPtr)		/* Place to store converted result. */
 {
-    Tcl_WideInt index;
+    Tcl_Size index;
 
-    if (Tcl_GetWideIntFromObj(interp, obj, &index) != TCL_OK) {
+    if (Tcl_GetIntForIndex(interp, obj, NUMBER_OF_OBJECT_VARS - 1, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (index < 0 || index >= NUMBER_OF_OBJECT_VARS) {
+    if (index == TCL_INDEX_NONE) {
 	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", TCL_INDEX_NONE);
 	return TCL_ERROR;
     }
 
@@ -1629,14 +1629,14 @@ static int
 CheckIfVarUnset(
     Tcl_Interp *interp,		/* Interpreter for error reporting. */
     Tcl_Obj ** varPtr,
-    size_t varIndex)		/* Index of the test variable to check. */
+    Tcl_Size varIndex)		/* Index of the test variable to check. */
 {
     if (varPtr[varIndex] == NULL) {
 	char buf[32 + TCL_INTEGER_SPACE];
 
-	snprintf(buf, sizeof(buf), "variable %" TCL_Z_MODIFIER "u is unset (NULL)", varIndex);
+	snprintf(buf, sizeof(buf), "variable %d is unset (NULL)", varIndex);
 	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, TCL_INDEX_NONE);
 	return 1;
     }
     return 0;
-- 
cgit v0.12


From fc9cd641eb779a5038416f122c6d0da0949cbbcb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 5 Apr 2023 16:05:36 +0000
Subject: Make sure that infoPtr->validMask only contains
 TCL_READABLE|TCL_WRITABLE|TCL_EXCEPTION, no other flags

---
 win/tclWinChan.c   | 6 +++---
 win/tclWinSerial.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 8a4db89..93596ee 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -1092,7 +1092,7 @@ Tcl_MakeFileChannel(
     TclFile readFile = NULL, writeFile = NULL;
     BOOL result;
 
-    if (mode == 0) {
+    if ((mode & (TCL_READABLE|TCL_WRITABLE)) == 0) {
 	return NULL;
     }
 
@@ -1375,7 +1375,7 @@ OpenFileChannel(
     for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL;
 	    infoPtr = infoPtr->nextPtr) {
 	if (infoPtr->handle == (HANDLE) handle) {
-	    return (permissions==infoPtr->validMask) ? infoPtr->channel : NULL;
+	    return ((permissions & (TCL_READABLE|TCL_WRITABLE|TCL_EXCEPTION))==infoPtr->validMask) ? infoPtr->channel : NULL;
 	}
     }
 
@@ -1388,7 +1388,7 @@ OpenFileChannel(
      */
 
     infoPtr->nextPtr = NULL;
-    infoPtr->validMask = permissions;
+    infoPtr->validMask = permissions & (TCL_READABLE|TCL_WRITABLE|TCL_EXCEPTION);
     infoPtr->watchMask = 0;
     infoPtr->flags = appendMode;
     infoPtr->handle = handle;
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 62af1c5..a55a23f 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -1458,7 +1458,7 @@ TclWinOpenSerialChannel(
     infoPtr = (SerialInfo *)ckalloc(sizeof(SerialInfo));
     memset(infoPtr, 0, sizeof(SerialInfo));
 
-    infoPtr->validMask = permissions;
+    infoPtr->validMask = permissions & (TCL_READABLE|TCL_WRITABLE);
     infoPtr->handle = handle;
     infoPtr->channel = (Tcl_Channel) NULL;
     infoPtr->readable = 0;
-- 
cgit v0.12


From b571892e4f3f2776d9794279256e3532a2c2c861 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Apr 2023 09:10:26 +0000
Subject: int -> Tcl_Size for tclWinDde.c/tclWinReg.c, so it could
 (theoretically) handle larger lists in Tcl 9.

---
 win/tclWinDde.c | 3 ++-
 win/tclWinReg.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index fb2be99..457f20d 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -318,7 +318,8 @@ DdeSetServerName(
     Tcl_DString dString;
     const WCHAR *actualName;
     Tcl_Obj *srvListPtr = NULL, **srvPtrPtr = NULL;
-    int n, srvCount = 0, lastSuffix, r = TCL_OK;
+    Tcl_Size n, srvCount = 0;
+    int lastSuffix, r = TCL_OK;
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
     /*
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index becc6f5..efd5b7c 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -1329,7 +1329,7 @@ SetValue(
 		(DWORD) type, (BYTE *) &value, sizeof(DWORD));
     } else if (type == REG_MULTI_SZ) {
 	Tcl_DString data, buf;
-	int objc, i;
+	Tcl_Size objc, i;
 	Tcl_Obj **objv;
 
 	if (Tcl_ListObjGetElements(interp, dataObj, &objc, &objv) != TCL_OK) {
-- 
cgit v0.12


From 3b742b785e159e8a3b9e25c985fd67ab028a19d2 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 12 Apr 2023 09:35:08 +0000
Subject: Correct spelling errors in comments and documentation, but also
 non-comment corrections in history.tcl and tcltest.test.

---
 ChangeLog                                 | 12 ++---
 ChangeLog.1999                            |  2 +-
 ChangeLog.2000                            | 14 +++---
 ChangeLog.2002                            | 14 +++---
 ChangeLog.2003                            |  2 +-
 ChangeLog.2004                            | 10 ++--
 ChangeLog.2005                            |  2 +-
 ChangeLog.2007                            | 10 ++--
 ChangeLog.2008                            |  4 +-
 changes                                   |  8 ++--
 compat/zlib/ChangeLog                     |  2 +-
 compat/zlib/contrib/iostream3/zfstream.cc |  2 +-
 doc/Cancel.3                              |  4 +-
 doc/Ensemble.3                            |  4 +-
 doc/Eval.3                                |  6 +--
 doc/FileSystem.3                          |  4 +-
 doc/OpenFileChnl.3                        |  2 +-
 doc/SubstObj.3                            |  2 +-
 doc/Tcl.n                                 |  2 +-
 doc/info.n                                |  2 +-
 doc/memory.n                              |  2 +-
 doc/namespace.n                           |  2 +-
 doc/next.n                                |  2 +-
 doc/pkgMkIndex.n                          |  2 +-
 doc/tcltest.n                             |  4 +-
 generic/regc_nfa.c                        | 10 ++--
 generic/regguts.h                         |  4 +-
 generic/tcl.decls                         |  2 +-
 generic/tclAlloc.c                        | 10 ++--
 generic/tclBasic.c                        | 24 +++++-----
 generic/tclBinary.c                       |  8 ++--
 generic/tclCkalloc.c                      |  2 +-
 generic/tclCmdIL.c                        | 10 ++--
 generic/tclCmdMZ.c                        | 14 +++---
 generic/tclCompCmds.c                     | 12 ++---
 generic/tclCompCmdsGR.c                   |  8 ++--
 generic/tclCompCmdsSZ.c                   |  2 +-
 generic/tclCompExpr.c                     |  8 ++--
 generic/tclCompile.c                      | 12 ++---
 generic/tclCompile.h                      |  2 +-
 generic/tclConfig.c                       |  2 +-
 generic/tclDate.c                         |  2 +-
 generic/tclDictObj.c                      | 12 ++---
 generic/tclEncoding.c                     |  4 +-
 generic/tclEnsemble.c                     |  4 +-
 generic/tclEnv.c                          |  2 +-
 generic/tclEvent.c                        |  4 +-
 generic/tclExecute.c                      | 14 +++---
 generic/tclFCmd.c                         |  2 +-
 generic/tclFileName.c                     |  4 +-
 generic/tclIO.c                           | 58 +++++++++++------------
 generic/tclIO.h                           |  8 ++--
 generic/tclIOCmd.c                        |  2 +-
 generic/tclIOGT.c                         | 14 +++---
 generic/tclIORChan.c                      | 26 +++++------
 generic/tclIORTrans.c                     | 26 +++++------
 generic/tclIOUtil.c                       | 16 +++----
 generic/tclIndexObj.c                     |  2 +-
 generic/tclInt.h                          | 26 +++++------
 generic/tclIntPlatDecls.h                 |  2 +-
 generic/tclInterp.c                       |  6 +--
 generic/tclLink.c                         |  2 +-
 generic/tclListObj.c                      | 10 ++--
 generic/tclLiteral.c                      |  4 +-
 generic/tclLoad.c                         |  2 +-
 generic/tclNamesp.c                       |  6 +--
 generic/tclNotify.c                       | 12 ++---
 generic/tclOO.c                           |  4 +-
 generic/tclOOCall.c                       |  2 +-
 generic/tclOOMethod.c                     |  2 +-
 generic/tclObj.c                          | 14 +++---
 generic/tclPanic.c                        |  2 +-
 generic/tclParse.c                        |  8 ++--
 generic/tclPathObj.c                      |  4 +-
 generic/tclPipe.c                         |  6 +--
 generic/tclPkg.c                          |  4 +-
 generic/tclStrToD.c                       |  6 +--
 generic/tclStringObj.c                    | 76 +++++++++++++++----------------
 generic/tclStringRep.h                    |  2 +-
 generic/tclTest.c                         |  6 +--
 generic/tclTestObj.c                      |  2 +-
 generic/tclThreadAlloc.c                  |  2 +-
 generic/tclThreadJoin.c                   |  4 +-
 generic/tclThreadTest.c                   |  2 +-
 generic/tclTrace.c                        | 14 +++---
 generic/tclUtf.c                          |  2 +-
 generic/tclUtil.c                         |  4 +-
 generic/tclVar.c                          |  4 +-
 generic/tclZlib.c                         |  2 +-
 library/auto.tcl                          |  8 ++--
 library/clock.tcl                         |  8 ++--
 library/history.tcl                       |  2 +-
 library/http/http.tcl                     |  8 ++--
 library/init.tcl                          |  2 +-
 library/msgcat/msgcat.tcl                 | 12 ++---
 library/opt/optparse.tcl                  | 22 ++++-----
 library/package.tcl                       |  6 +--
 library/platform/platform.tcl             |  2 +-
 library/platform/shell.tcl                |  8 ++--
 library/safe.tcl                          | 10 ++--
 library/tcltest/tcltest.tcl               | 32 ++++++-------
 library/tm.tcl                            | 18 ++++----
 library/word.tcl                          |  6 +--
 libtommath/changes.txt                    |  2 +-
 macosx/GNUmakefile                        |  4 +-
 macosx/tclMacOSXFCmd.c                    |  2 +-
 macosx/tclMacOSXNotify.c                  |  2 +-
 tests/appendComp.test                     |  2 +-
 tests/chanio.test                         | 10 ++--
 tests/clock.test                          |  2 +-
 tests/cmdAH.test                          |  4 +-
 tests/cmdMZ.test                          |  4 +-
 tests/compile.test                        |  2 +-
 tests/dict.test                           |  2 +-
 tests/env.test                            |  8 ++--
 tests/error.test                          |  2 +-
 tests/eval.test                           |  4 +-
 tests/event.test                          |  2 +-
 tests/exec.test                           |  2 +-
 tests/expr.test                           |  2 +-
 tests/fCmd.test                           |  8 ++--
 tests/fileName.test                       |  2 +-
 tests/fileSystem.test                     |  2 +-
 tests/for.test                            |  4 +-
 tests/indexObj.test                       |  2 +-
 tests/internals.tcl                       |  4 +-
 tests/io.test                             |  6 +--
 tests/ioCmd.test                          |  2 +-
 tests/ioTrans.test                        |  6 +--
 tests/iogt.test                           |  2 +-
 tests/mathop.test                         |  2 +-
 tests/msgcat.test                         |  8 ++--
 tests/ooNext2.test                        |  2 +-
 tests/pkgMkIndex.test                     |  4 +-
 tests/remote.tcl                          |  2 +-
 tests/resolver.test                       |  2 +-
 tests/safe-stock.test                     |  4 +-
 tests/safe.test                           |  4 +-
 tests/scan.test                           |  2 +-
 tests/socket.test                         |  8 ++--
 tests/stringObj.test                      | 12 ++---
 tests/tcltest.test                        | 28 ++++++------
 tests/unixFCmd.test                       |  4 +-
 tests/unixForkEvent.test                  |  2 +-
 tests/winDde.test                         |  6 +--
 tests/winFCmd.test                        |  2 +-
 tools/man2tcl.c                           |  2 +-
 tools/mkdepend.tcl                        |  4 +-
 tools/str2c                               |  2 +-
 unix/configure                            |  2 +-
 unix/configure.in                         |  4 +-
 unix/install-sh                           |  4 +-
 unix/tclUnixChan.c                        |  4 +-
 unix/tclUnixCompat.c                      |  2 +-
 unix/tclUnixFCmd.c                        |  6 +--
 unix/tclUnixFile.c                        |  2 +-
 unix/tclUnixInit.c                        |  4 +-
 unix/tclUnixNotfy.c                       |  2 +-
 unix/tclUnixPipe.c                        |  4 +-
 unix/tclUnixPort.h                        |  2 +-
 unix/tclUnixSock.c                        | 20 ++++----
 unix/tclUnixTest.c                        |  2 +-
 unix/tclXtNotify.c                        |  2 +-
 win/Makefile.in                           |  2 +-
 win/coffbase.txt                          |  4 +-
 win/makefile.vc                           |  2 +-
 win/nmakehlp.c                            | 10 ++--
 win/rules.vc                              |  2 +-
 win/tcl.m4                                |  4 +-
 win/tclWinChan.c                          |  4 +-
 win/tclWinConsole.c                       |  2 +-
 win/tclWinDde.c                           |  6 +--
 win/tclWinFCmd.c                          |  2 +-
 win/tclWinFile.c                          |  8 ++--
 win/tclWinInit.c                          |  6 +--
 win/tclWinNotify.c                        |  2 +-
 win/tclWinPipe.c                          |  6 +--
 win/tclWinReg.c                           | 12 ++---
 win/tclWinSerial.c                        | 10 ++--
 win/tclWinSock.c                          | 32 ++++++-------
 win/tclWinThrd.c                          |  4 +-
 win/tclWinTime.c                          | 12 ++---
 182 files changed, 611 insertions(+), 609 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61e3e04..b189086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1382,7 +1382,7 @@ a better first place to look now.
 
 2012-05-03  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* compat/zlib/*: Upgrade to zlib 1.2.7 (pre-built dll is still 1.2.5,
+	* compat/zlib/*: Upgrade to zlib 1.2.7 (prebuilt dll is still 1.2.5,
 	will be upgraded as soon as the official build is available)
 
 2012-05-03  Don Porter  <dgp@users.sourceforge.net>
@@ -5482,7 +5482,7 @@ a better first place to look now.
 	* generic/tclIORChan.c (ReflectClose, ReflectInput, ReflectOutput,
 	(ReflectSeekWide, ReflectWatch, ReflectBlock, ReflectSetOption,
 	(ReflectGetOption, ForwardProc): [Bug 2978773]: Preserve
-	ReflectedChannel* structures across handler invokations, to avoid
+	ReflectedChannel* structures across handler invocations, to avoid
 	crashes when the handler implementation induces nested callbacks and
 	destruction of the channel deep inside such a nesting.
 
@@ -6363,7 +6363,7 @@ a better first place to look now.
 2009-12-28  Donal K. Fellows  <dkf@users.sf.net>
 
 	* unix/Makefile.in (trace-shell, trace-test): [FRQ 1083288]: Added
-	targets to allow easier tracing of shell and test invokations.
+	targets to allow easier tracing of shell and test invocations.
 
 	* unix/configure.in: [Bug 942170]:	Detect the st_blocks field of
 	* generic/tclCmdAH.c (StoreStatData):	'struct stat' correctly.
@@ -6847,7 +6847,7 @@ a better first place to look now.
 
 	* unix/tclUnixChan.c (TtyParseMode): Partial undo of Donal's tidy-up
 	from a few days ago (2009-11-9, not in ChangeLog). It seems that
-	strchr is apparently a macro on AIX and reacts badly to pre-processor
+	strchr is apparently a macro on AIX and reacts badly to preprocessor
 	directives in its arguments.
 
 2009-11-16  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
@@ -7141,7 +7141,7 @@ a better first place to look now.
 	package-* that were for building Solaris packages.  Appears that the
 	pieces needed for these targets to function have never been present in
 	the current era of Tcl development and belong completely to Tcl
-	pre-history.
+	prehistory.
 
 2009-10-19  Don Porter  <dgp@users.sourceforge.net>
 
@@ -8709,7 +8709,7 @@ a better first place to look now.
 2009-01-19  David Gravereaux  <davygrvy@pobox.com>
 
 	* win/build.vc.bat: Improved tools detection and error message
-	* win/makefile.vc: Reorganized the $(TCLOBJ) file list into seperate
+	* win/makefile.vc: Reorganized the $(TCLOBJ) file list into separate
 	parts for easier maintenance. Matched all sources built using -GL to
 	both $(lib) and $(link) to use -LTCG and avoid a warning message.
 	Addressed the over-building nature of the htmlhelp target by moving
diff --git a/ChangeLog.1999 b/ChangeLog.1999
index 3bf4e9a..e736dee 100644
--- a/ChangeLog.1999
+++ b/ChangeLog.1999
@@ -388,7 +388,7 @@
 	the beginning of the test run
 
 	* tests/basic.test: Use version information defined in tcltest instead
-	of hardcoded version number
+	of hard-coded version number
 
 	* tests/socket.test: package require tcltest before attempting to use
 	variable defined in tcltest namespace
diff --git a/ChangeLog.2000 b/ChangeLog.2000
index 7e78c19..e22dff9 100644
--- a/ChangeLog.2000
+++ b/ChangeLog.2000
@@ -103,7 +103,7 @@
 	119398]
 
 	* library/init.tcl (unknown): Added specific level parameters to
-	all uplevel invokations to boost performance; didn't dare touch
+	all uplevel invocation to boost performance; didn't dare touch
 	the "namespace inscope" stuff though, since it looks sensitive
 	to me!  Should fix [Bug 123217], though testing is tricky...
 
@@ -348,7 +348,7 @@
 	makeFile/makeDirectory and removeFile/removeDirectory.
 
 	* tests/basic.test: Changed references to tcltest::tclVersion to
-	hardcoded numbers.
+	hard-coded numbers.
 	* generic/tcl.h: Changed reference to tcltest2.tcl and tcltest.tcl in
 	comments to tests/basic.test.
 
@@ -1121,7 +1121,7 @@
 
 2000-06-27  Eric Melski  <ericm@scriptics.com>
 
-	* tests/stringObj.test: Tweaked tests to avoid hardcoded high-ASCII
+	* tests/stringObj.test: Tweaked tests to avoid hard-coded high-ASCII
 	characters (which will fail in multibyte locales); instead used \uXXXX
 	syntax. [Bug: 3842].
 
@@ -1546,7 +1546,7 @@
 	* unix/mkLinks: Regen'd with new mkLinks.tcl.
 
 	* unix/mkLinks.tcl: Fixed indentation, made link setup more
-	intelligent (only do one existance test per man page, instead of one
+	intelligent (only do one existence test per man page, instead of one
 	per function).
 
 	* doc/library.n: Fixed .SH NAME macro to include each function
@@ -1641,7 +1641,7 @@
 2000-04-21  Brent Welch <welch@scriptics.com>
 
 	* library/http2.1/http.tcl: More thrashing with the "server closes
-	without reading post data" scenario. Reverted to the previous filevent
+	without reading post data" scenario. Reverted to the previous fileevent
 	configuratiuon, which seems to work better with small amounts of post
 	data.
 
@@ -2267,7 +2267,7 @@
 	* library/auto.tcl: Fixed the regular expression that performs $
 	escaping before sourcing a file to index. It was erroneously adding \
 	escapes even to $'s that were already escaped, effectively
-	"un-escaping" those $'s. (bug #2611).
+	"unescaping" those $'s. (bug #2611).
 
 2000-01-27  Eric Melski  <ericm@scriptics.com>
 
@@ -2378,7 +2378,7 @@
 
 	* generic/tclVar.c: Changed behavior of variable command when name
 	refers to an element in an array (ie, "variable foo(x)") to always
-	return an error, regardless of existance of that element in the array
+	return an error, regardless of existence of that element in the array
 	(now behavior is consistant with docs too) (bug #981).
 
 2000-01-20  Jeff Hobbs  <hobbs@scriptics.com>
diff --git a/ChangeLog.2002 b/ChangeLog.2002
index fa31e42..9534476 100644
--- a/ChangeLog.2002
+++ b/ChangeLog.2002
@@ -15,7 +15,7 @@
 	* tests/winPipe.test:
 	* win/tclWinPipe.c (Tcl_WaitPid):
 	* win/tclWinTest.c:  Gave Tcl_WaitPid the ability to return a Win32
-	exception code translated into a posix style SIG*. This allows [close]
+	exception code translated into a Posix-style SIG*. This allows [close]
 	to report "CHILDKILLED" without the meaning getting lost in a
 	truncated exit code. In TclCleanupChildren(), TclpGetPid() had to get
 	moved to before Tcl_WaitPid() as the the handle is removed from the
@@ -1941,7 +1941,7 @@
 
 	* tests/pkg/samename.tcl: restored. needed by pkgMkIndex.test.
 
-	* library/tcltest/tcltest.tcl: restored writeability testing of
+	* library/tcltest/tcltest.tcl: restored writability testing of
 	-tmpdir, augmented by a special exception for the deafault value.
 
 2002-07-01  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
@@ -1959,9 +1959,9 @@
 	* tests/info.test:	[temporaryDirectory] of tcltest.
 	* tests/interp.test:
 
-	* library/tcltest/tcltest.tcl:	Stopped checking for writeability of
+	* library/tcltest/tcltest.tcl:	Stopped checking for writability of
 	-tmpdir value because no default directory can be guaranteed to be
-	writeable.
+	writable.
 
 	* tests/autoMkindex.tcl: removed.
 	* tests/pkg/samename.tcl: removed.
@@ -2469,7 +2469,7 @@
 	thread-safe *_r counterparts are not available.
 	* unix/tcl.m4: added configure check for readdir_r
 	* unix/tcl.m4 (Darwin): set TCL_DEFAULT_ENCODING to utf-8 on MacOSX
-	(where posix file apis expect utf-8, not iso8859-1).
+	(where Posix file apis expect utf-8, not iso8859-1).
 	* unix/configure: regen
 	* unix/Makefile.in: set DYLD_LIBRARY_PATH in parallel to
 	LD_LIBRARY_PATH for MacOSX dynamic linker.
@@ -3683,7 +3683,7 @@
 
 	* win/tclAppInit.c: Changed #include "tcl.h" to be tclPort.h to remove
 	the raw windows.h include. tclPort.h brings in windows.h already and
-	lessens the pre-compiled-header mush and the randomly useless #pragma
+	lessens the precompiled-header mush and the randomly useless #pragma
 	comment (lib,...) references throughout the big windows.h tree (as
 	observed at high linker warning levels).
 
@@ -3793,7 +3793,7 @@
 	* generic/tclIO.c: Large-file support (with many consequences.)
 	* compat/strtoll.c, compat/strtoull.c: New support functions.
 	* unix/tcl.m4, unix/configure: 64-bit support and greatly enhanced
-	cacheing.
+	caching.
 
 	Most other changes, including all those in doc/* and test/* as well as
 	the majority in the platform directories, follow on from these.
diff --git a/ChangeLog.2003 b/ChangeLog.2003
index 3c3ee11..acdf81d 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -268,7 +268,7 @@
 	recently fixed by 2003-11-15 commit to regcomp.c by Pavel Goran. His
 	notes on the fix: This bug results from an error in code that splits
 	states into "progress" and "no-progress" ones. This error causes an
-	interesting situation with the pre-collected single-linked list of
+	interesting situation with the precollected single-linked list of
 	states to be splitted: many items were added to the list, but only
 	several of them are accessible from the list beginning, since the
 	"tmp" member of struct state (which is used here to hold a pointer to
diff --git a/ChangeLog.2004 b/ChangeLog.2004
index 550e286..e237382 100644
--- a/ChangeLog.2004
+++ b/ChangeLog.2004
@@ -377,7 +377,7 @@
 	strstr, strtoul and strtod.
 	* unix/tcl.m4 (SC_TCL_CHECK_BROKEN_FUNC): Split a complex stanza out
 	of configure.in into its own function. Also force it to do the right
-	thing with cacheing of results of AC_TRY_RUN to deal with issue raised
+	thing with caching of results of AC_TRY_RUN to deal with issue raised
 	in [Patch 1073524]
 
 	* doc/foreach.n: Added simple example. [FRQ 1073334]
@@ -1975,7 +1975,7 @@
 	* doc/FileSystem.3:
 	* generic/tclIOUtil.c: Clarified documentation regarding ability of a
 	filesystem to say that it doesn't support a given operation using the
-	EXDEV posix error code (copyFileProc, renameFileProc, etc), and
+	EXDEV Posix error code (copyFileProc, renameFileProc, etc), and
 	updated one piece of code to ensure correct behaviour when an
 	operation is not supported [Bug 1017072]
 
@@ -2277,7 +2277,7 @@
 	with vfs [Bug 991420].
 	* tests/fileSystem.test: added test for above bug.
 
-	* doc/FileSystem.3: clarified documentation of posix error codes in
+	* doc/FileSystem.3: clarified documentation of Posix error codes in
 	'remove directory' FS proc - 'EEXIST' is used to signify a non-empty
 	directory error (bug reported against tclvfs).
 
@@ -4339,7 +4339,7 @@
 	provided by the c-runtime. [Bug 672938]
 
 	* win/nmakehlp.c: defensive techniques to avoid static buffer
-	overflows and a couple envars upsetting invokations of cl.exe and
+	overflows and a couple envars upsetting invocations of cl.exe and
 	link.exe. [Bug 885537]
 
 	* tests/winPipe.test: Added proof that BuildCommandLine() is not doing
@@ -4548,7 +4548,7 @@
 	dictionary is computed at compile time (when it is fully known). The
 	dictionary is pushed on the stack along with the result, and the code
 	and level values are included in the bytecode as operands. Also
-	supports optimized compilation of un-[catch]ed [return]s from procs
+	supports optimized compilation of un[catch]ed [return]s from procs
 	with default options into the INST_DONE instruction.
 
 	* generic/tclExecute.c: Rewrote INST_RETURN instruction to retrieve
diff --git a/ChangeLog.2005 b/ChangeLog.2005
index 109ea8e..f2d1b65 100644
--- a/ChangeLog.2005
+++ b/ChangeLog.2005
@@ -229,7 +229,7 @@
 	***POTENTIAL INCOMPATIBILITY*** for bytecode savers/loaders. See below
 
 	* generic/tclCompCmds.c (TclCompileSwitchCmd): Arrange for very simple
-	[switch] invokations to be compiled into hash lookups into jump tables;
+	[switch] invocations to be compiled into hash lookups into jump tables;
 	only a very specific kind of [switch] can be safely compiled this way,
 	but that happens to be the most common kind. This makes around 5-10%
 	difference to the speed of execution of clock.test.
diff --git a/ChangeLog.2007 b/ChangeLog.2007
index dd2a5fe..a28a5cb 100644
--- a/ChangeLog.2007
+++ b/ChangeLog.2007
@@ -1426,7 +1426,7 @@
 	initialization assumptions of the TIP 280 code in CompileWord().
 
 	* generic/tclCompExpr.c:	Suppress the attempt to convert to
-	numeric when pre-compiling a constant expresion indicates an error.
+	numeric when precompiling a constant expresion indicates an error.
 
 2007-08-22  Miguel Sofer  <msofer@users.sf.net>
 
@@ -2827,8 +2827,8 @@
 2007-03-24  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
 
 	* win/tclWinThrd.c: Thread exit handler marks the current thread as
-	un-initialized. This allows exit handlers that are registered later to
-	re-initialize this subsystem in case they need to use some sync
+	uninitialized. This allows exit handlers that are registered later to
+	reinitialize this subsystem in case they need to use some sync
 	primitives (cond variables) from this file again.
 
 2007-03-23  Miguel Sofer  <msofer@users.sf.net>
@@ -4938,7 +4938,7 @@
 
 	Misc patches to make code more efficient. [Bug 1530474] (afredd)
 	* generic/*.c, macosx/tclMacOSXNotify.c, unix/tclUnixNotfy.c,
-	* win/tclWinThrd.c: Tidy up invokations of Tcl_Panic() to promote
+	* win/tclWinThrd.c: Tidy up invocations of Tcl_Panic() to promote
 	string constant sharing and consistent style.
 	* generic/tclBasic.c (Tcl_CreateInterp): More efficient handling of
 	* generic/tclClock.c (TclClockInit):	 registration of commands not
@@ -5016,7 +5016,7 @@
 
 2006-07-24  Don Porter	<dgp@users.sourceforge.net>
 
-	* win/tclWinSock.c:	Correct un-initialized Tcl_DString. Thanks to
+	* win/tclWinSock.c:	Correct uninitialized Tcl_DString. Thanks to
 	afredd. [Bug 1518166]
 
 2006-07-21  Miguel Sofer  <msofer@users.sf.net>
diff --git a/ChangeLog.2008 b/ChangeLog.2008
index 9c4e951..7bd2a01 100644
--- a/ChangeLog.2008
+++ b/ChangeLog.2008
@@ -1207,7 +1207,7 @@
 	* generic/tcl.decls, doc/Ensemble.3, doc/namespace.n
 	* tests/namespace.test: Allow the handling of a (fixed) number of
 	formal parameters between an ensemble's command and subcommand at
-	invokation time. [Patch 1901783]
+	invocation time. [Patch 1901783]
 
 2008-09-28  Miguel Sofer  <msofer@users.sf.net>
 
@@ -3252,7 +3252,7 @@
 2008-03-21  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/switch.n: Clarified documentation in respect of two-argument
-	invokation. [Bug 1899962]
+	invocation. [Bug 1899962]
 
 	* tests/switch.test: Added more tests of regexp-mode compilation of
 	the [switch] command. [Bug 1854435]
diff --git a/changes b/changes
index f3d0120..6641777 100644
--- a/changes
+++ b/changes
@@ -3028,7 +3028,7 @@ in case of errors is required for proper cleanup by the user of fcopy. (BW)
 	x eval rename foo blotz
 	x alias foo {}
 The problem was that the interp code was not using the actual current name
-of the command to be deleted as a result of un-aliasing foo. (JL)
+of the command to be deleted as a result of unaliasing foo. (JL)
 
 6/19/97 (feature change) Pass interp down to the ChannelOption and
 driver specific calls so system errors can be differentiated from syntax
@@ -4167,7 +4167,7 @@ Only.)  This fix included:
 the location of the encoding files and libraries.  This fix included:
     - Adding the TclSetPerInitScript routine.
     - Modifying the Tcl_Init routines to evaluate the non-NULL
-      pre-init script.
+      preinit script.
     - Adding the Tcl_SetdefaultEncodingDir and Tcl_GetDefaultEncodingDir
       routines.
     - Modifying the TclpInitLibrary routines to append the default
@@ -6977,7 +6977,7 @@ of traced command do not fire (sofer)
 
 2007-08-16 (bug fix)[1773040] ::errorInfo trace crash (janssen,porter)
 
-2007-08-16 (performance)[1564517] pre-compile constant expressions (porter)
+2007-08-16 (performance)[1564517] precompile constant expressions (porter)
 
 2007-08-21 (bug fix)[1775878] 'puts \' in interactive tclsh failed to move to
 prompt for continuation line (porter)
@@ -8685,7 +8685,7 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 
 2016-07-08 (bug)[a47641] [file normalize] & Windows junctions (nadkarni)
 
-2016-07-09 [ae61a6] [file] handling of Win hardcoded names (CON) (nadkarni)
+2016-07-09 [ae61a6] [file] handling of Win hard-coded names (CON) (nadkarni)
         *** POTENTIAL INCOMPATIBILITY ***
 
 2016-07-09 [3613671] [file owned] (more) useful on Win (nadkarni)
diff --git a/compat/zlib/ChangeLog b/compat/zlib/ChangeLog
index 457526b..bd4540d 100644
--- a/compat/zlib/ChangeLog
+++ b/compat/zlib/ChangeLog
@@ -847,7 +847,7 @@ Changes in 1.2.1.2 (9 September 2004)
 - Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
 - Update contrib/ada [Anisimkov]
 - Update contrib/minizip [Vollant]
-- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix configure to not hard-code directories for Darwin [Peterson]
 - Fix gzio.c to not return error on empty files [Brown]
 - Fix indentation; update version in contrib/delphi/ZLib.pas and
   contrib/pascal/zlibpas.pas [Truta]
diff --git a/compat/zlib/contrib/iostream3/zfstream.cc b/compat/zlib/contrib/iostream3/zfstream.cc
index 94eb933..5779874 100644
--- a/compat/zlib/contrib/iostream3/zfstream.cc
+++ b/compat/zlib/contrib/iostream3/zfstream.cc
@@ -138,7 +138,7 @@ gzfilebuf::open_mode(std::ios_base::openmode mode,
   bool testa = mode & std::ios_base::app;
 
   // Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
-  // Original zfstream hardcoded the compression level to maximum here...
+  // Original zfstream hard-coded the compression level to maximum here...
   // Double the time for less than 1% size improvement seems
   // excessive though - keeping it at the default level
   // To change back, just append "9" to the next three mode strings
diff --git a/doc/Cancel.3 b/doc/Cancel.3
index 847707e..ff2a9b4 100644
--- a/doc/Cancel.3
+++ b/doc/Cancel.3
@@ -26,7 +26,7 @@ Error message to use in the cancellation, or NULL to use a default message. If
 not NULL, this object will have its reference count decremented before
 \fBTcl_CancelEval\fR returns.
 .AP int flags in
-ORed combination of flag bits that specify additional options.
+OR'ed combination of flag bits that specify additional options.
 For \fBTcl_CancelEval\fR, only \fBTCL_CANCEL_UNWIND\fR is currently
 supported.  For \fBTcl_Canceled\fR, only \fBTCL_LEAVE_ERR_MSG\fR and
 \fBTCL_CANCEL_UNWIND\fR are currently supported.
@@ -47,7 +47,7 @@ Extensions can use this function to check to see if they should abort a long
 running command.  This function is thread sensitive and may only be called
 from the thread the interpreter was created in.
 .SS "FLAG BITS"
-Any ORed combination of the following values may be used for the
+Any OR'ed combination of the following values may be used for the
 \fIflags\fR argument to procedures such as \fBTcl_CancelEval\fR:
 .TP 20
 \fBTCL_CANCEL_UNWIND\fR
diff --git a/doc/Ensemble.3 b/doc/Ensemble.3
index 30c1d3b..93aa458 100644
--- a/doc/Ensemble.3
+++ b/doc/Ensemble.3
@@ -71,14 +71,14 @@ The name of the ensemble command to be created.
 The namespace to which the ensemble command is to be bound, or NULL
 for the current namespace.
 .AP int ensFlags in
-An ORed set of flag bits describing the basic configuration of the
+An OR'ed set of flag bits describing the basic configuration of the
 ensemble. Currently only one bit has meaning, \fBTCL_ENSEMBLE_PREFIX\fR,
 which is present when the ensemble command should also match
 unambiguous prefixes of subcommands.
 .AP Tcl_Obj *cmdNameObj in
 A value holding the name of the ensemble command to look up.
 .AP int flags in
-An ORed set of flag bits controlling the behavior of
+An OR'ed set of flag bits controlling the behavior of
 \fBTcl_FindEnsemble\fR. Currently only \fBTCL_LEAVE_ERR_MSG\fR is supported.
 .AP Tcl_Command token in
 A normal command token that refers to an ensemble command, or which
diff --git a/doc/Eval.3 b/doc/Eval.3
index 1318fdb..ec4b111 100644
--- a/doc/Eval.3
+++ b/doc/Eval.3
@@ -49,7 +49,7 @@ modified to hold the result or error message from the script.
 .AP Tcl_Obj *objPtr in
 A Tcl value containing the script to execute.
 .AP int flags in
-ORed combination of flag bits that specify additional options.
+OR'ed combination of flag bits that specify additional options.
 \fBTCL_EVAL_GLOBAL\fR and \fBTCL_EVAL_DIRECT\fR are currently supported.
 .AP "const char" *fileName in
 Name of a file containing a Tcl script.
@@ -109,7 +109,7 @@ or
 which will be safely substituted by the Tcl interpreter into
 .QW ^Z .
 .PP
-\fBTcl_EvalObjv\fR executes a single pre-parsed command instead of a
+\fBTcl_EvalObjv\fR executes a single preparsed command instead of a
 script.  The \fIobjc\fR and \fIobjv\fR arguments contain the values
 of the words for the Tcl command, one word in each value in
 \fIobjv\fR.  \fBTcl_EvalObjv\fR evaluates the command and returns
@@ -160,7 +160,7 @@ list. Like \fBTcl_VarEval\fR, \fBTcl_VarEvalVA\fR is deprecated.
 
 .SH "FLAG BITS"
 .PP
-Any ORed combination of the following values may be used for the
+Any OR'ed combination of the following values may be used for the
 \fIflags\fR argument to procedures such as \fBTcl_EvalObjEx\fR:
 .TP 23
 \fBTCL_EVAL_DIRECT\fR
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index 4a57743..7ac93c8 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -231,7 +231,7 @@ the file which caused an error in the various copy/rename operations.
 .AP Tcl_Obj **objPtrRef out
 Filled with a value containing the result of the operation.
 .AP Tcl_Obj *resultPtr out
-Pre-allocated value in which to store (using
+Preallocated value in which to store (using
 \fBTcl_ListObjAppendElement\fR) the list of
 files or directories which are successfully matched.
 .AP int mode in
@@ -487,7 +487,7 @@ is a Tcl_Obj specifying the contents of the symbolic link given by
 by the caller, which should call \fBTcl_DecrRefCount\fR when the result is no
 longer needed. If the \fItoPtr\fR is not NULL, Tcl should create a link
 of one of the types passed in in the \fIlinkAction\fR flag. This flag is
-an ORed combination of \fBTCL_CREATE_SYMBOLIC_LINK\fR and \fBTCL_CREATE_HARD_LINK\fR.
+an OR'ed combination of \fBTCL_CREATE_SYMBOLIC_LINK\fR and \fBTCL_CREATE_HARD_LINK\fR.
 Where a choice exists (i.e.\ more than one flag is passed in), the Tcl
 convention is to prefer symbolic links. When a link is successfully
 created, the return value should be \fItoPtr\fR (which is therefore
diff --git a/doc/OpenFileChnl.3 b/doc/OpenFileChnl.3
index 82851da..cff2210 100644
--- a/doc/OpenFileChnl.3
+++ b/doc/OpenFileChnl.3
@@ -599,7 +599,7 @@ their possible values are described in the manual entry for the Tcl
 \fBfconfigure\fR command. Other options can be added by each channel type.
 These channel type specific options are described in the manual entry for
 the Tcl command that creates a channel of that type; for example, the
-additional options for TCP based channels are described in the manual entry
+additional options for TCP-based channels are described in the manual entry
 for the Tcl \fBsocket\fR command.
 The procedure normally returns \fBTCL_OK\fR. If an error occurs, it returns
 \fBTCL_ERROR\fR and calls \fBTcl_SetErrno\fR to store an appropriate POSIX
diff --git a/doc/SubstObj.3 b/doc/SubstObj.3
index a2b6214..ca6822b 100644
--- a/doc/SubstObj.3
+++ b/doc/SubstObj.3
@@ -24,7 +24,7 @@ message.
 .AP Tcl_Obj *objPtr in
 A Tcl value containing the string to perform substitutions on.
 .AP int flags in
-ORed combination of flag bits that specify which substitutions to
+OR'ed combination of flag bits that specify which substitutions to
 perform.  The flags \fBTCL_SUBST_COMMANDS\fR,
 \fBTCL_SUBST_VARIABLES\fR and \fBTCL_SUBST_BACKSLASHES\fR are
 currently supported, and \fBTCL_SUBST_ALL\fR is provided as a
diff --git a/doc/Tcl.n b/doc/Tcl.n
index fc3b477..3e809fa 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.n
@@ -182,7 +182,7 @@ Vertical tab (Unicode U+00000B).
 .
 A single space character replaces the backslash, newline, and all spaces
 and tabs after the newline.  This backslash sequence is unique in that it
-is replaced in a separate pre-pass before the command is actually parsed.
+is replaced in a separate prepass before the command is actually parsed.
 This means that it will be replaced even when it occurs between braces,
 and the resulting space will be treated as a word separator if it is not
 in braces or quotes.
diff --git a/doc/info.n b/doc/info.n
index 477e272..94141b4 100644
--- a/doc/info.n
+++ b/doc/info.n
@@ -180,7 +180,7 @@ means that the command is executed by \fBeval\fR or \fBuplevel\fR.
 .TP
 \fBprecompiled\fR\0\0\0\0\0\0\0\0
 .
-means that the command is found in a pre-compiled script (loadable by
+means that the command is found in a precompiled script (loadable by
 the package \fBtbcload\fR), and no further information will be
 available.
 .RE
diff --git a/doc/memory.n b/doc/memory.n
index 4d6a7d1..fc3ff99 100644
--- a/doc/memory.n
+++ b/doc/memory.n
@@ -41,7 +41,7 @@ of packets and bytes allocated.
 .TP
 \fBmemory init \fR[\fBon\fR|\fBoff\fR]
 .
-Turn on or off the pre-initialization of all allocated memory
+Turn on or off the preinitialization of all allocated memory
 with bogus bytes.  Useful for detecting the use of uninitialized
 values.
 .TP
diff --git a/doc/namespace.n b/doc/namespace.n
index b0b6e25..f7775b4 100644
--- a/doc/namespace.n
+++ b/doc/namespace.n
@@ -161,7 +161,7 @@ this command first finds the matching exported commands.
 It then checks whether any of those commands
 were previously imported by the current namespace.
 If so, this command deletes the corresponding imported commands.
-In effect, this un-does the action of a \fBnamespace import\fR command.
+In effect, this undoes the action of a \fBnamespace import\fR command.
 .TP
 \fBnamespace import \fR?\fB\-force\fR? ?\fIpattern\fR \fIpattern ...\fR?
 .
diff --git a/doc/next.n b/doc/next.n
index db846be..294d4b5 100644
--- a/doc/next.n
+++ b/doc/next.n
@@ -96,7 +96,7 @@ forward to the proper implementation of the method (which it does by invoking
 the \fBnext\fR command as filters are inserted into the front of the method
 call chain) and is responsible for returning the result of \fBnext\fR.
 .PP
-Filters are invoked when processing an invokation of the \fBunknown\fR
+Filters are invoked when processing an invocation of the \fBunknown\fR
 method because of a failure to locate a method implementation, but \fInot\fR
 when invoking either constructors or destructors. (Note however that the
 \fBdestroy\fR method is a conventional method, and filters are invoked as
diff --git a/doc/pkgMkIndex.n b/doc/pkgMkIndex.n
index 5a6b905..f98cbcd 100644
--- a/doc/pkgMkIndex.n
+++ b/doc/pkgMkIndex.n
@@ -108,7 +108,7 @@ it immediately upon \fBpackage require\fR.  This is not compatible with
 the use of \fIauto_reset\fR, and therefore its use is discouraged.
 .TP 15
 \fB\-load \fIpkgPat\fR
-The index process will pre-load any packages that exist in the
+The index process will preload any packages that exist in the
 current interpreter and match \fIpkgPat\fR into the child interpreter used to
 generate the index.  The pattern match uses string match rules, but without
 making case distinctions.
diff --git a/doc/tcltest.n b/doc/tcltest.n
index 25e5e5e..1a5151a 100644
--- a/doc/tcltest.n
+++ b/doc/tcltest.n
@@ -625,14 +625,14 @@ the test suite is being run on a Unix platform.
 .PP
 Each \fBtest\fR should include whatever \fB\-constraints\fR are
 required to constrain it to run only where appropriate.  Several
-constraints are pre-defined in the \fBtcltest\fR package, listed
+constraints are predefined in the \fBtcltest\fR package, listed
 below.  The registration of user-defined constraints is performed
 by the \fBtestConstraint\fR command.  User-defined constraints
 may appear within a test file, or within the script specified
 by the \fBconfigure \-load\fR or \fBconfigure \-loadfile\fR
 options.
 .PP
-The following is a list of constraints pre-defined by the
+The following is a list of constraints predefined by the
 \fBtcltest\fR package itself:
 .TP
 \fIsingleTestInterp\fR
diff --git a/generic/regc_nfa.c b/generic/regc_nfa.c
index 7f43958..bd98508 100644
--- a/generic/regc_nfa.c
+++ b/generic/regc_nfa.c
@@ -487,7 +487,7 @@ freearc(
 /*
  * changearctarget - flip an arc to have a different to state
  *
- * Caller must have verified that there is no pre-existing duplicate arc.
+ * Caller must have verified that there is no preexisting duplicate arc.
  *
  * Note that because we store arcs in their from state, we can't easily have
  * a similar changearcsource function.
@@ -1515,7 +1515,7 @@ pullback(
  * Returns 1 if successful (which it always is unless the source is the
  * start state or we have an internal error), 0 if nothing happened.
  *
- * A significant property of this function is that it deletes no pre-existing
+ * A significant property of this function is that it deletes no preexisting
  * states, and no outarcs of the constraint's from state other than the given
  * constraint arc.  This makes the loops in pullback() safe, at the cost that
  * we may leave useless states behind.  Therefore, we leave it to pullback()
@@ -1694,7 +1694,7 @@ pushfwd(
  * Returns 1 if successful (which it always is unless the destination is the
  * post state or we have an internal error), 0 if nothing happened.
  *
- * A significant property of this function is that it deletes no pre-existing
+ * A significant property of this function is that it deletes no preexisting
  * states, and no inarcs of the constraint's to state other than the given
  * constraint arc.  This makes the loops in pushfwd() safe, at the cost that
  * we may leave useless states behind.  Therefore, we leave it to pushfwd()
@@ -2467,7 +2467,7 @@ breakconstraintloop(struct nfa * nfa, struct state * sinitial)
  * have multiple redundant arc pathways).  Each donemap is a char array
  * indexed by state number.  The donemaps are all of the same size "nstates",
  * which is nfa->nstates as of the start of the recursion.  This is enough to
- * have entries for all pre-existing states, but *not* entries for clone
+ * have entries for all preexisting states, but *not* entries for clone
  * states created during the recursion.  That's okay since we have no need to
  * mark those.
  *
@@ -2774,7 +2774,7 @@ markcanreach(
  - analyze - ascertain potentially-useful facts about an optimized NFA
  ^ static long analyze(struct nfa *);
  */
-static long			/* re_info bits to be ORed in */
+static long			/* re_info bits to be OR'ed in */
 analyze(
     struct nfa *nfa)
 {
diff --git a/generic/regguts.h b/generic/regguts.h
index 71d04f3..a91765e 100644
--- a/generic/regguts.h
+++ b/generic/regguts.h
@@ -285,10 +285,10 @@ struct state {
 };
 
 struct nfa {
-    struct state *pre;		/* pre-initial state */
+    struct state *pre;		/* preinitial state */
     struct state *init;		/* initial state */
     struct state *final;	/* final state */
-    struct state *post;		/* post-final state */
+    struct state *post;		/* postfinal state */
     int nstates;		/* for numbering states */
     struct state *states;	/* state-chain header */
     struct state *slast;	/* tail of the chain */
diff --git a/generic/tcl.decls b/generic/tcl.decls
index b50f775..c3d5073 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -59,7 +59,7 @@ declare 8 {
 	    const char *file, int line)
 }
 
-# Tcl_CreateFileHandler and Tcl_DeleteFileHandler are only available on unix,
+# Tcl_CreateFileHandler and Tcl_DeleteFileHandler are only available on Unix,
 # but they are part of the old generic interface, so we include them here for
 # compatibility reasons.
 
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index cc683b6..5eaa2eb 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -116,7 +116,7 @@ static struct block bigBlocks={	/* Big blocks aren't suballocated. */
 
 /*
  * The allocator is protected by a special mutex that must be explicitly
- * initialized. Futhermore, because Tcl_Alloc may be used before anything else
+ * initialized. Furthermore, because Tcl_Alloc may be used before anything else
  * in Tcl, we make this module self-initializing after all with the allocInit
  * variable.
  */
@@ -385,10 +385,10 @@ TclpAlloc(
 
 static void
 MoreCore(
-    int bucket)			/* What bucket to allocat to. */
+    int bucket)			/* Bucket to allocate to. */
 {
     union overhead *overPtr;
-    long size;		/* size of desired block */
+    long size;			/* size of desired block */
     long amount;		/* amount to allocate */
     int numBlocks;		/* how many blocks we get */
     struct block *blockPtr;
@@ -511,7 +511,7 @@ TclpFree(
 
 char *
 TclpRealloc(
-    char *oldPtr,		/* Pointer to alloced block. */
+    char *oldPtr,		/* Pointer to alloc'ed block. */
     unsigned int numBytes)	/* New size of memory. */
 {
     int i;
@@ -610,7 +610,7 @@ TclpRealloc(
     }
 
     /*
-     * Ok, we don't have to copy, it fits as-is
+     * No need to copy. It fits as-is.
      */
 
 #ifndef NDEBUG
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 63e7d75..da8870d 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -754,7 +754,7 @@ Tcl_CreateInterp(void)
     /*
      * Create the core commands. Do it here, rather than calling
      * Tcl_CreateCommand, because it's faster (there's no need to check for a
-     * pre-existing command by the same name). If a command has a Tcl_CmdProc
+     * preexisting command by the same name). If a command has a Tcl_CmdProc
      * but no Tcl_ObjCmdProc, set the Tcl_ObjCmdProc to
      * TclInvokeStringCommand. This is an object-based wrapper function that
      * extracts strings, calls the string function, and creates an object for
@@ -1806,15 +1806,15 @@ Tcl_HideCommand(
     }
 
     /*
-     * NB: This code is currently 'like' a rename to a specialy set apart name
+     * NB: This code is currently 'like' a rename to a special separate name
      * table. Changes here and in TclRenameCommand must be kept in synch until
      * the common parts are actually factorized out.
      */
 
     /*
      * Remove the hash entry for the command from the interpreter command
-     * table. This is like deleting the command, so bump its command epoch;
-     * this invalidates any cached references that point to the command.
+     * table. This is like deleting the command, so bump its command epoch
+     * to invalidate any cached references that point to the command.
      */
 
     if (cmdPtr->hPtr != NULL) {
@@ -1935,7 +1935,7 @@ Tcl_ExposeCommand(
 
     if (cmdPtr->nsPtr != iPtr->globalNsPtr) {
 	/*
-	 * This case is theoritically impossible, we might rather Tcl_Panic
+	 * This case is theoretically impossible, we might rather Tcl_Panic
 	 * than 'nicely' erroring out ?
 	 */
 
@@ -2041,7 +2041,7 @@ Tcl_ExposeCommand(
  *	In the future, when cmdName is seen as the name of a command by
  *	Tcl_Eval, proc will be called. To support the bytecode interpreter,
  *	the command is created with a wrapper Tcl_ObjCmdProc
- *	(TclInvokeStringCommand) that eventially calls proc. When the command
+ *	(TclInvokeStringCommand) that eventually calls proc. When the command
  *	is deleted from the table, deleteProc will be called. See the manual
  *	entry for details on the calling sequence.
  *
@@ -3416,7 +3416,7 @@ CallCommandTraces(
  *	The value given for the code argument.
  *
  * Side effects:
- *	Transfers a message from the cancelation message to the interpreter.
+ *	Transfers a message from the cancellation message to the interpreter.
  *
  *----------------------------------------------------------------------
  */
@@ -4711,7 +4711,7 @@ TEOV_NotFound(
 
     /*
      * Get the list of words for the unknown handler and allocate enough space
-     * to hold both the handler prefix and all words of the command invokation
+     * to hold both the handler prefix and all words of the command invocation
      * itself.
      */
 
@@ -5054,7 +5054,7 @@ TclEvalEx(
 				 * TclSubstTokens(), to properly handle
 				 * [...]-nested commands. The 'outerScript'
 				 * refers to the most-outer script containing
-				 * the embedded command, which is refered to
+				 * the embedded command, which is referred to
 				 * by 'script'. The 'clNextOuter' refers to
 				 * the current entry in the table of
 				 * continuation lines in this "main script",
@@ -5619,8 +5619,8 @@ TclArgumentEnter(
 	/*
 	 * Ignore argument words without line information (= dynamic). If they
 	 * are variables they may have location information associated with
-	 * that, either through globally recorded 'set' invokations, or
-	 * literals in bytecode. Eitehr way there is no need to record
+	 * that, either through globally recorded 'set' invocations, or
+	 * literals in bytecode. Either way there is no need to record
 	 * something here.
 	 */
 
@@ -7057,7 +7057,7 @@ int
 Tcl_SetRecursionLimit(
     Tcl_Interp *interp,		/* Interpreter whose nesting limit is to be
 				 * set. */
-    int depth)			/* New value for maximimum depth. */
+    int depth)			/* New value for maximum depth. */
 {
     Interp *iPtr = (Interp *) interp;
     int old;
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 703c35b..9836d02 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -25,7 +25,7 @@
 #define BINARY_NOCOUNT -2	/* No count was specified in format. */
 
 /*
- * The following flags may be ORed together and returned by GetFormatSpec
+ * The following flags may be OR'ed together and returned by GetFormatSpec
  */
 
 #define BINARY_SIGNED 0		/* Field to be read as signed data */
@@ -36,7 +36,7 @@
  * placed in the object cache by 'binary scan' before it bails out and
  * switches back to Plan A (creating a new object for each value.)
  * Theoretically, it would be possible to keep the cache about for the values
- * that are already in it, but that makes the code slower in practise when
+ * that are already in it, but that makes the code slower in practice when
  * overflow happens, and makes little odds the rest of the time (as measured
  * on my machine.) It is also slower (on the sample I tried at least) to grow
  * the cache to hold all items we might want to put in it; presumably the
@@ -926,7 +926,7 @@ BinaryFormatCmd(
     }
 
     /*
-     * Prepare the result object by preallocating the caclulated number of
+     * Prepare the result object by preallocating the calculated number of
      * bytes and filling with nulls.
      */
 
@@ -1674,7 +1674,7 @@ GetFormatSpec(
  *
  *	This routine determines, if bytes of a number need to be re-ordered,
  *	and returns a numeric code indicating the re-ordering to be done.
- *	This depends on the endiannes of the machine and the desired format.
+ *	This depends on the endianness of the machine and the desired format.
  *	It is in effect a table (whose contents depend on the endianness of
  *	the system) describing whether a value needs reversing or not. Anyone
  *	porting the code to a big-endian platform should take care to make
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 986798d..6e7e7e4 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -380,7 +380,7 @@ Tcl_DumpActiveMemory(
  * Tcl_DbCkalloc - debugging ckalloc
  *
  *	Allocate the requested amount of space plus some extra for guard bands
- *	at both ends of the request, plus a size, panicing if there isn't
+ *	at both ends of the request, plus a size, panicking if there isn't
  *	enough space, then write in the guard bands and return the address of
  *	the space in the middle that the user asked for.
  *
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 75e572d..eba385d 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -61,7 +61,7 @@ typedef struct SortInfo {
     int sortMode;		/* The sort mode. One of SORTMODE_* values
 				 * defined below. */
     Tcl_Obj *compareCmdPtr;	/* The Tcl comparison command when sortMode is
-				 * SORTMODE_COMMAND. Pre-initialized to hold
+				 * SORTMODE_COMMAND. Preinitialized to hold
 				 * base of command. */
     int *indexv;		/* If the -index option was specified, this
 				 * holds an encoding of the indexes contained
@@ -3332,7 +3332,7 @@ Tcl_LsearchObjCmd(
 		 * our first match might not be the first occurrence.
 		 * Consider: 0 0 0 1 1 1 2 2 2
 		 *
-		 * To maintain consistancy with standard lsearch semantics, we
+		 * To maintain consistency with standard lsearch semantics, we
 		 * must find the leftmost occurrence of the pattern in the
 		 * list. Thus we don't just stop searching here. This
 		 * variation means that a search always makes log n
@@ -4047,7 +4047,7 @@ Tcl_LsortObjCmd(
 	}
 
 	/*
-	 * Merge this element in the pre-existing sublists (and merge together
+	 * Merge this element in the preexisting sublists (and merge together
 	 * sublists when we have two of the same size).
 	 */
 
@@ -4243,7 +4243,7 @@ MergeLists(
  *	ordering between two elements.
  *
  * Results:
- *	A negative results means the the first element comes before the
+ *	A negative results means the first element comes before the
  *	second, and a positive results means that the second element should
  *	come first. A result of zero means the two elements are equal and it
  *	doesn't matter which comes first.
@@ -4445,7 +4445,7 @@ DictionaryCompare(
 
 	    /*
 	     * Convert both chars to lower for the comparison, because
-	     * dictionary sorts are case insensitve. Covert to lower, not
+	     * dictionary sorts are case-insensitive. Covert to lower, not
 	     * upper, so chars between Z and a will sort before A (where most
 	     * other interesting punctuations occur).
 	     */
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index a97f309..85c059a 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -324,7 +324,7 @@ Tcl_RegexpObjCmd(
 
 	if (match == 0) {
 	    /*
-	     * We want to set the value of the intepreter result only when
+	     * We want to set the value of the interpreter result only when
 	     * this is the first time through the loop.
 	     */
 
@@ -427,7 +427,7 @@ Tcl_RegexpObjCmd(
 	 * match. We always increment the offset by at least one to prevent
 	 * endless looping (as in the case: regexp -all {a*} a). Otherwise,
 	 * when we match the NULL string at the end of the input string, we
-	 * will loop indefinately (because the length of the match is 0, so
+	 * will loop indefinitely (because the length of the match is 0, so
 	 * offset never changes).
 	 */
 
@@ -1105,7 +1105,7 @@ Tcl_SplitObjCmd(
 
 	/*
 	 * Handle the special case of splitting on a single character. This is
-	 * only true for the one-char ASCII case, as one unicode char is > 1
+	 * only true for the one-char ASCII case, as one Unicode char is > 1
 	 * byte in length.
 	 */
 
@@ -1392,7 +1392,7 @@ StringIndexCmd(
     }
 
     /*
-     * Get the char length to calulate what 'end' means.
+     * Get the char length to calculate what 'end' means.
      */
 
     length = Tcl_GetCharLength(objv[1]);
@@ -1513,7 +1513,7 @@ StringIsCmd(
     /*
      * We get the objPtr so that we can short-cut for some classes by checking
      * the object type (int and double), but we need the string otherwise,
-     * because we don't want any conversion of type occuring (as, for example,
+     * because we don't want any conversion of type occurring (as, for example,
      * Tcl_Get*FromObj would do).
      */
 
@@ -2005,7 +2005,7 @@ StringMapCmd(
 	int *mapLens;
 
 	/*
-	 * Precompute pointers to the unicode string and length. This saves us
+	 * Precompute pointers to the Unicode string and length. This saves us
 	 * repeated function calls later, significantly speeding up the
 	 * algorithm. We only need the lowercase first char in the nocase
 	 * case.
@@ -2054,7 +2054,7 @@ StringMapCmd(
 		    ustring1 = p - 1;
 
 		    /*
-		     * Append the map value to the unicode string.
+		     * Append the map value to the Unicode string.
 		     */
 
 		    Tcl_AppendUnicodeToObj(resultPtr,
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 1486920..1f3674c 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -242,7 +242,7 @@ TclCompileAppendCmd(
  *
  * TclCompileArray*Cmd --
  *
- *	Functions called to compile "array" sucommands.
+ *	Functions called to compile "array" subcommands.
  *
  * Results:
  *	All return TCL_OK for a successful compile, and TCL_ERROR to defer
@@ -647,7 +647,7 @@ TclCompileCatchCmd(
      * catch range so that errors in the substitution are not caught.
      * [Bug 219184]
      * The reason for duplicating the script is that EVAL_STK would otherwise
-     * begin by undeflowing the stack below the mark set by BEGIN_CATCH4.
+     * begin by underflowing the stack below the mark set by BEGIN_CATCH4.
      */
 
     range = TclCreateExceptRange(CATCH_EXCEPTION_RANGE, envPtr);
@@ -998,7 +998,7 @@ TclCompileContinueCmd(
  *
  * TclCompileDict*Cmd --
  *
- *	Functions called to compile "dict" sucommands.
+ *	Functions called to compile "dict" subcommands.
  *
  * Results:
  *	All return TCL_OK for a successful compile, and TCL_ERROR to defer
@@ -1673,7 +1673,7 @@ CompileDictEachCmd(
 
     /*
      * Error handler "finally" clause, which force-terminates the iteration
-     * and rethrows the error.
+     * and re-throws the error.
      */
 
     TclAdjustStackDepth(-1, envPtr);
@@ -1845,7 +1845,7 @@ TclCompileDictUpdateCmd(
     /*
      * Termination code for non-ok returns: stash the result and return
      * options in the stack, bring up the key list, finish the update code,
-     * and finally return with the catched return data
+     * and finally return with the caught return data
      */
 
     ExceptionRangeTarget(envPtr, range, catchOffset);
@@ -1891,7 +1891,7 @@ TclCompileDictAppendCmd(
 
     /*
      * There must be at least two argument after the command. And we impose an
-     * (arbirary) safe limit; anyone exceeding it should stop worrying about
+     * (arbitrary) safe limit; anyone exceeding it should stop worrying about
      * speed quite so much. ;-)
      */
 
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 4328ace..3592663 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -415,7 +415,7 @@ TclCompileIfCmd(
 	if (TclFixupForwardJumpToHere(envPtr,
 		jumpEndFixupArray.fixup+jumpIndex, 127)) {
 	    /*
-	     * Adjust the immediately preceeding "ifFalse" jump. We moved it's
+	     * Adjust the immediately preceding "ifFalse" jump. We moved it's
 	     * target (just after this jump) down three bytes.
 	     */
 
@@ -619,8 +619,8 @@ TclCompileInfoCommandsCmd(
     Tcl_DecrRefCount(objPtr);
 
     /*
-     * Confirmed as a literal that will not frighten the horses. Compile. Note
-     * that the result needs to be list-ified.
+     * Confirmed as a literal that will not frighten the horses. Compile.
+     * The result must be made into a list.
      */
 
     /* TODO: Just push the known value */
@@ -1430,7 +1430,7 @@ TclCompileLinsertCmd(
 	 * Second when idx < TCL_INDEX_END, indicating "end-N" indexing,
 	 * we want the first half of the split to end at index end-N and
 	 * the second half to start at index end-N+1. We accomplish this
-	 * with a pre-adjustment of the end-N value.
+	 * with a preadjustment of the end-N value.
 	 * The root of this is that the commands [lrange] and [linsert]
 	 * differ in their interpretation of the "end" index.
 	 */
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 5c2a0b6..383abc2 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -2330,7 +2330,7 @@ IssueSwitchJumpTable(
      * Compile the switch by using a jump table, which is basically a
      * hashtable that maps from literal values to match against to the offset
      * (relative to the INST_JUMP_TABLE instruction) to jump to. The jump
-     * table itself is independent of any invokation of the bytecode, and as
+     * table itself is independent of any invocation of the bytecode, and as
      * such is stored in an auxData block.
      *
      * Start by allocating the jump table itself, plus some workspace.
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index ca9a21a..44baf0e 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -96,7 +96,7 @@ enum OperandTypes {
  *
  * The lexeme field is filled in with the lexeme of the operator that is
  * returned by the ParseLexeme() routine. Only lexemes for unary and binary
- * operators get stored in an OpNode. Other lexmes get different treatement.
+ * operators get stored in an OpNode. Other lexmes get different treatment.
  *
  * The precedence field provides a place to store the precedence of the
  * operator, so it need not be looked up again and again.
@@ -157,7 +157,7 @@ enum Marks {
 				 * BINARY_PLUS according to context. */
 #define MINUS		2	/* Ambiguous. Resolves to UNARY_MINUS or
 				 * BINARY_MINUS according to context. */
-#define BAREWORD	3	/* Ambigous. Resolves to BOOLEAN or to
+#define BAREWORD	3	/* Ambiguous. Resolves to BOOLEAN or to
 				 * FUNCTION or a parse error according to
 				 * context and value. */
 #define INCOMPLETE	4	/* A parse error. Used only when the single
@@ -566,7 +566,7 @@ ParseExpr(
 				 * we build the parse tree. */
     unsigned int nodesAvailable = 64; /* Initial size of the storage array. This
 				 * value establishes a minimum tree memory
-				 * cost of only about 1 kibyte, and is large
+				 * cost of only about 1 kilobyte, and is large
 				 * enough for most expressions to parse with
 				 * no need for array growth and
 				 * reallocation. */
@@ -1871,7 +1871,7 @@ Tcl_ParseExpr(
  *	Returns the number of bytes scanned to produce the lexeme.
  *
  * Side effects:
- *	Code identifying lexeme parsed is writen to *lexemePtr.
+ *	Code identifying lexeme parsed is written to *lexemePtr.
  *
  *----------------------------------------------------------------------
  */
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index bffe7f8..323ada8 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2013,7 +2013,7 @@ CompileCommandTokens(
     TclNewObj(cmdObj);
     assert (parsePtr->numWords > 0);
 
-    /* Pre-Compile */
+    /* Precompile */
 
     envPtr->numCommands++;
     EnterCmdStartData(envPtr, cmdIdx,
@@ -2381,15 +2381,15 @@ TclCompileTokens(
     int depth = TclGetStackDepth(envPtr);
 
     /*
-     * For the handling of continuation lines in literals we first check if
+     * For the handling of continuation lines in literals, first check if
      * this is actually a literal. For if not we can forego the additional
-     * processing. Otherwise we pre-allocate a small table to store the
-     * locations of all continuation lines we find in this literal, if any.
+     * processing. Otherwise preallocate a small table to store the
+     * locations of all continuation lines found in this literal, if any.
      * The table is extended if needed.
      *
      * Note: Different to the equivalent code in function 'TclSubstTokens()'
-     * (see file "tclParse.c") we do not seem to need the 'adjust' variable.
-     * We also do not seem to need code which merges continuation line
+     * (see file "tclParse.c") there seem to be no need the 'adjust' variable.
+     * There also seems to be no need for code which merges continuation line
      * information of multiple words which concat'd at runtime. Either that or
      * I have not managed to find a test case for these two possibilities yet.
      * It might be a difference between compile- versus run-time processing.
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index bf814e8..207f3af 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -434,7 +434,7 @@ typedef struct ByteCode {
 				 * active. This structure can be freed when
 				 * refCount becomes zero. */
     unsigned int flags;		/* flags describing state for the codebyte.
-				 * this variable holds ORed values from the
+				 * this variable holds OR'ed values from the
 				 * TCL_BYTECODE_ masks defined above */
     const char *source;		/* The source string from which this ByteCode
 				 * was compiled. Note that this pointer is not
diff --git a/generic/tclConfig.c b/generic/tclConfig.c
index 8ea1f4d..9756979 100644
--- a/generic/tclConfig.c
+++ b/generic/tclConfig.c
@@ -182,7 +182,7 @@ Tcl_RegisterConfig(
  *	configuration information embedded into a binary library.
  *
  * Results:
- *	A standard tcl result.
+ *	A standard Tcl result.
  *
  * Side effects:
  *	See the manual for what this command does.
diff --git a/generic/tclDate.c b/generic/tclDate.c
index 192c7b3..ebe499d 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -2426,7 +2426,7 @@ static const TABLE TimezoneTable[] = {
     { "ist",	tZONE,	  -HOUR(11/2) },    /* Indian Standard */
     { "zp6",	tZONE,	  -HOUR( 6) },	    /* USSR Zone 5 */
 #if	0
-    /* For completeness.  NST is also Newfoundland Stanard, nad SST is
+    /* For completeness.  NST is also Newfoundland Standard, and SST is
      * also Swedish Summer. */
     { "nst",	tZONE,	  -HOUR(13/2) },    /* North Sumatra */
     { "sst",	tZONE,	  -HOUR( 7) },	    /* South Sumatra, USSR Zone 6 */
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 3fe1800..f3e8d0c 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -754,7 +754,7 @@ SetDictFromAny(
  *	the chain fields of the dictionaries (for easy invalidation of string
  *	representations using InvalidateDictChain). If the flags argument has
  *	the DICT_PATH_CREATE bits set (and not the DICT_PATH_EXISTS bit),
- *	non-existant keys will be inserted with a value of an empty
+ *	non-extant keys will be inserted with a value of an empty
  *	dictionary, resulting in the path being built.
  *
  *----------------------------------------------------------------------
@@ -841,7 +841,7 @@ TclTraceDictPath(
  *
  * InvalidateDictChain --
  *
- *	Go through a dictionary chain (built by an updating invokation of
+ *	Go through a dictionary chain (built by an updating invocation of
  *	TclTraceDictPath) and invalidate the string representations of all the
  *	dictionaries on the chain.
  *
@@ -1165,7 +1165,7 @@ Tcl_DictObjNext(
     ChainEntry *cPtr;
 
     /*
-     * If the searh is done; we do no work.
+     * If the search is done; we do no work.
      */
 
     if (searchPtr->epoch == -1) {
@@ -3559,9 +3559,9 @@ TclDictWithFinish(
     if (pathc > 0) {
 	/*
 	 * Want to get to the dictionary which we will update; need to do
-	 * prepare-for-update de-sharing along the path *but* avoid generating
-	 * an error on a non-existant path (we'll treat that the same as a
-	 * non-existant variable. Luckily, the de-sharing operation isn't
+	 * prepare-for-update unsharing along the path *but* avoid generating
+	 * an error on a non-extant path (we'll treat that the same as a
+	 * non-extant variable. Luckily, the unsharing operation isn't
 	 * deeply damaging if we don't go on to update; it's just less than
 	 * perfectly efficient (but no memory should be leaked).
 	 */
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 92217f3..dea112a 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -856,7 +856,7 @@ FreeEncoding(
  *
  * Tcl_GetEncodingName --
  *
- *	Given an encoding, return the name that was used to constuct the
+ *	Given an encoding, return the name that was used to construct the
  *	encoding.
  *
  * Results:
@@ -2753,7 +2753,7 @@ TableToUtfProc(
 	}
 
 	/*
-	 * Special case for 1-byte utf chars for speed.
+	 * Special case for 1-byte Utf chars for speed.
 	 */
 
 	if (ch && ch < 0x80) {
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 3b80a21..b00aa7d 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -1872,7 +1872,7 @@ NsEnsembleImplementationCmdNR(
      *
      *   ((Q: That's not true if the -map option is used, is it?))
      *
-     * but we don't do that (the cacheing of the command object used should
+     * but we don't do that (the caching of the command object used should
      * help with that.)
      */
 
@@ -2251,7 +2251,7 @@ TclFetchEnsembleRoot(
  *
  * EnsmebleUnknownCallback --
  *
- *	Helper for the ensemble engine that handles the procesing of unknown
+ *	Helper for the ensemble engine that handles the processing of unknown
  *	callbacks. See the user documentation of the ensemble unknown handler
  *	for details; this function is only ever called when such a function is
  *	defined, and is only ever called once per ensemble dispatch (i.e. if a
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 2788c7e..e9f7d7d 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -411,7 +411,7 @@ Tcl_PutEnv(
     }
 
     /*
-     * First convert the native string to UTF. Then separate the string into
+     * First convert the native string to Utf. Then separate the string into
      * name and value parts, and call TclSetEnv to do all of the real work.
      */
 
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 8cbb55b..35136e1 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -579,7 +579,7 @@ TclGetBgErrorHandler(
  *
  *	This function is associated with the "tclBgError" assoc data for an
  *	interpreter; it is invoked when the interpreter is deleted in order to
- *	free the information assoicated with any pending error reports.
+ *	free the information associated with any pending error reports.
  *
  * Results:
  *	None.
@@ -1039,7 +1039,7 @@ TclInitSubsystems(void)
 
     if (subsystemsInitialized == 0) {
 	/*
-	 * Double check inside the mutex. There are definitly calls back into
+	 * Double check inside the mutex. There are definitely calls back into
 	 * this routine from some of the functions below.
 	 */
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index a9f4326..44ace68 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1751,7 +1751,7 @@ TclCompileObj(
 	 * Future optimizations ...
 	 * (1) Save the location data (ExtCmdLoc) keyed by start line. In that
 	 *     case we recompile once per location of the literal, but not
-	 *     continously, because the moment we have all locations we do not
+	 *     continuously, because the moment we have all locations we do not
 	 *     need to recompile any longer.
 	 *
 	 * (2) Alternative: Do not recompile, tell the execution engine the
@@ -1849,7 +1849,7 @@ TclCompileObj(
  *
  * TclIncrObj --
  *
- *	Increment an integeral value in a Tcl_Obj by an integeral value held
+ *	Increment an integral value in a Tcl_Obj by an integral value held
  *	in another Tcl_Obj. Caller is responsible for making sure we can
  *	update the first object.
  *
@@ -3818,7 +3818,7 @@ TEBCresume(
      *	   Start of INST_INCR instructions.
      *
      * WARNING: more 'goto' here than your doctor recommended! The different
-     * instructions set the value of some variables and then jump to somme
+     * instructions set the value of some variables and then jump to some
      * common execution code.
      */
 
@@ -5354,7 +5354,7 @@ TEBCresume(
 	}
 
 	if (fromIdx <= toIdx) {
-	    /* Construct the subsquence list */
+	    /* Construct the subsequence list */
 	    /* unshared optimization */
 	    if (Tcl_IsShared(valuePtr)) {
 		objResultPtr = Tcl_NewListObj(toIdx-fromIdx+1, objv+fromIdx);
@@ -5569,7 +5569,7 @@ TEBCresume(
 	TRACE(("\"%.20s\" %.20s => ", O2S(valuePtr), O2S(value2Ptr)));
 
 	/*
-	 * Get char length to calulate what 'end' means.
+	 * Get char length to calculate what 'end' means.
 	 */
 
 	length = Tcl_GetCharLength(valuePtr);
@@ -5772,7 +5772,7 @@ TEBCresume(
 	}
 
 	/*
-	 * Get the unicode representation; this is where we guarantee to lose
+	 * Get the Unicode representation; this is where we guarantee to lose
 	 * bytearrays.
 	 */
 
@@ -7654,7 +7654,7 @@ TEBCresume(
 		O2S(OBJ_UNDER_TOS), O2S(OBJ_AT_TOS), done));
 
 	/*
-	 * The INST_DICT_FIRST and INST_DICT_NEXT instructsions are always
+	 * The INST_DICT_FIRST and INST_DICT_NEXT instructions are always
 	 * followed by a conditional jump, so we can take advantage of this to
 	 * do some peephole optimization (note that we're careful to not close
 	 * out someone doing something else).
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index dbb8994..56445b6 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1226,7 +1226,7 @@ TclFileLinkCmd(
 	if (contents == NULL) {
 	    /*
 	     * We handle three common error cases specially, and for all other
-	     * errors, we use the standard posix error message.
+	     * errors, we use the standard Posix error message.
 	     */
 
 	    if (errno == EEXIST) {
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index dcd3d0e..b3294fd 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -89,7 +89,7 @@ SetResultLength(
  * Results:
  *	Returns the position in the path immediately after the root including
  *	any trailing slashes. Appends a cleaned up version of the root to the
- *	Tcl_DString at the specified offest.
+ *	Tcl_DString at the specified offset.
  *
  * Side effects:
  *	Modifies the specified Tcl_DString.
@@ -1897,7 +1897,7 @@ TclGlob(
      * To process a [glob] invocation, this function may be called multiple
      * times. Each time, the previously discovered filenames are in the
      * interpreter result. We stash that away here so the result is free for
-     * error messsages.
+     * error messages.
      */
 
     savedResultObj = Tcl_GetObjResult(interp);
diff --git a/generic/tclIO.c b/generic/tclIO.c
index b9223d9..7e83e89 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -955,7 +955,7 @@ GetChannelTable(
  *
  * Side effects:
  *	Deletes the hash table of channels. May close channels. May flush
- *	output on closed channels. Removes any channeEvent handlers that were
+ *	output on closed channels. Removes any channelEvent handlers that were
  *	registered in this interpreter.
  *
  *----------------------------------------------------------------------
@@ -988,7 +988,7 @@ DeleteChannelTable(
 	statePtr = chanPtr->state;
 
 	/*
-	 * Remove any fileevents registered in this interpreter.
+	 * Remove any file events registered in this interpreter.
 	 */
 
 	for (sPtr = statePtr->scriptRecordPtr, prevPtr = NULL;
@@ -1407,7 +1407,7 @@ Tcl_GetChannel(
 				 * channel. */
     const char *chanName,	/* The name of the channel. */
     int *modePtr)		/* Where to store the mode in which the
-				 * channel was opened? Will contain an ORed
+				 * channel was opened? Will contain an OR'ed
 				 * combination of TCL_READABLE and
 				 * TCL_WRITABLE, if non-NULL. */
 {
@@ -1490,7 +1490,7 @@ TclGetChannelFromObj(
     Tcl_Obj *objPtr,
     Tcl_Channel *channelPtr,
     int *modePtr,		/* Where to store the mode in which the
-				 * channel was opened? Will contain an ORed
+				 * channel was opened? Will contain an OR'ed
 				 * combination of TCL_READABLE and
 				 * TCL_WRITABLE, if non-NULL. */
     int flags)
@@ -1900,7 +1900,7 @@ Tcl_StackChannel(
      * impossible) we move the buffers from the common state structure into
      * the channel itself. We use the buffers in the channel below the new
      * transformation to hold the data. In the future this allows us to write
-     * transformations which pre-read data and push the unused part back when
+     * transformations which preread data and push the unused part back when
      * they are going away.
      */
 
@@ -2009,7 +2009,7 @@ ChannelFree(
  *	A standard Tcl result.
  *
  * Side effects:
- *	If TCL_ERROR is returned, the posix error code will be set with
+ *	If TCL_ERROR is returned, the Posix error code will be set with
  *	Tcl_SetErrno. May leave a message in interp result as well.
  *
  *----------------------------------------------------------------------
@@ -2032,7 +2032,7 @@ Tcl_UnstackChannel(
 
     if (chanPtr->downChanPtr != NULL) {
 	/*
-	 * Instead of manipulating the per-thread / per-interp list/hashtable
+	 * Instead of manipulating the per-thread / per-interp list/hash table
 	 * of registered channels we wind down the state of the
 	 * transformation, and then restore the state of underlying channel
 	 * into the old structure.
@@ -2525,8 +2525,8 @@ RecycleBuffer(
     }
 
     /*
-     * Only save buffers which have the requested buffersize for the channel.
-     * This is to honor dynamic changes of the buffersize made by the user.
+     * Only save buffers which have the requested buffer size for the channel.
+     * This is to honor dynamic changes of the buffe rsize made by the user.
      */
 
     if ((bufPtr->bufLength - BUFFER_PADDING) != statePtr->bufSize) {
@@ -2685,7 +2685,7 @@ FlushChannel(
     /*
      * Prevent writing on a dead channel -- a channel that has been closed but
      * not yet deallocated. This can occur if the exit handler for the channel
-     * deallocation runs before all channels are deregistered in all
+     * deallocation runs before all channels are unregistered in all
      * interpreters.
      */
 
@@ -2800,9 +2800,9 @@ FlushChannel(
 	    if (calledFromAsyncFlush) {
 		/*
 		 * TIP #219, Tcl Channel Reflection API.
-		 * When defering the error copy a message from the bypass into
+		 * When deferring the error copy a message from the bypass into
 		 * the unreported area. Or discard it if the new error is to
-		 * be ignored in favor of an earlier defered error.
+		 * be ignored in favor of an earlier deferred error.
 		 */
 
 		Tcl_Obj *msg = statePtr->chanMsg;
@@ -3152,8 +3152,8 @@ CloseChannel(
  *	The channel to cut out of the list must not be referenced in any
  *	interpreter. This is something this procedure cannot check (despite
  *	the refcount) because the caller usually wants fiddle with the channel
- *	(like transfering it to a different thread) and thus keeps the
- *	refcount artifically high to prevent its destruction.
+ *	(like transferring it to a different thread) and thus keeps the
+ *	refcount artificially high to prevent its destruction.
  *
  *----------------------------------------------------------------------
  */
@@ -3267,9 +3267,9 @@ Tcl_CutChannel(
  * NOTE:
  *	The channel to splice into the list must not be referenced in any
  *	interpreter. This is something this procedure cannot check (despite
- *	the refcount) because the caller usually wants figgle with the channel
- *	(like transfering it to a different thread) and thus keeps the
- *	refcount artifically high to prevent its destruction.
+ *	the refcount) because the caller usually wants fiddle with the channel
+ *	(like transferring it to a different thread) and thus keeps the
+ *	refcount artificially high to prevent its destruction.
  *
  *----------------------------------------------------------------------
  */
@@ -3681,7 +3681,7 @@ Tcl_CloseEx(
  *
  * NOTE:
  *	CloseWrite removes the channel as far as the user is concerned.
- *	However, the ooutput data structures may continue to exist for a while
+ *	However, the output data structures may continue to exist for a while
  *	longer if it has a background flush scheduled. The device itself is
  *	eventually closed and the channel structures modified, in
  *	CloseChannelPart, below.
@@ -4140,7 +4140,7 @@ Tcl_WriteChars(
     /*
      * Inefficient way to convert UTF-8 to byte-array, but the code
      * parallels the way it is done for objects.  Special case for 1-byte
-     * (used by eg [puts] for the \n) could be extended to more efficient
+     * (used by e.g. [puts] for the \n) could be extended to more efficient
      * translation of the src string.
      */
 
@@ -4425,7 +4425,7 @@ Write(
 
 	    /*
  	     * We just flushed.  So if we have needNlFlush set to record that
- 	     * we need to flush because theres a (translated) newline in the
+ 	     * we need to flush because there is a (translated) newline in the
  	     * buffer, that's likely not true any more.  But there is a tricky
  	     * exception.  If we have saved bytes that did not really get
  	     * flushed and those bytes came from a translation of a newline as
@@ -4670,7 +4670,7 @@ Tcl_GetsObj(
 
 		    /*
 		     * If a CR is at the end of the buffer, then check for a
-		     * LF at the begining of the next buffer, unless EOF char
+		     * LF at the beginning of the next buffer, unless EOF char
 		     * was found already.
 		     */
 
@@ -5681,7 +5681,7 @@ Tcl_ReadRaw(
 
     /*
      * Go to the driver only if we got nothing from pushback.  Have to do it
-     * this way to avoid EOF mis-timings when we consider the ability that EOF
+     * this way to avoid EOF mistimings when we consider the ability that EOF
      * may not be a permanent condition in the driver, and in that case we
      * have to synchronize.
      */
@@ -6071,7 +6071,7 @@ ReadChars(
 				 * is larger than the number of characters
 				 * available in the first buffer, only the
 				 * characters from the first buffer are
-				 * returned. The execption is when there is
+				 * returned. The exception is when there is
 				 * not any complete character in the first
 				 * buffer.  In that case, a recursive call
 				 * effectively obtains chars from the
@@ -7285,7 +7285,7 @@ Tcl_TruncateChannel(
 
     /*
      * Seek first to force a total flush of all pending buffers and ditch any
-     * pre-read input data.
+     * preread input data.
      */
 
     WillWrite(chanPtr);
@@ -7345,7 +7345,7 @@ CheckChannelErrors(
 
 	/*
 	 * TIP #219, Tcl Channel Reflection API.
-	 * Move a defered error message back into the channel bypass.
+	 * Move a deferred error message back into the channel bypass.
 	 */
 
 	if (statePtr->chanMsg != NULL) {
@@ -7670,7 +7670,7 @@ Tcl_GetChannelBufferSize(
  * Side effects:
 
  *	An error message is generated in interp's result object to indicate
- *	that a command was invoked with the a bad option. The message has the
+ *	that a command was invoked with a bad option. The message has the
  *	form:
  *		bad option "blah": should be one of
  *		<...generic options...>+<...specific options...>
@@ -11024,7 +11024,7 @@ FixLevelCode(
      * Syntax = (option value)... ?message?
      *
      * Bad message syntax causes a panic, because the other side uses
-     * Tcl_GetReturnOptions and list construction functions to marshall the
+     * Tcl_GetReturnOptions and list construction functions to marshal the
      * information. Hence an error means that we've got serious breakage.
      */
 
@@ -11093,8 +11093,8 @@ FixLevelCode(
     lvn = (Tcl_Obj **)ckalloc(lcn * sizeof(Tcl_Obj *));
 
     /*
-     * New level/code information is spliced into the first occurence of
-     * -level, -code, further occurences are ignored. The options cannot be
+     * New level/code information is spliced into the first occurrence of
+     * -level, -code, further occurrences are ignored. The options cannot be
      * not present, we would not come here. Options which are ok are simply
      * copied over.
      */
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 03bbce8..c7a3b7f 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -45,7 +45,7 @@ typedef struct ChannelBuffer {
     struct ChannelBuffer *nextPtr;
     				/* Next buffer in chain. */
     char buf[TCLFLEXARRAY];		/* Placeholder for real buffer. The real
-				 * buffer occuppies this space + bufSize-1
+				 * buffer occupies this space + bufSize-1
 				 * bytes. This must be the last field in the
 				 * structure. */
 } ChannelBuffer;
@@ -129,7 +129,7 @@ typedef struct ChannelState {
     char *channelName;		/* The name of the channel instance in Tcl
 				 * commands. Storage is owned by the generic
 				 * IO code, is dynamically allocated. */
-    int	flags;			/* ORed combination of the flags defined
+    int	flags;			/* OR'ed combination of the flags defined
 				 * below. */
     Tcl_Encoding encoding;	/* Encoding to apply when reading or writing
 				 * data on this channel. NULL means no
@@ -209,7 +209,7 @@ typedef struct ChannelState {
      * TIP #219 ... Info for the I/O system ...
      * Error message set by channel drivers, for the propagation of arbitrary
      * Tcl errors. This information, if present (chanMsg not NULL), takes
-     * precedence over a posix error code returned by a channel operation.
+     * precedence over a Posix error code returned by a channel operation.
      */
 
     Tcl_Obj* chanMsg;
@@ -222,7 +222,7 @@ typedef struct ChannelState {
 } ChannelState;
 
 /*
- * Values for the flags field in Channel. Any ORed combination of the
+ * Values for the flags field in Channel. Any OR'ed combination of the
  * following flags can be stored in the field. These flags record various
  * options and state bits about the channel. In addition to the flags below,
  * the channel can also have TCL_READABLE (1<<1) and TCL_WRITABLE (1<<2) set.
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index f11a4ab..eb4ae78 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1049,7 +1049,7 @@ Tcl_ExecObjCmd(
  *
  * Side effects:
  *	Sets interp's result to boolean true or false depending on whether the
- *	preceeding input operation on the channel would have blocked.
+ *	preceding input operation on the channel would have blocked.
  *
  *---------------------------------------------------------------------------
  */
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index bbb0838..4792ae2 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -406,7 +406,7 @@ ExecuteCallback(
 
     /*
      * Use a byte-array to prevent the misinterpretation of binary data coming
-     * through as UTF while at the tcl level.
+     * through as Utf while at the tcl level.
      */
 
     Tcl_ListObjAppendElement(NULL, command, Tcl_NewByteArrayObj(buf, bufLen));
@@ -414,7 +414,7 @@ ExecuteCallback(
     /*
      * Step 2, execute the command at the global level of the interpreter used
      * to create the transformation. Destroy the command afterward. If an
-     * error occured and the current interpreter is defined and not equal to
+     * error occurred and the current interpreter is defined and not equal to
      * the interpreter for the callback, then copy the error message into
      * current interpreter. Don't copy if in preservation mode.
      */
@@ -560,7 +560,7 @@ TransformCloseProc(
      * Now flush data waiting in internal buffers to output and input. The
      * input must be done despite the fact that there is no real receiver for
      * it anymore. But the scripts might have sideeffects other parts of the
-     * system rely on (f.e. signaling the close to interested parties).
+     * system rely on (f.e. signalling the close to interested parties).
      */
 
     PreserveData(dataPtr);
@@ -1097,7 +1097,7 @@ TransformWatchProc(
     Tcl_Channel downChan;
 
     /*
-     * The caller expressed interest in events occuring for this channel. We
+     * The caller expressed interest in events occurring for this channel. We
      * are forwarding the call to the underlying channel now.
      */
 
@@ -1204,12 +1204,12 @@ static int
 TransformNotifyProc(
     ClientData clientData,	/* The state of the notified
 				 * transformation. */
-    int mask)			/* The mask of occuring events. */
+    int mask)			/* The mask of occurring events. */
 {
     TransformChannelData *dataPtr = (TransformChannelData *)clientData;
 
     /*
-     * An event occured in the underlying channel. This transformation doesn't
+     * An event occurred in the underlying channel. This transformation doesn't
      * process such events thus returns the incoming mask unchanged.
      */
 
@@ -1299,7 +1299,7 @@ ResultClear(
  * ResultInit --
  *
  *	Initializes the specified buffer structure. The structure will contain
- *	valid information for an emtpy buffer.
+ *	valid information for an empty buffer.
  *
  * Side effects:
  *	See above.
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index c43cde8..3eca3f8 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -10,7 +10,7 @@
  *
  *	See TIP #219 for the specification of this functionality.
  *
- * Copyright (c) 2004-2005 ActiveState, a divison of Sophos
+ * Copyright (c) 2004-2005 ActiveState, a division of Sophos
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -120,7 +120,7 @@ typedef struct {
      * data in buffers is flushed out through the generation of fake file
      * events.
      *
-     * See 'rechan', 'memchan', etc.
+     * See 'refchan', 'memchan', etc.
      *
      * Here this is _not_ required. Interest in events is posted to the Tcl
      * level via 'watch'. And posting of events is possible from the Tcl level
@@ -131,7 +131,7 @@ typedef struct {
 } ReflectedChannel;
 
 /*
- * Structure of the table maping from channel handles to reflected
+ * Structure of the table mapping from channel handles to reflected
  * channels. Each interpreter which has the handler command for one or more
  * reflected channels records them in such a table, so that 'chan postevent'
  * is able to find them even if the actual channel was moved to a different
@@ -870,8 +870,8 @@ TclChanPostEventObjCmd(
      * handles of reflected channels, and only of such whose handler is
      * defined in this interpreter.
      *
-     * We keep the old checks for both, for paranioa, but abort now instead of
-     * throwing errors, as failure now means that our internal datastructures
+     * We keep the old checks for both, for paranoia, but abort now instead of
+     * throwing errors, as failure now means that our internal data structures
      * have gone seriously haywire.
      */
 
@@ -1017,7 +1017,7 @@ UnmarshallErrorResult(
      * Syntax = (option value)... ?message?
      *
      * Bad syntax causes a panic. This is OK because the other side uses
-     * Tcl_GetReturnOptions and list construction functions to marshall the
+     * Tcl_GetReturnOptions and list construction functions to marshal the
      * information; if we panic here, something has gone badly wrong already.
      */
 
@@ -1108,7 +1108,7 @@ TclChanCaughtErrorBypass(
  *	driver specific instance data.
  *
  * Results:
- *	A posix error.
+ *	A Posix error.
  *
  * Side effects:
  *	Releases memory. Arbitrary, as it calls upon a script.
@@ -1682,7 +1682,7 @@ ReflectWatch(
  *	is required of it.
  *
  * Results:
- *	A posix error number.
+ *	A Posix error number.
  *
  * Side effects:
  *	Allocates memory. Arbitrary, as it calls upon a script.
@@ -2179,7 +2179,7 @@ NewReflectedChannel(
  *	refcount of the returned object is -- zero --.
  *
  * Side effects:
- *	May allocate memory. Mutex protected critical section locks out other
+ *	May allocate memory. Mutex-protected critical section locks out other
  *	threads for a short time.
  *
  *----------------------------------------------------------------------
@@ -2233,7 +2233,7 @@ FreeReflectedChannel(
  * InvokeTclMethod --
  *
  *	This function is used to invoke the Tcl level of a reflected channel.
- *	It handles all the command assembly, invokation, and generic state and
+ *	It handles all the command assembly, invocation, and generic state and
  *	result mgmt. It does *not* handle thread redirection; that is the
  *	responsibility of clients of this function.
  *
@@ -2261,8 +2261,8 @@ InvokeTclMethod(
 {
     Tcl_Obj *methObj = NULL;	/* Method name in object form */
     Tcl_InterpState sr;		/* State of handler interp */
-    int result;			/* Result code of method invokation */
-    Tcl_Obj *resObj = NULL;	/* Result of method invokation. */
+    int result;			/* Result code of method invocation */
+    Tcl_Obj *resObj = NULL;	/* Result of method invocation. */
     Tcl_Obj *cmd;
 
     if (rcPtr->dead) {
@@ -2482,7 +2482,7 @@ GetReflectedChannelMap(
  *
  * Side effects:
  *	Deletes the hash table of channels. May close channels. May flush
- *	output on closed channels. Removes any channeEvent handlers that were
+ *	output on closed channels. Removes any channelEvent handlers that were
  *	registered in this interpreter.
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c
index 26b6d99..730820e 100644
--- a/generic/tclIORTrans.c
+++ b/generic/tclIORTrans.c
@@ -639,7 +639,7 @@ TclChanPushObjCmd(
     /*
      * Mode tell us what the parent channel supports. The methods tell us what
      * the handler supports. We remove the non-supported bits from the mode
-     * and check that the channel is not completely inacessible. Afterward the
+     * and check that the channel is not completely inaccessible. Afterward the
      * mode tells us which methods are still required, and these methods will
      * also be supported by the handler, by design of the check.
      */
@@ -872,7 +872,7 @@ UnmarshallErrorResult(
  *	driver specific instance data.
  *
  * Results:
- *	A posix error.
+ *	A Posix error.
  *
  * Side effects:
  *	Releases memory. Arbitrary, as it calls upon a script.
@@ -986,7 +986,7 @@ ReflectClose(
 #endif /* TCL_THREADS */
 
     /*
-     * Do the actual invokation of "finalize" now; we're in the right thread.
+     * Do the actual invocation of "finalize" now; we're in the right thread.
      */
 
     result = InvokeTclMethod(rtPtr, "finalize", NULL, NULL, &resObj);
@@ -1497,7 +1497,7 @@ ReflectWatch(
  *	is required of it.
  *
  * Results:
- *	A posix error number.
+ *	A Posix error number.
  *
  * Side effects:
  *	Allocates memory. Arbitrary, as it calls upon a script.
@@ -1584,7 +1584,7 @@ static int
 ReflectGetOption(
     ClientData clientData,	/* Channel to query */
     Tcl_Interp *interp,		/* Interpreter to leave error messages in */
-    const char *optionName,	/* Name of reuqested option */
+    const char *optionName,	/* Name of requested option */
     Tcl_DString *dsPtr)		/* String to place the result into */
 {
     ReflectedTransform *rtPtr = (ReflectedTransform *)clientData;
@@ -1639,7 +1639,7 @@ ReflectHandle(
 
     /*
      * Transformations have no handle of their own. As such we simply query
-     * the parent channel for it. This way the qery will ripple down through
+     * the parent channel for it. This way the query will ripple down through
      * all transformations until reaches the base channel. Which then returns
      * its handle, or fails. The former will then ripple up the stack.
      *
@@ -1673,7 +1673,7 @@ ReflectNotify(
     ReflectedTransform *rtPtr = (ReflectedTransform *)clientData;
 
     /*
-     * An event occured in the underlying channel.
+     * An event occurred in the underlying channel.
      *
      * We delete our timer. It was not fired, yet we are here, so the channel
      * below generated such an event and we don't have to. The renewal of the
@@ -1937,7 +1937,7 @@ FreeReflectedTransform(
  * InvokeTclMethod --
  *
  *	This function is used to invoke the Tcl level of a reflected channel.
- *	It handles all the command assembly, invokation, and generic state and
+ *	It handles all the command assembly, invocation, and generic state and
  *	result mgmt. It does *not* handle thread redirection; that is the
  *	responsibility of clients of this function.
  *
@@ -1969,8 +1969,8 @@ InvokeTclMethod(
     int cmdc;			/* #words in constructed command */
     Tcl_Obj *methObj = NULL;	/* Method name in object form */
     Tcl_InterpState sr;		/* State of handler interp */
-    int result;			/* Result code of method invokation */
-    Tcl_Obj *resObj = NULL;	/* Result of method invokation. */
+    int result;			/* Result code of method invocation */
+    Tcl_Obj *resObj = NULL;	/* Result of method invocation. */
 
     if (rtPtr->dead) {
 	/*
@@ -1994,7 +1994,7 @@ InvokeTclMethod(
      */
 
     /*
-     * Insert method into the pre-allocated area, after the command prefix,
+     * Insert method into the preallocated area, after the command prefix,
      * before the channel id.
      */
 
@@ -2021,7 +2021,7 @@ InvokeTclMethod(
     }
 
     /*
-     * And run the handler... This is done in auch a manner which leaves any
+     * And run the handler... This is done in a manner which leaves any
      * existing state intact.
      */
 
@@ -2923,7 +2923,7 @@ TimerRun(
  * ResultInit --
  *
  *	Initializes the specified buffer structure. The structure will contain
- *	valid information for an emtpy buffer.
+ *	valid information for an empty buffer.
  *
  * Side effects:
  *	See above.
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 8d5a6db..ca11172 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -312,7 +312,7 @@ Tcl_Stat(
 #endif /* !TCL_WIDE_INT_IS_LONG */
 
 	/*
-	 * Copy across all supported fields, with possible type coercions on
+	 * Copy across all supported fields, with possible type coercion on
 	 * those fields that change between the normal and lf64 versions of
 	 * the stat structure (on Solaris at least). This is slow when the
 	 * structure sizes coincide, but that's what you get for using an
@@ -485,7 +485,7 @@ TclFSCwdIsNative(void)
  *	given.
  *
  * Results:
- *	1 (equal) or 0 (un-equal) as appropriate.
+ *	1 (equal) or 0 (unequal) as appropriate.
  *
  * Side effects:
  *	If the paths are equal, but are not the same object, this method will
@@ -1380,7 +1380,7 @@ Tcl_FSData(
  * Special notes:
  *	If the filesystem-specific normalizePathProcs can re-introduce ../, ./
  *	sequences into the path, then this function will not return the
- *	correct result. This may be possible with symbolic links on unix.
+ *	correct result. This may be possible with symbolic links on Unix.
  *
  *	Important assumption: if startAt is non-zero, it must point to a
  *	directory separator that we know exists and is already normalized (so
@@ -1401,7 +1401,7 @@ TclFSNormalizeToUniquePath(
      * Call each of the "normalise path" functions in succession. This is a
      * special case, in which if we have a native filesystem handler, we call
      * it first. This is because the root of Tcl's filesystem is always a
-     * native filesystem (i.e. '/' on unix is native).
+     * native filesystem (i.e. '/' on Unix is native).
      */
 
     firstFsRecPtr = FsGetFirstFilesystem();
@@ -2105,7 +2105,7 @@ Tcl_PosixError(
  *
  * Tcl_FSStat --
  *
- *	This function replaces the library version of stat and lsat.
+ *	This function replaces the library version of stat and lstat.
  *
  *	The appropriate function for the filesystem to which pathPtr belongs
  *	will be called.
@@ -2770,7 +2770,7 @@ Tcl_FSGetCwd(
 	 * If we do call a cwd, we must watch for errors (if the cwd returns
 	 * NULL). This ensures that, say, on Unix if the permissions of the
 	 * cwd change, 'pwd' does actually throw the correct error in Tcl.
-	 * (This is tested for in the test suite on unix).
+	 * (This is tested for in the test suite on Unix).
 	 */
 
 	if (fsPtr == NULL || fsPtr->getCwdProc == NULL) {
@@ -3968,7 +3968,7 @@ FsListMounts(
  *	an element.
  *
  * Results:
- *	Returns list object with refCount of zero. If the passed in lenPtr is
+ *	Returns list object with refCount of zero. If the passed-in lenPtr is
  *	non-NULL, we use it to return the number of elements in the returned
  *	list.
  *
@@ -4172,7 +4172,7 @@ TclFSNonnativePathType(
 	 * We want to skip the native filesystem in this loop because
 	 * otherwise we won't necessarily pass all the Tcl testsuite - this is
 	 * because some of the tests artificially change the current platform
-	 * (between win, unix) but the list of volumes we get by calling
+	 * (between Win, Unix) but the list of volumes we get by calling
 	 * fsRecPtr->fsPtr->listVolumesProc will reflect the current (real)
 	 * platform only and this may cause some tests to fail. In particular,
 	 * on Unix '/' will match the beginning of certain absolute Windows
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index b17b224..89b19fd 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -181,7 +181,7 @@ GetIndexFromObjList(
 
     /*
      * Use Tcl_GetIndexFromObjStruct to do the work to avoid duplicating most
-     * of the code there. This is a bit ineffiecient but simpler.
+     * of the code there. This is a bit inefficient but simpler.
      */
 
     result = TclListObjGetElements(interp, tableObjPtr, &objc, &objv);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 0a48039..6ff5527 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -195,7 +195,7 @@ typedef struct Tcl_Ensemble Tcl_Ensemble;
 typedef struct NamespacePathEntry NamespacePathEntry;
 
 /*
- * Special hashtable for variables: this is just a Tcl_HashTable with an nsPtr
+ * Special hash table for variables: this is just a Tcl_HashTable with an nsPtr
  * field added at the end: in this way variables can find their namespace
  * without having to copy a pointer in their struct: they can access it via
  * their hPtr->tablePtr.
@@ -285,7 +285,7 @@ typedef struct Namespace {
 				 * registered. */
     int numExportPatterns;	/* Number of export patterns currently
 				 * registered using "namespace export". */
-    int maxExportPatterns;	/* Mumber of export patterns for which space
+    int maxExportPatterns;	/* Number of export patterns for which space
 				 * is currently allocated. */
     int cmdRefEpoch;		/* Incremented if a newly added command
 				 * shadows a command for which this namespace
@@ -446,7 +446,7 @@ typedef struct EnsembleConfig {
 				 * all lists, and cannot be found by scanning
 				 * the list from the namespace's ensemble
 				 * field. */
-    int flags;			/* ORed combo of TCL_ENSEMBLE_PREFIX,
+    int flags;			/* OR'ed combo of TCL_ENSEMBLE_PREFIX,
 				 * ENSEMBLE_DEAD and ENSEMBLE_COMPILE. */
 
     /* OBJECT FIELDS FOR ENSEMBLE CONFIGURATION */
@@ -473,7 +473,7 @@ typedef struct EnsembleConfig {
 				 * results passed directly back to the caller
 				 * (including the error code) unless the code
 				 * is TCL_CONTINUE in which case the
-				 * subcommand will be reparsed by the ensemble
+				 * subcommand will be re-parsed by the ensemble
 				 * core, presumably because the ensemble
 				 * itself has been updated. */
     Tcl_Obj *parameterList;	/* List of ensemble parameter names. */
@@ -617,7 +617,7 @@ typedef struct VarInHash {
     Tcl_HashEntry entry;	/* The hash table entry that refers to this
 				 * variable. This is used to find the name of
 				 * the variable and to delete it from its
-				 * hashtable if it is no longer needed. It
+				 * hash table if it is no longer needed. It
 				 * also holds the variable's name. */
 } VarInHash;
 
@@ -628,7 +628,7 @@ typedef struct VarInHash {
  *
  * VAR_ARRAY -			1 means this is an array variable rather than
  *				a scalar variable or link. The "tablePtr"
- *				field points to the array's hashtable for its
+ *				field points to the array's hash table for its
  *				elements.
  * VAR_LINK -			1 means this Var structure contains a pointer
  *				to another Var structure that either has the
@@ -641,12 +641,12 @@ typedef struct VarInHash {
  * Flags that indicate the type and status of storage; none is set for
  * compiled local variables (Var structs).
  *
- * VAR_IN_HASHTABLE -		1 means this variable is in a hashtable and
- *				the Var structure is malloced. 0 if it is a
+ * VAR_IN_HASHTABLE -		1 means this variable is in a hash table and
+ *				the Var structure is malloc'ed. 0 if it is a
  *				local variable that was assigned a slot in a
  *				procedure frame by the compiler so the Var
  *				storage is part of the call frame.
- * VAR_DEAD_HASH		1 means that this var's entry in the hashtable
+ * VAR_DEAD_HASH		1 means that this var's entry in the hash table
  *				has already been deleted.
  * VAR_ARRAY_ELEMENT -		1 means that this variable is an array
  *				element, so it is not legal for it to be an
@@ -1237,7 +1237,7 @@ typedef struct CFWordBC {
     struct CFWordBC *prevPtr;	/* Previous entry in stack for same Tcl_Obj. */
     struct CFWordBC *nextPtr;	/* Next entry for same command call. See
 				 * CmdFrame litarg field for the list start. */
-    Tcl_Obj *obj;		/* Back reference to hashtable key */
+    Tcl_Obj *obj;		/* Back reference to hash table key */
 } CFWordBC;
 
 /*
@@ -1251,7 +1251,7 @@ typedef struct CFWordBC {
  *
  * These structures are allocated and filled by both the function
  * TclSubstTokens() in the file "tclParse.c" and its caller TclEvalEx() in the
- * file "tclBasic.c", and stored in the thread-global hashtable "lineCLPtr" in
+ * file "tclBasic.c", and stored in the thread-global hash table "lineCLPtr" in
  * file "tclObj.c". They are used by the functions TclSetByteCodeFromAny() and
  * TclCompileScript(), both found in the file "tclCompile.c". Their memory is
  * released by the function TclFreeObj(), in the file "tclObj.c", and also by
@@ -1629,7 +1629,7 @@ typedef struct Command {
 				 * recreated). */
     Namespace *nsPtr;		/* Points to the namespace containing this
 				 * command. */
-    int refCount;		/* 1 if in command hashtable plus 1 for each
+    int refCount;		/* 1 if in command hash table plus 1 for each
 				 * reference from a CmdName Tcl object
 				 * representing a command's name in a ByteCode
 				 * instruction sequence. This structure can be
@@ -4989,7 +4989,7 @@ MODULE_SCOPE size_t TclEnvEpoch; /* Epoch of the tcl environment
                                          * (if changed with tcl-env). */
 
 #endif /* _TCLINT */
-
+
 /*
  * Local Variables:
  * mode: c
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 7034fc3..5bd4828 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -575,7 +575,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 
 #undef TclpCreateTempFile_
 #undef TclUnixWaitForFile_
-#ifndef MAC_OSX_TCL /* not accessable on Win32/UNIX */
+#ifndef MAC_OSX_TCL /* not accessible on Win32/UNIX */
 #undef TclMacOSXGetFileAttribute /* 15 */
 #undef TclMacOSXSetFileAttribute /* 16 */
 #undef TclMacOSXCopyFileAttributes /* 17 */
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 62feaf1..0a57b70 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -197,7 +197,7 @@ struct LimitHandler {
 /*
  * Values for the LimitHandler flags field.
  *      LIMIT_HANDLER_ACTIVE - Whether the handler is currently being
- *              processed; handlers are never to be entered reentrantly.
+ *              processed; handlers are never to be reentered.
  *      LIMIT_HANDLER_DELETED - Whether the handler has been deleted. This
  *              should not normally be observed because when a handler is
  *              deleted it is also spliced out of the list of handlers, but
@@ -3221,7 +3221,7 @@ Tcl_MakeSafe(
     Tcl_UnsetVar2(interp, "tcl_platform", "user", TCL_GLOBAL_ONLY);
 
     /*
-     * Unset path informations variables (the only one remaining is [info
+     * Unset path information variables (the only one remaining is [info
      * nameofexecutable])
      */
 
@@ -4188,7 +4188,7 @@ CallScriptLimitCallback(
  *	None.
  *
  * Side effects:
- *	A limit callback implemented as an invokation of a Tcl script in
+ *	A limit callback implemented as an invocation of a Tcl script in
  *	another interpreter is either installed or removed.
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 4850d02..b845032 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -376,7 +376,7 @@ LinkTraceProc(
     /*
      * For writes, first make sure that the variable is writable. Then convert
      * the Tcl value to C if possible. If the variable isn't writable or can't
-     * be converted, then restore the varaible's old value and return an
+     * be converted, then restore the variable's old value and return an
      * error. Another tricky thing: we have to save and restore the interp's
      * result, since the variable access could occur when the result has been
      * partially set.
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 964f596..f0bd53e 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -539,7 +539,7 @@ Tcl_ListObjAppendList(
  *
  *	If 'listPtr' is not already of type 'tclListType', it is converted.
  *	The 'refCount' of 'objPtr' is incremented as it is added to 'listPtr'.
- *	Appending the new element may cause the the array of element pointers
+ *	Appending the new element may cause the array of element pointers
  *	in 'listObj' to grow.  Any preexisting string representation of
  *	'listPtr' is invalidated.
  *
@@ -707,7 +707,7 @@ Tcl_ListObjAppendElement(
  *
  * 	TCL_ERROR
  *
- * 	    'listPtr' is not a valid list. An an error message is left in the
+ * 	    'listPtr' is not a valid list. An error message is left in the
  * 	    interpreter's result if 'interp' is not NULL.
  *
  *  Effect
@@ -873,7 +873,7 @@ Tcl_ListObjReplace(
      * Note that when count == 0 and objc == 0, this routine is logically a
      * no-op, removing and adding no elements to the list. However, by flowing
      * through this routine anyway, we get the important side effect that the
-     * resulting listPtr is a list in canoncial form. This is important.
+     * resulting listPtr is a list in canonical form. This is important.
      * Resist any temptation to optimize this case.
      */
 
@@ -1312,7 +1312,7 @@ TclLsetList(
     TclListObjGetElements(NULL, indexArgPtr, &indexCount, &indices);
 
     /*
-     * Let TclLsetFlat handle the actual lset'ting.
+     * Let TclLsetFlat perform the actual lset operation.
      */
 
     retValuePtr = TclLsetFlat(interp, listPtr, indexCount, indices, valuePtr);
@@ -1925,7 +1925,7 @@ SetListFromAny(
  *
  *	Update the string representation for a list object.
  *
- *	Any previously-exising string representation is not invalidated, so
+ *	Any previously-existing string representation is not invalidated, so
  *	storage is lost if this has not been taken care of.
  *
  * Effect
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 5dab6d1..0c1c2fa 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -390,7 +390,7 @@ TclRegisterLiteral(
     int flags)			/* If LITERAL_ON_HEAP then the caller already
 				 * malloc'd bytes and ownership is passed to
 				 * this function. If LITERAL_CMD_NAME then
-				 * the literal should not be shared accross
+				 * the literal should not be shared across
 				 * namespaces. */
 {
     CompileEnv *envPtr = ePtr;
@@ -433,7 +433,7 @@ TclRegisterLiteral(
 
     /*
      * The literal is new to this CompileEnv. If it is a command name, avoid
-     * sharing it accross namespaces, and try not to share it with non-cmd
+     * sharing it across namespaces, and try not to share it with non-cmd
      * literals. Note that FQ command names can be shared, so that we register
      * the namespace as the interp's global NS.
      */
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 08a0bcc..dbacead 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -1015,7 +1015,7 @@ Tcl_StaticPackage(
  * TclGetLoadedPackages --
  *
  *	This function returns information about all of the files that are
- *	loaded (either in a particular intepreter, or for all interpreters).
+ *	loaded (either in a particular interpreter, or for all interpreters).
  *
  * Results:
  *	The return value is a standard Tcl completion code. If successful, a
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 7290bd1..290dcea 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -4164,7 +4164,7 @@ UnlinkNsPath(
  * Side effects:
  *	Increments the command reference epoch in each namespace whose path
  *	includes the given namespace. This causes any cached resolved names
- *	whose root cacheing context starts at that namespace to be recomputed
+ *	whose root caching context starts at that namespace to be recomputed
  *	the next time they are used.
  *
  *----------------------------------------------------------------------
@@ -4237,7 +4237,7 @@ NamespaceQualifiersCmd(
 	if ((*p == ':') && (p > name) && (*(p-1) == ':')) {
 	    p -= 2;			/* Back up over the :: */
 	    while ((p >= name) && (*p == ':')) {
-		p--;			/* Back up over the preceeding : */
+		p--;			/* Back up over the preceding : */
 	    }
 	    break;
 	}
@@ -4516,7 +4516,7 @@ NamespaceTailCmd(
  *
  * Side effects:
  *	Creates new variables in the current scope, linked to the
- *	corresponding variables in the stipulated nmamespace. If anything goes
+ *	corresponding variables in the stipulated namespace. If anything goes
  *	wrong, the result is an error message.
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index e76bca8..3dbc58b 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -987,12 +987,12 @@ Tcl_DoOneEvent(
 	}
 
 	/*
-	 * If Tcl_WaitForEvent has returned 1, indicating that one system
-	 * event has been dispatched (and thus that some Tcl code might have
-	 * been indirectly executed), we break out of the loop. We do this to
-	 * give VwaitCmd for instance a chance to check if that system event
-	 * had the side effect of changing the variable (so the vwait can
-	 * return and unwind properly).
+	 * If Tcl_WaitForEvent has returned 1, indicating that one system event
+	 * has been dispatched (and thus that some Tcl code might have been
+	 * indirectly executed), we break out of the loop in order, e.g.  to
+	 * give vwait a chance to determine whether that system event had the
+	 * side effect of changing the variable (so the vwait can return and
+	 * unwind properly).
 	 *
 	 * NB: We will process idle events if any first, because otherwise we
 	 *     might never do the idle events if the notifier always gets
diff --git a/generic/tclOO.c b/generic/tclOO.c
index b28efd8..c8937ef 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -1105,7 +1105,7 @@ ObjectNamespaceDeleted(
 
     /*
      * One rule for the teardown routines is that if an object is in the
-     * process of being deleted, nothing else may modify its bookeeping
+     * process of being deleted, nothing else may modify its bookkeeping
      * records.  This is the flag that
      */
     oPtr->flags |= OBJECT_DESTRUCTING;
@@ -1157,7 +1157,7 @@ ObjectNamespaceDeleted(
     if (((Command *) oPtr->command)->flags && CMD_IS_DELETED) {
 	/*
 	 * Something has already started the command deletion process. We can
-	 * go ahead and clean up the the namespace,
+	 * go ahead and clean up the namespace,
 	 */
     } else {
 	/*
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 68a7173..7ebde5e 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -1299,7 +1299,7 @@ TclOOGetStereotypeCallChain(
     /*
      * Check to see if the method has no implementation. If so, we probably
      * need to add in a call to the unknown method. Otherwise, set up the
-     * cacheing of the method implementation (if relevant).
+     * caching of the method implementation (if relevant).
      */
 
     if (count == callPtr->numChain) {
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index c65003f..edaa593 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -18,7 +18,7 @@
 
 /*
  * Structure used to help delay computing names of objects or classes for
- * [info frame] until needed, making invokation faster in the normal case.
+ * [info frame] until needed, making invocation faster in the normal case.
  */
 
 struct PNI {
diff --git a/generic/tclObj.c b/generic/tclObj.c
index fde12f6..4abfa49 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -80,7 +80,7 @@ typedef struct ThreadSpecificData {
     Tcl_HashTable *lineCLPtr;   /* This table remembers for each Tcl_Obj
                                  * generated by a call to the function
                                  * TclSubstTokens() from a literal text
-                                 * where bs+nl sequences occured in it, if
+                                 * where bs+nl sequences occurred in it, if
                                  * any. I.e. this table keeps track of
                                  * invisible and stripped continuation lines.
                                  * Its keys are Tcl_Obj pointers, the values
@@ -111,14 +111,14 @@ static ThreadSpecificData *TclGetContLineTable(void);
  */
 
 typedef struct PendingObjData {
-    int deletionCount;		/* Count of the number of invokations of
+    int deletionCount;		/* Count of the number of invocations of
 				 * TclFreeObj() are on the stack (at least
 				 * conceptually; many are actually expanded
 				 * macros). */
     Tcl_Obj *deletionStack;	/* Stack of objects that have had TclFreeObj()
 				 * invoked upon them but which can't be
 				 * deleted yet because they are in a nested
-				 * invokation of TclFreeObj(). By postponing
+				 * invocation of TclFreeObj(). By postponing
 				 * this way, we limit the maximum overall C
 				 * stack depth when deleting a complex object.
 				 * The down-side is that we alter the overall
@@ -588,7 +588,7 @@ TclContinuationsEnter(
 	 * the switch command is identical, mapping them all to the same
 	 * literal. An interesting result of this is that the number and
 	 * locations (offset) of invisible continuation lines in the literal
-	 * are the same for all occurences.
+	 * are the same for all occurrences.
 	 *
 	 * Note that while reusing the existing entry is possible it requires
 	 * the same actions as for a new entry because we have to copy the
@@ -1395,7 +1395,7 @@ TclFreeObj(
      * We have to access it using the low-level call and then check for
      * validity. This function can be called after TclFinalizeThreadData() has
      * already killed the thread-global data structures. Performing
-     * TCL_TSD_INIT will leave us with an un-initialized memory block upon
+     * TCL_TSD_INIT will leave us with an uninitialized memory block upon
      * which we crash (if we where to access the uninitialized hashtable).
      */
 
@@ -1486,7 +1486,7 @@ TclFreeObj(
      * We have to access it using the low-level call and then check for
      * validity. This function can be called after TclFinalizeThreadData() has
      * already killed the thread-global data structures. Performing
-     * TCL_TSD_INIT will leave us with an un-initialized memory block upon
+     * TCL_TSD_INIT will leave us with an uninitialized memory block upon
      * which we crash (if we where to access the uninitialized hashtable).
      */
 
@@ -3485,7 +3485,7 @@ Tcl_GetBignumFromObj(
  *
  * Side effects:
  *	A copy of bignum is stored in *bignumValue, which is expected to be
- *	uninitialized or cleared. If conversion fails, an the 'interp'
+ *	uninitialized or cleared. If conversion fails and the 'interp'
  *	argument is not NULL, an error message is stored in the interpreter
  *	result.
  *
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index b03ad41..16b3ece 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -144,7 +144,7 @@ Tcl_PanicVA(
 /* ARGSUSED */
 
 /*
- * The following comment is here so that Coverity's static analizer knows that
+ * The following comment is here so that Coverity's static analyzer knows that
  * a Tcl_Panic() call can never return and avoids lots of false positives.
  */
 
diff --git a/generic/tclParse.c b/generic/tclParse.c
index 5bbaf93..0b9ecdd 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -832,7 +832,7 @@ ParseHex(
 
 int
 TclParseBackslash(
-    const char *src,		/* Points to the backslash character of a a
+    const char *src,		/* Points to the backslash character of a
 				 * backslash sequence. */
     int numBytes,		/* Max number of bytes to scan. */
     int *readPtr,		/* NULL, or points to storage where the number
@@ -2201,9 +2201,9 @@ TclSubstTokens(
      */
 
     /*
-     * For the handling of continuation lines in literals we first check if
-     * this is actually a literal. For if not we can forego the additional
-     * processing. Otherwise we pre-allocate a small table to store the
+     * For the handling of continuation lines in literals, first check if
+     * this is actually a literal. If not then forego the additional
+     * processing. Otherwise preallocate a small table to store the
      * locations of all continuation lines we find in this literal, if any.
      * The table is extended if needed.
      */
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 372a30d..f5571e2 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -848,7 +848,7 @@ TclJoinPath(
     int elements,		/* Number of elements to use (-1 = all) */
     Tcl_Obj * const objv[],	/* Path elements to join */
     int forceRelative)		/* If non-zero, assume all more paths are
-				 * relative (e. g. simple normalization) */
+				 * relative (e.g. simple normalization) */
 {
     Tcl_Obj *res = NULL;
     int i;
@@ -903,7 +903,7 @@ TclJoinPath(
 		}
 
 		/*
-		 * If it doesn't begin with '.' and is a unix path or it a
+		 * If it doesn't begin with '.' and is a Unix path or it a
 		 * windows path without backslashes, then we can be very
 		 * efficient here. (In fact even a windows path with
 		 * backslashes can be joined efficiently, but the path object
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 9bb8997..31e1143 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -60,7 +60,7 @@ static TclFile		FileForRedirect(Tcl_Interp *interp, const char *spec,
 
 static TclFile
 FileForRedirect(
-    Tcl_Interp *interp,		/* Intepreter to use for error reporting. */
+    Tcl_Interp *interp,		/* Interpreter to use for error reporting. */
     const char *spec,		/* Points to character just after redirection
 				 * character. */
     int atOK,			/* Non-zero means that '@' notation can be
@@ -452,7 +452,7 @@ TclCreatePipeline(
     TclFile *outPipePtr,	/* If non-NULL, output to the pipeline goes to
 				 * a pipe, unless overridden by redirection in
 				 * the command. The file id with which to read
-				 * frome this pipe is stored at *outPipePtr.
+				 * from this pipe is stored at *outPipePtr.
 				 * NULL means command specified its own output
 				 * sink. */
     TclFile *errFilePtr)	/* If non-NULL, all stderr output from the
@@ -526,7 +526,7 @@ TclCreatePipeline(
      * and remove them from the argument list in the pipeline. Count the
      * number of distinct processes (it's the number of "|" arguments plus
      * one) but don't remove the "|" arguments because they'll be used in the
-     * second pass to seperate the individual child processes. Cannot start
+     * second pass to separate the individual child processes. Cannot start
      * the child processes in this pass because the redirection symbols may
      * appear anywhere in the command line - e.g., the '<' that specifies the
      * input to the entire pipe may appear at the very end of the argument
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 35ec1a3..ec932f1 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -1541,7 +1541,7 @@ CompareVersions(
 				 * of version numbers). */
     int *isMajorPtr)		/* If non-null, the word pointed to is filled
 				 * in with a 0/1 value. 1 means that the
-				 * difference occured in the first element. */
+				 * difference occurred in the first element. */
 {
     int thisIsMajor, res, flip;
     char *s1, *e1, *s2, *e2, o1, o2;
@@ -1994,7 +1994,7 @@ RequirementSatisfied(
 
     /*
      * We have both min and max, and generate their internal reps. When
-     * identical we compare as is, otherwise we pad with 'a0' to ove the range
+     * identical we compare as is, otherwise we pad with 'a0' to over the range
      * a bit.
      */
 
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index fd3170a..75125f0 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -1700,7 +1700,7 @@ MakeLowPrecisionDouble(
     }
 
     /*
-     * All the easy cases have failed. Promote ths significand to bignum and
+     * All the easy cases have failed. Promote the significand to bignum and
      * call MakeHighPrecisionDouble to do it the hard way.
      */
 
@@ -1996,7 +1996,7 @@ RefineApproximation(
     /*
      * Compute twoMd as 2*M*d, where d is the exact value.
      * This is done by multiplying by 5**(M5+exponent) and then multiplying
-     * by 2**(M5+exponent+1), which is, of couse, a left shift.
+     * by 2**(M5+exponent+1), which is, of course, a left shift.
      */
 
     mp_init_copy(&twoMd, exactSignificand);
@@ -2200,7 +2200,7 @@ NormalizeRightward(
  *
  * RequiredPrecision --
  *
- *	Determines the number of bits needed to hold an intger.
+ *	Determines the number of bits needed to hold an integer.
  *
  * Results:
  *	Returns the position of the most significant bit (0 - 63).  Returns 0
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index b42eeb3..b1046b1 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -135,7 +135,7 @@ GrowStringBuffer(
     int flag)
 {
     /*
-     * Pre-conditions:
+     * Preconditions:
      *	objPtr->typePtr == &tclStringType
      *	needed > stringPtr->allocated
      *	flag || objPtr->bytes != NULL
@@ -185,7 +185,7 @@ GrowUnicodeBuffer(
     int needed)
 {
     /*
-     * Pre-conditions:
+     * Preconditions:
      *	objPtr->typePtr == &tclStringType
      *	needed > stringPtr->maxChars
      *	needed < STRING_MAXCHARS
@@ -400,7 +400,7 @@ Tcl_NewUnicodeObj(
  *	Get the length of the Unicode string from the Tcl object.
  *
  * Results:
- *	Pointer to unicode string representing the unicode object.
+ *	Pointer to Unicode string representing the Unicode object.
  *
  * Side effects:
  *	Frees old internal rep. Allocates memory for new "String" internal
@@ -427,10 +427,10 @@ Tcl_GetCharLength(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object;
+     * Optimize the case where we're really dealing with a ByteArray object;
      * we don't need to convert to a string to perform the get-length operation.
      *
-     * NOTE that we do not need the bytearray to be "pure".  A ByteArray value
+     * NOTE that we do not need the ByteArray to be "pure".  A ByteArray value
      * with a string rep cannot be trusted to represent the same value as the
      * string rep, but it *can* be trusted to have the same character length
      * as the string rep, which is all this routine cares about.
@@ -463,7 +463,7 @@ Tcl_GetCharLength(
 	if (numChars < objPtr->length) {
 	    /*
 	     * Since we've just computed the number of chars, and not all UTF
-	     * chars are 1-byte long, go ahead and populate the unicode
+	     * chars are 1-byte long, go ahead and populate the Unicode
 	     * string.
 	     */
 
@@ -547,7 +547,7 @@ Tcl_GetUniChar(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object
+     * Optimize the case where we're really dealing with a ByteArray object
      * we don't need to convert to a string to perform the indexing operation.
      */
 
@@ -591,7 +591,7 @@ Tcl_GetUniChar(
 #if TCL_UTF_MAX == 4
 int
 TclGetUCS4(
-    Tcl_Obj *objPtr,		/* The object to get the Unicode charater
+    Tcl_Obj *objPtr,		/* The object to get the Unicode character
 				 * from. */
     int index)			/* Get the index'th Unicode character. */
 {
@@ -603,7 +603,7 @@ TclGetUCS4(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object
+     * Optimize the case where we're really dealing with a ByteArray object
      * we don't need to convert to a string to perform the indexing operation.
      */
 
@@ -683,7 +683,7 @@ TclGetUCS4(
 
 Tcl_UniChar *
 Tcl_GetUnicode(
-    Tcl_Obj *objPtr)		/* The object to find the unicode string
+    Tcl_Obj *objPtr)		/* The object to find the Unicode string
 				 * for. */
 {
     return Tcl_GetUnicodeFromObj(objPtr, NULL);
@@ -710,10 +710,10 @@ Tcl_GetUnicode(
 
 Tcl_UniChar *
 Tcl_GetUnicodeFromObj(
-    Tcl_Obj *objPtr,		/* The object to find the unicode string
+    Tcl_Obj *objPtr,		/* The object to find the Unicode string
 				 * for. */
     int *lengthPtr)		/* If non-NULL, the location where the string
-				 * rep's unichar length should be stored. If
+				 * rep's Tcl_UniChar length should be stored. If
 				 * NULL, no length is stored. */
 {
     String *stringPtr;
@@ -767,7 +767,7 @@ Tcl_GetRange(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object
+     * Optimize the case where we're really dealing with a ByteArray object
      * we don't need to convert to a string to perform the substring operation.
      */
 
@@ -987,7 +987,7 @@ Tcl_SetObjLength(
 	}
 
 	/*
-	 * Mark the new end of the unicode string
+	 * Mark the new end of the Unicode string
 	 */
 
 	stringPtr->numChars = length;
@@ -1079,14 +1079,14 @@ Tcl_AttemptSetObjLength(
 	objPtr->bytes[length] = 0;
 
 	/*
-	 * Invalidate the unicode data.
+	 * Invalidate the Unicode data.
 	 */
 
 	stringPtr->numChars = -1;
 	stringPtr->hasUnicode = 0;
     } else {
 	/*
-	 * Changing length of pure unicode string.
+	 * Changing length of pure Unicode string.
 	 */
 
 	if (length > STRING_MAXCHARS) {
@@ -1102,7 +1102,7 @@ Tcl_AttemptSetObjLength(
 	}
 
 	/*
-	 * Mark the new end of the unicode string.
+	 * Mark the new end of the Unicode string.
 	 */
 
 	stringPtr->unicode[length] = 0;
@@ -1136,9 +1136,9 @@ Tcl_AttemptSetObjLength(
 void
 Tcl_SetUnicodeObj(
     Tcl_Obj *objPtr,		/* The object to set the string of. */
-    const Tcl_UniChar *unicode,	/* The unicode string used to initialize the
+    const Tcl_UniChar *unicode,	/* The Unicode string used to initialize the
 				 * object. */
-    int numChars)		/* Number of characters in the unicode
+    int numChars)		/* Number of characters in the Unicode
 				 * string. */
 {
     if (Tcl_IsShared(objPtr)) {
@@ -1166,9 +1166,9 @@ UnicodeLength(
 static void
 SetUnicodeObj(
     Tcl_Obj *objPtr,		/* The object to set the string of. */
-    const Tcl_UniChar *unicode,	/* The unicode string used to initialize the
+    const Tcl_UniChar *unicode,	/* The Unicode string used to initialize the
 				 * object. */
-    int numChars)		/* Number of characters in the unicode
+    int numChars)		/* Number of characters in the Unicode
 				 * string. */
 {
     String *stringPtr;
@@ -1336,9 +1336,9 @@ Tcl_AppendToObj(
 void
 Tcl_AppendUnicodeToObj(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
-    const Tcl_UniChar *unicode,	/* The unicode string to append to the
+    const Tcl_UniChar *unicode,	/* The Unicode string to append to the
 				 * object. */
-    int length)			/* Number of chars in "unicode". */
+    int length)			/* Number of chars in unicode. */
 {
     String *stringPtr;
 
@@ -1354,8 +1354,8 @@ Tcl_AppendUnicodeToObj(
     stringPtr = GET_STRING(objPtr);
 
     /*
-     * If objPtr has a valid Unicode rep, then append the "unicode" to the
-     * objPtr's Unicode rep, otherwise the UTF conversion of "unicode" to
+     * If objPtr has a valid Unicode rep, then append unicode to the
+     * objPtr's Unicode rep, otherwise the UTF conversion of unicode to
      * objPtr's string rep.
      */
 
@@ -1369,7 +1369,7 @@ Tcl_AppendUnicodeToObj(
 	AppendUnicodeToUtfRep(objPtr, unicode, length);
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1409,7 +1409,7 @@ Tcl_AppendObjToObj(
     }
 
     /*
-     * Handle append of one bytearray object to another as a special case.
+     * Handle append of one ByteArray object to another as a special case.
      * Note that we only do this when the objects don't have string reps; if
      * it did, then appending the byte arrays together could well lose
      * information; this is a special-case optimization only.
@@ -1527,8 +1527,8 @@ Tcl_AppendObjToObj(
  *
  * AppendUnicodeToUnicodeRep --
  *
- *	This function appends the contents of "unicode" to the Unicode rep of
- *	"objPtr". objPtr must already have a valid Unicode rep.
+ *	Appends the contents of unicode to the Unicode rep of
+ *	objPtr, which must already have a valid Unicode rep.
  *
  * Results:
  *	None.
@@ -1559,7 +1559,7 @@ AppendUnicodeToUnicodeRep(
     stringPtr = GET_STRING(objPtr);
 
     /*
-     * If not enough space has been allocated for the unicode rep, reallocate
+     * If not enough space has been allocated for the Unicode rep, reallocate
      * the internal rep object with additional space. First try to double the
      * required allocation; if that fails, try a more modest increase. See the
      * "TCL STRING GROWTH ALGORITHM" comment at the top of this file for an
@@ -1573,7 +1573,7 @@ AppendUnicodeToUnicodeRep(
 	int offset = -1;
 
 	/*
-	 * Protect against case where unicode points into the existing
+	 * Protect against case where Unicode points into the existing
 	 * stringPtr->unicode array. Force it to follow any relocations due to
 	 * the reallocs below.
 	 */
@@ -1587,7 +1587,7 @@ AppendUnicodeToUnicodeRep(
 	stringPtr = GET_STRING(objPtr);
 
 	/*
-	 * Relocate unicode if needed; see above.
+	 * Relocate Unicode if needed; see above.
 	 */
 
 	if (offset >= 0) {
@@ -1632,7 +1632,7 @@ static void
 AppendUnicodeToUtfRep(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const Tcl_UniChar *unicode,	/* String to convert to UTF. */
-    int numChars)		/* Number of chars of "unicode" to convert. */
+    int numChars)		/* Number of chars of unicode to convert. */
 {
     String *stringPtr = GET_STRING(objPtr);
 
@@ -1644,7 +1644,7 @@ AppendUnicodeToUtfRep(
 
 #if COMPAT
     /*
-     * Invalidate the unicode rep.
+     * Invalidate the Unicode rep.
      */
 
     stringPtr->hasUnicode = 0;
@@ -2933,8 +2933,8 @@ TclStringReverse(
 
 	if (Tcl_IsShared(objPtr)) {
 	    /*
-	     * Create a non-empty, pure unicode value, so we can coax
-	     * Tcl_SetObjLength into growing the unicode rep buffer.
+	     * Create a non-empty, pure Unicode value, so we can coax
+	     * Tcl_SetObjLength into growing the Unicode rep buffer.
 	     */
 
 	    objPtr = Tcl_NewUnicodeObj(&ch, 1);
@@ -3276,7 +3276,7 @@ SetStringFromAny(
  *	None.
  *
  * Side effects:
- *	The object's string may be set by converting its Unicode represention
+ *	The object's string may be set by converting its Unicode representation
  *	to UTF format.
  *
  *----------------------------------------------------------------------
@@ -3313,7 +3313,7 @@ ExtendStringRepWithUnicode(
     int numChars)
 {
     /*
-     * Pre-condition: this is the "string" Tcl_ObjType.
+     * Precondition: this is the "string" Tcl_ObjType.
      */
 
     int i, origLength, size = 0;
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index dc33f4b..1850f17 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -56,7 +56,7 @@ typedef struct String {
 				 * the UTF string (minus 1 byte for the
 				 * termination char). */
     int maxChars;		/* Max number of chars that can fit in the
-				 * space allocated for the unicode array. */
+				 * space allocated for the Unicode array. */
     int hasUnicode;		/* Boolean determining whether the string has
 				 * a Unicode representation. */
     Tcl_UniChar unicode[TCLFLEXARRAY];	/* The array of Unicode chars. The actual size
diff --git a/generic/tclTest.c b/generic/tclTest.c
index e7af185..f227ec3 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2873,7 +2873,7 @@ TestgetassocdataCmd(
  * TestgetplatformCmd --
  *
  *	This procedure implements the "testgetplatform" command. It is
- *	used to retrievel the value of the tclPlatform global variable.
+ *	used to retrieve the value of the tclPlatform global variable.
  *
  * Results:
  *	A standard Tcl result.
@@ -4409,7 +4409,7 @@ TestsetplatformCmd(
  *	A standard Tcl result.
  *
  * Side effects:
- *	When the packge given by argv[1] is loaded into an interpreter,
+ *	When the package given by argv[1] is loaded into an interpreter,
  *	variable "x" in that interpreter is set to "loaded".
  *
  *----------------------------------------------------------------------
@@ -7450,7 +7450,7 @@ TestNRELevels(
  *
  *	This procedure implements the "testconcatobj" command. It is used
  *	to test that Tcl_ConcatObj does indeed return a fresh Tcl_Obj in all
- *	cases and thet it never corrupts its arguments. In other words, that
+ *	cases and that it never corrupts its arguments. In other words, that
  *	[Bug 1447328] was fixed properly.
  *
  * Results:
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 8d8c0c8..3003487 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -624,7 +624,7 @@ TestindexobjCmd(
 
     /*
      * Tcl_GetIndexFromObj assumes that the table is statically-allocated so
-     * that its address is different for each index object. If we accidently
+     * that its address is different for each index object. If we accidentally
      * allocate a table at the same address as that cached in the index
      * object, clear out the object's cached state.
      */
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 33dc480..1bcd404 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -973,7 +973,7 @@ GetBlocks(
     int n;
 
     /*
-     * First, atttempt to move blocks from the shared cache. Note the
+     * First, attempt to move blocks from the shared cache. Note the
      * potentially dirty read of numFree before acquiring the lock which is a
      * slight performance enhancement. The value is verified after the lock is
      * actually acquired.
diff --git a/generic/tclThreadJoin.c b/generic/tclThreadJoin.c
index 5c70a62..d6d89a1 100644
--- a/generic/tclThreadJoin.c
+++ b/generic/tclThreadJoin.c
@@ -211,8 +211,8 @@ TclJoinThread(
  *
  * TclRememberJoinableThread --
  *
- *	This procedure remebers a thread as joinable. Only a call to
- *	TclJoinThread will remove the structre created (and initialized) here.
+ *	This procedure remembers a thread as joinable. Only a call to
+ *	TclJoinThread will remove the structure created (and initialized) here.
  *	IOW, not waiting upon a joinable thread will cause memory leaks.
  *
  * Results:
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index 4493822..1302b4e 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -827,7 +827,7 @@ ThreadSend(
     }
 
     /*
-     * Short circut sends to ourself. Ought to do something with -async, like
+     * Short circuit sends to ourself. Ought to do something with -async, like
      * run in an idle handler.
      */
 
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 8c1c79d..442ce02 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -1095,7 +1095,7 @@ Tcl_CommandTraceInfo(
  *
  * Side effects:
  *	A trace is set up on the command given by cmdName, such that future
- *	changes to the command will be intermediated by proc. See the manual
+ *	changes to the command will be mediated by proc. See the manual
  *	entry for complete details on the calling sequence for proc.
  *
  *----------------------------------------------------------------------
@@ -2899,7 +2899,7 @@ Tcl_UntraceVar2(
 				 * trace, including any of TCL_TRACE_READS,
 				 * TCL_TRACE_WRITES, TCL_TRACE_UNSETS,
 				 * TCL_GLOBAL_ONLY, and TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc,	/* Function assocated with trace. */
+    Tcl_VarTraceProc *proc,	/* Function associated with trace. */
     ClientData clientData)	/* Arbitrary argument to pass to proc. */
 {
     VarTrace *tracePtr;
@@ -3032,7 +3032,7 @@ Tcl_VarTraceInfo(
 				 * signify an array reference. */
     int flags,			/* OR-ed combo or TCL_GLOBAL_ONLY,
 				 * TCL_NAMESPACE_ONLY (can be 0). */
-    Tcl_VarTraceProc *proc,	/* Function assocated with trace. */
+    Tcl_VarTraceProc *proc,	/* Function associated with trace. */
     ClientData prevClientData)	/* If non-NULL, gives last value returned by
 				 * this function, so this call will return the
 				 * next trace after that one. If NULL, this
@@ -3068,7 +3068,7 @@ Tcl_VarTraceInfo2(
 				 * as-a-whole. */
     int flags,			/* OR-ed combination of TCL_GLOBAL_ONLY,
 				 * TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc,	/* Function assocated with trace. */
+    Tcl_VarTraceProc *proc,	/* Function associated with trace. */
     ClientData prevClientData)	/* If non-NULL, gives last value returned by
 				 * this function, so this call will return the
 				 * next trace after that one. If NULL, this
@@ -3126,7 +3126,7 @@ Tcl_VarTraceInfo2(
  *
  * Side effects:
  *	A trace is set up on the variable given by varName, such that future
- *	references to the variable will be intermediated by proc. See the
+ *	references to the variable will be mediated by proc. See the
  *	manual entry for complete details on the calling sequence for proc.
  *     The variable's flags are updated.
  *
@@ -3165,7 +3165,7 @@ Tcl_TraceVar(
  *
  * Side effects:
  *	A trace is set up on the variable given by part1 and part2, such that
- *	future references to the variable will be intermediated by proc. See
+ *	future references to the variable will be mediated by proc. See
  *	the manual entry for complete details on the calling sequence for
  *	proc. The variable's flags are updated.
  *
@@ -3218,7 +3218,7 @@ Tcl_TraceVar2(
  *
  * Side effects:
  *	A trace is set up on the variable given by part1 and part2, such that
- *	future references to the variable will be intermediated by the
+ *	future references to the variable will be mediated by the
  *	traceProc listed in tracePtr. See the manual entry for complete
  *	details on the calling sequence for proc.
  *
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 33a7b1d..9f32fcf 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -1645,7 +1645,7 @@ int
 Tcl_UniCharNcasecmp(
     const Tcl_UniChar *ucs,	/* Unicode string to compare to uct. */
     const Tcl_UniChar *uct,	/* Unicode string ucs is compared to. */
-    unsigned long numChars)	/* Number of unichars to compare. */
+    unsigned long numChars)	/* Number of Unichars to compare. */
 {
     for ( ; numChars != 0; numChars--, ucs++, uct++) {
 	if (*ucs != *uct) {
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index d3e88d4..ddcb254 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1228,7 +1228,7 @@ TclScanElement(
 	     * If we are quoting solely due to ] or internal " characters use
 	     * the CONVERT_MASK mode where we escape all special characters
 	     * except for braces. "extra" counted space needed to escape
-	     * braces too, so substract "braceCount" to get our actual needs.
+	     * braces too, so subtract "braceCount" to get our actual needs.
 	     */
 
 	    bytesNeeded += (extra - braceCount);
@@ -2058,7 +2058,7 @@ Tcl_ConcatObj(
      * Something cannot be determined to be safe, so build the concatenation
      * the slow way, using the string representations.
      *
-     * First try to pre-allocate the size required.
+     * First try to preallocate the size required.
      */
 
     for (i = 0;  i < objc;  i++) {
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 6f0ec89..b2e59b3 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -596,7 +596,7 @@ TclObjLookupVarEx(
     }
 
     /*
-     * If part1Ptr is a tclParsedVarNameType, separate it into the pre-parsed
+     * If part1Ptr is a tclParsedVarNameType, separate it into the preparsed
      * parts.
      */
 
@@ -794,7 +794,7 @@ TclObjLookupVarEx(
  *	TclObjLookupVar):
  *	    -1 a global reference
  *	    -2 a reference to a namespace variable
- *	    -3 a non-cachable reference, i.e., one of:
+ *	    -3 a non-cacheable reference, i.e., one of:
  *		. non-indexed local var
  *		. a reference of unknown origin;
  *		. resolution by a namespace or interp resolver
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index c9b4cbc..c0922f4 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1705,7 +1705,7 @@ Tcl_ZlibDeflate(
     }
 
     /*
-     * Reduce the bytearray length to the actual data length produced by
+     * Reduce the ByteArray length to the actual data length produced by
      * deflate.
      */
 
diff --git a/library/auto.tcl b/library/auto.tcl
index 7d23b6e..f998b45 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -119,7 +119,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 			      $basename$patch library]
 	}
     }
-    # uniquify $dirs in order
+    # make $dirs unique, preserving order
     array set seen {}
     foreach i $dirs {
 	# Make sure $i is unique under normalization. Avoid repeated [source].
@@ -317,7 +317,7 @@ namespace eval auto_mkindex_parser {
 	    $parser expose eval
 	    $parser invokehidden rename eval _%@eval
 
-	    # Install all the registered psuedo-command implementations
+	    # Install all the registered pseudo-command implementations
 
 	    foreach cmd $initCommands {
 		eval $cmd
@@ -570,7 +570,7 @@ auto_mkindex_parser::hook {
 	load {} tbcload $auto_mkindex_parser::parser
 
 	# AUTO MKINDEX:  tbcload::bcproc name arglist body
-	# Adds an entry to the auto index list for the given pre-compiled
+	# Adds an entry to the auto index list for the given precompiled
 	# procedure name.
 
 	auto_mkindex_parser::commandInit tbcload::bcproc {name args} {
@@ -625,7 +625,7 @@ auto_mkindex_parser::command namespace {op args} {
 		    }
 		    regsub -all ::+ $name :: name
 		}
-		# create artifical proc to force an entry in the tclIndex
+		# create artificial proc to force an entry in the tclIndex
 		$parser eval [list ::proc $name {} {}]
 	    }
 	}
diff --git a/library/clock.tcl b/library/clock.tcl
index b51f86f..abe6c81 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -2298,7 +2298,7 @@ proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
 #	Returns the locale that was previously current.
 #
 # Side effects:
-#	Does [mclocale].  If necessary, loades the designated locale's files.
+#	Does [mclocale].  If necessary, loads the designated locale's files.
 #
 #----------------------------------------------------------------------
 
@@ -2605,7 +2605,7 @@ proc ::tcl::clock::FormatStarDate { date } {
 #
 # Parameters:
 #	year - Year from the Roddenberry epoch
-#	fractYear - Fraction of a year specifiying the day of year.
+#	fractYear - Fraction of a year specifying the day of year.
 #	fractDay - Fraction of a day
 #
 # Results:
@@ -2975,7 +2975,7 @@ proc ::tcl::clock::InterpretHMS { date } {
 #	Returns the system time zone.
 #
 # Side effects:
-#	Stores the sustem time zone in the 'CachedSystemTimeZone'
+#	Stores the system time zone in the 'CachedSystemTimeZone'
 #	variable, since determining it may be an expensive process.
 #
 #----------------------------------------------------------------------
@@ -3401,7 +3401,7 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     close $f
 
     # The file begins with a magic number, sixteen reserved bytes, and then
-    # six 4-byte integers giving counts of fileds in the file.
+    # six 4-byte integers giving counts of fields in the file.
 
     binary scan $d a4a1x15IIIIII \
 	magic version nIsGMT nIsStd nLeap nTime nType nChar
diff --git a/library/history.tcl b/library/history.tcl
index ef9099b..8505c10 100644
--- a/library/history.tcl
+++ b/library/history.tcl
@@ -268,7 +268,7 @@ proc ::tcl::HistIndex {event} {
 	return -code error "event \"$event\" is too far in the past"
     }
     if {$i > $history(nextid)} {
-	return -code error "event \"$event\" hasn't occured yet"
+	return -code error "event \"$event\" hasn't occurred yet"
     }
     return $i
 }
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 5a09bb8..fb256a3 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -2356,7 +2356,7 @@ proc http::error {token} {
 #	token	The token returned from http::geturl
 #
 # Side Effects
-#	unsets the state array
+#	Unsets the state array.
 
 proc http::cleanup {token} {
     variable $token
@@ -2375,7 +2375,7 @@ proc http::cleanup {token} {
 
 # http::Connect
 #
-#	This callback is made when an asyncronous connection completes.
+#	This callback is made when an asynchronous connection completes.
 #
 # Arguments
 #	token	The token returned from http::geturl
@@ -3250,7 +3250,7 @@ proc http::CopyChunk {token chunk} {
 #
 # Arguments
 #	token	The token returned from http::geturl
-#	count	The amount transfered
+#	count	The amount transferred
 #
 # Side Effects
 #	Invokes callbacks
@@ -3293,7 +3293,7 @@ proc http::CopyDone {token count {error {}}} {
 #	reason	- "eof" means premature EOF (not EOF as the natural end of
 #		  the response)
 #		- "" means completion of response, with or without EOF
-#		- anything else describes an error confition other than
+#		- anything else describes an error condition other than
 #		  premature EOF.
 #
 # Side Effects
diff --git a/library/init.tcl b/library/init.tcl
index 0655dc8..9412e00 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -200,7 +200,7 @@ if {[namespace which -command exec] eq ""} {
     set auto_noexec 1
 }
 
-# Define a log command (which can be overwitten to log errors
+# Define a log command (which can be overwritten to log errors
 # differently, specially when stderr is not available)
 
 if {[namespace which -command tclLog] eq ""} {
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index fa91a37..851ad77 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -32,7 +32,7 @@ namespace eval msgcat {
 
     # Configuration values per Package (e.g. client namespace).
     # The dict key is of the form "<option> <namespace>" and the value is the
-    # configuration option. A nonexisting key is an unset option.
+    # configuration option. A non-existing key is an unset option.
     variable PackageConfig [dict create mcfolder {} loadcmd {} changecmd {}\
 	    unknowncmd {} loadedlocales {} loclist {}]
 
@@ -179,7 +179,7 @@ namespace eval msgcat {
 #	Find the translation for the given string based on the current
 #	locale setting. Check the local namespace first, then look in each
 #	parent namespace until the source is found.  If additional args are
-#	specified, use the format command to work them into the traslated
+#	specified, use the format command to work them into the translated
 #	string.
 #	If no catalog item is found, mcunknown is called in the caller frame
 #	and its result is returned.
@@ -578,7 +578,7 @@ proc msgcat::mcforgetpackage {} {
 #	mcfolder
 #	    The message catalog folder of the package.
 #	    This is automatically set by mcload.
-#	    If the value is changed using the set subcommand, an evntual
+#	    If the value is changed using the set subcommand, an eventual
 #	    loadcmd is invoked and all message files of the package locale are
 #	    loaded.
 #
@@ -1013,7 +1013,7 @@ proc msgcat::mcflmset {pairs} {
 #	by an application specific routine for error reporting
 #	purposes.  The default behavior is to return the source string.
 #	If additional args are specified, the format command will be used
-#	to work them into the traslated string.
+#	to work them into the translated string.
 #
 # Arguments:
 #	locale		The current locale.
@@ -1034,9 +1034,9 @@ proc msgcat::mcunknown {args} {
 #	- Default global handler, if mcunknown is not redefined.
 #	- Per package handler, if the package sets unknowncmd to the empty
 #	  string.
-#	It returna the source string if the argument list is empty.
+#	It returns the source string if the argument list is empty.
 #	If additional args are specified, the format command will be used
-#	to work them into the traslated string.
+#	to work them into the translated string.
 #
 # Arguments:
 #	locale		(unused) The current locale.
diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl
index 454b923..914ceff 100644
--- a/library/opt/optparse.tcl
+++ b/library/opt/optparse.tcl
@@ -75,7 +75,7 @@ namespace eval ::tcl {
     variable OptDescN 0
 
 # Inside algorithm/mechanism description:
-# (not for the faint hearted ;-)
+# (not for the faint-hearted ;-)
 #
 # The argument description is parsed into a "program tree"
 # It is called a "program" because it is the program used by
@@ -134,9 +134,9 @@ namespace eval ::tcl {
 # they should start to be much faster.
 # But this code use a lot of helper procs (like Lvarset)
 # which are quite slow and would be helpfully optimized
-# for instance by being written in C. Also our struture
+# for instance by being written in C. Also our structure
 # is complex and there is maybe some places where the
-# string rep might be calculated at great exense. to be checked.
+# string rep might be calculated at great expense. to be checked.
 
 #
 # Parse a given description and saves it here under the given key
@@ -226,7 +226,7 @@ proc ::tcl::OptKeyDelete {key} {
         set OptDesc($descKey)
     }
 
-# Parse entry point for ppl who don't want to register with a key,
+# Parse entry point for people who don't want to register with a key,
 # for instance because the description changes dynamically.
 #  (otherwise one should really use OptKeyRegister once + OptKeyParse
 #   as it is way faster or simply OptProc which does it all)
@@ -328,18 +328,18 @@ proc ::tcl::OptProcArgGiven {argname} {
 	    return $start
 	}
     }
-    # Set the value field of the current instruction
+    # Set the value field of the current instruction.
     proc OptCurSetValue {descriptionsName value} {
 	upvar $descriptionsName descriptions
-	# get the current item full adress
+	# Get the current item full address.
         set adress [OptCurAddr $descriptions]
-	# use the 3th field of the item  (see OptValue / OptNewInst)
+	# Use the 3rd field of the item  (see OptValue / OptNewInst).
 	lappend adress 2
 	Lvarset descriptions $adress [list 1 $value]
 	#                                  ^hasBeenSet flag
     }
 
-    # empty state means done/paste the end of the program
+    # Empty state means done/paste the end of the program.
     proc OptState {item} {
         lindex $item 0
     }
@@ -352,11 +352,11 @@ proc ::tcl::OptProcArgGiven {argname} {
     #######
     # Arguments manipulation
 
-    # Returns the argument that has to be processed now
+    # Returns the argument that has to be processed now.
     proc OptCurrentArg {lst} {
         lindex $lst 0
     }
-    # Advance to next argument
+    # Advance to next argument.
     proc OptNextArg {argsName} {
         uplevel 1 [list Lvarpop1 $argsName]
     }
@@ -553,7 +553,7 @@ proc ::tcl::OptKeyParse {descKey arglist} {
 		if {[OptHasBeenSet $item]} {
 #		    puts "adding $vname"
 		    # lets use the input name for the returned list
-		    # it is more usefull, for instance you can check that
+		    # it is more useful, for instance you can check that
 		    # no flags at all was given with expr
 		    # {![string match "*-*" $Args]}
 		    lappend vnamesLst [OptName $item]
diff --git a/library/package.tcl b/library/package.tcl
index 4a73346..4ccc20a 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -69,7 +69,7 @@ proc tcl::Pkg::CompareExtension {fileName {ext {}}} {
 #			than lazily when the first reference to an exported
 #			procedure in the package is made.
 # -verbose		(optional) Verbose output; the name of each file that
-#			was successfully rocessed is printed out. Additionally,
+#			was successfully processed is printed out. Additionally,
 #			if processing of a file failed a message is printed.
 # -load pat		(optional) Preload any packages whose names match
 #			the pattern.  Used to handle DLLs that depend on
@@ -206,7 +206,7 @@ proc pkg_mkIndex {args} {
 	    package unknown tclPkgUnknown
 
 	    # Stub out the unknown command so package can call into each other
-	    # during their initialilzation.
+	    # during their initialization.
 
 	    proc unknown {args} {}
 
@@ -720,7 +720,7 @@ proc ::tcl::Pkg::Create {args} {
 	error $err(noLoadOrSource)
     }
 
-    # OK, now everything is good.  Generate the package ifneeded statment.
+    # OK, now everything is good.  Generate the package ifneeded statement.
     set cmdline "package ifneeded $opts(-name) $opts(-version) "
 
     set cmdList {}
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index acaebf2..63d4d76 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -265,7 +265,7 @@ proc ::platform::LibcVersion {base _->_ vv} {
 
     set libc [lindex $libclist 0]
 
-    # Try executing the library first. This should suceed
+    # Try executing the library first. This should succeed
     # for a glibc library, and return the version
     # information.
 
diff --git a/library/platform/shell.tcl b/library/platform/shell.tcl
index 6eb9691..1e43409 100644
--- a/library/platform/shell.tcl
+++ b/library/platform/shell.tcl
@@ -27,7 +27,7 @@ proc ::platform::shell::generic {shell} {
     LOCATE base out
 
     set     code {}
-    # Forget any pre-existing platform package, it might be in
+    # Forget any preexisting platform package, it might be in
     # conflict with this one.
     lappend code {package forget platform}
     # Inject our platform package
@@ -52,7 +52,7 @@ proc ::platform::shell::identify {shell} {
     LOCATE base out
 
     set     code {}
-    # Forget any pre-existing platform package, it might be in
+    # Forget any preexisting platform package, it might be in
     # conflict with this one.
     lappend code {package forget platform}
     # Inject our platform package
@@ -99,14 +99,14 @@ proc ::platform::shell::LOCATE {bv ov} {
     upvar 1 $bv base $ov out
 
     # Locate the platform package for injection into the specified
-    # shell. We are using package management to find it, whereever it
+    # shell. We are using package management to find it, wherever it
     # is, instead of using hardwired relative paths. This allows us to
     # install the two packages as TMs without breaking the code
     # here. If the found package is wrapped we copy the code somewhere
     # where the spawned shell will be able to read it.
 
     # This code is brittle, it needs has to adapt to whatever changes
-    # are made to the TM code, i.e. the provide statement generated by
+    # are made to the TM code, i.e. the "provide" statement generated by
     # tm.tcl
 
     set pl [package ifneeded platform [package require platform]]
diff --git a/library/safe.tcl b/library/safe.tcl
index 59e4c90..1eafec0 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -169,7 +169,7 @@ proc ::safe::interpConfigure {args} {
 		    # it is most probably a set in fact but we would need
 		    # then to jump to the set part and it is not *sure*
 		    # that it is a set action that the user want, so force
-		    # it to use the unambigous -statics ?value? instead:
+		    # it to use the unambiguous -statics ?value? instead:
 		    return -code error\
 			"ambigous query (get or set -noStatics ?)\
 				use -statics instead"
@@ -220,7 +220,7 @@ proc ::safe::interpConfigure {args} {
 	    }
 	    # we can now reconfigure :
 	    InterpSetConfig $slave $accessPath $statics $nested $deleteHook
-	    # auto_reset the child (to completly synch the new access_path)
+	    # auto_reset the child (to completely synch the new access_path)
 	    if {$doreset} {
 		if {[catch {::interp eval $slave {auto_reset}} msg]} {
 		    Log $slave "auto_reset failed: $msg"
@@ -332,7 +332,7 @@ proc ::safe::InterpSetConfig {child access_path staticsok nestedok deletehook} {
 			moved it to front of slave's access_path" NOTICE
 	}
 
-	# Add 1st level sub dirs (will searched by auto loading from tcl
+	# Add 1st level subdirs (will searched by auto loading from tcl
 	# code in the child using glob and thus fail, so we add them here
 	# so by default it works the same).
 	set access_path [AddSubDirs $access_path]
@@ -602,7 +602,7 @@ proc ::safe::interpDelete {child} {
     }
 
     # If the child has a cleanup hook registered, call it.  Check the
-    # existance because we might be called to delete an interp which has
+    # existence because we might be called to delete an interp which has
     # not been registered with us at all
 
     if {[info exists state(cleanupHook)]} {
@@ -636,7 +636,7 @@ proc ::safe::interpDelete {child} {
     return
 }
 
-# Set (or get) the logging mecanism
+# Set (or get) the logging mechanism
 
 proc ::safe::setLogCmd {args} {
     variable Log
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 7344f9f..984f5c1 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -153,7 +153,7 @@ namespace eval tcltest {
     }
 
 ##### Initialize internal arrays of tcltest, but only if the caller
-    # has not already pre-initialized them.  This is done to support
+    # has not already preinitialized them.  This is done to support
     # compatibility with older tests that directly access internals
     # rather than go through command interfaces.
     #
@@ -163,7 +163,7 @@ namespace eval tcltest {
 	    return
 	}
 	if {[info exists $varName]} {
-	    # Pre-initialized value is a scalar: destroy it!
+	    # Preinitialized value is a scalar:  Destroy it!
 	    unset $varName
 	}
 	array set $varName $value
@@ -196,7 +196,7 @@ namespace eval tcltest {
     ArrayDefault testConstraints {}
 
 ##### Initialize internal variables of tcltest, but only if the caller
-    # has not already pre-initialized them.  This is done to support
+    # has not already preinitialized them.  This is done to support
     # compatibility with older tests that directly access internals
     # rather than go through command interfaces.
     #
@@ -229,7 +229,7 @@ namespace eval tcltest {
     # check the current working dir for files created by the tests.
     # filesMade keeps track of such files created using the makeFile and
     # makeDirectory procedures.  filesExisted stores the names of
-    # pre-existing files.
+    # preexisting files.
     #
     # Note that $filesExisted lists only those files that exist in
     # the original [temporaryDirectory].
@@ -298,7 +298,7 @@ namespace eval tcltest {
     # keep track of test level for nested test commands
     variable testLevel 0
 
-    # the variables and procs that existed when saveState was called are
+    # the variables and procedures that existed when saveState was called are
     # stored in a variable of the same name
     Default saveState {}
 
@@ -354,12 +354,12 @@ namespace eval tcltest {
 	# be kept in sync with the [configure -outfile] configuration
 	# option ( and underlying variable Option(-outfile) ).  This is
 	# accomplished with a write trace on Option(-outfile) that will
-	# update [outputChannel] whenver a new value is written.  That
+	# update [outputChannel] whenever a new value is written.  That
 	# much is easy.
 	#
 	# The trick is that in order to maintain compatibility with
 	# version 1 of tcltest, we must allow every configuration option
-	# to get its inital value from command line arguments.  This is
+	# to get its initial value from command line arguments.  This is
 	# accomplished by setting initial read traces on all the
 	# configuration options to parse the command line option the first
 	# time they are read.  These traces are cancelled whenever the
@@ -482,7 +482,7 @@ namespace eval tcltest {
 
     # Initialize the default values of the configurable options that are
     # historically associated with an exported variable.  If that variable
-    # is already set, support compatibility by accepting its pre-set value.
+    # is already set, support compatibility by accepting its preset value.
     # Use [trace] to establish ongoing connection between the deprecated
     # exported variable and the modern option kept as a true internal var.
     # Also set up usage string and value testing for the option.
@@ -761,7 +761,7 @@ namespace eval tcltest {
 		# even if the directory is not writable
 		return $directory
 	    }
-	    return -code error "\"$directory\" is not writeable"
+	    return -code error "\"$directory\" is not writable"
 	}
 	return $directory
     }
@@ -852,7 +852,7 @@ namespace eval tcltest {
 # tcltest::Debug* --
 #
 #     Internal helper procedures to write out debug information
-#     dependent on the chosen level. A test shell may overide
+#     dependent on the chosen level. A test shell may override
 #     them, f.e. to redirect the output into a different
 #     channel, or even into a GUI.
 
@@ -1758,7 +1758,7 @@ proc tcltest::SubstArguments {argList} {
     # We need to split the argList up into tokens but cannot use list
     # operations as they throw away some significant quoting, and
     # [split] ignores braces as it should.  Therefore what we do is
-    # gradually build up a string out of whitespace seperated strings.
+    # gradually build up a string out of whitespace-separated strings.
     # We cannot use [split] to split the argList into whitespace
     # separated strings as it throws away the whitespace which maybe
     # important so we have to do it all by hand.
@@ -1865,7 +1865,7 @@ proc tcltest::SubstArguments {argList} {
 #   match -             specifies type of matching to do on result,
 #                       output, errorOutput; this must be a string
 #			previously registered by a call to [customMatch].
-#			The strings exact, glob, and regexp are pre-registered
+#			The strings exact, glob, and regexp are preregistered
 #			by the tcltest package.  Default value is exact.
 #
 # Arguments:
@@ -1896,7 +1896,7 @@ proc tcltest::test {name description args} {
     FillFilesExisted
     incr testLevel
 
-    # Pre-define everything to null except output and errorOutput.  We
+    # Predefine everything to null except output and errorOutput.  We
     # determine whether or not to trap output based on whether or not
     # these variables (output & errorOutput) are defined.
     lassign {} constraints setup cleanup body result returnCodes errorCode match
@@ -2491,7 +2491,7 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
 
     # Remove files and directories created by the makeFile and
     # makeDirectory procedures.  Record the names of files in
-    # workingDirectory that were not pre-existing, and associate them
+    # workingDirectory that were not preexisting, and associate them
     # with the test file that created them.
 
     if {!$calledFromAllFile} {
@@ -3449,7 +3449,7 @@ proc tcltest::threadReap {} {
 
 # Initialize the constraints and set up command line arguments
 namespace eval tcltest {
-    # Define initializers for all the built-in contraint definitions
+    # Define initializers for all the built-in constraint definitions
     DefineConstraintInitializers
 
     # Set up the constraints in the testConstraints array to be lazily
@@ -3458,7 +3458,7 @@ namespace eval tcltest {
     trace add variable testConstraints read [namespace code SafeFetch]
 
     # Only initialize constraints at package load time if an
-    # [initConstraintsHook] has been pre-defined.  This is only
+    # [initConstraintsHook] has been predefined.  This is only
     # for compatibility support.  The modern way to add a custom
     # test constraint is to just call the [testConstraint] command
     # straight away, without all this "hook" nonsense.
diff --git a/library/tm.tcl b/library/tm.tcl
index c60084c..02007d5 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -22,10 +22,10 @@
 #
 #      This covers the possibility that the application asked for a package
 #      late, and the package was actually added to the installation after the
-#      application was started. It shoukld still be able to find it.
+#      application was started. It should still be able to find it.
 #
 #   2) It still is not there: Either way, you don't get it, but the rescan
-#      takes time. This is however an error case and we dont't care that much
+#      takes time. This is however an error case and we don't care that much
 #      about it
 #
 #   3) It was there the first time; but for some reason a "package forget" has
@@ -70,9 +70,9 @@ namespace eval ::tcl::tm {
 #	No result for subcommands 'add' and 'remove'. A list of paths for
 #	'list'.
 #
-# Sideeffects
+# Side effects
 #	The subcommands 'add' and 'remove' manipulate the list of paths to
-#	search for Tcl Modules. The subcommand 'list' has no sideeffects.
+#	search for Tcl Modules. The subcommand 'list' has no side effects.
 
 proc ::tcl::tm::add {args} {
     # PART OF THE ::tcl::tm::path ENSEMBLE
@@ -81,7 +81,7 @@ proc ::tcl::tm::add {args} {
     #
     # The command enforces the restriction that no path may be an ancestor
     # directory of any other path on the list. If the new path violates this
-    # restriction an error wil be raised.
+    # restriction an error will be raised.
     #
     # If the path is already present as is no error will be raised and no
     # action will be taken.
@@ -166,7 +166,7 @@ proc ::tcl::tm::list {} {
 #	name		- Name of desired package.
 #	version		- Version of desired package. Can be the
 #			  empty string.
-#	exact		- Either -exact or ommitted.
+#	exact		- Either -exact or omitted.
 #
 #	Name, version, and exact are used to determine satisfaction. The
 #	original is called iff no satisfaction was achieved. The name is also
@@ -175,7 +175,7 @@ proc ::tcl::tm::list {} {
 # Results
 #	None.
 #
-# Sideeffects
+# Side effects
 #	May populate the package ifneeded database with additional provide
 #	scripts.
 
@@ -310,7 +310,7 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 # Results
 #	None.
 #
-# Sideeffects
+# Side effects
 #	May add paths to the list of defaults.
 
 proc ::tcl::tm::Defaults {} {
@@ -355,7 +355,7 @@ proc ::tcl::tm::Defaults {} {
 # Results
 #	No result.
 #
-# Sideeffects
+# Side effects
 #	Calls 'path add' to paths to the list of module search paths.
 
 proc ::tcl::tm::roots {paths} {
diff --git a/library/word.tcl b/library/word.tcl
index 828f13a..0c8e01c 100644
--- a/library/word.tcl
+++ b/library/word.tcl
@@ -5,7 +5,7 @@
 # properly for different platforms.
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998 Scritpics Corporation.
+# Copyright (c) 1998 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -14,7 +14,7 @@
 # interpreted as white space.
 
 if {$::tcl_platform(platform) eq "windows"} {
-    # Windows style - any but a unicode space char
+    # Windows style - any but a Unicode space char
     if {![info exists ::tcl_wordchars]} {
 	set ::tcl_wordchars {\S}
     }
@@ -22,7 +22,7 @@ if {$::tcl_platform(platform) eq "windows"} {
 	set ::tcl_nonwordchars {\s}
     }
 } else {
-    # Motif style - any unicode word char (number, letter, or underscore)
+    # Motif style - any Unicode word char (number, letter, or underscore)
     if {![info exists ::tcl_wordchars]} {
 	set ::tcl_wordchars {\w}
     }
diff --git a/libtommath/changes.txt b/libtommath/changes.txt
index 1b3a7a3..cc6736c 100644
--- a/libtommath/changes.txt
+++ b/libtommath/changes.txt
@@ -412,7 +412,7 @@ v0.13  -- tons of minor speed-ups in low level add, sub, mul_2 and div_2 which p
 Jan 17th, 2003
 v0.12  -- re-wrote the majority of the makefile so its more portable and will
           install via "make install" on most *nix platforms
-       -- Re-packaged all the source as seperate files.  Means the library a single
+       -- Re-packaged all the source as separate files.  Means the library a single
           file packagage any more.  Instead of just adding "bn.c" you have to add
           libtommath.a
        -- Renamed "bn.h" to "tommath.h"
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index cdeb099..b2e3614 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -1,7 +1,7 @@
 ########################################################################################################
 #
 # Makefile wrapper to build tcl on Mac OS X in a way compatible with the tk/macosx Xcode buildsystem
-#	uses the standard unix build system in tcl/unix (which can be used directly instead of this
+#	uses the standard Unix build system in tcl/unix (which can be used directly instead of this
 #	if you are not using the tk/macosx projects).
 #
 # Copyright (c) 2002-2008 Daniel A. Steffen <das@users.sourceforge.net>
@@ -150,7 +150,7 @@ ${objdir}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure \
 build-${PROJECT}: ${objdir}/Makefile
 	${DO_MAKE}
 ifeq (${INSTALL_BUILD},)
-# symolic link hackery to trick
+# symbolic link hackery to trick
 # 'make install INSTALL_ROOT=${OBJ_DIR}'
 # into building Tcl.framework and tclsh in ${SYMROOT}
 	@cd "${OBJ_DIR}" && mkdir -p $(dir $(subst ${space},\ ,.${LIBDIR})) $(dir $(subst ${space},\ ,.${BINDIR})) "${SYMROOT}" && \
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 6275aac..064f9e3 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -491,7 +491,7 @@ TclMacOSXCopyFileAttributes(
  *
  * Results:
  *	The return value is 1, 0 or -1 indicating whether the file matches the
- *	given criteria, does not match them, or an error occurred (in wich
+ *	given criteria, does not match them, or an error occurred (in which
  *	case an error is left in interp).
  *
  * Side effects:
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index bbbac65..27d4525 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -1237,7 +1237,7 @@ FileHandlerEventProc(
  *	polls without blocking.
  *
  * Results:
- *	Returns 0 if a tcl event or timeout ocurred and 1 if a non-tcl
+ *	Returns 0 if a tcl event or timeout occurred and 1 if a non-tcl
  *	CFRunLoop source was processed.
  *
  * Side effects:
diff --git a/tests/appendComp.test b/tests/appendComp.test
index a6e78d2..0b2beb9 100644
--- a/tests/appendComp.test
+++ b/tests/appendComp.test
@@ -384,7 +384,7 @@ test appendComp-8.1 {defer error to runtime} -setup {
 # patch (no read traces run for lappend, append). The compiled tests are
 # failing for lappend (9.0/1) before the patch, showing how it invokes read
 # traces in the compiled path. The append tests are good (9.2/3). After the
-# patch the failues are gone.
+# patch the failures are gone.
 
 test appendComp-9.0 {bug 3057639, lappend compiled, read trace on non-existing array variable element} -setup {
     unset -nocomplain myvar
diff --git a/tests/chanio.test b/tests/chanio.test
index 81c31d8..6062605 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -3566,7 +3566,7 @@ test chan-io-31.13 {binary mode is synonym of lf mode} -setup {
 } -result lf
 #
 # Test chan-io-9.14 has been removed because "auto" output translation mode is
-# not supoprted.
+# not supported.
 #
 test chan-io-31.14 {Tcl_Write mixed, Tcl_Gets auto} -setup {
     file delete $path(test1)
@@ -5304,8 +5304,10 @@ test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
 } -cleanup {
     chan close $f1
 } -result {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
-test chan-io-39.23 {Tcl_GetChannelOption, server socket is not readable or\
-        writeable, it should still have valid -eofchar and -translation options} -setup {
+test chan-io-39.23 {
+	Tcl_GetChannelOption, server socket is not readable or writable, but should
+	still have valid -eofchar and -translation options.
+} -setup {
     set l [list]
 } -body {
     set sock [socket -server [namespace code accept] -myaddr 127.0.0.1 0]
@@ -7553,7 +7555,7 @@ test chan-io-61.1 {Reset eof state after changing the eof char} -setup {
     removeFile eofchar
 } -result {77 = 23431}
 
-# Test the cutting and splicing of channels, this is incidentially the
+# Test the cutting and splicing of channels, this is incidentally the
 # attach/detach facility of package Thread, but __without any safeguards__. It
 # can also be used to emulate transfer of channels between threads, and is
 # used for that here.
diff --git a/tests/clock.test b/tests/clock.test
index db43a67..c30fea3 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -36047,7 +36047,7 @@ test clock-42.1 {regression test - %z in :localtime when west of Greenwich } \
     } \
     -result {-0500}
 
-# 43.1 was a bad test - mktime returning -1 is an error according to posix.
+# 43.1 was a bad test - mktime returning -1 is an error according to Posix.
 
 test clock-44.1 {regression test - time zone name containing hyphen } \
     -setup {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 8d36594..526c261 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -1295,7 +1295,7 @@ test cmdAH-24.14.1 {
     file mtime [file join [temporaryDirectory] CON.txt]
 } -match regexp -result {could not (?:get modification time|read)} -returnCodes error
 
-# 3155760000 is 64-bit unix time, Wed Jan 01 00:00:00 GMT 2070:
+# 3155760000 is 64-bit Unix time, Wed Jan 01 00:00:00 GMT 2070:
 test cmdAH-24.20.1 {Tcl_FileObjCmd: atime 64-bit time_t, bug [4718b41c56]} -constraints {time64bit} -setup {
     set filename [makeFile "" foo.text]
 } -body {
@@ -1694,7 +1694,7 @@ test cmdAH-32.5 {file tempfile - templates} -constraints unix -body {
 } -cleanup {
     catch {file delete $name}
 } -result ok
-# Not portable; not all unix systems have mkstemps()
+# Not portable; not all Unix systems have mkstemps()
 test cmdAH-32.6 {file tempfile - templates} -body {
     set template [file join $dirfile foo]
     close [file tempfile name $template.bar]
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index 61203c1..66213f9 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -59,8 +59,8 @@ test cmdMZ-1.4 {Tcl_PwdObjCmd: failure} -setup {
     file delete -force $foodir
     file mkdir $foodir
     cd $foodir
-} -constraints {unix nonPortable} -body {
-    # This test fails on various unix platforms (eg Linux) where permissions
+} -constraints {Unix nonPortable} -body {
+    # This test fails on various Unix platforms (eg Linux) where permissions
     # caching causes this to fail. The caching is strictly incorrect, but we
     # have no control over that.
     file attr . -permissions 0o000
diff --git a/tests/compile.test b/tests/compile.test
index 4a65330..ac95c25 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -519,7 +519,7 @@ test compile-13.3 {TclCompileScript: testing check of max depth by nested script
     #puts $errors
     # all of nested calls exceed the limit, so must end with "too many nested compilations"
     # (or evaluations, depending on compile method/instruction and "mixed" compile within
-    # evaliation), so no one succeeds, the result must be empty:
+    # evaluation), so no one succeeds, the result must be empty:
     ti eval {set result}
 } -result {}
 #
diff --git a/tests/dict.test b/tests/dict.test
index 6ede398..fe9ec33 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -1117,7 +1117,7 @@ test dict-19.2 {dict: testing for leaks} -constraints memory -body {
     # This test is made to stress object reference management
     memtest {
 	apply {{} {
-	    # A shared invalid dictinary
+	    # A shared invalid dictionary
 	    set apa {a {}b c d}
 	    set bepa $apa
 	    catch {dict replace $apa e f}
diff --git a/tests/env.test b/tests/env.test
index bc1d7e9..fb0674d 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -221,9 +221,9 @@ NAME2=more
 XYZZY=garbage}
 
 test env-2.5 {different encoding (wide chars)} -constraints {win exec} -setup {
-    # be sure set of (unicode) environment occurs if single-byte encoding is used:
+    # be sure set of (Unicode) environment occurs if single-byte encoding is used:
     encodingswitch cp1252
-    # german (cp1252) and russian (cp1251) characters together encoded as utf-8:
+    # German (cp1252) and Russian (cp1251) characters together encoded as utf-8:
     set val 2d2dc3a4c3b6c3bcc39f2dd182d0b5d181d1822d2d
     set env(XYZZY) [encoding convertfrom utf-8 [binary decode hex $val]]
     # now switch to utf-8 (to see correct values from test):
@@ -303,7 +303,7 @@ test env-5.1 {
     corner cases - remove one elem at a time
 } -setup setup1 -body {
     # When no environment variables exist, the env var will contain no
-    # entries. The "array names" call synchs up the C-level environ array with
+    # entries. The "array names" call syncs up the C-level environ array with
     # the Tcl level env array. Make sure an empty Tcl array is created.
     foreach e [array names env] {
 	unset env($e)
@@ -347,7 +347,7 @@ test env-5.4 {corner cases - unset the env array} -setup {
     setup1
     interp create i
 } -body {
-    # The info exists command should be in synch with the env array.
+    # The info exists command should be in sync with the env array.
     # Know Bug: 1737
     i eval {set env(THIS_SHOULD_EXIST) a}
     set     result [info exists env(THIS_SHOULD_EXIST)]
diff --git a/tests/error.test b/tests/error.test
index d5ce528..7f7b534 100644
--- a/tests/error.test
+++ b/tests/error.test
@@ -924,7 +924,7 @@ test error-18.12 {variable assignment unaffected by exception in finally} {
     list $em [dict get $opts -errorcode]
 } {bar FOO}
 
-# try tests - fallthough body cases
+# try tests - fall-through body cases
 
 test error-19.1 {try with fallthrough body #1} {
     set RES {}
diff --git a/tests/eval.test b/tests/eval.test
index d473fdf..959dc87 100644
--- a/tests/eval.test
+++ b/tests/eval.test
@@ -64,7 +64,7 @@ test eval-3.2 {concatenating eval and pure lists} {
 } {1 2 3 4 5}
 test eval-3.3 {eval and canonical lists} {
     set cmd [list list 1 2 3 4 5]
-    # Force existance of utf-8 rep
+    # Force existence of utf-8 rep
     set dummy($cmd) $cmd
     unset dummy
     eval $cmd
@@ -72,7 +72,7 @@ test eval-3.3 {eval and canonical lists} {
 test eval-3.4 {concatenating eval and canonical lists} {
     set cmd  [list list 1]
     set cmd2 [list 2 3 4 5]
-    # Force existance of utf-8 rep
+    # Force existence of utf-8 rep
     set dummy($cmd) $cmd
     set dummy($cmd2) $cmd2
     unset dummy
diff --git a/tests/event.test b/tests/event.test
index 77f13d3..50d1088 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -429,7 +429,7 @@ foo
 
 # someday : add a test checking that when there is no bgerror, an error msg
 # goes to stderr ideally one would use sub interp and transfer a fake stderr
-# to it, unfortunatly the current interp tcl API does not allow that. The
+# to it, unfortunately the current interp tcl API does not allow that. The
 # other option would be to use fork a test but it then becomes more a
 # file/exec test than a bgerror test.
 
diff --git a/tests/exec.test b/tests/exec.test
index 3c445e8..e77a0ac 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -25,7 +25,7 @@ testConstraint noosxCI [expr {![info exists ::env(MAC_CI)]}]
 
 unset -nocomplain path
 
-# Utilities that are like bourne shell stalwarts, but cross-platform.
+# Utilities that are like Bourne shell stalwarts, but cross-platform.
 set path(echo) [makeFile {
     puts -nonewline [lindex $argv 0]
     foreach str [lrange $argv 1 end] {
diff --git a/tests/expr.test b/tests/expr.test
index 2434ab4..01f832e 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -7280,7 +7280,7 @@ test expr-52.1 {
 # Bug e3dcab1d14
 proc do-one-test-expr-63 {e p float athreshold} {
     # e - power of 2 to test
-    # p - tcl_precision to test wuth
+    # p - tcl_precision to test with
     # float - floating point value 2**-$p
     # athreshold - tolerable absolute error (1/2 decimal digit in
     #              least significant place plus 1/2 least significant bit)
diff --git a/tests/fCmd.test b/tests/fCmd.test
index fcf5cbe..d711138 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -96,7 +96,7 @@ testConstraint notFileSharing 1
 testConstraint linkFile 1
 testConstraint linkDirectory 1
 
-# Several tests require need to match results against the unix username
+# Several tests require need to match results against the Unix username
 set user {}
 if {[testConstraint unix]} {
     catch {
@@ -757,7 +757,7 @@ test fCmd-7.5 {FileForceOption: multiple times through loop} -setup {
 
 test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
     -constraints {unix notRoot knownBug} -body {
-    # Labelled knownBug because it is dangerous [Bug: 3881]
+    # Labeled knownBug because it is dangerous [Bug: 3881]
     file mkdir td1
     file attr td1 -perm 0o40000
     file rename ~$user td1
@@ -878,7 +878,7 @@ test fCmd-9.7 {file rename: comprehensive: file to existing file} -setup {
 test fCmd-9.8 {file rename: comprehensive: dir to empty dir} -setup {
     cleanup
 } -constraints {notRoot testchmod notNetworkFilesystem} -body {
-    # Under unix, you can rename a read-only directory, but you can't move it
+    # Under Unix you can rename a read-only directory, but you can't move it
     # into another directory.
     file mkdir td1
     file mkdir [file join td2 td1]
@@ -2443,7 +2443,7 @@ test fCmd-28.12 {file link: cd into a link} -setup {
     cd $orig
     # Now '$up' should be either $orig or [file dirname abc.dir], depending on
     # whether 'cd' actually moves to the destination of a link, or simply
-    # treats the link as a directory. (On windows the former, on unix the
+    # treats the link as a directory. (On windows the former, on Unix the
     # latter, I believe)
     if {
 	([file normalize $up] ne [file normalize $orig]) &&
diff --git a/tests/fileName.test b/tests/fileName.test
index 7a8ae61..2a35987 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -1343,7 +1343,7 @@ catch {file attributes globTest/a1 -permissions 0o755}
 test filename-15.4 {unix specific no complain: no errors, good result} \
 	{unix nonPortable} {
     # test fails because if an error occurs, the interp's result is reset...
-    # or you don't run at scriptics where the outser and welch users exists
+    # or you don't run at scriptics where the ouster and welch users exists
     glob -nocomplain ~ouster ~foo ~welch
 } {/home/ouster /home/welch}
 test filename-15.4.1 {no complain: errors, sequencing} {
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 2de778a..1e6045b 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -299,7 +299,7 @@ test filesystem-1.33 {link normalisation: link near filesystem root} {testsetpla
     testsetplatform windows
     set res [file normalize C:/../bar]
     if {[testConstraint unix]} {
-	# Some unices go further in normalizing this -- not really a problem
+	# Some Unices go further in normalizing this -- not really a problem
 	# since this is a Windows test.
 	regexp {C:/bar$} $res res
     }
diff --git a/tests/for.test b/tests/for.test
index a13ee54..8659d8e 100644
--- a/tests/for.test
+++ b/tests/for.test
@@ -337,7 +337,7 @@ proc formatMail {} {
         50 {} \
         51 {Binary Releases} \
         52 {} \
-        53 {Pre-compiled releases are available for the following platforms: } \
+        53 {Precompiled releases are available for the following platforms: } \
         54 {} \
         55 {     Windows 3.1, Windows 95, and Windows NT: Fetch} \
         56 {     ftp://ftp.sunlabs.com/pub/tcl/win42b1.exe, then execute it. The file is a} \
@@ -556,7 +556,7 @@ Obtaining The Releases
 
 Binary Releases
 
-Pre-compiled releases are available for the following
+Precompiled releases are available for the following
 platforms:
 
      Windows 3.1, Windows 95, and Windows NT: Fetch
diff --git a/tests/indexObj.test b/tests/indexObj.test
index b992373..6be0eb4 100644
--- a/tests/indexObj.test
+++ b/tests/indexObj.test
@@ -1,4 +1,4 @@
-# This file is a Tcl script to test out the the procedures in file
+# This file is a Tcl script to test out the procedures in file
 # tkIndexObj.c, which implement indexed table lookups.  The tests here are
 # organized in the standard fashion for Tcl tests.
 #
diff --git a/tests/internals.tcl b/tests/internals.tcl
index e859afe..43cafd5 100644
--- a/tests/internals.tcl
+++ b/tests/internals.tcl
@@ -36,7 +36,7 @@ proc testWithLimit args {
 	# with limited address space:
 	if {[info exists in(-addmem)] || [info exists in(-maxmem)]} {
 	    if {[info exists in(-addmem)]} {
-		# as differnce to normal usage, so try to retrieve current memory usage:
+		# as difference to normal usage, so try to retrieve current memory usage:
 		if {[catch {
 		    # using ps (vsz is in KB):
 		    incr in(-addmem) [expr {[lindex [exec ps -hq $ppid -o vsz] end] * 1024}]
@@ -93,4 +93,4 @@ namespace export test*
 # for script path & as mark for loaded
 proc scriptpath {} [list return [info script]]
 
-}}; # end of internals.
\ No newline at end of file
+}}; # end of internals.
diff --git a/tests/io.test b/tests/io.test
index 181d028..031f857 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -3763,7 +3763,7 @@ test io-31.13 {binary mode is synonym of lf mode} {
 } lf
 #
 # Test io-9.14 has been removed because "auto" output translation mode is
-# not supoprted.
+# not supported.
 #
 test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} {
     file delete $path(test1)
@@ -5720,7 +5720,7 @@ test io-39.22a {Tcl_SetChannelOption, invariance} {
     set l
 } {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
 test io-39.23 {Tcl_GetChannelOption, server socket is not readable or
-        writeable, it should still have valid -eofchar and -translation options } {
+        writable, it should still have valid -eofchar and -translation options } {
     set l [list]
     set sock [socket -server [namespace code accept] -myaddr 127.0.0.1 0]
     lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation]
@@ -8495,7 +8495,7 @@ test io-61.1 {Reset eof state after changing the eof char} -setup {
 } -result {77 = 23431}
 
 
-# Test the cutting and splicing of channels, this is incidentially the
+# Test the cutting and splicing of channels, this is incidentally the
 # attach/detach facility of package Thread, but __without any
 # safeguards__. It can also be used to emulate transfer of channels
 # between threads, and is used for that here.
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index b0dd1d7..dae15af 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -660,7 +660,7 @@ test iocmd-20.1 {chan, unknown method} -body {
 } -returnCodes error -match glob -result {unknown or ambiguous subcommand "foo": must be *}
 
 # --- --- --- --------- --------- ---------
-# chan create, and method "initalize"
+# chan create, and method "initialize"
 
 test iocmd-21.0 {chan create, wrong#args, not enough} {
     catch {chan create} msg
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 44e7d64..4eafb6b 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -114,7 +114,7 @@ test iortrans-1.1 {chan, unknown method} -returnCodes error -body {
 } -match glob -result {unknown or ambiguous subcommand "foo": must be*}
 
 # --- --- --- --------- --------- ---------
-# chan push, and method "initalize"
+# chan push, and method "initialize"
 
 test iortrans-2.0 {chan push, wrong#args, not enough} -returnCodes error -body {
     chan push
@@ -1334,7 +1334,7 @@ test iortrans-11.2 {delete interp of reflected transform} -setup {
 
 # ### ### ### ######### ######### #########
 ## Helper command. Runs a script in a separate thread and returns the result.
-## A channel is transfered into the thread as well, and a list of configuation
+## A channel is transferred into the thread as well, and a list of configuration
 ## variables
 
 proc inthread {chan script args} {
@@ -2013,7 +2013,7 @@ test iortrans.tf-8.1 {seek flushes write buffers, ignores data} -setup {
 	# The close flushes again, this modifies the file!
 	lappend notes | [close $c] |
 	# NOTE: The flush generated by the close is recorded immediately, the
-	# other note's here are defered until after the thread is done. This
+	# other note's here are deferred until after the thread is done. This
 	# changes the order of the result a bit from the non-threaded case
 	# (The first | moves one to the right). This is an artifact of the
 	# 'inthread' framework, not of the transformation itself.
diff --git a/tests/iogt.test b/tests/iogt.test
index 3cac2cf..68f9a5c 100644
--- a/tests/iogt.test
+++ b/tests/iogt.test
@@ -843,7 +843,7 @@ test iogt-6.0 {Push back} -constraints testchannel -body {
     # expect to get "xxx" from the transform because of unread "def" input to
     # transform which returns "xxx".
     #
-    # Actually the IO layer pre-read the whole file and will read "def"
+    # Actually the IO layer preread the whole file and will read "def"
     # directly from the buffer without bothering to consult the newly stacked
     # transformation. This is wrong.
     read $f 3
diff --git a/tests/mathop.test b/tests/mathop.test
index 12a4e7f..3a46314 100644
--- a/tests/mathop.test
+++ b/tests/mathop.test
@@ -22,7 +22,7 @@ namespace eval ::testmathop2 {
 }
 
 # Helper to test math ops.
-# Test different invokation variants and see that they do the same thing.
+# Test different invocation variants and see that they do the same thing.
 # Byte compiled / non byte compiled version
 # Shared / unshared arguments
 # Original / imported
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 9a6eac0..d34a483 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -978,7 +978,7 @@ namespace eval ::msgcat::test {
     variable locale
     if {![info exist locale]} { set locale [mclocale] }
 
-	test msgcat-14.1 {invokation loadcmd} -setup {
+	test msgcat-14.1 {invocation loadcmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
@@ -992,7 +992,7 @@ namespace eval ::msgcat::test {
 	    lsort $resultvariable
 	} -result {foo foo_bar}
 
-	test msgcat-14.2 {invokation failed in loadcmd} -setup {
+	test msgcat-14.2 {invocation failed in loadcmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
@@ -1010,7 +1010,7 @@ namespace eval ::msgcat::test {
 	    list $err [dict get $errdict -code]
 	} -result {fail 1}
 
-	test msgcat-14.3 {invokation changecmd} -setup {
+	test msgcat-14.3 {invocation changecmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
@@ -1023,7 +1023,7 @@ namespace eval ::msgcat::test {
 	    set resultvariable
 	} -result {foo_bar foo {}}
 
-	test msgcat-14.4 {invokation unknowncmd} -setup {
+	test msgcat-14.4 {invocation unknowncmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
diff --git a/tests/ooNext2.test b/tests/ooNext2.test
index 74ba006..726757b 100644
--- a/tests/ooNext2.test
+++ b/tests/ooNext2.test
@@ -126,7 +126,7 @@ test oo-nextto-1.3 {basic nextto functionality: constructors} -setup {
 	variable result
 	constructor {p q r} {
 	    lappend result ==C== p=$p,q=$q,r=$r
-	    # Route arguments to superclasses, in non-trival pattern
+	    # Route arguments to superclasses, in non-trivial pattern
 	    nextto B $q
 	    nextto A $p $r
 	}
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index 79e0f2e..e047840 100644
--- a/tests/pkgMkIndex.test
+++ b/tests/pkgMkIndex.test
@@ -490,7 +490,7 @@ removeFile [file join pkg pkg2_b.tcl]
 
 makeFile {
 #  This package requires circ2, and circ2 requires circ3, which in turn
-#  requires circ1.  In case of cirularities, pkg_mkIndex should give up when
+#  requires circ1.  In case of circularities, pkg_mkIndex should give up when
 #  it gets stuck.
 package require circ2 1.0
 package provide circ1 1.0
@@ -652,7 +652,7 @@ test pkgMkIndex-12.1 {same name procs in different namespace} {
 
 removeFile [file join pkg samename.tcl]
 
-# Proc names with embedded spaces are properly listed (ie, correct number of
+# Proc names with embedded spaces are properly listed (i.e. correct number of
 # braces) in result
 makeFile {
 package provide spacename 1.0
diff --git a/tests/remote.tcl b/tests/remote.tcl
index 3c2fb51..2b975c6 100644
--- a/tests/remote.tcl
+++ b/tests/remote.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-# Initialize message delimitor
+# Initialize message delimiter
 
 # Initialize command array
 catch {unset command}
diff --git a/tests/resolver.test b/tests/resolver.test
index 9916529..88eae99 100644
--- a/tests/resolver.test
+++ b/tests/resolver.test
@@ -203,7 +203,7 @@ test resolver-2.1 {compiled var resolver: Bug #3383616} -setup {
 # resolver-agnostic).
 #
 # In order to make the test cases for the per-interpreter cmd literal pool
-# reproducable and to minimize interactions between test cases, we use a child
+# reproducible and to minimize interactions between test cases, we use a child
 # interpreter per test-case.
 #
 #
diff --git a/tests/safe-stock.test b/tests/safe-stock.test
index 7be483e..0bab25d 100644
--- a/tests/safe-stock.test
+++ b/tests/safe-stock.test
@@ -40,8 +40,8 @@ proc mapList {map listIn} {
     return $listOut
 }
 
-# Force actual loading of the safe package because we use un-exported (and
-# thus un-autoindexed) APIs in this test result arguments:
+# Force actual loading of the safe package because we use unexported (and
+# thus unautoindexed) APIs in this test result arguments:
 catch {safe::interpConfigure}
 
 # high level general test
diff --git a/tests/safe.test b/tests/safe.test
index e4c3442..632a959 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -50,8 +50,8 @@ proc mapAndSortList {map listIn} {
     lsort $listOut
 }
 
-# Force actual loading of the safe package because we use un-exported (and
-# thus un-autoindexed) APIs in this test result arguments:
+# Force actual loading of the safe package because we use unexported (and
+# thus unautoindexed) APIs in this test result arguments:
 catch {safe::interpConfigure}
 
 # testing that nested and statics do what is advertised (we use a static
diff --git a/tests/scan.test b/tests/scan.test
index e3fab05..300335e 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -512,7 +512,7 @@ test scan-5.10 {integer scanning} -setup {
     list [scan "1 2 " "%hd %d %d %d" a b c d] $a $b $c $d
 } -result {2 1 2 {} {}}
 #
-# The behavior for scaning intergers larger than MAX_INT is not defined by the
+# The behavior for scanning integers larger than MAX_INT is not defined by the
 # ANSI spec.  Some implementations wrap the input (-16) some return MAX_INT.
 #
 test scan-5.11 {integer scanning} -constraints {nonPortable} -setup {
diff --git a/tests/socket.test b/tests/socket.test
index 0dfff53..7251bfa 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -114,7 +114,7 @@ set t2 [clock milliseconds]
 set lat1 [expr {($t2-$t1)*2}]; # doubled as a safety margin
 
 # Test the latency of failed connection attempts over the loopback
-# interface. They can take more than a second under Windowos and requres
+# interface. They can take more than a second under Windows and requires
 # additional [after]s in some tests that are not needed on systems that fail
 # immediately.
 set t1 [clock milliseconds]
@@ -1833,7 +1833,7 @@ proc transf_test {{testmode transfer} {maxIter 1000} {maxTime 10000}} {
     set srvsock {}
     # if binding on port 0 is not possible (system related, blocked on ISPs etc):
     if {[catch {close [socket -async $::localhost $port]}]} {
-      # simplest server on random port (immediatelly closing a connect):
+      # simplest server on random port (immediately closing a connect):
       set port [randport]
       set srvsock [socket -server {apply {{ch args} {close $ch}}} -myaddr $::localhost $port]
       # socket on windows has some issues yet (e. g. bug [b6d0d8cc2c]), so we simply decrease iteration count (to 1/4):
@@ -1867,7 +1867,7 @@ proc transf_test {{testmode transfer} {maxIter 1000} {maxTime 10000}} {
       }
       iteration first
     }
-    # parent proc commiting transfer attempt (attach) and checking acquire was successful:
+    # parent proc committing transfer attempt (attach) and checking acquire was successful:
     proc transf_parent {fd args} {
       tcltest::DebugPuts 2 "** trma / $::count ** $args **"
       thread::attach $fd
@@ -2373,7 +2373,7 @@ test socket-14.13 {testing writable event when quick failure} -body {
     # Test for bug 336441ed59 where a quick background fail was ignored
     #
     # Test only for windows as socket -async 255.255.255.255 fails
-    # directly on unix
+    # directly on Unix
     #
     # The following connect should fail very quickly
     set a1 [after $latency {set x timeout}]
diff --git a/tests/stringObj.test b/tests/stringObj.test
index c45bdb2..2c91546 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -314,7 +314,7 @@ test stringObj-9.10 {TclAppendObjToObj, integer src & mixed dest} testobj {
 test stringObj-9.11 {TclAppendObjToObj, mixed src & 1-byte dest index check} testobj {
     # bug 2678, in <=8.2.0, the second obj (the one to append) in
     # Tcl_AppendObjToObj was not correctly checked to see if it was all one
-    # byte chars, so a unicode string would be added as one byte chars.
+    # byte chars, so a Unicode string would be added as one byte chars.
     set x abcdef
     set len [string length $x]
     set y a\u00fcb\u00e5c\u00ef
@@ -337,7 +337,7 @@ test stringObj-10.1 {Tcl_GetRange with all byte-size chars} {testobj testdstring
 } [list none bcde string string]
 test stringObj-10.2 {Tcl_GetRange with some mixed width chars} {testobj testdstring} {
     # Because this test does not use \uXXXX notation below instead of
-    # hardcoding the values, it may fail in multibyte locales. However, we
+    # hard-coding the values, it may fail in multibyte locales. However, we
     # need to test that the parser produces untyped objects even when there
     # are high-ASCII characters in the input (like "ï"). I don't know what
     # else to do but inline those characters here.
@@ -349,7 +349,7 @@ test stringObj-10.2 {Tcl_GetRange with some mixed width chars} {testobj testdstr
 } [list none "bc\u00EF\u00EFde" string string]
 test stringObj-10.3 {Tcl_GetRange with some mixed width chars} testobj {
     # set x "abcïïdef"
-    # Use \uXXXX notation below instead of hardcoding the values, otherwise
+    # Use \uXXXX notation below instead of hard-coding the values, otherwise
     # the test will fail in multibyte locales.
     set x "abc\u00EF\u00EFdef"
     string length $x
@@ -358,7 +358,7 @@ test stringObj-10.3 {Tcl_GetRange with some mixed width chars} testobj {
 } [list string "bc\u00EF\u00EFde" string string]
 test stringObj-10.4 {Tcl_GetRange with some mixed width chars} testobj {
     # set a "ïa¿b®cï¿d®"
-    # Use \uXXXX notation below instead of hardcoding the values, otherwise
+    # Use \uXXXX notation below instead of hard-coding the values, otherwise
     # the test will fail in multibyte locales.
     set a "\u00EFa\u00BFb\u00AEc\u00EF\u00BFd\u00AE"
     set result [list]
@@ -418,13 +418,13 @@ test stringObj-13.4 {Tcl_GetCharLength with mixed width chars} testobj {
 } 1
 test stringObj-13.5 {Tcl_GetCharLength with mixed width chars} testobj {
     # string length "￮￮"
-    # Use \uXXXX notation below instead of hardcoding the values, otherwise
+    # Use \uXXXX notation below instead of hard-coding the values, otherwise
     # the test will fail in multibyte locales.
     string length "\u00EF\u00BF\u00AE\u00EF\u00BF\u00AE"
 } 6
 test stringObj-13.6 {Tcl_GetCharLength with mixed width chars} testobj {
     # set a "ïa¿b®cï¿d®"
-    # Use \uXXXX notation below instead of hardcoding the values, otherwise
+    # Use \uXXXX notation below instead of hard-coding the values, otherwise
     # the test will fail in multibyte locales.
     set a "\u00EFa\u00BFb\u00AEc\u00EF\u00BFd\u00AE"
     list [string length $a] [string length $a]
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 075cdf6..d16c76b 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -542,20 +542,20 @@ test tcltest-8.2 {tcltest a.tcl -tmpdir thisdirectoryisafile} {
     -result {*not a directory*}
     -match glob
 }
-# Test non-writeable directories, non-readable directories with directory flags
+# Test non-writable directories, non-readable directories with directory flags
 set notReadableDir [file join [temporaryDirectory] notreadable]
-set notWriteableDir [file join [temporaryDirectory] notwriteable]
+set notWritableDir [file join [temporaryDirectory] notwritable]
 makeDirectory notreadable
-makeDirectory notwriteable
+makeDirectory notwritable
 switch -- $::tcl_platform(platform) {
     unix {
 	file attributes $notReadableDir -permissions 0o333
-	file attributes $notWriteableDir -permissions 0o555
+	file attributes $notWritableDir -permissions 0o555
     }
     default {
 	# note in FAT/NTFS we won't be able to protect directory with read-only attribute...
-	catch {file attributes $notWriteableDir -readonly 1}
-	catch {testchmod 0o444 $notWriteableDir}
+	catch {file attributes $notWritableDir -readonly 1}
+	catch {testchmod 0o444 $notWritableDir}
     }
 }
 test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
@@ -570,17 +570,17 @@ test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
 # This constraint doesn't go at the top of the file so that it doesn't
 # interfere with tcltest-5.5
 testConstraint notFAT [expr {
-       ![regexp {^(FAT\d*|NTFS)$} [lindex [file system $notWriteableDir] 1]]
+       ![regexp {^(FAT\d*|NTFS)$} [lindex [file system $notWritableDir] 1]]
     || $::tcl_platform(platform) eq "unix" || [llength [info commands testchmod]]
 }]
 # FAT/NTFS permissions are fairly hopeless; ignore this test if that FS is used
-test tcltest-8.4 {tcltest a.tcl -tmpdir notWriteableDir} {
+test tcltest-8.4 {tcltest a.tcl -tmpdir notWritableDir} {
     -constraints {unixOrWin notRoot notFAT notWsl}
     -body {
-	child msg $a -tmpdir $notWriteableDir
+	child msg $a -tmpdir $notWritableDir
 	return $msg
     }
-    -result {*not writeable*}
+    -result {*not writable*}
     -match glob
 }
 test tcltest-8.5 {tcltest a.tcl -tmpdir normaldirectory} {
@@ -720,15 +720,15 @@ test tcltest-8.60 {::workingDirectory}  {
 switch -- $::tcl_platform(platform) {
     unix {
 	file attributes $notReadableDir -permissions 0o777
-	file attributes $notWriteableDir -permissions 0o777
+	file attributes $notWritableDir -permissions 0o777
     }
     default {
-	catch {testchmod 0o777 $notWriteableDir}
-	catch {file attributes $notWriteableDir -readonly 0}
+	catch {testchmod 0o777 $notWritableDir}
+	catch {file attributes $notWritableDir -readonly 0}
     }
 }
 
-file delete -force -- $notReadableDir $notWriteableDir
+file delete -force -- $notReadableDir $notWritableDir
 removeFile a.tcl
 removeFile thisdirectoryisafile
 removeDirectory normaldirectory
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index 7389cc7..8ac3ccc 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -26,7 +26,7 @@ testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 set oldcwd [pwd]
 cd [temporaryDirectory]
 
-# Several tests require need to match results against the unix username
+# Several tests require need to match results against the Unix username
 set user {}
 if {[testConstraint unix]} {
     catch {set user [exec whoami]}
@@ -387,7 +387,7 @@ file delete -force -- foo.test
 test unixFCmd-18.1 {Unix pwd} -constraints {unix notRoot nonPortable} -setup {
     set cd [pwd]
 } -body {
-    # This test is nonPortable because SunOS generates a weird error
+    # This test is non-portable because SunOS generates a weird error
     # message when the current directory isn't readable.
     set nd $cd/tstdir
     file mkdir $nd
diff --git a/tests/unixForkEvent.test b/tests/unixForkEvent.test
index 5299db3..a4270d6 100644
--- a/tests/unixForkEvent.test
+++ b/tests/unixForkEvent.test
@@ -15,7 +15,7 @@ testConstraint testfork [llength [info commands testfork]]
 
 # Test if the notifier thread is well initialized in a forked interpreter
 # by Tcl_InitNotifier
-test unixforkevent-1.1 {fork and test writeable event} \
+test unixforkevent-1.1 {fork and test writable event} \
     -constraints {testfork nonPortable} \
     -body {
 	set myFolder [makeDirectory unixtestfork]
diff --git a/tests/winDde.test b/tests/winDde.test
index d97ff84..a526d0d 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -153,15 +153,15 @@ test winDde-3.5 {DDE request locally} -constraints dde -body {
     dde execute TclEval self [list set \xe1 foo]
     dde request -binary TclEval self \xe1
 } -result "foo\x00"
-# Set variable a to A with diaeresis (unicode C4) by relying on the fact
+# Set variable a to A with diaeresis (Unicode C4) by relying on the fact
 # that utf-8 is sent (e.g. "c3 84" on the wire)
 test winDde-3.6 {DDE request utf-8} -constraints dde -body {
     set \xe1 "not set"
     dde execute TclEval self "set \xe1 \xc4"
     scan [set \xe1] %c
 } -result 196
-# Set variable a to A with diaeresis (unicode C4) using binary execute
-# and compose utf-8 (e.g. "c3 84" ) manualy
+# Set variable a to A with diaeresis (Unicode C4) using binary execute
+# and compose utf-8 (e.g. "c3 84" ) manually
 test winDde-3.7 {DDE request binary} -constraints dde -body {
     set \xe1 "not set"
     dde execute -binary TclEval self [list set \xc3\xa1 \xc3\x84\x00]
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 83dfbf7..3d0a9e0 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -137,7 +137,7 @@ append longname $longname
 # Uses the "testfile" command instead of the "file" command.  The "file"
 # command provides several layers of sanity checks on the arguments and
 # it can be difficult to actually forward "insane" arguments to the
-# low-level posix emulation layer.
+# low-level Posix emulation layer.
 
 test winFCmd-1.1 {TclpRenameFile: errno: EACCES} -body {
     testfile mv $cdfile $cdrom/dummy~~.fil
diff --git a/tools/man2tcl.c b/tools/man2tcl.c
index 8e59bea..66562f9 100644
--- a/tools/man2tcl.c
+++ b/tools/man2tcl.c
@@ -52,7 +52,7 @@ static int status;
 
 /*
  * The variable below is set to 1 if output should be generated. If it's 0, it
- * means we're doing a pre-pass to make sure that the file can be properly
+ * means we're doing a prepass to make sure that the file can be properly
  * parsed.
  */
 
diff --git a/tools/mkdepend.tcl b/tools/mkdepend.tcl
index b1ad076..90a3b92 100644
--- a/tools/mkdepend.tcl
+++ b/tools/mkdepend.tcl
@@ -252,7 +252,7 @@ proc compressDeps {depends} {
 #	Adds a new set of path and replacement string to the global list.
 #
 # Arguments:
-#	newPathInfo	comma seperated path and replacement string
+#	newPathInfo	comma separated path and replacement string
 #
 # Results:
 #	None.
@@ -296,7 +296,7 @@ proc readInputListFile {objectListFile} {
     set fl [read $f]
     close $f
 
-    # fix native path seperator so it isn't treated as an escape.
+    # fix native path separator so it isn't treated as an escape.
     regsub -all {\\} $fl {/} fl
 
     # Treat the string as a list so filenames between double quotes are
diff --git a/tools/str2c b/tools/str2c
index 588abdf..e2c5208 100644
--- a/tools/str2c
+++ b/tools/str2c
@@ -29,7 +29,7 @@ proc translate {what} {
 set lg [string length $r]
 if {$lg<$MAX} {
     puts "/*
- * Single part writeable string generated by str2c
+ * Single part writable string generated by str2c
  */
 static char data\[\]=\"[translate $r]\";"
 } else {
diff --git a/unix/configure b/unix/configure
index 13877ad..e0777f3 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10165,7 +10165,7 @@ fi
 done
 
 # Nb: if getcwd uses popen and pwd(1) (like SunOS 4) we should really
-# define USEGETWD even if the posix getcwd exists. Add a test ?
+# define USEGETWD even if the Posix getcwd exists. Add a test ?
 
 
 
diff --git a/unix/configure.in b/unix/configure.in
index f84720e..14922a6 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -90,7 +90,7 @@ AC_C_INLINE
 #--------------------------------------------------------------------
 # Supply substitutes for missing POSIX header files.  Special notes:
 #	- stdlib.h doesn't define strtol, strtoul, or
-#	  strtod insome versions of SunOS
+#	  strtod in some versions of SunOS
 #	- some versions of string.h don't declare procedures such
 #	  as strstr
 # Do this early, otherwise an autoconf bug throws errors on configure
@@ -209,7 +209,7 @@ AC_C_BIGENDIAN
 # Check if Posix compliant getcwd exists, if not we'll use getwd.
 AC_CHECK_FUNCS(getcwd, , [AC_DEFINE(USEGETWD, 1, [Is getcwd Posix-compliant?])])
 # Nb: if getcwd uses popen and pwd(1) (like SunOS 4) we should really
-# define USEGETWD even if the posix getcwd exists. Add a test ?
+# define USEGETWD even if the Posix getcwd exists. Add a test ?
 
 AC_REPLACE_FUNCS(mkstemp opendir strtol waitpid)
 AC_CHECK_FUNC(strerror, , [AC_DEFINE(NO_STRERROR, 1, [Do we have strerror()])])
diff --git a/unix/install-sh b/unix/install-sh
index 21b733a..b6593f3 100755
--- a/unix/install-sh
+++ b/unix/install-sh
@@ -329,7 +329,7 @@ do
 	' 0
 
 	# Because "mkdir -p" follows existing symlinks and we likely work
-	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directly in world-writable /tmp, make sure that the '$tmpdir'
 	# directory is successfully created first before we actually test
 	# 'mkdir -p'.
 	if (umask $mkdir_umask &&
@@ -515,4 +515,4 @@ done
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
-# End:
\ No newline at end of file
+# End:
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 9330207..2f51226 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -1269,7 +1269,7 @@ TtyParseMode(
      *
      * We cannot if/else/endif the strchr arguments, it has to be the whole
      * function. On AIX this function is apparently a macro, and macros do
-     * not allow pre-processor directives in their arguments.
+     * not allow preprocessor directives in their arguments.
      */
 
     if (
@@ -1512,7 +1512,7 @@ TclpOpenFileChannel(
 Tcl_Channel
 Tcl_MakeFileChannel(
     ClientData handle,		/* OS level handle. */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
     FileState *fsPtr;
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 2034db9..853e93a 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -738,7 +738,7 @@ CopyGrp(
  *
  * CopyHostent --
  *
- *      Copies string fields of the hostnent structure to the private buffer,
+ *      Copies string fields of the hostent structure to the private buffer,
  *      honouring the size of the buffer.
  *
  * Results:
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 8660818..26429df 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -1,7 +1,7 @@
 /*
  * tclUnixFCmd.c
  *
- *	This file implements the unix specific portion of file manipulation
+ *	This file implements the Unix specific portion of file manipulation
  *	subcommands of the "file" command. All filename arguments should
  *	already be translated to native format.
  *
@@ -350,7 +350,7 @@ DoRenameFile(
     }
 
     /*
-     * IRIX returns EIO when you attept to move a directory into itself. We
+     * IRIX returns EIO when you attempt to move a directory into itself. We
      * just map EIO to EINVAL get the right message on SGI. Most platforms
      * don't return EIO except in really strange cases.
      */
@@ -740,7 +740,7 @@ DoCreateDirectory(
  *
  *	Recursively copies a directory. The target directory dst must not
  *	already exist. Note that this function does not merge two directory
- *	hierarchies, even if the target directory is an an empty directory.
+ *	hierarchies, even if the target directory is an empty directory.
  *
  * Results:
  *	If the directory was successfully copied, returns TCL_OK. Otherwise
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index c269079..1d1d729 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -693,7 +693,7 @@ TclpObjLstat(
  *	is either the given clientData, if the working directory hasn't
  *	changed, or a new clientData (owned by our caller), giving the new
  *	native path, or NULL if the current directory could not be determined.
- *	If NULL is returned, the caller can examine the standard posix error
+ *	If NULL is returned, the caller can examine the standard Posix error
  *	codes to determine the cause of the problem.
  *
  * Side effects:
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 2aae158..2d17027 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -479,7 +479,7 @@ TclpInitLibraryPath(
      * Look for the library relative to the TCL_LIBRARY env variable. If the
      * last dirname in the TCL_LIBRARY path does not match the last dirname in
      * the installLib variable, use the last dir name of installLib in
-     * addition to the orginal TCL_LIBRARY path.
+     * addition to the original TCL_LIBRARY path.
      */
 
     str = getenv("TCL_LIBRARY");			/* INTL: Native. */
@@ -996,7 +996,7 @@ TclpSetVariables(
  * TclpFindVariable --
  *
  *	Locate the entry in environ for a given name. On Unix this routine is
- *	case sensetive, on Windows this matches mixed case.
+ *	case sensitive, on Windows this matches mixed case.
  *
  * Results:
  *	The return value is the index in environ of an entry with the name
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 0a5712a..4655327 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -1452,7 +1452,7 @@ AtForkChild(void)
 
 	    /*
 	     * The tsdPtr from before the fork is copied as well.  But since
-	     * we are paranoic, we don't trust its condvar and reset it.
+	     * we are paranoiac, we don't trust its condvar and reset it.
 	     */
 #ifdef __CYGWIN__
 	    DestroyWindow(tsdPtr->hwnd);
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index 9d27632..75e2879 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -393,12 +393,12 @@ TclpCreateProcess(
 				 * receive no standard input. */
     TclFile outputFile,		/* If non-NULL, gives the file that receives
 				 * output from the child process. If
-				 * outputFile file is not writeable or is
+				 * outputFile file is not writable or is
 				 * NULL, output from the child will be
 				 * discarded. */
     TclFile errorFile,		/* If non-NULL, gives the file that receives
 				 * errors from the child process. If errorFile
-				 * file is not writeable or is NULL, errors
+				 * file is not writable or is NULL, errors
 				 * from the child will be discarded. errorFile
 				 * may be the same as outputFile. */
     Tcl_Pid *pidPtr)		/* If this function is successful, pidPtr is
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index ab2f55e..97caad0 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -513,7 +513,7 @@ extern int	gettimeofday(struct timeval *tp,
 
 /*
  *---------------------------------------------------------------------------
- * Not all systems declare the errno variable in errno.h. so this file does it
+ * Not all systems declare the errno variable in errno.h, so this file does it
  * explicitly. The list of system error messages also isn't generally declared
  * in a header file anywhere.
  *---------------------------------------------------------------------------
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 3c56a5e..6ca1293 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -40,7 +40,7 @@ typedef union {
 } address;
 
 /*
- * This structure describes per-instance state of a tcp based channel.
+ * This structure describes per-instance state of a tcp-based channel.
  */
 
 typedef struct TcpState TcpState;
@@ -54,7 +54,7 @@ typedef struct TcpFdList {
 struct TcpState {
     Tcl_Channel channel;	/* Channel associated with this file. */
     TcpFdList fds;		/* The file descriptors of the sockets. */
-    int flags;			/* ORed combination of the bitfields defined
+    int flags;			/* OR'ed combination of the bitfields defined
 				 * below. */
     int interest;		/* Event types of interest */
 
@@ -81,7 +81,7 @@ struct TcpState {
 };
 
 /*
- * These bits may be ORed together into the "flags" field of a TcpState
+ * These bits may be OR'ed together into the "flags" field of a TcpState
  * structure.
  */
 
@@ -399,17 +399,17 @@ TcpBlockModeProc(
  *
  *	Check the state of an async connect process. If a connection attempt
  *	terminated, process it, which may finalize it or may start the next
- *	attempt. If a connect error occures, it is saved in
+ *	attempt. If a connect error occurs, it is saved in
  *	statePtr->connectError to be reported by 'fconfigure -error'.
  *
  *	There are two modes of operation, defined by errorCodePtr:
- *	 *  non-NULL: Called by explicite read/write command. Blocks if the
+ *	 *  non-NULL: Called by explicit read/write command. Blocks if the
  *	    socket is blocking.
  *	    May return two error codes:
  *	     *	EWOULDBLOCK: if connect is still in progress
  *	     *	ENOTCONN: if connect failed. This would be the error message
- *		of a rect or sendto syscall so this is emulated here.
- *	 *  NULL: Called by a backround operation. Do not block and do not
+ *		of a recv or sendto syscall so this is emulated here.
+ *	 *  NULL: Called by a background operation. Do not block and do not
  *	    return any error code.
  *
  * Results:
@@ -441,7 +441,7 @@ WaitForConnect(
     }
 
     /*
-     * Check if an async connect is running. If not return ok
+     * Check if an async connect is running. If not return ok.
      */
 
     if (!GOT_BITS(statePtr->flags, TCP_ASYNC_PENDING)) {
@@ -1079,7 +1079,7 @@ TcpWatchProc(
 	 * socket file descriptor is writable when the other end of the socket
 	 * is closed.  This is in contrast to the guarantees Tcl makes that
 	 * its channels become writable and fire writable events on an error
-	 * conditon.  This has caused a leak of file descriptors in a state of
+	 * condition.  This has caused a leak of file descriptors in a state of
 	 * background flushing.  See Tcl ticket 1758a0b603.
 	 *
 	 * As a workaround, when our caller indicates an interest in writable
@@ -1484,7 +1484,7 @@ Tcl_MakeTcpClientChannel(
 void *
 TclpMakeTcpClientChannelMode(
     void *sock,		/* The socket to wrap up into a channel. */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
     TcpState *statePtr;
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index 9b89b2f..92ea830 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -724,7 +724,7 @@ TestgotsigCmd(
  *
  *	Implements the "testchmod" cmd.  Used when testing "file" command.
  *	The only attribute used by the Windows platform is the user write
- *	flag; if this is not set, the file is made read-only.  Otehrwise, the
+ *	flag; if this is not set, the file is made read-only.  Otherwise, the
  *	file is made read-write.
  *
  * Results:
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index dcd9abe..bea092c 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -17,7 +17,7 @@
 #include "tclInt.h"
 
 /*
- * This structure is used to keep track of the notifier info for a a
+ * This structure is used to keep track of the notifier info for a
  * registered file.
  */
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 33a1e2c..7b0f209 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -518,7 +518,7 @@ ${TEST_EXE_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} tclTestMain.${OBJEXT}
         tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
 	$(COPY) tclsh.exe.manifest ${TEST_EXE_FILE}.manifest
 
-# use pre-built zlib1.dll
+# use prebuilt zlib1.dll
 ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
 	@if test "@ZLIB_LIBS@set" = "${ZLIB_DIR_NATIVE}/win64-arm/zdll.libset" ; then \
 		$(COPY) $(ZLIB_DIR)/win64-arm/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
diff --git a/win/coffbase.txt b/win/coffbase.txt
index 3314f26..a0ea5cf 100644
--- a/win/coffbase.txt
+++ b/win/coffbase.txt
@@ -1,10 +1,10 @@
 ;
 ; This file defines the virtual base addresses for the Dynamic Link Libraries
 ; that are part of the Tcl system.  The first token on a line is the key (or name
-; of the DLL) and the second token is the virtual base address, in hexidecimal.
+; of the DLL) and the second token is the virtual base address, in hexadecimal.
 ; The third token is the maximum size of the DLL image file, including symbols.
 ;
-; Using a specified "prefered load address" should speed loading time by avoiding
+; Using a specified "preferred load address" should speed loading time by avoiding
 ; relocations (NT supported only).  It is assumed extension authors will contribute
 ; their modules to this grand-master list.  You can use the dumpbin utility with
 ; the /headers option to get the "size of image" data (already in hex).  If the
diff --git a/win/makefile.vc b/win/makefile.vc
index aa5dd54..f8facb1 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -109,7 +109,7 @@
 #		Hooks to allow the intermediate and output directories to be
 #		changed.  $(OUT_DIR) is assumed to be
 #		$(BINROOT)\(Release|Debug) based on if symbols are requested.
-#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
+#		$(TMP_DIR) will be $(OUT_DIR)\<buildtype> by default.
 #
 #	TESTPAT=<file>
 #		Reads the tests requested to be run from this file.
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 2dc33cc..0ebaf63 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -219,13 +219,13 @@ CheckForCompilerFeature(
     sa.bInheritHandle = FALSE;
 
     /*
-     * Create a non-inheritible pipe.
+     * Create a non-inheritable pipe.
      */
 
     CreatePipe(&Out.pipe, &h, &sa, 0);
 
     /*
-     * Dupe the write side, make it inheritible, and close the original.
+     * Dupe the write side, make it inheritable, and close the original.
      */
 
     DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
@@ -361,7 +361,7 @@ CheckForLinkerFeature(
     CreatePipe(&Out.pipe, &h, &sa, 0);
 
     /*
-     * Dupe the write side, make it inheritible, and close the original.
+     * Dupe the write side, make it inheritable, and close the original.
      */
 
     DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
@@ -593,7 +593,7 @@ list_free(list_item_t **listPtrPtr)
  * SubstituteFile --
  *	As windows doesn't provide anything useful like sed and it's unreliable
  *	to use the tclsh you are building against (consider x-platform builds -
- *	eg compiling AMD64 target from IX86) we provide a simple substitution
+ *	e.g. compiling AMD64 target from IX86) we provide a simple substitution
  *	option here to handle autoconf style substitutions.
  *	The substitution file is whitespace and line delimited. The file should
  *	consist of lines matching the regular expression:
@@ -619,7 +619,7 @@ SubstituteFile(
     if (fp != NULL) {
 
 	/*
-	 * Build a list of substutitions from the first filename
+	 * Build a list of substitutions from the first filename
 	 */
 
 	sp = fopen(substitutions, "rt");
diff --git a/win/rules.vc b/win/rules.vc
index 8d28b10..0dfe609 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1344,7 +1344,7 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # and switches are specific to it.
 # The following macros are defined, names are for historical compatibility:
 # OPTDEFINES - /Dxxx C macro flags based on user-specified OPTS
-# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration opttions
+# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration options
 # crt - Compiler switch that selects the appropriate C runtime
 # cdebug - Compiler switches related to debug AND optimizations
 # cwarn - Compiler switches that set warning levels
diff --git a/win/tcl.m4 b/win/tcl.m4
index d5105cb..a0797e8 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -1181,7 +1181,7 @@ AC_DEFUN([SC_WITH_TCL], [
 #	none
 #
 # Results
-#	Subst's the following values:
+#	Substitutes the following values:
 #		TCLSH_PROG
 #------------------------------------------------------------------------
 
@@ -1227,7 +1227,7 @@ AC_DEFUN([SC_PROG_TCLSH], [
 #	none
 #
 # Results
-#	Subst's the following values:
+#	Substitutes the following values:
 #		BUILD_TCLSH
 #------------------------------------------------------------------------
 
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 5604204..6308930 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -935,7 +935,7 @@ TclpOpenFileChannel(
 	}
 
 	/*
-	* For natively named Windows serial ports we are done.
+	* For natively-named Windows serial ports we are done.
 	*/
 	channel = TclWinOpenSerialChannel(handle, channelName,
 		channelPermissions);
@@ -1071,7 +1071,7 @@ TclpOpenFileChannel(
 Tcl_Channel
 Tcl_MakeFileChannel(
     ClientData rawHandle,	/* OS level handle */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
 #if defined(HAVE_NO_SEH) && !defined(_WIN64) && !defined(__clang__)
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index b9b81f8..facdb01 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -1405,7 +1405,7 @@ ConsoleThreadActionProc(
     /*
      * We do not access firstConsolePtr in the thread structures. This is not
      * for all serials managed by the thread, but only those we are watching.
-     * Removal of the filevent handlers before transfer thus takes care of
+     * Removal of the fileevent handlers before transfer thus takes care of
      * this structure.
      */
 
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 678eed3..deeb9d4 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -868,7 +868,7 @@ DdeServerProc(
     case XTYP_EXECUTE: {
 	/*
 	 * Execute this script. The results will be saved into a list object
-	 * which will be retreived later. See ExecuteRemoteObject.
+	 * which will be retrieved later. See ExecuteRemoteObject.
 	 */
 
 	Tcl_Obj *returnPackagePtr;
@@ -891,13 +891,13 @@ DdeServerProc(
 	    /* Empty binary array. */
 	    ddeObjectPtr = Tcl_NewObj();
 	} else if ((dlen & 1) || utilString[(dlen>>1)-1]) {
-	    /* Cannot be unicode, so assume utf-8 */
+	    /* Cannot be Unicode, so assume utf-8 */
 	    if (!string[dlen-1]) {
 		dlen--;
 	    }
 	    ddeObjectPtr = Tcl_NewStringObj(string, dlen);
 	} else {
-	    /* unicode */
+	    /* Unicode */
 	    Tcl_DString dsBuf;
 
 	    Tcl_DStringInit(&dsBuf);
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 595f6b7..13d9ed8 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -877,7 +877,7 @@ DoCreateDirectory(
  *
  *	Recursively copies a directory. The target directory dst must not
  *	already exist. Note that this function does not merge two directory
- *	hierarchies, even if the target directory is an an empty directory.
+ *	hierarchies, even if the target directory is an empty directory.
  *
  * Results:
  *	If the directory was successfully copied, returns TCL_OK. Otherwise
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index efd2104..3b1ff76 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -1680,7 +1680,7 @@ NativeAccess(
 	}
 
 	/*
-	 * We cannnot verify the access fast, check it below using security
+	 * We cannot verify the access fast, check it below using security
 	 * info.
 	 */
     }
@@ -1800,7 +1800,7 @@ NativeAccess(
 	RevertToSelf();
 
 	/*
-	 * Setup desiredAccess according to the access priveleges we are
+	 * Setup desiredAccess according to the access privileges we are
 	 * checking.
 	 */
 
@@ -2056,7 +2056,7 @@ NativeStat(
      * 'getFileAttributesExProc', and if that isn't available, then on even
      * simpler routines.
      *
-     * Special consideration must be given to Windows hardcoded names like
+     * Special consideration must be given to Windows hard-coded names like
      * CON, NULL, COM1, LPT1 etc. For these, we still need to do the
      * CreateFile as some may not exist (e.g. there is no CON in wish by
      * default). However the subsequent GetFileInformationByHandle will
@@ -2345,7 +2345,7 @@ FromCTime(
  *	is either the given clientData, if the working directory hasn't
  *	changed, or a new clientData (owned by our caller), giving the new
  *	native path, or NULL if the current directory could not be determined.
- *	If NULL is returned, the caller can examine the standard posix error
+ *	If NULL is returned, the caller can examine the standard Posix error
  *	codes to determine the cause of the problem.
  *
  * Side effects:
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 3aadf7a..d512e73 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -163,7 +163,7 @@ TclpInitLibraryPath(
      * Look for the library relative to the TCL_LIBRARY env variable. If the
      * last dirname in the TCL_LIBRARY path does not match the last dirname in
      * the installLib variable, use the last dir name of installLib in
-     * addition to the orginal TCL_LIBRARY path.
+     * addition to the original TCL_LIBRARY path.
      */
 
     AppendEnvironment(pathPtr, installLib);
@@ -240,8 +240,8 @@ AppendEnvironment(
     }
 
     /*
-     * The "L" preceeding the TCL_LIBRARY string is used to tell VC++ that
-     * this is a unicode string.
+     * The "L" preceding the TCL_LIBRARY string is used to tell VC++ that
+     * this is a Unicode string.
      */
 
     GetEnvironmentVariableW(L"TCL_LIBRARY", wBuf, MAX_PATH);
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index 2542476..83db956 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -14,7 +14,7 @@
 #include "tclInt.h"
 
 /*
- * The follwing static indicates whether this module has been initialized.
+ * The following static indicates whether this module has been initialized.
  */
 
 #define INTERVAL_TIMER	1	/* Handle of interval timer. */
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 6c1331f..8b707fa 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -922,12 +922,12 @@ TclpCreateProcess(
 				 * receive no standard input. */
     TclFile outputFile,		/* If non-NULL, gives the file that receives
 				 * output from the child process. If
-				 * outputFile file is not writeable or is
+				 * outputFile file is not writable or is
 				 * NULL, output from the child will be
 				 * discarded. */
     TclFile errorFile,		/* If non-NULL, gives the file that receives
 				 * errors from the child process. If errorFile
-				 * file is not writeable or is NULL, errors
+				 * file is not writable or is NULL, errors
 				 * from the child will be discarded. errorFile
 				 * may be the same as outputFile. */
     Tcl_Pid *pidPtr)		/* If this function is successful, pidPtr is
@@ -3156,7 +3156,7 @@ PipeThreadActionProc(
     /*
      * We do not access firstPipePtr in the thread structures. This is not for
      * all pipes managed by the thread, but only those we are watching.
-     * Removal of the filevent handlers before transfer thus takes care of
+     * Removal of the fileevent handlers before transfer thus takes care of
      * this structure.
      */
 
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 87b33e1..d54ead2 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -773,7 +773,7 @@ GetValue(
      * length to TCL_DSTRING_STATIC_SIZE, but this should be safer if the
      * implementation of Dstrings changes.
      *
-     * This allows short values to be read from the registy in one call.
+     * This allows short values to be read from the registry in one call.
      * Longer values need a second call with an expanded DString.
      */
 
@@ -867,7 +867,7 @@ GetValue(
  *
  * GetValueNames --
  *
- *	This function enumerates the values of the a given key. If the
+ *	This function enumerates the values of the given key. If the
  *	optional pattern is supplied, then only value names that match the
  *	pattern will be returned.
  *
@@ -1002,7 +1002,7 @@ OpenKey(
  *
  * OpenSubKey --
  *
- *	This function opens a given subkey of a root key on the specified
+ *	Opens a given subkey of the given root key on the specified
  *	host.
  *
  * Results:
@@ -1087,7 +1087,7 @@ OpenSubKey(
  *
  * ParseKeyName --
  *
- *	This function parses a key name into the host, root, and subkey parts.
+ *	Parses a key name into the host, root, and subkey parts.
  *
  * Results:
  *	The pointers to the start of the host and subkey names are returned in
@@ -1466,7 +1466,7 @@ BroadcastValue(
  *
  * AppendSystemError --
  *
- *	This routine formats a Windows system error message and places it into
+ *	Formats a Windows system error message and places it into
  *	the interpreter result.
  *
  * Results:
@@ -1539,7 +1539,7 @@ AppendSystemError(
  *
  * ConvertDWORD --
  *
- *	This function determines whether a DWORD needs to be byte swapped, and
+ *	Determines whether a DWORD needs to be byte swapped, and
  *	returns the appropriately swapped value.
  *
  * Results:
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 53d2daf..155312b 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -328,7 +328,7 @@ ProcExitHandler(
  *
  * SerialBlockTime --
  *
- *	Wrapper to set Tcl's block time in msec
+ *	Wrapper to set Tcl's block time in msec.
  *
  * Results:
  *	None.
@@ -902,7 +902,7 @@ SerialInputProc(
 	    }
 	} else {
 	    /*
-	     * BLOCKING mode: Tcl trys to read a full buffer of 4 kBytes here.
+	     * BLOCKING mode: Tcl tries to read a full buffer of 4 kBytes here.
 	     */
 
 	    if (cStat.cbInQue > 0) {
@@ -971,9 +971,9 @@ SerialOutputProc(
     *errorCode = 0;
 
     /*
-     * At EXIT Tcl trys to flush all open channels in blocking mode. We avoid
+     * At EXIT Tcl tries to flush all open channels in blocking mode. We avoid
      * blocking output after ExitProc or CloseHandler(chan) has been called by
-     * checking the corrresponding variables.
+     * checking the corresponding variables.
      */
 
     if (!initialized || TclInExit()) {
@@ -2218,7 +2218,7 @@ SerialThreadActionProc(
     /*
      * We do not access firstSerialPtr in the thread structures. This is not
      * for all serials managed by the thread, but only those we are watching.
-     * Removal of the filevent handlers before transfer thus takes care of
+     * Removal of the fileevent handlers before transfer thus takes care of
      * this structure.
      */
 
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 1c13479..abe8321 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -121,7 +121,7 @@ typedef union {
 #endif
 
 /*
- * This structure describes per-instance state of a tcp based channel.
+ * This structure describes per-instance state of a tcp-based channel.
  */
 
 typedef struct TcpState TcpState;
@@ -177,7 +177,7 @@ struct TcpState {
 };
 
 /*
- * These bits may be ORed together into the "flags" field of a TcpState
+ * These bits may be OR'ed together into the "flags" field of a TcpState
  * structure.
  */
 
@@ -573,8 +573,8 @@ TcpBlockModeProc(
  *	    May return two error codes:
  *	     *	EWOULDBLOCK: if connect is still in progress
  *	     *	ENOTCONN: if connect failed. This would be the error message
- *		of a rect or sendto syscall so this is emulated here.
- *	 *  Null: Called by a backround operation. Do not block and don't
+ *		of a recv or sendto syscall so this is emulated here.
+ *	 *  Null: Called by a background operation. Do not block and don't
  *	    return any error code.
  *
  * Results:
@@ -647,7 +647,7 @@ WaitForConnect(
 
 	    /*
 	     * For blocking sockets and foreground processing, disable async
-	     * connect as we continue now synchoneously.
+	     * connect as we continue now synchronously.
 	     */
 
 	    if (errorCodePtr != NULL &&
@@ -662,7 +662,7 @@ WaitForConnect(
 	    SetEvent(tsdPtr->socketListLock);
 
 	    /*
-	     * Continue connect. If switched to synchroneous connect, the
+	     * Continue connect. If switched to synchronous connect, the
 	     * connect is terminated.
 	     */
 
@@ -675,7 +675,7 @@ WaitForConnect(
 	    (void) Tcl_SetServiceMode(oldMode);
 
 	    /*
-	     * Check for Succesfull connect or async connect restart
+	     * Check for Successful connect or async connect restart
 	     */
 
 	    if (result == TCL_OK) {
@@ -846,7 +846,7 @@ TcpInputProc(
 
 	/*
 	 * If an RST comes, then ignore the error and report an EOF just like
-	 * on unix.
+	 * on Unix.
 	 */
 
 	if (error == WSAECONNRESET) {
@@ -1296,7 +1296,7 @@ TcpGetOptionProc(
     /*
      * Go one step in async connect
      *
-     * If any error is thrown save it as backround error to report eventually
+     * If any error is thrown save it as background error to report eventually
      * below.
      */
     WaitForConnect(statePtr, NULL);
@@ -1853,7 +1853,7 @@ TcpConnect(
 
 	    if (async_connect && error == WSAEWOULDBLOCK) {
 		/*
-		 * Asynchroneous connect
+		 * Asynchronous connect
 		 *
 		 * Remember that we jump back behind this next round
 		 */
@@ -1922,7 +1922,7 @@ TcpConnect(
 
     if (Tcl_GetErrno() == 0) {
 	/*
-	 * Succesfully connected
+	 * Successfully connected
 	 *
 	 * Set up the select mask for read/write events.
 	 */
@@ -1981,7 +1981,7 @@ TcpConnect(
 	}
 
 	/*
-	 * Error message on synchroneous connect
+	 * Error message on synchronous connect
 	 */
 
 	if (interp != NULL) {
@@ -3057,7 +3057,7 @@ WaitForSocketEvent(
 	WaitForSingleObject(tsdPtr->socketListLock, INFINITE);
 
 	/*
-	 * Check if event occured.
+	 * Check if event occurred.
 	 */
 
 	event_found = GOT_BITS(statePtr->readyEvents, events);
@@ -3069,7 +3069,7 @@ WaitForSocketEvent(
 	SetEvent(tsdPtr->socketListLock);
 
 	/*
-	 * Exit loop if event occured.
+	 * Exit loop if event occurred.
 	 */
 
 	if (event_found) {
@@ -3174,7 +3174,7 @@ SocketThread(
  *
  * Side effects:
  *	The flags for the given socket are updated to reflect the event that
- *	occured.
+ *	occurred.
  *
  *----------------------------------------------------------------------
  */
@@ -3324,7 +3324,7 @@ SocketProc(
  *
  * FindFDInList --
  *
- *	Return true, if the given file descriptior is contained in the
+ *	Return true, if the given file descriptor is contained in the
  *	file descriptor list.
  *
  * Results:
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index 65c4b3c..dffb5b6 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -783,9 +783,9 @@ Tcl_ConditionWait(
 	    timeout = 0;
 	} else {
 	    /*
-	     * When dequeuing, we can leave the tsdPtr->nextPtr and
+	     * When dequeueing, we can leave the tsdPtr->nextPtr and
 	     * tsdPtr->prevPtr with dangling pointers because they are
-	     * reinitialilzed w/out reading them when the thread is enqueued
+	     * reinitialized w/out reading them when the thread is enqueued
 	     * later.
 	     */
 
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index ed58824..d77609f 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -598,7 +598,7 @@ NativeGetMicroseconds(void)
 
 	if (curCounter.QuadPart <= perfCounterLastCall) {
 	    /*
-	     * Calibrated file-time is saved from posix in 100-ns ticks
+	     * Calibrated file-time is saved from Posix in 100-ns ticks
 	     */
 
 	    return fileTimeLastCall / 10;
@@ -617,7 +617,7 @@ NativeGetMicroseconds(void)
 	if (curCounter.QuadPart - perfCounterLastCall <
 		11 * curCounterFreq * timeInfo.calibrationInterv / 10
 	) {
-	    /* Calibrated file-time is saved from posix in 100-ns ticks */
+	    /* Calibrated file-time is saved from Posix in 100-ns ticks */
 	    return NativeCalc100NsTicks(fileTimeLastCall,
 		perfCounterLastCall, curCounterFreq, curCounter.QuadPart) / 10;
 	}
@@ -754,7 +754,7 @@ TclpGetDate(
 	 */
 
 	/*
-	 * Hm, Borland's localtime manages to return NULL under certain
+	 * Hmm, Borland's localtime manages to return NULL under certain
 	 * circumstances (e.g. wintime.test, test 1.2). Nobody tests for this,
 	 * since 'localtime' isn't supposed to do this, possibly leading to
 	 * crashes.
@@ -985,7 +985,7 @@ CalibrationThread(
     QueryPerformanceFrequency(&timeInfo.curCounterFreq);
     timeInfo.fileTimeLastCall.LowPart = curFileTime.dwLowDateTime;
     timeInfo.fileTimeLastCall.HighPart = curFileTime.dwHighDateTime;
-    /* Calibrated file-time will be saved from posix in 100-ns ticks */
+    /* Calibrated file-time will be saved from Posix in 100-ns ticks */
     timeInfo.fileTimeLastCall.QuadPart -= timeInfo.posixEpoch.QuadPart;
 
     ResetCounterSamples(timeInfo.fileTimeLastCall.QuadPart,
@@ -1058,7 +1058,7 @@ UpdateTimeEachSecond(void)
 				 * step over 1 second. */
 
     /*
-     * Sample performance counter and system time (from posix epoch).
+     * Sample performance counter and system time (from Posix epoch).
      */
 
     GetSystemTimeAsFileTime(&curSysTime);
@@ -1078,7 +1078,7 @@ UpdateTimeEachSecond(void)
     lastFileTime.QuadPart = curFileTime.QuadPart;
 
     /*
-     * We devide by timeInfo.curCounterFreq.QuadPart in several places. That
+     * We divide by timeInfo.curCounterFreq.QuadPart in several places. That
      * value should always be positive on a correctly functioning system. But
      * it is good to be defensive about such matters. So if something goes
      * wrong and the value does goes to zero, we clear the
-- 
cgit v0.12


From 55375d0dfe6e47bdd9c469574414eb7153d66aef Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Apr 2023 12:48:12 +0000
Subject: 2 more spelling fixes, but undo fixes in compat/zlib: Please report
 them upstream, otherwise they will re-appear here every time zlib is updated
 to a newer version.

---
 ChangeLog.2007                            | 2 +-
 compat/zlib/ChangeLog                     | 2 +-
 compat/zlib/contrib/iostream3/zfstream.cc | 2 +-
 generic/tclCompExpr.c                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.2007 b/ChangeLog.2007
index a28a5cb..404bc4d 100644
--- a/ChangeLog.2007
+++ b/ChangeLog.2007
@@ -1426,7 +1426,7 @@
 	initialization assumptions of the TIP 280 code in CompileWord().
 
 	* generic/tclCompExpr.c:	Suppress the attempt to convert to
-	numeric when precompiling a constant expresion indicates an error.
+	numeric when precompiling a constant expression indicates an error.
 
 2007-08-22  Miguel Sofer  <msofer@users.sf.net>
 
diff --git a/compat/zlib/ChangeLog b/compat/zlib/ChangeLog
index bd4540d..457526b 100644
--- a/compat/zlib/ChangeLog
+++ b/compat/zlib/ChangeLog
@@ -847,7 +847,7 @@ Changes in 1.2.1.2 (9 September 2004)
 - Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
 - Update contrib/ada [Anisimkov]
 - Update contrib/minizip [Vollant]
-- Fix configure to not hard-code directories for Darwin [Peterson]
+- Fix configure to not hardcode directories for Darwin [Peterson]
 - Fix gzio.c to not return error on empty files [Brown]
 - Fix indentation; update version in contrib/delphi/ZLib.pas and
   contrib/pascal/zlibpas.pas [Truta]
diff --git a/compat/zlib/contrib/iostream3/zfstream.cc b/compat/zlib/contrib/iostream3/zfstream.cc
index 5779874..94eb933 100644
--- a/compat/zlib/contrib/iostream3/zfstream.cc
+++ b/compat/zlib/contrib/iostream3/zfstream.cc
@@ -138,7 +138,7 @@ gzfilebuf::open_mode(std::ios_base::openmode mode,
   bool testa = mode & std::ios_base::app;
 
   // Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
-  // Original zfstream hard-coded the compression level to maximum here...
+  // Original zfstream hardcoded the compression level to maximum here...
   // Double the time for less than 1% size improvement seems
   // excessive though - keeping it at the default level
   // To change back, just append "9" to the next three mode strings
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 44baf0e..4e145b8 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -1759,7 +1759,7 @@ ConvertTreeToTokens(
 
 		/*
 		 * All the Tcl_Tokens allocated and filled belong to
-		 * this subexpresion. The first token is the leading
+		 * this subexpression. The first token is the leading
 		 * TCL_TOKEN_SUB_EXPR token, and all the rest (one fewer)
 		 * are its components.
 		 */
-- 
cgit v0.12


From cf6c56c88d5339f1a4106b80aa7209ee5f061e50 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 12 Apr 2023 13:30:39 +0000
Subject: Correct spelling errors in comments and documentation, but also a
 non-comment corrections in history.tcl and tcltest.test.

---
 ChangeLog                                 | 12 ++---
 ChangeLog.1999                            |  2 +-
 ChangeLog.2000                            | 14 ++---
 ChangeLog.2002                            | 14 ++---
 ChangeLog.2003                            |  2 +-
 ChangeLog.2004                            | 10 ++--
 ChangeLog.2005                            |  2 +-
 ChangeLog.2007                            | 10 ++--
 ChangeLog.2008                            |  4 +-
 changes                                   |  8 +--
 compat/zlib/ChangeLog                     |  2 +-
 compat/zlib/contrib/iostream3/zfstream.cc |  2 +-
 doc/Cancel.3                              |  4 +-
 doc/Ensemble.3                            |  4 +-
 doc/Eval.3                                |  6 +--
 doc/FileSystem.3                          |  4 +-
 doc/OpenFileChnl.3                        |  2 +-
 doc/SubstObj.3                            |  2 +-
 doc/info.n                                |  2 +-
 doc/memory.n                              |  2 +-
 doc/namespace.n                           |  2 +-
 doc/next.n                                |  2 +-
 doc/pkgMkIndex.n                          |  2 +-
 doc/tcltest.n                             |  4 +-
 generic/regc_nfa.c                        | 10 ++--
 generic/regguts.h                         |  4 +-
 generic/tcl.decls                         |  2 +-
 generic/tclAlloc.c                        |  6 +--
 generic/tclBasic.c                        | 24 ++++-----
 generic/tclBinary.c                       |  8 +--
 generic/tclCmdIL.c                        |  8 +--
 generic/tclCmdMZ.c                        | 10 ++--
 generic/tclCompCmds.c                     | 12 ++---
 generic/tclCompCmdsGR.c                   |  6 +--
 generic/tclCompCmdsSZ.c                   |  2 +-
 generic/tclCompExpr.c                     |  8 +--
 generic/tclCompile.c                      |  6 +--
 generic/tclCompile.h                      |  2 +-
 generic/tclConfig.c                       |  2 +-
 generic/tclDate.c                         |  2 +-
 generic/tclDictObj.c                      | 12 ++---
 generic/tclEncoding.c                     |  2 +-
 generic/tclEnsemble.c                     |  2 +-
 generic/tclEnv.c                          |  2 +-
 generic/tclEvent.c                        |  4 +-
 generic/tclExecute.c                      | 10 ++--
 generic/tclFCmd.c                         |  2 +-
 generic/tclFileName.c                     |  4 +-
 generic/tclIO.c                           | 58 ++++++++++----------
 generic/tclIO.h                           |  8 +--
 generic/tclIOCmd.c                        |  2 +-
 generic/tclIOGT.c                         | 14 ++---
 generic/tclIORChan.c                      | 26 ++++-----
 generic/tclIORTrans.c                     | 26 ++++-----
 generic/tclIOUtil.c                       |  7 ++-
 generic/tclIndexObj.c                     |  2 +-
 generic/tclInt.h                          | 22 ++++----
 generic/tclIntPlatDecls.h                 |  2 +-
 generic/tclInterp.c                       |  6 +--
 generic/tclLink.c                         |  2 +-
 generic/tclListObj.c                      | 89 ++++++++++++++++---------------
 generic/tclLiteral.c                      |  4 +-
 generic/tclNamesp.c                       |  6 +--
 generic/tclNotify.c                       | 12 ++---
 generic/tclOO.c                           |  4 +-
 generic/tclOOCall.c                       |  2 +-
 generic/tclOOMethod.c                     |  2 +-
 generic/tclObj.c                          | 14 ++---
 generic/tclPanic.c                        |  2 +-
 generic/tclParse.c                        |  8 +--
 generic/tclPathObj.c                      |  4 +-
 generic/tclPipe.c                         |  4 +-
 generic/tclPkg.c                          |  4 +-
 generic/tclStrToD.c                       |  6 +--
 generic/tclStringObj.c                    | 70 ++++++++++++------------
 generic/tclStringRep.h                    |  2 +-
 generic/tclTest.c                         |  6 +--
 generic/tclThreadAlloc.c                  |  2 +-
 generic/tclThreadJoin.c                   |  4 +-
 generic/tclThreadTest.c                   |  2 +-
 generic/tclTrace.c                        | 14 ++---
 generic/tclUtf.c                          |  2 +-
 generic/tclUtil.c                         |  4 +-
 generic/tclVar.c                          |  4 +-
 generic/tclZlib.c                         |  2 +-
 library/auto.tcl                          |  8 +--
 library/clock.tcl                         |  8 +--
 library/history.tcl                       |  2 +-
 library/http/http.tcl                     |  6 +--
 library/init.tcl                          |  2 +-
 library/msgcat/msgcat.tcl                 |  5 +-
 library/opt/optparse.tcl                  | 22 ++++----
 library/package.tcl                       |  6 +--
 library/platform/platform.tcl             |  2 +-
 library/platform/shell.tcl                |  8 +--
 library/safe.tcl                          | 12 ++---
 library/tcltest/tcltest.tcl               | 32 +++++------
 library/tm.tcl                            | 18 +++----
 library/word.tcl                          |  2 +-
 libtommath/changes.txt                    |  2 +-
 macosx/GNUmakefile                        |  4 +-
 macosx/tclMacOSXFCmd.c                    |  2 +-
 macosx/tclMacOSXNotify.c                  |  2 +-
 tests/appendComp.test                     |  2 +-
 tests/chanio.test                         | 10 ++--
 tests/clock.test                          |  2 +-
 tests/cmdAH.test                          |  4 +-
 tests/cmdMZ.test                          |  4 +-
 tests/compile.test                        |  2 +-
 tests/dict.test                           |  2 +-
 tests/env.test                            |  8 +--
 tests/error.test                          |  2 +-
 tests/eval.test                           |  4 +-
 tests/event.test                          |  2 +-
 tests/exec.test                           |  2 +-
 tests/expr.test                           |  2 +-
 tests/fCmd.test                           |  8 +--
 tests/fileName.test                       |  2 +-
 tests/fileSystem.test                     |  2 +-
 tests/for.test                            |  4 +-
 tests/indexObj.test                       |  2 +-
 tests/internals.tcl                       |  2 +-
 tests/io.test                             |  6 +--
 tests/ioCmd.test                          |  2 +-
 tests/ioTrans.test                        |  6 +--
 tests/iogt.test                           |  2 +-
 tests/mathop.test                         |  2 +-
 tests/msgcat.test                         |  8 +--
 tests/ooNext2.test                        |  2 +-
 tests/pkgMkIndex.test                     |  4 +-
 tests/remote.tcl                          |  2 +-
 tests/resolver.test                       |  2 +-
 tests/safe-stock.test                     |  4 +-
 tests/safe.test                           |  4 +-
 tests/scan.test                           |  2 +-
 tests/socket.test                         |  8 +--
 tests/stringObj.test                      |  6 +--
 tests/tcltest.test                        | 28 +++++-----
 tests/unixFCmd.test                       |  4 +-
 tests/unixForkEvent.test                  |  2 +-
 tests/winDde.test                         |  6 +--
 tests/winFCmd.test                        |  2 +-
 tools/mkdepend.tcl                        |  4 +-
 unix/configure                            |  2 +-
 unix/install-sh                           |  4 +-
 unix/tclUnixChan.c                        |  4 +-
 unix/tclUnixCompat.c                      |  2 +-
 unix/tclUnixFCmd.c                        |  6 +--
 unix/tclUnixFile.c                        |  2 +-
 unix/tclUnixInit.c                        |  4 +-
 unix/tclUnixNotfy.c                       |  2 +-
 unix/tclUnixPipe.c                        |  4 +-
 unix/tclUnixPort.h                        |  2 +-
 unix/tclUnixSock.c                        | 20 +++----
 unix/tclUnixTest.c                        |  2 +-
 unix/tclXtNotify.c                        |  2 +-
 win/Makefile.in                           |  2 +-
 win/makefile.vc                           |  2 +-
 win/nmakehlp.c                            | 10 ++--
 win/rules.vc                              |  2 +-
 win/tcl.m4                                |  4 +-
 win/tclWinChan.c                          |  4 +-
 win/tclWinDde.c                           |  6 +--
 win/tclWinFCmd.c                          |  2 +-
 win/tclWinFile.c                          |  8 +--
 win/tclWinInit.c                          |  6 +--
 win/tclWinNotify.c                        |  2 +-
 win/tclWinPipe.c                          |  6 +--
 win/tclWinReg.c                           | 12 ++---
 win/tclWinSerial.c                        | 10 ++--
 win/tclWinSock.c                          | 32 +++++------
 win/tclWinThrd.c                          |  4 +-
 win/tclWinTime.c                          | 10 ++--
 173 files changed, 608 insertions(+), 601 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61e3e04..b189086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1382,7 +1382,7 @@ a better first place to look now.
 
 2012-05-03  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* compat/zlib/*: Upgrade to zlib 1.2.7 (pre-built dll is still 1.2.5,
+	* compat/zlib/*: Upgrade to zlib 1.2.7 (prebuilt dll is still 1.2.5,
 	will be upgraded as soon as the official build is available)
 
 2012-05-03  Don Porter  <dgp@users.sourceforge.net>
@@ -5482,7 +5482,7 @@ a better first place to look now.
 	* generic/tclIORChan.c (ReflectClose, ReflectInput, ReflectOutput,
 	(ReflectSeekWide, ReflectWatch, ReflectBlock, ReflectSetOption,
 	(ReflectGetOption, ForwardProc): [Bug 2978773]: Preserve
-	ReflectedChannel* structures across handler invokations, to avoid
+	ReflectedChannel* structures across handler invocations, to avoid
 	crashes when the handler implementation induces nested callbacks and
 	destruction of the channel deep inside such a nesting.
 
@@ -6363,7 +6363,7 @@ a better first place to look now.
 2009-12-28  Donal K. Fellows  <dkf@users.sf.net>
 
 	* unix/Makefile.in (trace-shell, trace-test): [FRQ 1083288]: Added
-	targets to allow easier tracing of shell and test invokations.
+	targets to allow easier tracing of shell and test invocations.
 
 	* unix/configure.in: [Bug 942170]:	Detect the st_blocks field of
 	* generic/tclCmdAH.c (StoreStatData):	'struct stat' correctly.
@@ -6847,7 +6847,7 @@ a better first place to look now.
 
 	* unix/tclUnixChan.c (TtyParseMode): Partial undo of Donal's tidy-up
 	from a few days ago (2009-11-9, not in ChangeLog). It seems that
-	strchr is apparently a macro on AIX and reacts badly to pre-processor
+	strchr is apparently a macro on AIX and reacts badly to preprocessor
 	directives in its arguments.
 
 2009-11-16  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
@@ -7141,7 +7141,7 @@ a better first place to look now.
 	package-* that were for building Solaris packages.  Appears that the
 	pieces needed for these targets to function have never been present in
 	the current era of Tcl development and belong completely to Tcl
-	pre-history.
+	prehistory.
 
 2009-10-19  Don Porter  <dgp@users.sourceforge.net>
 
@@ -8709,7 +8709,7 @@ a better first place to look now.
 2009-01-19  David Gravereaux  <davygrvy@pobox.com>
 
 	* win/build.vc.bat: Improved tools detection and error message
-	* win/makefile.vc: Reorganized the $(TCLOBJ) file list into seperate
+	* win/makefile.vc: Reorganized the $(TCLOBJ) file list into separate
 	parts for easier maintenance. Matched all sources built using -GL to
 	both $(lib) and $(link) to use -LTCG and avoid a warning message.
 	Addressed the over-building nature of the htmlhelp target by moving
diff --git a/ChangeLog.1999 b/ChangeLog.1999
index 3bf4e9a..e736dee 100644
--- a/ChangeLog.1999
+++ b/ChangeLog.1999
@@ -388,7 +388,7 @@
 	the beginning of the test run
 
 	* tests/basic.test: Use version information defined in tcltest instead
-	of hardcoded version number
+	of hard-coded version number
 
 	* tests/socket.test: package require tcltest before attempting to use
 	variable defined in tcltest namespace
diff --git a/ChangeLog.2000 b/ChangeLog.2000
index 7e78c19..e22dff9 100644
--- a/ChangeLog.2000
+++ b/ChangeLog.2000
@@ -103,7 +103,7 @@
 	119398]
 
 	* library/init.tcl (unknown): Added specific level parameters to
-	all uplevel invokations to boost performance; didn't dare touch
+	all uplevel invocation to boost performance; didn't dare touch
 	the "namespace inscope" stuff though, since it looks sensitive
 	to me!  Should fix [Bug 123217], though testing is tricky...
 
@@ -348,7 +348,7 @@
 	makeFile/makeDirectory and removeFile/removeDirectory.
 
 	* tests/basic.test: Changed references to tcltest::tclVersion to
-	hardcoded numbers.
+	hard-coded numbers.
 	* generic/tcl.h: Changed reference to tcltest2.tcl and tcltest.tcl in
 	comments to tests/basic.test.
 
@@ -1121,7 +1121,7 @@
 
 2000-06-27  Eric Melski  <ericm@scriptics.com>
 
-	* tests/stringObj.test: Tweaked tests to avoid hardcoded high-ASCII
+	* tests/stringObj.test: Tweaked tests to avoid hard-coded high-ASCII
 	characters (which will fail in multibyte locales); instead used \uXXXX
 	syntax. [Bug: 3842].
 
@@ -1546,7 +1546,7 @@
 	* unix/mkLinks: Regen'd with new mkLinks.tcl.
 
 	* unix/mkLinks.tcl: Fixed indentation, made link setup more
-	intelligent (only do one existance test per man page, instead of one
+	intelligent (only do one existence test per man page, instead of one
 	per function).
 
 	* doc/library.n: Fixed .SH NAME macro to include each function
@@ -1641,7 +1641,7 @@
 2000-04-21  Brent Welch <welch@scriptics.com>
 
 	* library/http2.1/http.tcl: More thrashing with the "server closes
-	without reading post data" scenario. Reverted to the previous filevent
+	without reading post data" scenario. Reverted to the previous fileevent
 	configuratiuon, which seems to work better with small amounts of post
 	data.
 
@@ -2267,7 +2267,7 @@
 	* library/auto.tcl: Fixed the regular expression that performs $
 	escaping before sourcing a file to index. It was erroneously adding \
 	escapes even to $'s that were already escaped, effectively
-	"un-escaping" those $'s. (bug #2611).
+	"unescaping" those $'s. (bug #2611).
 
 2000-01-27  Eric Melski  <ericm@scriptics.com>
 
@@ -2378,7 +2378,7 @@
 
 	* generic/tclVar.c: Changed behavior of variable command when name
 	refers to an element in an array (ie, "variable foo(x)") to always
-	return an error, regardless of existance of that element in the array
+	return an error, regardless of existence of that element in the array
 	(now behavior is consistant with docs too) (bug #981).
 
 2000-01-20  Jeff Hobbs  <hobbs@scriptics.com>
diff --git a/ChangeLog.2002 b/ChangeLog.2002
index fa31e42..9534476 100644
--- a/ChangeLog.2002
+++ b/ChangeLog.2002
@@ -15,7 +15,7 @@
 	* tests/winPipe.test:
 	* win/tclWinPipe.c (Tcl_WaitPid):
 	* win/tclWinTest.c:  Gave Tcl_WaitPid the ability to return a Win32
-	exception code translated into a posix style SIG*. This allows [close]
+	exception code translated into a Posix-style SIG*. This allows [close]
 	to report "CHILDKILLED" without the meaning getting lost in a
 	truncated exit code. In TclCleanupChildren(), TclpGetPid() had to get
 	moved to before Tcl_WaitPid() as the the handle is removed from the
@@ -1941,7 +1941,7 @@
 
 	* tests/pkg/samename.tcl: restored. needed by pkgMkIndex.test.
 
-	* library/tcltest/tcltest.tcl: restored writeability testing of
+	* library/tcltest/tcltest.tcl: restored writability testing of
 	-tmpdir, augmented by a special exception for the deafault value.
 
 2002-07-01  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
@@ -1959,9 +1959,9 @@
 	* tests/info.test:	[temporaryDirectory] of tcltest.
 	* tests/interp.test:
 
-	* library/tcltest/tcltest.tcl:	Stopped checking for writeability of
+	* library/tcltest/tcltest.tcl:	Stopped checking for writability of
 	-tmpdir value because no default directory can be guaranteed to be
-	writeable.
+	writable.
 
 	* tests/autoMkindex.tcl: removed.
 	* tests/pkg/samename.tcl: removed.
@@ -2469,7 +2469,7 @@
 	thread-safe *_r counterparts are not available.
 	* unix/tcl.m4: added configure check for readdir_r
 	* unix/tcl.m4 (Darwin): set TCL_DEFAULT_ENCODING to utf-8 on MacOSX
-	(where posix file apis expect utf-8, not iso8859-1).
+	(where Posix file apis expect utf-8, not iso8859-1).
 	* unix/configure: regen
 	* unix/Makefile.in: set DYLD_LIBRARY_PATH in parallel to
 	LD_LIBRARY_PATH for MacOSX dynamic linker.
@@ -3683,7 +3683,7 @@
 
 	* win/tclAppInit.c: Changed #include "tcl.h" to be tclPort.h to remove
 	the raw windows.h include. tclPort.h brings in windows.h already and
-	lessens the pre-compiled-header mush and the randomly useless #pragma
+	lessens the precompiled-header mush and the randomly useless #pragma
 	comment (lib,...) references throughout the big windows.h tree (as
 	observed at high linker warning levels).
 
@@ -3793,7 +3793,7 @@
 	* generic/tclIO.c: Large-file support (with many consequences.)
 	* compat/strtoll.c, compat/strtoull.c: New support functions.
 	* unix/tcl.m4, unix/configure: 64-bit support and greatly enhanced
-	cacheing.
+	caching.
 
 	Most other changes, including all those in doc/* and test/* as well as
 	the majority in the platform directories, follow on from these.
diff --git a/ChangeLog.2003 b/ChangeLog.2003
index ec4109f..d0f4ebc 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -268,7 +268,7 @@
 	recently fixed by 2003-11-15 commit to regcomp.c by Pavel Goran. His
 	notes on the fix: This bug results from an error in code that splits
 	states into "progress" and "no-progress" ones. This error causes an
-	interesting situation with the pre-collected single-linked list of
+	interesting situation with the precollected single-linked list of
 	states to be splitted: many items were added to the list, but only
 	several of them are accessible from the list beginning, since the
 	"tmp" member of struct state (which is used here to hold a pointer to
diff --git a/ChangeLog.2004 b/ChangeLog.2004
index 550e286..e237382 100644
--- a/ChangeLog.2004
+++ b/ChangeLog.2004
@@ -377,7 +377,7 @@
 	strstr, strtoul and strtod.
 	* unix/tcl.m4 (SC_TCL_CHECK_BROKEN_FUNC): Split a complex stanza out
 	of configure.in into its own function. Also force it to do the right
-	thing with cacheing of results of AC_TRY_RUN to deal with issue raised
+	thing with caching of results of AC_TRY_RUN to deal with issue raised
 	in [Patch 1073524]
 
 	* doc/foreach.n: Added simple example. [FRQ 1073334]
@@ -1975,7 +1975,7 @@
 	* doc/FileSystem.3:
 	* generic/tclIOUtil.c: Clarified documentation regarding ability of a
 	filesystem to say that it doesn't support a given operation using the
-	EXDEV posix error code (copyFileProc, renameFileProc, etc), and
+	EXDEV Posix error code (copyFileProc, renameFileProc, etc), and
 	updated one piece of code to ensure correct behaviour when an
 	operation is not supported [Bug 1017072]
 
@@ -2277,7 +2277,7 @@
 	with vfs [Bug 991420].
 	* tests/fileSystem.test: added test for above bug.
 
-	* doc/FileSystem.3: clarified documentation of posix error codes in
+	* doc/FileSystem.3: clarified documentation of Posix error codes in
 	'remove directory' FS proc - 'EEXIST' is used to signify a non-empty
 	directory error (bug reported against tclvfs).
 
@@ -4339,7 +4339,7 @@
 	provided by the c-runtime. [Bug 672938]
 
 	* win/nmakehlp.c: defensive techniques to avoid static buffer
-	overflows and a couple envars upsetting invokations of cl.exe and
+	overflows and a couple envars upsetting invocations of cl.exe and
 	link.exe. [Bug 885537]
 
 	* tests/winPipe.test: Added proof that BuildCommandLine() is not doing
@@ -4548,7 +4548,7 @@
 	dictionary is computed at compile time (when it is fully known). The
 	dictionary is pushed on the stack along with the result, and the code
 	and level values are included in the bytecode as operands. Also
-	supports optimized compilation of un-[catch]ed [return]s from procs
+	supports optimized compilation of un[catch]ed [return]s from procs
 	with default options into the INST_DONE instruction.
 
 	* generic/tclExecute.c: Rewrote INST_RETURN instruction to retrieve
diff --git a/ChangeLog.2005 b/ChangeLog.2005
index 109ea8e..f2d1b65 100644
--- a/ChangeLog.2005
+++ b/ChangeLog.2005
@@ -229,7 +229,7 @@
 	***POTENTIAL INCOMPATIBILITY*** for bytecode savers/loaders. See below
 
 	* generic/tclCompCmds.c (TclCompileSwitchCmd): Arrange for very simple
-	[switch] invokations to be compiled into hash lookups into jump tables;
+	[switch] invocations to be compiled into hash lookups into jump tables;
 	only a very specific kind of [switch] can be safely compiled this way,
 	but that happens to be the most common kind. This makes around 5-10%
 	difference to the speed of execution of clock.test.
diff --git a/ChangeLog.2007 b/ChangeLog.2007
index b01db6a..404bc4d 100644
--- a/ChangeLog.2007
+++ b/ChangeLog.2007
@@ -1426,7 +1426,7 @@
 	initialization assumptions of the TIP 280 code in CompileWord().
 
 	* generic/tclCompExpr.c:	Suppress the attempt to convert to
-	numeric when pre-compiling a constant expression indicates an error.
+	numeric when precompiling a constant expression indicates an error.
 
 2007-08-22  Miguel Sofer  <msofer@users.sf.net>
 
@@ -2827,8 +2827,8 @@
 2007-03-24  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
 
 	* win/tclWinThrd.c: Thread exit handler marks the current thread as
-	un-initialized. This allows exit handlers that are registered later to
-	re-initialize this subsystem in case they need to use some sync
+	uninitialized. This allows exit handlers that are registered later to
+	reinitialize this subsystem in case they need to use some sync
 	primitives (cond variables) from this file again.
 
 2007-03-23  Miguel Sofer  <msofer@users.sf.net>
@@ -4938,7 +4938,7 @@
 
 	Misc patches to make code more efficient. [Bug 1530474] (afredd)
 	* generic/*.c, macosx/tclMacOSXNotify.c, unix/tclUnixNotfy.c,
-	* win/tclWinThrd.c: Tidy up invokations of Tcl_Panic() to promote
+	* win/tclWinThrd.c: Tidy up invocations of Tcl_Panic() to promote
 	string constant sharing and consistent style.
 	* generic/tclBasic.c (Tcl_CreateInterp): More efficient handling of
 	* generic/tclClock.c (TclClockInit):	 registration of commands not
@@ -5016,7 +5016,7 @@
 
 2006-07-24  Don Porter	<dgp@users.sourceforge.net>
 
-	* win/tclWinSock.c:	Correct un-initialized Tcl_DString. Thanks to
+	* win/tclWinSock.c:	Correct uninitialized Tcl_DString. Thanks to
 	afredd. [Bug 1518166]
 
 2006-07-21  Miguel Sofer  <msofer@users.sf.net>
diff --git a/ChangeLog.2008 b/ChangeLog.2008
index 53690e4..7df6cbc 100644
--- a/ChangeLog.2008
+++ b/ChangeLog.2008
@@ -1207,7 +1207,7 @@
 	* generic/tcl.decls, doc/Ensemble.3, doc/namespace.n
 	* tests/namespace.test: Allow the handling of a (fixed) number of
 	formal parameters between an ensemble's command and subcommand at
-	invokation time. [Patch 1901783]
+	invocation time. [Patch 1901783]
 
 2008-09-28  Miguel Sofer  <msofer@users.sf.net>
 
@@ -3252,7 +3252,7 @@
 2008-03-21  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/switch.n: Clarified documentation in respect of two-argument
-	invokation. [Bug 1899962]
+	invocation. [Bug 1899962]
 
 	* tests/switch.test: Added more tests of regexp-mode compilation of
 	the [switch] command. [Bug 1854435]
diff --git a/changes b/changes
index ecd098e..75642de 100644
--- a/changes
+++ b/changes
@@ -3028,7 +3028,7 @@ in case of errors is required for proper cleanup by the user of fcopy. (BW)
 	x eval rename foo blotz
 	x alias foo {}
 The problem was that the interp code was not using the actual current name
-of the command to be deleted as a result of un-aliasing foo. (JL)
+of the command to be deleted as a result of unaliasing foo. (JL)
 
 6/19/97 (feature change) Pass interp down to the ChannelOption and
 driver specific calls so system errors can be differentiated from syntax
@@ -4167,7 +4167,7 @@ Only.)  This fix included:
 the location of the encoding files and libraries.  This fix included:
     - Adding the TclSetPerInitScript routine.
     - Modifying the Tcl_Init routines to evaluate the non-NULL
-      pre-init script.
+      preinit script.
     - Adding the Tcl_SetdefaultEncodingDir and Tcl_GetDefaultEncodingDir
       routines.
     - Modifying the TclpInitLibrary routines to append the default
@@ -6977,7 +6977,7 @@ of traced command do not fire (sofer)
 
 2007-08-16 (bug fix)[1773040] ::errorInfo trace crash (janssen,porter)
 
-2007-08-16 (performance)[1564517] pre-compile constant expressions (porter)
+2007-08-16 (performance)[1564517] precompile constant expressions (porter)
 
 2007-08-21 (bug fix)[1775878] 'puts \' in interactive tclsh failed to move to
 prompt for continuation line (porter)
@@ -8685,7 +8685,7 @@ improvements to regexp engine from Postgres (lane,porter,fellows,seltenreich)
 
 2016-07-08 (bug)[a47641] [file normalize] & Windows junctions (nadkarni)
 
-2016-07-09 [ae61a6] [file] handling of Win hardcoded names (CON) (nadkarni)
+2016-07-09 [ae61a6] [file] handling of Win hard-coded names (CON) (nadkarni)
         *** POTENTIAL INCOMPATIBILITY ***
 
 2016-07-09 [3613671] [file owned] (more) useful on Win (nadkarni)
diff --git a/compat/zlib/ChangeLog b/compat/zlib/ChangeLog
index 457526b..bd4540d 100644
--- a/compat/zlib/ChangeLog
+++ b/compat/zlib/ChangeLog
@@ -847,7 +847,7 @@ Changes in 1.2.1.2 (9 September 2004)
 - Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
 - Update contrib/ada [Anisimkov]
 - Update contrib/minizip [Vollant]
-- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix configure to not hard-code directories for Darwin [Peterson]
 - Fix gzio.c to not return error on empty files [Brown]
 - Fix indentation; update version in contrib/delphi/ZLib.pas and
   contrib/pascal/zlibpas.pas [Truta]
diff --git a/compat/zlib/contrib/iostream3/zfstream.cc b/compat/zlib/contrib/iostream3/zfstream.cc
index 94eb933..5779874 100644
--- a/compat/zlib/contrib/iostream3/zfstream.cc
+++ b/compat/zlib/contrib/iostream3/zfstream.cc
@@ -138,7 +138,7 @@ gzfilebuf::open_mode(std::ios_base::openmode mode,
   bool testa = mode & std::ios_base::app;
 
   // Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
-  // Original zfstream hardcoded the compression level to maximum here...
+  // Original zfstream hard-coded the compression level to maximum here...
   // Double the time for less than 1% size improvement seems
   // excessive though - keeping it at the default level
   // To change back, just append "9" to the next three mode strings
diff --git a/doc/Cancel.3 b/doc/Cancel.3
index 73edaf6..027fb09 100644
--- a/doc/Cancel.3
+++ b/doc/Cancel.3
@@ -26,7 +26,7 @@ Error message to use in the cancellation, or NULL to use a default message. If
 not NULL, this object will have its reference count decremented before
 \fBTcl_CancelEval\fR returns.
 .AP int flags in
-ORed combination of flag bits that specify additional options.
+OR'ed combination of flag bits that specify additional options.
 For \fBTcl_CancelEval\fR, only \fBTCL_CANCEL_UNWIND\fR is currently
 supported.  For \fBTcl_Canceled\fR, only \fBTCL_LEAVE_ERR_MSG\fR and
 \fBTCL_CANCEL_UNWIND\fR are currently supported.
@@ -47,7 +47,7 @@ Extensions can use this function to check to see if they should abort a long
 running command.  This function is thread sensitive and may only be called
 from the thread the interpreter was created in.
 .SS "FLAG BITS"
-Any ORed combination of the following values may be used for the
+Any OR'ed combination of the following values may be used for the
 \fIflags\fR argument to procedures such as \fBTcl_CancelEval\fR:
 .TP 20
 \fBTCL_CANCEL_UNWIND\fR
diff --git a/doc/Ensemble.3 b/doc/Ensemble.3
index b768fd6..71a53ac 100644
--- a/doc/Ensemble.3
+++ b/doc/Ensemble.3
@@ -69,14 +69,14 @@ The name of the ensemble command to be created.
 The namespace to which the ensemble command is to be bound, or NULL
 for the current namespace.
 .AP int ensFlags in
-An ORed set of flag bits describing the basic configuration of the
+An OR'ed set of flag bits describing the basic configuration of the
 ensemble. Currently only one bit has meaning, \fBTCL_ENSEMBLE_PREFIX\fR,
 which is present when the ensemble command should also match
 unambiguous prefixes of subcommands.
 .AP Tcl_Obj *cmdNameObj in
 A value holding the name of the ensemble command to look up.
 .AP int flags in
-An ORed set of flag bits controlling the behavior of
+An OR'ed set of flag bits controlling the behavior of
 \fBTcl_FindEnsemble\fR. Currently only \fBTCL_LEAVE_ERR_MSG\fR is supported.
 .AP Tcl_Command token in
 A normal command token that refers to an ensemble command, or which
diff --git a/doc/Eval.3 b/doc/Eval.3
index 02a8da5..bccb696 100644
--- a/doc/Eval.3
+++ b/doc/Eval.3
@@ -49,7 +49,7 @@ modified to hold the result or error message from the script.
 .AP Tcl_Obj *objPtr in
 A Tcl value containing the script to execute.
 .AP int flags in
-ORed combination of flag bits that specify additional options.
+OR'ed combination of flag bits that specify additional options.
 \fBTCL_EVAL_GLOBAL\fR and \fBTCL_EVAL_DIRECT\fR are currently supported.
 .AP "const char" *fileName in
 Name of a file containing a Tcl script.
@@ -107,7 +107,7 @@ in code for string comparison, you can use
 which will be safely substituted by the Tcl interpreter into
 .QW ^Z .
 .PP
-\fBTcl_EvalObjv\fR executes a single pre-parsed command instead of a
+\fBTcl_EvalObjv\fR executes a single preparsed command instead of a
 script.  The \fIobjc\fR and \fIobjv\fR arguments contain the values
 of the words for the Tcl command, one word in each value in
 \fIobjv\fR.  \fBTcl_EvalObjv\fR evaluates the command and returns
@@ -159,7 +159,7 @@ in practice. This function is deprecated and will be removed in Tcl 9.0.
 
 .SH "FLAG BITS"
 .PP
-Any ORed combination of the following values may be used for the
+Any OR'ed combination of the following values may be used for the
 \fIflags\fR argument to procedures such as \fBTcl_EvalObjEx\fR:
 .TP 23
 \fBTCL_EVAL_DIRECT\fR
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index e7cc4ab..7cbbded 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -233,7 +233,7 @@ The value to set in the operation.
 .AP Tcl_Obj **objPtrRef out
 Filled with a value containing the result of the operation.
 .AP Tcl_Obj *resultPtr out
-Pre-allocated value in which to store (using
+Preallocated value in which to store (using
 \fBTcl_ListObjAppendElement\fR) the list of
 files or directories which are successfully matched.
 .AP int mode in
@@ -483,7 +483,7 @@ is a Tcl_Obj specifying the contents of the symbolic link given by
 by the caller, which should call \fBTcl_DecrRefCount\fR when the result is no
 longer needed. If the \fItoPtr\fR is not NULL, Tcl should create a link
 of one of the types passed in in the \fIlinkAction\fR flag. This flag is
-an ORed combination of \fBTCL_CREATE_SYMBOLIC_LINK\fR and \fBTCL_CREATE_HARD_LINK\fR.
+an OR'ed combination of \fBTCL_CREATE_SYMBOLIC_LINK\fR and \fBTCL_CREATE_HARD_LINK\fR.
 Where a choice exists (i.e.\ more than one flag is passed in), the Tcl
 convention is to prefer symbolic links. When a link is successfully
 created, the return value should be \fItoPtr\fR (which is therefore
diff --git a/doc/OpenFileChnl.3 b/doc/OpenFileChnl.3
index e8ed521..1c6f619 100644
--- a/doc/OpenFileChnl.3
+++ b/doc/OpenFileChnl.3
@@ -599,7 +599,7 @@ their possible values are described in the manual entry for the Tcl
 \fBfconfigure\fR command. Other options can be added by each channel type.
 These channel type specific options are described in the manual entry for
 the Tcl command that creates a channel of that type; for example, the
-additional options for TCP based channels are described in the manual entry
+additional options for TCP-based channels are described in the manual entry
 for the Tcl \fBsocket\fR command.
 The procedure normally returns \fBTCL_OK\fR. If an error occurs, it returns
 \fBTCL_ERROR\fR and calls \fBTcl_SetErrno\fR to store an appropriate POSIX
diff --git a/doc/SubstObj.3 b/doc/SubstObj.3
index fa30fb1..f10e01d 100644
--- a/doc/SubstObj.3
+++ b/doc/SubstObj.3
@@ -24,7 +24,7 @@ message.
 .AP Tcl_Obj *objPtr in
 A Tcl value containing the string to perform substitutions on.
 .AP int flags in
-ORed combination of flag bits that specify which substitutions to
+OR'ed combination of flag bits that specify which substitutions to
 perform.  The flags \fBTCL_SUBST_COMMANDS\fR,
 \fBTCL_SUBST_VARIABLES\fR and \fBTCL_SUBST_BACKSLASHES\fR are
 currently supported, and \fBTCL_SUBST_ALL\fR is provided as a
diff --git a/doc/info.n b/doc/info.n
index 86263db..8a61ba9 100644
--- a/doc/info.n
+++ b/doc/info.n
@@ -172,7 +172,7 @@ The body of a script provided to \fBeval\fR or \fBuplevel\fR.
 .TP
 \fBprecompiled\fR\0\0\0\0\0\0\0\0
 .
-A pre-compiled script (loadable by the package
+A precompiled script (loadable by the package
 \fBtbcload\fR), and no further information is available.
 .RE
 .TP
diff --git a/doc/memory.n b/doc/memory.n
index 4d6a7d1..fc3ff99 100644
--- a/doc/memory.n
+++ b/doc/memory.n
@@ -41,7 +41,7 @@ of packets and bytes allocated.
 .TP
 \fBmemory init \fR[\fBon\fR|\fBoff\fR]
 .
-Turn on or off the pre-initialization of all allocated memory
+Turn on or off the preinitialization of all allocated memory
 with bogus bytes.  Useful for detecting the use of uninitialized
 values.
 .TP
diff --git a/doc/namespace.n b/doc/namespace.n
index 3196cac..1773555 100644
--- a/doc/namespace.n
+++ b/doc/namespace.n
@@ -161,7 +161,7 @@ this command first finds the matching exported commands.
 It then checks whether any of those commands
 were previously imported by the current namespace.
 If so, this command deletes the corresponding imported commands.
-In effect, this un-does the action of a \fBnamespace import\fR command.
+In effect, this undoes the action of a \fBnamespace import\fR command.
 .TP
 \fBnamespace import \fR?\fB\-force\fR? ?\fIpattern\fR \fIpattern ...\fR?
 .
diff --git a/doc/next.n b/doc/next.n
index f731335..624e058 100644
--- a/doc/next.n
+++ b/doc/next.n
@@ -96,7 +96,7 @@ forward to the proper implementation of the method (which it does by invoking
 the \fBnext\fR command as filters are inserted into the front of the method
 call chain) and is responsible for returning the result of \fBnext\fR.
 .PP
-Filters are invoked when processing an invokation of the \fBunknown\fR
+Filters are invoked when processing an invocation of the \fBunknown\fR
 method because of a failure to locate a method implementation, but \fInot\fR
 when invoking either constructors or destructors. (Note however that the
 \fBdestroy\fR method is a conventional method, and filters are invoked as
diff --git a/doc/pkgMkIndex.n b/doc/pkgMkIndex.n
index 5a6b905..f98cbcd 100644
--- a/doc/pkgMkIndex.n
+++ b/doc/pkgMkIndex.n
@@ -108,7 +108,7 @@ it immediately upon \fBpackage require\fR.  This is not compatible with
 the use of \fIauto_reset\fR, and therefore its use is discouraged.
 .TP 15
 \fB\-load \fIpkgPat\fR
-The index process will pre-load any packages that exist in the
+The index process will preload any packages that exist in the
 current interpreter and match \fIpkgPat\fR into the child interpreter used to
 generate the index.  The pattern match uses string match rules, but without
 making case distinctions.
diff --git a/doc/tcltest.n b/doc/tcltest.n
index 5a53699..965ed64 100644
--- a/doc/tcltest.n
+++ b/doc/tcltest.n
@@ -625,14 +625,14 @@ the test suite is being run on a Unix platform.
 .PP
 Each \fBtest\fR should include whatever \fB\-constraints\fR are
 required to constrain it to run only where appropriate.  Several
-constraints are pre-defined in the \fBtcltest\fR package, listed
+constraints are predefined in the \fBtcltest\fR package, listed
 below.  The registration of user-defined constraints is performed
 by the \fBtestConstraint\fR command.  User-defined constraints
 may appear within a test file, or within the script specified
 by the \fBconfigure \-load\fR or \fBconfigure \-loadfile\fR
 options.
 .PP
-The following is a list of constraints pre-defined by the
+The following is a list of constraints predefined by the
 \fBtcltest\fR package itself:
 .TP
 \fIsingleTestInterp\fR
diff --git a/generic/regc_nfa.c b/generic/regc_nfa.c
index f676a45..71bcb09 100644
--- a/generic/regc_nfa.c
+++ b/generic/regc_nfa.c
@@ -487,7 +487,7 @@ freearc(
 /*
  * changearctarget - flip an arc to have a different to state
  *
- * Caller must have verified that there is no pre-existing duplicate arc.
+ * Caller must have verified that there is no preexisting duplicate arc.
  *
  * Note that because we store arcs in their from state, we can't easily have
  * a similar changearcsource function.
@@ -1515,7 +1515,7 @@ pullback(
  * Returns 1 if successful (which it always is unless the source is the
  * start state or we have an internal error), 0 if nothing happened.
  *
- * A significant property of this function is that it deletes no pre-existing
+ * A significant property of this function is that it deletes no preexisting
  * states, and no outarcs of the constraint's from state other than the given
  * constraint arc.  This makes the loops in pullback() safe, at the cost that
  * we may leave useless states behind.  Therefore, we leave it to pullback()
@@ -1694,7 +1694,7 @@ pushfwd(
  * Returns 1 if successful (which it always is unless the destination is the
  * post state or we have an internal error), 0 if nothing happened.
  *
- * A significant property of this function is that it deletes no pre-existing
+ * A significant property of this function is that it deletes no preexisting
  * states, and no inarcs of the constraint's to state other than the given
  * constraint arc.  This makes the loops in pushfwd() safe, at the cost that
  * we may leave useless states behind.  Therefore, we leave it to pushfwd()
@@ -2467,7 +2467,7 @@ breakconstraintloop(struct nfa * nfa, struct state * sinitial)
  * have multiple redundant arc pathways).  Each donemap is a char array
  * indexed by state number.  The donemaps are all of the same size "nstates",
  * which is nfa->nstates as of the start of the recursion.  This is enough to
- * have entries for all pre-existing states, but *not* entries for clone
+ * have entries for all preexisting states, but *not* entries for clone
  * states created during the recursion.  That's okay since we have no need to
  * mark those.
  *
@@ -2774,7 +2774,7 @@ markcanreach(
  - analyze - ascertain potentially-useful facts about an optimized NFA
  ^ static long analyze(struct nfa *);
  */
-static long			/* re_info bits to be ORed in */
+static long			/* re_info bits to be OR'ed in */
 analyze(
     struct nfa *nfa)
 {
diff --git a/generic/regguts.h b/generic/regguts.h
index de5d18e..62ab889 100644
--- a/generic/regguts.h
+++ b/generic/regguts.h
@@ -258,10 +258,10 @@ struct state {
 };
 
 struct nfa {
-    struct state *pre;		/* pre-initial state */
+    struct state *pre;		/* preinitial state */
     struct state *init;		/* initial state */
     struct state *final;	/* final state */
-    struct state *post;		/* post-final state */
+    struct state *post;		/* postfinal state */
     int nstates;		/* for numbering states */
     struct state *states;	/* state-chain header */
     struct state *slast;	/* tail of the chain */
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 7f7fafb..6278bd3 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -59,7 +59,7 @@ declare 8 {
 	    const char *file, int line)
 }
 
-# Tcl_CreateFileHandler and Tcl_DeleteFileHandler are only available on unix,
+# Tcl_CreateFileHandler and Tcl_DeleteFileHandler are only available on Unix,
 # but they are part of the old generic interface, so we include them here for
 # compatibility reasons.
 
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index 03655b9..800b0ae 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -116,7 +116,7 @@ static struct block bigBlocks={	/* Big blocks aren't suballocated. */
 
 /*
  * The allocator is protected by a special mutex that must be explicitly
- * initialized. Futhermore, because Tcl_Alloc may be used before anything else
+ * initialized. Furthermore, because Tcl_Alloc may be used before anything else
  * in Tcl, we make this module self-initializing after all with the allocInit
  * variable.
  */
@@ -511,7 +511,7 @@ TclpFree(
 
 void *
 TclpRealloc(
-    void *oldPtr,		/* Pointer to alloced block. */
+    void *oldPtr,		/* Pointer to alloc'ed block. */
     unsigned int numBytes)	/* New size of memory. */
 {
     int i;
@@ -610,7 +610,7 @@ TclpRealloc(
     }
 
     /*
-     * Ok, we don't have to copy, it fits as-is
+     * No need to copy. It fits as-is.
      */
 
 #ifndef NDEBUG
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 616600f..abc5d60 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -1053,7 +1053,7 @@ Tcl_CreateInterp(void)
     /*
      * Create the core commands. Do it here, rather than calling
      * Tcl_CreateCommand, because it's faster (there's no need to check for a
-     * pre-existing command by the same name). If a command has a Tcl_CmdProc
+     * preexisting command by the same name). If a command has a Tcl_CmdProc
      * but no Tcl_ObjCmdProc, set the Tcl_ObjCmdProc to
      * TclInvokeStringCommand. This is an object-based wrapper function that
      * extracts strings, calls the string function, and creates an object for
@@ -2253,15 +2253,15 @@ Tcl_HideCommand(
     }
 
     /*
-     * NB: This code is currently 'like' a rename to a specialy set apart name
+     * NB: This code is currently 'like' a rename to a special separate name
      * table. Changes here and in TclRenameCommand must be kept in synch until
      * the common parts are actually factorized out.
      */
 
     /*
      * Remove the hash entry for the command from the interpreter command
-     * table. This is like deleting the command, so bump its command epoch;
-     * this invalidates any cached references that point to the command.
+     * table. This is like deleting the command, so bump its command epoch
+     * to invalidate any cached references that point to the command.
      */
 
     if (cmdPtr->hPtr != NULL) {
@@ -2382,7 +2382,7 @@ Tcl_ExposeCommand(
 
     if (cmdPtr->nsPtr != iPtr->globalNsPtr) {
 	/*
-	 * This case is theoritically impossible, we might rather Tcl_Panic
+	 * This case is theoretically impossible, we might rather Tcl_Panic
 	 * than 'nicely' erroring out ?
 	 */
 
@@ -2488,7 +2488,7 @@ Tcl_ExposeCommand(
  *	In the future, when cmdName is seen as the name of a command by
  *	Tcl_Eval, proc will be called. To support the bytecode interpreter,
  *	the command is created with a wrapper Tcl_ObjCmdProc
- *	(TclInvokeStringCommand) that eventially calls proc. When the command
+ *	(TclInvokeStringCommand) that eventually calls proc. When the command
  *	is deleted from the table, deleteProc will be called. See the manual
  *	entry for details on the calling sequence.
  *
@@ -3939,7 +3939,7 @@ CallCommandTraces(
  *	The value given for the code argument.
  *
  * Side effects:
- *	Transfers a message from the cancelation message to the interpreter.
+ *	Transfers a message from the cancellation message to the interpreter.
  *
  *----------------------------------------------------------------------
  */
@@ -5249,7 +5249,7 @@ TEOV_NotFound(
 
     /*
      * Get the list of words for the unknown handler and allocate enough space
-     * to hold both the handler prefix and all words of the command invokation
+     * to hold both the handler prefix and all words of the command invocation
      * itself.
      */
 
@@ -5594,7 +5594,7 @@ TclEvalEx(
 				 * TclSubstTokens(), to properly handle
 				 * [...]-nested commands. The 'outerScript'
 				 * refers to the most-outer script containing
-				 * the embedded command, which is refered to
+				 * the embedded command, which is referred to
 				 * by 'script'. The 'clNextOuter' refers to
 				 * the current entry in the table of
 				 * continuation lines in this "main script",
@@ -6160,8 +6160,8 @@ TclArgumentEnter(
 	/*
 	 * Ignore argument words without line information (= dynamic). If they
 	 * are variables they may have location information associated with
-	 * that, either through globally recorded 'set' invokations, or
-	 * literals in bytecode. Eitehr way there is no need to record
+	 * that, either through globally recorded 'set' invocations, or
+	 * literals in bytecode. Either way there is no need to record
 	 * something here.
 	 */
 
@@ -7605,7 +7605,7 @@ int
 Tcl_SetRecursionLimit(
     Tcl_Interp *interp,		/* Interpreter whose nesting limit is to be
 				 * set. */
-    int depth)			/* New value for maximimum depth. */
+    int depth)			/* New value for maximum depth. */
 {
     Interp *iPtr = (Interp *) interp;
     int old;
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index b744203..b956bd0 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -26,7 +26,7 @@
 #define BINARY_NOCOUNT -2	/* No count was specified in format. */
 
 /*
- * The following flags may be ORed together and returned by GetFormatSpec
+ * The following flags may be OR'ed together and returned by GetFormatSpec
  */
 
 #define BINARY_SIGNED 0		/* Field to be read as signed data */
@@ -37,7 +37,7 @@
  * placed in the object cache by 'binary scan' before it bails out and
  * switches back to Plan A (creating a new object for each value.)
  * Theoretically, it would be possible to keep the cache about for the values
- * that are already in it, but that makes the code slower in practise when
+ * that are already in it, but that makes the code slower in practice when
  * overflow happens, and makes little odds the rest of the time (as measured
  * on my machine.) It is also slower (on the sample I tried at least) to grow
  * the cache to hold all items we might want to put in it; presumably the
@@ -1194,7 +1194,7 @@ BinaryFormatCmd(
     }
 
     /*
-     * Prepare the result object by preallocating the caclulated number of
+     * Prepare the result object by preallocating the calculated number of
      * bytes and filling with nulls.
      */
 
@@ -1950,7 +1950,7 @@ GetFormatSpec(
  *
  *	This routine determines, if bytes of a number need to be re-ordered,
  *	and returns a numeric code indicating the re-ordering to be done.
- *	This depends on the endiannes of the machine and the desired format.
+ *	This depends on the endianness of the machine and the desired format.
  *	It is in effect a table (whose contents depend on the endianness of
  *	the system) describing whether a value needs reversing or not. Anyone
  *	porting the code to a big-endian platform should take care to make
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 1838f7f..b1ee1f4 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -65,7 +65,7 @@ typedef struct {
     int sortMode;		/* The sort mode. One of SORTMODE_* values
 				 * defined below. */
     Tcl_Obj *compareCmdPtr;	/* The Tcl comparison command when sortMode is
-				 * SORTMODE_COMMAND. Pre-initialized to hold
+				 * SORTMODE_COMMAND. Preinitialized to hold
 				 * base of command. */
     int *indexv;		/* If the -index option was specified, this
 				 * holds an encoding of the indexes contained
@@ -4883,7 +4883,7 @@ Tcl_LsortObjCmd(
 	}
 
 	/*
-	 * Merge this element in the pre-existing sublists (and merge together
+	 * Merge this element in the preexisting sublists (and merge together
 	 * sublists when we have two of the same size).
 	 */
 
@@ -5200,7 +5200,7 @@ MergeLists(
  *	ordering between two elements.
  *
  * Results:
- *	A negative results means the the first element comes before the
+ *	A negative results means the first element comes before the
  *	second, and a positive results means that the second element should
  *	come first. A result of zero means the two elements are equal and it
  *	doesn't matter which comes first.
@@ -5402,7 +5402,7 @@ DictionaryCompare(
 
 	    /*
 	     * Convert both chars to lower for the comparison, because
-	     * dictionary sorts are case insensitve. Covert to lower, not
+	     * dictionary sorts are case-insensitive. Covert to lower, not
 	     * upper, so chars between Z and a will sort before A (where most
 	     * other interesting punctuations occur).
 	     */
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 4a802c9..cd34364 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -427,7 +427,7 @@ Tcl_RegexpObjCmd(
 	 * match. We always increment the offset by at least one to prevent
 	 * endless looping (as in the case: regexp -all {a*} a). Otherwise,
 	 * when we match the NULL string at the end of the input string, we
-	 * will loop indefinately (because the length of the match is 0, so
+	 * will loop indefinitely (because the length of the match is 0, so
 	 * offset never changes).
 	 */
 
@@ -1239,7 +1239,7 @@ Tcl_SplitObjCmd(
 
 	/*
 	 * Handle the special case of splitting on a single character. This is
-	 * only true for the one-char ASCII case, as one unicode char is > 1
+	 * only true for the one-char ASCII case, as one Unicode char is > 1
 	 * byte in length.
 	 */
 
@@ -1588,7 +1588,7 @@ StringIsCmd(
     /*
      * We get the objPtr so that we can short-cut for some classes by checking
      * the object type (int and double), but we need the string otherwise,
-     * because we don't want any conversion of type occuring (as, for example,
+     * because we don't want any conversion of type occurring (as, for example,
      * Tcl_Get*FromObj would do).
      */
 
@@ -2122,7 +2122,7 @@ StringMapCmd(
 	int *mapLens, *u2lc = NULL;
 
 	/*
-	 * Precompute pointers to the unicode string and length. This saves us
+	 * Precompute pointers to the Unicode string and length. This saves us
 	 * repeated function calls later, significantly speeding up the
 	 * algorithm. We only need the lowercase first char in the nocase
 	 * case.
@@ -2171,7 +2171,7 @@ StringMapCmd(
 		    ustring1 = p - 1;
 
 		    /*
-		     * Append the map value to the unicode string.
+		     * Append the map value to the Unicode string.
 		     */
 
 		    TclAppendUnicodeToObj(resultPtr,
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index dacb72a..7c5eead 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -230,7 +230,7 @@ TclCompileAppendCmd(
  *
  * TclCompileArray*Cmd --
  *
- *	Functions called to compile "array" sucommands.
+ *	Functions called to compile "array" subcommands.
  *
  * Results:
  *	All return TCL_OK for a successful compile, and TCL_ERROR to defer
@@ -634,7 +634,7 @@ TclCompileCatchCmd(
      * catch range so that errors in the substitution are not caught.
      * [Bug 219184]
      * The reason for duplicating the script is that EVAL_STK would otherwise
-     * begin by undeflowing the stack below the mark set by BEGIN_CATCH4.
+     * begin by underflowing the stack below the mark set by BEGIN_CATCH4.
      */
 
     range = TclCreateExceptRange(CATCH_EXCEPTION_RANGE, envPtr);
@@ -982,7 +982,7 @@ TclCompileContinueCmd(
  *
  * TclCompileDict*Cmd --
  *
- *	Functions called to compile "dict" sucommands.
+ *	Functions called to compile "dict" subcommands.
  *
  * Results:
  *	All return TCL_OK for a successful compile, and TCL_ERROR to defer
@@ -1686,7 +1686,7 @@ CompileDictEachCmd(
 
     /*
      * Error handler "finally" clause, which force-terminates the iteration
-     * and rethrows the error.
+     * and re-throws the error.
      */
 
     TclAdjustStackDepth(-1, envPtr);
@@ -1858,7 +1858,7 @@ TclCompileDictUpdateCmd(
     /*
      * Termination code for non-ok returns: stash the result and return
      * options in the stack, bring up the key list, finish the update code,
-     * and finally return with the catched return data
+     * and finally return with the caught return data
      */
 
     ExceptionRangeTarget(envPtr, range, catchOffset);
@@ -1904,7 +1904,7 @@ TclCompileDictAppendCmd(
 
     /*
      * There must be at least two argument after the command. And we impose an
-     * (arbirary) safe limit; anyone exceeding it should stop worrying about
+     * (arbitrary) safe limit; anyone exceeding it should stop worrying about
      * speed quite so much. ;-)
      */
 
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 7bb06ab..d0cd6e9 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -416,7 +416,7 @@ TclCompileIfCmd(
 	if (TclFixupForwardJumpToHere(envPtr,
 		jumpEndFixupArray.fixup + jumpIndex, 127)) {
 	    /*
-	     * Adjust the immediately preceeding "ifFalse" jump. We moved it's
+	     * Adjust the immediately preceding "ifFalse" jump. We moved it's
 	     * target (just after this jump) down three bytes.
 	     */
 
@@ -619,8 +619,8 @@ TclCompileInfoCommandsCmd(
     Tcl_DecrRefCount(objPtr);
 
     /*
-     * Confirmed as a literal that will not frighten the horses. Compile. Note
-     * that the result needs to be list-ified.
+     * Confirmed as a literal that will not frighten the horses. Compile.
+     * The result must be made into a list.
      */
 
     /* TODO: Just push the known value */
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index ddc5c89..5146b33 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -2374,7 +2374,7 @@ IssueSwitchJumpTable(
      * Compile the switch by using a jump table, which is basically a
      * hashtable that maps from literal values to match against to the offset
      * (relative to the INST_JUMP_TABLE instruction) to jump to. The jump
-     * table itself is independent of any invokation of the bytecode, and as
+     * table itself is independent of any invocation of the bytecode, and as
      * such is stored in an auxData block.
      *
      * Start by allocating the jump table itself, plus some workspace.
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 8808024..9791cb3 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -96,7 +96,7 @@ enum OperandTypes {
  *
  * The lexeme field is filled in with the lexeme of the operator that is
  * returned by the ParseLexeme() routine. Only lexemes for unary and binary
- * operators get stored in an OpNode. Other lexmes get different treatement.
+ * operators get stored in an OpNode. Other lexmes get different treatment.
  *
  * The precedence field provides a place to store the precedence of the
  * operator, so it need not be looked up again and again.
@@ -157,7 +157,7 @@ enum Marks {
 				 * BINARY_PLUS according to context. */
 #define MINUS		2	/* Ambiguous. Resolves to UNARY_MINUS or
 				 * BINARY_MINUS according to context. */
-#define BAREWORD	3	/* Ambigous. Resolves to BOOLEAN or to
+#define BAREWORD	3	/* Ambiguous. Resolves to BOOLEAN or to
 				 * FUNCTION or a parse error according to
 				 * context and value. */
 #define INCOMPLETE	4	/* A parse error. Used only when the single
@@ -576,7 +576,7 @@ ParseExpr(
 				 * we build the parse tree. */
     unsigned int nodesAvailable = 64; /* Initial size of the storage array. This
 				 * value establishes a minimum tree memory
-				 * cost of only about 1 kibyte, and is large
+				 * cost of only about 1 kilobyte, and is large
 				 * enough for most expressions to parse with
 				 * no need for array growth and
 				 * reallocation. */
@@ -1912,7 +1912,7 @@ Tcl_ParseExpr(
  *	Returns the number of bytes scanned to produce the lexeme.
  *
  * Side effects:
- *	Code identifying lexeme parsed is writen to *lexemePtr.
+ *	Code identifying lexeme parsed is written to *lexemePtr.
  *
  *----------------------------------------------------------------------
  */
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index c10145c..1ab7301 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2053,7 +2053,7 @@ CompileCommandTokens(
 
     assert (parsePtr->numWords > 0);
 
-    /* Pre-Compile */
+    /* Precompile */
 
     TclNewObj(cmdObj);
     envPtr->numCommands++;
@@ -2423,9 +2423,9 @@ TclCompileTokens(
     int depth = TclGetStackDepth(envPtr);
 
     /*
-     * if this is actually a literal, handle continuation lines by
+     * If this is actually a literal, handle continuation lines by
      * preallocating a small table to store the locations of any continuation
-     * lines we find in this literal.  The table is extended if needed.
+     * lines found in this literal.  The table is extended if needed.
      *
      * Note: In contrast with the analagous code in 'TclSubstTokens()' the
      * 'adjust' variable seems unneeded here.  The code which merges
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 2e5d3ac..87fb783 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -434,7 +434,7 @@ typedef struct ByteCode {
 				 * active. This structure can be freed when
 				 * refCount becomes zero. */
     unsigned int flags;		/* flags describing state for the codebyte.
-				 * this variable holds ORed values from the
+				 * this variable holds OR'ed values from the
 				 * TCL_BYTECODE_ masks defined above */
     const char *source;		/* The source string from which this ByteCode
 				 * was compiled. Note that this pointer is not
diff --git a/generic/tclConfig.c b/generic/tclConfig.c
index 5bffbcb..36d37ec 100644
--- a/generic/tclConfig.c
+++ b/generic/tclConfig.c
@@ -181,7 +181,7 @@ Tcl_RegisterConfig(
  *	configuration information embedded into a library.
  *
  * Results:
- *	A standard tcl result.
+ *	A standard Tcl result.
  *
  * Side effects:
  *	See the manual for what this command does.
diff --git a/generic/tclDate.c b/generic/tclDate.c
index 97675fb..3bdbdb2 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -2425,7 +2425,7 @@ static const TABLE TimezoneTable[] = {
     { "ist",	tZONE,	  -HOUR(11/2) },    /* Indian Standard */
     { "zp6",	tZONE,	  -HOUR( 6) },	    /* USSR Zone 5 */
 #if	0
-    /* For completeness.  NST is also Newfoundland Stanard, nad SST is
+    /* For completeness.  NST is also Newfoundland Standard, and SST is
      * also Swedish Summer. */
     { "nst",	tZONE,	  -HOUR(13/2) },    /* North Sumatra */
     { "sst",	tZONE,	  -HOUR( 7) },	    /* South Sumatra, USSR Zone 6 */
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index ab66186..44ee1a9 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -778,7 +778,7 @@ GetDictFromObj(
  *	the chain fields of the dictionaries (for easy invalidation of string
  *	representations using InvalidateDictChain). If the flags argument has
  *	the DICT_PATH_CREATE bits set (and not the DICT_PATH_EXISTS bit),
- *	non-existant keys will be inserted with a value of an empty
+ *	non-extant keys will be inserted with a value of an empty
  *	dictionary, resulting in the path being built.
  *
  *----------------------------------------------------------------------
@@ -871,7 +871,7 @@ TclTraceDictPath(
  *
  * InvalidateDictChain --
  *
- *	Go through a dictionary chain (built by an updating invokation of
+ *	Go through a dictionary chain (built by an updating invocation of
  *	TclTraceDictPath) and invalidate the string representations of all the
  *	dictionaries on the chain.
  *
@@ -1197,7 +1197,7 @@ Tcl_DictObjNext(
     ChainEntry *cPtr;
 
     /*
-     * If the searh is done; we do no work.
+     * If the search is done; we do no work.
      */
 
     if (!searchPtr->epoch) {
@@ -3683,9 +3683,9 @@ TclDictWithFinish(
     if (pathc > 0) {
 	/*
 	 * Want to get to the dictionary which we will update; need to do
-	 * prepare-for-update de-sharing along the path *but* avoid generating
-	 * an error on a non-existant path (we'll treat that the same as a
-	 * non-existant variable. Luckily, the de-sharing operation isn't
+	 * prepare-for-update unsharing along the path *but* avoid generating
+	 * an error on a non-extant path (we'll treat that the same as a
+	 * non-extant variable. Luckily, the unsharing operation isn't
 	 * deeply damaging if we don't go on to update; it's just less than
 	 * perfectly efficient (but no memory should be leaked).
 	 */
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 41a84db..db98d54 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -3437,7 +3437,7 @@ TableToUtfProc(
 	}
 
 	/*
-	 * Special case for 1-byte utf chars for speed.
+	 * Special case for 1-byte Utf chars for speed.
 	 */
 
 	if ((unsigned)ch - 1 < 0x7F) {
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 963f1d8..2a33398 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -1888,7 +1888,7 @@ NsEnsembleImplementationCmdNR(
      *
      *   ((Q: That's not true if the -map option is used, is it?))
      *
-     * but don't do that because cacheing of the command object should help.
+     * but don't do that because caching of the command object should help.
      */
 
     {
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 1378708..e9da69f 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -411,7 +411,7 @@ Tcl_PutEnv(
     }
 
     /*
-     * First convert the native string to UTF. Then separate the string into
+     * First convert the native string to Utf. Then separate the string into
      * name and value parts, and call TclSetEnv to do all of the real work.
      */
 
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index e28128f..56004aa 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -599,7 +599,7 @@ TclGetBgErrorHandler(
  *
  *	This function is associated with the "tclBgError" assoc data for an
  *	interpreter; it is invoked when the interpreter is deleted in order to
- *	free the information assoicated with any pending error reports.
+ *	free the information associated with any pending error reports.
  *
  * Results:
  *	None.
@@ -1132,7 +1132,7 @@ Tcl_InitSubsystems(void)
 
     if (subsystemsInitialized == 0) {
 	/*
-	 * Double check inside the mutex. There are definitly calls back into
+	 * Double check inside the mutex. There are definitely calls back into
 	 * this routine from some of the functions below.
 	 */
 
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 4c6c088..7f431bd 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1690,7 +1690,7 @@ TclCompileObj(
 	 * Future optimizations ...
 	 * (1) Save the location data (ExtCmdLoc) keyed by start line. In that
 	 *     case we recompile once per location of the literal, but not
-	 *     continously, because the moment we have all locations we do not
+	 *     continuously, because the moment we have all locations we do not
 	 *     need to recompile any longer.
 	 *
 	 * (2) Alternative: Do not recompile, tell the execution engine the
@@ -1788,7 +1788,7 @@ TclCompileObj(
  *
  * TclIncrObj --
  *
- *	Increment an integeral value in a Tcl_Obj by an integeral value held
+ *	Increment an integral value in a Tcl_Obj by an integral value held
  *	in another Tcl_Obj. Caller is responsible for making sure we can
  *	update the first object.
  *
@@ -3604,7 +3604,7 @@ TEBCresume(
      *	   Start of INST_INCR instructions.
      *
      * WARNING: more 'goto' here than your doctor recommended! The different
-     * instructions set the value of some variables and then jump to somme
+     * instructions set the value of some variables and then jump to some
      * common execution code.
      */
 
@@ -5462,7 +5462,7 @@ TEBCresume(
 	TRACE(("\"%.20s\" %.20s => ", O2S(valuePtr), O2S(value2Ptr)));
 
 	/*
-	 * Get char length to calulate what 'end' means.
+	 * Get char length to calculate what 'end' means.
 	 */
 
 	length = TclGetCharLength(valuePtr);
@@ -7446,7 +7446,7 @@ TEBCresume(
 		O2S(OBJ_UNDER_TOS), O2S(OBJ_AT_TOS), done));
 
 	/*
-	 * The INST_DICT_FIRST and INST_DICT_NEXT instructsions are always
+	 * The INST_DICT_FIRST and INST_DICT_NEXT instructions are always
 	 * followed by a conditional jump, so we can take advantage of this to
 	 * do some peephole optimization (note that we're careful to not close
 	 * out someone doing something else).
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index bfc3f43..1ad7e1a 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -1220,7 +1220,7 @@ TclFileLinkCmd(
 	if (contents == NULL) {
 	    /*
 	     * We handle three common error cases specially, and for all other
-	     * errors, we use the standard posix error message.
+	     * errors, we use the standard Posix error message.
 	     */
 
 	    if (errno == EEXIST) {
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 7b3b03f..ac0dfa3 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -100,7 +100,7 @@ SetResultLength(
  * Results:
  *	Returns the position in the path immediately after the root including
  *	any trailing slashes. Appends a cleaned up version of the root to the
- *	Tcl_DString at the specified offest.
+ *	Tcl_DString at the specified offset.
  *
  * Side effects:
  *	Modifies the specified Tcl_DString.
@@ -1900,7 +1900,7 @@ TclGlob(
      * To process a [glob] invocation, this function may be called multiple
      * times. Each time, the previously discovered filenames are in the
      * interpreter result. We stash that away here so the result is free for
-     * error messsages.
+     * error messages.
      */
 
     savedResultObj = Tcl_GetObjResult(interp);
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 1c43360..b642156 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -978,7 +978,7 @@ GetChannelTable(
  *
  * Side effects:
  *	Deletes the hash table of channels. May close channels. May flush
- *	output on closed channels. Removes any channeEvent handlers that were
+ *	output on closed channels. Removes any channelEvent handlers that were
  *	registered in this interpreter.
  *
  *----------------------------------------------------------------------
@@ -1011,7 +1011,7 @@ DeleteChannelTable(
 	statePtr = chanPtr->state;
 
 	/*
-	 * Remove any fileevents registered in this interpreter.
+	 * Remove any file events registered in this interpreter.
 	 */
 
 	for (sPtr = statePtr->scriptRecordPtr, prevPtr = NULL;
@@ -1430,7 +1430,7 @@ Tcl_GetChannel(
 				 * channel. */
     const char *chanName,	/* The name of the channel. */
     int *modePtr)		/* Where to store the mode in which the
-				 * channel was opened? Will contain an ORed
+				 * channel was opened? Will contain an OR'ed
 				 * combination of TCL_READABLE and
 				 * TCL_WRITABLE, if non-NULL. */
 {
@@ -1513,7 +1513,7 @@ TclGetChannelFromObj(
     Tcl_Obj *objPtr,
     Tcl_Channel *channelPtr,
     int *modePtr,		/* Where to store the mode in which the
-				 * channel was opened? Will contain an ORed
+				 * channel was opened? Will contain an OR'ed
 				 * combination of TCL_READABLE and
 				 * TCL_WRITABLE, if non-NULL. */
     TCL_UNUSED(int) /*flags*/)
@@ -1937,7 +1937,7 @@ Tcl_StackChannel(
      * impossible) we move the buffers from the common state structure into
      * the channel itself. We use the buffers in the channel below the new
      * transformation to hold the data. In the future this allows us to write
-     * transformations which pre-read data and push the unused part back when
+     * transformations which preread data and push the unused part back when
      * they are going away.
      */
 
@@ -2046,7 +2046,7 @@ ChannelFree(
  *	A standard Tcl result.
  *
  * Side effects:
- *	If TCL_ERROR is returned, the posix error code will be set with
+ *	If TCL_ERROR is returned, the Posix error code will be set with
  *	Tcl_SetErrno. May leave a message in interp result as well.
  *
  *----------------------------------------------------------------------
@@ -2069,7 +2069,7 @@ Tcl_UnstackChannel(
 
     if (chanPtr->downChanPtr != NULL) {
 	/*
-	 * Instead of manipulating the per-thread / per-interp list/hashtable
+	 * Instead of manipulating the per-thread / per-interp list/hash table
 	 * of registered channels we wind down the state of the
 	 * transformation, and then restore the state of underlying channel
 	 * into the old structure.
@@ -2613,8 +2613,8 @@ RecycleBuffer(
     }
 
     /*
-     * Only save buffers which have the requested buffersize for the channel.
-     * This is to honor dynamic changes of the buffersize made by the user.
+     * Only save buffers which have the requested buffer size for the channel.
+     * This is to honor dynamic changes of the buffe rsize made by the user.
      */
 
     if ((bufPtr->bufLength) != statePtr->bufSize + BUFFER_PADDING) {
@@ -2774,7 +2774,7 @@ FlushChannel(
     /*
      * Prevent writing on a dead channel -- a channel that has been closed but
      * not yet deallocated. This can occur if the exit handler for the channel
-     * deallocation runs before all channels are deregistered in all
+     * deallocation runs before all channels are unregistered in all
      * interpreters.
      */
 
@@ -2889,9 +2889,9 @@ FlushChannel(
 	    if (calledFromAsyncFlush) {
 		/*
 		 * TIP #219, Tcl Channel Reflection API.
-		 * When defering the error copy a message from the bypass into
+		 * When deferring the error copy a message from the bypass into
 		 * the unreported area. Or discard it if the new error is to
-		 * be ignored in favor of an earlier defered error.
+		 * be ignored in favor of an earlier deferred error.
 		 */
 
 		Tcl_Obj *msg = statePtr->chanMsg;
@@ -3247,8 +3247,8 @@ CloseChannel(
  *	The channel to cut out of the list must not be referenced in any
  *	interpreter. This is something this procedure cannot check (despite
  *	the refcount) because the caller usually wants fiddle with the channel
- *	(like transfering it to a different thread) and thus keeps the
- *	refcount artifically high to prevent its destruction.
+ *	(like transferring it to a different thread) and thus keeps the
+ *	refcount artificially high to prevent its destruction.
  *
  *----------------------------------------------------------------------
  */
@@ -3362,9 +3362,9 @@ Tcl_CutChannel(
  * NOTE:
  *	The channel to splice into the list must not be referenced in any
  *	interpreter. This is something this procedure cannot check (despite
- *	the refcount) because the caller usually wants figgle with the channel
- *	(like transfering it to a different thread) and thus keeps the
- *	refcount artifically high to prevent its destruction.
+ *	the refcount) because the caller usually wants fiddle with the channel
+ *	(like transferring it to a different thread) and thus keeps the
+ *	refcount artificially high to prevent its destruction.
  *
  *----------------------------------------------------------------------
  */
@@ -3785,7 +3785,7 @@ Tcl_CloseEx(
  *
  * NOTE:
  *	CloseWrite removes the channel as far as the user is concerned.
- *	However, the ooutput data structures may continue to exist for a while
+ *	However, the output data structures may continue to exist for a while
  *	longer if it has a background flush scheduled. The device itself is
  *	eventually closed and the channel structures modified, in
  *	CloseChannelPart, below.
@@ -4238,7 +4238,7 @@ Tcl_WriteChars(
     /*
      * Inefficient way to convert UTF-8 to byte-array, but the code
      * parallels the way it is done for objects.  Special case for 1-byte
-     * (used by eg [puts] for the \n) could be extended to more efficient
+     * (used by e.g. [puts] for the \n) could be extended to more efficient
      * translation of the src string.
      */
 
@@ -4543,7 +4543,7 @@ Write(
 
 	    /*
  	     * We just flushed.  So if we have needNlFlush set to record that
- 	     * we need to flush because theres a (translated) newline in the
+ 	     * we need to flush because there is a (translated) newline in the
  	     * buffer, that's likely not true any more.  But there is a tricky
  	     * exception.  If we have saved bytes that did not really get
  	     * flushed and those bytes came from a translation of a newline as
@@ -4796,7 +4796,7 @@ Tcl_GetsObj(
 
 		    /*
 		     * If a CR is at the end of the buffer, then check for a
-		     * LF at the begining of the next buffer, unless EOF char
+		     * LF at the beginning of the next buffer, unless EOF char
 		     * was found already.
 		     */
 
@@ -5832,7 +5832,7 @@ Tcl_ReadRaw(
 
     /*
      * Go to the driver only if we got nothing from pushback.  Have to do it
-     * this way to avoid EOF mis-timings when we consider the ability that EOF
+     * this way to avoid EOF mistimings when we consider the ability that EOF
      * may not be a permanent condition in the driver, and in that case we
      * have to synchronize.
      */
@@ -6257,7 +6257,7 @@ ReadChars(
 				 * is larger than the number of characters
 				 * available in the first buffer, only the
 				 * characters from the first buffer are
-				 * returned. The execption is when there is
+				 * returned. The exception is when there is
 				 * not any complete character in the first
 				 * buffer.  In that case, a recursive call
 				 * effectively obtains chars from the
@@ -7446,7 +7446,7 @@ Tcl_TruncateChannel(
 
     /*
      * Seek first to force a total flush of all pending buffers and ditch any
-     * pre-read input data.
+     * preread input data.
      */
 
     WillWrite(chanPtr);
@@ -7506,7 +7506,7 @@ CheckChannelErrors(
 
 	/*
 	 * TIP #219, Tcl Channel Reflection API.
-	 * Move a defered error message back into the channel bypass.
+	 * Move a deferred error message back into the channel bypass.
 	 */
 
 	if (statePtr->chanMsg != NULL) {
@@ -7834,7 +7834,7 @@ Tcl_GetChannelBufferSize(
  * Side effects:
 
  *	An error message is generated in interp's result object to indicate
- *	that a command was invoked with the a bad option. The message has the
+ *	that a command was invoked with a bad option. The message has the
  *	form:
  *		bad option "blah": should be one of
  *		<...generic options...>+<...specific options...>
@@ -11312,7 +11312,7 @@ FixLevelCode(
      * Syntax = (option value)... ?message?
      *
      * Bad message syntax causes a panic, because the other side uses
-     * Tcl_GetReturnOptions and list construction functions to marshall the
+     * Tcl_GetReturnOptions and list construction functions to marshal the
      * information. Hence an error means that we've got serious breakage.
      */
 
@@ -11381,8 +11381,8 @@ FixLevelCode(
     lvn = (Tcl_Obj **)ckalloc(lcn * sizeof(Tcl_Obj *));
 
     /*
-     * New level/code information is spliced into the first occurence of
-     * -level, -code, further occurences are ignored. The options cannot be
+     * New level/code information is spliced into the first occurrence of
+     * -level, -code, further occurrences are ignored. The options cannot be
      * not present, we would not come here. Options which are ok are simply
      * copied over.
      */
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 5d02569..399acdb 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -45,7 +45,7 @@ typedef struct ChannelBuffer {
     struct ChannelBuffer *nextPtr;
     				/* Next buffer in chain. */
     char buf[TCLFLEXARRAY];		/* Placeholder for real buffer. The real
-				 * buffer occuppies this space + bufSize-1
+				 * buffer occupies this space + bufSize-1
 				 * bytes. This must be the last field in the
 				 * structure. */
 } ChannelBuffer;
@@ -129,7 +129,7 @@ typedef struct ChannelState {
     char *channelName;		/* The name of the channel instance in Tcl
 				 * commands. Storage is owned by the generic
 				 * IO code, is dynamically allocated. */
-    int	flags;			/* ORed combination of the flags defined
+    int	flags;			/* OR'ed combination of the flags defined
 				 * below. */
     Tcl_Encoding encoding;	/* Encoding to apply when reading or writing
 				 * data on this channel. NULL means no
@@ -209,7 +209,7 @@ typedef struct ChannelState {
      * TIP #219 ... Info for the I/O system ...
      * Error message set by channel drivers, for the propagation of arbitrary
      * Tcl errors. This information, if present (chanMsg not NULL), takes
-     * precedence over a posix error code returned by a channel operation.
+     * precedence over a Posix error code returned by a channel operation.
      */
 
     Tcl_Obj* chanMsg;
@@ -224,7 +224,7 @@ typedef struct ChannelState {
 } ChannelState;
 
 /*
- * Values for the flags field in Channel. Any ORed combination of the
+ * Values for the flags field in Channel. Any OR'ed combination of the
  * following flags can be stored in the field. These flags record various
  * options and state bits about the channel. In addition to the flags below,
  * the channel can also have TCL_READABLE (1<<1) and TCL_WRITABLE (1<<2) set.
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 40f0090..bc4fab4 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1033,7 +1033,7 @@ Tcl_ExecObjCmd(
  *
  * Side effects:
  *	Sets interp's result to boolean true or false depending on whether the
- *	preceeding input operation on the channel would have blocked.
+ *	preceding input operation on the channel would have blocked.
  *
  *---------------------------------------------------------------------------
  */
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index 0e15280..51fa94d 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -409,7 +409,7 @@ ExecuteCallback(
 
     /*
      * Use a byte-array to prevent the misinterpretation of binary data coming
-     * through as UTF while at the tcl level.
+     * through as Utf while at the tcl level.
      */
 
     Tcl_ListObjAppendElement(NULL, command, Tcl_NewByteArrayObj(buf, bufLen));
@@ -417,7 +417,7 @@ ExecuteCallback(
     /*
      * Step 2, execute the command at the global level of the interpreter used
      * to create the transformation. Destroy the command afterward. If an
-     * error occured and the current interpreter is defined and not equal to
+     * error occurred and the current interpreter is defined and not equal to
      * the interpreter for the callback, then copy the error message into
      * current interpreter. Don't copy if in preservation mode.
      */
@@ -568,7 +568,7 @@ TransformCloseProc(
      * Now flush data waiting in internal buffers to output and input. The
      * input must be done despite the fact that there is no real receiver for
      * it anymore. But the scripts might have sideeffects other parts of the
-     * system rely on (f.e. signaling the close to interested parties).
+     * system rely on (f.e. signalling the close to interested parties).
      */
 
     PreserveData(dataPtr);
@@ -1104,7 +1104,7 @@ TransformWatchProc(
     Tcl_Channel downChan;
 
     /*
-     * The caller expressed interest in events occuring for this channel. We
+     * The caller expressed interest in events occurring for this channel. We
      * are forwarding the call to the underlying channel now.
      */
 
@@ -1211,12 +1211,12 @@ static int
 TransformNotifyProc(
     ClientData clientData,	/* The state of the notified
 				 * transformation. */
-    int mask)			/* The mask of occuring events. */
+    int mask)			/* The mask of occurring events. */
 {
     TransformChannelData *dataPtr = (TransformChannelData *)clientData;
 
     /*
-     * An event occured in the underlying channel. This transformation doesn't
+     * An event occurred in the underlying channel. This transformation doesn't
      * process such events thus returns the incoming mask unchanged.
      */
 
@@ -1306,7 +1306,7 @@ ResultClear(
  * ResultInit --
  *
  *	Initializes the specified buffer structure. The structure will contain
- *	valid information for an emtpy buffer.
+ *	valid information for an empty buffer.
  *
  * Side effects:
  *	See above.
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 3057595..29f47ba 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -10,7 +10,7 @@
  *
  *	See TIP #219 for the specification of this functionality.
  *
- * Copyright © 2004-2005 ActiveState, a divison of Sophos
+ * Copyright © 2004-2005 ActiveState, a division of Sophos
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -139,7 +139,7 @@ typedef struct {
      * data in buffers is flushed out through the generation of fake file
      * events.
      *
-     * See 'rechan', 'memchan', etc.
+     * See 'refchan', 'memchan', etc.
      *
      * A timer is used here as well in order to ensure at least on pass through
      * the event loop when a channel becomes ready. See issues 67a5eabbd3d1 and
@@ -148,7 +148,7 @@ typedef struct {
 } ReflectedChannel;
 
 /*
- * Structure of the table maping from channel handles to reflected
+ * Structure of the table mapping from channel handles to reflected
  * channels. Each interpreter which has the handler command for one or more
  * reflected channels records them in such a table, so that 'chan postevent'
  * is able to find them even if the actual channel was moved to a different
@@ -897,8 +897,8 @@ TclChanPostEventObjCmd(
      * handles of reflected channels, and only of such whose handler is
      * defined in this interpreter.
      *
-     * We keep the old checks for both, for paranioa, but abort now instead of
-     * throwing errors, as failure now means that our internal datastructures
+     * We keep the old checks for both, for paranoia, but abort now instead of
+     * throwing errors, as failure now means that our internal data structures
      * have gone seriously haywire.
      */
 
@@ -1073,7 +1073,7 @@ UnmarshallErrorResult(
      * Syntax = (option value)... ?message?
      *
      * Bad syntax causes a panic. This is OK because the other side uses
-     * Tcl_GetReturnOptions and list construction functions to marshall the
+     * Tcl_GetReturnOptions and list construction functions to marshal the
      * information; if we panic here, something has gone badly wrong already.
      */
 
@@ -1164,7 +1164,7 @@ TclChanCaughtErrorBypass(
  *	driver-specific instance data.
  *
  * Results:
- *	A posix error.
+ *	A Posix error.
  *
  * Side effects:
  *	Releases memory. Arbitrary, as it calls upon a script.
@@ -1745,7 +1745,7 @@ ReflectWatch(
  *	is required of it.
  *
  * Results:
- *	A posix error number.
+ *	A Posix error number.
  *
  * Side effects:
  *	Allocates memory. Arbitrary, as it calls upon a script.
@@ -2311,7 +2311,7 @@ NewReflectedChannel(
  *	refcount of the returned object is -- zero --.
  *
  * Side effects:
- *	May allocate memory. Mutex protected critical section locks out other
+ *	May allocate memory. Mutex-protected critical section locks out other
  *	threads for a short time.
  *
  *----------------------------------------------------------------------
@@ -2365,7 +2365,7 @@ FreeReflectedChannel(
  * InvokeTclMethod --
  *
  *	This function is used to invoke the Tcl level of a reflected channel.
- *	It handles all the command assembly, invokation, and generic state and
+ *	It handles all the command assembly, invocation, and generic state and
  *	result mgmt. It does *not* handle thread redirection; that is the
  *	responsibility of clients of this function.
  *
@@ -2393,8 +2393,8 @@ InvokeTclMethod(
 {
     Tcl_Obj *methObj = NULL;	/* Method name in object form */
     Tcl_InterpState sr;		/* State of handler interp */
-    int result;			/* Result code of method invokation */
-    Tcl_Obj *resObj = NULL;	/* Result of method invokation. */
+    int result;			/* Result code of method invocation */
+    Tcl_Obj *resObj = NULL;	/* Result of method invocation. */
     Tcl_Obj *cmd;
 
     if (rcPtr->dead) {
@@ -2613,7 +2613,7 @@ GetReflectedChannelMap(
  *
  * Side effects:
  *	Deletes the hash table of channels. May close channels. May flush
- *	output on closed channels. Removes any channeEvent handlers that were
+ *	output on closed channels. Removes any channelEvent handlers that were
  *	registered in this interpreter.
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c
index 3fe2585..8ab1ffb9 100644
--- a/generic/tclIORTrans.c
+++ b/generic/tclIORTrans.c
@@ -642,7 +642,7 @@ TclChanPushObjCmd(
     /*
      * Mode tell us what the parent channel supports. The methods tell us what
      * the handler supports. We remove the non-supported bits from the mode
-     * and check that the channel is not completely inacessible. Afterward the
+     * and check that the channel is not completely inaccessible. Afterward the
      * mode tells us which methods are still required, and these methods will
      * also be supported by the handler, by design of the check.
      */
@@ -874,7 +874,7 @@ UnmarshallErrorResult(
  *	driver specific instance data.
  *
  * Results:
- *	A posix error.
+ *	A Posix error.
  *
  * Side effects:
  *	Releases memory. Arbitrary, as it calls upon a script.
@@ -993,7 +993,7 @@ ReflectClose(
 #endif /* TCL_THREADS */
 
     /*
-     * Do the actual invokation of "finalize" now; we're in the right thread.
+     * Do the actual invocation of "finalize" now; we're in the right thread.
      */
 
     result = InvokeTclMethod(rtPtr, "finalize", NULL, NULL, &resObj);
@@ -1488,7 +1488,7 @@ ReflectWatch(
  *	is required of it.
  *
  * Results:
- *	A posix error number.
+ *	A Posix error number.
  *
  * Side effects:
  *	Allocates memory. Arbitrary, as it calls upon a script.
@@ -1575,7 +1575,7 @@ static int
 ReflectGetOption(
     void *clientData,	/* Channel to query */
     Tcl_Interp *interp,		/* Interpreter to leave error messages in */
-    const char *optionName,	/* Name of reuqested option */
+    const char *optionName,	/* Name of requested option */
     Tcl_DString *dsPtr)		/* String to place the result into */
 {
     ReflectedTransform *rtPtr = (ReflectedTransform *)clientData;
@@ -1630,7 +1630,7 @@ ReflectHandle(
 
     /*
      * Transformations have no handle of their own. As such we simply query
-     * the parent channel for it. This way the qery will ripple down through
+     * the parent channel for it. This way the query will ripple down through
      * all transformations until reaches the base channel. Which then returns
      * its handle, or fails. The former will then ripple up the stack.
      *
@@ -1664,7 +1664,7 @@ ReflectNotify(
     ReflectedTransform *rtPtr = (ReflectedTransform *)clientData;
 
     /*
-     * An event occured in the underlying channel.
+     * An event occurred in the underlying channel.
      *
      * We delete our timer. It was not fired, yet we are here, so the channel
      * below generated such an event and we don't have to. The renewal of the
@@ -1927,7 +1927,7 @@ FreeReflectedTransform(
  * InvokeTclMethod --
  *
  *	This function is used to invoke the Tcl level of a reflected channel.
- *	It handles all the command assembly, invokation, and generic state and
+ *	It handles all the command assembly, invocation, and generic state and
  *	result mgmt. It does *not* handle thread redirection; that is the
  *	responsibility of clients of this function.
  *
@@ -1959,8 +1959,8 @@ InvokeTclMethod(
     int cmdc;			/* #words in constructed command */
     Tcl_Obj *methObj = NULL;	/* Method name in object form */
     Tcl_InterpState sr;		/* State of handler interp */
-    int result;			/* Result code of method invokation */
-    Tcl_Obj *resObj = NULL;	/* Result of method invokation. */
+    int result;			/* Result code of method invocation */
+    Tcl_Obj *resObj = NULL;	/* Result of method invocation. */
 
     if (rtPtr->dead) {
 	/*
@@ -1984,7 +1984,7 @@ InvokeTclMethod(
      */
 
     /*
-     * Insert method into the pre-allocated area, after the command prefix,
+     * Insert method into the preallocated area, after the command prefix,
      * before the channel id.
      */
 
@@ -2011,7 +2011,7 @@ InvokeTclMethod(
     }
 
     /*
-     * And run the handler... This is done in auch a manner which leaves any
+     * And run the handler... This is done in a manner which leaves any
      * existing state intact.
      */
 
@@ -2913,7 +2913,7 @@ TimerRun(
  * ResultInit --
  *
  *	Initializes the specified buffer structure. The structure will contain
- *	valid information for an emtpy buffer.
+ *	valid information for an empty buffer.
  *
  * Side effects:
  *	See above.
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 9a3ddfb..f665e0f 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -293,7 +293,7 @@ Tcl_Stat(
 #endif /* !TCL_WIDE_INT_IS_LONG */
 
 	/*
-	 * Copy across all supported fields, with possible type coercions on
+	 * Copy across all supported fields, with possible type coercion on
 	 * those fields that change between the normal and lf64 versions of
 	 * the stat structure (on Solaris at least). This is slow when the
 	 * structure sizes coincide, but that's what you get for using an
@@ -1304,7 +1304,7 @@ Tcl_FSData(
  *	None (beyond the memory allocation for the result).
  *
  * Special notes:
- *	If the filesystem-specific normalizePathProcs can re-introduce ../, ./
+ *	If the filesystem-specific normalizePathProcs can reintroduce ../, ./
  *	components into the pathname, this function does not return the correct
  *	result. This may be possible with symbolic links on unix.
  *
@@ -2062,8 +2062,7 @@ Tcl_PosixError(
  * Tcl_FSStat --
  *	Calls 'statProc' of the filesystem corresponding to pathPtr.
  *
- *	Replaces the standard library routines stat.
- *
+ *	Replaces the standard library "stat" routine.
  *
  * Results:
  *	See stat documentation.
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index 2474c97..652853c 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -182,7 +182,7 @@ GetIndexFromObjList(
 
     /*
      * Use Tcl_GetIndexFromObjStruct to do the work to avoid duplicating most
-     * of the code there. This is a bit ineffiecient but simpler.
+     * of the code there. This is a bit inefficient but simpler.
      */
 
     result = TclListObjGetElementsM(interp, tableObjPtr, &objc, &objv);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 464909c..c073f42 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -232,7 +232,7 @@ typedef struct Tcl_Ensemble Tcl_Ensemble;
 typedef struct NamespacePathEntry NamespacePathEntry;
 
 /*
- * Special hashtable for variables: this is just a Tcl_HashTable with an nsPtr
+ * Special hash table for variables: this is just a Tcl_HashTable with an nsPtr
  * field added at the end: in this way variables can find their namespace
  * without having to copy a pointer in their struct: they can access it via
  * their hPtr->tablePtr.
@@ -482,7 +482,7 @@ typedef struct EnsembleConfig {
 				 * all lists, and cannot be found by scanning
 				 * the list from the namespace's ensemble
 				 * field. */
-    int flags;			/* ORed combo of TCL_ENSEMBLE_PREFIX,
+    int flags;			/* OR'ed combo of TCL_ENSEMBLE_PREFIX,
 				 * ENSEMBLE_DEAD and ENSEMBLE_COMPILE. */
 
     /* OBJECT FIELDS FOR ENSEMBLE CONFIGURATION */
@@ -509,7 +509,7 @@ typedef struct EnsembleConfig {
 				 * results passed directly back to the caller
 				 * (including the error code) unless the code
 				 * is TCL_CONTINUE in which case the
-				 * subcommand will be reparsed by the ensemble
+				 * subcommand will be re-parsed by the ensemble
 				 * core, presumably because the ensemble
 				 * itself has been updated. */
     Tcl_Obj *parameterList;	/* List of ensemble parameter names. */
@@ -653,7 +653,7 @@ typedef struct VarInHash {
     Tcl_HashEntry entry;	/* The hash table entry that refers to this
 				 * variable. This is used to find the name of
 				 * the variable and to delete it from its
-				 * hashtable if it is no longer needed. It
+				 * hash table if it is no longer needed. It
 				 * also holds the variable's name. */
 } VarInHash;
 
@@ -664,7 +664,7 @@ typedef struct VarInHash {
  *
  * VAR_ARRAY -			1 means this is an array variable rather than
  *				a scalar variable or link. The "tablePtr"
- *				field points to the array's hashtable for its
+ *				field points to the array's hash table for its
  *				elements.
  * VAR_LINK -			1 means this Var structure contains a pointer
  *				to another Var structure that either has the
@@ -677,12 +677,12 @@ typedef struct VarInHash {
  * Flags that indicate the type and status of storage; none is set for
  * compiled local variables (Var structs).
  *
- * VAR_IN_HASHTABLE -		1 means this variable is in a hashtable and
- *				the Var structure is malloced. 0 if it is a
+ * VAR_IN_HASHTABLE -		1 means this variable is in a hash table and
+ *				the Var structure is malloc'ed. 0 if it is a
  *				local variable that was assigned a slot in a
  *				procedure frame by the compiler so the Var
  *				storage is part of the call frame.
- * VAR_DEAD_HASH		1 means that this var's entry in the hashtable
+ * VAR_DEAD_HASH		1 means that this var's entry in the hash table
  *				has already been deleted.
  * VAR_ARRAY_ELEMENT -		1 means that this variable is an array
  *				element, so it is not legal for it to be an
@@ -1277,7 +1277,7 @@ typedef struct CFWordBC {
     struct CFWordBC *prevPtr;	/* Previous entry in stack for same Tcl_Obj. */
     struct CFWordBC *nextPtr;	/* Next entry for same command call. See
 				 * CmdFrame litarg field for the list start. */
-    Tcl_Obj *obj;		/* Back reference to hashtable key */
+    Tcl_Obj *obj;		/* Back reference to hash table key */
 } CFWordBC;
 
 /*
@@ -1291,7 +1291,7 @@ typedef struct CFWordBC {
  *
  * These structures are allocated and filled by both the function
  * TclSubstTokens() in the file "tclParse.c" and its caller TclEvalEx() in the
- * file "tclBasic.c", and stored in the thread-global hashtable "lineCLPtr" in
+ * file "tclBasic.c", and stored in the thread-global hash table "lineCLPtr" in
  * file "tclObj.c". They are used by the functions TclSetByteCodeFromAny() and
  * TclCompileScript(), both found in the file "tclCompile.c". Their memory is
  * released by the function TclFreeObj(), in the file "tclObj.c", and also by
@@ -5235,7 +5235,7 @@ MODULE_SCOPE size_t TclEnvEpoch;	/* Epoch of the tcl environment
 					 * (if changed with tcl-env). */
 
 #endif /* _TCLINT */
-
+
 /*
  * Local Variables:
  * mode: c
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index bd8d8e5..07888bf 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -580,7 +580,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 
 #undef TclpCreateTempFile_
 #undef TclUnixWaitForFile_
-#ifndef MAC_OSX_TCL /* not accessable on Win32/UNIX */
+#ifndef MAC_OSX_TCL /* not accessible on Win32/UNIX */
 #undef TclMacOSXGetFileAttribute /* 15 */
 #undef TclMacOSXSetFileAttribute /* 16 */
 #undef TclMacOSXCopyFileAttributes /* 17 */
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index e6f210c..cacf87a 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -198,7 +198,7 @@ struct LimitHandler {
 /*
  * Values for the LimitHandler flags field.
  *      LIMIT_HANDLER_ACTIVE - Whether the handler is currently being
- *              processed; handlers are never to be entered reentrantly.
+ *              processed; handlers are never to be reentered.
  *      LIMIT_HANDLER_DELETED - Whether the handler has been deleted. This
  *              should not normally be observed because when a handler is
  *              deleted it is also spliced out of the list of handlers, but
@@ -3320,7 +3320,7 @@ TclMakeSafe(
     Tcl_UnsetVar2(interp, "tcl_platform", "user", TCL_GLOBAL_ONLY);
 
     /*
-     * Unset path informations variables (the only one remaining is [info
+     * Unset path information variables (the only one remaining is [info
      * nameofexecutable])
      */
 
@@ -4284,7 +4284,7 @@ CallScriptLimitCallback(
  *	None.
  *
  * Side effects:
- *	A limit callback implemented as an invokation of a Tcl script in
+ *	A limit callback implemented as an invocation of a Tcl script in
  *	another interpreter is either installed or removed.
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclLink.c b/generic/tclLink.c
index f478a00..9443db4 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -830,7 +830,7 @@ LinkTraceProc(
     /*
      * For writes, first make sure that the variable is writable. Then convert
      * the Tcl value to C if possible. If the variable isn't writable or can't
-     * be converted, then restore the varaible's old value and return an
+     * be converted, then restore the variable's old value and return an
      * error. Another tricky thing: we have to save and restore the interp's
      * result, since the variable access could occur when the result has been
      * partially set.
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 8b683b1..811bd0f 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -1878,24 +1878,27 @@ Tcl_ListObjAppendList(
  *
  * Tcl_ListObjAppendElement --
  *
- *	This function is a special purpose version of Tcl_ListObjAppendList:
- *	it appends a single object referenced by elemObj to the list object
- *	referenced by toObj. If toObj is not already a list object, an
- *	attempt will be made to convert it to one.
+ *	Like 'Tcl_ListObjAppendList', but Appends a single value to a list.
  *
- * Results:
- *	The return value is normally TCL_OK; in this case elemObj is added to
- *	the end of toObj's list. If toObj does not refer to a list object
- *	and the object can not be converted to one, TCL_ERROR is returned and
- *	an error message will be left in the interpreter's result if interp is
- *	not NULL.
+ * Value
  *
- * Side effects:
- *	The ref count of elemObj is incremented since the list now refers to
- *	it. toObj will be converted, if necessary, to a list object. Also,
- *	appending the new element may cause listObj's array of element
- *	pointers to grow. toObj's old string representation, if any, is
- *	invalidated.
+ *	TCL_OK
+ *
+ *	    'objPtr' is appended to the elements of 'listPtr'.
+ *
+ *	TCL_ERROR
+ *
+ *	    listPtr does not refer to a list object and the object can not be
+ *	    converted to one. An error message will be left in the
+ *	    interpreter's result if interp is not NULL.
+ *
+ * Effect
+ *
+ *	If 'listPtr' is not already of type 'tclListType', it is converted.
+ *	The 'refCount' of 'objPtr' is incremented as it is added to 'listPtr'.
+ *	Appending the new element may cause the array of element pointers
+ *	in 'listObj' to grow.  Any preexisting string representation of
+ *	'listPtr' is invalidated.
  *
  *----------------------------------------------------------------------
  */
@@ -1917,23 +1920,27 @@ Tcl_ListObjAppendElement(
  *
  * Tcl_ListObjIndex --
  *
- *	This function returns a pointer to the index'th object from the list
- *	referenced by listPtr. The first element has index 0. If index is
- *	negative or greater than or equal to the number of elements in the
- *	list, a NULL is returned. If listPtr is not a list object, an attempt
- *	will be made to convert it to a list.
+ * 	Retrieve a pointer to the element of 'listPtr' at 'index'.  The index
+ * 	of the first element is 0.
  *
- * Results:
- *	The return value is normally TCL_OK; in this case objPtrPtr is set to
- *	the Tcl_Obj pointer for the index'th list element or NULL if index is
- *	out of range. This object should be treated as readonly and its ref
- *	count is _not_ incremented; the caller must do that if it holds on to
- *	the reference. If listPtr does not refer to a list and can't be
- *	converted to one, TCL_ERROR is returned and an error message is left
- *	in the interpreter's result if interp is not NULL.
+ * Value
  *
- * Side effects:
- *	listPtr will be converted, if necessary, to a list object.
+ * 	TCL_OK
+ *
+ *	    A pointer to the element at 'index' is stored in 'objPtrPtr'.  If
+ *	    'index' is out of range, NULL is stored in 'objPtrPtr'.  This
+ *	    object should be treated as readonly and its 'refCount' is _not_
+ *	    incremented. The caller must do that if it holds on to the
+ *	    reference.
+ *
+ * 	TCL_ERROR
+ *
+ * 	    'listPtr' is not a valid list. An error message is left in the
+ * 	    interpreter's result if 'interp' is not NULL.
+ *
+ *  Effect
+ *
+ * 	If 'listPtr' is not already of type 'tclListType', it is converted.
  *
  *----------------------------------------------------------------------
  */
@@ -2769,7 +2776,7 @@ TclLsetList(
     ListObjGetElements(indexListCopy, indexCount, indices);
 
     /*
-     * Let TclLsetFlat handle the actual lset'ting.
+     * Let TclLsetFlat perform the actual lset operation.
      */
 
     retValueObj = TclLsetFlat(interp, listObj, indexCount, indices, valueObj);
@@ -3398,18 +3405,16 @@ fail:
  *
  * UpdateStringOfList --
  *
- *	Update the string representation for a list object. Note: This
- *	function does not invalidate an existing old string rep so storage
- *	will be lost if this has not already been done.
+ *	Update the string representation for a list object.
  *
- * Results:
- *	None.
+ *	Any previously-existing string representation is not invalidated, so
+ *	storage is lost if this has not been taken care of.
  *
- * Side effects:
- *	The object's string is set to a valid string that results from the
- *	list-to-string conversion. This string will be empty if the list has
- *	no elements. The list internal representation should not be NULL and
- *	we assume it is not NULL.
+ * Effect
+ *
+ *	The string representation of 'listPtr' is set to the resulting string.
+ *	This string will be empty if the list has no elements. It is assumed
+ *	that the list internal representation is not NULL.
  *
  *----------------------------------------------------------------------
  */
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 56ce848..3966901 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -400,7 +400,7 @@ TclRegisterLiteral(
     int flags)			/* If LITERAL_ON_HEAP then the caller already
 				 * malloc'd bytes and ownership is passed to
 				 * this function. If LITERAL_CMD_NAME then
-				 * the literal should not be shared accross
+				 * the literal should not be shared across
 				 * namespaces. */
 {
     CompileEnv *envPtr = (CompileEnv *)ePtr;
@@ -444,7 +444,7 @@ TclRegisterLiteral(
 
     /*
      * The literal is new to this CompileEnv. If it is a command name, avoid
-     * sharing it accross namespaces, and try not to share it with non-cmd
+     * sharing it across namespaces, and try not to share it with non-cmd
      * literals. Note that FQ command names can be shared, so that we register
      * the namespace as the interp's global NS.
      */
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 5a2979e..2531421 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -4209,7 +4209,7 @@ UnlinkNsPath(
  * Side effects:
  *	Increments the command reference epoch in each namespace whose path
  *	includes the given namespace. This causes any cached resolved names
- *	whose root cacheing context starts at that namespace to be recomputed
+ *	whose root caching context starts at that namespace to be recomputed
  *	the next time they are used.
  *
  *----------------------------------------------------------------------
@@ -4282,7 +4282,7 @@ NamespaceQualifiersCmd(
 	if ((*p == ':') && (p > name) && (*(p-1) == ':')) {
 	    p -= 2;			/* Back up over the :: */
 	    while ((p >= name) && (*p == ':')) {
-		p--;			/* Back up over the preceeding : */
+		p--;			/* Back up over the preceding : */
 	    }
 	    break;
 	}
@@ -4561,7 +4561,7 @@ NamespaceTailCmd(
  *
  * Side effects:
  *	Creates new variables in the current scope, linked to the
- *	corresponding variables in the stipulated nmamespace. If anything goes
+ *	corresponding variables in the stipulated namespace. If anything goes
  *	wrong, the result is an error message.
  *
  *----------------------------------------------------------------------
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index e17819e..e511fa1 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -1027,12 +1027,12 @@ Tcl_DoOneEvent(
 	}
 
 	/*
-	 * If Tcl_WaitForEvent has returned 1, indicating that one system
-	 * event has been dispatched (and thus that some Tcl code might have
-	 * been indirectly executed), we break out of the loop. We do this to
-	 * give VwaitCmd for instance a chance to check if that system event
-	 * had the side effect of changing the variable (so the vwait can
-	 * return and unwind properly).
+	 * If Tcl_WaitForEvent has returned 1, indicating that one system event
+	 * has been dispatched (and thus that some Tcl code might have been
+	 * indirectly executed), we break out of the loop in order, e.g.  to
+	 * give vwait a chance to determine whether that system event had the
+	 * side effect of changing the variable (so the vwait can return and
+	 * unwind properly).
 	 *
 	 * NB: We will process idle events if any first, because otherwise we
 	 *     might never do the idle events if the notifier always gets
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 299ac4c..46ab3b2 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -1134,7 +1134,7 @@ ObjectNamespaceDeleted(
 
     /*
      * One rule for the teardown routines is that if an object is in the
-     * process of being deleted, nothing else may modify its bookeeping
+     * process of being deleted, nothing else may modify its bookkeeping
      * records.  This is the flag that
      */
 
@@ -1187,7 +1187,7 @@ ObjectNamespaceDeleted(
     if (((Command *) oPtr->command)->flags && CMD_DYING) {
 	/*
 	 * Something has already started the command deletion process. We can
-	 * go ahead and clean up the the namespace,
+	 * go ahead and clean up the namespace,
 	 */
     } else {
 	/*
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index fc36f90..5430a7d 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -1493,7 +1493,7 @@ TclOOGetStereotypeCallChain(
     /*
      * Check to see if the method has no implementation. If so, we probably
      * need to add in a call to the unknown method. Otherwise, set up the
-     * cacheing of the method implementation (if relevant).
+     * caching of the method implementation (if relevant).
      */
 
     if (count == callPtr->numChain) {
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index a613fb4..2386c15 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -18,7 +18,7 @@
 
 /*
  * Structure used to help delay computing names of objects or classes for
- * [info frame] until needed, making invokation faster in the normal case.
+ * [info frame] until needed, making invocation faster in the normal case.
  */
 
 struct PNI {
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 99368fe..fae401d 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -80,7 +80,7 @@ typedef struct {
     Tcl_HashTable *lineCLPtr;   /* This table remembers for each Tcl_Obj
                                  * generated by a call to the function
                                  * TclSubstTokens() from a literal text
-                                 * where bs+nl sequences occured in it, if
+                                 * where bs+nl sequences occurred in it, if
                                  * any. I.e. this table keeps track of
                                  * invisible and stripped continuation lines.
                                  * Its keys are Tcl_Obj pointers, the values
@@ -111,14 +111,14 @@ static ThreadSpecificData *TclGetContLineTable(void);
  */
 
 typedef struct PendingObjData {
-    int deletionCount;		/* Count of the number of invokations of
+    int deletionCount;		/* Count of the number of invocations of
 				 * TclFreeObj() are on the stack (at least
 				 * conceptually; many are actually expanded
 				 * macros). */
     Tcl_Obj *deletionStack;	/* Stack of objects that have had TclFreeObj()
 				 * invoked upon them but which can't be
 				 * deleted yet because they are in a nested
-				 * invokation of TclFreeObj(). By postponing
+				 * invocation of TclFreeObj(). By postponing
 				 * this way, we limit the maximum overall C
 				 * stack depth when deleting a complex object.
 				 * The down-side is that we alter the overall
@@ -581,7 +581,7 @@ TclContinuationsEnter(
 	 * the switch command is identical, mapping them all to the same
 	 * literal. An interesting result of this is that the number and
 	 * locations (offset) of invisible continuation lines in the literal
-	 * are the same for all occurences.
+	 * are the same for all occurrences.
 	 *
 	 * Note that while reusing the existing entry is possible it requires
 	 * the same actions as for a new entry because we have to copy the
@@ -1391,7 +1391,7 @@ TclFreeObj(
      * We have to access it using the low-level call and then check for
      * validity. This function can be called after TclFinalizeThreadData() has
      * already killed the thread-global data structures. Performing
-     * TCL_TSD_INIT will leave us with an un-initialized memory block upon
+     * TCL_TSD_INIT will leave us with an uninitialized memory block upon
      * which we crash (if we where to access the uninitialized hashtable).
      */
 
@@ -1482,7 +1482,7 @@ TclFreeObj(
      * We have to access it using the low-level call and then check for
      * validity. This function can be called after TclFinalizeThreadData() has
      * already killed the thread-global data structures. Performing
-     * TCL_TSD_INIT will leave us with an un-initialized memory block upon
+     * TCL_TSD_INIT will leave us with an uninitialized memory block upon
      * which we crash (if we where to access the uninitialized hashtable).
      */
 
@@ -3866,7 +3866,7 @@ Tcl_GetBignumFromObj(
  *
  * Side effects:
  *	A copy of bignum is stored in *bignumValue, which is expected to be
- *	uninitialized or cleared. If conversion fails, an the 'interp'
+ *	uninitialized or cleared. If conversion fails and the 'interp'
  *	argument is not NULL, an error message is stored in the interpreter
  *	result.
  *
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index ba7e801..1f5ef27 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -144,7 +144,7 @@ Tcl_PanicVA(
  */
 
 /*
- * The following comment is here so that Coverity's static analizer knows that
+ * The following comment is here so that Coverity's static analyzer knows that
  * a Tcl_Panic() call can never return and avoids lots of false positives.
  */
 
diff --git a/generic/tclParse.c b/generic/tclParse.c
index 4de0356..5ee1a9f 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -779,7 +779,7 @@ ParseHex(
 
 int
 TclParseBackslash(
-    const char *src,		/* Points to the backslash character of a a
+    const char *src,		/* Points to the backslash character of a
 				 * backslash sequence. */
     int numBytes,		/* Max number of bytes to scan. */
     int *readPtr,		/* NULL, or points to storage where the number
@@ -2133,9 +2133,9 @@ TclSubstTokens(
      */
 
     /*
-     * For the handling of continuation lines in literals we first check if
-     * this is actually a literal. For if not we can forego the additional
-     * processing. Otherwise we pre-allocate a small table to store the
+     * For the handling of continuation lines in literals, first check if
+     * this is actually a literal. If not then forego the additional
+     * processing. Otherwise preallocate a small table to store the
      * locations of all continuation lines we find in this literal, if any.
      * The table is extended if needed.
      */
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index e67ae64..ce9db2a 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -827,7 +827,7 @@ TclJoinPath(
     int elements,		/* Number of elements to use (-1 = all) */
     Tcl_Obj * const objv[],	/* Path elements to join */
     int forceRelative)		/* If non-zero, assume all more paths are
-				 * relative (e. g. simple normalization) */
+				 * relative (e.g. simple normalization) */
 {
     Tcl_Obj *res = NULL;
     int i;
@@ -883,7 +883,7 @@ TclJoinPath(
 		}
 
 		/*
-		 * If it doesn't begin with '.' and is a unix path or it a
+		 * If it doesn't begin with '.' and is a Unix path or it a
 		 * windows path without backslashes, then we can be very
 		 * efficient here. (In fact even a windows path with
 		 * backslashes can be joined efficiently, but the path object
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 699d559..830f3f6 100644
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -415,7 +415,7 @@ TclCreatePipeline(
     TclFile *outPipePtr,	/* If non-NULL, output to the pipeline goes to
 				 * a pipe, unless overridden by redirection in
 				 * the command. The file id with which to read
-				 * frome this pipe is stored at *outPipePtr.
+				 * from this pipe is stored at *outPipePtr.
 				 * NULL means command specified its own output
 				 * sink. */
     TclFile *errFilePtr)	/* If non-NULL, all stderr output from the
@@ -489,7 +489,7 @@ TclCreatePipeline(
      * and remove them from the argument list in the pipeline. Count the
      * number of distinct processes (it's the number of "|" arguments plus
      * one) but don't remove the "|" arguments because they'll be used in the
-     * second pass to seperate the individual child processes. Cannot start
+     * second pass to separate the individual child processes. Cannot start
      * the child processes in this pass because the redirection symbols may
      * appear anywhere in the command line - e.g., the '<' that specifies the
      * input to the entire pipe may appear at the very end of the argument
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 7866158..c5b2d38 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -1782,7 +1782,7 @@ CompareVersions(
 				 * of version numbers). */
     int *isMajorPtr)		/* If non-null, the word pointed to is filled
 				 * in with a 0/1 value. 1 means that the
-				 * difference occured in the first element. */
+				 * difference occurred in the first element. */
 {
     int thisIsMajor, res, flip;
     char *s1, *e1, *s2, *e2, o1, o2;
@@ -2235,7 +2235,7 @@ RequirementSatisfied(
 
     /*
      * We have both min and max, and generate their internal reps. When
-     * identical we compare as is, otherwise we pad with 'a0' to ove the range
+     * identical we compare as is, otherwise we pad with 'a0' to over the range
      * a bit.
      */
 
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 92b2938..664a18c 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -1818,7 +1818,7 @@ MakeLowPrecisionDouble(
     }
 
     /*
-     * All the easy cases have failed. Promote ths significand to bignum and
+     * All the easy cases have failed. Promote the significand to bignum and
      * call MakeHighPrecisionDouble to do it the hard way.
      */
 
@@ -2120,7 +2120,7 @@ RefineApproximation(
     /*
      * Compute twoMd as 2*M*d, where d is the exact value.
      * This is done by multiplying by 5**(M5+exponent) and then multiplying
-     * by 2**(M5+exponent+1), which is, of couse, a left shift.
+     * by 2**(M5+exponent+1), which is, of course, a left shift.
      */
 
     if (mp_init_copy(&twoMd, exactSignificand) != MP_OKAY) {
@@ -2349,7 +2349,7 @@ NormalizeRightward(
  *
  * RequiredPrecision --
  *
- *	Determines the number of bits needed to hold an intger.
+ *	Determines the number of bits needed to hold an integer.
  *
  * Results:
  *	Returns the position of the most significant bit (0 - 63).  Returns 0
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index de6dc2f..340ef50 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -297,7 +297,7 @@ GrowStringBuffer(
     int flag)
 {
     /*
-     * Pre-conditions:
+     * Preconditions:
      *	objPtr->typePtr == &tclStringType
      *	needed > stringPtr->allocated
      *	flag || objPtr->bytes != NULL
@@ -348,7 +348,7 @@ GrowUnicodeBuffer(
     int needed)
 {
     /*
-     * Pre-conditions:
+     * Preconditions:
      *	objPtr->typePtr == &tclStringType
      *	needed > stringPtr->maxChars
      *	needed < UNICHAR_STRING_MAXCHARS
@@ -594,7 +594,7 @@ Tcl_NewUnicodeObj(
  *	Get the length of the Unicode string from the Tcl object.
  *
  * Results:
- *	Pointer to unicode string representing the unicode object.
+ *	Pointer to Unicode string representing the Unicode object.
  *
  * Side effects:
  *	Frees old internal rep. Allocates memory for new "String" internal
@@ -676,10 +676,10 @@ Tcl_GetCharLength(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object;
-     * we don't need to convert to a string to perform the get-length operation.
+     * Optimize BytArray case: No need to convert to a string to perform the
+     * get-length operation.
      *
-     * Starting in Tcl 8.7, we check for a "pure" bytearray, because the
+     * Starting in Tcl 8.7, check for a "pure" bytearray, because the
      * machinery behind that test is using a proper bytearray ObjType.  We
      * could also compute length of an improper bytearray without shimmering
      * but there's no value in that. We *want* to shimmer an improper bytearray
@@ -773,7 +773,7 @@ Tcl_GetUniChar(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object
+     * Optimize the case where we're really dealing with a ByteArray object
      * we don't need to convert to a string to perform the indexing operation.
      */
 
@@ -817,7 +817,7 @@ Tcl_GetUniChar(
 
 int
 TclGetUniChar(
-    Tcl_Obj *objPtr,		/* The object to get the Unicode charater
+    Tcl_Obj *objPtr,		/* The object to get the Unicode character
 				 * from. */
     int index)			/* Get the index'th Unicode character. */
 {
@@ -829,7 +829,7 @@ TclGetUniChar(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object
+     * Optimize the case where we're really dealing with a ByteArray object
      * we don't need to convert to a string to perform the indexing operation.
      */
 
@@ -911,7 +911,7 @@ TclGetUniChar(
 #undef Tcl_GetUnicode
 unsigned short *
 Tcl_GetUnicode(
-    Tcl_Obj *objPtr)		/* The object to find the unicode string
+    Tcl_Obj *objPtr)		/* The object to find the Unicode string
 				 * for. */
 {
     return TclGetUnicodeFromObj(objPtr, NULL);
@@ -964,10 +964,10 @@ TclGetUnicodeFromObj_(
 #if TCL_UTF_MAX > 3 && !defined(TCL_NO_DEPRECATED)
 unsigned short *
 Tcl_GetUnicodeFromObj(
-    Tcl_Obj *objPtr,		/* The object to find the unicode string
+    Tcl_Obj *objPtr,		/* The object to find the Unicode string
 				 * for. */
     int *lengthPtr)		/* If non-NULL, the location where the string
-				 * rep's unichar length should be stored. If
+				 * rep's Tcl_UniChar length should be stored. If
 				 * NULL, no length is stored. */
 {
     String *stringPtr;
@@ -1090,7 +1090,7 @@ TclGetRange(
     }
 
     /*
-     * Optimize the case where we're really dealing with a bytearray object
+     * Optimize the case where we're really dealing with a ByteArray object
      * we don't need to convert to a string to perform the substring operation.
      */
 
@@ -1309,7 +1309,7 @@ Tcl_SetObjLength(
 	}
 
 	/*
-	 * Mark the new end of the unicode string
+	 * Mark the new end of the Unicode string
 	 */
 
 	stringPtr->numChars = length;
@@ -1401,14 +1401,14 @@ Tcl_AttemptSetObjLength(
 	objPtr->bytes[length] = 0;
 
 	/*
-	 * Invalidate the unicode data.
+	 * Invalidate the Unicode data.
 	 */
 
 	stringPtr->numChars = -1;
 	stringPtr->hasUnicode = 0;
     } else {
 	/*
-	 * Changing length of pure unicode string.
+	 * Changing length of pure Unicode string.
 	 */
 
 	if (length > UNICHAR_STRING_MAXCHARS) {
@@ -1424,7 +1424,7 @@ Tcl_AttemptSetObjLength(
 	}
 
 	/*
-	 * Mark the new end of the unicode string.
+	 * Mark the new end of the Unicode string.
 	 */
 
 	stringPtr->unicode[length] = 0;
@@ -1459,9 +1459,9 @@ Tcl_AttemptSetObjLength(
 void
 Tcl_SetUnicodeObj(
     Tcl_Obj *objPtr,		/* The object to set the string of. */
-    const unsigned short *unicode,	/* The unicode string used to initialize the
+    const unsigned short *unicode,	/* The Unicode string used to initialize the
 				 * object. */
-    int numChars)		/* Number of characters in the unicode
+    int numChars)		/* Number of characters in the Unicode
 				 * string. */
 {
     String *stringPtr;
@@ -1523,9 +1523,9 @@ UnicodeLength(
 static void
 SetUnicodeObj(
     Tcl_Obj *objPtr,		/* The object to set the string of. */
-    const Tcl_UniChar *unicode,	/* The unicode string used to initialize the
+    const Tcl_UniChar *unicode,	/* The Unicode string used to initialize the
 				 * object. */
-    int numChars)		/* Number of characters in the unicode
+    int numChars)		/* Number of characters in the Unicode
 				 * string. */
 {
     UniCharString *stringPtr;
@@ -1699,9 +1699,9 @@ Tcl_AppendToObj(
 void
 TclAppendUnicodeToObj(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
-    const Tcl_UniChar *unicode,	/* The unicode string to append to the
+    const Tcl_UniChar *unicode,	/* The Unicode string to append to the
 				 * object. */
-    int length)			/* Number of chars in "unicode". */
+    int length)			/* Number of chars in unicode. */
 {
     UniCharString *stringPtr;
 
@@ -1756,7 +1756,7 @@ Tcl_AppendUnicodeToObj(
     SET_STRING(objPtr, stringPtr);
 }
 #endif
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1796,7 +1796,7 @@ Tcl_AppendObjToObj(
     }
 
     /*
-     * Handle append of one bytearray object to another as a special case.
+     * Handle append of one ByteArray object to another as a special case.
      * Note that we only do this when the objects are pure so that the
      * bytearray faithfully represent the true value; Otherwise appending the
      * byte arrays together could lose information;
@@ -1913,8 +1913,8 @@ Tcl_AppendObjToObj(
  *
  * AppendUnicodeToUnicodeRep --
  *
- *	This function appends the contents of "unicode" to the Unicode rep of
- *	"objPtr". objPtr must already have a valid Unicode rep.
+ *	Appends the contents of unicode to the Unicode rep of
+ *	objPtr, which must already have a valid Unicode rep.
  *
  * Results:
  *	None.
@@ -1945,7 +1945,7 @@ AppendUnicodeToUnicodeRep(
     stringPtr = GET_UNICHAR_STRING(objPtr);
 
     /*
-     * If not enough space has been allocated for the unicode rep, reallocate
+     * If not enough space has been allocated for the Unicode rep, reallocate
      * the internal rep object with additional space. First try to double the
      * required allocation; if that fails, try a more modest increase. See the
      * "TCL STRING GROWTH ALGORITHM" comment at the top of this file for an
@@ -1959,7 +1959,7 @@ AppendUnicodeToUnicodeRep(
 	int offset = -1;
 
 	/*
-	 * Protect against case where unicode points into the existing
+	 * Protect against case where Unicode points into the existing
 	 * stringPtr->unicode array. Force it to follow any relocations due to
 	 * the reallocs below.
 	 */
@@ -1973,7 +1973,7 @@ AppendUnicodeToUnicodeRep(
 	stringPtr = GET_UNICHAR_STRING(objPtr);
 
 	/*
-	 * Relocate unicode if needed; see above.
+	 * Relocate Unicode if needed; see above.
 	 */
 
 	if (offset >= 0) {
@@ -2018,7 +2018,7 @@ static void
 AppendUnicodeToUtfRep(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const Tcl_UniChar *unicode,	/* String to convert to UTF. */
-    int numChars)		/* Number of chars of "unicode" to convert. */
+    int numChars)		/* Number of chars of unicode to convert. */
 {
     UniCharString *stringPtr = GET_UNICHAR_STRING(objPtr);
 
@@ -4301,8 +4301,8 @@ TclStringReverse(
 
 	if (!inPlace || Tcl_IsShared(objPtr)) {
 	    /*
-	     * Create a non-empty, pure unicode value, so we can coax
-	     * Tcl_SetObjLength into growing the unicode rep buffer.
+	     * Create a non-empty, pure Unicode value, so we can coax
+	     * Tcl_SetObjLength into growing the Unicode rep buffer.
 	     */
 
 	    objPtr = TclNewUnicodeObj(&ch, 1);
@@ -4767,7 +4767,7 @@ SetStringFromAny(
  *	None.
  *
  * Side effects:
- *	The object's string may be set by converting its Unicode represention
+ *	The object's string may be set by converting its Unicode representation
  *	to UTF format.
  *
  *----------------------------------------------------------------------
@@ -4804,7 +4804,7 @@ ExtendStringRepWithUnicode(
     int numChars)
 {
     /*
-     * Pre-condition: this is the "string" Tcl_ObjType.
+     * Precondition: this is the "string" Tcl_ObjType.
      */
 
     int i, origLength, size = 0;
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index bce9092..0219a00 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -55,7 +55,7 @@ typedef struct {
 				 * the UTF string (minus 1 byte for the
 				 * termination char). */
     Tcl_Size maxChars;		/* Max number of chars that can fit in the
-				 * space allocated for the unicode array. */
+				 * space allocated for the Unicode array. */
     int hasUnicode;		/* Boolean determining whether the string has
 				 * a Unicode representation. */
     unsigned short unicode[TCLFLEXARRAY];	/* The array of Unicode chars. The actual size
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 459c494..5e882d1 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -3092,7 +3092,7 @@ TestgetassocdataCmd(
  * TestgetplatformCmd --
  *
  *	This procedure implements the "testgetplatform" command. It is
- *	used to retrievel the value of the tclPlatform global variable.
+ *	used to retrieve the value of the tclPlatform global variable.
  *
  * Results:
  *	A standard Tcl result.
@@ -4853,7 +4853,7 @@ TestsetplatformCmd(
  *	A standard Tcl result.
  *
  * Side effects:
- *	When the packge given by argv[1] is loaded into an interpreter,
+ *	When the package given by argv[1] is loaded into an interpreter,
  *	variable "x" in that interpreter is set to "loaded".
  *
  *----------------------------------------------------------------------
@@ -8063,7 +8063,7 @@ TestNRELevels(
  *
  *	This procedure implements the "testconcatobj" command. It is used
  *	to test that Tcl_ConcatObj does indeed return a fresh Tcl_Obj in all
- *	cases and thet it never corrupts its arguments. In other words, that
+ *	cases and that it never corrupts its arguments. In other words, that
  *	[Bug 1447328] was fixed properly.
  *
  * Results:
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 65bfb14..df4d2e3 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -963,7 +963,7 @@ GetBlocks(
     size_t n;
 
     /*
-     * First, atttempt to move blocks from the shared cache. Note the
+     * First, attempt to move blocks from the shared cache. Note the
      * potentially dirty read of numFree before acquiring the lock which is a
      * slight performance enhancement. The value is verified after the lock is
      * actually acquired.
diff --git a/generic/tclThreadJoin.c b/generic/tclThreadJoin.c
index 4d2aca5..af4bc13 100644
--- a/generic/tclThreadJoin.c
+++ b/generic/tclThreadJoin.c
@@ -211,8 +211,8 @@ TclJoinThread(
  *
  * TclRememberJoinableThread --
  *
- *	This procedure remebers a thread as joinable. Only a call to
- *	TclJoinThread will remove the structre created (and initialized) here.
+ *	This procedure remembers a thread as joinable. Only a call to
+ *	TclJoinThread will remove the structure created (and initialized) here.
  *	IOW, not waiting upon a joinable thread will cause memory leaks.
  *
  * Results:
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index ed887db..22887df 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -823,7 +823,7 @@ ThreadSend(
     }
 
     /*
-     * Short circut sends to ourself. Ought to do something with -async, like
+     * Short circuit sends to ourself. Ought to do something with -async, like
      * run in an idle handler.
      */
 
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 3e8844a..0b1606a 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -1107,7 +1107,7 @@ Tcl_CommandTraceInfo(
  *
  * Side effects:
  *	A trace is set up on the command given by cmdName, such that future
- *	changes to the command will be intermediated by proc. See the manual
+ *	changes to the command will be mediated by proc. See the manual
  *	entry for complete details on the calling sequence for proc.
  *
  *----------------------------------------------------------------------
@@ -2967,7 +2967,7 @@ Tcl_UntraceVar2(
 				 * trace, including any of TCL_TRACE_READS,
 				 * TCL_TRACE_WRITES, TCL_TRACE_UNSETS,
 				 * TCL_GLOBAL_ONLY, and TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc,	/* Function assocated with trace. */
+    Tcl_VarTraceProc *proc,	/* Function associated with trace. */
     ClientData clientData)	/* Arbitrary argument to pass to proc. */
 {
     VarTrace *tracePtr;
@@ -3101,7 +3101,7 @@ Tcl_VarTraceInfo(
 				 * signify an array reference. */
     int flags,			/* OR-ed combo or TCL_GLOBAL_ONLY,
 				 * TCL_NAMESPACE_ONLY (can be 0). */
-    Tcl_VarTraceProc *proc,	/* Function assocated with trace. */
+    Tcl_VarTraceProc *proc,	/* Function associated with trace. */
     ClientData prevClientData)	/* If non-NULL, gives last value returned by
 				 * this function, so this call will return the
 				 * next trace after that one. If NULL, this
@@ -3138,7 +3138,7 @@ Tcl_VarTraceInfo2(
 				 * as-a-whole. */
     int flags,			/* OR-ed combination of TCL_GLOBAL_ONLY,
 				 * TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc,	/* Function assocated with trace. */
+    Tcl_VarTraceProc *proc,	/* Function associated with trace. */
     ClientData prevClientData)	/* If non-NULL, gives last value returned by
 				 * this function, so this call will return the
 				 * next trace after that one. If NULL, this
@@ -3196,7 +3196,7 @@ Tcl_VarTraceInfo2(
  *
  * Side effects:
  *	A trace is set up on the variable given by varName, such that future
- *	references to the variable will be intermediated by proc. See the
+ *	references to the variable will be mediated by proc. See the
  *	manual entry for complete details on the calling sequence for proc.
  *     The variable's flags are updated.
  *
@@ -3237,7 +3237,7 @@ Tcl_TraceVar(
  *
  * Side effects:
  *	A trace is set up on the variable given by part1 and part2, such that
- *	future references to the variable will be intermediated by proc. See
+ *	future references to the variable will be mediated by proc. See
  *	the manual entry for complete details on the calling sequence for
  *	proc. The variable's flags are updated.
  *
@@ -3290,7 +3290,7 @@ Tcl_TraceVar2(
  *
  * Side effects:
  *	A trace is set up on the variable given by part1 and part2, such that
- *	future references to the variable will be intermediated by the
+ *	future references to the variable will be mediated by the
  *	traceProc listed in tracePtr. See the manual entry for complete
  *	details on the calling sequence for proc.
  *
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index fd8681c..6e14689 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -2012,7 +2012,7 @@ int
 TclUniCharNcasecmp(
     const Tcl_UniChar *ucs,	/* Unicode string to compare to uct. */
     const Tcl_UniChar *uct,	/* Unicode string ucs is compared to. */
-    unsigned long numChars)	/* Number of unichars to compare. */
+    unsigned long numChars)	/* Number of Unichars to compare. */
 {
     for ( ; numChars != 0; numChars--, ucs++, uct++) {
 	if (*ucs != *uct) {
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 60e37fc..7bd55e2 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1235,7 +1235,7 @@ TclScanElement(
 	     * If we are quoting solely due to ] or internal " characters use
 	     * the CONVERT_MASK mode where we escape all special characters
 	     * except for braces. "extra" counted space needed to escape
-	     * braces too, so substract "braceCount" to get our actual needs.
+	     * braces too, so subtract "braceCount" to get our actual needs.
 	     */
 
 	    bytesNeeded += (extra - braceCount);
@@ -2064,7 +2064,7 @@ Tcl_ConcatObj(
      * Something cannot be determined to be safe, so build the concatenation
      * the slow way, using the string representations.
      *
-     * First try to pre-allocate the size required.
+     * First try to preallocate the size required.
      */
 
     for (i = 0;  i < objc;  i++) {
diff --git a/generic/tclVar.c b/generic/tclVar.c
index c614371..8ff43f0 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -632,7 +632,7 @@ TclObjLookupVarEx(
     }
 
     /*
-     * If part1Ptr is a parsedVarNameType, retrieve the pre-parsed parts.
+     * If part1Ptr is a parsedVarNameType, retrieve the preparsed parts.
      */
 
     ParsedGetInternalRep(part1Ptr, parsed, arrayPtr, elem);
@@ -793,7 +793,7 @@ TclObjLookupVarEx(
  *	TclObjLookupVar):
  *	    -1 a global reference
  *	    -2 a reference to a namespace variable
- *	    -3 a non-cachable reference, i.e., one of:
+ *	    -3 a non-cacheable reference, i.e., one of:
  *		. non-indexed local var
  *		. a reference of unknown origin;
  *		. resolution by a namespace or interp resolver
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index c485d43..1d64877 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -1731,7 +1731,7 @@ Tcl_ZlibDeflate(
     }
 
     /*
-     * Reduce the bytearray length to the actual data length produced by
+     * Reduce the ByteArray length to the actual data length produced by
      * deflate.
      */
 
diff --git a/library/auto.tcl b/library/auto.tcl
index 3b1bb05..e7c954d 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -180,7 +180,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 			      $basename$patch library]
 	}
     }
-    # uniquify $dirs in order
+    # make $dirs unique, preserving order
     array set seen {}
     foreach i $dirs {
 	# Make sure $i is unique under normalization. Avoid repeated [source].
@@ -380,7 +380,7 @@ namespace eval auto_mkindex_parser {
 	    $parser expose eval
 	    $parser invokehidden rename eval _%@eval
 
-	    # Install all the registered psuedo-command implementations
+	    # Install all the registered pseudo-command implementations
 
 	    foreach cmd $initCommands {
 		eval $cmd
@@ -633,7 +633,7 @@ auto_mkindex_parser::hook {
 	load {} tbcload $auto_mkindex_parser::parser
 
 	# AUTO MKINDEX:  tbcload::bcproc name arglist body
-	# Adds an entry to the auto index list for the given pre-compiled
+	# Adds an entry to the auto index list for the given precompiled
 	# procedure name.
 
 	auto_mkindex_parser::commandInit tbcload::bcproc {name args} {
@@ -688,7 +688,7 @@ auto_mkindex_parser::command namespace {op args} {
 		    }
 		    regsub -all ::+ $name :: name
 		}
-		# create artifical proc to force an entry in the tclIndex
+		# create artificial proc to force an entry in the tclIndex
 		$parser eval [list ::proc $name {} {}]
 	    }
 	}
diff --git a/library/clock.tcl b/library/clock.tcl
index 118d177..be4abf8 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -2298,7 +2298,7 @@ proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
 #	Returns the locale that was previously current.
 #
 # Side effects:
-#	Does [mclocale].  If necessary, loades the designated locale's files.
+#	Does [mclocale].  If necessary, loads the designated locale's files.
 #
 #----------------------------------------------------------------------
 
@@ -2605,7 +2605,7 @@ proc ::tcl::clock::FormatStarDate { date } {
 #
 # Parameters:
 #	year - Year from the Roddenberry epoch
-#	fractYear - Fraction of a year specifiying the day of year.
+#	fractYear - Fraction of a year specifying the day of year.
 #	fractDay - Fraction of a day
 #
 # Results:
@@ -2975,7 +2975,7 @@ proc ::tcl::clock::InterpretHMS { date } {
 #	Returns the system time zone.
 #
 # Side effects:
-#	Stores the sustem time zone in the 'CachedSystemTimeZone'
+#	Stores the system time zone in the 'CachedSystemTimeZone'
 #	variable, since determining it may be an expensive process.
 #
 #----------------------------------------------------------------------
@@ -3401,7 +3401,7 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     close $f
 
     # The file begins with a magic number, sixteen reserved bytes, and then
-    # six 4-byte integers giving counts of fileds in the file.
+    # six 4-byte integers giving counts of fields in the file.
 
     binary scan $d a4a1x15IIIIII \
 	magic version nIsGMT nIsStd nLeap nTime nType nChar
diff --git a/library/history.tcl b/library/history.tcl
index 4867021..5dd6b06 100644
--- a/library/history.tcl
+++ b/library/history.tcl
@@ -268,7 +268,7 @@ proc ::tcl::HistIndex {event} {
 	return -code error "event \"$event\" is too far in the past"
     }
     if {$i > $history(nextid)} {
-	return -code error "event \"$event\" hasn't occured yet"
+	return -code error "event \"$event\" hasn't occurred yet"
     }
     return $i
 }
diff --git a/library/http/http.tcl b/library/http/http.tcl
index f2ad0a0..6c3c068 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -3322,7 +3322,7 @@ proc http::postError {token} {
 #	token	The token returned from http::geturl
 #
 # Side Effects
-#	unsets the state array
+#	Unsets the state array.
 
 proc http::cleanup {token} {
     variable $token
@@ -3350,7 +3350,7 @@ proc http::cleanup {token} {
 
 # http::Connect
 #
-#	This callback is made when an asyncronous connection completes.
+#	This callback is made when an asynchronous connection completes.
 #
 # Arguments
 #	token	The token returned from http::geturl
@@ -4457,7 +4457,7 @@ proc http::CopyChunk {token chunk} {
 #
 # Arguments
 #	token	The token returned from http::geturl
-#	count	The amount transfered
+#	count	The amount transferred
 #
 # Side Effects
 #	Invokes callbacks
diff --git a/library/init.tcl b/library/init.tcl
index 23f4da3..33be0ac 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -132,7 +132,7 @@ if {[namespace which -command exec] eq ""} {
     set auto_noexec 1
 }
 
-# Define a log command (which can be overwitten to log errors
+# Define a log command (which can be overwritten to log errors
 # differently, specially when stderr is not available)
 
 if {[namespace which -command tclLog] eq ""} {
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 12ab43f..fa21685 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -34,7 +34,7 @@ namespace eval msgcat {
 
     # Configuration values per Package (e.g. client namespace).
     # The dict key is of the form "<option> <namespace>" and the value is the
-    # configuration option. A nonexisting key is an unset option.
+    # configuration option. A non-existing key is an unset option.
     variable PackageConfig [dict create mcfolder {} loadcmd {} changecmd {}\
 	    unknowncmd {} loadedlocales {} loclist {}]
 
@@ -211,6 +211,7 @@ proc msgcat::mc {args} {
 #	parent namespace until the source is found.  If additional args are
 #	specified, use the format command to work them into the translated
 #	string.
+#
 #	If no catalog item is found, mcunknown is called in the caller frame
 #	and its result is returned.
 #
@@ -684,7 +685,7 @@ proc msgcat::mcpackagenamespaceget {} {
 #	mcfolder
 #	    The message catalog folder of the package.
 #	    This is automatically set by mcload.
-#	    If the value is changed using the set subcommand, an evntual
+#	    If the value is changed using the set subcommand, an eventual
 #	    loadcmd is invoked and all message files of the package locale are
 #	    loaded.
 #
diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl
index 454b923..914ceff 100644
--- a/library/opt/optparse.tcl
+++ b/library/opt/optparse.tcl
@@ -75,7 +75,7 @@ namespace eval ::tcl {
     variable OptDescN 0
 
 # Inside algorithm/mechanism description:
-# (not for the faint hearted ;-)
+# (not for the faint-hearted ;-)
 #
 # The argument description is parsed into a "program tree"
 # It is called a "program" because it is the program used by
@@ -134,9 +134,9 @@ namespace eval ::tcl {
 # they should start to be much faster.
 # But this code use a lot of helper procs (like Lvarset)
 # which are quite slow and would be helpfully optimized
-# for instance by being written in C. Also our struture
+# for instance by being written in C. Also our structure
 # is complex and there is maybe some places where the
-# string rep might be calculated at great exense. to be checked.
+# string rep might be calculated at great expense. to be checked.
 
 #
 # Parse a given description and saves it here under the given key
@@ -226,7 +226,7 @@ proc ::tcl::OptKeyDelete {key} {
         set OptDesc($descKey)
     }
 
-# Parse entry point for ppl who don't want to register with a key,
+# Parse entry point for people who don't want to register with a key,
 # for instance because the description changes dynamically.
 #  (otherwise one should really use OptKeyRegister once + OptKeyParse
 #   as it is way faster or simply OptProc which does it all)
@@ -328,18 +328,18 @@ proc ::tcl::OptProcArgGiven {argname} {
 	    return $start
 	}
     }
-    # Set the value field of the current instruction
+    # Set the value field of the current instruction.
     proc OptCurSetValue {descriptionsName value} {
 	upvar $descriptionsName descriptions
-	# get the current item full adress
+	# Get the current item full address.
         set adress [OptCurAddr $descriptions]
-	# use the 3th field of the item  (see OptValue / OptNewInst)
+	# Use the 3rd field of the item  (see OptValue / OptNewInst).
 	lappend adress 2
 	Lvarset descriptions $adress [list 1 $value]
 	#                                  ^hasBeenSet flag
     }
 
-    # empty state means done/paste the end of the program
+    # Empty state means done/paste the end of the program.
     proc OptState {item} {
         lindex $item 0
     }
@@ -352,11 +352,11 @@ proc ::tcl::OptProcArgGiven {argname} {
     #######
     # Arguments manipulation
 
-    # Returns the argument that has to be processed now
+    # Returns the argument that has to be processed now.
     proc OptCurrentArg {lst} {
         lindex $lst 0
     }
-    # Advance to next argument
+    # Advance to next argument.
     proc OptNextArg {argsName} {
         uplevel 1 [list Lvarpop1 $argsName]
     }
@@ -553,7 +553,7 @@ proc ::tcl::OptKeyParse {descKey arglist} {
 		if {[OptHasBeenSet $item]} {
 #		    puts "adding $vname"
 		    # lets use the input name for the returned list
-		    # it is more usefull, for instance you can check that
+		    # it is more useful, for instance you can check that
 		    # no flags at all was given with expr
 		    # {![string match "*-*" $Args]}
 		    lappend vnamesLst [OptName $item]
diff --git a/library/package.tcl b/library/package.tcl
index 5f0795f..2d72a7c 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -69,7 +69,7 @@ proc tcl::Pkg::CompareExtension {fileName {ext {}}} {
 #			than lazily when the first reference to an exported
 #			procedure in the package is made.
 # -verbose		(optional) Verbose output; the name of each file that
-#			was successfully rocessed is printed out. Additionally,
+#			was successfully processed is printed out. Additionally,
 #			if processing of a file failed a message is printed.
 # -load pat		(optional) Preload any packages whose names match
 #			the pattern.  Used to handle DLLs that depend on
@@ -206,7 +206,7 @@ proc pkg_mkIndex {args} {
 	    package unknown tclPkgUnknown
 
 	    # Stub out the unknown command so package can call into each other
-	    # during their initialilzation.
+	    # during their initialization.
 
 	    proc unknown {args} {}
 
@@ -733,7 +733,7 @@ proc ::tcl::Pkg::Create {args} {
 	error $err(noLoadOrSource)
     }
 
-    # OK, now everything is good.  Generate the package ifneeded statment.
+    # OK, now everything is good.  Generate the package ifneeded statement.
     set cmdline "package ifneeded $opts(-name) $opts(-version) "
 
     set cmdList {}
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index acaebf2..63d4d76 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -265,7 +265,7 @@ proc ::platform::LibcVersion {base _->_ vv} {
 
     set libc [lindex $libclist 0]
 
-    # Try executing the library first. This should suceed
+    # Try executing the library first. This should succeed
     # for a glibc library, and return the version
     # information.
 
diff --git a/library/platform/shell.tcl b/library/platform/shell.tcl
index 6eb9691..1e43409 100644
--- a/library/platform/shell.tcl
+++ b/library/platform/shell.tcl
@@ -27,7 +27,7 @@ proc ::platform::shell::generic {shell} {
     LOCATE base out
 
     set     code {}
-    # Forget any pre-existing platform package, it might be in
+    # Forget any preexisting platform package, it might be in
     # conflict with this one.
     lappend code {package forget platform}
     # Inject our platform package
@@ -52,7 +52,7 @@ proc ::platform::shell::identify {shell} {
     LOCATE base out
 
     set     code {}
-    # Forget any pre-existing platform package, it might be in
+    # Forget any preexisting platform package, it might be in
     # conflict with this one.
     lappend code {package forget platform}
     # Inject our platform package
@@ -99,14 +99,14 @@ proc ::platform::shell::LOCATE {bv ov} {
     upvar 1 $bv base $ov out
 
     # Locate the platform package for injection into the specified
-    # shell. We are using package management to find it, whereever it
+    # shell. We are using package management to find it, wherever it
     # is, instead of using hardwired relative paths. This allows us to
     # install the two packages as TMs without breaking the code
     # here. If the found package is wrapped we copy the code somewhere
     # where the spawned shell will be able to read it.
 
     # This code is brittle, it needs has to adapt to whatever changes
-    # are made to the TM code, i.e. the provide statement generated by
+    # are made to the TM code, i.e. the "provide" statement generated by
     # tm.tcl
 
     set pl [package ifneeded platform [package require platform]]
diff --git a/library/safe.tcl b/library/safe.tcl
index 7fc2b5c..b84d2f5 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -194,7 +194,7 @@ proc ::safe::interpConfigure {args} {
 		    # it is most probably a set in fact but we would need
 		    # then to jump to the set part and it is not *sure*
 		    # that it is a set action that the user want, so force
-		    # it to use the unambigous -statics ?value? instead:
+		    # it to use the unambiguous -statics ?value? instead:
 		    return -code error\
 			"ambigous query (get or set -noStatics ?)\
 				use -statics instead"
@@ -249,11 +249,11 @@ proc ::safe::interpConfigure {args} {
 	    if {![::tcl::OptProcArgGiven -deleteHook]} {
 		set deleteHook $state(cleanupHook)
 	    }
-	    # we can now reconfigure :
+	    # Now reconfigure
 	    set withAutoPath [::tcl::OptProcArgGiven -autoPath]
 	    InterpSetConfig $child $accessPath $statics $nested $deleteHook $autoPath $withAutoPath
 
-	    # auto_reset the child (to completely synch the new access_path) tests safe-9.8 safe-9.9
+	    # auto_reset the child (to completely sync the new access_path) tests safe-9.8 safe-9.9
 	    if {$doreset} {
 		if {[catch {::interp eval $child {auto_reset}} msg]} {
 		    Log $child "auto_reset failed: $msg"
@@ -375,7 +375,7 @@ proc ::safe::InterpSetConfig {child access_path staticsok nestedok deletehook au
 
 	set raw_auto_path $access_path
 
-	# Add 1st level sub dirs (will searched by auto loading from tcl
+	# Add 1st level subdirs (will searched by auto loading from tcl
 	# code in the child using glob and thus fail, so we add them here
 	# so by default it works the same).
 	set access_path [AddSubDirs $access_path]
@@ -695,7 +695,7 @@ proc ::safe::interpDelete {child} {
     }
 
     # If the child has a cleanup hook registered, call it.  Check the
-    # existance because we might be called to delete an interp which has
+    # existence because we might be called to delete an interp which has
     # not been registered with us at all
 
     if {[info exists state(cleanupHook)]} {
@@ -729,7 +729,7 @@ proc ::safe::interpDelete {child} {
     return
 }
 
-# Set (or get) the logging mecanism
+# Set (or get) the logging mechanism
 
 proc ::safe::setLogCmd {args} {
     variable Log
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 6a161a3..ff3f250 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -153,7 +153,7 @@ namespace eval tcltest {
     }
 
 ##### Initialize internal arrays of tcltest, but only if the caller
-    # has not already pre-initialized them.  This is done to support
+    # has not already preinitialized them.  This is done to support
     # compatibility with older tests that directly access internals
     # rather than go through command interfaces.
     #
@@ -163,7 +163,7 @@ namespace eval tcltest {
 	    return
 	}
 	if {[info exists $varName]} {
-	    # Pre-initialized value is a scalar: destroy it!
+	    # Preinitialized value is a scalar:  Destroy it!
 	    unset $varName
 	}
 	array set $varName $value
@@ -196,7 +196,7 @@ namespace eval tcltest {
     ArrayDefault testConstraints {}
 
 ##### Initialize internal variables of tcltest, but only if the caller
-    # has not already pre-initialized them.  This is done to support
+    # has not already preinitialized them.  This is done to support
     # compatibility with older tests that directly access internals
     # rather than go through command interfaces.
     #
@@ -229,7 +229,7 @@ namespace eval tcltest {
     # check the current working dir for files created by the tests.
     # filesMade keeps track of such files created using the makeFile and
     # makeDirectory procedures.  filesExisted stores the names of
-    # pre-existing files.
+    # preexisting files.
     #
     # Note that $filesExisted lists only those files that exist in
     # the original [temporaryDirectory].
@@ -298,7 +298,7 @@ namespace eval tcltest {
     # keep track of test level for nested test commands
     variable testLevel 0
 
-    # the variables and procs that existed when saveState was called are
+    # the variables and procedures that existed when saveState was called are
     # stored in a variable of the same name
     Default saveState {}
 
@@ -354,12 +354,12 @@ namespace eval tcltest {
 	# be kept in sync with the [configure -outfile] configuration
 	# option ( and underlying variable Option(-outfile) ).  This is
 	# accomplished with a write trace on Option(-outfile) that will
-	# update [outputChannel] whenver a new value is written.  That
+	# update [outputChannel] whenever a new value is written.  That
 	# much is easy.
 	#
 	# The trick is that in order to maintain compatibility with
 	# version 1 of tcltest, we must allow every configuration option
-	# to get its inital value from command line arguments.  This is
+	# to get its initial value from command line arguments.  This is
 	# accomplished by setting initial read traces on all the
 	# configuration options to parse the command line option the first
 	# time they are read.  These traces are cancelled whenever the
@@ -482,7 +482,7 @@ namespace eval tcltest {
 
     # Initialize the default values of the configurable options that are
     # historically associated with an exported variable.  If that variable
-    # is already set, support compatibility by accepting its pre-set value.
+    # is already set, support compatibility by accepting its preset value.
     # Use [trace] to establish ongoing connection between the deprecated
     # exported variable and the modern option kept as a true internal var.
     # Also set up usage string and value testing for the option.
@@ -761,7 +761,7 @@ namespace eval tcltest {
 		# even if the directory is not writable
 		return $directory
 	    }
-	    return -code error "\"$directory\" is not writeable"
+	    return -code error "\"$directory\" is not writable"
 	}
 	return $directory
     }
@@ -852,7 +852,7 @@ namespace eval tcltest {
 # tcltest::Debug* --
 #
 #     Internal helper procedures to write out debug information
-#     dependent on the chosen level. A test shell may overide
+#     dependent on the chosen level. A test shell may override
 #     them, f.e. to redirect the output into a different
 #     channel, or even into a GUI.
 
@@ -1789,7 +1789,7 @@ proc tcltest::SubstArguments {argList} {
     # We need to split the argList up into tokens but cannot use list
     # operations as they throw away some significant quoting, and
     # [split] ignores braces as it should.  Therefore what we do is
-    # gradually build up a string out of whitespace seperated strings.
+    # gradually build up a string out of whitespace-separated strings.
     # We cannot use [split] to split the argList into whitespace
     # separated strings as it throws away the whitespace which maybe
     # important so we have to do it all by hand.
@@ -1896,7 +1896,7 @@ proc tcltest::SubstArguments {argList} {
 #   match -             specifies type of matching to do on result,
 #                       output, errorOutput; this must be a string
 #			previously registered by a call to [customMatch].
-#			The strings exact, glob, and regexp are pre-registered
+#			The strings exact, glob, and regexp are preregistered
 #			by the tcltest package.  Default value is exact.
 #
 # Arguments:
@@ -1927,7 +1927,7 @@ proc tcltest::test {name description args} {
     FillFilesExisted
     incr testLevel
 
-    # Pre-define everything to null except output and errorOutput.  We
+    # Predefine everything to null except output and errorOutput.  We
     # determine whether or not to trap output based on whether or not
     # these variables (output & errorOutput) are defined.
     lassign {} constraints setup cleanup body result returnCodes errorCode match
@@ -2526,7 +2526,7 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
 
     # Remove files and directories created by the makeFile and
     # makeDirectory procedures.  Record the names of files in
-    # workingDirectory that were not pre-existing, and associate them
+    # workingDirectory that were not preexisting, and associate them
     # with the test file that created them.
 
     if {!$calledFromAllFile} {
@@ -3484,7 +3484,7 @@ proc tcltest::threadReap {} {
 
 # Initialize the constraints and set up command line arguments
 namespace eval tcltest {
-    # Define initializers for all the built-in contraint definitions
+    # Define initializers for all the built-in constraint definitions
     DefineConstraintInitializers
 
     # Set up the constraints in the testConstraints array to be lazily
@@ -3493,7 +3493,7 @@ namespace eval tcltest {
     trace add variable testConstraints read [namespace code SafeFetch]
 
     # Only initialize constraints at package load time if an
-    # [initConstraintsHook] has been pre-defined.  This is only
+    # [initConstraintsHook] has been predefined.  This is only
     # for compatibility support.  The modern way to add a custom
     # test constraint is to just call the [testConstraint] command
     # straight away, without all this "hook" nonsense.
diff --git a/library/tm.tcl b/library/tm.tcl
index c1a8f8a..75abfb0 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -22,10 +22,10 @@
 #
 #      This covers the possibility that the application asked for a package
 #      late, and the package was actually added to the installation after the
-#      application was started. It shoukld still be able to find it.
+#      application was started. It should still be able to find it.
 #
 #   2) It still is not there: Either way, you don't get it, but the rescan
-#      takes time. This is however an error case and we dont't care that much
+#      takes time. This is however an error case and we don't care that much
 #      about it
 #
 #   3) It was there the first time; but for some reason a "package forget" has
@@ -70,9 +70,9 @@ namespace eval ::tcl::tm {
 #	No result for subcommands 'add' and 'remove'. A list of paths for
 #	'list'.
 #
-# Sideeffects
+# Side effects
 #	The subcommands 'add' and 'remove' manipulate the list of paths to
-#	search for Tcl Modules. The subcommand 'list' has no sideeffects.
+#	search for Tcl Modules. The subcommand 'list' has no side effects.
 
 proc ::tcl::tm::add {args} {
     # PART OF THE ::tcl::tm::path ENSEMBLE
@@ -81,7 +81,7 @@ proc ::tcl::tm::add {args} {
     #
     # The command enforces the restriction that no path may be an ancestor
     # directory of any other path on the list. If the new path violates this
-    # restriction an error wil be raised.
+    # restriction an error will be raised.
     #
     # If the path is already present as is no error will be raised and no
     # action will be taken.
@@ -166,7 +166,7 @@ proc ::tcl::tm::list {} {
 #	name		- Name of desired package.
 #	version		- Version of desired package. Can be the
 #			  empty string.
-#	exact		- Either -exact or ommitted.
+#	exact		- Either -exact or omitted.
 #
 #	Name, version, and exact are used to determine satisfaction. The
 #	original is called iff no satisfaction was achieved. The name is also
@@ -175,7 +175,7 @@ proc ::tcl::tm::list {} {
 # Results
 #	None.
 #
-# Sideeffects
+# Side effects
 #	May populate the package ifneeded database with additional provide
 #	scripts.
 
@@ -310,7 +310,7 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 # Results
 #	None.
 #
-# Sideeffects
+# Side effects
 #	May add paths to the list of defaults.
 
 proc ::tcl::tm::Defaults {} {
@@ -355,7 +355,7 @@ proc ::tcl::tm::Defaults {} {
 # Results
 #	No result.
 #
-# Sideeffects
+# Side effects
 #	Calls 'path add' to paths to the list of module search paths.
 
 proc ::tcl::tm::roots {paths} {
diff --git a/library/word.tcl b/library/word.tcl
index 58ff4dc..e86c44a 100644
--- a/library/word.tcl
+++ b/library/word.tcl
@@ -5,7 +5,7 @@
 # properly for different platforms.
 #
 # Copyright © 1996 Sun Microsystems, Inc.
-# Copyright © 1998 Scritpics Corporation.
+# Copyright © 1998 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/libtommath/changes.txt b/libtommath/changes.txt
index 1b3a7a3..cc6736c 100644
--- a/libtommath/changes.txt
+++ b/libtommath/changes.txt
@@ -412,7 +412,7 @@ v0.13  -- tons of minor speed-ups in low level add, sub, mul_2 and div_2 which p
 Jan 17th, 2003
 v0.12  -- re-wrote the majority of the makefile so its more portable and will
           install via "make install" on most *nix platforms
-       -- Re-packaged all the source as seperate files.  Means the library a single
+       -- Re-packaged all the source as separate files.  Means the library a single
           file packagage any more.  Instead of just adding "bn.c" you have to add
           libtommath.a
        -- Renamed "bn.h" to "tommath.h"
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 1ee3bf1..77886c7 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -1,7 +1,7 @@
 ########################################################################################################
 #
 # Makefile wrapper to build tcl on Mac OS X in a way compatible with the tk/macosx Xcode buildsystem
-#	uses the standard unix build system in tcl/unix (which can be used directly instead of this
+#	uses the standard Unix build system in tcl/unix (which can be used directly instead of this
 #	if you are not using the tk/macosx projects).
 #
 # Copyright (c) 2002-2008 Daniel A. Steffen <das@users.sourceforge.net>
@@ -150,7 +150,7 @@ ${objdir}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure \
 build-${PROJECT}: ${objdir}/Makefile
 	${DO_MAKE}
 ifeq (${INSTALL_BUILD},)
-# symolic link hackery to trick
+# symbolic link hackery to trick
 # 'make install INSTALL_ROOT=${OBJ_DIR}'
 # into building Tcl.framework and tclsh in ${SYMROOT}
 	@cd "${OBJ_DIR}" && mkdir -p $(dir $(subst ${space},\ ,.${LIBDIR})) $(dir $(subst ${space},\ ,.${BINDIR})) "${SYMROOT}" && \
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index 60cb7f3..0fbc7a3 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -491,7 +491,7 @@ TclMacOSXCopyFileAttributes(
  *
  * Results:
  *	The return value is 1, 0 or -1 indicating whether the file matches the
- *	given criteria, does not match them, or an error occurred (in wich
+ *	given criteria, does not match them, or an error occurred (in which
  *	case an error is left in interp).
  *
  * Side effects:
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index d7c4d7f..169c7b9 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -1350,7 +1350,7 @@ TclpNotifierData(void)
  *	polls without blocking.
  *
  * Results:
- *	Returns 0 if a tcl event or timeout ocurred and 1 if a non-tcl
+ *	Returns 0 if a tcl event or timeout occurred and 1 if a non-tcl
  *	CFRunLoop source was processed.
  *
  * Side effects:
diff --git a/tests/appendComp.test b/tests/appendComp.test
index 66f2a5c..121b704 100644
--- a/tests/appendComp.test
+++ b/tests/appendComp.test
@@ -384,7 +384,7 @@ test appendComp-8.1 {defer error to runtime} -setup {
 # patch (no read traces run for lappend, append). The compiled tests are
 # failing for lappend (9.0/1) before the patch, showing how it invokes read
 # traces in the compiled path. The append tests are good (9.2/3). After the
-# patch the failues are gone.
+# patch the failures are gone.
 
 test appendComp-9.0 {bug 3057639, lappend compiled, read trace on non-existing array variable element} -setup {
     unset -nocomplain myvar
diff --git a/tests/chanio.test b/tests/chanio.test
index 5c0dba4..179d7a7 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -3572,7 +3572,7 @@ test chan-io-31.13 {binary mode is synonym of lf mode} -setup {
 } -result lf
 #
 # Test chan-io-9.14 has been removed because "auto" output translation mode is
-# not supoprted.
+# not supported.
 #
 test chan-io-31.14 {Tcl_Write mixed, Tcl_Gets auto} -setup {
     file delete $path(test1)
@@ -5310,8 +5310,10 @@ test chan-io-39.22a {Tcl_SetChannelOption, invariance} -setup {
 } -cleanup {
     chan close $f1
 } -result {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
-test chan-io-39.23 {Tcl_GetChannelOption, server socket is not readable or\
-        writeable, it should still have valid -eofchar and -translation options} -setup {
+test chan-io-39.23 {
+	Tcl_GetChannelOption, server socket is not readable or writable, but should
+	still have valid -eofchar and -translation options.
+} -setup {
     set l [list]
 } -body {
     set sock [socket -server [namespace code accept] -myaddr 127.0.0.1 0]
@@ -7613,7 +7615,7 @@ test chan-io-61.1 {Reset eof state after changing the eof char} -setup {
     removeFile eofchar
 } -result {77 = 23431}
 
-# Test the cutting and splicing of channels, this is incidentially the
+# Test the cutting and splicing of channels, this is incidentally the
 # attach/detach facility of package Thread, but __without any safeguards__. It
 # can also be used to emulate transfer of channels between threads, and is
 # used for that here.
diff --git a/tests/clock.test b/tests/clock.test
index 2a53259..0b385c9 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -36043,7 +36043,7 @@ test clock-42.1 {regression test - %z in :localtime when west of Greenwich } \
     } \
     -result {-0500}
 
-# 43.1 was a bad test - mktime returning -1 is an error according to posix.
+# 43.1 was a bad test - mktime returning -1 is an error according to Posix.
 
 test clock-44.1 {regression test - time zone name containing hyphen } \
     -setup {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 01a4a36..f024f36 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -1741,7 +1741,7 @@ test cmdAH-24.14.1 {
     file mtime [file join [temporaryDirectory] CON.txt]
 } -match regexp -result {could not (?:get modification time|read)} -returnCodes error
 
-# 3155760000 is 64-bit unix time, Wed Jan 01 00:00:00 GMT 2070:
+# 3155760000 is 64-bit Unix time, Wed Jan 01 00:00:00 GMT 2070:
 test cmdAH-24.20.1 {Tcl_FileObjCmd: atime 64-bit time_t, bug [4718b41c56]} -constraints {time64bit} -setup {
     set filename [makeFile "" foo.text]
 } -body {
@@ -2150,7 +2150,7 @@ test cmdAH-32.5 {file tempfile - templates} -constraints unix -body {
 } -cleanup {
     catch {file delete $name}
 } -result ok
-# Not portable; not all unix systems have mkstemps()
+# Not portable; not all Unix systems have mkstemps()
 test cmdAH-32.6 {file tempfile - templates} -body {
     set template [file join $dirfile foo]
     close [file tempfile name $template.bar]
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index a7aa36c..89947bb 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -55,8 +55,8 @@ test cmdMZ-1.4 {Tcl_PwdObjCmd: failure} -setup {
     file delete -force $foodir
     file mkdir $foodir
     cd $foodir
-} -constraints {unix nonPortable} -body {
-    # This test fails on various unix platforms (eg Linux) where permissions
+} -constraints {Unix nonPortable} -body {
+    # This test fails on various Unix platforms (eg Linux) where permissions
     # caching causes this to fail. The caching is strictly incorrect, but we
     # have no control over that.
     file attr . -permissions 0
diff --git a/tests/compile.test b/tests/compile.test
index aec1ef1..36b4f3a 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -520,7 +520,7 @@ test compile-13.3 {TclCompileScript: testing check of max depth by nested script
     #puts $errors
     # all of nested calls exceed the limit, so must end with "too many nested compilations"
     # (or evaluations, depending on compile method/instruction and "mixed" compile within
-    # evaliation), so no one succeeds, the result must be empty:
+    # evaluation), so no one succeeds, the result must be empty:
     ti eval {set result}
 } -result {}
 #
diff --git a/tests/dict.test b/tests/dict.test
index d67f703..1515675 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -1109,7 +1109,7 @@ test dict-19.2 {dict: testing for leaks} -constraints memory -body {
     # This test is made to stress object reference management
     memtest {
 	apply {{} {
-	    # A shared invalid dictinary
+	    # A shared invalid dictionary
 	    set apa {a {}b c d}
 	    set bepa $apa
 	    catch {dict replace $apa e f}
diff --git a/tests/env.test b/tests/env.test
index ce7c01e..5317897 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -221,9 +221,9 @@ NAME2=more
 XYZZY=garbage}
 
 test env-2.5 {different encoding (wide chars)} -constraints {win exec} -setup {
-    # be sure set of (unicode) environment occurs if single-byte encoding is used:
+    # be sure set of (Unicode) environment occurs if single-byte encoding is used:
     encodingswitch cp1252
-    # german (cp1252) and russian (cp1251) characters together encoded as utf-8:
+    # German (cp1252) and Russian (cp1251) characters together encoded as utf-8:
     set val 2d2dc3a4c3b6c3bcc39f2dd182d0b5d181d1822d2d
     set env(XYZZY) [encoding convertfrom utf-8 [binary decode hex $val]]
     # now switch to utf-8 (to see correct values from test):
@@ -303,7 +303,7 @@ test env-5.1 {
     corner cases - remove one elem at a time
 } -setup setup1 -body {
     # When no environment variables exist, the env var will contain no
-    # entries. The "array names" call synchs up the C-level environ array with
+    # entries. The "array names" call syncs up the C-level environ array with
     # the Tcl level env array. Make sure an empty Tcl array is created.
     foreach e [array names env] {
 	unset env($e)
@@ -347,7 +347,7 @@ test env-5.4 {corner cases - unset the env array} -setup {
     setup1
     interp create i
 } -body {
-    # The info exists command should be in synch with the env array.
+    # The info exists command should be in sync with the env array.
     # Know Bug: 1737
     i eval {set env(THIS_SHOULD_EXIST) a}
     set     result [info exists env(THIS_SHOULD_EXIST)]
diff --git a/tests/error.test b/tests/error.test
index 4ce7709..5bed039 100644
--- a/tests/error.test
+++ b/tests/error.test
@@ -924,7 +924,7 @@ test error-18.12 {variable assignment unaffected by exception in finally} {
     list $em [dict get $opts -errorcode]
 } {bar FOO}
 
-# try tests - fallthough body cases
+# try tests - fall-through body cases
 
 test error-19.1 {try with fallthrough body #1} {
     set RES {}
diff --git a/tests/eval.test b/tests/eval.test
index 5ffe309..9b8eccd 100644
--- a/tests/eval.test
+++ b/tests/eval.test
@@ -64,7 +64,7 @@ test eval-3.2 {concatenating eval and pure lists} {
 } {1 2 3 4 5}
 test eval-3.3 {eval and canonical lists} {
     set cmd [list list 1 2 3 4 5]
-    # Force existance of utf-8 rep
+    # Force existence of utf-8 rep
     set dummy($cmd) $cmd
     unset dummy
     eval $cmd
@@ -72,7 +72,7 @@ test eval-3.3 {eval and canonical lists} {
 test eval-3.4 {concatenating eval and canonical lists} {
     set cmd  [list list 1]
     set cmd2 [list 2 3 4 5]
-    # Force existance of utf-8 rep
+    # Force existence of utf-8 rep
     set dummy($cmd) $cmd
     set dummy($cmd2) $cmd2
     unset dummy
diff --git a/tests/event.test b/tests/event.test
index 16cbc24..d62d08e 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -427,7 +427,7 @@ foo
 
 # someday : add a test checking that when there is no bgerror, an error msg
 # goes to stderr ideally one would use sub interp and transfer a fake stderr
-# to it, unfortunatly the current interp tcl API does not allow that. The
+# to it, unfortunately the current interp tcl API does not allow that. The
 # other option would be to use fork a test but it then becomes more a
 # file/exec test than a bgerror test.
 
diff --git a/tests/exec.test b/tests/exec.test
index d1ef418..4058ae9 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -25,7 +25,7 @@ testConstraint noosxCI [expr {![info exists ::env(MAC_CI)]}]
 
 unset -nocomplain path
 
-# Utilities that are like bourne shell stalwarts, but cross-platform.
+# Utilities that are like Bourne shell stalwarts, but cross-platform.
 set path(echo) [makeFile {
     puts -nonewline [lindex $argv 0]
     foreach str [lrange $argv 1 end] {
diff --git a/tests/expr.test b/tests/expr.test
index 85860f7..985bce1 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -7455,7 +7455,7 @@ test expr-62.10 {TIP 582: comments can go inside function calls} {
 # Bug e3dcab1d14
 proc do-one-test-expr-63 {e p float athreshold} {
     # e - power of 2 to test
-    # p - tcl_precision to test wuth
+    # p - tcl_precision to test with
     # float - floating point value 2**-$p
     # athreshold - tolerable absolute error (1/2 decimal digit in
     #              least significant place plus 1/2 least significant bit)
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 3476895..2469762 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -87,7 +87,7 @@ testConstraint notFileSharing 1
 testConstraint linkFile 1
 testConstraint linkDirectory 1
 
-# Several tests require need to match results against the unix username
+# Several tests require need to match results against the Unix username
 set user {}
 if {[testConstraint unix]} {
     catch {
@@ -787,7 +787,7 @@ test fCmd-7.5 {FileForceOption: multiple times through loop} -setup {
 
 test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
     -constraints {unix notRoot knownBug} -body {
-    # Labelled knownBug because it is dangerous [Bug: 3881]
+    # Labeled knownBug because it is dangerous [Bug: 3881]
     file mkdir td1
     file attr td1 -perm 0o40000
     file rename ~$user td1
@@ -887,7 +887,7 @@ test fCmd-9.7 {file rename: comprehensive: file to existing file} -setup {
 test fCmd-9.8 {file rename: comprehensive: dir to empty dir} -setup {
     cleanup
 } -constraints {notRoot testchmod notNetworkFilesystem} -body {
-    # Under unix, you can rename a read-only directory, but you can't move it
+    # Under Unix you can rename a read-only directory, but you can't move it
     # into another directory.
     file mkdir td1
     file mkdir [file join td2 td1]
@@ -2438,7 +2438,7 @@ test fCmd-28.12 {file link: cd into a link} -setup {
     cd $orig
     # Now '$up' should be either $orig or [file dirname abc.dir], depending on
     # whether 'cd' actually moves to the destination of a link, or simply
-    # treats the link as a directory. (On windows the former, on unix the
+    # treats the link as a directory. (On windows the former, on Unix the
     # latter, I believe)
     if {
 	([file normalize $up] ne [file normalize $orig]) &&
diff --git a/tests/fileName.test b/tests/fileName.test
index d70c09c..b147bd7 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -1346,7 +1346,7 @@ catch {file attributes globTest/a1 -permissions 0o755}
 test filename-15.4 {unix specific no complain: no errors, good result} \
 	{unix nonPortable} {
     # test fails because if an error occurs, the interp's result is reset...
-    # or you don't run at scriptics where the outser and welch users exists
+    # or you don't run at scriptics where the ouster and welch users exists
     glob -nocomplain ~ouster ~foo ~welch
 } {/home/ouster /home/welch}
 test filename-15.4.1 {no complain: errors, sequencing} {
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 003bf40..d62a59a 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -298,7 +298,7 @@ test filesystem-1.33 {link normalisation: link near filesystem root} {testsetpla
     testsetplatform windows
     set res [file normalize C:/../bar]
     if {[testConstraint unix]} {
-	# Some unices go further in normalizing this -- not really a problem
+	# Some Unices go further in normalizing this -- not really a problem
 	# since this is a Windows test.
 	regexp {C:/bar$} $res res
     }
diff --git a/tests/for.test b/tests/for.test
index 8284a09..26300ce 100644
--- a/tests/for.test
+++ b/tests/for.test
@@ -337,7 +337,7 @@ proc formatMail {} {
         50 {} \
         51 {Binary Releases} \
         52 {} \
-        53 {Pre-compiled releases are available for the following platforms: } \
+        53 {Precompiled releases are available for the following platforms: } \
         54 {} \
         55 {     Windows 3.1, Windows 95, and Windows NT: Fetch} \
         56 {     ftp://ftp.sunlabs.com/pub/tcl/win42b1.exe, then execute it. The file is a} \
@@ -556,7 +556,7 @@ Obtaining The Releases
 
 Binary Releases
 
-Pre-compiled releases are available for the following
+Precompiled releases are available for the following
 platforms:
 
      Windows 3.1, Windows 95, and Windows NT: Fetch
diff --git a/tests/indexObj.test b/tests/indexObj.test
index f10bd2a..2c50200 100644
--- a/tests/indexObj.test
+++ b/tests/indexObj.test
@@ -1,4 +1,4 @@
-# This file is a Tcl script to test out the the procedures in file
+# This file is a Tcl script to test out the procedures in file
 # tkIndexObj.c, which implement indexed table lookups.  The tests here are
 # organized in the standard fashion for Tcl tests.
 #
diff --git a/tests/internals.tcl b/tests/internals.tcl
index ff6c42b..36dbc90 100644
--- a/tests/internals.tcl
+++ b/tests/internals.tcl
@@ -36,7 +36,7 @@ proc testWithLimit args {
 	# with limited address space:
 	if {[info exists in(-addmem)] || [info exists in(-maxmem)]} {
 	    if {[info exists in(-addmem)]} {
-		# as differnce to normal usage, so try to retrieve current memory usage:
+		# as difference to normal usage, so try to retrieve current memory usage:
 		if {[catch {
 		    # using ps (vsz is in KB):
 		    incr in(-addmem) [expr {[lindex [exec ps -hq $ppid -o vsz] end] * 1024}]
diff --git a/tests/io.test b/tests/io.test
index 88ad425..82a458d 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -3833,7 +3833,7 @@ test io-31.13 {binary mode is synonym of lf mode} {
 } lf
 #
 # Test io-9.14 has been removed because "auto" output translation mode is
-# not supoprted.
+# not supported.
 #
 test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} {
     file delete $path(test1)
@@ -5790,7 +5790,7 @@ test io-39.22a {Tcl_SetChannelOption, invariance} {
     set l
 } {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
 test io-39.23 {Tcl_GetChannelOption, server socket is not readable or
-        writeable, it should still have valid -eofchar and -translation options } {
+        writable, it should still have valid -eofchar and -translation options } {
     set l [list]
     set sock [socket -server [namespace code accept] -myaddr 127.0.0.1 0]
     lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation]
@@ -8752,7 +8752,7 @@ test io-61.1 {Reset eof state after changing the eof char} -setup {
 } -result {77 = 23431}
 
 
-# Test the cutting and splicing of channels, this is incidentially the
+# Test the cutting and splicing of channels, this is incidentally the
 # attach/detach facility of package Thread, but __without any
 # safeguards__. It can also be used to emulate transfer of channels
 # between threads, and is used for that here.
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index c5b0352..2a1f616 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -703,7 +703,7 @@ test iocmd-20.1 {chan, unknown method} -body {
 } -returnCodes error -match glob -result {unknown or ambiguous subcommand "foo": must be *}
 
 # --- --- --- --------- --------- ---------
-# chan create, and method "initalize"
+# chan create, and method "initialize"
 
 test iocmd-21.0 {chan create, wrong#args, not enough} {
     catch {chan create} msg
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 9f6542c..45d2530 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -114,7 +114,7 @@ test iortrans-1.1 {chan, unknown method} -returnCodes error -body {
 } -match glob -result {unknown or ambiguous subcommand "foo": must be*}
 
 # --- --- --- --------- --------- ---------
-# chan push, and method "initalize"
+# chan push, and method "initialize"
 
 test iortrans-2.0 {chan push, wrong#args, not enough} -returnCodes error -body {
     chan push
@@ -1334,7 +1334,7 @@ test iortrans-11.2 {delete interp of reflected transform} -setup {
 
 # ### ### ### ######### ######### #########
 ## Helper command. Runs a script in a separate thread and returns the result.
-## A channel is transfered into the thread as well, and a list of configuation
+## A channel is transferred into the thread as well, and a list of configuration
 ## variables
 
 proc inthread {chan script args} {
@@ -2013,7 +2013,7 @@ test iortrans.tf-8.1 {seek flushes write buffers, ignores data} -setup {
 	# The close flushes again, this modifies the file!
 	lappend notes | [close $c] |
 	# NOTE: The flush generated by the close is recorded immediately, the
-	# other note's here are defered until after the thread is done. This
+	# other note's here are deferred until after the thread is done. This
 	# changes the order of the result a bit from the non-threaded case
 	# (The first | moves one to the right). This is an artifact of the
 	# 'inthread' framework, not of the transformation itself.
diff --git a/tests/iogt.test b/tests/iogt.test
index d397ccb..5692682 100644
--- a/tests/iogt.test
+++ b/tests/iogt.test
@@ -843,7 +843,7 @@ test iogt-6.0 {Push back} -constraints testchannel -body {
     # expect to get "xxx" from the transform because of unread "def" input to
     # transform which returns "xxx".
     #
-    # Actually the IO layer pre-read the whole file and will read "def"
+    # Actually the IO layer preread the whole file and will read "def"
     # directly from the buffer without bothering to consult the newly stacked
     # transformation. This is wrong.
     read $f 3
diff --git a/tests/mathop.test b/tests/mathop.test
index 13a0543..3c25a2b 100644
--- a/tests/mathop.test
+++ b/tests/mathop.test
@@ -22,7 +22,7 @@ namespace eval ::testmathop2 {
 }
 
 # Helper to test math ops.
-# Test different invokation variants and see that they do the same thing.
+# Test different invocation variants and see that they do the same thing.
 # Byte compiled / non byte compiled version
 # Shared / unshared arguments
 # Original / imported
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 4549cee..6d2ba2c 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -1055,7 +1055,7 @@ if {[package vsatisfies [package provide msgcat] 1.7]} {
     variable locale
     if {![info exist locale]} { set locale [mclocale] }
 
-	test msgcat-14.1 {invokation loadcmd} -setup {
+	test msgcat-14.1 {invocation loadcmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
@@ -1069,7 +1069,7 @@ if {[package vsatisfies [package provide msgcat] 1.7]} {
 	    lsort $resultvariable
 	} -result {foo foo_bar}
 
-	test msgcat-14.2 {invokation failed in loadcmd} -setup {
+	test msgcat-14.2 {invocation failed in loadcmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
@@ -1087,7 +1087,7 @@ if {[package vsatisfies [package provide msgcat] 1.7]} {
 	    list $err [dict get $errdict -code]
 	} -result {fail 1}
 
-	test msgcat-14.3 {invokation changecmd} -setup {
+	test msgcat-14.3 {invocation changecmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
@@ -1100,7 +1100,7 @@ if {[package vsatisfies [package provide msgcat] 1.7]} {
 	    set resultvariable
 	} -result {foo_bar foo {}}
 
-	test msgcat-14.4 {invokation unknowncmd} -setup {
+	test msgcat-14.4 {invocation unknowncmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
 	    mclocale ""
diff --git a/tests/ooNext2.test b/tests/ooNext2.test
index 746f9a5..8d8cf45 100644
--- a/tests/ooNext2.test
+++ b/tests/ooNext2.test
@@ -126,7 +126,7 @@ test oo-nextto-1.3 {basic nextto functionality: constructors} -setup {
 	variable result
 	constructor {p q r} {
 	    lappend result ==C== p=$p,q=$q,r=$r
-	    # Route arguments to superclasses, in non-trival pattern
+	    # Route arguments to superclasses, in non-trivial pattern
 	    nextto B $q
 	    nextto A $p $r
 	}
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index 25840c6..33add42 100644
--- a/tests/pkgMkIndex.test
+++ b/tests/pkgMkIndex.test
@@ -490,7 +490,7 @@ removeFile [file join pkg pkg2_b.tcl]
 
 makeFile {
 #  This package requires circ2, and circ2 requires circ3, which in turn
-#  requires circ1.  In case of cirularities, pkg_mkIndex should give up when
+#  requires circ1.  In case of circularities, pkg_mkIndex should give up when
 #  it gets stuck.
 package require circ2 1.0
 package provide circ1 1.0
@@ -654,7 +654,7 @@ test pkgMkIndex-12.1 {same name procs in different namespace} {
 
 removeFile [file join pkg samename.tcl]
 
-# Proc names with embedded spaces are properly listed (ie, correct number of
+# Proc names with embedded spaces are properly listed (i.e. correct number of
 # braces) in result
 makeFile {
 package provide spacename 1.0
diff --git a/tests/remote.tcl b/tests/remote.tcl
index 6bc4b17..eee551a 100644
--- a/tests/remote.tcl
+++ b/tests/remote.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-# Initialize message delimitor
+# Initialize message delimiter
 
 # Initialize command array
 catch {unset command}
diff --git a/tests/resolver.test b/tests/resolver.test
index 51df07c..ea84956 100644
--- a/tests/resolver.test
+++ b/tests/resolver.test
@@ -203,7 +203,7 @@ test resolver-2.1 {compiled var resolver: Bug #3383616} -setup {
 # resolver-agnostic).
 #
 # In order to make the test cases for the per-interpreter cmd literal pool
-# reproducable and to minimize interactions between test cases, we use a child
+# reproducible and to minimize interactions between test cases, we use a child
 # interpreter per test-case.
 #
 #
diff --git a/tests/safe-stock.test b/tests/safe-stock.test
index d23d86e..24e90a0 100644
--- a/tests/safe-stock.test
+++ b/tests/safe-stock.test
@@ -97,8 +97,8 @@ proc mapAndSortList {map listIn} {
     lsort $listOut
 }
 
-# Force actual loading of the safe package because we use un-exported (and
-# thus un-autoindexed) APIs in this test result arguments:
+# Force actual loading of the safe package because we use unexported (and
+# thus unautoindexed) APIs in this test result arguments:
 catch {safe::interpConfigure}
 
 testConstraint AutoSyncDefined 1
diff --git a/tests/safe.test b/tests/safe.test
index f3890b7..0a888f4 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -56,8 +56,8 @@ proc mapAndSortList {map listIn} {
     lsort $listOut
 }
 
-# Force actual loading of the safe package because we use un-exported (and
-# thus un-autoindexed) APIs in this test result arguments:
+# Force actual loading of the safe package because we use unexported (and
+# thus unautoindexed) APIs in this test result arguments:
 catch {safe::interpConfigure}
 
 # testing that nested and statics do what is advertised (we use a static
diff --git a/tests/scan.test b/tests/scan.test
index 03a5b46..cf58828 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -508,7 +508,7 @@ test scan-5.10 {integer scanning} -setup {
     list [scan "1 2 " "%hd %d %d %d" a b c d] $a $b $c $d
 } -result {2 1 2 {} {}}
 #
-# The behavior for scaning intergers larger than MAX_INT is not defined by the
+# The behavior for scanning integers larger than MAX_INT is not defined by the
 # ANSI spec.  Some implementations wrap the input (-16) some return MAX_INT.
 #
 test scan-5.11 {integer scanning} -constraints {nonPortable} -setup {
diff --git a/tests/socket.test b/tests/socket.test
index 052733f..82e908a 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -127,7 +127,7 @@ set t2 [clock milliseconds]
 set lat1 [expr {($t2-$t1)*2}]; # doubled as a safety margin
 
 # Test the latency of failed connection attempts over the loopback
-# interface. They can take more than a second under Windowos and requres
+# interface. They can take more than a second under Windows and requires
 # additional [after]s in some tests that are not needed on systems that fail
 # immediately.
 set t1 [clock milliseconds]
@@ -1864,7 +1864,7 @@ proc transf_test {{testmode transfer} {maxIter 1000} {maxTime 10000}} {
     set srvsock {}
     # if binding on port 0 is not possible (system related, blocked on ISPs etc):
     if {[catch {close [socket -async $::localhost $port]}]} {
-      # simplest server on random port (immediatelly closing a connect):
+      # simplest server on random port (immediately closing a connect):
       set port [randport]
       set srvsock [socket -server {apply {{ch args} {close $ch}}} -myaddr $::localhost $port]
       # socket on windows has some issues yet (e. g. bug [b6d0d8cc2c]), so we simply decrease iteration count (to 1/4):
@@ -1898,7 +1898,7 @@ proc transf_test {{testmode transfer} {maxIter 1000} {maxTime 10000}} {
       }
       iteration first
     }
-    # parent proc commiting transfer attempt (attach) and checking acquire was successful:
+    # parent proc committing transfer attempt (attach) and checking acquire was successful:
     proc transf_parent {fd args} {
       tcltest::DebugPuts 2 "** trma / $::count ** $args **"
       thread::attach $fd
@@ -2447,7 +2447,7 @@ test socket-14.13 {testing writable event when quick failure} \
     # Test for bug 336441ed59 where a quick background fail was ignored
 
     # Test only for windows as socket -async 255.255.255.255 fails
-    # directly on unix
+    # directly on Unix
 
     # The following connect should fail very quickly
     set a1 [after 2000 {set x timeout}]
diff --git a/tests/stringObj.test b/tests/stringObj.test
index 5c1d040..60e1294 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -317,7 +317,7 @@ test stringObj-9.10 {TclAppendObjToObj, integer src & mixed dest} testobj {
 test stringObj-9.11 {TclAppendObjToObj, mixed src & 1-byte dest index check} testobj {
     # bug 2678, in <=8.2.0, the second obj (the one to append) in
     # Tcl_AppendObjToObj was not correctly checked to see if it was all one
-    # byte chars, so a unicode string would be added as one byte chars.
+    # byte chars, so a Unicode string would be added as one byte chars.
     set x abcdef
     set len [string length $x]
     set y a\xFCb\xE5c\xEF
@@ -410,13 +410,13 @@ test stringObj-13.4 {Tcl_GetCharLength with mixed width chars} testobj {
 } 1
 test stringObj-13.5 {Tcl_GetCharLength with mixed width chars} testobj {
     # string length "￮￮"
-    # Use \uXXXX notation below instead of hardcoding the values, otherwise
+    # Use \uXXXX notation below instead of hard-coding the values, otherwise
     # the test will fail in multibyte locales.
     string length "\xEF\xBF\xAE\xEF\xBF\xAE"
 } 6
 test stringObj-13.6 {Tcl_GetCharLength with mixed width chars} testobj {
     # set a "ïa¿b®cï¿d®"
-    # Use \uXXXX notation below instead of hardcoding the values, otherwise
+    # Use \uXXXX notation below instead of hard-coding the values, otherwise
     # the test will fail in multibyte locales.
     set a "\xEFa\xBFb\xAEc\xEF\xBFd\xAE"
     list [string length $a] [string length $a]
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 29d40e2..114ce30 100644
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -542,20 +542,20 @@ test tcltest-8.2 {tcltest a.tcl -tmpdir thisdirectoryisafile} {
     -result {*not a directory*}
     -match glob
 }
-# Test non-writeable directories, non-readable directories with directory flags
+# Test non-writable directories, non-readable directories with directory flags
 set notReadableDir [file join [temporaryDirectory] notreadable]
-set notWriteableDir [file join [temporaryDirectory] notwriteable]
+set notWritableDir [file join [temporaryDirectory] notwritable]
 makeDirectory notreadable
-makeDirectory notwriteable
+makeDirectory notwritable
 switch -- $::tcl_platform(platform) {
     unix {
 	file attributes $notReadableDir -permissions 0o333
-	file attributes $notWriteableDir -permissions 0o555
+	file attributes $notWritableDir -permissions 0o555
     }
     default {
 	# note in FAT/NTFS we won't be able to protect directory with read-only attribute...
-	catch {file attributes $notWriteableDir -readonly 1}
-	catch {testchmod 0o444 $notWriteableDir}
+	catch {file attributes $notWritableDir -readonly 1}
+	catch {testchmod 0o444 $notWritableDir}
     }
 }
 test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
@@ -570,17 +570,17 @@ test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {
 # This constraint doesn't go at the top of the file so that it doesn't
 # interfere with tcltest-5.5
 testConstraint notFAT [expr {
-       ![regexp {^(FAT\d*|NTFS)$} [lindex [file system $notWriteableDir] 1]]
+       ![regexp {^(FAT\d*|NTFS)$} [lindex [file system $notWritableDir] 1]]
     || $::tcl_platform(platform) eq "unix" || [llength [info commands testchmod]]
 }]
 # FAT/NTFS permissions are fairly hopeless; ignore this test if that FS is used
-test tcltest-8.4 {tcltest a.tcl -tmpdir notWriteableDir} {
+test tcltest-8.4 {tcltest a.tcl -tmpdir notWritableDir} {
     -constraints {unixOrWin notRoot notFAT notWsl}
     -body {
-	child msg $a -tmpdir $notWriteableDir
+	child msg $a -tmpdir $notWritableDir
 	return $msg
     }
-    -result {*not writeable*}
+    -result {*not writable*}
     -match glob
 }
 test tcltest-8.5 {tcltest a.tcl -tmpdir normaldirectory} {
@@ -720,15 +720,15 @@ test tcltest-8.60 {::workingDirectory}  {
 switch -- $::tcl_platform(platform) {
     unix {
 	file attributes $notReadableDir -permissions 0o777
-	file attributes $notWriteableDir -permissions 0o777
+	file attributes $notWritableDir -permissions 0o777
     }
     default {
-	catch {testchmod 0o777 $notWriteableDir}
-	catch {file attributes $notWriteableDir -readonly 0}
+	catch {testchmod 0o777 $notWritableDir}
+	catch {file attributes $notWritableDir -readonly 0}
     }
 }
 
-file delete -force -- $notReadableDir $notWriteableDir
+file delete -force -- $notReadableDir $notWritableDir
 removeFile a.tcl
 removeFile thisdirectoryisafile
 removeDirectory normaldirectory
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index 1250c0b..09a34dd 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -26,7 +26,7 @@ testConstraint notWsl [expr {[llength [array names ::env *WSL*]] == 0}]
 set oldcwd [pwd]
 cd [temporaryDirectory]
 
-# Several tests require need to match results against the unix username
+# Several tests require need to match results against the Unix username
 set user {}
 if {[testConstraint unix]} {
     catch {set user [exec whoami]}
@@ -387,7 +387,7 @@ file delete -force -- foo.test
 test unixFCmd-18.1 {Unix pwd} -constraints {unix notRoot nonPortable} -setup {
     set cd [pwd]
 } -body {
-    # This test is nonPortable because SunOS generates a weird error
+    # This test is non-portable because SunOS generates a weird error
     # message when the current directory isn't readable.
     set nd $cd/tstdir
     file mkdir $nd
diff --git a/tests/unixForkEvent.test b/tests/unixForkEvent.test
index f321b10..bf22449 100644
--- a/tests/unixForkEvent.test
+++ b/tests/unixForkEvent.test
@@ -17,7 +17,7 @@ testConstraint testfork [llength [info commands testfork]]
 
 # Test if the notifier thread is well initialized in a forked interpreter
 # by Tcl_InitNotifier
-test unixforkevent-1.1 {fork and test writeable event} \
+test unixforkevent-1.1 {fork and test writable event} \
     -constraints {testfork nonPortable} \
     -body {
 	set myFolder [makeDirectory unixtestfork]
diff --git a/tests/winDde.test b/tests/winDde.test
index 14308c7..93b9242 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -154,15 +154,15 @@ test winDde-3.5 {DDE request locally} -constraints dde -body {
     dde execute TclEval self [list set \xe1 foo]
     dde request -binary TclEval self \xe1
 } -result "foo\x00"
-# Set variable a to A with diaeresis (unicode C4) by relying on the fact
+# Set variable a to A with diaeresis (Unicode C4) by relying on the fact
 # that utf-8 is sent (e.g. "c3 84" on the wire)
 test winDde-3.6 {DDE request utf-8} -constraints dde -body {
     set \xe1 "not set"
     dde execute TclEval self "set \xe1 \xc4"
     scan [set \xe1] %c
 } -result 196
-# Set variable a to A with diaeresis (unicode C4) using binary execute
-# and compose utf-8 (e.g. "c3 84" ) manualy
+# Set variable a to A with diaeresis (Unicode C4) using binary execute
+# and compose utf-8 (e.g. "c3 84" ) manually
 test winDde-3.7 {DDE request binary} -constraints {dde notWine} -body {
     set \xe1 "not set"
     dde execute -binary TclEval self [list set \xc3\xa1 \xc3\x84\x00]
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 3be1920..9b5e67e 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -123,7 +123,7 @@ append longname $longname
 # Uses the "testfile" command instead of the "file" command.  The "file"
 # command provides several layers of sanity checks on the arguments and
 # it can be difficult to actually forward "insane" arguments to the
-# low-level posix emulation layer.
+# low-level Posix emulation layer.
 
 test winFCmd-1.1 {TclpRenameFile: errno: EACCES} -body {
     testfile mv $cdfile $cdrom/dummy~~.fil
diff --git a/tools/mkdepend.tcl b/tools/mkdepend.tcl
index 6e3d6ed..b02e396 100644
--- a/tools/mkdepend.tcl
+++ b/tools/mkdepend.tcl
@@ -252,7 +252,7 @@ proc compressDeps {depends} {
 #	Adds a new set of path and replacement string to the global list.
 #
 # Arguments:
-#	newPathInfo	comma seperated path and replacement string
+#	newPathInfo	comma separated path and replacement string
 #
 # Results:
 #	None.
@@ -296,7 +296,7 @@ proc readInputListFile {objectListFile} {
     set fl [read $f]
     close $f
 
-    # fix native path seperator so it isn't treated as an escape.
+    # fix native path separator so it isn't treated as an escape.
     regsub -all {\\} $fl {/} fl
 
     # Treat the string as a list so filenames between double quotes are
diff --git a/unix/configure b/unix/configure
index 05fd35a..f654378 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8105,7 +8105,7 @@ fi
 
 done
 # Nb: if getcwd uses popen and pwd(1) (like SunOS 4) we should really
-# define USEGETWD even if the posix getcwd exists. Add a test ?
+# define USEGETWD even if the Posix getcwd exists. Add a test ?
 
 ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
 if test "x$ac_cv_func_mkstemp" = xyes
diff --git a/unix/install-sh b/unix/install-sh
index 21b733a..b6593f3 100755
--- a/unix/install-sh
+++ b/unix/install-sh
@@ -329,7 +329,7 @@ do
 	' 0
 
 	# Because "mkdir -p" follows existing symlinks and we likely work
-	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directly in world-writable /tmp, make sure that the '$tmpdir'
 	# directory is successfully created first before we actually test
 	# 'mkdir -p'.
 	if (umask $mkdir_umask &&
@@ -515,4 +515,4 @@ done
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
-# End:
\ No newline at end of file
+# End:
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 94c172d..a7a6eb1 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -1532,7 +1532,7 @@ TtyParseMode(
      *
      * We cannot if/else/endif the strchr arguments, it has to be the whole
      * function. On AIX this function is apparently a macro, and macros do
-     * not allow pre-processor directives in their arguments.
+     * not allow preprocessor directives in their arguments.
      */
 
     if (
@@ -1782,7 +1782,7 @@ TclpOpenFileChannel(
 Tcl_Channel
 Tcl_MakeFileChannel(
     void *handle,		/* OS level handle. */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
     TtyState *fsPtr;
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 7bd840a..3a7778e 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -736,7 +736,7 @@ CopyGrp(
  *
  * CopyHostent --
  *
- *      Copies string fields of the hostnent structure to the private buffer,
+ *      Copies string fields of the hostent structure to the private buffer,
  *      honouring the size of the buffer.
  *
  * Results:
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index ed6a6e0..f8eaeb5 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -1,7 +1,7 @@
 /*
  * tclUnixFCmd.c
  *
- *	This file implements the unix specific portion of file manipulation
+ *	This file implements the Unix specific portion of file manipulation
  *	subcommands of the "file" command. All filename arguments should
  *	already be translated to native format.
  *
@@ -340,7 +340,7 @@ DoRenameFile(
     }
 
     /*
-     * IRIX returns EIO when you attept to move a directory into itself. We
+     * IRIX returns EIO when you attempt to move a directory into itself. We
      * just map EIO to EINVAL get the right message on SGI. Most platforms
      * don't return EIO except in really strange cases.
      */
@@ -730,7 +730,7 @@ DoCreateDirectory(
  *
  *	Recursively copies a directory. The target directory dst must not
  *	already exist. Note that this function does not merge two directory
- *	hierarchies, even if the target directory is an an empty directory.
+ *	hierarchies, even if the target directory is an empty directory.
  *
  * Results:
  *	If the directory was successfully copied, returns TCL_OK. Otherwise
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index c1fb7da..aecdb3b 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -701,7 +701,7 @@ TclpObjLstat(
  *	is either the given clientData, if the working directory hasn't
  *	changed, or a new clientData (owned by our caller), giving the new
  *	native path, or NULL if the current directory could not be determined.
- *	If NULL is returned, the caller can examine the standard posix error
+ *	If NULL is returned, the caller can examine the standard Posix error
  *	codes to determine the cause of the problem.
  *
  * Side effects:
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 6d7f19b..ce08425 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -469,7 +469,7 @@ TclpInitLibraryPath(
      * Look for the library relative to the TCL_LIBRARY env variable. If the
      * last dirname in the TCL_LIBRARY path does not match the last dirname in
      * the installLib variable, use the last dir name of installLib in
-     * addition to the orginal TCL_LIBRARY path.
+     * addition to the original TCL_LIBRARY path.
      */
 
     str = getenv("TCL_LIBRARY");			/* INTL: Native. */
@@ -987,7 +987,7 @@ TclpSetVariables(
  * TclpFindVariable --
  *
  *	Locate the entry in environ for a given name. On Unix this routine is
- *	case sensetive, on Windows this matches mixed case.
+ *	case sensitive, on Windows this matches mixed case.
  *
  * Results:
  *	The return value is the index in environ of an entry with the name
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 943e7d7..0a2b695 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -439,7 +439,7 @@ AtForkChild(void)
 
 	    /*
 	     * The tsdPtr from before the fork is copied as well. But since we
-	     * are paranoic, we don't trust its condvar and reset it.
+	     * are paranoiac, we don't trust its condvar and reset it.
 	     */
 #ifdef __CYGWIN__
 	    DestroyWindow(tsdPtr->hwnd);
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index c1fd36f..b6ade1a 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -393,12 +393,12 @@ TclpCreateProcess(
 				 * receive no standard input. */
     TclFile outputFile,		/* If non-NULL, gives the file that receives
 				 * output from the child process. If
-				 * outputFile file is not writeable or is
+				 * outputFile file is not writable or is
 				 * NULL, output from the child will be
 				 * discarded. */
     TclFile errorFile,		/* If non-NULL, gives the file that receives
 				 * errors from the child process. If errorFile
-				 * file is not writeable or is NULL, errors
+				 * file is not writable or is NULL, errors
 				 * from the child will be discarded. errorFile
 				 * may be the same as outputFile. */
     Tcl_Pid *pidPtr)		/* If this function is successful, pidPtr is
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 791c2a3..5d5b14b 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -504,7 +504,7 @@ extern int	gettimeofday(struct timeval *tp,
 
 /*
  *---------------------------------------------------------------------------
- * Not all systems declare the errno variable in errno.h. so this file does it
+ * Not all systems declare the errno variable in errno.h, so this file does it
  * explicitly. The list of system error messages also isn't generally declared
  * in a header file anywhere.
  *---------------------------------------------------------------------------
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 0a63788..45a3c4d 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -41,7 +41,7 @@ typedef union {
 } address;
 
 /*
- * This structure describes per-instance state of a tcp based channel.
+ * This structure describes per-instance state of a tcp-based channel.
  */
 
 typedef struct TcpState TcpState;
@@ -54,7 +54,7 @@ typedef struct TcpFdList {
 
 struct TcpState {
     Tcl_Channel channel;	/* Channel associated with this file. */
-    int flags;			/* ORed combination of the bitfields defined
+    int flags;			/* OR'ed combination of the bitfields defined
 				 * below. */
     TcpFdList fds;		/* The file descriptors of the sockets. */
     int interest;		/* Event types of interest */
@@ -82,7 +82,7 @@ struct TcpState {
 };
 
 /*
- * These bits may be ORed together into the "flags" field of a TcpState
+ * These bits may be OR'ed together into the "flags" field of a TcpState
  * structure.
  */
 
@@ -389,17 +389,17 @@ TcpBlockModeProc(
  *
  *	Check the state of an async connect process. If a connection attempt
  *	terminated, process it, which may finalize it or may start the next
- *	attempt. If a connect error occures, it is saved in
+ *	attempt. If a connect error occurs, it is saved in
  *	statePtr->connectError to be reported by 'fconfigure -error'.
  *
  *	There are two modes of operation, defined by errorCodePtr:
- *	 *  non-NULL: Called by explicite read/write command. Blocks if the
+ *	 *  non-NULL: Called by explicit read/write command. Blocks if the
  *	    socket is blocking.
  *	    May return two error codes:
  *	     *	EWOULDBLOCK: if connect is still in progress
  *	     *	ENOTCONN: if connect failed. This would be the error message
- *		of a rect or sendto syscall so this is emulated here.
- *	 *  NULL: Called by a backround operation. Do not block and do not
+ *		of a recv or sendto syscall so this is emulated here.
+ *	 *  NULL: Called by a background operation. Do not block and do not
  *	    return any error code.
  *
  * Results:
@@ -431,7 +431,7 @@ WaitForConnect(
     }
 
     /*
-     * Check if an async connect is running. If not return ok
+     * Check if an async connect is running. If not return ok.
      */
 
     if (!GOT_BITS(statePtr->flags, TCP_ASYNC_PENDING)) {
@@ -1204,7 +1204,7 @@ TcpWatchProc(
 	 * socket file descriptor is writable when the other end of the socket
 	 * is closed.  This is in contrast to the guarantees Tcl makes that
 	 * its channels become writable and fire writable events on an error
-	 * conditon.  This has caused a leak of file descriptors in a state of
+	 * condition.  This has caused a leak of file descriptors in a state of
 	 * background flushing.  See Tcl ticket 1758a0b603.
 	 *
 	 * As a workaround, when our caller indicates an interest in writable
@@ -1604,7 +1604,7 @@ Tcl_MakeTcpClientChannel(
 void *
 TclpMakeTcpClientChannelMode(
     void *sock,		/* The socket to wrap up into a channel. */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
     TcpState *statePtr;
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index be54481..ee1229b 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -594,7 +594,7 @@ TestgotsigCmd(
  *
  *	Implements the "testchmod" cmd.  Used when testing "file" command.
  *	The only attribute used by the Windows platform is the user write
- *	flag; if this is not set, the file is made read-only.  Otehrwise, the
+ *	flag; if this is not set, the file is made read-only.  Otherwise, the
  *	file is made read-write.
  *
  * Results:
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index 45bda3e..4388009 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -17,7 +17,7 @@
 #include "tclInt.h"
 
 /*
- * This structure is used to keep track of the notifier info for a a
+ * This structure is used to keep track of the notifier info for a
  * registered file.
  */
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 202b860..a5cd90e 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -600,7 +600,7 @@ ${TEST_EXE_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} tclTestMain.${OBJEXT}
         tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
 	$(COPY) tclsh.exe.manifest ${TEST_EXE_FILE}.manifest
 
-# use pre-built zlib1.dll
+# use prebuilt zlib1.dll
 ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
 	@if test "@ZLIB_LIBS@set" = "${ZLIB_DIR_NATIVE}/win64-arm/zdll.libset" ; then \
 		$(COPY) $(ZLIB_DIR)/win64-arm/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
diff --git a/win/makefile.vc b/win/makefile.vc
index 1f0b02e..d1f4ef3 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -112,7 +112,7 @@
 #		Hooks to allow the intermediate and output directories to be
 #		changed.  $(OUT_DIR) is assumed to be
 #		$(BINROOT)\(Release|Debug) based on if symbols are requested.
-#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
+#		$(TMP_DIR) will be $(OUT_DIR)\<buildtype> by default.
 #
 #	TESTPAT=<file>
 #		Reads the tests requested to be run from this file.
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index fc40da4..e0941e3 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -210,13 +210,13 @@ CheckForCompilerFeature(
     sa.bInheritHandle = FALSE;
 
     /*
-     * Create a non-inheritible pipe.
+     * Create a non-inheritable pipe.
      */
 
     CreatePipe(&Out.pipe, &h, &sa, 0);
 
     /*
-     * Dupe the write side, make it inheritible, and close the original.
+     * Dupe the write side, make it inheritable, and close the original.
      */
 
     DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
@@ -352,7 +352,7 @@ CheckForLinkerFeature(
     CreatePipe(&Out.pipe, &h, &sa, 0);
 
     /*
-     * Dupe the write side, make it inheritible, and close the original.
+     * Dupe the write side, make it inheritable, and close the original.
      */
 
     DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
@@ -584,7 +584,7 @@ list_free(list_item_t **listPtrPtr)
  * SubstituteFile --
  *	As windows doesn't provide anything useful like sed and it's unreliable
  *	to use the tclsh you are building against (consider x-platform builds -
- *	eg compiling AMD64 target from IX86) we provide a simple substitution
+ *	e.g. compiling AMD64 target from IX86) we provide a simple substitution
  *	option here to handle autoconf style substitutions.
  *	The substitution file is whitespace and line delimited. The file should
  *	consist of lines matching the regular expression:
@@ -610,7 +610,7 @@ SubstituteFile(
     if (fp != NULL) {
 
 	/*
-	 * Build a list of substutitions from the first filename
+	 * Build a list of substitutions from the first filename
 	 */
 
 	sp = fopen(substitutions, "rt");
diff --git a/win/rules.vc b/win/rules.vc
index 0dd6ef2..d8b3b12 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1369,7 +1369,7 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # and switches are specific to it.
 # The following macros are defined, names are for historical compatibility:
 # OPTDEFINES - /Dxxx C macro flags based on user-specified OPTS
-# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration opttions
+# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration options
 # crt - Compiler switch that selects the appropriate C runtime
 # cdebug - Compiler switches related to debug AND optimizations
 # cwarn - Compiler switches that set warning levels
diff --git a/win/tcl.m4 b/win/tcl.m4
index 8774b94..954c3c0 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -1044,7 +1044,7 @@ AC_DEFUN([SC_WITH_TCL], [
 #	none
 #
 # Results
-#	Subst's the following values:
+#	Substitutes the following values:
 #		TCLSH_PROG
 #------------------------------------------------------------------------
 
@@ -1090,7 +1090,7 @@ AC_DEFUN([SC_PROG_TCLSH], [
 #	none
 #
 # Results
-#	Subst's the following values:
+#	Substitutes the following values:
 #		BUILD_TCLSH
 #------------------------------------------------------------------------
 
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 93596ee..ecdd03a 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -939,7 +939,7 @@ TclpOpenFileChannel(
 	}
 
 	/*
-	 * For natively named Windows serial ports we are done.
+	 * For natively-named Windows serial ports we are done.
 	 */
 
 	channel = TclWinOpenSerialChannel(handle, channelName,
@@ -1079,7 +1079,7 @@ TclpOpenFileChannel(
 Tcl_Channel
 Tcl_MakeFileChannel(
     ClientData rawHandle,	/* OS level handle */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
 #if defined(HAVE_NO_SEH) && !defined(_WIN64) && !defined(__clang__)
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 457f20d..697aae6 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -871,7 +871,7 @@ DdeServerProc(
     case XTYP_EXECUTE: {
 	/*
 	 * Execute this script. The results will be saved into a list object
-	 * which will be retreived later. See ExecuteRemoteObject.
+	 * which will be retrieved later. See ExecuteRemoteObject.
 	 */
 
 	Tcl_Obj *returnPackagePtr;
@@ -894,13 +894,13 @@ DdeServerProc(
 	    /* Empty binary array. */
 	    ddeObjectPtr = Tcl_NewObj();
 	} else if ((dlen & 1) || utilString[(dlen>>1)-1]) {
-	    /* Cannot be unicode, so assume utf-8 */
+	    /* Cannot be Unicode, so assume utf-8 */
 	    if (!string[dlen-1]) {
 		dlen--;
 	    }
 	    ddeObjectPtr = Tcl_NewStringObj(string, dlen);
 	} else {
-	    /* unicode */
+	    /* Unicode */
 	    Tcl_DString dsBuf;
 
 	    Tcl_DStringInit(&dsBuf);
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 7f8cfd1..acf61b7 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -879,7 +879,7 @@ DoCreateDirectory(
  *
  *	Recursively copies a directory. The target directory dst must not
  *	already exist. Note that this function does not merge two directory
- *	hierarchies, even if the target directory is an an empty directory.
+ *	hierarchies, even if the target directory is an empty directory.
  *
  * Results:
  *	If the directory was successfully copied, returns TCL_OK. Otherwise
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 3e5cff5..f0c46f9 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -1679,7 +1679,7 @@ NativeAccess(
 	}
 
 	/*
-	 * We cannnot verify the access fast, check it below using security
+	 * We cannot verify the access fast, check it below using security
 	 * info.
 	 */
     }
@@ -1799,7 +1799,7 @@ NativeAccess(
 	RevertToSelf();
 
 	/*
-	 * Setup desiredAccess according to the access priveleges we are
+	 * Setup desiredAccess according to the access privileges we are
 	 * checking.
 	 */
 
@@ -2056,7 +2056,7 @@ NativeStat(
      * 'getFileAttributesExProc', and if that isn't available, then on even
      * simpler routines.
      *
-     * Special consideration must be given to Windows hardcoded names like
+     * Special consideration must be given to Windows hard-coded names like
      * CON, NULL, COM1, LPT1 etc. For these, we still need to do the
      * CreateFile as some may not exist (e.g. there is no CON in wish by
      * default). However the subsequent GetFileInformationByHandle will
@@ -2347,7 +2347,7 @@ FromCTime(
  *	is either the given clientData, if the working directory hasn't
  *	changed, or a new clientData (owned by our caller), giving the new
  *	native path, or NULL if the current directory could not be determined.
- *	If NULL is returned, the caller can examine the standard posix error
+ *	If NULL is returned, the caller can examine the standard Posix error
  *	codes to determine the cause of the problem.
  *
  * Side effects:
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 2eaaa09..c085c81 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -147,7 +147,7 @@ TclpInitLibraryPath(
      * Look for the library relative to the TCL_LIBRARY env variable. If the
      * last dirname in the TCL_LIBRARY path does not match the last dirname in
      * the installLib variable, use the last dir name of installLib in
-     * addition to the orginal TCL_LIBRARY path.
+     * addition to the original TCL_LIBRARY path.
      */
 
     AppendEnvironment(pathPtr, installLib);
@@ -225,8 +225,8 @@ AppendEnvironment(
     }
 
     /*
-     * The "L" preceeding the TCL_LIBRARY string is used to tell VC++ that
-     * this is a unicode string.
+     * The "L" preceding the TCL_LIBRARY string is used to tell VC++ that
+     * this is a Unicode string.
      */
 
     GetEnvironmentVariableW(L"TCL_LIBRARY", wBuf, MAX_PATH);
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index fd39428..7b7ef1e 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -14,7 +14,7 @@
 #include "tclInt.h"
 
 /*
- * The follwing static indicates whether this module has been initialized.
+ * The following static indicates whether this module has been initialized.
  */
 
 #define INTERVAL_TIMER	1	/* Handle of interval timer. */
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 094aa8b..14767f9 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -923,12 +923,12 @@ TclpCreateProcess(
 				 * receive no standard input. */
     TclFile outputFile,		/* If non-NULL, gives the file that receives
 				 * output from the child process. If
-				 * outputFile file is not writeable or is
+				 * outputFile file is not writable or is
 				 * NULL, output from the child will be
 				 * discarded. */
     TclFile errorFile,		/* If non-NULL, gives the file that receives
 				 * errors from the child process. If errorFile
-				 * file is not writeable or is NULL, errors
+				 * file is not writable or is NULL, errors
 				 * from the child will be discarded. errorFile
 				 * may be the same as outputFile. */
     Tcl_Pid *pidPtr)		/* If this function is successful, pidPtr is
@@ -3145,7 +3145,7 @@ PipeThreadActionProc(
     /*
      * We do not access firstPipePtr in the thread structures. This is not for
      * all pipes managed by the thread, but only those we are watching.
-     * Removal of the filevent handlers before transfer thus takes care of
+     * Removal of the fileevent handlers before transfer thus takes care of
      * this structure.
      */
 
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index efd5b7c..3732550 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -782,7 +782,7 @@ GetValue(
      * length to TCL_DSTRING_STATIC_SIZE, but this should be safer if the
      * implementation of Dstrings changes.
      *
-     * This allows short values to be read from the registy in one call.
+     * This allows short values to be read from the registry in one call.
      * Longer values need a second call with an expanded DString.
      */
 
@@ -876,7 +876,7 @@ GetValue(
  *
  * GetValueNames --
  *
- *	This function enumerates the values of the a given key. If the
+ *	This function enumerates the values of the given key. If the
  *	optional pattern is supplied, then only value names that match the
  *	pattern will be returned.
  *
@@ -1012,7 +1012,7 @@ OpenKey(
  *
  * OpenSubKey --
  *
- *	This function opens a given subkey of a root key on the specified
+ *	Opens a given subkey of the given root key on the specified
  *	host.
  *
  * Results:
@@ -1097,7 +1097,7 @@ OpenSubKey(
  *
  * ParseKeyName --
  *
- *	This function parses a key name into the host, root, and subkey parts.
+ *	Parses a key name into the host, root, and subkey parts.
  *
  * Results:
  *	The pointers to the start of the host and subkey names are returned in
@@ -1476,7 +1476,7 @@ BroadcastValue(
  *
  * AppendSystemError --
  *
- *	This routine formats a Windows system error message and places it into
+ *	Formats a Windows system error message and places it into
  *	the interpreter result.
  *
  * Results:
@@ -1549,7 +1549,7 @@ AppendSystemError(
  *
  * ConvertDWORD --
  *
- *	This function determines whether a DWORD needs to be byte swapped, and
+ *	Determines whether a DWORD needs to be byte swapped, and
  *	returns the appropriately swapped value.
  *
  * Results:
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index a55a23f..6ab305c 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -335,7 +335,7 @@ ProcExitHandler(
  *
  * SerialBlockTime --
  *
- *	Wrapper to set Tcl's block time in msec
+ *	Wrapper to set Tcl's block time in msec.
  *
  * Results:
  *	None.
@@ -904,7 +904,7 @@ SerialInputProc(
 	    }
 	} else {
 	    /*
-	     * BLOCKING mode: Tcl trys to read a full buffer of 4 kBytes here.
+	     * BLOCKING mode: Tcl tries to read a full buffer of 4 kBytes here.
 	     */
 
 	    if (cStat.cbInQue > 0) {
@@ -973,9 +973,9 @@ SerialOutputProc(
     *errorCode = 0;
 
     /*
-     * At EXIT Tcl trys to flush all open channels in blocking mode. We avoid
+     * At EXIT Tcl tries to flush all open channels in blocking mode. We avoid
      * blocking output after ExitProc or CloseHandler(chan) has been called by
-     * checking the corrresponding variables.
+     * checking the corresponding variables.
      */
 
     if (!initialized || TclInExit()) {
@@ -2287,7 +2287,7 @@ SerialThreadActionProc(
     /*
      * We do not access firstSerialPtr in the thread structures. This is not
      * for all serials managed by the thread, but only those we are watching.
-     * Removal of the filevent handlers before transfer thus takes care of
+     * Removal of the fileevent handlers before transfer thus takes care of
      * this structure.
      */
 
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 7fc34e1..7dd5b41 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -105,7 +105,7 @@ typedef union {
 #endif
 
 /*
- * This structure describes per-instance state of a tcp based channel.
+ * This structure describes per-instance state of a tcp-based channel.
  */
 
 typedef struct TcpState TcpState;
@@ -161,7 +161,7 @@ struct TcpState {
 };
 
 /*
- * These bits may be ORed together into the "flags" field of a TcpState
+ * These bits may be OR'ed together into the "flags" field of a TcpState
  * structure.
  */
 
@@ -553,8 +553,8 @@ TcpBlockModeProc(
  *	    May return two error codes:
  *	     *	EWOULDBLOCK: if connect is still in progress
  *	     *	ENOTCONN: if connect failed. This would be the error message
- *		of a rect or sendto syscall so this is emulated here.
- *	 *  Null: Called by a backround operation. Do not block and don't
+ *		of a recv or sendto syscall so this is emulated here.
+ *	 *  Null: Called by a background operation. Do not block and don't
  *	    return any error code.
  *
  * Results:
@@ -642,7 +642,7 @@ WaitForConnect(
 
 	    /*
 	     * For blocking sockets and foreground processing, disable async
-	     * connect as we continue now synchoneously.
+	     * connect as we continue now synchronously.
 	     */
 
 	    if (errorCodePtr != NULL &&
@@ -657,7 +657,7 @@ WaitForConnect(
 	    SetEvent(tsdPtr->socketListLock);
 
 	    /*
-	     * Continue connect. If switched to synchroneous connect, the
+	     * Continue connect. If switched to synchronous connect, the
 	     * connect is terminated.
 	     */
 
@@ -670,7 +670,7 @@ WaitForConnect(
 	    (void) Tcl_SetServiceMode(oldMode);
 
 	    /*
-	     * Check for Succesfull connect or async connect restart
+	     * Check for Successful connect or async connect restart
 	     */
 
 	    if (result == TCL_OK) {
@@ -830,7 +830,7 @@ TcpInputProc(
 
 	/*
 	 * If an RST comes, then ignore the error and report an EOF just like
-	 * on unix.
+	 * on Unix.
 	 */
 
 	if (error == WSAECONNRESET) {
@@ -1227,7 +1227,7 @@ TcpGetOptionProc(
     /*
      * Go one step in async connect
      *
-     * If any error is thrown save it as backround error to report eventually
+     * If any error is thrown save it as background error to report eventually
      * below.
      */
 
@@ -1774,7 +1774,7 @@ TcpConnect(
 
 	    if (async_connect && error == WSAEWOULDBLOCK) {
 		/*
-		 * Asynchroneous connect
+		 * Asynchronous connect
 		 *
 		 * Remember that we jump back behind this next round
 		 */
@@ -1843,7 +1843,7 @@ TcpConnect(
 
     if (Tcl_GetErrno() == 0) {
 	/*
-	 * Succesfully connected
+	 * Successfully connected
 	 *
 	 * Set up the select mask for read/write events.
 	 */
@@ -1902,7 +1902,7 @@ TcpConnect(
 	}
 
 	/*
-	 * Error message on synchroneous connect
+	 * Error message on synchronous connect
 	 */
 
 	if (interp != NULL) {
@@ -2937,7 +2937,7 @@ WaitForSocketEvent(
 	WaitForSingleObject(tsdPtr->socketListLock, INFINITE);
 
 	/*
-	 * Check if event occured.
+	 * Check if event occurred.
 	 */
 
 	event_found = GOT_BITS(statePtr->readyEvents, events);
@@ -2949,7 +2949,7 @@ WaitForSocketEvent(
 	SetEvent(tsdPtr->socketListLock);
 
 	/*
-	 * Exit loop if event occured.
+	 * Exit loop if event occurred.
 	 */
 
 	if (event_found) {
@@ -3054,7 +3054,7 @@ SocketThread(
  *
  * Side effects:
  *	The flags for the given socket are updated to reflect the event that
- *	occured.
+ *	occurred.
  *
  *----------------------------------------------------------------------
  */
@@ -3204,7 +3204,7 @@ SocketProc(
  *
  * FindFDInList --
  *
- *	Return true, if the given file descriptior is contained in the
+ *	Return true, if the given file descriptor is contained in the
  *	file descriptor list.
  *
  * Results:
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index b69fbfc..e9d4e08 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -777,9 +777,9 @@ Tcl_ConditionWait(
 	    timeout = 0;
 	} else {
 	    /*
-	     * When dequeuing, we can leave the tsdPtr->nextPtr and
+	     * When dequeueing, we can leave the tsdPtr->nextPtr and
 	     * tsdPtr->prevPtr with dangling pointers because they are
-	     * reinitialilzed w/out reading them when the thread is enqueued
+	     * reinitialized w/out reading them when the thread is enqueued
 	     * later.
 	     */
 
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index e8401a5..6fecbd2 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -650,7 +650,7 @@ NativeGetMicroseconds(void)
 
 	if (curCounter.QuadPart <= perfCounterLastCall) {
 	    /*
-	     * Calibrated file-time is saved from posix in 100-ns ticks
+	     * Calibrated file-time is saved from Posix in 100-ns ticks
 	     */
 
 	    return fileTimeLastCall / 10;
@@ -669,7 +669,7 @@ NativeGetMicroseconds(void)
 	if (curCounter.QuadPart - perfCounterLastCall <
 		11 * curCounterFreq * timeInfo.calibrationInterv / 10) {
 	    /*
-	     * Calibrated file-time is saved from posix in 100-ns ticks.
+	     * Calibrated file-time is saved from Posix in 100-ns ticks.
 	     */
 
 	    return NativeCalc100NsTicks(fileTimeLastCall,
@@ -1029,7 +1029,7 @@ CalibrationThread(
     timeInfo.fileTimeLastCall.HighPart = curFileTime.dwHighDateTime;
 
     /*
-     * Calibrated file-time will be saved from posix in 100-ns ticks.
+     * Calibrated file-time will be saved from Posix in 100-ns ticks.
      */
 
     timeInfo.fileTimeLastCall.QuadPart -= timeInfo.posixEpoch.QuadPart;
@@ -1104,7 +1104,7 @@ UpdateTimeEachSecond(void)
 				 * step over 1 second. */
 
     /*
-     * Sample performance counter and system time (from posix epoch).
+     * Sample performance counter and system time (from Posix epoch).
      */
 
     GetSystemTimeAsFileTime(&curSysTime);
@@ -1129,7 +1129,7 @@ UpdateTimeEachSecond(void)
     lastFileTime.QuadPart = curFileTime.QuadPart;
 
     /*
-     * We devide by timeInfo.curCounterFreq.QuadPart in several places. That
+     * We divide by timeInfo.curCounterFreq.QuadPart in several places. That
      * value should always be positive on a correctly functioning system. But
      * it is good to be defensive about such matters. So if something goes
      * wrong and the value does goes to zero, we clear the
-- 
cgit v0.12


From 24560200447c62cad046f3299f153715c686cc86 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Wed, 12 Apr 2023 13:36:17 +0000
Subject: Undo spelling corrections in compat/zlib.

---
 compat/zlib/ChangeLog                     | 2 +-
 compat/zlib/contrib/iostream3/zfstream.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat/zlib/ChangeLog b/compat/zlib/ChangeLog
index bd4540d..457526b 100644
--- a/compat/zlib/ChangeLog
+++ b/compat/zlib/ChangeLog
@@ -847,7 +847,7 @@ Changes in 1.2.1.2 (9 September 2004)
 - Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
 - Update contrib/ada [Anisimkov]
 - Update contrib/minizip [Vollant]
-- Fix configure to not hard-code directories for Darwin [Peterson]
+- Fix configure to not hardcode directories for Darwin [Peterson]
 - Fix gzio.c to not return error on empty files [Brown]
 - Fix indentation; update version in contrib/delphi/ZLib.pas and
   contrib/pascal/zlibpas.pas [Truta]
diff --git a/compat/zlib/contrib/iostream3/zfstream.cc b/compat/zlib/contrib/iostream3/zfstream.cc
index 5779874..94eb933 100644
--- a/compat/zlib/contrib/iostream3/zfstream.cc
+++ b/compat/zlib/contrib/iostream3/zfstream.cc
@@ -138,7 +138,7 @@ gzfilebuf::open_mode(std::ios_base::openmode mode,
   bool testa = mode & std::ios_base::app;
 
   // Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
-  // Original zfstream hard-coded the compression level to maximum here...
+  // Original zfstream hardcoded the compression level to maximum here...
   // Double the time for less than 1% size improvement seems
   // excessive though - keeping it at the default level
   // To change back, just append "9" to the next three mode strings
-- 
cgit v0.12


From e4749b5f325ab29ff28f2e3223df5f6db91c2e42 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Apr 2023 18:17:43 +0000
Subject: Some more int -> Tcl_Size (which is actually the same in 8.7).
 Backported from 9.0

---
 generic/tclTest.c       | 42 ++++++++++++++++++++++++------------------
 generic/tclTestObj.c    |  2 +-
 generic/tclThreadTest.c | 13 +++++++------
 win/Makefile.in         |  6 ++++--
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 5e882d1..893f073 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2063,7 +2063,7 @@ static int UtfExtWrapper(
     int result;
     int flags;
     Tcl_Obj **flagObjs;
-    int nflags;
+    Tcl_Size nflags;
     static const struct {
 	const char *flagKey;
 	int flag;
@@ -2078,7 +2078,7 @@ static int UtfExtWrapper(
 	{"profilereplace", TCL_ENCODING_PROFILE_REPLACE},
 	{NULL, 0}
     };
-    int i;
+    Tcl_Size i;
     Tcl_WideInt wide;
 
     if (objc < 7 || objc > 10) {
@@ -2453,7 +2453,8 @@ TestevalexObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int length, flags;
+    int flags;
+    Tcl_Size length;
     const char *script;
 
     flags = 0;
@@ -3691,7 +3692,8 @@ TestlinkarrayCmd(
 	TCL_LINK_FLOAT, TCL_LINK_DOUBLE, TCL_LINK_STRING, TCL_LINK_CHARS,
 	TCL_LINK_BINARY
     };
-    int optionIndex, typeIndex, readonly, i, size, length;
+    int optionIndex, typeIndex, readonly, i, size;
+    Tcl_Size length;
     char *name, *arg;
     Tcl_WideInt addr;
 
@@ -4036,7 +4038,8 @@ TestparserObjCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     const char *script;
-    int length, dummy;
+    Tcl_Size dummy;
+    int length;
     Tcl_Parse parse;
 
     if (objc != 3) {
@@ -4092,7 +4095,8 @@ TestexprparserObjCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     const char *script;
-    int length, dummy;
+    Tcl_Size dummy;
+    int length;
     Tcl_Parse parse;
 
     if (objc != 3) {
@@ -4281,7 +4285,8 @@ TestparsevarnameObjCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     const char *script;
-    int append, length, dummy;
+    int length, append;
+    Tcl_Size dummy;
     Tcl_Parse parse;
 
     if (objc != 4) {
@@ -4414,7 +4419,8 @@ TestregexpObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i, ii, indices, stringLength, match, about;
+    int i, indices, match, about;
+    Tcl_Size stringLength, ii;
     int hasxflags, cflags, eflags;
     Tcl_RegExp regExpr;
     const char *string;
@@ -4527,7 +4533,7 @@ TestregexpObjCmd(
 	if (objc > 2 && (cflags&REG_EXPECT) && indices) {
 	    const char *varName;
 	    const char *value;
-	    int start, end;
+	    Tcl_Size start, end;
 	    char resinfo[TCL_INTEGER_SPACE * 2];
 
 	    varName = Tcl_GetString(objv[2]);
@@ -4567,7 +4573,7 @@ TestregexpObjCmd(
 
     Tcl_RegExpGetInfo(regExpr, &info);
     for (i = 0; i < objc; i++) {
-	int start, end;
+	Tcl_Size start, end;
 	Tcl_Obj *newPtr, *varPtr, *valuePtr;
 
 	varPtr = objv[i];
@@ -5568,7 +5574,7 @@ TeststringbytesObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
-    int n;
+    Tcl_Size n;
     const unsigned char *p;
 
     if (objc != 2) {
@@ -6956,10 +6962,10 @@ static int
 TestWrongNumArgsObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i, length;
+    Tcl_Size i, length;
     const char *msg;
 
     if (objc < 3) {
@@ -7474,7 +7480,7 @@ static Tcl_Obj *
 SimpleRedirect(
     Tcl_Obj *pathPtr)		/* Name of file to copy. */
 {
-    int len;
+    Tcl_Size len;
     const char *str;
     Tcl_Obj *origPtr;
 
@@ -7667,7 +7673,7 @@ TestUtfPrevCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    int numBytes, offset;
+    Tcl_Size numBytes, offset;
     char *bytes;
     const char *result;
 
@@ -7708,7 +7714,7 @@ TestNumUtfCharsCmd(
     Tcl_Obj *const objv[])
 {
     if (objc > 1) {
-	int numBytes, len, limit = TCL_INDEX_NONE;
+	Tcl_Size numBytes, len, limit = TCL_INDEX_NONE;
 	const char *bytes = Tcl_GetStringFromObj(objv[1], &numBytes);
 
 	if (objc > 2) {
@@ -7776,7 +7782,7 @@ TestGetIntForIndexCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    int result;
+    Tcl_Size result;
     Tcl_WideInt endvalue;
 
     if (objc != 3) {
@@ -8654,7 +8660,7 @@ static int
 InterpCompiledVarResolver(
     TCL_UNUSED(Tcl_Interp *),
     const char *name,
-    TCL_UNUSED(int) /* length */,
+    TCL_UNUSED(Tcl_Size) /* length */,
     TCL_UNUSED(Tcl_Namespace *),
     Tcl_ResolvedVarInfo **rPtr)
 {
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 6c056da..0f5f21f 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -907,7 +907,7 @@ TestlistobjCmd(
     Tcl_Size first;			/* First index in the list */
     Tcl_Size count;			/* Count of elements in a list */
     Tcl_Obj **varPtr;
-    int i, len;
+    Tcl_Size i, len;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg...?");
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index 22887df..44d2b0e 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -273,7 +273,8 @@ ThreadObjCmd(
     }
     case THREAD_CREATE: {
 	const char *script;
-	int joinable, len;
+	int joinable;
+	Tcl_Size len;
 
 	if (objc == 2) {
 	    /*
@@ -608,7 +609,7 @@ NewTestThread(
      */
 
     Tcl_Preserve(tsdPtr->interp);
-    result = Tcl_EvalEx(tsdPtr->interp, threadEvalScript, -1, 0);
+    result = Tcl_EvalEx(tsdPtr->interp, threadEvalScript, TCL_INDEX_NONE, 0);
     if (result != TCL_OK) {
 	ThreadErrorProc(tsdPtr->interp);
     }
@@ -655,10 +656,10 @@ ThreadErrorProc(
     errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY);
     if (errorProcString == NULL) {
 	errChannel = Tcl_GetStdChannel(TCL_STDERR);
-	Tcl_WriteChars(errChannel, "Error from thread ", -1);
-	Tcl_WriteChars(errChannel, buf, -1);
+	Tcl_WriteChars(errChannel, "Error from thread ", TCL_INDEX_NONE);
+	Tcl_WriteChars(errChannel, buf, TCL_INDEX_NONE);
 	Tcl_WriteChars(errChannel, "\n", 1);
-	Tcl_WriteChars(errChannel, errorInfo, -1);
+	Tcl_WriteChars(errChannel, errorInfo, TCL_INDEX_NONE);
 	Tcl_WriteChars(errChannel, "\n", 1);
     } else {
 	argv[0] = errorProcString;
@@ -983,7 +984,7 @@ ThreadCancel(
     Tcl_MutexUnlock(&threadMutex);
     Tcl_ResetResult(interp);
     return Tcl_CancelEval(tsdPtr->interp,
-    	(result != NULL) ? Tcl_NewStringObj(result, -1) : NULL, 0, flags);
+    	(result != NULL) ? Tcl_NewStringObj(result, TCL_INDEX_NONE) : NULL, 0, flags);
 }
 
 /*
diff --git a/win/Makefile.in b/win/Makefile.in
index a5cd90e..6c92749 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -82,7 +82,7 @@ CFLAGS_OPTIMIZE	= @CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -D__USE_MINGW_ANSI_STDIO=0 -DMP_FIXED_CUTOFFS -DMP_NO_STDINT
+CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DMP_FIXED_CUTOFFS -D__USE_MINGW_ANSI_STDIO=0 -DMP_NO_STDINT
 
 # To compile without backward compatibility and deprecated code uncomment the
 # following
@@ -545,7 +545,7 @@ $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) ${TCL_ZIP_
 	tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
 	$(COPY) tclsh.exe.manifest $(TCLSH).manifest
 	@VC_MANIFEST_EMBED_EXE@
-	if test "${ZIPFS_BUILD}" = "2" ; then \
+	@if test "${ZIPFS_BUILD}" = "2" ; then \
 		cat ${TCL_ZIP_FILE} >> ${TCLSH}; \
 		${NATIVE_ZIP} -A ${TCLSH} \
 		  || echo 'ignore zip-error by adjust sfx process (not executable?)'; \
@@ -683,6 +683,8 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c
 
 tclEvent.${OBJEXT}: tclEvent.c tclUuid.h
 
+tclTest.${OBJEXT}: tclTest.c tclUuid.h
+
 $(TOP_DIR)/manifest.uuid:
 	printf "git-" >$(TOP_DIR)/manifest.uuid
 	(cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || \
-- 
cgit v0.12


From 4518ee9a6deea0f9709c67f91ef839c53567170f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Apr 2023 19:52:38 +0000
Subject: Cherry-pick: Rearrange code blocks in DoReadChars to do less work
 when returning early

---
 generic/tclIO.c | 140 ++++++++++++++++++++++++++++----------------------------
 tests/io.test   |   8 +++-
 2 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index b642156..6ec93f2 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -102,7 +102,7 @@ typedef struct CopyState {
     Tcl_WideInt total;		/* Total bytes transferred (written). */
     Tcl_Interp *interp;		/* Interp that started the copy. */
     Tcl_Obj *cmdPtr;		/* Command to be invoked at completion. */
-    int bufSize;		/* Size of appended buffer. */
+    Tcl_Size bufSize;		/* Size of appended buffer. */
     char buffer[TCLFLEXARRAY];		/* Copy buffer, this must be the last
                                  * field. */
 } CopyState;
@@ -151,7 +151,7 @@ typedef struct CloseCallback {
  * Static functions in this file:
  */
 
-static ChannelBuffer *	AllocChannelBuffer(int length);
+static ChannelBuffer *	AllocChannelBuffer(Tcl_Size length);
 static void		PreserveChannelBuffer(ChannelBuffer *bufPtr);
 static void		ReleaseChannelBuffer(ChannelBuffer *bufPtr);
 static int		IsShared(ChannelBuffer *bufPtr);
@@ -193,9 +193,9 @@ static int		DetachChannel(Tcl_Interp *interp, Tcl_Channel chan);
 static void		DiscardInputQueued(ChannelState *statePtr,
 			    int discardSavedBuffers);
 static void		DiscardOutputQueued(ChannelState *chanPtr);
-static int		DoRead(Channel *chanPtr, char *dst, int bytesToRead,
+static Tcl_Size		DoRead(Channel *chanPtr, char *dst, Tcl_Size bytesToRead,
 			    int allowShortReads);
-static int		DoReadChars(Channel *chan, Tcl_Obj *objPtr, int toRead,
+static Tcl_Size		DoReadChars(Channel *chan, Tcl_Obj *objPtr, Tcl_Size toRead,
 			    int allowShortReads, int appendFlag);
 static int		FilterInputBytes(Channel *chanPtr,
 			    GetsState *statePtr);
@@ -239,7 +239,7 @@ static int              WillRead(Channel *chanPtr);
  * short description of what the macro does.
  *
  * --------------------------------------------------------------------------
- * int BytesLeft(ChannelBuffer *bufPtr)
+ * Tcl_Size BytesLeft(ChannelBuffer *bufPtr)
  *
  *	Returns the number of bytes of data remaining in the buffer.
  *
@@ -2531,10 +2531,10 @@ Tcl_RemoveChannelMode(
 
 static ChannelBuffer *
 AllocChannelBuffer(
-    int length)			/* Desired length of channel buffer. */
+    Tcl_Size length)			/* Desired length of channel buffer. */
 {
     ChannelBuffer *bufPtr;
-    int n;
+    Tcl_Size n;
 
     n = length + CHANNELBUFFER_HEADER_SIZE + BUFFER_PADDING + BUFFER_PADDING;
     bufPtr = (ChannelBuffer *)ckalloc(n);
@@ -4099,11 +4099,11 @@ Tcl_ClearChannelHandlers(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_Write(
     Tcl_Channel chan,		/* The channel to buffer output for. */
     const char *src,		/* Data to queue in output buffer. */
-    int srcLen)			/* Length of data in bytes, or < 0 for
+    Tcl_Size srcLen)			/* Length of data in bytes, or < 0 for
 				 * strlen(). */
 {
     /*
@@ -4153,17 +4153,18 @@ Tcl_Write(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_WriteRaw(
     Tcl_Channel chan,		/* The channel to buffer output for. */
     const char *src,		/* Data to queue in output buffer. */
-    int srcLen)			/* Length of data in bytes, or < 0 for
+    Tcl_Size srcLen)		/* Length of data in bytes, or TCL_INDEX_NONE for
 				 * strlen(). */
 {
     Channel *chanPtr = ((Channel *) chan);
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
-    int errorCode, written;
+    int errorCode;
+    Tcl_Size written;
 
     if (CheckChannelErrors(statePtr, TCL_WRITABLE | CHANNEL_RAW_MODE) != 0) {
 	return TCL_INDEX_NONE;
@@ -4209,17 +4210,17 @@ Tcl_WriteRaw(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_WriteChars(
     Tcl_Channel chan,		/* The channel to buffer output for. */
     const char *src,		/* UTF-8 characters to queue in output
 				 * buffer. */
-    int len)			/* Length of string in bytes, or TCL_INDEX_NONE for
+    Tcl_Size len)			/* Length of string in bytes, or TCL_INDEX_NONE for
 				 * strlen(). */
 {
     Channel *chanPtr = (Channel *) chan;
     ChannelState *statePtr = chanPtr->state;	/* State info for channel */
-    int result;
+    Tcl_Size result;
     Tcl_Obj *objPtr;
 
     if (CheckChannelErrors(statePtr, TCL_WRITABLE) != 0) {
@@ -4278,7 +4279,7 @@ Tcl_WriteChars(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_WriteObj(
     Tcl_Channel chan,		/* The channel to buffer output for. */
     Tcl_Obj *objPtr)		/* The object to write. */
@@ -4290,7 +4291,7 @@ Tcl_WriteObj(
     Channel *chanPtr;
     ChannelState *statePtr;	/* State info for channel */
     const char *src;
-    int srcLen;
+    Tcl_Size srcLen;
 
     statePtr = ((Channel *) chan)->state;
     chanPtr = statePtr->topChanPtr;
@@ -4592,7 +4593,7 @@ Write(
  *---------------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_Gets(
     Tcl_Channel chan,		/* Channel from which to read. */
     Tcl_DString *lineRead)	/* The line read will be appended to this
@@ -4601,7 +4602,7 @@ Tcl_Gets(
 				 * for managing the storage. */
 {
     Tcl_Obj *objPtr;
-    int charsStored;
+    Tcl_Size charsStored;
 
     TclNewObj(objPtr);
     charsStored = Tcl_GetsObj(chan, objPtr);
@@ -4635,7 +4636,7 @@ Tcl_Gets(
  *---------------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_GetsObj(
     Tcl_Channel chan,		/* Channel from which to read. */
     Tcl_Obj *objPtr)		/* The line read will be appended to this
@@ -4647,7 +4648,7 @@ Tcl_GetsObj(
 				/* State info for channel */
     ChannelBuffer *bufPtr;
     int inEofChar, skip, copiedTotal, oldFlags, oldRemoved;
-    int oldLength;
+    Tcl_Size oldLength;
     Tcl_Encoding encoding;
     char *dst, *dstEnd, *eol, *eof;
     Tcl_EncodingState oldState;
@@ -4801,7 +4802,7 @@ Tcl_GetsObj(
 		     */
 
 		    if (eol >= dstEnd) {
-			int offset;
+			Tcl_Size offset;
 
 			if (eol != eof) {
 			    offset = eol - objPtr->bytes;
@@ -5089,7 +5090,7 @@ TclGetsObjBinary(
 				/* State info for channel */
     ChannelBuffer *bufPtr;
     int inEofChar, skip, copiedTotal, oldFlags, oldRemoved;
-    int rawLen, byteLen, oldLength;
+    Tcl_Size rawLen, byteLen, oldLength;
     int eolChar;
     unsigned char *dst, *dstEnd, *eol, *eof, *byteArray;
 
@@ -5736,11 +5737,11 @@ CommonGetsCleanup(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_Read(
     Tcl_Channel chan,		/* The channel from which to read. */
     char *dst,			/* Where to store input read. */
-    int bytesToRead)		/* Maximum number of bytes to read. */
+    Tcl_Size bytesToRead)		/* Maximum number of bytes to read. */
 {
     Channel *chanPtr = (Channel *) chan;
     ChannelState *statePtr = chanPtr->state;
@@ -5781,11 +5782,11 @@ Tcl_Read(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_ReadRaw(
     Tcl_Channel chan,		/* The channel from which to read. */
     char *readBuf,		/* Where to store input read. */
-    int bytesToRead)		/* Maximum number of bytes to read. */
+    Tcl_Size bytesToRead)		/* Maximum number of bytes to read. */
 {
     Channel *chanPtr = (Channel *) chan;
     ChannelState *statePtr = chanPtr->state;
@@ -5899,11 +5900,11 @@ Tcl_ReadRaw(
  *---------------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_ReadChars(
     Tcl_Channel chan,		/* The channel to read. */
     Tcl_Obj *objPtr,		/* Input data is stored in this object. */
-    int toRead,			/* Maximum number of characters to store, or
+    Tcl_Size toRead,		/* Maximum number of characters to store, or
 				 * TCL_INDEX_NONE to read all available data (up to EOF or
 				 * when channel blocks). */
     int appendFlag)		/* If non-zero, data read from the channel
@@ -5955,11 +5956,11 @@ Tcl_ReadChars(
  *---------------------------------------------------------------------------
  */
 
-static int
+static Tcl_Size
 DoReadChars(
     Channel *chanPtr,		/* The channel to read. */
     Tcl_Obj *objPtr,		/* Input data is stored in this object. */
-    int toRead,			/* Maximum number of characters to store, or
+    Tcl_Size toRead,		/* Maximum number of characters to store, or
 				 * TCL_INDEX_NONE to read all available data (up to EOF or
 				 * when channel blocks). */
     int allowShortReads,	/* Allow half-blocking (pipes,sockets) */
@@ -5971,38 +5972,13 @@ DoReadChars(
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
     ChannelBuffer *bufPtr;
-    int copied, copiedNow, result;
+    Tcl_Size copied;
+    int result, copiedNow;
     Tcl_Encoding encoding = statePtr->encoding;
     int binaryMode;
 #define UTF_EXPANSION_FACTOR	1024
     int factor = UTF_EXPANSION_FACTOR;
 
-    binaryMode = (encoding == NULL)
-	    && (statePtr->inputTranslation == TCL_TRANSLATE_LF)
-	    && (statePtr->inEofChar == '\0');
-
-    if (appendFlag) {
-	if (binaryMode && (NULL == TclGetBytesFromObj(NULL, objPtr, NULL))) {
-	    binaryMode = 0;
-	}
-    } else {
-	if (binaryMode) {
-	    Tcl_SetByteArrayLength(objPtr, 0);
-	} else {
-	    Tcl_SetObjLength(objPtr, 0);
-
-	    /*
-	     * We're going to access objPtr->bytes directly, so we must ensure
-	     * that this is actually a string object (otherwise it might have
-	     * been pure Unicode).
-	     *
-	     * Probably not needed anymore.
-	     */
-
-	    TclGetString(objPtr);
-	}
-    }
-
     if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)) {
 	/* TODO: We don't need this call? */
 	UpdateInterest(chanPtr);
@@ -6047,6 +6023,32 @@ DoReadChars(
     chanPtr = statePtr->topChanPtr;
     TclChannelPreserve((Tcl_Channel)chanPtr);
 
+    binaryMode = (encoding == NULL)
+	    && (statePtr->inputTranslation == TCL_TRANSLATE_LF)
+	    && (statePtr->inEofChar == '\0');
+
+    if (appendFlag) {
+	if (binaryMode && (NULL == TclGetBytesFromObj(NULL, objPtr, NULL))) {
+	    binaryMode = 0;
+	}
+    } else {
+	if (binaryMode) {
+	    Tcl_SetByteArrayLength(objPtr, 0);
+	} else {
+	    Tcl_SetObjLength(objPtr, 0);
+
+	    /*
+	     * We're going to access objPtr->bytes directly, so we must ensure
+	     * that this is actually a string object (otherwise it might have
+	     * been pure Unicode).
+	     *
+	     * Probably not needed anymore.
+	     */
+
+	    TclGetString(objPtr);
+	}
+    }
+
     /*
      * Must clear the BLOCKED|EOF flags here since we check before reading.
      */
@@ -6275,7 +6277,7 @@ ReadChars(
     int savedIEFlags = statePtr->inputEncodingFlags;
     int savedFlags = statePtr->flags;
     char *dst, *src = RemovePoint(bufPtr);
-    int numBytes;
+    Tcl_Size numBytes;
     int srcLen = BytesLeft(bufPtr);
 
     /*
@@ -6821,11 +6823,11 @@ TranslateInputEOL(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_Ungets(
     Tcl_Channel chan,		/* The channel for which to add the input. */
     const char *str,		/* The input itself. */
-    int len,			/* The length of the input. */
+    Tcl_Size len,			/* The length of the input. */
     int atEnd)			/* If non-zero, add at end of queue; otherwise
 				 * add at head of queue. */
 {
@@ -7752,7 +7754,7 @@ Tcl_ChannelBuffered(
 void
 Tcl_SetChannelBufferSize(
     Tcl_Channel chan,		/* The channel whose buffer size to set. */
-    int sz)			/* The size to set. */
+    Tcl_Size sz)			/* The size to set. */
 {
     ChannelState *statePtr;	/* State of real channel structure. */
 
@@ -7806,7 +7808,7 @@ Tcl_SetChannelBufferSize(
  *----------------------------------------------------------------------
  */
 
-int
+Tcl_Size
 Tcl_GetChannelBufferSize(
     Tcl_Channel chan)		/* The channel for which to find the buffer
 				 * size. */
@@ -7858,7 +7860,7 @@ Tcl_BadChannelOption(
 	const char *genericopt =
 		"blocking buffering buffersize encoding eofchar profile translation";
 	const char **argv;
-	int argc, i;
+	Tcl_Size argc, i;
 	Tcl_DString ds;
         Tcl_Obj *errObj;
 
@@ -8168,7 +8170,7 @@ Tcl_SetChannelOption(
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
     size_t len;			/* Length of optionName string. */
-    int argc;
+    Tcl_Size argc;
     const char **argv = NULL;
 
     /*
@@ -9770,7 +9772,7 @@ CopyData(
     Tcl_Channel inChan, outChan;
     ChannelState *inStatePtr, *outStatePtr;
     int result = TCL_OK, size;
-    int sizeb;
+    Tcl_Size sizeb;
     Tcl_WideInt total;
     const char *buffer;
     int inBinary, outBinary, sameEncoding;
@@ -10105,11 +10107,11 @@ CopyData(
  *----------------------------------------------------------------------
  */
 
-static int
+static Tcl_Size
 DoRead(
     Channel *chanPtr,		/* The channel from which to read. */
     char *dst,			/* Where to store input read. */
-    int bytesToRead,		/* Maximum number of bytes to read. */
+    Tcl_Size bytesToRead,		/* Maximum number of bytes to read. */
     int allowShortReads)	/* Allow half-blocking (pipes,sockets) */
 {
     ChannelState *statePtr = chanPtr->state;
@@ -11299,7 +11301,7 @@ FixLevelCode(
     Tcl_Obj *msg)
 {
     int explicitResult, numOptions, lcn;
-    int lc;
+    Tcl_Size lc;
     Tcl_Obj **lv, **lvn;
     int res, i, j, val, lignore, cignore;
     int newlevel = -1, newcode = -1;
diff --git a/tests/io.test b/tests/io.test
index 82a458d..1efd69c 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -9304,12 +9304,16 @@ test io-75.12 {invalid utf-8 encoding read is ignored} -setup {
     close $f
     removeFile io-75.12
 } -result 4181
-test io-75.13 {invalid utf-8 encoding read is not ignored (-profile strict)} -setup {
+test io-75.13 {
+    In nonblocking mode when there is an encoding error the data that has been
+    successfully read so far is returned first and then the error is returned
+    on the next call to [read].
+} -setup {
     set fn [makeFile {} io-75.13]
     set f [open $fn w+]
     fconfigure $f -encoding binary
     # \x81 is invalid in utf-8
-    puts -nonewline $f "A\x81"
+    puts -nonewline $f A\x81
     flush $f
     seek $f 0
     fconfigure $f -encoding utf-8 -blocking 0 -eofchar "" -translation lf -profile strict
-- 
cgit v0.12


From 023ceb178da1d545717b455ee96184c481f20f5c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Apr 2023 06:16:05 +0000
Subject: cherry-pick from trunk: Remove one unnecesary call to Tcl_SetErrno()
 in DoReadChars().

---
 generic/tclIO.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6ec93f2..92ad97e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -6091,11 +6091,7 @@ DoReadChars(
 
 	    if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
 		    && !GotFlag(statePtr, CHANNEL_STICKY_EOF)
-		    && !GotFlag(statePtr, CHANNEL_NONBLOCKING)) {
-		/* Channel is blocking.  Return an error so that callers
-		 * like [read] can return an error.
-		*/
-		Tcl_SetErrno(EILSEQ);
+		    && (!GotFlag(statePtr, CHANNEL_NONBLOCKING))) {
 		goto finish;
 	    }
 	}
@@ -6138,7 +6134,7 @@ finish:
     }
 
     /*
-     * Regenerate the top channel, in case it was changed due to
+     * Regenerate chanPtr in case it was changed due to
      * self-modifying reflected transforms.
      */
 
@@ -6160,8 +6156,14 @@ finish:
     assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED)
             == (CHANNEL_EOF|CHANNEL_BLOCKED)));
     UpdateInterest(chanPtr);
+
+    /* This must comes after UpdateInterest(), which may set errno */
     if (GotFlag(statePtr, CHANNEL_ENCODING_ERROR)
 	    && (!copied || !GotFlag(statePtr, CHANNEL_NONBLOCKING))) {
+	/* Channel either is blocking or is nonblocking with no data
+	 * succesfully red before the error.  Return an error so that callers
+	 * like [read] can also return an error.
+	*/
 	Tcl_SetErrno(EILSEQ);
 	copied = -1;
     }
@@ -6200,7 +6202,7 @@ ReadBytes(
 				 * been allocated to hold data, not how many
 				 * bytes of data have been stored in the
 				 * object. */
-    int bytesToRead)		/* Maximum number of bytes to store, or < 0 to
+    int bytesToRead)		/* Maximum number of bytes to store, or -1 to
 				 * get all available bytes. Bytes are obtained
 				 * from the first buffer in the queue - even
 				 * if this number is larger than the number of
@@ -6597,7 +6599,7 @@ ReadChars(
 	     * precautions.
 	     */
 
-	    if (nextPtr->nextRemoved - srcLen < 0) {
+	    if (nextPtr->nextRemoved < srcLen) {
 		Tcl_Panic("Buffer Underflow, BUFFER_PADDING not enough");
 	    }
 
-- 
cgit v0.12


From 50f141d888ff2170dfd1a6bfe34c65a4df087307 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Apr 2023 16:55:51 +0000
Subject: re-generate unix/configure

---
 unix/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/configure b/unix/configure
index e0777f3..54e3ae6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2458,7 +2458,7 @@ esac
 #--------------------------------------------------------------------
 # Supply substitutes for missing POSIX header files.  Special notes:
 #	- stdlib.h doesn't define strtol, strtoul, or
-#	  strtod insome versions of SunOS
+#	  strtod in some versions of SunOS
 #	- some versions of string.h don't declare procedures such
 #	  as strstr
 # Do this early, otherwise an autoconf bug throws errors on configure
-- 
cgit v0.12


From ee84d52e390aa68fc33193c42203272d42ba500d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Apr 2023 16:56:57 +0000
Subject: Re-generate unix/configure

---
 unix/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/configure b/unix/configure
index f654378..05fd35a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8105,7 +8105,7 @@ fi
 
 done
 # Nb: if getcwd uses popen and pwd(1) (like SunOS 4) we should really
-# define USEGETWD even if the Posix getcwd exists. Add a test ?
+# define USEGETWD even if the posix getcwd exists. Add a test ?
 
 ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
 if test "x$ac_cv_func_mkstemp" = xyes
-- 
cgit v0.12


From 0000e98387b76863afc7e061f08b41fbc5a77762 Mon Sep 17 00:00:00 2001
From: pooryorick <com.digitalsmarties@pooryorick.com>
Date: Fri, 14 Apr 2023 11:40:11 +0000
Subject: Fix for issue [718de2132f487cf2], "review use of strip on the stubs
 library".

---
 unix/Makefile.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 21d4085..2f28fcf 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -151,7 +151,8 @@ SHELL			= @MAKEFILE_SHELL@
 # distribution, which is slower but guaranteed to work.
 
 INSTALL_STRIP_PROGRAM	= -s
-INSTALL_STRIP_LIBRARY	= -S -x
+# Use --strip-unneeded instead of -x.  See issue 718de2132f487cf2
+INSTALL_STRIP_LIBRARY	= -S --strip-unneeded
 
 INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
 INSTALL_PROGRAM		= ${INSTALL}
-- 
cgit v0.12


From f82e6059dce38a482b9db9366d2edf71cb5ea917 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Apr 2023 21:40:50 +0000
Subject: int -> Tcl_Size where appropriate in tcl.decls (reducing the diff
 against Tcl 9.0)

---
 generic/tcl.decls  | 12 ++++++------
 generic/tclDecls.h | 24 ++++++++++++------------
 unix/tclAppInit.c  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 6278bd3..4e8f20a 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -1159,7 +1159,7 @@ declare 323 {
     int Tcl_UniCharToUpper(int ch)
 }
 declare 324 {
-    int Tcl_UniCharToUtf(int ch, char *buf)
+    Tcl_Size Tcl_UniCharToUtf(int ch, char *buf)
 }
 declare 325 {
     const char *Tcl_UtfAtIndex(const char *src, Tcl_Size index)
@@ -1193,16 +1193,16 @@ declare 333 {
 	    const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr)
 }
 declare 334 {
-    int Tcl_UtfToLower(char *src)
+    Tcl_Size Tcl_UtfToLower(char *src)
 }
 declare 335 {
-    int Tcl_UtfToTitle(char *src)
+    Tcl_Size Tcl_UtfToTitle(char *src)
 }
 declare 336 {
-    int Tcl_UtfToChar16(const char *src, unsigned short *chPtr)
+    Tcl_Size Tcl_UtfToChar16(const char *src, unsigned short *chPtr)
 }
 declare 337 {
-    int Tcl_UtfToUpper(char *src)
+    Tcl_Size Tcl_UtfToUpper(char *src)
 }
 declare 338 {
     Tcl_Size Tcl_WriteChars(Tcl_Channel chan, const char *src, Tcl_Size srcLen)
@@ -2395,7 +2395,7 @@ declare 645 {
 
 # TIP #548
 declare 646 {
-    int Tcl_UtfToUniChar(const char *src, int *chPtr)
+    Tcl_Size Tcl_UtfToUniChar(const char *src, int *chPtr)
 }
 declare 647 {
     char *Tcl_UniCharToUtfDString(const int *uniStr,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 84c2b4d..e2901fb 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1007,7 +1007,7 @@ EXTERN int		Tcl_UniCharToTitle(int ch);
 /* 323 */
 EXTERN int		Tcl_UniCharToUpper(int ch);
 /* 324 */
-EXTERN int		Tcl_UniCharToUtf(int ch, char *buf);
+EXTERN Tcl_Size		Tcl_UniCharToUtf(int ch, char *buf);
 /* 325 */
 EXTERN const char *	Tcl_UtfAtIndex(const char *src, Tcl_Size index);
 /* 326 */
@@ -1035,14 +1035,14 @@ EXTERN char *		Tcl_UtfToExternalDString(Tcl_Encoding encoding,
 				const char *src, Tcl_Size srcLen,
 				Tcl_DString *dsPtr);
 /* 334 */
-EXTERN int		Tcl_UtfToLower(char *src);
+EXTERN Tcl_Size		Tcl_UtfToLower(char *src);
 /* 335 */
-EXTERN int		Tcl_UtfToTitle(char *src);
+EXTERN Tcl_Size		Tcl_UtfToTitle(char *src);
 /* 336 */
-EXTERN int		Tcl_UtfToChar16(const char *src,
+EXTERN Tcl_Size		Tcl_UtfToChar16(const char *src,
 				unsigned short *chPtr);
 /* 337 */
-EXTERN int		Tcl_UtfToUpper(char *src);
+EXTERN Tcl_Size		Tcl_UtfToUpper(char *src);
 /* 338 */
 EXTERN Tcl_Size		Tcl_WriteChars(Tcl_Channel chan, const char *src,
 				Tcl_Size srcLen);
@@ -1924,7 +1924,7 @@ EXTERN int		Tcl_GetIntForIndex(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_Size endValue,
 				Tcl_Size *indexPtr);
 /* 646 */
-EXTERN int		Tcl_UtfToUniChar(const char *src, int *chPtr);
+EXTERN Tcl_Size		Tcl_UtfToUniChar(const char *src, int *chPtr);
 /* 647 */
 EXTERN char *		Tcl_UniCharToUtfDString(const int *uniStr,
 				Tcl_Size uniLength, Tcl_DString *dsPtr);
@@ -2411,7 +2411,7 @@ typedef struct TclStubs {
     int (*tcl_UniCharToLower) (int ch); /* 321 */
     int (*tcl_UniCharToTitle) (int ch); /* 322 */
     int (*tcl_UniCharToUpper) (int ch); /* 323 */
-    int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
+    Tcl_Size (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */
     const char * (*tcl_UtfAtIndex) (const char *src, Tcl_Size index); /* 325 */
     int (*tclUtfCharComplete) (const char *src, Tcl_Size length); /* 326 */
     Tcl_Size (*tcl_UtfBackslash) (const char *src, int *readPtr, char *dst); /* 327 */
@@ -2421,10 +2421,10 @@ typedef struct TclStubs {
     const char * (*tclUtfPrev) (const char *src, const char *start); /* 331 */
     int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, Tcl_Size dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */
     char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, Tcl_DString *dsPtr); /* 333 */
-    int (*tcl_UtfToLower) (char *src); /* 334 */
-    int (*tcl_UtfToTitle) (char *src); /* 335 */
-    int (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
-    int (*tcl_UtfToUpper) (char *src); /* 337 */
+    Tcl_Size (*tcl_UtfToLower) (char *src); /* 334 */
+    Tcl_Size (*tcl_UtfToTitle) (char *src); /* 335 */
+    Tcl_Size (*tcl_UtfToChar16) (const char *src, unsigned short *chPtr); /* 336 */
+    Tcl_Size (*tcl_UtfToUpper) (char *src); /* 337 */
     Tcl_Size (*tcl_WriteChars) (Tcl_Channel chan, const char *src, Tcl_Size srcLen); /* 338 */
     Tcl_Size (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */
     char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */
@@ -2733,7 +2733,7 @@ typedef struct TclStubs {
     int (*tcl_IsShared) (Tcl_Obj *objPtr); /* 643 */
     int (*tcl_LinkArray) (Tcl_Interp *interp, const char *varName, void *addr, int type, Tcl_Size size); /* 644 */
     int (*tcl_GetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size endValue, Tcl_Size *indexPtr); /* 645 */
-    int (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
+    Tcl_Size (*tcl_UtfToUniChar) (const char *src, int *chPtr); /* 646 */
     char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
     int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
     unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index 05d25de..b203487 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -91,7 +91,7 @@ main(
     TclZipfs_AppHook(&argc, &argv);
 #endif
 
-    Tcl_Main((size_t)argc, argv, TCL_LOCAL_APPINIT);
+    Tcl_Main(argc, argv, TCL_LOCAL_APPINIT);
     return 0;			/* Needed only to prevent compiler warning. */
 }
 
-- 
cgit v0.12


From 788236542834710698cace10523d24ae7143279d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 15 Apr 2023 19:02:44 +0000
Subject: Backout fix for [718de2132f487cf2]: It breaks on MacOS and other
 systems which don't support the --strip-unneeded option

---
 unix/Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2f28fcf..21d4085 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -151,8 +151,7 @@ SHELL			= @MAKEFILE_SHELL@
 # distribution, which is slower but guaranteed to work.
 
 INSTALL_STRIP_PROGRAM	= -s
-# Use --strip-unneeded instead of -x.  See issue 718de2132f487cf2
-INSTALL_STRIP_LIBRARY	= -S --strip-unneeded
+INSTALL_STRIP_LIBRARY	= -S -x
 
 INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
 INSTALL_PROGRAM		= ${INSTALL}
-- 
cgit v0.12


From 52425dcf5d50616645b90e2acee65ef733962afa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 15 Apr 2023 19:09:41 +0000
Subject: Add one more unused stub entry

---
 generic/tcl.decls     | 2 +-
 generic/tclDecls.h    | 9 ++++++---
 generic/tclStubInit.c | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index c3d5073..58b7400 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2339,7 +2339,7 @@ declare 653 {
 
 # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
 
-declare 687 {
+declare 688 {
     void TclUnusedStubEntry(void)
 }
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 078974c..11e8e59 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1877,7 +1877,8 @@ EXTERN unsigned char *	TclGetByteArrayFromObj_(Tcl_Obj *objPtr,
 /* Slot 684 is reserved */
 /* Slot 685 is reserved */
 /* Slot 686 is reserved */
-/* 687 */
+/* Slot 687 is reserved */
+/* 688 */
 EXTERN void		TclUnusedStubEntry(void);
 
 typedef struct {
@@ -2601,7 +2602,8 @@ typedef struct TclStubs {
     void (*reserved684)(void);
     void (*reserved685)(void);
     void (*reserved686)(void);
-    void (*tclUnusedStubEntry) (void); /* 687 */
+    void (*reserved687)(void);
+    void (*tclUnusedStubEntry) (void); /* 688 */
 } TclStubs;
 
 extern const TclStubs *tclStubsPtr;
@@ -3953,8 +3955,9 @@ extern const TclStubs *tclStubsPtr;
 /* Slot 684 is reserved */
 /* Slot 685 is reserved */
 /* Slot 686 is reserved */
+/* Slot 687 is reserved */
 #define TclUnusedStubEntry \
-	(tclStubsPtr->tclUnusedStubEntry) /* 687 */
+	(tclStubsPtr->tclUnusedStubEntry) /* 688 */
 
 #endif /* defined(USE_TCL_STUBS) */
 
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index c504586..d6621b6 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1726,7 +1726,8 @@ const TclStubs tclStubs = {
     0, /* 684 */
     0, /* 685 */
     0, /* 686 */
-    TclUnusedStubEntry, /* 687 */
+    0, /* 687 */
+    TclUnusedStubEntry, /* 688 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From a9974c36d092201f528c8b8272ed47a2811e6ce7 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 16 Apr 2023 17:31:58 +0000
Subject: size_t -> ptrdiff_t to match Tcl 9 unsigned->signed change

---
 generic/tcl.decls      | 26 +++++++-------
 generic/tclBasic.c     |  2 +-
 generic/tclBinary.c    |  4 +--
 generic/tclDecls.h     | 96 +++++++++++++++++++++++++-------------------------
 generic/tclObj.c       |  6 ++--
 generic/tclStringObj.c |  2 +-
 generic/tclStubInit.c  | 14 ++++----
 7 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 8082069..6ac10cb 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2413,19 +2413,19 @@ declare 649 {
 }
 declare 650 {
     unsigned char *Tcl_GetBytesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    size_t *numBytesPtr)
+	    ptrdiff_t *numBytesPtr)
 }
 
 # TIP #481
 declare 651 {
-    char *TclGetStringFromObj(Tcl_Obj *objPtr, size_t *lengthPtr)
+    char *TclGetStringFromObj(Tcl_Obj *objPtr, ptrdiff_t *lengthPtr)
 }
 declare 652 {
-    unsigned short *TclGetUnicodeFromObj(Tcl_Obj *objPtr, size_t *lengthPtr)
+    unsigned short *TclGetUnicodeFromObj(Tcl_Obj *objPtr, ptrdiff_t *lengthPtr)
 }
 # Only available in Tcl 8.x, NULL in Tcl 9.0
 declare 653 {
-    unsigned char *TclGetByteArrayFromObj(Tcl_Obj *objPtr, size_t *numBytesPtr)
+    unsigned char *TclGetByteArrayFromObj(Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr)
 }
 
 # TIP #575
@@ -2462,28 +2462,28 @@ declare 660 {
 # TIP #616
 declare 661 {
     int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
-	    size_t *objcPtr, Tcl_Obj ***objvPtr)
+	    ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr)
 }
 declare 662 {
     int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
-	    size_t *lengthPtr)
+	    ptrdiff_t *lengthPtr)
 }
 declare 663 {
-    int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, size_t *sizePtr)
+    int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, ptrdiff_t *sizePtr)
 }
 declare 664 {
-    int TclSplitList(Tcl_Interp *interp, const char *listStr, size_t *argcPtr,
+    int TclSplitList(Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr,
 	    const char ***argvPtr)
 }
 declare 665 {
-    void TclSplitPath(const char *path, size_t *argcPtr, const char ***argvPtr)
+    void TclSplitPath(const char *path, ptrdiff_t *argcPtr, const char ***argvPtr)
 }
 declare 666 {
-    Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr)
+    Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr)
 }
 declare 667 {
     int TclParseArgsObjv(Tcl_Interp *interp, const Tcl_ArgvInfo *argTable,
-	    size_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv)
+	    ptrdiff_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv)
 }
 
 # TIP #617
@@ -2533,7 +2533,7 @@ declare 678 {
 }
 declare 679 {
     int Tcl_NRCallObjProc2(Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2,
-	    void *clientData, size_t objc, Tcl_Obj *const objv[])
+	    void *clientData, ptrdiff_t objc, Tcl_Obj *const objv[])
 }
 
 # TIP #638.
@@ -2542,7 +2542,7 @@ declare 680 {
 	    void **clientDataPtr, int *typePtr)
 }
 declare 681 {
-    int Tcl_GetNumber(Tcl_Interp *interp, const char *bytes, size_t numBytes,
+    int Tcl_GetNumber(Tcl_Interp *interp, const char *bytes, ptrdiff_t numBytes,
 	    void **clientDataPtr, int *typePtr)
 }
 
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index abc5d60..70d2160 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -9192,7 +9192,7 @@ Tcl_NRCallObjProc2(
     Tcl_Interp *interp,
     Tcl_ObjCmdProc2 *objProc,
     void *clientData,
-    size_t objc,
+    ptrdiff_t objc,
     Tcl_Obj *const objv[])
 {
     if (objc > INT_MAX) {
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index b956bd0..204830b 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -457,7 +457,7 @@ unsigned char *
 Tcl_GetBytesFromObj(
     Tcl_Interp *interp,		/* For error reporting */
     Tcl_Obj *objPtr,		/* Value to extract from */
-    size_t *numBytesPtr)	/* If non-NULL, write the number of bytes
+    ptrdiff_t *numBytesPtr)	/* If non-NULL, write the number of bytes
 				 * in the array here */
 {
     ByteArray *baPtr;
@@ -539,7 +539,7 @@ Tcl_GetByteArrayFromObj(
 unsigned char *
 TclGetByteArrayFromObj(
     Tcl_Obj *objPtr,		/* The ByteArray object. */
-    size_t *numBytesPtr)	/* If non-NULL, write the number of bytes
+    ptrdiff_t *numBytesPtr)	/* If non-NULL, write the number of bytes
 				 * in the array here */
 {
     ByteArray *baPtr;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 6dca873..7d82250 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1936,16 +1936,16 @@ EXTERN unsigned char *	TclGetBytesFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *numBytesPtr);
 /* 650 */
 EXTERN unsigned char *	Tcl_GetBytesFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, size_t *numBytesPtr);
+				Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr);
 /* 651 */
 EXTERN char *		TclGetStringFromObj(Tcl_Obj *objPtr,
-				size_t *lengthPtr);
+				ptrdiff_t *lengthPtr);
 /* 652 */
 EXTERN unsigned short *	 TclGetUnicodeFromObj(Tcl_Obj *objPtr,
-				size_t *lengthPtr);
+				ptrdiff_t *lengthPtr);
 /* 653 */
 EXTERN unsigned char *	TclGetByteArrayFromObj(Tcl_Obj *objPtr,
-				size_t *numBytesPtr);
+				ptrdiff_t *numBytesPtr);
 /* 654 */
 EXTERN int		Tcl_UtfCharComplete(const char *src, Tcl_Size length);
 /* 655 */
@@ -1971,26 +1971,26 @@ EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
 				int sigNumber);
 /* 661 */
 EXTERN int		TclListObjGetElements(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, size_t *objcPtr,
+				Tcl_Obj *listPtr, ptrdiff_t *objcPtr,
 				Tcl_Obj ***objvPtr);
 /* 662 */
 EXTERN int		TclListObjLength(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, size_t *lengthPtr);
+				Tcl_Obj *listPtr, ptrdiff_t *lengthPtr);
 /* 663 */
 EXTERN int		TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-				size_t *sizePtr);
+				ptrdiff_t *sizePtr);
 /* 664 */
 EXTERN int		TclSplitList(Tcl_Interp *interp, const char *listStr,
-				size_t *argcPtr, const char ***argvPtr);
+				ptrdiff_t *argcPtr, const char ***argvPtr);
 /* 665 */
-EXTERN void		TclSplitPath(const char *path, size_t *argcPtr,
+EXTERN void		TclSplitPath(const char *path, ptrdiff_t *argcPtr,
 				const char ***argvPtr);
 /* 666 */
-EXTERN Tcl_Obj *	TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr);
+EXTERN Tcl_Obj *	TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr);
 /* 667 */
 EXTERN int		TclParseArgsObjv(Tcl_Interp *interp,
 				const Tcl_ArgvInfo *argTable,
-				size_t *objcPtr, Tcl_Obj *const *objv,
+				ptrdiff_t *objcPtr, Tcl_Obj *const *objv,
 				Tcl_Obj ***remObjv);
 /* 668 */
 EXTERN Tcl_Size		Tcl_UniCharLen(const int *uniStr);
@@ -2030,14 +2030,14 @@ EXTERN Tcl_Command	Tcl_NRCreateCommand2(Tcl_Interp *interp,
 /* 679 */
 EXTERN int		Tcl_NRCallObjProc2(Tcl_Interp *interp,
 				Tcl_ObjCmdProc2 *objProc2, void *clientData,
-				size_t objc, Tcl_Obj *const objv[]);
+				ptrdiff_t objc, Tcl_Obj *const objv[]);
 /* 680 */
 EXTERN int		Tcl_GetNumberFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, void **clientDataPtr,
 				int *typePtr);
 /* 681 */
 EXTERN int		Tcl_GetNumber(Tcl_Interp *interp, const char *bytes,
-				size_t numBytes, void **clientDataPtr,
+				ptrdiff_t numBytes, void **clientDataPtr,
 				int *typePtr);
 /* 682 */
 EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
@@ -2740,10 +2740,10 @@ typedef struct TclStubs {
     char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
     int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
     unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
-    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, size_t *numBytesPtr); /* 650 */
-    char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */
-    unsigned short * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */
-    unsigned char * (*tclGetByteArrayFromObj) (Tcl_Obj *objPtr, size_t *numBytesPtr); /* 653 */
+    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr); /* 650 */
+    char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, ptrdiff_t *lengthPtr); /* 651 */
+    unsigned short * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, ptrdiff_t *lengthPtr); /* 652 */
+    unsigned char * (*tclGetByteArrayFromObj) (Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr); /* 653 */
     int (*tcl_UtfCharComplete) (const char *src, Tcl_Size length); /* 654 */
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
@@ -2751,13 +2751,13 @@ typedef struct TclStubs {
     int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
     int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
-    int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
-    int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *lengthPtr); /* 662 */
-    int (*tclDictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, size_t *sizePtr); /* 663 */
-    int (*tclSplitList) (Tcl_Interp *interp, const char *listStr, size_t *argcPtr, const char ***argvPtr); /* 664 */
-    void (*tclSplitPath) (const char *path, size_t *argcPtr, const char ***argvPtr); /* 665 */
-    Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, size_t *lenPtr); /* 666 */
-    int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, size_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
+    int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
+    int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, ptrdiff_t *lengthPtr); /* 662 */
+    int (*tclDictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, ptrdiff_t *sizePtr); /* 663 */
+    int (*tclSplitList) (Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr, const char ***argvPtr); /* 664 */
+    void (*tclSplitPath) (const char *path, ptrdiff_t *argcPtr, const char ***argvPtr); /* 665 */
+    Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, ptrdiff_t *lenPtr); /* 666 */
+    int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, ptrdiff_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
     Tcl_Size (*tcl_UniCharLen) (const int *uniStr); /* 668 */
     Tcl_Size (*tclNumUtfChars) (const char *src, Tcl_Size length); /* 669 */
     Tcl_Size (*tclGetCharLength) (Tcl_Obj *objPtr); /* 670 */
@@ -2769,9 +2769,9 @@ typedef struct TclStubs {
     Tcl_Command (*tcl_CreateObjCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 676 */
     Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
     Tcl_Command (*tcl_NRCreateCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc, Tcl_ObjCmdProc2 *nreProc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 678 */
-    int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, size_t objc, Tcl_Obj *const objv[]); /* 679 */
+    int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, ptrdiff_t objc, Tcl_Obj *const objv[]); /* 679 */
     int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
-    int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, size_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
+    int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, ptrdiff_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
     int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
     Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
     int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
@@ -4397,7 +4397,7 @@ extern const TclStubs *tclStubsPtr;
 #endif
 #if defined(USE_TCL_STUBS)
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
@@ -4408,15 +4408,15 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetByteArrayFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetByteArrayFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #endif
 #else
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
@@ -4427,11 +4427,11 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetByteArrayFromObj)(objPtr, (int *)(sizePtr)) : TclGetByteArrayFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetByteArrayFromObj)(objPtr, (int *)(sizePtr)) : TclGetByteArrayFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetUnicodeFromObj)(objPtr, (int *)(sizePtr)) : TclGetUnicodeFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetUnicodeFromObj)(objPtr, (int *)(sizePtr)) : TclGetUnicodeFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #endif
 #endif
 
@@ -4488,31 +4488,31 @@ extern const TclStubs *tclStubsPtr;
 #   undef Tcl_ListObjGetElements
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
-		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)))
+		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (ptrdiff_t *)(void *)(objcPtr), (objvPtr)))
 #   undef Tcl_ListObjLength
 #   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)) \
-		: tclStubsPtr->tclListObjLength((interp), (listPtr), (size_t *)(void *)(lengthPtr)))
+		: tclStubsPtr->tclListObjLength((interp), (listPtr), (ptrdiff_t *)(void *)(lengthPtr)))
 #   undef Tcl_DictObjSize
 #   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)) \
-		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (size_t *)(void *)(sizePtr)))
+		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (ptrdiff_t *)(void *)(sizePtr)))
 #   undef Tcl_SplitList
 #   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitList((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitList((interp), (listStr), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_SplitPath
 #   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitPath((path), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitPath((path), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitPath((path), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_FSSplitPath
 #   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_FSSplitPath((pathPtr), (int *)(void *)(lenPtr)) \
-		: tclStubsPtr->tclFSSplitPath((pathPtr), (size_t *)(void *)(lenPtr)))
+		: tclStubsPtr->tclFSSplitPath((pathPtr), (ptrdiff_t *)(void *)(lenPtr)))
 #   undef Tcl_ParseArgsObjv
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
-		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
+		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (ptrdiff_t *)(void *)(objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
 #else
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
@@ -4530,25 +4530,25 @@ extern const TclStubs *tclStubsPtr;
 #ifdef TCL_NO_DEPRECATED
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? (Tcl_ListObjGetElements)((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
-		: TclListObjGetElements((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)))
+		: TclListObjGetElements((interp), (listPtr), (ptrdiff_t *)(void *)(objcPtr), (objvPtr)))
 #   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
 		? (Tcl_ListObjLength)((interp), (listPtr), (int *)(void *)(lengthPtr)) \
-		: TclListObjLength((interp), (listPtr), (size_t *)(void *)(lengthPtr)))
+		: TclListObjLength((interp), (listPtr), (ptrdiff_t *)(void *)(lengthPtr)))
 #   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
 		? (Tcl_DictObjSize)((interp), (dictPtr), (int *)(void *)(sizePtr)) \
-		: TclDictObjSize((interp), (dictPtr), (size_t *)(void *)(sizePtr)))
+		: TclDictObjSize((interp), (dictPtr), (ptrdiff_t *)(void *)(sizePtr)))
 #   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? (Tcl_SplitList)((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitList((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: TclSplitList((interp), (listStr), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? (Tcl_SplitPath)((path), (int *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitPath((path), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: TclSplitPath((path), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
 		? (Tcl_FSSplitPath)((pathPtr), (int *)(void *)(lenPtr)) \
-		: TclFSSplitPath((pathPtr), (size_t *)(void *)(lenPtr)))
+		: TclFSSplitPath((pathPtr), (ptrdiff_t *)(void *)(lenPtr)))
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? (Tcl_ParseArgsObjv)((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
-		: TclParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
+		: TclParseArgsObjv((interp), (argTable), (ptrdiff_t *)(void *)(objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
 #endif
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 233c677..aeaa0cd 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1721,7 +1721,7 @@ char *
 TclGetStringFromObj(
     Tcl_Obj *objPtr,	/* Object whose string rep byte pointer should
 				 * be returned. */
-    size_t *lengthPtr)	/* If non-NULL, the location where the string
+    ptrdiff_t *lengthPtr)	/* If non-NULL, the location where the string
 				 * rep's byte array length should * be stored.
 				 * If NULL, no length is stored. */
 {
@@ -4066,7 +4066,7 @@ int
 Tcl_GetNumber(
     Tcl_Interp *interp,
     const char *bytes,
-    size_t numBytes,
+    ptrdiff_t numBytes,
     void **clientDataPtr,
     int *typePtr)
 {
@@ -4080,7 +4080,7 @@ Tcl_GetNumber(
 	bytes = &tclEmptyString;
 	numBytes = 0;
     }
-    if (numBytes == (size_t)TCL_INDEX_NONE) {
+    if (numBytes < 0) {
 	numBytes = strlen(bytes);
     }
     if (numBytes > INT_MAX) {
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 340ef50..a6ed49f 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -987,7 +987,7 @@ unsigned short *
 TclGetUnicodeFromObj(
     Tcl_Obj *objPtr,		/* The object to find the unicode string
 				 * for. */
-    size_t *lengthPtr)		/* If non-NULL, the location where the string
+    ptrdiff_t *lengthPtr)	/* If non-NULL, the location where the string
 				 * rep's unichar length should be stored. If
 				 * NULL, no length is stored. */
 {
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 05a829c..3a51f7e 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -138,7 +138,7 @@ static const char *TclUtfPrev(const char *src, const char *start) {
 }
 
 int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
-    size_t *objcPtr, Tcl_Obj ***objvPtr) {
+    ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr) {
     int n, result = Tcl_ListObjGetElements(interp, listPtr, &n, objvPtr);
     if ((result == TCL_OK) && objcPtr) {
 	*objcPtr = n;
@@ -146,7 +146,7 @@ int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
     return result;
 }
 int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
-    size_t *lengthPtr) {
+    ptrdiff_t *lengthPtr) {
     int n;
     int result = Tcl_ListObjLength(interp, listPtr, &n);
     if ((result == TCL_OK) && lengthPtr) {
@@ -155,14 +155,14 @@ int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
     return result;
 }
 int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-	size_t *sizePtr) {
+	ptrdiff_t *sizePtr) {
     int n, result = Tcl_DictObjSize(interp, dictPtr, &n);
     if ((result == TCL_OK) && sizePtr) {
 	*sizePtr = n;
     }
     return result;
 }
-int TclSplitList(Tcl_Interp *interp, const char *listStr, size_t *argcPtr,
+int TclSplitList(Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr,
 	const char ***argvPtr) {
     int n;
     int result = Tcl_SplitList(interp, listStr, &n, argvPtr);
@@ -171,14 +171,14 @@ int TclSplitList(Tcl_Interp *interp, const char *listStr, size_t *argcPtr,
     }
     return result;
 }
-void TclSplitPath(const char *path, size_t *argcPtr, const char ***argvPtr) {
+void TclSplitPath(const char *path, ptrdiff_t *argcPtr, const char ***argvPtr) {
     int n;
     Tcl_SplitPath(path, &n, argvPtr);
     if (argcPtr) {
 	*argcPtr = n;
     }
 }
-Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr) {
+Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr) {
     int n;
     Tcl_Obj *result = Tcl_FSSplitPath(pathPtr, &n);
     if (result && lenPtr) {
@@ -187,7 +187,7 @@ Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr) {
     return result;
 }
 int TclParseArgsObjv(Tcl_Interp *interp,
-	const Tcl_ArgvInfo *argTable, size_t *objcPtr, Tcl_Obj *const *objv,
+	const Tcl_ArgvInfo *argTable, ptrdiff_t *objcPtr, Tcl_Obj *const *objv,
 	Tcl_Obj ***remObjv) {
     int n, result;
     if (*objcPtr > INT_MAX) {
-- 
cgit v0.12


From 249b57ef37ebce777fcd204a11d93b0e612689ce Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 16 Apr 2023 17:58:44 +0000
Subject: some spelling corrections

---
 tests/ioCmd.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 2a1f616..e132b9a 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -1072,7 +1072,7 @@ test iocmd-23.1 {chan read, regular data return} -match glob -body {
     rename foo {}
     set res
 } -result {{read rc* 4096} {read rc* 4096} snarfsnarf}
-test iocmd-23.2 {chan read, bad data return, to much} -match glob -body {
+test iocmd-23.2 {chan read, bad data return, too much} -match glob -body {
     set res {}
     proc foo {args} {
 	oninit; onfinal; track
@@ -2383,7 +2383,7 @@ test iocmd.tf-23.1 {chan read, regular data return} -match glob -body {
     rename foo {}
     set res
 } -constraints {testchannel thread} -result {{read rc* 4096} {read rc* 4096} snarfsnarf}
-test iocmd.tf-23.2 {chan read, bad data return, to much} -match glob -body {
+test iocmd.tf-23.2 {chan read, bad data return, too much} -match glob -body {
     set res {}
     proc foo {args} {
 	oninit; onfinal; track
-- 
cgit v0.12


From 61722ce13d58865dabec38cc1ec9f52152f191af Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 16 Apr 2023 18:07:22 +0000
Subject: Remove unneeded ENCODING_UTF flags

---
 generic/tclEncoding.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index db98d54..774485d 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -602,7 +602,7 @@ TclInitEncodingSubsystem(void)
     type.nullSize	= 1;
     type.clientData	= INT2PTR(ENCODING_UTF);
     Tcl_CreateEncoding(&type);
-    type.clientData	= INT2PTR(0);
+    type.clientData	= NULL;
     type.encodingName	= "cesu-8";
     Tcl_CreateEncoding(&type);
 
@@ -614,7 +614,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(TCL_ENCODING_LE);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2be";
-    type.clientData	= INT2PTR(0);
+    type.clientData	= NULL;
     Tcl_CreateEncoding(&type);
     type.encodingName   = "ucs-2";
     type.clientData	= INT2PTR(leFlags);
@@ -628,7 +628,7 @@ TclInitEncodingSubsystem(void)
     type.clientData	= INT2PTR(TCL_ENCODING_LE);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-32be";
-    type.clientData	= INT2PTR(0);
+    type.clientData	= NULL;
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-32";
     type.clientData	= INT2PTR(leFlags);
@@ -639,13 +639,13 @@ TclInitEncodingSubsystem(void)
     type.freeProc	= NULL;
     type.nullSize	= 2;
     type.encodingName   = "utf-16le";
-    type.clientData	= INT2PTR(TCL_ENCODING_LE|ENCODING_UTF);
+    type.clientData	= INT2PTR(TCL_ENCODING_LE);
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-16be";
-    type.clientData	= INT2PTR(ENCODING_UTF);
+    type.clientData	= NULL;
     Tcl_CreateEncoding(&type);
     type.encodingName   = "utf-16";
-    type.clientData	= INT2PTR(leFlags|ENCODING_UTF);
+    type.clientData	= INT2PTR(leFlags);
     Tcl_CreateEncoding(&type);
 
 #ifndef TCL_NO_DEPRECATED
-- 
cgit v0.12


From db8e59ed80acf95cad3f0d0da9e36f46ae2de2d7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 18 Apr 2023 15:23:33 +0000
Subject: Add TCL_T_MODIFIER (from TIP #660). Some header-file clean-up.

---
 generic/tcl.h           | 97 +++++++++++++++++++++++++++++++++++--------------
 tools/regexpTestLib.tcl |  2 +-
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 9140ec4..27d7995 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -136,7 +136,7 @@ extern "C" {
  */
 
 #include <stdarg.h>
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #    define TCL_VARARGS(type, name) (type name, ...)
 #    define TCL_VARARGS_DEF(type, name) (type name, ...)
 #    define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
@@ -256,7 +256,7 @@ extern "C" {
  * New code should use prototypes.
  */
 
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #   undef _ANSI_ARGS_
 #   define _ANSI_ARGS_(x)	x
 
@@ -299,7 +299,7 @@ extern "C" {
  * VOID. This block is skipped under Cygwin and Mingw.
  */
 
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #if defined(_WIN32) && !defined(HAVE_WINNT_IGNORE_VOID)
 #ifndef VOID
 #define VOID void
@@ -317,7 +317,7 @@ typedef long LONG;
 #ifndef __VXWORKS__
 #   define VOID void
 #endif
-#endif /* !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 */
+#endif /* !TCL_NO_DEPRECATED */
 
 /*
  * Miscellaneous declarations.
@@ -399,16 +399,30 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #	define TCL_Z_MODIFIER	""
 #   endif
 #endif /* !TCL_Z_MODIFIER */
+#ifndef TCL_T_MODIFIER
+#   if defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_T_MODIFIER	"t"
+#   elif defined(_WIN64)
+#	define TCL_T_MODIFIER	TCL_LL_MODIFIER
+#   else
+#	define TCL_T_MODIFIER	TCL_Z_MODIFIER
+#   endif
+#endif /* !TCL_T_MODIFIER */
+
 #define Tcl_WideAsLong(val)	((long)((Tcl_WideInt)(val)))
 #define Tcl_LongAsWide(val)	((Tcl_WideInt)((long)(val)))
 #define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
 #define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
 
-#if TCL_MAJOR_VERSION > 8
-typedef size_t Tcl_Size;
+#if TCL_MAJOR_VERSION < 9
+    typedef int Tcl_Size;
+#   define TCL_SIZE_MODIFIER ""
+#   define TCL_SIZE_MAX INT_MAX
 #else
-typedef int Tcl_Size;
-#endif
+    typedef ptrdiff_t Tcl_Size;
+#   define TCL_SIZE_MAX PTRDIFF_MAX
+#   define TCL_SIZE_MODIFIER TCL_T_MODIFIER
+#endif /* TCL_MAJOR_VERSION */
 
 #ifdef _WIN32
 #   if TCL_MAJOR_VERSION > 8 || defined(_WIN64) || defined(_USE_64BIT_TIME_T)
@@ -461,7 +475,7 @@ typedef int Tcl_Size;
  */
 
 typedef struct Tcl_Interp
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 {
     /* TIP #330: Strongly discourage extensions from using the string
      * result. */
@@ -569,19 +583,28 @@ typedef void (Tcl_ThreadCreateProc) (void *clientData);
  */
 
 typedef struct Tcl_RegExpIndices {
-    long start;			/* Character offset of first character in
+#if TCL_MAJOR_VERSION > 8
+    Tcl_Size start;			/* Character offset of first character in
 				 * match. */
-    long end;			/* Character offset of first character after
+    Tcl_Size end;			/* Character offset of first character after
 				 * the match. */
+#else
+    long start;
+    long end;
+#endif
 } Tcl_RegExpIndices;
 
 typedef struct Tcl_RegExpInfo {
-    int nsubs;			/* Number of subexpressions in the compiled
+    Tcl_Size nsubs;			/* Number of subexpressions in the compiled
 				 * expression. */
     Tcl_RegExpIndices *matches;	/* Array of nsubs match offset pairs. */
-    long extendStart;		/* The offset at which a subsequent match
+#if TCL_MAJOR_VERSION > 8
+    Tcl_Size extendStart;		/* The offset at which a subsequent match
 				 * might begin. */
+#else
+    long extendStart;
     long reserved;		/* Reserved for later use. */
+#endif
 } Tcl_RegExpInfo;
 
 /*
@@ -619,7 +642,7 @@ typedef struct stat *Tcl_OldStat_;
 #define TCL_BREAK		3
 #define TCL_CONTINUE		4
 
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #define TCL_RESULT_SIZE		200
 #endif
 
@@ -637,7 +660,7 @@ typedef struct stat *Tcl_OldStat_;
  * Argument descriptors for math function callbacks in expressions:
  */
 
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 typedef enum {
     TCL_INT, TCL_DOUBLE, TCL_EITHER, TCL_WIDE_INT
 } Tcl_ValueType;
@@ -957,9 +980,9 @@ typedef struct Tcl_DString {
 
 #define Tcl_DStringLength(dsPtr) ((dsPtr)->length)
 #define Tcl_DStringValue(dsPtr) ((dsPtr)->string)
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #   define Tcl_DStringTrunc Tcl_DStringSetLength
-#endif /* !TCL_NO_DEPRECATED */
+#endif
 
 /*
  * Definitions for the maximum number of digits of precision that may be
@@ -1081,7 +1104,7 @@ typedef struct Tcl_DString {
 #define TCL_TRACE_UNSETS	 0x40
 #define TCL_TRACE_DESTROYED	 0x80
 
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #define TCL_INTERP_DESTROYED	 0x100
 #endif
 
@@ -1119,9 +1142,9 @@ typedef struct Tcl_DString {
  * give the flag)
  */
 
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 #   define TCL_PARSE_PART1	0x400
-#endif /* !TCL_NO_DEPRECATED */
+#endif
 
 /*
  * Types for linked variables:
@@ -1279,10 +1302,15 @@ struct Tcl_HashTable {
 				 * table. */
     Tcl_Size rebuildSize;		/* Enlarge table when numEntries gets to be
 				 * this large. */
+#if TCL_MAJOR_VERSION > 8
+    size_t mask;		/* Mask value used in hashing function. */
+#endif
     int downShift;		/* Shift count used in hashing function.
 				 * Designed to use high-order bits of
 				 * randomized keys. */
-    int mask;			/* Mask value used in hashing function. */
+#if TCL_MAJOR_VERSION < 9
+    int mask;		/* Mask value used in hashing function. */
+#endif
     int keyType;		/* Type of keys used in this table. It's
 				 * either TCL_CUSTOM_KEYS, TCL_STRING_KEYS,
 				 * TCL_ONE_WORD_KEYS, or an integer giving the
@@ -1448,7 +1476,11 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, void *clientData);
  * interface.
  */
 
-#define TCL_CLOSE2PROC		((Tcl_DriverCloseProc *) 1)
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_CLOSE2PROC		NULL
+#else
+#   define TCL_CLOSE2PROC		((void *) 1)
+#endif
 
 /*
  * Channel version tag. This was introduced in 8.3.2/8.4.
@@ -2023,6 +2055,12 @@ typedef struct Tcl_Parse {
 				 * *tokenPtr. */
     int errorType;		/* One of the parsing error types defined
 				 * above. */
+#if TCL_MAJOR_VERSION > 8
+    int incomplete;		/* This field is set to 1 by Tcl_ParseCommand
+				 * if the command appears to be incomplete.
+				 * This information is used by
+				 * Tcl_CommandComplete. */
+#endif
 
     /*
      * The fields below are intended only for the private use of the parser.
@@ -2041,10 +2079,9 @@ typedef struct Tcl_Parse {
 				 * beginning of region where the error
 				 * occurred (e.g. the open brace if the close
 				 * brace is missing). */
-    int incomplete;		/* This field is set to 1 by Tcl_ParseCommand
-				 * if the command appears to be incomplete.
-				 * This information is used by
-				 * Tcl_CommandComplete. */
+#if TCL_MAJOR_VERSION < 9
+    int incomplete;
+#endif
     Tcl_Token staticTokens[NUM_STATIC_TOKENS];
 				/* Initial space for tokens for command. This
 				 * space should be large enough to accommodate
@@ -2395,7 +2432,11 @@ typedef int (Tcl_NRPostProc) (void *data[], Tcl_Interp *interp,
  * stubs tables.
  */
 
-#define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
+#if TCL_MAJOR_VERSION > 8
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACB + (int) sizeof(void *))
+#else
+#   define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
+#endif
 
 /*
  * The following function is required to be defined in all stubs aware
@@ -2617,7 +2658,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv);
  * Deprecated Tcl functions:
  */
 
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+#ifndef TCL_NO_DEPRECATED
 /*
  * These function have been renamed. The old names are deprecated, but we
  * define these macros for backwards compatibility.
diff --git a/tools/regexpTestLib.tcl b/tools/regexpTestLib.tcl
index 454a4e8..71dc909 100644
--- a/tools/regexpTestLib.tcl
+++ b/tools/regexpTestLib.tcl
@@ -42,7 +42,7 @@ proc readInputFile {} {
 
 #
 # strings with embedded @'s are truncated
-# unpreceeded @'s are replaced by {}
+# unpreceded @'s are replaced by {}
 #
 proc removeAts {ls} {
     set len [llength $ls]
-- 
cgit v0.12


From 49cfc0317e60291c8ed8e25b07d725058ec72bb2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 18 Apr 2023 19:42:02 +0000
Subject: Adapt TIP's #494/#481/#537/#544/#568/#616/#623/#627/#630 to TIP #660
 changes

---
 generic/tcl.decls      | 26 +++++++-------
 generic/tcl.h          |  6 ++--
 generic/tclBasic.c     |  4 +--
 generic/tclBinary.c    |  6 ++--
 generic/tclDecls.h     | 98 +++++++++++++++++++++++++-------------------------
 generic/tclOO.h        |  2 +-
 generic/tclObj.c       | 16 ++++-----
 generic/tclProc.c      |  4 +--
 generic/tclStringObj.c |  2 +-
 generic/tclStubInit.c  | 16 ++++-----
 unix/dltest/pkgt.c     |  8 ++---
 win/tclAppInit.c       |  2 +-
 12 files changed, 93 insertions(+), 97 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index a89e64f..daa2f2b 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2413,19 +2413,19 @@ declare 649 {
 }
 declare 650 {
     unsigned char *Tcl_GetBytesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    size_t *numBytesPtr)
+	    ptrdiff_t *numBytesPtr)
 }
 
 # TIP #481
 declare 651 {
-    char *TclGetStringFromObj(Tcl_Obj *objPtr, size_t *lengthPtr)
+    char *TclGetStringFromObj(Tcl_Obj *objPtr, ptrdiff_t *lengthPtr)
 }
 declare 652 {
-    unsigned short *TclGetUnicodeFromObj(Tcl_Obj *objPtr, size_t *lengthPtr)
+    unsigned short *TclGetUnicodeFromObj(Tcl_Obj *objPtr, ptrdiff_t *lengthPtr)
 }
 # Only available in Tcl 8.x, NULL in Tcl 9.0
 declare 653 {
-    unsigned char *TclGetByteArrayFromObj(Tcl_Obj *objPtr, size_t *numBytesPtr)
+    unsigned char *TclGetByteArrayFromObj(Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr)
 }
 
 # TIP #575
@@ -2462,28 +2462,28 @@ declare 660 {
 # TIP #616
 declare 661 {
     int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
-	    size_t *objcPtr, Tcl_Obj ***objvPtr)
+	    ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr)
 }
 declare 662 {
     int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
-	    size_t *lengthPtr)
+	    ptrdiff_t *lengthPtr)
 }
 declare 663 {
-    int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, size_t *sizePtr)
+    int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, ptrdiff_t *sizePtr)
 }
 declare 664 {
-    int TclSplitList(Tcl_Interp *interp, const char *listStr, size_t *argcPtr,
+    int TclSplitList(Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr,
 	    const char ***argvPtr)
 }
 declare 665 {
-    void TclSplitPath(const char *path, size_t *argcPtr, const char ***argvPtr)
+    void TclSplitPath(const char *path, ptrdiff_t *argcPtr, const char ***argvPtr)
 }
 declare 666 {
-    Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr)
+    Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr)
 }
 declare 667 {
     int TclParseArgsObjv(Tcl_Interp *interp, const Tcl_ArgvInfo *argTable,
-	    size_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv)
+	    ptrdiff_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv)
 }
 
 # TIP #617
@@ -2533,7 +2533,7 @@ declare 678 {
 }
 declare 679 {
     int Tcl_NRCallObjProc2(Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2,
-	    void *clientData, size_t objc, Tcl_Obj *const objv[])
+	    void *clientData, ptrdiff_t objc, Tcl_Obj *const objv[])
 }
 
 # TIP #638.
@@ -2542,7 +2542,7 @@ declare 680 {
 	    void **clientDataPtr, int *typePtr)
 }
 declare 681 {
-    int Tcl_GetNumber(Tcl_Interp *interp, const char *bytes, size_t numBytes,
+    int Tcl_GetNumber(Tcl_Interp *interp, const char *bytes, ptrdiff_t numBytes,
 	    void **clientDataPtr, int *typePtr)
 }
 
diff --git a/generic/tcl.h b/generic/tcl.h
index 27d7995..07b0f97 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -704,7 +704,7 @@ typedef int (Tcl_CmdObjTraceProc) (void *clientData, Tcl_Interp *interp,
 	int level, const char *command, Tcl_Command commandInfo, int objc,
 	struct Tcl_Obj *const *objv);
 typedef int (Tcl_CmdObjTraceProc2) (void *clientData, Tcl_Interp *interp,
-	size_t level, const char *command, Tcl_Command commandInfo, size_t objc,
+	ptrdiff_t level, const char *command, Tcl_Command commandInfo, ptrdiff_t objc,
 	struct Tcl_Obj *const *objv);
 typedef void (Tcl_CmdObjTraceDeleteProc) (void *clientData);
 typedef void (Tcl_DupInternalRepProc) (struct Tcl_Obj *srcPtr,
@@ -731,7 +731,7 @@ typedef void (Tcl_NamespaceDeleteProc) (void *clientData);
 typedef int (Tcl_ObjCmdProc) (void *clientData, Tcl_Interp *interp,
 	int objc, struct Tcl_Obj *const *objv);
 typedef int (Tcl_ObjCmdProc2) (void *clientData, Tcl_Interp *interp,
-	size_t objc, struct Tcl_Obj *const *objv);
+	ptrdiff_t objc, struct Tcl_Obj *const *objv);
 typedef int (Tcl_LibraryInitProc) (Tcl_Interp *interp);
 typedef int (Tcl_LibraryUnloadProc) (Tcl_Interp *interp, int flags);
 typedef void (Tcl_PanicProc) (const char *format, ...);
@@ -1479,7 +1479,7 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, void *clientData);
 #if TCL_MAJOR_VERSION > 8
 #   define TCL_CLOSE2PROC		NULL
 #else
-#   define TCL_CLOSE2PROC		((void *) 1)
+#   define TCL_CLOSE2PROC		((Tcl_DriverCloseProc *)(void *)(size_t)1)
 #endif
 
 /*
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index abc5d60..4159cc4 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -9192,10 +9192,10 @@ Tcl_NRCallObjProc2(
     Tcl_Interp *interp,
     Tcl_ObjCmdProc2 *objProc,
     void *clientData,
-    size_t objc,
+    ptrdiff_t objc,
     Tcl_Obj *const objv[])
 {
-    if (objc > INT_MAX) {
+    if ((size_t)objc > INT_MAX) {
 	Tcl_WrongNumArgs(interp, 1, objv, "?args?");
 	return TCL_ERROR;
     }
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index b956bd0..710ed0b 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -457,7 +457,7 @@ unsigned char *
 Tcl_GetBytesFromObj(
     Tcl_Interp *interp,		/* For error reporting */
     Tcl_Obj *objPtr,		/* Value to extract from */
-    size_t *numBytesPtr)	/* If non-NULL, write the number of bytes
+    ptrdiff_t *numBytesPtr)	/* If non-NULL, write the number of bytes
 				 * in the array here */
 {
     ByteArray *baPtr;
@@ -539,7 +539,7 @@ Tcl_GetByteArrayFromObj(
 unsigned char *
 TclGetByteArrayFromObj(
     Tcl_Obj *objPtr,		/* The ByteArray object. */
-    size_t *numBytesPtr)	/* If non-NULL, write the number of bytes
+    ptrdiff_t *numBytesPtr)	/* If non-NULL, write the number of bytes
 				 * in the array here */
 {
     ByteArray *baPtr;
@@ -557,7 +557,7 @@ TclGetByteArrayFromObj(
 
     if (numBytesPtr != NULL) {
 	/* Make sure we return a value between 0 and UINT_MAX-1, or (size_t)-1 */
-	*numBytesPtr = ((size_t)(unsigned int)(baPtr->used + 1)) - 1;
+	*numBytesPtr = ((ptrdiff_t)(unsigned int)(baPtr->used + 1)) - 1;
     }
     return baPtr->bytes;
 }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index c5c7526..fb0931f 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1936,16 +1936,16 @@ EXTERN unsigned char *	TclGetBytesFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *numBytesPtr);
 /* 650 */
 EXTERN unsigned char *	Tcl_GetBytesFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, size_t *numBytesPtr);
+				Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr);
 /* 651 */
 EXTERN char *		TclGetStringFromObj(Tcl_Obj *objPtr,
-				size_t *lengthPtr);
+				ptrdiff_t *lengthPtr);
 /* 652 */
 EXTERN unsigned short *	 TclGetUnicodeFromObj(Tcl_Obj *objPtr,
-				size_t *lengthPtr);
+				ptrdiff_t *lengthPtr);
 /* 653 */
 EXTERN unsigned char *	TclGetByteArrayFromObj(Tcl_Obj *objPtr,
-				size_t *numBytesPtr);
+				ptrdiff_t *numBytesPtr);
 /* 654 */
 EXTERN int		Tcl_UtfCharComplete(const char *src, Tcl_Size length);
 /* 655 */
@@ -1971,26 +1971,26 @@ EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
 				int sigNumber);
 /* 661 */
 EXTERN int		TclListObjGetElements(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, size_t *objcPtr,
+				Tcl_Obj *listPtr, ptrdiff_t *objcPtr,
 				Tcl_Obj ***objvPtr);
 /* 662 */
 EXTERN int		TclListObjLength(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, size_t *lengthPtr);
+				Tcl_Obj *listPtr, ptrdiff_t *lengthPtr);
 /* 663 */
 EXTERN int		TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-				size_t *sizePtr);
+				ptrdiff_t *sizePtr);
 /* 664 */
 EXTERN int		TclSplitList(Tcl_Interp *interp, const char *listStr,
-				size_t *argcPtr, const char ***argvPtr);
+				ptrdiff_t *argcPtr, const char ***argvPtr);
 /* 665 */
-EXTERN void		TclSplitPath(const char *path, size_t *argcPtr,
+EXTERN void		TclSplitPath(const char *path, ptrdiff_t *argcPtr,
 				const char ***argvPtr);
 /* 666 */
-EXTERN Tcl_Obj *	TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr);
+EXTERN Tcl_Obj *	TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr);
 /* 667 */
 EXTERN int		TclParseArgsObjv(Tcl_Interp *interp,
 				const Tcl_ArgvInfo *argTable,
-				size_t *objcPtr, Tcl_Obj *const *objv,
+				ptrdiff_t *objcPtr, Tcl_Obj *const *objv,
 				Tcl_Obj ***remObjv);
 /* 668 */
 EXTERN Tcl_Size		Tcl_UniCharLen(const int *uniStr);
@@ -2030,14 +2030,14 @@ EXTERN Tcl_Command	Tcl_NRCreateCommand2(Tcl_Interp *interp,
 /* 679 */
 EXTERN int		Tcl_NRCallObjProc2(Tcl_Interp *interp,
 				Tcl_ObjCmdProc2 *objProc2, void *clientData,
-				size_t objc, Tcl_Obj *const objv[]);
+				ptrdiff_t objc, Tcl_Obj *const objv[]);
 /* 680 */
 EXTERN int		Tcl_GetNumberFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, void **clientDataPtr,
 				int *typePtr);
 /* 681 */
 EXTERN int		Tcl_GetNumber(Tcl_Interp *interp, const char *bytes,
-				size_t numBytes, void **clientDataPtr,
+				ptrdiff_t numBytes, void **clientDataPtr,
 				int *typePtr);
 /* 682 */
 EXTERN int		Tcl_RemoveChannelMode(Tcl_Interp *interp,
@@ -2738,10 +2738,10 @@ typedef struct TclStubs {
     char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
     int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
     unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
-    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, size_t *numBytesPtr); /* 650 */
-    char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */
-    unsigned short * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */
-    unsigned char * (*tclGetByteArrayFromObj) (Tcl_Obj *objPtr, size_t *numBytesPtr); /* 653 */
+    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr); /* 650 */
+    char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, ptrdiff_t *lengthPtr); /* 651 */
+    unsigned short * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, ptrdiff_t *lengthPtr); /* 652 */
+    unsigned char * (*tclGetByteArrayFromObj) (Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr); /* 653 */
     int (*tcl_UtfCharComplete) (const char *src, Tcl_Size length); /* 654 */
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
@@ -2749,13 +2749,13 @@ typedef struct TclStubs {
     int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
     int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
-    int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
-    int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, size_t *lengthPtr); /* 662 */
-    int (*tclDictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, size_t *sizePtr); /* 663 */
-    int (*tclSplitList) (Tcl_Interp *interp, const char *listStr, size_t *argcPtr, const char ***argvPtr); /* 664 */
-    void (*tclSplitPath) (const char *path, size_t *argcPtr, const char ***argvPtr); /* 665 */
-    Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, size_t *lenPtr); /* 666 */
-    int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, size_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
+    int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
+    int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, ptrdiff_t *lengthPtr); /* 662 */
+    int (*tclDictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, ptrdiff_t *sizePtr); /* 663 */
+    int (*tclSplitList) (Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr, const char ***argvPtr); /* 664 */
+    void (*tclSplitPath) (const char *path, ptrdiff_t *argcPtr, const char ***argvPtr); /* 665 */
+    Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, ptrdiff_t *lenPtr); /* 666 */
+    int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, ptrdiff_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
     Tcl_Size (*tcl_UniCharLen) (const int *uniStr); /* 668 */
     Tcl_Size (*tclNumUtfChars) (const char *src, Tcl_Size length); /* 669 */
     Tcl_Size (*tclGetCharLength) (Tcl_Obj *objPtr); /* 670 */
@@ -2767,9 +2767,9 @@ typedef struct TclStubs {
     Tcl_Command (*tcl_CreateObjCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 676 */
     Tcl_Trace (*tcl_CreateObjTrace2) (Tcl_Interp *interp, Tcl_Size level, int flags, Tcl_CmdObjTraceProc2 *objProc2, void *clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 677 */
     Tcl_Command (*tcl_NRCreateCommand2) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc2 *proc, Tcl_ObjCmdProc2 *nreProc2, void *clientData, Tcl_CmdDeleteProc *deleteProc); /* 678 */
-    int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, size_t objc, Tcl_Obj *const objv[]); /* 679 */
+    int (*tcl_NRCallObjProc2) (Tcl_Interp *interp, Tcl_ObjCmdProc2 *objProc2, void *clientData, ptrdiff_t objc, Tcl_Obj *const objv[]); /* 679 */
     int (*tcl_GetNumberFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void **clientDataPtr, int *typePtr); /* 680 */
-    int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, size_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
+    int (*tcl_GetNumber) (Tcl_Interp *interp, const char *bytes, ptrdiff_t numBytes, void **clientDataPtr, int *typePtr); /* 681 */
     int (*tcl_RemoveChannelMode) (Tcl_Interp *interp, Tcl_Channel chan, int mode); /* 682 */
     Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
     int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
@@ -4214,7 +4214,7 @@ extern const TclStubs *tclStubsPtr;
 #	define Tcl_SetPanicProc(arg) ((void)((Tcl_SetPanicProc)(arg)))
 #   endif
 #   define Tcl_MainEx Tcl_MainExW
-    EXTERN void Tcl_MainExW(int argc, wchar_t **argv,
+    EXTERN void Tcl_MainExW(Tcl_Size argc, wchar_t **argv,
 	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 #elif !defined(TCL_NO_DEPRECATED)
 #   define Tcl_FindExecutable(arg) ((void)((Tcl_FindExecutable)(arg)))
@@ -4394,7 +4394,7 @@ extern const TclStubs *tclStubsPtr;
 #endif
 #if defined(USE_TCL_STUBS)
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
@@ -4405,15 +4405,15 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetByteArrayFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetByteArrayFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #endif
 #else
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
@@ -4424,11 +4424,11 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetByteArrayFromObj)(objPtr, (int *)(sizePtr)) : TclGetByteArrayFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetByteArrayFromObj)(objPtr, (int *)(sizePtr)) : TclGetByteArrayFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetUnicodeFromObj)(objPtr, (int *)(sizePtr)) : TclGetUnicodeFromObj(objPtr, (size_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetUnicodeFromObj)(objPtr, (int *)(sizePtr)) : TclGetUnicodeFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
 #endif
 #endif
 
@@ -4485,31 +4485,31 @@ extern const TclStubs *tclStubsPtr;
 #   undef Tcl_ListObjGetElements
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
-		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)))
+		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (ptrdiff_t *)(void *)(objcPtr), (objvPtr)))
 #   undef Tcl_ListObjLength
 #   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)) \
-		: tclStubsPtr->tclListObjLength((interp), (listPtr), (size_t *)(void *)(lengthPtr)))
+		: tclStubsPtr->tclListObjLength((interp), (listPtr), (ptrdiff_t *)(void *)(lengthPtr)))
 #   undef Tcl_DictObjSize
 #   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)) \
-		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (size_t *)(void *)(sizePtr)))
+		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (ptrdiff_t *)(void *)(sizePtr)))
 #   undef Tcl_SplitList
 #   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitList((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitList((interp), (listStr), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_SplitPath
 #   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitPath((path), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitPath((path), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitPath((path), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   undef Tcl_FSSplitPath
 #   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_FSSplitPath((pathPtr), (int *)(void *)(lenPtr)) \
-		: tclStubsPtr->tclFSSplitPath((pathPtr), (size_t *)(void *)(lenPtr)))
+		: tclStubsPtr->tclFSSplitPath((pathPtr), (ptrdiff_t *)(void *)(lenPtr)))
 #   undef Tcl_ParseArgsObjv
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
-		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
+		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (ptrdiff_t *)(void *)(objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
 #else
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
@@ -4527,25 +4527,25 @@ extern const TclStubs *tclStubsPtr;
 #ifdef TCL_NO_DEPRECATED
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? (Tcl_ListObjGetElements)((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
-		: TclListObjGetElements((interp), (listPtr), (size_t *)(void *)(objcPtr), (objvPtr)))
+		: TclListObjGetElements((interp), (listPtr), (ptrdiff_t *)(void *)(objcPtr), (objvPtr)))
 #   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
 		? (Tcl_ListObjLength)((interp), (listPtr), (int *)(void *)(lengthPtr)) \
-		: TclListObjLength((interp), (listPtr), (size_t *)(void *)(lengthPtr)))
+		: TclListObjLength((interp), (listPtr), (ptrdiff_t *)(void *)(lengthPtr)))
 #   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
 		? (Tcl_DictObjSize)((interp), (dictPtr), (int *)(void *)(sizePtr)) \
-		: TclDictObjSize((interp), (dictPtr), (size_t *)(void *)(sizePtr)))
+		: TclDictObjSize((interp), (dictPtr), (ptrdiff_t *)(void *)(sizePtr)))
 #   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? (Tcl_SplitList)((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitList((interp), (listStr), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: TclSplitList((interp), (listStr), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? (Tcl_SplitPath)((path), (int *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitPath((path), (size_t *)(void *)(argcPtr), (argvPtr)))
+		: TclSplitPath((path), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
 #   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
 		? (Tcl_FSSplitPath)((pathPtr), (int *)(void *)(lenPtr)) \
-		: TclFSSplitPath((pathPtr), (size_t *)(void *)(lenPtr)))
+		: TclFSSplitPath((pathPtr), (ptrdiff_t *)(void *)(lenPtr)))
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? (Tcl_ParseArgsObjv)((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
-		: TclParseArgsObjv((interp), (argTable), (size_t *)(void *)(objcPtr), (objv), (remObjv)))
+		: TclParseArgsObjv((interp), (argTable), (ptrdiff_t *)(void *)(objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
 #endif
 
diff --git a/generic/tclOO.h b/generic/tclOO.h
index 6f18491..775bd32 100644
--- a/generic/tclOO.h
+++ b/generic/tclOO.h
@@ -63,7 +63,7 @@ typedef struct Tcl_ObjectContext_ *Tcl_ObjectContext;
 typedef int (Tcl_MethodCallProc)(void *clientData, Tcl_Interp *interp,
 	Tcl_ObjectContext objectContext, int objc, Tcl_Obj *const *objv);
 typedef int (Tcl_MethodCallProc2)(void *clientData, Tcl_Interp *interp,
-	Tcl_ObjectContext objectContext, size_t objc, Tcl_Obj *const *objv);
+	Tcl_ObjectContext objectContext, ptrdiff_t objc, Tcl_Obj *const *objv);
 typedef void (Tcl_MethodDeleteProc)(void *clientData);
 typedef int (Tcl_CloneProc)(Tcl_Interp *interp, void *oldClientData,
 	void **newClientData);
diff --git a/generic/tclObj.c b/generic/tclObj.c
index fae401d..e60042c 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1721,7 +1721,7 @@ char *
 TclGetStringFromObj(
     Tcl_Obj *objPtr,	/* Object whose string rep byte pointer should
 				 * be returned. */
-    size_t *lengthPtr)	/* If non-NULL, the location where the string
+    ptrdiff_t *lengthPtr)	/* If non-NULL, the location where the string
 				 * rep's byte array length should * be stored.
 				 * If NULL, no length is stored. */
 {
@@ -1751,11 +1751,7 @@ TclGetStringFromObj(
 	}
     }
     if (lengthPtr != NULL) {
-#if TCL_MAJOR_VERSION > 8
-	*lengthPtr = objPtr->length;
-#else
-	*lengthPtr = ((size_t)(unsigned)(objPtr->length + 1)) - 1;
-#endif
+	*lengthPtr = ((ptrdiff_t)(unsigned)(objPtr->length + 1)) - 1;
     }
     return objPtr->bytes;
 }
@@ -4041,7 +4037,7 @@ int
 Tcl_GetNumber(
     Tcl_Interp *interp,
     const char *bytes,
-    size_t numBytes,
+    ptrdiff_t numBytes,
     void **clientDataPtr,
     int *typePtr)
 {
@@ -4055,10 +4051,10 @@ Tcl_GetNumber(
 	bytes = &tclEmptyString;
 	numBytes = 0;
     }
-    if (numBytes == (size_t)TCL_INDEX_NONE) {
-	numBytes = strlen(bytes);
+    if (numBytes < 0) {
+	numBytes = (ptrdiff_t)strlen(bytes);
     }
-    if (numBytes > INT_MAX) {
+    if ((size_t)numBytes > INT_MAX) {
 	if (interp) {
             Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                     "max size for a Tcl value (%d bytes) exceeded", INT_MAX));
diff --git a/generic/tclProc.c b/generic/tclProc.c
index d02cac2..3abf3c3 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1690,7 +1690,7 @@ NRInterpProc2(
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
-    size_t objc,			/* Count of number of arguments to this
+    ptrdiff_t objc,			/* Count of number of arguments to this
 				 * procedure. */
     Tcl_Obj *const objv[])	/* Argument value objects. */
 {
@@ -1709,7 +1709,7 @@ ObjInterpProc2(
 				 * interpreted. */
     Tcl_Interp *interp,/* Interpreter in which procedure was
 				 * invoked. */
-    size_t objc,			/* Count of number of arguments to this
+    ptrdiff_t objc,			/* Count of number of arguments to this
 				 * procedure. */
     Tcl_Obj *const objv[])	/* Argument value objects. */
 {
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 340ef50..a6ed49f 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -987,7 +987,7 @@ unsigned short *
 TclGetUnicodeFromObj(
     Tcl_Obj *objPtr,		/* The object to find the unicode string
 				 * for. */
-    size_t *lengthPtr)		/* If non-NULL, the location where the string
+    ptrdiff_t *lengthPtr)	/* If non-NULL, the location where the string
 				 * rep's unichar length should be stored. If
 				 * NULL, no length is stored. */
 {
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index bab1935..e09d74d 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -97,7 +97,7 @@ static void uniCodePanic(void) {
 }
 #   define Tcl_GetUnicode (unsigned short *(*)(Tcl_Obj *))(void *)uniCodePanic
 #   define Tcl_GetUnicodeFromObj (unsigned short *(*)(Tcl_Obj *, int *))(void *)uniCodePanic
-#   define TclGetUnicodeFromObj (unsigned short *(*)(Tcl_Obj *, size_t *))(void *)uniCodePanic
+#   define TclGetUnicodeFromObj (unsigned short *(*)(Tcl_Obj *, ptrdiff_t *))(void *)uniCodePanic
 #   define Tcl_NewUnicodeObj (Tcl_Obj *(*)(const unsigned short *, int))(void *)uniCodePanic
 #   define Tcl_SetUnicodeObj (void(*)(Tcl_Obj *, const unsigned short *, int))(void *)uniCodePanic
 #   define Tcl_AppendUnicodeToObj (void(*)(Tcl_Obj *, const unsigned short *, int))(void *)uniCodePanic
@@ -138,7 +138,7 @@ static const char *TclUtfPrev(const char *src, const char *start) {
 }
 
 int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
-    size_t *objcPtr, Tcl_Obj ***objvPtr) {
+    ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr) {
     int n, result = Tcl_ListObjGetElements(interp, listPtr, &n, objvPtr);
     if ((result == TCL_OK) && objcPtr) {
 	*objcPtr = n;
@@ -146,7 +146,7 @@ int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
     return result;
 }
 int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
-    size_t *lengthPtr) {
+    ptrdiff_t *lengthPtr) {
     int n;
     int result = Tcl_ListObjLength(interp, listPtr, &n);
     if ((result == TCL_OK) && lengthPtr) {
@@ -155,14 +155,14 @@ int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
     return result;
 }
 int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-	size_t *sizePtr) {
+	ptrdiff_t *sizePtr) {
     int n, result = Tcl_DictObjSize(interp, dictPtr, &n);
     if ((result == TCL_OK) && sizePtr) {
 	*sizePtr = n;
     }
     return result;
 }
-int TclSplitList(Tcl_Interp *interp, const char *listStr, size_t *argcPtr,
+int TclSplitList(Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr,
 	const char ***argvPtr) {
     int n;
     int result = Tcl_SplitList(interp, listStr, &n, argvPtr);
@@ -171,14 +171,14 @@ int TclSplitList(Tcl_Interp *interp, const char *listStr, size_t *argcPtr,
     }
     return result;
 }
-void TclSplitPath(const char *path, size_t *argcPtr, const char ***argvPtr) {
+void TclSplitPath(const char *path, ptrdiff_t *argcPtr, const char ***argvPtr) {
     int n;
     Tcl_SplitPath(path, &n, argvPtr);
     if (argcPtr) {
 	*argcPtr = n;
     }
 }
-Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr) {
+Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr) {
     int n;
     Tcl_Obj *result = Tcl_FSSplitPath(pathPtr, &n);
     if (result && lenPtr) {
@@ -187,7 +187,7 @@ Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, size_t *lenPtr) {
     return result;
 }
 int TclParseArgsObjv(Tcl_Interp *interp,
-	const Tcl_ArgvInfo *argTable, size_t *objcPtr, Tcl_Obj *const *objv,
+	const Tcl_ArgvInfo *argTable, ptrdiff_t *objcPtr, Tcl_Obj *const *objv,
 	Tcl_Obj ***remObjv) {
     int n, result;
     if (*objcPtr > INT_MAX) {
diff --git a/unix/dltest/pkgt.c b/unix/dltest/pkgt.c
index e8047db..6264aec 100644
--- a/unix/dltest/pkgt.c
+++ b/unix/dltest/pkgt.c
@@ -16,10 +16,10 @@
 static int TraceProc2 (
     void *clientData,
     Tcl_Interp *interp,
-    size_t level,
+    ptrdiff_t level,
     const char *command,
     Tcl_Command commandInfo,
-    size_t objc,
+    ptrdiff_t objc,
     struct Tcl_Obj *const *objv)
 {
     (void)clientData;
@@ -55,12 +55,12 @@ static int
 Pkgt_EqObjCmd2(
     void *dummy,		/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
-    size_t objc,			/* Number of arguments. */
+    ptrdiff_t objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_WideInt result;
     const char *str1, *str2;
-    size_t len1, len2;
+    ptrdiff_t len1, len2;
     (void)dummy;
 
     if (objc != 3) {
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 27eb164..a3914f1 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -141,7 +141,7 @@ _tmain(
     TclZipfs_AppHook(&argc, &argv);
 #endif
 
-    Tcl_Main((size_t)argc, argv, TCL_LOCAL_APPINIT);
+    Tcl_Main(argc, argv, TCL_LOCAL_APPINIT);
     return 0;			/* Needed only to prevent compiler warning. */
 }
 
-- 
cgit v0.12


From aab1aa08f01ce2022df607d2ed1265021a0e1c81 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 19 Apr 2023 04:00:00 +0000
Subject: Fix missing stddef.h include

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

diff --git a/generic/tcl.h b/generic/tcl.h
index 07b0f97..045d822 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -123,6 +123,7 @@ extern "C" {
  */
 
 #include <stdio.h>
+#include <stddef.h>
 
 /*
  *----------------------------------------------------------------------------
-- 
cgit v0.12


From b98b8f9181336b09931ec33f4f5e6451913de654 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 19 Apr 2023 04:20:19 +0000
Subject: Fix dltest on Unix

---
 unix/dltest/pkgt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/dltest/pkgt.c b/unix/dltest/pkgt.c
index 6264aec..0c4b3d7 100644
--- a/unix/dltest/pkgt.c
+++ b/unix/dltest/pkgt.c
@@ -71,7 +71,7 @@ Pkgt_EqObjCmd2(
     str1 = Tcl_GetStringFromObj(objv[1], &len1);
     str2 = Tcl_GetStringFromObj(objv[2], &len2);
     if (len1 == len2) {
-	result = (Tcl_UtfNcmp(str1, str2, len1) == 0);
+	result = (Tcl_UtfNcmp(str1, str2, (size_t)len1) == 0);
     } else {
 	result = 0;
     }
-- 
cgit v0.12


From 4c6600039e95879fea2b3e5715592473edbd05e8 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 19 Apr 2023 05:49:37 +0000
Subject: Fix a few function signatures in manpages for TIP 660.

---
 doc/ByteArrObj.3 | 6 +++---
 doc/CrtObjCmd.3  | 2 +-
 doc/CrtTrace.3   | 4 ++--
 doc/Number.3     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/ByteArrObj.3 b/doc/ByteArrObj.3
index fd7f245..639018c 100644
--- a/doc/ByteArrObj.3
+++ b/doc/ByteArrObj.3
@@ -43,7 +43,7 @@ overwritten by a byte-array value.  For \fBTcl_GetBytesFromObj\fR,
 to the value from which to extract an array of bytes.
 .AP Tcl_Interp *interp in
 Interpreter to use for error reporting.
-.AP "size_t | int" *numBytesPtr out
+.AP "ptrdiff_t | int" *numBytesPtr out
 Points to space where the number of bytes in the array may be written.
 Caller may pass NULL when it does not need this information.
 .BE
@@ -154,10 +154,10 @@ and any string representation is invalidated.
 On success, both \fBTcl_GetBytesFromObj\fR and \fBTcl_GetByteArrayFromObj\fR
 write the number of bytes in the byte-array value of \fIobjPtr\fR
 to the space pointed to by \fInumBytesPtr\fR.  This space may be of type
-\fBsize_t\fR or of type \fBint\fR.  In Tcl 8, the largest number of
+\fBptrdiff_t\fR or of type \fBint\fR.  In Tcl 8, the largest number of
 bytes possible is \fBINT_MAX\fR, so either type can receive the value.
 In codebases meant to migrate to Tcl 9, the option to write to a space
-of type \fBsize_t\fR may aid in the migration.
+of type \fBptrdiff_t\fR may aid in the migration.
 .PP
 \fBTcl_SetByteArrayLength\fR enables a caller to change the size of a
 byte-array in the internal representation of an unshared \fIobjPtr\fR to
diff --git a/doc/CrtObjCmd.3 b/doc/CrtObjCmd.3
index 0490bd7..1481e81 100644
--- a/doc/CrtObjCmd.3
+++ b/doc/CrtObjCmd.3
@@ -187,7 +187,7 @@ except its \fIproc2\fR argument is of type \fBTcl_ObjCmdProc2\fR.
 typedef int \fBTcl_ObjCmdProc2\fR(
         ClientData \fIclientData\fR,
         Tcl_Interp *\fIinterp\fR,
-        size_t \fIobjc\fR,
+        ptrdiff_t \fIobjc\fR,
         Tcl_Obj *const \fIobjv\fR[]);
 .CE
 .PP
diff --git a/doc/CrtTrace.3 b/doc/CrtTrace.3
index 723a392..ba5a991 100644
--- a/doc/CrtTrace.3
+++ b/doc/CrtTrace.3
@@ -88,10 +88,10 @@ typedef int \fBTcl_CmdObjTraceProc\fR(
 typedef int \fBTcl_CmdObjTraceProc2\fR(
         \fBvoid *\fR \fIclientData\fR,
         \fBTcl_Interp\fR* \fIinterp\fR,
-        size_t \fIlevel\fR,
+        ptrdiff_t \fIlevel\fR,
         const char *\fIcommand\fR,
         \fBTcl_Command\fR \fIcommandToken\fR,
-        size_t \fIobjc\fR,
+        ptrdiff_t \fIobjc\fR,
         \fBTcl_Obj\fR *const \fIobjv\fR[]);
 .CE
 .PP
diff --git a/doc/Number.3 b/doc/Number.3
index f405060..d0dbb2f 100644
--- a/doc/Number.3
+++ b/doc/Number.3
@@ -27,7 +27,7 @@ When non-NULL, error information is recorded here when the value is not
 in any of the numeric formats recognized by Tcl.
 .AP "const char" *bytes in
 Points to first byte of the string value to be examined.
-.AP size_t numBytes in
+.AP ptrdiff_t numBytes in
 The number of bytes, starting at \fIbytes\fR, that should be examined.
 If the value \fBTCL_INDEX_NONE\fR is provided, then all bytes should
 be examined until the first \fBNUL\fR byte terminates examination.
-- 
cgit v0.12


From 1fe7d754ed84d81bf0fb2928b1bccfc96348bd12 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 21 Apr 2023 20:18:54 +0000
Subject: Reduce diff between 8.7 and 9.0. Add some testcases

---
 generic/tclCmdIL.c     |  87 ++++++++-------
 generic/tclStringObj.c | 295 +++++++++++++++++++++++++------------------------
 tests/cmdIL.test       |   5 +-
 tests/lsearch.test     |   5 +-
 4 files changed, 206 insertions(+), 186 deletions(-)

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index b1ee1f4..f6d3df3 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -39,7 +39,7 @@ typedef struct SortElement {
     } collationKey;
     union {			/* Object being sorted, or its index. */
 	Tcl_Obj *objPtr;
-	int index;
+	Tcl_Size index;
     } payload;
     struct SortElement *nextPtr;/* Next element in the list, or NULL for end
 				 * of list. */
@@ -51,7 +51,6 @@ typedef struct SortElement {
  */
 
 typedef int (*SortStrCmpFn_t) (const char *, const char *);
-typedef int (*SortMemCmpFn_t) (const void *, const void *, size_t);
 
 /*
  * The "lsort" command needs to pass certain information down to the function
@@ -74,7 +73,7 @@ typedef struct {
 				 * NULL if no indexes supplied, and points to
 				 * singleIndex field when only one
 				 * supplied. */
-    int indexc;			/* Number of indexes in indexv array. */
+    Tcl_Size indexc;		/* Number of indexes in indexv array. */
     int singleIndex;		/* Static space for common index case. */
     int unique;
     int numElements;
@@ -541,7 +540,7 @@ InfoBodyCmd(
     Interp *iPtr = (Interp *) interp;
     const char *name, *bytes;
     Proc *procPtr;
-    int numBytes;
+    Tcl_Size numBytes;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "procname");
@@ -651,7 +650,7 @@ InfoCommandsCmd(
     Tcl_Obj *listPtr, *elemObjPtr;
     int specificNsInPattern = 0;/* Init. to avoid compiler warning. */
     Tcl_Command cmd;
-    int i;
+    Tcl_Size i;
 
     /*
      * Get the pattern and find the "effective namespace" in which to list
@@ -1397,7 +1396,7 @@ TclInfoFrame(
 	    ADD_PAIR("proc", procNameObj);
 	} else if (procPtr->cmdPtr->clientData) {
 	    ExtraFrameInfo *efiPtr = (ExtraFrameInfo *)procPtr->cmdPtr->clientData;
-	    int i;
+	    Tcl_Size i;
 
 	    /*
 	     * This is a non-standard command. Luckily, it's told us how to
@@ -2202,7 +2201,8 @@ Tcl_JoinObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
-    int length, listLen, isArithSeries = 0;
+    Tcl_Size length, listLen;
+    int isArithSeries = 0;
     Tcl_Obj *resObjPtr = NULL, *joinObjPtr, **elemPtrs;
 
     if ((objc < 2) || (objc > 3)) {
@@ -2250,7 +2250,7 @@ Tcl_JoinObjCmd(
     if (length == 0) {
 	resObjPtr = TclStringCat(interp, listLen, elemPtrs, 0);
     } else {
-	int i;
+	Tcl_Size i;
 
 	TclNewObj(resObjPtr);
 	if (isArithSeries) {
@@ -2325,7 +2325,7 @@ Tcl_LassignObjCmd(
 {
     Tcl_Obj *listCopyPtr;
     Tcl_Obj **listObjv;		/* The contents of the list. */
-    int listObjc;		/* The length of the list. */
+    Tcl_Size listObjc;		/* The length of the list. */
     int code = TCL_OK;
 
     if (objc < 2) {
@@ -2456,7 +2456,8 @@ Tcl_LinsertObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Obj *listPtr;
-    int index, len, result;
+    Tcl_Size len, index;
+    int result;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "list index ?element ...?");
@@ -2574,7 +2575,8 @@ Tcl_LlengthObjCmd(
     Tcl_Obj *const objv[])
 				/* Argument objects. */
 {
-    int listLen, result;
+    Tcl_Size listLen;
+    int result;
     Tcl_Obj *objPtr;
 
     if (objc != 2) {
@@ -2622,7 +2624,8 @@ Tcl_LpopObjCmd(
     Tcl_Obj *const objv[])
 				/* Argument objects. */
 {
-    int listLen, result;
+    Tcl_Size listLen;
+    int result;
     Tcl_Obj *elemPtr, *stored;
     Tcl_Obj *listPtr, **elemPtrs;
 
@@ -2723,7 +2726,8 @@ Tcl_LrangeObjCmd(
     Tcl_Obj *const objv[])
 				/* Argument objects. */
 {
-    int listLen, first, last, result;
+    int result;
+    Tcl_Size listLen, first, last;
     if (objc != 4) {
 	Tcl_WrongNumArgs(interp, 1, objv, "list first last");
 	return TCL_ERROR;
@@ -2782,8 +2786,8 @@ LremoveIndexCompare(
     const void *el1Ptr,
     const void *el2Ptr)
 {
-    int idx1 = *((const int *) el1Ptr);
-    int idx2 = *((const int *) el2Ptr);
+    Tcl_Size idx1 = *((const Tcl_Size *) el1Ptr);
+    Tcl_Size idx2 = *((const Tcl_Size *) el2Ptr);
 
     /*
      * This will put the larger element first.
@@ -2799,8 +2803,8 @@ Tcl_LremoveObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i, idxc, listLen, prevIdx, first, num;
-    int *idxv;
+    Tcl_Size i, idxc, prevIdx, first, num;
+    Tcl_Size *idxv, listLen;
     Tcl_Obj *listObj;
 
     /*
@@ -2822,7 +2826,7 @@ Tcl_LremoveObjCmd(
 	Tcl_SetObjResult(interp, listObj);
 	return TCL_OK;
     }
-    idxv = (int *)ckalloc((objc - 2) * sizeof(int));
+    idxv = (Tcl_Size *)Tcl_Alloc((objc - 2) * sizeof(*idxv));
     for (i = 2; i < objc; i++) {
 	if (TclGetIntForIndexM(interp, objv[i], /*endValue*/ listLen - 1,
 		&idxv[i - 2]) != TCL_OK) {
@@ -2837,7 +2841,7 @@ Tcl_LremoveObjCmd(
      */
 
     if (idxc > 1) {
-	qsort(idxv, idxc, sizeof(int), LremoveIndexCompare);
+	qsort(idxv, idxc, sizeof(*idxv), LremoveIndexCompare);
     }
 
     /*
@@ -2850,7 +2854,7 @@ Tcl_LremoveObjCmd(
     num = 0;
     first = listLen;
     for (i = 0, prevIdx = -1 ; i < idxc ; i++) {
-	int idx = idxv[i];
+	Tcl_Size idx = idxv[i];
 
 	/*
 	 * Repeated index and sanity check.
@@ -2919,7 +2923,8 @@ Tcl_LrepeatObjCmd(
     Tcl_Obj *const objv[])
 				/* The argument objects. */
 {
-    int elementCount, i, totalElems;
+    Tcl_WideInt elementCount, i;
+    Tcl_Size totalElems;
     Tcl_Obj *listPtr, **dataArray = NULL;
 
     /*
@@ -2931,12 +2936,12 @@ Tcl_LrepeatObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "count ?value ...?");
 	return TCL_ERROR;
     }
-    if (TCL_OK != TclGetIntFromObj(interp, objv[1], &elementCount)) {
+    if (TCL_OK != TclGetWideIntFromObj(interp, objv[1], &elementCount)) {
 	return TCL_ERROR;
     }
     if (elementCount < 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"bad count \"%d\": must be integer >= 0", elementCount));
+		"bad count \"%" TCL_LL_MODIFIER "d\": must be integer >= 0", elementCount));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LREPEAT", "NEGARG",
 		NULL);
 	return TCL_ERROR;
@@ -2993,7 +2998,7 @@ Tcl_LrepeatObjCmd(
 	    dataArray[i] = tmpPtr;
 	}
     } else {
-	int j, k = 0;
+	Tcl_Size j, k = 0;
 
 	for (i=0 ; i<elementCount ; i++) {
 	    for (j=0 ; j<objc ; j++) {
@@ -3033,8 +3038,8 @@ Tcl_LreplaceObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Obj *listPtr;
-    int first, last;
-    int listLen, numToDelete, result;
+    Tcl_Size numToDelete, listLen, first, last;
+    int result;
 
     if (objc < 4) {
 	Tcl_WrongNumArgs(interp, 1, objv,
@@ -3134,7 +3139,7 @@ Tcl_LreverseObjCmd(
     Tcl_Obj *const objv[])	/* Argument values. */
 {
     Tcl_Obj **elemv;
-    int elemc, i, j;
+    Tcl_Size elemc, i, j;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "list");
@@ -3239,11 +3244,12 @@ Tcl_LsearchObjCmd(
     Tcl_Obj *const objv[])	/* Argument values. */
 {
     const char *bytes, *patternBytes;
-    int i, match, index, result=TCL_OK, listc, bisect;
-    int length, elemLen, start, groupSize, groupOffset, lower, upper;
+    int match, result=TCL_OK, bisect;
+    Tcl_Size i, length, listc, elemLen, start, index;
+    Tcl_Size groupSize, groupOffset, lower, upper;
     int allocatedIndexVector = 0;
     int dataType, isIncreasing;
-    Tcl_WideInt patWide, objWide;
+    Tcl_WideInt patWide, objWide, wide;
     int allMatches, inlineReturn, negatedMatch, returnSubindices, noCase;
     double patDouble, objDouble;
     SortInfo sortInfo;
@@ -3399,23 +3405,24 @@ Tcl_LsearchObjCmd(
 		result = TCL_ERROR;
 		goto done;
 	    }
-	    if (Tcl_GetIntFromObj(interp, objv[i+1], &groupSize) != TCL_OK) {
+	    if (Tcl_GetWideIntFromObj(interp, objv[i+1], &wide) != TCL_OK) {
 		result = TCL_ERROR;
 		goto done;
 	    }
-	    if (groupSize < 1) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"stride length must be at least 1", -1));
+	    if ((wide < 1) || (wide > LIST_MAX)) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"stride length must be between 1 and %d", LIST_MAX));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSEARCH",
 			"BADSTRIDE", NULL);
 		result = TCL_ERROR;
 		goto done;
 	    }
+	    groupSize = wide;
 	    i++;
 	    break;
 	case LSEARCH_INDEX: {		/* -index */
 	    Tcl_Obj **indices;
-	    int j;
+	    Tcl_Size j;
 
 	    if (allocatedIndexVector) {
 		TclStackFree(interp, sortInfo.indexv);
@@ -4485,6 +4492,7 @@ Tcl_LsortObjCmd(
     int group, groupSize, groupOffset, idx, allocatedIndexVector = 0;
     Tcl_Obj *resultPtr, *cmdPtr, **listObjPtrs, *listObj, *indexPtr;
     size_t elmArrSize;
+    Tcl_WideInt wide;
     SortElement *elementArray = NULL, *elementPtr;
     SortInfo sortInfo;		/* Information about this sort that needs to
 				 * be passed to the comparison function. */
@@ -4634,18 +4642,19 @@ Tcl_LsortObjCmd(
 		sortInfo.resultCode = TCL_ERROR;
 		goto done;
 	    }
-	    if (Tcl_GetIntFromObj(interp, objv[i+1], &groupSize) != TCL_OK) {
+	    if (Tcl_GetWideIntFromObj(interp, objv[i+1], &wide) != TCL_OK) {
 		sortInfo.resultCode = TCL_ERROR;
 		goto done;
 	    }
-	    if (groupSize < 2) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"stride length must be at least 2", -1));
+	    if ((wide < 2) || (wide > LIST_MAX)) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"stride length must be between 2 and %d", LIST_MAX));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "LSORT",
 			"BADSTRIDE", NULL);
 		sortInfo.resultCode = TCL_ERROR;
 		goto done;
 	    }
+	    groupSize = wide;
 	    group = 1;
 	    i++;
 	    break;
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index a6ed49f..010d822 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -46,28 +46,28 @@
 static void		AppendPrintfToObjVA(Tcl_Obj *objPtr,
 			    const char *format, va_list argList);
 static void		AppendUnicodeToUnicodeRep(Tcl_Obj *objPtr,
-			    const Tcl_UniChar *unicode, int appendNumChars);
+			    const Tcl_UniChar *unicode, Tcl_Size appendNumChars);
 static void		AppendUnicodeToUtfRep(Tcl_Obj *objPtr,
-			    const Tcl_UniChar *unicode, int numChars);
+			    const Tcl_UniChar *unicode, Tcl_Size numChars);
 static void		AppendUtfToUnicodeRep(Tcl_Obj *objPtr,
-			    const char *bytes, int numBytes);
+			    const char *bytes, Tcl_Size numBytes);
 static void		AppendUtfToUtfRep(Tcl_Obj *objPtr,
-			    const char *bytes, int numBytes);
+			    const char *bytes, Tcl_Size numBytes);
 static void		DupStringInternalRep(Tcl_Obj *objPtr,
 			    Tcl_Obj *copyPtr);
-static int		ExtendStringRepWithUnicode(Tcl_Obj *objPtr,
-			    const Tcl_UniChar *unicode, int numChars);
+static Tcl_Size		ExtendStringRepWithUnicode(Tcl_Obj *objPtr,
+			    const Tcl_UniChar *unicode, Tcl_Size numChars);
 static void		ExtendUnicodeRepWithString(Tcl_Obj *objPtr,
-			    const char *bytes, int numBytes,
-			    int numAppendChars);
+			    const char *bytes, Tcl_Size numBytes,
+			    Tcl_Size numAppendChars);
 static void		FillUnicodeRep(Tcl_Obj *objPtr);
 static void		FreeStringInternalRep(Tcl_Obj *objPtr);
 static void		GrowStringBuffer(Tcl_Obj *objPtr, int needed, int flag);
 static void		GrowUnicodeBuffer(Tcl_Obj *objPtr, int needed);
 static int		SetStringFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		SetUnicodeObj(Tcl_Obj *objPtr,
-			    const Tcl_UniChar *unicode, int numChars);
-static int		UnicodeLength(const Tcl_UniChar *unicode);
+			    const Tcl_UniChar *unicode, Tcl_Size numChars);
+static Tcl_Size		UnicodeLength(const Tcl_UniChar *unicode);
 #if !defined(TCL_NO_DEPRECATED)
 static int		UTF16Length(const unsigned short *unicode);
 #endif
@@ -425,7 +425,7 @@ Tcl_Obj *
 Tcl_NewStringObj(
     const char *bytes,		/* Points to the first of the length bytes
 				 * used to initialize the new object. */
-    int length)			/* The number of bytes to copy from "bytes"
+    Tcl_Size length)		/* The number of bytes to copy from "bytes"
 				 * when initializing the new object. If
 				 * negative, use bytes up to the first NUL
 				 * byte. */
@@ -437,10 +437,9 @@ Tcl_Obj *
 Tcl_NewStringObj(
     const char *bytes,		/* Points to the first of the length bytes
 				 * used to initialize the new object. */
-    int length)			/* The number of bytes to copy from "bytes"
-				 * when initializing the new object. If
-				 * negative, use bytes up to the first NUL
-				 * byte. */
+    Tcl_Size length)		/* The number of bytes to copy from "bytes"
+				 * when initializing the new object. If negative,
+				 * use bytes up to the first NUL byte. */
 {
     Tcl_Obj *objPtr;
 
@@ -717,7 +716,7 @@ int
 TclCheckEmptyString(
     Tcl_Obj *objPtr)
 {
-    int length = -1;
+    Tcl_Size length = TCL_INDEX_NONE;
 
     if (objPtr->bytes == &tclEmptyString) {
 	return TCL_EMPTYSTRING_YES;
@@ -763,10 +762,10 @@ int
 Tcl_GetUniChar(
     Tcl_Obj *objPtr,		/* The object to get the Unicode charater
 				 * from. */
-    int index)			/* Get the index'th Unicode character. */
+    Tcl_Size index)		/* Get the index'th Unicode character. */
 {
     String *stringPtr;
-    int ch, length;
+    int ch;
 
     if (index < 0) {
 	return -1;
@@ -778,6 +777,7 @@ Tcl_GetUniChar(
      */
 
     if (TclIsPureByteArray(objPtr)) {
+	Tcl_Size length;
 	unsigned char *bytes = Tcl_GetByteArrayFromObj(objPtr, &length);
 	if (index >= length) {
 		return -1;
@@ -819,21 +819,22 @@ int
 TclGetUniChar(
     Tcl_Obj *objPtr,		/* The object to get the Unicode character
 				 * from. */
-    int index)			/* Get the index'th Unicode character. */
+    Tcl_Size index)		/* Get the index'th Unicode character. */
 {
     UniCharString *stringPtr;
-    int ch, length;
+    int ch;
 
     if (index < 0) {
 	return -1;
     }
 
     /*
-     * Optimize the case where we're really dealing with a ByteArray object
-     * we don't need to convert to a string to perform the indexing operation.
+	 * Optimize the ByteArray case:  N need need to convert to a string to
+	 * perform the indexing operation.
      */
 
     if (TclIsPureByteArray(objPtr)) {
+	Tcl_Size length;
 	unsigned char *bytes = Tcl_GetByteArrayFromObj(objPtr, &length);
 	if (index >= length) {
 		return -1;
@@ -939,10 +940,10 @@ Tcl_GetUnicode(
 
 Tcl_UniChar *
 TclGetUnicodeFromObj_(
-    Tcl_Obj *objPtr,		/* The object to find the unicode string
+    Tcl_Obj *objPtr,		/* The object to find the Unicode string
 				 * for. */
     int *lengthPtr)		/* If non-NULL, the location where the string
-				 * rep's unichar length should be stored. If
+				 * rep's Tcl_UniChar length should be stored. If
 				 * NULL, no length is stored. */
 {
     UniCharString *stringPtr;
@@ -1014,9 +1015,9 @@ TclGetUnicodeFromObj(
  *
  *	Create a Tcl Object that contains the chars between first and last of
  *	the object indicated by "objPtr". If the object is not already a
- *	String object, convert it to one.  If first is negative, the returned
- *	string start at the beginning of objPtr.  If last is negative, the
- *	returned string ends at the end of objPtr.
+ *	String object, convert it to one.  If first is negative, the
+ *	returned string start at the beginning of objPtr.  If last is
+ *	negative, the returned string ends at the end of objPtr.
  *
  * Results:
  *	Returns a new Tcl Object of the String type.
@@ -1119,7 +1120,7 @@ TclGetRange(
 	 * If numChars is unknown, compute it.
 	 */
 
-	if (stringPtr->numChars == -1) {
+	if (stringPtr->numChars == TCL_INDEX_NONE) {
 	    TclNumUtfCharsM(stringPtr->numChars, objPtr->bytes, objPtr->length);
 	}
 	if (stringPtr->numChars == objPtr->length) {
@@ -1192,7 +1193,7 @@ Tcl_SetStringObj(
     Tcl_Obj *objPtr,		/* Object whose internal rep to init. */
     const char *bytes,		/* Points to the first of the length bytes
 				 * used to initialize the object. */
-    int length)			/* The number of bytes to copy from "bytes"
+    Tcl_Size length)		/* The number of bytes to copy from "bytes"
 				 * when initializing the object. If negative,
 				 * use bytes up to the first NUL byte.*/
 {
@@ -1223,20 +1224,19 @@ Tcl_SetStringObj(
  *
  * Tcl_SetObjLength --
  *
- *	This function changes the length of the string representation of an
- *	object.
+ *	Changes the length of the string representation of objPtr.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	If the size of objPtr's string representation is greater than length,
- *	then it is reduced to length and a new terminating null byte is stored
- *	in the strength. If the length of the string representation is greater
- *	than length, the storage space is reallocated to the given length; a
- *	null byte is stored at the end, but other bytes past the end of the
- *	original string representation are undefined. The object's internal
- *	representation is changed to "expendable string".
+ *	If the size of objPtr's string representation is greater than length, a
+ *	new terminating null byte is stored in objPtr->bytes at length, and
+ *	bytes at positions past length have no meaning.  If the length of the
+ *	string representation is greater than length, the storage space is
+ *	reallocated to length+1.
+ *
+ *	The object's internal representation is changed to &tclStringType.
  *
  *----------------------------------------------------------------------
  */
@@ -1245,20 +1245,15 @@ void
 Tcl_SetObjLength(
     Tcl_Obj *objPtr,		/* Pointer to object. This object must not
 				 * currently be shared. */
-    int length)			/* Number of bytes desired for string
+    Tcl_Size length)		/* Number of bytes desired for string
 				 * representation of object, not including
 				 * terminating null byte. */
 {
     UniCharString *stringPtr;
 
     if (length < 0) {
-	/*
-	 * Setting to a negative length is nonsense. This is probably the
-	 * result of overflowing the signed integer range.
-	 */
-
-	Tcl_Panic("Tcl_SetObjLength: negative length requested: "
-		"%d (integer overflow?)", length);
+	Tcl_Panic("Tcl_SetObjLength: length requested is negative: "
+		"%" TCL_SIZE_MODIFIER "d (integer overflow?)", length);
     }
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_SetObjLength");
@@ -1291,10 +1286,10 @@ Tcl_SetObjLength(
 	objPtr->bytes[length] = 0;
 
 	/*
-	 * Invalidate the unicode data.
+	 * Invalidate the Unicode data.
 	 */
 
-	stringPtr->numChars = -1;
+	stringPtr->numChars = TCL_INDEX_NONE;
 	stringPtr->hasUnicode = 0;
     } else {
 	/*
@@ -1350,20 +1345,17 @@ int
 Tcl_AttemptSetObjLength(
     Tcl_Obj *objPtr,		/* Pointer to object. This object must not
 				 * currently be shared. */
-    int length)			/* Number of bytes desired for string
+    Tcl_Size length)		/* Number of bytes desired for string
 				 * representation of object, not including
 				 * terminating null byte. */
 {
     UniCharString *stringPtr;
 
     if (length < 0) {
-	/*
-	 * Setting to a negative length is nonsense. This is probably the
-	 * result of overflowing the signed integer range.
-	 */
-
+	/* Negative lengths => most likely integer overflow */
 	return 0;
     }
+
     if (Tcl_IsShared(objPtr)) {
 	Tcl_Panic("%s called with shared object", "Tcl_AttemptSetObjLength");
     }
@@ -1404,7 +1396,7 @@ Tcl_AttemptSetObjLength(
 	 * Invalidate the Unicode data.
 	 */
 
-	stringPtr->numChars = -1;
+	stringPtr->numChars = TCL_INDEX_NONE;
 	stringPtr->hasUnicode = 0;
     } else {
 	/*
@@ -1505,14 +1497,14 @@ UTF16Length(
 }
 #endif
 
-static int
+static Tcl_Size
 UnicodeLength(
     const Tcl_UniChar *unicode)
 {
-    int numChars = 0;
+    Tcl_Size numChars = 0;
 
     if (unicode) {
-	while (numChars >= 0 && unicode[numChars] != 0) {
+	while ((numChars >= 0) && (unicode[numChars] != 0)) {
 	    numChars++;
 	}
     }
@@ -1525,7 +1517,7 @@ SetUnicodeObj(
     Tcl_Obj *objPtr,		/* The object to set the string of. */
     const Tcl_UniChar *unicode,	/* The Unicode string used to initialize the
 				 * object. */
-    int numChars)		/* Number of characters in the Unicode
+    Tcl_Size numChars)		/* Number of characters in the Unicode
 				 * string. */
 {
     UniCharString *stringPtr;
@@ -1576,18 +1568,18 @@ Tcl_AppendLimitedToObj(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const char *bytes,		/* Points to the bytes to append to the
 				 * object. */
-    int length,			/* The number of bytes available to be
-				 * appended from "bytes". If < 0, then all
-				 * bytes up to a NUL byte are available. */
-    int limit,			/* The maximum number of bytes to append to
+    Tcl_Size length,		/* The number of bytes available to be
+				 * appended from "bytes". If -1, then
+				 * all bytes up to a NUL byte are available. */
+    Tcl_Size limit,		/* The maximum number of bytes to append to
 				 * the object. */
     const char *ellipsis)	/* Ellipsis marker string, appended to the
 				 * object to indicate not all available bytes
 				 * at "bytes" were appended. */
 {
     UniCharString *stringPtr;
-    int toCopy = 0;
-    int eLen = 0;
+    Tcl_Size toCopy = 0;
+    Tcl_Size eLen = 0;
 
     if (length < 0) {
 	length = (bytes ? strlen(bytes) : 0);
@@ -1672,8 +1664,8 @@ Tcl_AppendToObj(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const char *bytes,		/* Points to the bytes to append to the
 				 * object. */
-    int length)			/* The number of bytes to append from "bytes".
-				 * If < 0, then append all bytes up to NUL
+    Tcl_Size length)		/* The number of bytes to append from "bytes".
+				 * If negative, then append all bytes up to NUL
 				 * byte. */
 {
     Tcl_AppendLimitedToObj(objPtr, bytes, length, INT_MAX, NULL);
@@ -1701,7 +1693,8 @@ TclAppendUnicodeToObj(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const Tcl_UniChar *unicode,	/* The Unicode string to append to the
 				 * object. */
-    int length)			/* Number of chars in unicode. */
+    Tcl_Size length)		/* Number of chars in Unicode. Negative
+    				 * lengths means nul terminated */
 {
     UniCharString *stringPtr;
 
@@ -1735,7 +1728,8 @@ Tcl_AppendUnicodeToObj(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const unsigned short *unicode,	/* The unicode string to append to the
 				 * object. */
-    int length)			/* Number of chars in "unicode". */
+    Tcl_Size length)		/* Number of chars in Unicode. Negative
+    				 * lengths means nul terminated */
 {
     String *stringPtr;
 
@@ -1783,7 +1777,8 @@ Tcl_AppendObjToObj(
     Tcl_Obj *appendObjPtr)	/* Object to append. */
 {
     UniCharString *stringPtr;
-    int length, numChars, appendNumChars = -1;
+    Tcl_Size length, numChars;
+    Tcl_Size appendNumChars = TCL_INDEX_NONE;
     const char *bytes;
 
     /*
@@ -1823,7 +1818,7 @@ Tcl_AppendObjToObj(
 	 * First, get the lengths.
 	 */
 
-	int lengthSrc;
+	Tcl_Size lengthSrc;
 
 	(void) Tcl_GetByteArrayFromObj(objPtr, &length);
 	(void) Tcl_GetByteArrayFromObj(appendObjPtr, &lengthSrc);
@@ -1929,10 +1924,10 @@ static void
 AppendUnicodeToUnicodeRep(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const Tcl_UniChar *unicode,	/* String to append. */
-    int appendNumChars)		/* Number of chars of "unicode" to append. */
+    Tcl_Size appendNumChars)	/* Number of chars of "unicode" to append. */
 {
     UniCharString *stringPtr;
-    int numChars;
+    Tcl_Size numChars;
 
     if (appendNumChars < 0) {
 	appendNumChars = UnicodeLength(unicode);
@@ -1956,7 +1951,7 @@ AppendUnicodeToUnicodeRep(
     uniCharStringCheckLimits(numChars);
 
     if (numChars > stringPtr->maxChars) {
-	int offset = -1;
+	Tcl_Size offset = TCL_INDEX_NONE;
 
 	/*
 	 * Protect against case where Unicode points into the existing
@@ -2018,13 +2013,13 @@ static void
 AppendUnicodeToUtfRep(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const Tcl_UniChar *unicode,	/* String to convert to UTF. */
-    int numChars)		/* Number of chars of unicode to convert. */
+    Tcl_Size numChars)		/* Number of chars of Unicode to convert. */
 {
     UniCharString *stringPtr = GET_UNICHAR_STRING(objPtr);
 
     numChars = ExtendStringRepWithUnicode(objPtr, unicode, numChars);
 
-    if (stringPtr->numChars != -1) {
+    if (stringPtr->numChars != TCL_INDEX_NONE) {
 	stringPtr->numChars += numChars;
     }
 }
@@ -2051,7 +2046,7 @@ static void
 AppendUtfToUnicodeRep(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const char *bytes,		/* String to convert to Unicode. */
-    int numBytes)		/* Number of bytes of "bytes" to convert. */
+    Tcl_Size numBytes)		/* Number of bytes of "bytes" to convert. */
 {
     UniCharString *stringPtr;
 
@@ -2087,10 +2082,10 @@ static void
 AppendUtfToUtfRep(
     Tcl_Obj *objPtr,		/* Points to the object to append to. */
     const char *bytes,		/* String to append. */
-    int numBytes)		/* Number of bytes of "bytes" to append. */
+    Tcl_Size numBytes)		/* Number of bytes of "bytes" to append. */
 {
     UniCharString *stringPtr;
-    int newLength, oldLength;
+    Tcl_Size newLength, oldLength;
 
     if (numBytes == 0) {
 	return;
@@ -2112,7 +2107,7 @@ AppendUtfToUtfRep(
 
     stringPtr = GET_UNICHAR_STRING(objPtr);
     if (newLength > stringPtr->allocated) {
-	int offset = -1;
+	Tcl_Size offset = TCL_INDEX_NONE;
 
 	/*
 	 * Protect against case where unicode points into the existing
@@ -2247,12 +2242,12 @@ Tcl_AppendFormatToObj(
     Tcl_Interp *interp,
     Tcl_Obj *appendObj,
     const char *format,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     const char *span = format, *msg, *errCode;
-    int numBytes = 0, objIndex = 0, gotXpg = 0, gotSequential = 0;
-    int originalLength, limit;
+    int gotXpg = 0, gotSequential = 0;
+    Tcl_Size objIndex = 0, originalLength, limit, numBytes = 0;
     Tcl_UniChar ch = 0;
     static const char *mixedXPG =
 	    "cannot mix \"%\" and \"%n$\" conversion specifiers";
@@ -2275,11 +2270,13 @@ Tcl_AppendFormatToObj(
     while (*format != '\0') {
 	char *end;
 	int gotMinus = 0, gotHash = 0, gotZero = 0, gotSpace = 0, gotPlus = 0;
-	int width, gotPrecision, precision, sawFlag, useShort = 0, useBig = 0;
+	int gotPrecision, sawFlag, useShort = 0, useBig = 0;
+	Tcl_WideInt width, precision;
 #ifndef TCL_WIDE_INT_IS_LONG
 	int useWide = 0;
 #endif
-	int newXpg, numChars, allocSegment = 0, segmentLimit, segmentNumBytes;
+	int newXpg, allocSegment = 0;
+	Tcl_Size numChars, segmentLimit, segmentNumBytes;
 	Tcl_Obj *segment;
 	int step = TclUtfToUniChar(format, &ch);
 
@@ -2400,7 +2397,7 @@ Tcl_AppendFormatToObj(
 		errCode = gotXpg ? "INDEXRANGE" : "FIELDVARMISMATCH";
 		goto errorMsg;
 	    }
-	    if (TclGetIntFromObj(interp, objv[objIndex], &width) != TCL_OK) {
+	    if (TclGetWideIntFromObj(interp, objv[objIndex], &width) != TCL_OK) {
 		goto error;
 	    }
 	    if (width < 0) {
@@ -2437,7 +2434,7 @@ Tcl_AppendFormatToObj(
 		errCode = gotXpg ? "INDEXRANGE" : "FIELDVARMISMATCH";
 		goto errorMsg;
 	    }
-	    if (TclGetIntFromObj(interp, objv[objIndex], &precision)
+	    if (TclGetWideIntFromObj(interp, objv[objIndex], &precision)
 		    != TCL_OK) {
 		goto error;
 	    }
@@ -2558,7 +2555,8 @@ Tcl_AppendFormatToObj(
 	    long l;
 	    Tcl_WideInt w;
 	    mp_int big;
-	    int toAppend, isNegative = 0;
+	    int isNegative = 0;
+	    Tcl_Size toAppend;
 
 #ifndef TCL_WIDE_INT_IS_LONG
 	    if (ch == 'p') {
@@ -2654,7 +2652,7 @@ Tcl_AppendFormatToObj(
 
 	    switch (ch) {
 	    case 'd': {
-		int length;
+		Tcl_Size length;
 		Tcl_Obj *pure;
 		const char *bytes;
 
@@ -2726,7 +2724,8 @@ Tcl_AppendFormatToObj(
 	    case 'b': {
 		Tcl_WideUInt bits = (Tcl_WideUInt) 0;
 		Tcl_WideInt numDigits = (Tcl_WideInt) 0;
-		int length, numBits = 4, base = 16, index = 0, shift = 0;
+		int numBits = 4, base = 16, index = 0, shift = 0;
+		Tcl_Size length;
 		Tcl_Obj *pure;
 		char *bytes;
 
@@ -2887,14 +2886,14 @@ Tcl_AppendFormatToObj(
 		*p++ = '+';
 	    }
 	    if (width) {
-		p += snprintf(p, TCL_INTEGER_SPACE, "%d", width);
+		p += snprintf(p, TCL_INTEGER_SPACE, "%" TCL_LL_MODIFIER "d", width);
 		if (width > length) {
 		    length = width;
 		}
 	    }
 	    if (gotPrecision) {
 		*p++ = '.';
-		p += snprintf(p, TCL_INTEGER_SPACE, "%d", precision);
+		p += snprintf(p, TCL_INTEGER_SPACE, "%" TCL_LL_MODIFIER "d", precision);
 		if (precision > INT_MAX - length) {
 		    msg = overflow;
 		    errCode = "OVERFLOW";
@@ -3020,7 +3019,7 @@ Tcl_Obj *
 Tcl_Format(
     Tcl_Interp *interp,
     const char *format,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     int result;
@@ -3053,7 +3052,8 @@ AppendPrintfToObjVA(
     const char *format,
     va_list argList)
 {
-    int code, objc;
+    int code;
+    Tcl_Size objc;
     Tcl_Obj **objv, *list;
     const char *p;
 
@@ -3334,12 +3334,14 @@ Tcl_Obj *
 TclStringRepeat(
     Tcl_Interp *interp,
     Tcl_Obj *objPtr,
-    int count,
+    Tcl_Size count,
     int flags)
 {
     Tcl_Obj *objResultPtr;
     int inPlace = flags & TCL_STRING_IN_PLACE;
-    int length = 0, unichar = 0, done = 1;
+    Tcl_Size length = 0;
+    int unichar = 0;
+    Tcl_Size done = 1;
     int binary = TclIsPureByteArray(objPtr);
 
     /* assert (count >= 2) */
@@ -3479,22 +3481,23 @@ TclStringRepeat(
 Tcl_Obj *
 TclStringCat(
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj * const objv[],
     int flags)
 {
     Tcl_Obj *objResultPtr, * const *ov;
-    int oc, length = 0, binary = 1;
+    int binary = 1;
+    Tcl_Size oc, length = 0;
     int allowUniChar = 1, requestUniChar = 0, forceUniChar = 0;
-    int first = objc - 1;	/* Index of first value possibly not empty */
-    int last = 0;		/* Index of last value possibly not empty */
+    Tcl_Size first = objc - 1;	/* Index of first value possibly not empty */
+    Tcl_Size last = 0;		/* Index of last value possibly not empty */
     int inPlace = flags & TCL_STRING_IN_PLACE;
 
     /* assert ( objc >= 0 ) */
 
     if (objc <= 1) {
-	/* Only one or no objects; return first or empty */
-	return objc ? objv[0] : Tcl_NewObj();
+	/* Negative (shouldn't be), one or no objects; return first or empty */
+	return objc == 1 ? objv[0] : Tcl_NewObj();
     }
 
     /* assert ( objc >= 2 ) */
@@ -3546,7 +3549,7 @@ TclStringCat(
 	 * Result will be pure byte array. Pre-size it
 	 */
 
-	int numBytes;
+	Tcl_Size numBytes;
 	ov = objv;
 	oc = objc;
 	do {
@@ -3565,7 +3568,8 @@ TclStringCat(
 		    last = objc - oc;
 		    if (length == 0) {
 			first = last;
-		    } else if (numBytes > INT_MAX - length) {
+		    }
+		    if (length > (INT_MAX-numBytes)) {
 			goto overflow;
 		    }
 		    length += numBytes;
@@ -3583,7 +3587,7 @@ TclStringCat(
 	    Tcl_Obj *objPtr = *ov++;
 
 	    if ((objPtr->bytes == NULL) || (objPtr->length)) {
-		int numChars;
+		Tcl_Size numChars;
 
 		TclGetUnicodeFromObj_(objPtr, &numChars); /* PANIC? */
 		if (numChars) {
@@ -3632,7 +3636,7 @@ TclStringCat(
 	    first = last = objc - oc - 1;
 
 	    if (oc && (length == 0)) {
-		int numBytes;
+		Tcl_Size numBytes;
 
 		/* assert ( pendingPtr != NULL ) */
 
@@ -3665,7 +3669,7 @@ TclStringCat(
 	} while (oc && (length == 0));
 
 	while (oc) {
-	    int numBytes;
+	    Tcl_Size numBytes;
 	    Tcl_Obj *objPtr = *ov++;
 
 	    /* assert ( length > 0 && pendingPtr == NULL )  */
@@ -3700,7 +3704,7 @@ TclStringCat(
 	 */
 
 	if (inPlace && !Tcl_IsShared(*objv)) {
-	    int start;
+	    Tcl_Size start;
 
 	    objResultPtr = *objv++; objc--;
 	    Tcl_GetByteArrayFromObj(objResultPtr, &start);
@@ -3719,7 +3723,7 @@ TclStringCat(
 	     */
 
 	    if (TclIsPureByteArray(objPtr)) {
-		int more;
+		Tcl_Size more;
 		unsigned char *src = Tcl_GetByteArrayFromObj(objPtr, &more);
 		memcpy(dst, src, more);
 		dst += more;
@@ -3730,7 +3734,7 @@ TclStringCat(
 	Tcl_UniChar *dst;
 
 	if (inPlace && !Tcl_IsShared(*objv)) {
-	    int start;
+	    Tcl_Size start;
 
 	    objResultPtr = *objv++; objc--;
 
@@ -3770,7 +3774,7 @@ TclStringCat(
 	    Tcl_Obj *objPtr = *objv++;
 
 	    if ((objPtr->bytes == NULL) || (objPtr->length)) {
-		int more;
+		Tcl_Size more;
 		Tcl_UniChar *src = TclGetUnicodeFromObj_(objPtr, &more);
 		memcpy(dst, src, more * sizeof(Tcl_UniChar));
 		dst += more;
@@ -3781,7 +3785,7 @@ TclStringCat(
 	char *dst;
 
 	if (inPlace && !Tcl_IsShared(*objv)) {
-	    int start;
+	    Tcl_Size start;
 
 	    objResultPtr = *objv++; objc--;
 
@@ -3817,7 +3821,7 @@ TclStringCat(
 	    Tcl_Obj *objPtr = *objv++;
 
 	    if ((objPtr->bytes == NULL) || (objPtr->length)) {
-		int more;
+		Tcl_Size more;
 		char *src = TclGetStringFromObj(objPtr, &more);
 
 		memcpy(dst, src, more);
@@ -3860,11 +3864,12 @@ TclStringCmp(
     Tcl_Obj *value2Ptr,
     int checkEq,		/* comparison is only for equality */
     int nocase,			/* comparison is not case sensitive */
-    int reqlength)		/* requested length in characters;
-						 * TCL_INDEX_NONE to compare whole strings */
+    Tcl_Size reqlength)		/* requested length in characters;
+						 * negative to compare whole strings */
 {
     const char *s1, *s2;
-    int empty, length, match, s1len, s2len;
+    int empty, match;
+    Tcl_Size length, s1len, s2len;
     memCmpFn_t memCmpFn;
 
     if ((reqlength == 0) || (value1Ptr == value2Ptr)) {
@@ -4053,12 +4058,12 @@ Tcl_Obj *
 TclStringFirst(
     Tcl_Obj *needle,
     Tcl_Obj *haystack,
-    int start)
+    Tcl_Size start)
 {
     int lh, ln = TclGetCharLength(needle);
-    Tcl_Obj *result;
-    int value = -1;
+    Tcl_Size value = TCL_INDEX_NONE;
     Tcl_UniChar *checkStr, *endStr, *uh, *un;
+    Tcl_Obj *obj;
 
     if (start < 0) {
 	start = 0;
@@ -4134,8 +4139,8 @@ TclStringFirst(
 	}
     }
   firstEnd:
-    TclNewIndexObj(result, value);
-    return result;
+    TclNewIndexObj(obj, value);
+    return obj;
 }
 
 /*
@@ -4162,10 +4167,10 @@ TclStringLast(
     Tcl_Obj *haystack,
     int last)
 {
-    int lh, ln = TclGetCharLength(needle);
-    Tcl_Obj *result;
-    int value = -1;
+    Tcl_Size lh, ln = TclGetCharLength(needle);
+    Tcl_Size value = TCL_INDEX_NONE;
     Tcl_UniChar *checkStr, *uh, *un;
+    Tcl_Obj *obj;
 
     if (ln == 0) {
 	/*
@@ -4221,8 +4226,8 @@ TclStringLast(
 	checkStr--;
     }
   lastEnd:
-    TclNewIndexObj(result, value);
-    return result;
+    TclNewIndexObj(obj, value);
+    return obj;
 }
 
 /*
@@ -4247,7 +4252,7 @@ static void
 ReverseBytes(
     unsigned char *to,		/* Copy bytes into here... */
     unsigned char *from,	/* ...from here... */
-    int count)			/* Until this many are copied, */
+    Tcl_Size count)		/* Until this many are copied, */
 				/* reversing as you go. */
 {
     unsigned char *src = from + count;
@@ -4280,7 +4285,7 @@ TclStringReverse(
 #endif
 
     if (TclIsPureByteArray(objPtr)) {
-	int numBytes;
+	Tcl_Size numBytes;
 	unsigned char *from = Tcl_GetByteArrayFromObj(objPtr, &numBytes);
 
 	if (!inPlace || Tcl_IsShared(objPtr)) {
@@ -4361,8 +4366,8 @@ TclStringReverse(
     }
 
     if (objPtr->bytes) {
-	int numChars = stringPtr->numChars;
-	int numBytes = objPtr->length;
+	Tcl_Size numChars = stringPtr->numChars;
+	Tcl_Size numBytes = objPtr->length;
 	char *to, *from = objPtr->bytes;
 
 	if (!inPlace || Tcl_IsShared(objPtr)) {
@@ -4381,7 +4386,7 @@ TclStringReverse(
 	     * Pass 1. Reverse the bytes of each multi-byte character.
 	     */
 
-	    int bytesLeft = numBytes;
+	    Tcl_Size bytesLeft = numBytes;
 	    int chw;
 
 	    while (bytesLeft) {
@@ -4468,7 +4473,7 @@ TclStringReplace(
      */
 
     if (TclIsPureByteArray(objPtr)) {
-	int numBytes;
+	Tcl_Size numBytes;
 	unsigned char *bytes = Tcl_GetByteArrayFromObj(objPtr, &numBytes);
 
 	if (insertPtr == NULL) {
@@ -4491,7 +4496,7 @@ TclStringReplace(
 	}
 
 	if (TclIsPureByteArray(insertPtr)) {
-	    int newBytes;
+	    Tcl_Size newBytes;
 	    unsigned char *iBytes
 		    = Tcl_GetByteArrayFromObj(insertPtr, &newBytes);
 
@@ -4506,7 +4511,7 @@ TclStringReplace(
 		return objPtr;
 	    }
 
-	    if (newBytes > INT_MAX - (numBytes - count)) {
+	    if (newBytes > (INT_MAX - (numBytes - count))) {
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "max size for a Tcl value (%d bytes) exceeded",
@@ -4536,7 +4541,7 @@ TclStringReplace(
 
     /* The traditional implementation... */
     {
-	int numChars;
+	Tcl_Size numChars;
 	Tcl_UniChar *ustring = TclGetUnicodeFromObj_(objPtr, &numChars);
 
 	/* TODO: Is there an in-place option worth pursuing here? */
@@ -4545,7 +4550,7 @@ TclStringReplace(
 	if (insertPtr) {
 	    Tcl_AppendObjToObj(result, insertPtr);
 	}
-	if (first + count < numChars) {
+	if ((first + count) < numChars) {
 	    TclAppendUnicodeToObj(result, ustring + first + count,
 		    numChars - first - count);
 	}
@@ -4586,17 +4591,17 @@ static void
 ExtendUnicodeRepWithString(
     Tcl_Obj *objPtr,
     const char *bytes,
-    int numBytes,
-    int numAppendChars)
+    Tcl_Size numBytes,
+    Tcl_Size numAppendChars)
 {
     UniCharString *stringPtr = GET_UNICHAR_STRING(objPtr);
-    int needed, numOrigChars = 0;
+    Tcl_Size needed, numOrigChars = 0;
     Tcl_UniChar *dst, unichar = 0;
 
     if (stringPtr->hasUnicode) {
 	numOrigChars = stringPtr->numChars;
     }
-    if (numAppendChars == -1) {
+    if (numAppendChars < 0) {
 	TclNumUtfCharsM(numAppendChars, bytes, numBytes);
     }
     needed = numOrigChars + numAppendChars;
@@ -4661,7 +4666,7 @@ DupStringInternalRep(
     UniCharString *srcStringPtr = GET_UNICHAR_STRING(srcPtr);
     UniCharString *copyStringPtr = NULL;
 
-    if (srcStringPtr->numChars == -1) {
+    if (srcStringPtr->numChars == TCL_INDEX_NONE) {
 	/*
 	 * The String struct in the source value holds zero useful data. Don't
 	 * bother copying it. Don't even bother allocating space in which to
@@ -4720,7 +4725,7 @@ DupStringInternalRep(
  *
  * Side effects:
  *	Any old internal representation for objPtr is freed and the internal
- *	representation is set to "String".
+ *	representation is set to &tclStringType.
  *
  *----------------------------------------------------------------------
  */
@@ -4797,17 +4802,17 @@ UpdateStringOfString(
     }
 }
 
-static int
+static Tcl_Size
 ExtendStringRepWithUnicode(
     Tcl_Obj *objPtr,
     const Tcl_UniChar *unicode,
-    int numChars)
+    Tcl_Size numChars)
 {
     /*
      * Precondition: this is the "string" Tcl_ObjType.
      */
 
-    int i, origLength, size = 0;
+    Tcl_Size i, origLength, size = 0;
     char *dst;
     UniCharString *stringPtr = GET_UNICHAR_STRING(objPtr);
 
diff --git a/tests/cmdIL.test b/tests/cmdIL.test
index 5a68925..316a945 100644
--- a/tests/cmdIL.test
+++ b/tests/cmdIL.test
@@ -137,7 +137,7 @@ test cmdIL-1.32 {lsort -stride errors} -returnCodes error -body {
 } -result {expected integer but got "foo"}
 test cmdIL-1.33 {lsort -stride errors} -returnCodes error -body {
     lsort -stride 1 bar
-} -result {stride length must be at least 2}
+} -match glob -result {stride length must be between 2 and *}
 test cmdIL-1.34 {lsort -stride errors} -returnCodes error -body {
     lsort -stride 2 {a b c}
 } -result {list size must be a multiple of the stride length}
@@ -168,6 +168,9 @@ test cmdIL-1.41 {lsort -stride and -index} -body {
 test cmdIL-1.42 {lsort -stride and-index} -body {
     lsort -stride 2 -index -1-1 {a 2 b 1}
 } -returnCodes error -result {index "-1-1" out of range}
+test cmdIL-1.43 {lsort -stride errors} -returnCodes error -body {
+    lsort -stride 4294967296 bar
+} -match glob -result {stride length must be between 2 and *}
 
 # Can't think of any good tests for the MergeSort and MergeLists procedures,
 # except a bunch of random lists to sort.
diff --git a/tests/lsearch.test b/tests/lsearch.test
index 7c1402d..c913e60 100644
--- a/tests/lsearch.test
+++ b/tests/lsearch.test
@@ -552,7 +552,7 @@ test lsearch-23.1 {lsearch -stride option, errors} -body {
 } -returnCodes error -result {"-stride" option must be followed by stride length}
 test lsearch-23.2 {lsearch -stride option, errors} -body {
     lsearch -stride 0 {a b} a
-} -returnCodes error -result {stride length must be at least 1}
+} -returnCodes error -match glob -result {stride length must be between 1 and *}
 test lsearch-23.3 {lsearch -stride option, errors} -body {
     lsearch -stride 2 {a b c} a
 } -returnCodes error -result {list size must be a multiple of the stride length}
@@ -688,6 +688,9 @@ test lsearch-28.8 {lsearch -sorted with -stride} -body {
 test lsearch-28.9 {lsearch -sorted with -stride} -body {
     lsearch -sorted -stride 2 -index 1 -subindices -inline {3 5 8 7 2 9} 9
 } -result 9
+test lsearch-28.10 {lsearch -sorted with -stride} -body {
+    lsearch -sorted -stride 4294967296 -index 1 -subindices -inline {3 5 8 7 2 9} 9
+} -returnCodes 1 -match glob -result {stride length must be between 1 and *}
 
 
 # cleanup
-- 
cgit v0.12


From b58023ffa18027e959e9f2e56118606adfe8343a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 21 Apr 2023 20:32:26 +0000
Subject: Since Tcl_GetSizeIntFromObj is the same as Tcl_GetIntFromObj (in
 8.7), it's not worth to spend a stub entry for it

---
 generic/tcl.decls     |  6 ------
 generic/tclDecls.h    | 12 ++++++------
 generic/tclObj.c      | 25 -------------------------
 generic/tclStubInit.c |  2 +-
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 6ac10cb..daa2f2b 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2567,12 +2567,6 @@ declare 685 {
     Tcl_Obj *Tcl_DStringToObj(Tcl_DString *dsPtr)
 }
 
-# TIP 660
-declare 686 {
-    int Tcl_GetSizeIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    Tcl_Size *sizePtr)
-}
-
 # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- #
 
 declare 688 {
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 9c3ca0d..d4e4381 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -2049,9 +2049,7 @@ EXTERN int		Tcl_GetWideUIntFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr);
 /* 685 */
 EXTERN Tcl_Obj *	Tcl_DStringToObj(Tcl_DString *dsPtr);
-/* 686 */
-EXTERN int		Tcl_GetSizeIntFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, Tcl_Size *sizePtr);
+/* Slot 686 is reserved */
 /* Slot 687 is reserved */
 /* 688 */
 EXTERN void		TclUnusedStubEntry(void);
@@ -2776,7 +2774,7 @@ typedef struct TclStubs {
     Tcl_Size (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */
     int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 684 */
     Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */
-    int (*tcl_GetSizeIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Size *sizePtr); /* 686 */
+    void (*reserved686)(void);
     void (*reserved687)(void);
     void (*tclUnusedStubEntry) (void); /* 688 */
 } TclStubs;
@@ -4181,8 +4179,7 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_GetWideUIntFromObj) /* 684 */
 #define Tcl_DStringToObj \
 	(tclStubsPtr->tcl_DStringToObj) /* 685 */
-#define Tcl_GetSizeIntFromObj \
-	(tclStubsPtr->tcl_GetSizeIntFromObj) /* 686 */
+/* Slot 686 is reserved */
 /* Slot 687 is reserved */
 #define TclUnusedStubEntry \
 	(tclStubsPtr->tclUnusedStubEntry) /* 688 */
@@ -4586,4 +4583,7 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_GetSlave Tcl_GetChild
 #define Tcl_GetMaster Tcl_GetParent
 
+/* TIP #660 */
+#define Tcl_GetSizeIntFromObj Tcl_GetIntFromObj
+
 #endif /* _TCLDECLS */
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 93e3a08..94cf376 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3551,31 +3551,6 @@ TclGetWideBitsFromObj(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_GetSizeIntFromObj --
- *
- *	Attempt to return a Tcl_Size from the Tcl object "objPtr".
- *
- * Results:
- *  TCL_OK - the converted Tcl_Size value is stored in *sizePtr
- *  TCL_ERROR - the error message is stored in interp
- *
- * Side effects:
- *	The function may free up any existing internal representation.
- *
- *----------------------------------------------------------------------
- */
-int
-Tcl_GetSizeIntFromObj(
-    Tcl_Interp *interp, /* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr,	/* The object from which to get a int. */
-    Tcl_Size *sizePtr)  /* Place to store resulting int. */
-{
-    return Tcl_GetIntFromObj(interp, objPtr, sizePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * FreeBignum --
  *
  *	This function frees the internal rep of a bignum.
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 104375e..e09d74d 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -2057,7 +2057,7 @@ const TclStubs tclStubs = {
     Tcl_GetEncodingNulLength, /* 683 */
     Tcl_GetWideUIntFromObj, /* 684 */
     Tcl_DStringToObj, /* 685 */
-    Tcl_GetSizeIntFromObj, /* 686 */
+    0, /* 686 */
     0, /* 687 */
     TclUnusedStubEntry, /* 688 */
 };
-- 
cgit v0.12


From 4402cae44685a3ca1b3c0c4bf9c5d0680195a0e8 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sat, 22 Apr 2023 10:04:53 +0000
Subject: Use TclListObjRange in lassign for performance reasons

---
 generic/tclCmdIL.c   | 17 +++++++++++++++--
 generic/tclExecute.c | 10 +++++-----
 generic/tclInt.h     |  4 ++--
 generic/tclListObj.c |  3 ++-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index f6d3df3..383cec4 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -2326,6 +2326,7 @@ Tcl_LassignObjCmd(
     Tcl_Obj *listCopyPtr;
     Tcl_Obj **listObjv;		/* The contents of the list. */
     Tcl_Size listObjc;		/* The length of the list. */
+    Tcl_Size origListObjc;	/* Original length */
     int code = TCL_OK;
 
     if (objc < 2) {
@@ -2337,8 +2338,10 @@ Tcl_LassignObjCmd(
     if (listCopyPtr == NULL) {
 	return TCL_ERROR;
     }
+    Tcl_IncrRefCount(listCopyPtr); /* Important! fs */
 
     TclListObjGetElementsM(NULL, listCopyPtr, &listObjc, &listObjv);
+    origListObjc = listObjc;
 
     objc -= 2;
     objv += 2;
@@ -2366,7 +2369,13 @@ Tcl_LassignObjCmd(
     }
 
     if (code == TCL_OK && listObjc > 0) {
-	Tcl_SetObjResult(interp, Tcl_NewListObj(listObjc, listObjv));
+	Tcl_Obj *resultObjPtr = TclListObjRange(
+	    interp, listCopyPtr, origListObjc - listObjc, origListObjc - 1);
+	if (resultObjPtr == NULL) {
+	    code = TCL_ERROR;
+	} else {
+	    Tcl_SetObjResult(interp, resultObjPtr);
+	}
     }
 
     Tcl_DecrRefCount(listCopyPtr);
@@ -2759,7 +2768,11 @@ Tcl_LrangeObjCmd(
 	    return TCL_ERROR;
 	}
     } else {
-	Tcl_SetObjResult(interp, TclListObjRange(objv[1], first, last));
+	Tcl_Obj *resultObj = TclListObjRange(interp, objv[1], first, last);
+	if (resultObj == NULL) {
+	    return TCL_ERROR;
+	}
+	Tcl_SetObjResult(interp, resultObj);
     }
     return TCL_OK;
 }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 7f431bd..e3b85b4 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5154,12 +5154,12 @@ TEBCresume(
 
 	if (TclHasInternalRep(valuePtr,&tclArithSeriesType)) {
 	    objResultPtr = TclArithSeriesObjRange(interp, valuePtr, fromIdx, toIdx);
-	    if (objResultPtr == NULL) {
-		TRACE_ERROR(interp);
-		goto gotError;
-	    }
 	} else {
-	    objResultPtr = TclListObjRange(valuePtr, fromIdx, toIdx);
+	    objResultPtr = TclListObjRange(interp, valuePtr, fromIdx, toIdx);
+	}
+	if (objResultPtr == NULL) {
+	    TRACE_ERROR(interp);
+	    goto gotError;
 	}
 
 	TRACE_APPEND(("\"%.30s\"", O2S(objResultPtr)));
diff --git a/generic/tclInt.h b/generic/tclInt.h
index c073f42..1481b5c 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3249,8 +3249,8 @@ MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
 MODULE_SCOPE int	TclListObjAppendElements(Tcl_Interp *interp,
 			    Tcl_Obj *toObj, int elemCount,
 			    Tcl_Obj *const elemObjv[]);
-MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Obj *listPtr, int fromIdx,
-			    int toIdx);
+MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Interp *interp, Tcl_Obj *listPtr,
+			    int fromIdx, int toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 811bd0f..a850695 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -1602,6 +1602,7 @@ ListRepRange(
 
 Tcl_Obj *
 TclListObjRange(
+    Tcl_Interp *interp,		/* May be NULL. Used for error messages */
     Tcl_Obj *listObj,		/* List object to take a range from. */
     Tcl_Size rangeStart,	/* Index of first element to include. */
     Tcl_Size rangeEnd)		/* Index of last element to include. */
@@ -1610,7 +1611,7 @@ TclListObjRange(
     ListRep resultRep;
 
     int isShared;
-    if (TclListObjGetRep(NULL, listObj, &listRep) != TCL_OK)
+    if (TclListObjGetRep(interp, listObj, &listRep) != TCL_OK)
 	return NULL;
 
     isShared = Tcl_IsShared(listObj);
-- 
cgit v0.12


From 556c3fc35b1011e4ed012fafa8e3907ad45752e2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 22 Apr 2023 16:34:56 +0000
Subject: Fix [2a5cb49733ff]: Make TCL_NO_TOMMATH_H sufficient for
 tclTomMathDecls.h

---
 generic/tclTomMath.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index 40a4e9d..1d4f30a 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -24,6 +24,15 @@
 #   define MP_VAL        -3  /* invalid input */
 #   define MP_ITER       -4  /* maximum iterations reached */
 #   define MP_BUF        -5  /* buffer overflow, supplied buffer too small */
+    typedef int mp_order;
+    #define MP_LSB_FIRST -1
+    #define MP_MSB_FIRST  1
+    typedef int mp_endian;
+    #define MP_LITTLE_ENDIAN  -1
+    #define MP_NATIVE_ENDIAN  0
+    #define MP_BIG_ENDIAN     1
+    #endif
+    define MP_DEPRECATED_PRAGMA(s) /* nothing */
 #   define MP_WUR            /* nothing */
 #   define mp_iszero(a) ((a)->used == 0)
 #   define mp_isneg(a)  ((a)->sign != 0)
-- 
cgit v0.12


From 9ec33349d58033ef07bfbbdeb48d2939a9ffb5a9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 22 Apr 2023 17:29:49 +0000
Subject: Fix tclTomMath.h (from prev commit)

---
 generic/tclTomMath.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h
index 1d4f30a..26db082 100644
--- a/generic/tclTomMath.h
+++ b/generic/tclTomMath.h
@@ -25,14 +25,13 @@
 #   define MP_ITER       -4  /* maximum iterations reached */
 #   define MP_BUF        -5  /* buffer overflow, supplied buffer too small */
     typedef int mp_order;
-    #define MP_LSB_FIRST -1
-    #define MP_MSB_FIRST  1
+#   define MP_LSB_FIRST -1
+#   define MP_MSB_FIRST  1
     typedef int mp_endian;
-    #define MP_LITTLE_ENDIAN  -1
-    #define MP_NATIVE_ENDIAN  0
-    #define MP_BIG_ENDIAN     1
-    #endif
-    define MP_DEPRECATED_PRAGMA(s) /* nothing */
+#   define MP_LITTLE_ENDIAN  -1
+#   define MP_NATIVE_ENDIAN  0
+#   define MP_BIG_ENDIAN     1
+#   define MP_DEPRECATED_PRAGMA(s) /* nothing */
 #   define MP_WUR            /* nothing */
 #   define mp_iszero(a) ((a)->used == 0)
 #   define mp_isneg(a)  ((a)->sign != 0)
-- 
cgit v0.12


From 8da10bea0f8c1888cd8ed0bb3097826efbf37f81 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 22 Apr 2023 17:31:50 +0000
Subject: Register "utf32string" for Python

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

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 94cf376..829e046 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -390,6 +390,10 @@ TclInitObjSubsystem(void)
 #if (TCL_UTF_MAX < 4) || !defined(TCL_NO_DEPRECATED)
     Tcl_RegisterObjType(&tclStringType);
 #endif
+#if (TCL_UTF_MAX > 3) && !defined(TCL_NO_DEPRECATED)
+    /* Only registered for 8.7, not for 9.0 any more. See [] */
+    Tcl_RegisterObjType(&tclUniCharStringType);
+#endif
     Tcl_RegisterObjType(&tclListType);
     Tcl_RegisterObjType(&tclDictType);
     Tcl_RegisterObjType(&tclByteCodeType);
-- 
cgit v0.12


From c90b84b1166c26f2d17506cb3c39ead08e7e9d34 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 22 Apr 2023 17:32:52 +0000
Subject: Fill in URL in previous commit

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

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 829e046..7c433d1 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -391,7 +391,8 @@ TclInitObjSubsystem(void)
     Tcl_RegisterObjType(&tclStringType);
 #endif
 #if (TCL_UTF_MAX > 3) && !defined(TCL_NO_DEPRECATED)
-    /* Only registered for 8.7, not for 9.0 any more. See [] */
+    /* Only registered for 8.7, not for 9.0 any more.
+     * See [https://core.tcl-lang.org/tk/tktview/6b49149b4e] */
     Tcl_RegisterObjType(&tclUniCharStringType);
 #endif
     Tcl_RegisterObjType(&tclListType);
-- 
cgit v0.12


From f14ee8d1bb0f076e919df01cbdd9059e1e5b9a93 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 22 Apr 2023 17:55:36 +0000
Subject: Fix [203792a48c]: Avoid signed integer overflow in Utf32ToUtfProc()

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

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 774485d..647ed68 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2774,9 +2774,9 @@ Utf32ToUtfProc(
 
 	int prev = ch;
 	if (flags & TCL_ENCODING_LE) {
-	    ch = (src[3] & 0xFF) << 24 | (src[2] & 0xFF) << 16 | (src[1] & 0xFF) << 8 | (src[0] & 0xFF);
+	    ch = (unsigned int)(src[3] & 0xFF) << 24 | (src[2] & 0xFF) << 16 | (src[1] & 0xFF) << 8 | (src[0] & 0xFF);
 	} else {
-	    ch = (src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
+	    ch = (unsigned int)(src[0] & 0xFF) << 24 | (src[1] & 0xFF) << 16 | (src[2] & 0xFF) << 8 | (src[3] & 0xFF);
 	}
 	if (HIGH_SURROGATE(prev) && !LOW_SURROGATE(ch)) {
 	    /* Bug [10c2c17c32]. If Hi surrogate not followed by Lo surrogate, finish 3-byte UTF-8 */
-- 
cgit v0.12


From e5eeaadf3c490991f3360ae3cea60e064e0b2c37 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Apr 2023 06:40:14 +0000
Subject: Don't refer to CVS any more

---
 macosx/README    | 2 --
 tools/eolFix.tcl | 2 --
 2 files changed, 4 deletions(-)

diff --git a/macosx/README b/macosx/README
index c2bcc42..d170bce 100644
--- a/macosx/README
+++ b/macosx/README
@@ -137,8 +137,6 @@ Detailed Instructions for building with macosx/GNUmakefile
 (where ${ver} is a shell variable containing the Tcl version number e.g. '8.6').
 Setup this shell variable as follows:
 	ver="8.6"
-If you are building from CVS, omit this step (CVS source tree names usually do
-not contain a version number).
 
 - Setup environment variables as desired, e.g. for a universal build on 10.5:
 	CFLAGS="-arch i386 -arch x86_64 -arch ppc -mmacosx-version-min=10.5"
diff --git a/tools/eolFix.tcl b/tools/eolFix.tcl
index 3f35ed4..b3382ac 100644
--- a/tools/eolFix.tcl
+++ b/tools/eolFix.tcl
@@ -1,8 +1,6 @@
 ## Super aggressive EOL-fixer!
 ##
 ##  Will even understand screwed up ones like CRCRLF.
-##  (found in bad CVS repositories, caused by spacey developers
-##   abusing CVS)
 ##
 ##  davygrvy@pobox.com    3:41 PM 10/12/2001
 ##
-- 
cgit v0.12


From 54b8f460977c12181e89d16fd8e35e45a5ebf878 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Apr 2023 20:24:01 +0000
Subject: RingSizeT -> Tcl_Size

---
 win/tclWinConsole.c | 77 ++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 1a10324..47aba5d 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -84,18 +84,11 @@ static int gInitialized = 0;
  * Ring buffer for storing data. Actual data is from bufPtr[start]:bufPtr[size-1]
  * and bufPtr[0]:bufPtr[length - (size-start)].
  */
-#if TCL_MAJOR_VERSION > 8
-typedef ptrdiff_t RingSizeT; /* Tcl9 TODO */
-#define RingSizeT_MAX PTRDIFF_MAX
-#else
-typedef int RingSizeT;
-#define RingSizeT_MAX INT_MAX
-#endif
 typedef struct RingBuffer {
     char *bufPtr;	/* Pointer to buffer storage */
-    RingSizeT capacity;	/* Size of the buffer in RingBufferChar */
-    RingSizeT start;	/* Start of the data within the buffer. */
-    RingSizeT length;	/* Number of RingBufferChar*/
+    Tcl_Size capacity;	/* Size of the buffer in RingBufferChar */
+    Tcl_Size start;	/* Start of the data within the buffer. */
+    Tcl_Size length;	/* Number of RingBufferChar*/
 } RingBuffer;
 #define RingBufferLength(ringPtr_) ((ringPtr_)->length)
 #define RingBufferHasFreeSpace(ringPtr_) ((ringPtr_)->length < (ringPtr_)->capacity)
@@ -234,16 +227,16 @@ static void	ConsoleWatchProc(ClientData instanceData, int mask);
 static void	ProcExitHandler(ClientData clientData);
 static void	ConsoleThreadActionProc(ClientData instanceData, int action);
 static DWORD	ReadConsoleChars(HANDLE hConsole, WCHAR *lpBuffer,
-		    RingSizeT nChars, RingSizeT *nCharsReadPtr);
+		    Tcl_Size nChars, Tcl_Size *nCharsReadPtr);
 static DWORD	WriteConsoleChars(HANDLE hConsole,
-		    const WCHAR *lpBuffer, RingSizeT nChars,
-		    RingSizeT *nCharsWritten);
-static void	RingBufferInit(RingBuffer *ringPtr, RingSizeT capacity);
+		    const WCHAR *lpBuffer, Tcl_Size nChars,
+		    Tcl_Size *nCharsWritten);
+static void	RingBufferInit(RingBuffer *ringPtr, Tcl_Size capacity);
 static void	RingBufferClear(RingBuffer *ringPtr);
-static RingSizeT	RingBufferIn(RingBuffer *ringPtr, const char *srcPtr,
-			    RingSizeT srcLen, int partialCopyOk);
-static RingSizeT	RingBufferOut(RingBuffer *ringPtr, char *dstPtr,
-			    RingSizeT dstCapacity, int partialCopyOk);
+static Tcl_Size	RingBufferIn(RingBuffer *ringPtr, const char *srcPtr,
+			    Tcl_Size srcLen, int partialCopyOk);
+static Tcl_Size	RingBufferOut(RingBuffer *ringPtr, char *dstPtr,
+			    Tcl_Size dstCapacity, int partialCopyOk);
 static ConsoleHandleInfo *AllocateConsoleHandleInfo(HANDLE consoleHandle,
 			    int permissions);
 static ConsoleHandleInfo *FindConsoleInfo(const ConsoleChannelInfo *);
@@ -331,9 +324,9 @@ static const Tcl_ChannelType consoleChannelType = {
  *------------------------------------------------------------------------
  */
 static void
-RingBufferInit(RingBuffer *ringPtr, RingSizeT capacity)
+RingBufferInit(RingBuffer *ringPtr, Tcl_Size capacity)
 {
-    if (capacity <= 0 || capacity > RingSizeT_MAX) {
+    if (capacity <= 0 || capacity > TCL_SIZE_MAX) {
 	Tcl_Panic("Internal error: invalid ring buffer capacity requested.");
     }
     ringPtr->bufPtr = (char *)ckalloc(capacity);
@@ -384,15 +377,15 @@ RingBufferClear(RingBuffer *ringPtr)
  *
  *------------------------------------------------------------------------
  */
-static RingSizeT
+static Tcl_Size
 RingBufferIn(
     RingBuffer *ringPtr,
     const char *srcPtr, /* Source to be copied */
-    RingSizeT srcLen,	  /* Length of source */
+    Tcl_Size srcLen,	  /* Length of source */
     int partialCopyOk 		  /* If true, partial copy is permitted */
     )
 {
-    RingSizeT freeSpace;
+    Tcl_Size freeSpace;
 
     RINGBUFFER_ASSERT(ringPtr);
 
@@ -407,8 +400,8 @@ RingBufferIn(
 
     if (ringPtr->capacity - ringPtr->start > ringPtr->length) {
 	/* There is room at the back */
-	RingSizeT endSpaceStart = ringPtr->start + ringPtr->length;
-	RingSizeT endSpace      = ringPtr->capacity - endSpaceStart;
+	Tcl_Size endSpaceStart = ringPtr->start + ringPtr->length;
+	Tcl_Size endSpace      = ringPtr->capacity - endSpaceStart;
 	if (endSpace >= srcLen) {
 	    /* Everything fits at the back */
 	    memmove(endSpaceStart + ringPtr->bufPtr, srcPtr, srcLen);
@@ -419,7 +412,7 @@ RingBufferIn(
 	}
     } else {
 	/* No room at the back. Existing data wrap to front. */
-	RingSizeT wrapLen =
+	Tcl_Size wrapLen =
 	    ringPtr->start + ringPtr->length - ringPtr->capacity;
 	memmove(wrapLen + ringPtr->bufPtr, srcPtr, srcLen);
     }
@@ -447,13 +440,13 @@ RingBufferIn(
  *
  *------------------------------------------------------------------------
  */
-static RingSizeT
+static Tcl_Size
 RingBufferOut(RingBuffer *ringPtr,
 	      char *dstPtr,	      /* Buffer for output data. May be NULL */
-	      RingSizeT dstCapacity,  /* Size of buffer */
+	      Tcl_Size dstCapacity,  /* Size of buffer */
 	      int partialCopyOk)      /* If true, return what's available */
 {
-    RingSizeT leadLen;
+    Tcl_Size leadLen;
 
     RINGBUFFER_ASSERT(ringPtr);
 
@@ -477,7 +470,7 @@ RingBufferOut(RingBuffer *ringPtr,
 	}
 	ringPtr->start += dstCapacity;
     } else {
-	RingSizeT wrapLen = dstCapacity - leadLen;
+	Tcl_Size wrapLen = dstCapacity - leadLen;
 	if (dstPtr) {
 	    memmove(dstPtr,
 		    ringPtr->start + ringPtr->bufPtr,
@@ -529,8 +522,8 @@ static DWORD
 ReadConsoleChars(
     HANDLE hConsole,
     WCHAR *lpBuffer,
-    RingSizeT nChars,
-    RingSizeT *nCharsReadPtr)
+    Tcl_Size nChars,
+    Tcl_Size *nCharsReadPtr)
 {
     DWORD nRead;
     BOOL result;
@@ -589,8 +582,8 @@ static DWORD
 WriteConsoleChars(
     HANDLE hConsole,
     const WCHAR *lpBuffer,
-    RingSizeT nChars,
-    RingSizeT *nCharsWrittenPtr)
+    Tcl_Size nChars,
+    Tcl_Size *nCharsWrittenPtr)
 {
     DWORD nCharsWritten;
     BOOL result;
@@ -1090,7 +1083,7 @@ ConsoleInputProc(
 {
     ConsoleChannelInfo *chanInfoPtr = (ConsoleChannelInfo *)instanceData;
     ConsoleHandleInfo *handleInfoPtr;
-    RingSizeT numRead;
+    Tcl_Size numRead;
 
     if (chanInfoPtr->handle == INVALID_HANDLE_VALUE) {
 	return 0; /* EOF */
@@ -1160,7 +1153,7 @@ ConsoleInputProc(
 	    && bufSize > 1         /* Not single byte read */
 	) {
 	    DWORD lastError;
-	    RingSizeT numChars;
+	    Tcl_Size numChars;
 	    ReleaseSRWLockExclusive(&handleInfoPtr->lock);
 	    lastError = ReadConsoleChars(chanInfoPtr->handle,
 					 (WCHAR *)bufPtr,
@@ -1242,7 +1235,7 @@ ConsoleOutputProc(
 {
     ConsoleChannelInfo *chanInfoPtr = (ConsoleChannelInfo *)instanceData;
     ConsoleHandleInfo *handleInfoPtr;
-    RingSizeT numWritten;
+    Tcl_Size numWritten;
 
     *errorCode = 0;
 
@@ -1638,8 +1631,8 @@ ConsoleReaderThread(
     ConsoleHandleInfo *handleInfoPtr = (ConsoleHandleInfo *) arg;
     ConsoleHandleInfo **iterator;
     char inputChars[200]; /* Temporary buffer */
-    RingSizeT inputLen = 0;
-    RingSizeT inputOffset = 0;
+    Tcl_Size inputLen = 0;
+    Tcl_Size inputOffset = 0;
 
     /*
      * Keep looping until one of the following happens.
@@ -1670,7 +1663,7 @@ ConsoleReaderThread(
 	    HANDLE consoleHandle;
 	    if (inputLen > 0) {
 		/* Private buffer has data. Copy it over. */
-		RingSizeT nStored;
+		Tcl_Size nStored;
 
 		assert((inputLen - inputOffset) > 0);
 
@@ -1833,7 +1826,7 @@ ConsoleWriterThread(LPVOID arg)
     ConsoleHandleInfo *handleInfoPtr = (ConsoleHandleInfo *) arg;
     ConsoleHandleInfo **iterator;
     BOOL success;
-    RingSizeT numBytes;
+    Tcl_Size numBytes;
     /*
      * This buffer size has no relation really with the size of the shared
      * buffer. Could be bigger or smaller. Make larger as multiple threads
@@ -1904,7 +1897,7 @@ ConsoleWriterThread(LPVOID arg)
 	ReleaseSRWLockExclusive(&handleInfoPtr->lock);
 	offset = 0;
 	while (numBytes > 0) {
-	    RingSizeT numWChars = numBytes / sizeof(WCHAR);
+	    Tcl_Size numWChars = numBytes / sizeof(WCHAR);
 	    DWORD status;
 	    status = WriteConsoleChars(handleInfoPtr->console,
 				       (WCHAR *)(offset + buffer),
-- 
cgit v0.12


From 8bfaaa8337b18264aac9bcc0f66a70bcc9f2c68d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Apr 2023 13:52:42 +0000
Subject: Simplify Tcl 9 compatibility macro's. No change in functionality.

---
 generic/tcl.decls      | 22 ++++++------
 generic/tclBinary.c    | 16 ++++-----
 generic/tclDecls.h     | 92 ++++++++++++++++++++++++--------------------------
 generic/tclObj.c       |  4 +--
 generic/tclStringObj.c |  4 +--
 generic/tclStubInit.c  | 32 +++++++++---------
 6 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/generic/tcl.decls b/generic/tcl.decls
index daa2f2b..2e5d7b4 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2413,19 +2413,19 @@ declare 649 {
 }
 declare 650 {
     unsigned char *Tcl_GetBytesFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    ptrdiff_t *numBytesPtr)
+	    void *numBytesPtr)
 }
 
 # TIP #481
 declare 651 {
-    char *TclGetStringFromObj(Tcl_Obj *objPtr, ptrdiff_t *lengthPtr)
+    char *TclGetStringFromObj(Tcl_Obj *objPtr, void *lengthPtr)
 }
 declare 652 {
-    unsigned short *TclGetUnicodeFromObj(Tcl_Obj *objPtr, ptrdiff_t *lengthPtr)
+    unsigned short *TclGetUnicodeFromObj(Tcl_Obj *objPtr, void *lengthPtr)
 }
 # Only available in Tcl 8.x, NULL in Tcl 9.0
 declare 653 {
-    unsigned char *TclGetByteArrayFromObj(Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr)
+    unsigned char *TclGetByteArrayFromObj(Tcl_Obj *objPtr, void *numBytesPtr)
 }
 
 # TIP #575
@@ -2462,28 +2462,28 @@ declare 660 {
 # TIP #616
 declare 661 {
     int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
-	    ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr)
+	    void *objcPtr, Tcl_Obj ***objvPtr)
 }
 declare 662 {
     int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
-	    ptrdiff_t *lengthPtr)
+	    void *lengthPtr)
 }
 declare 663 {
-    int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, ptrdiff_t *sizePtr)
+    int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, void *sizePtr)
 }
 declare 664 {
-    int TclSplitList(Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr,
+    int TclSplitList(Tcl_Interp *interp, const char *listStr, void *argcPtr,
 	    const char ***argvPtr)
 }
 declare 665 {
-    void TclSplitPath(const char *path, ptrdiff_t *argcPtr, const char ***argvPtr)
+    void TclSplitPath(const char *path, void *argcPtr, const char ***argvPtr)
 }
 declare 666 {
-    Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr)
+    Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, void *lenPtr)
 }
 declare 667 {
     int TclParseArgsObjv(Tcl_Interp *interp, const Tcl_ArgvInfo *argTable,
-	    ptrdiff_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv)
+	    void *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv)
 }
 
 # TIP #617
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 710ed0b..183d545 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -2,7 +2,7 @@
  * tclBinary.c --
  *
  *	This file contains the implementation of the "binary" Tcl built-in
- *	command and the Tcl value internal representation for binary data.
+ *	command and the Tcl binary data object.
  *
  * Copyright © 1997 Sun Microsystems, Inc.
  * Copyright © 1998-1999 Scriptics Corporation.
@@ -64,7 +64,7 @@ static int		FormatNumber(Tcl_Interp *interp, int type,
 static void		FreeByteArrayInternalRep(Tcl_Obj *objPtr);
 static void		FreeProperByteArrayInternalRep(Tcl_Obj *objPtr);
 static int		GetFormatSpec(const char **formatPtr, char *cmdPtr,
-			    int *countPtr, int *flagsPtr);
+			    Tcl_Size *countPtr, int *flagsPtr);
 static Tcl_Obj *	ScanNumber(unsigned char *buffer, int type,
 			    int flags, Tcl_HashTable **numberCachePtr);
 static int		SetByteArrayFromAny(Tcl_Interp *interp,
@@ -143,7 +143,7 @@ static const EnsembleImplMap decodeMap[] = {
 };
 
 /*
- * The following object types represent an array of bytes. The intent is to
+ * The following Tcl_ObjType represents an array of bytes. The intent is to
  * allow arbitrary binary data to pass through Tcl as a Tcl value without loss
  * or damage. Such values are useful for things like encoded strings or Tk
  * images to name just two.
@@ -457,7 +457,7 @@ unsigned char *
 Tcl_GetBytesFromObj(
     Tcl_Interp *interp,		/* For error reporting */
     Tcl_Obj *objPtr,		/* Value to extract from */
-    ptrdiff_t *numBytesPtr)	/* If non-NULL, write the number of bytes
+    void *numBytesPtr)	/* If non-NULL, write the number of bytes
 				 * in the array here */
 {
     ByteArray *baPtr;
@@ -487,7 +487,7 @@ Tcl_GetBytesFromObj(
     baPtr = GET_BYTEARRAY(irPtr);
 
     if (numBytesPtr != NULL) {
-	*numBytesPtr = baPtr->used;
+	*(ptrdiff_t *)numBytesPtr = baPtr->used;
     }
     return baPtr->bytes;
 }
@@ -539,7 +539,7 @@ Tcl_GetByteArrayFromObj(
 unsigned char *
 TclGetByteArrayFromObj(
     Tcl_Obj *objPtr,		/* The ByteArray object. */
-    ptrdiff_t *numBytesPtr)	/* If non-NULL, write the number of bytes
+    void *numBytesPtr)	/* If non-NULL, write the number of bytes
 				 * in the array here */
 {
     ByteArray *baPtr;
@@ -556,8 +556,8 @@ TclGetByteArrayFromObj(
     baPtr = GET_BYTEARRAY(irPtr);
 
     if (numBytesPtr != NULL) {
-	/* Make sure we return a value between 0 and UINT_MAX-1, or (size_t)-1 */
-	*numBytesPtr = ((ptrdiff_t)(unsigned int)(baPtr->used + 1)) - 1;
+	/* Make sure we return a value between 0 and UINT_MAX-1, or (ptrdiff_t)-1 */
+	*(ptrdiff_t *)numBytesPtr = ((ptrdiff_t)(unsigned int)(baPtr->used + 1)) - 1;
     }
     return baPtr->bytes;
 }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index d4e4381..9602e07 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1936,16 +1936,15 @@ EXTERN unsigned char *	TclGetBytesFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *numBytesPtr);
 /* 650 */
 EXTERN unsigned char *	Tcl_GetBytesFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr);
+				Tcl_Obj *objPtr, void *numBytesPtr);
 /* 651 */
-EXTERN char *		TclGetStringFromObj(Tcl_Obj *objPtr,
-				ptrdiff_t *lengthPtr);
+EXTERN char *		TclGetStringFromObj(Tcl_Obj *objPtr, void *lengthPtr);
 /* 652 */
 EXTERN unsigned short *	 TclGetUnicodeFromObj(Tcl_Obj *objPtr,
-				ptrdiff_t *lengthPtr);
+				void *lengthPtr);
 /* 653 */
 EXTERN unsigned char *	TclGetByteArrayFromObj(Tcl_Obj *objPtr,
-				ptrdiff_t *numBytesPtr);
+				void *numBytesPtr);
 /* 654 */
 EXTERN int		Tcl_UtfCharComplete(const char *src, Tcl_Size length);
 /* 655 */
@@ -1971,27 +1970,26 @@ EXTERN int		Tcl_AsyncMarkFromSignal(Tcl_AsyncHandler async,
 				int sigNumber);
 /* 661 */
 EXTERN int		TclListObjGetElements(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, ptrdiff_t *objcPtr,
+				Tcl_Obj *listPtr, void *objcPtr,
 				Tcl_Obj ***objvPtr);
 /* 662 */
 EXTERN int		TclListObjLength(Tcl_Interp *interp,
-				Tcl_Obj *listPtr, ptrdiff_t *lengthPtr);
+				Tcl_Obj *listPtr, void *lengthPtr);
 /* 663 */
 EXTERN int		TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-				ptrdiff_t *sizePtr);
+				void *sizePtr);
 /* 664 */
 EXTERN int		TclSplitList(Tcl_Interp *interp, const char *listStr,
-				ptrdiff_t *argcPtr, const char ***argvPtr);
+				void *argcPtr, const char ***argvPtr);
 /* 665 */
-EXTERN void		TclSplitPath(const char *path, ptrdiff_t *argcPtr,
+EXTERN void		TclSplitPath(const char *path, void *argcPtr,
 				const char ***argvPtr);
 /* 666 */
-EXTERN Tcl_Obj *	TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr);
+EXTERN Tcl_Obj *	TclFSSplitPath(Tcl_Obj *pathPtr, void *lenPtr);
 /* 667 */
 EXTERN int		TclParseArgsObjv(Tcl_Interp *interp,
-				const Tcl_ArgvInfo *argTable,
-				ptrdiff_t *objcPtr, Tcl_Obj *const *objv,
-				Tcl_Obj ***remObjv);
+				const Tcl_ArgvInfo *argTable, void *objcPtr,
+				Tcl_Obj *const *objv, Tcl_Obj ***remObjv);
 /* 668 */
 EXTERN Tcl_Size		Tcl_UniCharLen(const int *uniStr);
 /* 669 */
@@ -2738,10 +2736,10 @@ typedef struct TclStubs {
     char * (*tcl_UniCharToUtfDString) (const int *uniStr, Tcl_Size uniLength, Tcl_DString *dsPtr); /* 647 */
     int * (*tcl_UtfToUniCharDString) (const char *src, Tcl_Size length, Tcl_DString *dsPtr); /* 648 */
     unsigned char * (*tclGetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *numBytesPtr); /* 649 */
-    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr); /* 650 */
-    char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, ptrdiff_t *lengthPtr); /* 651 */
-    unsigned short * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, ptrdiff_t *lengthPtr); /* 652 */
-    unsigned char * (*tclGetByteArrayFromObj) (Tcl_Obj *objPtr, ptrdiff_t *numBytesPtr); /* 653 */
+    unsigned char * (*tcl_GetBytesFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, void *numBytesPtr); /* 650 */
+    char * (*tclGetStringFromObj) (Tcl_Obj *objPtr, void *lengthPtr); /* 651 */
+    unsigned short * (*tclGetUnicodeFromObj) (Tcl_Obj *objPtr, void *lengthPtr); /* 652 */
+    unsigned char * (*tclGetByteArrayFromObj) (Tcl_Obj *objPtr, void *numBytesPtr); /* 653 */
     int (*tcl_UtfCharComplete) (const char *src, Tcl_Size length); /* 654 */
     const char * (*tcl_UtfNext) (const char *src); /* 655 */
     const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
@@ -2749,13 +2747,13 @@ typedef struct TclStubs {
     int (*tcl_ExternalToUtfDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 658 */
     int (*tcl_UtfToExternalDStringEx) (Tcl_Interp *interp, Tcl_Encoding encoding, const char *src, Tcl_Size srcLen, int flags, Tcl_DString *dsPtr, Tcl_Size *errorLocationPtr); /* 659 */
     int (*tcl_AsyncMarkFromSignal) (Tcl_AsyncHandler async, int sigNumber); /* 660 */
-    int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
-    int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, ptrdiff_t *lengthPtr); /* 662 */
-    int (*tclDictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, ptrdiff_t *sizePtr); /* 663 */
-    int (*tclSplitList) (Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr, const char ***argvPtr); /* 664 */
-    void (*tclSplitPath) (const char *path, ptrdiff_t *argcPtr, const char ***argvPtr); /* 665 */
-    Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, ptrdiff_t *lenPtr); /* 666 */
-    int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, ptrdiff_t *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
+    int (*tclListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, void *objcPtr, Tcl_Obj ***objvPtr); /* 661 */
+    int (*tclListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, void *lengthPtr); /* 662 */
+    int (*tclDictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, void *sizePtr); /* 663 */
+    int (*tclSplitList) (Tcl_Interp *interp, const char *listStr, void *argcPtr, const char ***argvPtr); /* 664 */
+    void (*tclSplitPath) (const char *path, void *argcPtr, const char ***argvPtr); /* 665 */
+    Tcl_Obj * (*tclFSSplitPath) (Tcl_Obj *pathPtr, void *lenPtr); /* 666 */
+    int (*tclParseArgsObjv) (Tcl_Interp *interp, const Tcl_ArgvInfo *argTable, void *objcPtr, Tcl_Obj *const *objv, Tcl_Obj ***remObjv); /* 667 */
     Tcl_Size (*tcl_UniCharLen) (const int *uniStr); /* 668 */
     Tcl_Size (*tclNumUtfChars) (const char *src, Tcl_Size length); /* 669 */
     Tcl_Size (*tclGetCharLength) (Tcl_Obj *objPtr); /* 670 */
@@ -4394,7 +4392,7 @@ extern const TclStubs *tclStubsPtr;
 #endif
 #if defined(USE_TCL_STUBS)
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tclGetBytesFromObj(interp, objPtr, (int *)(sizePtr)) : tclStubsPtr->tcl_GetBytesFromObj(interp, objPtr, (sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	(tclStubsPtr->tcl_GetIndexFromObjStruct((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
@@ -4405,15 +4403,15 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetStringFromObj(objPtr, (sizePtr)))
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetByteArrayFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetByteArrayFromObj(objPtr, (sizePtr)))
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)(sizePtr)) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (sizePtr)))
 #endif
 #else
 #define Tcl_GetBytesFromObj(interp, objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (TclGetBytesFromObj)(interp, objPtr, (int *)(sizePtr)) : (Tcl_GetBytesFromObj)(interp, objPtr, (sizePtr)))
 #define Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr) \
 	((Tcl_GetIndexFromObjStruct)((interp), (objPtr), (tablePtr), (offset), (msg), (flags)|(int)(sizeof(*(indexPtr))<<1), (indexPtr)))
 #define Tcl_GetBooleanFromObj(interp, objPtr, boolPtr) \
@@ -4424,11 +4422,11 @@ extern const TclStubs *tclStubsPtr;
 	Tcl_GetBool(interp, src, (TCL_NULL_OK-2)&(int)sizeof((*(boolPtr))), (char *)(boolPtr)))
 #ifdef TCL_NO_DEPRECATED
 #define Tcl_GetStringFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)(sizePtr)) : (TclGetStringFromObj)(objPtr, (sizePtr)))
 #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetByteArrayFromObj)(objPtr, (int *)(sizePtr)) : TclGetByteArrayFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetByteArrayFromObj)(objPtr, (int *)(sizePtr)) : TclGetByteArrayFromObj(objPtr, (sizePtr)))
 #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \
-	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetUnicodeFromObj)(objPtr, (int *)(sizePtr)) : TclGetUnicodeFromObj(objPtr, (ptrdiff_t *)(sizePtr)))
+	(sizeof(*(sizePtr)) <= sizeof(int) ? (Tcl_GetUnicodeFromObj)(objPtr, (int *)(sizePtr)) : TclGetUnicodeFromObj(objPtr, (sizePtr)))
 #endif
 #endif
 
@@ -4485,31 +4483,31 @@ extern const TclStubs *tclStubsPtr;
 #   undef Tcl_ListObjGetElements
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
-		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (ptrdiff_t *)(void *)(objcPtr), (objvPtr)))
+		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (void *)(objcPtr), (objvPtr)))
 #   undef Tcl_ListObjLength
 #   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)) \
-		: tclStubsPtr->tclListObjLength((interp), (listPtr), (ptrdiff_t *)(void *)(lengthPtr)))
+		: tclStubsPtr->tclListObjLength((interp), (listPtr), (void *)(lengthPtr)))
 #   undef Tcl_DictObjSize
 #   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)) \
-		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (ptrdiff_t *)(void *)(sizePtr)))
+		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (void *)(sizePtr)))
 #   undef Tcl_SplitList
 #   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitList((interp), (listStr), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitList((interp), (listStr), (void *)(argcPtr), (argvPtr)))
 #   undef Tcl_SplitPath
 #   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitPath((path), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitPath((path), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitPath((path), (void *)(argcPtr), (argvPtr)))
 #   undef Tcl_FSSplitPath
 #   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_FSSplitPath((pathPtr), (int *)(void *)(lenPtr)) \
-		: tclStubsPtr->tclFSSplitPath((pathPtr), (ptrdiff_t *)(void *)(lenPtr)))
+		: tclStubsPtr->tclFSSplitPath((pathPtr), (void *)(lenPtr)))
 #   undef Tcl_ParseArgsObjv
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
-		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (ptrdiff_t *)(void *)(objcPtr), (objv), (remObjv)))
+		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (void *)(objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
 #else
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
@@ -4527,25 +4525,25 @@ extern const TclStubs *tclStubsPtr;
 #ifdef TCL_NO_DEPRECATED
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? (Tcl_ListObjGetElements)((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
-		: TclListObjGetElements((interp), (listPtr), (ptrdiff_t *)(void *)(objcPtr), (objvPtr)))
+		: TclListObjGetElements((interp), (listPtr), (objcPtr), (objvPtr)))
 #   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
 		? (Tcl_ListObjLength)((interp), (listPtr), (int *)(void *)(lengthPtr)) \
-		: TclListObjLength((interp), (listPtr), (ptrdiff_t *)(void *)(lengthPtr)))
+		: TclListObjLength((interp), (listPtr), (lengthPtr)))
 #   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
 		? (Tcl_DictObjSize)((interp), (dictPtr), (int *)(void *)(sizePtr)) \
-		: TclDictObjSize((interp), (dictPtr), (ptrdiff_t *)(void *)(sizePtr)))
+		: TclDictObjSize((interp), (dictPtr), (sizePtr)))
 #   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? (Tcl_SplitList)((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitList((interp), (listStr), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
+		: TclSplitList((interp), (listStr), (argcPtr), (argvPtr)))
 #   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? (Tcl_SplitPath)((path), (int *)(void *)(argcPtr), (argvPtr)) \
-		: TclSplitPath((path), (ptrdiff_t *)(void *)(argcPtr), (argvPtr)))
+		: TclSplitPath((path), (argcPtr), (argvPtr)))
 #   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
 		? (Tcl_FSSplitPath)((pathPtr), (int *)(void *)(lenPtr)) \
-		: TclFSSplitPath((pathPtr), (ptrdiff_t *)(void *)(lenPtr)))
+		: TclFSSplitPath((pathPtr), (lenPtr)))
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? (Tcl_ParseArgsObjv)((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
-		: TclParseArgsObjv((interp), (argTable), (ptrdiff_t *)(void *)(objcPtr), (objv), (remObjv)))
+		: TclParseArgsObjv((interp), (argTable), (objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
 #endif
 
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 7c433d1..933138c 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1726,7 +1726,7 @@ char *
 TclGetStringFromObj(
     Tcl_Obj *objPtr,	/* Object whose string rep byte pointer should
 				 * be returned. */
-    ptrdiff_t *lengthPtr)	/* If non-NULL, the location where the string
+    void *lengthPtr)	/* If non-NULL, the location where the string
 				 * rep's byte array length should * be stored.
 				 * If NULL, no length is stored. */
 {
@@ -1756,7 +1756,7 @@ TclGetStringFromObj(
 	}
     }
     if (lengthPtr != NULL) {
-	*lengthPtr = ((ptrdiff_t)(unsigned)(objPtr->length + 1)) - 1;
+	*(ptrdiff_t *)lengthPtr = ((ptrdiff_t)(unsigned)(objPtr->length + 1)) - 1;
     }
     return objPtr->bytes;
 }
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 010d822..d3a17d1 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -988,7 +988,7 @@ unsigned short *
 TclGetUnicodeFromObj(
     Tcl_Obj *objPtr,		/* The object to find the unicode string
 				 * for. */
-    ptrdiff_t *lengthPtr)	/* If non-NULL, the location where the string
+    void *lengthPtr)	/* If non-NULL, the location where the string
 				 * rep's unichar length should be stored. If
 				 * NULL, no length is stored. */
 {
@@ -1002,7 +1002,7 @@ TclGetUnicodeFromObj(
     stringPtr = GET_STRING(objPtr);
 
     if (lengthPtr != NULL) {
-	*lengthPtr = stringPtr->numChars;
+	*(ptrdiff_t *)lengthPtr = stringPtr->numChars;
     }
     return stringPtr->unicode;
 }
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index e09d74d..e2d52b9 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -138,67 +138,67 @@ static const char *TclUtfPrev(const char *src, const char *start) {
 }
 
 int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
-    ptrdiff_t *objcPtr, Tcl_Obj ***objvPtr) {
+    void *objcPtr, Tcl_Obj ***objvPtr) {
     int n, result = Tcl_ListObjGetElements(interp, listPtr, &n, objvPtr);
     if ((result == TCL_OK) && objcPtr) {
-	*objcPtr = n;
+	*(ptrdiff_t *)objcPtr = n;
     }
     return result;
 }
 int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr,
-    ptrdiff_t *lengthPtr) {
+    void *lengthPtr) {
     int n;
     int result = Tcl_ListObjLength(interp, listPtr, &n);
     if ((result == TCL_OK) && lengthPtr) {
-	*lengthPtr = n;
+	*(ptrdiff_t *)lengthPtr = n;
     }
     return result;
 }
 int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-	ptrdiff_t *sizePtr) {
+	void *sizePtr) {
     int n, result = Tcl_DictObjSize(interp, dictPtr, &n);
     if ((result == TCL_OK) && sizePtr) {
-	*sizePtr = n;
+	*(ptrdiff_t *)sizePtr = n;
     }
     return result;
 }
-int TclSplitList(Tcl_Interp *interp, const char *listStr, ptrdiff_t *argcPtr,
+int TclSplitList(Tcl_Interp *interp, const char *listStr, void *argcPtr,
 	const char ***argvPtr) {
     int n;
     int result = Tcl_SplitList(interp, listStr, &n, argvPtr);
     if ((result == TCL_OK) && argcPtr) {
-	*argcPtr = n;
+	*(ptrdiff_t *)argcPtr = n;
     }
     return result;
 }
-void TclSplitPath(const char *path, ptrdiff_t *argcPtr, const char ***argvPtr) {
+void TclSplitPath(const char *path, void *argcPtr, const char ***argvPtr) {
     int n;
     Tcl_SplitPath(path, &n, argvPtr);
     if (argcPtr) {
-	*argcPtr = n;
+	*(ptrdiff_t *)argcPtr = n;
     }
 }
-Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, ptrdiff_t *lenPtr) {
+Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, void *lenPtr) {
     int n;
     Tcl_Obj *result = Tcl_FSSplitPath(pathPtr, &n);
     if (result && lenPtr) {
-	*lenPtr = n;
+	*(ptrdiff_t *)lenPtr = n;
     }
     return result;
 }
 int TclParseArgsObjv(Tcl_Interp *interp,
-	const Tcl_ArgvInfo *argTable, ptrdiff_t *objcPtr, Tcl_Obj *const *objv,
+	const Tcl_ArgvInfo *argTable, void *objcPtr, Tcl_Obj *const *objv,
 	Tcl_Obj ***remObjv) {
     int n, result;
-    if (*objcPtr > INT_MAX) {
+    if (*(ptrdiff_t *)objcPtr > INT_MAX) {
 	if (interp) {
 	    Tcl_AppendResult(interp, "Tcl_ParseArgsObjv cannot handle *objcPtr > INT_MAX", NULL);
 	}
 	return TCL_ERROR;
     }
-    n = (int)*objcPtr;
+    n = *(ptrdiff_t *)objcPtr;
     result = Tcl_ParseArgsObjv(interp, argTable, &n, objv, remObjv);
-    *objcPtr = n;
+    *(ptrdiff_t *)objcPtr = n;
     return result;
 }
 
-- 
cgit v0.12


From ad7deae63486dd51cf1b388dbb095d0f0419aa34 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 28 Apr 2023 15:02:09 +0000
Subject: Remove some (void *) typecasts, which are no longer necessary

---
 generic/tclDecls.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 9602e07..f9b36ba 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4483,33 +4483,33 @@ extern const TclStubs *tclStubsPtr;
 #   undef Tcl_ListObjGetElements
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
-		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (void *)(objcPtr), (objvPtr)))
+		: tclStubsPtr->tclListObjGetElements((interp), (listPtr), (objcPtr), (objvPtr)))
 #   undef Tcl_ListObjLength
 #   define Tcl_ListObjLength(interp, listPtr, lengthPtr) (sizeof(*(lengthPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ListObjLength((interp), (listPtr), (int *)(void *)(lengthPtr)) \
-		: tclStubsPtr->tclListObjLength((interp), (listPtr), (void *)(lengthPtr)))
+		: tclStubsPtr->tclListObjLength((interp), (listPtr), (lengthPtr)))
 #   undef Tcl_DictObjSize
 #   define Tcl_DictObjSize(interp, dictPtr, sizePtr) (sizeof(*(sizePtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_DictObjSize((interp), (dictPtr), (int *)(void *)(sizePtr)) \
-		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (void *)(sizePtr)))
+		: tclStubsPtr->tclDictObjSize((interp), (dictPtr), (sizePtr)))
 #   undef Tcl_SplitList
 #   define Tcl_SplitList(interp, listStr, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitList((interp), (listStr), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitList((interp), (listStr), (void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitList((interp), (listStr), (argcPtr), (argvPtr)))
 #   undef Tcl_SplitPath
 #   define Tcl_SplitPath(path, argcPtr, argvPtr) (sizeof(*(argcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_SplitPath((path), (int *)(void *)(argcPtr), (argvPtr)) \
-		: tclStubsPtr->tclSplitPath((path), (void *)(argcPtr), (argvPtr)))
+		: tclStubsPtr->tclSplitPath((path), (argcPtr), (argvPtr)))
 #   undef Tcl_FSSplitPath
 #   define Tcl_FSSplitPath(pathPtr, lenPtr) (sizeof(*(lenPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_FSSplitPath((pathPtr), (int *)(void *)(lenPtr)) \
-		: tclStubsPtr->tclFSSplitPath((pathPtr), (void *)(lenPtr)))
+		: tclStubsPtr->tclFSSplitPath((pathPtr), (lenPtr)))
 #   undef Tcl_ParseArgsObjv
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
-		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (void *)(objcPtr), (objv), (remObjv)))
+		: tclStubsPtr->tclParseArgsObjv((interp), (argTable), (objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
-#else
+#else /* !defined(USE_TCL_STUBS) */
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
 		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
 		: (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_Char16ToUtfDString)
@@ -4545,7 +4545,7 @@ extern const TclStubs *tclStubsPtr;
 		? (Tcl_ParseArgsObjv)((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
 		: TclParseArgsObjv((interp), (argTable), (objcPtr), (objv), (remObjv)))
 #endif /* TCL_NO_DEPRECATED */
-#endif
+#endif /* defined(USE_TCL_STUBS) */
 
 /*
  * Deprecated Tcl procedures:
-- 
cgit v0.12


From 1645895629e813e4fbabf9d91e4b6077827ebab0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 29 Apr 2023 15:20:12 +0000
Subject: Eliminate ListSizeT_MAX, since it's the same as TCL_SIZE_MAX

---
 generic/tclArithSeries.c |  2 +-
 generic/tclInt.h         | 12 +-----------
 generic/tclListObj.c     | 10 +++++-----
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
index 0419841..632943a 100755
--- a/generic/tclArithSeries.c
+++ b/generic/tclArithSeries.c
@@ -349,7 +349,7 @@ TclNewArithSeriesObj(
 	}
     }
 
-    if (TCL_MAJOR_VERSION < 9 && len > ListSizeT_MAX) {
+    if (len > TCL_SIZE_MAX) {
 	Tcl_SetObjResult(
 	    interp,
 	    Tcl_NewStringObj("max length of a Tcl list exceeded", -1));
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 1481b5c..2d3a0fc 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2440,16 +2440,6 @@ typedef enum TclEolTranslation {
 #define TCL_INVOKE_NO_UNKNOWN	(1<<1)
 #define TCL_INVOKE_NO_TRACEBACK	(1<<2)
 
-#if TCL_MAJOR_VERSION > 8
-/*
- * SSIZE_MAX, NOT SIZE_MAX as negative differences need to be expressed
- * between values of the Tcl_Size type so limit the range to signed
- */
-#   define ListSizeT_MAX ((Tcl_Size)PTRDIFF_MAX)
-#else
-#   define ListSizeT_MAX INT_MAX
-#endif
-
 /*
  * ListStore --
  *
@@ -2490,7 +2480,7 @@ typedef struct ListStore {
 
 /* Max number of elements that can be contained in a list */
 #define LIST_MAX                                               \
-    ((Tcl_Size)(((size_t)ListSizeT_MAX - offsetof(ListStore, slots)) \
+    ((Tcl_Size)(((size_t)TCL_SIZE_MAX - offsetof(ListStore, slots)) \
 		   / sizeof(Tcl_Obj *)))
 /* Memory size needed for a ListStore to hold numSlots_ elements */
 #define LIST_SIZE(numSlots_) \
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index a850695..bb13961 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2101,12 +2101,12 @@ Tcl_ListObjReplace(
     }
     if (numToDelete < 0) {
 	numToDelete = 0;
-    } else if (first > ListSizeT_MAX - numToDelete /* Handle integer overflow */
+    } else if (first > LIST_MAX - numToDelete /* Handle integer overflow */
              || origListLen < first + numToDelete) {
 	numToDelete = origListLen - first;
     }
 
-    if (numToInsert > ListSizeT_MAX - (origListLen - numToDelete)) {
+    if (numToInsert > LIST_MAX - (origListLen - numToDelete)) {
 	return ListLimitExceededError(interp);
     }
 
@@ -2567,7 +2567,7 @@ TclLindexList(
      * see TIP#22 and TIP#33 for the details.
      */
     if (!TclHasInternalRep(argObj, &tclListType)
-	&& TclGetIntForIndexM(NULL, argObj, ListSizeT_MAX - 1, &index)
+	&& TclGetIntForIndexM(NULL, argObj, TCL_SIZE_MAX - 1, &index)
 	       == TCL_OK) {
 	/*
 	 * argPtr designates a single index.
@@ -2693,7 +2693,7 @@ TclLindexFlat(
 
 		while (++i < indexCount) {
 		    if (TclGetIntForIndexM(
-			    interp, indexArray[i], ListSizeT_MAX - 1, &index)
+			    interp, indexArray[i], TCL_SIZE_MAX - 1, &index)
 			!= TCL_OK) {
 			Tcl_DecrRefCount(sublistCopy);
 			return NULL;
@@ -2758,7 +2758,7 @@ TclLsetList(
      */
 
     if (!TclHasInternalRep(indexArgObj, &tclListType)
-	&& TclGetIntForIndexM(NULL, indexArgObj, ListSizeT_MAX - 1, &index)
+	&& TclGetIntForIndexM(NULL, indexArgObj, TCL_SIZE_MAX - 1, &index)
 	       == TCL_OK) {
 	/* indexArgPtr designates a single index. */
         /* T:listrep-1.{2.1,12.1,15.1,19.1},2.{2.3,9.3,10.1,13.1,16.1}, 3.{4,5,6}.3 */
-- 
cgit v0.12


From 10c71dc8b9b6b31ccb669be71f22adafdddfce6e Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 1 May 2023 13:31:30 +0000
Subject: Use modern copyright symbol, in line with rest of code

---
 doc/configurable.n | 2 +-
 tests/ooProp.test  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/configurable.n b/doc/configurable.n
index 9a2a478..dd1e09e 100644
--- a/doc/configurable.n
+++ b/doc/configurable.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2019 Donal K. Fellows
+'\" Copyright © 2019 Donal K. Fellows
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/tests/ooProp.test b/tests/ooProp.test
index fd77997..8120f88 100644
--- a/tests/ooProp.test
+++ b/tests/ooProp.test
@@ -3,7 +3,7 @@
 # Sourcing this file into Tcl runs the tests and generates output for errors.
 # No output means no errors were found.
 #
-# Copyright (c) 2019-2020 Donal K. Fellows
+# Copyright © 2019-2020 Donal K. Fellows
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
-- 
cgit v0.12


From 75554201664b7e701f13d53c97aa385cd1ff0114 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 1 May 2023 14:07:59 +0000
Subject: Add doc comments, fix a typo in a manpage

---
 doc/configurable.n  |  2 +-
 generic/tclOOCall.c | 82 +++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/doc/configurable.n b/doc/configurable.n
index dd1e09e..6477894 100644
--- a/doc/configurable.n
+++ b/doc/configurable.n
@@ -62,7 +62,7 @@ If passed no additional arguments, the \fBconfigure\fR method returns an
 alphabetically sorted dictionary of all \fIreadable\fR and \fIread-write\fR
 properties and their current values.
 .PP
-If passed a single addiional argument, that argument to the \fBconfigure\fR
+If passed a single additional argument, that argument to the \fBconfigure\fR
 method must be the name of a property to read (or an unambiguous prefix
 thereof); its value is returned.
 .PP
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 5a0eeea..57f8860 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -2110,11 +2110,24 @@ AddDefinitionNamespaceToChain(
     definePtr->num++;
 }
 
+/*
+ * ----------------------------------------------------------------------
+ *
+ * FindClassProps --
+ *
+ *	Discover the properties known to a class and its superclasses.
+ *	The property names become the keys in the accumulator hash table
+ *	(which is used as a set).
+ *
+ * ----------------------------------------------------------------------
+ */
+
 static void
 FindClassProps(
-    Class *clsPtr,
-    int writable,
-    Tcl_HashTable *accumulator)
+    Class *clsPtr,		/* The object to inspect. Must exist. */
+    int writable,		/* Whether we're after the readable or writable
+				 * property set. */
+    Tcl_HashTable *accumulator)	/* Where to gather the names. */
 {
     int i, dummy;
     Tcl_Obj *propName;
@@ -2148,11 +2161,24 @@ FindClassProps(
     }
 }
 
+/*
+ * ----------------------------------------------------------------------
+ *
+ * FindObjectProps --
+ *
+ *	Discover the properties known to an object and all its classes.
+ *	The property names become the keys in the accumulator hash table
+ *	(which is used as a set).
+ *
+ * ----------------------------------------------------------------------
+ */
+
 static void
 FindObjectProps(
-    Object *oPtr,
-    int writable,
-    Tcl_HashTable *accumulator)
+    Object *oPtr,		/* The object to inspect. Must exist. */
+    int writable,		/* Whether we're after the readable or writable
+				 * property set. */
+    Tcl_HashTable *accumulator)	/* Where to gather the names. */
 {
     int i, dummy;
     Tcl_Obj *propName;
@@ -2173,11 +2199,27 @@ FindObjectProps(
     FindClassProps(oPtr->selfCls, writable, accumulator);
 }
 
+/*
+ * ----------------------------------------------------------------------
+ *
+ * TclOOGetAllClassProperties --
+ *
+ *	Get the list of all properties known to a class, including to its
+ *	superclasses. Manages a cache so this operation is usually cheap.
+ *	The order of properties in the resulting list is undefined.
+ *
+ * ----------------------------------------------------------------------
+ */
+
 Tcl_Obj *
 TclOOGetAllClassProperties(
-    Class *clsPtr,
-    int writable,
-    int *allocated)
+    Class *clsPtr,		/* The class to inspect. Must exist. */
+    int writable,		/* Whether to get writable properties. If
+				 * false, readable properties will be returned
+				 * instead. */
+    int *allocated)		/* Address of variable to set to true if a
+				 * Tcl_Obj was allocated and may be safely
+				 * modified by the caller. */
 {
     Tcl_HashTable hashTable;
     FOREACH_HASH_DECLS;
@@ -2239,11 +2281,27 @@ TclOOGetAllClassProperties(
     return result;
 }
 
+/*
+ * ----------------------------------------------------------------------
+ *
+ * TclOOGetAllObjectProperties --
+ *
+ *	Get the list of all properties known to a object, including to its
+ *	classes. Manages a cache so this operation is usually cheap.
+ *	The order of properties in the resulting list is undefined.
+ *
+ * ----------------------------------------------------------------------
+ */
+
 Tcl_Obj *
 TclOOGetAllObjectProperties(
-    Object *oPtr,
-    int writable,
-    int *allocated)
+    Object *oPtr,		/* The object to inspect. Must exist. */
+    int writable,		/* Whether to get writable properties. If
+				 * false, readable properties will be returned
+				 * instead. */
+    int *allocated)		/* Address of variable to set to true if a
+				 * Tcl_Obj was allocated and may be safely
+				 * modified by the caller. */
 {
     Tcl_HashTable hashTable;
     FOREACH_HASH_DECLS;
-- 
cgit v0.12


From fea912c676a71b362b8c7d77e3f4242e374de1bb Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 1 May 2023 15:08:08 +0000
Subject: Remove IDE guff

---
 .project | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.project b/.project
index 43e03b1..eddd834 100644
--- a/.project
+++ b/.project
@@ -5,23 +5,7 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 </projectDescription>
-- 
cgit v0.12


From 43b5729ddf6c0793a6f6bb7c35dd30f4ea9ece17 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 2 May 2023 16:08:30 +0000
Subject: Fix [784befb0ba] - tailcall crash

---
 generic/tclCompCmdsSZ.c | 2 +-
 tests/tailcall.test     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index 383abc2..355c741 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -2618,7 +2618,7 @@ TclCompileTailcallCmd(
     Tcl_Token *tokenPtr = parsePtr->tokenPtr;
     int i;
 
-    if (parsePtr->numWords < 2 || parsePtr->numWords > 256
+    if (parsePtr->numWords < 2 || parsePtr->numWords >= 256
 	    || envPtr->procPtr == NULL) {
 	return TCL_ERROR;
     }
diff --git a/tests/tailcall.test b/tests/tailcall.test
index 3704333..35a7268 100644
--- a/tests/tailcall.test
+++ b/tests/tailcall.test
@@ -708,6 +708,13 @@ test tailcall-14.1-bc {{in a deleted namespace} {byte compiled}} -body {
     }
 } -returnCodes 1 -result {namespace "::ns" not found}
 
+test tailcall-bug-784befb0ba {tailcall crash with 254 args} -body {
+    proc tccrash args {llength $args}	
+    # Must be EXACTLY 254 for crash
+    proc p {} [list tailcall tccrash {*}[lrepeat 254 x]]
+    p
+} -result 254
+
 # cleanup
 ::tcltest::cleanupTests
 
-- 
cgit v0.12


From df75b9195608f60545ced2c165c87ad65288c66d Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 2 May 2023 16:33:39 +0000
Subject: Fix [ab123cfd3d] - scan ubsan. Tx chrstphrchvz for patch

---
 generic/tclScan.c | 15 +++++++++------
 tests/scan.test   |  5 +++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/generic/tclScan.c b/generic/tclScan.c
index f37f596..ba3d90f 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -305,7 +305,7 @@ ValidateFormat(
 	     * format string.
 	     */
 
-	    value = strtoul(format-1, &end, 10);	/* INTL: "C" locale. */
+	    unsigned long ul = strtoul(format-1, &end, 10);	/* INTL: "C" locale. */
 	    if (*end != '$') {
 		goto notXpg;
 	    }
@@ -315,17 +315,20 @@ ValidateFormat(
 	    if (gotSequential) {
 		goto mixedXPG;
 	    }
-	    objIndex = value - 1;
-	    if ((objIndex < 0) || (numVars && (objIndex >= numVars))) {
+	    if (ul == 0 || ul >= INT_MAX) {
+		goto badIndex;
+	    }
+	    objIndex = (int) ul - 1;
+	    if (numVars && (objIndex >= numVars)) {
 		goto badIndex;
 	    } else if (numVars == 0) {
 		/*
 		 * In the case where no vars are specified, the user can
 		 * specify %9999$ legally, so we have to consider special
-		 * rules for growing the assign array. 'value' is guaranteed
-		 * to be > 0.
+		 * rules for growing the assign array. 'ul' is guaranteed
+		 * to be > 0 and < INT_MAX as per checks above.
 		 */
-		xpgSize = (xpgSize > value) ? xpgSize : value;
+		xpgSize = (xpgSize > (int)ul) ? xpgSize : (int)ul;
 	    }
 	    goto xpgCheckDone;
 	}
diff --git a/tests/scan.test b/tests/scan.test
index 300335e..cd2ba63 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -852,6 +852,11 @@ test scan-13.8 {Tcl_ScanObjCmd, inline XPG case lots of arguments} {
     set msg [scan "10 20 30" {%100$d %5$d %200$d}]
     list [llength $msg] [lindex $msg 99] [lindex $msg 4] [lindex $msg 199]
 } {200 10 20 30}
+test scan-13.9 {Tcl_ScanObjCmd, inline XPG case limit error} -body {
+    # Note this applies to 64-bit builds as well so long as max number of
+    # command line arguments allowed for scan command is INT_MAX
+    scan abc {%2147483648$s}
+} -result {"%n$" argument index out of range} -returnCodes error
 
 # scan infinities - not working
 
-- 
cgit v0.12


From 7b688527d719054d95ce6e5313830d6dd9d50a25 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Wed, 3 May 2023 03:31:49 +0000
Subject: Changed CHANNEL_PROFILE_* to ENCODING_PROFILE_* and moved out of
 tclIO.h. See below.

For whatever reason, these macros were renamed and moved to tclIO.h post-660.
This is inappropriate as those macros deal with *encoding* flags, not *channel*
flags and have relevance outside of I/O making their renaming inappropriate. Further
putting them in tclIO.h forces inclusion of that header in modules that do not
otherwise need that header.
---
 generic/tcl.h         |  6 +++++-
 generic/tclCmdAH.c    |  2 +-
 generic/tclEncoding.c | 13 ++++++-------
 generic/tclIO.c       | 24 ++++++++++++------------
 generic/tclIO.h       |  7 -------
 generic/tclInt.h      | 15 +++++++++++++++
 6 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index f8a34c0..318c7a1 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2176,7 +2176,11 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_CHAR_LIMIT		0x10
 /* Internal use bits, do not define bits in this space. See above comment */
 #define TCL_ENCODING_INTERNAL_USE_MASK  0xFF00
-/* Reserve top byte for profile values (disjoint, not a mask) */
+/* 
+ * Reserve top byte for profile values (disjoint, not a mask). In case of
+ * changes, ensure ENCODING_PROFILE_* macros in tclInt.h are modified if
+ * necessary.
+ */
 #define TCL_ENCODING_PROFILE_TCL8     0x01000000
 #define TCL_ENCODING_PROFILE_STRICT   0x02000000
 #define TCL_ENCODING_PROFILE_REPLACE  0x03000000
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 2f50959..aa7a9b0 100644
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
@@ -675,7 +675,7 @@ EncodingConvertfromObjCmd(
      * Convert the string into a byte array in 'ds'.
      */
 #if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-    if (CHANNEL_PROFILE_GET(flags) == TCL_ENCODING_PROFILE_TCL8) {
+    if (ENCODING_PROFILE_GET(flags) == TCL_ENCODING_PROFILE_TCL8) {
 	/* Permits high bits to be non-0 in byte array (Tcl 8 style) */
 	bytesPtr = (char *) Tcl_GetByteArrayFromObj(data, &length);
     } else
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 647ed68..32878b0 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -10,7 +10,6 @@
  */
 
 #include "tclInt.h"
-#include "tclIO.h"
 
 typedef size_t (LengthProc)(const char *src);
 
@@ -200,10 +199,10 @@ static struct TclEncodingProfiles {
     {"tcl8", TCL_ENCODING_PROFILE_TCL8},
 };
 #define PROFILE_STRICT(flags_)                                         \
-    (CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT)
+    (ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_STRICT)
 
 #define PROFILE_REPLACE(flags_)                                         \
-    (CHANNEL_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE)
+    (ENCODING_PROFILE_GET(flags_) == TCL_ENCODING_PROFILE_REPLACE)
 
 #define UNICODE_REPLACE_CHAR ((Tcl_UniChar)0xFFFD)
 #define SURROGATE(c_)      (((c_) & ~0x7FF) == 0xD800)
@@ -2527,7 +2526,7 @@ UtfToUtfProc(
     flags |= PTR2INT(clientData);
     dstEnd = dst + dstLen - ((flags & ENCODING_UTF) ? TCL_UTF_MAX : 6);
 
-    profile = CHANNEL_PROFILE_GET(flags);
+    profile = ENCODING_PROFILE_GET(flags);
     for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
 
 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
@@ -4545,9 +4544,9 @@ TclEncodingProfileIdToName(
 int TclEncodingSetProfileFlags(int flags)
 {
     if (flags & TCL_ENCODING_STOPONERROR) {
-	CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
+	ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_STRICT);
     } else {
-	int profile = CHANNEL_PROFILE_GET(flags);
+	int profile = ENCODING_PROFILE_GET(flags);
 	switch (profile) {
 	case TCL_ENCODING_PROFILE_TCL8:
 	case TCL_ENCODING_PROFILE_STRICT:
@@ -4555,7 +4554,7 @@ int TclEncodingSetProfileFlags(int flags)
 	    break;
 	case 0: /* Unspecified by caller */
 	default:
-	    CHANNEL_PROFILE_SET(flags, TCL_ENCODING_PROFILE_TCL8);
+	    ENCODING_PROFILE_SET(flags, TCL_ENCODING_PROFILE_TCL8);
 	    break;
 	}
     }
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 92ad97e..57c1554 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -1702,11 +1702,11 @@ Tcl_CreateChannel(
     }
     statePtr->inputEncodingState  = NULL;
     statePtr->inputEncodingFlags  = TCL_ENCODING_START;
-    CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags,
+    ENCODING_PROFILE_SET(statePtr->inputEncodingFlags,
 			     TCL_ENCODING_PROFILE_TCL8);
     statePtr->outputEncodingState = NULL;
     statePtr->outputEncodingFlags = TCL_ENCODING_START;
-    CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags,
+    ENCODING_PROFILE_SET(statePtr->outputEncodingFlags,
 			     TCL_ENCODING_PROFILE_TCL8);
 
     /*
@@ -8067,7 +8067,7 @@ Tcl_GetChannelOption(
 	    Tcl_DStringAppendElement(dsPtr, "-profile");
 	}
 	/* Note currently input and output profiles are same */
-	profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
+	profile = ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
 	profileName = TclEncodingProfileIdToName(interp, profile);
 	if (profileName == NULL) {
 	    return TCL_ERROR;
@@ -8273,12 +8273,12 @@ Tcl_SetChannelOption(
 	Tcl_FreeEncoding(statePtr->encoding);
 	statePtr->encoding = encoding;
 	statePtr->inputEncodingState = NULL;
-	profile = CHANNEL_PROFILE_GET(statePtr->inputEncodingFlags);
+	profile = ENCODING_PROFILE_GET(statePtr->inputEncodingFlags);
 	statePtr->inputEncodingFlags = TCL_ENCODING_START;
-	CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
 	statePtr->outputEncodingState = NULL;
 	statePtr->outputEncodingFlags = TCL_ENCODING_START;
-	CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
+	ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile); /* Same as input */
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	UpdateInterest(chanPtr);
 	return TCL_OK;
@@ -8342,8 +8342,8 @@ Tcl_SetChannelOption(
 	if (TclEncodingProfileNameToId(interp, newValue, &profile) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	CHANNEL_PROFILE_SET(statePtr->inputEncodingFlags, profile);
-	CHANNEL_PROFILE_SET(statePtr->outputEncodingFlags, profile);
+	ENCODING_PROFILE_SET(statePtr->inputEncodingFlags, profile);
+	ENCODING_PROFILE_SET(statePtr->outputEncodingFlags, profile);
 	ResetFlag(statePtr, CHANNEL_NEED_MORE_DATA|CHANNEL_ENCODING_ERROR);
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
@@ -9470,8 +9470,8 @@ TclCopyChannel(
 	    && inStatePtr->inputTranslation == TCL_TRANSLATE_LF
 	    && outStatePtr->outputTranslation == TCL_TRANSLATE_LF
 	    && inStatePtr->encoding == outStatePtr->encoding
-	    && CHANNEL_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
-	    && CHANNEL_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
+	    && ENCODING_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
+	    && ENCODING_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
 
     /*
      * Allocate a new CopyState to maintain info about the current copy in
@@ -9799,8 +9799,8 @@ CopyData(
     inBinary = (inStatePtr->encoding == NULL);
     outBinary = (outStatePtr->encoding == NULL);
     sameEncoding = inStatePtr->encoding == outStatePtr->encoding
-	    && CHANNEL_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
-	    && CHANNEL_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
+	    && ENCODING_PROFILE_GET(inStatePtr->inputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8
+	    && ENCODING_PROFILE_GET(outStatePtr->outputEncodingFlags) == TCL_ENCODING_PROFILE_TCL8;
 
     if (!(inBinary || sameEncoding)) {
 	TclNewObj(bufObj);
diff --git a/generic/tclIO.h b/generic/tclIO.h
index 399acdb..729db5d 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -286,13 +286,6 @@ typedef struct ChannelState {
 #define CHANNEL_CLOSEDWRITE	(1<<21)	/* Channel write side has been closed.
 					 * No further Tcl-level write IO on
 					 * the channel is allowed. */
-#define CHANNEL_PROFILE_MASK     0xFF000000
-#define CHANNEL_PROFILE_GET(flags_)  ((flags_) & CHANNEL_PROFILE_MASK)
-#define CHANNEL_PROFILE_SET(flags_, profile_) \
-    do {                                           \
-	(flags_) &= ~CHANNEL_PROFILE_MASK;    \
-	(flags_) |= profile_;                      \
-    } while (0)
 
 /*
  * The length of time to wait between synthetic timer events. Must be zero or
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2d3a0fc..d3b2548 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -2860,6 +2860,21 @@ typedef struct ProcessGlobalValue {
 				/* Reject underscore digit separator */
 
 /*
+ *----------------------------------------------------------------------
+ * Internal convenience macros for manipulating encoding flags. See
+ * TCL_ENCODING_PROFILE_* in tcl.h
+ *----------------------------------------------------------------------
+ */
+
+#define ENCODING_PROFILE_MASK     0xFF000000
+#define ENCODING_PROFILE_GET(flags_)  ((flags_) & ENCODING_PROFILE_MASK)
+#define ENCODING_PROFILE_SET(flags_, profile_) \
+    do {                                       \
+	(flags_) &= ~ENCODING_PROFILE_MASK;    \
+	(flags_) |= profile_;                  \
+    } while (0)
+
+/*
  *----------------------------------------------------------------
  * Variables shared among Tcl modules but not used by the outside world.
  *----------------------------------------------------------------
-- 
cgit v0.12


From b583ea7360808cb502d1ea65954ab0387ebdd823 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 3 May 2023 15:51:10 +0000
Subject: Backport "Comments only. Fix blatantly obsolete ones". And a few more
 improvements from the same files.

---
 generic/tclStringObj.c | 95 +++++++++++++++++++++++++++++---------------------
 generic/tclStringRep.h | 44 ++++++++---------------
 2 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index d3a17d1..7fbf77a 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1,29 +1,27 @@
 /*
  * tclStringObj.c --
  *
- *	This file contains functions that implement string operations on Tcl
- *	objects. Some string operations work with UTF strings and others
- *	require Unicode format. Functions that require knowledge of the width
- *	of each character, such as indexing, operate on Unicode data.
- *
- *	A Unicode string is an internationalized string. Conceptually, a
- *	Unicode string is an array of 16-bit quantities organized as a
- *	sequence of properly formed UTF-8 characters. There is a one-to-one
- *	map between Unicode and UTF characters. Because Unicode characters
- *	have a fixed width, operations such as indexing operate on Unicode
- *	data. The String object is optimized for the case where each UTF char
+ *      This file contains functions that implement string operations on Tcl
+ *      objects. Some string operations work with UTF-8 encoding forms.
+ *      Functions that require knowledge of the width of each character,
+ * 	such as indexing, operate on fixed width encoding forms such as UTF-32.
+ *
+ * 	Conceptually, a string is a sequence of Unicode code points. Internally
+ * 	it may be stored in an encoding form such as a modified version of
+ * 	UTF-8 or UTF-16 (when TCL_UTF_MAX=3) or UTF-32.
+ *
+ *	The String object is optimized for the case where each UTF char
  *	in a string is only one byte. In this case, we store the value of
- *	numChars, but we don't store the Unicode data (unless Tcl_GetUnicode
- *	is explicitly called).
+ *	numChars, but we don't store the fixed form encoding (unless
+ * 	Tcl_GetUnicode is explicitly called).
  *
- *	The String object type stores one or both formats. The default
- *	behavior is to store UTF. Once Unicode is calculated by a function, it
- *	is stored in the internal rep for future access (without an additional
- *	O(n) cost).
+ *      The String object type stores one or both formats. The default
+ *      behavior is to store UTF-8. Once UTF-16/UTF32 is calculated, it is
+ *      stored in the internal rep for future access (without an additional
+ *      O(n) cost).
  *
  *	To allow many appends to be done to an object without constantly
- *	reallocating the space for the string or Unicode representation, we
- *	allocate double the space for the string or Unicode and use the
+ *	reallocating space, we allocate double the space and use the
  *	internal representation to keep track of how much space is used vs.
  *	allocated.
  *
@@ -37,7 +35,6 @@
 #include "tclInt.h"
 #include "tclTomMath.h"
 #include "tclStringRep.h"
-
 #include "assert.h"
 /*
  * Prototypes for functions defined later in this file:
@@ -631,10 +628,8 @@ TclGetCharLength(
      */
 
     if (TclIsPureByteArray(objPtr)) {
-	int length;
-
-	(void) Tcl_GetByteArrayFromObj(objPtr, &length);
-	return length;
+	(void) Tcl_GetByteArrayFromObj(objPtr, &numChars);
+	return numChars;
     }
 
     /*
@@ -675,10 +670,10 @@ Tcl_GetCharLength(
     }
 
     /*
-     * Optimize BytArray case: No need to convert to a string to perform the
-     * get-length operation.
+     * Optimize the case where we're really dealing with a bytearray object;
+     * we don't need to convert to a string to perform the get-length operation.
      *
-     * Starting in Tcl 8.7, check for a "pure" bytearray, because the
+     * Starting in Tcl 8.7, we check for a "pure" bytearray, because the
      * machinery behind that test is using a proper bytearray ObjType.  We
      * could also compute length of an improper bytearray without shimmering
      * but there's no value in that. We *want* to shimmer an improper bytearray
@@ -686,16 +681,17 @@ Tcl_GetCharLength(
      */
 
     if (TclIsPureByteArray(objPtr)) {
-
 	(void) Tcl_GetByteArrayFromObj(objPtr, &numChars);
     } else {
 	Tcl_GetString(objPtr);
 	numChars = Tcl_NumUtfChars(objPtr->bytes, objPtr->length);
     }
+
     return numChars;
 }
 #endif
 
+
 /*
  *----------------------------------------------------------------------
  *
@@ -722,6 +718,11 @@ TclCheckEmptyString(
 	return TCL_EMPTYSTRING_YES;
     }
 
+    if (TclIsPureByteArray(objPtr)
+	&& Tcl_GetCharLength(objPtr) == 0) {
+	return TCL_EMPTYSTRING_YES;
+    }
+
     if (TclListObjIsCanonical(objPtr)) {
 	TclListObjLengthM(NULL, objPtr, &length);
 	return length == 0;
@@ -2383,12 +2384,16 @@ Tcl_AppendFormatToObj(
 
 	width = 0;
 	if (isdigit(UCHAR(ch))) {
-	    width = strtoul(format, &end, 10);
-	    if (width < 0) {
+	    /* Note ull will be >= 0 because of isdigit check above */
+	    unsigned long long ull;
+	    ull = strtoull(format, &end, 10);
+	    /* Comparison is >=, not >, to leave room for nul */
+	    if (ull >= WIDE_MAX) {
 		msg = overflow;
 		errCode = "OVERFLOW";
 		goto errorMsg;
 	    }
+	    width = (Tcl_WideInt)ull;
 	    format = end;
 	    step = TclUtfToUniChar(format, &ch);
 	} else if (ch == '*') {
@@ -2425,7 +2430,16 @@ Tcl_AppendFormatToObj(
 	    step = TclUtfToUniChar(format, &ch);
 	}
 	if (isdigit(UCHAR(ch))) {
-	    precision = strtoul(format, &end, 10);
+	    /* Note ull will be >= 0 because of isdigit check above */
+	    unsigned long long ull;
+	    ull = strtoull(format, &end, 10);
+	    /* Comparison is >=, not >, to leave room for nul */
+	    if (ull >= WIDE_MAX) {
+		msg = overflow;
+		errCode = "OVERFLOW";
+		goto errorMsg;
+	    }
+	    precision = (Tcl_WideInt)ull;
 	    format = end;
 	    step = TclUtfToUniChar(format, &ch);
 	} else if (ch == '*') {
@@ -2531,6 +2545,9 @@ Tcl_AppendFormatToObj(
 	    if (TclGetIntFromObj(interp, segment, &code) != TCL_OK) {
 		goto error;
 	    }
+	    if ((unsigned)code > 0x10FFFF) {
+	    	code = 0xFFFD;
+	    }
 	    length = Tcl_UniCharToUtf(code, buf);
 	    if ((code >= 0xD800) && (length < 3)) {
 		/* Special case for handling high surrogates. */
@@ -3875,6 +3892,7 @@ TclStringCmp(
     if ((reqlength == 0) || (value1Ptr == value2Ptr)) {
 	/*
 	 * Always match at 0 chars of if it is the same obj.
+	 * Note: as documented reqlength negative means it is ignored
 	 */
 	match = 0;
     } else {
@@ -4006,15 +4024,15 @@ TclStringCmp(
 	 * comparison function.
 	 */
 	length = (s1len < s2len) ? s1len : s2len;
-	if (reqlength > 0 && reqlength < length) {
-	    length = reqlength;
-	} else if (reqlength < 0) {
+	if (reqlength < 0) {
 	    /*
 	     * The requested length is negative, so ignore it by setting it
 	     * to length + 1 to correct the match var.
 	     */
 
 	    reqlength = length + 1;
+	} else if (reqlength > 0 && reqlength < length) {
+	    length = reqlength;
 	}
 
 	if (checkEq && reqlength < 0 && (s1len != s2len)) {
@@ -4452,18 +4470,17 @@ TclStringReplace(
     int inPlace = flags & TCL_STRING_IN_PLACE;
     Tcl_Obj *result;
 
-    /* Caller is expected to pass sensible arguments */
-    assert ( count >= 0 ) ;
-    assert ( first >= 0 ) ;
-
     /* Replace nothing with nothing */
-    if ((insertPtr == NULL) && (count == 0)) {
+    if ((insertPtr == NULL) && (count <= 0)) {
 	if (inPlace) {
 	    return objPtr;
 	} else {
 	    return Tcl_DuplicateObj(objPtr);
 	}
     }
+    if (first < 0) {
+	first = 0;
+    }
 
     /*
      * The caller very likely had to call Tcl_GetCharLength() or similar
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index 0219a00..ef64d6c 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -1,29 +1,12 @@
 /*
  * tclStringRep.h --
  *
- *	This file contains the definition of the Unicode string internal
- *	representation and macros to access it.
+ *  This file contains the definition of internal representations of a string
+ *  and macros to access it.
  *
- *	A Unicode string is an internationalized string. Conceptually, a
- *	Unicode string is an array of 16-bit quantities organized as a
- *	sequence of properly formed UTF-8 characters. There is a one-to-one
- *	map between Unicode and UTF characters. Because Unicode characters
- *	have a fixed width, operations such as indexing operate on Unicode
- *	data. The String object is optimized for the case where each UTF char
- *	in a string is only one byte. In this case, we store the value of
- *	numChars, but we don't store the Unicode data (unless Tcl_GetUnicode
- *	is explicitly called).
- *
- *	The String object type stores one or both formats. The default
- *	behavior is to store UTF. Once Unicode is calculated by a function, it
- *	is stored in the internal rep for future access (without an additional
- *	O(n) cost).
- *
- *	To allow many appends to be done to an object without constantly
- *	reallocating the space for the string or Unicode representation, we
- *	allocate double the space for the string or Unicode and use the
- *	internal representation to keep track of how much space is used vs.
- *	allocated.
+ *  Conceptually, a string is a sequence of Unicode code points. Internally
+ *  it may be stored in an encoding form such as a modified version of UTF-8
+ *  or UTF-16 (when TCL_UTF_MAX=3) or UTF-32.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright (c) 1999 by Scriptics Corporation.
@@ -39,10 +22,10 @@
 /*
  * The following structure is the internal rep for a String object. It keeps
  * track of how much memory has been used and how much has been allocated for
- * the Unicode and UTF string to enable growing and shrinking of the UTF and
- * Unicode reps of the String object with fewer mallocs. To optimize string
+ * the various representations to enable growing and shrinking of 
+ * the String object with fewer mallocs. To optimize string
  * length and indexing operations, this structure also stores the number of
- * characters (same of UTF and Unicode!) once that value has been computed.
+ * code points (independent of encoding form) once that value has been computed.
  */
 
 typedef struct {
@@ -52,17 +35,18 @@ typedef struct {
 				 * Unicode rep, or that the number of UTF bytes ==
 				 * the number of chars. */
     Tcl_Size allocated;		/* The amount of space actually allocated for
-				 * the UTF string (minus 1 byte for the
+				 * the UTF-8 string (minus 1 byte for the
 				 * termination char). */
     Tcl_Size maxChars;		/* Max number of chars that can fit in the
 				 * space allocated for the Unicode array. */
     int hasUnicode;		/* Boolean determining whether the string has
-				 * a Unicode representation. */
-    unsigned short unicode[TCLFLEXARRAY];	/* The array of Unicode chars. The actual size
-				 * of this field depends on the 'maxChars'
-				 * field above. */
+				 * a Tcl_UniChar representation. */
+    unsigned short unicode[TCLFLEXARRAY];	/* The array of Tcl_UniChar units.
+				 * The actual size of this field depends on
+				 * the maxChars field above. */
 } String;
 
+/* Limit on string lengths. The -1 because limit does not include the nul */
 #define STRING_MAXCHARS \
     (int)(((size_t)UINT_MAX - offsetof(String, unicode))/sizeof(unsigned short) - 1)
 #define STRING_SIZE(numChars) \
-- 
cgit v0.12


From af320fb41e62980c0c988a377c138ac14757ad81 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 4 May 2023 12:53:45 +0000
Subject: Fix [9c397da4a9]: AppendPrintfToObjVA(): support 64-bit pointers

---
 generic/tcl.h          | 2 +-
 generic/tclStringObj.c | 8 ++++++--
 generic/tclStringRep.h | 2 +-
 tests/tailcall.test    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 318c7a1..2b6c947 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2176,7 +2176,7 @@ typedef struct Tcl_EncodingType {
 #define TCL_ENCODING_CHAR_LIMIT		0x10
 /* Internal use bits, do not define bits in this space. See above comment */
 #define TCL_ENCODING_INTERNAL_USE_MASK  0xFF00
-/* 
+/*
  * Reserve top byte for profile values (disjoint, not a mask). In case of
  * changes, ensure ENCODING_PROFILE_* macros in tclInt.h are modified if
  * necessary.
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 7fbf77a..0e47487 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -249,7 +249,7 @@ UpdateStringOfUTF16String(
 #endif
 
 #endif
-
+
 /*
  * TCL STRING GROWTH ALGORITHM
  *
@@ -3130,12 +3130,16 @@ AppendPrintfToObjVA(
 
 		break;
 	    }
+	    case 'p':
+		if (sizeof(size_t) == sizeof(Tcl_WideInt)) {
+		    size = 2;
+		}
+		/* FALLTHRU */
 	    case 'c':
 	    case 'i':
 	    case 'u':
 	    case 'd':
 	    case 'o':
-	    case 'p':
 	    case 'x':
 	    case 'X':
 		seekingConversion = 0;
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index ef64d6c..d1863fb 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -22,7 +22,7 @@
 /*
  * The following structure is the internal rep for a String object. It keeps
  * track of how much memory has been used and how much has been allocated for
- * the various representations to enable growing and shrinking of 
+ * the various representations to enable growing and shrinking of
  * the String object with fewer mallocs. To optimize string
  * length and indexing operations, this structure also stores the number of
  * code points (independent of encoding form) once that value has been computed.
diff --git a/tests/tailcall.test b/tests/tailcall.test
index c9ec674..0016845 100644
--- a/tests/tailcall.test
+++ b/tests/tailcall.test
@@ -709,7 +709,7 @@ test tailcall-14.1-bc {{in a deleted namespace} {byte compiled}} -body {
 } -returnCodes 1 -result {namespace "::ns" not found}
 
 test tailcall-bug-784befb0ba {tailcall crash with 254 args} -body {
-    proc tccrash args {llength $args}	
+    proc tccrash args {llength $args}
     # Must be EXACTLY 254 for crash
     proc p {} [list tailcall tccrash {*}[lrepeat 254 x]]
     p
-- 
cgit v0.12


From e51f7da2ee3eeb2de5ed29bffef7c4fd20bc2791 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 4 May 2023 12:58:41 +0000
Subject: Backport: Do not build every branch. Too expensive.

---
 .github/workflows/linux-build.yml | 9 ++++++++-
 .github/workflows/mac-build.yml   | 9 ++++++++-
 .github/workflows/onefiledist.yml | 9 ++++++++-
 .github/workflows/win-build.yml   | 9 ++++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 7ba9e89..f8c30da 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -1,5 +1,12 @@
 name: Linux
-on: [push]
+on: 
+  push:
+    branches:
+    - "main"
+    - "trunk"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index a9345a1..b5a586e 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -1,5 +1,12 @@
 name: macOS
-on: [push]
+on: 
+  push:
+    branches:
+    - "main"
+    - "trunk"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index 1f75762..c6277af 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -1,5 +1,12 @@
 name: Build Binaries
-on: [push]
+on: 
+  push:
+    branches:
+    - "main"
+    - "trunk"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index ba4e5ba..9773c2a 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -1,5 +1,12 @@
 name: Windows
-on: [push]
+on: 
+  push:
+    branches:
+    - "main"
+    - "trunk"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 env:
-- 
cgit v0.12


From f976a32c62ccbb7a5740756f8641f1f73357e57e Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 4 May 2023 18:21:01 +0000
Subject: Remove mention of Tcl_GlobalEval() from comment.

---
 generic/tclHistory.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/generic/tclHistory.c b/generic/tclHistory.c
index 24f6d65..0782629 100644
--- a/generic/tclHistory.c
+++ b/generic/tclHistory.c
@@ -58,8 +58,9 @@ Tcl_RecordAndEval(
     const char *cmd,		/* Command to record. */
     int flags)			/* Additional flags. TCL_NO_EVAL means only
 				 * record: don't execute command.
-				 * TCL_EVAL_GLOBAL means use Tcl_GlobalEval
-				 * instead of Tcl_Eval. */
+				 * TCL_EVAL_GLOBAL means evaluate the script
+				 * in global variable context instead of the
+				 * current procedure. */
 {
     Tcl_Obj *cmdPtr;
     int length = strlen(cmd);
-- 
cgit v0.12


From 4e92d998ebfea666fec1ffcb3b5e44bf6d2d67fd Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Fri, 5 May 2023 12:34:18 +0000
Subject: Minor fixes for perf tests

---
 tests-perf/listPerf.tcl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests-perf/listPerf.tcl b/tests-perf/listPerf.tcl
index 17f22e9..575c78e 100644
--- a/tests-perf/listPerf.tcl
+++ b/tests-perf/listPerf.tcl
@@ -3,8 +3,9 @@
 #
 # listPerf.tcl --
 #
-#  This file provides performance tests for list operations.
-#
+#  This file provides performance tests for list operations. Run
+#     tclsh listPerf.tcl help
+#  for options.
 # ------------------------------------------------------------------------
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -77,7 +78,9 @@ namespace eval perf::list {
                     break
                 }
                 --* {
-                    error "Unknown option $arg"
+                    puts stderr "Unknown option $arg"
+                    print_usage
+                    exit 1
                 }
                 default {
                     # Remaining will be passed back to the caller
@@ -383,6 +386,8 @@ namespace eval perf::list {
             comment Create a list from two lists - real test of expansion speed
             perf measure [list_describe $len "from a {*}list {*}list"] {list {*}$L {*}$L} [list len [expr {$len/2}]]
         }
+
+        perf destroy
     }
 
     proc lappend_describe {share_mode len num iters} {
@@ -1217,7 +1222,7 @@ namespace eval perf::list {
             set commands [lmap sel $selections {
                 if {$sel eq "help"} {
                     print_usage
-                    continue
+                    exit 0
                 }
                 set cmd ::perf::list::${sel}_perf
                 if {$cmd ni [info commands ::perf::list::*_perf]} {
-- 
cgit v0.12


From 67b780c161dd0f32a2780ea1465999daba7f941e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 5 May 2023 20:55:31 +0000
Subject: Remove .github and .travis-related stuff: No need to build this
 branch any more

---
 .github/workflows/linux-build.yml |  51 ------
 .github/workflows/mac-build.yml   |  59 -------
 .github/workflows/win-build.yml   |  81 ----------
 .travis.yml                       | 331 --------------------------------------
 unix/Makefile.in                  |   3 -
 5 files changed, 525 deletions(-)
 delete mode 100644 .github/workflows/linux-build.yml
 delete mode 100644 .github/workflows/mac-build.yml
 delete mode 100644 .github/workflows/win-build.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
deleted file mode 100644
index d619507..0000000
--- a/.github/workflows/linux-build.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Linux
-on: [push]
-permissions:
-  contents: read
-jobs:
-  gcc:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        cfgopt:
-          - ""
-          - "--disable-shared"
-          - "--enable-symbols"
-          - "--enable-symbols=mem"
-          - "CFLAGS=-DTCL_UTF_MAX=4"
-    defaults:
-      run:
-        shell: bash
-        working-directory: unix
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare
-        run: touch tclStubInit.c
-        working-directory: generic
-      - name: Configure ${{ matrix.cfgopt }}
-        run: |
-          mkdir "${HOME}/install"
-          ./configure ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
-        env:
-          CFGOPT: ${{ matrix.cfgopt }}
-      - name: Build
-        run: |
-          make all
-      - name: Build Test Harness
-        run: |
-          make tcltest
-      - name: Run Tests
-        run: |
-          make test
-        env:
-          ERROR_ON_FAILURES: 1
-      - name: Test-Drive Installation
-        run: |
-          make install
-      - name: Create Distribution Package
-        run: |
-          make dist
-      - name: Convert Documentation to HTML
-        run: |
-          make html-tcl
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
deleted file mode 100644
index 5b0c657..0000000
--- a/.github/workflows/mac-build.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-name: macOS
-on: [push]
-permissions:
-  contents: read
-jobs:
-  xcode:
-    runs-on: macos-10.15
-    defaults:
-      run:
-        shell: bash
-        working-directory: macosx
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare
-        run: touch tclStubInit.c
-        working-directory: generic
-      - name: Build
-        run: make all
-      - name: Run Tests
-        run: make test styles=develop
-        env:
-          ERROR_ON_FAILURES: 1
-          MAC_CI: 1
-  clang:
-    runs-on: macos-10.15
-    strategy:
-      matrix:
-        cfgopt:
-          - ""
-          - "--disable-shared"
-          - "--enable-symbols"
-          - "--enable-symbols=mem"
-    defaults:
-      run:
-        shell: bash
-        working-directory: unix
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare
-        run: |
-          touch tclStubInit.c
-          mkdir "$HOME/install"
-        working-directory: generic
-      - name: Configure ${{ matrix.cfgopt }}
-        # Note that macOS is always a 64 bit platform
-        run: ./configure --enable-64bit --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
-        env:
-          CFGOPT: ${{ matrix.cfgopt }}
-      - name: Build
-        run: |
-          make all tcltest
-      - name: Run Tests
-        run: |
-          make test
-        env:
-          ERROR_ON_FAILURES: 1
-          MAC_CI: 1
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
deleted file mode 100644
index 9a0ac98..0000000
--- a/.github/workflows/win-build.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-name: Windows
-on: [push]
-permissions:
-  contents: read
-jobs:
-  msvc:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: powershell
-        working-directory: win
-    strategy:
-      matrix:
-        cfgopt:
-          - "OPTS=threads"
-          - "OPTS=static,msvcrt,threads"
-          - "OPTS=symbols,threads"
-          - "OPTS=memdbg,threads"
-    # Using powershell means we need to explicitly stop on failure
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Init MSVC
-        uses: ilammy/msvc-dev-cmd@v1
-      - name: Build ${{ matrix.cfgopt }}
-        run: |
-          &nmake -f makefile.vc ${{ matrix.cfgopt }} all
-          if ($lastexitcode -ne 0) {
-             throw "nmake exit code: $lastexitcode"
-          }
-      - name: Build Test Harness ${{ matrix.cfgopt }}
-        run: |
-          &nmake -f makefile.vc ${{ matrix.cfgopt }} tcltest
-          if ($lastexitcode -ne 0) {
-             throw "nmake exit code: $lastexitcode"
-          }
-      - name: Run Tests ${{ matrix.cfgopt }}
-        run: |
-          &nmake -f makefile.vc ${{ matrix.cfgopt }} test
-          if ($lastexitcode -ne 0) {
-             throw "nmake exit code: $lastexitcode"
-          }
-        env:
-          ERROR_ON_FAILURES: 1
-  gcc:
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: bash
-        working-directory: win
-    strategy:
-      matrix:
-        cfgopt:
-          - ""
-          - "--disable-shared"
-          - "--enable-symbols"
-          - "--enable-symbols=mem"
-    # Using powershell means we need to explicitly stop on failure
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install MSYS2 and Make
-        run: choco install msys2 make
-      - name: Prepare
-        run: |
-          touch tclStubInit.c
-          mkdir "${HOME}/install"
-        working-directory: generic
-      - name: Configure ${{ matrix.cfgopt }}
-        run: |
-          ./configure ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
-        env:
-          CFGOPT: --enable-64bit --enable-threads ${{ matrix.cfgopt }}
-      - name: Build
-        run: make all
-      - name: Build Test Harness
-        run: make tcltest
-      - name: Run Tests
-        run: make test
-        env:
-          ERROR_ON_FAILURES: 1
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6447b34..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,331 +0,0 @@
-language: c
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - binutils-mingw-w64-i686
-      - binutils-mingw-w64-x86-64
-      - gcc-mingw-w64
-      - gcc-mingw-w64-base
-      - gcc-mingw-w64-i686
-      - gcc-mingw-w64-x86-64
-      - gcc-multilib
-jobs:
-  include:
-# Testing on Linux GCC
-    - name: "Linux/GCC/Shared"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/GCC/Shared: UTF_MAX=4"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=4
-    - name: "Linux/GCC/Shared: UTF_MAX=5"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=5
-    - name: "Linux/GCC/Shared: UTF_MAX=6"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=6
-    - name: "Linux/GCC/Static"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - CFGOPT="--disable-shared"
-        - BUILD_DIR=unix
-    - name: "Linux/GCC/Debug"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols"
-    - name: "Linux/GCC/Mem-Debug"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols=mem"
-# Newer/Older versions of GCC
-    - name: "Linux/GCC 10/Shared"
-      os: linux
-      dist: focal
-      compiler: gcc-10
-      addons:
-        apt:
-          packages:
-            - g++-10
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/GCC 5/Shared"
-      os: linux
-      dist: bionic
-      compiler: gcc-5
-      addons:
-        apt:
-          packages:
-            - g++-5
-      env:
-        - BUILD_DIR=unix
-# Testing on Linux Clang
-    - name: "Linux/Clang/Shared"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/Clang/Static"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - CFGOPT="--disable-shared"
-        - BUILD_DIR=unix
-    - name: "Linux/Clang/Debug"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols"
-    - name: "Linux/Clang/Mem-Debug"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols=mem"
-# Testing on Mac, various styles
-    - name: "macOS/Xcode 12/Shared"
-      os: osx
-      osx_image: xcode12.2
-      env:
-        - BUILD_DIR=macosx
-      install: []
-      script: &mactest
-        - make all
-        # The styles=develop avoids some weird problems on OSX
-        - make test styles=develop
-    - name: "macOS/Xcode 12/Shared/Unix-like"
-      os: osx
-      osx_image: xcode12.2
-      env:
-        - BUILD_DIR=unix
-# Newer MacOS versions
-    - name: "macOS/Xcode 12/Universal Apps/Shared"
-      os: osx
-      osx_image: xcode12u
-      env:
-        - BUILD_DIR=macosx
-      install: []
-      script: *mactest
-# Older MacOS versions
-    - name: "macOS/Xcode 11/Shared"
-      os: osx
-      osx_image: xcode11.7
-      env:
-        - BUILD_DIR=macosx
-      install: []
-      script: *mactest
-    - name: "macOS/Xcode 10/Shared"
-      os: osx
-      osx_image: xcode10.3
-      env:
-        - BUILD_DIR=macosx
-      install: []
-      script: *mactest
-    - name: "macOS/Xcode 9/Shared"
-      os: osx
-      osx_image: xcode9.4
-      env:
-        - BUILD_DIR=macosx
-      install: []
-      script: *mactest
-    - name: "macOS/Xcode 8/Shared"
-      os: osx
-      osx_image: xcode8.3
-      env:
-        - BUILD_DIR=macosx
-      install: []
-      script: *mactest
-# Test with mingw-w64 cross-compile
-# Doesn't run tests because wine is only an imperfect Windows emulation
-    - name: "Linux-cross-Windows/GCC/Shared/no test"
-      os: linux
-      dist: focal
-      compiler: x86_64-w64-mingw32-gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads"
-      script: &crosstest
-        - make all tcltest
-        # Include a high visibility marker that tests are skipped outright
-        - >
-          echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"
-# Test with mingw-w64 (32 bit) cross-compile
-# Doesn't run tests because wine is only an imperfect Windows emulation
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test"
-      os: linux
-      dist: focal
-      compiler: i686-w64-mingw32-gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 --enable-threads"
-      script: *crosstest
-# Test on Windows with MSVC native
-    - name: "Windows/MSVC/Shared"
-      os: windows
-      compiler: cl
-      env: &vcenv
-        - BUILD_DIR=win
-        - VCDIR="/C/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build"
-      before_install: &vcpreinst
-        - PATH="$PATH:$VCDIR"
-        - cd ${BUILD_DIR}
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=threads' '-f' makefile.vc test
-    - name: "Windows/MSVC/Static"
-      os: windows
-      compiler: cl
-      env: *vcenv
-      before_install: *vcpreinst
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc test
-    - name: "Windows/MSVC/Debug"
-      os: windows
-      compiler: cl
-      env: *vcenv
-      before_install: *vcpreinst
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc test
-    - name: "Windows/MSVC/Mem-Debug"
-      os: windows
-      compiler: cl
-      env: *vcenv
-      before_install: *vcpreinst
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'STATS=memdbg OPTS=threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x64 '&&' nmake 'STATS=memdbg OPTS=threads' '-f' makefile.vc test
-# Test on Windows with MSVC native (32-bit)
-    - name: "Windows/MSVC-x86/Shared"
-      os: windows
-      compiler: cl
-      env: *vcenv
-      before_install: *vcpreinst
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=threads' '-f' makefile.vc test
-    - name: "Windows/MSVC-x86/Static"
-      os: windows
-      compiler: cl
-      env: *vcenv
-      before_install: *vcpreinst
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=static,msvcrt,threads' '-f' makefile.vc test
-    - name: "Windows/MSVC-x86/Debug"
-      os: windows
-      compiler: cl
-      env: *vcenv
-      before_install: *vcpreinst
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'OPTS=symbols,threads' '-f' makefile.vc test
-    - name: "Windows/MSVC-x86/Mem-Debug"
-      os: windows
-      compiler: cl
-      env: *vcenv
-      before_install: *vcpreinst
-      install: []
-      script:
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'STATS=memdbg OPTS=threads' '-f' makefile.vc all tcltest
-        - cmd.exe //C vcvarsall.bat x86 '&&' nmake 'STATS=memdbg OPTS=threads' '-f' makefile.vc test
-# Test on Windows with GCC native
-    - name: "Windows/GCC/Shared"
-      os: windows
-      compiler: gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--enable-64bit --enable-threads"
-      before_install: &makepreinst
-        - choco install -y make
-        - cd ${BUILD_DIR}
-    - name: "Windows/GCC/Static"
-      os: windows
-      compiler: gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--enable-64bit --enable-threads --disable-shared"
-      before_install: *makepreinst
-    - name: "Windows/GCC/Debug"
-      os: windows
-      compiler: gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--enable-64bit --enable-threads --enable-symbols"
-      before_install: *makepreinst
-# Test on Windows with GCC native (32-bit)
-    - name: "Windows/GCC-x86/Shared"
-      os: windows
-      compiler: gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--enable-threads"
-      before_install: *makepreinst
-    - name: "Windows/GCC-x86/Static"
-      os: windows
-      compiler: gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--enable-threads --disable-shared"
-      before_install: *makepreinst
-    - name: "Windows/GCC-x86/Debug"
-      os: windows
-      compiler: gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--enable-threads --enable-symbols"
-      before_install: *makepreinst
-    - name: "Windows/GCC-x86/Mem-Debug"
-      os: windows
-      compiler: gcc
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--enable-threads --enable-symbols=mem"
-      before_install: *makepreinst
-before_install:
-  - touch generic/tclStubInit.c
-  - cd ${BUILD_DIR}
-install:
-  - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)
-before_script:
-  - export ERROR_ON_FAILURES=1
-script:
-  - make all tcltest || echo "Something wrong, maybe a hickup, let's try again"
-  - make test
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d25dfdd..bc3cdfe 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1747,9 +1747,6 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	@mkdir $(DISTDIR)/libtommath
 	cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h \
 		$(DISTDIR)/libtommath
-	cp -p $(TOP_DIR)/.travis.yml $(DISTDIR)
-	mkdir -p $(DISTDIR)/.github/workflows
-	cp -p $(TOP_DIR)/.github/workflows/*.yml $(DISTDIR)/.github/workflows
 
 alldist: dist
 	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
-- 
cgit v0.12


From 73dbbaaa23c0ab5d0233211c9f2e34782991a87d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 7 May 2023 20:06:50 +0000
Subject: New testcase, contributed by @chrstphrchvz. Many thanks! See
 [3837178c25]

---
 tests/dstring.test  | 18 ++++++++++++++++++
 tests/tailcall.test |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/dstring.test b/tests/dstring.test
index 6cf4bb8..59b3459 100644
--- a/tests/dstring.test
+++ b/tests/dstring.test
@@ -418,6 +418,24 @@ test dstring-4.2 {truncation} -constraints testdstring -setup {
 } -cleanup {
     testdstring free
 } -result {{} 0}
+test dstring-4.3 {truncation} -constraints testdstring -setup {
+    testdstring free
+} -body {
+    testdstring append "xwvut" -1
+    # Pass a negative length to Tcl_DStringSetLength();
+    # if not caught, causing '\0' to be written out-of-bounds,
+    # try corrupting dsPtr->length which begins
+    # 2*sizeof(Tcl_Size) bytes before dsPtr->staticSpace[],
+    # so that the result is -256 (on little endian systems)
+    # rather than e.g. -8 or -16.
+    # (sizeof(Tcl_Size) does not seem to be available via Tcl,
+    # so assume sizeof(Tcl_Size) == sizeof(void*) for Tcl 9.)
+    testdstring trunc [expr {-2*([package vsatisfies $tcl_version 9.0-]
+	? $tcl_platform(pointerSize) : 4)}]
+    list [testdstring get] [testdstring length]
+} -cleanup {
+    testdstring free
+} -result {{} 0}
 
 test dstring-5.1 {copying to result} -constraints testdstring -setup {
     testdstring free
diff --git a/tests/tailcall.test b/tests/tailcall.test
index 35a7268..6b09cde 100644
--- a/tests/tailcall.test
+++ b/tests/tailcall.test
@@ -709,7 +709,7 @@ test tailcall-14.1-bc {{in a deleted namespace} {byte compiled}} -body {
 } -returnCodes 1 -result {namespace "::ns" not found}
 
 test tailcall-bug-784befb0ba {tailcall crash with 254 args} -body {
-    proc tccrash args {llength $args}	
+    proc tccrash args {llength $args}
     # Must be EXACTLY 254 for crash
     proc p {} [list tailcall tccrash {*}[lrepeat 254 x]]
     p
-- 
cgit v0.12


From 0d8a08dbf1d766bcd778253199b782a231a202e7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 8 May 2023 09:35:57 +0000
Subject: Proposed fix for [96551aca55]: Avoid pointer arithmetic with NULL in
 FOREACH_STRUCT()

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

diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index 725c4ce..8a19f74 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -589,12 +589,12 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
 /*
  * A variation where the array is an array of structs. There's no issue with
  * possible NULLs; every element of the array will be iterated over and the
- * varable set to a pointer to each of those elements in turn.
+ * variable set to a pointer to each of those elements in turn.
  * REQUIRES DECLARATION: int i;
  */
 
 #define FOREACH_STRUCT(var,ary) \
-    for(i=0 ; var=&((ary).list[i]), i<(ary).num; i++)
+    if ((ary).num > 0) for(i=0; var=&((ary).list[i]), i<(ary).num; i++)
 
 /*
  * Convenience macros for iterating through hash tables. FOREACH_HASH_DECLS
-- 
cgit v0.12


From 133b43a5217bb5e27bced051732443f474610b9c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 8 May 2023 13:43:56 +0000
Subject: Better version, keeping the (undocumented) behavior of 'i'
 initialization

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

diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index 8a19f74..0b49359 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -590,11 +590,11 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
  * A variation where the array is an array of structs. There's no issue with
  * possible NULLs; every element of the array will be iterated over and the
  * variable set to a pointer to each of those elements in turn.
- * REQUIRES DECLARATION: int i;
+ * REQUIRES DECLARATION: int i; See [96551aca55] for more FOREACH_STRUCT details.
  */
 
 #define FOREACH_STRUCT(var,ary) \
-    if ((ary).num > 0) for(i=0; var=&((ary).list[i]), i<(ary).num; i++)
+    i=0; if ((ary).num > 0) for(; var=&((ary).list[i]), i<(ary).num; i++)
 
 /*
  * Convenience macros for iterating through hash tables. FOREACH_HASH_DECLS
-- 
cgit v0.12


From 2e02e1affdde86a1dd00fc78a73af5924c6d30a0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 9 May 2023 13:06:02 +0000
Subject: Remove useless type-casts. Backport some changes from 9.0

---
 win/tclWinFile.c | 10 +++++-----
 win/tclWinReg.c  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index f0c46f9..adc1d7d 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -170,7 +170,7 @@ static int		NativeWriteReparse(const WCHAR *LinkDirectory,
 static int		NativeMatchType(int isDrive, DWORD attr,
 			    const WCHAR *nativeName, Tcl_GlobTypeData *types);
 static int		WinIsDrive(const char *name, size_t nameLen);
-static Tcl_Size		WinIsReserved(const char *path);
+static size_t		WinIsReserved(const char *path);
 static Tcl_Obj *	WinReadLink(const WCHAR *LinkSource);
 static Tcl_Obj *	WinReadLinkDirectory(const WCHAR *LinkDirectory);
 static int		WinLink(const WCHAR *LinkSource,
@@ -1245,7 +1245,7 @@ WinIsDrive(
  * (not any trailing :).
  */
 
-static Tcl_Size
+static size_t
 WinIsReserved(
     const char *path)		/* Path in UTF-8 */
 {
@@ -2579,14 +2579,14 @@ TclpObjNormalizePath(
 		 */
 
 		if (isDrive) {
-		    Tcl_Size len = WinIsReserved(path);
+		    size_t len = WinIsReserved(path);
 
 		    if (len > 0) {
 			/*
 			 * Actually it does exist - COM1, etc.
 			 */
 
-			Tcl_Size i;
+			size_t i;
 
 			for (i=0 ; i<len ; i++) {
 			    WCHAR wc = ((WCHAR *)nativePath)[i];
@@ -2744,7 +2744,7 @@ TclpObjNormalizePath(
 				sizeof(WCHAR));
 			Tcl_DStringAppend(&dsNorm,
 				(const char *) nativeName,
-				(int) (wcslen(nativeName)*sizeof(WCHAR)));
+				wcslen(nativeName)*sizeof(WCHAR));
 		    }
 		}
 	    }
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 3732550..1ccb105 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -804,7 +804,7 @@ GetValue(
 	 */
 
 	length = Tcl_DStringLength(&data) * (2 / sizeof(WCHAR));
-	Tcl_DStringSetLength(&data, (int) length * sizeof(WCHAR));
+	Tcl_DStringSetLength(&data, length * sizeof(WCHAR));
 	result = RegQueryValueExW(key, nativeValue,
 		NULL, &type, (BYTE *) Tcl_DStringValue(&data), &length);
     }
@@ -865,7 +865,7 @@ GetValue(
 	 */
 
 	Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(
-		(BYTE *) Tcl_DStringValue(&data), (int) length));
+		(BYTE *) Tcl_DStringValue(&data), length));
     }
     Tcl_DStringFree(&data);
     return result;
@@ -914,7 +914,7 @@ GetValueNames(
 
     resultPtr = Tcl_NewObj();
     Tcl_DStringInit(&buffer);
-    Tcl_DStringSetLength(&buffer, (int) (MAX_KEY_LENGTH * sizeof(WCHAR)));
+    Tcl_DStringSetLength(&buffer, MAX_KEY_LENGTH * sizeof(WCHAR));
     index = 0;
     result = TCL_OK;
 
@@ -1221,7 +1221,7 @@ RecursiveDeleteKey(
     }
 
     Tcl_DStringInit(&subkey);
-    Tcl_DStringSetLength(&subkey, (int) (MAX_KEY_LENGTH * sizeof(WCHAR)));
+    Tcl_DStringSetLength(&subkey, MAX_KEY_LENGTH * sizeof(WCHAR));
 
     mode = saveMode;
     while (result == ERROR_SUCCESS) {
-- 
cgit v0.12


From 284a5014870e629b05bfa74cc12a432b8d45fa1d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 10 May 2023 12:09:07 +0000
Subject: Backport: docs: function does not "return an error", it returns
 TCL_ERROR, indicating an error occured

---
 doc/Namespace.3 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Namespace.3 b/doc/Namespace.3
index a037442..a971ddb 100644
--- a/doc/Namespace.3
+++ b/doc/Namespace.3
@@ -46,10 +46,10 @@ Tcl_Command
 \fBTcl_FindCommand\fR(\fIinterp, name, contextNsPtr, flags\fR)
 .sp
 Tcl_Obj *
-\fBTcl_GetNamespaceUnknownHandler(\fIinterp, nsPtr\fR)
+\fBTcl_GetNamespaceUnknownHandler\fR(\fIinterp, nsPtr\fR)
 .sp
 int
-\fBTcl_SetNamespaceUnknownHandler(\fIinterp, nsPtr, handlerPtr\fR)
+\fBTcl_SetNamespaceUnknownHandler\fR(\fIinterp, nsPtr, handlerPtr\fR)
 .SH ARGUMENTS
 .AS Tcl_NamespaceDeleteProc allowOverwrite in/out
 .AP Tcl_Interp *interp in/out
@@ -133,7 +133,7 @@ is true.
 .PP
 \fBTcl_Import\fR imports commands matching a pattern into a
 namespace.  Note that the pattern must include the name of the
-namespace to import from.  This function returns an error if
+namespace to import from.  This function returns TCL_ERROR if
 an attempt to import a command over an existing command is made,
 unless the \fIallowOverwrite\fR flag has been set.
 .PP
-- 
cgit v0.12


From 6c604517d78b9730ffd110ba042b16499abab45d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 10 May 2023 18:28:30 +0000
Subject: TIP 663 implementation

---
 ChangeLog        | 8856 ------------------------------------------------------
 ChangeLog.1999   | 2634 ----------------
 ChangeLog.2000   | 2539 ----------------
 ChangeLog.2001   | 3629 ----------------------
 ChangeLog.2002   | 4741 -----------------------------
 ChangeLog.2003   | 3349 ---------------------
 ChangeLog.2004   | 4619 ----------------------------
 ChangeLog.2005   | 3822 -----------------------
 ChangeLog.2007   | 5921 ------------------------------------
 ChangeLog.2008   | 3796 -----------------------
 changes          |   84 +-
 unix/Makefile.in |    5 +-
 12 files changed, 44 insertions(+), 43951 deletions(-)
 delete mode 100644 ChangeLog
 delete mode 100644 ChangeLog.1999
 delete mode 100644 ChangeLog.2000
 delete mode 100644 ChangeLog.2001
 delete mode 100644 ChangeLog.2002
 delete mode 100644 ChangeLog.2003
 delete mode 100644 ChangeLog.2004
 delete mode 100644 ChangeLog.2005
 delete mode 100644 ChangeLog.2007
 delete mode 100644 ChangeLog.2008

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index b189086..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,8856 +0,0 @@
-A NOTE ON THE CHANGELOG:
-Starting in early 2011, Tcl source code has been under the management of
-fossil, hosted at https://core.tcl-lang.org/tcl/ .  Fossil presents a "Timeline"
-view of changes made that is superior in every way to a hand edited log file.
-Because of this, many Tcl developers are now out of the habit of maintaining
-this log file.  You may still find useful things in it, but the Timeline is
-a better first place to look now.
-============================================================================
-
-2013-09-19  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.6.1 TAGGED FOR RELEASE ***
-
-	* generic/tcl.h:	Bump version number to 8.6.1.
-	* library/init.tcl:
-	* unix/configure.in:
-	* win/configure.in:
-	* unix/tcl.spec:
-	* README:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2013-09-19  Donal Fellows  <dkf@users.sf.net>
-
-	* doc/next.n (METHOD SEARCH ORDER): Bug [3606943]: Corrected
-	description of method search order.
-
-2013-09-18  Donal Fellows  <dkf@users.sf.net>
-
-	Bump TclOO version to 1.0.1 for release.
-
-2013-09-17  Donal Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (BinaryEncodeUu, BinaryDecodeUu): [Bug 2152292]:
-	Corrected implementation of the core of uuencode handling so that the
-	line length processing is correctly applied.
-	***POTENTIAL INCOMPATIBILITY***
-	Existing code that was using the old versions and working around the
-	limitations will now need to do far less. The -maxlen option now has
-	strict limits on the range of supported lengths; this is a limitation
-	of the format itself.
-
-2013-09-09  Donal Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (CloneProcedureMethod): [Bug 3609693]: Strip
-	the internal representation of method bodies during cloning in order
-	to ensure that any bound references to instance variables are removed.
-
-2013-09-01  Donal Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (BinaryDecodeHex): [Bug b98fa55285]: Ensure that
-	whitespace at the end of a string don't cause the decoder to drop the
-	last decoded byte.
-
-2013-08-03  Donal Fellows  <dkf@users.sf.net>
-
-	* library/auto.tcl: [Patch 3611643]: Allow TclOO classes to be found
-	by the autoloading mechanism.
-
-2013-08-02  Donal Fellows  <dkf@users.sf.net>
-
-	* generic/tclOODefineCmds.c (ClassSuperSet): Bug [9d61624b3d]: Stop
-	crashes when emptying the superclass slot, even when doing elaborate
-	things with metaclasses.
-
-2013-08-01  Harald Oehlmann  <oehhar@users.sf.net>
-
-	* tclUnixNotify.c (Tcl_InitNotifier): Bug [a0bc856dcd]: Start notifier
-	thread again if we were forked, to solve Rivet bug 55153.
-
-2013-07-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Africa/Casablanca:
-	* library/tzdata/America/Asuncion:
-	* library/tzdata/Antarctica/Macquarie:
-	* library/tzdata/Asia/Gaza:
-	* library/tzdata/Asia/Hebron:
-	* library/tzdata/Asia/Jerusalem:
-	http://www.iana.org/time-zones/repository/releases/tzdata2013d.tar.gz
-
-2013-07-03  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclXtNotify.c: Bug [817249]: bring tclXtNotify.c up to date with
-	Tcl_SetNotifier() change.
-
-2013-07-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:  Bug [32afa6e256]: dirent64 check is incorrect in tcl.m4
-	* unix/configure: (thanks to Brian Griffin)
-
-2013-06-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclConfig.c: Bug [9b2e636361]: Tcl_CreateInterp() needs
-	* generic/tclMain.c:   initialized encodings.
-
-2013-06-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclEvent.c: Bug [3611974]: InitSubsystems multiple thread
-	issue.
-
-2013-06-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/regc_locale.c: Bug [a876646efe]: re_expr character class
-	[:cntrl:] should contain \u0000 - \u001f
-
-2013-06-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmdsSZ.c (TclCompileTryCmd): [Bug 779d38b996]:
-	Rewrote the [try] compiler to generate better code in some cases and
-	to behave correctly in others; when an error happens during the
-	processing of an exception-trap clause or a finally clause, the
-	*original* return options are now captured in a -during option, even
-	when fully compiled.
-
-2013-06-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (INST_EXPAND_DROP): [Bugs 2835313, 3614226]:
-	New opcode to allow resetting the stack to get rid of an expansion,
-	restoring the stack to a known state in the process.
-	* generic/tclCompile.c, generic/tclCompCmds.c: Adjusted the compilers
-	for [break] and [continue] to get stack cleanup right in the majority
-	of cases.
-	* tests/for.test (for-7.*): Set of tests for these evil cases.
-
-2013-06-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4: Eliminate NO_VIZ macro as current zlib uses HAVE_HIDDEN
-	instead. One more last-moment fix for FreeBSD by Pietro Cerutti
-
-2013-06-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: fix for perf bug detected by Kieran
-	(https://groups.google.com/forum/?fromgroups#!topic/comp.lang.tcl/vfpI3bc-DkQ),
-	diagnosed by dgp to be a close relative of [Bug 781585], which was
-	fixed by commit	[f46fb50cb3]. This bug was introduced by myself in
-	commit [cbfe055d8c].
-
-2013-06-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileBreakCmd, TclCompileContinueCmd):
-	Added code to allow [break] and [continue] to be issued as a jump (in
-	the most common cases) rather than using the more expensive exception
-	processing path in the bytecode engine. [Bug 3614226]: Partial fix for
-	the issues relating to cleaning up the stack when dealing with [break]
-	and [continue].
-
-2013-05-27 Harald Oehlmann  <oehhar@users.sf.net>
-
-	* library/msgcat/msgcat.tcl: [Bug 3036566]: Also get locale from
-	registry key HCU\Control Panel\Desktop : PreferredUILanguages to honor
-	installed language packs on Vista+.
-	Bumped msgcat version to 1.5.2
-
-2013-05-22  Andreas Kupries  <andreask@activestate.com>
-
-	* tclCompile.c: Removed duplicate const qualifier causing the HP
-	native cc to error out.
-
-2013-05-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclUtf.c (TclUtfCasecmp): [Bug 3613609]: Replace problematic
-	uses of strcasecmp with a proper UTF-8-aware version. Affects both
-	[lsearch -nocase] and [lsort -nocase].
-
-2013-05-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/file.n: [Bug 3613671]: Added note to portability section on the
-	fact that [file owned] does not produce useful results on Windows.
-
-2013-05-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixFCmd.c (DefaultTempDir): [Bug 3613567]: Corrected logic
-	for checking return code of access() system call, which was inverted.
-
-2013-05-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:     Fix for FreeBSD, and remove support for older
-	* unix/configure:  FreeBSD versions. Patch by Pietro Cerutti.
-
-2013-05-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmdsGR.c: Split tclCompCmds.c again to keep size of
-	code down.
-
-2013-05-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBasic.c: Add panic in order to detect incompatible
-	mingw32 sys/stat.h and sys/time.h headers.
-
-2013-05-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/zlib/*: Upgrade to zlib 1.2.8
-
-2013-05-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	Optimizations and general bytecode generation improvements.
-	* generic/tclCompCmds.c (TclCompileAppendCmd, TclCompileLappendCmd):
-	(TclCompileReturnCmd): Make these generate bytecode in more cases.
-	(TclCompileListCmd): Make this able to push a literal when it can.
-	* generic/tclCompile.c (TclSetByteCodeFromAny, PeepholeOptimize):
-	Added checks to see if we can apply some simple cross-command-boundary
-	optimizations, and defined a small number of such optimizations.
-	(TclCompileScript): Added the special ability to compile the list
-	command with expansion ([list {*}blah]) into bytecode that does not
-	call an external command.
-
-2013-05-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclStubInit.c: Add support for Cygwin64, which has a 64-bit
-	* generic/tclDecls.h: "long" type. Binary compatibility with win64
-	requires that all stub entries use 32-bit long's, therefore the need
-	for various wrapper functions/macros. For Tcl 9 a better solution is
-	needed, but that cannot be done without introducing binary
-	incompatibility.
-
-2013-04-30  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl (::platform::LibcVersion):
-	* library/platform/pkgIndex.tcl: Followup to the 2013-01-30 change.
-	The RE become too restrictive again. SuSe added a timestamp after the
-	version. Loosened up a bit. Bumped package to version 1.0.12.
-
-2013-04-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileArraySetCmd): Generate better code
-	when the list of things to set is a literal.
-
-2013-04-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDecls.h: Implement Tcl_NewBooleanObj, Tcl_DbNewBooleanObj
-	and Tcl_SetBooleanObj as macros using Tcl_NewIntObj, Tcl_DbNewLongObj
-	and Tcl_SetIntObj. Starting with Tcl 8.5, this is exactly the same, it
-	only eliminates code duplication.
-	* generic/tclInt.h: Eliminate use of NO_WIDE_TYPE everywhere: It's
-	exactly the same as TCL_WIDE_INT_IS_LONG
-
-2013-04-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDecls.h: Implement many Tcl_*Var* functions and
-	Tcl_GetIndexFromObj as (faster/stack-saving) macros around resp their
-	Tcl_*Var*2 equivalent and Tcl_GetIndexFromObjStruct.
-
-2013-04-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDecls.h: Implement Tcl_Pkg* functions as
-	(faster/stack-saving) macros around Tcl_Pkg*Ex functions.
-
-2013-04-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/regc_color.c:	[Bug 3610026]: Stop crash when the number of
-	* generic/regerrs.h:	"colors" in a regular expression overflows a
-	* generic/regex.h:	short int.  Thanks to Heikki Linnakangas for
-	* generic/regguts.h:	the report and the patch.
-	* tests/regexp.test:
-
-2013-04-04  Reinhard Max  <max@suse.de>
-
-	* library/http/http.tcl (http::geturl): Allow URLs that don't have a
-	path, but a query query, e.g. http://example.com?foo=bar
-	* Bump the http package to 2.8.7.
-
-2013-03-22  Venkat Iyer <venkat@comit.com>
-	* library/tzdata/Africa/Cairo: Update to tzdata2013b.
-	* library/tzdata/Africa/Casablanca:
-	* library/tzdata/Africa/Gaborone:
-	* library/tzdata/Africa/Tripoli:
-	* library/tzdata/America/Asuncion:
-	* library/tzdata/America/Barbados:
-	* library/tzdata/America/Bogota:
-	* library/tzdata/America/Costa_Rica:
-	* library/tzdata/America/Curacao:
-	* library/tzdata/America/Nassau:
-	* library/tzdata/America/Port-au-Prince:
-	* library/tzdata/America/Santiago:
-	* library/tzdata/Antarctica/Palmer:
-	* library/tzdata/Asia/Aden:
-	* library/tzdata/Asia/Hong_Kong:
-	* library/tzdata/Asia/Muscat:
-	* library/tzdata/Asia/Rangoon:
-	* library/tzdata/Asia/Shanghai:
-	* library/tzdata/Atlantic/Bermuda:
-	* library/tzdata/Europe/Vienna:
-	* library/tzdata/Pacific/Easter:
-	* library/tzdata/Pacific/Fiji:
-	* library/tzdata/Asia/Khandyga: (new)
-	* library/tzdata/Asia/Ust-Nera: (new)
-	* library/tzdata/Europe/Busingen: (new)
-
-2013-03-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/auto.tcl: [Bug 2102614]: Add ensemble indexing support to
-	* tests/autoMkindex.test: [auto_mkindex].  Thanks Brian Griffin.
-
-2013-03-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFCmd.c: [Bug 3597000]: Consistent [file copy] result.
-	* tests/fileSystem.test:
-
-2013-03-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFile.c: [Bug 3608360]: Incompatible behaviour of "file
-	exists".
-
-2013-03-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/cmdAH.test (cmdAH-19.12): [Bug 3608360]: Added test to ensure
-	that we never ever allow [file exists] to do globbing.
-
-2013-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4: Patch by Andrew Shadura, providing better support for
-	three architectures they have in Debian.
-
-2013-03-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c:	[Bugs 3607246,3607372]: Unbalanced refcounts
-	* generic/tclLiteral.c:	of literals in the global literal table.
-
-2013-03-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/regc_nfa.c:	[Bugs 3604074,3606683]: Rewrite of the
-	* generic/regcomp.c:	fixempties() routine (and supporting routines)
-	to completely eliminate the infinite loop hazard. Thanks to Tom Lane
-	for the much improved solution.
-
-2013-02-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclLiteral.c:	Revise TclReleaseLiteral() to tolerate a NULL
-	interp argument.
-
-	* generic/tclCompile.c:	Update callers and revise mistaken comments.
-	* generic/tclProc.c:
-
-2013-02-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/regcomp.c:	[Bug 3606139]: missing error check allows
-	* tests/regexp.test:    regexp to crash Tcl. Thanks to Tom Lane for
-	providing the test-case and the patch.
-
-2013-02-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/chanio.test (chan-io-28.7): [Bug 3605120]: Stop test from
-	hanging when run standalone.
-
-2013-02-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclObj.c: Don't panic if Tcl_ConvertToType is called for a
-	type that doesn't have a setFromAnyProc, create a proper error message.
-
-2013-02-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/binary.test (binary-41.*): [Bug 3605721]: Test independence
-	fixes. Thanks to Rolf Ade for pointing out the problem.
-
-2013-02-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/assocd.test:	[Bugs 3605719,3605720]: Test independence.
-	* tests/basic.test:	Thanks Rolf Ade for patches.
-
-2013-02-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/fake-rfc2553.c: [Bug 3599194]: compat/fake-rfc2553.c is
-	broken.
-
-2013-02-22  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclAssembly.c:	Shift more burden of smart cleanup
-	* generic/tclCompile.c:		onto the TclFreeCompileEnv() routine.
-	Stop crashes when the hookProc raises an error.
-
-2013-02-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c:	[Bug 3605447]: Make sure the -clear option
-	* tests/namespace.test:	to [namespace export] always clears, whether
-	or not new export patterns are specified.
-
-2013-02-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c: [Bug 3605401]: Compiler error with latest mingw-w64
-	headers.
-
-2013-02-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclTrace.c:  [Bug 2438181]: Incorrect error reporting in
-	* tests/trace.test:    traces. Test-case and fix provided by Poor
-	Yorick.
-
-2013-02-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/regc_nfa.c:	[Bug 3604074]: Fix regexp optimization to
-	* tests/regexp.test:	stop hanging on the expression
-	((((((((a)*)*)*)*)*)*)*)* .  Thanks to Bjørn Grathwohl for discovery.
-
-2013-02-14  Harald Oehlmann  <oehhar@users.sf.net>
-
-	* library/msgcat/msgcat.tcl: [Bug 3604576]: Catch missing registry
-	entry "HCU\Control Panel\International".
-	Bumped msgcat version to 1.5.1
-
-2013-02-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ZlibTransformOutput): [Bug 3603553]: Ensure that
-	data gets written to the underlying stream by compressing transforms
-	when the amount of data to be written is one buffer's-worth; problem
-	was particularly likely to occur when compressing large quantities of
-	not-very-compressible data. Many thanks to Piera Poggio (vampiera) for
-	reporting.
-
-2013-02-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOBasic.c (TclOO_Object_VarName): [Bug 3603695]: Change
-	the way that the 'varname' method is implemented so that there are no
-	longer problems with interactions due to the resolver. Thanks to
-	Taylor Venable <tcvena@gmail.com> for identifying the problem.
-
-2013-02-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/regc_nfa.c (duptraverse): [Bug 3603557]: Increase the
-	maximum depth of recursion used when duplicating an automaton in
-	response to encountering a "wild" RE that hit the previous limit.
-	Allow the limit (DUPTRAVERSE_MAX_DEPTH) to be set by defining its
-	value in the Makefile. Problem reported by Jonathan Mills.
-
-2013-02-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* win/tclWinFile.c:	[Bug 3603434]: Make sure TclpObjNormalizePath()
-	properly declares "a:/" to be normalized, even when no "A:" drive is
-	present on the system.
-
-2013-02-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclLoadNone.c (TclpLoadMemory): [Bug 3433012]: Added dummy
-	version of this function to use in the event that a platform thinks it
-	can load from memory but cannot actually do so due to it being
-	disabled at configuration time.
-
-2013-02-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileArraySetCmd): [Bug 3603163]: Stop
-	crash in weird case where [eval] is used to make [array set] get
-	confused about whether there is a local variable table or not. Thanks
-	to Poor Yorick for identifying a reproducible crashing case.
-
-2013-01-30  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl (::platform::LibcVersion): See
-	* library/platform/pkgIndex.tcl: [Bug 3599098]: Fixed the RE
-	* unix/Makefile.in: extracting the version to avoid issues with
-	* win/Makefile.in: recent changes to the glibc banner. Now targeting a
-	less variable part of the string. Bumped package to version 1.0.11.
-
-2013-01-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileArraySetCmd)
-	(TclCompileArrayUnsetCmd, TclCompileDictAppendCmd)
-	(TclCompileDictCreateCmd, CompileDictEachCmd, TclCompileDictIncrCmd)
-	(TclCompileDictLappendCmd, TclCompileDictMergeCmd)
-	(TclCompileDictUnsetCmd, TclCompileDictUpdateCmd)
-	(TclCompileDictWithCmd, TclCompileInfoCommandsCmd):
-	* generic/tclCompCmdsSZ.c (TclCompileStringMatchCmd)
-	(TclCompileStringMapCmd): Improve the code generation in cases where
-	full compilation is impossible but a full ensemble invoke is provably
-	not necessary.
-
-2013-01-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclUnixCompat.c: [Bug 3601804]: platformCPUID segmentation
-	fault on Darwin.
-
-2013-01-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/http/http.tcl (http::geturl): [Bug 2911139]: Do not do vwait
-	for connect to avoid reentrancy problems (except when operating
-	without a -command option). Internally, this means that all sockets
-	created by the http package will always be operated in asynchronous
-	mode.
-
-2013-01-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls: Put back Tcl[GS]etStartupScript(Path|FileName)
-	in private stub table, so extensions using this (like Tk 8.4) will
-	continue to work in all Tcl 8.x versions. Extensions using this
-	still cannot be compiled against Tcl 8.6 headers.
-
-2013-01-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPort.h: [Bug 3598300]: unix: tcl.h does not include
-	sys/stat.h
-
-2013-01-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (PushVarName): [Bug 3600328]: Added mechanism
-	for suppressing compilation of variables when we couldn't cope with
-	the results. Useful for some [array] subcommands.
-	* generic/tclEnsemble.c (CompileToCompiledCommand): Must restore the
-	compilation environment when a command compiler fails.
-
-2013-01-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (TclZlibInit): [Bug 3601086]: Register the config
-	info in the iso8859-1 encoding as that is guaranteed to be present.
-
-2013-01-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* Makefile.in:   Allow win32 build with -DTCL_NO_DEPRECATED, just as
-	* generic/tcl.h: in the UNIX build. Define Tcl_EvalObj and
-	* generic/tclDecls.h: Tcl_GlobalEvalObj as macros, even when
-	* generic/tclBasic.c: TCL_NO_DEPRECATED is defined, so Tk can benefit
-	from it too.
-
-2013-01-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tcl.m4: More flexible search for win32 tclConfig.sh, backported
-	from TEA (not actually used in Tcl, only for Tk)
-
-2013-01-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls: Put back Tcl_[GS]etStartupScript in internal
-	stub table, so extensions using this, compiled against 8.5 headers
-	still run in Tcl 8.6.
-
-2013-01-13  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* doc/fileevent.n: [Bug 3436609]: Clarify readable fileevent "false
-	positives" in the case of multibyte encodings/transforms.
-
-2013-01-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIntDecls.h: If TCL_NO_DEPRECATED is defined, make sure
-	that TIP #139 functions all are taken from the public stub table, even
-	if the inclusion is through tclInt.h.
-
-2013-01-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls: Put back TclBackgroundException in internal
-	stub table, so extensions using this, compiled against 8.5 headers
-	still run in Tcl 8.6.
-
-2013-01-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/http/http.tcl: [Bug 3599395]: http assumes status line is a
-	proper Tcl list.
-
-2013-01-08  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFile.c: [Bug 3092089]: [file normalize] can remove path
-	components.	[Bug 3587096]: win vista/7: "can't find init.tcl" when
-	called via junction without folder list access.
-
-2013-01-07  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclOOStubLib.c: Restrict the stub library to only use
-	* generic/tclTomMathStubLib.c: Tcl_PkgRequireEx, Tcl_ResetResult and
-	Tcl_AppendResult, not any other function. This puts least restrictions
-	on eventual Tcl 9 stubs re-organization, and it works on the widest
-	range of Tcl versions.
-
-2013-01-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/http/http.tcl: Don't depend on Spencer-specific regexp
-	* tests/env.test: syntax (/u and /U) any more in unrelated places.
-	* tests/exec.test:
-	Bump http package to 2.8.6.
-
-2013-01-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclEnsemble.c (CompileBasicNArgCommand): Added very simple
-	compiler (which just compiles to a normal invoke of the implementation
-	command) for many ensemble subcommands where we can prove that there
-	is no way for scripts to detect the difference even through error
-	handling or [info level]/[info frame]. This improves the code produced
-	from some ensembles (e.g., [info], [string]) to the point where the
-	ensemble is now not normally seen at the bytecode level at all.
-
-2013-01-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h:      Insure that PURIFY builds cannot exploit the
-	* generic/tclExecute.c:  Tcl stack to hide mem defects.
-
-2013-01-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/fconfigure.n, doc/CrtChannel.3: Updated to reflect the fact that
-	the minimum buffer size is one byte, not ten. Identified by Schelte
-	Bron on the Tcler's Chat.
-
-	* generic/tclExecute.c (TEBCresume:INST_INVOKE_REPLACE):
-	* generic/tclEnsemble.c (TclCompileEnsemble): Added new mechanism to
-	allow for more efficient dispatch of non-bytecode-compiled subcommands
-	of bytecode-compiled ensembles. This can provide substantial speed
-	benefits in some cases.
-
-2013-01-02  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclEnsemble.c:  Remove stray calls to Tcl_Alloc and friends:
-	* generic/tclExecute.c:   the core should only use ckalloc to allow
-	* generic/tclIORTrans.c:  MEM_DEBUG to work properly.
-	* generic/tclTomMathInterface.c:
-
-2012-12-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/string.n: Noted the obsolescence of the 'bytelength',
-	'wordstart' and 'wordend' subcommands, and moved them to later in the
-	file.
-
-2012-12-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclListObj.c: [Bug 3598580]: Tcl_ListObjReplace may release
-	deleted elements too early.
-
-2012-12-22  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclUtil.c: [Bug 3598150]: Stop leaking allocated space when
-	objifying a zero-length DString. Spotted by afredd.
-
-2012-12-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/dltest/pkgb.c:  Inline compat Tcl_GetDefaultEncodingDir.
-	* generic/tclStubLib.c: Eliminate unnecessary static HasStubSupport()
-	and isDigit() functions, just do the same inline.
-
-2012-12-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmdsSZ.c (TclSubstCompile): Improved the sequence of
-	instructions issued for [subst] when dealing with simple variable
-	references.
-
-2012-12-14  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.6.0 TAGGED FOR RELEASE ***
-
-	* changes: updates for 8.6.0
-
-2012-12-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclZlib.c:	Repair same issue with misusing the
-	* tests/zlib.test:	'fire and forget' nature of Tcl_ObjSetVar2
-	in the new TIP 400 implementation.
-
-2012-12-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdAH.c:	(CatchObjCmdCallback): do not decrRefCount
-	* tests/cmdAH.test:	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 doesn't
-	access its objPtr parameter twice any more.
-
-2012-12-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Bump version number to 8.6.0.
-	* library/init.tcl:
-	* unix/configure.in:
-	* win/configure.in:
-	* unix/tcl.spec:
-	* README:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-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.
-
-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
-	spotting.
-
-2012-12-07  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.
-
-2012-11-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ZlibStreamSubcmd): [Bug 3590483]: Use a mechanism
-	for complex option resolution that has fewer problems with more
-	finicky compilers.
-
-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.
-
-2012-11-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (BinaryDecode64): [Bug 3033307]: Corrected
-	handling of trailing whitespace when decoding base64. Thanks to Anton
-	Kovalenko for reporting, and Andy Goth for the fix and tests.
-
-2012-11-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (INST_STR_RANGE_IMM): [Bug 3588366]: Corrected
-	implementation of bounds restriction for end-indexed compiled [string
-	range]. Thanks to Emiliano Gavilan for diagnosis and fix.
-
-2012-11-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	IMPLEMENTATION OF TIP#416
-
-	New Options for 'load': -global and -lazy
-
-	* generic/tcl.h:
-	* generic/tclLoad.c
-	* unix/tclLoadDl.c
-	* unix/tclLoadDyld.c
-	* tests/load.test
-	* doc/Load.3
-	* doc/load.n
-
-2012-11-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixFCmd.c (TclUnixOpenTemporaryFile): [Bug 2933003]: Factor
-	out all the code to do temporary file creation so that it is possible
-	to make it correct in one place. Allow overriding of the back-stop
-	default temporary file location at compile time by setting the
-	TCL_TEMPORARY_FILE_DIRECTORY #def to a string containing the directory
-	name (defaults to "/tmp" as that is the most common default).
-
-2012-11-13  Joe Mistachkin  <joe@mistachkin.com>
-
-	* win/tclWinInit.c: also search for the library directory (init.tcl,
-	encodings, etc) relative to the build directory associated with the
-	source checkout.
-
-2012-11-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   re-enable bcc-tailcall, after fixing an
-	* generic/tclExecute.c: infinite loop in the TCL_COMPILE_DEBUG mode
-
-
-2012-11-07  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Africa/Casablanca:
-	* library/tzdata/America/Araguaina:
-	* library/tzdata/America/Bahia:
-	* library/tzdata/America/Havana:
-	* library/tzdata/Asia/Amman:
-	* library/tzdata/Asia/Gaza:
-	* library/tzdata/Asia/Hebron:
-	* library/tzdata/Asia/Jerusalem:
-	* library/tzdata/Pacific/Apia:
-	* library/tzdata/Pacific/Fakaofo:
-	* library/tzdata/Pacific/Fiji:		Import tzdata2012i.
-
-2012-11-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/http/http.tcl (http::Finish): [Bug 3581754]: Ensure that
-	callbacks are done at most once to prevent problems with timeouts on a
-	keep-alive connection (combined with reentrant http package use)
-	causing excessive stack growth. Not a fix for the underlying problem,
-	but ensures that pain will be mostly kept away from users.
-	Bump http package to 2.8.5.
-
-2012-11-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	Added bytecode compilation of many Tcl commands. Some of these are
-	total compilations and some are only partial (i.e., only compile in
-	some cases). The (sub-)commands affected are:
-	* array: exists, set, unset
-	* dict: create, exists, merge
-	* format: (simple cases only)
-	* info: commands, coroutine, level, object
-	* info object: class, isa object, namespace
-	* namespace: current, code, qualifiers, tail, which
-	* regsub: (only cases convertable to simple [string map])
-	* self: (only no-argument and [self object] cases)
-	* string: first, last, map, range
-	* tailcall:
-	* yield:
-
-	[This was work originally done on the 'dkf-compile-misc-info' branch.]
-
-2012-11-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	IMPLEMENTATION OF TIP#413
-
-	Align the [string trim] and [string is space] commands, such that
-	[string trim] by default trims all characters for which [string is
-	space] returns 1, augmented with the NUL character.
-
-	* generic/tclUtf.c: Add NEL, BOM and two more characters to [string is
-	space]
-	* generic/tclCmdMZ.c: Modify [string trim] for Unicode modifications.
-	* generic/regc_locale.c: Regexp engine must match [string is space]
-	* doc/string.n
-	* tests/string.test
-	***POTENTIAL INCOMPATIBILITY***
-	Code that relied on characters not previously trimmed being not
-	removed will notice a difference; it is believed that this is rare,
-	but a workaround to get the behavior in Tcl 8.5 is to use " \t\n\r" as
-	an explicit trim set.
-
-2012-10-31  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in:   Dde version number to 1.4.0, ready for Tcl 8.6.0rc1
-	* win/makefile.vc
-	* win/tclWinDde.c
-	* library/dde/pkgIndex.tcl
-	* tests/winDde.test
-
-2012-10-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileDictUnsetCmd): Added compilation of
-	the [dict unset] command (for scalar var in LVT only).
-
-2012-10-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h:       Add "flags" parameter from Tcl_LoadFile to
-	* generic/tclIOUtil.c:    to various internal functions, so these
-	* generic/tclLoadNone.c:  flags are available through the whole
-	* unix/tclLoad*.c:        filesystem for (future) internal use.
-	* win/tclWinLoad.c:
-
-2012-10-17  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclNRCoroutineObjCmd): insure that numlevels
-	are properly set, fix bug discovered by dkf and reported at
-	http://code.activestate.com/lists/tcl-core/12213/
-
-2012-10-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	IMPLEMENTATION OF TIP#405
-
-	New commands for applying a transformation to the elements of a list
-	to produce another list (the [lmap] command) and to the mappings of a
-	dictionary to produce another dictionary (the [dict map] command). In
-	both cases, a [continue] will cause the skipping of an element/pair,
-	and a [break] will terminate the construction early and successfully.
-
-	* generic/tclCmdAH.c (Tcl_LmapObjCmd, TclNRLmapCmd): Implementation of
-	the new [lmap] command, based on (and sharing much of) [foreach].
-	* generic/tclDictObj.c (DictMapNRCmd): Implementation of the new [dict
-	map] subcommand, based on (and sharing much of) [dict for].
-	* generic/tclCompCmds.c (TclCompileLmapCmd, TclCompileDictMapCmd):
-	Compilation engines for [lmap] and [dict map].
-
-	IMPLEMENTATION OF TIP#400
-
-	* generic/tclZlib.c: Allow the specification of a compression
-	dictionary (a binary blob used to seed the compression engine) in both
-	streams and channel transformations. Also some reorganization to allow
-	for getting gzip header dictionaries and controlling buffering levels
-	in channel transformations (allowing a trade-off between formal
-	correctness and speed).
-	(Tcl_ZlibStreamSetCompressionDictionary): New C API to allow setting
-	the compression dictionary without using a Tcl script.
-
-2012-10-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDictObj.c: [Bug 3576509]: ::tcl::Bgerror crashes with
-	* generic/tclEvent.c:    invalid arguments. Better fix, which helps
-	for all Tcl_DictObjGet() calls in Tcl's source code.
-
-2012-10-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclEvent.c: [Bug 3576509]: tcl::Bgerror crashes with invalid
-	arguments
-
-2012-10-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in: [Bug 2459774]: tcl/win/Makefile.in not compatible
-	with msys 0.8.
-
-2012-10-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIO.c:	When checking for std channels being closed,
-	compare the channel state, not the channel itself so that stacked
-	channels do not cause trouble.
-
-2012-09-26  Reinhard Max  <max@suse.de>
-
-	* generic/tclIOSock.c (TclCreateSocketAddress): Work around a bug in
-	getaddrinfo() on OSX that caused name resolution to fail for [socket
-	-server foo -myaddr localhost 0].
-
-2012-09-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/configure.in: New import libraries for zlib 1.2.7, usable for
-	* win/configure:    all win32/win64 compilers
-	* compat/zlib/win32/zdll.lib:
-	* compat/zlib/win64/zdll.lib:
-
-	* win/tclWinDde.c: [FRQ 3527238]: Full unicode support for dde. Dde
-	version is now 1.4.0b2.
-	***POTENTIAL INCOMPATIBILITY***
-
-2012-09-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:  Make Tcl_Interp a fully opaque structure if
-	TCL_NO_DEPRECATED is set (TIP 330 and 336).
-	* win/nmakehlp.c: Let "nmakehlp -V" start searching digits after the
-	found match (suggested by Harald Oehlmann).
-
-2012-09-19  Harald Oehlmann  <oehhar@users.sf.net>
-
-	IMPLEMENTATION OF TIP#412.
-
-	* library/msgcat/msgcat.tcl:	dynamic locale change with mc file
-	* library/clock.tcl:            load on locale change.
-	clock uses new msgcat features.
-
-2012-09-07  Harald Oehlmann  <oehhar@users.sf.net>
-
-	*** 8.6b3 TAGGED FOR RELEASE ***
-
-	IMPLEMENTATION OF TIP#404.
-
-	* library/msgcat/msgcat.tcl:	[FRQ 3544988]: New commands [mcflset]
-	* library/msgcat/pkgIndex.tcl:	and [mcflmset] to set mc entries with
-	* unix/Makefile.in:		implicit message file locale.
-	* win/Makefile.in:		Bump to 1.5.0.
-
-2012-08-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/msgs/uk.msg: [Bug 3561330]: Use the correct full name of
-	March in Ukrainian. Thanks to Mikhail Teterin for reporting.
-
-2012-08-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBinary.c: [Bug 3496014]: Unecessary memset() in
-	Tcl_SetByteArrayObj().
-
-2012-08-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	[Bug 3559678]: Fix bad filename normalization
-	when the last component is the empty string.
-
-2012-08-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h:  Remove wrapper macro for ntohs(): unnecessary,
-	because it doesn't require an initialized winsock_2 library. See:
-	<http://msdn.microsoft.com/en-us/library/windows/desktop/ms740075%28v=vs.85%29.aspx>
-	* win/tclWinSock.c:
-	* generic/tclStubInit.c:
-
-2012-08-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/nmakehlp.c: Add "-V<num>" option, in order to be able to detect
-	partial version numbers.
-
-2012-08-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/buildall.vc.bat: Only build the threaded builds by default
-	* win/rules.vc:        Some code cleanup
-
-2010-08-13  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/tclUnixCompat.c: [Bug 3555454]: Rearrange a bit to quash
-	'declared but never defined' compiler warnings.
-
-2012-08-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/zlib/win64/zlib1.dll:  Add 64-bit build of zlib1.dll, and use
-	* compat/zlib/win64/zdll.lib:   it for the dynamic mingw-w64 build.
-	* win/Makefile.in:
-	* win/configure.in:
-	* win/configure:
-
-2012-08-09  Reinhard Max  <max@suse.de>
-
-	* tests/http.test: Fix http-3.29 for machines without IPv6 support.
-
-2010-08-08  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/tclUnixCompat.c: Change one '#ifdef' to '#if defined()' for
-	improved consistency within the file.
-
-2012-08-08  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclfileName.c: [Bug #1536227]: Cygwin network pathname
-	* tests/fileName.test:   support
-
-2012-08-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:	[Bug 3554250]: Overlooked one field of cleanup
-	in the thread exit handler for the filesystem subsystem.
-
-2012-07-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInterp.c (Tcl_GetInterpPath):
-	* unix/tclUnixPipe.c (TclGetAndDetachPids, Tcl_PidObjCmd):
-	* win/tclWinPipe.c (TclGetAndDetachPids, Tcl_PidObjCmd):
-	Purge use of Tcl_AppendElement, and corrected conversion of PIDs to
-	integer objects.
-
-2012-07-31  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/nmakehlp.c:  Add -Q option from sampleextension.
-	* win/Makefile.in: [FRQ 3544967]: Missing objectfiles in static lib
-	* win/makefile.vc: (Thanks to Jos Decoster).
-
-2012-07-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in:  No longer build tcltest.exe to run the tests,
-	but use tclsh86.exe in combination with tcltest86.dll to do that.
-	* tests/*.test:     load tcltest86.dll if necessary.
-
-2012-07-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tests/clock.test:    [Bug 3549770]: Multiple test failures running
-	* tests/registry.test: tcltest outside build tree
-	* tests/winDde.test:
-
-2012-07-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclUniData.c:   Support Unicode 6.2 (Add Turkish lira sign)
-	* generic/regc_locale.c:
-
-2012-07-25  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* win/tclWinPipe.c: [Bug 3547994]: Abandon the synchronous Windows
-	pipe driver to its fate when needed to honour TIP#398.
-
-2012-07-24  Trevor Davel  <twylite@crypt.co.za>
-
-	* win/tclWinSock.c: [Bug: 3545363]: Loop over multiple underlying file
-	descriptors for a socket where required (TcpCloseProc, SocketProc).
-	Refactor socket/descriptor setup to manage linked list operations in
-	one place. Fix memory leak in socket close (TcpCloseProc) and related
-	dangling pointers in SocketEventProc.
-
-2012-07-19  Reinhard Max  <max@suse.de>
-
-	* win/tclWinSock.c (TcpAccept): [Bug: 3545363]: Use a large enough
-	buffer for accept()ing IPv6 connections. Fix conversion of host and
-	port for passing to the accept proc to be independent of the IP
-	version.
-
-2012-07-23  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclIO.c: [Bug 3545365]: Never try a bg-flush  on a dead
-	channel, just like before 2011-08-17.
-
-2012-07-19  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclTest.c: Fix several more missing mutex-locks in
-	TestasyncCmd.
-
-2012-07-19  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclTest.c: [Bug 3544685]: Missing mutex-lock in
-	TestasyncCmd since 2011-08-19. Unbounded gratitude to Stuart
-	Cassoff for spotting it.
-
-2012-07-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/makefile.vc: [Bug 3544932]: Visual studio compiler check fails
-
-2012-07-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclUtil.c (UpdateStringOfEndOffset): [Bug 3544658]: Stop
-	1-byte overrun in memcpy, that object placement rules made harmless
-	but which still caused compiler complaints.
-
-2012-07-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/reg/pkgIndex.tcl:  Make registry 1.3 package dynamically
-	loadable when ::tcl::pkgconfig is available.
-
-2012-07-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinReg.c: [Bug 3362446]: registry keys command fails
-	with 8.5/8.6. Follow Microsofts example better in order to prevent
-	problems when using HKEY_PERFORMANCE_DATA.
-
-2012-07-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclUnixNotfy.c: [Bug 3541646]: Don't panic on triggerPipe
-	overrun.
-
-2012-07-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* win/tclWinSock.c (InitializeHostName): Corrected logic that
-	extracted the name of the computer from the gethostname call so that
-	it would use the name on success, not failure. Also ensured that the
-	buffer size is exactly that recommended by Microsoft.
-
-2012-07-08  Reinhard Max  <max@suse.de>
-
-	* library/http/http.tcl: [Bug 3531209]: Add fix and test for URLs that
-	* tests/http.test: 	 contain literal IPv6 addresses.
-
-2012-07-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/tclUnixPipe.c:	[Bug 1189293]: Make "<<" binary safe.
-	* win/tclWinPipe.c:
-
-2012-07-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclUtil.c (TclDStringAppendObj, TclDStringAppendDString):
-	* generic/tclInt.h (TclDStringAppendLiteral, TclDStringClear):
-	* generic/tclCompile.h (TclDStringAppendToken): Added wrappers to make
-	common cases of appending to Tcl_DStrings simpler to write. Prompted
-	by looking at [FRQ 1357401] (these are an _internal_ implementation of
-	that FRQ).
-
-2012-06-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/msgcat/msgcat.tcl:   Add tn, ro_MO and ru_MO to msgcat.
-
-2012-06-29  Harald Oehlmann <oehhar@users.sf.net>
-
-	* library/msgcat/msgcat.tcl:	[Bug 3536888]: Locale guessing of
-	* library/msgcat/pkgIndex.tcl:	msgcat fails on (some) Windows 7. Bump
-	* unix/Makefile.in:		to 1.4.5
-	* win/Makefile.in:
-
-2012-06-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/GetIndex.3: Reinforced the description of the requirement for
-	the tables of names to index over to be static, following posting to
-	tcl-core by Brian Griffin about a bug caused by Tktreectrl not obeying
-	this rule correctly. This does not represent a functionality change,
-	merely a clearer documentation of a long-standing constraint.
-
-2012-06-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:       Let Cygwin shared build link with
-	* unix/configure.in: zlib1.dll, not cygz.dll (two less
-	* unix/configure:    dependencies on cygwin-specific dll's)
-	* unix/Makefile.in:
-
-2012-06-26  Reinhard Max  <max@suse.de>
-
-	* generic/tclIOSock.c: Use EAI_SYSTEM only if it exists.
-	* unix/tclUnixSock.c:
-
-2012-06-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFileSystem.h:	[Bug 3024359]: Make sure that the
-	* generic/tclIOUtil.c:	per-thread cache of the list of file systems
-	* generic/tclPathObj.c:	currently registered is only updated at times
-	when no active loops are traversing it.  Also reduce the amount of
-	epoch storing and checking to where it can make a difference.
-
-2012-06-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdAH.c (EncodingDirsObjCmd): [Bug 3537605]: Do the right
-	thing when reporting errors with the number of arguments.
-
-2012-06-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclfileName.c: [Patch 1536227]: Cygwin network pathname
-	* tests/fileName.test:   support.
-
-2012-06-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclUnixNotfy.c: [Bug 3508771]: Cygwin notifier for handling
-	win32 events.
-
-2012-06-22  Reinhard Max  <max@suse.de>
-
-	* generic/tclIOSock.c: Rework the error message generation of [socket],
-	* unix/tclUnixSock.c:  so that the error code of getaddrinfo is used
-	* win/tclWinSock.c:    instead of errno unless it is EAI_SYSTEM.
-
-2012-06-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinReg.c:	[Bug 3362446]: registry keys command fails
-	* tests/registry.test:	with 8.5/8.6
-
-2012-06-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	[Bug 3532959]: Make sure the lifetime
-	* generic/tclProc.c:	management of entries in the linePBodyPtr
-	* tests/proc.test:	hash table can tolerate either order of
-	teardown, interp first, or Proc first.
-
-2012-06-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/configure.in:	Update autogoo for gettimeofday().
-	* unix/tclUnixPort.h:	Thanks Joe English.
-	* unix/configure:	autoconf 2.13
-
-	* unix/tclUnixPort.h:	[Bug 3530533]: Centralize #include <pthread.h>
-	* unix/tclUnixThrd.c:	in the tclUnixPort.h header so that old unix
-	systems that need inclusion in all compilation units are supported.
-
-2012-06-08  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c:    Revise the "null data" check: null strings are
-	possible, but empty binary arrays are not.
-	* tests/winDde.test:  Add test-case (winDde-9.4) for transferring
-	null-strings with dde. Convert tests to tcltest-2 syntax.
-
-2012-06-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (TclZlibInit): Declare that Tcl is publishing the
-	zlib package (version 2.0) as part of its bootstrap process. This will
-	have an impact on tclkit (which includes zlib 1.1) but otherwise be
-	very low impact.
-
-2012-06-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclUnixInit.c: On Cygwin, use win32 API in stead of uname()
-	to determine the tcl_platform variables.
-
-2012-05-31  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclZlib.c:  [Bug 3530536]: zlib-7.4 fails on IRIX64
-	* tests/zlib.test:
-	* doc/zlib.n:         Document that [stream checksum] doesn't do
-	what's expected for "inflate" and "deflate" formats
-
-2012-05-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/safe.tcl (safe::AliasFileSubcommand): Don't assume that
-	slaves have corresponding commands, as that is not true for
-	sub-subinterpreters (used in Tk's test suite).
-
-	* doc/safe.n: [Bug 1997845]: Corrected formatting so that generated
-	HTML can link properly.
-
-	* tests/socket.test (socket*-13.1): Prevented intermittent test
-	failure due to race condition.
-
-2012-05-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/expr.n, doc/mathop.n: [Bug 2931407]: Clarified semantics of
-	division and remainder operators.
-
-2012-05-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c:    [Bug 3525762]: Encoding handling in dde.
-	* win/Makefile.in:    Fix "make genstubs" when cross-compiling on UNIX
-
-2012-05-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/safe.tcl (safe::AliasFileSubcommand): [Bug 3529949]: Made a
-	more sophisticated method for preventing information leakage; it
-	changes references to "~user" into "./~user", which is safe.
-
-2012-05-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/namespace.n, doc/Ensemble.3: [Bug 3528418]: Document what is
-	going on with respect to qualification of command prefixes in ensemble
-	subcommand maps.
-
-	* generic/tclIO.h (SYNTHETIC_EVENT_TIME): Factored out the definition
-	of the amount of time that should be waited before firing a synthetic
-	event on a channel.
-
-2012-05-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c: [Bug 473946]: Special characters were not correctly
-	sent, now for XTYP_EXECUTE as well as XTYP_REQUEST.
-	* win/Makefile.in: Fix "make genstubs" when cross-compiling on UNIX
-
-2012-05-24  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl:  Take cygwin handling of X11 into account.
-	* generic/tcl*Decls.h: re-generated
-	* generic/tclStubInit.c:  Implement TclpIsAtty, Cygwin only.
-	* doc/dde.n: Doc fix: "dde execute iexplore" doesn't work
-	without -async, because iexplore doesn't return a value
-
-2012-05-24  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl:   Let cygwin share stub table with win32
-	* win/tclWinSock.c:     implement TclpInetNtoa for win32
-	* generic/tclInt.decls: Revert most of [3caedf05df], since when
-	  we let cygwin share the win32 stub table this is no longer necessary
-	* generic/tcl*Decls.h:  re-generated
-	* doc/dde.n:            1.3 -> 1.4
-
-2012-05-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ZlibTransformInput): [Bug 3525907]: Ensure that
-	decompressed input is flushed through the transform correctly when the
-	input stream gets to the end. Thanks to Alexandre Ferrieux and Andreas
-	Kupries for their work on this.
-
-2012-05-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFileName.c:	When using Tcl_SetObjLength() calls to
-	* generic/tclPathObj.c:		grow and shrink the objPtr->bytes
-	buffer, care must be taken that the value cannot possibly become pure
-	Unicode.  Calling Tcl_AppendToObj() has the possibility of making such
-	a conversion.  Bug found while valgrinding the trunk.
-
-2012-05-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	IMPLEMENTATION OF TIP#106
-
-	* win/tclWinDde.c:		Added encoding-related abilities to
-	* library/dde/pkgIndex.tcl:	the [dde] command. The dde package's
-	* tests/winDde.test:		version is now 1.4.0.
-	* doc/dde.n:
-
-2012-05-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOBasic.c (TclOO_Class_Constructor): [Bug 2023112]: Cut
-	the amount of hackiness in class constructors, and refactor some of
-	the error message handling from [oo::define] to be saner in the face
-	of odd happenings.
-
-2012-05-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd): [Bug 3106532]: Corrected
-	resulting indexes from -indexvar option to be usable with [string
-	range]; this was always the intention (and is consistent with [regexp
-	-indices] too).
-	***POTENTIAL INCOMPATIBILITY***
-	Uses of [switch -regexp -indexvar] that previously compensated for the
-	wrong offsets (by subtracting 1 from the end indices) now do not need
-	to do so as the value is correct.
-
-	* library/safe.tcl (safe::InterpInit): Ensure that the module path is
-	constructed in the correct order.
-	(safe::AliasGlob): [Bug 2964715]: More extensive handling of what
-	globbing is required to support package loading.
-
-	* doc/expr.n: [Bug 3525462]: Corrected statement about what happens
-	when comparing "0y" and "0x12"; the previously documented behavior was
-	actually a subtle bug (now long-corrected).
-
-2012-05-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdAH.c (TclMakeFileCommandSafe): [Bug 3445787]: Improve
-	the compatibility of safe interpreters' version of 'file' with that of
-	unsafe interpreters.
-	* library/safe.tcl (::safe::InterpInit): Teach the safe-interp scripts
-	about how to expose 'file' properly.
-
-2012-05-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c:   Protect against receiving strings without ending
-	\0, as external applications (or Tcl with TIP #106) could generate
-	that.
-
-2012-05-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c: [Bug 473946]: Special characters not correctly sent
-	* library/dde/pkgIndex.tcl:  Increase version to 1.3.3
-
-2012-05-10  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* {win,unix}/configure{,.in}: [Bug 2812981]: Clean up bundled
-	packages' build directory from within Tcl's ./configure, to avoid
-	stale configuration.
-
-2012-05-09  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c: [Bug 3522560]: Fixed the crash, enabled the
-	test case. Modified [chan postevent] to properly inject the event(s)
-	into the owner thread's event queue for execution in the correct
-	context. Renamed the ForwardOpTo...Thread() function to match with our
-	terminology.
-
-	* tests/ioCmd.test: [Bug 3522560]: Added a test which crashes the core
-	if it were not disabled as knownBug. For a reflected channel
-	transfered to a different thread the [chan postevent] run in the
-	handler thread tries to execute the owner threads's fileevent scripts
-	by itself, wrongly reaching across thread boundaries.
-
-2012-04-28  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclIO.c: Properly close nonblocking channels even when
-	not flushing them.
-
-2012-05-03  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/zlib/*: Upgrade to zlib 1.2.7 (prebuilt dll is still 1.2.5,
-	will be upgraded as soon as the official build is available)
-
-2012-05-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/socket.test:	[Bug 3428754]: Test socket-14.2 tolerate
-	[socket -async] connection that connects synchronously.
-
-	* unix/tclUnixSock.c:	[Bug 3428753]: Fix [socket -async] connections
-	that manage to connect synchronously.
-
-2012-05-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/configure.in:    Better detection and implementation for
-	* generic/configure:       cpuid instruction on Intel-derived
-	* generic/tclUnixCompat.c: processors, both 32-bit and 64-bit.
-	* generic/tclTest.c:       Move cpuid testcase from win-specific to
-	* win/tclWinTest.c:        generic tests, as it should work on all
-	* tests/platform.test:     Intel-related platforms now.
-
-2012-04-30  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tests/ioCmd.test: [Bug 3522560]: Tame deadlocks in broken refchan
-	tests.
-
-2012-04-28  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	IMPLEMENTATION OF TIP#398
-
-	* generic/tclIO.c: Quickly Exit with Non-Blocking Blocked Channels
-	* tests/io.test  : *** POTENTIAL INCOMPATIBILITY ***
-	* doc/close.n    : (compat flag available)
-
-2012-04-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPort.h:    Move CYGWIN-specific stuff from tclPort.h to
-	* generic/tclEnv.c:     tclUnixPort.h, where it belongs.
-	* unix/tclUnixPort.h:
-	* unix/tclUnixFile.c:
-
-2012-04-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/init.tcl (auto_execok): Allow shell builtins to be detected
-	even if they are upper-cased.
-
-2012-04-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclStubInit.c:    Get rid of _ANSI_ARGS_ and CONST
-	* generic/tclIO.c:
-	* generic/tclIOCmd.c:
-	* generic/tclTest.c:
-	* unix/tclUnixChan.c:
-
-2012-04-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclUtil.c (TclDStringToObj): Added internal function to make
-	the fairly-common operation of converting a DString into an Obj a more
-	efficient one; for long strings, it can just transfer the ownership of
-	the buffer directly. Replaces this:
-	   obj=Tcl_NewStringObj(Tcl_DStringValue(&ds),Tcl_DStringLength(&ds));
-	   Tcl_DStringFree(&ds);
-	with this:
-	   obj=TclDStringToObj(&ds);
-
-2012-04-24  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls:      [Bug 3508771]: load tclreg.dll in cygwin
-				     tclsh
-	* generic/tclIntPlatDecls.h: Implement TclWinGetSockOpt,
-	* generic/tclStubInit.c:     TclWinGetServByName and TclWinCPUID for
-	* generic/tclUnixCompat.c:   Cygwin.
-	* unix/configure.in:
-	* unix/configure:
-	* unix/tclUnixCompat.c:
-
-2012-04-18  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Africa/Casablanca:
-	* library/tzdata/America/Port-au-Prince:
-	* library/tzdata/Asia/Damascus:
-	* library/tzdata/Asia/Gaza:
-	* library/tzdata/Asia/Hebron: tzdata2012c
-
-2012-04-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/FileSystem.3 (Tcl_FSOpenFileChannelProc): [Bug 3518244]: Fixed
-	documentation of this filesystem callback function; it must not
-	register its created channel - that's the responsibility of the caller
-	of Tcl_FSOpenFileChannel - as that leads to reference leaks.
-
-2012-04-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclEnsemble.c (NsEnsembleImplementationCmdNR):
-	* generic/tclIOUtil.c (Tcl_FSEvalFileEx): Cut out levels of the C
-	stack by going direct to the relevant internal evaluation function.
-
-	* generic/tclZlib.c (ZlibTransformSetOption): [Bug 3517696]: Make
-	flushing work correctly in a pushed compressing channel transform.
-
-2012-04-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls:      [Bug 3514475]: Remove TclpGetTimeZone and
-	* generic/tclIntDecls.h:     TclpGetTZName
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c:
-	* unix/tclUnixTime.c:
-	* unix/tclWinTilemc:
-
-2012-04-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinInit.c:     [Bug 3448512]: clock scan "1958-01-01" fails
-	* win/tcl.m4:           only in debug compilation.
-	* win/configure:
-	* unix/tcl.m4:          Use NDEBUG consistantly meaning: no debugging.
-	* unix/configure:
-	* generic/tclBasic.c:
-	* library/dde/pkgIndex.tcl:  Use [::tcl::pkgconfig get debug] instead
-	* library/reg/pkgIndex.tcl:  of [info exists ::tcl_platform(debug)]
-
-2012-04-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tcl.h (TCL_DEPRECATED_API): [Bug 2458976]: Added macro that
-	can be used to mark parts of Tcl's API as deprecated. Currently only
-	used for fields of Tcl_Interp, which TIPs 330 and 336 have deprecated
-	with a migration strategy; we want to encourage people to move away
-	from those fields.
-
-2012-04-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOODefineCmds.c (ClassVarsSet, ObjVarsSet): [Bug 3396896]:
-	Ensure that the lists of variable names used to drive variable
-	resolution will never have the same name twice.
-
-	* generic/tclVar.c (AppendLocals): [Bug 2712377]: Fix problem with
-	reporting of declared variables in methods. It's really a problem with
-	how [info vars] interacts with variable resolvers; this is just a bit
-	of a hack so it is no longer a big problem.
-
-2012-04-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (Tcl_NewObjectInstance, TclNRNewObjectInstance):
-	[Bug 3514761]: Fixed bogosity with automated argument description
-	handling when constructing an instance of a class that is itself a
-	member of an ensemble. Thanks to Andreas Kupries for identifying that
-	this was a problem case at all!
-	(Tcl_CopyObjectInstance): Fix potential bleed-over of ensemble
-	information into [oo::copy].
-
-2012-04-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinSock.c:	[Bug 510001]: TclSockMinimumBuffers needs
-	* generic/tclIOSock.c:	platform implementation.
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-
-2012-04-03  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclStubInit.c: Remove the TclpGetTZName implementation for
-	* generic/tclIntDecls.h: Cygwin (from 2012-04-02 commit), re-generated
-	* generic/tclIntPlatDecls.h:
-
-2012-04-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	IMPLEMENTATION OF TIP#396.
-
-	* generic/tclBasic.c (builtInCmds, TclNRYieldToObjCmd): Convert the
-	formerly-unsupported yieldm and yieldTo commands into [yieldto].
-
-2012-04-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls: [Bug 3508771]: load tclreg.dll in cygwin tclsh
-	* generic/tclIntPlatDecls.h: Implement TclWinGetTclInstance,
-	* generic/tclStubInit.c:     TclpGetTZName, and various more
-	win32-specific internal functions for Cygwin, so win32 extensions
-	using those can be loaded in the cygwin version of tclsh.
-
-2012-03-30  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:        [Bug 3511806]: Compiler checks too early
-	* unix/configure.in:  This change allows to build the cygwin and
-	* unix/tclUnixPort.h: mingw32 ports of Tcl/Tk to build out-of-the-box
-	* win/tcl.m4:         using a native or cross-compiler.
-	* win/configure.in:
-	* win/tclWinPort.h:
-	* win/README          Document how to build win32 or win64 executables
-	with Linux, Cygwin or Darwin.
-
-2012-03-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCmdMZ.c (StringIsCmd): Faster mem-leak free
-	implementation of [string is entier].
-
-2012-03-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	IMPLEMENTATION OF TIP#395.
-
-	* generic/tclCmdMZ.c (StringIsCmd): Implementation of the [string is
-	entier] check. Code by Jos Decoster.
-
-2012-03-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:      [Bug 3508771]: Wrong Tcl_StatBuf used on MinGW.
-	* generic/tclFCmd.c:  [Bug 2015723]: Duplicate inodes from file stat
-	* generic/tclCmdAH.c: on windows (but now for cygwin as well).
-	* generic/tclOODefineCmds.c: minor gcc warning
-	* win/tclWinPort.h:   Use lower numbers, preventing integer overflow.
-	Remove the workaround for mingw-w64 [Bug 3407992]. It's long fixed.
-
-2012-03-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	IMPLEMENTATION OF TIP#397.
-
-	* generic/tclOO.c (Tcl_CopyObjectInstance): [Bug 3474460]: Make the
-	target object name optional when copying classes. [RFE 3485060]: Add
-	callback method ("<cloned>") so that scripted control over copying is
-	easier.
-	***POTENTIAL INCOMPATIBILITY***
-	If you'd previously been using the "<cloned>" method name, this now
-	has a standard semantics and call interface. Only a problem if you are
-	also using [oo::copy].
-
-2012-03-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	IMPLEMENTATION OF TIP#380.
-
-	* doc/define.n, doc/object.n, generic/tclOO.c, generic/tclOOBasic.c:
-	* generic/tclOOCall.c, generic/tclOODefineCmds.c, generic/tclOOInt.h:
-	* tests/oo.test: Switch definitions of lists of things in objects and
-	classes to a slot-based approach, which gives a lot more flexibility
-	and programmability at the script-level. Introduce new [::oo::Slot]
-	class which is the implementation of these things.
-
-	***POTENTIAL INCOMPATIBILITY***
-	The unknown method handler now may be asked to deal with the case
-	where no method name is provided at all. The default implementation
-	generates a compatible error message, and any override that forces the
-	presence of a first argument (i.e., a method name) will continue to
-	function as at present as well, so this is a pretty small change.
-
-	* generic/tclOOBasic.c (TclOO_Object_Destroy): Made it easier to do a
-	tailcall inside a normally-invoked destructor; prevented leakage out
-	to calling command.
-
-2012-03-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls:      [Bug 3508771]: load tclreg.dll in cygwin
-	* generic/tclIntPlatDecls.h: tclsh. Implement TclWinConvertError,
-	* generic/tclStubInit.c:     TclWinConvertWSAError, and various more
-	* unix/Makefile.in:          win32-specific internal functions for
-	* unix/tcl.m4:               Cygwin, so win32 extensions using those
-	* unix/configure:            can be loaded in the cygwin version of
-	* win/tclWinError.c:         tclsh.
-
-2012-03-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls:       Revert some cygwin-related signature
-	* generic/tclIntPlatDecls.h:  changes from [835f8e1e9d] (2010-01-22).
-	* win/tclWinError.c:          They were an attempt to make the cygwin
-	                              port compile again, but since cygwin is
-	                              based on unix this serves no purpose any
-	                              more.
-	* win/tclWinSerial.c:         Use EAGAIN in stead of EWOULDBLOCK,
-	* win/tclWinSock.c:           because in VS10+ the value of
-	                              EWOULDBLOCK is no longer the same as
-	                              EAGAIN.
-	* unix/Makefile.in:           Add tclWinError.c to the CYGWIN build.
-	* unix/tcl.m4:
-	* unix/configure:
-
-2012-03-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.decls:         [Bug 3508771]: load tclreg.dll in cygwin
-	* generic/tclInt.decls:      tclsh. Implement TclWinGetPlatformId,
-	* generic/tclIntPlatDecls.h: Tcl_WinUtfToTChar, Tcl_WinTCharToUtf (and
-	* generic/tclPlatDecls.h:    a dummy TclWinCPUID) for Cygwin, so win32
-	* generic/tclStubInit.c:     extensions using those can be loaded in
-	* unix/tclUnixCompat.c:      the cygwin version of tclsh.
-
-2012-03-19  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/America/Atikokan: Update to tzdata2012b.
-	* library/tzdata/America/Blanc-Sablon:
-	* library/tzdata/America/Dawson_Creek:
-	* library/tzdata/America/Edmonton:
-	* library/tzdata/America/Glace_Bay:
-	* library/tzdata/America/Goose_Bay:
-	* library/tzdata/America/Halifax:
-	* library/tzdata/America/Havana:
-	* library/tzdata/America/Moncton:
-	* library/tzdata/America/Montreal:
-	* library/tzdata/America/Nipigon:
-	* library/tzdata/America/Rainy_River:
-	* library/tzdata/America/Regina:
-	* library/tzdata/America/Santiago:
-	* library/tzdata/America/St_Johns:
-	* library/tzdata/America/Swift_Current:
-	* library/tzdata/America/Toronto:
-	* library/tzdata/America/Vancouver:
-	* library/tzdata/America/Winnipeg:
-	* library/tzdata/Antarctica/Casey:
-	* library/tzdata/Antarctica/Davis:
-	* library/tzdata/Antarctica/Palmer:
-	* library/tzdata/Asia/Yerevan:
-	* library/tzdata/Atlantic/Stanley:
-	* library/tzdata/Pacific/Easter:
-	* library/tzdata/Pacific/Fakaofo:
-	* library/tzdata/America/Creston: (new)
-
-2012-03-19  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixSock.c (Tcl_OpenTcpServer): Use the values returned
-	by getaddrinfo() for all three arguments to socket() instead of
-	only using ai_family. Try to keep the most meaningful error while
-	iterating over the result list, because using the last error can
-	be misleading.
-
-2012-03-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h: [Bug 3288345]: Wrong Tcl_StatBuf used on Cygwin
-	* unix/tclUnixFile.c:
-	* unix/tclUnixPort.h:
-	* win/cat.c:           Remove cygwin stuff no longer needed
-	* win/tclWinFile.c:
-	* win/tclWinPort.h:
-
-2012-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFile.c: [Bug 3388350]: mingw64 compiler warnings
-
-2012-03-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/*.n, doc/*.3: A number of small spelling and wording fixes.
-
-2012-03-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/info.n:   Various minor fixes (prompted by Andreas Kupries
-	* doc/socket.n: detecting a spelling mistake).
-
-2012-03-07  Andreas Kupries  <andreask@activestate.com>
-
-	* library/http/http.tcl: [Bug 3498327]: Generate upper-case
-	* library/http/pkgIndex.tcl: hexadecimal output for compliance
-	* tests/http.test: with RFC 3986. Bumped version to 2.8.4.
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2012-03-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h: Compatibility with older Visual Studio versions.
-
-2012-03-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclLoad.c: Patch from the cygwin folks
-	* unix/tcl.m4:
-	* unix/configure: (re-generated)
-
-2012-03-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (Tcl_SetByteArrayObj): [Bug 3496014]: Only zero
-	out the memory block if it is not being immediately overwritten. (Our
-	caller might still overwrite, but we should at least avoid
-	known-useless work.)
-
-2012-02-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIOUtil.c:	[Bug 3466099]: BOM in Unicode
-	* generic/tclEncoding.c:
-	* tests/source.test:
-
-2012-02-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/reg.test (14.21-23): Add tests relating to Bug 1115587. Actual
-	bug is characterised by test marked with 'knownBug'.
-
-2012-02-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIOUtil.c: [Bug 2233954]: AIX: compile error
-	* unix/tclUnixPort.h:
-
-2012-02-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (INST_LIST_RANGE_IMM): Enhance implementation
-	so that shortening a (not multiply-referenced) list by lopping the end
-	off with [lrange] or [lreplace] is efficient.
-
-2012-02-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileLreplaceCmd): Added a compilation
-	strategy for [lreplace] that tackles the cases which are equivalent to
-	a static [lrange].
-	(TclCompileLrangeCmd): Add compiler for [lrange] with constant indices
-	so we can take advantage of existing TCL_LIST_RANGE_IMM opcode.
-	(TclCompileLindexCmd): Improve coverage of constant-index-style
-	compliation using technique developed for [lrange] above.
-
-	(TclCompileDictForCmd): [Bug 3487626]: Fix crash in compilation of
-	[dict for] when its implementation command is used directly rather
-	than through the ensemble.
-
-2012-02-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Converted the memcpy() calls in append
-	operations to memmove() calls.  This adds safety in the case of
-	overlapping copies, and improves performance on some benchmarks.
-
-2012-02-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclEnsemble.c: [Bug 3485022]: TclCompileEnsemble() avoid
-	* tests/trace.test:	compile when exec traces set.
-
-2012-02-06  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclTrace.c:  [Bug 3484621]: Ensure that execution traces on
-	* tests/trace.test:    bytecoded commands bump the interp's compile
-	epoch.
-
-2012-02-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclUniData.c: [FRQ 3464401]: Support Unicode 6.1
-	* generic/regc_locale.c:
-
-2012-02-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* win/tclWinFile.c:	[Bugs 2974459,2879351,1951574,1852572,
-	1661378,1613456]: Revisions to the NativeAccess() routine that queries
-	file permissions on Windows native filesystems.  Meant to fix numerous
-	bugs where [file writable|readable|executable] "lies" about what
-	operations are possible, especially when the file resides on a Samba
-	share.
-
-2012-02-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/AddErrInfo.3: [Bug 3482614]: Documentation nit.
-
-2012-01-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileCatchCmd): Added a more efficient
-	bytecode generator for the case where 'catch' is used without any
-	variable arguments; don't capture the result just to discard it.
-
-2012-01-26  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdAH.c:		[Bug 3479689]: New internal routine
-	* generic/tclFCmd.c:		TclJoinPath(). Refactor all the
-	* generic/tclFileName.c:	*Join*Path* routines to give them more
-	* generic/tclInt.h:		useful interfaces that are easier to
-	* generic/tclPathObj.c:		manage getting the refcounts right.
-
-2012-01-26  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	[Bug 3475569]: Add checks for unshared values
-	before calls demanding them.  [Bug 3479689]: Stop memory corruption
-	when shimmering 0-refCount value to "path" type.
-
-2012-01-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (Tcl_CopyObjectInstance): [Bug 3474460]: When
-	copying an object, make sure that the configuration of the variable
-	resolver is also duplicated.
-
-2012-01-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/uniClass.tcl:    [FRQ 3473670]: Various Unicode-related
-	* tools/uniParse.tcl:    speedups/robustness. Enhanced tools to be
-	* generic/tclUniData.c:  able to handle characters > 0xFFFF. Done in
-	* generic/tclUtf.c:      all branches in order to simplify merges for
-	* generic/regc_locale.c: new Unicode versions (such as 6.1)
-
-2012-01-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (DictExistsCmd): [Bug 3475264]: Ensure that
-	errors only ever happen when insufficient arguments are supplied, and
-	not when a path doesn't exist or a dictionary is poorly formatted (the
-	two cases can't be easily distinguished).
-
-2012-01-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:        [Bug 3474726]: Eliminate detection of struct
-	* generic/tclWinPort.h: _stat32i64, just use _stati64 in combination
-	* generic/tclFCmd.c:    with _USE_32BIT_TIME_T, which is the same
-	* generic/tclTest.c:    then. Only keep _stat32i64 usage for cygwin,
-	* win/configure.in:     so it will not conflict with cygwin's own
-	* win/configure:	struct stat.
-
-2012-01-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	[Bug 3475667]: Prevent buffer read overflow.
-	Thanks to "sebres" for the report and fix.
-
-2012-01-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/dict.n (dict with): [Bug 3474512]: Explain better what is going
-	on when a dictionary key and the dictionary variable collide.
-
-2012-01-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/http/http.tcl (http::Connect): [Bug 3472316]: Ensure that we
-	only try to read the socket error exactly once.
-
-2012-01-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/tclvars.n: [Bug 3466506]: Document more environment variables.
-
-2012-01-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclUtf.c:      [Bug 3464428]: [string is graph \u0120] was
-	* generic/regc_locale.c: wrong. Add table for Unicode [:cntrl:] class.
-	* tools/uniClass.tcl:    Generate Unicode [:cntrl:] class table.
-	* tests/utf.test:
-
-2012-01-08  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (ReadZoneinfoFile): [Bug 3470928]: Corrected a bug
-	* tests/clock.test (clock-56.4):        where loading zoneinfo would
-	fail if one timezone abbreviation was a proper tail of another, and
-	zic used the same bytes of the file to represent both of them. Added a
-	test case for the bug, using the same data that caused the observed
-	failure "in the wild."
-
-2011-12-30  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/America/Bahia:		Update to Olson's tzdata2011n
-	* library/tzdata/America/Havana:
-	* library/tzdata/Europe/Kiev:
-	* library/tzdata/Europe/Simferopol:
-	* library/tzdata/Europe/Uzhgorod:
-	* library/tzdata/Europe/Zaporozhye:
-	* library/tzdata/Pacific/Fiji:
-
-2011-12-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclUtf.c: [Bug 3464428]: [string is graph \u0120] is wrong.
-	* generic/tclUniData.c:
-	* generic/regc_locale.c:
-	* tests/utf.test:
-	* tools/uniParse.tcl:   Clean up some unused stuff, and be more robust
-	against changes in UnicodeData.txt syntax
-
-2011-12-13  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclCompile.c (TclInitAuxDataTypeTable): Extended to register
-	the DictUpdateInfo structure as an AuxData type. For use by tbcload,
-	tclcompiler.
-
-2011-12-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/regc_locale.c: [Bug 3457031]: Some Unicode 6.0 chars not
-	* tests/utf.test:        in [:print:] class
-
-2011-12-07  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/uniParse.tcl:    [Bug 3444754]: string tolower \u01c5 is wrong
-	* generic/tclUniData.c:
-	* tests/utf.test:
-
-2011-11-30  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/tcltest/tcltest.tcl: [Bug 967195]: Make tcltest work
-	when tclsh is compiled without using the setargv() function on mingw.
-
-2011-11-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in: don't install tommath_(super)?class.h
-	* unix/Makefile.in: don't install directories like 8.2 and 8.3
-	* generic/tclTomMath.h: [Bug 2991415]: move include tclInt.h from
-	* generic/tclTomMathInt.h: tclTomMath.h to tclTomMathInt.h
-
-2011-11-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/history.tcl (history): Simplify the dance of variable
-	management used when chaining to the implementation command.
-
-2011-11-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TclCompileObj): Simplify and de-indent the
-	logic so that it is easier to comprehend.
-
-2011-11-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h: [Bug 3354324]: Windows: [file mtime] sets wrong
-	* win/tclWinFile.c: time (VS2005+ only).
-	* generic/tclTest.c:
-
-2011-11-20  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tests/thread.test: Remove unnecessary [after] calls from the thread
-	tests.  Make error message matching more robust for tests that may
-	have built-in race conditions.  Test thread-7.26 must first unset all
-	thread testing related variables.  Revise results of the thread-7.28
-	through thread-7.31 tests to account for the fact they are canceled
-	via a script sent to the thread asynchronously, which then impacts the
-	error message handling.  Attempt to manually drain the event queue for
-	the main thread after joining the test thread to make sure no stray
-	events are processed at the wrong time on the main thread.  Revise all
-	the synchronization and comparison semantics related to the thread id
-	and error message.
-
-2011-11-18  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tests/thread.test: Remove all use of thread::release from the thread
-	7.x tests, replacing it with a script that can easily cause "stuck"
-	threads to self-destruct for those test cases that require it.  Also,
-	make the error message handling far more robust by keeping track of
-	every asynchronous error.
-
-2011-11-17  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tests/thread.test: Refactor all the remaining thread-7.x tests that
-	were using [testthread].  Note that this test file now requires the
-	very latest version of the Thread package to pass all tests.  In
-	addition, the thread-7.18 and thread-7.19 tests have been flagged as
-	knownBug because they cannot pass without modifications to the [expr]
-	command, persuant to TIP #392.
-
-2011-11-17  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclThreadTest.c: For [testthread cancel], avoid creating a
-	new Tcl_Obj when the default script cancellation result is desired.
-
-2011-11-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* win/tclWinConsole.c: Refactor common thread handling patterns.
-
-2011-11-11  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tests/zlib.test: [Bug 3428756]: Use nonblocking writes in
-	single-threaded IO tests to avoid deadlocks when going beyond OS
-	buffers.  Tidy up [chan configure] flags across zlib.test.
-
-2011-11-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixCompat.c (TclpGetPwNam, TclpGetPwUid, TclpGetGrNam)
-	(TclpGetGrGid): Use the elaborate memory management scheme outlined on
-	http://www.opengroup.org/austin/docs/austin_328.txt to handle Tcl's
-	use of standard reentrant versions of the passwd/group access
-	functions so that everything can work on all BSDs. Problem identified
-	by Stuart Cassoff.
-
-2011-10-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/http/http.tcl:        Bump to version 2.8.3
-	* library/http/pkgIndex.tcl:
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-	* changes:	Updates toward 8.6b3 release.
-
-2011-10-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclLiteral.c (TclInvalidateCmdLiteral): [Bug 3418547]:
-	Additional code for handling the invalidation of literals.
-	* generic/tclBasic.c (Tcl_CreateObjCommand, Tcl_CreateCommand)
-	(TclRenameCommand, Tcl_ExposeCommand): The four additional places that
-	need extra care when dealing with literals.
-	* generic/tclTest.c (TestInterpResolverCmd): Additional test machinery
-	for interpreter resolvers.
-
-2011-10-18  Reinhard Max  <max@suse.de>
-
-	* library/clock.tcl (::tcl::clock::GetSystemTimeZone): Cache the time
-	zone only if it was detected by one of the expensive methods.
-	Otherwise after unsetting TCL_TZ or TZ the previous value will still
-	be used.
-
-2011-10-15  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/America/Sitka: Update to Olson's tzdata2011l
-	* library/tzdata/Pacific/Fiji:
-	* library/tzdata/Asia/Hebron: (New)
-
-2011-10-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFile.c:    [Bug 2935503]: Incorrect mode field returned by
-	[file stat] command.
-
-2011-10-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileDictWithCmd): Corrected handling of
-	qualified names, and added spacial cases for empty bodies (used when
-	[dict with] is just used for extracting variables).
-
-2011-10-07  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:        Fix gcc warnings (discovered with latest
-	* generic/tclIORChan.c: mingw, based on gcc 4.6.1)
-	* tests/env.test:       Fix env.test, when running under wine 1.3.
-
-2011-10-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (TclDictWithInit, TclDictWithFinish):
-	* generic/tclCompCmds.c (TclCompileDictWithCmd): Experimental
-	compilation for the [dict with] subcommand, using parts factored out
-	from the interpreted version of the command.
-
-2011-10-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinInt.h:   Remove tclWinProcs, as it is no longer
-	* win/tclWin32Dll.c: being used.
-
-2011-10-03  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/Africa/Dar_es_Salaam: Update to Olson's tzdata2011k
-	* library/tzdata/Africa/Kampala:
-	* library/tzdata/Africa/Nairobi:
-	* library/tzdata/Asia/Gaza:
-	* library/tzdata/Europe/Kaliningrad:
-	* library/tzdata/Europe/Kiev:
-	* library/tzdata/Europe/Minsk:
-	* library/tzdata/Europe/Simferopol:
-	* library/tzdata/Europe/Uzhgorod:
-	* library/tzdata/Europe/Zaporozhye:
-	* library/tzdata/Pacific/Apia:
-
-2011-09-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl, tools/tcltk-man2html-utils.tcl: More
-	refactoring so that more of the utility code is decently out of the
-	way. Adjusted the header-material generator so that version numbers
-	are only included in locations where there is room.
-
-2011-09-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclOO.h:      [RFE 3010352]: make all TclOO API functions
-	* generic/tclOODecls.h: MODULE_SCOPE
-	* generic/tclOOIntDecls.h:
-
-2011-09-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIndexObj.c (Tcl_ParseArgsObjv): [Bug 3413857]: Corrected
-	the memory management for the code parsing arguments when returning
-	"large" numbers of arguments. Also unbroke the TCL_ARGV_AUTO_REST
-	macro in passing.
-
-2011-09-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdAH.c (TclMakeFileCommandSafe): [Bug 3211758]: Also
-	make the main [file] command hidden by default in safe interpreters,
-	because that's what existing code expects. This will reduce the amount
-	which the code breaks, but not necessarily eliminate it...
-
-2011-09-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIORTrans.c: More revisions to get finalization of
-	ReflectedTransforms correct, including adopting a "dead" field as was
-	done in tclIORChan.c.
-
-	* tests/thread.test:	Stop using the deprecated thread management
-	commands of the tcltest package.  The test suite ought to provide
-	these tools for itself.  They do not belong in a testing harness.
-
-2011-09-22  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdIL.c:	Revise [info frame] so that it stops creating
-	cycles in the iPtr->cmdFramePtr stack.
-
-2011-09-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/re_syntax.n: [Bug 2903743]: Add more magic so that we can do at
-	least something sane on Solaris.
-	* tools/tcltk-man2html-utils.tcl (process-text): Teach the HTML
-	generator how to handle this magic.
-
-2011-09-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclThreadTest.c: Revise the thread exit handling of the
-	[testthread] command so that it properly maintains the per-process
-	data structures even when the thread exits for reasons other than the
-	[testthread exit] command.
-
-2011-09-21  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* unix/tclIO.c: [Bug 3412487]: Now short reads are allowed in
-	synchronous fcopy, avoid mistaking them as nonblocking ones.
-
-2011-09-21  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORTrans.c (ForwardOpToOwnerThread): Fixed the missing
-	initialization of the 'dsti' field. Reported by Don Porter, on chat.
-
-2011-09-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIORChan.c: Re-using the "interp" field to signal a dead
-	channel (via NULL value) interfered with conditional cleanup tasks
-	testing for "the right interp". Added a new field "dead" to perform
-	the dead channel signalling task so the corrupted logic is avoided.
-
-	* generic/tclIORTrans.c: Revised ReflectClose() and
-	FreeReflectedTransform() so that we stop leaking ReflectedTransforms,
-	yet free all Tcl_Obj values in the same thread that alloced them.
-
-2011-09-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/ioTrans.test:	Conversion from [testthread] to Thread package
-	stops most memory leaks.
-
-	* tests/thread.test:	Plug most memory leaks in thread.test.
-	Constrain the rest to be skipped during `make valgrind'.  Tests using
-	the [testthread cancel] testing command are leaky.  Corrections wait
-	for either addition of [thread::cancel] to the Thread package, or
-	improvements to the [testthread] testing command to make leak-free
-	versions of these tests possible.
-
-	* generic/tclIORChan.c:	Plug all memory leaks in ioCmd.test exposed
-	* tests/ioCmd.test:	by `make valgrind'.
-	* unix/Makefile.in:
-
-2011-09-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	IMPLEMENTATION OF TIP #388
-
-	* doc/Tcl.n:
-	* doc/re_syntax.n:
-	* generic/regc_lex.c:
-	* generic/regcomp.c:
-	* generic/regcustom.h:
-	* generic/tcl.h:
-	* generic/tclParse.c:
-	* tests/reg.test:
-	* tests/utf.test:
-
-2011-09-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (ProcWrongNumArgs): [Bugs 3400658,3408830]:
-	Corrected the handling of procedure error messages (found by TclOO).
-
-2011-09-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:        Don't change Tcl_UniChar type when
-	* generic/regcustom.h:  TCL_UTF_MAX == 4 (not supported anyway)
-
-2011-09-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (ProcWrongNumArgs): [Bugs 3400658,3408830]:
-	Ensemble-like rewriting of error messages is complex, and TclOO (in
-	combination with iTcl) hits the most tricky cases.
-
-	* library/http/http.tcl (http::geturl): [Bug 3391977]: Ensure that the
-	-headers option overrides the -type option (important because -type
-	has a default that is not always appropriate, and the header must not
-	be duplicated).
-
-2011-09-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c: [Bug 3408408]: Partial improvement by sharing
-	as literals the computed values of constant subexpressions when we can
-	do so without incurring the cost of string rep generation.
-
-2011-09-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c:	[Bug 3390638]: Workaround broken Solaris
-	Studio cc optimizer.  Thanks to Wolfgang S. Kechel.
-
-	* generic/tclDTrace.d:	[Bug 3405652]: Portability workaround for
-	broken system DTrace support.  Thanks to Dagobert Michelson.
-
-2011-09-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h: [Bug 3407070]: tclPosixStr.c won't build with
-	EOVERFLOW==E2BIG
-
-2011-09-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/thread.test:	Convert [testthread] use to Thread package use
-	in thread-6.1.  Eliminates a memory leak in `make valgrind`.
-
-	* tests/socket.test:	[Bug 3390699]: Convert [testthread] use to
-	Thread package use in socket_*-13.1.  Eliminates a memory leak in
-	`make valgrind`.
-
-2011-09-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/chanio.test:	[Bug 3389733]: Convert [testthread] use to
-	* tests/io.test:	Thread package use in *io-70.1.  Eliminates a
-	memory leak in `make valgrind`.
-
-2011-09-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c: [Bug 3401704]: Allow function names like
-	* tests/parseExpr.test:	 influence(), nanobot(), and 99bottles() that
-	have been parsed as missing operator syntax errors before with the
-	form NUMBER + FUNCTION.
-	***POTENTIAL INCOMPATIBILITY***
-
-2011-09-06  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/America/Goose_Bay: Update to Olson's tzdata2011i
-	* library/tzdata/America/Metlakatla:
-	* library/tzdata/America/Resolute:
-	* library/tzdata/America/St_Johns:
-	* library/tzdata/Europe/Kaliningrad:
-	* library/tzdata/Pacific/Apia:
-	* library/tzdata/Pacific/Honolulu:
-	* library/tzdata/Africa/Juba: (new)
-
-2011-09-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:   [RFE 1711975]: Tcl_MainEx() (like Tk_MainEx())
-	* generic/tclDecls.h:
-	* generic/tclMain.c:
-
-2011-09-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/http.test:	Convert [testthread] use to Thread package use.
-	Eliminates memory leak seen in `make valgrind`.
-
-2011-09-01  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* unix/tclUnixSock.c: [Bug 3401422]: Cache script-level changes to the
-	nonblocking flag of an async client socket in progress, and commit
-	them on completion.
-
-2011-09-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStrToD.c:	[Bug 3402540]: Corrections to TclParseNumber()
-	* tests/binary.test:	to make it reject invalid Nan(Hex) strings.
-
-	* tests/scan.test:	[scan Inf %g] is portable; remove constraint.
-
-2011-08-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInterp.c (SlaveCommandLimitCmd, SlaveTimeLimitCmd):
-	[Bug 3398794]: Ensure that low-level conditions in the limit API are
-	enforced at the script level through errors, not a Tcl_Panic. This
-	means that interpreters cannot read their own limits (writing already
-	did not work).
-
-2011-08-30  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixSock.c (TcpWatchProc): [Bug 3394732]: Put back the check
-	for server sockets.
-
-2011-08-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIORTrans.c: Leak of ReflectedTransformMap.
-
-2011-08-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:  [RFE 3396731]: Revise the [string reverse]
-	* tests/string.test:	implementation to operate on the representation
-	that comes in, avoid conversion to other reps.
-
-2011-08-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIORChan.c:	[Bug 3396948]: Leak of ReflectedChannelMap.
-
-2011-08-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIORTrans.c: [Bugs 3393279, 3393280]: ReflectClose(.) is
-	missing Tcl_EventuallyFree() calls at some of its exits.
-
-	* generic/tclIO.c: [Bugs 3394654, 3393276]: Revise FlushChannel() to
-	account for the possibility that the ChanWrite() call might recycle
-	the buffer out from under us.
-
-	* generic/tclIO.c: Preserve the chanPtr during FlushChannel so that
-	channel drivers don't yank it away before we're done with it.
-
-2011-08-19  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclTest.c: [Bug 2981154]: async-4.3 segfault.
-	* tests/async.test:  [Bug 1774689]: async-4.3 sometimes fails.
-
-2011-08-18  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclIO.c: [Bug 3096275]: Sync fcopy buffers input.
-
-2011-08-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclUniData.c: [Bug 3393714]: Overflow in toupper delta
-	* tools/uniParse.tcl:
-	* tests/utf.test:
-
-2011-08-17  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclIO.c:  [Bug 2946474]: Consistently resume backgrounded
-	* tests/ioCmd.test: flushes+closes when exiting.
-
-2011-08-17  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* doc/interp.n: Document TIP 378's one-way-ness.
-
-2011-08-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclGet.c: [Bug 3393150]: Overlooked free of intreps.
-	(It matters for bignums!)
-
-2011-08-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c: [Bug 3392070]: More complete prevention of
-	Tcl_Obj reference cycles when producing an intrep of ByteCode.
-
-2011-08-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclListObj.c (TclLindexList, TclLsetFlat): Silence warnings
-	about (unreachable) cases of uninitialized variables.
-	* generic/tclCmdIL.c (SelectObjFromSublist): Improve the generation of
-	* generic/tclIndexObj.c (Tcl_ParseArgsObjv): messages through the use
-	* generic/tclVar.c (ArrayStartSearchCmd):    of Tcl_ObjPrintf.
-
-2011-08-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c: [Bug 3390272]: Leak of [info script] value.
-
-2011-08-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPosixStr.c:    [Bug 3388350]: mingw64 compiler warnings
-	* win/tclWinPort.h:
-	* win/configure.in:
-	* win/configure:
-
-2011-08-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/FindExec.3: [Patch 3124554]: Move WishPanic from Tk to Tcl
-	* doc/Panic.3     Added Documentation
-
-2011-08-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	[Bug 3389764]: Eliminate possibility that dup
-	of a "path" value can create reference cycle.
-
-2011-08-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ZlibTransformOutput): [Bug 3390073]: Return the
-	correct length of written data for a compressing transform.
-
-2011-08-10 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclTestObj.c: [Bug 3386721]: Allow multiple [load]ing of the
-	Tcltest package.
-
-2011-08-09 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclBasic.c: [Bug 2919042]: Restore "valgrindability" of Tcl
-	* generic/tclEvent.c: that was lost by the streamlining of [exit], by
-	* generic/tclExecute.c: conditionally forcing a full Finalize:
-	* generic/tclInt.h:  use -DPURIFY or ::env(TCL_FINALIZE_ON_EXIT)
-
-2011-08-09 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclCompCmds.c: [Bug 3386417]: Avoid a reference loop between
-	* generic/tclInt.h:      the bytecode and its companion errostack
-	* generic/tclResult.c:   when compiling a syntax error.
-
-2011-08-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinConsole.c: [Bug 3388350]: mingw64 compiler warnings
-	* win/tclWinDde.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c:
-
-2011-08-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h: Change the signature of TclParseHex(), such that
-	* generic/tclParse.c: it can now parse up to 8 hex characters.
-
-2011-08-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ZlibStreamCmd): Make the -buffersize option to
-	'$zstream add' function correctly instead of having its value just be
-	discarded unceremoniously. Also generate error codes from more of the
-	code, not just the low-level code but also the Tcl infrastructure.
-
-2011-08-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOInfo.c (InfoClassCallCmd): [Bug 3387082]: Plug memory
-	leak in call chain introspection.
-
-2011-08-06  Kevin B, Kenny  <kennykb@acm.org>
-
-	* generic/tclAssemnbly.c: [Bug 3384840]: Plug another memory leak.
-	* generic/tclStrToD.c: [Bug 3386975]: Plug another memory leak.
-
-2011-08-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c: [Bug 3386975]: Plugged a memory leak in
-	double->string conversion.
-
-2011-08-05  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.6b2 TAGGED FOR RELEASE ***
-
-	* changes:	Updates for 8.6b2 release.
-
-2011-08-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclAssembly.c (AssembleOneLine): Ensure that memory isn't
-	leaked when an unknown instruction is encountered. Also simplify code
-	through use of Tcl_ObjPrintf in error message generation.
-
-	* generic/tclZlib.c (ZlibTransformClose): [Bug 3386197]: Plug a memory
-	leak found by Miguel with valgrind, and ensure that the correct
-	direction's buffers are released.
-
-2011-08-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclPtrSetVar): Fix valgrind-detected error when
-	newValuePtr is the interp's result obj.
-
-2011-08-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclAssembly.c (FreeAssemblyEnv): [Bug 3384840]: Plug another
-	possible memory leak due to over-complex code for freeing the table of
-	labels.
-
-2011-08-04  Reinhard Max  <max@suse.de>
-
-	* generic/tclIOSock.c (TclCreateSocketAddress): Don't bother using
-	AI_ADDRCONFIG for now, as it was causing problems in various
-	situations.
-
-2011-08-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclAssembly.c (AssembleOneLine, GetBooleanOperand)
-	(GetIntegerOperand, GetListIndexOperand, FindLocalVar): [Bug 3384840]:
-	A Tcl_Obj is allocated by GetNextOperand, so callers of it must not
-	hold a reference to one in the 'out' parameter when calling it. This
-	was causing a great many memory leaks.
-	* tests/assemble.test (assemble-51.*): Added group of memory leak
-	tests.
-
-2011-08-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6b2 release.
-	* tools/tcltk-man2html.tcl: Variable substitution botch.
-
-2011-08-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclObj.c (Tcl_DbIncrRefCount, Tcl_DbDecrRefCount)
-	(Tcl_DbIsShared): [Bug 3384007]: Fix the panic messages so they share
-	what should be shared and have the right number of spaces.
-
-2011-08-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c (TclProcCompileProc): [Bug 3383616]: Fix for leak
-	of resolveInfo when recompiling procs. Thanks go to Gustaf Neumann for
-	detecting the bug and providing the fix.
-
-2011-08-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/tclvars.n (EXAMPLES): Added some examples of how some of the
-	standard global variables can be used, following prompting by a
-	request by Robert Hicks.
-
-	* tools/tcltk-man2html.tcl (plus-pkgs): [Bug 3382474]: Added code to
-	determine the version number of contributed packages from their
-	directory names so that HTML documentation builds are less confusing.
-
-2011-07-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl (ensemble_commands, remap_link_target):
-	Small enhancements to improve cross-linking with contributed packages.
-	* tools/tcltk-man2html-utils.tcl (insert-cross-references): Enhance to
-	cope with contributed packages' C API.
-
-2011-07-28  Reinhard Max  <max@suse.de>
-
-	* unix/tcl.m4 (SC_TCL_IPV6): Fix AC_DEFINE invocation for
-	NEED_FAKE_RFC2553.
-	* unix/configure:	autoconf-2.59
-
-2011-07-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6b2 release.
-
-	* library/tzdata/Asia/Anadyr: Update to Olson's tzdata2011h
-	* library/tzdata/Asia/Irkutsk:
-	* library/tzdata/Asia/Kamchatka:
-	* library/tzdata/Asia/Krasnoyarsk:
-	* library/tzdata/Asia/Magadan:
-	* library/tzdata/Asia/Novokuznetsk:
-	* library/tzdata/Asia/Novosibirsk:
-	* library/tzdata/Asia/Omsk:
-	* library/tzdata/Asia/Sakhalin:
-	* library/tzdata/Asia/Vladivostok:
-	* library/tzdata/Asia/Yakutsk:
-	* library/tzdata/Asia/Yekaterinburg:
-	* library/tzdata/Europe/Kaliningrad:
-	* library/tzdata/Europe/Moscow:
-	* library/tzdata/Europe/Samara:
-	* library/tzdata/Europe/Volgograd:
-	* library/tzdata/America/Kralendijk: (new)
-	* library/tzdata/America/Lower_Princes: (new)
-
-2011-07-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (initScript): Ensure that TclOO is properly found by
-	all the various package mechanisms (by adding a dummy ifneeded script)
-	and not just some of them.
-
-2011-07-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h: [Bug 3372130]: Fix hypot math function with MSVC10
-
-2011-07-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c:	[Bug 3371644]: Repair failure to properly handle
-	* tests/util.test: (length == -1) scanning in TclConvertElement().
-	Thanks to Thomas Sader and Alexandre Ferrieux.
-
-2011-07-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/*.3, doc/*.n: Many small fixes to documentation as part of
-	project to improve quality of generated HTML docs.
-
-	* tools/tcltk-man2html.tcl (remap_link_target): More complete set of
-	definitions of link targets, especially for major C API types.
-	* tools/tcltk-man2html-utils.tcl (output-IP-list, cross-reference):
-	Update to generation to produce proper HTML bulleted and enumerated
-	lists.
-
-2011-07-19 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* doc/upvar.n: Undocument long gone limitation of [upvar].
-
-2011-07-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Bump version number to 8.6b2.
-	* library/init.tcl:
-	* unix/configure.in:
-	* win/configure.in:
-	* unix/tcl.spec:
-	* tools/tcl.wse.in:
-	* README:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2011-07-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c: Avoid segfaults when RecordByteCodeStats() is
-	called in a deleted interp.
-
-	* generic/tclCompile.c: [Bug 467523, 3357771]: Prevent circular
-	references in values with ByteCode intreps.  They can lead to memory
-	leaks.
-
-2011-07-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOCall.c (TclOORenderCallChain): [Bug 3365156]: Remove
-	stray refcount bump that caused a memory leak.
-
-2011-07-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUnixSock.c:  [Bug 3364777]: Stop segfault caused by
-	reading from struct after it had been freed.
-
-2011-07-11  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclExecute.c: [Bug 3339502]: Correct cast for CURR_DEPTH to
-	silence compiler warning.
-
-2011-07-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/http.n: [FRQ 3358415]: State what RFC defines HTTP/1.1.
-
-2011-07-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: Add missing INT2PTR
-
-2011-07-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/FileSystem.3: Corrected statements about ctime field of 'struct
-	stat'; that was always the time of the last metadata change, not the
-	time of creation.
-
-2011-07-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c:
-	* generic/tclTomMath.decls:
-	* generic/tclTomMathDecls.h:
-	* macosx/Tcl.xcode/project.pbxproj:
-	* macosx/Tcl.xcodeproj/project.pbxproj:
-	* tests/util.test:
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/Makefile.vc:
-	[Bug 3349507]: Fix a bug where bignum->double conversion is "round up"
-	and not "round to nearest" (causing expr double(1[string repeat 0 23])
-	not to be 1e+23).
-
-2011-06-28  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixSock.c (CreateClientSocket): [Bug 3325339]: Fix and
-	simplify posting of the writable fileevent at the end of an
-	asynchronous connection attempt. Improve comments for some of the
-	trickery around [socket -async].
-
-	* tests/socket.test: Adjust tests to the async code changes. Add more
-	tests for corner cases of async sockets.
-
-2011-06-22  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/pkgIndex.tcl: Updated to platform 1.0.10. Added
-	* library/platform/platform.tcl: handling of the DEB_HOST_MULTIARCH
-	* unix/Makefile.in: location change for libc.
-	* win/Makefile.in:
-
-	* generic/tclInt.h: Fixed the inadvertently committed disabling of
-	stack checks, see my 2010-11-15 commit.
-
-2011-06-22  Reinhard Max  <max@suse.de>
-
-	Merge from rmax-ipv6-branch:
-	* unix/tclUnixSock.c: Fix [socket -async], so that all addresses
-	returned by getaddrinfo() are tried, not just the first one. This
-	requires the event loop to be running while the async connection is in
-	progress. ***POTENTIAL INCOMPATIBILITY***
-	* tests/socket.test: Add a test for the above.
-	* doc/socket: Document the fact that -async needs the event loop
-	* generic/tclIOSock.c: AI_ADDRCONFIG is broken on HP-UX
-
-2011-06-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclLink.c:	[Bug 3317466]: Prevent multiple links to a
-	single Tcl variable when calling Tcl_LinkVar().
-
-2011-06-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStrToD.c:  [Bug 3315098]: Mem leak fix from Gustaf
-	Neumann.
-
-2011-06-08  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclExecute.c: Reverted the fix for [Bug 3274728] committed
-	on 2011-04-06 and replaced with one which is 64bit-safe. The existing
-	fix crashed tclsh on Windows 64bit.
-
-2011-06-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/fileSystem.test: Reduce the amount of use of duplication of
-	complex code to perform common tests, and convert others to do the
-	test result check directly using Tcltest's own primitives.
-
-2011-06-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tests/socket.test: Add test constraint, so 6.2 and 6.3 don't fail
-	when the machine does not have support for ip6. Follow-up to checkin
-	from 2011-05-11 by rmax.
-
-2011-06-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Removed TclCleanupLiteralTable(), and old
-	* generic/tclInt.h:	band-aid routine put in place while a fix for
-	* generic/tclLiteral.c:	[Bug 994838] took shape.  No longer needed.
-
-2011-06-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInt.h (TclInvalidateNsCmdLookup): [Bug 3185407]: Extend
-	the set of epochs that are potentially bumped when a command is
-	created, for a slight performance drop (in some circumstances) and
-	improved semantics.
-
-2011-06-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: Using the two free data elements in NRCommand to
-	store objc and objv - useful for debugging.
-
-2011-06-01  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclUtil.c:   Fix for [Bug 3309871]: Valgrind finds: invalid
-	read in TclMaxListLength().
-
-2011-05-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	  Use a complete growth algorithm for lists so
-	* generic/tclListObj.c:	  that length limits do not overconstrain by a
-	* generic/tclStringObj.c: factor of 2.  [Bug 3293874]: Fix includes
-	* generic/tclUtil.c:	  rooting all growth routines by default on a
-	common tunable parameter TCL_MIN_GROWTH.
-
-2011-05-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/msgcat/msgcat.tcl:	Bump to msgcat 1.4.4.
-	* library/msgcat/pkgIndex.tcl:
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2011-05-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.h (TCLOO_VERSION): Bump version.
-
-	IMPLEMENTATION OF TIP#381.
-
-	* doc/next.n, doc/ooInfo.n, doc/self.n, generic/tclOO.c,
-	* generic/tclOOBasic.c, generic/tclOOCall.c, generic/tclOOInfo.c,
-	* generic/tclOOInt.h, tests/oo.test, tests/ooNext2.test: Added
-	introspection of call chains ([self call], [info object call], [info
-	class call]) and ability to skip ahead in chain ([nextto]).
-
-2011-05-24  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/Africa/Cairo: Update to Olson tzdata2011g
-
-2011-05-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/msgcat/msgcat.tcl (msgcat::mcset, msgcat::mcmset): Remove
-	some useless code; [dict set] builds dictionary levels for us.
-
-2011-05-17  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclCompile.c (TclFixupForwardJump): Tracked down and fixed
-	* generic/tclBasic.c (TclArgumentBCEnter): the cause of a violation of
-	my assertion that 'ePtr->nline == objc' in TclArgumentBCEnter.  When a
-	bytecode was grown during jump fixup the pc -> command line mapping
-	was not updated. When things aligned just wrong the mapping would
-	direct command A to the data for command B, with a different number of
-	arguments.
-
-2011-05-11  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixSock.c (TcpWatchProc): No need to check for server
-	sockets here, as the generic server code already takes care of that.
-	* tests/socket.test (accept): Add tests to make sure that this remains
-	so.
-
-2011-05-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:     New internal routines TclScanElement() and
-	* generic/tclUtil.c:    TclConvertElement() are rewritten guts of
-	machinery to produce string rep of lists.  The new routines avoid and
-	correct [Bug 3173086].  See comments for much more detail.
-
-	* generic/tclDictObj.c:         Update all callers.
-	* generic/tclIndexObj.c:
-	* generic/tclListObj.c:
-	* generic/tclUtil.c:
-	* tests/list.test:
-
-2011-05-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNamesp.c (NamespacePathCmd): Convert to use Tcl_Obj API
-	* generic/tclPkg.c (Tcl_PackageObjCmd):   for result generation in
-	* generic/tclTimer.c (Tcl_AfterObjCmd):   [after info], [namespace
-	path] and [package versions].
-
-2011-05-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclListObj.c:	Revise empty string tests so that we avoid
-	potentially expensive string rep generations, especially for dicts.
-
-2011-05-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclLoad.c (TclGetLoadedPackages): Convert to use Tcl_Obj API
-	for result generation.
-
-2011-05-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h: Fix USE_TCLALLOC so that it can be enabled without
-	* unix/Makefile.in: editing the Makefile.
-
-2011-05-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclListObj.c:	Stop generating string rep of dict when
-	converting to list.  Tolerate NULL interps more completely.
-
-2011-05-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c:	Tighten Tcl_SplitList().
-	* generic/tclListObj.c:	Tighten SetListFromAny().
-	* generic/tclDictObj.c:	Tighten SetDictFromAny().
-	* tests/join.test:
-	* tests/mathop.test:
-
-2011-05-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	Revised TclFindElement() interface. The final
-	* generic/tclDictObj.c:	argument had been bracePtr, the address of a
-	* generic/tclListObj.c:	boolean var, where the caller can be told
-	* generic/tclParse.c:	whether or not the parsed list element was
-	* generic/tclUtil.c:	enclosed in braces.  In practice, no callers
-	really care about that.  What the callers really want to know is
-	whether the list element value exists as a literal substring of the
-	string being parsed, or whether a call to TclCopyAndCollpase() is
-	needed to produce the list element value.  Now the final argument is
-	changed to do what callers actually need. This is a better fit for the
-	calls in tclParse.c, where now a good deal of post-processing checking
-	for "naked backslashes" is no longer necessary.
-	***POTENTIAL INCOMPATIBILITY***
-	For any callers calling in via the internal stubs table who really do
-	use the final argument explicitly to check for the enclosing brace
-	scenario.  Simply looking for the braces where they must be is the
-	revision available to those callers, and it will backport cleanly.
-
-	* tests/parse.test:	Tests for expanded literals quoting detection.
-
-	* generic/tclCompCmdsSZ.c:	New TclFindElement() is also a better
-	fit for the [switch] compiler.
-
-	* generic/tclInt.h:	Replace TclCountSpaceRuns() with
-	* generic/tclListObj.c:	TclMaxListLength() which is the function we
-	* generic/tclUtil.c:	actually want.
-	* generic/tclCompCmdsSZ.c:
-
-	* generic/tclCompCmdsSZ.c: Rewrite of parts of the switch compiler to
-	better use the powers of TclFindElement() and do less parsing on its
-	own.
-
-2011-04-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	New utility routines:
-	* generic/tclParse.c:	TclIsSpaceProc() and TclCountSpaceRuns()
-	* generic/tclUtil.c:
-
-	* generic/tclCmdMZ.c:	Use new routines to replace calls to isspace()
-	* generic/tclListObj.c:	and their /* INTL */ risk.
-	* generic/tclStrToD.c:
-	* generic/tclUtf.c:
-	* unix/tclUnixFile.c:
-
-	* generic/tclStringObj.c:	Improved reaction to out of memory.
-
-2011-04-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	TclFreeIntRep() correction & cleanup.
-	* generic/tclExecute.c:
-	* generic/tclIndexObj.c:
-	* generic/tclInt.h:
-	* generic/tclListObj.c:
-	* generic/tclNamesp.c:
-	* generic/tclResult.c:
-	* generic/tclStringObj.c:
-	* generic/tclVar.c:
-
-	* generic/tclListObj.c:	FreeListInternalRep() cleanup.
-
-2011-04-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	Use macro to set List intreps.
-	* generic/tclListObj.c:
-
-	* generic/tclCmdIL.c:	Limits on list length were too strict.
-	* generic/tclInt.h:	Revised panics to errors where possible.
-	* generic/tclListObj.c:
-	* tests/lrepeat.test:
-
-	* generic/tclCompile.c:	Make sure SetFooFromAny routines react
-	* generic/tclIO.c:	reasonably when passed a NULL interp.
-	* generic/tclIndexObj.c:
-	* generic/tclListObj.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclProc.c:
-	* macosx/tclMacOSXFCmd.c:
-
-2011-04-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:       fix for [Bug 3288345]: Wrong Tcl_StatBuf
-	* generic/tclInt.h:    used on MinGW. Make sure that all _WIN32
-	* win/tclWinFile.c:    compilers use exactly the same layout
-	* win/configure.in:    for Tcl_StatBuf - the one used by MSVC6 -
-	* win/configure:       in all situations.
-
-2011-04-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclConfig.c:	Reduce internals access in the implementation
-	of [<foo>::pkgconfig list].
-
-2011-04-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdIL.c:	Use ListRepPtr(.) and other cleanup.
-	* generic/tclConfig.c:
-	* generic/tclListObj.c:
-
-	* generic/tclInt.h:	Define and use macros that test whether a Tcl
-	* generic/tclBasic.c:	list value is canonical.
-	* generic/tclUtil.c:
-
-2011-04-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/dict.n: [Bug 3288696]: Command summary was confusingly wrong
-	when it came to [dict filter] with a 'value' filter.
-
-2011-04-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclFCmd.c (TclFileAttrsCmd): Add comments to make this code
-	easier to understand. Added a panic to handle the case where the VFS
-	layer does something odd.
-
-2011-04-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c:	[Bug 3285375]: Rewrite of Tcl_Concat*()
-	routines to prevent segfaults on buffer overflow.  Build them out of
-	existing primitives already coded to handle overflow properly.  Uses
-	the new TclTrim*() routines.
-
-	* generic/tclCmdMZ.c:	New internal utility routines TclTrimLeft()
-	* generic/tclInt.h:	and TclTrimRight().  Refactor the
-	* generic/tclUtil.c:	[string trim*] implementations to use them.
-
-2011-04-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c: [Bug 2662380]: Fix crash caused by appending to a
-	variable with a write trace that unsets it.
-
-2011-04-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclUtil.c (Tcl_ConcatObj): [Bug 3285375]: Make the crash
-	less mysterious through the judicious use of a panic. Not yet properly
-	fixed, but at least now clearer what the failure mode is.
-
-2011-04-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/string.test:	Test for [Bug 3285472]. Not buggy in trunk.
-
-2011-04-12  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/Atlantic/Stanley: Update to Olson tzdata2011f
-
-2011-04-12  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: Fix for [Bug 2440625], kbk's patch
-
-2011-04-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:
-	* tests/coroutine.test: [Bug 3282869]: Ensure that 'coroutine eval'
-	runs the initial command in the proper context.
-
-2011-04-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:    Fix for [Bug 3281728]: Tcl sources from 2011-04-06
-	* unix/tcl.m4:      do not build on GCC9 (RH9)
-	* unix/configure:
-
-2011-04-08  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h: Fix for [Bug 3280043]: win2k: unresolved DLL
-	* win/configure.in: imports.
-	* win/configure
-
-2011-04-06  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TclCompileObj): Earlier return if Tip280
-	gymnastics not needed.
-
-	* generic/tclExecute.c: Fix for [Bug 3274728]: making *catchTop an
-	unsigned long.
-
-2011-04-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclAppInit.c:  Make symbols "main" and "Tcl_AppInit"
-	MODULE_SCOPE: there is absolutely no reason for exporting them.
-	* unix/tcl.m4:        Don't use -fvisibility=hidden with static
-	* unix/configure      libraries (--disable-shared)
-
-2011-04-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclFCmd.c, macosx/tclMacOSXFCmd.c, unix/tclUnixChan.c,
-	* unix/tclUnixFCmd.c, win/tclWinChan.c, win/tclWinDde.c,
-	* win/tclWinFCmd.c, win/tclWinLoad.c, win/tclWinPipe.c,
-	* win/tclWinReg.c, win/tclWinSerial.c, win/tclWinSock.c: More
-	generation of error codes (most platform-specific parts not already
-	using Tcl_PosixError).
-
-2011-04-05  Venkat Iyer <venkat@comit.com>
-
-	* library/tzdata/Africa/Casablanca: Update to Olson's tzdata2011e
-	* library/tzdata/America/Santiago:
-	* library/tzdata/Pacific/Easter:
-	* library/tzdata/America/Metlakatla: (new)
-	* library/tzdata/America/North_Dakota/Beulah: (new)
-	* library/tzdata/America/Sitka: (new)
-
-2011-04-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c, generic/tclOOBasic.c, generic/tclOODefineCmds.c
-	* generic/tclOOInfo.c, generic/tclOOMethod.c: More generation of
-	error codes (TclOO miscellany).
-
-	* generic/tclCmdAH.c, generic/tclCmdIL.c: More generation of error
-	codes (miscellaneous commands mostly already handled).
-
-2011-04-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* README:	[Bug 3202030]: Updated README files, repairing broken
-	* macosx/README:URLs and removing other bits that were clearly wrong.
-	* unix/README:	Still could use more eyeballs on the detailed build
-	* win/README:	advice on various plaforms.
-
-2011-04-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/init.tcl (tcl::mathfunc::rmmadwiw): Disable by default to
-	make test suite work.
-
-	* generic/tclBasic.c, generic/tclStringObj.c, generic/tclTimer.c,
-	* generic/tclTrace.c, generic/tclUtil.c: More generation of error
-	codes ([format], [after], [trace], RE optimizer).
-
-2011-04-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCmdAH.c:  Better error-message in case of errors
-	* generic/tclCmdIL.c:  related to setting a variable. This fixes
-	* generic/tclDictObj.c: a warning: "Why make your own error
-	* generic/tclScan.c:   message? Why?"
-	* generic/tclTest.c:
-	* test/error.test:
-	* test/info.test:
-	* test/scan.test:
-	* unix/tclUnixThrd.h:  Remove this unused header file.
-
-2011-04-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNamesp.c, generic/tclObj.c, generic/tclPathObj.c:
-	* generic/tclPipe.c, generic/tclPkg.c, generic/tclProc.c:
-	* generic/tclScan.c: More generation of error codes (namespace
-	creation, path normalization, pipeline creation, package handling,
-	procedures, [scan] formats)
-
-2011-04-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c (QuickConversion): Replaced another couple
-	of 'double' declarations with 'volatile double' to work around
-	misrounding issues in mingw-gcc 3.4.5.
-
-2011-04-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInterp.c, generic/tclListObj.c, generic/tclLoad.c:
-	More generation of errorCodes ([interp], [lset], [load], [unload]).
-
-	* generic/tclEvent.c, generic/tclFileName.c: More generation of
-	errorCode information (default [bgerror] and [glob]).
-
-2011-04-01  Reinhard Max  <max@suse.de>
-
-	* library/init.tcl: TIP#131 implementation.
-
-2011-03-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclGetDate.y, generic/tclDate.c (TclClockOldscanObjCmd):
-	More generation of errorCode information.
-
-2011-03-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c, generic/tclConfig.c, generic/tclUtil.c: More
-	generation of errorCode information, notably when lists are mis-parsed
-
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd, Tcl_RegsubObjCmd): Use the
-	error messages generated by the variable management code rather than
-	creating our own.
-
-2011-03-27  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclNREvalObjEx): fix performance issue, notably
-	apparent in tclbench's "LIST lset foreach". Many thanks to Twylite for
-	patiently researching the issue and explaining it to me: a missing
-	Tcl_ResetObjResult that causes unwanted sharing of the current result
-	Tcl_Obj.
-
-2011-03-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNamesp.c (Tcl_Export, Tcl_Import, DoImport): More
-	generation of errorCode information.
-
-	* generic/tclCompExpr.c, generic/tclCompile.c, generic/tclExecute.c:
-	* generic/tclListObj.c, generic/tclNamesp.c, generic/tclObj.c:
-	* generic/tclStringObj.c, generic/tclUtil.c: Reduce the number of
-	casts used to manage Tcl_Obj internal representations.
-
-2011-03-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h (ckfree,etc.): Restored C++ usability to the memory
-	allocation and free macros.
-
-2011-03-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclFCmd.c (TclFileAttrsCmd): Ensure that any reference to
-	temporary index tables is squelched immediately rather than hanging
-	around to trip us up in the future.
-
-2011-03-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclObj.c: Exploit HAVE_FAST_TSD for the deletion context in
-	TclFreeObj()
-
-2011-03-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclThreadAlloc.c: Simpler initialization of Cache under
-	HAVE_FAST_TSD, from mig-alloc-reform.
-
-2011-03-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclLoadDl.c:    [Bug 3216070]: Loading extension libraries
-	* unix/tclLoadDyld.c:  from embedded Tcl applications.
-	***POTENTIAL INCOMPATIBILITY***
-	For extensions which rely on symbols from other extensions being
-	present in the global symbol table. For an example and some discussion
-	of workarounds, see http://stackoverflow.com/q/8330614/301832
-
-2011-03-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCkAlloc.c:
-	* generic/tclInt.h: Remove one level of allocator indirection in
-	non-memdebug builds, imported from mig-alloc-reform.
-
-2011-03-20  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclThreadAlloc.c: Imported HAVE_FAST_TSD support from
-	mig-alloc-reform. The feature has to be enabled by hand: no autoconf
-	support has been added. It is not clear how universal a build using
-	this will be: it also requires some loader support.
-
-2011-03-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompExpr.c (ParseExpr): Generate errorCode information on
-	failure to parse expressions.
-
-2011-03-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclMain.c: [Patch 3124683]: Reorganize the platform-specific
-	stuff in (tcl|tk)Main.c.
-
-2011-03-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCkalloc.c: [Bug 3197864]: Pointer truncation on Win64
-	TCL_MEM_DEBUG builds.
-
-2011-03-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Some rewrites to eliminate calls to isspace()
-	* generic/tclParse.c:	and their /* INTL */ risk.
-	* generic/tclProc.c:
-
-2011-03-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:    Make SHLIB_LD_LIBS='${LIBS}' the default and
-	* unix/configure: set to "" on per-platform necessary basis.
-	Backported from TEA, but kept all original platform code which was
-	removed from TEA.
-
-2011-03-14  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tools/tclZIC.tcl (onDayOfMonth): Allow for leading zeroes in month
-	and day so that tzdata2011d parses correctly.
-	* library/tzdata/America/Havana:
-	* library/tzdata/America/Juneau:
-	* library/tzdata/America/Santiago:
-	* library/tzdata/Europe/Istanbul:
-	* library/tzdata/Pacific/Apia:
-	* library/tzdata/Pacific/Easter:
-	* library/tzdata/Pacific/Honolulu:  tzdata2011d
-
-	* generic/tclAssembly.c (BBEmitInstInt1): Changed parameter data types
-	in an effort to silence a MSVC warning reported by Ashok P. Nadkarni.
-	Unable to test, since both forms work on my machine in VC2005, 2008,
-	2010, in both release and debug builds.
-	* tests/tclTest.c (TestdstringCmd): Restored MSVC buildability broken
-	by [5574bdd262], which changed the effective return type of 'ckalloc'
-	from 'char*' to 'void*'.
-
-2011-03-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: remove TEBCreturn()
-
-2011-03-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tcl.h (ckalloc,ckfree,ckrealloc): Moved casts into these
-	macro so that they work with VOID* (which is a void* on all platforms
-	which Tcl actually builds on) and unsigned int for the length
-	parameters, removing the need for MANY casts across the rest of Tcl.
-	Note that this is a strict source-level-only change, so size_t cannot
-	be used (would break binary compatibility on 64-bit platforms).
-
-2011-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFile.c: [Bug 3185609]: File normalization corner case
-	of ... broken with -DUNICODE
-
-2011-03-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/unixInit.test: Make better use of tcltest2.
-
-2011-03-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c, generic/tclCompCmds.c, generic/tclEnsemble.c:
-	* generic/tclInt.h, generic/tclNamesp.c, library/auto.tcl:
-	* tests/interp.test, tests/namespace.test, tests/nre.test:
-	Converted the [namespace] command into an ensemble. This has the
-	consequence of making it vital for Tcl code that wishes to work with
-	namespaces to _not_ delete the ::tcl namespace.
-	***POTENTIAL INCOMPATIBILITY***
-
-	* library/tcltest/tcltest.tcl (loadIntoSlaveInterpreter): Added this
-	command to handle connecting tcltest to a slave interpreter. This adds
-	in the hook (inside the tcltest namespace) that allows the tests run
-	in the child interpreter to be reported as part of the main sequence
-	of test results. Bumped version of tcltest to 2.3.3.
-	* tests/init.test, tests/package.test: Adapted these test files to use
-	the new feature.
-
-	* generic/tclAlloc.c, generic/tclCmdMZ.c, generic/tclCompExpr.c:
-	* generic/tclCompile.c, generic/tclEnv.c, generic/tclEvent.c:
-	* generic/tclIO.c, generic/tclIOCmd.c, generic/tclIORChan.c:
-	* generic/tclIORTrans.c, generic/tclLiteral.c, generic/tclNotify.c:
-	* generic/tclParse.c, generic/tclStringObj.c, generic/tclUtil.c:
-	* generic/tclZlib.c, unix/tclUnixFCmd.c, unix/tclUnixNotfy.c:
-	* unix/tclUnixPort.h, unix/tclXtNotify.c: Formatting fixes, mainly to
-	comments, so code better fits the style in the Engineering Manual.
-
-2011-03-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/incr.test: Update more of the test suite to use Tcltest 2.
-
-2011-03-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c:	[Bug 3202171]: Tighten the detector of nested
-	* tests/namespace.test:	[namespace code] quoting that the quoted
-	scripts function properly even in a namespace that contains a custom
-	"namespace" command.
-
-	* doc/tclvars.n:	Formatting fix.  Thanks to Pat Thotys.
-
-2011-03-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/dstring.test, tests/init.test, tests/link.test: Update more of
-	the test suite to use Tcltest 2.
-
-2011-03-08  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBasic.c: Fix gcc warnings: variable set but not used
-	* generic/tclProc.c:
-	* generic/tclIORChan.c:
-	* generic/tclIORTrans.c:
-	* generic/tclAssembly.c:  Fix gcc warning: comparison between signed
-	and unsigned integer expressions
-
-2011-03-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	Remove TclMarkList() routine, an experimental
-	* generic/tclUtil.c:	dead-end from the 8.5 alpha days.
-
-	* generic/tclResult.c (ResetObjResult): [Bug 3202905]: Correct failure
-	to clear invalid intrep.  Thanks to Colin McDonald.
-
-2011-03-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclAssembly.c, tests/assemble.test: Migrate to use a style
-	more consistent with the rest of Tcl.
-
-2011-03-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	More replacements of Tcl_UtfBackslash() calls
-	* generic/tclCompile.c:	with TclParseBackslash() where possible.
-	* generic/tclCompCmdsSZ.c:
-	* generic/tclParse.c:
-	* generic/tclUtil.c:
-
-	* generic/tclUtil.c (TclFindElement):	[Bug 3192636]: Guard escape
-	sequence scans to not overrun the string end.
-
-2011-03-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclParse.c (TclParseBackslash): [Bug 3200987]: Correct
-	* tests/parse.test:	trunction checks in \x and \u substitutions.
-
-2011-03-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TclStackFree): insure that the execStack
-	satisfies "at most one free stack after the current one" when
-	consecutive reallocs caused the creation of intervening stacks.
-
-2011-03-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclAssembly.c (new file):
-	* generic/tclBasic.c (Tcl_CreateInterp):
-	* generic/tclInt.h:
-	* tests/assemble.test (new file):
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc:  Merged dogeen-assembler-branch into HEAD. Since
-	all functional changes are in the tcl::unsupported namespace, there's
-	no reason to sequester this code on a separate branch.
-
-2011-03-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Cleaner mem management for TEBCdata
-
-	* generic/tclExecute.c:
-	* tests/nre.test: Renamed BottomData to TEBCdata, so that the name
-	refers to what it is rather than to its storage location.
-
-	* generic/tclBasic.c:     Renamed struct TEOV_callback to the more
-	* generic/tclCompExpr.c:  descriptive NRE_callback.
-	* generic/tclCompile.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclTest.c:
-
-2011-03-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (ProcedureMethodCompiledVarConnect)
-	(ProcedureMethodCompiledVarDelete): [Bug 3185009]: Keep references to
-	resolved object variables so that an unset doesn't leave any dangling
-	pointers for code to trip over.
-
-2011-03-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclNREvalObjv): Missing a variable declaration
-	in commented out non-optimised code, left for ref in checkin
-	[b97b771b6d]
-
-2011-03-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclResult.c (Tcl_AppendResultVA):	Use the directive
-	USE_INTERP_RESULT [TIP 330] to force compat with interp->result
-	access, instead of the improvised hack USE_DIRECT_INTERP_RESULT_ACCESS
-	from releases past.
-
-2011-03-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompCmdsSZ.c (TclCompileThrowCmd, TclCompileUnsetCmd):
-	fix leaks
-
-	* generic/tclBasic.c:       This is [Patch 3168398],
-	* generic/tclCompCmdsSZ.c:  Joe Mistachkin's optimisation
-	* generic/tclExecute.c:     of Tip #285
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclInterp.c:
-	* generic/tclOODecls.h:
-	* generic/tclStubInit.c:
-	* win/makefile.vc:
-
-	* generic/tclExecute.c (ExprObjCallback): Fix object leak
-
-	* generic/tclExecute.c (TEBCresume): Store local var array and
-	constants in automatic vars to reduce indirection, slight perf
-	increase
-
-	* generic/tclOOCall.c (TclOODeleteContext): Added missing '*' so that
-	trunk compiles.
-
-	* generic/tclBasic.c (TclNRRunCallbacks): [Patch 3168229]: Don't do
-	the trampoline dance for commands that do not have an nreProc.
-
-2011-03-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (Tcl_NewObjectInstance, TclNRNewObjectInstance)
-	(TclOOObjectCmdCore, FinalizeObjectCall):
-	* generic/tclOOBasic.c (TclOO_Object_Destroy, AfterNRDestructor):
-	* generic/tclOOCall.c (TclOODeleteContext, TclOOGetCallContext):
-	Reorganization of call context reference count management so that code
-	is (mostly) simpler.
-
-2011-01-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/RegExp.3: [Bug 3165108]: Corrected documentation of description
-	of subexpression info in Tcl_RegExpInfo structure.
-
-2011-01-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPreserve.c:  Don't miss 64-bit address bits in panic
-				  message.
-	* win/tclWinChan.c:       Fix various gcc-4.5.2 64-bit warning
-	* win/tclWinConsole.c:    messages, e.g. by using full 64-bits for
-	* win/tclWinDde.c:	  socket fd's
-	* win/tclWinPipe.c:
-	* win/tclWinReg.c:
-	* win/tclWinSerial.c:
-	* win/tclWinSock.c:
-	* win/tclWinThrd.c:
-
-2011-01-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl: [FRQ 3159920]: Tcl_ObjPrintf() crashes with
-	* generic/tcl.decls   bad format specifier.
-	* generic/tcl.h:
-	* generic/tclDecls.h:
-
-2011-01-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (PushMethodCallFrame): [Bug 3001438]: Make
-	sure that the cmdPtr field of the procPtr is correct and relevant at
-	all times so that [info frame] can report sensible information about a
-	frame after a return to it from a recursive call, instead of probably
-	crashing (depending on what else has overwritten the Tcl stack!)
-
-2011-01-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBasic.c:      Various mismatches between Tcl_Panic
-	* generic/tclCompCmds.c:   format string and its arguments,
-	* generic/tclCompCmdsSZ.c: discovered thanks to [Bug 3159920]
-	* generic/tclCompExpr.c:
-	* generic/tclEnsemble.c:
-	* generic/tclPreserve.c:
-	* generic/tclTest.c:
-
-2011-01-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIOCmd.c: [Bug 3148192]: Commands "read/puts" incorrectly
-	* tests/chanio.test:  interpret parameters. Improved error-message
-	* tests/io.test       regarding legacy form.
-	* tests/ioCmd.test
-
-2011-01-15  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/tclvars.n:
-	* generic/tclStrToD.c:
-	* generic/tclUtil.c (Tcl_PrintDouble):
-	* tests/util.test (util-16.*): [Bug 3157475]: Restored full Tcl 8.4
-	compatibility for the formatting of floating point numbers when
-	$::tcl_precision is not zero. Added compatibility tests to make sure
-	that excess trailing zeroes are suppressed for all eight major code
-	paths.
-
-2011-01-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFile.c:   Use _vsnprintf in stead of vsnprintf, because
-	MSVC 6 doesn't have it. Reported by andreask.
-	* win/tcl.m4:         handle --enable-64bit=ia64 for gcc
-	* win/configure.in:   more accurate test for correct <intrin.h>
-	* win/configure:      (autoconf-2.59)
-	* win/tclWin32Dll.c:  VS 2005 64-bit does not have intrin.h, and
-	* generic/tclPanic.c: does not need it.
-
-2011-01-07  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/util.test (util-15.*): Added test cases for floating point
-	conversion of the largest denormal and the smallest normal number, to
-	avoid any possibility of the failure suffered by PHP in the last
-	couple of days. (They didn't fail, so no actual functional change.)
-
-2011-01-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/package.test, tests/pkg.test: Coalesce these tests into one
-	file that is concerned with the package system. Convert to use
-	tcltest2 properly.
-	* tests/autoMkindex.test, tests/pkgMkIndex.test: Convert to use
-	tcltest2 properly.
-
-2011-01-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/cmdAH.test, tests/cmdMZ.test, tests/compExpr.test,
-	* tests/compile.test, tests/concat.test, tests/eval.test,
-	* tests/fileName.test, tests/fileSystem.test, tests/interp.test,
-	* tests/lsearch.test, tests/namespace-old.test, tests/namespace.test,
-	* tests/oo.test, tests/proc.test, tests/security.test,
-	* tests/switch.test, tests/unixInit.test, tests/var.test,
-	* tests/winDde.test, tests/winPipe.test: Clean up of tests and
-	conversion to tcltest 2. Target has been to get init and cleanup code
-	out of the test body and into the -setup/-cleanup stanzas.
-
-	* tests/execute.test (execute-11.1): [Bug 3142026]: Added test that
-	fails (with a crash) in an unfixed memdebug build on 64-bit systems.
-
-2010-12-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (SortElement): Use unions properly in the
-	definition of this structure so that there is no need to use nasty
-	int/pointer type punning. Made it clearer what the purposes of the
-	various parts of the structure are.
-
-2010-12-31  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/dltest/*.c: [Bug 3148192]: Fix broken [load] tests by ensuring
-	that the affected files are never compiled with -DSTATIC_BUILD.
-
-2010-12-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (GrowEvaluationStack): Off-by-one error in
-	sizing the new allocation - was ok in comment but wrong in the code.
-	Triggered by [Bug 3142026] which happened to require exactly one more
-	than what was in existence.
-
-2010-12-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Fix crash when multiple -index
-	options are used. Simplified memory handling logic.
-
-2010-12-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWin32Dll.c:    [Patch 3059922]: fixes for mingw64 - gcc4.5.1
-	tdm64-1: completed for all environments.
-
-2010-12-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/configure.in:   Explicitely test for intrinsics support in
-	compiler, before assuming only MSVC has it.
-	* win/configure:      (autoconf-2.59)
-	* generic/tclPanic.c:
-
-2010-12-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWin32Dll.c:    [Patch 3059922]: fixes for mingw64 - gcc4.5.1
-	tdm64-1: Fixed for gcc, not yet for MSVC 64-bit.
-
-2010-12-17  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/Makefile.in:  Remove unwanted/obsolete 'ddd' target.
-
-2010-12-17  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/Makefile.in:	Clean up '.PHONY:' targets: Arrange those
-				common to Tcl and Tk as in Tk's Makefile.in,
-				add any missing ones and remove duplicates.
-
-2010-12-17  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/Makefile.in:  [Bug 2446711]: Remove 'allpatch' target.
-
-2010-12-17  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/Makefile.in:  [Bug 2537626]: Use 'rpmbuild', not 'rpm'.
-
-2010-12-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPanic.c:  [Patch 3124554]: Move WishPanic from Tk to Tcl
-	* win/tclWinFile.c:    Better communication with debugger, if present.
-
-2010-12-15  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* tclAssembly.c:
-	* assemble.test: 	Reworked beginCatch/endCatch handling to
-	enforce the more severe (but more correct) restrictions on catch
-	handling that appeared in the discussion of [Bug 3098302] and in
-	tcl-core traffic beginning about 2010-10-29.
-
-2010-12-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPanic.c:    Restore abort() as it was before.
-	* win/tclWinFile.c:      [Patch 3124554]: Use ExitProcess() here, like
-	in wish.
-
-2010-12-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h: [Bug 3137454]: Tcl CVS HEAD does not build on GCC 3.
-
-2010-12-14  Reinhard Max  <max@suse.de>
-
-	* win/tclWinSock.c (CreateSocket):         Swap the loops over
-	* unix/tclUnixSock.c (CreateClientSocket): local and remote addresses,
-	so that the system's address preference for the remote side decides
-	which family gets tried first. Cleanup and clarify some of the
-	comments.
-
-2010-12-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:    [Bug 3135271]: Link error due to hidden
-	* unix/tcl.m4:      symbols (CentOS 4.2)
-	* unix/configure:   (autoconf-2.59)
-	* win/tclWinFile.c:  Undocumented feature, only meant to be used by
-	Tk_Main. See [Patch 3124554]: Move WishPanic from Tk to Tcl
-
-2010-12-12  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/tcl.m4: Better building on OpenBSD.
-	* unix/configure: (autoconf-2.59)
-
-2010-12-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:       [Bug 3129448]: Possible over-allocation on
-	* generic/tclCkalloc.c: 64-bit platforms, part 2
-	* generic/tclCompile.c:
-	* generic/tclHash.c:
-	* generic/tclInt.h:
-	* generic/tclIO.h:
-	* generic/tclProc.c:
-
-2010-12-10 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclIO.c: Make sure [fcopy -size ... -command ...] always
-	* tests/io.test:   calls the callback asynchronously, even for size
-			   zero.
-
-2010-12-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBinary.c:  Fix gcc -Wextra warning: missing initializer
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclDictObj.c:
-	* generic/tclIndexObj.c:
-	* generic/tclIOCmd.c:
-	* generic/tclVar.c:
-	* win/tcl.m4:               Fix manifest-generation for 64-bit gcc
-				    (mingw-w64)
-	* win/configure.in:         Check for availability of intptr_t and
-				    uintptr_t
-	* win/configure:            (autoconf-2.59)
-	* generic/tclInt.decls:     Change 1st param of TclSockMinimumBuffers
-	* generic/tclIntDecls.h:    to ClientData, and TclWin(Get|Set)SockOpt
-	* generic/tclIntPlatDecls.h:to SOCKET, because on Win64 those are
-	* generic/tclIOSock.c:	    64-bit, which does not fit.
-	* win/tclWinSock.c:
-	* unix/tclUnixSock.c:
-
-2010-12-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/fCmd.test: Improve sanity of constraints now that we don't
-	support anything before Windows 2000.
-
-	* generic/tclCmdAH.c (TclInitFileCmd, TclMakeFileCommandSafe, ...):
-	Break up [file] into an ensemble. Note that the ensemble is safe in
-	itself, but the majority of its subcommands are not.
-	* generic/tclFCmd.c (FileCopyRename,TclFileDeleteCmd,TclFileAttrsCmd)
-	(TclFileMakeDirsCmd): Adjust these subcommand implementations to work
-	inside an ensemble.
-	(TclFileLinkCmd, TclFileReadLinkCmd, TclFileTemporaryCmd): Move these
-	subcommand implementations from tclCmdAH.c, where they didn't really
-	belong.
-	* generic/tclIOCmd.c (TclChannelNamesCmd): Move to more appropriate
-	source file.
-	* generic/tclEnsemble.c (TclMakeEnsemble): Start of code to make
-	partially-safe ensembles. Currently does not function as expected due
-	to various shortcomings in how safe interpreters are constructed.
-	* tests/cmdAH.test, tests/fCmd.test, tests/interp.test: Test updates
-	to take into account systematization of error messages.
-
-	* tests/append.test, tests/appendComp.test: Clean up tests so that
-	they don't leave things in the global environment (detected when doing
-	-singleproc testing).
-
-2010-12-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/fCmd.test, tests/safe.test, tests/uplevel.test,
-	* tests/upvar.test, tests/var.test: Convert more tests to tcltest2 and
-	factor them to be easier to understand.
-
-	* generic/tclStrToD.c: Tidy up code so that more #ifdef-fery is
-	quarantined at the front of the file and function headers follow the
-	modern Tcl style.
-
-2010-12-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBinary.c:  [Bug 3129448]: Possible over-allocation on
-	* generic/tclCkalloc.c: 64-bit platforms.
-	* generic/tclTrace.c:
-
-2010-12-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4: [Patch 3116490]: Cross-compile support for unix
-	* unix/configure: (autoconf-2.59)
-
-2010-12-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclUtil.c (TclReToGlob): Add extra check for multiple inner
-	*s that leads to poor recursive glob matching, defer to original RE
-	instead.  tclbench RE var backtrack.
-
-2010-12-03  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclUtil.c:   Silence gcc warning when using -Wwrite-strings
-	* generic/tclStrToD.c: Silence gcc warning for non-IEEE platforms
-	* win/Makefile.in:  [Patch 3116490]: Cross-compile Tcl mingw32 on unix
-	* win/tcl.m4:       This makes it possible to cross-compile Tcl/Tk for
-	* win/configure.in: Windows (either 32-bit or 64-bit) out-of-the-box
-	* win/configure:    on UNIX, using mingw-w64 build tools (If Itcl,
-	tdbc and Thread take over the latest tcl.m4, they can do that too).
-
-2010-12-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c (SetPrecisionLimits, TclDoubleDigits):
-	[Bug 3124675]: Added meaningless initialization of 'i', 'ilim' and
-	'ilim1' to silence warnings from the C compiler about possible use of
-	uninitialized variables, Added a panic to the 'switch' that assigns
-	them, to assert that the 'default' case is impossible.
-
-2010-12-01  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBasic.c: Fix gcc 64-bit warnings: cast from pointer to
-	* generic/tclHash.c:  integer of different size.
-	* generic/tclTest.c:
-	* generic/tclThreadTest.c:
-	* generic/tclStrToD.c: Fix gcc(-4.5.2) warning: 'static' is not at
-	beginning of declaration.
-	* generic/tclPanic.c: Allow Tcl_Panic() to enter the debugger on win32
-	* generic/tclCkalloc.c: Use Tcl_Panic() in stead of duplicating the
-	code.
-
-2010-11-30  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclInt.decls, generic/tclInt.h, generic/tclIntDecls.h:
-	* generic/tclStubInit.c: TclFormatInt restored at slot 24
-	* generic/tclUtil.c (TclFormatInt): restore TclFormatInt func from
-	2005-07-05 macro-ization. Benchmarks indicate it is faster, as a key
-	int->string routine (e.g. int-indexed arrays).
-
-2010-11-29 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclBasic.c: Patch by Miguel, providing a
-	[::tcl::unsupported::inject coroname command args], which prepends
-	("injects") arbitrary code to a suspended coro's future resumption.
-	Neat for debugging complex coros without heavy instrumentation.
-
-2010-11-29  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclStrToD.c:
-	* generic/tclTest.c:
-	* generic/tclTomMath.decls:
-	* generic/tclUtil.c:
-	* tests/util.test:
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc: Rewrite of Tcl_PrintDouble and TclDoubleDigits that
-	(a) fixes a severe performance problem with floating point shimmering
-	reported by Karl Lehenbauer, (b) allows TclDoubleDigits to generate
-	the digit strings for 'e' and 'f' format, so that it can be used for
-	tcl_precision != 0 (and possibly later for [format]), (c) fixes [Bug
-	3120139] by making TclPrintDouble inherently locale-independent, (d)
-	adds test cases to util.test for correct rounding in difficult cases
-	of TclDoubleDigits where fixed- precision results are requested. (e)
-	adds test cases to util.test for the controversial aspects of [Bug
-	3105247]. As a side effect, two more modules from libtommath
-	(bn_mp_set_int.c and bn_mp_init_set_int.c) are brought into the build,
-	since the new code uses them.
-
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclTomMathDecls.h:	Regenerated.
-
-2010-11-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/chanio.test, tests/iogt.test, tests/ioTrans.test: Convert more
-	tests to tcltest2 and factor them to be easier to understand.
-
-2010-11-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/chanio.test: Converted many tests to tcltest2 by marking the
-	setup and cleanup parts as such.
-
-2010-11-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWin32Dll.c: Fix gcc warnings: unused variable 'registration'
-	* win/tclWinChan.c:
-	* win/tclWinFCmd.c:
-
-2010-11-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclAppInit.c: [FRQ 491789]: "setargv() doesn't support a unicode
-	cmdline" now implemented for cygwin and mingw32 too.
-	* tests/main.test: No longer disable tests Tcl_Main-1.4 and 1.6 on
-	Windows, because those now work on all supported platforms.
-	* win/configure.in:  Set NO_VIZ=1 when zlib is compiled in libtcl,
-	this resolves compiler warnings in 64-bit and static builds.
-	* win/configure (regenerated)
-
-2010-11-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/file.n: [Bug 3111298]: Typofix.
-
-	* tests/oo.test: [Bug 3111059]: Added testing that neatly trapped this
-	issue.
-
-2010-11-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclNamesp.c: [Bug 3111059]: Fix leak due to bad looping
-	construct.
-
-2010-11-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tcl.m4: [FRQ 491789]: "setargv() doesn't support a unicode
-	cmdline" now implemented for mingw-w64
-	* win/configure    (re-generated)
-
-2010-11-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclAppInit.c:Bring compilation under mingw-w64 a bit closer
-	* win/cat.c:       to reality. See for what's missing:
-	* win/tcl.m4:      <https://sourceforge.net/apps/trac/mingw-w64/wiki/Unicode%20apps>
-	* win/configure:   (re-generated)
-	* win/tclWinPort.h: [Bug 3110161]: Extensions using TCHAR don't
-	compile on VS2005 SP1
-
-2010-11-15  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/interp.n: [Bug 3081184]: TIP #378.
-	* doc/tclvars.n: Performance fix for TIP #280.
-	* generic/tclBasic.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclInterp.c:
-	* tests/info.test:
-	* tests/interp.test:
-
-2010-11-10  Andreas Kupries  <andreask@activestate.com>
-
-	* changes:	Updates for 8.6b2 release.
-
-2010-11-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (ProcedureMethodVarResolver): [Bug 3105999]:
-	* tests/oo.test:	Make sure that resolver structures that are
-				only temporarily needed get squelched.
-
-2010-11-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclMain.c: Thanks, Kevin, for the fix, but this how it was
-	supposed to be (TCL_ASCII_MAIN is only supposed to be defined on
-	WIN32).
-
-2010-11-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclMain.c: Added missing conditional on _WIN32 around code
-	that messes around with the definition of _UNICODE, to correct a badly
-	broken Unix build from Jan's last commit.
-
-2010-11-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDecls.h:	[FRQ 491789]: "setargv() doesn't support a
-	* generic/tclMain.c:	unicode cmdline" implemented for Tcl on MSVC++
-	* doc/Tcl_Main.3:
-	* win/tclAppInit.c:
-	* win/makefile.vc:
-	* win/Makefile.in:
-	* win/tclWin32Dll.c:	Eliminate minor MSVC warning TCHAR -> char
-				conversion
-
-2010-11-04  Reinhard Max  <max@suse.de>
-
-	* tests/socket.test: Run the socket tests three times with the address
-	family set to any, inet, and inet6 respectively. Use constraints to
-	skip the tests if a family is found to be unsupported or not
-	configured on the local machine. Adjust the tests to dynamically adapt
-	to the address family that is being tested.
-
-	Rework some of the tests to speed them up by avoiding (supposedly)
-	unneeded [after]s.
-
-2010-11-04  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* unix/Makefile.in:	[Patch 3101127]: Installer Improvements.
-	* unix/install-sh:
-
-2010-11-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/error.test (error-19.13): Another variation on testing for
-	issues in [try] compilation.
-
-	* doc/Tcl.n (Variable substitution): [Bug 3099086]: Increase clarity
-	of explanation of what characters are actually permitted in variable
-	substitutions. Note that this does not constitute a change of
-	behavior; it is just an improvement of explanation.
-
-2010-11-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6b2 release.  (Thanks Andreas Kupries)
-
-2010-11-03  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFcmd.c:    [FRQ 2965056]: Windows build with -DUNICODE
-	* win/tclWinFile.c:    (more clean-ups for pre-win2000 stuff)
-	* win/tclWinReg.c:
-
-2010-11-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (TryPostBody):  Ensure that errors when setting
-	* tests/error.test (error-19.1[12]): message/opt capture variables get
-					     reflected properly to the caller.
-
-2010-11-03  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclCompCmds.c (TclCompileCatchCmd): [Bug 3098302]:
-	* tests/compile.test (compile-3.6): Reworked the compilation of the
-	[catch] command so as to avoid placing any code that might throw an
-	exception (specifically, any initial substitutions or any stores to
-	result or options variables) between the BEGIN_CATCH and END_CATCH but
-	outside the exception range.  Added a test case that panics on a stack
-	smash if the change is not made.
-
-2010-11-01  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* library/safe.tcl:	Improved handling of non-standard module path
-	* tests/safe.test:	lists, empty path lists in particular.
-
-2010-11-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Asia/Hong_Kong:
-	* library/tzdata/Pacific/Apia:
-	* library/tzdata/Pacific/Fiji:   Olson's tzdata2010o.
-
-2010-10-29  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclTimer.c:	[Bug 2905784]: Stop small [after]s from
-				wasting CPU while keeping accuracy.
-
-2010-10-28  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-	* generic/tclAssembly.c:
-	* tests/assembly.test (assemble-31.*): Added jump tables.
-
-2010-10-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/http.test:	[Bug 3097490]: Make http-4.15 pass in
-				isolation.
-
-	* unix/tclUnixSock.c:	[Bug 3093120]: Prevent calls of
-				freeaddrinfo(NULL) which can crash some
-				systems.  Thanks Larry Virden.
-
-2010-10-26  Reinhard Max  <max@suse.de>
-
-	* Changelog.2008: Split off from Changelog.
-	* generic/tclIOSock.c (TclCreateSocketAddress): The interp != NULL
-	check is needed for ::tcl::unsupported::socketAF as well.
-
-2010-10-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixSock.c (TcpGetOptionProc): Prevent crash if interp is
-	* win/tclWinSock.c (TcpGetOptionProc):   NULL (a legal situation).
-
-2010-10-26  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixSock.c (TcpGetOptionProc): Added support for
-	::tcl::unsupported::noReverseDNS, which if set to any value, prevents
-	[fconfigure -sockname] and [fconfigure -peername] from doing
-	reverse DNS queries.
-
-2010-10-24  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-	* generic/tclAssembly.c:
-	* tests/assembly.test (assemble-17.15): Reworked branch handling so
-	that forward branches can use jump1 (jumpTrue1, jumpFalse1). Added
-	test cases that the forward branches will expand to jump4, jumpTrue4,
-	jumpFalse4 when needed.
-
-2010-10-23  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-	* generic/tclAssembly.h (removed):
-				Removed file that was included in only one
-				source file.
-	* generictclAssembly.c:	Inlined tclAssembly.h.
-
-2010-10-17  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* doc/info.n:            [Patch 2995655]:
-	* generic/tclBasic.c:    Report inner contexts in [info errorstack]
-	* generic/tclCompCmds.c:
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* tests/error.test:
-	* tests/result.test:
-
-2010-10-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileDictForCmd): Update the compilation
-	* generic/tclCompile.c (tclInstructionTable):	of [dict for] so that
-	* generic/tclExecute.c (TEBCresume):		it no longer makes any
-	use of INST_DICT_DONE now that's not needed, and make it clearer in
-	the implementation of the instruction that it's just a deprecated form
-	of unset operation. Followup to my commit of 2010-10-16.
-
-2010-10-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (Tcl_ZlibStreamGet): [Bug 3081008]: Ensure that
-	when a bytearray gets its internals entangled with zlib for more than
-	a passing moment, that bytearray will never be shimmered away. This
-	increases the amount of copying but is simple to get right, which is a
-	reasonable trade-off.
-
-	* generic/tclStringObj.c (Tcl_AppendObjToObj): Added some special
-	cases so that most of the time when you build up a bytearray by
-	appending, it actually ends up being a bytearray rather than
-	shimmering back and forth to string.
-
-	* tests/http11.test (check_crc): Use a simpler way to express the
-	functionality of this procedure.
-
-	* generic/tclZlib.c: Purge code that wrote to the object returned by
-	Tcl_GetObjResult, as we don't want to do that anti-pattern no more.
-
-2010-10-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/uniParse.tcl:   [Bug 3085863]: tclUniData was 9 years old;
-	Ignore non-BMP characters and fix comment about UnicodeData.txt file.
-	* generic/regcomp.c:    Fix comment
-	* tests/utf.test:       Add some Unicode 6 testcases
-
-2010-10-17  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* doc/info.n:           Document [info errorstack] faithfully.
-
-2010-10-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (ReleaseDictIterator): Factored out the release
-	of the bytecode-level dictionary iterator information so that the
-	side-conditions on instruction issuing are simpler.
-
-2010-10-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/reg_locale.c: [Bug 3085863]: tclUniData 9 years old: Updated
-	* generic/tclUniData.c: Unicode tables to latest UnicodeData.txt,
-	* tools/uniParse.tcl:   corresponding with Unicode 6.0 (except for
-				out-of-range chars > 0xFFFF)
-
-2010-10-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c:	Alternative fix for [Bugs 467523,983660] where
-	* generic/tclExecute.c:	sharing of empty scripts is allowed again.
-
-2010-10-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinThrd.h: (removed) because it is just empty en used nowhere
-	* win/tcl.dsp
-
-2010-10-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/uniClass.tcl:    Spacing and comments: let uniClass.tcl
-	* generic/regc_locale.c: generation match better the current
-				 (hand-modified) regc_locale.c
-	* tools/uniParse.tcl:    Generate proper const qualifiers for
-	* generic/tclUniData.c:  tclUniData.c
-
-2010-10-12  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixSock.c (CreateClientSocket): [Bug 3084338]: Fix a
-	memleak and refactor the calls to freeaddrinfo().
-
-2010-10-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c:    [FRQ 2965056]: Windows build with -DUNICODE
-	* win/tclWinReg.c:
-	* win/tclWinTest.c:   More cleanups
-	* win/tclWinFile.c:   Add netapi32 to the link line, so we no longer
-	* win/tcl.m4:         have to use LoadLibrary to access those
-			      functions.
-	* win/makefile.vc:
-	* win/configure:      (Re-generate with autoconf-2.59)
-	* win/rules.vc        Update for VS10
-
-2010-10-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Fix overallocation of exec stack in TEBC (due
-	to mixing numwords and numbytes)
-
-2010-10-08  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIOSock.c: On Windows, use gai_strerrorA
-
-2010-10-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/winPipe.test:	Test hygiene with makeFile and removeFile.
-
-	* generic/tclCompile.c:	[Bug 3081065]: Prevent writing to the intrep
-	* tests/subst.test:	fields of a freed Tcl_Obj.
-
-2010-10-06  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* generic/tclAssembly.c:
-	* generic/tclAssembly.h:
-	* tests/assemble.test: Added catches. Still needs a lot of testing.
-
-2010-10-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* generic/tclAssembly.c:
-	* generic/tclAssembly.h:
-	* tests/assemble.test: Added dictAppend, dictIncrImm, dictLappend,
-	dictSet, dictUnset, nop, regexp, nsupvar, upvar, and variable.
-
-2010-10-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TEBCresume): [Bug 3079830]: Added invalidation
-	of string representations of dictionaries in some cases.
-
-2010-10-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclExecute.c (EvalStatsCmd): change 'evalstats' to return
-	data to interp by default, or if given an arg, use that as filename to
-	output to (accepts 'stdout' and 'stderr').  Fix output to print used
-	inst count data.
-	* generic/tclCkalloc.c: Change TclDumpMemoryInfo sig to allow objPtr
-	* generic/tclInt.decls: as well as FILE* as output.
-	* generic/tclIntDecls.h:
-
-2010-10-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c, generic/tclClock.c, generic/tclEncoding.c,
-	* generic/tclEnv.c, generic/tclLoad.c, generic/tclNamesp.c,
-	* generic/tclObj.c, generic/tclRegexp.c, generic/tclResolve.c,
-	* generic/tclResult.c, generic/tclUtil.c, macosx/tclMacOSXFCmd.c:
-	More purging of strcpy() from locations where we already know the
-	length of the data being copied.
-
-2010-10-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* tests/assemble.test:
-	* generic/tclAssemble.h:
-	* generic/tclAssemble.c:  Added listIn, listNotIn, and dictGet.
-
-2010-09-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* tests/assemble.test:   Added tryCvtToNumeric and several more list
-	* generic/tclAssemble.c: operations.
-	* generic/tclAssemble.h:
-
-2010-09-29  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* tests/assemble.test:   Completed conversion of tests to a
-	* generic/tclAssemble.c: "white box" structure that follows the
-	C code. Added missing safety checks on the operands of 'over' and
-	'reverse' so that negative operand counts don't smash the stack.
-
-2010-09-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/configure:	Re-generate with autoconf-2.59
-	* win/configure:
-	* generic/tclMain.c:	Make compilable with -DUNICODE as well
-
-2010-09-28  Reinhard Max  <max@suse.de>
-
-	TIP #162 IMPLEMENTATION
-
-	* doc/socket.n:		Document the changes to the [socket] and
-				[fconfigure] commands.
-
-	* generic/tclInt.h:	Introduce TclCreateSocketAddress() as a
-	* generic/tclIOSock.c:	replacement for the platform-dependent
-	* unix/tclUnixSock.c:	TclpCreateSocketAddress() functions. Extend
-	* unix/tclUnixChan.c:	the [socket] and [fconfigure] commands to
-	* unix/tclUnixPort.h:	behave as proposed in TIP #162. This is the
-	* win/tclWinSock.c:	core of what is required to support the use of
-	* win/tclWinPort.h:	IPv6 sockets in Tcl.
-
-	* compat/fake-rfc2553.c: A compat implementation of the APIs defined
-	* compat/fake-rfc2553.h: in RFC-2553 (getaddrinfo() and friends) on
-				 top of the existing gethostbyname() etc.
-	* unix/configure.in:	 Test whether the fake-implementation is
-	* unix/tcl.m4:		 needed.
-	* unix/Makefile.in:	 Add a compile target for fake-rfc2553.
-
-	* win/configure.in:	Allow cross-compilation by default.
-
-	* tests/socket.test:	Improve the test suite to make more use of
-	* tests/remote.tcl:	randomized ports to reduce interference with
-				tests running in parallel or other services on
-				the machine.
-
-2010-09-28  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* tests/assemble.test: Added more "white box" tests.
-	* generic/tclAssembly.c: Added the error checking and reporting
-	for undefined labels. Revised code so that no pointers into the
-	bytecode sequence are held (because the sequence can move!),
-	that no Tcl_HashEntry pointers are held (because the hash table
-	doesn't guarantee their stability!) and to eliminate the BBHash
-	table, which is merely additional information indexed by jump
-	labels and can just as easily be held in the 'label' structure.
-	Renamed shared structures to CamelCase, and renamed 'label' to
-	JumpLabel because other types of labels may eventually be possible.
-
-2010-09-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* tests/assemble.test: Added more "white box" tests.
-	* generic/tclAssembly.c: Fixed bugs exposed by the new tests.
-	(a) [eval] and [expr] had incorrect stack balance computed if
-	the arg was not a simple word. (b) [concat] accepted a negative
-	operand count. (c) [invoke] accepted a zero or negative operand
-	count. (d) more misspelt error messages.
-	Also replaced a funky NRCallTEBC with the new call
-	TclNRExecuteByteCode, necessitated by a merge with changes on the
-	HEAD.
-
-2010-09-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:    [Patch 3072080] (minus the itcl
-	* generic/tclCmdIL.c:    update): a saner NRE.
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:  This makes TclNRExecuteByteCode (ex TEBC)
-	* generic/tclCompile.h:  to be a normal NRE citizen: it loses its
-	* generic/tclExecute.c:  special status.
-	* generic/tclInt.decls:  The logic flow within the BC engine is
-	* generic/tclInt.h:      simplified considerably.
-	* generic/tclIntDecls.h:
-	* generic/tclObj.c:
-	* generic/tclProc.c:
-	* generic/tclTest.c:
-
-	* generic/tclVar.c: Use the macro HasLocalVars everywhere
-
-2010-09-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclOOMethod.c (ProcedureMethodVarResolver): avoid code
-	duplication, let the runtime var resolver call the compiled var
-	resolver.
-
-2010-09-26  Kevin B. Kenny  <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* tests/assemble.test:	Added many new tests moving toward a more
-	comprehensive test suite for the assembler.
-	* generic/tclAssembly.c:	Fixed bugs exposed by the new tests:
-	(a) [bitnot] and [not] had incorrect operand counts. (b)
-	INST_CONCAT cannot concatenate zero objects. (c) misspelt error
-	messages. (d) the "assembly code" internal representation lacked
-	a duplicator, which caused double-frees of the Bytecode object
-	if assembly code ever was duplicated.
-
-2010-09-25  Kevin B. Kenny   <kennykb@acm.org>
-
-	[dogeen-assembler-branch]
-
-	* generic/tclAssembly.c:	Massive refactoring of the assembler
-	* generic/tclAssembly.h:	to use a Tcl-like syntax (and use
-	* tests/assemble.test:		Tcl_ParseCommand to parse it). The
-	* tests/assemble1.bench:	refactoring also ensures that
-	Tcl_Tokens in the assembler have string ranges inside the source
-	code, which allows for [eval] and [expr] assembler directives
-	that simply call TclCompileScript and TclCompileExpr recursively.
-
-2010-09-24  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/stringComp.test: improved string eq/cmp test coverage
-	* generic/tclExecute.c (TclExecuteByteCode): merge INST_STR_CMP and
-	INST_STR_EQ/INST_STR_NEQ paths.  Speeds up eq/ne/[string eq] with
-	obj-aware comparisons and eq/==/ne/!= with length equality check.
-
-2010-09-24  Andreas Kupries  <andreask@activestate.com>
-
-	* tclWinsock.c: [Bug 3056775]: Fixed race condition between thread and
-	internal co-thread access of a socket's structure because of the
-	thread not using the socketListLock in TcpAccept(). Added
-	documentation on how the module works to the top.
-
-2010-09-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDecls.h: Make Tcl_SetPanicProc and Tcl_GetStringResult
-	* unix/tclAppInit.c:  callable without stubs, just as Tcl_SetVar.
-	* win/tclAppInit.c:
-
-2010-09-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdAH.c:   Fix cases where value returned by
-	* generic/tclEvent.c:   Tcl_GetReturnOptions() was leaked.
-	* generic/tclMain.c:    Thanks to Jeff Hobbs for discovery of the
-	anti-pattern to seek and destroy.
-
-2010-09-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclAppInit.c:  Make compilable with -DUNICODE (not activated
-	* win/tclAppInit.c:   yet), many clean-ups in comments.
-
-2010-09-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute: [Bug 3072640]: One more DECACHE_STACK_INFO() was
-	missing.
-
-	* tests/execute.test: Added execute-10.3 for [Bug 3072640]. The test
-	causes a mem failure.
-
-	* generic/tclExecute: Protect all possible writes to ::errorInfo or
-	::errorCode with DECACHE_STACK_INFO(), as they could run traces. The
-	new calls to be protected are Tcl_ResetResult(), Tcl_SetErrorCode(),
-	IllegalExprOperandType(), TclExprFloatError(). The error was triggered
-	by [Patch 3072080].
-
-2010-09-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tcl.m4:		Add kernel32 to LIBS, so the link line for
-	* win/configure:	mingw is exactly the same as for MSVC++.
-
-2010-09-21  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclExecute.c (TclExecuteByteCode):
-	* generic/tclOOMethod.c (ProcedureMethodCompiledVarConnect):
-	* generic/tclVar.c (TclLookupSimpleVar, CompareVarKeys):
-	* generic/tclPathObj.c (Tcl_FSGetNormalizedPath, Tcl_FSEqualPaths):
-	* generic/tclIOUtil.c (TclFSCwdPointerEquals): peephole opt
-	* generic/tclResult.c (TclMergeReturnOptions): Use memcmp where
-	applicable as possible speedup on some libc variants.
-
-2010-09-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	[BRANCH: dogeen-assembler-branch]
-
-	* generic/tclAssembly.c (new file):
-	* generic/tclAssembly.h:
-	* generic/tclBasic.c (builtInCmds, Tcl_CreateInterp):
-	* generic/tclInt.h:
-	* tests/assemble.test (new file):
-	* tests/assemble1.bench (new file):
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/Makefile.vc:
-		Initial commit of Ozgur Dogan Ugurlu's (SF user: dogeen)
-		assembler for the Tcl bytecode language.
-
-2010-09-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFile.c:   Fix declaration after statement.
-	* win/tcl.m4:         Add -Wdeclaration-after-statement, so this
-	* win/configure:      mistake cannot happen again.
-	* win/tclWinFCmd.c:   [Bug 3069278]: Breakage on head Windows
-	* win/tclWinPipe.c:   triggered by install-tzdata, final fix
-
-2010-09-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFCmd.c: Eliminate tclWinProcs->useWide everywhere, since
-	* win/tclWinFile.c: the value is always "1" on platforms >win95
-	* win/tclWinPipe.c:
-
-2010-09-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/file.n (file readlink): [Bug 3070580]: Typofix.
-
-2010-09-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinFCmd.c [Bug 3069278]: Breakage on head Windows triggered
-	by install-tzdata. Temporary don't compile this with -DUNICODE, while
-	investigating this bug.
-
-2010-09-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinFile.c: Remove define of FINDEX_INFO_LEVELS as all
-	supported versions of compilers should now have it.
-
-	* unix/Makefile.in: Do not pass current build env vars when using
-	NATIVE_TCLSH in targets.
-
-2010-09-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDecls.h:    Make Tcl_FindExecutable() work in UNICODE
-	* generic/tclEncoding.c: compiles (windows-only) as well as ASCII.
-	* generic/tclStubInit.c: Needed for [FRQ 491789]: setargv() doesn't
-	support a unicode cmdline.
-
-2010-09-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (TclAppendBytesToByteArray): [Bug 3067036]: Make
-	sure we never try to double zero repeatedly to get a buffer size. Also
-	added a check for sanity on the size of buffer being appended.
-
-2010-09-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Revise `make dist` target to tolerate the
-	case of zero bundled packages.
-
-2010-09-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl:   [Patch 3034251]: Backport ttkGenStubs.tcl
-	* generic/tcl.decls:    features to genStubs.tcl. Make the "generic"
-	* generic/tclInt.decls: argument in the *.decls files optional
-	* generic/tclOO.decls:  (no change to any tcl*Decls.h files)
-	* generic/tclTomMath.decls:
-	This allows genStubs.tcl to generate the ttk stub files as well, while
-	keeping full compatibility with existing *.decls files.
-
-2010-09-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h:  Allow all Win2000+ API entries in Tcl
-	* win/tclWin32Dll.c: Eliminate dynamical loading of advapi23 and
-	kernel32 symbols.
-
-2010-09-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinChan.c:      Various clean-ups, converting from
-	* win/tclWinConsole.c:   tclWinProc->xxxProc directly to Xxx
-	* win/tclWinInit.c:      (no change in functionality)
-	* win/tclWinLoad.c:
-	* win/tclWinSerial.c:
-	* win/tclWinSock.c:
-	* tools/genStubs.tcl:    Add scspec feature from ttkGenStubs.tcl
-	  (no change in output for *Decls.h files)
-
-2010-09-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWin32Dll.c: Partly revert yesterday's change, to make it work
-	on VC++ 6.0 again.
-
-2010-09-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/regsub.n: [Bug 3063568]: Fix for gotcha in example due to Tcl's
-	special handling of backslash-newline. Makes example slightly less
-	pure, but more useful.
-
-2010-09-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/makefile.vc:   Mingw should always link with -ladvapi32.
-	* win/tcl.m4:
-	* win/configure:     (regenerated)
-	* win/tclWinInt.h:   Remove ascii variant of tkWinPocs table, it is
-	* win/tclWin32Dll.c: no longer necessary. Fix CreateProcess signature
-	* win/tclWinPipe.c:  and remove unused GetModuleFileName and lstrcpy.
-	* win/tclWinPort.h:  Mingw/cygwin fixes: <tchar.h> should always be
-	included, and fix conflict in various macro values: Always force the
-	same values as in VC++.
-
-2010-09-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* win/tclWinChan.c:	[Bug 3059922]: #ifdef protections to permit
-	* win/tclWinFCmd.c:     builds with mingw on amd64 systems. Thanks to
-				"mescalinum" for reporting and testing.
-
-2010-09-08  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/tm.n: Added underscore to the set of characters accepted in
-	module names. This is true for quite some time in the code, this
-	change catches up the documentation.
-
-2010-09-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl (plus-pkgs): Improve the package
-	documentation search pattern to support the doctoos-generated
-	directory structure.
-	* tools/tcltk-man2html-utils.tcl (output-name): Made this more
-	resilient against misformatted NAME sections, induced by import of
-	Thread package documentation into Tcl doc tree.
-
-2010-09-02  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/glob.n: Fixed documentation ambiguity regarding the handling
-	of -join.
-
-	* library/safe.tcl (safe::AliasGlob): Fixed another problem, the
-	option -join does not stop option processing in the core builtin, so
-	the emulation must not do that either.
-
-2010-09-01  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* library/safe.tcl (safe::AliasGlob): Moved the command extending the
-	actual glob command with a -directory flag to when we actually have a
-	proper untranslated path,
-
-2010-09-01  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclExecute.c: [Bug 3057639]: Applied patch by Jeff to make
-	* generic/tclVar.c:	the behaviour of lappend in bytecompiled mode
-	* tests/append.test:	consistent with direct-eval and 'append'
-	* tests/appendComp.test: generally. Added tests (append*-9.*)
-	showing the difference.
-
-2010-08-31  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/rules.vc:               Typo (thanks to Twylite discovering
-				      this)
-	* generic/tclStubLib.c:       Revert to previous version: MSVC++ 6.0
-	* generic/tclTomMathStubLib.c:cannot handle the new construct.
-	* generic/tcl.decls           [Patch 2997642]: Many type casts needed
-	* generic/tclDecls.h:         when using Tcl_Pkg* API. Remaining part.
-	* generic/tclPkg.c:
-	* generic/tclBasic.c:
-	* generic/tclTomMathInterface.c:
-	* doc/PkgRequire.3
-
-2010-08-31  Andreas Kupries  <andreask@activestate.com>
-
-	* win/tcl.m4: Applied patch by Jeff fixing issues with the manifest
-	handling on Win64.
-	* win/configure: Regenerated.
-
-2010-08-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:    [Bugs 3046594,3047235,3048771]: New
-	* generic/tclCmdAH.c:    implementation for [tailcall] command: it now
-	* generic/tclCmdMZ.c:    schedules the command and returns TCL_RETURN.
-	* generic/tclExecute.c:  This fixes all issues with [catch] and [try].
-	* generic/tclInt.h:      Thanks dgp for exploring the dark corners.
-	* generic/tclNamesp.c:   More thorough testing is required.
-	* tests/tailcall.test:
-
-2010-08-30  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in:   [FRQ 2965056]: Windows build with -DUNICODE
-	* win/rules.vc:
-	* win/tclWinFCmd.c:  Make sure that allocated TCHAR arrays are
-	* win/tclWinFile.c:  always properly aligned as wchar_t, and
-	* win/tclWinPipe.c:  not bigger than necessary.
-	* win/tclWinSock.c:
-	* win/tclWinDde.c:   Those 3 files are not converted yet to be
-	* win/tclWinReg.c:   built with -DUNICODE, so add a TODO.
-	* win/tclWinTest.c:
-	* generic/tcl.decls:  [Patch 2997642]: Many type casts needed when
-	* generic/tclDecls.h: using Tcl_Pkg* API. Partly.
-	* generic/tclPkg.c:
-	* generic/tclStubLib.c: Demonstration how this change can benefit
-				code.
-	* generic/tclTomMathStubLib.c:
-	* doc/PkgRequire.3:
-
-2010-08-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/dict.n: [Bug 3046999]: Corrected cross reference to array
-	manpage to refer to (correct) existing subcommand.
-
-2010-08-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure, unix/tcl.m4: SHLIB_LD_LIBS='${LIBS}' for OSF1-V*.
-	Add /usr/lib64 to set of auto-search dirs. [Bug 1230554]
-	(SC_PATH_X): Correct syntax error when xincludes not found.
-
-	* win/Makefile.in (VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE):
-	* win/configure, win/configure.in, win/tcl.m4: SC_EMBED_MANIFEST
-	macro and --enable-embedded-manifest configure arg added to support
-	manifest embedding where we know the magic.  Help prevents DLL hell
-	with MSVC8+.
-
-2010-08-24  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.decls: [Bug 3007895]: Tcl_(Find|Create)HashEntry
-	* generic/tclHash.c: stub entries can never be called.
-	* generic/tclDecls.h:
-	* generic/tclStubInit.c: [Patch 2994165]: Change signature of
-	Tcl_FSGetNativePath and TclpDeleteFile follow-up: move stub entry back
-	to original location.
-
-2010-08-23  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Africa/Cairo:
-	* library/tzdata/Asia/Gaza: Olson's tzdata2010l.
-
-2010-08-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBasic.c:  [Patch 3009403]: Signature of Tcl_GetHashKey,
-	* generic/tclBinary.c: Tcl_(Create|Find)HashEntry follow-up:
-	* generic/tclCmdIL.c:  Remove many type casts which are no longer
-	* generic/tclCompile.c:necessary as a result of this signature change.
-	* generic/tclDictObj.c:
-	* generic/tclEncoding.c:
-	* generic/tclExecute.c:
-	* generic/tclInterp.c:
-	* generic/tclIOCmd.c:
-	* generic/tclObj.c:
-	* generic/tclProc.c:
-	* generic/tclTest.c:
-	* generic/tclTrace.c:
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-
-2010-08-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/linsert.n: [Bug 3045123]: Make description of what is actually
-	happening more accurate.
-
-2010-08-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl: [Patch 3034251]: Backport ttkGenStubs.tcl
-	features to genStubs.tcl, partly: Use void (*reserved$i)(void) = 0
-	instead of void *reserved$i = NULL for unused stub entries, in case
-	pointer-to-function and pointer-to-object are different sizes.
-	* generic/tcl*Decls.h:   (regenerated)
-	* generic/tcl*StubInit.c:(regenerated)
-
-2010-08-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/Method.3:   Fix definition of Tcl_MethodType.
-
-2010-08-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclTrace.c (TraceExecutionObjCmd, TraceCommandObjCmd)
-	(TraceVariableObjCmd): [Patch 3048354]: Use memcpy() instead of
-	strcpy() to avoid buffer overflow; we have the correct length of data
-	to copy anyway since we've just allocated the target buffer.
-
-2010-08-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl: [Patch 3034251]: Backport ttkGenStubs.tcl
-	features to genStubs.tcl, partly: remove unneeded ifdeffery and put
-	C++ guard around stubs pointer definition.
-	* generic/*Decls.h:   (regenerated)
-
-2010-08-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   New redesign of [tailcall]: find
-	* generic/tclExecute.c: errors early on, so that errorInfo
-	* generic/tclInt.h:     contains the proper info [Bug 3047235]
-	* generic/tclNamesp.c:
-
-	* generic/tclCmdAH.c (TclNRTryObjCmd): [Bug 3046594]: Block
-	tailcalling out of the body of a non-bc'ed [try].
-
-	* generic/tclBasic.c:    Redesign of [tailcall] to
-	* generic/tclCmdAH.c:    (a) fix [Bug 3047235]
-	* generic/tclCompile.h:  (b) enable fix for [Bug 3046594]
-	* generic/tclExecute.c:  (c) enable recursive tailcalls
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* tests/tailcall.test:
-
-2010-08-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/safe.tcl (AliasGlob): [Bug 3004191]: Restore safe [glob] to
-	working condition.
-
-2010-08-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (ProcWrongNumArgs): [Bug 3045010]: Make the
-	handling of passing the wrong number of arguments to [apply] somewhat
-	less verbose when a lambda term is present.
-
-2010-08-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/unicows:    Remove completely, see [FRQ 2819611].
-	* doc/FileSystem.3: [Patch 2994165]: Change signature of
-	* generic/tcl.decls  Tcl_FSGetNativePath and TclpDeleteFile
-	* generic/tclDecls.h:
-	* generic/tclIOUtil.c:
-	* generic/tclStubInit.c:
-	* generic/tclInt.h:
-	* unix/tclUnixFCmd.c:
-	* win/tclWinFCmd.c:
-	* doc/Hash.3: [Patch 3009403]: Signature of Tcl_GetHashKey,
-	* generic/tcl.h:     Tcl_(Create|Find)HashEntry
-
-2010-08-11  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/ldAix: Remove ancient (pre-4.2) AIX support
-	* unix/configure: Regen with ac-2.59
-	* unix/configure.in, unix/tclConfig.sh.in, unix/Makefile.in:
-	* unix/tcl.m4 (AIX): Remove the need for ldAIX, replace with
-	-bexpall/-brtl.  Remove TCL_EXP_FILE (export file) and other baggage
-	that went with it.  Remove pre-4 AIX build support.
-
-2010-08-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclNRYieldToObjCmd):
-	* tests/coroutine.test: Fixed bad copypasta snafu. Thanks to Andy Goth
-	for finding the bug.
-
-2010-08-10  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclUtil.c (TclByteArrayMatch): Patterns may not be
-	null-terminated, so account for that.
-
-2010-08-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6b2 release.
-
-2010-08-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/Makefile.in, win/makefile.bc, win/makefile.vc, win/tcl.dsp:
-	* win/tclWinPipe.c (TclpCreateProcess):
-	* win/stub16.c (removed): Removed Win9x tclpip8x.dll build and 16-bit
-	application loader stub support.  Win9x is no longer supported.
-
-	* win/tclWin32Dll.c (TclWinInit): Hard-enforce Windows 9x as an
-	unsupported platform with a panic.  Code to support it still exists in
-	other files (to go away in time), but new APIs are being used that
-	don't exist on Win9x.
-
-	* unix/tclUnixFCmd.c: Adjust license header as per
-	ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-
-	* license.terms: Fix DFARs note for number-adjusted rights clause
-
-	* win/tclWin32Dll.c (asciiProcs, unicodeProcs):
-	* win/tclWinLoad.c (TclpDlopen): 'load' use LoadLibraryEx with
-	* win/tclWinInt.h (TclWinProcs): LOAD_WITH_ALTERED_SEARCH_PATH to
-	prefer dependent DLLs in same dir as loaded DLL.
-
-	* win/Makefile.in (%.${OBJEXT}): better implicit rules support
-
-2010-08-04  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c: [Bug 3034840]: Fixed reference counting in
-	* generic/tclIORTrans.c: InvokeTclMethod and callers.
-	* tests/ioTrans.test:
-
-2010-08-03  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/var.test (var-19.1): [Bug 3037525]: Added test demonstrating
-	the local hashtable deletion crash and fix.
-
-	* tests/info.test (info-39.1): Added forward copy of test in 8.5
-	branch about [Bug 2933089]. Should not fail, and doesn't, after
-	updating the line numbers to the changed position.
-
-2010-08-02  Kevin B. Kenny  <kennykb@users.sf.net>
-
-	* library/tzdata/America/Bahia_Banderas:
-	* library/tzdata/Pacific/Chuuk:
-	* library/tzdata/Pacific/Pohnpei:
-	* library/tzdata/Africa/Cairo:
-	* library/tzdata/Europe/Helsinki:
-	* library/tzdata/Pacific/Ponape:
-	* library/tzdata/Pacific/Truk:
-	* library/tzdata/Pacific/Yap:			Olson's tzdata2010k.
-
-2010-08-02  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c: Correcting bad port of [Bug 3037525] fix
-
-2010-07-28  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c: [Bug 3037525]: Lose fickle optimisation in
-	TclDeleteVars (used for runtime-created locals) that caused crash.
-
-2010-07-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/zlib/win32/README.txt: Official build of zlib1.dll 1.2.5 is
-	* compat/zlib/win32/USAGE.txt:  finally available, so put it in.
-	* compat/zlib/win32/zlib1.dll:
-
-2010-07-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/http.n: Corrected description of location of one of the entries
-	in the state array.
-
-2010-07-24  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDecls.h: [Bug 3029891]: Functions that don't belong in
-	* generic/tclTest.c:  the stub table.
-	* generic/tclBasic.c: From [Bug 3030870] make itcl 3.x built with
-	pre-8.6 work in 8.6: Relax the relation between Tcl_CallFrame and
-	CallFrame.
-
-2010-07-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c: Added more errorCode setting.
-
-2010-07-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Ensure that [dict get]
-	* generic/tclDictObj.c (DictGetCmd): always generates an errorCode on
-	a failure to look up an entry.
-
-2010-07-11  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* unix/configure: (regenerated)
-	* unix/configure.in: For the NATIVE_TCLSH variable use the autoconf
-	* unix/Makefile.in:  SC_PROG_TCLSH to try and find a locally installed
-	native binary. This avoids manually fixing up when cross compiling. If
-	there is not one, revert to using the build product.
-
-2010-07-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.decs:	Reverted to the original TIP 337
-	implementation on what to do with the obsolete internal stub for
-	TclBackgroundException() (eliminate it!)
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2010-07-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls:  [Bug 803489]: Tcl_FindNamespace problem in
-	* generic/tclIntDecls.h: the Stubs table
-	* generic/tclStubInit.c:
-
-2010-07-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (IllegalExprOperandType): [Bug 3024379]: Made
-	sure that errors caused by an argument to an operator being outside
-	the domain of the operator all result in ::errorCode being ARITH
-	DOMAIN and not NONE.
-
-2010-07-01  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/rules.vc:              [Bug 3020677]: wish can't link reg1.2
-	* tools/checkLibraryDoc.tcl: formatting, spacing, cleanup unused
-	* tools/eolFix.tcl:          variables; no change in generated output
-	* tools/fix_tommath_h.tcl:
-	* tools/genStubs.tcl:
-	* tools/index.tcl:
-	* tools/man2help2.tcl:
-	* tools/regexpTestLib.tcl:
-	* tools/tsdPerf.tcl:
-	* tools/uniClass.tcl:
-	* tools/uniParse.tcl:
-
-2010-07-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/mathop.n: [Bug 3023165]: Fix typo that was preventing proper
-	rendering of the exclusive-or operator.
-
-2010-06-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPosixStr.c: [Bug 3019634]: errno.h and tclWinPort.h have
-	conflicting definitions. Added messages for ENOTRECOVERABLE, EOTHER,
-	ECANCELED and EOWNERDEAD, and fixed various typing mistakes in other
-	messages.
-
-2010-06-25  Reinhard Max  <max@suse.de>
-
-	* tests/socket.test: Prevent a race condition during shutdown of the
-	remote test server that can cause a hang when the server is being run
-	in verbose mode.
-
-2010-06-24  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h: [Bug 3019634]: errno.h and tclWinPort.h have
-	conflicting definitions.
-
-		***POTENTIAL INCOMPATIBILITY***
-	On win32, the correspondence between errno and the related error
-	message, as handled by Tcl_ErrnoMsg() changes. The error message is
-	kept the same, but the corresponding errno value might change.
-
-2010-06-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (Tcl_LsetObjCmd): [Bug 3019351]: Corrected wrong
-	args message.
-
-2010-06-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclLoadDl.c:    Eliminate various unnecessary type casts, use
-	* unix/tclLoadNext.c:  function typedefs whenever possible
-	* unix/tclUnixChan.c:
-	* unix/tclUnixFile.c:
-	* unix/tclUnixNotfy.c:
-	* unix/tclUnixSock.c:
-	* unix/tclUnixTest.c:
-	* unix/tclXtTest.c:
-	* generic/tclZlib.c:   Remove hack needed for zlib 1.2.3 on win32
-
-2010-06-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/init.tcl (auto_execok): [Bug 3017997]: Add .cmd to the
-	default list of extensions that we can execute interactively.
-
-2010-06-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/loadICU.tcl:   [Bug 3016135]: Traceback using clock format
-	* library/msgs/he.msg: with locale of he_IL.
-
-	* generic/tcl.h:       Simplify Tcl_AppInit and *_Init definitions,
-	* generic/tclInt.h:    spacing. Change TclpThreadCreate and
-	* generic/tcl.decls:   Tcl_CreateThread signature, making clear that
-	* generic/tclDecls.h:  "proc" is a function pointer, as in all other
-	* generic/tclEvent.c:  "proc" function parameters.
-	* generic/tclTestProcBodyObj.c:
-	* win/tclWinThrd.c:
-	* unix/tclUnixThrd.c:
-	* doc/Thread.3:
-	* doc/Class.3:         Fix Tcl_ObjectMetadataType definition.
-
-2010-06-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/Makefile.in:    Fix compilation of xttest with 8.6 changes
-	* unix/tclXtNotify.c:
-	* unix/tclXtTest.c:
-	* generic/tclPipe.c:   Fix gcc warning (with -fstrict-aliasing=2)
-	* library/auto.tcl:    Spacing and style fixes.
-	* library/history.tcl:
-	* library/init.tcl:
-	* library/package.tcl:
-	* library/safe.tcl:
-	* library/tm.tcl:
-
-2010-06-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl (make-man-pages): [Bug 3015327]: Make the
-	title of a manual page be stored relative to its resulting directory
-	name as well as its source filename. This was caused by both Tcl and a
-	contributed package ([incr Tcl]) defining an Object.3. Also corrected
-	the joining of strings in titles to avoid extra braces.
-
-2010-06-09  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl: Added OSX Intel 64bit
-	* library/platform/pkgIndex.tcl: Package updated to version 1.0.9.
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2010-06-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/tsdPerf.c:    Fix export of symbol Tsdperf_Init, when using
-	-fvisibility=hidden. Make two functions static, eliminate some
-	unnecessary type casts.
-	* tools/configure.in: Update to Tcl 8.6
-	* tools/configure:    (regenerated)
-	* tools/.cvsignore    new file
-
-2010-06-07  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclExecute.c: Ensure proper reset of [info errorstack] even
-	* generic/tclNamesp.c:  when compiling constant expr's with errors.
-
-2010-06-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   [Bug 3008307]: make callerPtr chains be
-	* generic/tclExecute.c: traversable accross coro boundaries. Add the
-	special coroutine CallFrame (partially reverting commit of
-	2009-12-10), as it is needed for coroutines that do not push a CF, eg,
-	those with [eval] as command. Thanks to Colin McCormack (coldstore)
-	and Alexandre Ferrieux for the hard work on this.
-
-2010-06-03  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclNamesp.c: Safer (and faster) computation of [uplevel]
-	* tests/error.test:    offsets in TIP 348. Toplevel offsets no longer
-	* tests/result.test:   overestimated.
-
-2010-06-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclOO.h:  BUILD_tcloo is never defined (leftover)
-	* win/makefile.bc:  Don't set BUILD_tcloo (leftover)
-	See also entry below: 2008-06-01  Joe Mistachkin
-
-2010-06-01  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclNamesp.c: Fix computation of [uplevel] offsets in TIP 348
-	* tests/error.test:    Only depend on callerPtr chaining now.
-	* tests/result.test:   Needed for upcoming coro patch.
-
-2010-05-31  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclVar.c:        Eliminate some casts to (Tcl_HashTable *)
-	* generic/tclExecute.c:
-	* tests/fileSystem.test:   Fix filesystem-5.1 test failure on CYGWIN
-
-2010-05-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h: [Patch 3008541]: Order of TIP #348 fields in
-	Interp structure
-
-2010-05-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmdsSZ.c (IssueTryFinallyInstructions): [3007374]:
-	Corrected error in handling of catch contexts to prevent crash with
-	chained handlers.
-
-	* generic/tclExecute.c (TclExecuteByteCode): Restore correct operation
-	of instruction-level execution tracing (had been broken by NRE).
-
-2010-05-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/opt/optParse.tcl: Don't generate spaces at the end of a
-	* library/opt/pkgIndex.tcl: line, eliminate ';' at line end, bump to
-	* tools/uniParse.tcl:       v0.4.6
-	* generic/tclUniData.c:
-	* tests/opt.test:
-	* tests/safe.test:
-
-2010-05-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/installData.tcl: Make sure that copyDir only receives
-	normalized paths, otherwise it might result in a crash on CYGWIN.
-	Restyle according to the Tcl style guide.
-	* generic/tclStrToD.c: [Bug 3005233]: Fix for build on OpenBSD vax
-
-2010-05-19  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tests/dict.test: Add missing tests for [Bug 3004007], fixed under
-	the radar on 2010-02-24 (dkf): EIAS violation in list-dict conversions
-
-2010-05-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/regcomp.c:     Don't use arrays of length 1, just use a
-	* generic/tclFileName.c: single element then, it makes code more
-	* generic/tclLoad.c:     readable. (Here it even prevents a type cast)
-
-2010-05-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclStrToD.c: [Bug 2996549]: Failure in expr.test on Win32
-
-2010-05-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (TclInfoFrame): Change this code to use
-	Tcl_GetCommandFullName rather than rolling its own. Discovered during
-	the hunting of [Bug 3001438] but unlikely to be a fix.
-
-2010-05-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinConsole.c: [Patch 2997087]: Unnecessary type casts.
-	* win/tclWinDde.c:
-	* win/tclWinLoad.c:
-	* win/tclWinNotify.c:
-	* win/tclWinSerial.c:
-	* win/tclWinSock.c:
-	* win/tclWinTime.c:
-	* win/tclWinPort.h: Don't duplicate CYGWIN timezone #define from
-			    tclPort.h
-
-2010-05-07  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl: Fix cpu name for Solaris/Intel 64bit.
-	* library/platform/pkgIndex.tcl: Package updated to version 1.0.8.
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2010-05-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPkg.c:   Unnecessary type casts, see [Patch 2997087]
-
-2010-05-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinNotify.c:	TCHAR-related fixes, making those two files
-	* win/tclWinSock.c:	compile fine when TCHAR != char. Please see
-	comments in [FRQ 2965056] (2965056-1.patch).
-
-2010-05-03  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIORChan.c:   Use "tclIO.h" and "tclTomMathDecls.h"
-	* generic/tclIORTrans.c:  everywhere
-	* generic/tclTomMath.h:
-	* tools/fix_tommath_h.tcl:
-	* libtommath/tommath.h:   Formatting (# should always be first char on
-				  line)
-	* win/tclAppInit.c:       For MINGW/CYGWIN, use GetCommandLineA
-				  explicitly.
-	* unix/.cvsignore:        Add pkg, *.dll
-
-	* libtommath/tommath.h:       CONSTify various useful internal
-	* libtommath/bn_mp_cmp_d.c:   functions (TclBignumToDouble, TclCeil,
-	* libtommath/bn_mp_cmp_mag.c: TclFloor), and related tommath functions
-	* libtommath/bn_mp_cmp.c:
-	* libtommath/bn_mp_copy.c:
-	* libtommath/bn_mp_count_bits.c:
-	* libtommath/bn_mp_div_2d.c:
-	* libtommath/bn_mp_mod_2d.c:
-	* libtommath/bn_mp_mul_2d.c:
-	* libtommath/bn_mp_neg.c:
-	* generic/tclBasic.c:        Handle TODO: const correctness ?
-	* generic/tclInt.h:
-	* generic/tclStrToD.c:
-	* generic/tclTomMath.decls:
-	* generic/tclTomMath.h:
-	* generic/tclTomMathDecls.h:
-
-2010-04-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Bump patchlevel to 8.6b1.2 to distinguish
-	* library/init.tcl:	CVS snapshots from earlier snapshots as well
-	* unix/configure.in:	as the 8.6b1 and 8.6b2 releases.
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-	* generic/tclBinary.c (TclAppendBytesToByteArray):	Add comments
-	* generic/tclInt.h (TclAppendBytesToByteArray):	placing overflow
-	protection responsibility on caller.  Convert "len" argument to signed
-	int which any value already vetted for overflow issues will fit into.
-	* generic/tclStringObj.c:	Update caller; standardize panic msg.
-
-	* generic/tclBinary.c (UpdateStringOfByteArray): [Bug 2994924]:	Add
-	panic when the generated string representation would grow beyond Tcl's
-	size limits.
-
-2010-04-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (TclAppendBytesToByteArray): Add extra armour
-	against buffer overflows.
-
-	* generic/tclBasic.c (NRInterpCoroutine): Corrected handling of
-	* tests/coroutine.test (coroutine-6.4):   arguments to deal with
-						  trickier cases.
-
-2010-04-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/coroutine.test: testing coroutine arguments after [yield]:
-	check that only 0/1 allowed
-
-2010-04-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (NRInterpCoroutine): Corrected handling of
-	arguments to deal with trickier cases.
-
-	* generic/tclCompCmds.c (TclCompileVariableCmd): Slightly tighter
-	issuing of instructions.
-
-	* generic/tclExecute.c (TclExecuteByteCode): Add peephole optimization
-	of the fact that INST_DICT_FIRST and INST_DICT_NEXT always have a
-	conditional jump afterwards.
-
-	* generic/tclBasic.c (TclNRYieldObjCmd, TclNRYieldmObjCmd)
-	(NRInterpCoroutine): Replace magic values for formal argument counts
-	for coroutine command implementations with #defines, for an increase
-	in readability.
-
-2010-04-30  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclMain.c: Unnecessary TCL_STORAGE_CLASS re-definition. It
-	was used for an ancient dummy reference to Tcl_LinkVar(), but that's
-	already gone since 2002-05-29.
-
-2010-04-29  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompExpr.c: Slight change in the literal sharing
-	* generic/tclCompile.c:  mechanism to avoid shimmering of
-	* generic/tclCompile.h:  command names.
-	* generic/tclLiteral.c:
-
-2010-04-29  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl: Another stab at getting the /lib,
-	* library/platform/pkgIndex.tcl: /lib64 difference right for linux.
-	* unix/Makefile.in:		 Package updated to version 1.0.7.
-	* win/Makefile.in:
-
-2010-04-29  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Antarctica/Macquarie:
-	* library/tzdata/Africa/Casablanca:
-	* library/tzdata/Africa/Tunis:
-	* library/tzdata/America/Santiago:
-	* library/tzdata/America/Argentina/San_Luis:
-	* library/tzdata/Antarctica/Casey:
-	* library/tzdata/Antarctica/Davis:
-	* library/tzdata/Asia/Anadyr:
-	* library/tzdata/Asia/Damascus:
-	* library/tzdata/Asia/Dhaka:
-	* library/tzdata/Asia/Gaza:
-	* library/tzdata/Asia/Kamchatka:
-	* library/tzdata/Asia/Karachi:
-	* library/tzdata/Asia/Taipei:
-	* library/tzdata/Europe/Samara:
-	* library/tzdata/Pacific/Apia:
-	* library/tzdata/Pacific/Easter:
-	* library/tzdata/Pacific/Fiji:   Olson's tzdata2010i.
-
-2010-04-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBinary.c (TclAppendBytesToByteArray): [Bug 2992970]: Make
-	* generic/tclStringObj.c (Tcl_AppendObjToObj): an append of a byte
-	array to another into an efficent operation. The problem was the (lack
-	of) a proper growth management strategy for the byte array.
-
-2010-04-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/dirent2.h:	Include "tcl.h", not <tcl.h>, like everywhere
-	* compat/dlfcn.h:	else, to ensure that the version in the Tcl
-	* compat/stdlib.h:	distribution is used, not some version from
-	* compat/string.h:	somewhere else.
-	* compat/unistd.h:
-
-2010-04-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in:	Remove unused @MAN2TCLFLAGS@
-	* win/tclWinPort.h:	Move <limits.h> include from tclInt.h to
-	* generic/tclInt.h:	tclWinPort.h, and eliminate unneeded
-	* generic/tclEnv.c:	<stdlib.h>, <stdio.h> and <string.h>, which
-				are already in tclInt.h
-	* generic/regcustom.h:	Move "tclInt.h" from regcustom.h up to
-	* generic/regex.h:	regex.h.
-	* generic/tclAlloc.c:	Unneeded <stdio.h> include.
-	* generic/tclExecute.c:	Fix gcc warning: comparison between signed and
-				unsigned.
-
-2010-04-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInt.h (TclIsVarDirectUnsettable): Corrected flags so that
-	deletion of traces is not optimized out...
-
-	* generic/tclExecute.c (ExecuteExtendedBinaryMathOp)
-	(TclCompareTwoNumbers,ExecuteExtendedUnaryMathOp,TclExecuteByteCode):
-	[Patch 2981677]: Move the less common arithmetic operations (i.e.,
-	exponentiation and operations on non-longs) out of TEBC for a big drop
-	in the overall size of the stack frame for most code. Net effect on
-	speed is minimal (slightly faster overall in tclbench). Also extended
-	the number of places where TRESULT handling is replaced with a jump to
-	dedicated code.
-
-2010-04-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Rearrange location of an
-	assignment to shorten the object code.
-
-2010-04-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIOUtil.c (Tcl_FSGetNativePath): [Bug 2992292]:
-	tclIOUtil.c assignment type mismatch compiler warning
-	* generic/regguts.h:     If tclInt.h or tclPort.h is already
-	* generic/tclBasic.c:    included, don't include <limits.h>
-	* generic/tclExecute.c:  again. Follow-up to [Bug 2991415]:
-	* generic/tclIORChan.c:  tclport.h #included before limits.h
-	* generic/tclIORTrans.c: See comments in [Bug 2991415]
-	* generic/tclObj.c:
-	* generic/tclOOInt.h:
-	* generic/tclStrToD.c:
-	* generic/tclTomMath.h:
-	* generic/tclTomMathInterface.c:
-	* generic/tclUtil.c:
-	* compat/strtod.c:
-	* compat/strtol.c:
-
-2010-04-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/tclLoadDl.c (FindSymbol): [Bug 2992295]: Simplified the logic
-	so that the casts added in Donal Fellows's change for the same bug are
-	no longer necessary.
-
-2010-04-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclLoadDl.c (FindSymbol): [Bug 2992295]: Added an explicit cast
-	because auto-casting between function and non-function types is never
-	naturally warning-free.
-
-	* generic/tclStubInit.c:   Add a small amount of gcc-isms (with #ifdef
-	* generic/tclOOStubInit.c: guards) to ensure that warnings are issued
-	when these files are older than the various *.decls files.
-
-2010-04-25  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:    Add unsupported [yieldm] command. Credit
-	* generic/tclInt.h:      Lars Hellstrom for the basic idea.
-
-2010-04-24  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:    Modify api of TclSpliceTailcall() to fix
-	* generic/tclExecute.c:  [yieldTo], which had not survived the latest
-	* generic/tclInt.h:      mods to tailcall. Thanks kbk for detecting
-	the problem.
-
-2010-04-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclUnixPort.h: [Bug 2991415]: tclport.h #included before
-	limits.h
-
-2010-04-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclPlatDecls.h:  Move TCHAR fallback typedef from tcl.h to
-	* generic/tcl.h:           tclPlatDecls.h (as suggested by dgp)
-	* generic/tclInt.h:        fix typo
-	* generic/tclIOUtil.c:     Eliminate various unnecessary
-	* unix/tclUnixFile.c:      type casts.
-	* unix/tclUnixPipe.c:
-	* win/tclWinChan.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c:
-	* win/tclWinLoad.c:
-	* win/tclWinPipe.c:
-
-2010-04-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclTest.c:  Use function prototypes from the FS API.
-	* compat/zlib/*:      Upgrade to zlib 1.2.5
-
-2010-04-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Improve commenting and
-	reduce indentation for the Invocation Block.
-
-2010-04-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/unset.n: [Bug 2988940]: Fix typo.
-
-2010-04-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h:       Move inclusion of <tchar.h> from
-	* generic/tcl.h:          tclPlatDecls.h to tclWinPort.h, where it
-	* generic/tclPlatDecls.h: belongs. Add fallback in tcl.h, so TCHAR is
-				  available in win32 always.
-
-2010-04-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/try.n: [Bug 2987551]: Fix typo.
-
-2010-04-14  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl: Linux platform identification:
-	* library/platform/pkgIndex.tcl: Check /lib64 for existence of files
-	* unix/Makefile.in: matching libc* before accepting it as base
-	* win/Makefile.in:  directory. This can happen on weirdly installed
-	32bit systems which have an empty or partially filled /lib64 without
-	an actual libc. Bumped to version 1.0.6.
-
-2010-04-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinPort.h: Fix [Patch 2986105]: conditionally defining
-	* win/tclWinFile.c: strcasecmp/strncasecmp
-	* win/tclWinLoad.c: Fix gcc warning: comparison of unsigned expression
-	>= 0 is always true
-
-2010-04-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmdsSZ.c (TclSubstCompile): If the first token does
-	not result in a *guaranteed* push of a Tcl_Obj on the stack, we must
-	push an empty object. Otherwise it is possible to get to a 'concat1'
-	or 'done' without enough values on the stack, resulting in a crash.
-	Thanks to Joe Mistachkin for identifying a script that could trigger
-	this case.
-
-2010-04-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/catch.n, doc/info.n, doc/return.n: Formatting.
-
-2010-04-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/Load.3: Minor corrections of formatting and cross links.
-
-2010-04-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/configure:       (regenerate with autoconf-2.59)
-	* unix/configure:
-	* unix/installManPage: [Bug 2982540]: configure and install* script
-	* unix/install-sh:     files should always have LF line ending.
-	* doc/Load.3:          Fix signature of Tcl_LoadFile in documentation.
-
-2010-04-05  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	TIP #348 IMPLEMENTATION
-
-	* generic/tclBasic.c: [Patch 2868499]: Substituted error stack
-	* generic/tclCmdIL.c:
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* generic/tclResult.c:
-	* doc/catch.n:
-	* doc/info.n:
-	* doc/return.n:
-	* tests/cmdMZ.test:
-	* tests/error.test:
-	* tests/execute.test:
-	* tests/info.test:
-	* tests/init.test:
-	* tests/result.test:
-
-2010-04-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tcl.m4 (SC_ENABLE_THREADS): Flip the default for whether to
-	* win/tcl.m4 (SC_ENABLE_THREADS):  build in threaded mode. Part of
-	* win/rules.vc:			   TIP #364.
-
-	* unix/tclLoadDyld.c (FindSymbol): Better human-readable error message
-	generation to match code in tclLoadDl.c.
-
-2010-04-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIOUtil.c, unix/tclLoadDl.c: Minor changes to enforce
-	Engineering Manual style rules.
-
-	* doc/FileSystem.3, doc/Load.3: Documentation for TIP#357.
-
-	* macosx/tclMacOSXBundle.c (OpenResourceMap): [Bug 2981528]: Only
-	define this function when HAVE_COREFOUNDATION is defined.
-
-2010-04-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.decls (Tcl_LoadFile): Add missing "const" in signature,
-	* generic/tclIOUtil.c (Tcl_LoadFile): and some formatting fixes
-	* generic/tclDecls.h:  (regenerated)
-
-2010-04-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIOUtil.c (Tcl_LoadFile): Corrections to previous commit
-	* unix/tclLoadDyld.c (TclpDlopen):    to make it build on OSX.
-
-2010-04-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	TIP #357 IMPLEMENTATION
-	TIP #362 IMPLEMENTATION
-
-	* generic/tclStrToD.c: [Bug 2952904]: Defer creation of the smallest
-	floating point number until it is actually used. (This change avoids a
-	bogus syslog message regarding a 'floating point software assist
-	fault' on SGI systems.)
-
-	* library/reg/pkgIndex.tcl:	[TIP #362]: Fixed first round of bugs
-	* tests/registry.test:		resulting from the recent commits of
-	* win/tclWinReg.c:		changes in support of the referenced
-					TIP.
-
-	* generic/tcl.decls:		[TIP #357]: First round of changes
-	* generic/tclDecls.h:		to export Tcl_LoadFile,
-	* generic/tclIOUtil.c:		Tcl_FindSymbol, and Tcl_FSUnloadFile
-	* generic/tclInt.h:		to the public API.
-	* generic/tclLoad.c:
-	* generic/tclLoadNone.c:
-	* generic/tclStubInit.c:
-	* tests/fileSystem.test:
-	* tests/load.test:
-	* tests/unload.test:
-	* unix/tclLoadDl.c:
-	* unix/tclLoadDyld.c:
-	* unix/tclLoadNext.c:
-	* unix/tclLoadOSF.c:
-	* unix/tclLoadShl.c:
-	* unix/tclUnixPipe.c:
-	* win/Makefile.in:
-	* win/tclWinLoad.c:
-
-2010-03-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/registry.n: Added missing documentation of TIP#362 flags.
-
-	* doc/package.n: [Bug 2980210]: Document the arguments taken by
-	the [package present] command correctly.
-
-	* doc/Thread.3: Added some better documentation of how to create and
-	use a thread using the C-level thread API, based on realization that
-	no such tutorial appeared to exist.
-
-2010-03-31  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* test/cmdMZ.test:    [FRQ 2974744]: share exception codes (ObjType?):
-	* test/error.test:    Revised test cases, making sure that abbreviated
-	* test/proc-old.test: codes are checked resulting in an error, and
-	                      checking for the exact error message.
-
-2010-03-30  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c (ReflectClose, ReflectInput, ReflectOutput,
-	(ReflectSeekWide, ReflectWatch, ReflectBlock, ReflectSetOption,
-	(ReflectGetOption, ForwardProc): [Bug 2978773]: Preserve
-	ReflectedChannel* structures across handler invocations, to avoid
-	crashes when the handler implementation induces nested callbacks and
-	destruction of the channel deep inside such a nesting.
-
-2010-03-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclObj.c (Tcl_GetCommandFromObj):     [Bug 2979402]: Reorder
-	the validity tests on internal rep of a "cmdName" value to avoid
-	invalid reads reported by valgrind.
-
-2010-03-30  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIndexObj:	[FRQ 2974744]: share exception codes
-	* generic/tclResult.c:	further optimization, making use of indexType.
-	* generic/tclZlib.c:    [Bug 2979399]: uninitialized value troubles
-
-2010-03-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #362 IMPLEMENTATION
-
-	* win/tclWinReg.c: [Patch 2960976]: Apply patch from Damon Courtney to
-	* tests/registry.test:	allow the registry command to be told to work
-	* win/Makefile.in:	with both 32-bit and 64-bit registries. Bump
-	* win/configure.in:	version of registry package to 1.3.
-	* win/makefile.bc:
-	* win/makefile.vc:
-	* win/configure:	autoconf-2.59
-
-2010-03-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:            Only test for -visibility=hidden with gcc
-	                          (Second remark in [Bug 2976508])
-	* unix/configure:         regen
-
-2010-03-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:       Fix array overrun in test format-1.12
-	caught by valgrind testing.
-
-2010-03-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h:	[FRQ 2974744]: share exception codes
-	* generic/tclResult.c:	(ObjType?)
-	* generic/tclCmdMZ.c:
-	* generic/tclCompCmdsSZ.c:
-
-2010-03-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclExecute.c: [Bug 2976508]: Tcl HEAD fails on HP-UX
-
-2010-03-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixFCmd.c (TclUnixCopyFile): [Bug 2976504]: Corrected
-	number of arguments to fstatfs() call.
-
-	* macosx/tclMacOSXBundle.c, macosx/tclMacOSXFCmd.c:
-	* macosx/tclMacOSXNotify.c: Reduce the level of ifdeffery in the
-	functions of these files to improve readability. They need to be
-	audited for whether complexity can be removed based on the minimum
-	supported version of OSX, but that requires a real expert.
-
-2010-03-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclResult.c:  [Bug 2383005]: Revise [return -errorcode] so
-	* tests/result.test:    that it rejects illegal non-list values.
-
-2010-03-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOInfo.c (InfoObjectMethodTypeCmd)
-	(InfoClassMethodTypeCmd): Added introspection of method types so that
-	it is possible to find this info out without using errors.
-	* generic/tclOOMethod.c (procMethodType): Now that introspection can
-	reveal the name of method types, regularize the name of normal methods
-	to be the name of the definition type used to create them.
-
-	* tests/async.test (async-4.*): Reduce obscurity of these tests by
-	putting the bulk of the code for them inside the test body with the
-	help of [apply].
-
-	* generic/tclCmdMZ.c (TryPostBody, TryPostHandler): Make sure that the
-	[try] command does not trap unwinding due to limits.
-
-2010-03-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	[Bug 2973361]: Revised fix for computing
-	indices of script arguments to [try].
-
-2010-03-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCmdMZ.c:      Make error message in "try" implementation
-	* generic/tclCompCmdsSZ.c: exactly the same as the one in "return"
-	* tests/error.test:
-	* libtommath/mtests/mpi.c: Single "const" addition
-
-2010-03-22  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	[Bug 2973361]: Compute the correct integer
-	values to identify the argument indices of the various script
-	arguments to [try]. Passing in -1 led to invalid memory reads.
-
-2010-03-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/exec.n: Make it a bit clearer that there is an option to run a
-	pipeline in the background.
-
-	* generic/tclIOCmd.c (Tcl_FcopyObjCmd):		Lift the restriction
-	* generic/tclIO.c (TclCopyChannel, CopyData):	on the [fcopy] command
-	* generic/tclIO.h (CopyState):			that forced it to only
-	copy up to 2GB per script-level callback. Now it is anything that can
-	fit in a (signed) 64-bit integer. Problem identified by Frederic
-	Bonnet on comp.lang.tcl. Note that individual low-level reads and
-	writes are still smaller as the optimal buffer size is smaller.
-
-2010-03-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/stub16.c:         Don't hide that we use the ASCII API here.
-	                        (does someone still use that?)
-	* win/tclWinPipe.c:     2 unnecessary type casts.
-
-2010-03-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmdsSZ.c (TclCompileThrowCmd): Added compilation for
-	the [throw] command.
-
-2010-03-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclListObj.c:	[Bug 2971669]: Prevent in overflow trouble in
-	* generic/tclTestObj.c:	ListObjReplace operations. Thanks to kbk for
-	* tests/listObj.test:	fix and test.
-
-2010-03-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmdsSZ.c (IssueTryFinallyInstructions):
-	[Bug 2971921]: Corrected jump so that it doesn't skip into the middle
-	of an instruction! Tightened the instruction issuing. Moved endCatch
-	calls closer to their point that they guard, ensuring correct ordering
-	of result values.
-
-2010-03-17  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORTrans.c (ReflectInput, ReflectOutput)
-	(ReflectSeekWide): [Bug 2921116]: Added missing TclEventuallyFree
-	calls for preserved ReflectedTransform* structures. Reworked
-	ReflectInput to preserve the structure for its whole life, not only in
-	InvokeTclMethod.
-
-	* generic/tclIO.c (Tcl_GetsObj): [Bug 2921116]: Regenerate topChan,
-	may have been changed by a self-modifying transformation.
-
-	* tests/ioTrans/test (iortrans-4.8, iortrans-4.9, iortrans-5.11)
-	(iortrans-7.4, iortrans-8.3): New test cases.
-
-2010-03-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* compat/zlib/*:	Upgrade zlib to version 1.2.4.
-	* win/makefile.vc:
-	* unix/Makefile.in:
-	* win/tclWinChan.c:	Don't cast away "const" without reason.
-
-2010-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/makefile.vc: [Bug 2967340]: Static build was failing.
-	* win/.cvsignore:
-
-2010-03-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclTest.c:	Remove unnecessary '&' decoration for
-	* generic/tclIOUtil.c:	function pointers
-	* win/tclWin32Dll.c:	Double declaration of TclNativeDupInternalRep
-	* unix/tclIOUtil.c:
-	* unix/dltest/.cvsignore: Ignore *.so here
-
-2010-03-09  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c: [Bug 2936225]: Thanks to Alexandre Ferrieux
-	* doc/refchan.n:    <ferrieux@users.sourceforge.net> for debugging and
-	* tests/ioCmd.test: fixing the problem. It is the write-side
-	equivalent to the bug fixed 2009-08-06.
-
-2010-03-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tzdata/America/Matamoros: New locale
-	* library/tzdata/America/Ojinaga: New locale
-	* library/tzdata/America/Santa_Isabel: New locale
-	* library/tzdata/America/Asuncion:
-	* library/tzdata/America/Tijuana:
-	* library/tzdata/Antarctica/Casey:
-	* library/tzdata/Antarctica/Davis:
-	* library/tzdata/Antarctica/Mawson:
-	* library/tzdata/Asia/Dhaka:
-	* library/tzdata/Pacific/Fiji:
-	Olson tzdata2010c.
-
-2010-03-07  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclTest.c:	  Test that tclOO stubs are present in stub
-				  library
-	* generic/tclOOMethod.c:  Applied missing part of [Patch 2961556]
-	* win/tclWinInt.h:	  Change all tclWinProcs signatures to use
-	* win/tclWin32Dll.c:	  TCHAR* in stead of WCHAR*. This is meant
-	* win/tclWinDde.c:	  as preparation to make [Enh 2965056]
-	* win/tclWinFCmd.c:	  possible at all.
-	* win/tclWinFile.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSock.c:
-
-2010-03-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclStubLib.c:	Remove presence of tclTomMathStubsPtr here.
-	* generic/tclTest.c:	Test that tommath stubs are present in stub
-				library.
-
-2010-03-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIORTrans.c (ForwardProc): [Bug 2964425]: When cleaning
-	the stables, it is sometimes necessary to do more than the minimum. In
-	this case, rationalizing the variables for a forwarded limit? method
-	required removing an extra Tcl_DecrRefCount too.
-
-	* generic/tclOO.h, generic/tclOOInt.h: [Patch 2961556]: Change TclOO
-	to use the same style of function typedefs as Tcl, as this is about
-	the last chance to get this right.
-
-	***POTENTIAL INCOMPATIBILITY***
-	Source code that uses function typedefs from TclOO will need to update
-	variables and argument definitions so that pointers to the function
-	values are used instead. Binary compatibility is not affected.
-
-	* generic/*.c, generic/tclInt.h, unix/*.c, macosx/*.c: Applied results
-	of doing a Code Audit. Principal changes:
-	  * Use do { ... } while (0) in macros
-	  * Avoid shadowing one local variable with another
-	  * Use clearer 'foo.bar++;' instead of '++foo.bar;' where result not
-	    required (i.e., semantically equivalent); clarity is increased
-	    because it is bar that is incremented, not foo.
-	  * Follow Engineering Manual rules on spacing and declarations
-
-2010-03-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (ObjectRenamedTrace): [Bug 2962664]: Add special
-	handling so that when the class of classes is deleted, so is the class
-	of objects. Immediately.
-
-	* generic/tclOOInt.h (ROOT_CLASS): Add new flag for specially marking
-	the root class. Simpler and more robust than the previous technique.
-
-2010-03-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclGetDate.y:    3 unnecessary MODULE_SCOPE
-	* generic/tclDate.c:       symbols
-	* generic/tclStubLib.c:    Split tommath stub lib
-	* generic/tclTomMathStubLib.c:  in separate file.
-	* win/makefile.bc:
-	* win/Makefile.in:
-	* win/makefile.vc:
-	* win/tcl.dsp:
-	* unix/Makefile.in:
-	* unix/tcl.m4:          Cygwin only gives warning
-	* unix/configure:       using -fvisibility=hidden
-	* compat/strncasecmp.c: A few more const's
-	* compat/strtod.c:
-	* compat/strtoul.c:
-
-2010-03-03  Andreas Kupries <andreask@activestate.com>
-
-	* doc/refchan.n: Followup to ChangeLog entry 2009-10-07
-	(generic/tclIORChan.c). Fixed the documentation to explain that errno
-	numbers are operating system dependent, and reworked the associated
-	example.
-
-2010-03-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:     [FRQ 2959069]: Support for -fvisibility=hidden
-	* unix/configure   (regenerated with autoconf-2.59)
-
-2010-03-01  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* unix/tclUnixSock.c: Refrain from a possibly lengthy reverse-DNS
-	lookup on 0.0.0.0 when calling [fconfigure -sockname] on an
-	universally-bound (default) server socket.
-
-	* generic/tclIndexObj.c: fix [AT 86258]: special-casing of empty
-	tables when generating error messages for [::tcl::prefix match].
-
-2010-02-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c: More additions of {TCL LOOKUP} error-code
-	generation to various subcommands of [info] as part of long-term
-	project to classify all Tcl's generated errors.
-
-2010-02-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclStubInit.c: [Bug 2959713]: Link error with gcc 4.1
-
-2010-02-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (StringFirstCmd, StringLastCmd): [Bug 2960021]:
-	Only search for the needle in the haystack when the needle isn't
-	larger than the haystack. Prevents an odd crash from sometimes
-	happening when things get mixed up (a common programming error).
-
-	* generic/tclMain.c (Tcl_Main): [Bug 801429]: Factor out the holding
-	of the client-installed main loop function into thread-specific data.
-
-	***POTENTIAL INCOMPATIBILITY***
-	Code that previously tried to set the main loop from another thread
-	will now fail. On the other hand, there is a fairly high probability
-	that such programs would have been failing before due to the lack of
-	any kind of inter-thread memory barriers guarding accesses to this
-	part of Tcl's state.
-
-2010-02-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c:   Split this file into two pieces to make it
-	* generic/tclCompCmdsSZ.c: easier to work with. It's still two very
-				   long files even after the split.
-
-2010-02-26  Reinhard Max  <max@suse.de>
-
-	* doc/safe.n: Name the installed file after the command it documents.
-	Use "Safe Tcl" instead of the "Safe Base", "Safe Tcl" mixture.
-
-2010-02-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/Makefile.in (NATIVE_TCLSH): Added this variable to allow for
-	better control of what tclsh to use for various scripts when doing
-	cross compiling. An imperfect solution, but works.
-
-	* unix/installManPage: Remap non-alphanumeric sequences in filenames
-	to single underscores (especially colons).
-
-2010-02-26  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/zlib.test: Add tests for [Bug 2818131] which was crashing with
-	mismatched zlib algorithms used in combination with gets. This issue
-	has been fixed by Andreas's last commit.
-
-2010-02-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclHash.c:	[FRQ 2958832]: Further speed-up of the
-	* generic/tclLiteral.c:	ouster-hash function.
-	* generic/tclObj.c:
-	* generic/tclCkalloc.c:	Eliminate various unnecessary (ClientData)
-	* generic/tclTest.c:	type casts.
-	* generic/tclTestObj.c:
-	* generic/tclTestProcBodyObj.c:
-	* unix/tclUnixTest.c:
-	* unix/tclUnixTime.c:
-	* unix/tclXtTest.c:
-
-2010-02-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (SetDictFromAny): Prevent the list<->dict
-	* generic/tclListObj.c (SetListFromAny): conversion code from taking
-	too many liberties. Stops loss of duplicate keys in some scenarios.
-	Many thanks to Jean-Claude Wippler for finding this.
-
-	* generic/tclExecute.c (TclExecuteByteCode): Reduce ifdef-fery and
-	size of activation record. More variables shared across instructions
-	than before.
-
-	* doc/socket.n: [Bug 2957688]: Clarified that [socket -server] works
-	with a command prefix. Extended example to show this in action.
-
-2010-02-22  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclZlib.c (ZlibTransformInput): [Bug 2762041]: Added a hack
-	to work around the general problem, early EOF recognition based on the
-	base-channel, instead of the data we have ready for reading in the
-	transform. Long-term we need a proper general fix (likely tracking EOF
-	on each level of the channel stack), with attendant complexity.
-	Furthermore, Z_BUF_ERROR can be ignored, and must be when feeding the
-	zlib code with single characters.
-
-2010-02-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclUnixPort.h:   Remove unnecessary EXTERN's, which already are
-	                        in the global stub table.
-	* unix/configure.in:    Use @EXEEXT@ in stead of @EXT_SUFFIX@
-	* unix/tcl.m4:
-	* unix/Makefile.in:     Use -DBUILD_tcl for CYGWIN
-	* unix/configure:       (regenerated)
-	* unix/dltest/pkg*.c:   Use EXTERN to control CYGWIN exported symbols
-	* generic/tclCmdMZ.c:   Remove some unnecessary type casts.
-	* generic/tclCompCmds.c:
-	* generic/tclTest.c:
-	* generic/tclUtil.c:
-
-2010-02-21  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/regexp.test: Add test cases back ported from Jacl regexp work.
-
-2010-02-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclDate.c:    Some more const tables.
-	* generic/tclGetDate.y:
-	* generic/regc_lex.c:
-	* generic/regerror.c:
-	* generic/tclStubLib.c:
-	* generic/tclBasic.c:   Fix [Bug 2954959] expr abs(0.0) is -0.0
-	* tests/expr.test:
-
-2010-02-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileStringLenCmd): Make [string length]
-	of a constant string be handled better (i.e., handle backslashes too).
-
-2010-02-19  Stuart Cassoff  <stwo@users.sourceforge.net>
-
-	* tcl.m4: Correct compiler/linker flags for threaded builds on
-	OpenBSD.
-	* configure: (regenerated).
-
-2010-02-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/installManPage: [Bug 2954638]: Correct behaviour of manual page
-	installer. Also added armouring to check that assumptions about the
-	initial state are actually valid (e.g., look for existing input file).
-
-2010-02-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclHash.c (HashStringKey):	Restore these hash functions
-	* generic/tclLiteral.c (HashString):	to use the classic algorithm.
-	* generic/tclObj.c (TclHashObjKey):	Community felt normal case
-	speed to be more important than resistance to malicious cases. For
-	now, hashes that need to deal with the malicious case can use a custom
-	hash table and install their own hash function, though that is not
-	functionality exposed to the script level.
-
-	* generic/tclCompCmds.c (TclCompileDictUpdateCmd): Stack depth must be
-	correctly described when compiling a body to prevent crashes in some
-	debugging modes.
-
-2010-02-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h: Change order of various struct members,
-	fixing potential binary incompatibility with Tcl 8.5
-
-2010-02-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/configure.in, generic/tclIOUtil.c (Tcl_Stat): Updated so that
-	we do not assume that all unix systems have the POSIX blkcnt_t type,
-	since OpenBSD apparently does not.
-
-	* generic/tclLiteral.c (HashString): Missed updating to FNV in one
-	place; the literal table (a copy of the hash table code...)
-
-2010-02-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl:   Reverted earlier rename from tcl*Stubs to
-	* generic/tclBasic.c:   tcl*ConstStubs, it's not necessary at all.
-	* generic/tclOO.c:
-	* generic/tclTomMathInterface.c:
-	* generic/tclStubInit.c: (regenerated)
-	* generic/tclOOStubInit.c: (regenerated)
-	* generic/tclEnsemble.c:Fix signed-unsigned mismatch
-	* win/tclWinInt.h:      make tclWinProcs "const"
-	* win/tclWin32Dll.c:
-	* win/tclWinFCmd.c:     Eliminate all internal Tcl_WinUtfToTChar
-	* win/tclWinFile.c:     and Tcl_WinTCharToUtf calls, needed
-	* win/tclWinInit.c:     for mslu support.
-	* win/tclWinLoad.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c:
-	* win/.cvsignore:
-	* compat/unicows/readme.txt:  [FRQ 2819611]: Add first part of MSLU
-	* compat/unicows/license.txt: support.
-	* compat/unicows/unicows.lib:
-
-2010-02-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (AllocObject, SquelchedNsFirst, ObjectRenamedTrace):
-	* generic/tclNamesp.c (Tcl_DeleteNamespace): [Bug 2950259]: Revised
-	the namespace deletion code to provide an additional internal callback
-	that gets triggered early enough in namespace deletion to allow TclOO
-	destructors to run sanely. Adjusted TclOO to take advantage of this,
-	so making tearing down an object by killing its namespace appear to
-	work seamlessly, which is needed for Itcl. (Note that this is not a
-	feature that will ever be backported to 8.5, and it remains not a
-	recommended way of deleting an object.)
-
-2010-02-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Divided the [switch]
-	compiler into three pieces (after the model of [try]): a parser, an
-	instruction-issuer for chained tests, and an instruction-issuer for
-	jump tables.
-
-	* generic/tclEnsemble.c: Split the ensemble engine out into its own
-	file rather than keeping it mashed together with the namespace code.
-
-2010-02-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tcl.m4:		Use -pipe for gcc on win32
-	* win/configure:	(mingw/cygwin) (regenerated)
-	* win/.cvsignore:	Add .lib, .exp and .res here
-
-2010-02-11  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/list.test: Add tests for explicit \0 in a string argument to
-	the list command.
-
-2010-02-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIOCmd.c (Tcl_OpenObjCmd): [Bug 2949740]: Make sure that
-	we do not try to put a NULL pipeline channel into binary mode.
-
-2010-02-11  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	[Bug 2826551, Patch 2948425]: Assorted regexp bugs related to -all,
-	-line and -start options and newlines.
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd): If -offset is given, treat it
-	as the start of the line if the previous character was a newline. Fix
-	nasty edge case where a zero length match would not advance the index.
-	* tests/regexp.test: Add regression tests back ported from Jacl.
-	Checks for a number of issues related to -line and newline handling. A
-	few of tests were broken before the patch and continue to be broken,
-	marked as knownBug.
-
-2010-02-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (ObjectRenamedTrace): [Bug 2949397]: Prevent
-	destructors from running on the two core class objects when the whole
-	interpreter is being destroyed.
-
-2010-02-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileTryCmd, IssueTryInstructions)
-	(IssueTryFinallyInstructions): Added compiler for the [try] command.
-	It is split into three pieces that handle the parsing of the tokens,
-	the issuing of instructions for finally-free [try], and the issuing of
-	instructions for [try] with finally; there are enough differences
-	between the all cases that it was easier to split the code rather than
-	have a single function do the whole thing.
-
-2010-02-09  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tools/genStubs.tcl: Remove dependency on 8.5+ idiom "in" in
-	expressions.
-
-2010-02-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (Tcl_ZlibDeflate, Tcl_ZlibInflate): [Bug 2947783]:
-	Make sure that the result is an unshared object before appending to it
-	so that nothing crashes if it is shared (use in Tcl code was not
-	affected by this, but use from C was an issue).
-
-2010-02-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclHash.c (HashStringKey):	Replace Tcl's crusty old hash
-	* generic/tclObj.c (TclHashObjKey):	function with the algorithm
-	due to Fowler, Noll and Vo. This is slightly faster (assuming the
-	presence of hardware multiply) and has somewhat better distribution
-	properties of the resulting hash values. Note that we only ever used
-	the 32-bit version of the FNV algorithm; Tcl's core hash engine
-	assumes that hash values are simple unsigned ints.
-
-	***POTENTIAL INCOMPATIBILITY***
-	Code that depends on hash iteration order (especially tests) may well
-	be disrupted by this. Where a definite order is required, the fix is
-	usually to just sort the results after extracting them from the hash.
-	Where this is insufficient, the code that has ceased working was
-	always wrong and was only working by chance.
-
-2010-02-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileErrorCmd): Added compilation of the
-	[error] command. No new bytecodes.
-
-2010-02-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl:	Follow-up to earlier commit today:
-	          Eliminate the need for an extra Stubs Pointer for adressing
-	          a static stub table: Just change the exported table from
-	          static to MODULE_SCOPE.
-	* generic/tclBasic.c
-	* generic/tclOO.c
-	* generic/tclTomMathInterface.c
-	* generic/tcl*Decls.h (regenerated)
-	* generic/tclStubInit.c (regenerated)
-	* generic/tclOOStubInit.c (regenerated)
-	* generic/tclTest.c (minor formatting)
-
-2010-02-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclVar.c: More consistency in errorcode generation.
-
-	* generic/tclOOBasic.c (TclOO_Object_Destroy): Rewrote to be NRE-aware
-	when calling destructors. Note that there is no guarantee that
-	destructors will always be called in an NRE context; that's a feature
-	of the 'destroy' method only.
-
-	* generic/tclEncoding.c: Add 'const' to many function-internal vars
-	that are never pointing to things that are written to.
-
-2010-02-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl:	Follow-up to [2010-01-29] commit:
-		prevent space within stub table function parameters if the
-		parameter type is a pointer.
-	* win/tclWinInt.h:	Minor Formatting
-	* generic/tcl.h:	VOID -> void and other formatting
-	* generic/tclInt.h:	Minor formatting
-	* generic/tclInt.decls: Change signature of TclNRInterpProcCore,
-	* generic/tclOO.decls:	and TclOONewProc(Instance|)MethodEx,
-	* generic/tclProc.c:	indicating that errorProc is a function,
-	* generic/tclOOMethod.c:pointer, and other formatting
-	* generic/tcl*Decls.h:	(regenerated)
-	* generic/tclVar.c:	gcc warning(line 3703): 'pattern' may be used
-				uninitialized in this function
-				gcc warning(line 3788): 'matched' may be used
-				uninitialized in this function
-
-2010-02-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclVar.c: Added more use of error-codes and reduced the
-	stack overhead of older interfaces.
-	(ArrayGetCmd): Stop silly crash when using a trivial pattern due to
-	error in conversion to ensemble.
-	(ArrayNamesCmd): Use the object RE interface for faster matching.
-
-2010-02-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclVar.c (ArrayUnsetCmd): More corrections.
-
-2010-02-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclVar.c: Turned the [array] command into a true ensemble.
-
-	* generic/tclOO.c (AllocObject, MyDeleted): A slightly faster way to
-	handle the deletion of [my] is with a standard delete callback. This
-	is because it doesn't require an additional memory allocation during
-	object creation. Also reduced the amount of string manipulation
-	performed during object creation to further streamline memory
-	handling; this is not backported to the 8.5 package as it breaks a
-	number of abstractions.
-
-	* generic/tclOOBasic.c (TclOO_Object_Destroy): [Bug 2944404]: Do not
-	crash when a destructor deletes the object that is executing that
-	destructor.
-
-2010-02-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclVar.c (Tcl_ArrayObjCmd): [Bug 2939073]: Stop the [array
-	unset] command from having dangling pointer problems when an unset
-	trace deletes the element that is going to be processed next. Many
-	thanks to Alexandre Ferrieux for the bulk of this fix.
-
-	* generic/regexec.c (ccondissect, crevdissect): [Bug 2942697]: Rework
-	these functions so that certain pathological patterns are matched much
-	more rapidly. Many thanks to Tom Lane for dianosing this issue and
-	providing an initial patch.
-
-2010-01-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompile.c (tclInstructionTable):	Bytecode instructions
-	* generic/tclCompCmds.c (TclCompileUnsetCmd):	to allow the [unset]
-	* generic/tclExecute.c (TclExecuteByteCode):	command to be compiled
-	with the compiler being a complete compilation for all compile-time
-	decidable uses.
-
-	* generic/tclVar.c (TclPtrUnsetVar): Var reference version of the code
-	to unset a variable. Required for INST_UNSET bytecodes.
-
-2010-01-29  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h: [Bug 2942081]: Reverted Tcl_ThreadDataKey type change
-				Changed some Tcl_CallFrame fields from "char *"
-				to "void *". This saves unnecessary space on
-				Cray's (and it's simply more correct).
-
-	* tools/genStubs.tcl:	No longer generate a space after "*" and
-				immediately after a function name, so the
-				format of function definitions in tcl*Decls.h
-				match all other tcl*.h header files.
-	* doc/ParseArgs.3:	Change Tcl_ArgvFuncProc, Tcl_ArgvGenFuncProc
-	* generic/tcl.h:	and GetFrameInfoValueProc to be function
-	* generic/tclInt.h:	definitions, not pointers, for consistency
-	* generic/tclOOInt.h:	with all other Tcl function definitions.
-	* generic/tclIndexObj.c:
-	* generic/regguts.h:	CONST -> const
-	* generic/tcl.decls:	Formatting
-	* generic/tclTomMath.decls: Formatting
-	* generic/tclDecls.h:	(regenerated)
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclOODecls.h:
-	* generic/tclOOIntDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclTomMathDecls.h:
-
-2010-01-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOBasic.c (TclOO_Object_Destroy): Move the execution of
-	destructors to a point where they can produce an error. This will not
-	work for all destructors, but it does mean that more failing calls of
-	them will be caught.
-	* generic/tclOO.c (AllocObject, MyDeletedTrace, ObjectRenamedTrace):
-	(ObjectNamespaceDeleted): Stop various ways of getting at commands
-	with dangling pointers to the object. Also increases the reliability
-	of calling of destructors (though most destructors won't benefit; when
-	an object is deleted namespace-first, its destructors are not run in a
-	nice state as the namespace is partially gone).
-
-2010-01-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclOOStubInit.c:   Remove double includes (which causes a
-	* generic/tclOOStubLib.c:    warning in CYGWIN compiles)
-	* unix/.cvsignore:	     add confdefs.h
-
-2010-01-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/proc.n: [Bug 1970629]: Define a bit better what the current
-	namespace of a procedure is.
-
-2010-01-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls:	     Don't use DWORD and HANDLE here.
-	* generic/tclIntPlatDecls.h:
-	* generic/tcl.h:	     Revert [2009-12-21] change, instead
-	* generic/tclPort.h:	     resolve the CYGWIN inclusion problems by
-	* win/tclWinPort.h:	     re-arranging the inclusions at other
-				     places.
-	* win/tclWinError.c
-	* win/tclWinPipe.c
-	* win/tcl.m4:		     Make cygwin configuration error into
-	* win/configure.in:	     a warning: CYGWIN compilation works
-	* win/configure:	     although there still are test failures.
-
-2010-01-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Improve error code
-	generation from some of the tailcall-related bits of TEBC.
-
-2010-01-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.h: [Bug 2910748]: NRE-enable direct eval on BC
-	* generic/tclExecute.c: spoilage.
-	* tests/nre.test:
-
-2010-01-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/dict.n: [Bug 2929546]: Clarify just what [dict with] and [dict
-	update] are doing with variables.
-
-2010-01-18  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (CreateScriptRecord): [Bug 2918110]: Initialize
-	the EventScriptRecord (esPtr) fully before handing it to
-	Tcl_CreateChannelHandler for registration. Otherwise a reflected
-	channel calling 'chan postevent' (== Tcl_NotifyChannel) in its
-	'watchProc' will cause the function 'TclChannelEventScriptInvoker'
-	to be run on an uninitialized structure.
-
-2010-01-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclStringObj.c (Tcl_AppendFormatToObj): [Bug 2932421]: Stop
-	the [format] command from causing argument objects to change their
-	internal representation when not needed. Thanks to Alexandre Ferrieux
-	for this fix.
-
-2010-01-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl:	  More factoring out of special cases
-	* tools/tcltk-man2html-utils.tcl: so that they are described outside
-	the engine file. Now there is only one real set of special cases in
-	there, to handle the .SO/.OP/.SE directives.
-
-2010-01-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:      Fix TCL_LL_MODIFIER for Cygwin
-	* generic/tclEnv.c:   Fix CYGWIN compilation problems,
-	* generic/tclInt.h:   and remove some unnecessary
-	* generic/tclPort.h:  double includes.
-	* generic/tclPlatDecls.h:
-	* win/cat.c:
-	* win/tclWinConsole.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c:
-	* win/tclWinThrd.c:
-	* win/tclWinPort.h:   Put win32 includes first
-	* unix/tclUnixChan.c: Forgot one CONST change
-
-2010-01-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl: Make the generation of the list of things
-	to process the docs from simpler and more flexible. Also factored out
-	the lists of special cases.
-
-2010-01-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c:      VC++ 6.0 doesn't have
-	* win/tclWinReg.c:      PDWORD_PTR
-	* win/tclWinThrd.c:     Fix various minor gcc warnings.
-	* win/tclWinTime.c:
-	* win/tclWinConsole.c:  Put channel type definitions
-	* win/tclWinChan.c:     in static const memory
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c:
-	* win/tclWinSock.c:
-	* generic/tclIOGT.c:
-	* generic/tclIORChan.c:
-	* generic/tclIORTrans.c:
-	* unix/tclUnixChan.c:
-	* unix/tclUnixPipe.c:
-	* unix/tclUnixSock.c:
-	* unix/configure:       (regenerated with autoconf 2.59)
-	* tests/info.test:      Make test independant from
-	                        tcltest implementation.
-
-2010-01-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/namespace.test (namespace-51.17): [Bug 2898722]: Demonstrate
-	that there are still bugs in the handling of resolution epochs. This
-	bug is not yet fixed.
-
-	* tools/tcltk-man2html.tcl:	  Split the man->html converter into
-	* tools/tcltk-man2html-utils.tcl: two pieces for easier maintenance.
-	Also made it much less verbose in its printed messages by default.
-
-2010-01-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl: Added basic support for building the docs
-	for contributed packages into the HTML versions. Prompted by question
-	on Tcler's Chat by Tom Krehbiel. Note that there remain problems in
-	the documentation generated due to errors in the contributed docs.
-
-2010-01-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c (TclPathPart):   [Bug 2918610]: Correct
-	* tests/fileName.test (filename-14.31): inconsistency between the
-	string rep and the intrep of a path value created by [file rootname].
-	Thanks to Vitaly Magerya for reporting.
-
-2010-01-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): [Bug 1636685]: Use the configuration
-	for modern FreeBSD suggested by the FreeBSD porter.
-
-2010-01-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	[Bug 2724403]: Fix leak of coroutines on
-	* generic/tclCompile.h: namespace deletion. Added a test for this
-	* generic/tclNamesp.c:	leak, and also a test for leaks on namespace
-	* tests/coroutine.test: deletion.
-	* tests/namespace.test:
-
-2009-12-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/safe.tcl (AliasSource): [Bug 2923613]: Make the safer
-	* tests/safe.test (safe-8.9):	  [source] handle a [return] at the
-					  end of the file correctly.
-
-2009-12-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* library/init.tcl (unknown): [Bug 2824981]: Fix infinite recursion of
-	::unknown when [set] is undefined.
-
-2009-12-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclHistory.c (Tcl_RecordAndEvalObj): Reduce the amount of
-	allocation and deallocation of memory by caching objects in the
-	interpreter assocData table.
-
-	* generic/tclObj.c (Tcl_GetCommandFromObj): Rewrite the logic so that
-	it does not require making assignments part way through an 'if'
-	condition, which was deeply unclear.
-
-	* generic/tclInterp.c (Tcl_MakeSafe): [Bug 2895741]: Make sure that
-	the min() and max() functions are supported in safe interpreters.
-
-2009-12-29  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tclBinary.c:	[Bug 2922555]: Handle completely invalid input
-	* tests/binary.test:	to the decode methods.
-
-2009-12-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/Makefile.in (trace-shell, trace-test): [FRQ 1083288]: Added
-	targets to allow easier tracing of shell and test invocations.
-
-	* unix/configure.in: [Bug 942170]:	Detect the st_blocks field of
-	* generic/tclCmdAH.c (StoreStatData):	'struct stat' correctly.
-	* generic/tclFileName.c (Tcl_GetBlocksFromStat):
-	* generic/tclIOUtil.c (Tcl_Stat):
-
-	* generic/tclInterp.c (TimeLimitCallback): [Bug 2891362]: Ensure that
-	* tests/interp.test (interp-34.13):	   the granularity ticker is
-	reset when we check limits because of the time limit event firing.
-
-2009-12-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/namespace.n (SCOPED SCRIPTS): [Bug 2921538]: Updated example to
-	not be quite so ancient.
-
-2009-12-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCmdMZ.c:      CONST -> const
-	* generic/tclParse.c
-
-2009-12-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/safe.tcl (AliasSource, AliasExeName): [Bug 2913625]: Stop
-	information about paths from leaking through [info script] and [info
-	nameofexecutable].
-
-2009-12-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4:		Install libtcl8.6.dll in bin directory
-	* unix/Makefile.in:
-	* unix/configure:	(regenerated)
-
-2009-12-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): [Bug 2918962]: Stop crash when
-	-index and -stride are used together.
-
-2009-12-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclThreadStorage.c: Fix gcc warning, using gcc-4.3.4 on
-				      cygwin: missing initializer
-	* generic/tclOOInt.h:	      Prevent conflict with DUPLICATE
-				      definition in WINAPI's nb30.h
-	* generic/rege_dfa.c:	      Fix macro conflict on CYGWIN: don't use
-				      "small".
-	* generic/tcl.h:	      Include <winsock2.h> before <stdio.h> on
-				      CYGWIN
-	* generic/tclPathObj.c
-	* generic/tclPort.h
-	* tests/env.test:	      Don't unset WINDIR and TERM, it has a
-				      special meaning on CYGWIN (both in UNIX
-				      and WIN32 mode!)
-	* generic/tclPlatDecls.h:     Include <tchar.h> through tclPlatDecls.h
-	* win/tclWinPort.h:	      stricmp -> strcasecmp
-	* win/tclWinDde.c:	      _wcsicmp -> wcscasecmp
-	* win/tclWinFile.c
-	* win/tclWinPipe.c
-	* win/tclWinSock.c
-	* unix/tcl.m4:		      Add dynamic loading support to CYGWIN
-	* unix/configure (regenerated)
-	* unix/Makefile.in
-
-2009-12-19  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	[Bug 2917627]: Fix for bad cmd resolution by
-	* tests/coroutine.test:	coroutines. Thanks to schelte for finding it.
-
-2009-12-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/safe.tcl (::safe::AliasGlob): Upgrade to correctly support a
-	larger fraction of [glob] functionality, while being stricter about
-	directory management.
-
-2009-12-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclTest.c:	Fix gcc warning: ignoring return value of
-	* unix/tclUnixNotify.c:	"write", declared with attribute
-	* unix/tclUnixPipe.c:	warn_unused_result.
-	* generic/tclInt.decls:	CONSTify functions TclpGetUserHome and
-	* generic/tclIntDecls.h:TclSetPreInitScript (TIP #27)
-	* generic/tclInterp.c:
-	* win/tclWinFile.c:
-	* unix/tclUnixFile.c:
-
-2009-12-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/tm.n: [Bug 1911342]: Formatting rewrite to avoid bogus crosslink
-	to the list manpage when generating HTML.
-
-	* library/msgcat/msgcat.tcl (Init): [Bug 2913616]: Do not use platform
-	tests that are not needed and which don't work in safe interpreters.
-
-2009-12-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/file.n (file tempfile): [Bug 2388866]: Note that this only ever
-	creates files on the native filesystem. This is a design feature.
-
-2009-12-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	Release TclPopCallFrame() from its
-	* generic/tclExecute.c:	tailcall-management duties
-	* generic/tclNamesp.c:
-
-	* generic/tclBasic.c:	Moving TclBCArgumentRelease call from
-	* generic/tclExecute.c:	TclNRTailcallObjCmd to TEBC, so that the
-	pairing of the Enter and Release calls is clearer.
-
-2009-12-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclTest.c (TestconcatobjCmd): [Bug 2895367]: Stop memory
-	leak when testing. We don't need extra noise of this sort when
-	tracking down real problems!
-
-2009-12-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclBinary.c:	Fix gcc warning, using gcc-4.3.4 on cygwin
-	* generic/tclCompExpr.c:warning: array subscript has type 'char'
-	* generic/tclPkg.c:
-	* libtommath/bn_mp_read_radix.c:
-	* win/makefile.vc:	[Bug 2912773]: Revert to version 1.203
-	* unix/tclUnixCompat.c:	Fix gcc warning: signed and unsigned type
-				in conditional expression.
-
-2009-12-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl (long-toc, cross-reference): [FRQ 2897296]:
-	Added cross links to sections within manual pages.
-
-2009-12-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   [Bug 2806407]: Full nre-enabling of coroutines
-	* generic/tclExecute.c:
-
-	* generic/tclBasic.c: Small cleanup
-
-	* generic/tclExecute.c: Fix panic in http11.test caused by buggy
-	earlier commits in coroutine management.
-
-2009-12-10  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclObj.c (TclContinuationsEnter): [Bug 2895323]: Updated
-	comments to describe when the function can be entered for the same
-	Tcl_Obj* multiple times. This is a continuation of the 2009-11-10
-	entry where a memory leak was plugged, but where not sure if that was
-	just a band-aid to paper over some other error. It isn't, this is a
-	legal situation.
-
-2009-12-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   Reducing the # of moving parts for coroutines
-	* generic/tclExecute.c: by delegating more to tebc; eliminate the
-	special coroutine CallFrame.
-
-2009-12-09  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c: [Bug 2901998]: Applied Alexandre Ferrieux's patch
-	fixing the inconsistent buffered I/O. Tcl's I/O now flushes buffered
-	output before reading, discards buffered input before writing, etc.
-
-2009-12-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: Ensure right lifetime of varFrame's (objc,objv)
-	for coroutines.
-
-	* generic/tclExecute.c: Code regrouping
-
-2009-12-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c: Added some of the missing setting of errorcode
-	values.
-
-2009-12-08  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TclStackFree): Improved panic msg.
-
-2009-12-08  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   Partial nre-enabling of coroutines. The
-	* generic/tclExecute.c: initial call still requires its own
-	* generic/tclInt.h:     instance of tebc, but on resume coros can
-	execute in the caller's tebc.
-
-	* generic/tclExecute.c (TEBC): Silence warning about pcAdjustment.
-
-2009-12-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Make the dict opcodes
-	more sparing in their use of C variables, to reduce size of TEBC
-	activiation record a little bit.
-
-2009-12-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TEBC): Grouping "slow" variables into structs,
-	to reduce register pressure and help the compiler with variable
-	allocation.
-
-2009-12-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Start cleaning the TEBC stables
-	* generic/tclInt.h:
-
-	* generic/tclCmdIL.c:   [Bug 2910094]: Fix by aku
-	* tests/coroutine.test:
-
-	* generic/tclBasic.c: Arrange for [tailcall] to be created with the
-	other builtins: was being created in a separate call, leftover from
-	pre-tip days.
-
-2009-12-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStrToD.c: [Bug 2902010]: Correct conditional compile
-	directives to better detect the toolchain that needs extra work for
-	proper underflow treatment instead of merely detecting the MIPS
-	platform.
-
-2009-12-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: [Patch 2910056]: Add ::tcl::unsupported::yieldTo
-	* generic/tclInt.h:
-
-2009-12-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (TryPostBody): [Bug 2910044]: Close off memory
-	leak in [try] when a variable-free handler clause is present.
-
-2009-12-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   Small changes for clarity in tailcall
-	* generic/tclExecute.c: and coroutine code.
-	* tests/coroutine.test:
-
-	* tests/tailcall.test: Remove some old unused crud; improved the
-	stack depth tests.
-
-	* generic/tclBasic.c:  Fixed things so that you can tailcall
-	* generic/tclNamesp.c: properly out of a coroutine.
-	* tests/tailcall.test:
-
-	* generic/tclInterp.c: Fixed tailcalls for same-interp aliases (no
-	test)
-
-2009-12-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/safe.tcl (::safe::AliasEncoding): Make the safe encoding
-	command behave more closely like the unsafe one (for safe ops).
-	(::safe::AliasGlob): [Bug 2906841]: Clamp down on evil use of [glob]
-	in safe interpreters.
-	* tests/safe.test: Rewrite to use tcltest2 better.
-
-2009-12-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* tools/genStubs.tcl:	Add support for win32 CALLBACK functions and
-	remove obsolete "emitStubs" and "genStubs" functions.
-	* win/Makefile.in:	Use tcltest86.dll for all tests, and add
-	.PHONY rules to preemptively stop trouble that plagued Tk from hitting
-	Tcl too.
-
-2009-11-30  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:	Don't use EXPORT for Tcl_InitStubs
-	* win/Makefile.in:	Better dependancies in case of static build.
-
-2009-11-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/Tcl.n: [Bug 2901433]: Improved description of expansion to
-	mention that it is using list syntax.
-
-2009-11-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclAppInit.c (Tcl_AppInit): [Bug 2902965]: Reverted Jan's change
-	that added a call to Tcl_InitStubs. The 'tclsh' and 'tcltest' programs
-	are providers, not consumers of the Stubs table, and should not link
-	with the Stubs library, but only with the main Tcl library. (In any
-	case, the presence of Tcl_InitStubs broke the build.)
-
-2009-11-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/BoolObj.3, doc/Class.3, doc/CrtChannel.3, doc/DictObj.3:
-	* doc/DoubleObj.3, doc/Ensemble.3, doc/Environment.3:
-	* doc/FileSystem.3, doc/Hash.3, doc/IntObj.3, doc/Limit.3:
-	* doc/Method.3, doc/NRE.3, doc/ObjectType.3, doc/PkgRequire.3:
-	* doc/SetChanErr.3, doc/SetResult.3: [Patch 2903921]: Many small
-	spelling fixes from Larry Virden.
-
-	BUMP VERSION OF TCLOO TO 0.6.2. Too many people need accumulated small
-	versions and bugfixes, so the version-bump removes confusion.
-
-	* generic/tclOOBasic.c (TclOO_Object_LinkVar): [Bug 2903811]: Remove
-	unneeded restrictions on who can usefully call this method.
-
-2009-11-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/Makefile.in: Add .PHONY rules and documentation to preemptively
-	stop trouble that plagued Tk from hitting Tcl too, and to make the
-	overall makefile easier to understand. Some reorganization too to move
-	related rules closer together.
-
-2009-11-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in:	[Bug 2902965]: Fix stub related changes that
-	* win/makefile.vc:	caused tclkit build to break.
-	* win/tclAppInit.c
-	* unix/tcl.m4
-	* unix/Makefile.in
-	* unix/tclAppInit.c
-	* unix/configure:	(regenerated)
-
-2009-11-25  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/Makefile.in:	Added a 'test-tcl' rule that is identical to
-	'test' except that it does not go spelunking in 'pkgs/'. (This rule
-	has existed in unix/Makefile.in for some time.)
-
-2009-11-25  Stuart Cassoff  <stwo@users.sf.net>
-
-	* unix/configure.in:	[Patch 2892871]: Remove unneeded
-	* unix/tcl.m4:		AC_STRUCT_TIMEZONE and use
-	* unix/tclConfig.h.in:	AC_CHECK_MEMBERS([struct stat.st_blksize])
-	* unix/tclUnixFCmd.c:	instead of AC_STRUCT_ST_BLKSIZE.
-	* unix/configure:	Regenerated with autoconf-2.59.
-
-2009-11-24  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tclIndex: Manually redone the part of tclIndex dealing with
-	safe.tcl and tm.tcl. This part passes the testsuite. Note that
-	automatic regeneration of this part is not possible because it wrongly
-	puts 'safe::Setup' on the list, and wrongly leaves out 'safe::Log'
-	which is more dynamically created than the generator expects.
-
-	Further note that the file "clock.tcl" is explicitly loaded by
-	"init.tcl", the first time the clock command is invoked. The relevant
-	code can be found at line 172ff, roughly, the definition of the
-	procedure 'clock'. This means none of the procedures of this file
-	belong in the tclIndex. Another indicator that automatic regeneration
-	of tclIndex is ill-advised.
-
-2009-11-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (FinalizeAlloc, Tcl_NewObjectInstance):
-	[Bug 2903011]: Make it an error to destroy an object in a constructor,
-	and also make sure that an object is not deleted twice in the error
-	case.
-
-2009-11-24  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/fCmd.test: [Bug 2893771]: Teach [file stat] to handle locked
-	* win/tclWinFile.c: files so that [file exists] no longer lies.
-
-2009-11-23  Kevin Kenny  <kennykb@acm.org>
-
-	* tests/fCmd.test (fCmd-30.1): Changed registry location of the 'My
-	Documents' folder to the one that's correct for Windows 2000, XP,
-	Server 2003, Vista, Server 2008, and Windows 7. (See
-	http://support.microsoft.com/kb/310746)
-
-2009-11-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWinDde.c:	#undef STATIC_BUILD, in order to make sure
-	* win/tclWinReg.c:	that Xxxxx_Init is always exported even when
-	* generic/tclTest.c:	Tcl is built static (otherwise we cannot
-				create a DLL).
-	* generic/tclThreadTest.c: Make all functions static, except
-				TclThread_Init.
-	* tests/fCmd.test:	Enable fCmd-30.1 when registry is available.
-	* win/tcl.m4:		Fix ${SHLIB_LD_LIBS} definition, fix conflicts
-	* win/Makefile.in:	Simplifications related to tcl.m4 changes.
-	* win/configure.in:	Between static libraries and import library on
-				windows.
-	* win/configure:	(regenerated)
-	* win/makefile.vc:	Add stub library to necessary link lines.
-
-2009-11-23  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclThreadTest.c (NewTestThread): [Bug 2901803]: Further
-	machinations to get NewTestThread actually to launch the thread, not
-	just compile.
-
-2009-11-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclThreadTest.c (NewTestThread): [Bug 2901803]: Fix small
-	error in function naming which blocked a threaded test build.
-
-2009-11-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in:	Create tcltest86.dll as dynamic Tcltest
-				package.
-	* generic/tclTest.c:	Remove extraneous prototypes, follow-up to
-	* generic/tclTestObj.c:	[Bug 2883850]
-	* tests/chanio.test:	Test-cases for fixed [Bug 2849797]
-	* tests/io.test:
-	* tests/safe.test:	Fix safe-10.1 and safe-10.4 test cases, making
-				the wrong assumption that Tcltest is a static
-				package.
-	* generic/tclEncoding.c:[Bug 2857044]: Updated freeIntRepProc routines
-	* generic/tclVar.c:	so that they set the typePtr field to NULL so
-				that the Tcl_Obj is not left in an
-				inconsistent state.
-	* unix/tcl.m4:		[Patch 2883533]: tcl.m4 support for Haiku OS
-	* unix/configure:	autoconf-2.59
-
-2009-11-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/tclAppInit.c:	[Bug 2883850, 2900542]: Repair broken build of
-	* win/tclAppInit.c:	the tcltest executable.
-
-2009-11-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/auto.tcl (tcl_findLibrary):
-	* library/clock.tcl (MakeUniquePrefixRegexp, MakeParseCodeFromFields)
-	(SetupTimeZone, ProcessPosixTimeZone):	Restored the use of a literal
-	* library/history.tcl (HistAdd):	'then' when following a multi-
-	* library/safe.tcl (interpConfigure):	line test expresssion. It's an
-	* library/tm.tcl (UnknownHandler):	aid to readability then.
-
-2009-11-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h:      Make all internal initialization
-	* generic/tclTest.c:     routines MODULE_SCOPE
-	* generic/tclTestObj.c:
-	* generic/tclTestProcBodyObj.c:
-	* generic/tclThreadTest.c:
-	* unix/Makefile.in:      Fix [Bug 2883850]: pkgIndex.tcl doesn't
-	* unix/tclAppInit.c:     get created with static Tcl build
-	* unix/tclXtTest.c:
-	* unix/tclXtNotify.c:
-	* unix/tclUnixTest.c:
-	* win/Makefile.in:
-	* win/tcl.m4:
-	* win/configure:         (regenerated)
-	* win/tclAppInit.c:
-	* win/tclWinDde.c:       Always compile with Stubs.
-	* win/tclWinReg.c:
-	* win/tclWinTest.c:
-
-2009-11-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/CrtChannel.3:	[Bug 2849797]: Fix channel name inconsistences
-	* generic/tclIORChan.c:	as suggested by DKF.
-	* generic/tclIO.c:	Minor *** POTENTIAL INCOMPATIBILITY ***
-				because Tcl_CreateChannel() and derivatives
-				now sometimes ignore their "chanName"
-				argument.
-
-	* generic/tclAsync.c:	Eliminate various gcc warnings (with -Wextra)
-	* generic/tclBasic.c
-	* generic/tclBinary.c
-	* generic/tclCmdAH.c
-	* generic/tclCmdIL.c
-	* generic/tclCmdMZ.c
-	* generic/tclCompile.c
-	* generic/tclDate.c
-	* generic/tclExecute.c
-	* generic/tclDictObj.c
-	* generic/tclIndexObj.c
-	* generic/tclIOCmd.c
-	* generic/tclIOUtil.c
-	* generic/tclIORTrans.c
-	* generic/tclOO.c
-	* generic/tclZlib.c
-	* generic/tclGetDate.y
-	* win/tclWinInit.c
-	* win/tclWinChan.c
-	* win/tclWinConsole.c
-	* win/tclWinNotify.c
-	* win/tclWinReg.c
-	* library/auto.tcl:		Eliminate "then" keyword
-	* library/clock.tcl
-	* library/history.tcl
-	* library/safe.tcl
-	* library/tm.tcl
-	* library/http/http.tcl:	Eliminate unnecessary spaces
-	* library/http1.0/http.tcl
-	* library/msgcat/msgcat.tcl
-	* library/opt/optparse.tcl
-	* library/platform/platform.tcl
-	* tools/tcltk-man2html.tcl
-	* tools/tclZIC.tcl
-	* tools/tsdPerf.c
-
-2009-11-17  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/tclUnixChan.c (TtyParseMode): Partial undo of Donal's tidy-up
-	from a few days ago (2009-11-9, not in ChangeLog). It seems that
-	strchr is apparently a macro on AIX and reacts badly to preprocessor
-	directives in its arguments.
-
-2009-11-16  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclEncoding.c:  [Bug 2891556]: Fix and improve test to
-	* generic/tclTest.c:	  detect similar manifestations in the future.
-	* tests/encoding.test:    Add tcltest support for finalization.
-
-2009-11-15  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWinDde.c: Avoid gcc compiler warning by explicitly casting
-	DdeCreateStringHandle argument.
-
-2009-11-12  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (CopyData): [Bug 2895565]: Dropped bogosity which
-	* tests/io.test: used the number of _written_ bytes or character to
-	update the counters for the read bytes/characters. New test io-53.11.
-	This is a forward port from the 8.5 branch.
-
-2009-11-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclClock.c (TclClockInit):    Do not create [clock] support
-	commands in safe interps.
-
-2009-11-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/http/http.tcl (http::geturl): [Bug 2891171]: URL checking
-	too strict when using multiple question marks.
-	* tests/http.test
-	* library/http/pkgIndex.tcl:  Bump to http 2.8.2
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2009-11-11  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclIO.c: Fix [Bug 2888099] (close discards ENOSPC error) by
-	saving the errno from the first of two FlushChannel()s. Uneasy to
-	test; might need specific channel drivers. Four-hands with aku.
-
-2009-11-10  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/winFCmd.test: Cleanup directories that have been set chmod
-	000. On Windows7 and Vista we really have no access and these were
-	getting left behind.
-	A few tests were changed to reflect the intent of the test where
-	setting a directory chmod 000 should prevent any modification. This
-	restriction was ignored on XP but is honoured on Vista
-
-2009-11-10  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclBasic.c: Plug another leak in TCL_EVAL_DIRECT evaluation.
-	Forward port from Tcl 8.5 branch, change by Don Porter.
-
-	* generic/tclObj.c: [Bug 2895323]: Plug memory leak in
-	TclContinuationsEnter(). Forward port from Tcl 8.5 branch, change by
-	Don Porter.
-
-2009-11-09  Stuart Cassoff  <stwo@users.sf.net>
-
-	* win/README: [bug 2459744]: Removed outdated Msys + Mingw info.
-
-2009-11-09  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclBasic.c (TclEvalObjEx): Moved the #280 decrement of
-	refCount for the file path out of the branch after the whole
-	conditional, closing a memory leak. Added clause on structure type to
-	prevent seg.faulting. Forward port from valgrinding the Tcl 8.5
-	branch.
-
-	* tests/info.test: Resolve ambiguous resolution of variable "res".
-	Forward port from 8.5
-
-2009-11-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/string.n (bytelength): Noted that this command is not a good
-	thing to use, and suggested a better alternatve. Also factored out the
-	description of the indices into its own section.
-
-2009-11-07  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/fCmd.test: [Bug 2891026]: Exclude tests using chmod 555
-	directories on vista and win7. The current user has access denied and
-	so cannot rename the directory without admin privileges.
-
-2009-11-06  Andreas Kupries  <andreask@activestate.com>
-
-	* library/safe.tcl (::safe::Setup): Added documentation of the
-	contents of the state array. Also killed the 'InterpState' procedure
-	with its upleveled variable/upvar combination, and replaced all uses
-	with 'namespace upvar'.
-
-2009-11-05  Andreas Kupries  <andreask@activestate.com>
-
-	* library/safe.tcl: A series of patches which bring the SafeBase up to
-	date with code guidelines, Tcl's features, also eliminating a number
-	of inefficiencies along the way.
-	(1) Changed all procedure names to be fully qualified.
-	(2) Moved the procedures out of the namespace eval. Kept their
-	locations. IOW, broke the namespace eval apart into small sections not
-	covering the procedure definitions.
-	(3) Reindented the code. Just lots of whitespace changes.
-	Functionality unchanged.
-	(4) Moved the multiple namespace eval's around. Command export at the
-	top, everything else (var decls, argument parsing setup) at the
-	bottom.
-	(5) Moved the argument parsing setup into a procedure called when the
-	code is loaded. Easier management of temporary data.
-	(6) Replaced several uses of 'Set' with calls to the new procedure
-	'InterpState' and direct access to the per-slave state array.
-	(7) Replaced the remaining uses of 'Set' and others outside of the
-	path/token handling, and deleted a number of procedures related to
-	state array access which are not used any longer.
-	(8) Converted the path token system to cache normalized paths and path
-	<-> token conversions. Removed more procedures not used any longer.
-	Removed the test cases 4.3 and 4.4 from safe.test. They were testing
-	the now deleted command "InterpStateName".
-	(9) Changed the log command setup so that logging is compiled out
-	completely when disabled (default).
-	(10) Misc. cleanup. Inlined IsInterp into CheckInterp, its only user.
-	Consistent 'return -code error' for error reporting. Updated to use
-	modern features (lassign, in/ni, dicts). The latter are used to keep a
-	reverse path -> token map and quicker check of existence.
-	(11) Fixed [Bug 2854929]: Recurse into all subdirs under all TM root
-	dirs and put them on the access path.
-
-2009-11-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Asia/Novokuznetsk: New tzdata locale for Kemerovo
-	oblast', which now keeps Novosibirsk time and not Kranoyarsk time.
-	* library/tzdata/Asia/Damascus: Syrian DST changes.
-	* library/tzdata/Asia/Hong_Kong: Hong Kong historic DST corrections.
-	Olson tzdata2009q.
-
-2009-11-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/object.n (DESCRIPTION): Substantive revision to make it clearer
-	what the fundamental semantics of an object actually are.
-
-2009-11-01  Joe Mistachkin  <joe@mistachkin.com>
-
-	* doc/Cancel.3: Minor cosmetic fixes.
-	* win/makefile.vc: Make htmlhelp target work again.  An extra set of
-	double quotes around the definition of the HTML help compiler tool
-	appears to be required.  Previously, there was one set of double
-	quotes around the definition of the tool and one around the actual
-	invocation.  This led to confusion because it was the only such tool
-	path to include double quotes around its invocation.  Also, it was
-	somewhat inflexible in the event that somebody needed to override the
-	tool command to include arguments.  Therefore, even though it may look
-	"wrong", there are now two double quotes on either side of the tool
-	path definition.  This fixes the problem that currently prevents the
-	htmlhelp target from building and maintains flexibility in case
-	somebody needs to override it via the command line or an environment
-	variable.
-
-2009-11-01  Joe English  <jenglish@users.sourceforge.net>
-
-	* doc/Eval.3, doc/Cancel.3: Move TIP#285 routines out of Eval.3 into
-	their own manpage.
-
-2009-10-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (ExprRoundFunc): [Bug 2889593]: Correctly report
-	the expected number of arguments when generating an error for round().
-
-2009-10-30  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/tcltest.test: When creating the notwritabledir we deny the
-	current user access to delete the file. We must grant this right when
-	we cleanup. Required on Windows 7 when the user does not automatically
-	have administrator rights.
-
-2009-10-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:        Changed the typedef for the mp_digit type
-	from:
-		typedef unsigned long mp_digit;
-	to:
-		typedef unsigned int mp_digit;
-	For 32-bit builds where "long" and "int" are two names for the same
-	thing, this is no change at all.  For 64-bit builds, though, this
-	causes the dp[] array of an mp_int to be made up of 32-bit elements
-	instead of 64-bit elements.  This is a huge improvement because
-	details elsewhere in the mp_int implementation cause only 28 bits of
-	each element to be actually used storing number data.  Without this
-	change bignums are over 50% wasted space on 64-bit systems.  [Bug
-	2800740].
-
-	***POTENTIAL INCOMPATIBILITY***
-	For 64-bit builds, callers of routines with (mp_digit) or (mp_digit *)
-	arguments *will*, and callers of routines with (mp_int *) arguments
-	*may* suffer both binary and stubs incompatibilities with Tcl releases
-	8.5.0 - 8.5.7.  Such possibilities should be checked, and if such
-	incompatibilities are present, suitable [package require] requirements
-	on the Tcl release should be put in place to keep such built code
-	[load]-ing only in Tcl interps that are compatible.
-
-2009-10-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/dict.test: Make variable-clean and simplify tests by utilizing
-	the fact that dictionaries have defined orders.
-
-	* generic/tclZlib.c (TclZlibCmd): Remove accidental C99-ism which
-	reportedly makes the AIX native compiler choke.
-
-2009-10-29  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (LocalizeFormat):
-	* tests/clock.test (clock-67.1):
-	[Bug 2819334]: Corrected a problem where '%%' followed by a letter in
-	a format group could expand recursively: %%R would turn into %%H:%M:%S
-
-2009-10-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclLiteral.c:	[Bug 2888044]: Fixed 2 bugs.
-	* tests/info.test:	First, as noted in the comments of the
-	TclCleanupLiteralTable routine, since the teardown of the intrep of
-	one Tcl_Obj can cause the teardown of others in the same table, the
-	full table cleanup must be done with care, but the code did not
-	contain the same care demanded in the comment.  Second, recent
-	additions to the info.test file had poor hygiene, leaving an array
-	variable ::a lying around, which breaks later interp.test tests during
-	a -singleproc 1 run of the test suite.
-
-2009-10-28  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/fileName.test (fileName-20.[78]): Corrected poor test
-	hygiene (failure to save and restore the working directory) that
-	caused these two tests to fail on Windows (and [Bug 2806250] to be
-	reopened).
-
-2009-10-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c: [Bug 2884203]: Missing refcount on cached
-	normalized path caused crashes.
-
-2009-10-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (ParseClockScanFormat): [Bug 2886852]: Corrected a
-	problem where [clock scan] didn't load the timezone soon enough when
-	processing a time format that lacked a complete date.
-	* tests/clock.test (clock-66.1):
-	Added a test case for the above bug.
-	* library/tzdata/America/Argentina/Buenos_Aires:
-	* library/tzdata/America/Argentina/Cordoba:
-	* library/tzdata/America/Argentina/San_Luis:
-	* library/tzdata/America/Argentina/Tucuman:
-	New DST rules for Argentina. (Olson's tzdata2009p.)
-
-2009-10-26  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Remove $(PACKAGE).* and prototype from the
-	`make distclean` target.  Completes 2009-10-20 commit.
-
-2009-10-24  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (ProcessPosixTimeZone):
-	Corrected a regression in the fix to [Bug 2207436] that caused
-	[clock] to apply EU daylight saving time rules in the US.
-	Thanks to Karl Lehenbauer for reporting this regression.
-	* tests/clock.test (clock-52.4):
-	Added a regression test for the above bug.
-	* library/tzdata/Asia/Dhaka:
-	* library/tzdata/Asia/Karachi:
-	New DST rules for Bangladesh and Pakistan. (Olson's tzdata2009o.)
-
-2009-10-23  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (FlushChannel): Skip OutputProc for low-level
-	0-length writes. When closing pipes which have already been closed
-	not skipping leads to spurious SIG_PIPE signals. Reported by
-	Mikhail Teterin <mi+thun@aldan.algebra.com>.
-
-2009-10-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOBasic.c (TclOO_Object_VarName): [Bug 2883857]: Allow
-	the passing of array element names through this method.
-
-2009-10-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclPosixStr.c: [Bug 2882561]: Work around oddity on Haiku OS
-	where SIGSEGV and SIGBUS are the same value.
-
-	* generic/tclTrace.c (StringTraceProc): [Bug 2881259]: Added back cast
-	to work around silly bug in MSVC's handling of auto-casting.
-
-2009-10-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Removed the long outdated and broken targets
-	package-* that were for building Solaris packages.  Appears that the
-	pieces needed for these targets to function have never been present in
-	the current era of Tcl development and belong completely to Tcl
-	prehistory.
-
-2009-10-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIO.c:      [Patch 2107634]: Revised ReadChars and
-	FilterInputBytes routines to permit reads to continue up to the string
-	limits of Tcl values.  Before revisions, large read attempts could
-	panic when as little as half the limiting value length was reached.
-	Thanks to Sean Morrison and Bob Parker for their roles in the fix.
-
-2009-10-18  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclObj.c (TclDbDumpActiveObjects, TclDbInitNewObj)
-	(Tcl_DbIncrRefCount, Tcl_DbDecrRefCount, Tcl_DbIsShared):
-	[Bug 2871908]: Enforce separation of concerns between the lineCLPtr
-	and objThreadMap thread specific data members.
-
-2009-10-18  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tests/thread.test (thread-4.[345]): [Bug 1565466]: Correct tests to
-	save their error state before the final call to threadReap just in
-	case it triggers an "invalid thread id" error.  This error can occur
-	if one or more of the target threads has exited prior to the attempt
-	to send it an asynchronous exit command.
-
-2009-10-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclVar.c (UnsetVarStruct, TclDeleteNamespaceVars)
-	(TclDeleteCompiledLocalVars, DeleteArray):
-	* generic/tclTrace.c (Tcl_UntraceVar2): [Bug 2629338]: Stop traces
-	that are deleted part way through (a feature used by tdom) from
-	causing freed memory to be accessed.
-
-2009-10-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (DictIncrCmd): [Bug 2874678]: Don't leak any
-	bignums when doing [dict incr] with a value.
-	* tests/dict.test (dict-19.3): Memory leak detection code.
-
-2009-10-07  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclObj.c: [Bug 2871908]: Plug memory leaks of objThreadMap
-	and lineCLPtr hashtables.  Also make the names of the continuation
-	line information initialization and finalization functions more
-	consistent. Patch supplied by Joe Mistachkin <joe@mistachkin.com>.
-
-	* generic/tclIORChan.c (ErrnoReturn): Replace hardwired constant 11
-	with proper errno #define, EAGAIN. What was I thinking? The BSD's have
-	a different errno assignment and break with the hardwired number.
-	Reported by emiliano on the chat.
-
-2009-10-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInterp.c (SlaveEval): Agressive stomping of internal reps
-	was added as part of the NRE patch of 2008-07-13.  This doesn't appear
-	to actually be needed, and it hurts quite a bit when large lists lose
-	their intreps and require reparsing.  Thanks to Ashok Nadkarni for
-	reporting the problem.
-
-	* generic/tclTomMathInt.h (new): Public header tclTomMath.h had
-	* generic/tclTomMath.h:	dependence on private headers, breaking use
-	* generic/tommath.h:	by extensions [Bug 1941434].
-
-2009-10-05  Andreas Kupries  <andreask@activestate.com>
-
-	* library/safe.tcl (AliasGlob): Fixed conversion of catch to
-	try/finally, it had an 'on ok msg' branch missing, causing a silent
-	error immediately, and bogus glob results, breaking search for Tcl
-	modules.
-
-2009-10-04  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXBundle.c:	[Bug 2569449]: Workaround CF memory
-	* unix/tclUnixInit.c:		managment bug in Mac OS X 10.4 &
-					earlier.
-
-2009-10-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Africa/Cairo:
-	* library/tzdata/Asia/Gaza:
-	* library/tzdata/Asia/Karachi:
-	* library/tzdata/Pacific/Apia:	Olson's tzdata2009n.
-
-2009-09-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclDictObj.c:		[Bug 2857044]: Updated freeIntRepProc
-	* generic/tclExecute.c:		routines so that they set the typePtr
-	* generic/tclIO.c:		field to NULL so that the Tcl_Obj is
-	* generic/tclIndexObj.c:	not left in an inconsistent state.
-	* generic/tclInt.h:
-	* generic/tclListObj.c:
-	* generic/tclNamesp.c:
-	* generic/tclOOCall.c:
-	* generic/tclObj.c:
-	* generic/tclPathObj.c:
-	* generic/tclProc.c:
-	* generic/tclRegexp.c:
-	* generic/tclStringObj.c:
-
-	* generic/tclAlloc.c:           Cleaned up various routines in the
-	* generic/tclCkalloc.c:         call stacks for memory allocation to
-	* generic/tclInt.h:             guarantee that any size values computed
-	* generic/tclThreadAlloc.c:     are within the domains of the routines
-	they get passed to.  [Bugs 2557696 and 2557796].
-
-2009-09-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	Replaced TclProcessReturn() calls with
-	* tests/error.test:	Tcl_SetReturnOptions() calls as a simple fix
-	for [Bug 2855247].  Thanks to Anton Kovalenko for the report and fix.
-	Additional fixes for other failures demonstrated by new tests.
-
-2009-09-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/error.test (error-15.8.*):	Coverage tests illustrating
-	flaws in the propagation of return options by [try].
-
-2009-09-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclooConfig.sh, win/tclooConfig.sh: [Bug 2026844]: Added dummy
-	versions of tclooConfig.sh that make it easier to build extensions
-	against both Tcl8.5+TclOO-standalone and Tcl8.6.
-
-2009-09-24  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #356 IMPLEMENTATION
-
-	* generic/tcl.decls:	Promote internal routine TclNRSubstObj()
-	* generic/tclCmdMZ.c:	to public Tcl_NRSubstObj().  Still needs docs.
-	* generic/tclCompile.c:
-	* generic/tclInt.h:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2009-09-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/namespace.n: the description of [namespace unknown] failed
-	to mention [namespace path]: fixed. Thx emiliano.
-
-2009-09-21  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/regexp.test: Added check for error message from
-	unbalanced [] in regexp. Added additional simple test cases
-	of basic regsub command.
-
-2009-09-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c:	Correct botch in the conversion of
-	Tcl_SubstObj().  Thanks to Kevin Kenny for detection and report.
-
-2009-09-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c:	Re-implement Tcl_SubstObj() as a simple
-	* generic/tclParse.c:	wrapper around TclNRSubstObj().  This has
-	* tests/basic.test:	the effect of caching compiled bytecode in
-	* tests/parse.test:	the value to be substituted.  Note that
-	Tcl_SubstObj() now exists only for extensions.  Tcl itself no longer
-	makes any use of it.  Note also that TclSubstTokens() is now reachable
-	only by Tcl_EvalEx() and Tcl_ParseVar() so tests aiming to test its
-	functioning needed adjustment to still have the intended effect.
-
-2009-09-16  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclObj.c:   Extended ::tcl::unsupported::representation.
-
-2009-09-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Completed the NR-enabling of [subst].
-	* generic/tclCmdMZ.c:	[Bug 2314561].
-	* generic/tclCompCmds.c:
-	* generic/tclCompile.c:
-	* generic/tclInt.h:
-	* tests/coroutine.test:
-	* tests/parse.test:
-
-2009-09-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/http.test: Added in cleaning up of http tokens for each test
-	to reduce amount of global-variable pollution.
-
-2009-09-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/http/http.tcl (http::Event): [Bug 2849860]: Handle charset
-	names in double quotes; some servers like generating them like that.
-
-2009-09-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclParse.c:	[Bug 2850901]: Corrected line counting error
-	* tests/into.test:	in multi-command script substitutions.
-
-2009-09-07  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclExecute.c:	Fix potential uninitialized variable use and
-	* generic/tclFCmd.c:	null dereference flagged by clang static
-	* generic/tclProc.c:	analyzer.
-	* generic/tclTimer.c:
-	* generic/tclUtf.c:
-
-	* generic/tclExecute.c:	Silence false positives from clang static
-	* generic/tclIO.c:	analyzer about potential null dereference.
-	* generic/tclScan.c:
-	* generic/tclCompExpr.c:
-
-2009-09-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileSubstCmd): [Bug 2314561]:
-	* generic/tclBasic.c:	Added a bytecode compiler routine for the
-	* generic/tclCmdMZ.c:	[subst] command. This is a partial solution to
-	* generic/tclCompile.c:	the need to NR-enable [subst] since bytecode
-	* generic/tclCompile.h:	execution is already NR-enabled. Two new
-	* generic/tclExecute.c:	bytecode instructions, INST_NOP and
-	* generic/tclInt.h:	INST_RETURN_CODE_BRANCH were added to support
-	* generic/tclParse.c:	the new routine.  INST_RETURN_CODE_BRANCH is
-	* tests/basic.test:	likely to be useful in any future effort to
-	* tests/info.test:	add a bytecode compiler routine for [try].
-	* tests/parse.test:
-
-2009-09-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/LinkVar.3: [Bug 2844962]: Added documentation of issues relating
-	to use of this API in a multi-threaded environment.
-
-2009-09-01  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORTrans.c (ReflectInput): Remove error response to
-	0-result from method 'limit?' of transformations. Return the number of
-	copied bytes instead, which is possibly nothing. The latter then
-	triggers EOF handling in the higher layers, making the 0-result of
-	limit? the way to inject artificial EOF's into the data stream.
-
-2009-09-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:  Bump to tcltest 2.3.2 after revision
-	* library/tcltest/pkgIndex.tcl: to verbose error message.
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2009-08-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:       [Bug 2845535]: A few more string
-	overflow cases in [format].
-
-2009-08-25  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclBasic.c (Tcl_CreateInterp, Tcl_EvalTokensStandard)
-	(Tcl_EvalEx, TclEvalEx, TclAdvanceContinuations, TclNREvalObjEx):
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd, TclListLines):
-	* generic/tclCompCmds.c (*):
-	* generic/tclCompile.c (TclSetByteCodeFromAny, TclInitCompileEnv)
-	(TclFreeCompileEnv, TclCompileScript, TclCompileTokens):
-	* generic/tclCompile.h (CompileEnv):
-	* generic/tclInt.h (ContLineLoc, Interp):
-	* generic/tclObj.c (ThreadSpecificData, ContLineLocFree)
-	(TclThreadFinalizeObjects, TclInitObjSubsystem, TclContinuationsEnter,
-	(TclContinuationsEnterDerived, TclContinuationsCopy, TclFreeObj)
-	(TclContinuationsGet):
-	* generic/tclParse.c (TclSubstTokens, Tcl_SubstObj):
-	* generic/tclProc.c (TclCreateProc):
-	* generic/tclVar.c (TclPtrSetVar):
-	* tests/info.test (info-30.0-24):
-
-	Extended the parser, compiler, and execution engine with code and
-	attendant data structures tracking the position of continuation lines
-	which are not visible in the resulting script Tcl_Obj*'s, to properly
-	account for them while counting lines for #280.
-
-2009-08-24  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.h: Annotate Tcl_Panic as noreturn for clang static
-	analyzer in PURIFY builds, replacing preprocessor/assert technique.
-
-	* macosx/tclMacOSXNotify.c: Fix multiple issues with nested event loops
-	when CoreFoundation notifier is running in embedded mode. (Fixes
-	problems in TkAqua Cocoa reported by Youness Alaoui on tcl-mac)
-
-2009-08-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFileName.c: Correct regression in [Bug 2837800] fix.
-	* tests/fileName.test:
-
-2009-08-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFileName.c: [Bug 2837800]: Correct the result produced by
-	[glob */test] when * matches something like ~foo.
-
-	* generic/tclPathObj.c: [Bug 2806250]: Prevent the storage of strings
-	starting with ~ in the "tail" part (normPathPtr field) of the path
-	intrep when PATHFLAGS != 0.  This establishes the assumptions relied
-	on elsewhere that the name stored there is a relative path.  Also
-	refactored to make an AppendPath() routine instead of the cut/paste
-	stanzas that were littered throughout.
-
-2009-08-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (TclNRIfObjCmd): [Bug 2823276]: Make [if]
-	NRE-safe on all arguments when interpreted.
-	(Tcl_LsortObjCmd): Close off memory leak.
-
-2009-08-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdAH.c (TclNRForObjCmd, etc.): [Bug 2823276]: Make [for]
-	and [while] into NRE-safe commands, even when interpreted.
-
-2009-08-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c: [Bug 2837800]: Added NULL check to prevent
-	* tests/fileName.test:  crashes during [glob].
-
-2009-08-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/dltest/pkge.c:  const addition
-	* unix/tclUnixThrd.c:  Use <pthread.h> in stead of "pthread.h"
-	* win/tclWinDde.c:     Eliminate some more gcc warnings
-	* win/tclWinReg.c:
-	* generic/tclInt.h:    Change ForIterData, make it const-safe.
-	* generic/tclCmdAH.c:
-
-2009-08-12  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #353 IMPLEMENTATION
-
-	* doc/NRE.3:		New public routine Tcl_NRExprObj() permits
-	* generic/tcl.decls:	extension commands to evaluate Tcl expressions
-	* generic/tclBasic.c:	in NR-enabled command procedures.
-	* generic/tclCmdAH.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclObj.c:
-	* tests/expr.test:
-
-	* generic/tclDecls.h:		make genstubs
-	* generic/tclStubInit.c:
-
-2009-08-06  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/refchan.n [Bug 2827000]: Extended the implementation of
-	* generic/tclIORChan.c: reflective channels (TIP 219, method
-	* tests/ioCmd.test: 'read'), enabling handlers to signal EAGAIN to
-	indicate 'no data, but not at EOF either', and other system
-	errors. Updated documentation, extended testsuite (New test cases
-	iocmd*-23.{9,10}).
-
-2009-08-02  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/coroutine.test: fix testfile cleanup
-
-2009-08-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclObj.c (Tcl_RepresentationCmd): Added an unsupported
-	command for reporting the representation of an object. Result string
-	is deliberately a bit obstructive so that people are not encouraged to
-	make code that depends on it; it's a debugging tool only!
-
-	* unix/tclUnixFCmd.c (GetOwnerAttribute, SetOwnerAttribute)
-	(GetGroupAttribute, SetGroupAttribute): [Bug 1942222]: Stop calling
-	* unix/tclUnixFile.c (TclpGetUserHome): endpwent() and endgrent();
-	they've been unnecessary for ages.
-
-2009-08-02  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tclWin32Dll.c: Eliminate TclWinResetInterfaceEncodings, since it
-	* win/tclWinInit.c:  does exactly the same as TclWinEncodingsCleanup,
-	* win/tclWinInt.h:   make sure that tclWinProcs and
-			     tclWinTCharEncoding are always set and reset
-			     concurrently.
-	* win/tclWinFCmd.c:  Correct check for win95
-
-2009-07-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c: [Bug 2830354]:	Corrected failure to
-	* tests/format.test:		grow buffer when format spec request
-	large width floating point values.  Thanks to Clemens Misch.
-
-2009-07-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/auto.tcl (tcl_findLibrary, auto_mkindex):
-	* library/package.tcl (pkg_mkIndex, tclPkgUnknown, MacOSXPkgUnknown):
-	* library/safe.tcl (interpAddToAccessPath, interpDelete, AliasGlob):
-	(AliasSource, AliasLoad, AliasEncoding):
-	* library/tm.tcl (UnknownHandler): Simplify by swapping some [catch]
-	gymnastics for use of [try].
-
-2009-07-26 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tools/genStubs.tcl: Forced LF translation when generating .h's to
-	avoid spurious diffs when regenerating on a Windows box.
-
-2009-07-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in: [Bug 2827066]: msys build --enable-symbols broken
-	* win/tcl.m4:	   And modified the same for unicows.dll, as a
-	* win/configure:   preparation for [Enh 2819611].
-
-2009-07-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* library/history.tcl (history): Reworked the history mechanism in
-	terms of ensembles, rather than the ad hoc ensemble-lite mechanism
-	used previously.
-
-2009-07-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/self.n (self class): [Bug 2704302]: Add some text to make it
-	clearer how to get the name of the current object's class.
-
-2009-07-23  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (Tcl_GetChannelHandle): [Bug 2826248]: Do not crash
-	* generic/tclPipe.c (FileForRedirect): for getHandleProc == NULL, this
-	is allowed. Provide a nice error message in the bypass area. Updated
-	caller to check the bypass for a mesage. Bug reported by Andy
-	Sonnenburg <andy22286@users.sourceforge.net>
-
-2009-07-23  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclNotify.c: [Bug 2820349]: Ensure that queued events are
-	freed once processed.
-
-2009-07-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* macosx/tclMacOSXFCmd.c: CONST -> const
-	* generic/tclGetDate.y:
-	* generic/tclDate.c:
-	* generic/tclLiteral.c: (char *) cast in ckfree call
-	* generic/tclPanic.c: [Feature Request 2814786]: remove TclpPanic
-	* generic/tclInt.h
-	* unix/tclUnixPort.h
-	* win/tclWinPort.h
-
-2009-07-22 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclEvent.c: [Bug 2001201 again]: Refined the 20090617 patch
-	on [exit] streamlining, so that it now correctly calls thread exit
-	handlers for the calling thread, including <Destroy> bindings in Tk.
-
-2009-07-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Asia/Dhaka:
-	* library/tzdata/Indian/Mauritius: Olson's tzdata2009k.
-
-2009-07-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (StringIsCmd): Reorganize so that [string is] is
-	more efficient when parsing things that are correct, at a cost of
-	making the empty string test slightly more costly. With this, the cost
-	of doing [string is integer -strict $x] matches [catch {expr {$x+0}}]
-	in the successful case, and greatly outstrips it in the failing case.
-
-2009-07-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.decls, generic/tclOO.c (Tcl_GetObjectName): Expose a
-	function for efficiently returning the current name of an object.
-
-2009-07-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in: Define NDEBUG in optimized (non-symbols) build to
-	disable NRE assert()s and threaded allocator range checks.
-
-2009-07-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBinary.c:	Removed unused variables.
-	* generic/tclCmdIL.c:
-	* generic/tclCompile.c:
-	* generic/tclExecute.c:
-	* generic/tclHash.c:
-	* generic/tclIOUtil.c:
-	* generic/tclVar.c:
-
-	* generic/tclBasic.c:	Silence compiler warnings about ClientData.
-	* generic/tclProc.c:
-
-	* generic/tclScan.c:    Typo in ACCEPT_NAN configuration.
-
-	* generic/tclStrToD.c:  [Bug 2819200]: Set floating point control
-	register on MIPS systems so that the gradual underflow expected by Tcl
-	is in effect.
-
-2009-07-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInt.h (Namespace):		   Added machinery to allow
-	* generic/tclNamesp.c (many functions):	   reduction of memory used
-	* generic/tclResolve.c (BumpCmdRefEpochs): by namespaces. Currently
-	#ifdef'ed out because of compatibility concerns.
-
-	* generic/tclInt.decls: Added four functions for better integration
-	with itcl-ng.
-
-2009-07-14  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclInt.h (TclNRSwitchObjCmd):
-	* generic/tclBasic.c (builtInCmds):
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd):
-	* tests/switch.test (switch-15.1):
-	[Bug 2821401]: Make non-bytecoded [switch] command aware of NRE.
-
-2009-07-13  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclCompile.c (TclInitCompileEnv, EnterCmdWordIndex)
-	(TclCleanupByteCode, TclCompileScript):
-	* generic/tclExecute.c (TclCompileObj, TclExecuteByteCode):
-	* tclCompile.h (ExtCmdLoc):
-	* tclInt.h (ExtIndex, CFWordBC, CmdFrame):
-	* tclBasic.c (DeleteInterpProc, TclArgumentBCEnter)
-	(TclArgumentBCRelease, TclArgumentGet, SAVE_CONTEXT)
-	(RESTORE_CONTEXT, NRCoroutineExitCallback, TclNRCoroutineObjCmd):
-	* generic/tclCmdAH.c (TclNRForObjCmd, TclNRForIterCallback,
-	(ForNextCallback):
-	* generic/tclCmdMZ.c (TclNRWhileObjCmd):
-
-	Extended the bytecode compiler initialization to recognize the
-	compilation of whole files (NRE enabled 'source' command) and switch
-	to the counting of absolute lines in that case.
-
-	Further extended the bytecode compiler to track the start line in the
-	generated information, and modified the bytecode execution to
-	recompile an object if the location as per the calling context doesn't
-	match the location saved in the bytecode. This part could be optimized
-	more by using more memory to keep all possibilities which occur
-	around, or by just adjusting the location information instead of a
-	total recompile.
-
-	Reworked the handling of literal command arguments in bytecode to be
-	saved (compiler) and used (execution) per command (See the
-	TCL_INVOKE_STK* instructions), and not per the whole bytecode. This,
-	and the previous change remove the problems with location data caused
-	by literal sharing (across whole files, but also proc bodies).
-	Simplified the associated datastructures (ExtIndex is gone, as is the
-	function EnterCmdWordIndex).
-
-	The last change causes the hashtable 'lineLABCPtr' to be state which
-	has to be kept per coroutine, like the CmdFrame stack. Reworked the
-	coroutine support code to create, delete and switch the information as
-	needed. Further reworked the tailcall command as well, it has to pop
-	its own arguments when run in a bytecode context to keep a proper
-	stack in 'lineLABCPtr'.
-
-	Fixed the mishandling of line information in the NRE-enabled 'for' and
-	'while' commands introduced when both were made to share their
-	iteration callbacks without taking into account that the loop body is
-	found in different words of the command. Introduced a separate data
-	structure to hold all the callback information, as we went over the
-	limit of 4 direct client-data values for NRE callbacks.
-
-	The above fixes [Bug 1605269].
-
-2009-07-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (StringIndexCmd, StringEqualCmd, StringCmpCmd):
-	* generic/tclExecute.c (TclExecuteByteCode): [Bug 2637173]: Factor out
-	* generic/tclInt.h (TclIsPureByteArray):     the code to determine if
-	* generic/tclUtil.c (TclStringMatchObj):     it is safe to work with
-	byte arrays directly, so that we get the check correct _once_.
-
-	* generic/tclOOCall.c (TclOOGetCallContext): [Bug 1895546]: Changed
-	* generic/tclOO.c (TclOOObjectCmdCore):	     the way that the cache is
-	managed so that when itcl does cunning things, those cunning things
-	can be cached properly.
-
-2009-07-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/vwait.n: Substantially increased the discussion of issues and
-	work-arounds relating to nested vwaits, following discussion on the
-	tcl-core mailing list on the topic.
-
-2009-07-10  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/zlib.test:   ZlibTransformClose may be called with a NULL
-	* generic/tclZlib.c: interpreter during finalization and
-	Tcl_SetChannelError requires a list. Added some tests to ensure error
-	propagation from the zlib library to the interp.
-
-2009-07-09  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/zlib.test: [Bug 2818131]: Added tests and fixed a typo that
-	broke [zlib push] for deflate format.
-
-2009-07-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* compat/mkstemp.c (mkstemp): [Bug 2819227]: Use rand() for random
-	numbers as it is more portable.
-
-2009-07-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ZlibTransformWatch): Correct the handling of
-	events so that channel transforms work with things like an asynch
-	[chan copy]. Problem reported by Pat Thoyts.
-
-2009-07-01  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/tclWinInt.h:   [Bug 2806622]: Handle the GetUserName API call
-	* win/tclWin32Dll.c: via the tclWinProcs indirection structure. This
-	* win/tclWinInit.c:  fixes a problem obtaining the username when the
-	USERNAME environment variable is unset.
-
-2009-06-30  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.h:		Add assert macros for clang static
-	* generic/tclPanic.c:		analyzer and redefine Tcl_Panic to
-	* generic/tclStubInit.c:	assert after panic in clang PURIFY
-					builds.
-
-	* generic/tclCmdIL.c:		Add clang assert for false positive
-					from static analyzer.
-
-2009-06-26  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl-Common.xcconfig:	 Update projects for Xcode 3.1 and
-	* macosx/Tcl.xcode/*:		 3.2, standardize on gcc 4.2, remove
-	* macosx/Tcl.xcodeproj/*:	 obsolete configurations and pre-Xcode
-	* macosx/Tcl.pbproj/* (removed): project.
-
-	* macosx/README:		 Update project docs, cleanup.
-
-	* unix/Makefile.in:		 Update dist target for project
-					 changes.
-
-2009-06-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/oo.test (oo-19.1): [Bug 2811598]: Make more resilient.
-
-2009-06-24  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/http11.test: [Bug 2811492]: Clean up procs after testing.
-
-2009-06-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCkalloc.c (MemoryCmd): [Bug 988703]:
-	* generic/tclObj.c (ObjData, TclFinalizeThreadObjects): Add mechanism
-	for discovering what Tcl_Objs are allocated when built for memory
-	debugging. Developed by Joe Mistachkin.
-
-2009-06-17 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclEvent.c: Applied a patch by George Peter Staplin
-	drastically reducing the ambition of [exit] wrt finalization, and
-	thus solving many multi-thread teardown issues. [Bugs 2001201,
-	486399, and possibly 597575, 990457, 1437595, 2750491]
-
-2009-06-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c: sprintf() -> Tcl_ObjPrintf() conversion.
-
-2009-06-15  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixPort.h: Move all socket-related code from tclUnixChan.c
-	* unix/tclUnixChan.c: to tclUnixSock.c.
-	* unix/tclUnixSock.c:
-
-2009-06-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl (make-man-pages): [Patch 557486]: Apply
-	last remaining meaningful part of this patch, a clean up of some
-	closing tags.
-
-2009-06-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c: [Bug 2802881]: The value stashed in
-	* generic/tclProc.c:    iPtr->compiledProcPtr when compiling a proc
-	* tests/execute.test:   survives too long. We only need it there long
-	enough for the right TclInitCompileEnv() call to re-stash it into
-	envPtr->procPtr.  Once that is done, the CompileEnv controls.  If we
-	let the value of iPtr->compiledProcPtr linger, though, then any other
-	bytecode compile operation that takes place will also have its
-	CompileEnv initialized with it, and that's not correct.  The value is
-	meant to control the compile of the proc body only, not other compile
-	tasks that happen along.  Thanks to Carlos Tasada for discovering and
-	reporting the problem.
-
-2009-06-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:       [Bug 2801413]: Revised [format] to not
-	overflow the integer calculations computing the length of the %ll
-	formats of really big integers.  Also added protections so that
-	[format]s that would produce results overflowing the maximum string
-	length of Tcl values throw a normal Tcl error instead of a panic.
-
-	* generic/tclStringObj.c:	[Bug 2803109]: Corrected failures to
-	deal with the "pure unicode" representation of an empty string.
-	Thanks to Julian Noble for reporting the problem.
-
-2006-06-09  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclGetDate.y: Fixed a thread safety bug in the generated
-	* library/clock.tcl:    Bison parser (needed a %pure-parser
-	* tests/clock.test:     declaration to avoid static variables).
-				Discovered that the %pure-parser declaration
-	                        allowed for returning the Bison error message
-	                        to the Tcl caller in the event of a syntax
-	                        error, so did so.
-	* generic/tclDate.c: bison 2.3
-
-2006-06-08  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Asia/Dhaka: New DST rule for Bangladesh. (Olson's
-	tzdata2009i.)
-
-2009-06-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/copy.n: Fix error in example spotted by Venkat Iyer.
-
-2009-06-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Replace dynamically-initialized table with a
-	table of static constants in the lookup table for exponent operator
-	computations that fit in a 64 bit integer result.
-
-	* generic/tclExecute.c: [Bug 2798543]: Corrected implementations and
-	selection logic of the INST_EXPON instruction.
-
-2009-06-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/expr.test:      [Bug 2798543]: Added many tests demonstrating
-	the broken cases.
-
-009-05-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Africa/Cairo:
-	* library/tzdata/Asia/Amman: Olson's tzdata2009h.
-
-2009-05-29  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl: Fixed handling of cpu ia64,
-	* library/platform/pkgIndex.tcl: taking ia64_32 into account
-	* unix/Makefile.in: now. Bumped version to 1.0.5. Updated the
-	* win/Makefile.in: installation commands.
-
-2009-05-26 Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* doc/expr.n: Fixed documentation of the right-associativity of
-	the ** operator. (spotted by kbk)
-
-2009-05-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOInfo.c (InfoObjectNsCmd): Added introspection mechanism
-	for finding out what an object's namespace is. Experience suggests
-	that it is just too useful to be able to do without it.
-
-2009-05-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/vwait.n: Added more words to make it clear just how bad it is to
-	nest [vwait]s.
-
-	* compat/mkstemp.c: Add more headers to make this file build on IRIX
-	6.5. Thanks to Larry McVoy for this.
-
-2009-05-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (TclNRNewObjectInstance):  [Bug 2414858]: Add a
-	* generic/tclBasic.c (TclPushTailcallPoint): marker to the stack of
-	NRE callbacks at the right point so that tailcall works correctly in a
-	constructor.
-
-	* tests/exec.test (cat): [Bug 2788468]: Adjust the scripted version of
-	cat so that it does not perform transformations on the data it is
-	working with, making it more like the standard Unix 'cat' program.
-
-2009-05-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclObj.c (Tcl_GetCommandFromObj): [Bug 2785893]: Ensure that
-	a command in a deleted namespace can't be found through a cached name.
-
-	* generic/tclBasic.c:    Let coroutines start with a much smaller
-	* generic/tclCompile.h:  stack: 200 words (previously was 2000, the
-	* generic/tclExecute.c:  same as interps).
-
-2009-05-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/env.test (printenvScript, env-4.3, env-4.5): [Bug 1513659]:
-	* tests/exec.test (exec-2.6): These tests had subtle dependencies on
-	being on platforms that were either ISO 8859-1 or UTF-8. Stabilized
-	the results by forcing the encoding.
-
-2009-05-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	[Bug 2582327]: Improve overflow error message
-	from [string repeat].
-
-	* tests/interp.test: interp-20.50 test for Bug 2486550.
-
-2009-05-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (InitFoundation, AllocObject, AllocClass):
-	* generic/tclOODefineCmds.c (InitDefineContext): Make sure that when
-	support namespaces are deleted, nothing bad can subsequently happen.
-	Issue spotted by Don Porter.
-
-2009-05-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/Tcl.n: [Bug 2538432]: Clarified exact treatment of ${arr(idx)}
-	form of variable substitution. This is not a change of behavior, just
-	an improved description of the current situation.
-
-2009-04-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclObjInvoke): [Bug 2486550]: Make sure that a
-	null objProc is not used, use Tcl_NRCallObjProc instead.
-
-2009-05-01  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/configure.in   Fix 64-bit detection for zlib on Win64
-	* win/configure      (regenerated)
-
-2009-04-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tcl.m4, unix/configure (SC_CONFIG_CFLAGS): harden the check to
-	add _r to CC on AIX with threads.
-
-2009-04-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/concat.n (EXAMPLES): [Bug 2780680]: Rewrote so that the spacing
-	of result messages is correct. (The exact way they were wrong was
-	different when rendered through groff or as HTML, but it was still
-	wrong both ways.)
-
-2009-04-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIndexObj.c:  Reset internal INTERP_ALTERNATE_WRONG_ARGS
-	* generic/tclIOCmd.c:     flag inside the Tcl_WrongNumArgs function,
-	                          so the caller no longer has to do the reset.
-
-2009-04-24  Stuart Cassoff  <stwo@users.sf.net>
-
-	* unix/Makefile.in: [Patch 2769530]: Don't chmod/exec installManPage.
-
-2009-04-19  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/http.tcl: [Bug 2715421]: Removed spurious newline added
-	* tests/http11.test:     after POST and added tests to detect excess
-	* tests/httpd11.tcl:     bytes being POSTed.
-	* library/http/pkgIndex.tcl:
-	* makefiles:             package version now 2.8.1
-
-2009-04-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/chan.n, doc/close.n: Tidy up documentation of TIP #332.
-
-2009-04-14  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Asia/Karachi: Updated rules for Pakistan Summer
-				       Time (Olson's tzdata2009f)
-
-2009-04-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (InvokeForwardMethod): Clarify the resolution
-	behaviour of the name of the command that is forwarded to: it's now
-	resolved using the object's namespace as context, which is much more
-	useful than the previous (somewhat random) behaviour of using the
-	caller's current namespace.
-
-2009-04-10  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/http.tcl:     Improved HTTP/1.1 support and added
-	* library/http/pkgIndex.tcl: specific HTTP/1.1 testing to ensure
-	* tests/http11.test:         we handle chunked+gzip for the various
-	* tests/httpd11.test:        modes (normal, -channel and -handler)
-	* makefiles:                 package version set to 2.8.0
-
-2009-04-10  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixChan.c:		TclUnixWaitForFile(): use FD_* macros
-	* macosx/tclMacOSXNotify.c:	to manipulate select masks (Cassoff).
-					[FRQ 1960647] [Bug 3486554]
-
-	* unix/tclLoadDyld.c:		Use RTLD_GLOBAL instead of RTLD_LOCAL.
-					[Bug 1961211]
-
-	* macosx/tclMacOSXNotify.c:	revise CoreFoundation notifier to allow
-					embedding into applications that
-					already have a CFRunLoop running and
-					want to run the tcl event loop via
-					Tcl_ServiceModeHook(TCL_SERVICE_ALL).
-
-	* macosx/tclMacOSXNotify.c:	add CFRunLoop based Tcl_Sleep() and
-	* unix/tclUnixChan.c:		TclUnixWaitForFile() implementations
-	* unix/tclUnixEvent.c:		and disable select() based ones in
-					CoreFoundation builds.
-
-	* unix/tclUnixNotify.c:		simplify, sync with tclMacOSXNotify.c.
-
-	* generic/tclInt.decls: 	add TclMacOSXNotifierAddRunLoopMode()
-	* generic/tclIntPlatDecls.h:	internal API, regen.
-	* generic/tclStubInit.c:
-
-	* unix/configure.in (Darwin):	use Darwin SUSv3 extensions if
-					available; remove /Network locations
-					from default tcl package search path
-					(NFS mounted locations and thus slow).
-	* unix/configure:		autoconf-2.59
-	* unix/tclConfig.h.in:		autoheader-2.59
-
-	* macosx/tclMacOSXBundle.c:	on Mac OS X 10.4 and later, replace
-					deprecated NSModule API by dlfcn API.
-
-2009-04-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/StringObj.3: [Bug 2089279]: Corrected example so that it works
-	on 64-bit machines as well.
-
-2009-04-10  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/http.test: [Bug 26245326]: Added specific check for problem
-	* tests/httpd: (return incomplete HTTP response header).
-
-2009-04-08  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tools/tclZIC.tcl: Always emit files with Unix line termination.
-	* library/tzdata: Olson's tzdata2009e
-
-2009-04-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/http/http.tcl:	[Bug 26245326]: Handle incomplete
-	lines in the "connecting" state. Thanks to Sergei Golovan.
-
-2009-04-08  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl: Extended the darwin sections to add
-	* library/platform/pkgIndex.tcl: a kernel version number to the
-	* unix/Makefile.in: identifier for anything from Leopard (10.5) on up.
-	* win/Makefile.in: Extended patterns for same. Extended cpu
-	* doc/platform.n: recognition for 64bit Tcl running on a 32bit kernel
-	on a 64bit processor (By Daniel Steffen). Bumped version to 1.0.4.
-	Updated Makefiles.
-
-2009-04-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:  [Bug 2570363]: Converted [eval]s (some
-	* library/tcltest/pkgIndex.tcl: unsafe!) to {*} in tcltest package.
-	* unix/Makefile.in:     => tcltest 2.3.1
-	* win/Makefile.in:
-
-2009-04-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Correction so that value of
-	TCL_GROWTH_MIN_ALLOC is everywhere expressed in bytes as comment
-	claims.
-
-2009-04-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/vwait.n: [Bug 1910136]: Extend description and examples to make
-	it clearer just how this command interprets variable names.
-
-2009-03-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/Alloc.3: [Bug 2556263]:	Size argument is "unsigned int".
-
-2009-03-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c (TclPathPart): [Bug 2710920]: TclPathPart()
-	* tests/fileName.test:	was computing the wrong results for both [file
-	dirname] and [file tail] on "path" arguments with the PATHFLAGS != 0
-	intrep and with an empty string for the "joined-on" part.
-
-2009-03-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/tclsh.1:		 Bring doc and tools in line with
-	* tools/installData.tcl: https://wiki.tcl-lang.org/page/exec+magic
-	* tools/str2c
-	* tools/tcltk-man2html.tcl
-
-2009-03-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/coroutine.n: [Bug 2152285]: Added basic documentation for the
-	coroutine and yield commands.
-
-2009-03-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOBasic.c (TclOOSelfObjCmd): [Bug 2704302]: Make 'self
-	class' better defined in the context of objects that change class.
-
-	* generic/tclVar.c (Tcl_UpvarObjCmd): [Bug 2673163] (ferrieux)
-	* generic/tclProc.c (TclObjGetFrame): Make the upvar command more able
-	to handle its officially documented syntax.
-
-2009-03-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: [Bug 2502037]: NR-enable the handling of unknown
-	commands.
-
-2009-03-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:   Fixed "leaks" in aliases, imports and
-	* generic/tclInt.h:     ensembles. Only remaining known leak is in
-	* generic/tclInterp.c:  ensemble unknown dispatch (as it not
-	* generic/tclNamesp.c:  NR-enabled)
-	* tests/tailcall.test:
-
-	* tclInt.h: comments
-
-	* tests/tailcall.test: Added tests to show that [tailcall] does not
-	currently always execute in constant space: interp-alias, ns-imports
-	and ensembles "leak" as of this commit.
-
-	* tests/nre.test: [foreach] has been NR-enabled for a while, the test
-	was marked 'knownBug': unmark it.
-
-	* generic/tclBasic.c:   Fix for (among others) [Bug 2699087]
-	* generic/tclCmdAH.c:   Tailcalls now perform properly even from
-	* generic/tclExecute.c: within [eval]ed scripts.
-	* generic/tclInt.h:     More tests missing, as well as proper
-	exploration and testing of the interaction with "redirectors" like
-	interp-alias (suspect that it does not happen in constant space)
-	and pure-eval commands.
-
-	* generic/tclExecute.c: Proper fix for [Bug 2415422]. Reenabled
-	* tests/nre.test:       the failing assertion that was disabled on
-	2008-12-18: the assertion is correct, the fault was in the
-	management of expansions.
-
-	* generic/tclExecute.c:  Fix both test and code for tailcall
-	* tests/tailcall.test:   from within a compiled [eval] body.
-
-	* tests/tailcall.test: Slightly improved tests
-
-2009-03-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/stringObj.test:         [Bug 2597185]: Test stringObj-6.9
-	checks that Tcl_AppendStringsToObj() no longer crashes when operating
-	on a pure unicode value.
-
-	* generic/tclExecute.c (INST_CONCAT1):  [Bug 2669109]: Panic when
-	appends overflow the max length of a Tcl value.
-
-2009-03-19  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tcl.h:
-	* generic/tclInt.h:
-	* generic/tclBasic.c:
-	* generic/tclExecute.c:
-	* generic/tclNamesp.c (Tcl_PopCallFrame): Rewritten tailcall
-	implementation, ::unsupported::atProcExit is (temporarily?) gone. The
-	new approach is much simpler, and also closer to being correct. This
-	commit fixes [Bug 2649975] and [Bug 2695587].
-
-	* tests/coroutine.test:    Moved the tests to their own files,
-	* tests/tailcall.test:     removed the unsupported.test. Added
-	* tests/unsupported.test:  tests for the fixed bugs.
-
-2009-03-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/tailcall.n: Added documentation for tailcall command.
-
-2009-03-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* win/tclWinFile.c (TclpObjNormalizePath):	[Bug 2688184]:
-	Corrected Tcl_Obj leak. Thanks to Joe Mistachkin for detection and
-	patch.
-
-	* generic/tclVar.c (TclLookupSimpleVar):	[Bug 2689307]: Shift
-	all calls to Tcl_SetErrorCode() out of TclLookupSimpleVar and onto its
-	callers, where control with TCL_LEAVE_ERR_MSG flag is more easily
-	handled.
-
-2009-03-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (TryPostBody): [Bug 2688063]: Extract information
-	from list before getting rid of last reference to it.
-
-2009-03-15  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclThread.c: [Bug 2687952]: Modify fix for TSD leak to match
-	* generic/tclThreadStorage.c: Tcl 8.5 (and prior) allocation semantics
-
-2009-03-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclThreadStorage.c (TSDTableDelete):	[Bug 2687952]: Ensure
-	* generic/tclThread.c (Tcl_GetThreadData):	that structures in
-	Tcl's TSD system are all freed. Use the correct matching allocator.
-
-	* generic/tclPosixStr.c (Tcl_SignalId,Tcl_SignalMsg): [Patch 1513655]:
-	Added support for SIGINFO, which is present on BSD platforms.
-
-2009-03-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tcl.pc.in (new file):		[Patch 2243948] (hat0)
-	* unix/configure.in, unix/Makefile.in: Added support for reporting
-	Tcl's public build configuration via the pkg-config system. TEA is
-	still the official mechanism though, in part because pkg-config is not
-	universally supported across all Tcl's supported platforms.
-
-2009-03-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclNRCoroutineObjCmd): fix Tcl_Obj leak.
-	Diagnosis and fix thanks to GPS.
-
-2009-03-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (Tcl_TryObjCmd, TclNRTryObjCmd): Moved the
-	implementation of [try] from Tcl code into C. Still lacks a bytecode
-	version, but should be better than what was before.
-
-2009-03-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (TclZlibCmd): Checksums are defined to be unsigned
-	32-bit integers, use Tcl_WideInt to pass to scripts. [Bug 2662434]
-	(ZlibStreamCmd, ChanGetOption): A few other related corrections.
-
-2009-02-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.decls:    [Bug 218977]: Tcl_DbCkfree needs return value
-	* generic/tclCkalloc.c
-	* generic/tclDecls.h:   (regenerated)
-	* generic/tclInt.decls: don't use CONST84/CONST86 here
-	* generic/tclCompile.h: don't use CONST86 here, comment fixing.
-	* generic/tclIO.h:      don't use CONST86 here, comment fixing.
-	* generic/tclIntDecls.h (regenerated)
-
-2009-02-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c (TclStringMatchObj):	[Bug 2637173]: Revised
-	the branching on the strObj->typePtr so that untyped values get
-	converted to the "string" type and pass through the Unicode matcher.
-	[Bug 2613766]: Also added checks to only perform "bytearray"
-	optimization on pure bytearray values.
-
-	* generic/tclCmdMZ.c:	Since Tcl_GetCharLength() has its own
-	* generic/tclExecute.c:	optimizations for the tclByteArrayType, stop
-	having the callers do them.
-
-2009-02-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/clock.n, doc/fblocked.n, doc/format.n, doc/lsort.n,
-	* doc/pkgMkIndex.n, doc/regsub.n, doc/scan.n, doc/tclvars.n:
-	General minor documentation improvements.
-
-	* library/http/http.tcl (geturl, Eof): Added support for 8.6's built
-	in zlib routines.
-
-2009-02-22  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tests/lrange.test:	Revert commits of 2008-07-23. Those were speed
-	* tests/binary.test:	tests, that are inherently brittle.
-
-2009-02-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Several revisions to the shimmering
-	patterns between Unicode and UTF string reps.  Most notably the
-	call: objPtr = Tcl_NewUnicodeObj(...,0); followed by a loop of calls:
-	Tcl_AppendUnicodeToObj(objPtr, u, n); will now grow and append to
-	the Unicode representation.  Before this commit, the sequence would
-	convert each append to UTF and perform the append to the UTF rep.
-	This is puzzling and likely a bug.  The performance of [string map]
-	is significantly improved by this change (according to the MAP
-	collection of benchmarks in tclbench).  Just in case there was some
-	wisdom in the old ways that I missed, I left in the ability to restore
-	the old patterns with a #define COMPAT 1 at the top of the file.
-
-2009-02-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	[Bug 2571597]: Fixed mistaken logic in
-	* tests/fileName.test:	TclFSGetPathType() that assumed (not
-	"absolute") => "relative". This is a false assumption on Windows,
-	where "volumerelative" is another possibility.
-
-2009-02-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Simplify the logic of the
-	Tcl_*SetObjLength() routines.
-
-	* generic/tclStringObj.c:	Rewrite GrowStringBuffer() so that it
-	has parallel structure with GrowUnicodeBuffer().  The revision permits
-	allocation attempts to continue all the way up to failure, with no
-	gap. It also directly manipulates the String and Tcl_Obj internals
-	instead of inefficiently operating via Tcl_*SetObjLength() with all of
-	its extra protections and underdocumented special cases.
-
-	* generic/tclStringObj.c:	Another round of simplification on
-	the allocation macros.
-
-2009-02-17  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tcl.m4, win/configure: Check if cl groks _WIN64 already to
-	avoid CC manipulation that can screw up later configure checks.
-	Use 'd'ebug runtime in 64-bit builds.
-
-2009-02-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Pare back the length of the unicode
-	array in a non-extended String struct to one Tcl_UniChar, meant to
-	hold the terminating NUL character.  Non-empty unicode strings are
-	then stored by extending the String struct by stringPtr->maxChars
-	additional slots in that array with sizeof(Tcl_UniChar) bytes per
-	slot. This revision makes the allocation macros much simpler.
-
-	* generic/tclStringObj.c:	Factor out common GrowUnicodeBuffer()
-	and solve overflow and growth algorithm fallbacks in it.
-
-	* generic/tclStringObj.c:	Factor out common GrowStringBuffer().
-
-	* generic/tclStringObj.c:	Convert Tcl_AppendStringsToObj into
-	* tests/stringObj.test:		a radically simpler implementation
-	where we just loop over calls to Tcl_AppendToObj.  This fixes [Bug
-	2597185].  It also creates a *** POTENTIAL INCOMPATIBILITY *** in
-	that T_ASTO can now allocate more space than is strictly required,
-	like all the other Tcl_Append* routines.  The incompatibility was
-	detected by test stringObj-6.5, which I've updated to reflect the
-	new behavior.
-
-	* generic/tclStringObj.c:	Revise buffer growth implementation
-	in ExtendStringRepWithUnicode.  Use cheap checks to determine that
-	no reallocation is necessary without cost of computing the precise
-	number of bytes needed.  Also make use of the string growth algortihm
-	in the case of repeated appends.
-
-2009-02-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclZlib.c:	Hack needed for official zlib1.dll build.
-	* win/configure.in:	fix [Feature Request 2605263] use official
-	* win/Makefile.in:	zlib build.
-	* win/configure:	(regenerated)
-	* compat/zlib/zdll.lib:	new files
-	* compat/zlib/zlib1.dll:
-
-	* win/Makefile.in:  [Bug 2605232]: tdbc doesn't build when Tcl is
-	compiled with --disable-shared.
-
-2009-02-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	[Bug 2603158]: Added protections from
-	* generic/tclTestObj.c:		invalid memory accesses when we append
-	* tests/stringObj.test:		(some part of) a Tcl_Obj to itself.
-	Added the appendself and appendself2 subcommands to the
-	[teststringobj] testing command and added tests to the test suite.
-
-	* generic/tclStringObj.c:	Factor out duplicate code from
-	Tcl_AppendObjToObj.
-
-	* generic/tclStringObj.c:	Replace the 'size_t uallocated' field
-	of the String struct, storing the number of bytes allocated to store
-	the Tcl_UniChar array, with an 'int maxChars' field, storing the
-	number of Tcl_UniChars that may be stored in the allocated space.
-	This reduces memory requirement a small bit, and makes some range
-	checks simpler to code.
-	* generic/tclTestObj.c:	Replace the [teststringobj ualloc] testing
-	* tests/stringObj.test:	command with [teststringobj maxchars] and
-	update the tests.
-
-	* generic/tclStringObj.c:	Removed limitation in
-	Tcl_AppendObjToObj where the char length of the result was only
-	computed if the appended string was all single byte characters.
-	This limitation was in place to dodge a bug in Tcl_GetUniChar.
-	With that bug gone, we can take advantage of always recording the
-	length of append results when we know it.
-
-2009-02-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Revisions so that we avoid creating
-	the strange representation of an empty string with
-	objPtr->bytes == NULL and stringPtr->hasUnicode == 0.  Instead in
-	the situations where that was being created, create a traditional
-	two-legged stork representation (objPtr->bytes = tclEmptyStringRep
-	and stringPtr->hasUnicode = 1).  In the situations where the strange
-	rep was treated differently, continue to do so by testing
-	stringPtr->numChars == 0 to detect it.  These changes make the code
-	more conventional so easier for new maintainers to pick up.  Also
-	sets up further simplifications.
-
-	* generic/tclTestObj.c:	Revise updates to [teststringobj] so we don't
-	get blocked by MODULE_SCOPE limits.
-
-2009-02-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Rewrites of the routines
-	Tcl_GetCharLength, Tcl_GetUniChar, Tcl_GetUnicodeFromObj,
-	Tcl_GetRange, and TclStringObjReverse to use the new macro, and
-	to more simply and clearly split the cases depending on whether
-	a valid unicode rep is present or needs to be created.
-	New utility routine UnicodeLength(), to compute the length of unicode
-	buffer arguments when no length is passed in, with built-in
-	overflow protection included.  Update three callers to use it.
-
-	* generic/tclInt.h:	New macro TclNumUtfChars meant to be a faster
-	replacement for a full Tcl_NumUtfChars() call when the string has all
-	single-byte characters.
-
-	* generic/tclStringObj.c:	Simplified Tcl_GetCharLength by
-	* generic/tclTestObj.c:		removing code that did nothing.
-	Added early returns from Tcl_*SetObjLength when the desired length
-	is already present; adapted test command to the change.
-
-	* generic/tclStringObj.c:	Re-implemented AppendUtfToUnicodeRep
-	so that we no longer pass through Tcl_DStrings which have their own
-	sets of problems when lengths overflow the int range.  Now AUTUR and
-	FillUnicodeRep share a common core routine.
-
-2009-02-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOODefineCmds.c (TclOOGetDefineCmdContext): Use the
-	correct field in the Interp structure for retrieving the frame to get
-	the context object so that people can extend [oo::define] without deep
-	shenanigans. Bug found by Federico Ferri.
-
-2009-02-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Re-implemented AppendUnicodeToUtfRep
-	so that we no longer pass through Tcl_DStrings which have their own
-	sets of problems when lengths overflow the int range.  Now AUTUR and
-	UpdateStringOfString share a common core routine.
-
-	* generic/tclStringObj.c:	Changed type of the 'allocated' field
-	* generic/tclTestObj.c:		of the String struct (and the
-	TestString counterpart) from size_t to int since only int values are
-	ever stored in it.
-
-2009-02-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclEncoding.c: Eliminate some unnessary type casts
-	* generic/tclEvent.c:    some internal const decorations
-	* generic/tclExecute.c:  spacing
-	* generic/tclIndexObj.c:
-	* generic/tclInterp.c:
-	* generic/tclIO.c:
-	* generic/tclIOCmd.c:
-	* generic/tclIORChan.c:
-	* generic/tclIOUtil.c:
-	* generic/tclListObj.c:
-	* generic/tclLiteral.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclOOBasic.c:
-	* generic/tclPathObj.c:
-	* generic/tclPkg.c:
-	* generic/tclProc.c:
-	* generic/tclRegexp.c:
-	* generic/tclScan.c:
-	* generic/tclStringObj.c:
-	* generic/tclTest.c:
-	* generic/tclTestProcBodyObj.c:
-	* generic/tclThread.c:
-	* generic/tclThreadTest.c:
-	* generic/tclTimer.c:
-	* generic/tclTrace.c:
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-	* generic/tclStubInit.c: (regenerated)
-
-2009-02-10  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4: [Bug 2502365]: Building of head on HPUX is broken when
-	using the native CC.
-	* unix/configure: (autoconf-2.59)
-
-2009-02-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclObj.c (Tcl_GetString):	Added comments and validity
-	checks following the call to an UpdateStringProc.
-
-	* generic/tclStringObj.c: Reduce code duplication in Tcl_GetUnicode*.
-	Restrict AppendUtfToUtfRep to non-negative length appends.
-	Convert all Tcl_InvalidateStringRep() calls into macros.
-	Simplify Tcl_AttemptSetObjLength by removing unreachable code.
-	Simplify SetStringFromAny() by removing unreachable and duplicate code.
-	Simplify Tcl_SetObjLength by removing unreachable code.
-	Removed handling of (objPtr->bytes != NULL) from UpdateStringOfString,
-	which is only called when objPtr->bytes is NULL.
-
-2009-02-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCompile.c: [Bug 2555129]: const compiler warning (as
-	error) in tclCompile.c
-
-2009-02-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (TclZlibCmd): [Bug 2573172]: Ensure that when
-	invalid subcommand name is given, the list of valid subcommands is
-	produced. This gives a better experience when using the command
-	interactively.
-
-2009-02-05  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclInterp.c: [Bug 2544618]: Fix argument checking for
-	[interp cancel].
-	* unix/Makefile.in: Fix build issue with zlib on FreeBSD (and possibly
-	other platforms).
-
-2009-02-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (StringIndexCmd, StringRangeCmd, StringLenCmd):
-	Simplify the implementation of some commands now that the underlying
-	string API knows more about bytearrays.
-
-	* generic/tclExecute.c (TclExecuteByteCode): [Bug 2568434]: Make sure
-	that INST_CONCAT1 will not lose string reps wrongly.
-
-	* generic/tclStringObj.c (Tcl_AppendObjToObj): Special-case the
-	appending of one bytearray to another, which can be extremely rapid.
-	Part of scheme to address [Bug 1665628] by making the basic string
-	operations more efficient on byte arrays.
-	(Tcl_GetCharLength, Tcl_GetUniChar, Tcl_GetRange): More special casing
-	work for bytearrays.
-
-2009-02-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c: [Bug 2561794]: Added overflow protections to
-	the AppendUtfToUtfRep routine to either avoid invalid arguments and
-	crashes, or to replace them with controlled panics.
-
-	* generic/tclCmdMZ.c:	[Bug 2561746]: Prevent crashes due to int
-	overflow of the length of the result of [string repeat].
-
-2009-02-03  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* macosx/tclMacOSXFCmd.c: Eliminate some unnessary type casts
-	* unix/tclLoadDyld.c:	  some internal const decorations
-	* unix/tclUnixCompat.c:	  spacing
-	* unix/tclUnixFCmd.c
-	* unix/tclUnixFile.c
-	* win/tclWinDde.c
-	* win/tclWinFCmd.c
-	* win/tclWinInit.c
-	* win/tclWinLoad.c
-	* win/tclWinPipe.c
-	* win/tclWinReg.c
-	* win/tclWinTest.c
-	* generic/tclBasic.c
-	* generic/tclBinary.c
-	* generic/tclCmdAH.c
-	* generic/tclCmdIL.c
-	* generic/tclCmdMZ.c
-	* generic/tclCompCmds.c
-	* generic/tclDictObj.c
-
-2009-02-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclObj.c (tclCmdNameType): [Bug 2558422]: Corrected the type
-	of this structure so that extensions that write it (yuk!) will still
-	be able to function correctly.
-
-2009-02-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c (SetUnicodeObj):	[Bug 2561488]:
-	Corrected failure of Tcl_SetUnicodeObj() to panic on a shared object.
-	Also factored out common code to reduce duplication.
-
-	* generic/tclObj.c (Tcl_GetStringFromObj): Reduce code duplication.
-
-2009-02-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInterp.c:	Reverted the conversion of [interp] into an
-	* tests/interp.test:	ensemble.  Such conversion is not necessary
-	* tests/nre.test:	(or even all that helpful) in the NRE-enabling
-	of [interp invokehidden], and it has other implications -- including
-	significant forkage of the 8.5 and 8.6 implementations -- that are
-	better off avoided if there's no gain.
-
-	* generic/tclStringObj.c (STRING_NOMEM):  [Bug 2494093]: Add missing
-	cast of NULL to (char *) that upsets some compilers.
-
-	* generic/tclStringObj.c (Tcl_(Attempt)SetObjLength):	[Bug 2553906]:
-	Added protections against callers asking for negative lengths.  It is
-	likely when this happens that an integer overflow is to blame.
-
-2009-02-01  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/makefile.vc: Allow nmake flags such as -a (rebuild all) to pass
-	down to the pkgs targets, too.
-
-2009-01-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/chan.n: [Bug 1216074]: Added another extended example.
-
-	* doc/refchan.n: Added an example of how to build a scripted channel.
-
-2009-01-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/stringObj.test: [Bug 2006888]: Remove non-ASCII chars from
-	non-comment locations in the file, making it work more reliably in
-	locales with a non-Latin-1 default encoding.
-
-	* generic/tclNamesp.c (Tcl_FindCommand): [Bug 2519474]: Ensure that
-	the path is not searched when the TCL_NAMESPACE_ONLY flag is given.
-
-	* generic/tclOODecls.h (Tcl_OOInitStubs): [Bug 2537839]: Make the
-	declaration of this macro work correctly in the non-stub case.
-
-2009-01-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInterp.c:	Convert the [interp] command into a
-	* tests/interp.test:	[namespace ensemble].  Work in progress
-	* tests/nre.test:	to NRE-enable the [interp invokehidden]
-	subcommand.
-
-2009-01-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNamesp.c (TclMakeEnsemble): [Bug 2529117]: Make this
-	function behave more sensibly when presented with a fully-qualified
-	name, rather than doing strange stuff.
-
-2009-01-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (TclInvokeObjectCommand): Made this understand
-	what to do if it ends up being used on a command with no objProc; that
-	shouldn't happen, but...
-
-	* generic/tclNamesp.c (TclMakeEnsemble): [Bug 2529157]: Made this
-	understand NRE command implementations better.
-	* generic/tclDictObj.c (DictForCmd): Eliminate unnecessary command
-	implementation.
-
-2009-01-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOODefineCmds.c (Tcl_ClassSetConstructor):
-	[Bug 2531577]: Ensure that caches of constructor chains are cleared
-	when the constructor is changed.
-
-2009-01-26  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclInt.h:   [Bug 1028264]: WSACleanup() too early.
-	* generic/tclEvent.c: The fix introduces "late exit handlers" for
-	* win/tclWinSock.c:   similar late process-wide cleanups.
-
-2009-01-26  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* win/tclWinSock.c: [Bug 2446662]: Resync Win behavior on RST with
-	that of unix (EOF).
-
-2009-01-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ChanClose): [Bug 2536400]: Only generate error
-	messages in the interpreter when the thread is not being closed down.
-
-2009-01-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/zlib.n: Added a note that 'zlib push' is reversed by 'chan pop'.
-
-2009-01-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCompile.h:	CONSTify TclPrintInstruction (TIP #27)
-	* generic/tclCompile.c
-	* generic/tclInt.h:	CONSTify TclpNativeJoinPath (TIP #27)
-	* generic/tclFileName.c
-	* generic/tcl.decls:	{unix win} is equivalent to {generic}
-	* generic/tclInt.decls
-	* generic/tclDecls.h:	(regenerated)
-	* generic/tclIntDecls.h
-	* generic/tclGetDate.y:	Single internal const decoration.
-	* generic/tclDate.c:
-
-2009-01-22  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/tcl.m4: Corrected a typo ($(SHLIB_VERSION) should be
-	${SHLIB_VERSION}).
-	* unix/configure: Autoconf 2.59
-
-2009-01-21  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c (ReflectClose): [Bug 2458202]:
-	* generic/tclIORTrans.c (ReflectClose): Closing a channel may supply
-	NULL for the 'interp'. Test for finalization needs to be different,
-	and one place has to pull the interp out of the channel instead.
-
-2009-01-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c: New fix for [Bug 2494093] replaces the
-	flawed attempt committed 2009-01-09.
-
-2009-01-19  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/Makefile.in: [Patch 907924]:Added a CONFIG_INSTALL_DIR
-	* unix/tcl.m4:      parameter so that distributors can control where
-	tclConfig.sh goes. Made the installation of 'ldAix' conditional upon
-	actually being on an AIX system. Allowed for downstream packagers to
-	customize SHLIB_VERSION on BSD-derived systems. Thanks to Stuart
-	Cassoff for his help.
-	* unix/configure: Autoconf 2.59
-
-2009-01-19  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/build.vc.bat: Improved tools detection and error message
-	* win/makefile.vc: Reorganized the $(TCLOBJ) file list into separate
-	parts for easier maintenance. Matched all sources built using -GL to
-	both $(lib) and $(link) to use -LTCG and avoid a warning message.
-	Addressed the over-building nature of the htmlhelp target by moving
-	from a pseudo target to a real target dependent on the entire docs/
-	directory contents.
-	* win/nmakehlp.c: Removed -g option and GrepForDefine() func as it
-	isn't being used anymore. The -V option method is much better.
-
-2009-01-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Bump patchlevel to 8.6b1.1 to distinguish
-	* library/init.tcl:	CVS snapshots from the 8.6b1 and 8.6b2 releases
-	* unix/configure.in:	and to deal with the fact that the 8.6b1
-	* win/configure.in:	version of init.tcl will not [source] in the
-	HEAD version of Tcl.
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2009-01-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_DeleteCommandFromToken):	Reverted most
-	of the substance of my 2009-01-12 commit. NULLing the objProc field of
-	a Command when deleting it is important so that tests for certain
-	classes of commands don't return false positives when applied to
-	deleted command tokens. Overall change is now just replacement of a
-	false comment with a true one.
-
-2009-01-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tcl.m4: [Bug 2502365]: Building of head on HPUX is broken when
-	using the native CC.
-	* unix/configure (autoconf-2.59)
-
-2009-01-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (Tcl_ThrowObjCmd):	Move implementation of [throw]
-	* library/init.tcl (throw):		to C from Tcl.
-
-2009-01-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_DeleteCommandFromToken): One consequence of
-	the NRE rewrite is that there are now situations where a NULL objProc
-	field in a Command struct is perfectly normal. Removed an outdated
-	comment in Tcl_DeleteCommandFromToken that claimed we use
-	cmdPtr->objPtr==NULL as a test of command validity. In fact we use
-	cmdPtr->flags&CMD_IS_DELETED to perform that test. Also removed the
-	setting to NULL, since any extension following the advice of the old
-	comment is going to be broken by NRE anyway, and needs to shift to
-	flag-based testing (or stop intruding into such internal matters).
-	Part of [Bug 2486550].
-
-2009-01-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c (STRING_SIZE): [Bug 2494093]: Corrected
-	failure to limit memory allocation requests to the sizes that can be
-	supported by Tcl's memory allocation routines.
-
-2009-01-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNamesp.c (NamespaceEnsembleCmd): [Bug 1558654]: Error out
-	when someone gives wrong # of args to [namespace ensemble create].
-
-2009-01-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c (STRING_UALLOC): [Bug 2494093]: Added missing
-	parens required to get correct results out of things like
-	STRING_UALLOC(num + append).
-
-2009-01-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c, generic/tclIndexObj.c, generic/tclListObj.c,
-	* generic/tclObj.c, generic/tclStrToD.c, generic/tclUtil.c,
-	* generic/tclVar.c: Generate errorcodes for the error cases which
-	approximate to "I can't interpret that string as one of those" and
-	"You gave me the wrong number of arguments".
-
-2009-01-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/dict.n: [Tk Bug 2491235]: Added more examples.
-
-	* tests/oo.test (oo-22.1): Adjusted test to be less dependent on the
-	specifics of how [info frame] reports general frame information, and
-	instead to focus on what methods add to it; that's really what the
-	test is about anyway.
-
-2009-01-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/stringObj.test:	Revise tests that demand a NULL Tcl_ObjType
-	in certain values to construct those values with [testdstring] so
-	there's no lack of robustness depending on the shimmer history of
-	shared literals.
-
-2009-01-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (DictIncrCmd): Corrected twiddling in internals
-	of dictionaries so that literals can't get destroyed.
-
-	* tests/expr.test: [Bug 2006879]: Eliminate non-ASCII char.
-
-	* generic/tclOOInfo.c (InfoObjectMethodsCmd,InfoClassMethodsCmd):
-	[Bug 2489836]: Only delete pointers that were actually allocated!
-
-	* generic/tclOO.c (TclNRNewObjectInstance, Tcl_NewObjectInstance):
-	[Bug 2481109]: Perform search for existing commands in right context.
-
-2009-01-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (TclNRSourceObjCmd): [Bug 2412068]: Make
-	* generic/tclIOUtil.c (TclNREvalFile):    implementation of the
-	[source] command be NRE enabled so that [yield] inside a script
-	sourced in a coroutine can work.
-
-2009-01-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdAH.c: Tidy up spacing and code style.
-
-2009-01-03  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (tcl::clock::add): Fixed error message formatting
-	in the case where [clock add] is presented with a bad switch.
-	* tests/clock.test (clock-65.1) Added a test case for the above
-	problem [Bug 2481670].
-
-2009-01-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): [Bug 878333]: Force the use of the
-	compatibility version of mkstemp() on IRIX.
-	* unix/configure.in, unix/Makefile.in (mkstemp.o):
-	* compat/mkstemp.c (new file): [Bug 741967]: Added a compatibility
-	implementation of the mkstemp() function, which is apparently needed
-	on some platforms.
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2008 IN "ChangeLog.2008"             ***
-	*** CHANGELOG ENTRIES FOR 2006-2007 IN "ChangeLog.2007"        ***
-	*** CHANGELOG ENTRIES FOR 2005 IN "ChangeLog.2005"             ***
-	*** CHANGELOG ENTRIES FOR 2004 IN "ChangeLog.2004"             ***
-	*** CHANGELOG ENTRIES FOR 2003 IN "ChangeLog.2003"             ***
-	*** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"             ***
-	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"             ***
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"             ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/ChangeLog.1999 b/ChangeLog.1999
deleted file mode 100644
index e736dee..0000000
--- a/ChangeLog.1999
+++ /dev/null
@@ -1,2634 +0,0 @@
-1999-12-22  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* changes: updated changes file
-	* tools/tclSplash.bmp: updated to show 8.3
-
-1999-12-21  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* README:
-	* generic/tcl.h:
-	* mac/README:
-	* unix/configure.in:
-	* tools/tcl.wse.in:
-	* win/README.binary:
-	* win/configure.in: updated to patch level 8.3b1
-
-	* unix/Makefile.in: added -srcdir=... for 'make html'
-
-	* doc/Hash.3: fixed reference to ckfree [Bug 3912]
-	* doc/RegExp.3: fixed calling params for Tcl_RegExecFromObj
-	* doc/open.n: fixed minor formatting errors
-	* doc/string.n: fixed minor formatting errors
-
-	* doc/lsort.n: added -unique docs
-	* tests/cmdIL.test:
-	* generic/tclCmdIL.c: added -unique option to lsort
-
-	* generic/tclThreadTest.c: changed thread ids to longs [Bug 3902]
-
-	* mac/tclMacOSA.c: fixed applescript for I18N [Bug 3644]
-
-	* win/mkd.bat:
-	* win/rmd.bat: removed necessity of tag.txt [Bug 3874]
-
-	* win/tclWinThrd.c: changed CreateThread to _beginthreadex and
-	ExitThread to _endthreadex
-
-1999-12-12  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/glob.n:
-	* tests/fileName.test:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclEncoding.c:
-	* generic/tclFileName.c:
-	* mac/tclMacFile.c:
-	* unix/tclUnixFile.c:
-	* win/tclWinFile.c: enhanced the glob command with the new options
-	-types -path -directory and -join. Deprecated TclpMatchFiles with
-	TclpMatchFilesTypes, extended TclGlob and TclDoGlob and added
-	GlobTypeData structure. [Bug 2363]
-
-1999-12-10  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/var.test:
-	* generic/tclCompile.c: fixed problem where setting to {} array would
-	intermittently not work. [Bug 3339] (Fontaine)
-
-	* generic/tclCmdMZ.c:
-	* generic/tclExecute.c: optimized INST_TRY_CVT_TO_NUMERIC to recognize
-	boolean objects. [Bug 2815] (Spjuth)
-
-	* tests/info.test:
-	* tests/parseOld.test:
-	* generic/tclCmdAH.c:
-	* generic/tclProc.c: changed Tcl_UplevelObjCmd (uplevel) and
-	Tcl_EvalObjCmd (eval) to use TCL_EVAL_DIRECT in the single arg case as
-	well, to take advantage of potential pure list input optimization.
-	This means that it won't get byte compiled though, which should be
-	acceptable.
-	* generic/tclBasic.c: made Tcl_EvalObjEx pure list object aware in the
-	TCL_EVAL_DIRECT case for efficiency.
-	* generic/tclUtil.c: made Tcl_ConcatObj pure list object aware, and
-	return a list object in that case [Bug 2098 2257]
-
-	* generic/tclMain.c: changed Tcl_Main to not constantly reuse the
-	commandPtr object (interactive case) as it could be shared. (Fellows)
-
-	* unix/configure.in:
-	* unix/tcl.m4:
-	* unix/tclUnixPipe.c: removed checking for compatible vfork function
-	and use of the vfork function. Modern VM systems rarely suffer any
-	performance degradation when fork is used, and it solves multiple
-	problems with vfork. Users that still want vfork can add -Dfork=vfork
-	to the compile flags. [Bug 942 2228 1312]
-
-1999-12-09  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* win/aclocal.m4: made it just include tcl.m4
-
-	* doc/exec.n:
-	* doc/open.n:
-	* win/tclWin32Dll.c:
-	* win/tclWinChan.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinInit.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSock.c: removed all code that supported Win32s. It was no
-	longer officially supported, and likely didn't work anyway.
-	* win/makefile.vc: removed 16 bit stuff, cleaned up.
-
-	* win/tcl16.rc:
-	* win/tclWin16.c:
-	* win/winDumpExts.c: these files have been removed from the source
-	tree (no longer necessary to build)
-
-1999-12-07  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/io.test: removed 'knownBug' tests that were for unsupported0,
-	which is now fcopy (that already has tests)
-
-	* mac/tclMacPort.h: added utime.h include
-
-	* generic/tclDate.c:
-	* unix/Makefile.in: fixed make gendate to swap const with CONST so it
-	uses the Tcl defined CONST type [Bug 3521]
-
-	* generic/tclIO.c: removed panic that could occur in FlushChannel when
-	a "blocking" channel would receive EAGAIN, instead treating it the
-	same as non-blocking. [Bug 3773]
-
-	* generic/tclUtil.c: fixed Tcl_ScanCountedElement to not step beyond
-	the end of the counted string. [Bug 3336]
-
-1999-12-03  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/load.n: added note about NT's buggy handling of './' with
-	LoadLibrary
-
-	* library/http2.1/http.tcl: fixed error handling in http::Event. [Bug
-	3752]
-
-	* tests/env.test: removed knownBug limitation from working test
-	* tests/all.tcl: ensured that ::tcltest::testsDirectory would be set
-	to an absolute path
-
-	* tests/expr-old.test:
-	* tests/parseExpr.test:
-	* tests/string.test:
-	* generic/tclGet.c:
-	* generic/tclInt.h:
-	* generic/tclObj.c:
-	* generic/tclParseExpr.c:
-	* generic/tclUtil.c:
-	* generic/tclExecute.c: added TclCheckBadOctal routine to enhance
-	error message checking for when users use invalid octal numbers (like
-	08), as well as replumbed the Expr*Funcs with a new VerifyExprObjType
-	to simplify type handling. [Bug 2467]
-
-	* tests/expr.test:
-	* generic/tclCompile.c: fixed 'bad code length' error for 'expr +
-	{[incr]}' case, with new test case [Bug 3736] and seg fault on 'expr
-	+ {[error]}' (different cause) that was caused by a correct
-	optimization that didn't correctly track how it was modifying the
-	source string in the opt. The optimization was removed, which means
-	that:
-		expr 1 + {[string length abc]}
-	will be not be compiled inline as before, but this should be written:
-		expr {1 + [string length abc]}
-	which will be compiled inline for speed. This prevents:
-		expr 1 + {[mindless error]}
-	from seg faulting, and only affects optimizations for degenerate cases
-	[Bug 3737]
-
-1999-12-01  Scott Redman <redman@scriptics.com>
-
-	* generic/tcl.decls:
-	* generic/tclMain.c:
-	* unix/tclAppInit.c:
-	* win/tclAppInit.c: Added two new internal functions,
-	TclSetStartupScriptFileName() and TclGetStartupScriptFileName() and
-	added hooks into the main() code for supporting TclPro and other "big"
-	shells more easily without requiring a copy of the main() code.
-
-	* generic/tclEncoding.c:
-	* generic/tclEvent.c: Moved encoding-related startup code from
-	tclEvent.c into the more appropriate tclEncoding.c.
-
-1999-11-30  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclIO.c: fix from Kupries for	Tcl_UnstackChannel that
-	correctly handles resetting translation and encoding.
-
-	* generic/tclLoad.c: #def'd out the unloading of DLLs at finalize time
-	for Unix in TclFinalizeLoad. [Bug 2560 3373] Should be parametrized
-	to allow for user to specify unload or not.
-
-	* win/tclWinTime.c: fixed handling of %Z on NT for time zones that
-	don't have DST.
-
-1999-11-29  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* library/dde1.1/pkgIndex.tcl:
-	* library/reg1.0/pkgIndex.tcl: added supported for debugged versions
-	of the libraries
-
-	* unix/tclUnixPipe.c: fixed PipeBlockModeProc to properly set
-	isNonBlocking flag on pipe. [Bug 1356 710]
-	removed spurious fcntl call from PipeBlockModeProc
-
-	* tests/scan.test:
-	* generic/tclScan.c: fixed scan where %[..] didn't match anything and
-	added test case. [Bug 3700]
-
-1999-11-24  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/open.n:
-	* win/tclWinSerial.c: adopted patch from Schroedter to handle
-	fconfigure $sock -lasterror on Windows. [RFE 3368]
-
-	* generic/tclCmdIL.c: made SORTMODE_INTEGER work with Longs [Bug 3652]
-
-1999-11-23  Scott Stanton  <stanton@scriptics.com>
-
-	* library/tcltest1.0/tcltest.tcl: Fixed bug where tcltest output went
-	to stdout instead of the specified output file in some cases.
-
-1999-11-19  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclProc.c: backed out change from 1999-11-18 as it could
-	affect return string from upvar as well.
-
-	* tools/tcl.wse.in: added tcltest1.0 library to distribution list
-
-	* doc/http.n:
-	* library/http2.1/http.tcl:
-	* library/http2.1/pkgIndex.tcl: updated http package to 2.2
-
-1999-11-18  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/tcl.m4: added defined for _THREAD_SAFE in --enable-threads
-	case; added check for pthread_mutex_init in libc; in AIX case, with
-	--enable-threads ${CC}_r is used; fixed flags when using gcc on SCO
-
-	* generic/tclProc.c: corrected error reporting for default case at the
-	global level for uplevel command.
-
-	* generic/tclIOSock.c: changed int to size_t type for len in
-	TclSockMinimumBuffers.
-
-	* generic/tclCkalloc.c: fixed Tcl_DbCkfree to return a value on NULL
-	input. [Bug 3400]
-
-	* generic/tclStringObj.c: fixed support for passing in negative length
-	to Tcl_SetUnicodeObj, et al handling routines. [Bug 3380]
-
-	* doc/scan.n:
-	* tests/scan.test:
-	* generic/tclScan.c: finished support for inline scan by supporting
-	XPG identifiers.
-
-	* doc/http.n:
-	* library/http2.1/http.tcl: added register and unregister commands to
-	http:: package (better support for tls/SSL), as well as -type argument
-	to http::geturl. [RFE 2617]
-
-	* generic/tclBasic.c: removed extra decr of numLevels in Tcl_EvalObjEx
-	that could cause seg fault. (mjansen@wendt.de)
-
-	* generic/tclEvent.c: fixed possible lack of MutexUnlock in
-	Tcl_DeleteExitHandler. [Bug 3545]
-
-	* unix/tcl.m4: Added better pthreads library check and inclusion of
-	_THREAD_SAFE in --enable-threads case
-	Added support for gcc config on SCO
-
-	* doc/glob.n: added note about ..../ glob behavior on Win9*
-	* doc/tcltest.n: fixed minor example errors. [Bug 3551]
-
-1999-11-17 Brent Welch <welch@scriptics.com>
-
-	* library/http2.1/http.tcl: Correctly fixed the -timeout problem
-	mentioned in the 10-29 change. Also added error handling for failed
-	writes on the socket during the protocol.
-
-1999-11-09  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/open.n: corrected docs for 'a' open mode.
-
-	* generic/tclIOUtil.c: changed Tcl_Alloc to ckalloc
-
-	* generic/tclInt.h:
-	* generic/tclObj.c: rolled back changes from 1999-10-29
-	Purify noted new leaks with that code
-
-	* generic/tclParse.c: added code in Tcl_ParseBraces to test for
-	possible unbalanced open brace in a comment
-
-	* library/init.tcl: removed the installed binary directory from the
-	auto_path variable
-
-	* tools/tcl.wse.in: updated to 8.3a1, fixed install of twind.tcl and
-	koi8-r.enc files
-
-	* unix/tcl.m4: added recognition of pthreads library for AIX
-
-1999-10-29  Brent Welch <welch@scriptics.com>
-
-	* generic/tclInt.h: Modified the TclNewObj and TclDecrRefCount in two
-	ways. First, in the case of TCL_THREADS, we do not use the special
-	Tcl_Obj allocator because that is a source of lock contention. Second,
-	general code cleanup to eliminate duplicated code. In particular,
-	TclDecrRefCount now uses TclFreeObj instead of duplicating that code,
-	so it is now identical to Tcl_DecrRefCount.
-
-	* generic/tclObj.c: Changed Tcl_NewObj so it uses the TclNewObj macro
-	instead of duplicating the code. Adjusted TclFreeObj so it understands
-	the TCL_THREADS case described above.
-
-	* library/http2.1/http.tcl: Fixed a bug in the handling of the
-	state(status) variable when the -timeout flag is specified. Previously
-	it was possible to leave the status undefined instead of empty, which
-	caused errors in http::status
-
-1999-10-28  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/aclocal.m4: made it just include tcl.m4
-
-	* library/tcltest1.0/tcltest.tcl: updated makeFile to return full
-	pathname of file created
-
-	* generic/tclStringObj.c: fixed Tcl_AppendStringsToObjVA so it only
-	iterates once over the va_list (avoiding a memcpy of it, which is not
-	portable).
-
-	* generic/tclEnv.c: fixed possible ABR error in environ array
-
-	* tests/scan.test:
-	* generic/tclScan.c: added support for use of inline scan, XPG3
-	currently not included
-
-	* tests/incr.test:
-	* tests/set.test:
-	* generic/tclCompCmds.c: fixed improper bytecode handling of 'eval
-	{set array($unknownvar) 5}' (also for incr). [Bug 3184]
-
-	* win/tclWinTest.c: added testvolumetype command, as atime is
-	completely ignored for Windows FAT file systems
-	* win/tclWinPort.h: added sys/utime.h to includes
-	* unix/tclUnixPort.h: added utime.h to includes
-	* doc/file.n:
-	* tests/cmdAH.test:
-	* generic/tclCmdAH.c: added time arguments to atime and mtime file
-	command methods (support 'touch' functionality)
-
-1999-10-20  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/tclUnixNotfy.c: fixed event/io threading problems by making
-	triggerPipe non-blocking. [Bug 2792]
-
-	* library/tcltest1.0/tcltest.tcl:
-	* generic/tclThreadTest.c: fixed mem leaks in threads
-
-	* generic/tclResult.c: fixed Tcl_AppendResultVA so it only iterates
-	once over the va_list (avoiding a memcpy of it, which is not
-	portable).
-
-	* generic/regc_color.c: fixed mem leak and assertion, from HS
-
-	* generic/tclCompile.c: removed savedChar trick that appeared to be
-	causing a segv when the literal table was released
-
-	* tests/string.test:
-	* generic/tclCmdMZ.c: fixed [string index] to return ByteArrayObj when
-	indexing into one (test case string-5.16). [Bug 2871]
-
-	* library/http2.1/http.tcl: protected gets with catch. [Bug 2665]
-
-1999-10-19  Jennifer Hom  <jenn@scriptics.com>
-
-	* tests/tcltest.test:
-	* doc/tcltest.n:
-	* library/tcltest1.0/tcltest.tcl: Removed the extra return at the end
-	of the tcltest.tcl file, added version information about tcl.
-
-	Applied patches sent in by Andreas Kupries to add helper procs for
-	debug output, add 3 new flags (-testsdir, -load, -loadfile), and
-	internally refactors common code for dealing with paths into separate
-	procedures. [Bug 2838, 2842]
-
-	Merged code from core-8-2-1 branch that changes the checks for the
-	value of tcl_interactive to also incorporate a check for the existence
-	of the variable.
-
-	* tests/autoMkindex.test:
-	* tests/pkgMkIndex.test: Explicitly cd to ::tcltest::testsDirectory at
-	the beginning of the test run
-
-	* tests/basic.test: Use version information defined in tcltest instead
-	of hard-coded version number
-
-	* tests/socket.test: package require tcltest before attempting to use
-	variable defined in tcltest namespace
-
-	* tests/unixInit.test:
-	* tests/unixNotfy.test: Added explicit exits needed to avoid problems
-	when the tests area run in wish.
-
-1999-10-12  Jim Ingham  <jingham@scriptics.com>
-
-	* mac/tclMacLoad.c: Stupid bug - we converted the filename to
-	external, but used the unconverted version.
-	* mac/tclMacFCmd.c: Fix a merge error in the bug fix for [Bug 2869]
-
-1999-10-12  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/regc_color.c:
-	* generic/regc_cvec.c:
-	* generic/regc_lex.c:
-	* generic/regc_locale.c:
-	* generic/regcomp.c:
-	* generic/regcustom.h:
-	* generic/regerrs.h:
-	* generic/regex.h:
-	* generic/regexec.c:
-	* generic/regguts.h:
-	* generic/tclRegexp.c:
-	* generic/tclTest.c:
-	* tests/reg.test: updated to Henry Spencer's new regexp engine
-	(mid-Sept 99). Should greatly reduce stack space reqs.
-
-	* library/tcltest1.0/pkgIndex.tcl: fixed procs in pkgIndex.tcl file
-
-	* generic/tclEnv.c: fixed mem leak with putenv and DStrings
-	* doc/Encoding.3: corrected docs
-	* tests/basic.test: updated test cases for 8.3
-	* tests/encoding.test: fixed test case that change system encoding to
-	a double-byte one (this causes a bogus mem read error for purify)
-	* unix/Makefile.in: purify has to use -best-effort to instrument
-	* unix/tclAppInit.c: identified potential mem leak when compiling
-	tcltest (not critical)
-	* unix/tclUnixPipe.c: fixed mem leak in TclpCreateProcess when doing
-	alloc between vfork and execvp.
-	* unix/tclUnixTest.c: fixed mem leak in findexecutable test command
-
-1999-10-05  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* {win,mac,unix,tools,}/README:
-	* win/README.binary:
-	* win/makefile.vc:
-	* {win,unix}/configure.in:
-	* generic/tcl.h:
-	* library/init.tcl: updated to 8.3a1 from 8.2.0.
-
-	* library/http2.1/http.tcl: fixed possible use of global c var.
-
-	* win/tclWinReg.c: fixed registry command to properly 'get'
-	HKEY_PERFORMANCE_DATA root key data. Needs more work.
-
-	* generic/tclNamesp.c:
-	* generic/tclVar.c:
-	* generic/tclCmdIL.c: fixed comment typos
-
-	* mac/tclMacFCmd.c: fixed filename stuff to support UTF-8. [Bug 2869]
-
-	* win/tclWinSerial.c: changed SerialSetOptionProc to return TCL_OK by
-	default. (patch from Rolf Schroedter)
-
-1999-09-21  Jennifer Hom  <jenn@scriptics.com>
-
-	* library/tcltest1.0/tcltest.tcl: Applied patches sent in by Andreas
-	Kupries to fix typos in comments and ::tcltest::grep, fix hook
-	redefinition problems, and change "string compare" to "string equal".
-	[Bug 2836, 2837, 2839, 2840]
-
-1999-09-20  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/env.test:
-	* unix/Makefile.in: added support for AIX LIBPATH env var. [Bug 2793]
-	removed second definition of INCLUDE_INSTALL_DIR (the one that
-	referenced @includedir@) [Bug 2805]
-	* unix/dltest/Makefile.in: added -lc to LIBS. [Bug 2794]
-
-1999-09-16  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/timer.test: changed after delay in timer test 6.29 from 1 to
-	10. [Bug 2796]
-
-	* tests/pkg.test:
-	* generic/tclPkg.c: fixed package version check to disallow 1.2..3
-	[Bug 2539]
-
-	* unix/Makefile.in: fixed gendate target - this never worked since RCS
-	was intro'd.
-	* generic/tclGetDate.y: updated to reflect previous changes to
-	tclDate.c (leap year calc) and added CEST and UCT time zone
-	recognition. Fixed 4 missing UCHAR() casts. [Bug 2717, 954, 1245,
-	1249]
-
-	* generic/tclCkalloc.c: changed Tcl_DumpActiveMemory to really dump to
-	stderr and close it [Bug 725] and changed Tcl_Ckrealloc and
-	Tcl_Ckfree to not bomb when NULL was passed in [Bug 1719] and changed
-	Tcl_Alloc, et al to not panic when a alloc request for zero came
-	through and NULL was returned (valid on AIX, Tru64) [Bug 2795, etc]
-
-	* tests/clock.test:
-	* doc/clock.n:
-	* generic/tclClock.c: added -milliseconds switch to clock clicks to
-	guarantee that the return value of clicks is in the millisecs
-	granularity. [Bug 2682, 1332]
-
-1999-09-15  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclIOCmd.c: fixed potential core dump in conjunction with
-	stacked channels with result obj manipulation in Tcl_ReadChars. [Bug
-	2623]
-
-	* tests/format.test:
-	* generic/tclCmdAH.c: fixed translation of %0#s in format. [Bug 2605]
-
-	* doc/msgcat.n: fixed \\ bug in example. [Bug 2548]
-
-	* unix/tcl.m4:
-	* unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug 2070]
-	and fix for IRIX SHLIB_LB_LIBS. [Bug 2610]
-
-	* doc/array.n:
-	* tests/var.test:
-	* tests/set.test:
-	* generic/tclVar.c: added an array unset operation, with docs and
-	tests. Variation of [Bug 1775]. Added fix in TclArraySet to check
-	when trying to set in a non-existent namespace. [Bug 2613]
-
-1999-09-14  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/linsert.test:
-	* doc/linsert.n:
-	* generic/tclCmdIL.c: fixed end-int interpretation of linsert to
-	correctly calculate value for end, added test and docs. [Bug 2693]
-
-	* doc/regexp.n:
-	* doc/regsub.n:
-	* tests/regexp.test:
-	* generic/tclCmdMZ.c: add -start switch to regexp and regsub with docs
-	and tests
-
-	* doc/switch.n: added proper use of comments to example.
-	* generic/tclCmdMZ.c: changed switch to complain when an error occurs
-	that seems to be due to a misplaced comment.
-
-	* generic/tclCmdMZ.c: fixed illegal ref for \[0-9] substitutions in
-	regsub. [Bug 2723]
-
-	* generic/tclCmdMZ.c: changed [string equal] to return an Int type
-	object (was a Boolean)
-
-1999-09-01  Jennifer Hom  <jenn@scriptics.com>
-
-	* library/tcltest1.0/tcltest.tcl: Process command-line arguments only
-	::tcltest doesn't have a child namespace (requires that command-line
-	args are processed in that namespace)
-
-1999-09-01  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclParseExpr.c: changed '"' to '\"' to make FreeBSD happy.
-	[Bug 2625]
-	* generic/tclProc.c: moved static buf to better location and changed
-	static msg that would overflow in ProcessProcResultCode [Bug 2483]
-	and added Tcl_DStringFree to Tcl_ProcObjCmd. Also reworked size of
-	static buffers.
-	* tests/stringObj.test: added test 9.11
-	* generic/tclStringObj.c: changed Tcl_AppendObjToObj to properly
-	handle the 1-byte dest and mixed src case where both had had Unicode
-	string len checks made on them. [Bug 2678]
-	* unix/aclocal.m4:
-	* unix/tcl.m4: adjusted fix from 8-21 to add -bnoentry to the AIX-*
-	case and readjusted the range
-
-1999-08-31  Jennifer Hom  <jenn@scriptics.com>
-
-	* library/tcltest1.0/tcltest.tcl:
-	* doc/tcltest.n:
-	* tests/README: Modified testConstraints variable so that it isn't
-	unset every time ::tcltest::initConstraints is called and cleaned up
-	documentation in the README file and the man page.
-
-1999-08-27  Jennifer Hom  <jenn@scriptics.com>
-
-	* tests/env.test:
-	* tests/exec.test:
-	* tests/io.test:
-	* tests/event.test:
-	* tests/tcltest.test: Added 'exit' calls to scripts that the tests
-	themselves write, and removed accidental checkin of knownBugThreaded
-	constraints for Solaris and Linux.
-
-	* library/tcltest1.0/tcltest.tcl: Modified tcltest so that variables
-	are only initialized to their default values if they did not
-	previously exist.
-
-1999-08-26  Jennifer Hom  <jenn@scriptics.com>
-
-	* tests/tcltest.test:
-	* library/tcltest1.0/tcltest.tcl: Added a -args flag that sets a
-	variable named ::tcltest::parameters based on whatever's being sent in
-	as the argument to the -args flag.
-
-1999-08-23  Jennifer Hom  <jenn@scriptics.com>
-
-	* tests/tcltest.test: Added additional tests for -tmpdir, marked all
-	tests that use exec as unixOrPc.
-
-	* tests/encoding.test:
-	* tests/interp.test:
-	* tests/macFCmd.test:
-	* tests/parseOld.test:
-	* tests/regexp.test: Applied patches from Jim Ingham to add encoding
-	to a Mac only interp test, change an error message in macFCmd.tet, put
-	a comment in parseOld.test, fix tests using the testencoding path
-	command, and put unixOrPc constraints on tests that use exec.
-
-1999-08-21  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/aclocal.m4: Changed AIX-4.[2-9] check to AIX-4.[1-9] [Bug 1909]
-
-1999-08-20  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclPosixStr.c: fixed typo. [Bug 2592]
-
-	* doc/*: fixed various nroff bugs in man pages. [Bug 2503 2588]
-
-1999-08-19  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* win/README.binary: fixed version info and some typos. [Bug 2561]
-
-	* doc/interp.n: updated list of commands available in a safe
-	interpreter. [Bug 2526]
-
-	* generic/tclIO.c: changed Tcl_GetChannelNames* to use style guide
-	headers (pleases HP cc)
-
-1999-08-18  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/Eval.3: fixed doc on input args. [Bug 2114]
-
-	* doc/OpenFileChnl.3:
-	* doc/file.n:
-	* tests/cmdAH.test:
-	* tclIO.c:
-	* tclCmdAH.c: added "file channels ?pattern?" tcl command, with
-	associated Tcl_GetChannelNames and Tcl_GetChannelNamesEx public C APIs
-	(added to tcl.decls as well), with docs and tests.
-
-	* tests/expr.test:
-	* generic/tclCompile.c: add TCL_TOKEN_VARIABLE to the part types that
-	cause differed compilation for exprs, to correct the expr
-	double-evaluation problem for vars. Added test cases. Related to [Bug
-	732]
-
-	* unix/Makefile.in: changed the dependency structure so that install-*
-	is dependent on * (ie - install-binaries is dependent on binaries).
-
-	* library/auto.tcl:
-	* library/init.tcl:
-	* library/ldAout.tcl:
-	* library/package.tcl:
-	* library/safe.tcl:
-	* library/word.tcl:
-	* library/http2.1/http.tcl:
-	* library/msgcat1.0/msgcat.tcl: updated libraries to better Tcl style
-	guide (no more string comparisons with == or !=, spacing changes).
-
-1999-08-05  Jim Ingham  <jingham@cygnus.com>
-
-	* mac/tclMacProjects.sea.hqx: Rearrange the projects so that the build
-	directory is separate from the sources. Much more convenient!
-
-1999-08-13  Scott Redman <redman@scriptics.com>
-
-	* /: 8.2.0 tagged for final release
-
-1999-08-12  Scott Stanton  <stanton@scriptics.com>
-
-	* win/Makefile.in: Added COMPILE_DEBUG_FLAGS macro to make it easier
-	to turn on compiler tracing.
-
-	* tests/parse.test:
-	* generic/tclParse.c: Fixed bug in Tcl_EvalEx where the termOffset was
-	not being updated in cases where the evaluation returned a non TCL_OK
-	error code. [Bug 2535]
-
-1999-08-12  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinSerial.c: Applied patch from Petteri Kettunen to remove
-	compiler warning.
-
-1999-08-10  Scott Redman  <redman@scriptics.com>
-
-	* generic/tclAlloc.c:
-	* generic/tclCmdIL.c:
-	* generic/tclIO.c:
-	* generic/tclThread.c:
-	* win/tclWinThrd.c:
-	* unix/tclUnixThrd.c: Fixed Brent's changes so that they work on
-	Windows (and he fixed the bug in the Unix thread implementation).
-
-1999-08-09  Brent Welch  <welch@scriptics.com>
-
-	* generic/tcl.decls:
-	* generic/tclAlloc.c:
-	* generic/tclCkalloc.c:
-	* generic/tclCmdIL.c:
-	* generic/tclDecls.h:
-	* generic/tclIO.c:
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclVar.c:
-	* mac/tclMacThrd.c:
-	* unix/tclUnixThrd.c:
-	* win/tclWinThrd.c: Added use of Tcl_GetAllocMutex to tclAlloc.c and
-	tclCkalloc.c so they can be linked against alternate thread packages.
-	Added Tcl_GetChannelNames to tclIO.c. Added TclVarTraceExists hook so
-	"info exists" triggers read traces exactly like it did in Tcl 7.6.
-	Stubs table changes to reflect new internal and external APIs.
-
-1999-08-09  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/string.test: added largest_int proc to adapt for >32 bit
-	machines and int overflow testing.
-	* tests/tcltest.test: fixed minor error in 8.2 result (from dgp)
-
-	* doc/Object.3: clarified Tcl_DecrRefCount docs. [Bug 1952]
-	* doc/array.n: clarified array pattern docs. [Bug 1330]
-	* doc/clock.n: fixed clock docs. [Bug 693]
-	* doc/lindex.n: clarified to account for new end-int behavior.
-	* doc/string.n: fixed formatting errors. [Bug 2188 2189]
-	* doc/tclvars.n: fixed doc error. [Bug 2042]
-	* library/init.tcl: fixed path handling in auto_execok (it could miss
-	including the normal path on some Windows machines). [Bug 1276]
-
-1999-08-05  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/tclvars.n: Made it clear that tcl_pkgPath was not set for
-	Windows (already mentioned in init.tcl). [Bug 2455]
-	* generic/tclLiteral.c: fixed reference to bytes that might not be
-	null terminated (using objPtr->bytes, which is). [Bug 2496]
-	* library/http2.1/http.tcl: Made use of "i" in init section use local
-	var and start at 0 (was 1). [Bug 2502]
-
-1999-08-04  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/reg.test: Added test for REG_EXPECT bug fixed by Henry's
-	patch.
-
-	* generic/regc_nfa.c:
-	* generic/regcomp.c:
-	* generic/rege_dfa.c:
-	* generic/regexec.c:
-	* generic/regguts.h: Applied patches supplied by Henry Spencer to
-	greatly enhance the performance of certain classes of regular
-	expressions. [Bug 2440, 2447]
-
-1999-08-03  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinInt.h: Remove function declarations in header that was
-	moved to tclInt.decls file in previous changes.
-
-1999-08-02  Scott Redman  <redman@scriptics.com>
-
-	* unix/configure.in:
-	* win/configure.in: Change beta level to b2.
-
-	* generic/tcl.h:
-	* generic/tcl.decls:
-	* generic/tclDecls.h:
-	* generic/tclInt.h:
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclRegexp.h:
-	* generic/tclStubInit.c: Move some exported public and internal
-	functions to the stub tables. Removed functions that are in the stub
-	tables (from this and previous changes) from the original header
-	files.
-
-1999-08-01  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinSock.c: Added comment block to SocketThread() function.
-	Added code to avoid calling TerminateThread(), but instead to send a
-	message to the socket event window to tell it to terminate its thread.
-
-1999-07-30  Jennifer Hom  <jenn@scriptics.com>
-
-	* tests/tcltest.test:
-	* library/tcltest1.0/tcltest.tcl: Exit with non-zero status if there
-	were problems with the way the test suite was started (e.g. wrong #
-	arguments).
-
-1999-07-30  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclInt.decls: added declaractions necessary for the Tcl test
-	code to work wth stubs. [Bug 2445]
-
-1999-07-30  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinPipe.c:
-	* win/Makefile.in: Fixing launching of 16-bit apps on Win9x from wish.
-	The command line was primed with tclpip82.dll, but it was ignored.
-	Fixed that, then fixed the gmake makefile to build tclpip82.dll as an
-	executable.
-
-	* win/tclWinSock.c: Applied small patch to get thread-specific data
-	after initializing the socket driver.
-
-	* unix/tclUnixThrd.c: Applied patch to fix threads on Irix 6.5. Patch
-	from James Dennett. [Bug 2450]
-
-	* tests/info.test: Enable test for tclParse.c change (info complete).
-
-1999-07-30  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tclIO.c: added fix for Kupries' trf patch. [Bug 2386]
-
-	* tclParse.c: fixed bug in info complete regarding nested square
-	brackets. [Bug 2382, 2466]
-
-1999-07-29  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinChan.c: Allow tcl to open CON and NUL, even for std
-	channels. Checking for bad/unusable std channels was moved to Tk since
-	its only purpose was to check whether to use the Tk Console Window for
-	the std channels. [Bug 2393 2392 2209 2458]
-
-	* unix/mkLinks.tcl: Applied patch to avoid linking pack.n to
-	pack-old.n. Patch from Don Porter. [Bug 2469]
-
-	* doc/Encoding.n: Applied patch to fix typo in .SH NAME line. Patch
-	from Don Porter. [Bug 2451]
-
-	* win/tclWinSock.c: Free Win32 Event handles when destroying the
-	socket helper thread.
-
-1999-07-28  Jennifer Hom  <jenn@scriptics.com>
-
-	* tests/tcltest.test:
-	* library/tcltest1.0/tcltest.tcl: Fixed the condition under which
-	::tcltest::PrintError had an infinite loop problem and added a test
-	case for it. Added an optional argument to ::tcltest::getMatchingFiles
-	telling it where to search for test files.
-
-1999-07-27  Scott Redman  <redman@scriptics.com>
-
-	* tools/tclSplash.bmp: Updated Windows installer bitmap to ready
-	Tcl/Tk Version 8.2.
-
-1999-07-26  Scott Redman  <redman@scriptics.com>
-
-	* tests/tcltest.test: Need to close the new core file, there seems to
-	be a hang in threaded WinNT if the file isn't closed. Open issue, need
-	to fix that hang.
-
-	* tests/httpold.test: Add time delay in response from Http server so
-	that test cases can properly detect timeout conditions with threads
-	enabled on multi-CPU WinNT.
-
-	* tests/winFCmd.test: Test case winFcmd-1.33 was looking for
-	c:\windows, which may not exist. Instead, create a new directory on
-	c:\ and use it for the test.
-
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSock.c: Fix terminating helper threads by holding any
-	mutexes from the primary thread while waiting for the helper thread to
-	terminate. Without these changes, the test suite hangs on WinNT with 2
-	CPUs and threads enabled. Open issue, seems to be a sporadic hang on
-	dual CPU systems still (very rare).
-
-1999-07-26  Jennifer Hom  <jenn@scriptics.com>
-
-	* tests/tcltest.test:
-	* library/tcltest1.0/tcltest.tcl:
-	* doc/tcltest.n: Cleaned up code in ::tcltest::PrintError, revised
-	documentation, and added tests for the tcltest package.
-
-1999-07-23  Scott Redman  <redman@scriptics.com>
-
-	* tests/info.test:
-	* generic/tclParse.c: Removed patch for info command, breaks test
-	cases on Unix. Patch was bad and needs to be redone properly. [Bug
-	2382]
-
-1999-07-22  Scott Redman  <redman@scriptics.com>
-
-	* Changed version to 8.2b2.
-
-	* win/tclWinSock.c: Fixed hang with threads enabled, fixed semaphores
-	with threads disabled.
-
-	* win/safe.test: Fixed safe-6.3 with threads enabled.
-
-	* win/Makefile.in: Fixed calling of tcltest to fix safe.test failures
-	due to path TCL_LIBRARY path.
-
-	* win/tclWinPort.h: Block out include of sys/*.h in order to build
-	extensions with MetroWerks compiler for Win32. [Bug 2385]
-
-	* generic/tclCmdMZ.c:
-	* generic/tclIO.c: Fix ANSI-style prototypes based on patch from
-	Ulrich Ring. [Bug 2391]
-
-	* unix/Makefile.in: Need to make install-sh executable before calling
-	(with chmod +x). [Bug 2413]
-
-	* tests/var.test:
-	* generic/tclVar.c: Fixed bug that caused a seg. fault when using
-	"array set a(b) {}", which is a bad array name anyway. Now the "array
-	set" command will return an error in this case. Added test case and
-	fixed existing test. [Bug 2427]
-
-1999-07-21  Scott Redman  <redman@scriptics.com>
-
-	* tests/info.test:
-	* generic/tclParse.c: Applied patch to fix "info complete" for the
-	string {[a [b]}. Patch from Peter Spjuth. [Bug 2382]
-
-	* doc/Utf.3:
-	* generic/tcl.decls:
-	* generic/tclDecls.h:
-	* generic/tclUtf.c: Changed function declarations in
-	non-platform-specific public APIs to use "unsigned long" instead of
-	"size_t", which may not be defined on certain compilers (rather than
-	include sys/types.h, which may not exist).
-
-	* unix/Makefile.in: Added the Windows configure script to the
-	distribution file list, already shipping configure.in and the .m4
-	files, but needed the configure script itself.
-
-	* win/makefile.vc: Changed version number of DDE package in VC++
-	makefile to use 1.1 instead of 1.0.
-
-	* doc/open.n: Added documentation of \\.\comX notation for opening
-	serial ports on Windows (alternative to comX:).
-
-	* tests/ioCmd.test:
-	* doc/open.n:
-	* win/tclWinSerial.c: Applied patch from Rolf Schroedter to add
-	-pollinterval option to fconfigure to modify the maxblocktime used in
-	the fileevent polling. Added documentation and fixed the test case as
-	well.
-
-	* win/tclWinSock.c: Modified 8.1.0 version of the Win32 socket driver
-	to move the handling of the socket event window in a separate thread.
-	It also turned out that Win95 & Win98 were, in some cases, getting
-	multiple FD_ACCEPTs but only handling one. Added a count for the
-	FD_ACCEPT to take care of this. Tested on NT4 SP3, NT4 SP4, Win95, and
-	Win98. [Bug 2178 2256 2259 2329 2323 2355]
-
-1999-07-21  Jerry Peek  <jpeek@scriptics.com>
-
-	* README: Small tweaks to clean up typos and wording.
-
-1999-07-20  Melissa Hirschl  <hershey@matisse.scriptics.com>
-
-	* generic/tclInitScript.h:
-	* unix/tclUnixInit.c: merged code with 8.0.5. We now use an
-	intermediate global tcl var "tclDefaultLibrary" to keep the
-	"tcl_library" var from being set by the default value in the Makefile.
-	Also fixed a bug in which caused the value of TCL_LIBRARY env var to
-	be ignored.
-	* unix/tclWinInit.c: just updated some comments.
-
-1999-07-19  Melissa Hirschl  <hershey@matisse.scriptics.com>
-
-	* library/http2.1/http.tcl: updated -useragent text to say version
-	2.1.
-
-1999-07-16  Scott Redman  <redman@scriptics.com>
-
-	* generic/tcl.decls:
-	* generic/tclDecls.h:
-	* generic/tclStubInit.c: Add Tcl_SetNotifier to stub table. [Bug 2364]
-
-	* unix/aclocal.m4:
-	* unix/tcl.m4: Add check for Alpha/Linux to correct the IEEE floating
-	flag to the compiler, should be -mieee. Patch from Don Porter.
-
-	* tools/tcl.hpj.in: Change version number of .cnt file referenced in
-	.HPJ file.
-
-1999-07-15  Scott Redman  <redman@scriptics.com>
-
-	* tools/tcl.wse.in: Fixed naming of target files for Windows.
-
-1999-07-14  Jerry Peek  <jpeek@scriptics.com>
-
-	* doc/re_syntax.n: Deleted sentence as suggested by Scott S.
-
-1999-07-12  Jerry Peek  <jpeek@scriptics.com>
-
-	* doc/re_syntax.n: Removed two notes to myself (oops), cleaned up
-	wording, fixed changebars, made two examples easier to read.
-
-1999-07-11  Scott Redman  <redman@scriptics.com>
-
-	* win/makefile.vc: Since the makefile.vc should continue to work while
-	we're working out bugs/issues in the new TEA-style
-	autoconf/configure/gmake build mechanism for Windows, the version
-	numbers of the Tcl libraries need to remain in sync. Modified the
-	version numbers in the makefile to reflect the change to 8.2b1.
-
-1999-07-09  Scott Redman  <redman@scriptics.com>
-
-	* win/configure.in: Eval DLLSUFFIX, LIBSUFFIX, and EXESUFFIX in the
-	configure script so that substitutions get expanded before being
-	placed in the Makefile. The "d" portion for debug libraries and DLLs
-	was not being set properly.
-
-1999-07-08  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/string.test:
-	* generic/tclCmdMZ.c: Fixed bug in string range bounds checking code.
-
-1999-07-08  Jennifer Hom  <jenn@scriptics.com>
-
-	* doc/tcltest.n:
-	* library/tcltest1.0/tcltest.tcl: Removed -asidefromdir and
-	-relateddir flags, removed unused ::tcltest::dotests proc, cleaned up
-	implementation of core file checking, and fixed the code that checks
-	for 1-letter flag abbreviations.
-
-1999-07-08  Scott Stanton  <stanton@scriptics.com>
-
-	* win/Makefile.in: Added tcltest target so runtest works properly.
-	Added missing names to the clean/distclean targets.
-
-	* tests/reg.test:
-	* generic/rege_dfa.c: Applied fix supplied by Henry Spencer for bug in
-	DFA state caching under lookahead conditions. [Bug 2318]
-
-1999-07-07  Scott Stanton  <stanton@scriptics.com>
-
-	* doc/fconfigure.n: Clarified default buffering behavior for the
-	standard channels. [Bug 2335]
-
-1999-07-06  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinSerial.c: New implementation of serial port driver from
-	Rolf Shroedter (Rolf.Schroedter@dlr.de) that allows more than one byte
-	to be read from the port. Implemented using polling instead of
-	threads, there is a max. 10ms latency between checking the port for
-	file events. [Bug 1980 2217]
-
-1999-07-06  Brent Welch  <welch@scriptics.com>
-
-	* library/http2.0/http.tcl: Fixed the -timeout option so it handles
-	timeouts that occur during connection attempts to hosts that are down
-	(the only case that really matters!)
-
-1999-07-03  Brent Welch  <welch@scriptics.com>
-
-	* doc/ChnlStack.3:
-	* generic/tcl.decls:
-	* generic/tclIO.c: Added a new variant of the "Trf patch" from Andreas
-	Kupres that adds new C APIs Tcl_StackChannel, Tcl_UnstackChannel, and
-	Tcl_GetStackedChannel.
-
-1999-07-03  Brent Welch  <welch@scriptics.com>
-
-	* generic/tclNotify.c:
-	* unix/tclUnixNotfy.c:
-	* unix/tclXtTest.c:
-	* unix/tclXtNotify.c:
-	* win/tclWinNotify.c:
-	* mac/tclMacNotify.c: Added Tcl_SetNotifier and the associated hook
-	points in the notifiers to be able to replace the notifier calls at
-	runtime. The Xt notifier and test program use this hook.
-
-1999-07-03  Brent Welch  <welch@scriptics.com>
-
-	* generic/tclParse.c: Changed parsing of variable names to allow empty
-	array names. Now "$(foo)" is a variable reference! Previous you had to
-	use something like $::(foo), which is slower. This change is requested
-	by Jean-Luc Fontaine for his STOOOP package.
-
-1999-07-01  Scott Redman  <redman@scriptics.com>
-
-	* generic/tclCmdAH.c:
-	* generic/tclFCmd.c: Call TclStat instead of TclpStat in order to
-	allow Tcl_Stat hooks to work properly.
-
-1999-06-29  Jennifer Hom  <jenn@scriptics.com>
-
-	* library/tcltest1.0/pkgIndex.tcl:
-	* library/tcltest1.0/tcltest.tcl:
-	* doc/tcltest.n:
-	* tests/all.tcl: Added -preservecore, -limitconstraints, -help, -file,
-	-notfile, -relateddir and -asidefromdir flags to the tcltest package
-	along with exported proc ::tcltest::getMatchingFiles. The
-	documentation was modified to match and all.tcl was modified to use
-	the new functionality instead of implementing -file itself.
-
-1999-06-28  Scott Redman  <redman@scriptics.com>
-
-	* generic/tclIndexObj.c:
-	* doc/GetIndex.3:
-	* tests/binary.test:
-	* tests/winDde.test: Applied patch from Peter Hardie (with changes) to
-	fix problem with Tcl_GetIndexFromObj() when the key being passed is
-	the empty string. It used to match "" and return TCL_OK, but it should
-	have returned TCL_ERROR instead. Added test case to "binary" and "dde"
-	commands to check the behavior. Added documentation note as well.
-
-1999-06-26  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinDde.c: Applied patch from Peter Hardie to add poke command
-	to dde. Also rev'd version of dde package to 1.1. [Bug 1738]
-
-1999-06-25  Jennifer Hom  <jenn@scriptics.com>
-
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* library/tcltest1.0/pkgIndex.tcl:
-	* library/tcltest1.0/tcltest.tcl:
-	* library/tcltest1.0: Added initial implementation of the Tcl test
-	harness package. This package was based on the defs.tcl file that was
-	part of the tests directory. Reversed the way that tests were
-	evaluated to fix a problem with false passes.
-
-	* doc/tcltest.n: Added documentation for the tcltest package.
-
-	* tests/README:
-	* tests/defs.tcl:
-	* tests/all.tcl: Modified all test files (tests/*.test) and all.tcl to
-	use the new tcltest package and removed references to the defs.tcl
-	file. Modified the README file to point to the man page for tcltest.
-
-1999-06-25  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/reg.test:
-	* generic/regexec.c: Fixed bugs in non-greedy quantifiers.
-
-1999-06-23  Jerry Peek  <jpeek@scriptics.com>
-
-	* doc/re_syntax.n:
-	* doc/switch.n:
-	* doc/lsearch.n:
-	* doc/RegExp.3:
-	* doc/regexp.n:
-	* doc/regsub.n: Moved information about syntax of 8.1 regular
-	expressions from regexp(n) manpage into new re_syntax(n) page. Added
-	pointers from other manpages to new re_syntax(n) page.
-
-1999-06-23  Scott Stanton  <stanton@scriptics.com>
-
-	* unix/Makefile.in: Changed install-doc to install-man.
-
-	* tools/uniParse.tcl:
-	* tools/uniClass.tcl:
-	* tools/README:
-	* tests/string.test:
-	* generic/regc_locale.c:
-	* generic/tclUniData.c:
-	* generic/tclUtf.c:
-	* doc/string.n: Updated Unicode character tables to reflect latest
-	Unicode 2.1 data. Also rationalized "regexp" and "string is"
-	definitions of character classes.
-
-1999-06-21  Scott Stanton  <stanton@scriptics.com>
-
-	* unix/tclUnixThrd.c (TclpThreadCreate): Fixed memory leak where
-	thread attributes were not being released. [Bug 2254]
-
-1999-06-17  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/regexp.test:
-	* generic/tclCmdMZ.c:
-	* generic/tclCmdIL.c: Changed to use new regexp interfaces. Added
-	-expanded, -line, -linestop, and -lineanchor switches to regsub.
-
-	* doc/RegExp.3: Documented the new regexp interfaces and the
-	compile/execute flags.
-
-	* generic/tclTest.c:
-	* generic/tclRegexp.h:
-	* generic/tclRegexp.c:
-	* generic/tcl.h:
-	* generic/tcl.decls: Renamed Tcl_RegExpMatchObj to Tcl_RegExpExecObj
-	and added a new Tcl_RegExpMatchObj that is equivalent to
-	Tcl_RegExpMatch. Added public macros for the regexp compile/execute
-	flags. Changed to store either an object pointer or a string pointer
-	in the TclRegexp structure. Changed to avoid adding a reference to the
-	object or copying the string.
-
-	* generic/regcomp.c: lint
-
-	* tests/reg.test:
-	* generic/regex.h:
-	* generic/regc_lex.c: Added REG_BOSONLY flag to allow Expect to
-	iterate through a string an only find matches that start at the
-	current position within the string.
-
-1999-06-16  Michael Thomas  <wart@scriptics.com>
-
-	* unix/configure.in:
-	* unix/Makefile.in:
-	* unix/tcl.m4:
-	* unix/aclocal.m4: Numerous build changes to make Tcl conform to the
-	proposed TEA spec
-
-1999-06-16  Melissa Hirschl  <hershey@matisse.scriptics.com>
-
-	* generic/tclVar.c (Tcl_VariableObjCmd): fixed premature increment in
-	loop that was causing out-of-bounds reads on array "varName".
-
-1999-06-16  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/execute.test:
-	* generic/tclExecute.c (TclExecuteByteCode): Fixed crash caused by a
-	bug in INST_LOAD_SCALAR1 where the scalar index was read as a signed 1
-	byte value instead of unsigned. [Bug 2243]
-
-1999-06-14  Melissa Hirschl  <hershey@matisse.scriptics.com>
-
-	* doc/StringObj.3
-	* test/stringObj.test
-	* unix/Makefile.in
-	* win/Makefile.in
-	* win/makefile.vc
-	* generic/tclStringObj.c:
-	Merged String and Unicode object types. Added new functions to the
-	puplic API: Tcl_NewUnicodeObj, Tcl_SetUnicodeObj, Tcl_GetUnicode,
-	Tcl_GetUniChar, Tcl_GetCharLength, Tcl_GetRange,
-	Tcl_AppendUnicodeToObj.
-
-1999-06-09  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclUnicodeObj.c: Lots of cleanup and simplification. Fixed
-	several memory bugs. Added TclAppendUnicodeToObj.
-
-	* generic/tclInt.h: Added declarations for various Unicode string
-	functions.
-
-	* generic/tclRegexp.c:
-	* generic/tclCmdMZ.c: Changed to use new Unicode string interfaces for
-	better performance.
-
-	* generic/tclRegexp.h:
-	* generic/tclRegexp.c:
-	* generic/tcl.h:
-	* generic/tcl.decls: Added Tcl_RegExpMatchObj and Tcl_RegExpGetInfo
-	calls to access lower level regexp API. These features are needed by
-	Expect. This is a preliminary implementation pending final review and
-	cleanup.
-
-	* generic/tclCmdMZ.c:
-	* tests/string.test: Fixed bug where string map failed on null strings
-
-	* generic/regexec.c:
-	* unix/tclUnixNotfy.c: lint
-
-	* tools/genStubs.tcl: Changed to always write output in LF mode.
-
-1999-06-08  Scott Stanton  <stanton@scriptics.com>
-
-	* win/tclWinSock.c: Rolled back to the 8.1.0 implementation because of
-	serious problems with the new driver. Basically no incoming socket
-	connections would be reported to a server port. The 8.1.1 code needs
-	to be redesigned and fixed correctly.
-
-1999-06-07  Melissa Hirschl  <hershey@matisse.scriptics.com>
-
-	* tests/string.test:
-	* generic/tclVar.c (Tcl_SetVar2Ex):
-	* generic/tclStringObj.c (Tcl_AppendObjToObj):
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): optimized the string index,
-	string length, string range, and append command in cases where the
-	object's internal rep is a bytearray. Objects with other internal reps
-	are converted to have the new unicode internal rep.
-
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/Makefile.vc:
-	* tests/unicode.test:
-	* generic/tclInt.h:
-	* generic/tclObj.c:
-	* generic/tclUnicodeObj.c: added a new object type to store the
-	unicode representation of a string.
-
-	* generic/tclTestObj.c: added the objtype option to the testobj
-	command. This option returns the name of the type of internal rep an
-	object has.
-
-1999-06-04  Scott Stanton  <stanton@scriptics.com>
-
-	* win/configure.in:
-	* win/Makefile.in: Windows build now handles static/dynamic
-	debug/nodebug builds and supports the standard targets using Cygwin
-	user tools plus GNU make and autoconf.
-
-1999-06-03  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):
-	* tests/string.test: Fixed bug where string equal/compare -nocase
-	reported wrong result on null strings. [Bug 2138]
-
-1999-06-02  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclUtf.c (Tcl_UtfNcasecmp): Fixed incorrect computation of
-	relative ordering. [Bug 2135]
-
-1999-06-01  Scott Stanton  <stanton@scriptics.com>
-
-	* unix/configure.in: Fixed various small configure.in patches
-	submitted by Jan Nijtmans. [Bug 2121]
-
-	* tests/reg.test:
-	* generic/regc_color.c:
-	* generic/regc_cvec.c:
-	* generic/regc_lex.c:
-	* generic/regc_locale.c:
-	* generic/regc_nfa.c:
-	* generic/regcomp.c:
-	* generic/regcustom.h:
-	* generic/rege_dfa.c:
-	* generic/regerror.c:
-	* generic/regerrs.h:
-	* generic/regex.h:
-	* generic/regexec.c:
-	* generic/regfree.c:
-	* generic/regfronts.c:
-	* generic/regguts.h:
-	* generic/tclCmdMZ.c:
-	* generic/tclRegexp.c:
-	* generic/tclRegexp.h:
-	* generic/tclTest.c: Applied Henry Spencer's latest regexp patches
-	that fix an infinite loop bug and add support for testing whether a
-	string could match with additional input. [Bug 2117]
-
-1999-05-28  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclObj.c: Changed to eliminate use of isupper/tolower in
-	favor of the Unicode versions.
-
-	* win/Makefile.in:
-	* win/configure.in: Added preliminary TEA implementation.
-
-	* win/tclWinDde.c: Fixed bug where dde calls were being passed an
-	invalid dde handle because Initialize had not been called. [Bug 2124]
-
-1999-05-26  Scott Redman  <redman@scriptic.com>
-
-	* generic/tclThreadTest.c: Fixed race condition in testthread code
-	that showed up in the WinNT test suite intermittently.
-
-	* win/tclWinSock.c: Fixed a hang in the WinNT socket driver, wake up
-	the socket thread every 100ms to check for events on the sockets that
-	did not wake up the thread (race condition).
-
-1999-05-24  Scott Stanton  <stanton@scriptics.com>
-
-	* tools/genStubs.tcl: Changed to allow a list of platforms instead of
-	just one at a time.
-
-	* generic/tcl.decls:
-	* generic/tclCmdMZ.c:
-	* generic/tclDecls.h:
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclPort.h:
-	* generic/tclStubInit.c:
-	* generic/tclStubLib.c: Various header file related changes and other
-	lint to try to get the Mac builds working.
-
-1999-05-21  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinPipe.c: Fix bug when launching command.com on Win95/98.
-	Need to wait for the procInfo.hProcess of the process that was
-	created, not the hProcess of the current process. [Bug 2105]
-
-1999-05-20  Scott Redman  <redman@scriptics.com>
-
-	* library/init.tcl: Add the directory where the executable is, and the
-	../lib directory relative to that, to the auto_path variable.
-
-1999-05-19  Scott Stanton  <stanton@scriptics.com>
-
-	Merged in various changes submitted by Jeff Hobbs:
-
-	* generic/tcl.decls:
-	* generic/tclUtf.c: Added Tcl_UniCharIs* functions for control, graph,
-	print, and punct classes.
-
-	* generic/tclUtil.c:
-	* doc/StrMatch.3: Added Tcl_StringCaseMatch() implementation to
-	support case-insensitive globbing.
-
-	* doc/string.n:
-	* unix/mkLinks:
-	* tests/string.test:
-	* generic/tclCmdMZ.c: Added additional character class tests, added
-	-nocase switch to "string match", changed string first/last to use
-	offsets.
-
-1999-05-19  Scott Redman  <redman@scriptics.com>
-
-	* generic/tcl.h: Add extern "C" block around entire header file for
-	C++ compilers to fix linkage issues. Submitted by Don Porter and Paul
-	Duffin.
-
-	* generic/tclRegexp.c: Fix bug when the regexp cache is empty and an
-	empty pattern is used in regexp ( such as {} or "" ).
-
-1999-05-18  Scott Stanton  <stanton@scriptics.com>
-
-	* win/tclWinChan.c: Modified initialization code to avoid inherenting
-	closed or invalid channels. If the standard input is anything other
-	than a console, file, serial port, or pipe, then we fall back to the
-	standard Tk window console.
-
-1999-05-14  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclCmdAH.c (Tcl_ForObjCmd): Fixed crash caused by failure to
-	reset the result before evaluating the test expression.
-
-1999-05-14  Bryan Surles  <surles@scriptics.com>
-
-	* generic/tclBasic.c (Tcl_CreateInterp): Added introspection variable
-	for threaded interps. If the interp was compiled with threads enabled,
-	the tcl_platform(threaded) variable will exist.
-
-1999-05-14  Scott Redman  <redman@scriptics.com>
-
-	* generic/tclDate.c: Applied patch to fix 100-year and 400-year
-	boundaries in leap year code, from Isaac Hollander. [Bug 2066]
-
-1999-05-13  Scott Stanton  <stanton@scriptics.com>
-
-	* unix/Makefile.in:
-	* unix/tclAppInit.c: Minor cleanup related to Xt notifier.
-
-	* unix/tclUnixInit.c (TclpSetInitialEncodings): Tcl now looks for an
-	encoding subfield in the LANG/LC_ALL variables in cases where the
-	locale is not found in the locale table. Ensure that setlocale() is
-	called at least once so X11 will initialize properly. Also, forces the
-	LC_NUMERIC locale to be "C" so numeric processing in scripts is not
-	affected by the current locale setting. [Bug 1989]
-
-	* generic/tclRegexp.c: Increased per-thread regexp cache to 30 slots.
-	This seems to be about the right number for larger applications like
-	exmh. [Bug 1063]
-
-1999-05-12  Scott Stanton  <stanton@scriptics.com>
-
-	* doc/tclsh.1: Updated references to rc script names to accurately
-	reflect the platform differences on Windows.
-
-	* tests/regexp.test:
-	* generic/tclInt.h:
-	* generic/tclBasic.c:
-	* generic/tclRegexp.h:
-	* generic/tclRegexp.c: Replaced the per-interpreter regexp cache with
-	a per-thread cache. Changed the Regexp object to take advantage of
-	this extra cache. Added a reference count to the TclRegexp type so
-	regexps can be shared by multiple objects. Removed the per-interp
-	regexp cache from the interpreter. Now regexps can be used with no
-	need for an interpreter. [Bug 1063]
-
-	* win/tclWinInit.c (TclpSetVariables): Avoid calling GetUserName if
-	the value can be determined from the USERNAME environment variable.
-	GetUserName is very slow.
-
-1999-05-07  Scott Stanton  <stanton@scriptics.com>
-
-	* win/winDumpExts.c:
-	* win/makefile.vc: Removed incorrect patch. [Bug 1998]
-
-	* generic/tcl.decls: Replaced const with CONST.
-
-	* generic/tclResult.c (Tcl_AppendResultVA):
-	* generic/tclStringObj.c (Tcl_AppendStringsToObjVA): Fixed to copy
-	arglist using memcpy instead of assignment so it works properly on
-	OS/390. [Bug 1997]
-
-	* generic/tclLoadNone.c: Updated to use current interfaces, added
-	TclpUnloadFile. [Bug 2003]
-
-	* win/winDumpExts.c:
-	* win/makefile.vc: Changed to emit library name in defs file. [Bug
-	1998]
-
-	* unix/configure.in: Added fix for OS/390. [Bug 1976]
-
-1999-05-06  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/string.test:
-	* generic/tclCmdMZ.c:
-	* doc/string.n: Fixed bug in string equal/compare code when using
-	-length option. Cleaned up docs a bit more.
-
-	* tests/http.test: Unset "data" array before running tests to avoid
-	failures due to previous tests.
-
-	* doc/string.n:
-	* tests/cmdIL.test:
-	* tests/cmdMZ.test:
-	* tests/error.test:
-	* tests/ioCmd.test:
-	* tests/lindex.test:
-	* tests/linsert.test:
-	* tests/lrange.test:
-	* tests/lreplace.test:
-	* tests/string.test:
-	* tests/cmdIL.test:
-	* generic/tclUtil.c:
-	* generic/tclCmdMZ.c: Replaced "string icompare/iequal" with -nocase
-	and -length switches to "string compare/equal". Added a -nocase option
-	to "string map". Changed index syntax to allow integer or
-	end?-integer? instead of a full expression. This is much simpler with
-	safeTcl scripts since it avoids double substitution issues.
-
-	* doc/Utf.3:
-	* generic/tclStubInit.c:
-	* generic/tclDecls.h:
-	* generic/tclUtf.c:
-	* generic/tcl.decls: Added Tcl_UtfNcmp and Tcl_UtfNcasecmp.
-
-1999-05-05  Scott Stanton  <stanton@scriptics.com>
-
-	* win/makefile.vc: Added encoding directory to install-libraries
-	target.
-
-1999-05-03  Scott Stanton  <stanton@scriptics.com>
-
-	* doc/string.n:
-	* tests/cmdMZ.test:
-	* tests/string.test:
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Changed "string length" to
-	avoid regenerating the string rep of a ByteArray object.
-
-	* tests/cmdIL.test:
-	* tests/cmdMZ.test:
-	* tests/error.test:
-	* tests/lindex.test:
-	* tests/linsert.test:
-	* tests/lrange.test:
-	* tests/lreplace.test:
-	* tests/string.test:
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):
-	* generic/tclUtil.c (TclGetIntForIndex): Applied Jeff Hobbs's string
-	patch which includes the following changes [Bug 1845]:
-	- string compare now takes optional length arg (for strncmp behavior)
-	- added string equal (just a few lines of code blended in with string
-	  compare)
-	- added string icompare/iequal for case-insensitive comparisons
-	- string index's index can now be ?end[+-]?expression
-	  I made this change in the private TclGetIntForIndex, which means
-	  that the list commands also benefit, as well as string range, et al.
-	- added [string repeat string count]
-	  Repeats given string number of times
-	- added string replace, string equiv to lreplace
-	  (quasi opposite of string range):
-		string replace first last ?string?
-	  Example of use, replacing end of string with ... should the string
-	  be more than 16 chars long:
-		string replace $string 16 end "..."
-	  This just returns the string len < 16, so it will only affect the
-	  long strings.
-	- added optional first and last args to string to*
-	  This allows you to just affect certain regions of a string with the
-	  command (like just capping the first letter). I found the original
-	  totitle to be too draconian to be useful.
-	- added [string map charMap string]
-	  where charMap is a {from to from to} list that equates to what one
-	  might get from [array get]. Each and can be multiple chars (or none
-	  at all). For Tcl/CGI users, this is a MAJOR speed booster.
-
-	* generic/tclParse.c (Tcl_ParseCommand): Changed to avoid modifying
-	eval'ed strings that are already null terminated. [Bug 1793]
-
-	* tests/binary.test:
-	* generic/tclBinary.c (DupByteArrayInternalRep): Fixed bug where type
-	was not being set in duplicated object. [Bug 1975, 2047]
-
-1999-04-30  Scott Stanton  <stanton@scriptics.com>
-
-	* Changed version to 8.1.1.
-
-1999-04-30  Scott Stanton  <stanton@scriptics.com>
-
-	* Merged changes from 8.1.0 branch:
-
-	* generic/tclParse.c: Fixed memory leak in CommandComplete.
-
-	* generic/tclPlatDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclIntDecls.h:
-	* generic/tclDecls.h:
-	* tools/genStubs.tcl: Added 'extern "C" {}' block around the stub
-	table pointer declaration so the stub library can be used from C++.
-	[Bug 1934]
-
-	* Lots of documentation and other release engineering fixes.
-
-1999-04-28  Scott Stanton  <stanton@scriptics.com>
-
-	* mac/tclMacResource.c:
-	* generic/tclListObj.c:
-	* generic/tclObj.c:
-	* generic/tclStringObj.c: Changed to avoid freeing the string
-	representation before freeing the internal rep. This helps with
-	debugging since the string rep will still be valid when the free proc
-	is invoked.
-
-1999-04-27  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclLiteral.c (TclHideLiteral): Fixed so hidden literals get
-	duplicated to avoid accidental sharing in the global object table.
-
-1999-04-23  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclStubInit.c:
-	* tools/genStubs.tcl: Changed to avoid the need for forward
-	declarations in stub initializers.
-
-1999-04-23  Scott Stanton  <stanton@scriptics.com>
-
-	* library/encoding/koi8-r.enc:
-	* tools/encoding/koi8-r.txt: Added support for the koi8-r Cyrillic
-	encoding. [Bug 1771]
-
-1999-04-22  Scott Stanton  <stanton@scriptics.com>
-
-	* win/tclWinFCmd.c:
-	* win/tclWin32Dll.c: Changed uses of "try" to "__try", since that is
-	the actual keyword. This eliminates the need for some -D flags from
-	the makefile.
-
-	* generic/tclPort.h: Added include of tcl.h since it defines various
-	Windows macros that are needed before deciding which platform porting
-	file to use.
-
-	* generic/tclEvent.c: lint
-
-	* win/tclWinInit.c (TclpInitPlatform): Added call to TclWinInit when
-	building a static library since DllMain will not be invoked. This
-	could break old code that explicitly called TclWinInit, but should be
-	simpler in the long run.
-
-1999-04-22  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclInt.h:
-	* generic/tclInt.decls:
-	* generic/tclCompile.c: Added TclSetByteCodeFromAny that takes a hook
-	procedure to invoke after compilation but before the byte codes are
-	emitted. This makes it possible to do postprocessing on the compiled
-	byte codes before the ByteCode is generated.
-
-	* generic/tclLiteral.c: Added TclHideLiteral and TclAddLiteralObj to
-	make it possible to create local unshared literal objects.
-
-	* win/tclWinInit.c:
-	* unix/tclUnixInit.c: Changed initial search path to match that
-	found used by tcl_findLibrary.
-
-1999-04-22  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinPort.h:
-	* win/tclWinSock.c: Added code to use WinSock 2.0 API on NT to avoid
-	creating a window to handle sockets. API not available on Win95 and
-	needs to be fixed on Win98, until then continue to use the older
-	(window-based) scheme on those two OSes.
-
-1999-04-15  Scott Stanton  <stanton@scriptics.com>
-
-	* Merged 8.1 back into the main trunk
-
-1999-04-13  Scott Stanton  <stanton@scriptics.com>
-
-	* library/encoding/gb2312.enc:
-	* library/encoding/euc-cn.enc:
-	* tools/encoding/gb2312.txt:
-	* tools/encoding/cp950.txt:
-	* tools/encoding/Makefile: Restored the double byte definition of
-	GB2312 and added the EUC-CN encoding. EUC-CN is a variant of GB2312
-	that shifts the characters into bytes with the high bit set and
-	includes ASCII as a subset. [Bug 632]
-
-1999-04-13  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinSock.c: Apply patch to allow write access to a socket if
-	FD_WRITE is sent but FD_CONNECT is not. Some strange problem with
-	either Win32 or a socket driver. [Bug 1664 1776]
-
-1999-04-09  Scott Redman  <redman@scriptics.com>
-
-	* unix/tclUnixNotfy.c: Fixed notifier deadlock situation when the pipe
-	used to talk back notifier thread is filled with data. When calling
-	the write() function to feed data down that pipe, unlock the
-	notifierMutex to allow the notifier to wake up again. Found as a
-	result of the focus.test for Tk hanging. [Bug 1700]
-
-1999-04-06  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/unixNotfy.test: Fixed hang in tests when built with thread
-	support.
-
-	* tests/httpold.test: Fixed broken test that didn't wait long enough
-	for events to arrive.
-
-	* tests/unixInit.test: Fixed race condition in test.
-
-	* tests/unixInit.test:
-	* tests/fileName.test: Minor test nits.
-
-	* unix/tclUnixInit.c (TclpSetInitialEncodings): Fixed bad initial
-	encoding string.
-
-1999-04-06  Bryan Surles  <surles@scriptics.com>
-
-	* generic/tclVar.c:
-	* generic/tclEnv.c: Moved the "array set" C level code into a common
-	routine (TclArraySet). The TclSetupEnv routine now uses this API to
-	create an env array w/ no elements.
-
-	* generic/tclEnv.c:
-	* generic/tclWinInit.h:
-	* generic/tclUnixInit.h:
-	* generic/tclInt.h: Made the Env module I18N compliant. Changed the
-	FindVariable routine to TclpFindVariable, that now does a case
-	insensitive string comparison on Windows, and not on UNIX. [Bug 1299,
-	1500]
-
-1999-04-05  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/io.test: Minor test cleanup.
-
-	* generic/tclEncoding.c (Tcl_CreateEncoding): Minor lint to make it
-	easier to compile on Digital-unix. [Bug 1659]
-
-	* unix/configure.in:
-	* unix/tclUnixPort.h: Applied patch for OS/390 to handle lack of
-	sys/param.h. [Bug 1725]
-
-	* unix/configure.in: Fixed BSD/OS 4.* configuration to support shared
-	libraries properly. [Bug 1730]
-
-1999-04-05  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinDde.c: decrease timeout value for DDE calls to 30k. [Bug
-	1639]
-
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclDecls.h:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclUtil.c: Added more functions to the Tcl stubs table,
-	including all Tcl_ functions not already in it (except Cmd functions)
-	and Tcl_GetCwd() and Tcl_Chdir() (new functions).
-
-	* tests/safe.test:
-	* doc/safe.n:
-	* generic/tclBasic.c:
-	* library/safe.tcl: The encoding command is not safe as-is, so create
-	a safe alias to mask out the "encoding system <name>" but allow all
-	other uses including "encoding system". Added test cases and updated
-	the man page for Safe Tcl.
-
-1999-04-05  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/winTime.test:
-	* win/tclWinTime.c: Fixed crash in clock command that occurred when
-	manipulating negative time values in timezones east of GMT. [Bug
-	1142, 1458]
-
-	* tests/platform.test:
-	* tests/fileName.test: Fixed broken tests.
-
-	* generic/tclFileName.c: Moved global regexps into thread local
-	storage.
-
-	* tests/socket.test: Changed so tests don't reuse sockets, since
-	Windows is slow to release sockets.
-
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c: Fixed race condition where background threads
-	were terminated while they still held a lock in the notifier.
-
-1999-04-02  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/http.test: Fixed bad test initialization code.
-
-	* generic/tclThreadTest.c (ThreadExitProc): Fixed bug where static
-	memory was being returned instead of a dynamically allocated result in
-	error cases.
-
-1999-04-02  Scott Redman  <redman@scriptics.com>
-
-	* doc/dde.n:
-	* tools/tcl.wse.in:
-	* win/makefile.vc:
-	* win/pkgIndex.tcl:
-	* win/tclWinDde.c: Add new DDE package, code removed from Tk now
-	separated into its own package. Changed DDE-based send code into "dde
-	eval" command. Can be loaded into tclsh (not just wish). Windows only.
-
-1999-04-02  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/expr.test:
-	* tests/for-old.test:
-	* tests/for.test:
-	* tests/foreach.test:
-	* tests/format.test:
-	* tests/httpold.test:
-	* tests/if.test:
-	* tests/init.test:
-	* tests/interp.test:
-	* tests/while.test: Added some tests for known bugs (marked with
-	knownBug constraint), and cleaned up a few bad tests.
-
-	* generic/regc_locale.c:
-	* generic/regcustom.h:
-	* generic/tcl.decls:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclInt.h:
-	* generic/tclRegexp.c:
-	* generic/tclScan.c:
-	* generic/tclTest.c:
-	* generic/tclUtf.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c: Made various Unicode utility functions public. The
-	following functions were made public and added to the stubs table:
-		Tcl_UtfToUniCharDString, Tcl_UniCharToUtfDString,
-		Tcl_UniCharLen, Tcl_UniCharNcmp, Tcl_UniCharIsAlnum,
-		Tcl_UniCharIsAlpha, Tcl_UniCharIsDigit, Tcl_UniCharIsLower,
-		Tcl_UniCharIsSpace, Tcl_UniCharIsUpper, Tcl_UniCharIsWordChar
-
-1999-04-01  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/registry.test:
-	* win/tclWinReg.c: Internationalized the registry code. It now uses
-	Unicode interfaces on NT. [Bug 1197]
-
-	* tests/parse.test:
-	* generic/tclParse.c: Fixed crash due to multiple frees in parser
-	during error cleanup when parsing commands with more tokens than will
-	fit in the static area of the parse structure. [Bug 1681]
-
-	* generic/tclInt.h: Removed duplicate declarations.
-
-	* generic/tclInt.decls:
-	* generic/tcl.decls: Added Tcl_WinUtfToTChar and Tcl_WinTCharToUtf to
-	the tclPlat table.
-
-1999-04-01  Scott Redman  <redman@scriptics.com>
-
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclDecls.h:
-	* generic/StubInit.c:
-	* tools/genStubs.tcl:
-	* unix/Makefile.in:
-	* win/makefile.vc: Applied patch from Jan Nijtmans to fix Ultrix
-	multiple symbol definition problem. Now, even Tcl includes a copy of
-	the Tcl stub library. Also fixed TCL_MEM_DEBUG mode (for Tk).
-
-1999-03-31  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinConsole.c: WinNT has a bug when reading a single character
-	from the console. Rewrote the code for the console to read an entire
-	line at a time using the reader thread.
-
-1999-03-30  Scott Stanton  <stanton@scriptics.com>
-
-	* unix/Makefile.in: Removed trailing backslash that broke the "depend"
-	target.
-
-	* unix/tclUnixInit.c (TclpSetInitialEncodings): Changed to avoid
-	calling setlocale(). We now look directly at env(LANG) and
-	env(LC_CTYPE) instead. [Bug 1636]
-
-	* generic/tclFileName.c:
-	* generic/tclDecls.h:
-	* generic/tcl.decls: Removed CONST from Tcl_JoinPath and
-	Tcl_TranslateFileName because it changes the signature of Tcl_JoinPath
-	in an incompatible manner.
-
-	* generic/tclInt.h:
-	* generic/tclLoad.c (TclFinalizeLoad):
-	* generic/tclEvent.c (Tcl_Finalize): Defer unloading of loadable
-	modules until all exit handlers have been invoked. [Bug 998, 1273,
-	1573, 1593]
-
-1999-03-29  Scott Stanton  <stanton@scriptics.com>
-
-	* generic/tclFileName.c:
-	* generic/tclDecls.h:
-	* generic/tcl.decls: Added CONST to Tcl_JoinPath and
-	Tcl_TranslateFileName.
-
-1999-03-29  Scott Redman  <redman@scriptics.com>
-
-	* tools/genStubs.tcl:
-	* unix/configure.in:
-	* unix/Makefile.in:
-	* win/makefile.vc:
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclIntPlatDecls.h: Removed the stub functions and changed
-	the stub macros to just use the name without params. Pass &tclStubs
-	into the interp (don't use tclStubsPtr because of collisions with the
-	stubs on Solaris).
-
-1999-03-27  Scott Redman  <redman@scriptics.com>
-
-	* win/makefile.bc: Removed makefile for Borland compiler, no longer
-	supported.
-
-1999-03-26  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinSerial.c:
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c: Don't close the Win32 handle for a channel if it's
-	a stdio handle (GetStdHandle()) during shutdown of a thread to prevent
-	it from destroying the stdio of other threads.
-
-1999-03-26  Suresh Ankolekar  <suresh@scriptics.com>
-
-	* unix/configure.in: --nameble-shared is now the default and build Tcl
-	as a shared library; specify --disable-shared to build a static Tcl
-	library and shell.
-
-1999-03-25  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/interp.test:
-	* generic/tclInterp.c (AliasObjCmd): Changed so aliases are invoked at
-	current scope in the target interpreter instead of at the global
-	scope. This was an incompatibility introduced in 8.1 that is being
-	removed. [Bug 1153, 1556]
-
-	* library/encoding/big5.enc:
-	* library/encoding/gb2312.enc:
-	* tools/encoding/big5.enc:
-	* tools/encoding/gb2312.enc: Added ASCII to big5 and gb2312 encodings.
-	[Bug 632]
-
-	* generic/tclPkg.c (Tcl_PkgRequireEx): Fixed broken clientData
-	initialization in package code.
-
-	* unix/Makefile.in (dist): Added tcl.decls and tclInt.decls to source
-	distribution. [Bug 1571]
-
-	* doc/Thread.3: Updated documentation of Tcl_MutexLock to indicate
-	that the recursive locking behavior is undefined. On Windows, it does
-	not block, on Unix it deadlocks. [Bug 1275]
-
-1999-03-24  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/execute.test:
-	* generic/tclExecute.c (TclExecuteByteCode): Fixed expression code
-	that incorrectly returned floating point values for integers if the
-	internal rep happened to be a double. Now we check to see if the
-	object has a string rep that looks like an integer before using the
-	double internal rep. [Bug 1516]
-
-1999-03-24  Scott Redman  <redman@scriptics.com>
-
-	* generic/tclAlloc.c:
-	* generic/tclEncoding.c:
-	* generic/tclProc.c:
-	* unix/tclUnixTime.c:
-	* win/tclWinSerial.c: Fixed compilation warnings/errors for VC++ 5.0
-	and 6.0 and HP-UX native compiler without -Aa or -Ae. [Bug 1323 1518
-	1324 1583 1585 1586]
-
-	* win/tclWinSock.c: Make sockets thread-safe on Windows. The current
-	implementation uses windows to handle events on the socket, one for
-	each thread (thread local storage). Previously, there was only one
-	window shared between threads, which didn't work. [Bug 1326]
-
-1999-03-23  Scott Stanton  <stanton@scriptics.com>
-
-	* tools/tcl.wse: Fixed file association to look in the right place for
-	the wish icon. [Bug 1544]
-
-	* tests/winNotify.test:
-	* tests/ioCmd.test:
-	* tests/event.test: Changed to use new style conditionals.
-
-	* tests/encoding.test: Fixed nonportable test.
-
-	* unix/dltest/configure.in:
-	* unix/dltest/Makefile.in: Added missing DBGX macros. [Bug 1564]
-
-	* tests/winNotify.test:
-	* mac/tclMacNotify.c:
-	* win/tclWinNotify.c:
-	* unix/tclUnixNotfy.c:
-	* generic/tclNotify.c: Added a new Tcl_ServiceModeHook interface that
-	is invoked whenever the service mode changes. This is needed to allow
-	the Windows notifier to create a communication window the first time
-	Tcl is about to enter an external modal event loop instead of at
-	startup time. This will avoid the various problems that people have
-	been seeing where the system hangs when tclsh is running outside of
-	the event loop. [Bug 783]
-
-	* generic/tclInt.h:
-	* generic/tcl.decls: Renamed TclpAlertNotifier back to
-	Tcl_AlertNotifier since it is part of the public notifier driver API.
-
-1999-03-23  Scott Redman  <redman@scriptics.com>
-
-	* win/tclWinSerial.c: Fixed problem with fileevent on the serial port
-	and nonblocking mode. Gets no longer hangs, fileevents fire whenever
-	there is any character data on the port.
-
-	* tests/winConsole.test:
-	* win/tclWinConsole.c: Fixed problem with fileevents and gets from a
-	console stdin. Previously, fileevents were firing before an entire
-	line was available for reading, which meant that when you did a gets
-	or read, it blocked (even in nonblocking mode). Now, it should work
-	the same as Unix: fileevents fire when an entire line is ready, and
-	gets and read do not block in non-blocking mode. Added an interactive
-	test case to check for this.
-
-1999-03-22  Scott Stanton  <stanton@scriptics.com>
-
-	* tests/reg.test:
-	* generic/regc_color.c: Applied regexp bug fix from Henry Spencer.
-
-1999-03-19  Scott Redman  <redman@scriptics.com>
-
-	* generic/tclCmdIL.c: Fixed the initialization of an array so that the
-	Sun 5.0 C compiler wouldn't complain.
-
-	* unix/configure.in: Added support for --enable-64bit. For now, this
-	is only supported on Solaris 7 64bit (SunOS 5.7) using the Sun
-	compiler (not gcc).
-
-1999-03-18  Scott Stanton  <stanton@scriptics.com>
-
-	* win/tclWinChan.c (TclpOpenFileChannel, Tcl_MakeFileChannel): Changed
-	to only test for console or comm handles when the type is
-	FILE_TYPE_CHAR to avoid useless tests on simple files. Also reordered
-	tests so consoles are tested first as this is more common.
-
-	* win/makefile.vc: Regularized usage of mkd and rmd and rm.
-
-	* library/encoding/shiftjis.enc:
-	* tools/encoding/shiftjis.txt: Missing/incorrect characters in
-	shift-jis table. [Bug 1008, 1526]
-
-	* generic/tclInt.decls:
-	* generic/tcl.decls: Eliminated use of "string" and "list" from
-	argument lists to avoid conflicts with C++ STL. [Bug 1181]
-
-	* win/tclWinFile.c (TclpMatchFiles): Changed to ignore the
-	FS_CASE_IS_PRESERVED bit and always return exactly what we get from
-	the system.
-
-1999-03-17  Scott Stanton  <stanton@GASPODE>
-
-	* win/README.binary:
-	* win/README:
-	* unix/configure.in:
-	* generic/tcl.h:
-	* README: Updated version to 8.1b3.
-
-1999-03-14  Scott Stanton  <stanton@GASPODE>
-
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c: Changed so channel drivers wait for the
-	reader/writer threads to exit before returning during a close
-	operation. This ensures that the main thread is the last thread to
-	exit, so the process return value is set properly.
-
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclIntPlatStubs.c:
-	* generic/tclIntStubs.c:
-	* generic/tclPlatDecls.h:
-	* generic/tclPlatStubs.c:
-	* generic/tclStubInit.c:
-	* generic/tclStubs.c: Fixed bad eol characters.
-
-	* generic/tclInt.decls: Changed "const" to "CONST" in declarations for
-	better portability.
-
-	* generic/tcl.decls: Renamed panic and panicVA to Tcl_Panic and
-	Tcl_PanicVA in the stub files.
-
-	* generic/tclInterp.c (Tcl_MakeSafe): Remove tcl_platform(user) from
-	safe interps.
-
-1999-03-11  Scott Stanton  <stanton@GASPODE>
-
-	* unix/Makefile.in:
-	* unix/configure.in: Include compat files in the stub library in
-	addition to the main library. Compat files are now built for dynamic
-	use in all cases.
-
-	* generic/tcl.h: Changed magic number so it doesn't match the plus
-	patch, at Jan's request.
-
-	* unix/tclConfig.sh.in:
-	* unix/dltest/Makefile.in:
-	* unix/dltest/configure.in:
-	* unix/dltest/pkga.c:
-	* unix/dltest/pkgb.c:
-	* unix/dltest/pkgc.c:
-	* unix/dltest/pkgd.c:
-	* unix/dltest/pkge.c:
-	* unix/dltest/pkgf.c: Changed package tests to build against the stubs
-	library.
-
-1999-03-10  Scott Stanton  <stanton@GASPODE>
-
-	* generic/tcl.h:
-	* generic/tcl.decls: Changed Tcl_ReleaseType from an enum to macros so
-	it can be used in .rc files. Added Tcl_GetString.
-
-	* mac/tclMacNotify.c:
-	* generic/tclNotify.c:
-	* generic/tclInt.h:
-	* win/tclWinNotify.c:
-	* generic/tcl.h: Renamed Tcl_AlertNotifier to TclpAlertNotifier.
-
-	* generic/tclInt.decls: Added TclWinAddProcess to make it possible for
-	expect to use Tcl_WaitForPid(). This patch is from Gordon Chaffee.
-
-	* mac/tclMacPort.h:
-	* win/tclWinInit.c:
-	* unix/tclUnixPort.h:
-	* generic/tclAsync.c: Added TclpAsyncMark to fix bug in async handling
-	on Windows where async events don't wake up the event loop. This patch
-	comes from Gordon Chaffee.
-
-	* generic/tcl.decls: Fixed declarations of reserved slots.
-
-1999-03-10  Scott Redman  <redman@scriptic.com>
-
-	* generic/tclCompile.h: Ensure that the ByteCode struct is binary
-	compatible with the version in 8.0.6.
-
-	* generic/tcl.h:
-	* generic/tclBasic.c: Add Tcl_GetVersion() function to the public C
-	API to allow programs to check the version number of the Tcl library
-	at runtime. Also added an enum to clarify the release level (alpha,
-	beta, final).
-
-1999-03-09  Scott Stanton  <stanton@GASPODE>
-
-	* Integrated changes from Tcl 8.0 including:
-		stubs mechanism
-		configure patches from Jan Nijtmans
-		rename of panic to Tcl_Panic
-
-1999-03-08  Lee Bernhard  <lfb@scriptics.com>
-
-	* win/tclWin32Dll.c: Removed Dll instance from thread-local storage.
-
-1999-03-08  Scott Stanton  <stanton@GASPODE>
-
-	* generic/tcl.h: Moved Tcl_Mutex, etc. macros above the inclusion of
-	tclDecls.h to avoid macro conflicts.
-
-	* generic/tclInt.h:
-	* generic/regc_color.c:
-	* generic/regcomp.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdAH.c:
-	* generic/tclIOCmd.c:
-	* generic/tclParse.c:
-	* generic/tclStringObj.c:
-	* unix/tclUnixNotfy.c: Cleaned up various compiler warnings,
-	eliminated UCHAR bugs.
-
-	* unix/tclUnixNotfy.c:
-	* unix/tclUnixThrd.c:
-	* generic/tclThreadTest.c:
-	* mac/tclMacThrd.c: Changed TclpCondition*() to Tcl_Condition*().
-
-	* INTEGRATED PATCHES FROM 8.0.6:
-
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclDecls.h:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclIntPlatStubs.c:
-	* generic/tclIntStubs.c:
-	* generic/tclPlatDecls.h:
-	* generic/tclPlatStubs.c:
-	* generic/tclStubInit.c:
-	* generic/tclStubLib.c:
-	* generic/tclStubs.c:
-	* tools/genStubs.tcl:
-	* unix/configure.in:
-	* unix/Makefile.in:
-	* unix/tclConfig.sh.in:
-	* win/makefile.vc:
-	* win/tclWinPort.h: Added Tcl stubs implementation. There are now two
-	new macros USE_TCL_STUBS and USE_TCL_STUB_PROCS that enable use of
-	stubs and disable stub macros respectively. All of the public and
-	private function declarations from tcl.h and tclInt.h have moved into
-	the *.decls files and the *Stubs.c and *Decls.h files are generated
-	using the genStubs.tcl script.
-
-	* unix/Makefile.in:
-	* unix/configure.in:
-	* unix/ldAix: Enhanced AIX shared library support.
-
-	* win/tclWinSock.c: Removed a bunch of extraneous PASCAL FAR
-	attributes from internal functions.
-
-	* win/tclWinReg.c: Changed registry package to use stubs mechanism so
-	it no longer depends on the specific version of Tcl.
-
-	* doc/AddErrInfo.3:
-	* doc/Eval.3:
-	* doc/PkgRequire.3:
-	* doc/SetResult.3:
-	* doc/StringObj.3:
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclPanic.c:
-	* generic/tclStringObj.c:
-	* generic/tclUtil.c:
-	* unix/mkLinks: Added va_list versions of all VARARGS functions so
-	they can be invoked from the stub functions.
-
-	* doc/package.n:
-	* doc/PkgRequire.3:
-	* generic/tclPkg.c: Added Tcl_PkgProvideEx, Tcl_RequireEx,
-	Tcl_PresentEx, and Tcl_PkgPresent. Added "package present" command.
-
-	* generic/tclFileName.c:
-	* mac/tclMacFile.c:
-	* mac/tclMacShLib.exp:
-	* unix/tclUnixFile.c:
-	* win/tclWinFile.c: Changed so TclGetUserHome is defined on all
-	platforms, even though it is currently a noop on mac and windows, and
-	renamed it to TclpGetUserHome.
-
-	* generic/tclPanic.c:
-	* generic/panic.c: Renamed panic to Tcl_Panic.
-
-1999-02-25  Scott Redman  <redman@scriptics.com>
-
-	* win/makefile.vc: Added tclWinConsole.c and tclWinSerial.c
-
-	* win/tclWinConsole.c: New code to properly deal with fileevents and
-	nonblocking mode on consoles.
-
-	* win/tclWinSerial.c: New code to properly deal with fileevents and
-	nonblocking mode on serial ports.
-
-	* win/tclWinPipe.c:
-	* win/tclWinPort.h: Exported functions to allow creation of pipe
-	channels from tclWinChan.c
-
-	* win/tclWinChan.c: Check the type of a channel, including for the
-	standard (stdin/stdout/stderr), and use the correct channel type to
-	create the channel (file, serial, console, or pipe).
-
-1999-02-11  Scott Stanton  <stanton@GASPODE>
-
-	* README:
-	* generic/tcl.h:
-	* win/README.binary:
-	* win/README:
-	* unix/configure.in:
-	* mac/README: Updated version numbers to 8.1b2.
-
-1999-02-10  Scott Stanton  <stanton@GASPODE>
-
-	* library/auto.tcl: Fixed auto_mkindex so it handles .tbc files. Did
-	some general cleanup to handle bad eval statements that didn't use
-	"list".
-
-	* unix/mkLinks:
-	* doc/SetVar.3:
-	* generic/tcl.h:
-	* generic/tclVar.c: Restored Tcl_ObjGetVar2 and Tcl_ObjSetVar2 from
-	8.0. Renamed Tcl_Get/SetObjVar2 to Tcl_GetVar2Ex and Tcl_SetVar2Ex.
-
-1999-02-10  Scott Stanton  <stanton@GASPODE>
-
-	INTEGRATED PATCHES FROM 8.0.5b2:
-
-	* test/winPipe.test: Changed to remove echoArgs.tcl temporary file
-	when done.
-
-	* tests/cmdAH.test:
-	* generic/tclFileName.c (TclGetExtension): Changed behavior so the
-	split happens at the last period in the name instead of the first
-	period of the last run of periods. So, "foo..o" is split into "foo."
-	and ".o" now. [Bug 1126]
-
-	* win/makefile.vc: Added better support for paths with spaces in the
-	name. Added .lib and support .dlls to the install-binaries target.
-	Added generate of a pkgIndex.tcl script to the install-libraries
-	target.
-
-	* win/tclAppInit.c:
-	* unix/tclAppInit.c:
-	* mac/tclMacAppInit.c:
-	* generic/tclTest.c: Changed some EXTERN declarations to extern since
-	they are not defining exported interfaces. This avoids generating
-	useless declspec() attributes and makes the windows makefile simpler.
-
-	* generic/tcl.h: Moved Tcl_AppInit declaration to end and cleared out
-	TCL_STORAGE_CLASS so it is not declared with a declspec().
-
-	* tests/interp.test:
-	* generic/tclInterp.c (DeleteAlias): Changed to use
-	Tcl_DeleteCommandFromToken so we handle renames properly. This avoids
-	senseless panic. [Bug 736]
-
-	* unix/tclUnixChan.c:
-	* win/tclWinSock.c:
-	* doc/socket.n: Applied Gordon Chaffee's patch to handle failures
-	during asynchronous socket connection operations. This adds a new
-	"-error" fconfgure option to socket channels. [Bug 893]
-
-	* generic/tclProc.c:
-	* generic/tclNamesp.c:
-	* generic/tclInt.h:
-	* generic/tclCmdIL.c:
-	* generic/tclBasic.c:
-	* generic/tclVar.c: Applied patch from Viktor Dukhovni to rationalize
-	TCL_LEAVE_ERR_MSG behavior when creating variables.
-
-	* generic/tclVar.c: Fixed bug in namespace tail computation. Fixed bug
-	where upvar could resurrect a namespace variable whose namespace had
-	been deleted.
-
-	* generic/tclCompile.c (TclCompileExprCmd): Eliminated yet another
-	bogus optimization in expression compilation.
-
-	* unix/configure.in: Added branch for BSD/OS-4* to shared library case
-	statement. [Bug 975]
-	Fixed to correctly handle IRIX 6.5 n32 library support. [Bug 1117]
-
-	* win/winDumpExts.c: Patched to be pickier about stripping @'s. [Bug
-	920]
-
-	* library/http2.0/http.tcl: Added catch around eof test in CopyDone
-	since the user may have already called http::reset. [Bug 1108]
-
-	* unix/configure.in: Changed Linux and IRIX to set SHLIB_LIBS to LIBS
-	so shared libraries are linked with the system libraries. [Bug 1018]
-
-	* generic/tclCompile.c (CompileExprWord): Fixed exception stack
-	overflow bug caused by missing statement. [Bug 928]
-
-	* generic/tclIOCmd.c:
-	* generic/tclBasic.c: Objectified the "open" command. [Bug 1113]
-
-	* generic/tclPosixStr.c (Tcl_ErrnoId, Tcl_ErrnoMsg): When using egcs,
-	ENOTSUP and EOPNOTSUPP are the same, so now we handle that case. [Bug
-	1137]
-
-	* library/init.tcl: Various small changes requested by Jan Nijtmans.
-	- If the variable $tcl_library contains the empty string, this empty
-	  string will be put in $auto_path. This is not useful at all, it only
-	  slows down later package processing.
-	- If the variable tcl_pkgPath is not set, the "unset __dir" fails.
-	  Thich makes init.tcl totally unusable. Better put a "catch" around
-	  it.
-	- In the function tcl_findLibraries, the "string match" function only
-	  works correctly if $tcl_patchLevel is in one of the forms "?.?a?",
-	  "?.?b?" or "?.?.?". Could a "regexp" be used instead, then it allows
-	  anything to be appended to the patchLevel string. And it is more
-	  efficient.
-	- The tclPkgSetup function assumes that if $type != "load" then the
-	  type must be "source". This needn't be true. Some users want to add
-	  their own setup types.
-	[RFE 1138] [Bug 978]
-
-	* win/tclWinReg.c:
-	* doc/registry.n: Added support for HKEY_PERFORMANCE_DATA and
-	HKEY_DYN_DATA keys. [Bug 1109]
-
-	* win/tclWinInit.c (TclPlatformInit): Added code to ensure tcl_pkgPath
-	is set to "" when no registry entry is found. [Bug 978]
-
-1999-02-01  Scott Stanton  <stanton@GASPODE>
-
-	* generic/tclBasic.c:
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclExecute.c:
-	* generic/tclHistory.c:
-	* generic/tclIO.c:
-	* generic/tclIOUtil.c:
-	* generic/tclInterp.c:
-	* generic/tclMain.c:
-	* generic/tclNamesp.c:
-	* generic/tclParse.c:
-	* generic/tclProc.c:
-	* generic/tclTest.c:
-	* generic/tclTimer.c:
-	* generic/tcl.h: Made eval interfaces compatible with 8.0 by renaming
-	Tcl_EvalObj to Tcl_EvalObjEx, renaming Tcl_Eval2 to Tcl_EvalEx and
-	restoring Tcl_EvalObj and Tcl_GlobalEvalObj interfaces so they match
-	Tcl 8.0.
-
-1999-01-28  Scott Stanton  <stanton@GASPODE>
-
-	* Merged Tcl 8.0.5b1 changes.
-
-	* generic/tclUtil.c (Tcl_DStringSetLength): Changed so the buffer
-	overallocates in a manner similar to Tcl_DStringAppend. This should
-	improve performance for TclUniCharToUtfDString.
-
-1998-12-11    === Tcl 8.1b1 Release ===
-
-1998-12-10  Scott Stanton  <stanton@GASPODE>
-
-	* Fixed lots of files that used TCL_THREAD instead of TCL_THREADS.
-
-	* generic/tclEncoding.c (Tcl_FreeEncoding): Moved most of the code
-	into a static FreeEncoding routine that does not grab the
-	encodingMutex to avoid deadlocks/races when called from other routines
-	that already have the mutex.
-
-1998-12-09  Scott Stanton  <stanton@GASPODE>
-
-	* library/msgcat1.0/msgcat.tcl: Fixed bad export list, fixed so all
-	locale strings are converted to lower case, including file names.
-
-	* generic/regcomp.c (makescan): Fixed bug in longest match case that
-	caused anchored patterns to fail. [Bug 897]
-
-1998-12-08  Scott Stanton  <stanton@GASPODE>
-
-	* library/msgcat1.0/msgcat.tcl: changed mc to invoke mcunknown in the
-	calling context, changed locale lookups to be case insensitive
-
-1998-12-07  Scott Stanton  <stanton@GASPODE>
-
-	* generic/tclAlloc.c (TclpRealloc): Fixed a memory allocation bug
-	where big blocks that were reallocated into a different heap location
-	were not being placed into the bigBlocks list. [Bug 933]
-
-	* tests/msgcat.test: Added message catalog test suite.
-
-	* library/msgcat1.0/msgcat.tcl: minor bug fixes, integrated latest
-	changes from Mark Harrison.
-
-1998-12-04  Scott Stanton  <stanton@GASPODE>
-
-	* library/msgcat1.0/msgcat.tcl: Changed code to conform to Tcl coding
-	standards. Changed to use file join for portability.
-
-	* library/msgcat1.0: Added initial implementaion of Tcl message
-	catalog package contributed by Mark Harrison.
-
-1998-12-03  Scott Stanton  <stanton@GASPODE>
-
-	* win/tclWinPipe.c (BuildCommandLine): Fixed bug that kept arguments
-	containing spaces from being properly quoted.
-
-	* tests/defs: Changed so auto_path is set to only contain the Tcl
-	library directory. This keeps the tests from accidentally picking up
-	stuff in installed packages.
-
-	* generic/tclUtil.c (Tcl_StringMatch): Changed to match 8.0 behavior
-	in corner case where there is no closing bracket.
-
-1998-12-02  Scott Stanton  <stanton@GASPODE>
-
-	* win/tclWinPipe.c (TclpCreateCommandChannel): Changed reader/writer
-	threads to have THREAD_PRIORITY_HIGHEST so they will have a chance to
-	run whenever there is something to do.
-
-	* generic/tclIO.c (WriteBytes, WriteChars): Fixed so extraneous
-	flushes do not happen in line mode.
-	(TranslateOutputEOL): Made translation more efficient in line mode and
-	fixed a buffer overflow bug in CRLF translation. [Bug 887]
-
-1998-12-02  Brent Welch  <welch@SAGE>
-
-	* Updated patchlevel to 8.1b1
-
-1998-12-02  Scott Stanton  <stanton@GASPODE>
-
-	* generic/regc_color.c (subcolor): Added check for error case to avoid
-	an out of bounds array reference.
-
-	* generic/tclCmdAH.c (Tcl_EncodingObjCmd): Changed to avoid using
-	Tcl_DStringResult because it is not binary clean.
-
-	* generic/tclParse.c (Tcl_ParseCommand): Fixed bug in comment parsing
-	where a trailing comment looked like an incomplete command.
-
-1998-12-02  Brent Welch  <welch@SAGE>
-
-	* Merged changes from 8.0.4, especially the new pkg_mkIndex
-
-1998-12-01  Scott Stanton  <stanton@GASPODE>
-
-	* generic/tclIO.c (Tcl_ReadChars): Added a call to UpdateInterest so
-	we don't block when there is data sitting in the buffers.
-
-	* generic/tclTest.c (TestevalobjvObjCmd): Updated for EvalObjv change.
-
-	* tests/parse.test: Updated tests for EvalObjv change.
-
-	* generic/tclParse.c (EvalObjv, Tcl_EvalObjv): Changed Tcl_EvalObjv
-	interface to remove string and length arguments, preserved original
-	interface as EvalObjv for internal use.
-
-	* generic/tcl.h: Changed Tcl_EvalObjv interface to remove string and
-	length arguments.
-
-	* doc/Eval.3: Updated documentation for Tcl_EvalObjv to remove string
-	and length arguments.
-
-	* generic/tclCompCmds.c (TclCompileForeachCmd): Fixed code that
-	corrupted the exceptDepth value in the compile environment when
-	foreach failed to compile inline. [Bug 884]
-
-	* library/encoding/euc-kr.enc:
-	* library/encoding/ksc5601.enc:
-	* tools/encoding/ksc5601.txt:
-	* unix/tclUnixInit.c: Added support for Korean EUC.
-
-	* win/tclWinChan.c (TclpGetDefaultStdChannel): added check for a
-	failure during Tcl_MakeFileChannel.
-
-1998-11-30  Scott Stanton  <stanton@GASPODE>
-
-	* unix/tclUnixNotfy.c (Tcl_WaitForEvent): Fixed hang that occurs when
-	trying to close a pipe that is currently being waited on by the
-	notifier thread. [Bug 607]
-
-	* unix/tclUnixFCmd.c (GetPermissionsAttribute): Increase size of
-	returnString buffer to avoid overflow. [Bug 584]
-
-	* generic/tclThreadTest.c (TclThreadSend): Fixed memory leak due to
-	use of TCL_VOLATILE instead of TCL_DYNAMIC.
-
-	* generic/tclThread.c (TclRememberSyncObject): Fixed memory leak
-	caused by failure to reuse condition variables.
-
-	* unix/tclUnixNotfy.c (Tcl_AlertNotifier, Tcl_WaitForEvent,
-	(NotifierThreadProc, Tcl_InitNotifier): Fixed race condition caused by
-	incorrect use of condition variables when sending messages between
-	threads. [Bug 607]
-
-	* generic/tclTestObj.c (TeststringobjCmd): MAX_STRINGS was off by one
-	so the strings array was too small.
-
-	* generic/tclCkalloc.c (Tcl_DbCkfree): Moved mutex lock so
-	ValidateMemory is done inside the mutex to avoid a race condition when
-	validate_memory is enabled. [Bug 880]
-
-1998-11-23  Scott Stanton  <stanton@GASPODE>
-
-	* regexec.c: more performance tuning from Henry Spencer.
-
-1998-11-17  Scott Stanton  <stanton@GASPODE>
-
-	* tclScan.c: moved "scan" implementation out of tclCmdMZ.c and added
-	Unicode support. This required a complete reimplementation of the
-	command to avoid using scanf(), which isn't Unicode aware. Two new
-	features were added in the process: %n to return the current number of
-	characters consumed, and XPG3-style %n$ argument order specifiers
-	similar to those provided by the "format" command. [Bug 833]
-
-	* tclAlloc.c: changed so allocated memory is always 8-byte aligned to
-	improve memory performance and to ensure that it will work on systems
-	that don't like accessing 4-byte aligned values (e.g. Solaris and
-	HP-UX). [Bug 834]
-
-1998-11-06  Scott Stanton  <stanton@GASPODE>
-
-	* tclVar.c (TclGetIndexedScalar): Fixed bug 796, var name was getting
-	lost before being passed to CallTraces.
-
-1998-10-21  Scott Stanton  <stanton@GASPODE>
-
-	* added "encoding" command
-
-	* Moved internal regexp declarations from tclInt.h to tclRegexp.h
-
-	* integrated regexp updates from Henry Spencer
-
-1998-10-15  Scott Stanton  <stanton@GASPODE>
-
-	* tclUtf.c: added Unicode character table support
-
-	* tclInt.h: added TclUniCharIsWordChar
-
-	* tclCmdMZ.c (Tcl_StringObjCmd): added "totitle" subcommand, changed
-	"wordend" and "wordstart" to properly handle Unicode word characters
-	and connector punctuation
-
-1998-10-05  Scott Stanton  <stanton@GASPODE>
-
-	* auto.tcl, package.tcl: fixed SCCS strings
-
-	* tclIndex: updated index to reflect 8.1 files
-
-	* tclCompile.c (TclCompileScript): changed to avoid modifying the
-	input string in place because name lookup operations could have
-	arbitrary side effects
-
-	* tclInterp.c: added guard against deleting current interpreter
-
-	* tclMacFile.c, tclUnixFile.c, tclWinFile.c, tclFileName.c: added
-	warnings around code that modifies strings in place
-
-	* tclExecute.c: fixed off-by-one copying error, fixed merge bugs
-
-	* tclEvent.c: changed so USE_TCLALLOC is tested for value instead of
-	definition
-
-	* tclCompCmds.c: replaced SCCS strings, added warnings around code
-	that modifies strings in place
-
-	* interp.test: added test for interp deleting itself
-
-1998-09-30  Scott Stanton  <stanton@GASPODE>
-
-	* makefile.vc: fixed so TCL_LIBRARY is set before running tcltest
-
-	* tclWin32Dll.c: removed TclpFinalize, cleanup of merges
diff --git a/ChangeLog.2000 b/ChangeLog.2000
deleted file mode 100644
index e22dff9..0000000
--- a/ChangeLog.2000
+++ /dev/null
@@ -1,2539 +0,0 @@
-2000-12-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c:
-	* tests/expr-old.test: Re-wrote Tcl's [expr rand()] and [expr
-	srand($seed)] implementations, fixing a range error on some 64-bit
-	platforms. Added tests that detect the bug. The rewrite changes the
-	seed -> sequence map on 64-bit platforms, only for seed >= 2^31, a
-	slight incompatibility. [Bug 121072, Patch 102781]
-
-2000-12-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/init.tcl:
-	* library/msgcat/msgcat.tcl:
-	* library/msgcat/pkgIndex.tcl:
-	* library/opt/optparse.tcl:
-	* library/opt/pkgIndex.tcl: Where [uplevel] is used in a proc to
-	evaluate a Tcl built-in command in the caller's context, the built-in
-	commands are now fully namespace-qualified. This prevents problems
-	when the caller context is in a namespace where the built-in command
-	name has been used by a command in the namespace. (For example,
-	[::ns::set] might be called instead of the intended [::set]). [Bug
-	119422, Patch 102545]
-
-2000-12-09  Jeff Hobbs  <jhobbs@interwoven.com>
-
-	* win/tclWinTime.c (CalibrationThread): added lint return value to
-	prevent compiler warning. [Bug 125005]
-
-	* docs/scan.n:
-	* tests/scan.test:
-	* generic/tclScan.c (Tcl_ScanObjCmd): changed %o and %x to use strtoul
-	instead of strtol to correctly preserve scan<>format conversion of
-	large integers. [Patch 102663, Bug 124600]
-
-	* generic/tclExecute.c (TclExecuteByteCode): Commited patch fixing
-	handling of {!<boolean>} in expressions. [Patch 102702]
-
-2000-12-08  Jeff Hobbs  <jhobbs@interwoven.com>
-
-	* library/init.tcl: Added support for PATHEXT variable in auto_execok,
-	recognizing the proper set of executable extensions on Windows. [Patch
-	102719]
-
-2000-12-08  Andreas Kupries  <a.kupries@westend.com>
-
-	* generic/tclEncoding.c (LoadTableEncoding): Changed dangerous code to
-	something less critical. This fixes [Bug 119417], part A without
-	affecting the speed when loading encodings.
-
-2000-12-08  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/open.n: Added xref to fconfigure and advice on the opening of
-	binary files. Should help prevent a recurrence of bugs like [Bug
-	124558]
-
-2000-12-07  Jeff Hobbs  <jhobbs@interwoven.com>
-
-	* generic/tcl.h: added note about need to updated
-	library/dde/pkgIndex.tcl with minor version increment.
-
-	* library/dde/pkgIndex.tcl: updated to use 84 version to reflect the
-	makefile. Should probably be updated to use its real version at some
-	point. [Patch 102560, Bug 119421]
-
-2000-12-06  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tcl.h (attemptckalloc): Fixed typo for #define of
-	attemptckalloc (was defined to Tcl_AttempDbCkalloc, should have been
-	Tcl_AttemptDbCkalloc). [Bug 124384]
-
-	* generic/tclCkalloc.c: Added TCL_MEM_DEBUG versions of
-	Tcl_AttemptDbCkrealloc and Tcl_AttemptDbCkalloc. [Bug 124384].
-
-2000-11-24  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Logical negation "!"  can
-	now handle string booleans, provided those values are placed in
-	variables.
-
-	* tests/expr.test (expr-13.17): Check that [expr {!$var}] can negate
-	the string-versions of booleans "yes", "false", etc.
-
-	* library/tcltest/tcltest.tcl (getMatchingFiles,
-	(getMatchingDirectories):
-	* tools/man2html.tcl (doDir):
-	* tools/man2help.tcl (doDir):
-	* library/package.tcl (tclPkgUnknown,tclMacPkgSearch):
-	* library/safe.tcl (AddSubDirs): [glob] uses -directory instead of
-	unsafe [file join]. [Bug 123313]
-
-	* generic/tclIndexObj.c:
-	* generic/tclTestObj.c (TestindexobjCmd): Changed internal
-	representation of index objects to fix [Bug 119082]; fix shouldn't be
-	visible to outside world...
-
-	* generic/tclTest.c (TestGetIndexFromObjStructObjCmd):
-	* tests/indexObj.test: (indexObj-6.*) Added to test for presence of
-	[Bug 119082].
-
-2000-11-23  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Fixed memory leak from [Bug
-	119398]
-
-	* library/init.tcl (unknown): Added specific level parameters to
-	all uplevel invocation to boost performance; didn't dare touch
-	the "namespace inscope" stuff though, since it looks sensitive
-	to me!  Should fix [Bug 123217], though testing is tricky...
-
-2000-11-21  Andreas Kupries  <a.kupries@westend.com>
-
-	All of the changes below are described in TIP #7 ~ Specification and
-	result from the application of the patch contained therein. Creator of
-	the patch is Kevin Kenny <kennykb@crd.ge.com>. The patch used here is
-	actually a bit different. Two MS specific constant values (format
-	FOOui64) were replaced with a more portable formatting of the values
-	and an additional cast to LONGLONG. My cross-compiling gcc was unable
-	to process the original form. [Patch 102459]
-
-	* tclWinTime.c: Add to the static data a set of variables that manage
-	the phase-locked techniques, including a ''CRITICAL_SECTION'' to guard
-	them so that multi-threaded code is stable.
-
-	* tclWinTime.c: Modify ''TclpGetSeconds'' to call ''TclpGetTime'' and
-	return the 'seconds' portion of the result. This change is necessary
-	to make sure that the two times are consistent near the rollover from
-	one second to another.
-
-	* tclWinTime.c: Modify ''TclpGetClicks'' to use TclpGetTime to
-	determine the click count as a number of microseconds.
-
-	* tclWinTime.c: Modify ''TclpGetTime'' to return the time as M*Q+B,
-	where Q is the result of ''QueryPerformanceCounter'', and M and B are
-	variables maintained by the phase-locked loop to keep the result as
-	close as possible to the system clock. The ''TclpGetTime'' call will
-	also launch the phase-lock management in a separate thread the first
-	time that it is invoked. If the performance counter is unavailable, or
-	if its frequency is not one of the two common 8254-compatible rates,
-	then ''TclpGetTime'' will return the result of ''ftime'' as it does in
-	Tcl 8.3.2.
-
-	* tclWinTime.c: Add the clock calibration procedure. The calibration
-	is somewhat complex; to save space, the reader is referred to the
-	reference implementation for the details of how the time base and
-	frequency are maintained.
-
-	* tclWinNotify.c: Modify ''Tcl_Sleep'' to test that the process has,
-	in fact, slept for the requisite time by calling ''TclpGetTime'' and
-	comparing with the desired time. Otherwise, roundoff errors may cause
-	the process to awaken early.
-
-	* tclWinTest.c: Add a ''testwinclock'' command. This command returns a
-	four element list comprising the seconds and microseconds portions of
-	the system clock and the seconds and microseconds portions of the Tcl
-	clock.
-
-	* winTime.test: Add to the test suite a test that makes sure that the
-	Tcl clock stays within 1.1 ms of the system clock over the duration of
-	the test.
-
-2000-11-21  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/global.n:
-	* doc/upvar.n:
-	* doc/variable.n: Improved documentation to mention that variables so
-	created are listed in [info locals] and added a few more cross-links
-	between these commands. [Bug 119387]
-
-2000-11-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/safe.test: (safe-4.3):
-	* generic/tclVar.c (TclLookupVar): Changed again. Now passes all the
-	tests, though one needed modifying since it required the wrong answer.
-	(Why on earth do we have inline modification of argument strings? This
-	sort of thing is horrendous to debug and doesn't work well in a
-	multithreaded environment!) [Bug 119192]
-
-	* tests/var.test: (var-1.19) If my attempts to fix the problem aren't
-	right yet, my attempts to describe it look pretty good to me...
-
-2000-11-16  Andreas Kupries  <a.kupries@westend.com>
-
-	* win/tclWinPort.h (line 69): Changed reference to winsock2.h into
-	winsock.h. This was a leftover from a foray into using winsock version
-	2 (History lesson from Scott Redman and Jeff Hobbs). This code was no
-	problem when compiling Tcl itself, but could trip extensions. [Bug
-	122568]
-
-2000-11-15  Jeff Hobbs  <jeff.hobbs@acm.org>
-
-	* unix/Makefile.in: removed bp.c references (hasn't existed in a long
-	time). Corrected 'make dist' to make dist with unversioned library
-	directories (same as out of cvs), so make install works correctly with
-	either source tree.
-
-2000-11-15  Jeff Hobbs  <jeff.hobbs@acm.org>
-
-	* generic/tclVar.c (TclLookupVar): reverted fix below as it broke all
-	other array unset error reporting.  Bug 119192 is still open.
-
-2000-11-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclVar.c (TclLookupVar): Changed references to part2 to use
-	elName instead in various error message generating spots. [Bug 119192]
-
-2000-11-03  David Gravereaux  <davygrvy@ajubasolutions.com>
-
-	* win/.cvsignore: Removed 'configure' from the glob list now that it's
-	included.
-
-2000-11-03  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	8.4a2 RELEASE
-
-	* unix/Makefile.in (install-libraries, dist):
-	* win/makefile.vc (install-libraries):
-	* win/Makefile.in (install-libraries): updated to install unversioned
-	library directories into versioned directories.
-
-	* tools/tcl.wse.in: updated for unversioning of library dirs
-
-	* unix/mkLinks: updated mkLinks with latest doc updates
-
-	* doc/Tcl_Main.3: added docs for Tcl_SetMainLoop
-
-	* generic/tclStubInit.c:
-	* generic/tclDecls.h:
-	* generic/tcl.decls: added Tcl_SetMainLoop proc that allows people to
-	set a main loop that will run for tclsh.
-	* generic/tcl.h: added Tcl_MainLoopProc typedef
-	* generic/tclMain.c (Tcl_SetMainLoop, StdinProc, Prompt): new
-	StdinProc and Prompt static procs and Tcl_SetMainLoop stubs proc. The
-	first two handle a fileevent based prompt (taken from tkMain.c).
-	Tcl_SetMainLoop enables the interactive setting of a main loop
-	procedure. This enables Tk to be a loadable package.
-
-2000-11-02  David Gravereaux  <davygrvy@ajubasolutions.com>
-
-	* generic/tclEvent.c: tclLibraryPath Tcl_Obj didn't have a way to
-	share its data among threads. This caused Tcl_Init() to always fail in
-	threads. Added a way to pass the data around with a global char*.
-	[BUG: 5301]
-
-2000-11-02  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* unix/configure:
-	* unix/dltest/configure:
-	* win/configure:
-	* tools/configure: checked in configure scripts so people doing CVS
-	checkouts aren't required to have autoconf. Changes to configure.in in
-	the future will require the corresponding configure script to also be
-	re-autoconf'ed and checked in.
-
-	* win/makefile.vc:
-	* win/tcl.m4: makefile fixes for Win64 support
-
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct): minor cast
-	changes.
-
-2000-11-01  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* unix/tcl.m4: removed use of -lbsd and -ldl for AIX-5.
-
-	* tests/subst.test: added tests for non-zero return code handling by
-	subst.
-	* generic/tclParse.c (Tcl_EvalEx): corrected handling of non-zero,
-	non-error return code cases for subst. [Bug 119829]
-
-	* generic/tclVar.c (TclVarTraceExists): Corrected excessive mem use
-	when info exists was called on a non-existent array element. [Bug
-	119213, 119336]
-
-2000-10-30  David Gravereaux  <davygrvy@ajubasolutions.com>
-
-	* win/configure.in:
-	* win/Makefile.in:
-	* win/makefile.vc:
-	* win/tcl.rc:
-	* win/tclsh.rc: Added logic to derive filenames better in the resource
-	scripts based on compile options.
-
-2000-10-30  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* unix/tclUnixInit.c: added default encoding map from "ja_JP.eucJP" to
-	"euc-jp". (takahashi)
-
-	* tests/clock.test: corrected clock-2.* test numbering
-
-	* unix/configure.in (SC_TCL_LINK_LIBS): removed code that was
-	commented out (it had been moved to tcl.m4's SC_TCL_LINK_LIBS
-	already).
-
-	* unix/tcl.m4: consolidated gettimeofday check for AIX.
-
-2000-10-27  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* unix/configure.in:
-	* unix/tcl.m4: added support for AIX-5.
-
-	* generic/tclIO.c (Tcl_NotifyChannel): removed #ifdef around code for
-	old channel structures, placed preserve/release around statePtr
-	* generic/tclIO.c (CloseChannel): the statePtr for a channel was not
-	being freed when the last channel in a stack was freed, causing a mem
-	leak.
-
-	* unix/tclUnixChan.c: updated channel types to strict
-	TCL_CHANNEL_VERSION_2 style to avoid compiler warnings. They work
-	either way, but this avoids compiler warnings (that worries people).
-
-2000-10-27  Jennifer Hom  <jenn@ajubasolutions.com>
-
-	* library/tcltest1.0/tcltest.tcl: Removed a cd into the test directory
-	in runAllTests that screwed up the temporary directory setting,
-	effectively preventing users from running tests on multiple platforms
-	at the same time.
-
-2000-10-26  David Gravereaux <davygrvy@ajubasolutions.com>
-
-	* win/tclWinFile.c (TclpMatchFilesTypes): NULL was being set to "attr"
-	which was a DWORD. Changed NULL to zero because a 'void *' can't be
-	set to a DWORD to avoid the compiler warning.
-
-2000-10-24  Jennifer Hom  <jenn@ajubasolutions.com>
-
-	* tests/all.tcl: Removed support for tcltest 1.0.
-
-	* tests/tcltest.test:
-	* library/tcltest1.0/tcltest.tcl:
-	* library/tcltest1.0/pkgIndex.tcl:
-	* docs/tcltest.n: Moved tcltest2 code so that it's the standard
-	version of tcltest. Removed all tcltest2 files (tests/tcltest2.test,
-	library/tcltest1.0/tcltest2.tcl, docs/tcltest2.n).
-
-2000-10-20  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* win/tclWinFile.c (TclpMatchFilesTypes): made the stat call only
-	occur when necessary (for 'glob' command). Significantly speeds up
-	glob command from 8.3. [BUG: 6216]
-
-2000-10-19  Jennifer Hom  <jenn@ajubasolutions.com>
-
-	* library/tcltest1.0/tcltest2.tcl:
-	* tests/tcltest2
-	* doc/tcltest2.n: Code and documentation cleanup. Modified -verbose to
-	take list of keywords as well as string of letters. Removed Tcl
-	version information from tcltest. Removed tcltest::grep from tcltest
-	package. Added optional 3rd directory argument to
-	makeFile/makeDirectory and removeFile/removeDirectory.
-
-	* tests/basic.test: Changed references to tcltest::tclVersion to
-	hard-coded numbers.
-	* generic/tcl.h: Changed reference to tcltest2.tcl and tcltest.tcl in
-	comments to tests/basic.test.
-
-2000-10-06  David Gravereaux  <davygrvy@ajubasolutions.com>
-
-	* win/tclWinChan.c: moved Win2K bug case test with GetStdHandle() from
-	TclpGetDefaultStdChannel into Tcl_MakeFileChannel to enable a more
-	general method in detecting invalid OS handles rather than just a
-	specific known case. [BUG: 5971]
-
-2000-10-06  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* tests/cmdAH.test: extra tests for 'file channels' that include
-	multiple interpreter tests and channel sharing
-	* generic/tclIO.c (Tcl_GetChannelNamesEx): corrected function (and
-	consequently 'file channels') to return channels that are actually
-	registered for this specific interp, rather than this thread.
-
-	* doc/CrtChannel.3: fixed spelling mistakes
-
-2000-09-29  Jennifer Hom  <jenn@ajubasolutions.com>
-
-	* library/tcltest1.0/tcltest2.tcl:
-	* tests/tcltest2.test:
-	* doc/tcltest2.n: Modified the new form of the test command to accept
-	both attribute-value pairs and command line options. Updated the tests
-	and the documentation for this new format. Also changed the option
-	names for the test command.
-
-2000-09-29  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* win/tclWinSerial.c (SerialGetOptionProc): corrected reporting of
-	space parity on Windows (Eason) [Bug 6057].
-
-	* win/Makefile.in: commented use of TESTFLAGS
-	* unix/Makefile.in: added TESTFLAGS to test target to conform with
-	Windows makefile and TEA style.
-
-	* tests/stack.test: prevented possible crash on systems with low
-	default stacksize (Tru64, AIX) in infinite recursion test. A solution
-	to check remaining stack space in the core is best, but hard to do in
-	a cross-platform manner.
-
-	* generic/tclIOGT.c (FLUSH_DELAY): renamed DELAY define to FLUSH_DELAY
-	to avoid defn conflict using Tru64's cc.
-
-2000-09-28  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* tools/tcl.wse.in: added tclPlatDecls.h and tkPlatDecls.h to the
-	Windows .exe install.
-
-	* tests/fCmd.test (fCmd-6.20): corrected test to remove c:/tcl8975@
-	after creating it.
-
-	* tests/fileName.test: cleaned up the testing of glob patterns for
-	c:/globTest (Windows) to directly create/remove directory.
-
-2000-09-27  Jeff Hobbs  <hobbs@ajubasolutions.com>
-
-	* generic/tcl.decls:
-	* generic/tclIO.c: updated Tcl_IsChannelShared,
-	Tcl_IsChannelRegistered, Tcl_CutChannel, Tcl_SpliceChannel,
-	Tcl_IsChannelExisting, and Tcl_ClearChannelHandlers to conform to the
-	new stacked channel implementation. Their stub slots were also moved
-	to give preference to the new 8.3.2 stub functions. This will cause an
-	incompatibility with 8.4a1 only.
-	(StopCopy): fixed a bug introduced by a partial fix in 8.3.2 that
-	didn't set nonBlocking correctly when resetting the flags for the
-	write side. [Bug: 6261]
-
-	* doc/ChnlStack.3:
-	* doc/CrtChannel.3:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclDecls.h:
-	* generic/tclIO.c:
-	* generic/tclIO.h:
-	* generic/tclIOGT.c:
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclTest.c:
-	* tests/iogt.test:
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc:
-	* win/tclConfig.sh.in:
-	* win/tclWinChan.c:
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c:
-	* win/tclWinSock.c: Up-port of changes made in 8.3.2 to 8.4a2 code
-	base. Most of these changes relate to the rewrite of the stacked
-	channel implementation, with a few config related fixes.
-
-	Following is an asynchronous include of the applicable ChangeLog
-	entries from 8.3.2.
-
-	********************************************************
-	** START OF ASYNCHRONOUS UP-PORT LOG (8.3.2 -> 8.4a2) **
-	********************************************************
-
-2000-08-07  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/ChnlStack.3:
-	* doc/CrtChannel.3: updated the docs to be aware of the
-	TCL_CHANNEL_VERSION_2 style of Tcl channels.
-
-	* generic/tclIO.c (Tcl_CreateChannel): added assertion to verify that
-	the new channel versioning will be binary compatible with older
-	channel drivers.
-
-2000-08-05  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclIOGT.c (TclChannelTransform): fixed segfault that would
-	occur when transforming a channel with a proc that did not yet exist.
-	(Kupries)
-
-	* generic/tclTest.c (TestChannelCmd): added some lint init'ing of
-	statePtr and chan vars.
-
-2000-07-26  Jeff Hobbs  <hobbs@scriptics.com>
-
-	Merged core-8-3-1-io-rewrite back into core-8-3-1-branch. The
-	core-8-3-1-io-rewrite branch should now be considered defunct.
-
-	* generic/tclStubInit.c:
-	* generic/tclDecls.h:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclIO.c: moved the Tcl_Channel* macros from tcl.h to tclIO.c
-	and made them proper stubbed functions. These are: Tcl_ChannelName,
-	Tcl_ChannelVersion, Tcl_ChannelBlockModeProc, Tcl_ChannelCloseProc,
-	Tcl_ChannelClose2Proc, Tcl_ChannelInputProc, Tcl_ChannelOutputProc,
-	Tcl_ChannelSeekProc, Tcl_ChannelSetOptionProc,
-	Tcl_ChannelGetOptionProc, Tcl_ChannelWatchProc,
-	Tcl_ChannelGetHandleProc, Tcl_ChannelFlushProc, and
-	Tcl_ChannelHandlerProc. These should be used to access the
-	Tcl_ChannelType structure instead of direct pointer dereferencing.
-
-	* tests/iogt.test: added RCS string, marked tests 2.* to be unixOnly
-	due to underlying system differences.
-
-2000-07-25 Andreas Kupries <a.kupries@westend.com>
-
-	* tests/iogt.test: (line 866f) New tests iogt-6.[01], highlighting
-	buffering trouble when stacking and unstacking transformations.
-	iogt-6.0 is solved, see the changes below. iogt-6.1 remains, for now,
-	due to the perceived complexity of solutions.
-
-	* generic/tclIO.h: (line 139f) struct Channel, added a buffer queue,
-	to hold data pushed back when stacking a transformation.
-
-	* generic/tclIO.c:
-	(line 91f, line 7434f) New internal function 'CopyBuffer'.  Derived
-	from 'CopyAndTranslateBuffer', with translation removed.
-	(line 1025f, line 1212f): Initialization of new queue.
-	(line 1164f, Tcl_StackChannel): Pushback of input queue.
-	(line 1293f, Tcl_UnstackChannel): Discard input and pushback.
-	(line 3748f, Tcl_ReadRaw): Modified to use data in the push back area
-	before going to the driver. Uses 'CopyBuffer', s.a.
-	(line 4702f, GetInput): Modified to use data in the push back area
-	before going to the driver.
- 	(line 4867f, Tcl_Seek): Modified to take pushback of the topmost
-	channel in a stack into account.
-	(line 5620f, Tcl_InputBuffered): See above. Added
-	'Tcl_ChannelBuffered'. Analog to 'Tcl_InputBuffered' but for the
-	buffer area in the channel.
-
-	* generic/tcl.decls: New public API 'Tcl_ChannelBuffered'. S.a.
-
-2000-07-17  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc: added tclIOGT.c to objects list to compile.
-
-	* generic/tclStubInit.c:
-	* generic/tclIntDecls.h:
-	* generic/tclInt.decls: commented out internal decls for
-	TclTestChannelCmd and TclTestChannelEventCmd as they were moved to
-	tclTest.c. Added new decls for TclChannelEventScriptInvoker and
-	TclChannelTransform.
-
-	* generic/tclIO.c (CloseChannel): stopped masking out of the
-	TCL_READABLE|TCL_WRITABLE bits from the state flags in CloseChannel,
-	instead adding extra intelligence to CheckChannelErrors with a new
-	CHANNEL_RAW_MODE bit for special behavior when called from Raw channel
-	APIs.
-
-2000-07-13  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclIO.c (StackSetBlockMode): moved set of chanPtr outside of
-	blockModeProc check to avoid infinite loop when blockModeProc was
-	NULL. Updated TransformSeekProc to not call Tcl_Seek directly
-	(Kupries).
-
-	* win/tclWinChan.c: updated fileChannelType to v2 channel struct
-	* win/tclWinConsole.c: updated consoleChannelType to v2 channel struct
-	* win/tclWinPipe.c: updated pipeChannelType to v2 channel struct
-	* win/tclWinSerial.c: updated serialChannelType to v2 channel struct
-	* win/tclWinSock.c: updated tcpChannelType to v2 channel struct
-
-2000-07-11  Brent Welch	<welch@ajubasolutions.com>
-
-	* win/tclConfig.sh.in (TCL_LIBS): Cleaned up unix-specific autoconf
-	variables.
-
-2000-07-11  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/iogt.test: made tests [345].0 not run by default as they were
-	failing in the new design, but I'm not convinced that the returned
-	result isn't correct.
-
-	* generic/tclDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tcl.decls: added Tcl_GetTopChannel C API that returns the
-	current top channel of a channel stack. Tcl_GetChannel was changed
-	earlier to return the bottommost channel of a stack because that is
-	the one that is guaranteed to stay around the longest, and this was
-	needed to compensate for certain operations that want to look at the
-	state of the main channel. Most channel APIs already compensate for
-	grabbing the top, so it shouldn't be needed often.
-
-	* generic/tclIO.c (Tcl_StackChannel, Tcl_UnstackChannel): Added
-	flushing of buffers (Kupries), removed use of DownChannel macro, added
-	Tcl_GetTopChannel public API to get to the top channel of the channel
-	stack (necessary for TLS). Rewrote Tcl_NotifyChannel for new channel
-	design (Kupries). Did some code cleanup in the transform code.
-	tclIO.c must still be broken into bits (separate out test code and
-	giot code, create tclIO.h).
-
-2000-07-10  Andreas Kupries <a.kupries@westend.com>
-
-	* tests/iogt.test: Reverted some earlier changes as a fix by Jeff
-	revived the original and correct behaviour. IOW, the tests showed a
-	genuine error and I didn't see it :(.
-
-	* generic/tclIO.c (Tcl_Read|Write_Raw): Changed to directly use the
-	drivers and not DoRead|DoWrite. The latter use the buffering system,
-	encoding and eol-translation and this wreaks havoc with the data going
-	through the transformations. Both procedures use CheckForchannelErrors
-	and let it believe that there is no background copy in progress or
-	else stacked channels could not be used for that.
-
-	* generic/tclIO.c (TclCopyChannel, CopyData): Moved access to the
-	topmost channel from the first to the second procedure to make the
-	decision about that at the last possible time (Callbacks can change
-	the stacking).
-
-	test suite: failures of iogt-[345].0
-
-2000-07-06  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/iogt.test: new tests for stacked channel stuff based off new
-	'testchannel transform|unstack' code (Kupries IOGT extension).
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclDecls.h:
-	* generic/tclStubsInit.c:
-	* generic/tclIO.c: complete rewrite of Tcl Channel code for stacked
-	channels. Channels are now designed to work in a more stacked fashion
-	with a shared ChannelState data structure.
-
-2000-06-02  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclIO.c (CloseChannel): removed the &ing out of
-	(TCL_READABLE|TCL_WRITABLE) from the flags, as CloseChannel does this
-	on the next pass through for the top channel, and it appeared to be
-	causing hangs by not allowing the final flush.
-
-2000-06-01  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclIO.c (CloseChannel): Rewrote CloseChannel code to unstack
-	a channel during the close process. Fixed a refcount bug in
-	Tcl_UnstackChannel. [Bug: 5623]
-	(CloseChannel): further extended CloseChannel in the stacked case to
-	effect certain operations on the next channel that would have been
-	done in Tcl_Close.  Also added CHANNEL_CLOSED and removed
-	(TCL_READABLE|TCL_WRITABLE) bits from chanPtr->flags. Changed final
-	reset of the WatchProc to check the chanDownPtr's (next) interestMask.
-
-	******************************************************
-	** END OF ASYNCHRONOUS UP-PORT LOG (8.3.2 -> 8.4a2) **
-	******************************************************
-
-2000-09-20  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/socket.test: removed doTestsWithRemoteServer constraint from
-	socket-12.*. It requires 'exec', not a remote server. Cleaned up some
-	coding errors.
-
-2000-09-20  Jennifer Hom  <jenn@ajubasolutions.com>
-
-	* library/tcltest1.0/pkgIndex.tcl: Updated to load tcltest 2.0.
-	* library/tcltest1.0/tcltest2.tcl: New version of tcltest.
-	Cleanup of command line parsing: allows users to specify command line
-	arguments through an environment variable named TCLTEST_OPTIONS [RFE:
-	3748], does not respond to incorrect arguments, and forces usage of
-	entire flag name when using command line arguments. Defines accessor
-	procs for all tcltest variables. Allows users to use 'return' in test
-	scripts. Allow users to specify whether test files should be sourced
-	or run in a separate process. 'all.tcl' code moved to tcltest package.
-	'test' proc modified to use attribute-value pairs. Allow users to
-	specify what return codes, output, and errors can be compared and
-	whether these values should be compared using regexp, glob, or exact
-	matching. makeDirectory & removeDirectory now operate with respect to
-	temporaryDirectory [Bug: 6001]. Test results from tests run in slave
-	interpreters are now included in test totals [Bug: 1493]. Test files
-	that return error values are now reported.
-	* tests/all.tcl: Added code to check for the tcltest version loaded;
-	modified to figure out which tests to run based on the tcltest version
-	loaded.
-	* tests/tcltest.test: Modified to explicitly load version 1.0 of
-	tcltest.
-	* tests/tcltest2.test: New test suite for tcltest; includes all of the
-	old tests plus new ones reflecting changes made for version 2.0.
-	* tests/cmdAH.test: Added singleTestInterp constraint to cmdAH-31.2;
-	this test does not run if tests aren't sourced into a single
-	interpreter.
-	* tests/socket.test: Fixed two tests that were referencing variables
-	outside of scope.
-
-	* tools/tcl.wse.in: Added code to install tcltest2.tcl.
-
-	* doc/tcltest2.n: New documentation for tcltest version 2.0. Removes
-	documentation for tcltest namespace variables. Adds documentation for
-	new tcltest procs.
-
-	* unix/mkLinks: Added code to link to tcltest2.n.
-
-	* generic/tcl.h: Added comment to modify tcltest2.tcl as well as
-	tcltest.tcl for version changes.
-
-2000-09-19  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd): When using -all, all attempts
-	after the first to match the regexp against the string should include
-	the TCL_REG_NOTBOL flag, to avoid erroneously matching ^ in the middle
-	of the string. Added code to set this flag after the first pass
-	through the matching loop. [Bug: 6284].
-
-2000-09-19  David Gravereaux  <davygrvy@ajubasolutions.com>
-
-	* doc/Eval.3: Added a note about the script argument to Tcl_Eval()
-	should be in UTF-8 or risk implied conversion errors when possible
-	combinations of upper ascii can be valid UTF-8 special codes.
-
-2000-09-17  Eric Melski  <ericm@ajubasolutions.com>
-
-	* tests/cmdIL.test: Added a test for fix for [Bug: 6212].
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Applied patch from [Bug:
-	6212], which corrected an error in the handling of the -index option.
-
-2000-09-14  Eric Melski  <ericm@ajubasolutions.com>
-
-	* doc/Alloc.3: Added entries for Tcl_AttemptAlloc, Tcl_AttempRealloc.
-
-	* doc/StringObj.3: Added entry for Tcl_AttemptSetObjLength.
-
-	* generic/tclDecls.h:
-	* generic/tclStubInit.c: Regen'ed stubs files from new tcl.decls.
-
-	* generic/tcl.decls: Added stubs for the Tcl_Attempt* memory
-	allocators and for Tcl_AttemptSetObjLength.
-
-	* generic/tcl.h: Added #define's for attemptckalloc, attemptckrealloc,
-	which map to the Tcl_Attempt* memory allocators.
-
-	* generic/tclCkalloc.c: Added non-panic'ing versions of Tcl_Alloc,
-	Tcl_Realloc, etc.; these are called Tcl_AttemptAlloc,
-	Tcl_AttemptRealloc, etc. These are used by Tcl_AttemptSetObjLength and
-	the string obj append functions.
-
-	* generic/tclStringObj.c: Modified string growth algorithm to use
-	doubling algorithm as long as possible, and only fall back when that
-	fails. Added Tcl_AttemptSetObjLength, and modified
-	AppendUnicodeToUnicodeRep, AppendUtfToUtfRep, and
-	Tcl_AppendStringsToObjVA to support this.
-
-2000-09-07  David Gravereaux <davygrvy@ajubasolutions.com>
-
-	* win/.cvsignore: changed the glob patterns a bit to exclude VC++
-	project conversion backups.
-
-	* win/tclWinPipe.c: Stage-1 bug fix for TR#2460 "exec leaks memory".
-	Added more logic around the close-down of the pipe reader thread so as
-	to avoid, at all cost, a TerminateThread. Most cases with exec are
-	fixed, but I don't consider 2460 done yet. Closing down the read side
-	of a pipe before the child process, doesn't really fit the windows
-	model. [BUG: 2460]
-
-2000-09-07  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/trace.n: minor doc cleanup
-
-2000-09-06  André Pönitz <poenitz@htwm.de>
-
-	* doc/*.n: added or changed "SEE ALSO:" section
-
-2000-09-06  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* win/tclWinLoad.c (TclpLoadFile): added special message for
-	ERROR_PROC_NOT_FOUND exception in loading a dll.
-	* win/tclWinError.c: changed ERROR_PROC_NOT_FOUND to map from ESRCH
-	(POSIX: no such process) to EINVAL because there is no good mapping
-	for "procedure not found".
-
-	* README:
-	* generic/tcl.h:
-	* library/tcltest1.0/tcltest.tcl:
-	* tools/tcl.wse.in:
-	* tools/tcltk-man2html.tcl:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure.in: updated patchlevel to 8.4a2
-
-	* unix/tclUnixPipe.c (TclpCreateProcess): Removed WNOHANG from
-	Tcl_WaitPid call in error case of process creation on Unix, as it
-	would lead to defunct processes. [Bug: 6148]
-
-	* tests/string.test: extended string repeat tests
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): changed STR_REPEAT to
-	preallocate the full space of the final string, avoided repeated
-	appends.
-
-	* doc/source.n:
-	* doc/Eval.3: added extra note about how to safe use ^Z in code, as it
-	is now a cross-platform (was just Windows) EOF char.
-
-2000-09-05  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclHash.c: fixed pedantic warning of incorrectly placed
-	#endif
-
-	* generic/tclExecute.c (TclExecuteByteCode): INST_STR_INDEX fixed
-	pedantic cast warning.
-	Corrected support for building with -DTCL_COMPILE_STATS.
-	Added efficiency check of object equality.
-
-2000-08-29  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclStringObj.c: Applied patch from Gerhard Hintermayer to
-	provide a more conservative string growth algorithm for strings larger
-	than one megabyte; this allows more efficient use of memory for very
-	large strings.
-
-2000-08-25  Eric Melski  <ericm@ajubasolutions.com>
-
-	* tests/trace.test: Extended array tracing tests.
-
-	* doc/trace.n: Clarified information about when array traces will be
-	fired.
-
-	* generic/tclVar.c (Tcl_ArrayObjCmd): Corrected call to CallTraces
-	(for TCL_TRACE_ARRAY) to only be called when the variable is either an
-	array or is undefined, to ensure that array traces do not fire for
-	scalar variables.
-
-2000-08-24  Eric Melski  <ericm@ajubasolutions.com>
-
-	* doc/man.macros: Tweaked tab settings for .SO (Standard Options)
-	sections, based on suggestion from Peter Spjuth.
-
-2000-08-24  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/README: Update to account for removal of --enable-gcc.
-	* unix/configure.in:
-	* unix/tcl.m4 (SC_ENABLE_GCC): Remove --enable-gcc option.
-	* win/README: Add note about building with Cygwin.
-	* win/configure.in:
-	* win/tcl.m4 (SC_ENABLE_GCC): Remove --enable-gcc option. Remove quick
-	hack that provided cross compile support for windows builds.
-
-2000-08-24  Eric Melski  <ericm@ajubasolutions.com>
-
-	Overall change: Added support for command rename/delete traces and new
-	trace syntax, from patch from Vince Darley. Added support for array
-	traces for variables. [RFE: 5048, 5967].
-
-	* doc/trace.n: Updated documentation for new syntax; flagged old
-	syntax as deprecated; added documentation for command rename/delete
-	traces and variable array traces.
-
-	* tests/trace.test: Updated tests for new trace syntax; new tests for
-	command rename/delete traces; new tests for array traces.
-
-	* generic/tclVar.c: Support for new trace syntax; support for
-	TCL_TRACE_ARRAY.
-
-	* generic/tclStubInit.c:
-	* generic/tclDecls.h:
-	* generic/tcl.decls: Stub functions for command rename/delete traces.
-
-	* generic/tcl.h:
-	* generic/tclInt.h:
-	* generic/tclBasic.c: Support for command traces.
-
-	* generic/tclCmdMZ.c (TclTraceVariableObjCmd): Patched to support new
-	[trace] syntax:
-	trace {add|remove|list} {variable|command} name ops command
-	Added support for command traces (rename, delete operations).
-	Added support for TCL_TRACE_ARRAY at Tcl level (array operation for
-	variable traces).
-
-2000-08-20  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclVar.c: Added check for non-arrays for [array statistics]
-	command (patch from Mark Patton).
-
-2000-08-19  David Gravereaux <davygrvy@ajubasolutions.com>
-
-	* generic/tclPlatDecls.h: without a previous '#include <windows.h>',
-	tclPlatDecls.h can't be parsed due to a missing definition of TCHAR.
-	Added a check to include it when not defined.
-
-	***POSSIBLE OBSCURE BUG*** could be caused when the compile flags for
-	the core happen to be different than a project who uses these publics
-	regarding -D_MBCS and -D_UNICODE. This added check might have to be
-	revisited later with a better understanding of the reprocusions. I
-	think TCHAR should be replaced with it's expansion.
-
-2000-08-18  David Gravereaux <davygrvy@ajubasolutions.com>
-
-	* win/.cvsignore (added): provides a cleaner build environment with
-	graphical CVS clients.
-
-2000-08-15  Eric Melski  <ericm@ajubasolutions.com>
-
-	* library/tcltest1.0/tcltest.tcl: Set debug level in
-	tcltest::restoreState to 2, for consistancy with the debug level in
-	tcltest::saveState [Bug: 4505].
-
-2000-08-14  Eric Melski  <ericm@ajubasolutions.com>
-
-	* win/makefile.vc:
-	* win/Makefile.in:
-	* unix/Makefile.in: Added tclPlatDecls.h to the list of installed
-	headers, for more complete stubs support. [Bug: 5241].
-
-	* generic/tcl.h: Added #include "tclPlatDecls.h" to get
-	platform-specific stubs declarations (Tcl_WinTCharToUtf, etc)
-	[Bug: 5241].
-
-	* README: Updated link for instructions on compiling Tcl from sources
-	to point to correct location (http://dev.scriptics.com/doc/... instead
-	of http://dev.scriptics.com/support/...).
-
-2000-08-11  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclEnv.c (TclUnsetEnv): Changed declaration of length
-	variable from "unsigned int" to "int", to match usage when passed to
-	TclpFindVariable [Bug: 6126].
-
-2000-08-10  Eric Melski  <ericm@ajubasolutions.com>
-
-	* library/msgcat1.0/pkgIndex.tcl: Bumped version number to 1.2 [Bug:
-	6100].
-
-	* library/msgcat1.0/msgcat.tcl: Removed erroneous [package forget] in
-	msgcat namespace initializer. Bumped version number to 1.2 [Bug: 6100]
-
-2000-08-10  David Gravereaux <davygrvy@ajubasolutions.com>
-
-	* generic/tclObj.c: r1.15 accidentally changed a global mutex name
-	tclObjMutex to ObjMutex.  Put the correct name back.
-
-2000-08-07  Eric Melski  <ericm@ajubasolutions.com>
-
-	* tests/indexObj.test: Added tests using the [testwrongnumargs]
-	command to test Tcl_WrongNumArgs.
-
-	* generic/tclTest.c (TestWrongNumArgsObjCmd): Added test function for
-	the Tcl_WrongNumArgs function.
-
-	* generic/tclIndexObj.c (Tcl_WrongNumArgs): Corrected algorithm to not
-	insert a space before the message component when objc == 0 [Bug: 6078]
-
-2000-07-27  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure.in: TCL_STUB_LIB_FLAG should not include ${TCL_DBGX}
-	in win/tclConfig.sh, fix that.
-
-2000-07-25  David Gravereaux  <davygrvy@ajubasolutions.com>
-
-	* doc/Async.3:
-	* generic/tclAsync.c:
-	* generic/tclInt.decls:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclTest.c:
-	* mac/tclMacPort.h:
-	* unix/tclUnixPort.h:
-	* win/tclWinInit.c: Thread-safe rewrite for tclAsync.c. Added notifier
-	alerting on all platforms as it was only working on Win before.
-	Removed older Win hacks that would end-up waking the wrong notifier in
-	the presence of a threaded build. All tests pass as before. New test
-	cases will be added soon for the new behavior. [BUG: 5791]
-
-2000-07-25  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclVar.c (CallTraces): Added check for VAR_TRACE_ACTIVE on
-	the array containing the variable before executing traces on that
-	array, to conform with normal variable traces and the documentation,
-	which states that while executing a trace, other traces on that
-	variable are disabled. [Bug: 6049].
-
-	* win/tclWinPipe.c (BuildCommandLine): Added Tcl_DStringFree call to
-	prevent potential memory leaks [Bug: 6041].
-
-2000-07-24  Eric Melski  <ericm@ajubasolutions.com>
-
-	* doc/msgcat.n: Added documentation about the selection of the default
-	locale on Windows.
-
-2000-07-23  Joe English  <jenglish@flightlab.com>
-
-	* doc/AddErrInfo.3:
-	* doc/ChnlStack.3:
-	* doc/Exit.3:
-	* doc/GetIndex.3:
-	* doc/Notifier.3:
-	* doc/Object.3:
-	* doc/RegExp.3:
-	* doc/SetResult.3:
-	* doc/SplitList.3:
-	* doc/Thread.3:  Added missing entries to NAME section.
-
-	* doc/AddErrInfo.3:
-	* doc/CrtObjCmd.3:
-	* doc/RecEvalObj.3: Changed Tcl_EvalObj to Tcl_EvalObjEx
-
-2000-07-21  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclStubInit.c:
-	* generic/tclObj.c:
-	* generic/tclInt.h:
-	* generic/tclHash.c:
-	* generic/tclDecls.h:
-	* generic/tcl.h:
-	* generic/tcl.decls:
-	* doc/Hash.3: Reapplied patch from Paul Duffin to extend hash tables
-	to allow custom key types, such as Tcl_Obj *'s, and others.
-
-	* doc/binary.n: Noted that the example in the introduction assumes a
-	32-bit system [Bug: 6035].
-
-2000-07-21  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure.in: Define ${prefix} and ${exec_prefix} like
-	unix/configure.in. Fix or add TCL_SRC_DIR, TCL_STUB_LIB_FILE,
-	TCL_STUB_LIB_FLAG, TCL_BUILD_STUB_LIB_SPEC, TCL_STUB_LIB_SPEC,
-	TCL_BUILD_STUB_LIB_PATH, TCL_STUB_LIB_PATH.
-
-2000-07-20  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclStubInit.c:
-	* generic/tclObj.c:
-	* generic/tclInt.h:
-	* generic/tclHash.c:
-	* generic/tclDecls.h:
-	* generic/tcl.h:
-	* generic/tcl.decls:
-	* doc/Hash.3: Reverted patch from Paul Duffin to extend hash tables to
-	allow custom key types, such as Tcl_Obj *'s, and others; it seems to
-	break Tk.
-
-2000-07-19  Eric Melski  <ericm@ajubasolutions.com>
-
-	* generic/tclStubInit.c:
-	* generic/tclObj.c:
-	* generic/tclInt.h:
-	* generic/tclHash.c:
-	* generic/tclDecls.h:
-	* generic/tcl.h:
-	* generic/tcl.decls:
-	* doc/Hash.3: Applied patch from Paul Duffin to extend hash tables to
-	allow custom key types, such as Tcl_Obj *'s, and others.
-
-	* tests/pkgMkIndex.test: Added tests for pkg_compareExtension.
-
-	* library/package.tcl: Enhanced pkg_compareExtension to handle Unixes
-	which tack the version number on to the end of library names (eg,
-	foo.so.1.2); such filenames will be correctly matched. (Patch from
-	Vince Darley).
-
-	* win/makefile.vc: Applied patch from Don Porter to provide better
-	nmake support for NT/Alpha [RFE: 5938].
-
-2000-07-18  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/configure.in:
-	* unix/tcl.m4:
-	* win/tcl.m4: Properly quote arguments to m4 macros. This allows Tcl
-	to work with the new version of autoconf.
-
-2000-07-18  Eric Melski  <ericm@ajubasolutions.com>
-
-	* tests/opt.test: Removed references to Lfirst, Lrest functions.
-
-	* library/opt0.4/optparse.tcl: Applied patch from Chris Nelson, which
-	replaces the [Lfirst] function with an inline [lindex ... 0] and
-	[Lrest] with [lrange ... 1 end], for better performance. [RFE: 6019]
-
-2000-07-18  Eric Melski  <ericm@scriptics.com>
-
-	* compat/string.h: Fixed function prototypes for strpbrk and strtok
-	[Bug: 6020].
-
-2000-07-17  David Gravereaux  <davygrvy@ajubasolutions.com>
-
-	* win/tclWinChan.c: Win2K OS bug with GetStdHandle(STD_OUTPUT_HANDLE)
-	giving the wrong answer. This made TclpGetDefaultStdChannel grab what
-	it thought was a valid native stdout handle. Added a new WriteFile()
-	test to make sure it's really valid. This OS bug doesn't affect the
-	shells. Only -subsystem:windows (aka WinMain) application that
-	dynamically load tclXX.dll [BUG: 5971]
-
-2000-07-17  Eric Melski  <ericm@scriptics.com>
-
-	* library/msgcat1.0/msgcat.tcl:
-	* doc/msgcat.n:
-	* tests/msgcat.test: Applied patches from Chris Nelson, to provide the
-	mcmset function, which allows the translator to set multiple string
-	translations in a single function call, rather than requiring many
-	calls to mcset. [RFE: 6000, 5993]. In addition, these patches correct
-	mcload to use utf-8 encoding on when reading message catalog files,
-	and provides for better default behavior for determining the locale on
-	a Windows system.
-
-2000-07-17  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/tcl.m4 (SC_ENABLE_GCC): Don't set CC=gcc before running
-	AC_PROG_CC if CC is already set.
-
-2000-07-13  André Pönitz <poenitz@mathematik.tu-chemnitz.de>
-
-	* doc/lappend.n:
-	* doc/lindex.n:
-	* doc/linsert.n:
-	* doc/list.n:
-	* doc/llength.n:
-	* doc/lrange.n:
-	* doc/lreplace.n:
-	* doc/lsearch.n:
-	* doc/lsort.n: Added SEE ALSO sections.
-
-2000-07-07  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure.in: Fix definition of TCL_SRC_DIR so that it matches
-	the Unix version.
-	* win/tclConfig.sh.in: Removed duplicate variables.
-
-2000-07-06  Eric Melski  <ericm@scriptics.com>
-
-	* tests/msgcat.test:
-	* library/msgcat1.0/msgcat.tcl: Applied patch from Christian Krone, to
-	provide extended args support for msgcat::unknown, which is used for
-	strings without a known translation in the current locale [Bug: 5984].
-
-2000-06-29  Eric Melski  <ericm@scriptics.com>
-
-	* doc/msgcat.n: Doc's for mcmax function.
-
-	* library/msgcat1.0/msgcat.tcl: Applied patches from Laurent Duperval,
-	to add mcmax function, which computes the length of the longest of
-	several translated strings. Bumped version number to 1.1.
-
-2000-06-27  Eric Melski  <ericm@scriptics.com>
-
-	* tests/stringObj.test: Tweaked tests to avoid hard-coded high-ASCII
-	characters (which will fail in multibyte locales); instead used \uXXXX
-	syntax. [Bug: 3842].
-
-2000-06-26  Eric Melski  <ericm@scriptics.com>
-
-	* doc/package.n: Corrected information about [package forget]
-	arguments [Bug: 5418].
-
-2000-06-23  Eric Melski  <ericm@scriptics.com>
-
-	* doc/Hash.3: Added documentation patch for Tcl_Obj *'s as keys in Tcl
-	hash tables [RFE: 5934].
-
-	* generic/tcl.h:
-	* generic/tclHash.c: Applied patch from [RFE: 5934], which extends Tcl
-	hash tables to allow Tcl_Obj *'s as the key.
-
-2000-06-20  Eric Melski  <ericm@ajubasolutions.com>
-
-	* tests/opt.test:
-	* library/opt0.4/optparse.tcl: Applied patch from [Bug: 5922], which
-	corrected an incorrect use of [string match].
-
-	* unix/tclConfig.sh.in:
-	* win/tclConfig.sh.in: Applied patch from [Bug: 5921], which corrects a
-	typo in the comments in these files.
-
-2000-06-19  Eric Melski  <ericm@scriptics.com>
-
-	* doc/RegExp.3: Replaced instances of "Tcl_GetRegExpInfo" with
-	"Tcl_RegExpGetInfo", the correct name of the function [Bug: 5901].
-
-2000-06-13  Eric Melski  <ericm@scriptics.com>
-
-	* win/tcl.m4:
-	* win/configure.in:
-	* win/Makefile.in: Applied patch from [RFE: 5844], to extend support
-	for mingw compile environment on Windows.
-
-	* win/tclWinDde.c:
-	* win/tclWinInit.c:
-	* win/tclWinNotify.c:
-	* win/tclWinPipe.c:
-	* win/tclWinReg.c:
-	* win/tclWinThrd.c: Applied patch from [Bug: 5794], to fix compiler
-	warnings when using mingw on Windows.
-
-2000-05-31  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/set-old.test:
-	* doc/unset.n:
-	* generic/tclVar.c (Tcl_UnsetObjCmd): added -nocomplain and -- options
-	to unset, to allow for a silent unset operation.
-
-2000-05-31  Eric Melski  <ericm@scriptics.com>
-
-	* generic/tclVar.c (Tcl_ArrayObjCmd): Added support for regexp and
-	exact matching for [array names] command. [RFE: 3684].
-
-	* doc/array.n: Added documentation for [array names
-	-exact/-regexp/-glob] [RFE: 3684].
-
-	* tests/set-old.test: Added tests for [array names
-	-exact/-regexp/-glob] [RFE: 3684].
-
-2000-06-06  Jeff Hobbs  <hobbs@scriptics.com>
-
-	8.4a1 RELEASE
-
-	* generic/tclExecute.c (TclExecuteByteCode INST_STR_CMP): added test
-	of iResult return from memcmp, as memcmp isn't required to return only
-	-1,0,1.
-
-2000-06-03  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct): Corrected caching
-	of the index ptr to account for offsets != sizeof(char *). [Bug: 5153]
-
-2000-05-29  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* tests/http.test
-	* doc/http.n
-	* library/http2.3/http.tcl: Fixed bug 5741, where unsuccessful geturl
-	calls sometimes leaked memory and resources (sockets). Also, switched
-	around some of the logic so that http::wait never throws an exception.
-	This is because in an asynchronous geturl, the command callback will
-	probably end up doing all the error handling anyway, and in an
-	asynchronous situation, the user expects to check the state when the
-	transaction completes, as opposed to being thrown an exception.	For
-	the http package, this menas the user can check http::status for
-	"error" and http::error for the error message after doing the
-	http::wait.
-
-2000-05-27  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/info.test:
-	* doc/info.n:
-	* generic/tclIOUtil.c (Tcl_EvalFile):
-	* generic/tclCmdIL.c (InfoScriptCmd): added ability to set the info
-	script return value [info script ?newFileName?]. This will be
-	beneficial for virtual file system programs. [Bug: 4225]
-
-2000-05-26  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclCmdMZ.c (Tcl_RegsubObjCmd): reworked to operate in
-	Unicode, tweaked for performance.
-	(Tcl_StringObjCmd) changed STR_FIRST/STR_LAST error message to
-	something more understandable, reworked STR_FIRST, STR_LAST, STR_MAP,
-	STR_MATCH, STR_RANGE, STR_REPLACE to operate in Unicode. Removed
-	inneffectual STR_RANGE "special" ByteArray support. Optimized STR_MAP
-	algorithm, especially optimized for one-pair case. Fixed possible mem
-	overrun in STR_INDEX bytearray case.
-
-	* generic/tclCompExpr.c: changed INST_STREQ -> INST_STR_EQ,
-	INST_STRNEQ -> INST_STR_NEQ
-	* generic/tclCompile.c: added streq, strneq, strcmp, strlen &
-	strmatch to the compiled stats instructionTable
-	* generic/tclCompile.h: added instructions INST_STR_CMP,
-	INST_STR_INDEX, INST_STR_MATCH
-	* generic/tclCompCmds.c: added byte compiler support for [string
-	compare|match|index].
-	* generic/tclExecute.c: Changed INST_STR_(N)EQ to return an Int object
-	and not bother trying to reuse the top stack object. Added
-	INST_STR_CMP, INST_STR_INDEX, INST_STR_MATCH bytecode ops. Extended
-	evalstats output info with Tcl_IsShared stat info.
-
-	* generic/tclInt.h:
-	* generic/tclObj.c (Tcl_DbIsShared): added support for checking result
-	of Tcl_IsShared in evalstats (TCL_COMPILE_STATS).
-
-	* generic/tclStringObj.c (Tcl_AppendUnicodeToObj): removed dead code.
-	(AppendUnicodeToUnicodeRep) removed overallocation by extra
-	sizeof(Tcl_UniChar) multiplier.
-
-	* tests/string.test: added string map tests for the one-pair case,
-	corrected tests to reflect improved error messages in first/last.
-	Added tests against mem overrun in string index bytearray case.
-
-2000-05-23  Eric Melski  <ericm@scriptics.com>
-
-	* generic/tclInt.h: Added function prototypes for TclCompileStringCmd
-	and TclCompileReturnCmd.
-
-	* generic/tclCompile.h: Added definition of INST_STRLEN opcode and
-	updated LAST_INST_OPCODE value.
-
-	* generic/tclBasic.c: Added information about TclCompileStringCmd and
-	TclCompileReturnCmd to BuiltInCmds table.
-
-	* generic/tclExecute.c (TclExecuteByteCode): Added support for the
-	INST_STRLEN opcode.
-
-	* generic/tclCompCmds.c (TclCompileStringCmd): Basic implementation of
-	byte-compiled [string] command. Not all subcommands are implemented;
-	those that are not an out-line compiled.
-
-	(TclCompileReturnCmd): Byte-compiled implementation of [return]
-	command. Only "simple" returns are byte-compiled; in particular, if
-	the -code, -errorinfo or -errorcode flags are used, the command is not
-	byte-compiled.
-
-2000-05-22  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/scan.n:
-	* doc/array.n: minor doc fixes [Bug: 5396]
-
-	* generic/tclEnv.c: cast cleanup [Bug: 5624]
-	* win/tclWinConsole.c: cast and header cleanup [Bug: 5625]
-	* win/tclWinSerial.c: cast cleanup [Bug: 5626]
-	* win/tclWinFCmd.c: cast cleanup [Bug: 5627]
-
-2000-05-19  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclTest.c:
-	* generic/tclIO.c: moved channel test commands from tclIO.c to
-	tclTest.c.
-	* generic/tclIO.h: new file, split out from tclIO.c to allow test
-	commands to be moved to tclTest.c.
-
-	* generic/tclStubInit.c:
-	* generic/tclIntDecls.h:
-	* generic/tclInt.decls: removed TclTestChannel*Cmd from internal stubs
-	table and added TclChannelEventScriptInvoker to the internal stubs
-	table so it can be used from the test code.
-
-2000-05-18  Eric Melski  <ericm@scriptics.com>
-
-	* tests/clock.test: Added test for "2 days 2 hours ago" style
-	specifications.
-
-	* generic/tclDate.c: Regenerated from tclGetDate.y.
-
-	* generic/tclGetDate.y: Tweaked grammar to properly handle the "ago"
-	keyword when it follows multiple relative unit specifiers, as in "2
-	days 2 hours ago". [Bug: 5497]
-
-2000-05-18  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* win/{tcl.m4,Makefile.in,configure.in}: added support for mingw
-	compile env and cross-compiling. [Bug: 5499]
-
-	* generic/tclClock.c (FormatClock): correct code to handle locale
-	specific return values from strftime, if any. [Bug: 3345]
-
-	* unix/tclUnixInit.c (TclpSetInitialEncodings): attempt to correct
-	setlocale calls for XIM support and locale issues. [BUG: 5422 3345
-	4236 2522 2521]
-
-2000-05-17  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* library/init.tcl (auto_import): added check to see if a valid
-	pattern was coming in, to avoid simple error cases [Bug: 3326]
-
-	* doc/regsub.n: correct regsub docs [Bug: 5346]
-
-2000-05-15  Eric Melski  <ericm@scriptics.com>
-
-	* library/history.tcl: Corrected an off-by-one error in HistIndex,
-	which was causing [history redo] to start its search at the wrong
-	event index. [Bug: 1269].
-
-2000-05-10  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclPosixStr.c (Tcl_SignalMsg): clarified #defines for Linux
-	on Sparc to compile correctly. [Bug: 5364]
-
-	* doc/namespace.n:
-	* tests/namespace.test:
-	* generic/tclNamesp.c (Tcl_NamespaceObjCmd): added 'namespace exists'
-	command. [Bug: 4665]
-
-	* doc/source.n:
-	* doc/Eval.3:
-	* tests/source.test:
-	* generic/tclIOUtil.c (Tcl_EvalFile): added explicit \32 (^Z) eofchar
-	(affects Tcl_EvalFile in C, "source" in Tcl). This was implicit on
-	Windows already, and is now cross-platform to allow for scripted
-	documents.
-
-2000-05-09  Andreas Kupries  <a.kupries@westend.com>
-	operating as proxy for David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinThrd.c (TclpInitLock, TclpMasterLock): Added missing
-	initialization of joinLock.
-
-2000-05-09  Eric Melski  <ericm@scriptics.com>
-
-	* tests/lsearch.test:
-	* doc/lsearch.n:
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): Extended [lsearch] to
-	support sorted list searching and typed list searching. [RFE: 4098].
-
-2000-05-08  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/expr.n:
-	* tests/expr.test:
-	* tests/expr-old.test: added tests for 'eq' and 'ne'
-	* generic/tclExecute.c:
-	* generic/tclCompile.h: added INST_STREQ and INST_STRNEQ opcodes that
-	do strict string comparisons.
-	* generic/tclCompExpr.c: added 'eq' and 'ne' string comparison
-	operators.
-	* generic/tclParseExpr.c (GetLexeme): added 'eq' and 'ne' expr parse
-	terms (string (in)equality check).
-
-	* generic/tclCmdIL.c (Tcl_LinsertObjCmd): made use of
-	Tcl_DuplicateObj where code was otherwise duplicated. Made special
-	case of inserting one element at the end work again (where index ==
-	len).
-	(Tcl_LreplaceObjCmd): moved Tcl_DuplicateObj call lower and cleaned
-	up use of other arguments.
-
-	* generic/tclObj.c (Tcl_DuplicateObj): simplified code to call
-	TclInitStringRep, which the code was just duplicating in part.
-
-	* doc/Utf.3:
-	* generic/tclStubInit.c:
-	* generic/tcl.decls:
-	* generic/tclDecls.h:
-	* generic/tclUtf.c: Added new functions Tcl_UniCharNcasecmp and
-	Tcl_UniCharCaseMatch (unicode parallel to Tcl_StringCaseMatch)
-	* generic/tclUtil.c: rewrote Tcl_StringCaseMatch algorithm for
-	optimization and made Tcl_StringMatch just call Tcl_StringCaseMatch
-	* tests/string.test: extended string match tests
-
-2000-05-08  Eric Melski  <ericm@scriptics.com>
-
-	* tests/set-old.test:
-	* doc/array.n:
-	* generic/tclVar.c: Added [array statistics] command [RFE: 4557]
-
-2000-05-06  Andreas Kupries <a.kupries@westend.com>
-	operating as proxy for David Gravereaux <davygrvy@pobox.com>
-
-	* tclThreadJoin.c: Fixed several places with missing a & in arguments
-	to calls of Tcl_Mutex(Un)lock and Tcl_ConditionNotify functions.
-
-2000-05-02  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* README:
-	* generic/tcl.h:
-	* library/init.tcl:
-	* library/reg1.0/pkgIndex.tcl:
-	* library/tcltest1.0/tcltest.tcl:
-	* mac/README:
-	* tools/tcl.hpj.in:
-	* tools/tcl.wse.in:
-	* unix/README:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README:
-	* win/README.binary:
-	* win/configure.in:
-	* win/makefile.vc:
-	* win/tcl.m4: updated patchlevel to 8.4a1
-
-	* tests/compile.test:
-	* tests/init.test:
-	* tests/proc.test:
-	* tests/proc-old.test:
-	* tests/rename.test:
-	* generic/tclProc.c: reworked error return for procedures with
-	incorrect args to be like the C Tcl_WrongNumArgs, where a "wrong #
-	args: ..." message is printed out with the args list.
-
-	* unix/Makefile.in: add tclsh.ico and tcl.spec to dist target
-
-2000-05-02  Andreas Kupries <a.kupries@westend.com>
-
-	Overall changes:
-	  (1) Implementation of joinable threads for all platforms.
-	  (2) Additional API's for channels. Required to allow the thread
-	      extension to move channels between threads.
-
-	* generic/tcl.decls (lines 1360f): Added Tcl_JoinThread,
-	Tcl_IsChannelShared, Tcl_IsChannelRegistered, Tcl_CutChannel,
-	Tcl_SpliceChannel, Tcl_IsChannelExisting and Tcl_ClearChannelHandlers
-	(slots 394 to 400).
-
-	* generic/tclIO.c: Implemented Tcl_IsChannelRegistered,
-	Tcl_IsChannelShared, Tcl_CutChannel, Tcl_SpliceChannel,
-	Tcl_IsChannelExisting and Tcl_ClearChannelHandlers.  Tcl_CutChannel
-	uses code from CloseChannel. Replaced this code by a call to
-	Tcl_CutChannel. Replaced several code fragments adding channels to
-	the channel list with calls to Tcl_SpliceChannel. Removed now unused
-	variables from CloseChannel and Tcl_UnstackChannel.
-	Tcl_ClearChannelHandlers uses code from Tcl_Close. Replaced this code
-	by a call to Tcl_ClearChannelHandlers. Removed now unused variables
-	from Tcl_Close. Added the subcommands 'cut', 'forgetch', 'splice' and
-	'isshared' to the test code (TclTestChannelCmd).
-
-	* unix/tclUnixThread.c: Implemented Tcl_JoinThread using the
-	pthread-functionality.
-
-	* win/tclWinThrd.c: Fixed several small typos in comments.
-	Implemented Tcl_JoinThread using a platform independent emulation
-	layer (see generic/tclThreadJoin.c below). Added 'joinLock' to
-	serialize Tcl_CreateThread and TclpExitThread to prevent a race for
-	joinable threads.
-
-	* mac/tclMacThrd.c: Implemented Tcl_JoinThread using a platform
-	independent emulation layer (see generic/tclThreadJoin.c below). Due
-	to the cooperative nature of threading on this platform the race
-	mentioned above is not present.
-
-	* generic/tclThreadJoin.c: New file. Contains a platform independent
-	emulation layer helping in the implementation of joinable threads for
-	the win and mac platforms.
-
-	* generic/tclInt.h: Added declarations for TclJoinThread,
-	TclRememberJoinableThread and TclSignalExitThread. These procedures
-	define the API of the emulation layer for joinable threads (see
-	generic/tclThreadJoin.c above).
-
-	* win/Makefile.in:
-	* win/makefile.vc: Added generic/tclTheadJoin.o to the rules.
-
-	* mac/: I don't know to which file generic/tclTheadJoin.o has to be
-	added to so that it compiles. Sorry.
-
-	* unix/tclUnixChan.c: #ifdef'd the thread-local list of file channels
-	as it prevents us from transfering channels. To restore this we may
-	need an extended interface to drivers in the future. Target:
-	9.0. Found while testing the new transfer of channels. The information
-	in this list for a channel was left behind and then crashed the system
-	during finalization.
-
-	* generic/tclThreadTest.c: Added -joinable flag to 'testthread
-	create'. Added subcommand 'testthread join'.
-
-	* doc/CrtChannel.3: Added documentation for Tcl_IsChannelRegistered,
-	Tcl_IsChannelShared, Tcl_CutChannel, Tcl_SpliceChannel,
-	Tcl_IsChannelExisting and Tcl_ClearChannelHandlers.
-
-	* doc/Thread.3: Added documentation for Tcl_JoinThread.
-
-	* tests/thread.test: Added tests for joining of threads.
-
-2000-04-27  Eric Melski  <ericm@scriptics.com>
-
-	* doc/library.n: Added entries for auto_qualify and auto_import
-	[Bug: 1271].
-
-	* doc/Init.3: Manual entry for Tcl_Init [Bug: 1820].
-
-	* doc/expr.n: Added documentation for each of the math library
-	functions that expr supports [Bug: 1054].
-
-2000-04-26  Eric Melski  <ericm@scriptics.com>
-
-	* doc/memory.n: Man page for Tcl "memory" command, which is created
-	when TCL_MEM_DEBUG is defined at compile time.
-
-	* doc/TCL_MEM_DEBUG.3: Man page with overall information about
-	TCL_MEM_DEBUG usage.
-
-	* doc/DumpActiveMemory.3: Man page for Tcl_DumpActiveMemory,
-	Tcl_InitMemory, and Tcl_ValidateAllMemory [Bug: 1816, 1835].
-
-	* generic/tclCkalloc.c: Fixed some function headers.
-
-	* unix/mkLinks: Regen'd with new mkLinks.tcl.
-
-	* unix/mkLinks.tcl: Fixed indentation, made link setup more
-	intelligent (only do one existence test per man page, instead of one
-	per function).
-
-	* doc/library.n: Fixed .SH NAME macro to include each function
-	documented on the page, so that mkLinks will know about the functions
-	listed there, and so that the Windows help file index will get set up
-	correctly [Bug: 1898, 5273].
-
-2000-04-26  Jeff Hobbs  <hobbs@scriptics.com>
-
-	8.3.1 RELEASE
-
-	* README:
-	* mac/README:
-	* tools/tcl.wse.in:
-	* unix/README:
-	* unix/tcl.spec:
-	* win/README:
-	* win/README.binary: Updating URLs to reference dev.scriptics.com
-
-2000-04-25  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc: updated for http change and some cleanup
-	* library/http2.[13]: moved dir http2.1 to http2.3 to match version
-
-	* doc/Utf.3: clarified docs for Tcl_(UniChar|Utf)AtIndex
-
-	* unix/tclUnixThrd.c: removed {}s around PTHREAD_MUTEX_INITIALIZER
-	[Bug: 5254]
-
-	* unix/tclLoadDyld.c (TclpLoadFile): removed use of interp->result
-
-2000-04-25  Eric Melski  <ericm@scriptics.com>
-
-	* unix/mkLinks:
-	* doc/AddErrInfo.3: Added information about Tcl_LogCommandInfo
-	[Bug: 1818].
-
-2000-04-24  Eric Melski  <ericm@scriptics.com>
-
-	* unix/mkLinks:
-	* doc/OpenFileChnl.3: Added man entry for Tcl_Ungets [Bug: 1834].
-
-	* unix/mkLinks:
-	* doc/SourceRCFile.3: Man page for Tcl_SourceRCFile [Bug: 1833].
-
-	* unix/mkLinks:
-	* doc/ParseCmd.3: Added documentation for Tcl_ParseVar [Bug: 1828].
-
-2000-04-24  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/tclUnixNotfy.c (Tcl_FinalizeNotifier, NotifierThreadProc):
-	added write of 'q' into triggerPipe for notifier in threaded case, so
-	that Tcl doesn't hang when children are still running [Bug: 4139]
-
-	* unix/tclUnixThrd.c (Tcl_MutexLock): minor comment fixes.
-
-2000-04-23  Jim Ingham  <jingham@cygnus.com>
-
-	These changes make some error handling marginally better for Mac
-	sockets. It is still somewhat flakey, however.
-
-	* mac/tclMacSock.c (TcpClose): Add timeouts to the close - these don't
-	seem to be honored, however. Use a separate PB for the release, since
-	an async connect socket will still be using the original buffer. Make
-	sure TCPRelease returns noErr before freeing the recvBuff. If the call
-	returns an error, then the buffer is not right.
-	* mac/tclMacSock.c (CreateSocket): Add timeouts to the async create.
-	These don't seem to trigger, however. Sigh...
-	* mac/tclMacSock.c (WaitForSocketEvent): If an TCP_ASYNC_CONNECT
-	socket errors out, then return EWOULDBLOCK & error out.
-	* mac/tclMacSock.c (NotifyRoutine): Added a NotifyRoutine for
-	experimenting with MacTCP.
-
-2000-04-22  Jim Ingham <jingham@cygnus.com>
-
-	* library/package.tcl (tclPkgUnknown): Fixed a typo in the Mac package
-	search part of tclPkgUnknown.
-
-2000-04-21  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* library/http2.1/http.tcl: Fixed a newly introduced bug where if
-	there's a -command callback and something goes wrong, geturl threw an
-	exception, called the callback, and unset the token. I changed it so
-	that it will not call the callback when throwing an exception (so the
-	caller only finds out about a given error from one place).  Also,
-	fixed http::ncode so that it actually gives you back the http return
-	code (i.e. 200, 404, etc.) instead of the first digit of the version
-	of HTTP being used (i.e. 1).
-
-2000-04-21  Brent Welch <welch@scriptics.com>
-
-	* library/http2.1/http.tcl: More thrashing with the "server closes
-	without reading post data" scenario. Reverted to the previous fileevent
-	configuratiuon, which seems to work better with small amounts of post
-	data.
-
-2000-04-20  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclAlloc.c: wrapped caddr_t define to not be done on Unix
-	* unix/tclUnixPort.h: added Tclp*Alloc defines to allow the use of
-	USE_TCLALLOC on Unix. [Bug: 4731]
-
-2000-04-19  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* library/dde1.1/pkgIndex.tcl:
-	* library/reg1.0/pkgIndex.tcl:
-	* win/tclWinChan.c:
-	* win/tclWinThrd.c: converted CRLF to LF the */tcl.hpj.in files were
-	not converted, as it confuses hcw locally. [Bug: 5096]
-
-	* win/Makefile.in: expanded cleanup target for help files
-
-	* doc/Thread.3: minor macro cleanup
-
-	* generic/tclFileName.c (SplitUnixPath): added support for QNX node
-	ids.
-
-2000-04-18  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* README:
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-	* win/README.binary: bumped version to 8.3.1
-
-	* win/tcl.hpj.in: updated copyright date
-
-	* generic/tclEnv.c: environment support for Mac OS/X
-	* unix/tclUnixPort.h: environment support for Mac OS/X
-	* unix/tclLoadDyld.c: new file for Mac OS/X dl functions
-	* unix/Makefile.in: added install-strip target; bindir, libdir,
-	mandir, includedir vars; tclLoadDyld.c target [Bug: 2527]
-
-	* unix/tclUnixChan.c (CreateSocket): force a socket back into blocking
-	mode (default state) after a -async connect succeeds. [Bug: 4388]
-
-	* generic/tclEvent.c (TclInitSubsystems): Moved tclLibraryPath to
-	thread-local storage to prevent thread-related race condition.
-	[Bug: 5033]
-	* unix/tclAppInit.c (main): removed #ifdef TCL_TEST that sets the
-	library path as it was unnecessary and conflicts with move of
-	tclLibraryPath to thread-local storage.
-
-2000-04-18  Scott Redman  <redman@scriptics.com>
-
-	* win/Makefile.in:
-	* win/tcl.rc:
-	* win/tclsh.rc:
-	* win/tclsh.ico:  Modified copyright dates in Windows resource files.
-	Added an icon for tclsh.exe.
-
-2000-04-17  Brent Welch <welch@scriptics.com>
-
-	* generic/tcl.h, generic/tclThreadTest.c, unix/tclUnixThrd.c,
-	* win/tclWinThread.c, mac/tclMacThread.c: Added Tcl_CreateThreadType
-	and TCL_RETURN_THREAD_TYPE macros for declaring the NewThread callback
-	proc.
-
-2000-04-14  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/tclUnixChan.c (TtyParseMode): Only allow setting mark/space
-	parity on platforms that support it [Bug: 5089]
-
-	* generic/tclBasic.c (Tcl_GetVersion): adjusted use of major/minor to
-	not conflict with global decl on some systems [Bug: 2882]
-
-	* doc/AppInit.3:
-	* doc/Async.3:
-	* doc/BackgdErr.3:
-	* doc/CrtChannel.3:
-	* doc/CrtInterp.3:
-	* doc/CrtMathFnc.3:
-	* doc/DString.3:
-	* doc/Eval.3:
-	* doc/ExprLong.3:
-	* doc/GetInt.3:
-	* doc/GetOpnFl.3:
-	* doc/Interp.3:
-	* doc/LinkVar.3:
-	* doc/OpenFileChnl.3:
-	* doc/OpenTcp.3:
-	* doc/PkgRequire.3:
-	* doc/RecordEval.3:
-	* doc/SetResult.3:
-	* doc/SplitList.3:
-	* doc/StaticPkg.3:
-	* doc/TraceVar.3:
-	* doc/Translate.3:
-	* doc/UpVar.3:
-	* doc/load.n: removed or updated references to interp->result use.
-
-2000-04-13  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/regexp.n: doc clarification [Bug: 5037]
-	* doc/update.n: typo fix [Bug: 4996]
-
-	* unix/tcl.m4 (SC_ENABLE_THREADS): enhanced the detection of
-	pthread_mutex_init [Bug: 4359] and (SC_CONFIG_CFLAGS) added
-	--enable-64bit-vis switch for Sparc VIS compilation [Bug: 4995]
-
-2000-04-12  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/dde.n: corrected dde poke docs. [Bug: 4991]
-
-2000-04-11  Eric Melski  <ericm@scriptics.com>
-
-	* win/tclWinPipe.c: Added "CONST" keyword to declaration of char
-	*native in TclpCreateTempFile, to supress compiler warnings.
-
-2000-04-10  Brent Welch <welch@scriptics.com>
-
-	* generic/tcl.h: Fixed Tcl_CreateThread declaration.
-	* library/tcltest1.0/tcltest.tcl: Fixed the "mainThread"
-	initialization to work with either testthread or the thread extension
-	* unix/tclUnixThrd.c: Fixed compiler warning when compiling with
-	-DTCL_THREADS
-
-2000-04-10  Eric Melski  <ericm@scriptics.com>
-
-	* win/tclWinPipe.c (TclpCreateTempFile): Added conversion of contents
-	string from UTF to native encoding [Bug: 4030].
-
-	* tests/regexp.test: Added tests for infinite looping in [regexp
-	-all].
-
-	* generic/tclCmdMZ.c: Fixed infinite loop bug with [regexp -all]
-	[Bug: 4981].
-
-	* tests/*.test: Changed all occurrences of "namespace import
-	::tcltest" to "namespace import -force ::tcltest" [Bug: 3948].
-
-2000-04-09  Brent Welch <welch@scriptics.com>
-
-	* lib/httpd2.1/http.tcl: Worked on the "server closes before reading
-	post data" case, which unfortunately causes different error cases on
-	Solaris, which can read the reply, and Linux and Windows, which cannot
-	read anything. This is all in the loop-back case - client and server
-	on the same host. Also unified the error handling so the "ioerror"
-	status goes away and errors are reflected in a more uniform way.
-	Updated the man page to document the behavior.
-
-2000-04-09  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/reg.test (matchexpected): corrected tests to use tcltest
-	constraint types to skip certain tests.
-
-	* generic/tclBasic.c (Tcl_SetCommandInfo): comment fix
-
-	* unix/tclUnixThrd.c (Tcl_CreateThread): moved TCL_THREADS ifdef
-	inside of func as it is declared for non-threads builds as well. In
-	the non-threads case, it always returns TCL_ERROR (couldn't create
-	thread).
-
-2000-04-08  Andreas Kupries <a.kupries@westend.com>
-
-	* Overall change: Definition of a public API for the creation of
-	new threads.
-
-	* generic/tclInt.h (line 1802f): Removed the definition of
-	'TclpThreadCreate'. (line 793f) Removed the definition of
-	'Tcl_ThreadCreateProc'.
-
-	* generic/tcl.h (line 388f): Readded the definition of
-	'Tcl_ThreadCreateProc'. Added Win32 stuff send in by David Graveraux
-	<davygrvy@bigfoot.com> to that too (__stdcall, ...). Added macros for
-	the default stacksize and allowed flags.
-
-	* generic/tcl.decls (line 1356f): Added definition of
-	'Tcl_CreateThread', slot 393 of the stub table. Two new arguments in
-	the public API, for stacksize and flags.
-
-	* win/tclWinThrd.c:
-	* mac/tclMacThrd.c: Renamed TclpThreadCreate to Tcl_CreateThread,
-	added handling of the stacksize. Flags are currently ignored.
-
-	* unix/tclUnixThrd.c: See above, but handles joinable flag. Ignores
-	the specified stacksize if the macro HAVE_PTHREAD_ATTR_SETSTACKSIZE is
-	not defined.
-
-	* generic/tclThreadTest.c (line 363): See below.
-
-	* unix/tclUnixNotfy.c (line 210): Adapted to the changes above. Uses
-	default stacksize and no flags now.
-
-	* unic/tcl.m4 (line 382f): Added a check for
-	'pthread_attr_setstacksize' to detect platforms not implementing this
-	feature of pthreads. If it is implemented, configure will define the
-	macro HAVE_PTHREAD_ATTR_SETSTACKSIZE (See unix/tclUnixThrd.c too).
-
-	* doc/Thread.3: Added Tcl_CreateThread and its arguments to the list
-	of described functions. Removed stuff about not providing a public
-	C-API for thread-creation.
-
-2000-04-07  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/binary.n: clarified docs on sign extension in binary scan [Bug:
-	3466]
-
-	* library/tcltest1.0/tcltest.tcl (initConstraints): removed win32s
-	references (no longer supported)
-
-	* tests/fCmd.test: marked test 8.1 knownBug because it is dangerous on
-	poorly configured systems [Bug: 3881] and added 8.2 to keep essence of
-	8.1 tested.
-
-2000-04-05  Andreas Kupries <a.kupries@westend.com>
-
-	* generic/tclIO.c (Tcl_UnstackChannel, line 1831): Forcing interest
-	mask to the correct value after an unstack and re-initialization of
-	the notifier via the watchProc. Without this the first fileevent after
-	an unstack will come through and be processed, but no more. [Bug: ??].
-
-2000-03-04  Brent Welch  <welch@scriptics.com>
-
-	* {win,unix}/Makefile.in: added dependency of tclStubInit.c on
-	tcl.decls and tclInt.decls
-	* generic/tclThread.c: Tweak so this compiles w/out TCL_THREADS
-	* generic/{tcl.decls,tclStubInit.c}:  Just touched the tcl.decls and
-	regenerated the tclStubInit.c file
-
-2000-03-29  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* library/http2.1/http.tcl: For the -querychannel option, fconfigure
-	the socket to be binary so that we don't translate anything while
-	reading the data. This is because we determine the content length of
-	the data on the channel by using seek (to the end of the file) and
-	tell on the file handle, and we need the content-length to match the
-	amount of data actually sent, and translation can affect the number of
-	bytes posted.
-
-2000-04-03  Andreas Kupries <a.kupries@westend.com>
-
-	* Overall change: Definition of public API's for the finalization of
-	conditions and mutexes. [Bug: 4199].
-
-	* generic/tclInt.h: Removed definitions of TclFinalizeMutex and
-	TclFinalizeCondition.
-
-	* generic/tcl.decls: Added declarations of Tcl_MutexFinalize and
-	Tcl_ConditionFinalize.
-
-	* generic/tclThread.c: Renamed TclFinalizeMutex to Tcl_MutexFinalize.
-	Renamed TclFinalizeCondition to Tcl_ConditionFinalize.
-
-	* generic/tclNotify.c: Changed usage of TclFinalizeMutex to
-	Tcl_MutexFinalize.
-
-	* unix/tclUnixNotfy.c:
-	* generic/tclThreadTest.c: Changed usages of TclFinalizeCondition to
-	Tcl_ConditionFinalize.
-
-	* generic/tcl.h: Added empty macros for Tcl_MutexFinalize and
-	Tcl_ConditionFinalize, to be used when the core is compiled without
-	threads.
-
-	* doc/Thread.3:	Added description the new API's.
-
-2000-04-03  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclCmdIL.c (InfoVarsCmd): checked for non-NULL procPtr to
-	prevent itcl info override crash [Bug: 4064]
-
-	* tests/foreach.test:
-	* tests/namespace.test:
-	* tests/var.test: Added lsorts to avoid random sorted return
-	problems. [Bug: 2682]
-
-	* tests/fileName.test: fixed 14.1 test fragility [Bug: 1482]
-
-	* tools/man2help2.tcl: fixed winhelp cross-linking error [Bug: 4156]
-	improved translation to winhelp [Bug: 3679]
-
-	* unix/Makefile.in (MAN_INSTALL_DIR): patch to accept --mandir
-	correctly [Bug: 4085]
-
-	* unix/dltest/pkg[a-e].c: Cleaned up test packages [Bug: 2293]
-
-2000-04-03  Eric Melski  <ericm@scriptics.com>
-
-	* unix/tclUnixFCmd.c (SetGroupAttribute):
-	* unix/tclUnixFCmd.c (SetOwnerAttribute): Added (uid_t) and (gid_t)
-	casts to avoid compiler warnings.
-
-2000-03-31  Eric Melski  <ericm@scriptics.com>
-
-	* generic/tclGet.c (Tcl_GetDouble): Added additional conditions to
-	error test (previously only errno was checked, but the return value of
-	strtod() should be checked as well). [Bug: 4118]
-
-	* tests/exec.test: Added test for proper conversion of UTF data when
-	used with "<< $dataWithUTF" on exec's.
-
-	* unix/tclUnixPipe.c (TclpCreateTempFile): Added
-	Tcl_UtfToExternalDString call, so that if there is UTF content in the
-	string it will be properly converted to the system encoding before
-	being written [Bug: 4030].
-	(TclpCreateTempFile): Added a check on the return value of tmpnam;
-	some systems (Linux, for example) will start to return NULL after
-	tmpnam has been called TMP_MAX times; not checking for this can have
-	bad results (overwriting temp files, core dumps, etc.)
-
-2000-03-30  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclBasic.c (Tcl_DeleteCommandFromToken): Added comments
-	noting the need to pair ckalloc with ckfree. [Bug: 4262]
-
-	* generic/tclInt.decls:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c:
-	* win/tclWin32Dll.c: removed TclWinSynchSpawn (vestige of Win32s
-	support).
-
-	* win/tclWinReg.c: made use of TclWinGetPlatformId instead of getting
-	info again
-
-	* win/tclWinPort.h:
-	* win/Makefile.in:
-	* win/configure.in:
-	* win/tcl.m4: Added support for gcc/mingw on Windows [Bug: 4234]
-
-2000-03-29  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclCompile.c (TclCleanupByteCode): made ByteCode cleanup
-	more aware of TCL_BYTECODE_PRECOMPILED flagged structs (gen'd by
-	tbcload), to correctly clean them up.
-
-	* generic/tclClock.c (FormatClock): moved check for empty format
-	earlier, commented 0 result return value
-
-2000-03-29  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* library/http2.1/http.tcl: Removed an unnecessary fileevent statement
-	from the error processing part of the Write method. Also, fixed two
-	potential memory leaks in wait and reset, in which the state array
-	wasn't being unset before throwing an exception. Prior to this
-	version, Brent checked in a fix to catch a fileevent statement that
-	was sometimes causing a stack trace when geturl was called with
-	-timeout. I believe Brent's fix is necessary because TLS closes bad
-	sockets for secure connections, and the fileevent was trying to act on
-	a socket that no longer existed.
-
-2000-03-27  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/httpd: removed unnecessary 'puts stderr "Post Dispatch"'
-
-	* tests/namespace.test:
-	* generic/tclNamesp.c (Tcl_Export): added a uniq'ing test to the
-	export list so only one instance of each export pattern would exist in
-	the list.
-
-	* generic/tclExecute.c (TclExecuteByteCode): optimized case for the
-	empty string in ==/!= comparisons
-
-2000-03-27  Eric Melski  <ericm@scriptics.com>
-
-	* unix/tclUnixChan.c: Added (off_t) type casts in lseek() call [Bug:
-	4409].
-
-	* unix/tclLoadAout.c:
-	* unix/tclUnixPipe.c: Added (off_t) type casts in lseek() calls [Bug:
-	4410].
-
-2000-03-22  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* library/http2.1/http.tcl: Fixed a bug where string query data that
-	was bigger than queryblocksize would get duplicate characters at block
-	boundaries.
-
-2000-03-22  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* library/http2.1/http.tcl: Fixed bug 4463, where we were getting a
-	stack trace if we tried to publish a project to a good host but a port
-	where there was no server listening.  It turned out the problem was a
-	stray fileevent that needed to be cleared.  Also, fixed a bug where
-	http::code could stack trace if called on a bad token (one which
-	didn't represent a successful geturl) by adding an http element to the
-	state array in geturl.
-
-2000-03-21  Eric Melski  <ericm@scriptics.com>
-
-	* tests/clock.test: Modified some tests that were not robust with
-	respect to the time zone in which they were run and were thus failing.
-
-	* doc/clock.n: Clarified meaning of -gmt with respect to -base when
-	used with [clock scan] (-gmt does not affect the interpretation of
-	-base).
-
-2000-03-19  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* library/http2.1/http.tcl: geturl used to throw an exception when the
-	connection failed; I accidentally returned a token with the error
-	info, breaking backwards compatibility. I changed it back to throwing
-	an exception, but unsetting the state array first (thus still
-	eliminating the original memory leak problem).
-
-2000-03-19  Sandeep Tamhankar <sandeep@scriptics.com>
-
-	* library/http2.1/http.tcl: Added -querychannel option and altered
-	some of Brent's modifications to allow asynchronous posts (via
-	-command). Also modified -queryprogress so that it calls the query
-	callback as <callback> <token> <total size> <current size> to be
-	consistent with -progress. Added -queryblocksize option with default
-	8192 bytes for post blocksize. Fixed a bunch of potential memory leaks
-	for the case when geturl receives bad args or can't open a socket,
-	etc. Overall, the package really rocks now.
-
-	* doc/http.n: Added -queryblocksize, -querychannel, and
-	-queryprogress. Also, changed the description of -blocksize, which
-	states that the -progress callback will be called for each block, to
-	now qualify that with an "if -progress is specified".
-
-	* tests/http.test: Added a querychannel test for synchronous and
-	asynchronous posts, altered the queryprogress test such that the
-	callback conforms to the -progress format. Also, had to use the
-	-queryblocksize option to do the post 16K at a time to match Brent's
-	expected results (and to test that -queryblocksize works).
-
-2000-03-15  Brent Welch <welch@scriptics.com>
-
-	* library/http2.1/http.tcl: Added -queryprogress callback to
-	http::geturl and also changed it so that writing the post data is
-	event driven if the queryprogress callback or a timeout is given.
-	This allows a timeout to occur when writing lots of post data. The
-	queryprogress callback is called after each block of query data is
-	posted. It has the same signature as the -progress callback.
-
-2000-03-06  Eric Melski  <ericm@scriptics.com>
-
-	* library/package.tcl: Applied patch from Bug: 2570; rather than
-	setting geometry of slave interp to 0x0 when Tk was loaded, it now
-	does "wm withdraw .". Both remove the main window from the display,
-	but the former caused some internal structures to get initialized to
-	zero, which caused crashes with some extensions.
-
-2000-03-02  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* library/package.tcl (tclPkgUnknown): extended to allow recognizes
-	changes in the auto_path while sourcing in other pkgIndex.tcl files
-
-	* doc/FindExec.3: fixed doc for declaration of Tcl_FindExecutable
-	[Bug: 4275]
-
-	* generic/tclFileName.c (Tcl_TranslateFileName): Applied patch from
-	Newman to significantly speedup file split/join on Windows (replaces
-	regexp with custom parser). [Bug: 2867]
-
-	* win/README.binary: change mailing lists from @consortium.org to
-	@scriptics.com [Bug: 4173]
-
-2000-02-28  Eric Melski  <ericm@scriptics.com>
-
-	* tests/clock.test: Added test for ISO bases < 100000
-
-	* generic/tclDate.c: (generated on Solaris)
-	* generic/tclGetDate.y: Changed condition for deciding if a number is
-	an ISO 8601 base from number >= 100000 to numberOfDigits >= 6.
-	Previously it would fail to recognize 000000 as an ISO base.
-
-2000-02-14  Eric Melski  <ericm@scriptics.com>
-
-	* unix/Makefile.in: Added rpm target to generate Tcl binary RPM.
-
-	* unix/tcl.spec: RPM specification file for a Tcl binary RPM for
-	Linux.
-
-2000-02-10  Jeff Hobbs  <hobbs@scriptics.com>
-
-	8.3.0 RELEASE
-
-	* changes: updated for 8.3.0 release
-
-	* doc/load.n: added notes about dll load errors on Windows
-
-	* unix/README:
-	* unix/Makefile.in (dist): removed porting.notes and porting.old from
-	distribution and CVS.  The information was very outdated. Now refer to
-	http://dev.scriptics.com/services/support/platforms.html
-
-	* tests/unixInit.test: fixed japanese LANG encoding test [Bug: 3549]
-
-	* unix/configure.in:
-	* unix/tcl.m4: correct CFLAG_WARNING setting, fixed gcc config for
-	AIX, added -export-dynamic to LDFLAGS for FreeBSD-3+ [Bug: 2998]
-
-	* win/tclWinLoad.c (TclpLoadFile): improved error message for load
-	failures, could perhaps be even more intelligent.
-
-2000-02-09  Jim Ingham	 <jingham@cygnus.com>
-
-	* mac/tclMacSock.c: Don't panic when you get an error closing an async
-	socket. This doesn't seem to hurt anything, and we return the error so
-	the caller can do the right thing.
-
-	New Files:
-	* mac/MW_TclHeader.h:
-	* mac/MW_TclTestHeader.h:
-	* mac/MW_TclTestHeader.pch:
-	* mac/MW_TclAppleScriptHeader.h: More convenient to use .h prefix
-	files in the preference panels...
-
-	The above are curtesy of Daniel Steffen (steffen@math.mq.edu.au)
-
-2000-02-08  Eric Melski  <ericm@scriptics.com>
-
-	* tests/clock.test: Added tests for "next monthname" constructs.
-	* generic/tclDate.c:
-	* generic/tclGetDate.y (Message): Added a grammar rule for "next
-	monthname" so that we can handle "next january" and similar constructs
-	(bug #4146).
-
-2000-02-08  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* README:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* win/configure.in:
-	* win/README:
-	* win/README.binary:
-	* generic/tcl.h (TCL_RELEASE_SERIAL): Moved to 8.3.0 patchlevel
-
-	* doc/library.n:
-	* library/auto.tcl: fixed crufty puts code and docs [Bug: 4122]
-
-	* library/tcltest1.0/tcltest.tcl: correctly protected searchDirectory
-	list to allow dirnames with spaces
-
-	* unix/tcl.m4: changed all -fpic to -fPIC
-
-	* generic/tclDecls.h:
-	* generic/tcl.decls: change Tcl_GetOpenFile to use decl of 'int
-	forWriting' instead of 'int write' to avoid shadowing [Bug: 4121]
-
-	* tests/httpold.test: changed test script to source in the httpd
-	server procs from httpd instead of having its own set.
-
-	* tests/httpd: improved query support in test httpd to handle fix in
-	http.tcl. [Bug: 4089 change 2000-02-01]
-
-	* unix/README: fixed notes about --enable-shared and add note about
-	--disable-shared.
-
-2000-02-07  Eric Melski  <ericm@scriptics.com>
-
-	* tests/package.test:
-	* library/tclIndex:
-	* library/package.tcl: Renamed ::package namespace to ::pkg.
-
-2000-02-03  Eric Melski <ericm@scriptics.com>
-
-	* doc/Package.n:
-	* doc/packagens.n: Renamed Package.n -> packagens.n because Windows
-	can't deal with case-sensitive names.
-
-2000-02-02  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* tests/regexp.test: added tests for -all and -inline switches
-	* doc/regexp.n: added docs for -all and -inline switches
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd): added extra comments for new
-	-all and -inline switches to regexp command
-
-2000-02-01  Eric Melski  <ericm@scriptics.com>
-
-	* library/init.tcl: Applied patch from rfe 1734 regarding auto_load
-	errors not setting error message and errorInfo properly.
-
-2000-02-01  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* win/Makefile.in (install-*): reduced verbosity of install
-
-	* generic/tclFileName.c (Tcl_JoinPath): improved support for special
-	QNX node id prefixes in pathnames [Bug: 4053]
-
-	* library/http1.0/http.tcl:
-	* library/http2.1/http.tcl: The query data POSTed was newline
-	terminated when it shouldn't be altered [Bug: 4089]
-
-2000-01-31  Eric Melski  <ericm@scriptics.com>
-
-	* tests/package.test:
-	* library/tclIndex:
-	* library/package.tcl: Added ::package namespace and ::package::create
-	function.
-
-	* library/init.tcl: Fixed problem with auto_load and determining if
-	commands were loaded.
-
-	* library/auto.tcl: "Fixed" issues with $ in files to be auto indexed.
-
-	* doc/Package.n: New man page for package::create function.
-
-	* doc/pkgMkIndex.n: Added additional information.
-
-	* doc/library.n: Added additional qualification regarding auto_mkindex.
-
-2000-01-28  Eric Melski  <ericm@scriptics.com>
-
-	* tests/pkg/magicchar2.tcl:
-	* tests/autoMkindex.test: Test for auto loader fix (bug #2480).
-
-	* library/init.tcl: auto_load was using [info commands $name] to
-	determine if a given command was available; if the command name had *
-	or [] it, this would fail because info commands uses glob-style
-	matching. This is fixed. (Bug #2480).
-
-	* tests/pkg/spacename.tcl:
-	* tests/pkgMkIndex.test: Tests for fix for bug #2360.
-
-	* library/package.tcl: Fixed to extract only the first element of the
-	list returned by auto_qualify (bug #2360).
-
-	* tests/pkg/magicchar.tcl:
-	* tests/autoMkindex.test: Test for fix for bug #2611.
-
-	* library/auto.tcl: Fixed the regular expression that performs $
-	escaping before sourcing a file to index. It was erroneously adding \
-	escapes even to $'s that were already escaped, effectively
-	"unescaping" those $'s. (bug #2611).
-
-2000-01-27  Eric Melski  <ericm@scriptics.com>
-
-	* tests/autoMkindex.test:
-	* library/auto.tcl: Applied patch (with slight modification) from bug
-	#2701: auto_mkIndex uses platform dependent file paths. Added test for
-	fix.
-
-2000-01-27  Jennifer Hom  <jenn@scriptics.com>
-
-	* library/tcltest1.0/tcltest.tcl: Changed NormalizePath to
-	normalizePath and exported it as a public proc. This proc creates an
-	absolute path given the name of the variable containing the path to
-	modify. The path is modified in place.
-	* library/tcltest1.0/pkgIndex.tcl: Added normalizePath.
-	* tests/all.tcl: Changed code to use normalizePath.
-
-2000-01-27  Eric Melski  <ericm@scriptics.com>
-
-	* tests/pkg/samename.tcl: test file for bug #1983
-
-	* tests/pkgMkIndex.test:
-	* doc/pkgMkIndex.n:
-	* library/package.tcl: Per rfe #4097, optimized creation of direct
-	load packages to bypass computing the list of commands added by the
-	new package. Also made direct loading the default, and added a -lazy
-	option.
-	Fixed bug #1983, dealing with pkg_mkIndex incorrectly handling
-	situations with two procs by the same name but in different namespaces
-	(ie, foo::baz and bar::baz).
-
-2000-01-26  Eric Melski  <ericm@scriptics.com>
-
-	* generic/tclNamesp.c: Undid fix for #956, which broke backwards
-	compatibility.
-
-	* doc/variable.n:
-	* doc/trace.n:
-	* doc/namespace.n:
-	* doc/info.n: Added further information about differences between
-	"namespace which" and "info exists".
-
-	* doc/SetErrno.3: Added descriptions of ErrnoId() and ErrnoMsg()
-	functions.
-
-2000-01-25  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* unix/tcl.m4: modified EXTRA_CFLAGS to add -DHAVE_TZSET for OSF1-V*
-	and ULTRIX-4.* when not using gcc. Also added higher min stack size
-	for OSF1-V* when building with threads. [Bug: 4063]
-
-	* generic/tclClock.c (FormatClock): inlined resultPtr, as it
-	conflicted with var creation for HAVE_TZSET #def [Bug: 4063]
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): fixed potential leak when
-	calling lsort -command with bad command [Bug: 4067]
-
-	* generic/tclFileName.c (Tcl_JoinPath): added support for special QNX
-	node id prefixes in pathnames [Bug: 4053]
-
-	* doc/ListObj.3: clarified Tcl_ListObjGetElements docs [Bug: 4080]
-
-	* doc/glob.n: clarified Mac path separator determination docs.
-
-	* win/makefile.vc: added some support for building helpfile on Windows
-
-2000-01-23  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* library/init.tcl (auto_execok): added 'start' to list of recognized
-	built-in commands for COMSPEC on NT. [Bug: 2858]
-
-	* unix/tclUnixPort.h: moved include of <utime.h> lower since some
-	systems (UTS) require sys/types.h to be included first [Bug: 4031]
-
-	* unix/tclUnixChan.c (CreateSocketAddress): changed comparison with -1
-	to 0xFFFFFFFF, to ensure 32 bit comparison even on 64 bit systems.
-	[Bug: 3878]
-
-	* generic/tclFileName.c: improved guessing of path separator for the
-	Mac. (Darley)
-
-	* generic/tclInt.h:
-	* generic/tcl.decls: moved Tcl_ProcObjCmd to stubs table [Bug: 3827]
-	and removed 'register' from stub definition of
-	Tcl_AppendUnicodeToObj [Bug: 4038]
-
-2000-01-21  Eric Melski  <ericm@scriptics.com>
-
-	* unix/mkLinks:
-	* doc/GetHostName.3: Man page for Tcl_GetHostName (bug #1817).
-
-	* doc/lreplace.n: Corrected man page with respect to treatment of
-	empty lists, and "prettied up" the page. (bug #1705).
-
-2000-01-20  Eric Melski  <ericm@scriptics.com>
-
-	* tests/namespace.test: Added test for undefined variables with
-	namespace which (bug #956).
-
-	* generic/tclNamesp.c: Added check for undefined variables in
-	NamespaceWhichCmd (bug #956).
-
-	* tests/var.test: Added tests for corrected variable behavior (bug
-	#981).
-
-	* doc/upvar.n: Expanded explanation of upvar behavior with respect to
-	variable traces. (bugs 3917 1433 2110).
-
-	* generic/tclVar.c: Changed behavior of variable command when name
-	refers to an element in an array (ie, "variable foo(x)") to always
-	return an error, regardless of existence of that element in the array
-	(now behavior is consistant with docs too) (bug #981).
-
-2000-01-20  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* generic/tclCmdIL.c (InfoBodyCmd): made [info body] return a string
-	if the body has been bytecompiled.
-	* generic/tclBasic.c (Tcl_EvalObjEx): added pedantic check for
-	originating proc body of bytecompiled code, #def'd out as the change
-	for [info body] should make it unnecessary
-
-	* unix/tclUnixNotfy.c (Tcl_InitNotifier): added cast for tsdPtr
-
-	* tests/set.test: added test for complex array elem name compiling
-	* generic/tclCompCmds.c (TclCompileSetCmd): Fixed parsing of array
-	elements during compiling, and slightly optimised same [Bug: 3889]
-
-	* doc/tclvars.n: added definitions for tcl_(non)wordchars
-
-	* doc/vwait.n: added notes about requirement for vwait var being
-	globally scoped [Bug: 3329]
-
-	* library/word.tcl: changed tcl_(non)wordchars settings to use new
-	unicode regexp char class escapes instead of char sequences
-
-2000-01-14  Eric Melski  <ericm@scriptics.com>
-
-	* tests/var.test: Added a test for the array multiple delete
-	protection in Tcl_UnsetVar2.
-
-	* generic/tclVar.c: Added protection in Tcl_UnsetVar2 against attempts
-	to multiply delete arrays when unsetting them (bug #3453). This could
-	happen if there was an unset trace on an array element and the trace
-	proc made a global or upvar link to the array, and then the array was
-	unset at the global level. See the bug reference for more information.
-
-	* unix/tclUnixTime.c: New clock format format.
-
-	* compat/strftime.c: New clock format format.
-
-	* generic/tclGetDate.y: New clock scan format.
-
-2000-01-13  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* changes: updated changes file to reflect 8.3b2 mods
-
-	* README:
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.m4:
-	* win/README.binary:
-	* win/configure.in: updated to patchlevel 8.3b2
-
-	* generic/regexec.c: added var initialization to prevent compiler
-	warning
-
-2000-01-13  Eric Melski  <ericm@scriptics.com>
-
-	* tests/cmdIL.test: Added tests for lsort -dictionary with characters
-	that occur between Z and a in ASCII.
-
-	* generic/tclCmdIL.c: Modified DictionaryCompare function (used by
-	lsort -dictionary) to do upper/lower case equivalency before doing
-	character comparisons, instead of after. This fixes bug #1357, in
-	which lsort -dictionary [list ` AA c CC] and lsort -dictionary [list
-	AA c ` CC] gave different (and both wrong) results.
-
-2000-01-12  Eric Melski  <ericm@scriptics.com>
-
-	* tests/clock.test: Added tests for "next <day-of-week>" and
-	"<day-of-week>"
-	Added tests for "monday 1 week ago", etc, from RFE #3671.
-
-	* doc/tests/clock.test: Added numerous tests for clock scan.
-
-	* doc/generic/tclGetDate.y: Fixed some shift/reduce conflicts in clock
-	grammar.
-
-	* doc/doc/clock.n: Added documentation for new supported clock scan
-	formats and additional explanation of daylight savings time correction
-	algorithm.
-
-2000-01-12  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* doc/file.n:
-	* tests/unixFCmd.test:
-	* unix/tclUnixFCmd.c: added support for symbolic permissions setting
-	in SetPermissionsAttribute (file attr $file -perm ...) [Bug: 3970]
-
-	* generic/tclClock.c: fixed support for 64bit handling of clock values
-	[Bug: 1806]
-
-	* generic/tclThreadTest.c: upped a buffer size to hold double
-
-	* tests/info.test:
-	* generic/tclCmdIL.c: fixed 'info procs ::namesp::*' behavior (Dejong)
-
-	* generic/tclNamesp.c: made imported commands also import their
-	compile proc [Bug: 2100]
-
-	* tests/expr.test:
-	* unix/Makefile.in:
-	* unix/configure.in:
-	* unix/tcl.m4: recognize strtod bug on Tru64 v5.0 [Bug: 3378] and
-	added tests to prevent unnecessary chmod +x in sources while
-	installing, as well as more intelligent setsockopt/gethostbyname
-	checks [Bug: 3366, 3389]
-
-	* unix/tclUnixThrd.c: added compile time support (through use of the
-	TCL_THREAD_STACK_MIN define) for increasing the default stack size for
-	a thread. [Bug: 3797, 1966]
-
-2000-01-11  Eric Melski  <ericm@scriptics.com>
-
-	* generic/tclGetDate.y: Added comments for the Convert function. Added
-	a fix for daylight savings time handling for relative time spans of
-	days, weeks or fortnights. (bug 3441, 3868).
-
-	* generic/tclDate.c: Fixed compiler warning issues.
-
-2000-01-10  Jeff Hobbs  <hobbs@scriptics.com>
-
-	* compat/waitpid.c: use pid_t type instead of int [Bug: 3999]
-
-	* tests/utf.test: fixed test that allowed \8 as octal value
-	* generic/tclUtf.c: changed Tcl_UtfBackslash to not allow non-octal
-	digits (8,9) in \ooo substs. [Bug: 3975]
-
-	* generic/tcl.h: noted need to change win/tcl.m4 and
-	tools/tclSplash.bmp for minor version changes
-
-	* library/http2.1/http.tcl: trim value for $state(meta) key
-
-	* unix/tclUnixFile.c: fixed signature style on functions
-
-	* unix/Makefile.in: made sure tcl.m4 would be installed with dist
-
-	* unix/tcl.m4: added ELF support for NetBSD [Bug: 3959]
-
-2000-01-10  Eric Melski  <ericm@scriptics.com>
-
-	* generic/tclGetDate.y: Added rules for ISO 8601 formats (BUG #847):
-	CCYY-MM-DD
-	CCYYMMDD
-	YY-MM-DD
-	YYMMDD
-	CCYYMMDDTHHMMSS
-	CCYYMMDD HHMMSS
-	CCYYMMDDTHH:MM:SS
-	Fixed "clock scan <number>" to scan the number as an hour for the
-	current day, rather than a minute after 00:00 for the current day
-	(bug #2732).
-
-2000-01-07  Eric Melski  <ericm@scriptics.com>
-
-	* generic/tclClock.c: Changed switch in Tcl_ClockObjCmd to use
-	enumerated values instead of constants. (ie, COMMAND_SCAN instead of
-	3).
diff --git a/ChangeLog.2001 b/ChangeLog.2001
deleted file mode 100644
index 5fdff46..0000000
--- a/ChangeLog.2001
+++ /dev/null
@@ -1,3629 +0,0 @@
-2001-12-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/init.tcl: make sure env(COMSPEC) on Windows is executed with
-	the right case, as it may otherwise fail inexplicably.
-
-2001-12-28  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tclCkalloc.c (MemoryCmd, TclFinalizeMemorySubsystem): Added
-	the [memory onexit] command, intended to replace [checkmem].
-
-	* doc/DumpActiveMemory.3:
-	* doc/memory.n: Updated documentation for [memory] and related
-	matters. [Bug 487677]
-
-	* mac/tclMacBOAMain.c (Tcl_Main, CheckmemCmd): Removed all the
-	machinery for the [checkmem] command that is completely duplicated by
-	code in generic/tclCkalloc.c.
-
-	* generic/tclBinary.c:
-	* generic/tclListObj.c:
-	* generic/tclObj.c:
-	* generic/tclStringObj.c: Removed references to [checkmem] in
-	comments, referencing [memory active] instead, since it is
-	documented.
-
-2001-12-28  Daniel Steffen <das@users.sourceforge.net>
-
-	* mac/tclMacInit.c:
-	* mac/tclMacTclCode.r: synced up tclInit features to unix/win:
-	implemented TclSetPreInitScript support, use of existing tclInit proc
-	if defined, check of default encoding dir if set. Changed script
-	library resource names to lowercase (i.e. same as corresponding
-	files). Used Tcl_JoinPath instead of string append. Check that system
-	encoding could be loaded before utf translating the LibraryPath.
-	* mac/tclMacApplication.r:
-	* mac/tclMacLibrary.r:
-	* mac/tclMacOSA.r:
-	* mac/tclMacResource.r: minor version resources cleanup
-
-2001-12-21  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/tcl.m4 (SC_PATH_TCLCONFIG, SC_PATH_TKCONFIG):
-	Search for config file using exec_prefix instead of prefix when no
-	--with-tcl or --with-tk argument is used. [Bug 492418]
-
-2001-12-21  Daniel Steffen <das@users.sourceforge.net>
-
-	* unix/tcl.m4: fixed incorrect SHLIB_LD_LIBS setting for MacOSX /
-	Darwin.
-	* unix/configure: Regen.
-	* unix/mkLinks.tcl: improved case-insensitive filesystem support.
-	* unix/mkLinks: Regen.
-
-2001-12-19  Don Porter <dgp@users.sourceforge.net>
-
-	* unix/Makefile.in (dist): corrected use of eolFix.tcl on working
-	files. It should operate on distributed files. [Bug 495120]
-
-2001-12-19  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/tcl.wse.in: Fix for [Bug 495120]. tcl.wse.in was stored in cvs
-	with improper <eol>. This resulted in corrupted <eol> when checked-out
-	on translating CVS clients such as windows (CRCRLF) and mac (CRCR).
-
-2001-12-19  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure:
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Update SunOS 5.[0-6] target so that
-	correct linker options are passed to gcc or ld. [Tk Bug 220863]
-
-2001-12-19  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/README: Update to account for changes in the unix/dltest
-	directory, the way autoconf is run, and the new "make shell" target.
-
-2001-12-19  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Rename dltest to dlpkgs to fix problem where lib
-	files were not getting built because dltest/ directory already
-	existed.
-
-2001-12-19  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinSerial.c (SerialCheckProc): corrected time calculations to
-	be unsigned. (schroedter)
-
-2001-12-18  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Define new dltest target that simply does a cd to
-	dltest/ before running make. There is no need for the separate
-	configure script that was previously being used.
-	* unix/configure: Regen.
-	* unix/configure.in: Subst into dltest/Makefile.
-	* unix/dltest/Makefile.in: Define LIBS using DL_LIBS, LIBS, and
-	MATH_LIBS variables instead of TCL_LIBS variable from tclConfig.sh.
-	* unix/dltest/README: Update readme to account for new configure free
-	implementation.
-	* unix/dltest/configure: Removed.
-	* unix/dltest/configure.in: Removed.
-
-2001-12-18  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tcl.h (TCL_STUB_MAGIC): Added cast to force type to be an
-	int and get rid of a persistent and pointless warning with SunPro
-	compiler.
-
-	* generic/tclCkalloc.c (Tcl_AttemptDbCkalloc,Tcl_AttemptDbCkrealloc):
-	* generic/tcl.decls (Tcl_AttemptDbCkalloc,Tcl_AttemptDbCkrealloc):
-	Made the file parameters to these functions into CONST char *, like
-	they always should have been to match the other Tcl*Db* API functions.
-
-2001-12-17  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* Applied [Bug 219311] on behalf of Rolf Schroedter
-	<schroedter@users.sourceforge.net> to prevent fcopy on serial ports
-	from flooding the event queue.
-
-2001-12-11  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/CrtInterp.3:
-	* generic/tclBasic.c: docs and comments corrections. [Bug 493412]
-	Bug & patch by Don Porter.
-
-2001-12-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* win/tclWinNotify.c (Tcl_FinalizeNotifier): Stop Tcl on Windows from
-	crashing when shutdown from a non-Tcl thread. Fixes [Bug 217982]
-	[orig. 5804] reported by Hugh Vu and Gene Leache. I'm not convinced
-	that the shutdown process is right even with this, but it was
-	definitely wrong without...
-
-2001-12-13  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* win/tclWinSock.c (TcpGetOptionProc): Fix for [Bug 478565] reported
-	by an unknown person. Bypasses all calls to "gethostbyaddr" for
-	address "0.0.0.0" to prevent delays on Win/NT.
-
-2001-12-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/Preserve.3: doc'd TCL_DYNAMIC use. [Patch 483989] (porter)
-
-2001-12-12  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_GetsObj): Applied patch for [Bug 491341] as
-	provided by Don Porter <dgp@users.sourceforge.net>. Fixes the
-	assumption of having an empty Tcl_Obj to work with.
-
-2001-12-11  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds.c:
-	* generic/tclCompile.c:
-	* generic/tclExecute.c: consistency patch, to make all instructions
-	that pop a variable number of Tcl_Obj's off the execution stack take
-	the number of popped objects as first operand. Modified *only* the new
-	instructions INST_LIST_INDEX_MULTI and INST_LSET_FLAT, so this has no
-	effect on bytecodes generated up to tcl8.4a3 inclusive.
-
-	* generic/tclExecute.c: fix debug messages in INST_LSET_LIST.
-
-	* generic/tclCompCmds.c (TclCompileLindexCmd):
-	* generic/tclCompExpr.c (CompileMathFuncCall): removed the last two
-	overestimates of the necessary stack depth for bytecodes in the fix of
-	[Bug 483611]
-
-2001-12-10  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/tclUnixPipe.c (TclpCreateProcess): Applied Don Porter's patch
-	fixing [Bug 437489].
-
-2001-12-10  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclEvent.c:
-	* tests/event.test: fix background error reporting in the absence of a
-	bgerror proc [Bug 219142].
-
-2001-12-10  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/Access.3:
-	* doc/CrtChannel.3:
-	* doc/DString.3:
-	* doc/ExprLong.3:
-	* doc/FileSystem.3:
-	* doc/GetStdChan.3:
-	* doc/OpenFileChnl.3:
-	* doc/StdChannels.3:
-	* doc/TCL_MEM_DEBUG.3:
-	* doc/Tcl_Main.3:
-	* doc/Utf.3:
-	* doc/file.n:
-	* doc/tclsh.1:  Several typo and formatting corrections discovered
-	during conversion to TMML. Thanks to Joe English. [Patch 490514]
-	* unix/mkLinks: 'make mklinks'
-
-2001-12-10  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds.c:
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclProc.c: fixed the calculation of the maximal stack depth
-	required by bytecodes. [Bug 483611]
-
-2001-12-07  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c:
-	* tests/trace.test: restored consistency in refCount accounting by
-	array traces [Bug 4484339], submitted by Don Porter.
-
-2001-12-06  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/parseExpr.test, tests/for.test, tests/expr.test:
-	* tests/expr-old.test, tests/compile.test, tests/compExpr.test
-	* tests/compExpr-old.test: Kept up to date with syntax errors.
-	* generic/tclParseExpr.c (ParsePrimaryExpr): Rewrote to give even
-	better syntax errors in the fairly common case of an identifier
-	without decorations by guessing based on the currently available
-	functions. Also made messages consistent between memdebug and ordinary
-	builds.
-
-2001-12-05  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c:
-	* tests/trace.test: new algorithm for [array get], safe when there are
-	traces that modify the array. [Bug 449893]
-
-2001-12-04  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/compExpr-old.test, tests/compExpr.test, tests/compile.test:
-	* tests/expr-old.test, tests/expr.test, tests/for.test:
-	* tests/while.test, tests/if.test: Rewrite to handle more specific
-	syntax errors.
-	* tests/parseExpr.test: Rewrite to get rid of dup test numbers and
-	handle more specific syntax errors.
-	* generic/tclParseExpr.c (LogSyntaxError): Added a detail message
-	argument to help explain what the syntax error is.
-	(Tcl_ParseExpr, ParseCondExpr, ParsePrimaryExpr): Added detail
-	messages.
-	(UNKNOWN_CHAR): New lexeme for characters that are always illegal in
-	expressions outside strings.
-
-2001-12-03  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/expr.n: Various documentation improvements in relation to the
-	function calls. Includes fix for [Bug 487704] submitted by Devin Eyre.
-
-2001-12-03  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: Some install target bugs repaired along with
-	$(TCLSTUBLIB) added to the dependencies rather than implicit through
-	the dde and reg extensions which don't happen to always require it for
-	some build types.
-
-2001-11-30  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c: Tcl_Preserve'ing VarTrace structures to avoid
-	memory corruption. Patch for [Bug 484334] provided by Don Porter
-
-2001-11-29  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/namespace.test: modified namespace-41.2, added 41.3
-	{knownbug} after discussion with Don Porter and Kevin Kenny.
-
-2001-11-29  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/namespace.test: added namespace-41.2, a simpler test for
-	[Bug 231259]
-
-2001-11-29  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclBinary.c (BINARY_SCAN_MAX_CACHE, Tcl_BinaryObjCmd,
-	(ScanNumber): Added caching scheme to reduce number of object
-	allocations when doing scans of large repetitive binary strings. See
-	comments in file for reasoning behind implementation. Suggested by
-	Miguel Sofer in [Patch 429916], but independently implemented.
-
-2001-11-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/regsub.n, doc/regexp.n: Converted dangling references to
-	METASYNTAX section into references to the re_syntax manual page.
-
-2001-11-27  D. Richard Hipp   <drh@hwaci.com>
-
-	* win/tclWinFCmd.c: Fix a coredump in the filename normalizer code for
-	Win95/98.
-
-2001-11-27  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: Removed the Tk reference for the 'winhelp' target.
-	Converge at install will need to be the solution for Tk and all other
-	extensions.
-
-2001-11-27  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/cmdAH.test (cmdAH-24.2): Made test less sensitive to OS
-	preemption, but perfection isn't practical. [Bug 463189, reported by
-	Don Porter]
-
-	* tests/switch.test (switch-9.*): Added tests to exercise more of the
-	argument checking.  (switch-7.2,switch-7.3): Test changed behaviour
-	slightly.
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd): Reworked argument parsing to
-	be stricter about what it accepts. This should make uses of the
-	[switch] command be more maintainable. [Bug 475397, reported by Don
-	Porter]
-
-2001-11-26  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tclIntPlatDecls.h: 'make genstubs' after changes in
-	2001-11-23 commit from Daniel Steffen.
-
-2001-11-24  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Add comments to better describe TCL_EXE and when
-	it should be available.
-	* win/Makefile.in: Add TCL_EXE variable to be used by rules like `make
-	genstubs`. Don't set TCL_LIBRARY before running `make genstubs` since
-	we will be running with a tclsh from the PATH not the one we build.
-
-2001-11-24  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Add comctl32.lib to wish link libs.
-	This change was originally added to Tk on 2001-11-09 but was not
-	committed to Tcl.
-
-2001-11-23  Daniel Steffen <das@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* unix/configure.in:
-	* unix/install-sh:
-	* unix/mkLinks:
-	* unix/mkLinks.tcl:
-	* unix/tclLoadDyld.c:
-	* unix/tclMtherr.c: Mac OSX support: build system, dynamic code loading
-	and support for case-insensitive filesystems in mkLinks. [Patch 435258]
-
-2001-11-23  Daniel Steffen <das@users.sourceforge.net>
-
-	Up-port to 8.4 of mac code changes for 8.3.3 & various new changes for
-	8.4, some already backported to 8.3.4. [Patch 435658]
-
-	* generic/tclObj.c: added #include to fix missing prototype errors
-
-	* generic/tcl.h: MAC_TCL: addition of ConditionalMacros.h and use of
-	DLLIMPORT and DLLEXPORT like on other platforms. ( => no longer need
-	the .exp files and can remove use of #pragma export that never worked
-	well)
-	removed line continuation in #if clause as this breaks the mac
-	resource compiler (note that *.r files include tcl.h)
-
-	* mac/tclMacFile.c: fixed bug in permission checking code
-
-	* mac/tclMacLoad.c: corrected utf-8 handling, comparison of package
-	names to code fragment names changed to only match on the length of
-	package name, this allows for fragment names with version numbers
-	appended.
-
-	* mac/tclMacInt.h:
-	* generic/tclInt.h:
-	* mac/tclMacTime.c:
-	* generic/tclIOUtil.c: moved declaration of TclpGetGMTOffset()
-
-	* mac/tclMacShLib.exp:
-	* mac/tclMacOSA.exp:
-	* mac/tclMacMSLPrefix.h: removed files
-
-	* unix/Makefile.in: removed reference to .exp files
-
-	* mac/MW_TclBuildLibHeader.h:
-	* mac/MW_TclBuildLibHeader.pch:
-	* mac/MW_TclHeaderCommon.h:
-	* mac/MW_TclStaticHeader.h:
-	* mac/MW_TclStaticHeader.pch: new precompiled header files
-
-	* mac/MW_TclAppleScriptHeader.pch:
-	* mac/MW_TclHeader.pch:
-	* mac/MW_TclTestHeader.pch:
-	* mac/tclMacCommonPch.h: revised precompiled header handling: now
-	include a common header file 'MW_TclHeaderCommon.h' from all .pch
-	files, the .pch files themselves now only setup #defines (e.g.
-	BUILD_tcl, STATIC_BUILD, TCL_DEBUG, TCL_THREADS) like in makefiles on
-	other platforms.
-
-	* mac/tclMac.h:
-	* mac/tclMacPort.h:
-	* mac/tclMacInt.h: use of BUILD_tcl and TCL_STORAGE_CLASS like on other
-	platforms, standardize #include'd files to what's done on other
-	platforms, removed use of #pragma export.
-
-	* mac/tcltkMacBuildSupport.sea.hqx: new archive of mac build support
-	files & suggested build environment directory hierarchy:
-	'Building MacTclTk' & 'CW Pro6 changes' readme's.
-	projects for MoreFiles 1.5.2 static & shared libraries.
-	project & sources for 'pseudoCarbonSupport', see below.
-	included XML versions of the projects for CW Pro5 or Pro7 users.
-
-	* mac/tclMacProjects.sea.hqx: updated mac build project files:
-	build support for CodeWarrior Pro6, UnivIntf 3.4 & shared runtime
-	libraries: the MSL libraries and MoreFiles are no longer compiled into
-	Tcl.shlb, all non-static binaries now use the Pro6 shared runtime
-	libraries and MoreFiles.shlb.  These shlbs are merged into the standard
-	Wish and TclShell, but 3rd party applications linking with Tcl.shlb or
-	Tk.shlb need to setup access to them.  (see the "(sh-ppc)" targets
-	for how to do this.)
-	included XML versions of the projects for CW Pro5 or Pro7 users.
-	use compat/strtod.c instead of MSL's strtod()
-	use WASTE versions of MSL for tcl test target to avoid text buffer
-	cutoff at 32k.
-	Merging the full MSL.shlb and the other shlbs into Wish & TclShell
-	makes them a bit larger than before, use unmerged binaries to avoid
-	copying the shared code with every application, e.g. when deploying
-	numerous Wish based droplets.
-	Note that using CW Pro5 to compile extensions is in principle still
-	possible, but need to link with Pro6 runtime libraries.
-	Tclapplescript now loads and runs on CFM68k.
-	Highly experimental "pseudoCarbon" support for Tcl only on OS 8/9:
-	binaries in "Build:(Carbon):" link against CarbonLib instead of
-	InterfaceLib, however the actual code has not been carbonized! i.e. it
-	will not run on OSX and may not even run properly with CarbonLib.
-	This should in principle allow you to build & test OS9 CFM Carbon
-	binaries that need to link with Tcl.shlb. On OSX you can use the
-	native Tcl.framework, but you have to build a MachO binary as there
-	is no CFM glue lib for Tcl.framework.
-	the library pseudoCarbonSupport.shlb manually loads the symbols from
-	InterfaceLib that are not in CarbonLib but are needed by the
-	uncarbonized code in Tcl.shlb and TclShell.
-
-	* generic/tclMain.c: MAC_TCL: workaround for broken/non-standard isatty
-	on MW Pro6, #include <unistd.h> instead of defining isatty
-
-	* mac/tclMacPort.h: MW Pro6 changes for MSL fcntl.h, stat.h & isatty
-
-	* mac/tclMacAppInit.c: add EXTERN to InstallConsole to enable DLL
-	export via the TCL_STORAGE_CLASS mechanism.
-
-	* mac/tclMacFCmd.c: fix for FSpDirectoryCopy API change
-
-	* mac/tclMacLibrary.c: emit compile time error when
-	TCL_REGISTER_LIBRARY and USE_TCL_STUBS are both defined at the same
-	time in an extension, this use is not currently supported and will
-	result in a crash when dynamically loading the extension.
-
-	* mac/tclMacApplication.r:
-	* mac/tclMacLibrary.r:
-	* mac/tclMacOSA.r:
-	* mac/tclMacResource.r: fixed obsolete copyrights/dates in version
-	strings; updated version strings to standard usage; added support for
-	'(Support Libraries)' subfolder for shared runtime libraries in
-	unmerged binaries; commented out demo setting of "Tcl Environment
-	Variables"; reorganized resources among these files to avoid multiple
-	copies in applications and shared libraries, the script libraries are
-	now no longer duplicated in Tclsh but are only included in the
-	resources of Tcl.shlb.
-
-	* mac/tclMacChan.c:
-	* mac/tclMacSock.c: cast for *BlockMode
-
-	* mac/tclMacUtil.c:
-	* mac/tclMacMath.h: removed obsolete hypot() definition
-
-	* generic/tclIntPlatDecls.h:
-	* generic/tclInt.decls:
-	* generic/tclStubInit.c:
-	* mac/tclMacNotify.c:
-	* mac/tclMacOSA.c:
-	* mac/tclMacUtil.c:
-	* generic/tclThreadTest.c: renamed routines conflicting with standard
-	Apple or MoreFiles headers (at compile or link time):
-	GetGlobalMouse         -> GetGlobalMouseTcl
-	FSpGetDirectoryID      -> FSpGetDirectoryIDTcl
-	FSpOpenResFileCompat   -> FSpOpenResFileCompatTcl
-	FSpCreateResFileCompat -> FSpCreateResFileCompatTcl
-	NewThread              -> NewTestThread
-	the renamed MoreFiles *Tcl routines are just wrappers calling into the
-	MoreFiles DLL.
-
-	* mac/tclMacCommonPch.h:
-	* mac/tclMacThrd.c:
-	* mac/tclMacPanic.c: removed OLDROUTINENAMES define, renamed obsolete
-	apple API names to modern equivalents; UH3.4 support: added #include
-	<ControlDefinitions.h>, updated New*Proc() calls to New*UPP().
-
-	* mac/tclMacUnix.c: added missing (Tcl_Obj ***) cast to
-	Tcl_ListObjGetElements call
-
-	* mac/tclMacAlloc.c: modernized TclpSysAlloc() to use temporary memory
-	instead of system heap memory when available (MacOS >= 7.5 and
-	possibly earlier, use of system heap has been discouraged for a long
-	time and has many disadvantages, e.g. memory isn't paged out, and
-	errors can very easily bring the system down); fixed crashing bug in
-	TclpSysRealloc() and CleanUpExitProc() where memory was being accessed
-	after having been deallocated; fixed memory leak in (de)allocation
-	code (for every block ever allocated with TclpSysAlloc, a Ptr was
-	leaked), if temporary memory is available, don't track allocated
-	memory, instead use RecoverHandle() to get Handle from Ptr, otherwise
-	use doubly linked list to correctly track memory and free all
-	allocated memory; added new option for ConfigureMemory:
-	MEMORY_DONT_USE_TEMPMEM, disables use of temporary memory even when it
-	would be available, only necessary when writing e.g. a driver (using
-	tcl??); increased fraction of application heap reserved for OS
-	routines to 512K
-
-	* compat/strftime.c:
-	* mac/tclMacTime.c:
-	* mac/tclMacPort.h:
-	* generic/tclInt.decls:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c: timezone support for mac via TclpGetTZName()
-	like on windows, using an inverse timezone table adapted from
-	tclDate.c to map gmtoffset in seconds gotten from the MacOS APIs to a
-	timezone string, as there is no good way to get this info from MacOS.
-	I had to make up some unusual timezones and arbitrarily decide on the
-	most standard of the multiple choices available for every timezone.
-
-	* generic/tclExecute.c: workaround for a MSL bug/misfeature: for very
-	small floats, MSL can return errno ERANGE but a non-zero value (<
-	LDBL_MIN however)
-
-	* mac/tclMacAppInit.c: support for WASTE text library using temporary
-	memory, setting has no effect if WASTE is not used.
-
-	* mac/tclMacPanic.c: removed duplicate code from generic/tclPanic.c
-	and added that file to projects instead.
-
-	* tests/all.tcl: set tcltest::singleProcess 1 as multiple processes
-	are not available on the mac.
-
-	* tests/cmdAH.test: access time not available on the mac, skip the
-	atime touch test
-
-	* tests/appendComp.test:
-	* tests/cmdMZ.test:
-	* tests/compile.test:
-	* tests/exec.test:
-	* tests/fileName.test:
-	* tests/lset.test:
-	* tests/namespace.test:
-	* tests/tcltest.test: added missing cleanups/tests/catches that caused
-	tests to fail on the mac.
-
-	* doc/tclvars.n: doc bug, env(PWD) should be env(HOME) [Bug 463834]
-
-2001-11-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/trace.test (trace-8.8): Corrected test for Bug 219393.
-
-	* generic/tclBasic.c (Tcl_DeleteCommandFromToken,CallCommandTraces):
-	* generic/tclCmdMZ>c (Tcl_UntraceCommand):  Added Tcl_Preserve and
-	Tcl_Release calls to prevent deletion of CommandTrace structures until
-	all callers are done using them, preventing memory corruption. [Bug
-	453805]
-
-2001-11-20  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	* doc/GetTime.3 (Tcl_GetTime):
-	* generic/tcl.decls (Tcl_GetTime):
-	* generic/tclClock.c (Tcl_ClockObjCmd):
-	* generic/tclCompile.c (TclCleanupByteCode, TclInitByteCodeObj):
-	* generic/tclCmdMZ.c (Tcl_TimeObjCmd):
-	* generic/tclUtil.c (TclpGetTime):
-	* generic/tclTest.c (GetTimesCmd):
-	* generic/tclTimer.c (Tcl_CreateTimerHandler, TimerSetupProc,
-	(TimerCheckProc, TimerHandlerEventProc):
-	* mac/tclMacNotify.c (Tcl_SetTimer):
-	* mac/tclMacShLib.exp (Tcl_GetTime):
-	* mac/tclMacTime.c (Tcl_GetTime):
-	* unix/tclUnixChan.c (TclUnixWaitForFile):
-	* unix/tclUnixEvent.c (Tcl_Sleep):
-	* unix/tclUnixThrd.c (Tcl_ConditionWait):
-	* unix/tclUnixTime.c (Tcl_GetTime):
-	* win/tclWinNotify.c (Tcl_Sleep):
-	* win/tclWinTest.c (TestwinclockCmd):
-	* win/tclWinTime.c (TclpGetSeconds, TclpGetClicks, Tcl_GetTime):
-	Changed all uses of TclpGetTime to Tcl_GetTime. Added Tcl_GetTime to
-	the Stubs table and the library documentation. Added a TclpGetTime in
-	tclUtil.c for backward compatibility of extensions. [Patch 483500,
-	TIP#73]
-
-	* generic/tclCmdMZ.c (Tcl_TimeObjCmd): Corrected an error in the
-	[time] command that caused incorrect results to be returned if the
-	total duration of all iterations exceeded 2**31 microseconds. [Bug
-	478847]
-
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclStubInit.h: Reran 'make genstubs'
-
-2001-11-20  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c
-	* generic/tclCompile.h:
-	* generic/tclExecute.c: moving all code relative to bytecodes from
-	tclBasic.c to tclExecute.c - the functions RecordTracebackInfo and
-	Tcl_ExprObj went to tclExecute.c, and new interface function was
-	defined (TclCompEvalObj).
-	The final objective of this sequence of moves is to provide a clean,
-	clear-cut interface between Tcl's core and the compiler/engine
-	subsystem.
-
-2001-11-20  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c
-	* generic/tclCompile.h:
-	* generic/tclExecute.c: factoring out of common code in tclBasic.c
-	(new function TclInterpReady defined: it resets the interp's result,
-	then checks that it hasn't been deleted and that the nesting level is
-	acceptable). Passed the responsibility of calling it to the *callers*
-	of TclEvalObjvInternal.
-
-2001-11-20  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c
-	* generic/tclExecute.c: a better variant of the previous-to-last
-	commit (restoring numLevels computations). The managing of the levels
-	now has to be done by the *callers* of TclEvalObjvInternal
-
-2001-11-20  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: missing variable declaration under
-	TCL_COMPILE_DEBUG.
-
-2001-11-20  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c:
-	* generic/tclProc.c: restoring the computations of iPtr->numLevels to
-	the original logic (previous to buggy modifs on 2001-11-16).
-
-2001-11-20  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tools/eolFix.tcl (new-file):
-	* unix/Makefile.in: added EOL correction for Windows bat files to
-	dist target. [Bug 219409] (davygrvy)
-
-	* unix/tclUnixInit.c (TclpSetInitialEncodings): update of patch from
-	2001-11-16 that uses the old Tcl encoding check mechanism as a
-	fallback to the original. Also added a TCL_DEFAULT_ENCODING #define
-	(defaults to iso8859-1). Tcl will first try setlocale and nl_langinfo,
-	and if that fails, guess based on certain LANG|LC_* env vars. [Patch
-	418645]
-
-2001-11-19  David Gravereaux <davygrvy@pobox.com>
-
-	* win/buildall.vc.bat:  Added useful comments.
-
-2001-11-19  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/compile.test: added a test for bug [Bug 483309]
-
-2001-11-19  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFile.c:
-	* win/tclWinFCmd.c:
-	* win/tclWin32Dll.c:
-	* doc/file.n:
-	* tests/winFCmd.test: improved speed of file normalization for
-	Win95/98, and clarified docs on differences in file normalization
-	between NT/2000 and the older operating systems. Added test to ensure
-	normalization is correct.
-
-2001-11-19  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c:
-	* generic/tclParse.c: Code reorganisation. Moved all evaluation
-	functions from tclParse.c to tclBasic.c, so that now tclParse.c deals
-	exclusively with parsing and all evaluations are done by code in
-	tclBasic.c. The functions moved are: TclEvalObjvInternal,
-	Tcl_EvalObjv, Tcl_LogCommandInfo, Tcl_EvalTokensStandard,
-	Tcl_EvalTokens, Tcl_EvalEx, Tcl_Eval, Tcl_EvalObj and
-	Tcl_GlobalEvalObj.
-
-2001-11-19  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/trace.test (trace-8.8): Added adapted version of [Bug 219393]
-	as new test; the test won't reliably show up the old problem unless it
-	is being run under something like Purify, but something is better than
-	nothing...
-
-	* generic/tclVar.c (Tcl_TraceVar2, Tcl_UntraceVar2): Added missing
-	mask bits for trace result type and a check for a nonsense flag
-	combination.
-	* generic/tclCmdMZ.c (TraceVarProc): Added missing test for NULL when
-	deleting a trace that doesn't cause an error.
-
-	* doc/TraceVar.3: Added documentation for change due to TIP#68.
-
-	* generic/tclCmdMZ.c (TraceVarInfo): Removed problematic errMsg field
-	from structure.
-	(TraceVarProc): Removed references to errMsg field and changed
-	handling of errors so that they returned a Tcl_Obj* containing the
-	error string. This minimizes the number of calls to the memory
-	management subsystem.
-	(TclTraceCommandObjCmd, TraceCommandProc): Removed references to
-	errMsg field which was never used in command traces in any case.
-	(Tcl_TraceObjCmd, TclTraceVariableObjCmd): Removed references to
-	errMsg field and made variable traces register with
-	TCL_TRACE_RESULT_OBJECT bit set.
-
-	* generic/tcl.h (TCL_TRACE_RESULT_DYNAMIC,TCL_TRACE_RESULT_OBJECT):
-	New constants to define how to handle the strings returned from trace
-	callbacks [TIP#68]
-	* generic/tclVar.c (CallTraces, Tcl_GetVar2Ex, TclGetIndexedScalar,
-	(TclGetElementOfIndexedArray, Tcl_SetVar2Ex, TclSetIndexedScalar,
-	(TclSetElementOfIndexedArray, Tcl_UnsetVar2, Tcl_ArrayObjCmd,
-	(TclDeleteVars, TclDeleteCompiledLocalVars, DeleteArray,
-	(TclVarTraceExists): Support for those new trace flags.
-
-2001-11-19  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds.c: patch for [Bug 483309] (petasis).
-
-2001-11-16  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	* generic/tclListObj.c: removed a C++-style comment that was
-	inadvertently left in the source code.
-
-2001-11-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/interp.test:
-	* generic/tclInterp.c (SlaveObjCmd): Corrected argument checking for
-	'$interp alias|aliases|issafe'. [Patch 479560] (thoyts, hobbs)
-
-	* unix/tclUnixInit.c: added HAVE_LANGINFO code block.
-	* unix/configure: regened
-	* unix/configure.in: added SC_ENABLE_LANGINFO call
-	* unix/tcl.m4: made SHLIB_LD_LIBS='${LIBS}' for FreeBSD* (meyer)
-	Added modified version of Wagner patch to make use of nl_langinfo
-	where possible to determine Unix platform encoding, instead of the
-	inflexible built-in system. This is used by default when possible, and
-	can be disabled with --enable-langinfo=no. [Patch 418645] (hobbs,
-	wagner)
-
-2001-11-16  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclObj.c: moved Tcl_GetCommandFromObj and all defining code
-	for tclCmdNameType objects to tclObj.c (from tclExecute.c). This code
-	has nothing to do with bytecodes.
-
-2001-11-16  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclParse.c:
-	* generic/tclProc.c:
-	* tests/stack.test: consolidation of duplicated code (in
-	TclExecuteByteCode and EvalObjv); renaming of EvalObjv to TclEvalObjv
-	as it is not static anymore; restored consistency of level counts
-	between compiled and directly evaled code. [Bug 480896]
-
-2001-11-12  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc:
-	* win/rules.vc:  Small bug fixes.
-
-	* win/README: added some docs pointing to the docs in makefile.vc for
-	it's use.
-
-2001-10-17  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	* doc/lappend.n:
-	* doc/lindex.n:
-	* doc/linsert.n:
-	* doc/list.n:
-	* doc/llength.n:
-	* doc/lrange.n:
-	* doc/lsearch.n:
-	* doc/lset.n (new-file):
-	* doc/lsort.n:
-	* generic/tclBasic.c (builtInCmds, Tcl_EvalObjEx):
-	* generic/tclCmdIL.c (Tcl_LindexObjCmd, Tcl_LindexList):
-	(Tcl_LindexFlat, Tcl_LsetObjCmd):
-	* generic/tclCompCmds.c (Tcl_CompileLindexCmd, Tcl_CompileLsetCmd):
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c (TclExecuteByteCode):
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclListObj.c (TclLsetList, TclLsetFlat, TclSetListElement):
-	* generic/tclObj.c (TclInitObjSubsystem):
-	* generic/tclStubInit.c:
-	* generic/tclTestObj.c (TestobjCmd):
-	* generic/tclUtil.c (TclGetIntForIndex, SetEndOffsetFromAny):
-	* generic/tclVar.c (Tcl_LappendObjCmd):
-	* tests/lindex.test:
-	* tests/lset.test (new-file):
-	* tests/lsetComp.test (new-file):
-	* tests/obj.test:
-	* tests/string.test:
-	* tests/stringComp.test:
-	Reference implementation of TIP's #22, #33 and #45. Adds the ability
-	of the [lindex] command to have multiple index arguments, and adds the
-	[lset] command. Both commands are byte-code compiled. [Patch 471874]
-	(work by Kenny, commited by Hobbs)
-
-2001-11-12  David Gravereaux <davygrvy@pobox.com>
-
-	* win/buildall.vc.bat(new):
-	* win/makefile.vc:  Small fix with deriving the "OriginalFilename"
-	string in the .rc scripts. Added a quick batchfile for building the
-	entire thing.
-
-2001-11-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/FileSystem.3:
-	* doc/file.n:
-	* doc/tcltest.n: converted use of \' to more reasonable format.
-
-2001-11-10  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* win/Makefile.in: Add "make gdb" target. This target can run tclsh
-	inside either gdb or insight.
-
-2001-11-10  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc:  Added a check to make sure one runs the makefile
-	from the /win directory only.
-
-	* win/mkd.bat:
-	* win/rmd.bat:  Changes from Llyod Lim for better stability.
-	[Patch 456759]
-
-2001-11-09  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc:
-	* win/tcl.dsp:  winhelp target fixes for non-NT systems. It seems
-	NMAKE under these remembers changed directories during commands. A new
-	tcltest feature from Peter Spjuth <peter.spjuth@space.se> to specify a
-	pattern file from the commandline and redirecting output to a file
-	when not under NT with it's scrollback console. Then it replays it,
-	piped through more. Added 2 new static "configurations" to tcl.dsp.
-	I could keep adding more, but I think we should leave it up to the
-	user for customizing it.
-
-	Sticky-points left:  'profile' option.
-
-2001-11-09  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/FileSystem.3:
-	* doc/StdChannels.3:
-	* doc/file.n:
-	* doc/tcltest.n:
-	* tools/man2help.tcl:
-	* tools/man2help2.tcl: fixed winhelp generation problems
-	[Patch 480268]
-
-	* unix/configure:
-	* unix/tcl.m4: added -lc to AIX libs, fixed path to ldAix
-
-2001-11-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/var.test:
-	* generic/tclVar.c: Corrected bug in [global] when dealing with
-	variable names matching :*. [Bug 480176]
-
-2001-11-08  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	Fixup stack size under OSF1. [Patch 474790]
-
-	* unix/configure: Regen.
-	* unix/tcl.m4: Add HAVE_PTHREAD_ATTR_SETSTACKSIZE define to
-	EXTRA_CFLAGS to adjust initial stack size.
-
-2001-11-08  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	Enable thread support under FreeBSD. [Bug 473708]
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_ENABLE_THREADS): Check for pthread functions in
-	libc_r and enable thread support if found.
-	* unix/dltest/Makefile.in: Set SHLIB_LD_LIBS and use it in the
-	Makefile to properly link a shared library.
-
-2001-11-08  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* unix/dltest/Makefile.in: Avoid adding libc to the LIBS variable
-	since it is not needed when linking with CC. If required when linking
-	with LD it should be done on a case by case basis in tcl.m4.
-
-2001-11-08  David Gravereaux <davygrvy@pobox.com>
-
-	* win/rules.vc:
-	* win/makefile.vc:  Fixed install target to adjust for the different
-	build types. Added a 'linkexten' option to link the win extensions
-	inside the shell when built static. Placed win/tclAppInit.c patch in
-	SF patch DB for approval. 'profile' option not hooked in yet.
-	Everything else know is done.
-
-	* win/tcl.dsp(new):
-	* win/tcl.dsw(new):  Simple MsDev stub project files that calls
-	makefile.vc. Will help run Tcl in the debugger easier without
-	confusing MsDev for where the .pdb files are.
-
-2001-11-07  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* win/Makefile.in: Print a message indicating that the user should run
-	"make genstubs" when the generated tclStubInit.c file is out of date.
-	We can't regenerate automatically since there may be no tclsh on the
-	system and that would cause bootstrap problems. [Bug 465874]
-
-2001-11-07  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	Define TCL_INCLUDE_SPEC in tclConfig.sh. It should be included by
-	extensions that need to find Tcl include headers in the install
-	location. The user can override the include install dir with
-	--includedir so we need to record this information for extensions.
-	[Bug 421835]
-
-	* unix/configure: Regen.
-	* unix/configure.in: Define TCL_INCLUDE_SPEC.
-	* unix/tclConfig.sh.in: Define TCL_INCLUDE_SPEC.
-	* win/configure: Regen.
-	* win/configure.in: Define TCL_INCLUDE_SPEC.
-	* win/tclConfig.sh.in: Define TCL_INCLUDE_SPEC.
-
-2001-11-07  David Gravereaux <davygrvy@pobox.com>
-
-	* win/rules.vc:
-	* win/makefile.vc: Dropped the NOMSVCRT macro and put it on the option
-	list instead. It makes more sense to me this way as NOMSVCRT=0 would
-	only be the valid setting. Fixed the dde and reg extension for
-	building static. Improved, but not perfected, the winhelp target.
-
-2001-11-07  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/README: Change minimum VC++ version to 5.X since 4.X is known
-	not to work.
-	Indicate that Mingw is required and building with Cygwin gcc is not
-	supported. Include instructions that indicate how to install Mingw and
-	what URLs folks should use to download the supported version of Mingw.
-	* win/configure: Regen.
-	* win/configure.in: Error out if user tries to compile the Windows
-	version of Tcl with Cygwin gcc. Users should compile with Mingw gcc
-	instead.
-
-2001-11-06  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIO.c (ReadChars): Fixed [Bug 478856] reported by Stuart
-	Cassoff <stwo@users.sourceforge.net>. The bug caused loss of
-	fileevents when [read]ing less data from the channel than buffered.
-	Due to an empty input buffer the flag CHANNEL_NEED_MORE_DATA was set
-	but never reset, causing the I/O system to wait for more data instead
-	of using a timer to synthesize fileevents and to flush the pending
-	data out of the buffers.
-
-2001-11-06  David Gravereaux <davygrvy@pobox.com>
-
-	* win/rules.vc (new):
-	* win/makefile.vc:  Complete over/under rewrite to support numerous
-	build options all from the commandline itself without needing to edit
-	the makefile. Now requires vcvars32.bat to be run prior to running
-	nmake for bootstraping the environment. Fully doc'd usage for it is in
-	makefile.vc. Commentary welcome. Sticky points left are:
-
-	1) winhelp target shows errors in the converting script.
-	2) .rc scripts aren't getting the right #defines to build the correct
-	   "OriginalFilename" strings. (have patch, won't commit yet)
-	3) Naming convention with suffixes describing the buildtype are 'tsdx'
-	   which will need public acceptance. ie. tclsh84tsx.exe is a (t)
-	   threaded shell (s) statically linked to the core and (x) uses
-	   msvcrt instead of libcmt.
-
-2001-11-04  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* library/init.tcl: made filesystem fallback proc ::tcl::CopyDirectory
-	more robust to vagaries of non-native filesystems.
-
-2001-11-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/file.n:
-	* generic/tclIOUtil.c: updated documentation and comments to clarify
-	behaviour of 'file copy' wrt soft links.
-
-2001-10-29  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFile.c: fix to '-types {f r}' bug in TclpMatchInDirectory
-	(which could cause a UMR, as well as returning wrong results). Also
-	improved API for 'stat' to resolve [Bug 219258].
-	* win/tclWin32Dll.c
-	* win/tclWinInt.h: addition of improved stat API to internal lookup
-	table.
-	* tests/fileName.test: two new tests for the above bug.
-	* generic/tclIOUtil.c: some cleanup of comments and #ifdefs
-
-2001-10-29  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tclUnixFile.c (TclpMatchInDirectory): Argument to access() was
-	entryPtr->d_name instead of nativeEntry which failed when trying to
-	check access for files in other than the current directory. [Bug
-	475941, reported by Georgios Petasis]
-
-2001-10-25  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tclUnixChan.c: Added stateUpdated member to struct TtyState.
-	(TtyCloseProc,TtySetOptionProc,TtyInit): Use stateUpdated member of
-	TtyState to decide whether it is necessary to reset a serial port when
-	Tcl closes it. Blindly resetting can cause Tcl to be sent an
-	unexpected SIGTSTP when it is executing in the background [Bug 471374,
-	reported by Chris Nelson]
-
-2001-10-22  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* doc/ObjectType.3: Minor documentation fix, reported by David N.
-	Welton <davidw@users.sourceforge.net> directly to me.
-
-2001-10-22  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFCmd.c: fix to stop test suite from hanging process under
-	some versions of WinNT. [Bug 466102] (Kevin Kenny)
-
-2001-10-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/clock.test (clock-8.1):
-	* generic/tclDate.c (RelativeMonth):
-	* generic/tclGetDate.y (RelativeMonth): corrected off-by-one-day error
-	in clock scan with relative months and years during swing hours. [Bug
-	413397, Patch 414024] (lavana)
-
-2001-10-18  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to bug in Tcl_FSChdir shown up by recent
-	tclkit builds.
-
-2001-10-17  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixPipe.c (PipeInputProc, PipeOutputProc): do immediate
-	retry when error is returned with errno == EINTR. [Bug 415131] (leger)
-
-2001-10-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclLoadAout.c (TclGuessPackageName): removed unused vars and
-	fixed warnings. [Bug 446622] (lim)
-
-2001-10-15  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclProc.c: changing a memcmp to strncmp to avoid a memory
-	error detected by purify (thanks Jeff); modify style to agrre with the
-	style guide.
-
-2001-10-15  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclInt.decls (TclExpandCodeArray,TclGetInstructionTable):
-	Added to internal stubs table. Tclcompiler (Tclpro project) needs them
-	if used as loadable package under Windows. Changed signatures. We
-	don't want to describe compiler internal structures in "tclInt.h".
-
-	* generic/tclCompile.h: S.a. Removed function declarations.
-	* generic/tclCompile.c: S.a. Adapted to changed signatures.
-
-2001-10-15  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:
-	* unix/configure.in:
-	* win/configure:
-	* win/configure.in:
-	* win/tcl.m4: reworked to be a little cleaner in comparison to each
-	other, and to AC_SUBST even empty vars for win/tclConfig.sh
-
-	* generic/tclFileName.c: minor code cleanup
-
-	* generic/tcl.h: moved #define of WIN32 to tcl.h where __WIN32__ is
-	defined and added #ifndef check.
-
-	* doc/open.n: moved all fconfigure option docs to fconfigure.n
-	* doc/fconfigure.n: added serial config options
-
-	* win/tclWinChan.c:
-	* win/tclWinPort.h:
-	* win/tclWinSerial.c: added TIP #35 Windows enhancements for serial
-	configuration. [Patch 438509] (schroedter)
-
-2001-10-15  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFCmd.c: fix to memory leak in TclFileDeleteCmd on
-	certain error conditions.
-	* doc/FileSystem.3: fix to typo.
-
-2001-10-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/encoding/ebcdic.enc:
-	* tools/encoding/ebcdic.txt: EBCDIC charset mapping.
-	[Patch 219323] (nijtmans)
-
-	* library/encoding/tis-620.enc:
-	* tools/encoding/tis-620.txt: TIS-620 charset mapping.
-	[Patch 467423] (poonlap)
-
-	* tests/http.test: added removeFile for outdata
-
-	* tests/ioCmd.test: added catch around file removal, as Windows file
-	locking throws errors.
-
-	* tests/socket.test (socket-7.2): corrected to work on Win2K.
-
-2001-10-12  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/compile.test: new tests for [Bug 467523]; they are only
-	effective if TCL_MEM_DEBUG was set during compilation.
-
-2001-10-11  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclLiteral.c (TclReleaseLiteral): insured that
-	self-referential bytecodes are properly cleaned up on interpreter
-	deletion [Bug 467523] (Ronnie Brunner)
-
-2001-10-10  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinPort.h:  #include <winsock2.h> needed to get moved to
-	after #include <windows.h> or wierd misunderstandings took place when
-	-D_WIN32_WINNT=0x0400 is set for outside code that requires knowledge
-	of Tcl innards. General header macro magic applied liberally...
-
-2001-10-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/unixInit.test:	Corrected restore of ::env(LANG).
-
-2001-10-09  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclFileName.c (Tcl_SplitPath): corrected mem leak intro'd
-	with VFS code where the result obj from Tcl_FSSplitPath was not
-	getting freed.
-
-2001-10-09  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclLiteral.c: (TclReleaseLiteral) reverted previous patch
-	for [Bug 467523] - cure is worse than the illness.
-
-2001-10-05  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclLiteral.c: (TclReleaseLiteral) insured that
-	self-referential bytecodes are properly cleaned up on interpreter
-	deletion. [Bug 467523] (Ronnie Brunner)
-
-2001-10-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tools/configure:
-	* tools/configure.in: noted 8.4 as default Tcl version
-
-	* library/encoding/cp936.enc:
-	* library/encoding/cp949.enc:
-	* library/encoding/cp950.enc:
-	* library/encoding/iso8859-16.enc:
-	* library/encoding/macCroatian.enc:
-	* library/encoding/macCyrillic.enc:
-	* library/encoding/macGreek.enc:
-	* library/encoding/macIceland.enc:
-	* library/encoding/macRoman.enc:
-	* library/encoding/macTurkish.enc:
-	* tools/encoding/cp1250.txt:
-	* tools/encoding/cp1251.txt:
-	* tools/encoding/cp1252.txt:
-	* tools/encoding/cp1253.txt:
-	* tools/encoding/cp1254.txt:
-	* tools/encoding/cp1255.txt:
-	* tools/encoding/cp1256.txt:
-	* tools/encoding/cp1257.txt:
-	* tools/encoding/cp1258.txt:
-	* tools/encoding/cp874.txt:
-	* tools/encoding/cp932.txt:
-	* tools/encoding/cp936.txt:
-	* tools/encoding/cp949.txt:
-	* tools/encoding/cp950.txt:
-	* tools/encoding/iso8859-1.txt:
-	* tools/encoding/iso8859-10.txt:
-	* tools/encoding/iso8859-13.txt:
-	* tools/encoding/iso8859-14.txt:
-	* tools/encoding/iso8859-15.txt:
-	* tools/encoding/iso8859-16.txt:
-	* tools/encoding/iso8859-2.txt:
-	* tools/encoding/iso8859-3.txt:
-	* tools/encoding/iso8859-4.txt:
-	* tools/encoding/iso8859-5.txt:
-	* tools/encoding/iso8859-6.txt:
-	* tools/encoding/iso8859-7.txt:
-	* tools/encoding/iso8859-8.txt:
-	* tools/encoding/iso8859-9.txt:
-	* tools/encoding/koi8-r.txt:
-	* tools/encoding/macCentEuro.txt:
-	* tools/encoding/macCroatian.txt:
-	* tools/encoding/macCyrillic.txt:
-	* tools/encoding/macGreek.txt:
-	* tools/encoding/macIceland.txt:
-	* tools/encoding/macRoman.txt:
-	* tools/encoding/macTurkish.txt:
-	Updated encodings with latest mappings from www.unicode.org. This did
-	not include some Mac encodings that have special multi-unichar
-	translations now (like symbols, dingbats and japanese). Also does not
-	include big5, gb or euc* as those have different formats in the latest
-	Unicode version that need new conversion tools. Not all related .enc
-	files changed as some had been updates separately.
-
-2001-10-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclEvent.c (Tcl_FinalizeThread): moved freeing of
-	tclLibraryPath to before the thread exit handlers are called. Slight
-	modification to change on 2001-09-24.
-
-2001-10-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/configure: regen'ed
-	* win/tcl.m4:
-	* win/makefile.vc: added Win64 SDK RC1 compilation support
-	* win/Makefile.in: added $(LDFLAGS_CONSOLE) to TCLSH, TCLTEST and
-	PIPE_DLL_FILE targets to get the link flags
-
-	* win/tclWinInit.c: minor 64bit casts
-
-2001-10-01  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclParseExpr.c: removed unnecessary inclusion of
-	tclCompile.h and made a small modification in (InfoBodyCmd) to improve
-	the isolation of the compiler/engine subsystem.
-
-2001-09-29  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:
-	* doc/FileSystem.3: corrected and clarified documentation for
-	'Tcl_FSListVolumes(Proc)'. No code changes.
-
-2001-09-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/FindExec.3: added a comment not to change the working directory
-	before calling Tcl_GetNameOfExecutable. [Bug 219215]
-
-2001-09-28  Kevin Kenny   <kennykb@users.sourceforge.net>
-
-	* generic/tclIO.c: added two more '(ClientData)' casts on calls to
-	Tcl_Preserve and Tcl_Release -- ones that Vince apparently missed.
-
-2001-09-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/lsort.n: Improved doc...
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd, SortCompare): Made
-	offset-from-end indexing work, and factored out some "magic numbers"
-	for easier understanding. [Bug 465674]
-	* tests/cmdIL.test (cmdIL-1.26): Added test for offset-from-end
-	indexing for lsort.
-
-2001-09-28  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFCmd.c:
-	* unix/tclUnixFCmd.c: fix to performance issue reported by jcw in
-	which 'access("")' is called unnecessarily when normalizing any
-	absolute path.
-	* generic/tclIO.c: added '(ClientData)' cast to calls to
-	Tcl_(Preserve|Release) newly introduced, fixing compile error on
-	Windows.
-
-2001-09-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/FileSystem.3 (Tcl_FSLoadFile):
-	* generic/tcl.decls (Tcl_FSLoadFile):
-	* generic/tcl.h (Tcl_FSLoadFileProc):
-	* generic/tclInt.h (TclpLoadFile):
-	* generic/tclIOUtil.c (Tcl_FSLoadFile):
-	* generic/tclLoadNone.c (TclpLoadFile):
-	* generic/tclTest.c (TestReportLoadFile):
-	* library/ldAout.tcl:
-	* mac/tclMacLoad.c (TclpLoadFile):
-	* unix/tclLoadAix.c (TclpLoadFile):
-	* unix/tclLoadAout.c (TclpLoadFile):
-	* unix/tclLoadDl.c (TclpLoadFile):
-	* unix/tclLoadDld.c (TclpLoadFile):
-	* unix/tclLoadDyld.c (TclpLoadFile):
-	* unix/tclLoadNext.c (TclpLoadFile):
-	* unix/tclLoadOSF.c (TclpLoadFile):
-	* unix/tclLoadShl.c (TclpLoadFile):
-	* win/tclWinLoad.c (TclpLoadFile):
-	* win/tclWinFCmd.c (DoRemoveJustDirectory):  More CONST poisoning
-	fixes from the 2001-09-24 TIP 27 changes. CONST-ified Tcl_FSLoadFile
-	and TclpLoadFile. Report and patch from Kevin Kenny. [Bug 465833]
-
-	* generic/tclIO.c (ChannelTimerProc):  Added Tcl_Preserve() and
-	Tcl_Release() to fix segfault introduced by the 2001-09-26 changes.
-	[Bug 465494]
-
-	* doc/TCL_MEM_DEBUG.3:  Updated out-of-date reference to #define
-	GUARD_SIZE.
-
-	* doc/UpVar.3 (Tcl_UpVar,Tcl_UpVar2):
-	* generic/tcl.decls (Tcl_UpVar,Tcl_UpVar2):
-	* generic/tclInt.decls (TclFindProc,TclGetFrame):
-	* generic/tclInt.h (TclFindProc,TclGetFrame,TclLookupVar,
-	(TclPrecTraceProc,TclProcInterpProc}):
-	* generic/tclProc.c (TclGetFrame,TclFindProc):
-	* generic/tclVar.c (Tcl_UpVar,Tcl_UpVar2,MakeUpvar):  Updated APIs in
-	generic/tclProc.c and generic/tclVar.c according to the guidelines of
-	TIP 27. [Patch 465442]
-
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h: make genstubs
-
-2001-09-26  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* doc/fileevent.n: Accepted [Patch 465279] adding an example to the
-	fileevent manpage. Minor modifications to get a better formatting.
-	Report and patch by David N. Welton <davidw@users.sourceforge.net>.
-
-	* The changes below fix [Bug 462317] where Expect tried to read more
-	than was in the buffers and then blocked in the OS call as its pty
-	channel driver provides no blockmodeproc through which the OS could be
-	notified of blocking-behaviour. Because of this the general I/O core
-	has to take more care than usual to preserve the semantics of
-	non-blocking channels.
-
-	The problem was reported by "Kevin O'Gorman" <kevin@kosmanor.com>.
-
-	* generic/tclIO.c (Tcl_ReadRaw): Do not read from the driver if the
-	channel is non-blocking and the fileevent causing the read was
-	generated by a timer. We do not know if there is data available from
-	the OS. Instead of going to the OS for more and potentially blocking
-	we simply signal EWOULDBLOCK to the higher levels to cause the system
-	to wait for true fileevents.
-	(GetInput): Same as before.
-	(ChannelTimerProc): Added set and clear of CHANNEL_TIMER_FEV.
-
-	* generic/tclIO.h (CHANNEL_TIMER_FEV): New flag for channels. Is set
-	if a fileevent was generated by a timer, the channel is not blocking
-	and the driver did not provide a blockmodeproc. In that case the I/O
-	core has to be especially careful about going to the driver for more
-	data.
-
-2001-09-26  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/SplitPath.3 (Tcl_GetPathType):
-	* generic/tcl.decls (Tcl_GetPathType):
-	* generic/tclFileName.c (Tcl_GetPathType):
-	* win/tclWinFile.c (TclpMatchInDirectory, NativeStat):  Vince Darley
-	reports the 2001-09-24 TIP 27 changes left the win directory CONST
-	poisoned. These changes should fix that.
-
-	* generic/tclDecls.h: make genstubs
-
-2001-09-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/GetInt.3:
-	* generic/tclInt.h (TclGetLong deleted):
-	* generic/tcl.decls:
-	* generic/tclInt.decls:
-	* generic/tclGet.c:  Updated APIs in generic/tclGet.c according to the
-	guidelines of TIP 27. [Patch 464674]
-
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h: make genstubs
-
-2001-09-25  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c: removed comments referring to unused flag
-	TCL_PARSE_PART1.
-
-2001-09-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/Concat.3:
-	* doc/DString.3:
-	* doc/SplitList.3:
-	* generic/tclInt.h (TclCheckBadOctal):
-	* generic/tcl.decls:
-	* generic/tclInt.decls:
-	* generic/tclEncoding.c (OpenEncodingFile):
-	* generic/tclMain.c (Tcl_Main):
-	* generic/tclUtil.c:
-	* unix/tclLoadDl.c (TclpLoadFile):  Updated APIs in generic/tclUtil.c
-	according to the guidelines of TIP 27. [Patch 464553]
-
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h: make genstubs
-
-2001-09-24  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	The change below fixes [Bug 464380]. The bug was reported by Ronnie
-	Brunner <rbrunner@users.sourceforge.net>. He also provided the patch.
-
-	* generic/tclEvent.c (Tcl_Finalize): Moved release of 'tclLibraryPath'
-	to Tcl_FinalizeThread.
-	(Tcl_FinalizeThread): See above, new place for release of
-	'tclLibraryPath'.
-
-2001-09-24  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tools/encoding/cp1252.txt: File was missing part of the encoding
-	[euro, ZCaron and zcaron].
-
-	* doc/OpenFileChnl.3: Add docs for Tcl_OutputBuffered; remove some old
-	changebars.
-
-2001-09-21  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclExecute.c (TclExecuteByteCode): corrected INST_STR_CMP
-	else case for strings to pass true utf char length to Tcl_UtfNCmp.
-
-2001-09-20  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinInit.c: added extra processor definitions. (mstacy)
-
-	* win/tclWinSock.c (SocketThread): corrected pointer cast for _WIN64.
-
-	* win/tclWinNotify.c: removed unnecessary winsock include (it is
-	already in from tclWinPort.h).
-
-	* win/tclWinPort.h: changed winsock.h include to winsock2.h. Reverses
-	change from 2000-11-16, but is necessary for WIN64. Extensions should
-	comply with defined OS words, or use #ifndef.
-
-2001-09-20  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/socket.test: removed dependence on being run from same dir as
-	remote.tcl, which only now needs to be in the same dir as this file.
-	[Bug 219326]
-
-2001-09-19  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclTest.c (TestcmdtokenCmd): corrected pointer
-	storage/retrieval for 64bit machines.
-
-	* generic/tclCmdAH.c (Tcl_FormatObjCmd):
-	* generic/tclScan.c (Tcl_ScanObjCmd): corrected handling of format and
-	scan on 64-bit machines. [Bug 412696] (rmax)
-
-	* unix/configure: regen'ed
-	* unix/tcl.m4: added --enable-64bit support for HP-11 with the 64-bit
-	kernel.
-
-	* tests/basic.test:
-	* tests/cmdInfo.test: improved skip reporting of missing commands
-
-	* tests/winFCmd.test: simplified error check for winFCmd-7.9
-
-	* tests/winPipe.test: removed obsolete cat16 tests
-
-	* generic/tclExecute.c (TclExecuteByteCode): fixed invalid usage of
-	valuePtr in TRACE_WITH_OBJ in INST_EVAL_STK case. [Bug 462594] Changed
-	INST_STR_CMP instruction to promote to Unicode strings only when one
-	of the strings is already of Unicode type.
-
-	* generic/tclExecute.c (TclExecuteByteCode):
-	* generic/tclCompile.c (instructionTable):
-	* generic/tclCompCmds.c (TclCompileStringCmd): INST_STR_MATCH -
-	Updated to Int1 instruction type and added special case to use
-	INST_STR_EQ instead when no glob chars are specified in a static
-	string.
-
-	* tests/{for.test,foreach.test,if.test,while.test}:
-	* generic/tclCompCmds.c (TclCompileForCmd, TclCompileForeachCmd,
-	TclCompileIfCmd, TclCompileWhileCmd): Corrected the overaggressive
-	compiling of loop bodies enclosed in ""s.  [Bug 219166] (msofer)
-
-2001-09-19  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: insured that execution stack errors are also
-	detected at abnormal returns.
-
-2001-09-19  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/socket.n: Added documentation to mention what happens when a
-	server socket is created with port=0. Removed an old change bar, and
-	no new change bar because Tcl has always behaved this way as it is
-	really a poorly-documented standards-defined OS feature.
-
-	* tests/util.test (util-8.1): Test derived from code to detect the
-	problem, but the test always works in the C locale, so beware if you
-	are maintaining the code.
-	* generic/tclUtil.c (TclNeedSpace): Rewrote to be UTF-8 aware. [Bug
-	411825, but not that patch which would have added extra spaces if
-	there was a real non-ASCII space involved.]
-
-2001-09-18 Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIOCmd.c (Tcl_PutsObjCmd): Rewritten to have saner and
-	faster argument handling. [Bug 123552], [Patch 402564] (fellows)
-
-2001-09-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): On Linux, disable inlining when one
-	of the compat/*.c routines is to be linked in. [Patch 440891]
-
-2001-09-17  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tcl.h: removed forced #define USE_TCLALLOC 1 for Windows.
-	This means the native system allocator will be used by default. This
-	should be binary and source compatible with extensions, as Tcl_Alloc
-	is a properly stubbed function.
-
-2001-09-17  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: corrected small bug in [Patch 456668] - the
-	varFramePtr was not restored in one possible exit.
-
-2001-09-17  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/tclvars.n:
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclProc.c: disabled all compile and execution tracing
-	functionality in standard builds; TCL_COMPILE_DEBUG is now necessary
-	to enable it. [Bug 451858]
-
-2001-09-14  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* doc/gets.n:
-	* doc/read.n:
-	* doc/puts.n:
-	* doc/flush.n:
-	* doc/fconfigure.n:
-	* doc/flush.n:
-	* doc/eof.n:
-	* doc/seek.n:
-	* doc/tell.n:
-	* doc/close.n:
-	* doc/fileevent.n: Added references to the Tcl standard channels. Item
-	[219250], reported by David LeBlanc <whisper@oz.net>. Thanks to
-	Christopher Nelson <chris@pinebush.com> for doing editorial work.
-
-2001-09-13  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* win/Makefile.in:
-	* win/configure.in:
-	* win/makefile.bc:
-	* win/makefile.vc:
-	* library/dde/pkgIndex.tcl: Fixed version numbers from bogus tcl
-	versions to independent versions for dde and registry packages.
-
-2001-09-13  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/regexp.test (regexp-20.1):
-	* generic/tclCmdMZ.c (Tcl_RegsubObjCmd): had to adjust fix from
-	2001-08-06 to actually duplicate the objects in certain cases. This is
-	really a place where feather would have been essential. [Bug 461322]
-
-	* generic/tclUtf.c (Tcl_UtfPrev): corrected to return the proper
-	location when the middle of a UTF-8 byte was passed in [Tk Bug 450504]
-
-	* ChangeLog.1999:
-	* ChangeLog: broke changes from 199x into ChangeLog.1999 to reduce
-	size of the main ChangeLog.
-
-2001-09-13  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* tests/ioCmd.test: Changed the computation of the result for
-	iocmd-8.1[123] so that the tests work for single- and multi-process
-	execution of the testsuite. Depending on the choice of the user stdout
-	is a tty or not and thus reports different channel options. Fixes
-	[460993] reported by Don Porter.
-
-2001-09-13  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/ParseCmd.3:
-	* generic/tcl.decls:
-	* generic/tclCmdMZ.c (Tcl_SubstObjCmd):
-	* generic/tclDecls.h:
-	* generic/tclParse.c:
-	* generic/tclStubInit.c:
-	* tests/parse.test: Deprecate the use of Tcl_EvalTokens, replaced by
-	the new Tcl_EvalTokensStandard. The new function performs the same
-	duties but adheres to the standard return convention for Tcl
-	evaluations; the deprecated function could only return TCL_OK or
-	TCL_ERROR, which caused [Bug 219384] and [Bug 455151]. This patch
-	implements [TIP 56].
-
-2001-09-12  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4: Invert the logic that checks for $GCC. Instead of
-	checking for "$GCC" = "no" we check for "$GCC" != "yes" or simply swap
-	the true and false blocks of code in an if statement. That way if GCC
-	is set to "" everything will still work. [Bug 460991]
-
-2001-09-12  Don Porter <msofer@users.sourceforge.net>
-
-	* tests/appendComp.test:
-	* tests/lsearch.test:
-	* tests/namespace.test:
-	* tests/rename.test:
-	* tests/split.test:  Corrected tests to better isolate tests in one
-	file from influencing tests in other files. [Bug 460591]
-
-2001-09-12  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tcl.decls: reserved stub #481 for the implementation of
-	[TIP 56]
-
-2001-09-11  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* doc/OpenFileChnl.3: Added documentation for Tcl_WriteRaw and
-	Tcl_ReadRaw [Bug 414929].
-
-	* doc/CrtChannel.3: Added documentation for Tcl_ChannelBuffered and
-	Tcl_GetTopChannel [Bug 414929].
-
-	* The changes below are a fix for [Bug 219253].
-
-	* tests/socket.test: Removed _most_ instances of hardwired port
-	numbers for listening sockets. Remaining are the ports in all tests
-	with constraint 'doTestsWithRemoteServer'. These seem to be designed
-	for a more controlled environment and are usually skipped when running
-	the testsuite.
-
-	* tests/io.test: Removed all instances of hardwired port numbers for
-	listening sockets.
-
-2001-09-10  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclEvent.c (TclInExit): Corrected handling of tsd in late
-	stages of finalization. [Bug 419449] (darley)
-
-	* tests/stack.test:
-	* generic/tclInterp.c (AliasObjCmd): Check the numLevels to ensure
-	that we aren't hitting some alias loop condition. [Bug 443184]
-
-2001-09-10  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Don't include . characters in the
-	Tcl library name when building on FreeBSD 3.X and later systems.
-	[Patch 450725]
-
-2001-09-10  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* doc/tclsh.1:
-	* doc/Tcl_Main.3:
-	* doc/CrtChannel.3:
-	* doc/OpenFileChnl.3:
-	* doc/GetStdChan.3: Enhanced the manpages with cross-references to
-	the new manpage and more explanations how these functions deal with
-	the standard channels in various situations.
-
-	* doc/StdChannels.3: New manpage describing handling of the standard
-	channels by the Tcl library. [Bug 402725]
-
-2001-09-10  Don Porter <dgp@users.sourceforge.net>
-
-	* unix/mkLinks (Tcl_FSLink): Updated to reflect 2001-08-23 file system
-	changes.
-
-	* unix/tclLoadShl.c:  Added #include of tclInt.h; access to Tcl
-	internals, notably TclpUnloadFile(), is required. Thanks to Bob
-	Techentin for report and patch. [Bug 459305]
-
-	* generic/tclInitScript.h (initScript):
-	* win/tclWinInit.c (TCL_REGISTRY_KEY, TclpSetVariables):  Removed
-	vestiges of Tcl's old initialization from registry variables. [Bug
-	455645]
-
-2001-09-10  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclInt.decls: Also added 'TclWinFlushDirtyChannels' to the
-	  internal platform specific stub table.
-
-	* win/tclWinFile.c (TclpObjStat): Now added the call to
-	'TclWinFlushDirtyChannels' to this function. I don't know where my
-	head was last thursday (2001-09-06), but the call was actually added
-	to 'TclpObjChdir', i.e. the implementation of [cd]. Corrected this
-	now. Thanks to Vince Darley for spotting this.
-
-2001-09-10  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclProc.c:
-	* tests/proc.test: made [proc] bytecompile a no-op for procs defined
-	with _args_ as single argument and an empty body. [FRQ 451441]
-
-2001-09-09  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* win/Makefile.in: Use () around variable name instead of {}. Use
-	TCLTEST variable directly instead of depending on the tcltest alias.
-
-2001-09-09  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tcl.h:
-	* generic/tclPlatDecls.h: Reminder from David Cuthbert
-	<dacut@kanga.org> that I hadn't finished the Borland compatibility
-	stuff. [Patch 436116]
-
-2001-09-09  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/cmdAH.test: Modify cmdAH-20.5 and cmdAH-24.8 to display the
-	file atime or mtime results if the test fails.
-
-2001-09-08  David Gravereaux <davygrvy@pobox.com>
-
-	* win/mkd.bat:
-	* win/rmd.bat: made these text files, text files again. [Patch 451333]
-
-2001-09-08  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/mkd.bat:
-	* win/rmd.bat: Apply binary property (cvs admin -kb) to files and
-	convert to CRLF linefeed format to fix the VC++ build. [Bug 219409]
-
-2001-09-08 Vince Darley <vincentdarley@users.sourceforge.net>
-
-	* generic/tclInt.h:
-	* generic/tclFCmd.c:
-	* doc/FileSystem.3:
-	* generic/tclIOUtil.c: removed Tcl_FSCopyFile fallback to channel
-	copying, since the channels will not have access to interpreters and
-	the channel copying currently requires an interp. Code which required
-	cross-platform copies always has interpreters, so that solves the
-	problem. Fixes bug in TclKit.
-
-2001-09-07  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tcl.m4: Added -link50compat option so a VC6 linker makes a VC5
-	(pre sp3) compatible import library. [Bug 219257]
-
-2001-09-07  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWinThrd.c (TclpThreadExit): Cast status argument to
-	_endthreadex to unsigned instead of DWORD to match the Win32 function
-	prototype.
-
-2001-09-06  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* All the changes below serve to fix bug [219148] which reports a 80x
-	performance hit for file I/O on Win* systems. On my system it was
-	closer to a 120x hit. Problem report by Uwe Traum <no email address
-	available>.
-
-	The fix goes like this: The obstacle is 'FlushFileBuffers', executed
-	whenever Tcl writes data to the OS, as Tcl has to wait for the disk to
-	complete I/O, and disks are slow. We remove that obstacle. This opens
-	another problem, [file size] reports back wrong numbers. So for [file
-	size] we add the call back in. As optimization we keep track of the
-	channels which were written to and flush only these.
-
-	* win/tclWinFile.c (TclpObjStat): Added a call to
-	'TclWinFlushDirtyChannels'. This ensures that [file size] and related
-	commands report the correct size of a file even if Tcl has recently
-	written to it. Unixoid OS's always report the correct size even for
-	files with pending data, but Win* syssystem don't. They only report
-	what is actually on disk.
-
-	* win/tclWinInt.h: Added declaration of 'TclWinFlushDirtyChannels',
-	making it available to other parts of the tcl core.
-
-	* win/tclWinChan.c (TclWinFlushDirtyChannels): New, internal,
-	procedure. Goes through the list of open file channels and forces the
-	OS to flush its file buffers for all which were written to since the
-	last call of this function. This is an expensive operation as Tcl has
-	to wait for the OS to complete actual writes to the disk.
-
-	(FileInfo): Added dirty flag required by the procedure above.
-
-	(FileOutputProc): Removed flushing of file buffers, setting the dirty
-	flag instead. This means that the previously incurred delays do not
-	happen anymore.
-
-	(TclWinOpenFileChannel): Added initialization of 'dirty' flag.
-
-2001-09-06  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/http.n: noted -binary, charset and coding state keys.
-	* tests/http.test:
-	* library/http/pkgIndex.tcl:
-	* library/http/http.tcl (geturl): correctly get charset parameter
-	and convert text according to specified encoding (if known). RFC
-	iso8859-1 is used by default. Also recognize Content-encoding to see
-	if we should do binary translation. Added a CYA -binary switch for the
-	cases that were missed. [Bugs 219211, 219399]
-
-	* tests/ioUtil.test: changed to make better use of constraints and
-	remove knownBug constraints that weren't valid.
-
-2001-09-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (unixInit-3.2): Updated test to support newer
-	HP-UX releases that properly report euc-jp as the system encoding for
-	Japanese. Bug report and patch verification by Bob Techentin. [Bug
-	453883]
-
-	* doc/http.n:
-	* library/http/*.tcl:
-	* tools/tcl.wse.in:
-	* tools/tclmin.wse:
-	* unix/Makefile.in:
-	* win/{Mm}akefile.*:  Updated http package to version 2.4, reflecting
-	the new features just added.
-
-2001-09-06 Vince Darley <vincentdarley@users.sourceforge.net>
-
-	* generic/tclTest.c: tests of old-fs hooks no longer cause problems in
-	threaded builds. Also removed unused unload proc.
-	* generic/tcl.decls:
-	* generic/tclIOUtilc: added Tcl_FSMountsChanged so that a vfs can
-	inform the filesystem that the filesystem epoch must be changed (since
-	cached filesystems may now be incorrect). Fixes problem running tclvfs
-	extension.
-	* library/tcltest/tcltest.tcl: if tests aren't in a native filesystem,
-	then don't use pipes to run them. [Bug 458741]
-
-2001-09-06  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tcl.decls (479 generic):
-	* generic/tclIO.c (Tcl_Seek,Tcl_Tell,Tcl_OutputBuffered): Added public
-	function to return the size of the output buffer and reworked other
-	channel functions to use this shared functionality and that of
-	Tcl_InputBuffered() too. [TIP#49, Rolf Schroedter]
-
-2001-09-05  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclPlatDecls.h:  Another small trim finalizing Borland
-	support.
-
-	* win/tclWinPipe.c:
-	* win/tclWinPort.h:  More Borland compatibility fixes. Changed EDQUOT
-	#define from 49 to 69. Borland had a clash as it was already using
-	this number. Upon advice from Helmut Giese, EDQUOT has been found in
-	other header files #defined as 69. [Patch 436116]
-
-	* win/.cvsignore:  A few more glob patterns added.
-
-	* win/makefile.bc (new):  Borland lives once more! rejoice..
-	* generic/tclAlloc.c: Small Borland compatibility fix.
-	* win/tclWinTime.c:  More Borland compatibility fixes. [Patch 436116]
-
-2001-09-05 Vince Darley <vincentdarley@users.sourceforge.net>
-
-	* tests/winFCmd.test: made notWin2000 constraint false if not running
-	on Windows at all.
-
-2001-09-04  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinThrd.c:  Revisited _beginthreadex() stuff. Instead of
-	assuming a c-runtime implimentation of _beginthreadex normal, I
-	reversed the logic to not assume, and use when is by explicitly
-	needing to add runtimes that support it such as Borland.
-
-	* generic/tcl.h:
-	* generic/tclPlatDecls.h:  Borland compatibility change so ClientData
-	was properly typed as a void* and TCHAR would not be defined twice.
-
-	* generic/tcl.h:  Removed a small mistake from before. Changes to the
-	EXTERN macro for proper Borland compatibility will have to see a TIP.
-	What's this with the MS compiler:
-
-		__declspec(dllexport) int func (int a, int b);
-
-	will have to be this with Borland:
-
-		int __cdecl __export func (int a, int b);
-
-	The order of the attribute needs to be after the return type.
-
-2001-09-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* compat/strtod.c (strtod):  Fixed failure to handle expressions like
-	3eq2 and failure to set errno on overflow. [Bug 440894]
-
-2001-09-04  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclProc.c:
-	* tests/proc.test: made [proc] check that formal args have simple
-	names. [Bug 458548]
-
-2001-09-04 Vince Darley <vincentdarley@users.sourceforge.net>
-
-	Minor bug fixes in filesystem, plus small vfs changes as a result of
-	enabling the test filesystem to work properly.
-	* tests/fileName.test: ensure new test cleans up after itself
-	* doc/filename.n:
-	* generic/tclFileName.c: improved Mac path handling and document why
-	[Bug 421842] on Windows handling of UNC paths is not valid.
-	Documentation and code now much clearer on what is and is not a UNC
-	path.
-	* doc/FileSystem.3:
-	* unix/tclUnixPipe.c:
-	* generic/tclFCmd.c:
-	* generic/tclIOUtil.c: fixed error message, fixed [Bug 453512] about
-	dangerous use of tmpnam, replaced with mkstemp. Documented all the
-	changes.
-	* generic/tclTest.c: made test vfs fully functional as a 'reporting
-	filesystem'.
-	* generic/tcl.stubs:
-	* generic/tcl.h:
-	* generic/tclInt.h:
-	* generic/tclIOUtil.c:
-	* doc/file.n:
-	* various platform-specific 'TclpLoadFile': fixed comments about
-	unload behaviour, and completed objectification of loading. Required
-	change to Tcl_Filesystem lookup table, so incompatible with 8.4a3, but
-	not older versions of Tcl. The change also allows 'link' and
-	'reporting' filesystems to function correctly when loading files.
-	Implementation of 'file delete -force' copes with case where cwd is
-	inside the directory. Moved overlooked Tcl_FSGetPathType from internal
-	to external API. Made sure filesystems which are registered and then
-	unregistered are only freed when all references to them are gone.
-	Documented changes.
-	* unix/tclUnixFCmd.c: when deleting directories recursively, make sure
-	permissions are ok. Together with the above, this fixes [Bug 219139]
-	* tests/winFCmd.test: differentiated test results for win2k versus
-	not. This fixes [Bug: 219239]
-	* tests/fCmd.test: added tests for 'file delete -force' where the cwd
-	is inside, and when permissions are inadequate.
-
-2001-09-04  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompile.c: fixed incorrect operands for INST_LIST [Bug
-	458241] (David Cuthbert, dacut@users.sourceforge.net)
-
-2001-09-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclExecute.c (TclExecuteByteCode): fixed missing comma in
-	debug macro.
-
-2001-09-03  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/ExprLongObj.3: Fixed error in documentation of argument type to
-	Tcl_ExprObj [Bug 457435]
-
-2001-09-02  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinThrd.c:  Portability fix for Cygwin who's c-runtime,
-	not surprisingly, doesn't have the MSVCRT specific _beginthreadex /
-	_endthreadex pair. This might have to be revisited for proper Borland,
-	lcc32, Watcom and other support as well. [Patch 444255]
-
-	* win/tclWinThrd.c:  Moved FinalizeConditionEvent() proto to within
-	the main #ifdef TCL_THREADS block to avoid mingw warning about it
-	being there but unused.
-
-	* win/makefile.vc:  Added -Zl (zee el) to tclStubLib.c compile line to
-	make sure the tclstub84.lib static library is built without requiring
-	a specific C-runtime library at link-time for the end-use developer.
-	It has been noted on c.l.t that this trips many first time users
-	trying to make extensions. [Patch 403533]
-
-2001-08-31  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclInt.h: added TclCompileListCmd header
-	* generic/tclBasic.c: added TclCompileListCmd compile proc
-	* generic/tclCompCmds.c (TclCompileListCmd): function to compile the
-	'list' command at parse time.
-	* generic/tclExecute.c (TclExecuteByteCode): definition of INST_LIST
-	bytecode.
-
-	* doc/StringObj.3: added words of warning to use Tcl_ResetResult with
-	the Tcl_Append* functions.
-
-	* tests/compile.test: added compile-11.* interp result checks
-	* generic/tclUtil.c (TclGetIntForIndex): added Tcl_ResetResult before
-	Tcl_AppendStringsToObj to prevent shared object crash when called from
-	bcc instruction. The Tcl_Append* calls that append to the result
-	object that are invoked by bcc insts must remember to call
-	Tcl_ResetResult because the bcc doesn't do this for us. [Bug 456892]
-
-2001-08-30  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclIndexObj.c: fixed some casting problems that upset Crays.
-	[Bug 419528] (andreasen)
-
-2001-08-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h: Silence warning from Sun compiler. [Bug 454374]
-
-2001-08-30  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: allow cached fully-qualified command names to
-	be usable from different namespaces within the same interpreter
-	without forcing a new lookup. This speeds up scripts that pass command
-	names in variables ("this" in some OO packages). [Patch 456668]
-
-2001-08-30 Vince Darley <vincentdarley@users.sourceforge.net>
-
-	Further fs updates. After examining the most common Tcl extensions
-	(TclX, BLT, Tk, TclPro, Mktclapp), it has been determined that only
-	TclpGetCwd and the Access/Stat/Open insert/delete hooks of the
-	internal fs functions are ever used. The remaining functions from
-	Tcl's internal interfaces have therefore been removed, since Tcl now
-	exports a more suitable public API (Tcl_FS...)
-
-	* generic/tclInt.stubs:
-	* generic/tclInt.h: updated for removed internal functions. Some new
-	internal functions have been put in tclInt.h (and not exported in the
-	stub table because good public equivalents exist).
-	* generic/tclTest.c: some test functions used the internal private
-	APIs. These tests have been retained, but modified to use public APIs.
-	Also objectified the internal filesystem tests.
-	* win/tclWinFile.c: removed TclpStat, TclpAccess and refactored code
-	to use NativeAccess, NativeStat. This should speed up stat, access and
-	glob commands.
-	* win/tclWinFCmd.c: removed all TclpCopy/Rename/Delete File/Directory
-	string-based procedures which aren't used any more. Improved
-	efficiency of some other procedures. Ensure that filename conversions
-	with a NULL interp do not crash Tcl.
-	* mac/tclMacFCmd.c: wrapped long lines and cleaned up
-	TclpObjNormalizePath, removed all TclpCopy/Rename/Delete
-	File/Directory string-based procedures which aren't used any more.
-	* mac/tclMacFile.c: removed obsolete TclpStat, TclpAccess, TclpChdir,
-	etc.
-	* unix/tclUnixFCmd.c: removed use of TclpAccess, removed all
-	TclpCopy/Rename/Delete File/Directory string-based procedures which
-	aren't used any more.
-	* unix/tclUnixFile.c: removed obsolete TclpStat, TclpAccess,
-	TclpChdir, etc.
-	* tcl(Unix|Mac|Win)Chan.c: objectified TclpOpenFileChannel.
-	* various 'load' implementations all objectified.
-	* generic/tclFileName.c: removed redundant code.
-	* generic/tclIOUtil.c: removed TclStat, TclAccess, TclpListVolumes.
-	Fix to MatchInDirectory at the root of a volume. Also improved some
-	documentation, and improved default path joining behaviour for virtual
-	filesystems, especially regarding '~'.
-	* tests/fileName.test: added tests to check for bugs fixed above.
-	* doc/FileName.3: improved documentation
-
-2001-08-30  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclAsync.c:
-	* generic/tclEvent.c:
-	* generic/tclInt.h: Improper cleanup of asyncMutex in tclAsync.c
-	repaired. TclFinalizeSynchronization() was trying to remove a
-	registered mutex that was dumped earlier when the TSD it was stored in
-	was cleared. This was only surfacing on *nix. Windows was being masked
-	by mutexes not actually being returned to the system! That was
-	repaired in a previous patch. Needed to add a private
-	TclFinalizeAsync() to tclAsync.c and called from Tcl_FinalizeThread().
-	Pheww.. Is this done yet? [Bug 414419] requested by Rob Ratcliff
-	<rrr6399@futuretek.com>
-
-2001-08-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCompCmds.c (TclPushVarName): noted 'static' defn.
-	[Bug 453872]
-
-2001-08-26  Don Porter <dgp@users.sourceforge.net>
-
-	* library/auto.tcl (tcl_findLibrary):
-	* tests/unixInit.test (unixInit-2.{1,9}):
-	* unix/tclUnixInit.c (TclpInitLibraryPath):
-	* win/tclWinInit.c (TclpInitLibraryPath):  Corrected inconsistency
-	between  the search path for script libraries and the directory name
-	$DISTNAME into which distributions built by 'make test' unpack. [Bug
-	455642]
-
-2001-08-24  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/stringComp.test: added string-1.3
-	* generic/tclCompCmds.c (TclCompileStringCmd): changed to return
-	TCL_OUT_LINE_COMPILE instead of TCL_ERROR when compiling and an
-	unknown string method is called. This is necessary as the string
-	command may be never called, or not until 'string' is redefined.
-
-2001-08-24 Vince Darley <vincentdarley@users.sourceforge.net>
-
-	* doc/glob.n: documented windows-style path issue with glob.
-	[Bug 219392]
-	* doc/filename.n: documented windows path/file length limitation.
-	[Bug 454597]
-
-2001-08-24  Don Porter <dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (unixInit-2.9): Corrected expected result to
-	match Tcl's quirky construction of its init library path.
-
-2001-08-23  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* win/tclWinPipe.c (BuildCommandLine): Fixed [Bug 432499]. Part of the
-	code used the non-absolute path to the executable to determine
-	quoting. This failed if the absolute path contained spaces, but the
-	application name itself not. This bug caused no trouble on Win NT 5,
-	but does for other variants in the Win* family. Report and fix due to
-	Ken Poole <kenpoole@users.sourceforge.net>.
-
-2001-08-23  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:
-	* unix/tcl.m4: added QNX-6 build support. [Bug 219410] (loverso)
-
-	* unix/tclUnixFCmd.c:
-	* generic/tclIOUtil.c:
-	* generic/tclFileName.c: corrected minor compiler warnings.
-
-2001-08-23 Vince Darley <vincentdarley@users.sourceforge.net>
-
-	Variety of small filesystem and vfs issues fixed or improved. The new
-	fs code allows many new opportunities for efficiency improvements
-	through the objectified API. The main changes integrated here are such
-	efficiency improvements. Some limitations of the original
-	implementation have also now been lifted. Meanwhile a variety of fs
-	bugs (some old, some new) have also been fixed.
-
-	* generic/tclFileName.c: Made Tcl_FSSplitPath more efficient, and
-	removed some static string-based procedures which are no longer used.
-	Much more objectification. Tcl_FSJoinPath is now very efficient and
-	more aware of virtual filesystems. Clarified where the Mac-specific
-	code attempts to interpret Unix-style paths. Modified TclDoGlob to use
-	lstat not access to fix [Bug 434876] (L. Virden)
-
-	* tcl(Win|Unix|Mac)FCmd.c:
-	* tcl(Win|Unix|Mac)File.c: replaced TclpListVolumes with
-	TclpObjListVolumes with different signature, updated code due to more
-	efficient signature of Tcl_FSGetTranslatedPath. Used cached native
-	paths where possible to improve efficiency -- this was completed on
-	MacOS, but on Unix and Win the traversal functions make the task much
-	more complex, so there are still some improvements possible there.
-	Removed unused TclpNormalizePath which had been left in tclWinFCmd.c.
-	Objectified all 'file attributes' functions. Fixed the new [Bug
-	451571, Bruce Stephens] which is most obvious on Unix, but could occur
-	on MacOS or Windows. This bug actually existed in Tcl 8.3.x but was
-	only made obvious by the recent filesystem overhaul when the code was
-	exercised more heavily.
-	* tests/fileName.test: Three new tests to exercise the above bug, and
-	make sure it is fixed correctly.
-	* unix/tclUnixFile.c: avoid panic in glob when a link doesn't point
-	anywhere. It would probably be good to define exactly what Tcl should
-	do in circumstances like these, and make sure mac/win/unix all behave
-	accordingly. [Bug 417111] (Hemang Lavana). Also fixed
-	misleading/obsolete comment in the code.
-	* generic/tcl.stubs: changed signature of Tcl_FSGetTranslatedPath and
-	added Tcl_FSGetTranslatedStringPath.
-	These changes allow further optimisations in the FS code.
-	* generic/tcl.h: changed signature of Tcl_FSListVolumes so that it
-	doesn't require a Tcl interpreter plus result. Renamed Tcl_FSReadLink
-	to Tcl_FSLink with additional argument so we can support making links
-	in the future. [Patch: 450340]
-	* generic/tclInt.h: added declaration for TclpObjListVolumes.
-	Objectified internal call signatures for 'file attributes' functions,
-	and added an internal objectified get path type function.
-	* generic/tclIOUtil.c: added the moved function TclpListVolumes which
-	calls platform specific code (needed for backwards compatibility), and
-	improved efficiency of parts of the FS (particularly file
-	normalization). Much less copying and memory allocation is required
-	now. added new GetPathType so that changes in 'file volumes' can
-	actually affect files' types, and objectified more code. Made current
-	code work with test suite artificially changing current platform.
-	Added 'static' keywords where required.
-	* generic/tclIO.c:
-	* generic/tclTest.c: Added 'static' keywords, fixing [Bug 453872] (Bob
-	Techentin)
-	* generic/tclCmdAH.c: file command implementation updated for API
-	changes, removed unnecessary special-case SplitPath static function,
-	since it no longer helps prevent code duplication. Moved setting of
-	interpreter result to each individual location that actually required
-	it, to avoid very large code separation between reading and setting
-	the result.
-	* doc/FileSystem.3: updated documentation for the new or changed APIs,
-	and clarified some issues.
-	* doc/SplitPath.3: added pointer to newer APIs in FileSystem.3
-	* doc/filename.n: clarified current implementation of tilde support on
-	Mac/Win.  [Bug 453514] (Sergey Kuzmin)
-	* doc/glob.n: improved documentation for '-directory' and '-path'
-	options.
-
-	There are now many private, obsolete, platform-specific 'Tclp'
-	string-based filesystem APIs which could be removed. We should check
-	whether any of these are used by extensions and, at least in Tcl 9,
-	remove them.
-
-	The above changes signify a ***POTENTIAL INCOMPATIBILITY*** with
-	8.4a3, since signatures of two functions in the new API have changed,
-	but not with older versions of Tcl.
-
-2001-08-23  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclBinary.c (FormatNumber): Extract a long from the object
-	and not an int, to stop [binary format] from being unable to format
-	some input numbers on architectures where sizeof(int) is less than
-	sizeof(long) (particularly Alpha). [tiprender Bug 441861]
-
-	* tests/format.test: Converted conditional execution of tests into a
-	test constraint.
-
-2001-08-22  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/Makefile.in:
-	* win/makefile.vc: updated install target for dde1.2
-	* doc/dde.n: fixed dde man page (which was totally incorrect).
-	* tests/winDde.test:
-	* win/tclWinDde.c (Tcl_DdeObjCmd): added -binary option to dde request
-	command to allow for returning binary data. [Bug 227482]
-	Updated dde to 1.2
-
-	* tests/tcltest.test: added unixExecs constraint to files that used
-	'grep' in the test. [Bug 453143]
-
-	* library/tcltest/tcltest.tcl: fixed stdio constraint test. [Patch
-	454050] (stanton)
-	Simplified unixExecs constraint test.
-
-2001-08-22  Don Porter <dgp@users.sourceforge.net>
-
-	* tests/ioUtil.test (ioUtil-3.*): Corrected errors in tests revealed
-	by fix of overagressive compiler. [Bug 451200]
-
-2001-08-21  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds.c:
-	* tests/compile.test: Fixed overagressive compilation of [catch]: it
-	was catching errors at substitution time. [Bug 219184]
-
-2001-08-21  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/tcltest.test (tcltest-12.2): fixed test that would break when
-	env vars weren't Tcl list friendly [Patch 454046] (stanton)
-
-2001-08-20  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/http/http.tcl (geturl): added port number to Host: header to
-	comply with HTTP/1.1 spec (RFC 2068). [Bug 452217]
-
-2001-08-16  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/tcl.wse.in:
-	* tools/tcl.hpj.in:
-	* win/tcl.hpj.in:  Removed -kb storage in CVS to ensure these text
-	files are checked-out in the translation mode CVS is in. Setting these
-	as binary as part of an effort to make sure they are always in CRLF,
-	no matter what the CVS translation, is bypassing how CVS works and is
-	confusing.
-
-	* tools/genStubs.tcl:  Removed LF-only output. Having to reconvert
-	back to CRLF before committing to CVS was giving me a headache. [Bug
-	451333]
-
-	* win/makefile.vc: replaced $(WINDIR) with $(include32) for the
-	.rc.res inference rule. winver.h wasn't getting included. [Bug 445630]
-
-2001-08-14  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c: make the intial maxNestingDepth of an
-	interpreter be MAX_NESTING_DEPTH instead of a hardwired value. [Bug
-	232564]
-
-2001-08-13  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/trace.test: Corrected test numbers. [Bug 449794]
-
-2001-08-12  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/configure: Regen.
-	* unix/configure.in:
-	* unix/tcl.m4: Use GCC variable set by AC_PROG_CC instead of defining
-	our own using_gcc variable.
-
-2001-08-11  Vince Darley <vincentdarley@users.sourceforge.net>
-
-	Variety of small issues introduced by the vfs code fixed:
-	* generic/tclIOUtil.c: uninitialised read.
-	* generic/tclFCmd.c: possible memory leak in file delete with error
-	condition.
-
-2001-08-10  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c:
-	* tests/trace.test: Insure that [array] traces work correctly for
-	undefined variables. [Bug 449094]
-
-2001-08-09  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/Makefile.in: Delete the unused getcwd.o target. [Bug 440942]
-
-2001-08-08  Don Porter <dgp@users.sourceforge.net>
-
-	* library/dde/pkgIndex.tcl:
-	* library/http/http.tcl:
-	* library/http/pkgIndex.tcl:
-	* library/msgcat/msgcat.tcl:
-	* library/msgcat/pkgIndex.tcl:
-	* library/opt/optparse.tcl:
-	* library/opt/pkgIndex.tcl:
-	* library/reg/pkgIndex.tcl:
-	* library/tcltest/tcltest.tcl:
-	* library/tcltest/pkgIndex.tcl: Added checks for package dependencies.
-	Bumped patchlevels of changed packages: http 2.3.2, msgcat 1.2.2,
-	opt 0.4.3, tcltest 2.0.1. [Patch 448931]
-
-	* README:
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* unix/configure:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure:
-	* win/configure.in: Bumped up patchlevel to 8.4a4 to distinguish CVS
-	snapshots from the 8.4a3 release. This does not necessarily mean there
-	will be an 8.4a4 release. [Bug 448938]
-
-2001-08-06  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	8.4a3 RELEASE
-
-	* changes:
-	* README:
-	* mac/README:
-	* unix/README:
-	* win/README.binary: updated for 8.4a3 release
-
-	* generic/tclFileName.c (Tcl_FSSplitPath): update to Tcl style guide.
-
-	* generic/tclFCmd.c (FileCopyRename): fixed mem leak in introduction
-	of vfs code where a new Tcl_Obj wasn't freed.
-
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd, Tcl_RegsubObjCmd): reordered
-	the retrieval of arguments to avoid shimmering bug when the pattern
-	and string referenced the same object.
-
-	* unix/configure: regenerated
-	* unixE/tcl.m4: added GNU (HURD) configuration target.
-	[Patch 442974] (brinkmann)
-
-	* win/README: made note of URL for Windows compilation notes
-
-	* win/tclWinThrd.c (TclpFinalizeMutex, TclpFinalizeCondition): added
-	DeleteCriticalSection calls for cleanup [Patch 419683]
-
-	* unix/tclUnixPipe.c (TclpCreateTempFile): fixed use of tmpnam,
-	which is dangerous. [Patch 442636] (lim)
-	The use of tmpnam in TclpTempFileName must still be changed.
-
-	* tests/http.test (http-4.14): fixed variable error return.
-	[Bug 424252]
-
-2001-08-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/configure: regenerated
-	* win/tcl.m4: fixed DLLSUFFIX definition to always be ${DBGX}.dll.
-	This is necessary for TEA compliant builds that build shared against a
-	static-built Tcl.
-	* win/Makefile.in ($(TCLSH)): added $(TCL_STUB_LIB_FILE) to build
-	target, otherwise it wouldn't get generated in a static build.
-
-2001-08-06  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIOCmd.c (Tcl_GetsObjCmd): Applied patch from [Bug 442665]
-	to fix the bug reported by it. The function can corrupt a freed object
-	if it is called with objc == 3. This is because it retrieves resultPtr
-	and does not increment its reference count, but then calls
-	Tcl_ObjSetVar2, which causes the retrieved resultPtr object to be
-	released.
-
-2001-08-06  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/tclsh.1: Added note that the tclsh program is frequently
-	installed with the Tcl version numer as part of the name. [Patch
-	402725]
-
-	* generic/tclPkg.c:
-	* tests/pkg.test:  [package forget] now forgets all of the package
-	arguments it receives, not stopping when a package is not found. [Bug
-	415273]
-
-2001-08-02  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclIOUtil.c (Tcl_FSMatchInDirectory): corrected
-	uninitialized value.
-
-2001-08-02  Mo DeJong  <mdejong@redhat.com>
-
-	* generic/tclPlatDecls.h:
-	* win/tclWinPort.h: Revert <tchar.h> related changes made to improve
-	Cygwin support on 2001-07-18. This change ended up breaking the VC++
-	build because of conflicts between Windows APIs and internal Tk APIs.
-
-2001-08-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixFCmd.c: minor casts to eliminate warnings. (lim)
-	[Patch 440218]
-
-	* tests/parseOld.test: changed some tests that required testwordend to
-	exist to skip in a proper tcltest manner. [Bug 442663]
-
-	* library/http/http.tcl (http::mapReply): the regsub'ing of \n and \t
-	to escape them was unnecessary.
-
-2001-07-31  Vince Darley <vincentdarley@users.sourceforge.net>
-
-	Changes from TIP#17 "Redo Tcl's filesystem"
-	The following files were impacted:
-	* doc/Access.3:
-	* doc/FileSystem.3:
-	* doc/OpenFileChnl.3:
-	* doc/file.n:
-	* doc/glob.n:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclDate.c:
-	* generic/tclDecls.h:
-	* generic/tclEncoding.c:
-	* generic/tclFCmd.c:
-	* generic/tclFileName.c:
-	* generic/tclGetDate.y:
-	* generic/tclIO.c:
-	* generic/tclIOCmd.c:
-	* generic/tclIOUtil.c:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclLoad.c:
-	* generic/tclStubInit.c:
-	* generic/tclTest.c:
-	* generic/tclUtil.c:
-	* library/init.tcl:
-	* mac/tclMacFCmd.c:
-	* mac/tclMacFile.c:
-	* mac/tclMacInit.c:
-	* mac/tclMacPort.h:
-	* mac/tclMacResource.c:
-	* mac/tclMacTime.c:
-	* tests/cmdAH.test:
-	* tests/event.test:
-	* tests/fCmd.test:
-	* tests/fileName.test:
-	* tests/io.test:
-	* tests/ioCmd.test:
-	* tests/proc-old.test:
-	* tests/registry.test:
-	* tests/unixFCmd.test:
-	* tests/winDde.test:
-	* tests/winFCmd.test:
-	* unix/mkLinks:
-	* unix/tclUnixFCmd.c:
-	* unix/tclUnixFile.c:
-	* unix/tclUnixInit.c:
-	* unix/tclUnixPipe.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c:
-	* win/tclWinInit.c:
-	* win/tclWinPipe.c:
-
-2001-07-24  Mo DeJong  <mdejong@redhat.com>
-
-	* win/tclWinThrd.c (Tcl_CreateThread): Close Windows HANDLE returned
-	by _beginthreadex. The MS documentation states that this handle is not
-	closed by a later call to _endthreadex.
-
-2001-07-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/pkgMkindex.n:
-	* library/package.tcl:  Corrected documentation and usage message of
-	[pkg_mkIndex].
-
-2001-07-18  Mo DeJong  <mdejong@redhat.com>
-
-	* generic/tclPlatDecls.h: Define TCHAR by including windows.h instead
-	of tchar.h since Cygwin does not support the tchar.h header. Include
-	CHECK_UNICODE_CALLS logic from tclWinPort.h.
-	* win/tclWinPort.h: Remove CHECK_UNICODE_CALLS logic. Remove include
-	of windows.h since this now done it tclPlatDecls.h.
-	* win/tclWinReg.c: Remove duplicate include of windows.h.
-
-2001-07-18  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIO.c: Aftermath to [Bug 427196]. Squash empty buffers if
-	they are smaller than the requested buffersize, to prevent reusage of
-	old buffers and to honor changes in the requested buffersize made by
-	the user.
-
-2001-07-17  Mo DeJong  <mdejong@redhat.com>
-
-	* win/tclWinFile.c (TclpReadlink): Add Cygwin specific definition for
-	the TclpReadlink function. This method implements reading of symbolic
-	links when build with Cygwin.
-
-2001-07-17  Mo DeJong  <mdejong@redhat.com>
-
-	* win/tclWinPort.h: Add Cygwin specific defines for environ and
-	timezone variables.
-
-2001-07-17  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIO.c (GetInput): Fixed [Bug 427196]. Memory was
-	overwritten because a buffer was used after a change of the requested
-	buffersize together with that requested buffersize and not its actual
-	size, which was smaller. Note that the continous reuse of the smaller
-	buffer negatively impacts performance. The system never allocates a
-	buffer with the newly requested bigger buffersize.
-
-2001-07-16  Mo DeJong  <mdejong@redhat.com>
-
-	* generic/tcl.h: Define __WIN32__ when __CYGWIN__ or __MINGW32__ is
-	defined.
-	* generic/tclAlloc.c: Define caddr_t when compiling with VC++ or
-	mingw. This type is already defined when compiling with Cygwin.
-
-2001-07-16  Mo DeJong  <mdejong@redhat.com>
-
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c:
-	* win/tclWinPort.h:
-	* win/tclWinSerial.c:
-	* win/tclWinThrd.c:
-	Remove unnecessary #includes of dos.h, direct.h, and tchar.h. This
-	will help the Cygwin porting effort since these headers do not exist
-	under Cygwin.
-
-2001-07-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinPipe.c (PipeClose2Proc): constrained the mutex lock to
-	just the TerminateThread call and waiting for termination. (jsmith)
-
-	* generic/tclCmdMZ.c: Removed extra copy of the SCAN_* macros
-	#defined in generic/tclScan.c. [Bug 441230] (porter)
-
-2001-07-12  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/unixInit.test (unixInit-2.8): Added extra constraint,
-	notInstalledInTmp, to stop this test from damaging installations in
-	/tmp; not much fun to have to reinstall the Tcl library every time you
-	run the test suite!
-
-	* tests/subst.test (subst-10.*): Updated tests to check new behaviour
-	for 'break' in command substitutions.
-	(subst-1.2,subst-7.1): Error messages changed.
-	* doc/SubstObj.3: New file, to document Tcl_SubstObj.
-	* doc/subst.n: Improved and updated documentation for 'subst' to help
-	support the changed behaviour.
-	* generic/tcl.decls (generic-437): Declaration for Tcl_SubstObj
-	* generic/tcl.h (TCL_SUBST_*): Added flags for Tcl_SubstObj.
-	* generic/tclCmdMZ.c (Tcl_SubstObj,Tcl_SubstObjCmd): Divided into two
-	parts to allow people to access the innards of 'subst' and changed the
-	behaviour when command substitutions do a 'break' to be different from
-	'continue'. Also now works with objects, which allows for some nifty
-	optimisations with variable substitutions and a slight improvement
-	with command substitutions. [TIP#36]
-
-2001-07-10  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/Makefile.in: Add AR variable for use in STLIB_LD.
-	* unix/configure: Regen.
-	* unix/configure.in: Use STLIB_LD when defining MAKE_LIB and
-	MAKE_STUB_LIB. Subst RANLIB and AR.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Add doc comment about STLIB_LD
-	command. Check ${AR} env var when setting STLIB_LD and delay
-	evaluation until make time.
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Delay evaluation of ${AR} in STLIB_LD
-	and add flags to better match the Unix implementation. Don't bother
-	defining AR when using VC++ since it is not used.
-
-2001-07-06  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Pass -e _WinMain@16 in addition to
-	the -mwindows flag to work around a problem with ld when it
-	incorrectly use main() as the executable entry point when both
-	WinMain() and main() are available.
-
-2001-07-06  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/cmdAH.test: Added leading zero to file modes to work around
-	fault in HPUX strtol() which ignores the base parameter. [Bug 438808]
-
-2001-07-05  Mo DeJong  <mdejong@redhat.com>
-
-	* win/Makefile.in: Subst DEPARG directly instead of relying on a
-	variable. This will make Cygwin builds faster since an extra exec will
-	be avoided.
-	* win/configure: Regen.
-	* win/configure.in: Subst DEPARG.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Move AC_MSG_CHECKING after the
-	AC_CHECK_PROG so that status messages do not get mixed together. Set
-	DEPARG based on the results of the cygpath check so that we avoid
-	using an extra exec when it is not needed. Use ac_cv_cygwin status
-	flag instead of looking at the output of gcc -v, which works in the
-	case where -mno-cygwin is set in the CFLAGS.
-
-2001-07-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* README:
-	* mac/README:
-	* unix/README:
-	* win/README:
-	* win/README.binary: updated READMEs with purls
-
-2001-07-03  Mo DeJong  <mdejong@redhat.com>
-
-	* win/Makefile.in: Remove PATHTYPE variable.
-	* win/configure: Regen.
-	* win/configure.in: Don't subst PATHTYPE.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Remove PATHTYPE variable. Set CYGPATH
-	to "cygpath -w" if the cygpath executable is found on the path. This
-	approach works for native Cygwin builds and cross compiles.
-
-2001-07-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/var.test:
-	* generic/tclVar.c (Tcl_VariableObjCmd): added patch to check for
-	number of args. [Patch 426038]
-
-	* generic/tclVar.c (Tcl_GetVar2Ex): added ability to recognize
-	TCL_TRACE_READS flags to cause creation of part1 in TclLookupVar to
-	make sure newly created array will get read traces triggered
-	appropriately. This is called by Tcl_ObjGetVar2, Tcl_GetVar, and
-	Tcl_GetVar2.
-	(TclSetIndexedScalar, TclSetElementOfIndexedArray): added read trace
-	triggering for lappend case.
-	(Tcl_LappendObjCmd): pass TCL_TRACE_READS to Tcl_ObjGetVar2 to trigger
-	possible read traces for new arrays.
-
-	* generic/tclExecute.c (TclExecuteByteCode): added TCL_TRACE_READS
-	flag to INST_LAPPEND(_ARRAY)_STK case to trigger read traces for newly
-	created arrays. Removed unnecessary #ifdef for TCL_COMPILE_DEBUG in
-	INST_LOAD_SCALAR1 case.
-
-	* tests/append.test:
-	* tests/appendComp.test: added tests for read trace triggering for
-	append and lappend.
-
-2001-07-03  Mo DeJong  <mdejong@redhat.com>
-
-	* tests/clock.test (clock-2.5): Adjust test so that it passes when the
-	time slice is 60 msecs, now passes under Windows 98.
-
-2001-07-03  Mo DeJong  <mdejong@redhat.com>
-
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Don't pass the v flag to ${AR} when
-	using gcc, verbose output is not needed.
-
-2001-07-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (unixInit-2.8):  Changed test back to using
-	installation layout, adding comments explaining why the test writes to
-	the directories it does, and checks to avoid destroying other files in
-	/tmp.
-
-2001-07-03  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/unixInit.test (unixInit-1.2): Fixed faults reported in
-	[Bug 438070] - well, at least enough to work on Solaris - and added
-	comments that should make what is going on in the test clearer.
-
-2001-07-02  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/util.test: added util-4.6
-	* generic/tclUtil.c (Tcl_ConcatObj): Corrected walking backwards over
-	utf-8 chars. [Bug 227512]
-
-2001-07-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (unixInit-2.8):  Corrected test for all absolute
-	pathnames in library path when executable is installed near root
-	directory to use correct development directory layout. [Bug 438014]
-
-	* tests/unixInit.test (unixInit-2.9):
-	* unix/tclUnixInit.c (TclpInitLibraryPath):
-	* win/tclWinInit.c (TclpInitLibraryPath):  Corrected buggy
-	construction of search path entries relative to executable. Added test
-	for bad construction. [Bug 438014]
-
-2001-06-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclNamesp.c: Correction to faulty patch from [Bug 231259]
-
-2001-06-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/unixInit.test (unixInit-1.2): Modified so as not to require a
-	local echo service, which fails on many systems which have that turned
-	off for security reasons...
-
-2001-06-27  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclInt.h:
-	* generic/tclObj.c:
-	* unix/Makefile.in: added a -DPURIFY mode that makes Tcl_Obj's
-	allocated and free singularly (instead of in alloc in blocks and never
-	free) to allow checkers like Purify to operate better.
-
-	* library/encoding/koi8-u.enc: added koi8-u (Ukranian variant)
-	encoding.
-
-	* tests/subst.test:
-	* generic/tclUtf.c (Tcl_UtfBackslash): Corrected backslash handling of
-	multibyte utf-8 chars. [Bug 217987]
-
-	* generic/tclCmdIL.c (InfoProcsCmd): fixed potential mem leak in info
-	procs that created objects without using them.
-
-	* generic/tclCompCmds.c (TclCompileStringCmd): fixed mem leak when
-	string command failed to parse the subcommand.
-
-	* doc/interp.n:
-	* doc/unknown.n: updated notes about what is in a safe interp. [Bug
-	218605]
-
-2001-06-27  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/event.test (event-11.5): Removed hard-coded port number which
-	could fail on some systems. [Bug 436727]
-
-2001-06-26  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/Makefile.in:
-	* win/Makefile.in: Add `make shell` target. This target will set the
-	proper env vars before invoking tclsh from the build directory.
-
-2001-06-26  Mo DeJong  <mdejong@redhat.com>
-
-	* win/Makefile.in: Use : to separate VPATH entries. This works for
-	both Cygwin builds and cross builds, the VPSEP variable is simply
-	unneeded complexity.
-	* win/configure: Regen.
-	* win/configure.in: Don't subst VPSEP.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Remove VPSEP variable.
-
-2001-06-26  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/configure: Regen.
-	* unix/configure.in: Fix last checkin by removing export since that
-	only works in bash.
-	* win/configure: Regen.
-	* win/configure.in: Ditto.
-
-2001-06-26  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/configure: Regen.
-	* unix/configure.in: Set CFLAGS to "" if the user did not set CFLAGS
-	in the env. This keeps AC_PROG_CC from adding "-g -O2" to the CFLAGS
-	by default.
-	* win/configure: Regen.
-	* win/configure.in: Ditto.
-
-2001-06-25  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure: Regen.
-	* win/configure.in: Use RC_DEFINE flag from tcl.m4.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Set RC_DEFINE flag based on the
-	compiler in use.
-
-2001-06-25  Mo DeJong  <mdejong@redhat.com>
-
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Link to the imm32 library when
-	building with mingw gcc.
-
-2001-06-25  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): When building with gcc, don't attempt
-	to link with LD or support dllwrap. Simply require a recent version of
-	Cygwin gcc or Mingw gcc that supports -shared. When linking, use gcc
-	instead of ld since gcc automatically includes libs like -lmsvcrt.
-
-2001-06-22  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure: Regen.
-	* win/configure.in: Add resource compiler fix from 8.3.3 to fix
-	compiling with mingw.
-
-2001-06-22  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure: Regen.
-	* win/tcl.m4: Fix silly typo in last checkin.
-
-2001-06-22  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/Makefile.in: Set CFLAGS to @CFLAGS@ and @CFLAGS_DEFAULT@. Set
-	LDFLAGS to @LDFLAGS@ and @LDFLAGS_DEFAULT@. Add LDFLAGS_DEBUG and
-	LDFLAGS_OPTIMIZE to match the way CFLAGS_DEFAULT works. This will
-	support user set CFLAGS or LDFLAGS at configure time.
-	* unix/configure: Regen.
-	* unix/configure.in: Don't set CFLAGS to CFLAGS_DEFAULT, instead
-	subst CFLAGS_DEFAULT into the Makefile. Add AC_SUBST for
-	CFLAGS_DEFAULT, LDFLAGS_DEFAULT, LDFLAGS_DEBUG, and LDFLAGS_OPTIMIZE.
-	* unix/tcl.m4 (SC_ENABLE_SYMBOLS): Modify LDFLAGS_DEFAULT so that it
-	uses a Makefile variable just like CFLAGS_DEFAULT.
-	* win/Makefile.in: Set CFLAGS to @CFLAGS@ and @CFLAGS_DEFAULT@. Set
-	LDFLAGS to @LDFLAGS@ and @LDFLAGS_DEFAULT@. This will support user set
-	CFLAGS or LDFLAGS at configure time.
-	* win/configure: Regen.
-	* win/configure.in: Don't set CFLAGS or LDFLAGS, instead subst
-	CFLAGS_DEFAULT and LDFLAGS_DEFAULT into the Makefile.
-	* win/tcl.m4 (SC_ENABLE_SYMBOLS): Modify LDFLAGS_DEFAULT so that it
-	uses a Makefile variable just like CFLAGS_DEFAULT.
-
-2001-06-22  Mo DeJong  <mdejong@redhat.com>
-
-	* win/configure:
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Don't set LDFLAGS_DEBUG to -g or
-	LDFLAGS_OPTIMIZE to -O when compiling with gcc. These flags are not
-	needed and can cause problems with the Cygwin version of ld.
-
-2001-06-18  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/unixInit.test (unixInit-1.2,unixInit-2.8): Added test for code
-	described below, and fixed a couple of errors that caused problems
-	during testing; the code to determine the installedTcl constraint was
-	wrong, and test unixInit-2.8 assumed that /tmp/lib was free for use
-	and could be deleted, which clashed nastily with my installation and
-	made other tests fail unnecessarily!
-
-	* unix/tclUnixChan.c (TtyInit,TclpOpenFileChannel,
-	(Tcl_MakeFileChannel,TclpGetDefaultStdChannel): Alterations so that
-	the standard channels - stdin, stdout and stderr - have the correct
-	type and fconfigure options. This required making the initialisation
-	of serial lines a little more sophisticated to make the console behave
-	correctly in interactive mode... [Bug 219137 and duplicates]
-
-2001-06-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclPanic.c (Tcl_PanicVA):
-	* mac/tclMacAppInit.c (main):
-	* mac/tclMacPanic.c (TclpPanic):
-	* unix/tclUnixPort.h:
-	* win/tclWinPort.h: Replaced TclMacSetPanic with TclpPanic for setting
-	a platform-specific panic handler. TclpPanic is NULL on Unix and
-	Windows. Fixes broken wish on Mac due to earlier patches. [Patch
-	415648]
-
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c: `make gentubs` after above changes.
-
-2001-06-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* mac/tclMacAppInit.c (main, Macintosh_Init):
-	* mac/tclMacBOAAppInit.c (main):
-	* mac/tclMacPanic.c: Applied patches from Dan Steffen correcting
-	problems on the Macintosh in the 2001-06-08 changes.
-
-2001-06-12  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/regexp.test (regexp-18.12):
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd): Fixed so that submatches
-	that do not match always have index pair {-1 -1} [Bug 219232]
-
-2001-06-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:
-	* generic/tcl.decls:
-	* generic/tclPanic.c: Added CONST to Tcl_*Panic* public interfaces.
-	[Patch 415648, TIP 27]
-
-	* generic/tclInt.decls:
-	* mac/tclMacAppInit.c (main):
-	* mac/tclMacBOAAppInit.c (main):
-	* mac/tclMacPanic.c: Modified special Mac implementations of
-	Tcl_*Panic* to be exact copies of the generic implementations. Added
-	TclMacSetPanic. The generic implementations should be used directly,
-	rather than copies, but that requires further changes by someone
-	familiar with the Mac build systems. [Patch 415648]
-
-	* generic/tclDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c: `make gentubs` after above changes.
-
-	* doc/Panic.3:
-	* unix/mkLinks:  New file documenting Tcl_*Panic* public interfaces,
-	followed by `make mklinks`. [Patch 415648, Bug 219170, Bug 414936]
-
-2001-06-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclUtil.c (Tcl_DStringAppendElement): patch to save an
-	extra strlen call. [Bug 428572]
-
-2001-05-30  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Added two casts to
-	INST_STR_CMP implementation to get rid of a couple warnings from the
-	SUNWspro C compiler.
-
-	* generic/tclBasic.c (Tcl_GetMathFuncInfo,Tcl_ListMathFuncs):
-	* generic/tclCmdIL.c (Tcl_InfoObjCmd,InfoFunctionsCmd):
-	* generic/tcl.decls (generic table, positions 435+436):
-	* tests/info.test:
-	* doc/CrtMathFnc.3:
-	* doc/info.n: Changes due to TIP #15 "Functions to List and Detail
-	Math Functions"
-
-2001-05-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/init.tcl (unknown): removed errant " in error message
-
-2001-05-27  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/regc_locale.c: updated character class range data for
-	Unicode v3.1.0 compliance.
-	* generic/tclUniData.c: regenerated from Unicode v3.1.0 data file (new
-	as of 2001-05-16). This brings Tcl to current unicode compliance.
-
-	* tests/utf.test: added tests to check unicode 3 compliance
-
-	* unix/Makefile.in (tclUtf.o): added tclUniData.c dependency.
-
-	* tools/uniClass.tcl: added comments to output format and the script
-	for clarification.
-
-	* tools/uniParse.tcl: corrected filename output and GetDelta macro to
-	use 'info' as param (was 'infO')
-
-2001-05-26  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclVar.c (tclArraySearchType,SetArraySearchObj,
-	(ParseSearchId): Added code to speed up array searching by reducing
-	the amount of parsing needed for searchIds.
-
-	* generic/tclObj.c (TclInitObjSubsystem):
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct):
-	* generic/tclNamesp.c (TclInitNamespaceSubsystem):
-	* generic/tclInt.h: Moved some Tcl_ObjType initialisation to
-	TclInitObjSubsystem to be with the bulk of the rest. [Patch 424851]
-	Committed by Miguel Sofer <mig@utdt.edu>
-
-2001-05-23  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/io.test: changed io-52.[9-11] to not be platform sensitive
-	with EOL translation.
-
-	* library/encoding/cp1250.enc:
-	* library/encoding/cp1251.enc:
-	* library/encoding/cp1252.enc:
-	* library/encoding/cp1253.enc:
-	* library/encoding/cp1254.enc:
-	* library/encoding/cp1255.enc:
-	* library/encoding/cp1256.enc:
-	* library/encoding/cp1257.enc:
-	* library/encoding/cp1258.enc:
-	* library/encoding/cp874.enc:
-	* library/encoding/iso8859-6.enc:
-	* library/encoding/iso8859-7.enc:
-	* library/encoding/iso8859-8.enc:
-	* library/encoding/iso8859-10.enc (new):
-	* library/encoding/iso8859-13.enc (new):
-	* library/encoding/iso8859-14.enc (new): updated encoding tables based
-	on http://www.unicode.org/Public/MAPPINGS/. (kuhn)
-
-2001-05-23  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/tcl.m4 (SC_PATH_TCLCONFIG): Fix comments, and typo in cached
-	variable name.
-
-2001-05-23  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/tcl.m4 (SC_LOAD_TKCONFIG): Remove use of undefined TCLCONFIG
-	variable and call AC_MSG_RESULT to print the checking result.
-	* win/tcl.m4: Ditto.
-
-2001-05-22  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclObj.c (TclAllocateFreeObjects): simplified
-	objSizePlusPadding to use sizeof(Tcl_Obj) (max) Corrected use of
-	tclObjsAlloced/Freed/Shared in TCL_MEM_DEBUG compile.
-
-2001-05-22  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: removed Tcl_DuplicateObj in INST_DUP
-
-2001-05-21  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/tcltest.test (tcltest-19.1): fixed failing test that was
-	getting affected by Windows env handling of empty valued elements.
-
-	* unix/tcl.m4: added more common install directories in which to
-	search for *Config.sh. [Bug 419812]
-
-	* tests/cmdMZ.test (cmdMZ-1.4): added notLinux constraint to test to
-	prevent failure message on Linux due to OS caching bug.
-
-	* tests/httpd (httpdRespond): added response to timeout value in query
-	string.
-
-	* tests/http.test: removed unused notLinux constraint setting
-
-	* generic/tclRegexp.c (Tcl_RegExpExecObj): added use of
-	Tcl_GetUnicodeFromObj.
-
-2001-05-19  Andreas Kupries <andreas_kupries@users.sourceforge.net>
-
-	* Note that "tclbench" (see project "tcllib") was extended with
-	performance benchmarks for [fcopy] too.
-
-	* doc/fcopy.n: Updated to reflect the extended behaviour of 'fcopy'.
-
-	* tests/io.test: Added tests 'io-52.9', 'io-52.10' and 'io-52.11' to
-	test the handling of encodings by 'fcopy' / 'TclCopychannel'. [Bug
-	209210]
-
-	* generic/tclIO.c: Split of both 'Tcl_ReadChars' and 'Tcl_WriteChars'
-	into a public error checking and an internal working part. The public
-	functions now use the new internal ones. The new functions are
-	'DoReadChars' and 'DoWriteChars'. Extended 'CopyData' to use the new
-	functions 'DoXChars' when required by the encodings on the input and
-	output channels. [Bug 209210]
-
-2001-05-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/history.tcl (tcl::HistAdd): prevent empty calls from being
-	added to the history (arndt)
-
-	* tests/error.test: updated error-1.3 message to account for string
-	index being compiled at toplevel.
-	* tests/appendComp.test:
-	* tests/stringComp.test: new files for extended bytecode testing
-
-	* generic/tclBasic.c: added new CompileProc invocations to basic
-	command initialization.
-	* generic/tclCompCmds.c: added new compile commands for append,
-	lappend, lindex and llength. Refactored set and incr compile commands
-	to use new TclPushVarName function for handling the varname component
-	during compilation (also used by append and lappend). Changed string
-	compile command to compile toplevel code as well (when possible).
-	* generic/tclCompile.c: added new instruction enums
-	* generic/tclCompile.h: added debug info for new instructions
-	* generic/tclExecute.c (TclExecuteByteCode): moved elemPtr to toplevel
-	var (oft-used). Added definitions for new bytecode instructions
-	INST_LIST_INDEX, INST_LIST_LENGTH, INST_APPEND_SCALAR1,
-	INST_APPEND_SCALAR4, INST_APPEND_ARRAY1, INST_APPEND_ARRAY4,
-	INST_APPEND_ARRAY_STK, INST_APPEND_STK, INST_LAPPEND_SCALAR1,
-	INST_LAPPEND_SCALAR4, INST_LAPPEND_ARRAY1, INST_LAPPEND_ARRAY4,
-	INST_LAPPEND_ARRAY_STK, INST_LAPPEND_STK.
-	Refactored repititious code for reuse with INST_LOAD_STK (same as
-	INST_LOAD_SCALAR_STK), INST_STORE_STK (same as INST_STORE_SCALAR_STK).
-	Updated INST_STR_CMP with style of fix of 2001-04-06 Fellows
-	[Bug 219201] as that fix only affected the runtime eval'ed "string"
-	(string compare is normally byte-compiled now). We may want to back
-	these out for speed in the future, noting the problems with \x00
-	comparisons in the docs.
-	* generic/tclInt.h: declarations for new compile commands.
-	* generic/tclVar.c: change TclGetIndexedScalar,
-	TclGetElementOfIndexedArray, TclSetElementOfIndexedArray and
-	TclSetIndexedScalar to use flags. The Set functions now support
-	TCL_APPEND_ELEMENT and TCL_LIST_ELEMENT as well.
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h: minor signature changes for above.
-
-	* generic/tclCmdMZ.c: made use of new Tcl_GetUnicodeFromObj.
-
-2001-05-16  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/console.n: Deleted. Put it in the wrong source tree! D'oh!
-
-2001-05-15  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tcl.decls:
-	* generic/tclDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclStringObj.c (Tcl_GetUnicodeFromObj): new function to
-	parallel Tcl_GetStringFromObj (fix of an API oversight).
-
-	* unix/tclUnixPipe.c: updated pipeChannelType to TCL_CHANNEL_VERSION_2
-	type specification.
-
-	* tests/fileName.test: corrected tests not to fail on win when a
-	C:/test dir exists.
-
-	* generic/tclFileName.c (ExtractWinRoot): corrected ABR error
-
-2001-05-15  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/lindex.test: added test for nested braces [Patch 423617]
-
-2001-05-15  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclInt.h:
-	* generic/tclNamesp.c: invalidate all bytecodes in a namespace if a
-	new command shadows a bytecoded command.
-	* tests/namespace.test:
-	Patched from [Bug 231259]
-
-2001-05-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/console.n: Created. It seems very odd to me that the console
-	implementation is part of the Tcl distribution and not part of Tk, but
-	given the location of the source, the documentation must obviously
-	match up...
-
-2001-05-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):
-	* tests/string.test (string-4.14): Negative string indices should not
-	be added as offsets to the result of [string first] but instead be
-	treated as referring to the start of the string. [Bug 423581]
-
-2001-05-11  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/Makefile.in: Add a LDFLAGS variable to the Makefile instead of
-	directly substing @LDFLAGS@.
-	* unix/configure: Regen.
-	* unix/tcl.m4: Fix CFLAGS_DEFAULT so that the name of a Makefile
-	variable is passed as @CFLAGS@.
-	* win/Makefile.in: Move the setting of CFLAGS higher up in the
-	Makefile.
-	* win/configure: Regen.
-	* win/configure.in: Use dnl to comment out macros so that they are not
-	accidently expanded.
-	* win/tcl.m4: Fix CFLAGS_DEFAULT so that the name of a Makefile
-	variable is passed as @CFLAGS@.
-
-2001-05-07  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: insure different rand() seeds in different
-	threads. [Bug 416643]
-
-2001-05-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/tcltest.test: removed extraneous 'c' (doh!) [Bug: 414031]
-
-	* tools/tcltk-man2html.tcl: removed use of 'exec' for portability and
-	fixed up code.
-
-2001-05-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/library.n:
-	* library/init.tcl:
-	* tests/autoMkindex.t*: Modified [auto_import] to apply pattern
-	matching in the [namespace import] style. [Bug 420186]
-	***POTENTIAL INCOMPATIBILITY*** for any callers of [auto_import] from
-	outside Tcl that expect the pattern matching to be like that of
-	[string match].
-
-2001-05-03  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclParse.c:
-	* tests/namespace.test: Insure consistent behaviour of the [unknown]
-	command: when a command is unknown, it is always processed by
-	[::unknown], ignoring any namespace proc which happens to be called
-	"unknown" [Patch 421166, Bug 420507]
-
-2001-05-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* tools/genStubs.tcl: Add a package require of Tcl 8 at the beginning
-	of the script so that the script will print a descriptive error
-	message when run in an old Tcl 7 shell.
-
-2001-04-27  Kevin Kenny	<kennykb@crd.ge.com>
-
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclCmdIL.c:
-	* generic/tclProc.c:
-	* generic/tclVar.c: Added another collection of missing CONSTs related
-	to TclGetNamespaceForQualName.
-	* generic/tclIntDecls.h: Regenerated.
-
-2001-04-25  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4: Subst TCL_THREADS into tclConfig.sh.
-	* unix/tclConfig.sh.in: Add TCL_THREADS variable.
-	* win/configure: Regen.
-	* win/tcl.m4: Subst TCL_THREADS into tclConfig.sh.
-	* win/tclConfig.sh.in: Add TCL_THREADS variable.
-
-2001-04-25  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/configure: Regen.
-	* unix/configure.in: Use $@ in MAKE_LIB and MAKE_STUB_LIB commands
-	instead of using a delayed subst variable. Replace instances of
-	STUB_LIB_FILE with TCL_STUB_LIB_FILE.
-
-2001-04-25  Mo DeJong  <mdejong@redhat.com>
-
-	* unix/Makefile.in: Use TCL_STUB_LIB_FILE instead of STUB_LIB_FILE.
-	* unix/configure: Regen.
-	* unix/configure.in: Don't subst STUB_LIB_FILE, use TCL_STUB_LIB_FILE
-	instead.
-
-2001-04-25  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tools/encoding/iso8859-15.txt:
-	* library/encoding/iso8859-15.enc: Oops! Got the full encoding wrong.
-	Should be fixed now...
-
-	* tools/encoding/iso8859-15.txt:
-	* library/encoding/iso8859-15.enc:
-	* tools/tcl.wse.in: Added ISO 8859-15 (a.k.a. Latin-1 + Euro currency
-	symbol) support.
-
-	* generic/tclNamesp.c:
-	* generic/tclBasic.c (TclRenameCommand): Missing CONST from several
-	declarations relating to use of TclGetNamespaceForQualName
-
-2001-04-24  Kevin B. Kenny    <kennykb@acm.org>
-
-	* doc/AssocData.3:
-	* doc/CrtCommand.3:
-	* doc/CrtMathFnc.3:
-	* doc/CrtObjCmd.3:
-	* doc/ExprLong.3:
-	* generic/tclBasic.c:
-	* generic/tclCmdMZ.c:
-	* doc/CrtSlave.3:
-	* generic/tclNamesp.c:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclInt.decls:
-	* generic/tclInt.h: (TIP #27) Another round of CONST changes, this
-	time adding CONST to the API's exported from tclBasic.c. [Patch
-	415179]
-	***POTENTIAL INCOMPATIBILITY*** from 8.4a2, in which Vince Darley's
-	changes to command tracing were added. A const has been added to the
-	type signature of one of the parameters to Tcl_CommandTraceProc.
-
-2001-04-10  Kevin B. Kenny    <kennykb@acm.org>
-
-	* unix/tclUnixTime.c: Altered code to use memcpy instead of
-	structure assigments in an effort to achieve better K&R
-	compatibility.
-
-2001-04-10  Kevin B. Kenny    <kennykb@acm.org>
-
-	* unix/tclUnixTime.c: Fixed silly typo in calls to 'gmtime' and
-	'localtime' that broke the Linux build.
-
-2001-04-09  Kevin B. Kenny    <kennykb@acm.org>
-
-	* unix/tclLoadShl.c: Added DYNAMIC_PATH to the load flags so that the
-	SHLIB_PATH will be searched for other libraries. [Bug 219140]
-
-2001-04-09  Kevin B. Kenny    <kennykb@acm.org>
-
-	* unix/tcl.m4: Added _REENTRANT to Solaris build so that thread safe
-	library routines are included.
-	* unix/configure: Re-ran 'autoconf' with changed tcl.m4
-	* tclUnixTime.c: Modified for thread safety of 'gmtime' and
-	'localtime' system calls. [Bugs 219136 and 232558]
-
-2001-04-09  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/expr.test (expr-21.*): Tests to check below fix.
-	* generic/tclParseExpr.c (GetLexeme): Now recognises the
-	non-numeric boolean literals for what they are. It no longer makes
-	sense for anyone to create functions with the same name as one of
-	them, but this was true in 7.* as well [Bug 217777; finally!]
-
-2001-04-07  Miguel Sofer <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: Avoid panic when there are extra items in the
-	tcl stack. [Bug 406709, Patch 414470]
-	* tests/foreach.test: test to exercise the patch
-
-2001-04-07  Miguel Sofer <msofer@users.sourceforge.net>
-
-	* doc/namespace.n: document correct functionality
-	* generic/tclNamesp.c: corrected behaviour of [namespace code]
-	[Bug 219385, Patch 403530]
-	* library/init.tcl:
-	* tests/namespace-old.test: test correct functionality
-	* tests/namespace.test: test correct functionality
-
-2001-04-07  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/Makefile.in (checkdoc): New target, checking the definitions as
-	found in the compiled library against the manpages to find
-	undocumented public functionality.
-
-	* unix/mkLinks: Updated to include the new manpage.
-
-	* doc/UniCharIsAlpha.3: New manpage documenting the Unicode
-	character classification APIs. [Bug 218720]
-
-2001-04-07  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/mkLinks: Updated to incorporate the changes below.
-
-	* doc/StringObj.3: Added 'Tcl_AttemptSetObjLength' to the NAME
-	section. [Bug 414435]
-
-	* doc/Alloc.3: Added both 'Tcl_AttemptAlloc' and 'Tcl_AttemptRealloc'
-	to the NAME section. [Bug 414435]
-
-	* doc/Utf.3: Added both 'Tcl_UniCharCaseMatch' and
-	'Tcl_UniCharNcasecmp' to the NAME section. [Bug 414435]
-
-2001-04-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/init.tcl:
-	* tests/init.test:  Modified processing of $::errorInfo by [unknown]
-	when the auto-loaded command throws an error to better cover the
-	tracks of auto-loading. [Bug 219280, Patch 403551]
-
-2001-04-06  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/read.n: Added section on "USE WITH SERIAL PORTS" to resolve
-	[Bug 219402]
-
-	* tests/string.test (string-2.30): Test for this case
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd, STR_COMPARE branch): Fixed
-	problem caused by Utf-rep of \x00 being more than Utf-rep of \x01
-	fooling memcmp by forcing everything through Utf-based comparisons.
-	Added optimizations for case where objects have a string/unicode-rep
-	or a bytearray-rep (i.e. where we can perform comparisons on
-	fixed-size units). [Bug 219201]
-	* generic/tclUtf.c (Tcl_UtfNcmp): Corrected seriously erroneous
-	comment.
-
-2001-04-05  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* doc/Macintosh.3: Removed duplicates from .SH line. [Bug 413983]
-
-2001-04-05  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Fixed so will compile
-	with K&R compilers. [Patch 413844, Bug 413847]
-
-2001-04-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclMain.c:  Patch from Kevin Kenny to restore support of
-	pre-ANSI compilers. [Bug 413846, Patch 413842]
-
-2001-04-04  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/mkLinks: Updated to contain the new manpage.
-
-	* doc/Environment.3: New manpage, describes Tcl_PutEnv. [Bug 219171]
-
-	* doc/Macintosh.3: New manpage describing the macintosh specific parts
-	of the public API. [Bug 219169]
-
-2001-04-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:
-	* unix/tcl.m4: extended test of termios vs. termio vs. sgtty to
-	better detect result on Linux and when certain configure
-	redirections are being used. [Patch 402923; Bug 227412, 219194] (max)
-
-2001-04-04  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclTest.c:
-	* tests/io.tests: TIP #10 followup correcting a problem with the
-	original patch because of the lack of 'testthread id' for a
-	non-threaded compilation.
-
-2001-04-04  Kevin Kenny <kennykb@acm.org>
-
-	* doc/ByteArrObj.3:
-	* doc/DumpActiveMemory.3:
-	* doc/InitStubs.3:
-	* doc/PkgRequire.3:
-	* doc/StringObj.3:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclBinary.c:
-	* generic/tclCkalloc.c:
-	* generic/tclDecls.h:
-	* generic/tclListObj.c:
-	* generic/tclObj.c:
-	* generic/tclPkg.c:
-	* generic/tclStringObj.c:
-	* generic/tclStubLib.c: (TIP#27) Changed a number of Tcl API's to
-	accept "CONST char*" in place of simple "char*". (kennykb) [Patch
-	404026]
-
-2001-04-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclListObj.c (Tcl_SetListObj): set objPtr->length = 0 in
-	empty object case to maintain sanctity of Tcl_Obj bytes/length
-	pairing. [Patch 405998] (porter)
-
-2001-04-03  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/mkLinks: Added 'Signal.3', 'Tcl_WaitPid'.
-
-	* doc/DetachPids.3: Added description of 'Tcl_WaitPid' [Bug 219173].
-
-	* doc/Signal.3: New man page describing the public API procedures
-	'Tcl_SignalId' and 'Tcl_SignalMsg'. [Bug 219172]
-
-2001-04-02  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* README:
-	* win/README:
-	* win/README.binary: further notes corrections.
-
-	* win/configure:
-	* win/tcl.m4 (SHLIB_LD):  added -incremental:no. [Bug 219381]
-
-2001-04-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* README:
-	* mac/README:
-	* win/README:
-	* win/README.binary:
-	* unix/README: updated patchlevel information to 8.4a3 and updated
-	links and notes.
-
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* win/configure.in (VER):
-	* win/configure:
-	* unix/configure:
-	* unix/configure.in (VER):
-	* unix/tcl.spec: updated patchlevel information to 8.4a3
-
-2001-03-30  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCkalloc.c (TclFinalizeMemorySubsystem): set curTagPtr
-	to NULL to allow for reuse.
-	* generic/tclEvent.c (Tcl_Finalize): moved the tsdPtr initialization
-	inside the subsystemsInitialized check to prevent it potentially
-	getting called twice during finalization.
-	[Patch 403532, Bug 219391] (wu)
-
-	* generic/tclThreadTest.c (Tcl_ThreadObjCmd): cast fixes
-	* generic/tclTest.c (TestChannelCmd): added cast to mollify Windows
-	debug build.
-
-	* win/tclWinSock.c (SocketEventProc): Fixed race condition in
-	readability of socket on Windows. [Patch 410674, Bug 219205, 219333]
-
-	* win/tcl.m4: added imm32.lib to LIBS_GUI for Tk IME support.
-
-	* win/Makefile.in (install-libraries): removed extra \s that broke
-	the target.
-	(install-doc): improved install-* targets to use their base build
-	dependency.
-
-2001-03-30  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* All of the changes below belong to TIP #10 [Tcl I/O Enhancement:
-	Thread-Aware Channels]. See also [Patch 403358] at SF.
-
-	* generic/tclIO.h (struct ChannelState, line 236f): Extended the
-	structure with a new field of type 'Tcl_ThreadId' to hold the id of
-	the thread currently managing all channels with this state.
-
-	Note: This structure is shared by all channels in a stack of
-	transformations.
-
-	* generic/tclIO.c (Tcl_CreateChannel, lines 1058-1065): Modified to
-	store the Id of the current thread in the 'ChannelState' of the new
-	channel.
-
-	* generic/tclIO.c (Tcl_SpliceChannel, lines 2265-2270): Modified in
-	the same manner as 'Tcl_CreateChannel' as the channel will be managed
-	by the current thread afterward.
-
-	* generic/tclIO.c   (Tcl_GetChannelThread, lines 1478-1503):
-	* generic/tcl.decls (Tcl_GetChannelThread, lines 1504-1506): New API
-	function to retrieve the Id of the managing thread from a channel.
-	Implementation and declaration.
-
-	* generic/tclTest.c (TestChannelCmd, lines 4520-4532): Added
-	subcommand 'mthread' to query a channel about its managing thread.
-
-2001-03-29  Mo DeJong  <mdejong@redhat.com>
-
-	* tests/interp.test: Print out warning when testinterpdelete command
-	is not defined. Add tests that checks to make sure a child interp
-	inherits the parent's cwd.
-
-2001-03-29  Jeff Hobbs  <jeffh@gimlet.activestate.com>
-
-	* doc/tcltest.n: corrected incorrect macro usage.
-
-	* doc/lsort.n: corrected unbalanced nroff macros.
-
-	* unix/tclUnixPipe.c (TclpCreateTempFile): prevent potential race
-	condition and security leak in tmp filename creation.
-	[Patch 402924] (max)
-
-	* unix/configure:
-	* unix/tcl.m4: corrected IRIX-5.x config to not use -n32.
-	[Patch 403626] (english)
-
-	* unix/tclUnixThrd.c (Tcl_ConditionWait): fixed handling of timeout
-	for threads (corrects excessive CPU usage issue for Tk on Unix in
-	threaded Tcl environment). [Bug 411603] (ruppert)
-
-2001-03-29  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/lsort.n: Added some notes that clarify the behaviour of
-	[lsort] as well as a whole bunch of examples.  [Bug 219202]
-
-2001-03-27  Jeff Hobbs  <jeffh@gimlet.activestate.com>
-
-	* doc/Alloc.3: corrected docs to note that Tcl_Attempt* return char
-	*'s, not ints. [Bug 411388]
-
-	* tests/regexp.test (regexp-19.1):
-	* generic/tclCmdMZ.c (Tcl_RegsubObjCmd): fixed handling of nulls in
-	subspec value.
-
-2001-03-26  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclDecls.h (Tcl_InitCustomHashTable):  Correction to patch
-	from 2001-01-18;  tclDecls.h was not generated using 'make genstubs'.
-
-2001-03-26  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* win/tclWinInt.h (tclWinTCharEncoding): Removed as now a static
-	variable in win/tclWin32Dll.c instead.
-
-2001-03-23  Jeff Hobbs  <jeffh@activestate.com>
-
-	* generic/tclVar.c (Tcl_ArrayObjCmd): Corrected retrieval of resultPtr
-	to prevent possible corruption.
-
-	* generic/tclNamesp.c (Tcl_Import): Correctly freed a DString.
-	[Patch 403755] (lavana)
-
-2001-03-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/set-old.test (set-old-7.2): Changed error behaviour of
-	[unset] to agree with documentation, so must change test as well.
-
-2001-03-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/package.tcl (pkg_mkIndex):  Added patch from Vince Darley to
-	make [pkg_mkIndex -verbose] even more verbose. [Bug 219349, Patch
-	403529]
-
-2001-03-13  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/info.n: Improved documentation for [info hostname]. [Bug 403840]
-
-	* generic/tclVar.c (Tcl_UnsetObjCmd): Made command behave as
-	documented [issue remaining from Bug 405769]
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): A missing {return TCL_OK;}
-	was causing memory corruption. [Bug 408002]
-
-	* generic/tclExecute.c (TclDeleteExecEnv, GrowEvaluationStack,
-	(TclExecuteByteCode): Added some casts to ClientData that are
-	apparently needed on some architectures.
-
-2001-03-12  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/string.test: Fixed some test numberings and added a test.
-	[Patch 403229]
-
-2001-03-06  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclVar.c (Tcl_UnsetObjCmd): Rewrote argument parser to avoid
-	a read off the end of the argument array that could occur when
-	executing something like [unset -nocomplain] was executed. Improved
-	the error message given when not enough arguments are given (-nocomplain
-	should obviously be *before* --, not after it) and also modified the
-	test suite to take account of that and the documentation to use the
-	same improvement. [Bug 405769]
-
-2001-03-02  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Fixed bug that could pass
-	pointers to freed memory to command implementations, which most
-	obviously caused some weird behaviour with [info level], but could
-	have caused problems with user code and command traces too. [Bug
-	404865, Patch 405436]
-
-2001-02-23  msofer  <msofer@users.sourceforge.net>
-
-	* no changes; fixing up the missing comment in the previous one.
-	Sorry.
-
-2001-02-23  msofer  <msofer@ant.utdt>
-
-	* /cvsroot/tcl/tcl/tests/execute.test: added test for evaluation of an
-	expression in a variable; evals once by compiling, second time using
-	the previous compilation
-
-2001-02-18  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/clock.n: Updated documentation to reflect the addition of
-	compat/strftime.c, including the correct formatting of ISO-8601:1988
-	fiscal week number (%V).
-
-2001-02-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdMZ.c (Tcl_SplitObjCmd): Improved efficiency of
-	splitting strings into individual characters by adding hash so that
-	only one Tcl_Obj per character is created. Improves performance of
-	splitting of short strings and makes a huge difference to splitting of
-	long strings, such as is done in the mime package in tcllib. [Bug
-	131523]
-
-2001-01-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* win/makefile.vc (install-libraries):  Corrected misdirected install
-	directory for the msgcat 1.2 package.
-
-2001-01-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIO.c (CopyData): Moved code that updates the count of how
-	many bytes are left to copy. Corrects bug that when writing occurs in
-	the background, the copy loop could be escaped without updating the
-	count, causing CopyData() to try to copy more bytes than the toRead
-	value originally passed to TclCopyChannel(), leading to hangs and
-	misreporting of number of bytes copied. [Bug 118203, Patch 103432]
-
-2001-01-18  Andreas Kupries  <a.kupries@westend.com>
-
-	Everything below belongs together, it fixes [Bug 123153]
-
-	* generic/tcl.h (line 342): A bit more explanation about the default
-	value for TCL_PRESERVE_BINARY_COMPATABILITY.
-
-	* generic/tcl.h (line 1208): Define the macro 'Tcl_InitHashTable' only
-	when TCL_PRESERVE_BINARY_COMPATIBILITY is not set as it kills binary
-	compatibility to 8.3 and earlier versions. This is the main part of
-	the patch/change.
-
-	* generic/tcl.decls (line 1469):
-	* generic/tclHash.c (Tcl_InitHashTable):
-	* generic/tclHash.c (Tcl_InitHashTableEx):
-	* generic/tclObj.c (Tcl_InitObjHashTable): Changed
-	'Tcl_InitHashTableEx' to 'Tcl_InitCustomHashTable'. This change is
-	more of an estethical nature, replacing the ubiquitous 'Ex' suffix
-	with a more meaningful name. The introduced binary incompatibility is
-	deemed acceptable as it is between alpha versions.  Updated callers.
-
-	* doc/Hash.3:
-	* unix/mkLinks: Changed 'Tcl_InitHashTableEx' to
-	'Tcl_InitCustomHashTable'.
-
-2001-01-10  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/winPipe.test (winpipe-1.20):
-	* tests/winDde.test (createChildProcess):
-	* tests/pkgMkIndex.test (pkgtest::createIndex): Removed assumption
-	that paths contain no spaces which causes problems with both [eval]
-	and [open |...] due to the well-known differences between lists and
-	strings. Fixes [Bug 119406]
-
-2001-01-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/unixInit.test:
-	* unix/tclUnixInit.c (TclpInitLibraryPath):
-	* win/tclWinInit.c (TclpInitLibraryPath):  Several entries in the
-	library path ($tcl_libPath) are determined relative to the absolute
-	path of the executable. When the executable is installed in or near
-	the root directory of the file system, relative pathnames were being
-	incorrectly generated, and in the worst case, memory access violations
-	were crashing the program. [Bug 119416, Patch 102972]
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"             ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/ChangeLog.2002 b/ChangeLog.2002
deleted file mode 100644
index 9534476..0000000
--- a/ChangeLog.2002
+++ /dev/null
@@ -1,4741 +0,0 @@
-2002-12-18  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/makefile.vc: some uses of xcopy swapped to the @$(CPY) macro.
-	Reported by Joe Mistachkin <joe@mistachkin.com>.
-
-2002-12-17  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclNotify.c (TclFinalizeNotifier, Tcl_SetServiceMode):
-	(Tcl_ThreadAlert): Check that the stub functions are non-NULL before
-	calling them. They could be set to NULL by Tcl_SetNotifier.
-
-2002-12-16  David Gravereaux  <davygrvy@pobox.com>
-
-	* generic/tclPipe.c (TclCleanupChildren):
-	* tests/winPipe.test:
-	* win/tclWinPipe.c (Tcl_WaitPid):
-	* win/tclWinTest.c:  Gave Tcl_WaitPid the ability to return a Win32
-	exception code translated into a Posix-style SIG*. This allows [close]
-	to report "CHILDKILLED" without the meaning getting lost in a
-	truncated exit code. In TclCleanupChildren(), TclpGetPid() had to get
-	moved to before Tcl_WaitPid() as the the handle is removed from the
-	list taking away the ability to get the process id after the wait is
-	done. This shouldn't effect the unix implimentaion unless waitpid is
-	called with a pid of zero, meaning "any". I don't think it is..
-
-2002-12-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/configure.in:	Updated configure of CVS snapshots to reflect
-	* win/configure.in:	the 8.4.1.1 patchlevel.
-
-	* unix/configure:	autoconf
-	* win/configure		autoconf
-
-2002-12-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclProc.c (ProcessProcResultCode): Fix failure to propagate
-	negative return codes up the call stack. [Bug 647307]
-	* tests/proc.test (proc-6.1): Test for Bug 647307
-
-	* generic/tclParseExpr.c (TclParseInteger):  Return 1 for the string
-	"0x" (recognize leading "0" as an integer). [Bug 648441]
-	* tests/parseExpr.test (parseExpr-19.1): Test for Bug 648441.
-
-2002-12-09  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinThrd.c (TclpMasterUnlock):
-	* generic/tclThread.c (TclFinalizeThreadData): TclpMasterUnlock must
-	exist and be called unconditional of TCL_THREADS. [Bug 651139]
-
-2002-12-08  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinSock.c (SocketThreadExitHandler, InitSockets):  Check
-	that the tsdPtr is valid before dereferencing as we call it from the
-	exit handler, too [Bug 650353]. Another WSAStartup() loaded version
-	comparison byte swap issue fixed. Although 0x0101 byte swapped is
-	still 0x0101, properly claiming which is major/minor is more correct.
-
-2002-12-06  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclStubInit.c: regen
-	* generic/tclIntPlatDecls.h: regen
-	* generic/tclInt.decls: added TclWinResetInterface
-
-	* win/tclWin32Dll.c (TclWinResetInterfaces):
-	* win/tclWinInit.c (TclpSetInitialEncodings, WinEncodingsCleanup):
-	add exit handler that resets the encoding information to a state where
-	we can reuse Tcl. Following these changes, it is possible to reuse Tcl
-	(following Tcl_FindExecutable or Tcl_CreateInterp) following a
-	Tcl_Finalize.
-
-	* generic/tclIOUtil.c (TclFinalizeFilesystem): reset statics to their
-	original values on finalize to allow reuse of the library.
-
-2002-12-04  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinPipe.c: reverted back to -r1.27 due to numerous test
-	failures that need to be resolved first. The idea was good, but the
-	details aren't.
-
-2002-12-04  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinPipe.c (Tcl_WaitPid):  When a process exits with an
-	exception, pass this notice on to the caller with a SIG* code rather
-	than truncating the exit code and missing the meaning. This allows
-	TclCleanupChildren() to report "CHILDKILLED".
-
-	This has a different behavior than unix in that closing the read pipe
-	to a process sends the SIGPIPE signal which is returned as a SIGPIPE
-	exit status. On windows, we send the process a CTRL_BREAK_EVENT and
-	get back a CONTROL_C_EXIT which is documented to mean a SIGINT which
-	seems wrong as a system, but is the correct exit status.
-
-2002-12-04  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to redirected 'load' in virtual filesystem
-	for some Unix systems.
-
-	* generic/tclEvent.c: the filesystem must be cleaned up before the
-	encoding subsystem because it needs access to encodings. Fixes crash
-	on exit observed in embedded applications.
-
-	* generic/tclTestObj.c: patch omitted from previous change of
-	2002-11-13
-
-2002-12-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclStubLib.c (Tcl_InitStubs): prevent the cached check of
-	tclStubsPtr to allow for repeated load/unload of the Tcl dll by
-	hosting apps. [Bug 615304]
-
-2002-12-03  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclAppInit.c (sigHandler): Protect from trying to close a NULL
-	handle.
-
-	* win/tclWinPipe.c (PipeClose2Proc, TclpCreateProcess): Send a real
-	Win32 signal (CTRL_C_EVENT) when the read channel is brought down to
-	alert the child to close on its side. Start the process with
-	CREATE_NEW_PROCESS_GROUP to allow the ability to send these signals.
-	The following test case now brings down the child without the use of
-	an external [kill] command.
-
-	% set p [open "|[info name]" w+]
-	file8d5380
-	% pid $p
-	2876
-	% close $p     <- now doesn't block in Tcl_WaitPid()
-	%
-
-	* win/tclWinPipe.c (PipeClose2Proc): Changed CTRL_C_EVENT to
-	CTRL_BREAK_EVENT as it can't be ignored by the child and proved to
-	work on [open "|netstat 1" w+] where CTRL_C_EVENT didn't.
-
-2002-11-27  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinPort.h: Don't turn off winsock prototypes!  TclX didn't
-	like it. Even though the core doesn't use the prototypes, do offer
-	them.
-
-	* win/tclWinSock.c: Removed shutdown() from the function table as it
-	wasn't referenced anywhere and cleaned-up some casting that that
-	wasn't needed.
-
-	* win/tclWinSock.c: WSAStartup() loaded version comparison error which
-	resulted in 2.0 looking less than 1.1.
-
-	* win/tclWinChan.c (Tcl_MakeFileChannel): return of DuplicateHandle()
-	incorrectly used. [Bug 618852]
-
-2002-11-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclEncoding.c (TclFinalizeEncodingSubsystem): properly
-	cleanup all encodings by using Tcl_FirstHashEntry in the while loop.
-
-	* unix/Makefile.in (valgrind): add simple valgrind target
-
-	* tests/exec.test: unset path var to allow singleproc testing
-
-	* generic/tclInterp.c (AliasCreate): preserve/release interps to
-	prevent possible FMR error in bad alias cases.
-
-2002-11-26  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinPort.h:
-	* win/tclWinSock.c:  This patch does two things:
-
-	1) Cleans-up the winsock typedefs by using the typedefs provided by
-	winsock2.h. This has no effect on how winsock is initialized; just
-	makes the source code easier to read. [Patch 561305 561301]
-
-	2) Revamps how the socket message handler thread is brought up and
-	down to allow for cleaner exits without the use of TerminateThread().
-	TerminateThread is evil. No attempt has been made to resolve [Bug
-	593810] which may need a new channel driver version for adding a
-	registering function within the transfered thread to init the handler
-	thread. IOW, initialization of the TSD structure is getting bypassed
-	through the thread extension's [thread::transfer] command.
-
-2002-11-26  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c:
-	* win/tclWinSock.c:
-	* win/tclWinThrd.c:
-	* win/tclWinTime.c:  General cleanup of all worker threads used by the
-	channel drivers. Eliminates the normal case where the worker thread is
-	terminated ('cept the winsock one). Instead, use kernel events to
-	signal a clean exit. Only when the worker thread is blocked on an I/O
-	call is the thread terminated. Essentially, this makes all other
-	channel worker threads behave like the PipeReaderThread() function for
-	it's cleaner exit behavior. This appears to fix [Bug 597924] but needs
-	3rd party confirmation to close the issue.
-
-2002-11-26  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/README: Update msys build env URL. This release #4 build both
-	tcl and tk without problems.
-
-2002-11-22  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/init.tcl:         code cleanup to reduce use of
-	* library/opt/optparse.tcl: string compare
-
-	* tests/interp.test: interp-14.4
-	* generic/tclInterp.c (TclPreventAliasLoop): prevent seg fault when
-	creating an alias command over the interp name. [Bug 641195]
-
-2002-11-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclUtil.c (SetEndOffsetFromAny): handle integer offset
-	after the "end-" prefix.
-
-	* generic/get.test:
-	* generic/string.test:
-	* generic/tclObj.c (SetIntFromAny, SetWideIntFromAny):
-	* generic/tclGet.c (TclGetLong, Tcl_GetInt): simplify sign handling
-	before calling strtoul(l). [Bug 634856]
-
-2002-11-18  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclWinThrd.c (Tcl_CreateThread/TclpThreadExit): Fixed improper
-	compiler macros that missed the VC++ compiler. This resulted in VC++
-	builds using CreateThread()/ExitThread() in place of the proper
-	_beginthreadex()/_endthreadex(). This was a large error and am
-	surprised I missed seeing it earlier.
-
-2002-11-13  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/regexpComp.test: added tests 22.*
-	* generic/tclCompCmds.c (TclCompileRegexpCmd): add left and right
-	anchoring (^ and $) recognition and check starting or ending .* to
-	extend the number of REs that can be compiled to string match or
-	string equal.
-
-2002-11-13  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:
-	* tests/trace.test: applied patch from Hemang Levana to fix [Bug
-	615043] in execution traces with 'return -code error'.
-
-	* generic/tclTestObj.c:
-	* tests/stringObj.test: added 'knownBug' test for [Bug 635200]
-	* generic/tclStringObj.c: corrected typos in comments
-
-	* generic/tclFileName.c:
-	* tests/fileName.test: applied patch for bug reported against tclvfs
-	concerning handling of Windows serial ports like 'com1', 'lpt3' by the
-	virtual filesystem code.
-
-	* doc/RegExp.3: clarification of the 'extendMatch' return values.
-
-2002-11-11  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclUtil.c (Tcl_Backslash): use TclUtfToUniChar.
-	(Tcl_StringCaseMatch): use TclUtfToUniChar and add further
-	optimizations for the one-byte/char case.
-
-	* generic/tclUtf.c: make use of TclUtfToUniChar macro throughout the
-	functions, and add extra optimization to Tcl_NumUtfChars for
-	one-byte/char case.
-
-	* generic/tclVar.c (DisposeTraceResult, CallVarTraces): add proper
-	static declarations.
-
-	* generic/tclStringObj.c (Tcl_GetCharLength): optimize for the ascii
-	char case.
-	(Tcl_GetUniChar): remove unnecessary use of Tcl_UtfToUniChar.
-	(FillUnicodeRep): Use TclUtfToUniChar.
-
-	* generic/tclHash.c (HashStringKey): move string++ lower to save an
-	instruction.
-
-	* generic/tclExecute.c (TclExecuteByteCode): improve INST_STR_CMP to
-	use memcmp in the one-byte/char case, also use direct index for
-	INST_STR_INDEX in that case.
-
-	* generic/tclEncoding.c (UtfToUtfProc, UtfToUnicodeProc):
-	(TableFromUtfProc, EscapeFromUtfProc): Use TclUtfToUniChar.
-	(UnicodeToUtfProc, TableToUtfProc): add 1-byte char optimizations for
-	Tcl_UniCharToUtf call. These improve encoded channel conversion speeds
-	by up to 20%.
-
-	* tests/split.test: added 1-char string split tests
-	* generic/tclCmdMZ.c (Tcl_SplitObjCmd): Use TclUtfToUniChar. Also
-	added a special case for single-ascii-char splits.
-	(Tcl_StringObjCmd): Use TclUtfToUniChar. For STR_RANGE, support
-	getting ranges of ByteArrays (reverts change from 2000-05-26).
-	(TraceExecutionProc) add proper static declaration.
-
-	* generic/tclInt.h: add macro version of Tcl_UtfToUniChar
-	(TclUtfToUniChar) that does the one-byte utf-char check without
-	calling Tcl_UtfToUniChar, for use by the core. This brings notable
-	speedups for primarily ascii string handling.
-
-	* generic/tcl.h (TCL_PATCH_LEVEL): bump to 8.4.1.1 for patchlevel
-	only. This interim number will only be reflected by [info patchlevel].
-
-2002-11-11  Kevin Kenny  <kennykb@acm.org>
-
-	* doc/Tcl.n: Corrected indentation of the new language. Oops.
-
-2002-11-10  Kevin Kenny <kennykb@acm.org>
-
-	* doc/Tcl.n: Added language to the Endekalogue to make it clear that
-	substitutions always take place from left to right. [Bug 635644]
-
-2002-11-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* changes: Note TclInExit TclInThreadExit changes.
-	* generic/tclEvent.c (TclInExit, TclInThreadExit): Split out
-	functionality of TclInExit to make it clear which one should be called
-	in each situation.
-	* generic/tclInt.decls: Declare TclInThreadExit.
-	* generic/tclIntDecls.h: Regen.
-	* generic/tclStubInit.c: Regen.
-	* mac/tclMacChan.c (StdIOClose):
-	* unix/tclUnixChan.c (FileCloseProc):
-	* win/tclWinChan.c (FileCloseProc):
-	* win/tclWinConsole.c (ConsoleCloseProc):
-	* win/tclWinPipe.c (TclpCloseFile):
-	* win/tclWinSerial.c (SerialCloseProc): Invoke the new TclInThreadExit
-	method instead of TclInExit.
-
-2002-11-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Generate a fatal configure error if
-	no ar program can be found on the path. [Bug 582039]
-	* win/configure: Regen.
-	* win/configure.in: Check that AR, RANLIB, and RC are found on the
-	path when building with gcc.
-
-2002-11-03  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclAppInit.c:  Calls Registry_Init() and Dde_Init() when
-	STATIC_BUILD and TCL_USE_STATIC_PACKAGES macros are set.
-
-	* win/makefile.vc:
-	* win/rules.vc:  linkexten option now sets the TCL_USE_STATIC_PACKAGES
-	macro which also adds the registry and dde object files to the link
-	of the shell. [Patch 479697] Also factored some additional macros that
-	will be helpful for extension authors. Version grepping of tcl.h will
-	need to be added to complete this.
-
-	* win/buildall.vc.bat: Added more descriptive commentary.
-
-2002-11-01  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinReg.c:  Changed the Tcl_PkgProvide() line to declare the
-	registry extension at version 1.1 from 1.0.
-
-2002-10-31  Andreas Kupries  <andreask@activestate.com>
-
-	* library/word.tcl: Changed $tcl_platform to $::tcl_platform to avoid
-	possible scope trouble.
-
-2002-10-29  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinInt.h:
-	* win/tclWin32Dll.c: added comments about certain NULL function
-	pointers which will be filled in when Tcl_FindExecutable is called, so
-	that users don't report invalid bugs on this topic. (No code changes
-	at all).
-
-2002-10-29  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclLoadDyld.c (TclpFindSymbol): pass all dyld error messages
-	upstream [Bug 627546].
-
-2002-10-28  Andreas Kupries  <andreask@activestate.com>
-
-	* library/dde/pkgIndex.tcl:
-	* library/reg/pkgIndex.tcl: Changed the hardwired debug suffix (d) to
-	the correct suffix (g).
-
-2002-10-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/auto.tcl:	Converted the Mac-specific [package unknown]
-	* library/init.tcl:	behavior to use a chaining mechanism to extend
-	* library/package.tcl:	the default [tclPkgUnknown]. [Bug 627660]
-	* library/tclIndex:	[Patch 624509] (steffen)
-
-2002-10-26  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: xcopy on NT 4.0 doesn't support the /Y switch
-	(overwrite). Added logic to handle this. [Bug 618019]
-
-2002-10-23  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclInt.h: Removed definitions of obsolete HistoryEvent and
-	HistoryRev structures (the history mechanism has been written in Tcl
-	for some time now.)
-
-2002-10-22  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	*** 8.4.1 TAGGED FOR RELEASE ***
-
-	* changes: updated for 8.4.1 release
-
-	* win/Makefile.in: removed @MEM_DEBUG_FLAGS@ subst.
-	* win/configure: regen
-	* win/configure.in: removed SC_ENABLE_MEMDEBUG call
-	* win/tcl.m4: replaced SC_ENABLE_MEMDEBUG with a more intelligent
-	SC_ENABLE_SYMBOLS that takes yes|no|mem|compile|all as options now.
-
-2002-10-22  Daniel Steffen  <das@users.sourceforge.net>
-
-	* library/auto.tcl (tcl_findLibrary):
-	* library/package.tcl (tclPkgUnknown): on macosx, search inside the
-	Resources/Scripts subdirectory of any potential package directory.
-	* macosx/Tcl.pbproj/project.pbxproj: add standard Frameworks dirs to
-	TCL_PACKAGE_PATH make argument.
-	* unix/tclUnixInit.c (TclpSetVariables): on macosx, add embedded
-	framework dirs to tcl_pkgPath: @executable_path/../Frameworks and
-	@executable_path/../PrivateFrameworks (if they exist), as well as the
-	dirs in DYLD_FRAMEWORK_PATH (if set). [Patch 624509]
-	use standard MAXPATHLEN instead of literal 1024
-
-2002-10-22  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/StringObj.3, doc/Object.3: Documented that Tcl_Obj's standard
-	string form is a modified UTF-8; apparently, this was not mentioned
-	anywhere in the main docs, and lead to [Bug 624919].
-
-2002-10-21  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.pbproj/project.pbxproj: bumped version to 8.4.1
-	* generic/tcl.h: Added reminder comment to edit
-	macosx/Tcl.pbproj/project.pbxproj when version number changes.
-
-2002-10-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/reg/pkgIndex.tcl:
-	* win/configure:
-	* win/configure.in:
-	* win/Makefile.in:
-	* win/makefile.vc:
-	* win/makefile.bc:    Updated to reg1.1
-
-	* doc/registry.n:      Added support for broadcasting changes to the
-	* tests/registry.test: registry Environment. Noted proper code in the
-	* win/tclWinReg.c:     docs. [Patch 625453]
-
-	* unix/Makefile.in (dist): add any mac/tcl*.sea.hqx files
-
-2002-10-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclVar.c:	Fixed code that check for proper # of args to
-	* tests/var.test:	[array names]. Added test. [Bug 624755]
-
-2002-10-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/configure:                 add workaround for cygwin windres
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): problem. [Patch 624010] (howell)
-
-2002-10-15  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* README: added archives.tcl.tk note
-
-	* unix/configure:
-	* unix/tcl.m4: Correct AIX-5 ppc build flags. Correct HP 11 64-bit gcc
-	building. [Patch 601051] (martin)
-
-2002-10-15  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:
-	* tests/trace.test: applied patch from Hemang Levana to fix [Bug
-	615043] in execution traces with idle tasks firing.
-
-2002-10-14  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclEnv.c (Tcl_PutEnv): correct possible mem leak. [Patch
-	623269] (brouwers)
-
-2002-10-11  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tcl.h: Need a different strategy through the maze of
-	#defines to let people building with Cygwin build correctly. Also made
-	some comments less misleading...
-
-2002-10-10  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* README: fixed minor nits [Bug 607776] (virden)
-
-	* win/configure:
-	* win/tcl.m4: enable USE_THREAD_ALLOC (new threaded allocator) by
-	default in cygwin configure on Windows.
-
-2002-10-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/Tcl.n:	Clarified that namespace separators are legal in the
-			variable names during $-subtitution. [Bug 615139]
-
-	* doc/regexp.n:	Typo correction. Thanks Ronnie Brunner. [Bug 606826]
-
-2002-10-10  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* unix/tclLoadAout.c
-	* unix/tclLoadDl.c
-	* unix/tclLoadDld.c
-	* unix/tclLoadDyld.c
-	* unix/tclLoadNext.c
-	* unix/tclLoadOSF.c
-	* unix/tclLoadShl.c
-	* win/tclWinLoad.c: allow either full paths or simply dll names to be
-	specified when loading files (the latter will be looked up by the OS
-	on your PATH/LD_LIBRARY_PATH as appropriate). Fixes [Bug 611108]
-
-2002-10-09  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/README: doc'ed --enable-symbols options.
-	* unix/Makefile.in: removed @MEM_DEBUG_FLAGS@ subst.
-	* unix/configure: regen
-	* unix/configure.in: removed SC_ENABLE_MEMDEBUG call
-	* unix/tcl.m4: replaced SC_ENABLE_MEMDEBUG with a more intelligent
-	SC_ENABLE_SYMBOLS that takes yes|no|mem|compile|all as options now.
-
-2002-10-09  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclWinTime.c: Added code to set an exit handler that terminates
-	the thread that calibrates the performance counter, so that the thread
-	won't outlive unloading the Tcl DLL. [Bug 620735]
-
-2002-10-09  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/binary.n: More clarification of [binary scan]'s behaviour.
-
-2002-10-09  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclIntDecls.h: fixed botched regen.
-
-2002-10-09  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.decls: made TclSetPreInitScript() declaration
-	generic as it is used on mac & aqua as well.
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c: regen.
-	* generic/tclCompile.h: added prototype for TclCompileVariableCmd.
-
-	* mac/tclMacPort.h: removed incorrect <fcntl.h> definitions and
-	obsolete <stat.h> definitions.
-	* mac/tclMacChan.c: removed obsolete GetOpenMode() and replaced
-	associated constants with the <fcntl.h> analogues (they existing defs
-	were inconsistent with <fcntl.h> which was causing havoc when
-	Tcl_GetOpenMode was used instead of private GetOpenMode).
-
-	* mac/tclMacFCmd.c: removed GenerateUniqueName(), use equivalent (and
-	identically named) routine from MoreFiles instead.
-
-	* mac/tclMacLoad.c: CONSTification, fixes to Vince's last changes.
-
-	* mac/tclMacFile.c:
-	* mac/tclMacTest.c:
-	* mac/tclMacUnix.c: CONSTification.
-
-	* mac/tclMacOSA.c: CONSTification, sprintf fixes, UH 3.4.x changes;
-	fix for missing autoname token from TclOSACompileCmd. (bdesgraupes)
-	* mac/AppleScript.html(AppleScript delete): doc fix. (bdesgraupes)
-
-	* mac/tcltkMacBuildSupport.sea.hqx: updated MoreFiles to 1.5.3,
-	updated build instructions for 8.4.
-	* mac/tclMacProjects.sea.hqx: rebuilt archive.
-
-2002-10-09  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/Alloc.3: Added a note to mention that attempting to allocate a
-	zero-length block can return NULL. [Tk Bug 619544]
-
-2002-10-04  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/binary.n: Doc improvements [Patch 616480]
-
-	* tests/fCmd.test, tests/winFCmd.test:
-	* tools/eolFix.tcl, tools/genStubs.tcl: [file exist] -> [file exists]
-	Thanks to David Welton.
-
-2002-10-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n: fixed typo [Bug 618018]. Thanks to "JJM".
-
-2002-10-03  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tools/man2help2.tcl:
-	* tests/http.test, tests/httpd, tests/httpold.test:
-	* tests/env.test, tests/binary.test, tests/autoMkindex.test:
-	* library/init.tcl, library/http/http.tcl: [info exist] should really
-	be [info exists]. [Bug 602566]
-
-	* doc/lsearch.n: Better specification of what happens when -sorted is
-	mixed with other options. [Bug 617816]
-
-2002-10-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclProc.c (TclCreateProc): mask out VAR_UNDEFINED for
-	precompiled locals to support 8.3 precompiled code.
-	(Tcl_ProcObjCmd): correct 2002-09-26 fix to look for tclProcBodyType.
-
-2002-10-01  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/socket.n: Mentioned that ports may be specified as serivce names
-	as well as integers. [Bug 616843]
-
-2002-09-30  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCompCmds.c (TclCompileRegexpCmd): correct the checking
-	for bad re's that didn't terminate the re string. Resultant compiles
-	were correct, but much slower than necessary.
-
-2002-09-29  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclAppInit.c: Added proper exiting conditions using Win32
-	console signals. This handles the existing lack of a Ctrl+C exit to
-	call exit handlers when built for thread support. Also, properly
-	handles exits from other conditions such as CTRL_CLOSE_EVENT,
-	CTRL_LOGOFF_EVENT, and CTRL_SHUTDOWN_EVENT signals. In all cases,
-	exit handlers will be called. [Bug 219355]
-
-	* win/makefile.vc: Added missing tclThreadAlloc.c to the build rules
-	and defines USE_THREAD_ALLOC when TCL_THREADS is defined to get the
-	new behavior by default.
-
-2002-09-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* README:		Bumped to version 8.4.1 to avoid confusion of
-	* generic/tcl.h:	CVS snapshots with the actual 8.4.0 release.
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf
-	* win/configure:
-
-2002-09-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure: regen.
-	* unix/tcl.m4: improve AIX-4/5 64bit compilation support.
-
-	* generic/tclProc.c (Tcl_ProcObjCmd): correct overeager optimization
-	of noop proc to handle the precompiled case. (sofer)
-
-	* unix/ldAix (nmopts): add -X32_64 to make it work for 32 or 64bit
-	mode compilation.
-
-	* library/encoding/koi8-u.enc: removed extraneous spaces that confused
-	encoding reader. [Bug 615115]
-
-	* unix/Makefile.in: generate source dists with -src designator and do
-	not generate .Z anymore (just .gz and .zip).
-
-2002-09-18  Mumit Khan <khan@nanotech.wisc.edu>
-
-	Added basic Cygwin support.
-
-	* win/tcl.m4 (SC_PATH_TCLCONFIG): Support one-tree build.
-	(SC_PATH_TKCONFIG): Likewise.
-	(SC_PROG_TCLSH): Likewise.
-	(SC_CONFIG_CFLAGS): Assume real Cygwin port and remove -mno-cygwin
-	flags. Add -mwin32 to extra_cflags and extra_ldflags. Remove ``-e
-	_WinMain@16'' from LDFLAGS_WINDOW.
-	* win/configure.in: Allow Cygwin build.
-	(SEH test): Define to be 1 instead of empty value.
-	(EXCEPTION_DISPOSITION): Add test.
-	* win/configure: Regenerate.
-
-	* generic/tcl.h: Don't explicitly define __WIN32__ for Cygwin, let the
-	user decide whether to use Windows or POSIX personality.
-	(TCL_WIDE_INT_TYPE, TCL_LL_MODIFIER, struct Tcl_StatBuf): Define for
-	Cygwin.
-	* generic/tclEnv.c (Tcl_CygwinPutenv): putenv replacement for Cygwin.
-	* generic/tclFileName.c (Tcl_TranslateFileName): Convert POSIX to
-	native format.
-	(TclDoGlob): Likewise.
-	* generic/tclPlatDecls.h (TCHAR): Define for Cygwin.
-	* win/tclWinPort.h (putenv, TclpSysAlloc, TclpSysFree,
-	(TclpSysRealloc): Define for Cygwin.
-
-2002-09-26  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: preserve environment value of INSTALL_ROOT. When
-	embedding only use deployment build. Force relink before embedded
-	build to ensure new linker flags are picked up.
-
-	* macosx/Tcl.pbproj/project.pbxproj: add symbolic links to debug lib,
-	stub libs and tclConfig.sh in framework toplevel. Configure target
-	dependency fix. Fix to 'clean' action. Added private tcl headers to
-	framework. Install tclsh symbolic link. Html doc build works when no
-	installed tclsh available. Made html doc structure in framework more
-	like in Apple frameworks.
-
-2002-09-24  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tcl.m4 (SC_TCL_64BIT_FLAGS): Yet more robust 64-bit value
-	detection to close [Bug 613117] on more systems.
-
-	* generic/tclCompile.c (TclPrintSource): More CONSTifying.
-	* generic/tclExecute.c (EvalStatsCmd): Object-ify to reduce warnings.
-	Thanks to 'CoderX2' on the chat for bringing this to my attention...
-
-	* unix/tcl.m4: Forgot to define TCL_WIDE_INT_IS_LONG at the
-	appropriate moment. I believe this is the cause of [Bug 613117]
-
-	* doc/lset.n: Changed 'list' to 'varName' for consistency with lappend
-	documentation. Thanks to Glenn Jackman [Bug 611719]
-
-2002-09-22  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:  Corrected [puts -nonewline] within
-	test bodies. Thanks to Harald Kirsch. [Bug 612786, Patch 612788] Also
-	corrected reporting of body return code. Thanks to David Taback [Bug
-	611922]
-	* library/tcltest/pkgIndex.tcl: Bump to version 2.2.1.
-	* tests/tcltest.test: added tests for these bugs.
-
-2002-09-15  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Add PEEK_XCLOSEIM define under
-	Linux. This is used by Tk to double check that an X input context is
-	cleaned up before it is closed.
-
-2002-09-12  David Gravereaux <davygrvy@pobox.com>
-
-	* win/coffbase.txt: Added BLT to the virtual base address listings
-	table should BLT's build tools decide to use it.
-
-2002-09-12  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tcl.h:
-	* mac/tclMacApplication.r:
-	* mac/tclMacLibrary.r:
-	* mac/tclMacResource.r: unified use of the two equivalent resource
-	compiler header inclusion defines RC_INVOKED and RESOURCE_INCLUDED,
-	now use RC_INVOKED throughout.
-
-2002-09-10  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/README: Add note about building extensions with the same
-	compiler Tcl was built with. [Tk Bug 592096]
-
-2002-09-10  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.pbproj/project.pbxproj: disabled building html
-	documentation during embedded build.
-
-2002-09-10  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in: added DYLIB_INSTALL_DIR variable for macosx and
-	set it to default value ${LIB_RUNTIME_DIR}
-	* unix/tcl.m4 (Darwin): use DYLIB_INSTALL_DIR instead of
-	LIB_RUNTIME_DIR in the -install_name argument to ld.
-	* unix/configure: regen.
-
-	* macosx/Tcl.pbproj/project.pbxproj:
-	* macosx/Makefile: added support for building Tcl as an embedded
-	framework, i.e. using an dyld install_name containing
-	@executable_path/../Frameworks via the new DYLIB_INSTALL_DIR
-	unix/Makefile variable.
-
-2002-09-10  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	*** 8.4.0 TAGGED FOR RELEASE ***
-
-2002-09-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/file.n:  Format correction, and clarified [file normalize]
-	returns an absolute path.
-
-	* doc/tcltest.n:  Added examples section, as long promised.
-
-2002-09-06  Reinhard Max  <max@suse.de>
-
-	* tests/tcltest.test: Added nonRoot flag to tests 8.3, 8.4, and 8.12.
-
-2002-09-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:  Clarified phrasing.
-
-	* generic/tclBasic.c (TclRenameCommand,CallCommandTraces):
-	* tests/trace.test (trace-27.1): Corrected memory leak when a rename
-	trace deleted the command being traced. Test added. Thanks to Hemang
-	Lavana for the fix. [Bug 604609]
-
-	* generic/tclVar.c (TclDeleteVars):  Corrected logic for setting the
-	TCL_INTERP_DESTROYED flag when calling variable traces. [Tk Bug 605121]
-
-2002-09-04  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c (DeleteArray): leak plug [Bug 604239]. Thanks to
-	dkf and dgp for the long and difficult discussion in the chat.
-
-2002-09-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclVar.c (Tcl_UpVar2): code cleanup to not use goto
-
-	* unix/configure: remove -pthread from LIBS on FreeBSD in thread
-	* unix/tcl.m4:    enabled build. [Bug 602849]
-
-2002-09-03  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclInterp.c (AliasCreate): a Tcl_Obj was leaked on error
-	return from TclPreventAliasLoop.
-
-2002-09-03  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.pbproj/project.pbxproj: Bumped version number to 8.4.0
-	and updated copyright info.
-
-2002-09-03  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c (Tcl_UpVar2): a Tcl_Obj was being leaked on error
-	return from TclGetFrame.
-
-2002-09-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:  Updated changes for 8.4.0 release.
-
-2002-09-02  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixFile.c (TclpObjLink): removed unnecessary/unfreed extra
-	native char*.
-
-	* unix/tclUnixChan.c (Tcl_MakeTcpClientChannel): make sure to init
-	flags field of TcpState ptr to 0.
-
-	* unix/configure:
-	* unix/tcl.m4: added 64-bit gcc compilation support on HP-11.
-	[Patch 601051] (martin)
-
-	* README:		Bumped version number to 8.4.0
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* unix/configure:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure:
-	* win/configure.in:
-
-	* generic/tclInterp.c (SlaveCreate): make sure that the memory and
-	checkmem commands are initialized in non-safe slave interpreters when
-	TCL_MEM_DEBUG is used. [Bug 583445]
-
-	* win/tclWinConsole.c (ConsoleCloseProc): only wait on writable pipe
-	if there was something to write. This may prevent infinite wait on
-	exit.
-
-	* tests/exec.test: marked exec-18.1 unixOnly until the Windows
-	incompatibility (in the test, not the core) can be resolved.
-
-	* tests/http.test (http-3.11): added close $fp that was causing an
-	error on Windows because the file was not closed before deleting.
-
-	* unix/tclUnixInit.c (Tcl_MacOSXGetLibraryPath): made this static
-	function only appear when HAVE_CFBUNDLE is defined.
-
-2002-08-31  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4: added TK_SHLIB_LD_EXTRAS analogue of existing
-	TCL_SHLIB_LD_EXTRAS for linker settings only used when linking Tk.
-
-	* unix/configure: regen
-
-2002-08-31  Daniel Steffen  <das@users.sourceforge.net>
-
-	*** macosx-8-4-branch merged into the mainline [Patch 602770] ***
-
-	* generic/tcl.decls: added new macosx specific entry to stubs table.
-
-	* tools/genStubs.tcl: added generation of platform guards for
-	macosx. This is a little more complex than it seems, because MacOS X
-	IS "unix" plus a little bit, for the purposes of Tcl. BUT
-	unfortunately, Tk uses "unix" to mean X11. So added platform keys for
-	macosx (the little added to "unix"), "aqua" and "x11" to distinguish
-	these for Tk.
-
-	* generic/tcl.h: added a #ifnded RESOURCE_INCLUDED so that tcl.h can
-	be passed to the resource compiler.
-
-	* generic/tcl.h:
-	* generic/tclNotify.c: added a few Notifier procs, to be able to
-	modify more bits of the Tcl notifier dynamically. Required to get Mac
-	OS X Tk to live on top of the Tcl Unix threaded notifier. Changes the
-	size of the Tcl_NotifierProcs structure, but doesn't move any elements
-	around.
-
-	* unix/tclUnixNotfy.c: moved the call to Tcl_ConditionNotify till
-	AFTER we are done mucking with the pointer swap. Fixes cases where the
-	thread waiting on the condition wakes & accesses the waitingListPtr
-	before it gets reset, causing a hang.
-
-	* library/auto.tcl (tcl_findLibrary): added checking the directories
-	in the tcl_pkgPath for library files on macosx to enable support of
-	the standard Mac OSX library locations.
-
-	* unix/Makefile.in:
-	* unix/configure.in:
-	* unix/tcl.m4: added MAC_OSX_DIR. Added PLAT_OBJS to the OBJS: there
-	are some MacOS X specific files now for Tcl, and when I get the
-	resource & applescript stuff ported over, and restore support for
-	FindFiles, etc, there will be a few more. Added LD_LIBRARY_PATH_VAR
-	configure variable to avoid having to set all possible LD_LIBRARY_PATH
-	analogues on all platforms. LD_LIBRARY_PATH_VAR is "LD_LIBRARY_PATH"
-	by default, "LIBPATH" on AIX, "SHLIB_PATH" on HPUX and
-	"DYLD_LIBRARY_PATH" on Mac OSX. Added configure option to package Tcl
-	as a framework on Mac OSX.
-
-	* macosx/tclMacOSXBundle.c (new): support for finding Tcl extension
-	packaged as 'bundles' in the standard Mac OSX library locations.
-
-	* unix/tclUnixInit.c: added support for findig the tcl script library
-	inside Tcl packaged as a framework on Mac OSX.
-
-	* macosx/Tcl.pbproj/jingham.pbxuser (new):
-	* macosx/Tcl.pbproj/project.pbxproj (new): project for Apple's
-	ProjectBuilder IDE.
-
-	* macosx/Makefile (new): simple makefile for building the project from
-	the command line via the ProjectBuilder tool 'pbxbuild'.
-
-	* unix/configure:
-	* generic/tclStubInit.c:
-	* generic/tclPlatDecls.h: regen
-
-2002-08-29  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* win/tclWinThrd.c (TclpFinalizeThreadData, TclWinFreeAllocCache):
-	Applied patch for [Bug 599428], provided by Miguel Sofer
-	<msofer@users.sourceforge.net>.
-
-2002-08-28  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclEnv.c:
-	* unix/configure.in:
-	* win/tclWinPort.h:  putenv() on some systems copies the buffer rather
-	than taking reference to it. This causes memory leaks and is know to
-	effect mswindows (msvcrt) and NetBSD 1.5.2 . This patch tests for this
-	behavior and turns on -DHAVE_PUTENV_THAT_COPIES=1 when approriate.
-	Thanks to David Welton for assistance. [Bug 414910]
-
-	* unix/configure: regen'd
-
-2002-08-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/eval.n: Added mention of list command and corrected "SEE ALSO".
-
-	* unix/configure.in: Cache handling of ac_cv_type_socklen_t was wrong.
-	[Bug 600931] reported by John Ellson. Fixed by putting the brackets
-	where they belong.
-
-2002-08-26  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds.c: fix for [Bug 599788] (error in element name
-	causing segfault), reported by Tom Wilkason. Fixed by copying the
-	tokens instead of the source string.
-
-2002-08-26  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclThreadAlloc.c: small optimisation, reducing the new
-	allocator's overhead.
-
-2002-08-23  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclObj.c (USE_THREAD_ALLOC): fixed leak [Bug 597936]. Thanks
-	to Zoran Vasiljevic.
-
-2002-08-23  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclThreadAlloc.c (USE_THREAD_ALLOC): moving objects between
-	caches as a block, instead of one-by-one.
-
-2002-08-22  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c:
-	* generic/tclCmdMZ.c: fix for freed memory r/w in delete traces [Bug
-	589863], patch by Hemang Lavana.
-
-2002-08-20  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* win/Makefile.in (CFLAGS):
-	* unix/Makefile.in (MEM_DEBUG_FLAGS): Added usage of @MEM_DEBUG_FLAGS@.
-	* win/configure.in:
-	* unix/configure.in: Added usage of SC_ENABLE_MEMDEBUG.
-	* win/tcl.m4:
-	* unix/tcl.m4: Added macro SC_ENABLE_MEMDEBUG. Allows a user of
-	configure to (de)activate memory validation and debugging
-	(TCL_MEM_DEBUG). No need to modify the makefile anymore.
-
-2002-08-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCkalloc.c:	CONSTified MemoryCmd and CheckmemCmd.
-
-	* README:		Bumped version number to 8.4b3 to distinguish
-	* generic/tcl.h:	HEAD from the 8.4b2 release.
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure.in:
-
-	* unix/configure:	autoconf
-	* win/configure:
-
-	* library/http/http.tcl:	Corrected installation directory of
-	* library/msgcat/msgcat.tcl:	the package tcltest 2.2. Added
-	* library/opt/optparse.tcl:	comments in other packages to remind
-	* library/tcltest/tcltest.tcl:	that installation directories need
-	* unix/Makefile.in:		updates to match increasing version
-	* win/Makefile.in:		numbers. [Bug 597450]
-	* win/makefile.bc:
-	* win/makefile.vc:
-
-2002-08-19  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/tclUnixTest.c (TestfilehandlerCmd): Changed readable/writable
-	to the more common readable|writable. Fixes [Bug 596034] reported by
-	Larry Virden <lvirden@users.sourceforge.net>.
-
-2002-08-16  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/fCmd.test: Added test to make sure that the cause of the
-	problem is detectable with an unpatched Tcl.
-	* doc/ObjectType.3: Added note on the root cause of this problem to
-	the documentation, since it is possible for user code to trigger this
-	sort of behaviour too.
-	* generic/tclIOUtil.c (SetFsPathFromAny): Objects should only have
-	their old representation deleted when we know that we are about to
-	install a new one. This stops a weird TclX bug under Linux with
-	certain kinds of memory debugging enabled which essentally came down
-	to a double-free of a string.
-
-2002-08-14  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclInt.h:
-	* generic/tclObj.c: (code cleanup) factored the parts in the macros
-	TclNewObj() / TclDecrRefCount() into a common part for all
-	memory allocators and two new macros TclAllocObjStorage() /
-	TclFreeObjStorage() that are specific to each allocator and fully
-	describe the differences. Removed allocator-specific code from
-	tclObj.c by using the macros.
-
-2002-08-12  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c: fixing UMR in delete traces, [Bug 589863].
-
-2002-08-08  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/man2help.tcl: Fixed $argv handling bug where if -bitmap wasn't
-	specified $argc was off by one.
-
-2002-08-08  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/uplevel.test: added 6.1 to test [uplevel] with shadowed
-	commands [Bug 524383]
-
-	* tests/subst.test: added 5.8-10 as further tests for [Bug 495207]
-
-2002-08-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/README: Noted removal of defs.tcl.
-
-2002-08-08  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/lsearch.n: corrected lsearch docs to use -inline in examples.
-
-	*** 8.4b2 TAGGED FOR RELEASE ***
-
-	* tests/fCmd.test:
-	* tests/unixFCmd.test: updated tests for new link copy behavior.
-	* generic/tclFCmd.c (CopyRenameOneFile): changed the behavior to
-	follow links to endpoints and copy that file/directory instead of just
-	copying the surface link. This means that trying to copy a link that
-	has no endpoint (danling link) is an error. [Patch 591647] (darley)
-	(CopyRenameOneFile): this is currently disabled by default until
-	further issues with such behavior (like relative links) can be
-	handled correctly.
-
-	* tests/README: slight wording improvements
-
-2002-08-07  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* docs/BoolObj.3: added description of valid string reps for a
-	boolean object. [Bug 584794]
-	* generic/tclObj.c: optimised Tcl_GetBooleanFromObj and
-	SetBooleanFromAny to avoid parsing the string rep when it can be
-	avoided. [Bugs 584650, 472576]
-
-2002-08-07  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompile.h:
-	* generic/tclObj.c: making tclCmdNameType static ([Bug 584567], Don
-	Porter).
-
-2002-08-07  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclObj.c (Tcl_NewObj): added conditional code for
-	USE_THREAD_ALLOC; objects allocated through Tcl_NewObj() were
-	otherwise being leaked. [Bug 587488] reported by Sven Sass.
-
-2002-08-06  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.decls:
-	* unix/tclUnixThrd.c: Added stubs and implementations for
-	non-threaded build for the tclUnixThrd.c procs TclpReaddir,
-	TclpLocaltime, TclpGmtime and TclpInetNtoa. Fixes link errors in
-	stubbed & threaded extensions that include tclUnixPort.h and use any
-	of the procs readdir, localtime, gmtime or inet_ntoa (e.g. TclX 8.4)
-	[Bug 589526]
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c: Regen.
-
-2002-08-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	The setup and cleanup scripts are now
-	* library/tcltest/pkgIndex.tcl:	skipped when a test is skipped, fixing
-	* tests/tcltest.test:		[Bug 589859]. Test for bug added, and
-	corrected tcltest package bumped to version 2.2.
-
-	* generic/tcl.decls:	Restored Tcl_Concat to return (char *). Like
-	* generic/tclDecls.h:	Tcl_Merge, it transfers ownership of a dynamic
-	* generic/tclUtil.c:	allocated string to the caller.
-
-2002-08-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/CmdCmplt.3:	Applied Patch 585105 to fully CONST-ify all
-	* doc/Concat.3:		remaining public interfaces of Tcl. Notably,
-	* doc/CrtCommand.3:	the parser no longer writes on the string it
-	* doc/CrtSlave.3:	is parsing, so it is no longer necessary for
-	* doc/CrtTrace.3:	Tcl_Eval() to be given a writable string. Also
-	* doc/Eval.3:		the refactoring of the Tcl_*Var* routines by
-	* doc/ExprLong.3:	by Miguel Sofer is included, so that the
-	* doc/LinkVar.3:	"part1" argument for them no longer needs to
-	* doc/ParseCmd.3:	be writable either.
-	* doc/SetVar.3:
-	* doc/TraceVar.3:
-	* doc/UpVar.3:		Compatibility support has been enhanced so
-	* generic/tcl.decls:	that a #define of USE_NON_CONST will remove
-	* generic/tcl.h:	all possible source incompatibilities with the
-	* generic/tclBasic.c:	8.3 version of the header file(s). The new
-	* generic/tclCmdMZ.c:	#define of USE_COMPAT_CONST now does what
-	* generic/tclCompCmds.c:USE_NON_CONST used to do -- disable only those
-	* generic/tclCompExpr.c:new CONST's that introduce irreconcilable
-	* generic/tclCompile.c:	incompatibilities.
-	* generic/tclCompile.h:
-	* generic/tclDecls.h:	Several bugs are also fixed by this patch.
-	* generic/tclEnv.c:	[Bugs 584051,580433] [Patches 585105,582429]
-	* generic/tclEvent.c:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclInterp.c:
-	* generic/tclLink.c:
-	* generic/tclObj.c:
-	* generic/tclParse.c:
-	* generic/tclParseExpr.c:
-	* generic/tclProc.c:
-	* generic/tclTest.c:
-	* generic/tclUtf.c:
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-	* mac/tclMacTest.c:
-	* tests/expr-old.test:
-	* tests/parseExpr.test:
-	* unix/tclUnixTest.c:
-	* unix/tclXtTest.c:
-	* win/tclWinTest.c:
-
-2002-08-01  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: bugfix (reading freed memory). Testsuite
-	passed on linux/i386, compile-13.1 hung on linux/alpha.
-
-2002-08-01  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: added a reference count for the complete
-	execution stack, instead of Tcl_Preserve/Tcl_Release.
-
-2002-08-01  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclCkalloc.c (TclFinalizeMemorySubsystem): Don't lock the
-	ckalloc mutex before invoking the Tcl_DumpActiveMemory function since
-	it also locks the same mutex. This code is only executed when "memory
-	onexit filename" has been executed and Tcl is compiled with
-	-DTCL_MEM_DEBUG.
-
-2002-08-01  Reinhard Max  <max@suse.de>
-
-	* win/tclWinPort.h: The windows headers don't provide socklen_t, so we
-	have to do it.
-
-2002-07-31  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclInt.h (USE_THREAD_ALLOC): for unshared objects,
-	TclDecrRefCount now frees the internal rep before the string rep -
-	just like the non-macro Tcl_DecrRefCount/TclFreeObj [Bug 524802]. For
-	the other allocators the fix was done on 2002-03-06.
-
-2002-07-31  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclInterp.c: signed/unsigned comparison warning fixed
-	(Vince Darley).
-
-2002-07-31  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tcl.m4 (SC_BUGGY_STRTOD): Enabled caching of test results.
-
-	* unix/tcl.m4 (SC_BUGGY_STRTOD): Solaris 2.8 still has a buggy
-	strtod() implementation; make sure we detect it.
-
-	* tests/expr.test (expr-22.*): Marked as non-portable because it seems
-	that these tests have an annoying tendency to fail in unexpected ways.
-	[Bugs 584825, 584950, 585986]
-
-2002-07-30  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* tests/io.test:
-	* generic/tclIO.c (WriteChars): Added flag to break out of loop if
-	nothing of the input is consumed at all, to prevent infinite looping
-	of called with a non-UTF-8 string. Fixes Bug 584603 (partially). Added
-	new test "io-60.1". Might need additional changes to Tcl_Main so that
-	unprintable results are printed as binary data.
-
-2002-07-29  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Use CC_SEARCH_FLAGS instead of LD_SEARCH_FLAGS
-	when linking with ${CC}.
-	* unix/configure: Regen.
-	* unix/configure.in: Don't subst CC_SEARCH_FLAGS or LD_SEARCH_FLAGS
-	since this is now done in tcl.m4.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Document and set CC_SEARCH_FLAGS
-	whenever LD_SEARCH_FLAGS is set. [Patch 588290]
-
-2002-07-29  Reinhard Max  <max@suse.de>
-
-	* unix/tcl.m4 (SC_SERIAL_PORT): Fixed detection for cases when
-                                        configure's stdin is not a tty.
-
-	* unix/tclUnixPort.h:
-	* generic/tclIOSock.c:          Changed size_t to socklen_t in
-                                        socket-related function calls.
-
-	* unix/configure.in:            Added test and fallback definition
-                                        for socklen_t.
-
-	* unix/configure:               generated.
-
-2002-07-29  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclObj.c: fixed a comment
-
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclInterp.c: added the new flag TCL_EVAL_INVOKE to the
-	interface of the Tcl_Eval* functions, removing the
-	TCL_EVAL_NO_TRACEBACK added yesterday: alias invocations not only
-	require no tracebacks, but also look up the command name in the global
-	scope - see new test interp-9.4
-	* tests/interp.test: added 9.3 to test for safety of aliases to hidden
-	commands, 9.4 to test for correct command lookup scope.
-
-2002-07-29  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/regc_locale.c (cclass): [[:xdigit:]] is only a defined
-	concept on western characters, so should not allow any unicode digit,
-	and hence number of ranges in [[:xdigit:]] is fixed.
-	* tests/reg.test: Added test to detect the bug.
-	* generic/regc_cvec.c (newcvec): Corrected initial size value in
-	character vector structure. [Bug 578363] Many thanks to
-	pvgoran@users.sf.net for tracking this down.
-
-2002-07-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tcl.h:
-	* generic/tclBasic.c: added the new flag TCL_EVAL_NO_TRACEBACK to the
-	interface of the Tcl_Eval* functions. Modified the error message for
-	too many nested evaluations.
-	* generic/tclInterp.h: changed the Alias struct to be of variable
-	length and store the prefix arguments directly (instead of a pointer
-	to a Tcl_Obj list). Made AliasObjCmd call Tcl_EvalObjv instead of
-	TclObjInvoke - thus making aliases trigger execution traces [Bug
-	582522].
-	* tests/interp.test:
-	* tests/stack.test: adapted to the new error message.
-	* tests/trace.test: added tests for aliases firing the exec traces.
-
-2002-07-27  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Revert fix for Tcl bug 529801 since it was
-	incorrect and broke the build on other systems. Fix [Bug 587299]. Add
-	MAJOR_VERSION, MINOR_VERSION, PATCH_LEVEL, SHLIB_LD_FLAGS,
-	SHLIB_LD_LIBS, CC_SEARCH_FLAGS, LD_SEARCH_FLAGS, and LIB_FILE
-	variables to support more generic library build/install rules.
-	* unix/configure: Regen.
-	* unix/configure.in: Move AC_PROG_RANLIB into tcl.m4. Move shared
-	build test and setting of MAKE_LIB and MAKE_STUB_LIB into tcl.m4. Move
-	subst of a number of variables into tcl.m4 where they are defined.
-	* unix/tcl.m4 (SC_ENABLE_SYMBOLS, SC_CONFIG_CFLAGS): Subst vars where
-	they are defined. Add MAKE_LIB, MAKE_STUB_LIB, INSTALL_LIB, and
-	INSTALL_STUB_LIB rules to deal with the ugly details of running ranlib
-	on static libs at build and install time. Replace TCL_SHLIB_LD_EXTRAS
-	with SHLIB_LD_FLAGS and use it when building a shared library.
-	* unix/tclConfig.sh.in: Add TCL_CC_SEARCH_FLAGS.
-
-2002-07-26  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: fixed Tcl_Obj leak in code corresponding to
-	the macro NEXT_INST_V(x, 0, 1) [Bug 587495].
-
-2002-07-26  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c (TclObjLookupVar): leak fix and improved comments.
-
-2002-07-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclVar.c (TclLookupVar): removed early returns that
-	prevented the parens from being restored. Also removed goto label as
-	it was not necessary.
-
-2002-07-24  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c:
-	* tests/expr-old.test: fix for erroneous error messages in [expr],
-	[Bug 587140] reported by Martin Lemburg.
-
-2002-07-25  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tclProc.c: fix for [Tk Bug 219218] "error handling with
-	bgerror in Tk"
-
-2002-07-24  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: restoring full TCL_COMPILE_DEBUG
-	functionality.
-
-2002-07-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/unixInit.test: relaxed unixInit-3.1 to accept iso8859-15 as a
-	valid C encoding. [Bug 575336]
-
-2002-07-24  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: restoring the tcl_traceCompile functionality
-	while I repair tcl_traceExec. The core now compiles and runs also
-	under TCL_COMPILE_DEBUG, but execution in the bytecode engine can
-	still not be traced.
-
-2002-07-24  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* unix/configure.in: corrected fix for [Bug 529801]: ranlib only
-	needed for static builds on Mac OS X.
-	* unix/configure: Regen.
-	* unix/tclLoadDyld.c: fixed small bugs introduced by Vince,
-	implemented library unloading correctly (needs OS X 10.2).
-
-2002-07-23  Joe English  <jenglish@users.sourceforge.net>
-
-	* doc/OpenFileChnl.3: (Updates from Larry Virden)
-	* doc/open.n:
-	* doc/tclsh.1: Fix section numbers in Unix man page references.
-	* doc/lset.n:  In EXAMPLES section, include command to set the initial
-	value used in subsequent examples.
-	* doc/http.n: Package version updated to 2.4.
-
-2002-07-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Enable 64 bit compilation when using
-	the native compiler on a 64 bit version of IRIX. [Bug 219220]
-
-2002-07-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Combine ranlib tests and avoid printing unless
-	ranlib is actually run.
-
-2002-07-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/tcl.m4 (SC_PATH_X): Set XINCLUDES to "" instead of "# no
-	special path needed" or "# no include files found" when x headers
-	cannot be located.
-
-2002-07-22  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: made tclNativeFilesystem static (since 07-19
-	changes removed its usage elsewhere), and added comments about its
-	usage.
-	* generic/tclLoad.c:
-	* generic/tcl.h:
-	* generic/tcl.decls:
-	* doc/FileSystem.3: converted last load-related ClientData parameter
-	to Tcl_LoadHandle opaque structure, removing a couple of casts in the
-	process.
-
-	* generic/tclInt.h: removed tclNativeFilesystem declaration since it
-	is now static again.
-
-2002-07-22  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/expr.test (expr-22.*): Added tests to help detect the
-	corrected handling.
-	* generic/tclExecute.c (IllegalExprOperandType): Improved error
-	message generated when attempting to manipulate Inf and NaN values.
-	* generic/tclParseExpr.c (GetLexeme): Allowed parser to recognise
-	'Inf' as a floating-point number. [Bug 218000]
-
-2002-07-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* tclIOUtil.c: Silence compiler warning. [Bug 584408].
-
-2002-07-19  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to GetFilesystemRecord
-	* win/tclWinFile.c:
-	* unix/tclUnixFile.c: fix to subtle problem with links shown up by
-	latest tclkit builds.
-
-2002-07-19  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure:
-	* unix/configure.in:
-	* win/configure:
-	* win/configure.in: Add AC_PREREQ(2.13) in an attempt to make it more
-	clear that the configure scripts must be generated with autoconf
-	version 2.13. [Bug 583573]
-
-2002-07-19  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* unix/Makefile.in: fix to build on MacOS X [Bug 529801], bug report
-	and fix from jcw.
-
-2002-07-19  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* win/tclWinSerial.c (no_timeout): Made this variable static.
-
-	* generic/tclExecute.c, generic/tclCompile.c, generic/tclBasic.c:
-	* generic/tclCompile.h (builtinFuncTable, instructionTable): Added
-	prefix to these symbols because they are visible outside the Tcl
-	library.
-
-	* generic/tclCompExpr.c (operatorTable):
-	* unix/tclUnixTime.c (tmKey):
-	* generic/tclIOUtil.c (theFilesystemEpoch, filesystemWantToModify,
-	filesystemIteratorsInProgress, filesystemOkToModify): Made these
-	variables static.
-
-	* unix/tclUnixFile.c:		Renamed nativeFilesystem to
-	* win/tclWinFile.c:		tclNativeFilesystem and declared
-	* generic/tclIOUtil.c:		it properly in tclInt.h
-	* generic/tclInt.h:
-
-	* generic/tclUtf.c (totalBytes): Made this array static and const.
-
-	* generic/tclParse.c (typeTable): Made this array static and const.
-	(Tcl_ParseBraces): Simplified error handling case so that scans are
-	only performed when needed, and flags are simpler too.
-
-	* license.terms: Added AS to list of copyright holders; it's only
-	fair for the current gatekeepers to be listed here!
-
-	* tests/cmdMZ.test: Renamed constraint for clarity. [Bug 583427]
-	Added tests for the [time] command, which was previously only
-	indirectly tested!
-
-2002-07-18  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclInt.h:
-	* generic/tcl.h:
-	* */*Load*.c: added comments on changes of 07/17 and replaced
-	clientData with Tcl_LoadHandle in all locations.
-
-	* generic/tclFCmd.c:
-	* tests/fileSystem.test: fixed a 'knownBug' with 'file attributes ""'
-	* tests/winFCmd.test:
-	* tests/winPipe.test:
-	* tests/fCmd.test:
-	* tessts/winFile.test: added 'pcOnly' constraint to some tests to make
-	for more useful 'tests skipped' log from running all tests on
-	non-Windows platforms.
-
-2002-07-17  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (CallCommandTraces): delete traces now receive
-	the FQ old name of the command. [Bug 582532] (Don Porter)
-
-2002-07-18  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/ioUtil.test: added constraints to 1.4,2.4 so they don't run
-	outside of tcltest. [Bugs 583276, 583277]
-
-2002-07-17  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c (DupParsedVarName): nasty bug fixed, reported by
-	Vince Darley.
-
-2002-07-17  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c (TclPtrIncrVar): missing CONST in declarations,
-	inconsistent with tclInt.h. Thanks to Vince Darley for reporting, boo
-	to gcc for not complaining.
-
-2002-07-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclInt.h:
-	* generic/tclIOUtil.c:
-	* generic/tclLoadNone.c:
-	* unix/tclLoadAout.c:
-	* unix/tclLoadDl.c:
-	* unix/tclLoadDld.c:
-	* unix/tclLoadDyld.c:
-	* unix/tclLoadNext.c:
-	* unix/tclLoadOSF.c:
-	* unix/tclLoadShl.c:
-	* mac/tclMacLoad.c:
-	* win/tclWinLoad.c: modified to move more functionality to the generic
-	code and avoid duplication. Partial replacement of internal uses of
-	clientData with opaque Tcl_LoadHandle. A little further work still
-	needed, but significant changes are done.
-
-2002-07-17  D. Richard Hipp    <drh@hwaci.com>
-
-	* library/msgcat/msgcat.tcl: fix a comment that was causing problems
-	for programs (ex: mktclapp) that embed the initialization scripts in
-	strings.
-
-2002-07-17  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclVar.c: removing the now redundant functions to access
-	indexed variables: Tcl(Get|Set|Incr)IndexedScalar() and
-	Tcl(Get|Set|Incr)ElementOfIndexedArray().
-
-2002-07-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Minor fixes to make this
-	file compile with SunPro CC...
-
-2002-07-17  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: modified to do variable lookup explicitly, and
-	then either inlining the variable access or else calling the new
-	TclPtr(Set|Get|Incr)Var functions in tclVar.c
-	* generic/tclInt.h: declare some functions previously local to
-	tclVar.c for usage by TEBC.
-	* generic/tclVar.c: removed local declarations; moved all special
-	accessor functions for indexed variables to the end of the file -
-	they are unused and ready for removal, but left there for the time
-	being as they are in the internal stubs table.
-
-	** WARNING FOR BYTECODE MAINTAINERS **
-	TCL_COMPILE_DEBUG is currently not functional; will be fixed ASAP.
-
-2002-07-16  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* win/Makefile.in: Add a more descriptive warning in the event `make
-	genstubs` needs to be rerun.
-
-2002-07-16  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Use dltest.marker file to keep track of when the
-	dltest package is up to date. This fixes [Bug 575768] since tcltest is
-	no longer linked every time.
-	* unix/dltest/Makefile.in: Create ../dltest.marker after a successful
-	`make all` run in dltest.
-
-2002-07-16  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/configure.in: Remove useless subst of TCL_BIN_DIR.
-
-2002-07-15  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c: inaccurate comment fixed
-
-2002-07-15  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_AddObjErrorInfo):
-	* generic/tclExecute.c (TclUpdateReturnInfo):
-	* generic/tclInt.h:
-	* generic/tclProc.c:
-	Added two Tcl_Obj to the ExecEnv structure to hold the fully qualified
-	names "::errorInfo" and "::errorCode" to cache the addresses of the
-	corresponding variables. The two most frequent setters of these
-	variables now profit from the new variable name caching.
-
-2002-07-15  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclVar.c: refactorisation to reuse already looked-up Var
-	pointers; definition of three new Tcl_Obj types to cache variable name
-	parsing and lookup for later reuse; modification of internal functions
-	to profit from the caching.
-
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclNamesp.c: adding CONST qualifiers to variable names
-	passed to Tcl_FindNamespaceVar and to variable resolvers; adding CONST
-	qualifier to the 'msg' argument to TclLookupVar. Needed to avoid code
-	duplication in the new tclVar.c code.
-
-	* tests/set-old.test:
-	* tests/var.test: slight modification of error messages due to the
-	modifications in the tclVar.c code.
-
-2002-07-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/unixInit.test:	Improved constraints to protect /tmp. [Bug
-	581403]
-
-2002-07-15  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/winFCmd.test: renamed 'win2000' and 'notWin2000' to more
-	appropriate constraint names.
-	* win/tclWinFile.c: updated comments to reflect 07-11 changes.
-	* win/tclWinFCmd.c: made ConvertFileNameFormat static again, since no
-	longer used in tclWinFile.c
-	* mac/tclMacFile.c: completed TclpObjLink implementation which was
-	previously lacking.
-	* generic/tclIOUtil.c: comment cleanup and code speedup.
-
-2002-07-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	Removed declarations that duplicated entries
-	in the (internal) stub table.
-
-	* library/tcltest/tcltest.tcl:  Corrected errors in handling of
-	configuration options -constraints and -limitconstraints.
-
-	* README:		Bumped HEAD to version 8.4b2 so we can
-	* generic/tcl.h:	distinguish it from the 8.4b1 release.
-	* tools/tcl.wse.in:
-	* unix/configure*:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure*:
-
-2002-07-11  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/file.n:
-	* win/tclWinFile.c: on Win 95/98/ME the long form of the path is used
-	as a normalized form. This is required because short forms are not a
-	robust representation. The file normalization function has been sped
-	up, but more performance gains might be possible, if speed is still an
-	issue on these platforms.
-
-2002-07-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl: Corrected reaction to existing but
-	false ::tcl_interactive.
-
-	* doc/Hash.3: Overlooked CONST documentation update.
-
-2002-07-11  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCkalloc.c: ckalloc() and friends take the block size as
-	an unsigned, so we should use %ud when reporting it in fprintf() and
-	panic().
-
-2002-07-11  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompile.c: now setting local vars undefined at compile
-	time, instead of waiting until the proc is initialized.
-	* generic/tclProc.c: use macro TclSetVarUndefined instead of directly
-	setting the flag.
-
-2002-07-11  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/cmdAH.test: [file attr -perm] is Unix-only, so add [catch]
-	when not inside a suitably-protected test.
-
-2002-07-10  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/unixFCmd.test, tests/fileName.test:
-	* tests/fCmd.test: Removed [exec] of Unix utilities that have
-	equivalents in standard Tcl. [Bug 579268] Also simplified some of
-	unixFCmd.test while I was at it.
-
-2002-07-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/tcltest.test:  Greatly reduced the number of [exec]s, using
-	slave interps instead.
-	* library/tcltest/tcltest.tcl:  Fixed bug uncovered in the conversion
-	where a message was written to stdout instead of [outputChannel].
-
-	* tests/basic.test:	Cleaned up, constrained, and reduced the
-	* tests/compile.test:	amount of [exec] usage in the test suite.
-	* tests/encoding.test:
-	* tests/env.test:
-	* tests/event.test:
-	* tests/exec.test:
-	* tests/io.test:
-	* tests/ioCmd.test:
-	* tests/regexp.test:
-	* tests/regexpComp.test:
-	* tests/socket.test:
-	* tests/tcltest.test:
-	* tests/unixInit.test:
-	* tests/winDde.test:
-	* tests/winPipe.test:
-
-2002-07-10  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/cmdAH.test: Removed [exec] of Unix utilities. [Bug 579211]
-
-	* tests/expr.test: Added tests to make sure that this works.
-	* generic/tclExecute.c (ExprCallMathFunc): Functions should also be
-	able to return wide-ints. [Bug 579284]
-
-2002-07-08  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* tests/socket.test: Fixed [Bug 578164]. The original reason for the
-	was a DNS outage while running the testsuite. Changed [info hostname]
-	to 127.0.0.1 to bypass DNS, knowing that we operate on the local host.
-
-2002-07-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:		Fixed incompatibility in [viewFile].
-	* library/tcltest/tcltest.tcl:	Corrected docs. Bumped to 2.2.1.
-	* library/tcltest/pkgIndex.tcl: [Bug 578163]
-
-2002-07-08  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/cmdAH.test:
-	* tests/fCmd.test:
-	* tests/fileName.test: tests which rely on 'file link' need a
-	constraint so they don't run on older Windows OS. [Bug 578158]
-	* generic/tclIOUtil.c:
-	* generic/tcl.h:
-	* generic/tclInt.h:
-	* generic/tclTest.c:
-	* mac/tclMacChan.c:
-	* unix/tclUnixChan.c:
-	* win/tclWinChan.c:
-	* doc/FileSystem.3: cleaned up internal handling of
-	Tcl_FSOpenFileChannel to remove duplicate code, and make writing
-	external vfs's clearer and easier. No functionality change. Also
-	clarify that objects with refCount zero should not be passed in to the
-	Tcl_FS API, and prevent segfaults from occuring on such user errors.
-	[Bug 578617]
-
-2002-07-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/pkgMkIndex.test:  Constrained tests of [load] package indexing
-	to those platforms where the testing shared libraries have been built.
-	[Bug 578166]
-
-2002-07-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes: added recent changes
-
-2002-07-05  Reinhard Max  <max@suse.de>
-
-	* generic/tclClock.c (FormatClock): Convert the format string to utf-8
-	before calling TclpStrftime, so that non-ASCII characters don't get
-	mangled when the result string is being converted back.
-	* tests/clock.test: Added a test for that.
-
-2002-07-05  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/Makefile.in (ro-test,ddd,GDB,DDD): Created new targets to
-	allow running the test suite with a read-only current directory,
-	running under ddd instead of gdb, and factored out some executable
-	names for broken sites (like mine) where gdb and ddd are installed
-	with non-standard names...
-
-	* tests/httpold.test: Altered test names to httpold-* to avoid clashes
-	with http.test, and stopped tests from failing when the current
-	directory is not writable...
-
-	* tests/event.test:		Stop these tests from failing when the
-	* tests/ioUtil.test:		current directory is not writable...
-	* tests/regexp.test:
-	* tests/regexpComp.test:
-	* tests/source.test:
-	* tests/unixFile.test:
-	* tests/unixNotfy.test:
-
-	* tests/unixFCmd.test:		Trying to make these test-files not
-	* tests/macFCmd.test:		bomb out with an error when the
-	* tests/http.test:		current directory is not writable...
-	* tests/fileName.test:
-	* tests/env.test:
-
-2002-07-05  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	*** 8.4b1 TAGGED FOR RELEASE ***
-
-2002-07-04  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/cmdMZ.test (cmdMZ-1.4):
-	* tests/cmdAH.test: More fixing of writable-current-dir assumption.
-	[Bug 575824]
-
-2002-07-04  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/basic.test: Same issue as below; fixed [Bug 575817]
-
-2002-07-04  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* tests/socket.test:
-	* tests/winPipe.test:
-	* tests/pid.test: Fixed [Bug 575848]. See below for a description the
-	general problem.
-
-	* All the bugs below are instances of the same problem: The testsuite
-	assumes [pwd] = [temporaryDirectory] and writable.
-
-	* tests/iogt.test: Fixed [Bug 575860].
-	* tests/io.test:   Fixed [Bug 575862].
-	* tests/exec.test:
-	* tests/ioCmd.test: Fixed [Bug 575836].
-
-2002-07-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/pkg1/direct1.tcl: removed
-	* tests/pkg1/pkgIndex.tcl: removed
-	* tests/pkgMkIndex.test:  Imported auxilliary files from tests/pkg1
-	into the test file pkgMkIndex.test itself. Formatting fixes.
-
-	* unix/Makefile.in: removed tests/pkg/* from `make dist`
-
-	* tests/pkg/circ1.tcl: removed
-	* tests/pkg/circ2.tcl: removed
-	* tests/pkg/circ3.tcl: removed
-	* tests/pkg/global.tcl: removed
-	* tests/pkg/import.tcl: removed
-	* tests/pkg/pkg1.tcl: removed
-	* tests/pkg/pkg2_a.tcl: removed
-	* tests/pkg/pkg2_b.tcl: removed
-	* tests/pkg/pkg3.tcl: removed
-	* tests/pkg/pkg4.tcl: removed
-	* tests/pkg/pkg5.tcl: removed
-	* tests/pkg/pkga.tcl: removed
-	* tests/pkg/samename.tcl: removed
-	* tests/pkg/simple.tcl: removed
-	* tests/pkg/spacename.tcl: removed
-	* tests/pkg/std.tcl: removed
-	* tests/pkgMkIndex.test: Fixed [Bug 575857] where this test file
-	expected to be able to write to [file join [testsDirectory] pkg]. Part
-	of the fix was to import several auxilliary files into the test file
-	itself.
-
-	* tests/main.test:	Cheap fix for [Bugs 575851, 575858]. Avoid
-	* tests/tcltest.test:	non-writable . by [cd [temporaryDirectory]].
-
-	* library/auto.tcl: Fix [tcl_findLibrary] to be sure it sets $varName
-	only if a successful library script is found. [Bug 577033]
-
-2002-07-03  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileCatchCmd): return
-	TCL_OUT_LINE_COMPILE instead of TCL_ERROR: let the failure happen at
-	runtime so that it can be caught [Bug 577015].
-
-2002-07-02  Joe English  <jenglish@users.sourceforge.net>
-
-	* doc/tcltest.n: Markup fixes, spellcheck.
-
-2002-07-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n: more refinements of the documentation.
-
-	* library/tcltest/tcltest.tcl: Added trace to be sure the stdio
-	constraint is updated whenever the [interpreter] changes.
-
-	* doc/tcltest.n:		Reverted [makeFile] and [viewFile] to
-	* library/tcltest/tcltest.tcl:	their former behavior, and documented
-	* tests/cmdAH.test:		it. Corrected misspelling of hook
-	* tests/event.test:		procedure. Restored tests.
-	* tests/http.test:
-	* tests/io.test:
-
-	* library/tcltest/tcltest.tcl: Simplified logic of [GetMatchingFiles]
-	and [GetMatchingDirectories], removing special case processing.
-
-	* doc/tcltest.n: More documentation updates. Reference sections are
-	complete. Only examples need adding.
-
-2002-07-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fCmd.test:
-	* generic/tclCmdAH.c: clearer error msgs for 'file link', as per the
-	man page.
-
-2002-07-01  Joe English  <jenglish@users.sourceforge.net>
-
-	* doc/Access.3:
-	* doc/AddErrInfo.3:
-	* doc/Alloc.3:
-	* doc/Backslash.3:
-	* doc/CrtChannel.3:
-	* doc/CrtSlave.3:
-	* doc/Encoding.3:
-	* doc/Eval.3:
-	* doc/FileSystem.3:
-	* doc/Notifier.3:
-	* doc/OpenFileChnl.3:
-	* doc/ParseCmd.3:
-	* doc/RegExp.3:
-	* doc/Tcl_Main.3:
-	* doc/Thread.3:
-	* doc/TraceCmd.3:
-	* doc/Utf.3:
-	* doc/WrongNumArgs.3:
-	* doc/binary.n:
-	* doc/clock.n:
-	* doc/expr.n:
-	* doc/fconfigure.n:
-	* doc/glob.n:
-	* doc/http.n:
-	* doc/interp.n:
-	* doc/lsearch.n:
-	* doc/lset.n:
-	* doc/msgcat.n:
-	* doc/packagens.n:
-	* doc/pkgMkIndex.n:
-	* doc/registry.n:
-	* doc/resource.n:
-	* doc/safe.n:
-	* doc/scan.n:
-	* doc/tclvars.n:  Spell-check, fixed typos (Updates from Larry Virden).
-
-2002-07-01  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Made Solaris use gcc for linking
-	when building with gcc to resolve problems with undefined symbols
-	being present when tcl library used with non-gcc linker at later
-	stage. Symbols were compiler-generated, so it is the compiler's
-	business to define them. [Bug 541181]
-
-2002-07-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n: more work in progress updating tcltest docs.
-
-	* library/tcltest/tcltest.tcl: Change [configure -match] to stop
-	treating an empty list as a list of the single pattern "*". Changed
-	the default value to [list *] so default operation remains the same.
-
-	* tests/pkg/samename.tcl: restored. needed by pkgMkIndex.test.
-
-	* library/tcltest/tcltest.tcl: restored writability testing of
-	-tmpdir, augmented by a special exception for the deafault value.
-
-2002-07-01  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/concat.n: Documented the *real* behaviour of [concat]!
-
-2002-06-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n: more work in progress updating tcltest docs.
-
-	* tests/README:		Updated the instructions on running and
-	* tests/cmdMZ.test:	adding to the test suite. Also updated
-	* tests/encoding.test:	several tests, mostly to correctly create
-	* tests/fCmd.test:	and destroy any temporary files in the
-	* tests/info.test:	[temporaryDirectory] of tcltest.
-	* tests/interp.test:
-
-	* library/tcltest/tcltest.tcl:	Stopped checking for writability of
-	-tmpdir value because no default directory can be guaranteed to be
-	writable.
-
-	* tests/autoMkindex.tcl: removed.
-	* tests/pkg/samename.tcl: removed.
-	* tests/pkg/magicchar.tcl: removed.
-	* tests/pkg/magicchar2.tcl: removed.
-	* tests/autoMkindex.test: Updated auto_mkIndex tests to use [makeFile]
-	and [removeFile] so tests are done in [temporaryDirecotry] where write
-	access is guaranteed.
-
-	* library/tcltest/tcltest.tcl:	Fixed [makeFile] and [viewFile] to
-	* tests/cmdAH.test:		accurately reflect a file's contents.
-	* tests/event.test:		Updated tests that depended on buggy
-	* tests/http.test:		behavior. Also added warning messages
-	* tests/io.test:		to "-debug 1" operations to debug test
-	* tests/iogt.test:		calls to (make|remove)(File|Directory)
-
-	* unix/mkLinks: `make mklinks` on 6-27 commits.
-
-2002-06-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompile.h: modified the macro TclEmitPush to not call its
-	first argument repeatedly or pass it to other macros, [Bug 575194]
-	reported by Peter Spjuth.
-
-2002-06-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* docs/tcltest.n:	Doc revisions in progress.
-	* library/tcltest/tcltest.tcl: Corrected -testdir default value. Was
-	not reliable, and disagreed with docs! Thanks to Hemang Lavana. [Bug
-	575150]
-
-2002-06-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tclUnixThrd.c:	Renamed the Tcl_Platform* #defines to TclOS*
-	* unix/tclUnixPipe.c:	because they are only used internally. Also
-	* unix/tclUnixFile.c:	stopped double-#def of TclOSlstat [Bug 566099,
-	* unix/tclUnixFCmd.c:	post-rename]
-	* unix/tclUnixChan.c:
-	* unix/tclUnixPort.h:
-
-	* doc/string.n: Improved documentation for [string last] along lines
-	described in [Bug 574799] so it indicates that the supplied index
-	marks the end of the search space.
-
-2002-06-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/dde.n:		Work in progress updating the documentation
-	* doc/http.n:		of the packages that come bundled with
-	* doc/msgcat.n:		the Tcl source distribution, notably tcltest.
-	* doc/registry.n:
-	* doc/tcltest.n:
-
-	* library/tcltest/tcltest.tcl:  Made sure that the TCLTEST_OPTIONS
-	environment variablle configures tcltest at package load time.
-
-2002-06-26  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fileSystem.test:
-	* generic/tclIOUtil.c: fix to handling of empty paths "" which are not
-	claimed by any filesystem [Bug 573758]. Ensure good error messages
-	are given in all cases.
-	* tests/cmdAH.test:
-	* unix/tclUnixFCmd.c: fix to bug reported as part of [Patch 566669].
-	Thanks to Taguchi, Takeshi for the report.
-
-2002-06-26  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixTime.c: Make [clock format] respect locale settings.
-	* tests/clock.test:   [Bug 565880]. ***POTENTIAL INCOMPATIBILITY***
-
-2002-06-26  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/CrtInterp.3:
-	* doc/StringObj.3: clarifications by Don Porter, [Bug 493995] and [Bug
-	500930].
-
-2002-06-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Corrected suppression of -verbose skip
-	* tests/tcltest.test:		and start by [test -output]. Also
-	corrected test suite errors exposed by corrected code. [Bug 564656]
-
-2002-06-25  Reinhard Max  <max@suse.de>
-
-	* unix/tcl.m4:       New macro SC_CONFIG_MANPAGES.
-	* unix/configure.in: Added support for symlinks and compression when
-	* unix/Makefile.in:  installing the manpages. [Patch 518052]
-	* unix/mkLinks.tcl:  Default is still hardlinks and no compression.
-
-	* unix/mkLinks:      generated
-	* unix/configure:
-
-	* unix/README:       Added documentation for the new features.
-
-	* unix/tcl.m4 (SC_PATH_TCLCONFIG): Replaced ${exec_prefix}/lib by
-	${libdir}.
-
-2002-06-25  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclUtil.c (TclGetIntForIndex): Fix of critical [Bug 533364]
-	generated when the index is bad and the result is a shared object. The
-	T_ASTO(T_GOR, ...) idiom likely exists elsewhere though. Also removed
-	some cruft that just complicated things to no advantage.
-	(SetEndOffsetFromAny): Same fix, though this wasn't on the path
-	excited by the bug.
-
-2002-06-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Implementation of TIP 101. Adds abd
-	* tests/parseOld.test:		exports a [configure] command from
-	* tests/tcltest.test:		tcltest.
-
-2002-06-22  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes: updated changes file for 8.4b1 release.
-
-	* library/tcltest/tcltest.tcl:	Corrections to tcltest and the Tcl
-	* tests/basic.test:		test suite so that a test with options
-	* tests/cmdInfo.test:		-constraints knownBug
-	* tests/compile.test:		-limitConstraints 1 only tests the
-	* tests/encoding.test:		knownBug tests. Mostly involves
-	* tests/env.test:		replacing direct access to the
-	* tests/event.test:		testConstraints array with calls to
-	* tests/exec.test:		the testConstraint command (which
-	* tests/execute.test:		requires tcltest version 2)
-	* tests/fCmd.test:
-	* tests/format.test:
-	* tests/http.test:
-	* tests/httpold.test:
-	* tests/ioUtil.test:
-	* tests/link.test:
-	* tests/load.test:
-	* tests/namespace.test:
-	* tests/pkgMkIndex.test:
-	* tests/reg.test:
-	* tests/result.test:
-	* tests/scan.test:
-	* tests/stack.test:
-
-2002-06-22  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tools/tcl.wse.in (Disk Label), unix/tcl.spec (version):
-	* win/README.binary, README, win/configure.in, unix/configure.in:
-	* generic/tcl.h (TCL_RELEASE_*, TCL_PATCH_LEVEL): Bump to beta1.
-
-2002-06-21  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:
-	* generic/tclParseExpr.c: LogSyntaxError() should reset the
-	interpreter result [Bug 550142 "Tcl_ExprObj -> abort"]
-
-2002-06-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Updated all package install directories
-	* win/Makefile.in:	to match current Major.minor versions
-	* win/makefile.bc:	of the packages. Added tcltest package
-	* win/makefile.vc:	to installation on Windows.
-
-	* library/init.tcl:  Corrected comments and namespace style issues.
-	Thanks to Bruce Stephens. [Bug 572025]
-
-2002-06-21  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/cmdAH.test:          Added TIP#99 implementation of 'file
-	* tests/fCmd.test:           link'. Supports creation of symbolic and
-	* tests/fileName.test:       hard links in the native filesystems and
-	* tests/fileSystem.test:     in vfs's, when the individual filesystem
-	* generic/tclTest.c:         supports the concept.
-	* generic/tclCmdAH.c:
-	* generic/tclIOUtil.c:
-	* generic/tcl.h:
-	* generic/tcl.decls:
-	* doc/FileSystem.3:
-	* doc/file.n:
-	* mac/tclMacFile.c:
-	* unix/tclUnixFile.c:
-	* win/tclWinFile.c: Also enhanced speed of 'file normalize' on
-	Windows.
-
-2002-06-20  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclEvalObjvInternal): fix for [Bug 571385] in
-	the implementation of TIP#62 (command tracing). Vince Darley, Hemang
-	Lavana & Don Porter: thanks.
-
-2002-06-20  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclCompEvalObj): clarified and simplified the
-	logic for compilation/recompilation.
-
-2002-06-19  Joe English  <jenglish@users.sourceforge.net>
-
-	* doc/file.n: Fixed indentation. No substantive changes.
-
-2002-06-19  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd): get the resultPtr again as
-	the Tcl_ObjSetVar2 may cause the result to change. [Patch 558324]
-	(watson)
-
-2002-06-19  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TEBC): removing unused "for(;;)" loop;
-	improved comments; re-indentation.
-
-2002-06-18  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TEBC):
-	- elimination of duplicated code in the non-immediate INST_INCR
-	  instructions.
-	- elimination of 103 (!) TclDecrRefCount macros. The different
-	  instructions now jump back to a common "DecrRefCount zone" at the
-	  top of the loop. The macro "ADJUST_PC" was replaced by two macros
-	  "NEXT_INST_F" and "NEXT_INST_V" that take three params
-	  (pcAdjustment, # of stack objects to discard, resultObjPtr handling
-	  flag). The only instructions that retain a TclDecrRefCount are
-	  INST_POP (for speed), the common code for the non-immediate
-	  INST_INCR, INST_FOREACH_STEP and the two INST_LSET.
-
-	The object size of tclExecute.o was reduced by approx 20% since the
-	start of the consolidation drive, while making room for some peep-hole
-	optimisation at runtime.
-
-2002-06-18  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TEBC, INST_DONE): small bug in the panic code
-	for tcl-stack corruption.
-
-2002-06-17  David Gravereaux <davygrvy@pobox.com>
-
-	Trims to support the removal of RESOURCE_INCLUDED from rc scripts from
-	[FRQ 565088].
-
-	* generic/tcl.h: moved the #ifndef RC_INVOKED start block up in the
-	file. rc scripts don't need to know thread mutexes.
-
-	* win/tcl.rc:
-	* win/tclsh.rc: removed the #define RESOURCE_INCLUDED to let the
-	built-in -DRC_INVOKED to the work.
-
-2002-06-17  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/CrtTrace.3:        Added TIP#62 implementation of command
-	* doc/trace.n:           execution tracing [FRQ 462580] (lavana).
-	* generic/tcl.h:         This includes enter/leave tracing as well
-	* generic/tclBasic.c:    as inter-procedure stepping.
-	* generic/tclCmdMZ.c:
-	* generic/tclCompile.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclVar.c:
-	* tests/trace.test:
-
-2002-06-17  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* win/tclWinPipe.c (BuildCommandLine): Fixed [Bug 554068] ([exec] on
-	windows did not treat { in filenames well.). Bug reported by Vince
-	Darley <vincentdarley@users.sourceforge.net>, patch provided by Vince
-	too.
-
-2002-06-17  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tcl.h: #ifdef logic for K&R C backwards compatibility
-	changed to assume modern C by default. See [FRQ 565088] for full
-	details.
-
-2002-06-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/msgcat.n: Corrected en_UK references to en_GB. UK is not a
-	country designation recognized in ISO 3166.
-
-	* library/msgcat/msgcat.tcl:  More Windows Registry locale codes from
-	Bruno Haible.
-
-	* doc/msgcat.n:
-	* library/msgcat/msgcat.tcl:
-	* library/msgcat/pkgIndex.tcl:
-	* tests/msgcat.test:  Revised locale initialization to interpret
-	environment variable locale values according to XPG4, and to recognize
-	the LC_ALL and LC_MESSAGES values over that of LANG. Also added many
-	Windows Registry locale values to those recognized by msgcat. Revised
-	tests and docs. Bumped to version 1.3. Thanks to Bruno Haible for the
-	report and assistance crafting the solution. [Bug 525522, 525525]
-
-2002-06-16  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompile.c (TclCompileTokens): a better algorithm for the
-	previous bug fix.
-
-2002-06-16  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompile.c (TclCompileTokens):
-	* tests/compile.test: [Bug 569438] in the processing of dollar
-	variables; report by Georgios Petasis.
-
-2002-06-16  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: bug in the consolidation of the INCR_..._STK
-	instructions; the bug could not be exercised as the (faulty)
-	instruction INST_INCR_ARRAY_STK was never compiled-in (related to [Bug
-	569438]).
-
-2002-06-14  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): runtime peep-hole
-	optimisation of variables (INST_STORE, INST_INCR) and commands
-	(INST_INVOKE); faster check for the existence of a catch.
-	(TclExecuteByteCode): runtime peep-hole optimisation of comparisons.
-	(TclExecuteByteCode): runtime peep-hole optimisation of INST_FOREACH -
-	relies on peculiarities of the code produced by the bytecode compiler.
-
-2002-06-14  David Gravereaux <davygrvy@pobox.com>
-
-	* win/rules.vc: The test for compiler optimizations was in error.
-	Thanks goes to Roy Terry <royterry@earthlink.net> for his assistance
-	with this.
-
-2002-06-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/trace.n, tests/trace.test:
-	* generic/tclCmdMZ.c (Tcl_TraceObjCmd,TclTraceCommandObjCmd)
-	(TclTraceVariableObjCmd): Changed references to "trace list" to
-	"trace info" as mandated by TIP#102.
-
-2002-06-13  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): consolidated code for the
-	conditional branch instructions.
-
-2002-06-13  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): fixed the previous patch;
-	wouldn't compile with TCL_COMPILE_DEBUG set.
-
-2002-06-13  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): consolidated the handling
-	of exception returns to INST_INVOKE and INST_EVAL, as well as most of
-	the code for INST_CONTINUE and INST_BREAK, in the new jump target
-	"processExceptionReturn".
-
-2002-06-13  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): consolidated variable
-	handling opcodes, replaced redundant code with some 'goto'. All
-	store/append/lappend opcodes on the same data type now share the main
-	code; same with incr opcodes.
-	* generic/tclVar.c: added the bit TCL_TRACE_READS to the possible
-	flags to Tcl_SetVar2Ex - it causes read traces to be fired prior to
-	setting the variable. This is used in the core for [lappend].
-
-	***NOTE*** the usage of TCL_TRACE_READS in Tcl_(Obj)?GetVar.* is not
-	documented; there, it causes the call to create the variable if it
-	does not exist. The new usage in Tcl_(Obj)?SetVar.* remains
-	undocumented too ...
-
-2002-06-13  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fCmd.test:
-	* tests/winFile.test:
-	* tests/fileSystem.test:
-	* generic/tclTest.c:
-	* generic/tclCmdAH.c:
-	* generic/tclIOUtil.c:
-	* doc/FileSystem.3:
-	* mac/tclMacFile.c:
-	* unix/tclUnixFile.c:
-	* win/tclWinFile.c: fixed up further so both compiles and actually
-	works with VC++ 5 or 6.
-	* win/tclWinInt.h:
-	* win/tclWin32Dll.c: cleaned up code and vfs tests and added tests for
-	the internal changes of 2002-06-12, to see whether WinTcl on NTFS can
-	coexist peacefully with links in the filesystem. Added new test
-	command 'testfilelink' to enable the newer code to be tested.
-	* tests/fCmd.test: (made certain tests of 'testfilelink' not run on
-	unix).
-
-2002-06-12  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tclBasic.c (Tcl_DeleteTrace): fixed [Bug 568123] (thanks to Hemang
-	Lavana)
-
-2002-06-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinFile.c: corrected the symbolic link handling code to allow
-	it to compile. Added real definition of REPARSE_DATA_BUFFER (found in
-	winnt.h). Most of the added definitions appear to have correct,
-	cross-Win-version equivalents in winnt.h and should be removed, but
-	just making things "work" for now.
-
-2002-06-12  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:
-	* generic/tcl.decls:
-	* generic/tclDecls.h: made code for Tcl_FSNewNativePath agree with man
-	pages.
-
-	* doc/FileSystem.3: clarified the circumstances under which certain
-	functions are called in the presence of symlinks.
-
-	* win/tclWinFile.c:
-	* win/tclWinPort.h:
-	* win/tclWinInt.h:
-	* win/tclWinFCmd.c:  Fix for Windows to allow 'file lstat', 'file
-	type', 'glob -type l', 'file copy', 'file delete', 'file normalize',
-	and all VFS code to work correctly in the presence of symlinks
-	(previously Tcl's behaviour was not very well defined). This also
-	fixes possible serious problems in all versions of WinTcl where 'file
-	delete' on a NTFS symlink could delete the original, not the symlink.
-	Note: symlinks cannot yet be created in pure Tcl.
-
-2002-06-11  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c:
-	* generic/tclCompCmds.c:
-	* generic/tclInt.h: reverted the new compilation functions; replaced
-	by a more general approach described below.
-
-	* generic/tclCompCmds.c:
-	* generic/tclCompile.c: made *all* compiled variable access attempts
-	create an indexed variable - even get or incr without previous set.
-	This allows indexed access to local variables that are created and set
-	at runtime, for example by [global], [upvar], [variable], [regexp],
-	[regsub].
-
-2002-06-11  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/global.n:
-	* doc/info.n:
-	* test/info.test:
-	* generic/tclCmdIL.c: fix for [Bug 567386], [info locals] was
-	reporting some linked variables.
-
-	* generic/tclBasic.c:
-	* generic/tclCompCmds.c:
-	* generic/tclInt.h: added compile functions for [global], [variable]
-	and [upvar]. They just declare the new local variables, the commands
-	themselves are not compiled-in. This gives a notably faster read
-	access to these linked variables.
-
-2002-06-11  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: optimised algorithm for exception range
-	lookup; part of [Patch 453709].
-
-2002-06-10  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* unix/tclUnixFCmd.c: fixed [Bug 566669]
-	* generic/tclIOUtil.c: improved and sped up handling of native paths
-	(duplication and conversion to normalized paths), particularly on
-	Windows.
-	* modified part of above commit, due to problems on Linux. Will
-	re-examine bug report and evaluate more closely.
-
-2002-06-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/tcltest.test:  More corrections to test suite so that tests of
-	failing [test]s don't show up themselves as failing tests.
-
-2002-06-07  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclExecute.c: Tidied up headers in relation to float.h to
-	cut the cruft and ensure DBL_MAX is defined since doubles seem to be
-	the same size everywhere; if the assumption isn't true, the variant
-	platforms had better have run configure...
-
-	* unix/tclUnixPort.h (EOVERFLOW): Added code to define it if it
-	wasn't previously defined. Also some other general tidying and adding
-	of comments. [Bugs 563122, 564595]
-	* compat/tclErrno.h: Added definition for EOVERFLOW copied from
-	Solaris headers; I've been unable to find any uses of EFTYPE, which
-	was the error code previously occupying the slot, in Tcl, or any
-	definition of it in the Solaris headers.
-
-2002-06-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/dltest/Makefile.in: Remove hard coded CFLAGS=-g and add
-	CFLAGS_DEBUG, CFLAGS_OPTIMIZE, and CFLAGS_DEFAULT varaibles. [Bug
-	565488]
-
-2002-06-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/tcltest.test:  Corrections to test suite so that tests of
-	failing [test]s don't show up themselves as failing tests.
-
-	* tests/io.test: Fixed up namespace variable resolution issues
-	revealed by running test suite with "-singleproc 1".
-
-	* doc/tcltest.n:
-	* library/tcltest/tcltest.tcl:
-	* tests/tcltest.test: Several updates to tcltest.
-	  1) changed to lazy initialization of test constraints
-	  2) deprecated [initConstraintsHook]
-	  3) repaired badly broken [limitConstraints].
-	  4) deprecated [threadReap] and [mainThread]
-	[Patch 512214, Bug 558742, Bug 461000, Bug 534903]
-
-2002-06-06  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixThrd.c (TclpReaddir, TclpLocaltime, TclpGmtime): added
-	mutex wrapped calls to readdir, localtime & gmtime in case their
-	thread-safe *_r counterparts are not available.
-	* unix/tcl.m4: added configure check for readdir_r
-	* unix/tcl.m4 (Darwin): set TCL_DEFAULT_ENCODING to utf-8 on MacOSX
-	(where Posix file apis expect utf-8, not iso8859-1).
-	* unix/configure: regen
-	* unix/Makefile.in: set DYLD_LIBRARY_PATH in parallel to
-	LD_LIBRARY_PATH for MacOSX dynamic linker.
-	* generic/tclEnv.c (TclSetEnv): fix env var setting on MacOSX (adapted
-	from [Patch 524352] by jkbonfield).
-
-2002-06-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/Tcl_Main.3: Documented $tcl_rcFileName and added more
-	clarifications about the intended use of Tcl_Main(). [Bug 505651]
-
-2002-06-05  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclFileName.c (TclGlob): mac specific fix to recent changes
-	in 'glob -tails' handling.
-	* mac/tclMacPort.h:
-	* mac/tclMacChan.c: fixed TIP#91 bustage.
-	* mac/tclMacResource.c (Tcl_MacConvertTextResource): added utf
-	conversion of text resource contents.
-	* tests/macFCmd.test (macFCmd-1.2): allow CWIE creator.
-
-2002-06-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:
-	* tests/init.test:
-	* tests/tcltest.test:	Added more TIP 85 tests from Arjen Markus.
-	Converted tcltest.test to use a private namespace. Fixed bugs in
-	[tcltest::Eval] revealed by calling [tcltest::test] from a non-global
-	namespace, and namespace errors in init.test.
-
-2002-06-04  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/README: Update msys+mingw URL.
-
-2002-06-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:
-	* library/tcltest/tcltest.tcl:
-	* library/tcltest/pkgIndex.tcl:
-	* tests/tcltest.test:  Implementation of TIP 85. Allows tcltest users
-	to add new legal values of the -match option to [test], associating
-	each with a Tcl command that does the matching of expected results
-	with actual results of tests. Thanks to Arjen Markus. => tcltest 2.1
-	[Patch 521362]
-
-2002-06-03  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/namespace.n: added description of [namepace forget] behaviour
-	for unqualified patterns. [Bug 559268]
-
-2002-06-03  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: reverting an accidental modification in the
-	last commit.
-
-2002-06-03  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/Tcl.n: clarify the empty variable name issue ([Bug 549285]
-	reported by Tom Krehbiel, patch by Don Porter).
-
-2002-05-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/package.tcl:  Fixed leak of slave interp in [pkg_mkIndex].
-	Thanks to Helmut for report. [Bug 550534]
-
-	* tests/io.test:
-	* tests/main.test:  Use the "stdio" constraint to control whether an
-	[open "|[interpreter]"] is attempted.
-
-	* generic/tclExecute.c (TclMathInProgress,TclExecuteByteCode
-	(ExprCallMathFunc):
-	* generic/tclInt.h (TclMathInProgress):
-	* unix/Makefile.in (tclMtherr.*):
-	* unix/configure.in (NEED_MATHERR):
-	* unix/tclAppInit.c (matherr):
-	* unix/tclMtherr.c (removed file):
-	* win/tclWinMtherr.c (_matherr): Removed internal routine
-	TclMathInProgress and Unix implementation of matherr(). These are now
-	obsolete, dealing with very old versions of the C math library.
-	Windows version is retained in case Borland compilers require it, but
-	it is inactive. Thanks to Joe English. [Bug 474335, Patch 555635]
-
-	* unix/configure: regen
-
-2002-05-30  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclCompile.h: removed exprIsJustVarRef and
-	exprIsComparison from the ExprInfo and CompileEnv structs. These
-	were set, but not used since dec 1999 [Bug 562383].
-
-2002-05-30  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c (TclGlob): fix to longstanding 'knownBug' in
-	fileName tests 15.2-15.4, and fix to a new Tcl 8.4 bug in certain uses
-	of 'glob -tails'.
-	* tests/fileName.test: removed 'knownBug' flag from some tests, added
-	some new tests for above bugs.
-
-2002-05-29  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure: regen'ed
-	* unix/configure.in: replaced bigendian check with autoconf standard
-	AC_C_BIG_ENDIAN, which defined WORDS_BIGENDIAN on bigendian systems.
-	* generic/tclUtf.c (Tcl_UniCharNcmp):
-	* generic/tclInt.h (TclUniCharNcmp): use WORDS_BIGENDIAN instead of
-	TCL_OPTIMIZE_UNICODE_COMPARE to enable memcmp alternative.
-
-	* generic/tclExecute.c (TclExecuteByteCode INST_STR_CMP):
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): changed the case for choosing
-	the Tcl_UniCharNcmp compare to when both objs are of StringType, as
-	benchmarks show that is the optimal check (both bigendian and
-	littleendian systems).
-
-2002-05-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclMain.c: Removed "dummy" reference to Tcl_LinkVar. It is
-	no longer needed since Tcl_Main() now actually calls Tcl_LinkVar().
-	Thanks to Joe English for pointing that out.
-
-2002-05-29  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode):
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Use the macro version.
-	* generic/tclInt.h (TclUniCharNcmp): Optimised still further with a
-	macro for use in sensitive places like tclExecute.c
-
-	* generic/tclUtf.c (Tcl_UniCharNcmp): Use new flag to figure out when
-	we can use an optimal comparison scheme, and default to the old scheme
-	in other cases which is at least safe.
-	* unix/configure.in (TCL_OPTIMIZE_UNICODE_COMPARE): New optional flag
-	that indicates when we can use memcmp() to compare Unicode strings
-	(i.e. when the high-byte of a Tcl_UniChar precedes the low-byte.)
-
-2002-05-29  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclUtf.c: added TclpUtfNcmp2 private command that
-	mirrors Tcl_UtfNcmp, but takes n in bytes, not utf-8 chars. This
-	provides a faster alternative for comparing utf strings	internally.
-	(Tcl_UniCharNcmp, Tcl_UniCharNcasecmp): removed the explicit end of
-	string check as it wasn't correct for the function (by doc and logic).
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): reworked the string equal
-	comparison code to use TclpUtfNcmp2 as well as short-circuit for
-	equal objects or unequal length strings in the equal case.
-	Removed the use of goto and streamlined the other parts.
-
-	* generic/tclExecute.c (TclExecuteByteCode): added check for object
-	equality in the comparison instructions. Added short-circuit for !=
-	length strings in INST_EQ, INST_NEQ and INST_STR_CMP. Reworked
-	INST_STR_CMP to use TclpUtfNcmp2 where appropriate, and only use
-	Tcl_UniCharNcmp when at least one of the objects is a Unicode obj with
-	no utf bytes.
-
-	* generic/tclCompCmds.c (TclCompileStringCmd): removed error creation
-	in code that no longer throws an error.
-
-	* tests/string.test:
-	* tests/stringComp.test: added more string comparison checks.
-
-	* tests/clock.test: better qualified 9.1 constraint check for %s.
-
-2002-05-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclThreadAlloc.c (TclpRealloc, TclpFree): protect
-	against the case when NULL is based.
-
-	* tests/clock.test: added clock-9.1
-	* compat/strftime.c:
-	* generic/tclClock.c:
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* unix/tclUnixTime.c: fix for Windows msvcrt mem leak caused by using
-	an env(TZ) setting trick for in clock format -gmt 1. This also makes
-	%s seem to work correctly with -gmt 1 as well as making it a lot
-	faster by avoid the env(TZ) hack. TclpStrftime now takes useGMT as an
-	arg. [Bug 559376]
-
-2002-05-28  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fixes to Tcl_FSLoadFile when called on a file
-	inside a vfs. This should avoid leaving temporary files sitting
-	around on exit. [Bug 545579]
-
-2002-05-27  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* win/tclWinError.c: Added comment on conversion of
-	ERROR_NEGATIVE_SEEK because that is a mapping that really belongs,
-	and not a catch-all case.
-	* win/tclWinPort.h (EOVERFLOW): Should be either EFBIG or EINVAL
-	* generic/tclPosixStr.c (Tcl_ErrnoId, Tcl_ErrnoMsg): EOVERFLOW can
-	potentially be a synonym for EINVAL.
-
-2002-05-24  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	=== Changes due to TIP#91 ===
-
-	* win/tclWinPort.h: Added declaration of EOVERFLOW.
-	* doc/CrtChannel.3: Added documentation of wideSeekProc.
-	* generic/tclIOGT.c (TransformSeekProc, TransformWideSeekProc):
-	Adapted to use the new channel mechanism.
-	* unix/tclUnixChan.c (FileSeekProc, FileWideSeekProc): Renamed
-	FileSeekProc to FileWideSeekProc and created new FileSeekProc which
-	has the old-style interface and which errors out with EOVERFLOW when
-	the returned file position can't fit into the return type (int for
-	historical reasons).
-	* win/tclWinChan.c (FileSeekProc, FileWideSeekProc): Renamed
-	FileSeekProc to FileWideSeekProc and created new FileSeekProc which
-	has the old-style interface and which errors out with EOVERFLOW when
-	the returned file position can't fit into the return type (int for
-	historical reasons).
-	* mac/tclMacChan.c (FileSeek): Reverted to old interface; Macs lack
-	large-file support because I can't see how to add it.
-	* generic/tclIO.c (Tcl_Seek, Tcl_Tell): Given these functions
-	knowledge of the new arrangement of channel types.
-	(Tcl_ChannelVersion): Added recognition of new version code.
-	(HaveVersion): New function to do version checking.
-	(Tcl_ChannelBlockModeProc, Tcl_ChannelFlushProc)
-	(Tcl_ChannelHandlerProc): Made these functions use HaveVersion for
-	ease of future maintainability.
-	(Tcl_ChannelBlockModeProc): Obvious lookup function.
-	* generic/tcl.h (Tcl_ChannelType): New wideSeekProc field, and
-	seekProc type restored to old interpretation.
-	(TCL_CHANNEL_VERSION_3): New channel version.
-
-2002-05-24  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* tests/winPipe.test: Applied patch for [Bug 549617]. Patch and bug
-	report by Kevin Kenny <kennykb@users.sourceforge.net>.
-
-	* win/tclWinSock.c (TcpWatchProc): Fixed [Bug 557878]. We are not
-	allowed to mess with the watch mask if the socket is a server socket.
-	I believe that the original reporter is George Peter Staplin.
-
-2002-05-21  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/configure.in: Invoke SC_ENABLE_SHARED before calling
-	SC_CONFIG_CFLAGS so that the SHARED_BUILD variable can be checked
-	inside SC_CONFIG_CFLAGS.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Pass -non_shared instead of -shared
-	to ld when configured with --disable-shared under OSF. [Bug 540390]
-
-2002-05-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.h: added prototype for TclpFilesystemPathType().
-	* mac/tclMacChan.c: use MSL provided creator type if available instead
-	of the default 'MPW '.
-
-2002-05-16  Joe English  <jenglish@users.sf.net>
-
-	* doc/CrtObjCmd.3: Added Tcl_GetCommandFromObj, Tcl_GetCommandFullName
-	[Bugs 547987, 414921]
-
-2002-05-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tclUnixChan.c (TtyOutputProc): #if/#endif-ed this function out
-	to stop compiler warnings. Also much general tidying of comments in
-	this file and removal of whitespace from blank lines.
-
-2002-05-13  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* unix/tclUnixChan.c (SETBREAK): Solaris thinks ioctl() takes a signed
-	second argument, and Linux thinks ioctl() takes an unsigned second
-	argument. So need a longer definition of this macro to get neither to
-	spew warnings...
-
-2002-05-13  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclEvent.c:
-	* generic/tclIOUtil.c:
-	* generic/tclInt.h: clean up all memory allocated by the filesystem,
-	via introduction of 'TclFinalizeFilesystem'.
-	Move TclFinalizeLoad into TclFinalizeFilesystem so we can be sure it
-	is called at just the right time.
-	Fix bad comment also. [Bug 555078 and 'fs' part of 543549]
-	* win/tclWinChan.c: fix comment referring to wrong function.
-
-2002-05-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/load.test:
-	* tests/safe.test:
-	* tests/tcltest.test: Corrected some list-quoting issues and other
-	matters that cause tests to fail when the patch includes special
-	characters. Report from Vince Darley. [Bug 554068]
-
-2002-05-08    David Gravereaux <davygrvy@pobox.com>
-
-	* doc/file.n:
-	* tools/man2tcl.c:
-	* tools/man2help2.tcl:  Thanks to Peter Spjuth
-	<peter.spjuth@space.se>, again. My prior fix for single-quote macro
-	mis-understanding was wrong. Reverted to reimpliment the 'macro2' proc
-	which handles single-quote macros and restored file.n text arrangement
-	to avoid single-quotes on the first line. Sorry for all the confusion.
-
-2002-05-08  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/man2tcl.c:
-	* tools/man2help2.tcl: Proper source of macro error misunderstanding
-	single-quote as the leading macro command found and repaired.
-
-	* doc/file.n: Reverted to prior state before I messed with it.
-
-2002-05-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl: Corrected [uplevel] quoting when
-	[source]-ing test script in subdirectories.
-	* tests/fileName.test:
-	* tests/load.test:
-	* tests/main.test:
-	* tests/tcltest.test:
-	* tests/unixInit.test: Fixes to test suite when there's a space in the
-	working path. Thanks to Kevin Kenny.
-
-2002-05-07  David Gravereaux <davygrvy@pobox.com>
-
-	-- Changes from Peter Spjuth <peter.spjuth@space.se>
-	* tools/man2tcl.c: Increased line buffer size and a bail-out if that
-	should ever be over-run.
-	* tools/man2help.tcl: Include Courier New font in rtf header.
-	* tools/man2help2.tcl: Improved handling of CS/CE fields. Use Courier
-	New for code samples and indent better.
-
-	* doc/file.n:
-	* doc/TraceCmd.3:  winhelp conversion tools where understanding
-	a ' as the first character on a line to be an unknown macro.
-	Not knowing how to repair tools/man2tcl.c, I decided to rearrange
-	the text in the docs instead.
-
-2002-05-07  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c: fix to similar segfault when using 'glob
-	-types nonsense -dir dirname -join * *'. [Bug 553320]
-
-	* doc/FileSystem.3: further documentation on vfs.
-	* tests/cmdAH.test:
-	* tests/fileSystem.test:
-	* tests/pkgMkindex.test: Fix to testsuite bugs when running out of
-	directory whose name contains '{' or '['.
-
-2002-05-07  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/basic.test: Fix for [Bug 549607]
-	* tests/encoding.test: Fix for [Bug 549610]
-	These are testsuite bugs that caused failures when the filename
-	contained spaces. Report & fix by Kevin Kenny.
-
-2002-05-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c: fix to freeing a bad object (i.e. segfault)
-	when using 'glob -types nonsense -dir dirname'.
-	* generic/tclWinFile.c: fix to [Bug 551306], also wrapped some long
-	lines.
-	* tests/fileName.test: added several tests for the above bugs.
-	* doc/FileSystem.3: clarified documentation on refCount requirements
-	of the object returned by the path type function.
-	* generic/tclIOUtil.c:
-	* win/tclWinFile.c:
-	* unix/tclUnixFile.c:
-	* mac/tclMacFile.c: moved TclpFilesystemPathType to the platform-
-	specific directories, so we can add missing platform-specific
-	implementations. On Windows, 'file system' now returns useful results
-	like "native NTFS", "native FAT" for that system. Unix and MacOS still
-	only return "native".
-	* doc/file.n: clarified documentation.
-	* tests/winFile.test: test for 'file system' returning correct values.
-	* tests/fileSystem.test: test for 'file system' returning correct
-	values. Clean up after failed previous test run.
-
-2002-04-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:
-	* unix/tcl.m4: change HP-11 SHLIB_LD_LIBS from "" to ${LIBS} so that
-	the .sl knows its dependent libs.
-
-2002-04-26  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/obj.test (obj-11.[56]): Test conversion to boolean more
-	thoroughly.
-	* generic/tclObj.c (SetBooleanFromAny): Was not calling an integer
-	parsing function on native 64-bit platforms! [Bug 548686]
-
-2002-04-24  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclInt.h: corrected TclRememberJoinableThread decl to use
-	VOID instead of void.
-	* generic/tclThreadJoin.c: noted that this code isn't needed on Unix.
-
-2002-04-23  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/exec.n:
-	* doc/tclvars.n: doc updates [Patch 509426] (gravereaux)
-
-2002-04-24  Daniel Steffen  <das@users.sourceforge.net>
-
-	* mac/tclMacResource.r: added check of TCLTK_NO_LIBRARY_TEXT_RESOURCES
-	#define to allow disabling the inclusion of the tcl library code in
-	the resource fork of Tcl executables and shared libraries.
-
-2002-04-23  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/TraceCmd.3: New file that documents Tcl_CommandTraceInfo,
-	Tcl_TraceCommand and Tcl_UntraceCommand [Bug 414927]
-
-2002-04-22  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclAlloc.c:
-	* generic/tclInt.h:
-	* generic/tclThreadAlloc.c (new):
-	* unix/Makefile.in:
-	* unix/tclUnixThrd.c:
-	* win/Makefile.in:
-	* win/tclWinInt.h:
-	* win/tclWinThrd.c: added new threaded allocator contributed by AOL
-	that significantly reduces lock contention when multiple threads are
-	in use. Only Windows and Unix implementations are ready, and the
-	Windows one may need work. It is only used by default on Unix for now,
-	and requires that USE_THREAD_ALLOC be defined (--enable-threads on
-	Unix will define this).
-
-	* generic/tclIOUtil.c (Tcl_FSRegister, Tcl_FSUnregister): corrected
-	calling of Tcl_ConditionWait to ensure that there would be a condition
-	to wait upon.
-
-	* generic/tclCmdAH.c (Tcl_FileObjCmd): added cast in FILE_SIZE.
-
-	* win/tclWinFCmd.c (DoDeleteFile): check return of setattr API calls
-	in file deletion for correct Win32 API handling.
-
-	* win/Makefile.in: correct dependencies for shell, gdb, runtest
-	targets.
-
-	* doc/clock.n:
-	* compat/strftime.c (_fmt): change strftime to correctly handle
-	localized %c, %x and %X on Windows. Added some notes about how the
-	other values could be further localized.
-
-2002-04-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclMain.c (Tcl_Main):  Free the memory allocated for the
-	startup script path. [Bug 543549]
-
-	* library/msgcat/msgcat.tcl:  [mcmax] wasn't using the caller's
-	namespace when determining the max translated length. Also made
-	revisions for better use of namespace variables and more efficient
-	[uplevel]s.
-
-	* doc/msgcat.n:
-	* library/msgcat/msgcat.tcl:
-	* library/msgcat/pkgIndex.tcl:  Added [mcload] to the export list of
-	msgcat; bumped to 1.2.3. [Bug 544727]
-
-2002-04-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.decls:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c:
-	* mac/tclMacFCmd.c:
-	* mac/tclMacFile.c:
-	* mac/tclMacUtil.c: Modified TclpObjNormalizePath to be alias file
-	aware, and replaced various calls to FSpLocationFrom*Path by calls to
-	new alias file aware versions FSpLLocationFrom*Path. The alias file
-	aware routines don't resolve the last component of a path if it is an
-	alias. This allows [file copy/delete] etc. to act correctly on alias
-	files. (c.f. discussion in [Bug 511666])
-
-2002-04-19  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/lindex.test (lindex-3.7):
-	* generic/tclUtil.c (TclGetIntForIndex): Stopped indexes from hitting
-	wide ints. [Bug 526717]
-
-2002-04-18  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclNamesp.c:
-	* tests/info.test: [Bug 545325] info level didn't report namespace
-	eval, bug report by Richard Suchenwirth.
-
-2002-04-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/subst.n:  Clarified documentation on handling unusual return
-	codes during substitution, and on variable substitutions implied by
-	command substitution, and vice versa. [Bug 536838]
-
-2002-04-18  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdIL.c (InfoBodyCmd):
-	* tests/info.test (info-2.6): Proc bodies without string reps would
-	report as empty. [Bug 545644]
-
-	* generic/tclCmdMZ.c (Tcl_SubstObj): More clarification for comment on
-	behaviour when substitutions are not well-formed, prompted by [Bug
-	536831]; alas, removing the ill-defined behaviour is a lot of work.
-
-2002-04-18  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c:
-	* tests/expr-old.test: fix for [Bug 542588] (Phil Ehrens), where "too
-	large integers" were reported as "floating-point value" in [expr]
-	error messages.
-
-2002-04-17  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclEncoding.c (EscapeFromUtfProc):
-	* generic/tclIO.c (WriteChars, Tcl_Close): corrected the handling of
-	outputting end escapes for escape-based encodings.
-	[Bug 526524] (yamamoto)
-
-2002-04-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:  Removed [saveState] and [restoreState] from tcltest
-	2 documentation, effectively deprecating them. [Bug 495660]
-	* library/tcltest/tcltest.tcl: Made separate export for commands kept
-	only for tcltest 1 compatibility.
-
-	* tests/iogt.test: Revised to run tests in a namespace, rather than
-	use the useless and buggy [saveState] and [restoreState] commands of
-	tcltest. Updated to use tcltest 2 as well. [Patch 544911]
-
-2002-04-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/io.test: Revised to run tests in a namespace, rather than use
-	the useless and buggy [saveState] and [restoreState] commands of
-	tcltest. Updated to use tcltest 2 as well. [Patch 544546]
-
-2002-04-15  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclProc.c:
-	* tests/proc-old.test: Improved stack trace for TCL_BREAK and
-	TCL_CONTINUE returns from procs. Patch by Don Porter [Bug 536955].
-
-	* generic/tclExecute.c:
-	* tests/compile.test: made bytecodes check for a catch before
-	returning; the compiled [return] is otherwise non-catchable. [Bug
-	542142] reported by Andreas Kupries.
-
-2002-04-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/socket.test:  Increased timeout values so that tests have
-	time to successfully complete even on slow/busy machines. [Bug 523470]
-
-	* doc/tcltest.n:
-	* library/tcltest/tcltest.tcl:
-	* tests/tcltest.test:  Revised [tcltest::test] to return errors when
-	called with invalid syntax and to accept exactly two arguments as
-	documented. Improved error messages. [Bug 497446, Patch 513983]
-	***POTENTIAL INCOMPATIBILITY***: Incompatible with previous tcltest
-	2.* releases, found only in alpha releases of Tcl 8.4.
-
-2002-04-11  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclNotify.c (TclFinalizeNotifier): remove remaining
-	unserviced events on finalization.
-
-	* win/tcl.m4: Enabled COFF as well as CV style debug info with
-	--enable-symbols to allow Dr. Watson users to see function info. More
-	info on debugging levels can be obtained at:
-	http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp
-
-	* tests/ioCmd.test: fixed iocmd-8.15 to have mac and unixPc variants.
-
-	* generic/tclParse.c (Tcl_ParseVar): conditionally incr obj refcount
-	to prevent possible mem leak.
-
-2002-04-08  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tcl.h: no <sys/types.h> on mac.
-	* mac/tclMacFile.c: minor fixes to Vince's changes from 03-24.
-	* mac/tclMacOSA.c:
-	* mac/tclMacResource.c: added missing Tcl_UtfToExternalDString
-	conversions of resource file names.
-	* mac/tclMacSock.c (TcpGetOptionProc): fixed bug introduced by Andreas
-	on 02-25; changed strcmp's to strncmp's so that option comparison
-	behaves like on other platforms.
-	* mac/tcltkMacBuildSupport.sea.hqx (CW Pro6 changes): added support to
-	allow Tk to hookup C library stderr/stdout to TkConsole.
-	* tests/basic.test:
-	* tests/cmdAH.test:
-	* tests/encoding.test:
-	* tests/fileSystem.test:
-	* tests/ioCmd.test: fixed tests failing on mac: check for existence of
-	[exec], changed some result strings.
-
-2002-04-06  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixFCmd.c (Realpath): added a little extra code to
-	initialize a realpath arg when compiling in PURIFY mode in order to
-	prevent spurious purify warnings. We should really create our own
-	realpath implementation, but this will at least quiet purify for now.
-
-2002-04-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (Tcl_SubstObj):
-	* tests/subst.test:  Corrected [subst] so that return codes TCL_BREAK
-	and TCL_CONTINUE returned by variable substitution have the same
-	effect as when those codes are returned by command substitution. [Bug
-	536879]
-
-2002-04-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/tcltest/tcltest.tcl: added getMatchingFiles back (alias to
-	GetMatchingFiles), which was a public function in tcltest 1.0.
-
-2002-04-01  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclEnv.c:
-	* generic/tclIOUtil.c: invalidate filesystem cache when the user
-	changes env(HOME). Fixes [Bug 535621]. Also cleaned up some of the
-	documentation.
-	* tests/fileSystem.test: added test for bug just fixed.
-
-2002-04-01  Kevin Kenny  <kennykb@acm.org>
-
-	* win/tclWinTime.c (Tcl_GetTime): made the checks of clock frequency
-	more permissive to cope with the fact that Win98SE is observed to
-	return 1.19318 in place of 1.193182 for the performance counter
-	frequency.
-
-2002-03-29  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCmdMZ.c (Tcl_TraceObjCmd, TraceVarProc)
-	(TraceCommandProc, TclTraceCommandObjCmd):  corrected potential
-	double-free of traces on variables by flagging in Trace*Proc that it
-	will free the var in case the eval wants to delete the var trace as
-	well. [Bug 536937] Also converted Tcl_UntraceVar -> Tcl_UntraceVar2
-	and Tcl_Eval to Tcl_EvalEx in Trace*Proc for slight efficiency
-	improvement.
-
-2002-03-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/AllowExc.3:
-	* generic/tclBasic.c (Tcl_EvalObjv,Tcl_EvalEx,Tcl_EvalObjEx):
-	* generic/tclCompile.h (TclCompEvalObj):
-	* generic/tclExecute.c (TclCompEvalObj,TclExecuteByteCode):
-	* tests/basic.test: Corrected problems with Tcl_AllowExceptions having
-	influence over the wrong scope of Tcl_*Eval* calls. Patch from Miguel
-	Sofer. Report from Jean-Claude Wippler. [Bug 219181]
-
-2002-03-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclVar.c: Refactored CallTraces to collect repeated handling
-	of its returned value into CallTraces itself.
-
-2002-03-28  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/feather.bmp:
-	* tools/man2help.tcl:
-	* tools/man2help2.tcl:
-	* win/makefile.vc: More winhelp target fixups. Added a feather bitmap
-	to the non-scrollable area and changed the color to be yellow from a
-	plain white. The colors can be whatever we want them to be, but
-	thought I would start with something bold. [Bug 527941]
-
-	* doc/SetVar.3:
-	* doc/TraceVar.3:
-	* doc/UpVar.3:  .AP macro syntax repair.
-
-2002-03-27  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/man2help.tcl:
-	* win/makefile.vc:  winhelp target now copies all needed files from
-	tools/ to a workarea under $(OUT_DIR) and builds it from there. No
-	build cruft is left in tools/ anymore. All paths used in man2help.tcl
-	are now relative to where the script is. [Bug 527941]
-
-2002-03-27  David Gravereaux <davygrvy@pobox.com>
-
-	* win/.cvsignore:
-	* win/buildall.vc.bat:
-	* win/coffbase.txt:
-	* win/makefile.vc:
-	* win/nmakehlp.c (new):
-	* win/rules.vc:  First draft fix for [Bug 527941]. More changes need
-	to done to the makehelp target to get to stop leaving build files in
-	the tools/ directory. This does not address the syntax errors in the
-	man files. Having the contents of tcl.hpj(.in) inside makefile.vc
-	allows for version numbers to be replaced with macros.
-
-	The new nmakehlp.c is built by rules.vc in preprocessing and removes
-	the need to use tricky shell syntax that wasn't compatible on Win9x
-	systems. Clean targets made Win9x complient. This is a first draft
-	repair for [Bug 533862].
-
-2002-03-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_EvalEx): passing the correct commandSize to
-	TclEvalObjvInternal. [Bug 219362], fix by David Knoll.
-
-2002-03-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_EvalEx):
-	* tests/basic.test: avoid exceptional returns at level 0. [Bug 219181]
-
-2002-03-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n ([mainThread]):
-	* library/tcltest/tcltest.tcl:
-	* tests/tcltest.test:  Major code cleanup to deal with whitespace,
-	coding conventions, and namespace issues, with several minor bugs
-	fixed in the process.
-
-	* tests/main.test: Added missing [after cancel]s.
-
-2002-03-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/main.test: Removed workarounds for Bug 495977.
-
-	* library/tcltest/tcltest.tcl:  Keep the value of $::auto_path
-	unchanged, so that the tcltest package can test code that depends on
-	auto-loading. If a testing application needs $::auto_path pruned, it
-	should do that itself. [Bug 495726]
-	Improve the processing of the -constraints option to [test] so that
-	constraint lists can have arbitrary whitespace, and non-lists don't
-	blow things up. [Bug 495977]
-	Corrected faulty variable initialization. [Bug 534845]
-
-2002-03-25  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* doc/CrtTrace.3: small doc correction
-	* generic/tclBasic.c (Tcl_DeleteTrace): Allow NULL callback on trace
-	deletions. [Bug 534728] (Hemang Lavana)
-
-2002-03-24  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_EvalObjv): replaced obscure, incorrect code
-	as described in [Bug 533907] (Don Porter).
-
-2002-03-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:  Use [interpreter] to set/query the
-	executable currently running the tcltest package. [Bug 454050]
-
-	* library/tcltest/tcltest.tcl:  Allow non-proc commands to be used as
-	the customization hooks. [Bug 495662]
-
-2002-03-24  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFilename.c:
-	* generic/tclFCmd.c:
-	* generic/tclTest.c:
-	* generic/tcl.h:
-	* generic/tclIOUtil.c:
-	* win/tclWinFile.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinPipe.c:
-	* unix/tclUnixFile.c:
-	* unix/tclUnixFCmd.c:
-	* mac/tclMacFile.c:
-	* doc/FileSystem.3:
-	* doc/file.n:
-	* tests/cmdAH.test:
-	* tests/fileName.test:
-	* tests/fileSystem.test: (new file)
-	* tests/winFCmd.test: fix [Bug 511666] and [Bug 511658], and improved
-	documentation of some aspects of the filesystem, particularly
-	'Tcl_FSMatchInDirectory' which now might match a single file/directory
-	only, and 'file normalize' which wasn't very clear before. Removed
-	inconsistency betweens docs and the Tcl_Filesystem structure. Also
-	fixed [Bug 523217] and corrected file normalization on Unix so that
-	it expands symbolic links. Added some new tests of the filesystem
-	code (in the new file 'fileSystem.test'), and some extra tests for
-	correct handling of symbolic links. Fix to [Bug 530960] which shows up
-	on Win98. Made comparison with ".com" case insensitive in tclWinPipe.c
-
-	***POTENTIAL INCOMPATIBILITY***: But only between alpha releases
-	(users of the new Tcl_Filesystem lookup table in Tcl 8.4a4 need to
-	handle the new way in which Tcl may call Tcl_FSMatchInDirectory, and
-	'file normalize' on unix now behaves correctly). Only known impact is
-	with the 'tclvfs' extension.
-
-2002-03-22  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* tests/basic.test (basic-46.1): adding test for [Bug 533758], fixed
-	earlier today.
-
-2002-03-22  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinInt.h: moved undef of TCL_STORAGE_CLASS. [Bug 478579]
-
-2002-03-22  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_EvalObjEx):
-	* generic/tclExecute.c (TclCompEvalObj): fixed the errorInfo for
-	return codes other than (TCL_OK, TCL_ERROR) to runLevel 0.[Bug 533758]
-	Removed the static RecordTracebackInfo(), as its functionality is
-	easily replicated by Tcl_LogCommandInfo. Bug and redundancy noted by
-	Don Porter.
-
-2002-03-21  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/expr.n: Improved documentation for ceil and floor. [Bug 530535]
-
-2002-03-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/SetVar.3:
-	* doc/TraceVar.3:
-	* doc/UpVar.3:
-	* generic/tcl.h (Tcl_VarTraceProc):
-	* generic/tcl.decls (Tcl_GetVar2, Tcl_SetVar2, Tcl_TraceVar2,
-	(Tcl_UnsetVar2, Tcl_UntraceVar2, Tcl_UpVar2, Tcl_VarTraceInfo2,
-	(Tcl_GetVar2Ex, TclSetVar2Ex):
-	* generic/tclCmdMZ.c (TraceVarProc):
-	* generic/tclEnv.c (EnvTraceProc):
-	* generic/tclEvent.c (VwaitVarProc):
-	* generic/tclInt.decls (TclLookupVar,TclPrecTraceProc):
-	* generic/tclLink.c (LinkTraceProc):
-	* generic/tclUtil.c (TclPrecTraceProc):
-	* generic/tclVar.c (CallTraces, MakeUpvar, VarErrMsg, TclLookupVar,
-	(Tcl_GetVar2, Tcl_SetVar2, Tcl_TraceVar2, Tcl_UnsetVar2,
-	(Tcl_UntraceVar2, Tcl_UpVar2, Tcl_VarTraceInfo2, Tcl_GetVar2Ex,
-	(TclSetVar2Ex): Updated interfaces of generic/tclVar.c according to
-	TIP 27. In particular, the "part2" arguments were CONSTified. [Patch
-	532642]
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h: make genstubs
-
-2002-03-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/compile.test (compile-12.3): Test to detect bug 530320.
-	* generic/tclCompile.c (TclCompileTokens): Fixed buffer overrun
-	reported in bug 530320.
-
-2002-03-14  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Add configure time test for SEH support in the
-	compiler.
-	* win/tclWin32Dll.c (ESP, EBP, TclpCheckStackSpace,
-	(_except_checkstackspace_handler):
-	* win/tclWinChan.c (ESP, EBP, Tcl_MakeFileChannel,
-	(_except_makefilechannel_handler):
-	* win/tclWinFCmd.c (ESP, EBP, DoRenameFile, DoCopyFile,
-	(_except_dorenamefile_handler, _except_docopyfile_handler):
-	Implement SEH support under gcc using inline asm. Tcl and Tk should
-	now compile with Mingw 1.1. [Patch 525746]
-
-2002-03-14  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWinFCmd.c (DoRenameFile, DoCopyFile): Handle an SEH exception
-	with EXCEPTION_EXECUTE_HANDLER instead of restarting the faulting
-	instruction with EXCEPTION_CONTINUE_EXECUTION. [Bug 466102] provides
-	an example of how restarting could send Tcl into an infinite loop.
-	[Patch 525746]
-
-2002-03-11  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWinFCmd.c (DoRenameFile, DoCopyFile, DoDeleteFile,
-	(DoRemoveJustDirectory): Make sure we don't pass NULL or "" as a path
-	name to Win32 API functions since this was crashing under Windows 98.
-
-2002-03-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:
-	* library/tcltest/pkgIndex.tcl: Bumped tcltest package to 2.0.2.
-
-2002-03-11  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl (getMatchingFiles): Pass a proper list
-	to foreach to avoid munging a Windows patch like D:\Foo\Bar into
-	D:FooBar before the glob.
-
-2002-03-11  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclEncoding.c: Fix typo in comment.
-	* generic/tclIO.c (DoReadChars, ReadBytes, ReadChars): Use NULL value
-	instead of pointer set to NULL to make things more clear. Reorder
-	arguments so that they match the function signatures. Cleanup little
-	typos and add more descriptive comment.
-
-2002-03-08  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/README: Update to indicate that Mingw 1.1 is required to build
-	Tcl. Add section describing new msys based build process. Update
-	Cygwin build instructions so users know where to find Mingw 1.1.
-
-2002-03-08  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinFCmd.c (DoCopyFile): correctly set retval to TCL_OK.
-
-2002-03-07  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWin32Dll.c (TclpCheckStackSpace):
-	* win/tclWinFCmd.c (DoRenameFile, DoCopyFile): Replace hard coded
-	constants with Win32 symbolic names. Move control flow statements out
-	of __try blocks since the documentation indicates it is frowned upon.
-
-2002-03-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/interp.n:
-	* generic/tclInterp.c (Tcl_InterpObjCmd, SlaveObjCmd,
-	(SlaveRecursionLimit):
-	* generic/tclTest.c:
-	* tests/interp.test: Added the [interp recursionlimit] command to
-	set/query the recursion limit of an interpreter. Proposal and
-	implementation from Stephen Trier. [TIP 87, Patch 522849]
-
-2002-03-06  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tcl.h, tools/tcl.wse.in, unix/configure.in,
-	* unix/tcl.spec, win/README.binary, win/configure.in, README:
-	Bumped patchlevel; this might need to change in the future, but it
-	will help us distinguish between the CVS version and the most recent
-	released version.
-
-2002-03-06  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclInt.h: for unshared objects, TclDecrRefCount now frees
-	the internal rep before the string rep - just like the non-macro
-	Tcl_DecrRefCount/TclFreeObj. [Bug 524802]
-
-2002-03-06  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/lsearch.n: Documentation of new features, plus examples.
-	* tests/lsearch.test: Tests of new features.
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): TIP#80 support. See
-	http://purl.org/tcl/tip/80 for details.
-
-2002-03-05  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	*** 8.4a4 TAGGED FOR RELEASE ***
-
-	* unix/tclUnixChan.c: initial remedy for [Bug 525783] flush problem
-	introduced by TIP #35. This may not satisfy true serial channels, but
-	it restores the correct flushing of std* channels on exit.
-
-	* unix/README: added --enable-langinfo doc.
-
-	* unix/tcl.spec:
-	* tools/tcl.wse.in: fixed URL refs to use www.tcl.tk or SF.
-
-2002-03-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* README:
-	* mac/README:
-	* unix/Makefile.in:
-	* unix/README:
-	* win/README:
-	* win/README.binary: updated to use www.tcl.tk URL.
-
-	* unix/Makefile.in: added older ChangeLogs to dist target.
-
-	* tests/io.test:
-	* tests/encoding.test: corrected iso2022 encoding results.
-	added encoding-24.*
-	* generic/tclEncoding.c (EscapeFromUtfProc): corrected output of
-	escape codes as per RFC 1468. [Patch 474358] (taguchi)
-	(TclFinalizeEncodingSubsystem): corrected potential double-free
-	when encodings were finalized on exit. [Bugs 219314, 524674]
-
-2002-03-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/encoding/iso2022-jp.enc:
-	* library/encoding/iso2022.enc:
-	* tools/encoding/iso2022-jp.esc:
-	* tools/encoding/iso2022.esc: gave <ESC>$B precedence over <ESC>$@,
-	based on comments (point 1) in [Bug 219283] (rfc 1468)
-
-	* tests/encoding.test: added encoding-23.* tests
-	* generic/tclIO.c (FilterInputBytes): reset the TCL_ENCODING_START
-	flags in the ChannelState when using 'gets'. [Bug 523988]
-	Also reduced the value of ENCODING_LINESIZE from 30 to 20 as this
-	seems to improve the performance of 'gets' according to tclbench.
-
-2002-02-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCmdMZ.c (TraceCommandProc): ensure that TraceCommandInfo
-	structure was also deleted when a command was deleted to prevent a
-	mem leak.
-
-	* generic/tclBasic.c (Tcl_CreateObjTrace): set tracePtr->flags
-	correctly.
-
-	* generic/tclTimer.c (TimerExitProc): remove remaining events in
-	tls on thread exit.
-
-2002-02-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclNamesp.c: allow cached fully-qualified namespace names to
-	be usable from different namespaces within the same interpreter
-	without forcing a new lookup [Patch 458872].
-
-2002-02-28  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclExecute.c: Replaced a few direct stack accesses with the
-	POP_OBJECT() macro [Bug 507181] (Don Porter).
-
-2002-02-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/GetIndex.3:
-	* generic/tcl.decls (Tcl_GetIndexFromObjStruct):
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct):  Revised the
-	prototype of the Tcl_GetIndexFromObjStruct to take its struct table as
-	a (CONST VOID *) argument, better describing what it is, maintaining
-	source compatibility, and adding CONST correctness according to TIP
-	27. Thanks to Joe English for an elegant solution. [Bug 520304]
-
-	* generic/tclDecls.h: make genstubs
-
-	* generic/tclMain.c (Tcl_Main,StdinProc):  Corrected some reference
-	count management errors on the interactive command Tcl_Obj found by
-	Purify. Thanks to Jeff Hobbs for the report and assistance.
-
-2002-02-27  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclBasic.c (Tcl_EvalTokensStandard): corrected mem leak in
-	error case.
-
-	* generic/tclTest.c (TestStatProc[123]): correct harmless UMRs.
-
-	* generic/tclLink.c (Tcl_LinkVar): correct mem leak in error case.
-
-2002-02-27  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* tests/socket.test (2.7): Accepted and applied patch for [Bug 523470]
-	provided by Don Porter <dgp@users.sourceforge.net> to avoid timing
-	problems in that test.
-
-	* unix/tclUnixChan.c (TclpOpenFileChannel): Added code to regonize
-	"/dev/tty" (by name) and to not handle it as tty / serial line. This
-	is the controlling terminal and is special. Setting it into raw mode
-	as is done for other tty's is a bad idea. This is a hackish fix for
-	expect [Bug 520624]. The fix has limitation: Tcl_MakeFileChannel
-	handles tty's specially too, but is unable to recognize /dev/tty as it
-	only gets a file descriptor, and no name for it.
-
-2002-02-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCmdAH.c (StoreStatData): corrected mem leak.
-
-	* generic/tclCmdMZ.c (Tcl_RegsubObjCmd): prevent obj leak in
-	remedial regsub case.
-
-	* generic/tclFileName.c (Tcl_TranslateFileName): decr refcount for
-	error case to prevent mem leak.
-
-	* generic/tclVar.c (Tcl_ArrayObjCmd): removed extra obj allocation.
-
-	* unix/tclUnixSock.c (Tcl_GetHostName): added an extra
-	gethostbyname check to guard against failure with truncated
-	names returned by uname.
-
-	* unix/configure:
-	* unix/tcl.m4 (SC_SERIAL_PORT): added sys/modem.h check and defined
-	_XOPEN_SOURCE_EXTENDED for HP-11 to get updated header decls.
-
-	* unix/tclUnixChan.c: added Unix implementation of TIP #35, serial
-	port support. [Patch 438509] (schroedter)
-
-2002-02-26  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCmpCmds.c: (bugfix to the bugfix, hopefully the last)
-	Bugfix to the new [for] compiling code: was setting a exceptArray
-	parameter using another param which wasn't yet initialised, thus
-	filling it with noise.
-
-2002-02-25  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* mac/tclMacSock.c (TcpGetOptionProc): Changed to recognize the option
-	"-error". Essentially ignores the option, always returning an empty
-	string.
-
-2002-02-25  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/Alloc.3:
-	* doc/LinkVar.3:
-	* doc/ObjectType.3:
-	* doc/PkgRequire.3:
-	* doc/Preserve.3:
-	* doc/TCL_MEM_DEBUG.3: Updated documentation to describe the ckalloc,
-	ckfree, ckrealloc, attemptckalloc, and attemptckrealloc macros, and
-	to accurately describe when and how they are used. [Bug 497459] (dgp)
-
-	* generic/tclHash.c (AllocArrayEntry, AllocStringEntry):
-	Before invoking ckalloc when creating a Tcl_HashEntry,
-	check that the amount of memory being allocated is
-	at least as large as sizeof(Tcl_HashEntry). The previous
-	code was allocating memory regions that were one
-	or two bytes short. [Bug 521950] (dejong)
-
-2002-02-25  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_EvalEx): avoiding a buffer overrun
-	reported by Joe English, and restoring tcl7.6 behaviour for
-	[subst]: badly terminated nested scripts will raise an error
-	and not be evaluated. [Bug 495207]
-
-2002-02-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/tclUnixPort.h: corrected strtoll prototype mismatch on Tru64.
-	* compat/strtod.c (strtod): simplified #includes
-	* compat/strtol.c (strtol): gather result in a long before returning
-	as a long: necessary on platforms where sizeof(int) != sizeof(long).
-
-2002-02-25  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclLoadDyld.c: updated to use Mac OS X 10.1 dyld APIs that
-	have more libdl-like semantics. [Bug 514392]
-
-2002-02-25  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds: fixing a bug in patch dated 2002-02-22, in the
-	code for [for] and [while]. Under certain conditions, for long bodies,
-	the exception range parameters were badly computed. Tests forthcoming:
-	I still can't reproduce the conditions in the testsuite (!), although
-	the bug (with assorted segfault or panic!)  can be triggered from the
-	console or with the new parse.bench in tclbench.
-
-2002-02-25  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* compat/strtoul.c, compat/strtol.c, compat/strtod.c: Added UCHAR,
-	CONST and #includes to clean up GCC output.
-
-2002-02-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* compat/strtoull.c (strtoull):
-	* compat/strtoll.c (strtoll):
-	* compat/strtoul.c (strtoul): Fixed failure to handle leading
-	sign symbols '+' and '-' and '0X' and raise overflow errors.
-	[Bug 440916]  Also corrects prototype and errno problems.
-
-2002-02-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Link with -n32 instead of -32 when
-	building on IRIX64-6.* system. [Bug 521707]
-
-2002-02-22  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:
-	* generic/tclObj.c: renamed global variable emptyString ->
-	tclEmptyString because it is no longer static.
-	* generic/tclPkg.c: Fix for panic when library is loaded on a
-	platform without backlinking without proper use of stubs. [Bug 476537]
-
-2002-02-22  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/regexpComp.test: updated regexp-11.[1-4] to match changes in
-	regexp.test for new regsub syntax
-
-	* unix/configure:
-	* unix/tcl.m4: added --enable-64bit support for AIX-4 (using -q64
-	flag) when using IBM's xlc compiler.
-
-	* tests/safe.test: updated safe-8.5 and safe-8.7
-	* library/safe.tcl (CheckFileName): removed the limit on
-	sourceable file names (was only *.tcl or tclIndex files with no more
-	than one dot and 14 chars). There is enough internal protection in a
-	safe interpreter already. [Tk Bug 521560]
-
-2002-02-22  Miguel Sofer  <msofer@users.sourceforge.net>
-
-	* generic/tclCompCmds: [FR 465811]. Optimising [if], [for] and [while]
-	for constant conditions; in addition, [for] and [while] are now
-	compiled with the "loop rotation" optimisation (thanks to Kevin
-	Kenny).
-
-2002-02-22  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	--- TIP#76 CHANGES ---
-	* generic/tclCmdMZ.c (Tcl_RegsubObjCmd): Final-argument-less
-	[regsub] returns the modified string.
-	* doc/regsub.n: Updated docs.
-	* tests/regexp.test: Updated and added tests.
-
-	* compat/strtoll.c (strtoll):
-	* compat/strtoull.c (strtoull):
-	* unix/tclUnixPort.h:
-	* win/tclWinPort.h: Const-ing 64-bit compatibility declarations. Note
-	that the return pointer is non-const because it is entirely legal for
-	the functions to be called from somewhere that owns the string being
-	passed. Fixes problem reported by Larry Virden.
-
-2002-02-21  David Gravereaux <davygrvy@pobox.com>
-
-	* win/mkd.bat (removed):
-	* win/coffbase.txt (new):
-	* win/makefile.bc:
-	* win/makefile.vc:  Changed the 'setup' target to stop using the
-	mkd.bat file and just make the directory right in the rule. Same
-	change to makefile.bc. Neither configure.in nor Makefile.in use it.
-
-	coffbase.txt will be the master list for our "prefered base addresses"
-	set by the linker. This should improve load-time (NT only) by avoiding
-	relocations. Submissions to the list by extension authors are
-	encouraged.
-
-	Added a 'tidy' target to compliment 'clean' and 'hose' to remove just
-	the outputs. Also removed the $(winlibs) macro as it wasn't being
-	used.
-
-	Stuff left to do:
-	1) get the winhelp target to stop building in the tools/ directory.
-	2) stop using rmd.bat
-	3) add more dependacy rules.
-
-	* win/tclAppInit.c:  Reverted back to -r1.6, as the header file change
-	to tclPort.h won't allow for easy embedded support outside of the
-	source dist. Thanks to Don Porter for pointing this out to me.
-
-2002-02-21  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc:
-	* win/rules.vc:  Added a new "loimpact" option that sets the
-	-ws:aggressive linker option. Off by default. It's said to keep the
-	heap use low at the expense of alloc speed.
-
-	* win/tclAppInit.c: Changed #include "tcl.h" to be tclPort.h to remove
-	the raw windows.h include. tclPort.h brings in windows.h already and
-	lessens the precompiled-header mush and the randomly useless #pragma
-	comment (lib,...) references throughout the big windows.h tree (as
-	observed at high linker warning levels).
-
-2002-02-21  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tcl.h: Better guessing of LP64/ILP32 architecture, but now
-	sensitive to presence of (suitable) <limits.h>
-
-2002-02-20  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tcl.decls (Tcl_RegExpRange,Tcl_GetIndexFromObjStruct):
-	Overlooked a few source incompatibilities. Now using CONST84.
-	* generic/tclDecls.h: make genstubs
-	* generic/tcl.h (Tcl_CmdObjTraceProc): silence warning from Sun
-	Workshop compiler.
-
-2002-02-20  David Gravereaux <davygrvy@pobox.com>
-
-	* win/buildall.vc.bat:
-	* win/makefile.vc:
-	* win/rules.vc: General clean-ups. Added compiler and linker tests for
-	a) the pentium 0x0F errata, b) optimizing (not all have this), and c)
-	linker v6 section alignment confusion. All these are tested first to
-	make sure any D4002 or LNK1117 warnings aren't displayed. The pentium
-	0x0F errata is a recommended switch. The v5 linker's section alignment
-	default is 512, but the v6 linker was changed to 4096 in an attempt to
-	speed loading on Win98. I changed the default to always be 512 across
-	both linkers, unless linking statically, then 4096 is used for the
-	claimed speed effect. Using a 512 alignment saves 12k bytes of dead
-	space in the DLL.
-
-	Added IA64 B-stepping errata switch when the compiler supports it.
-
-	Added profiling to $(lflags) when requested and also removed the
-	explict -entry option as the default works fine as is.
-
-	Removed win/tclWinInit.c from the special case section to let it use
-	the common implicit rule as the $(EXTFLAGS) macro it had was never
-	referenced anywhere.
-
-2002-02-20  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tcl.h: Added code to guess the correct settings for
-	TCL_WIDE_INT_IS_LONG and TCL_WIDE_INT_TYPE when configure doesn't tell
-	us them, as can happen with extensions.
-
-2002-02-19  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/format.n: Updated docs to list the specification.
-	* generic/tclCmdAH.c (Tcl_FormatObjCmd): Made behaviour on 64-bit
-	platforms correctly meet the specification, that %d works with the
-	native word-sized integer, instead of trying to guess (wrongly)
-	from the value being passed.
-
-2002-02-19  Don Porter <dgp@users.sourceforge.net>
-
-	* changes: First draft of updated changes for 8.4a4 release.
-
-2002-02-15  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixPort.h: add strtoll/strtoull declarations for
-	platforms that do not define them.
-
-	* generic/tclIndexObj.c (STRING_AT): removed ptrdiff_t cast and
-	use of VOID* in default case (GNU-ism).
-
-2002-02-15  Kevin Kenny  <kennykb@acm.org>
-
-	* compat/strtoll.c:
-	* compat/strtoul.c:
-	* compat/strtoull.c:
-	* generic/tclIOUtil.c:
-	* generic/tclPosixStr.c:
-	* generic/tclTest.c:
-	* generic/tclTestObj.c:
-	* tests/get.test:
-	* win/Makefile.vc: Further tweaks to the TIP 72 patch to make it
-	compile under VC++.
-
-2002-02-15  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* tclExecute.c:
-	* tclIOGT.c:
-	* tclIndexObj.c: Touchups to the TIP 72 patch to make it compileable
-	under Windows again. The changes are not complete, there is one nasty
-	regarding _stati64
-
-2002-02-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	+----------------------+
-	| TIP #72 IMPLEMENTED. |
-	+----------------------+
-
-	There are a lot of changes from this TIP, so please see
-	http://purl.org/tcl/tip/72.html for discussion of
-	backward-compatibility issues, but the main ones modifications are in:
-
-	* generic/tcl.h: New types.
-	* generic/tcl.decls: New public functions.
-	* generic/tclExecute.c: 64-bit aware bytecode engine.
-	* generic/tclBinary.c: 64-bit handling in [binary] command.
-	* generic/tclScan.c: 64-bit handling in [scan] command.
-	* generic/tclCmdAH.c: 64-bit handling in [file] and [format]
-	commands.
-	* generic/tclBasic.c: New "wordSize" entry in ::tcl_platform.
-	* generic/tclFCmd.c: Large-file support (with many consequences.)
-	* generic/tclIO.c: Large-file support (with many consequences.)
-	* compat/strtoll.c, compat/strtoull.c: New support functions.
-	* unix/tcl.m4, unix/configure: 64-bit support and greatly enhanced
-	caching.
-
-	Most other changes, including all those in doc/* and test/* as well as
-	the majority in the platform directories, follow on from these.
-
-	Also coming out of the woodwork:
-	* generic/tclIndex.c: Better support for Cray PVP.
-	* win/tclWinMtherr.c: Better Borland support.
-
-	Note that, in a number of places through the Unix part of the platform
-	support, there are Tcl_Platform* references. These are expanded into
-	the correct way to call that particular underlying function, i.e. with
-	or without a '64' suffix, and should be used by people working on the
-	core in preference to the API functions they overlay so that the code
-	remains portable depending on the presence or absence of 64-bit
-	support on the underlying platform.
-
-	***POTENTIAL INCOMPATIBILITY***: Extracted from the TIP
-
-	SUMMARY OF INCOMPATIBILITIES AND FIXES
-	======================================
-
-	The behaviour of expressions containing constants that appear positive
-	but which have a negative internal representation will change, as
-	these will now usually be interpreted as wide integers. This is always
-	fixable by replacing the constant with int(constant).
-
-	Extensions creating new channel types will need to be altered as
-	different types are now in use in those areas. The change to the
-	declaration of Tcl_FSStat and Tcl_FSLstat (which are the new preferred
-	API in any case) are less serious as no non-alpha releases have been
-	made yet with those API functions.
-
-	Scripts that are lax about the use of the l modifier in format and
-	scan will probably need to be rewritten. This should be very uncommon
-	though as previously it had absolutely no effect.
-
-	Extensions that create new math functions that take more than one
-	argument will need to be recompiled (the size of Tcl_Value changes),
-	and functions that accept arguments of any type (TCL_EITHER) will need
-	to be rewritten to handle wide integer values. (I do not expect this
-	to affect many extensions at all.)
-
-2002-02-14  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIOCmd.c (Tcl_GetsObjCmd): Trivial fix for [Bug 517503], a
-	memory leak reported by Miguel Sofer <msofer@users.sf.net>. The leak
-	happens if an error occurs for "set var [gets $chan]" and leak one
-	empty object.
-
-2002-02-12  David Gravereaux <davygrvy@pobox.com>
-
-	* djgpp/ (new directory)
-	* djgpp/Makefile (new):
-	* unix/tclAppInit.c:
-	* unix/tclMtherr.c:
-	* unix/tclUnixFCmd.c:
-	* unix/tclUnixFile.c:
-	* unix/tclUnixInit.c:
-	* unix/tclUnixPort.h:  Early stage of DJGPP support for building Tcl
-	on DOS. Dynamic loading isn't working, yet. Requires watt32 for the
-	TCP/IP stack. No autoconf, yet. Barely tested, but makes a working exe
-	that runs Tcl in protected-mode, flat memory. [exec] and pipes will
-	need the most work as multi-tasking on DOS has to be carefully.
-
-2002-02-10  Kevin Kenny  <kennykb@acm.org>
-
-	* doc/CrtObjCmd.3:
-	* doc/CrtTrace.3:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclInt.h:
-	* generic/tclTest.c:
-	* tests/basic.test: Added Tcl_CreateObjTrace,
-	Tcl_GetCommandInfoFromToken and Tcl_SetCommandInfoFromToken.
-	(TIPs #32 and #79.)
-
-	* generic/tclDecls.h:
-	* generic/tclStubInit.c: Regenerated Stubs tables.
-
-2002-02-08  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:
-	* unix/tcl.m4: added -pthread for FreeBSD to EXTRA_CFLAGS and
-	LDFLAGS. Also triggered nodots only for FreeBSD-3. Added
-	AC_DEFINE(_POSIX_PTHREAD_SEMANTICS) for Solaris.
-
-	* unix/tclUnixPort.h:
-	* unix/tclUnixThrd.c: added thread-safe versions of readdir,
-	localtime, gmtime and inet_ntoa for threaded build. (jgdavidson)
-
-	* generic/tclScan.c (Tcl_ScanObjCmd): prevented ckfree being called on
-	a pointer to NULL.
-
-2002-02-07  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/DString.3:
-	* doc/Encoding.3:
-	* doc/GetCwd.3:
-	* doc/SplitPath.3:
-	* doc/Translate.3:
-	* doc/Utf.3:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclEncoding.c:
-	* generic/tclEnv.c:
-	* generic/tclFileName.c:
-	* generic/tclIOUtil.c:
-	* generic/tclUtf.c:
-	* generic/tclUtil.c:
-	* mac/tclMacInit.c:
-	* unix/tclUnixFile.c:
-	* unix/tclUnixInit.c:
-	* unix/tclUnixPipe.c:
-	* win/tclWin32Dll.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c:
-	* win/tclWinInit.c: Partial TIP 27 rollback. Following routines
-	restored to return (char *): Tcl_DStringAppend,
-	Tcl_DStringAppendElement, Tcl_JoinPath, Tcl_TranslateFileName,
-	Tcl_ExternalToUtfDString, Tcl_UtfToExternalDString,
-	Tcl_UniCharToUtfDString, Tcl_GetCwd, Tcl_WinTCharToUtf. Also restored
-	Tcl_WinUtfToTChar to return (TCHAR *) and Tcl_UtfToUniCharDString to
-	return (Tcl_UniChar *). Modified some callers. This change recognizes
-	that Tcl_DStrings are de-facto white-box objects.
-
-	* generic/tclDecls.h:
-	* generic/tclPlatDecls.h: make genstubs
-
-	* generic/tclCmdMZ.c: corrected use of C++-style comment.
-
-2002-02-06  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/scan.test:
-	* generic/tclScan.c (Tcl_ScanObjCmd): corrected scan 0x... %x handling
-	that didn't accept the 0x as a prelude to a base 16 number. [Bug
-	495213]
-
-	* generic/tclCompCmds.c (TclCompileRegexpCmd): made early check for
-	bad RE to stop checking further.
-
-	* generic/tclCmdMZ.c (Tcl_RegsubObjCmd): added special case to search
-	for simple 'string map' style regsub calls. Delayed creation of
-	resultPtr object until an initial match is made, as the input string
-	object can then be reused for no matches.
-	(Tcl_StringObjCmd): optimization improvements to the STR_MAP
-	algorithm for zero-length and nocase cases.
-
-	* tests/regexp.test:
-	* tests/regexpComp.test: extra code coverage tests.
-
-	* tests/string.test: added 10.18 and 10.19 extra tests.
-
-	* generic/regc_locale.c (casecmp): slight performance improvement.
-
-2002-02-05  Don Porter <dgp@users.sourceforge.net>
-
-	* library/http/http.tcl:
-	* library/http/pkgIndex.tcl:  Corrected use of http::error when
-	::error was intended. Bump to http 2.4.2.
-
-2002-02-04  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/tclUnixChan.c (FileOutputProc): Fixed [bug 465765] reported by
-	Dale Talcott <daletalcott@users.sourceforge.net>. Avoid writing
-	nothing into a file as STREAM based implementations will consider this
-	a EOF (if the file is a pipe). Not done in the generic layer as this
-	type of writing is actually useful to check the state of a socket.
-
-	* doc/open.n: Fixed [Bug 511540], added cross-reference to 'pid' as
-	the command to use to retrieve the pid of a command pipeline created
-	via 'open'.
-
-2002-02-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCmdMZ.c (Tcl_RegexpObjCmd): handle quirky about case
-	earlier to avoid shimmering problem.
-
-2002-02-01  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* tests/io.test: io-39.22 split into two tests, one platform
-	dependent, the other not. -eofchar is not empty on the windows
-	platform.
-
-2002-02-01  Vince Darley <vincentdarley@users.sourceforge.net>
-
-	* generic/tclTest.c: fix to picky windows compiler problem with the
-	'MainLoop' function declaration.
-
-2002-01-31  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* win/tclWinFCmd.c: TIP 27: Applied patch fixing CONST warnings on
-	behalf of Don Porter <dgp@users.sourceforge.net>.
-
-2002-01-30  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclInt.h: For each interface identified in the TIP 27
-	changes below as a POTENTIAL INCOMPATIBILITY, the source of the
-	incompatibility has been parameterized so that it can be removed. When
-	compiling extension code against the Tcl header files, use the
-	compiler flag -DUSE_NON_CONST to remove the irresolvable source
-	incompatibilities introduced by the TIP 27 changes. Resolvable changes
-	are left for extension authors to resolve.
-	* generic/tclDecls.h: make genstubs
-
-2002-01-30  Vince Darley <vincentdarley@users.sourceforge.net>
-
-	* doc/FileSystem.3: added documentation for 3 public functions which
-	had been overlooked. [Bug 507701]
-	* unix/mkLinks: make mklinks
-
-2002-01-29  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/regexpComp.test:
-	* generic/tclCompCmds.c (TclCompileRegexpCmd): enhanced to support
-	-nocase and -- options.
-
-2002-01-28  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/tcl.m4 (SC_LOAD_TCLCONFIG):
-	* win/tcl.m4 (SC_LOAD_TCLCONFIG): Set TCL_LIB_SPEC, TCL_STUB_LIB_SPEC,
-	and TCL_STUB_LIB_PATH to the values of TCL_BUILD_LIB_SPEC,
-	TCL_BUILD_STUB_LIB_SPEC, and TCL_BUILD_STUB_LIB_PATH when tclConfig.sh
-	is loaded from the build directory. A Tcl extension should make use of
-	the non-build versions of these variables since they will work in both
-	cases. This modification was described in TIP 34.
-
-2002-01-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinReg.c (regConnectRegistryProc,RecursiveDeleteKey)
-	(DeleteKey,GetKeyNames,GetType,GetValue,OpenSubKey,SetValue):
-	redid the CONSTification as previous changes caused failing tests.
-
-	* tests/regexpComp.test (new):
-	* generic/tclInt.h:
-	* generic/tclBasic.c: added TclCompileRegexpCmd entry
-	* generic/tclCompCmds.c (TclCompileStringCmd): corrected to return
-	TCL_OUT_LINE_COMPILE instead of TCL_ERROR for parsing errors, so
-	it only throws the error for runtime compile, in case the user
-	modifies 'string'.
-	(TclCompileRegexpCmd): first try at a byte-compiled regexp command. It
-	handles static strings and ^$ bounded static strings.
-	(TclCompileAppendCmd): made TclPushVarName call always use
-	TCL_CREATE_VAR as numWords is always > 2 at that point.
-
-	* generic/tclExecute.c (TclExecuteByteCode:INST_LIST): correct
-	possibly dangerous decr in macro call.
-
-	* win/tclWinInit.c (TclpFindVariable): CONSTification touch-up
-
-	* win/tclWinReg.c (OpenSubKey): corrected bug introduced in
-	CONSTification that dropped pointer reference.
-
-	* ChangeLog.2000 (new file):
-	* ChangeLog: broke changes from 2000 into ChangeLog.2000 to reduce
-	size of the main ChangeLog.
-
-2002-01-28  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclPlatDecls.h:  Added preprocessor logic to force a
-	typedef of TCHAR when __STDC__ is defined when using the uncommon
-	-Za compiler switch with the microsoft compiler.
-
-2002-01-27  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/package.n: Documented global namespace context for script
-	evaluation by [package require].
-
-2002-01-27  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.decls:
-	* generic/tclIntPlatDecls.h:
-	* mac/tclMacChan.c:
-	* mac/tclMacFCmd.c:
-	* mac/tclMacFile.c:
-	* mac/tclMacInit.c:
-	* mac/tclMacLoad.c:
-	* mac/tclMacResource.c:
-	* mac/tclMacSock.c: TIP 27 CONSTification induced changes
-
-	* tests/event.test:
-	* tests/main.test: added catches/constraints to test that
-	use features that don't exist on the mac.
-
-2002-01-25  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	Make -eofchar and -translation options read only for server sockets.
-	[Bug 496733]
-
-	* generic/tclIO.c (Tcl_GetChannelOption, Tcl_SetChannelOption):
-	Instead of returning nothing for the -translation option on a server
-	socket, always return "auto". Return the empty string enclosed in
-	quotes for the -eofchar option on a server socket. Fixup -eofchar
-	usage message so that it matches the implementation.
-	* tests/io.test: Add -eofchar tests and -translation tests to ensure
-	options are read only on server sockets.
-	* tests/socket.test: Update tests to account for -eofchar and
-	-translation option changes.
-
-2002-01-25  Don Porter <dgp@users.sourceforge.net>
-
-	* compat/strstr.c (strstr):
-	* generic/tclCmdAH.c (Tcl_FormatObjCmd):
-	* generic/tclCmdIL.c (InfoNameOfExecutableCmd):
-	* generic/tclEnv.c (ReplaceString):
-	* generic/tclFileName.c (ExtractWinRoot):
-	* generic/tclIO.c (FlushChannel,Tcl_BadChannelOption):
-	* generic/tclStringObj.c (AppendUnicodeToUtfRep):
-	* generic/tclThreadTest.c (TclCreateThread):
-	* generic/tclUtf.c (Tcl_UtfPrev):
-	* mac/tclMacFCmd.c (TclpObjListVolumes):
-	* mac/tclMacResource.c (TclMacRegisterResourceFork,
-	(BuildResourceForkList):
-	* win/tclWinInit.c (AppendEnvironment):  Sought out and eliminated
-	instances of CONST-casting that are no longer needed after the
-	TIP 27 effort.
-
-	* Following is [Patch 501006]
-	* generic/tclInt.decls (Tcl_AddInterpResolvers, Tcl_Export,
-	(Tcl_FindNamespace, Tcl_GetInterpResolvers, Tcl_ForgetImport,
-	(Tcl_Import, Tcl_RemoveInterpResolvers):
-	* generic/tclNamesp.c (Tcl_Export, Tcl_Import, Tcl_ForgetImport,
-	(Tcl_FindNamespace):
-	* generic/tclResolve.c (Tcl_AddInterpResolvers,Tcl_GetInterpResolvers,
-	(Tcl_RemoveInterpResolvers): Updated APIs in generic/tclResolve.c and
-	generic/tclNamesp.c according to the guidelines of TIP 27.
-	* generic/tclIntDecls.h: make genstubs
-
-	* Following is [Patch 505630]
-	* doc/AddErrorInfo.3:
-	* generic/tcl.decls (Tcl_LogCommandInfo):
-	* generic/tclBasic.c (Tcl_LogCommandInfo): Updated interfaces
-	of generic/tclBasic.cc according to TIP 27.
-	* generic/tclDecls.h: make genstubs
-
-	* Following is [Patch 506818]
-	* doc/Hash.3:
-	* generic/tcl.decls (Tcl_HashStats):
-	* generic/tclHash.c (Tcl_HashStats):  Updated APIs of generic/tclHash.c
-	according to guidelines of TIP 27.
-	* generic/tclDecls.h: make genstubs
-	* generic/tclVar.c (Tcl_ArrayObjCmd): Updated callers.
-
-	* Following is [Patch 506807]
-	* doc/ObjectType.3:
-	* generic/tcl.decls (Tcl_GetObjType):
-	* generic/tclObj.c (Tcl_GetObjType): Updated APIs of generic/tclObj.c
-	according to guidelines of TIP 27.
-	* generic/tclDecls.h: make genstubs
-
-	* Following is [Patch 507304]
-	* doc/Encoding.3:
-	* generic/tcl.decls (Tcl_WinUtfToTChar,Tcl_WinTCharToUtf):
-	* win/tclWin32Dll.c (Tcl_WinUtfToTChar,Tcl_WinTCharToUtf):
-	Updated interfaces in win/tclWin32Dll.c according to TIP 27.
-	* generic/tclPlatDecls.h: make genstubs
-	* generic/tclIOUtil.c (TclpNativeToNormalized):
-	* win/tclWinFCmd.c (TclpObjNormalizePath):
-	* win/tclWinFile.c (TclpFindExecutable,TclpMatchInDirectory,
-	(NativeIsExec,NativeStat):
-	* win/tclWinLoad.c (TclpLoadFile):
-	* win/tclWinPipe.c (TclpOpenFile,ApplicationType):
-	* win/tclWinReg.c (regConnectRegistryProc,RecursiveDeleteKey,DeleteKey,
-	(GetKeyNames,GetType,GetValue,OpenSubKey,SetValue):
-	* win/tclWinSerial.c (SerialSetOptionProc): Update callers.
-
-	* Following is [Patch 505072]
-	* doc/Concat.3:
-	* doc/Encoding.3:
-	* doc/Filesystem.3:
-	* doc/Macintosh.3:
-	* doc/OpenFileChnl.3
-	* doc/SetResult.3:
-	* doc/SetVar.3:
-	* doc/SplitList.3:
-	* doc/SplitPath.3:
-	* doc/Translate.3:
-	* generic/tcl.h (Tcl_FSMatchInDirectoryProc):
-	* generic/tclInt.h (TclpMatchInDirectory):
-	* generic/tcl.decls (Tcl_Concat,Tcl_GetStringResult,Tcl_GetVar,
-	(Tcl_GetVar2,Tcl_JoinPath,Tcl_Merge,Tcl_OpenCommandChannel,Tcl_SetVar,
-	(Tcl_SetVar2,Tcl_SplitList,Tcl_SplitPath,Tcl_TranslateFileName,
-	(Tcl_ExternalToUtfDString,Tcl_GetEncodingName,Tcl_UtfToExternalDString,
-	(Tcl_GetDefaultEncodingDir,Tcl_SetDefaultEncodingDir,
-	(Tcl_FSMatchInDirectory,Tcl_MacEvalResource,Tcl_MacFindResource):
-	* generic/tclInt.decls (TclCreatePipeline,TclGetEnv,TclpGetCwd,
-	(TclpCreateProcess):
-	* mac/tclMacFile.c (TclpGetCwd):
-	* generic/tclEncoding.c (Tcl_GetDefaultEncodingDir,
-	(Tcl_SetDefaultEncodingDir,Tcl_GetEncodingName,
-	(Tcl_ExternalToUtfDString,Tcl_UtfToExternalDString, OpenEncodingFile,
-	(LoadEscapeEncoding):
-	* generic/tclFileName.c (DoTildeSubst,Tcl_JoinPath,Tcl_SplitPath,
-	(Tcl_TranslateFileName):
-	* generic/tclIOUtil.c (Tcl_FSMatchInDirectory):
-	* generic/tclPipe.c (FileForRedirect,TclCreatePipeline,
-	(Tcl_OpenCommandChannel):
-	* generic/tclResult.c (Tcl_GetStringResult):
-	* generic/tclUtil.c (Tcl_Concat,Tcl_SplitList,Tcl_Merge):
-	* generic/tclVar.c (Tcl_GetVar,Tcl_GetVar2,Tcl_SetVar,Tcl_SetVar2):
-	* mac/tclMacResource.c (Tcl_MacEvalResource,Tcl_MacFindResource):
-	Updated interfaces of generic/tclEncoding, generic/tclFilename.c,
-	generic/tclIOUtil.c, generic/tclPipe.c, generic/tclResult.c,
-	generic/tclUtil.c, generic/tclVar.c and mac/tclMacResource.c according
-	to TIP 27. Tcl_TranslateFileName rewritten as wrapper around VFS-aware
-	version.
-	***POTENTIAL INCOMPATIBILITY***
-	Includes source incompatibilities: argv arguments of Tcl_Concat,
-	Tcl_JoinPath, Tcl_OpenCommandChannel, Tcl_Merge; argvPtr arguments of
-	Tcl_SplitList and Tcl_SplitPath.
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h: make genstubs
-
-	* generic/tclCkalloc.c (MemoryCmd):
-	* generic/tclClock.c (FormatClock):
-	* generic/tclCmdAH.c (Tcl_CaseObjCmd,Tcl_EncodingObjCmd,Tcl_FileObjCmd):
-	* generic/tclCmdIL.c (InfoLibraryCmd,InfoPatchLevelCmd,
-	(InfoTclVersionCmd):
-	* generic/tclCompCmds.c (TclCompileForeachCmd):
-	* generic/tclCompCmds.h (TclCompileForeachCmd):
-	* generic/tclCompile.c (TclFindCompiledLocal):
-	* generic/tclEnv.c (TclSetupEnv,TclSetEnv,Tcl_PutEnv,TclGetEnv,
-	(EnvTraceProc):
-	* generic/tclEvent.c (Tcl_BackgroundError):
-	* generic/tclIO.c (Tcl_BadChannelOption,Tcl_SetChannelOption):
-	* generic/tclIOCmd.c (Tcl_ExecObjCmd,Tcl_OpenObjCmd):
-	* generic/tclIOSock.c (TclSockGetPort):
-	* generic/tclIOUtil.c (SetFsPathFromAny):
-	* generic/tclLink.c (LinkTraceProc):
-	* generic/tclMain.c (Tcl_Main):
-	* generic/tclNamesp.c (TclTeardownNamespace):
-	* generic/tclProc.c (TclCreateProc):
-	* generic/tclTest.c (TestregexpObjCmd,TesttranslatefilenameCmd,
-	(TestchmodCmd,GetTimesCmd,TestsetCmd,TestOpenFileChannelProc1,
-	(TestOpenFileChannelProc2,TestOpenFileChannelProc3,AsyncHandlerProc,
-	(TestpanicCmd):
-	* generic/tclThreadTest.c (ThreadErrorProc,ThreadEventProc):
-	* generic/tclUtil.c (TclPrecTraceProc):
-	* mac/tclMacFCmd.c (GetFileSpecs):
-	* mac/tclMacFile.c (TclpMatchInDirectory):
-	* mac/tclMacInit.c (TclpInitLibraryPath,Tcl_SourceRCFile):
-	* mac/tclMacOSA.c (tclOSAStore,tclOSALoad):
-	* mac/tclMacResource.c (Tcl_MacEvalResource):
-	* unix/tclUnixFCmd.c (TclpObjNormalizePath):
-	* unix/tclUnixFile.c (TclpMatchInDirectory,TclpGetUserHome,TclpGetCwd,
-	(TclpReadLink):
-	* unix/tclUnixInit.c (TclpInitLibraryPath,TclpSetVariables,
-	(Tcl_SourceRCFile):
-	* unix/tclUnixPipe.c (TclpOpenFile,TclpCreateTempFile,
-	(TclpCreateProcess):
-	* win/tclWinFile.c (TclpGetCwd,TclpMatchInDirectory):
-	* win/tclWinInit.c (TclpInitLibraryPath,Tcl_SourceRCFile,
-	(TclpSetVariables):
-	* win/tclWinPipe.c (TclpCreateProcess): Updated callers.
-
-2002-01-24  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tclIOUtil.c (SetFsPathFromAny):  Corrected tilde-substitution
-	of pathnames where > 1 separator follows the ~. [Bug 504950]
-
-2002-01-24  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/http/pkgIndex.tcl:
-	* library/http/http.tcl: don't add port in default case to handle
-	broken servers. http bumped to 2.4.1  [Bug 504508]
-
-2002-01-23  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* unix/mkLinks: Regenerated.
-	* doc/CrtChannel.3:
-	* doc/ChnlStack.3: Moved documentation for 'Tcl_GetTopChannel' from
-	'CrtChannel' to 'ChnlStack'. Added documentation of
-	'Tcl_GetStackedChannel'. [Bug 506147] reported by Mark Patton
-	<msp@users.sourceforge.net>.
-
-2002-01-23  Don Porter <dgp@users.sourceforge.net>
-
-	* win/tclWinFile.c (NativeAccess,NativeStat,NativeIsExec,
-	(TclpGetUserHome):
-	* win/tclWinPort.h (TclWinSerialReopen):
-	* win/tclWinSerial.c (TclWinSerialReopen):
-	* win/tclWinSock.c (Tcl_OpenTcpServer):  Corrections to earlier TIP 27
-	changes. Thanks to Andreas Kupries for the feedback.
-	* generic/tclPlatDecls.h: make genstubs
-
-	* doc/GetHostName.3:
-	* doc/GetOpnFl.3:
-	* doc/OpenTcp.3:
-	* tcl.decls (Tcl_GetHostName,Tcl_GetOpenFile,Tcl_OpenTcpClient,
-	(Tcl_OpenTclServer):
-	* mac/tclMacSock.c (CreateSocket,Tcl_OpenTcpClient,Tcl_OpenTcpServer,
-	(Tcl_GetHostName,GetHostFromString):
-	* unix/tclUnixChan.c (CreateSocket,CreateSocketAddress,
-	(Tcl_OpenTcpClient,Tcl_OpenTcpServer,Tcl_GetOpenFile):
-	* unix/tclUnixSock.c (Tcl_GetHostName):
-	* win/tclWinSock.c (CreateSocket,CreateSocketAddress,
-	(Tcl_OpenTcpClient,Tcl_OpenTcpServer,Tcl_GetHostName):
-	Updated socket interfaces according to TIP 27.
-	* generic/tclCmdIL.c (InfoHostnameCmd): Updated callers.
-	* generic/tclDecls.h: make genstubs
-
-2002-01-21  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclLoadNone.c: TclpLoadFile() didn't match proto of typedef
-	Tcl_FSLoadFileProc. OK'd by vincentdarley. [Patch 502488]
-
-2002-01-21  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIO.c (WriteChars): Fix for [Bug 506297], reported by
-	Martin Forssen <ruric@users.sourceforge.net>. The encoding chosen in
-	the script exposing the bug writes out three intro characters when
-	TCL_ENCODING_START is set, but does not consume any input as
-	TCL_ENCODING_END is cleared. As some output was generated the
-	enclosing loop calls UtfToExternal again, again with START set. Three
-	more characters in the out and still no use of input ... To break this
-	infinite loop we remove TCL_ENCODING_START from the set of flags after
-	the first call (no condition is required, the later calls remove an
-	unset flag, which is a no-op). This causes the subsequent calls to
-	UtfToExternal to consume and convert the actual input.
-
-2002-01-21  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tclTest.c: Converted declarations of TestReport file system
-	to more portable form. [Bug 501417]
-
-	* generic/tcl.decls (Tcl_TraceCommand,Tcl_UntraceCommand,
-	(Tcl_CommandTraceInfo):
-	* generic/tclCmdMZ.c (Tcl_TraceCommand,Tcl_UntraceCommand,
-	(Tcl_CommandTraceInfo): Updated APIs in generic/tclCmdMZ.c according
-	to the guidelines of TIP 27.
-	* generic/tclDecls.h: make genstubs
-
-2002-01-18  Don Porter <dgp@users.sourceforge.net>
-
-	* win/tclWinChan.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c: Overlooked callers of Tcl_FSGetNativePath
-
-	* win/tclWinDde.c:
-	* win/tclWinReg.c: Overlooked callers of Tcl_GetIndexFromObj
-
-2002-01-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclThreadTest.c:
-	* mac/tclMacChan.c:
-	* mac/tclMacFCmd.c:
-	* mac/tclMacFile.c:
-	* mac/tclMacLoad.c:
-	* mac/tclMacResource.c: TIP 27 CONSTification broke the mac build in a
-	number of places.
-
-2002-01-17  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIOCmd.c (Tcl_GetsObjCmd): Fixed [Bug 504642] as reported
-	by Brian Griffin <bgriffin@users.sourceforge.net>, using his
-	patch. Before the patch the generic I/O layer held an unannounced
-	reference to the interp result to store the read line into. This
-	unfortunately has disastrous results if the channel driver executes a
-	tcl script to perform its operation, this freeing the interp
-	result. In that case we are dereferencing essentially a dangling
-	reference. It is not truly dangling because the object is in the free
-	list, but this only causes us to smash the free list and have the
-	error occur later somewhere else. The patch simply creates a new
-	object for the line and later sets it into the interp result when we
-	are done with reading.
-
-2002-01-16  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/tcl.m4 (SC_LOAD_TCLCONFIG):
-	* win/tcl.m4 (SC_LOAD_TCLCONFIG): Subst TCL_DBGX into
-	TCL_STUB_LIB_FILE and TCL_STUB_LIB_FLAG variables so that an extension
-	does not need to subst TCL_DBGX into its makefile. [Tk Bug 504356]
-
-2002-01-16  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/FileSystem.3:
-	* doc/GetCwd.3:
-	* doc/GetIndex.3:
-	* generic/tcl.decls (Tcl_GetIndexFromObj, Tcl_GetIndexFromObjStruct,
-	(Tcl_GetCwd, Tcl_FSFileAttrStrings, Tcl_FSGetNativePath,
-	(Tcl_FSGetTranslatedStringPath):
-	* generic/tcl.h (Tcl_FSFileAttrStringsProc):
-	* generic/tclFCmd.c (TclFileAttrsCmd):
-	* generic/tclIOUtil.c (Tcl_GetCwd,NativeFileAttrStrings,
-	(Tcl_FSFileAttrStrings,Tcl_FSGetTranslatedStringPath,
-	(Tcl_FSGetNativePath):
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObj,
-	(Tcl_GetIndexFromObjStruct):
-	More TIP 27 updates in tclIOUtil.c and tclIndexObj.c that were
-	overlooked before. [Patch 504671]
-	***POTENTIAL INCOMPATIBILITY***
-	Includes a source incompatibility in the tablePtr arguments of the
-	Tcl_GetIndexFromObj* routines.
-	* generic/tclDecls.h: make genstubs
-
-	* generic/tclBinary.c (Tcl_BinaryObjCmd):
-	* generic/tclClock.c (Tcl_ClockObjCmd):
-	* generic/tclCmdAH.c (Tcl_EncodingObjCmd, Tcl_FileObjCmd):
-	* generic/tclCmdIL.c (Tcl_InfoObjCmd,Tcl_LsearchObjCmd,Tcl_LsortObjCmd):
-	* generic/tclCmdMZ.c (Tcl_TraceObjCmd,Tcl_RegexpObjCmd,Tcl_RegsubObjCmd,
-	(Tcl_StringObjCmd,Tcl_SubstObjCmd,Tcl_SwitchObjCmd,
-	(TclTraceCommandObjCmd,TclTraceVariableObjCmd):
-	* generic/tclCompCmds.c (TclCompileStringCmd):
-	* generic/tclEvent.c (Tcl_UpdateObjCmd):
-	* generic/tclFileName.c (Tcl_GlobObjCmd):
-	* generic/tclIO.c (Tcl_FileEventObjCmd):
-	* generic/tclIOCmd.c (Tcl_SeekObjCmd,Tcl_ExecObjCmd,Tcl_SocketObjCmd,
-	(Tcl_FcopyObjCmd):
-	* generic/tclInterp.c (Tcl_InterpObjCmd,SlaveObjCmd):
-	* generic/tclNamesp.c (Tcl_NamespaceObjCmd):
-	* generic/tclPkg.c (Tcl_PackageObjCmd):
-	* generic/tclTest.c (Tcltest_Init,TestencodingObjCmd,TestgetplatformCmd,
-	(TestlocaleCmd,TestregexpObjCmd,TestsaveresultCmd,
-	(TestGetIndexFromObjStructObjCmd,TestReportFileAttrStrings):
-	* generic/tclTestObj.c (TestindexObjCmd,TeststringObjCmd):
-	* generic/tclTimer.c (Tcl_AfterObjCmd):
-	* generic/tclVar.c (Tcl_ArrayObjCmd):
-	* mac/tclMacFCmd.c (SetFileFinderAttributes):
-	* unix/tclUnixChan.c (TclpOpenFileChannel):
-	* unix/tclUnixFCmd.c (tclpFileAttrStrings):
-	* unix/tclUnixFile.c (TclpObjAccess,TclpObjChdir,TclpObjStat,
-	(TclpObjLstat):
-	* win/tclWinFCmd.c (tclpFileAttrStrings): Updated callers.
-
-	* doc/RegExp.3:
-	* doc/Utf.3:
-	* generic/tcl.decls:
-	* generic/tclInt.decls:
-	* generic/tclRegexp.c:
-	* generic/tclUtf.c:  Updated APIs in generic/tclUtf.c and
-	generic/tclRegexp.c according to the guidelines of TIP 27.
-	[Patch 471509]
-
-	* generic/regc_locale.c (element,cclass):
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):
-	* generic/tclFileName.c (TclpGetNativePathType,SplitMacPath):
-	* generic/tclIO.c (ReadChars):
-	* mac/tclMacLoad.c (TclpLoadFile):
-	* win/tclWinFile.c (TclpGetUserHome): Updated callers.
-
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h: make genstubs
-
-	* doc/ParseCmd.3 (Tcl_ParseVar):
-	* generic/tcl.decls (Tcl_ParseVar):
-	* generic/tclParse.c (Tcl_ParseVar):
-	* generic/tclTest.c (TestparsevarObjCmd): Updated APIs in
-	generic/tclParse.c according to the guidelines of TIP 27. Updated
-	callers. [Patch 501046]
-	* generic/tclDecls.h: make genstubs
-
-	* generic/tcl.decls (Tcl_RecordAndEval):
-	* generic/tclDecls.h: make genstubs
-	* generic/tclHistory.c (Tcl_RecordAndEval): Updated APIs in
-	generic/tclHistory.c according to the guidelines of TIP 27.
-	[Patch 504091]
-
-	* doc/CrtSlave.3:
-	* generic/tcl.decls (Tcl_CreateAlias, Tcl_CreateAliasObj,
-	(Tcl_CreateSlave, Tcl_GetAlias, Tcl_GetAliasObj, Tcl_GetSlave):
-	* generic/tclInterp.c (Tcl_CreateAlias, Tcl_CreateAliasObj,
-	(Tcl_CreateSlave, Tcl_GetAlias, Tcl_GetAliasObj, Tcl_GetSlave):
-	Updated APIs in the file generic/tclInterp.c according to the
-	guidelines of TIP 27. [Patch 501371]
-	***POTENTIAL INCOMPATIBILITY***
-	Includes a source incompatibility in the targetCmdPtr arguments of the
-	Tcl_GetAlias* routines.
-
-	* generic/tclDecls.h: make genstubs
-
-2002-01-15  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/SetErrno.3 (Tcl_ErrnoMsg): Corrected documentation for
-	Tcl_ErrnoMsg; it takes an integer argument. Thanks to Georgios
-	Petasis. [Bug 468183]
-
-	* doc/AddErrInfo.3 (Tcl_PosixError):
-	* doc/Eval.3 (Tcl_EvalFile):
-	* doc/FileSystem.c (Tcl_FSOpenFileChannel,Tcl_FSOpenFileChannelProc):
-	* doc/OpenFileChnl.3 (Tcl_OpenFileChannel):
-	* doc/SetErrno.3 (Tcl_ErrnoId,Tcl_ErrnoMsg):
-	* doc/Signal.3 (Tcl_SignalId,Tcl_SignalMsg):
-	* generic/tcl.decls (Tcl_ErrnoId,TclErrnoMsg,Tcl_EvalFile,
-	(Tcl_OpenFileChannel,Tcl_PosixError,Tcl_SignalId,Tcl_SignalMsg,
-	(Tcl_FSOpenFileChannel):
-	* generic/tcl.h (Tcl_FSOpenFileChannelProc):
-	* generic/tclIO.c (FlushChannel):
-	* generic/tclIOUtil.c (Tcl_OpenFileChannel,Tcl_EvalFile,TclGetOpenMode,
-	(Tcl_PosixError,Tcl_FSOpenFileChannel):
-	* generic/tclInt.decls (TclGetOpenMode):
-	* generic/tclInt.h (TclOpenFileChannelProc_,TclGetOpenMode,
-	(TclpOpenFileChannel):
-	* generic/tclPipe.c (TclCleanupChildren):
-	* generic/tclPosixStr.c (Tcl_ErrnoId,Tcl_ErrnoMsg,Tcl_SignalId,
-	(Tcl_SignalMsg):
-	* generic.tclTest.c (PretendTclpOpenFileChannel,
-	(TestOpenFileChannelProc1,TestOpenFileChannelProc2,
-	(TestOpenFileChannelProc3,TestReportOpenFileChannel):
-	* mac/tclMacChan.c (TclpOpenFileChannel):
-	* unix/tclUnixChan.c (TclpOpenFileChannel):
-	* win/tclWinChan.c (TclpOpenFileChannel): Updated APIs in
-	generic/tclIOUtil.c and generic/tclPosixStr.c according to the
-	guidelines of TIP 27. Updated callers. [Patch 499196]
-
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h: make genstubs
-
-	* doc/CrtChannel.3:
-	* doc/OpenFileChnl.3:
-	* generic/tcl.decls:
-	* generic/tclIO.h:
-	* generic/tclIO.c (DoWrite, Tcl_RegisterChannel, Tcl_GetChannel,
-	(Tcl_CreateChannel, Tcl_GetChannelName, CloseChannel, Tcl_Write,
-	(Tcl_WriteRaw, Tcl_Ungets, Tcl_BadChannelOption, Tcl_GetChannelOption,
-	(Tcl_SetChannelOption, Tcl_GetChannelNamesEx, Tcl_ChannelName):
-	Updated APIs in the file generic/tclIO.c according to the guidelines
-	of TIP 27. Several minor documentation corrections as well.
-	[Patch 503565]
-	* generic/tclDecls.h: make genstubs
-
-	* generic/tcl.h (Tcl_DriverOutputProc, Tcl_DriverGetOptionProc,
-	(Tcl_DriverSetOptionProc):
-	* generic/tclIOGT.c (TransformOutputProc, TransformGetOptionProc,
-	(TransformSetOptionProc):
-	* mac/tclMacChan.c (FileOutput, StdIOOutput):
-	* man/tclMacSock.c (TcpGetOptionProc, TcpOutput):
-	* unix/tclUnixChan.c (FileOutputProc, TcpGetOptionProc, TcpOutputProc,
-	(TtyGetOptionProc, TtySetOptionProc):
-	* unix/tclUnixPipe.c (PipeOuputProc):
-	* win/tclWinChan.c (FileOutputProc):
-	* win/tclWinConsole.c (ConsleOutputProc):
-	* win/tclWinPipe.c (PipeOuputProc):
-	* win/tclWinSerial.c (SerialOutputProc, SerialGetOptionProc,
-	(SerialSetOptionProc):
-	* win/tclWinSock.c (TcpGetOptionProc, TcpOutput): Updated channel
-	driver interface according to the guidelines of TIP 27. See also
-	[Bug 500348].
-
-	* doc/CrtChannel.3:
-	* generic/tcl.h:
-	* generic/tclIO.c:
-	* generic/tclIO.h:
-	* generic/tclInt.h:
-	* tools/checkLibraryDoc.tcl:
-	Moved Tcl_EolTranslation enum declaration from generic/tcl.h to
-	generic/tclInt.h (renamed to TclEolTranslation). It is not used
-	anywhere in Tcl's public interface.
-
-2002-01-14  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/GetIndex.3:
-	* doc/WrongNumArgs.3:
-	* generic/tcl.decls (Tcl_GetIndexFromObj, Tcl_GetIndexFromObjStruct,
-	(Tcl_WrongNumArgs):
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObj,Tcl_GetIndexFromObjStruct,
-	(Tcl_WrongNumArgs): Updated APIs in the file generic/tclIndexObj.c
-	according to the guidelines of TIP 27. [Patch 501491]
-	* generic/tclDecls.h: make genstubs
-
-2002-01-11  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/configure.in:
-	* win/configure: Regen.
-	* win/configure.in: Use ${libdir} instead of ${exec_prefix}/lib
-	to properly support the --libdir option to configure. [Bug 489370]
-
-2002-01-11  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* win/tclWinSerial.c (SerialSetOptionProc): Applied patch for [Bug
-	500348] supplied by Rolf Schroedter <schroedter@users.sf.net>. The
-	function modified the contents of the the 'value' string and now does
-	not do this anymore. This is a followup to the change made on
-	2001-12-17.
-
-2002-01-11  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: Removed -GD compiler option. It was intended for
-	future use, but MS is again changing the future at their whim. The
-	D4002 warning was harmless though, but someone using VC .NET logged it
-	as a concern. [Bug 501565]
-
-2002-01-11  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Burn Tcl build directory into tcltest executable
-	to avoid crashes caused by ld loading a previously installed version
-	of the tcl shared library. [Bug 218110]
-
-2002-01-10  Don Porter <dgp@users.sourceforge.net>,
-	Kevin Kenny <kennykb@users.sourceforge.net>
-
-	* unix/tclLoadDld.c (TclpLoadFile):  syntax error: unbalanced parens.
-	Kevin notes that it's far from clear that this file is ever included
-	in an actual build; Linux without dlopen appears to be a nonexistent
-	configuration.
-
-2002-01-08  Don Porter <dgp@users.sourceforge.net>,
-	Kevin Kenny <kennykb@users.sourceforge.net>
-
-	* doc/StaticPkg.3 (Tcl_StaticPackage):
-	* generic/tcl.decls (Tcl_StaticPackage):
-	* generic/tclDecls.h (Tcl_StaticPackage):
-	* generic/tclInt.decls (TclGuessPackageName):
-	* generic/tclInt.h (TclGuessPackageName):
-	* generic/tclLoad.c (Tcl_StaticPackage):
-	* generic/tclLoadNone.c (TclGuessPackageName):
-	* mac/tclMacLoad.c (TclGuessPackageName):
-	* unix/tclLoadAout.c (TclGuessPackageName):
-	* unix/tclLoadDl.c (TclGuessPackageName):
-	* unix/tclLoadDld.c (TclGuessPackageName):
-	* unix/tclLoadDyld.c (TclGuessPackageName):
-	* unix/tclLoadNext.c (TclGuessPackageName):
-	* unix/tclLoadOSF.c (TclGuessPackageName):
-	* unix/tclLoadShl.c (TclGuessPackageName):
-	* win/tclWinLoad.c (TclGuessPackageName):  Updated APIs in the files
-	*/tcl*Load*.c according to the guidelines of TIP 27. [Patch 501096]
-
-2002-01-09  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tclTest.c (MainLoop):
-	* tests/main.test (Tcl_Main-1.{3,4,5,6}):  Corrected some non-portable
-	tests from the new Tcl_Main changes. Thanks to Kevin Kenny.
-
-2002-01-07  Don Porter <dgp@users.sourceforge.net>
-
-	* generic/tclEvent.c (TclInExit):
-	* generic/tclIOUtil.c (SetFsPathFromAbsoluteNormalized,
-	(SetFsPathFromAny,Tcl_FSNewNativePath,DupFsPathInternalRep):
-	* generic/tclListObj.c (TclLsetList,TclLsetFlat):  Added some type
-	casts to satisfy picky compilers.
-
-	* generic/tclMain.c:  Bug fix: neglected the NULL case in
-	TclGetStartupScriptFileName(). Broke Tk/wish.
-
-2002-01-05  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/Tcl_Main.3:
-	* generic/tclMain.c:  Substantial rewrite and expanded documentation
-	of Tcl_Main to correct a number of bugs and flaws:
-
-	  - Interactive Tcl_Main can now enter a main loop, exit that loop and
-	    continue interactive operations. The loop may even exit in the
-	    midst of interactive command typing without loss of the partial
-	    command. [Bugs 486453, 474131]
-	  - Tcl_Main now gracefully handles deletion of its master
-	    interpreter.
-	  - Interactive Tcl_Main can now operate with non-blocking stdin
-	  - Interactive Tcl_Main can now detect EOF on stdin even in
-	    mid-command. [Bug 491341]
-	  - Added VFS-aware internal routines for managing the startup script
-	    selection.
-	  - Tcl variable 'tcl_interactive' is now linked to C variable 'tty'
-	    so that one can disable/enable interactive prompts at the script
-	    level when there is no startup script. This is meant for use by
-	    the test suite.
-	  - Consistent use of the Tcl libraries standard channels as returned
-	    by Tcl_GetStdChannel(); as opposed to the channels named 'stdin',
-	    'stdout', and 'stderr' in the master interp, which can be
-	    different or unavailable.
-	  - Tcl_Main now calls Tcl_Exit() if evaluation of [exit] in the
-	    master interpreter returns, assuring Tcl_Main does not return.
-	  - Documented Tcl_Main's absence from public stub table
-	  - Documented that Tcl_Main does not return.
-	  - Documented Tcl variables set by Tcl_Main.
-	  - All prompts are done from a single procedure, Prompt.
-	  - Use of Tcl_Obj-enabled interfaces everywhere.
-
-	* generic/tclInt.decls (TclGetStartupScriptPath,
-	(TclSetStartupScriptPath): New internal VFS-aware routines for
-	managing the startup script of Tcl_Main.
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c: make genstubs
-
-	* generic/tclTest.c (TestsetmainloopCmd,TestexitmainloopCmd,
-	(Tcltest_Init,TestinterpdeleteCmd):
-	* tests/main.test (new):  Added new file to test suite that thoroughly
-	tests generic/tclMain.c; added some new test commands for testing
-	Tcl_SetMainLoop().
-
-2002-01-04  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/Alloc.3:
-	* doc/Concat.3:
-	* doc/CrtMathFnc.3:
-	* doc/Hash.3:
-	* doc/Interp.3:
-	* doc/LinkVar.3:
-	* doc/ObjectType.3:
-	* doc/PkgRequire.3:
-	* doc/Preserve.3:
-	* doc/SetResult.3:
-	* doc/SplitList.3:
-	* doc/SplitPath.3:
-	* doc/TCL_MEM_DEBUG.3: Updated documentation to describe the ckalloc,
-	ckfree, ckrealloc, attemptckalloc, and attemptckrealloc macros, and
-	to accurately describe when and how they are used. [Bug 497459]
-
-	* generic/tclThreadJoin.c (TclRememberJoinableThread,TclJoinThread):
-	Replaced Tcl_Alloc and Tcl_Free calls with ckalloc and ckfree so that
-	memory debugging is supported.
-
-2002-01-04  Daniel Steffen <das@users.sourceforge.net>
-
-	* mac/tclMacTime.c (TclpGetTZName): fix for daylight savings TZName bug
-
-2002-01-03  Don Porter <dgp@users.sourceforge.net>
-
-	* doc/FileSystem.3:
-	* generic/tclIOUtil.c: Updated some old uses of "fileName" to
-	new VFS terminology, "pathPtr".
-
-2002-01-03  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/basic.test (basic-39.4): Greatly simplified test while
-	still leaving it so that it crashes when run without the fix to
-	the [foreach] implementation.
-	* generic/tclCmdAH.c (Tcl_ForeachObjCmd): Stopped [Bug 494348] from
-	happening by not trying to be so clever with cacheing; if nothing
-	untoward is happening anyway, the less efficient technique will
-	only add a few instruction cycles (one function call and a few
-	derefs/assigns per list per iteration, with no change in the
-	number of tests) and if something odd *is* going on, the code is
-	now far more robust.
-
-	* tests/basic.test (basic-39.4): Reproducable script from [Bug 494348]
-
-2002-01-02  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/util.test (Wrapper_Tcl_StringMatch,util-5.*): Rewrote so the
-	test is performed with the right internal function since [string
-	match] no longer uses Tcl_StringCaseMatch internally.
-
-	* tests/string.test (string-11.51):
-	* generic/tclUtf.c (Tcl_UniCharCaseMatch):
-	* generic/tclUtil.c (Tcl_StringCaseMatch): Fault with matching
-	case-insensitive non-ASCII patterns containing upper case characters.
-	[Bug 233257]
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"             ***
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"             ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/ChangeLog.2003 b/ChangeLog.2003
deleted file mode 100644
index d0f4ebc..0000000
--- a/ChangeLog.2003
+++ /dev/null
@@ -1,3349 +0,0 @@
-2003-12-25  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWin32Dll.c (DllMain): Add HAVE_NO_SEH blocks in place of
-	__try and __except statements to support gcc builds. This is needed
-	after David's changes on 2003-12-21. [Patch 858493]
-
-2003-12-23  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclAlloc.c:	All uses of 'panic' (the macro) changed to
-	* generic/tclBasic.c:	'Tcl_Panic' (the function). The #define of
-	* generic/tclBinary.c:	panic in tcl.h clearly states it is deprecated
-	* generic/tclCkalloc.c:	in the comments. [Patch 865264]
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclCompCmds.c:
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclConfig.c:
-	* generic/tclDictObj.c:
-	* generic/tclEncoding.c:
-	* generic/tclEvent.c:
-	* generic/tclExecute.c:
-	* generic/tclHash.c:
-	* generic/tclInterp.c:
-	* generic/tclIO.c:
-	* generic/tclIOCmd.c:
-	* generic/tclIOUtil.c:
-	* generic/tclListObj.c:
-	* generic/tclLiteral.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclParse.c:
-	* generic/tclPathObj.c:
-	* generic/tclPkg.c:
-	* generic/tclPreserve.c:
-	* generic/tclProc.c:
-	* generic/tclStringObj.c:
-	* generic/tclTest.c:
-	* generic/tclThreadAlloc.c:
-	* generic/tclTimer.c:
-	* generic/tclTrace.c:
-	* generic/tclVar.c:
-	* mac/tclMacChan.c:
-	* mac/tclMacOSA.c:
-	* mac/tclMacResource.c:
-	* mac/tclMacSock.c
-	* mac/tclMacThrd.c:
-	* unix/tclUnixChan.c:
-	* unix/tclUnixNotfy.c:
-	* unix/tclUnixThrd.c:
-	* unix/tclXtNotify.c:
-	* win/tclWin32Dll.c:
-	* win/tclWinChan.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinNotify.c:
-	* win/tclWinPipe.c:
-	* win/tclWinSock.c:
-	* win/tclWinThrd.c:
-
-	* generic/tclInt.h:  Deprecated use of Tcl_Ckalloc changed to
-	Tcl_Alloc in the TclAllocObjStorage macro.
-
-2003-12-22  David Gravereaux <davygrvy@pobox.com>
-
-	* win/nmakehlp.c:
-	* win/rules.vc:  New feature for extensions that use rules.vc. Now
-	reads header files for version strings. No more hard coding
-	TCL_VERSION = 8.5 and having to edit it when you swap cores.
-
-	* win/makefile.vc: VERSION macro now set by reading tcl.h for it.
-
-	* generic/tcl.h: Removed note that makefile.vc needs to have a version
-	number changed.
-
-2003-12-21  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWin32Dll.c: Structured Exception Handling added around
-	Tcl_Finalize called from DllMain's DLL_PROCESS_DETACH. We can't be
-	100% assured that Tcl is being unloaded by the OS in a stable
-	condition and we need to protect the exit handlers should the stack be
-	in a hosed state. AT&T style assembly for SEH under MinGW has not been
-	added yet. This is a first part change for [Patch 858493]
-
-2003-12-17  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclBinary.c (DeleteScanNumberCache): fixed crashing bug when
-	numeric scan-value cache contains NULL value.
-
-2003-12-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclCmdAH.c:
-	* unix/tclUnixFile.c:
-	* win/tclWinFCmd.c:
-	* tests/fCmd.test:
-	* tests/fileSystem.test:
-	* doc/file.n: final fix to support for relative links and its
-	implications on normalization and other parts of the filesystem code.
-	Fixes [Bug 859251] and some Windows problems with recursive file
-	delete/copy and symbolic links.
-
-2003-12-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c:
-	* tests/fileSystem.test: fix and tests for [Bug 860402] in new file
-	normalization code.
-
-2003-12-17  Zoran Vasiljevic  <zv@archiware.com>
-
-	* generic/tclIOUtil.c: fixed 2 memory (object) leaks. [Bug 839519]
-
-	* generic/tclPathObj.c: fixed Tcl_FSGetTranslatedPath to always return
-	properly refcounted path object. [Bug 861515]
-
-2003-12-16  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fCmd.test: marking fCmd-9.14.2, as nonPortable, since on
-	Solaris one can change the name of the current directory with 'file
-	rename'.
-	* doc/FileSystem.3: clarified documentation on ownership of return
-	objects/strings of some Tcl_FS* calls.
-
-2003-12-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclThreadAlloc.c (binfo): Made variable file-local.
-
-2003-12-15  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tcl.rc:
-	* win/tclsh.rc: Slight modification to the STRINGIFY macro to support
-	Borland's rc tool.
-
-	* win/tclWinFile.c (TclpUtime) : utimbuf struct not a problem with
-	Borland.
-
-	* win/tclWinTime.c (TclpGetDate) : Borland's localtime() has a slight
-	behavioral difference.
-
-	From Helmut Giese <hgiese@ratiosoft.com> [Patch 758097].
-
-2003-12-14  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclInt.decls: commented-out entry for TclpCheckStackSpace,
-	removing it from the Stubs table. It's already declared in tclInt.h
-	and labeled as a function that is not to be exported. Regened tables.
-
-2003-12-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd): TIP#75 Implementation
-	* tests/switch.test:	Can now get submatch information when using
-	* doc/switch.n:		-regexp matching in [switch].
-
-2003-12-14  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: complete rewrite of generic file normalization
-	code to cope with links followed by '..'. [Bug 849514], and parts of
-	[Bug 859251]
-
-2003-12-12  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinChan.c: Win32's SetFilePointer() takes LONGs not DWORDs (a
-	signed/unsigned mismatch). Redid local vars to avoid all casting
-	except where truly required.
-
-2003-12-12  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclCmdAH.c: fix to normalization of non-existent user name
-	('file normalize ~nobody') [Bug 858937]
-	* doc/file.n: clarify behaviour of 'file link' when the target is not
-	an absolute path.
-	* doc/filename.n: correct documentation to say that Windows Tcl does
-	handle '~user', for recent Windows releases, and clarified distinction
-	between MacOS 'classic' and MacOS X.
-	* doc/glob.n: clarification of glob's behaviour when returning
-	filenames starting with a '~'.
-
-	* tests/fileSystem.test:
-	* tests/fileName.test: new tests added for the normalization problem
-	above and other recentlt reported issues.
-
-	* win/tclWinFile.c: corrected unclear comments
-
-	* unix/tclUnixFile.c: allow creation of relative links. [Bug 833713]
-
-2003-12-11  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinSock.c (SocketThreadExitHandler) : added a TerminateThread
-	fallback just in case the socket handler thread is really in a paused
-	state. This can happen when Tcl is being unloaded by the OS from an
-	exception handler. See MSDN docs on DllMain, it states this behavior.
-
-2003-12-09  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:
-	* unix/tcl.m4: updated OpenBSD build configuration based on
-	[Patch #775246] (cassoff)
-
-2003-12-09  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tclUnixPort.h:	#ifdef'd out declarations of errno which are
-	* tools/man2tcl.c:	known to cause problems with recent glibc.
-				[Bug 852369]
-
-2003-12-09  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFile.c: fix to NT file permissions code [Bug 855923]
-	* tests/winFile.test: added tests for NT file permissions - patch and
-	test scripts supplied by Benny.
-
-	* tests/winFCmd.test: fixed one test for when not running in C:/
-
-2003-12-02  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclBinary.c (DeleteScanNumberCache, ScanNumber): Made the
-	numeric scan-value cache have proper references to the objects within
-	it so strange patterns of writes won't cause references to freed
-	objects. Thanks to Paul Obermeir for the report. [Bug 851747]
-
-2003-12-01  Miguel Sofer <msofer@users.sf.net>
-
-	* doc/lset.n: fix typo [Bug 852224]
-
-2003-11-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParse.c:	Corrected faulty check for trailing white
-	space in {expand} parsing. Thanks Andreas Leitgeb. [Bug 848262]
-	* tests/parse.test: 	New tests for the bug.
-
-2003-11-24  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: fix to [Bug 845778] - Infinite recursion on
-	[cd] (Windows only bug), for which new tests have just been added.
-
-2003-11-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/winFCmd.test (winFCmd-16.10,11): Merged new tests from
-	core-8-4-branch.
-
-2003-11-20  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c: fix flag bit collision between LOOKUP_FOR_UPVAR
-	and TCL_PARSE_PART1 (deprecated) [Bug 835020]
-
-2003-11-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/compile.test (compile-16.22.0):	Improved test for the recent
-	fix for Bug 845412.
-
-2003-11-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompile.c (TclCompileScript): Added a guard for the
-	expansion code so that long non-expanding commands don't get expansion
-	infrastructure inserted in them, especially when that infrastructure
-	isn't initialised. [Bug 845412]
-
-2003-11-18  David Gravereaux <davygrvy@pobox.com>
-
-	* contrib/djgpp/Makefile:		Changes from Victor Wagner
-	* contrib/djgpp/langinfo.c (new):	<vitus@45.free.net> for better
-	* contrib/djgpp/langinfo.h (new):	DJGPP support.
-	* unix/tclUnixInit.c:			.
-	* unix/tclUnixChan.c:			.
-	* unix/tclUnixFCmd.c:			.
-
-2003-11-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/reg.test: Added tests for [Bugs 230589, 504785, 505048, 840258]
-	recently fixed by 2003-11-15 commit to regcomp.c by Pavel Goran. His
-	notes on the fix: This bug results from an error in code that splits
-	states into "progress" and "no-progress" ones. This error causes an
-	interesting situation with the precollected single-linked list of
-	states to be splitted: many items were added to the list, but only
-	several of them are accessible from the list beginning, since the
-	"tmp" member of struct state (which is used here to hold a pointer to
-	the next list item) gets overwritten, which results in a "looped"
-	chain. As a result, not all of states are splitted, and one state is
-	splitted two times, causing incorrect "no-progress" flag values.
-
-2003-11-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Make sure that
-	Tcl_AsyncInvoke is called regularly when processing bytecodes.
-	* generic/tclTest.c (AsyncThreadProc, TestasyncCmd): Extended testing
-	harness to send an asynchronous marking without relying on UNIX
-	signals.
-	* tests/async.test (async-4.*): Tests to check that async events are
-	handled by the bytecode core. [Bug 746722]
-
-2003-11-15  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclTest.c (TestHashSystemHashCmd): Removed 'const' modifier
-	from hash type structure; it should be const and the hash code assumes
-	it behaves like const, but that's not how the API is defined. Like
-	this, we are following in the same footsteps as Tcl_RegisterObjType()
-	which has the same conditions on its argument. Stops VC++5.2 warning.
-	[Bug 842511]
-
-2003-11-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclHash.c (Tcl_DeleteHashTable,Tcl_HashStats,RebuildTable):
-	* generic/tclTest.c (TestHashSystemHashCmd): TIP#138 implementation,
-	* tests/misc.test:	plus a new chunk of stuff to test the hash
-				functions more thoroughly in the test suite.
-				[Patch 731356, modified]
-
-	* doc/Tcl.n: Updated Tcl version number and changebars.
-
-2003-11-14  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/ParseCmd.3:	Implementation of TIP 157.  Adds recognition
-	* doc/Tcl.n:		of the new leading {expand} syntax on words.
-	* generic/tcl.h:	Parses such words as the new Tcl_Token type
-	* generic/tclBasic.c:	TCL_TOKEN_EXPAND_WORD. Updated Tcl_EvalEx and
-	* generic/tclCompile.c: the bytecode compiler/execution engine to
-	* generic/tclCompile.h:	recognize the new token type. New opcodes
-	* generic/tclExecute.c:	INST_LIST_VERIFY and INST_INVOKE_EXP and a new
-	* generic/tclParse.c:	operand type OPERAND_ULIST1 are defined. Docs
-	* generic/tclTest.c:	and tests are included.
-	* tests/basic.test:
-	* tests/compile.test:
-	* tests/parse.test:
-
-	* library/auto.tcl:	Replaced several [eval]s used to perform
-	* library/package.tcl:	argument expansion with the new syntax. In the
-	* library/safe.tcl:	test files lindex.test and lset.test, replaced
-	* tests/cmdInfo.test:	use of [eval] to force direct string
-	* tests/encoding.test:	evaluation with use of [testevalex] which more
-	* tests/execute.test:	directly and robustly serves the same purpose.
-	* tests/fCmd.test:
-	* tests/http.test:
-	* tests/init.test:
-	* tests/interp.test:
-	* tests/io.test:
-	* tests/ioUtil.test:
-	* tests/iogt.test:
-	* tests/lindex.test:
-	* tests/lset.test:
-	* tests/namespace-old.test:
-	* tests/namespace.test:
-	* tests/pkg.test:
-	* tests/pkgMkIndex.test:
-	* tests/proc.test:
-	* tests/reg.test:
-	* tests/trace.test:
-	* tests/upvar.test:
-	* tests/winConsole.test:
-	* tests/winFCmd.test:
-
-2003-11-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/cmdMZ.test (cmdMZ-1.4): change to nonPortable as more systems
-	are using permissions caching, and this isn't really a Tcl controlled
-	issue.
-
-2003-11-11  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:
-	* unix/tcl.m4: improve AIX --enable-64bit handling
-	remove -D__NO_STRING_INLINES -D__NO_MATH_INLINES from CFLAGS_OPTIMIZE
-	on Linux. Make default opt -O2 (was -O).
-
-2003-11-11  David Gravereaux <davygrvy@pobox.com>
-
-	* contrib/djgpp/Makefile:  Suggested changes from vitus@45.free.net
-	(Victor Wagner)
-
-	* unix/tclUnixPort.h:  added socklen_t typedef for DJGPP
-
-2003-11-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tclUnixInit.c (TclpInitLibraryPath):
-	* win/tclWinInit.c (TclpInitLibraryPath):	Fix for [Bug 832657]
-	that should not run afoul of startup constraints.
-
-	* library/dde/pkgIndex.tcl:	Added safeguards so that registry and
-	* library/reg/pkgIndex.tcl:	dde packages are not offered on
-	* win/tclWinDde.c:		non-Windows platforms. Bumped to
-	* win/tclWinReg.c:		registry 1.1.3 and dde 1.3.
-	* win/Makefile.in:
-	* win/configure.in:
-	* win/makefile.bc:
-	* win/makefile.vc:
-
-	* win/configure:	autoconf (2.57)
-
-2003-11-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/cmdIL.test: Stopped cmdIL-5.5 from stomping over the test
-	command, and updated the tests to use some tcltest2 features in
-	relation to cleanup. [Bug 838384]
-
-2003-11-10  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclCmdAH.c:
-	* tests/fCmd.test: fix to misleading error message in 'file link'.
-	[Bug 836208]
-
-2003-11-07  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to compiler warning/error with some
-	compilers. [Bug 835918]
-
-2003-11-07  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: optimized builds define NDEBUG to turn off
-	ThreadAlloc range checking.
-
-2003-11-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (unixInit-2.10):  New test to expose [Bug 832657]
-	failure of TclpInitLibraryPath() to properly handle .. in the path
-	of the executable.
-
-2003-11-04  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: added 'test' target.
-
-2003-11-03  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c
-	* generic/tclInt.h: added comments and re-arranged code to clarify
-	distinction between Tcl_LoadHandle, ClientData for 'load'ed code, and
-	point out limitations of the design introduced with Tcl 8.4.
-
-	* unix/tclUnixFile.c: fix to memory leak
-
-	* generic/tclCmdIL.c: removed warning on Windows.
-
-2003-11-01  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LrepeatObjCmd): Check for sensible list
-	lengths and allow for soft failure of the memory subsystem in the
-	[lconcat] command [Bug 829027]. Uses direct list creation to avoid
-	extra copies when working near the limit of available memory. Also
-	reorganized to encourage optimizing compilers to optimize heavily.
-	* generic/tclListObj.c (TclNewListObjDirect): New list constructor
-	that does not copy the array of objects. Useful for creating
-	potentially very large lists or where you are about to throw away the
-	array argument which is being used in its entirety.
-
-2003-10-28  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (NEXT_INST macros): replaced macro variable
-	"result" by "resultHandling" to avoid confusion.
-
-2003-10-23  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/tclUnixChan.c (Tcl_MakeFileChannel): Applied [Patch 813606]
-	fixing [Bug 813087]. Detection of sockets was off for Mac OS X which
-	implements pipes as local sockets. The new code ensures that only IP
-	sockets are detected as such.
-
-	* win/tclWinSock.c (TcpWatchProc): Watch for FD_CLOSE too when asked
-	for writable events by the generic layer.
-	(SocketEventProc): Generate a writable event too when a close is
-	detected.
-
-	  Together the changes fix [Bug 599468].
-
-2003-10-23  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/resource.test:
-	* mac/tclMacResource.c: fix to resource freeing problem in 'resource'
-	command reported by Bernard Desgraupes.
-
-	* doc/FileSystem.3: updated documentation for 'glob' fix on 2003-10-13
-	below
-
-2003-10-22  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdAH.c (Tcl_FileObjCmd): Changed FILE_ prefix to FCMD_
-	to stop symbol/#def clashes on Cygwin/Mingw32 on NT. [Bug 822528]
-
-2003-10-21   Daniel Steffen  <das@users.sourceforge.net>
-
-	* tools/tcltk-man2html.tcl: fixed incorrect html generated for
-	.IP/.TP lists, now use <DL><DT>...<DD>...<P><DT>...<DD>...</DL>
-	instead of illegal  <DL><P><DT>...<DD>...<P><DT>...<DD>...</DL>.
-	Added skipping of directives directly after .TP to avoid them being
-	used as item descriptions, e.g. .TP\n.VS in clock.n.
-
-2003-10-21  Andreas Kupries  <andreask@pliers.activestate.com>
-
-	* win/tclWinPipe.c (BuildCommandLine): Applied the patch coming with
-	[Bug 805605] to the code, fixing the incorrect use of ispace noted by
-	Ronald Dauster <ronaldd@users.sourceforge.net>.
-
-2003-10-20  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	* doc/msgcat.n:
-	* library/msgcat/msgcat.tcl (mclocale,mcload):
-	* tools/tcl.wse.in:
-	* unix/Makefile.in:     Implementation of TIP#156, add a "root locale"
-	* win/makefile.bc:      to the 'msgcat' package. Advanced msgcat
-	* win/Makefile.in:      version number to 1.4
-	* win/Makefile.vc:
-
-2003-10-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdIL.c (SortInfo,etc): Reorganized so that SortInfo
-	carries an array of integer indices instead of a Tcl list. This nips
-	shimmering problems in the bud and simplifies SelectObjFromSublist at
-	the cost of making setup slightly more complex. [Bug 823768]
-
-2003-10-14  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclAppInit.c (sigHandler): Punt gracefully if exitToken has
-	already been destroyed.
-
-2003-10-14  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:
-	* tests/regexp.test: fix to [Bug 823524] in regsub; added three new
-	tests.
-
-2003-10-14  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclAppendObjToErrorInfo):	New internal routine
-	that appends a Tcl_Obj to the errorInfo, saving the caller the trouble
-	of extracting the string rep.
-
-	* generic/tclStringObj.c (TclAppendLimitedToObj):	New internal
-	routine that supports truncated appends with optional ellipsis marking.
-	This single routine supports UTF-8-safe truncated appends needed in
-	several places throughout the Tcl source code, mostly for error and
-	stack messages. Clean fix for [Bug 760872].
-
-	* generic/tclInt.h:	Declarations for new internal routines.
-
-	* generic/tclCmdMZ.c:	Updated callers to use the new routines.
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclExecute.c:
-	* generic/tclIOUtil.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclParseExpr.c:
-	* generic/tclProc.c:
-	* generic/tclStringObj.c:
-	* mac/tclMacResource.c:
-
-	* library/init.tcl:	Updated ::errorInfo cleanup in [unknown] to
-	reflect slight modifications to Tcl_LogCommandInfo(). Corrects failing
-	init-4.* tests.
-
-2003-10-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	TIP#127 IMPLEMENTATION FROM JOE MICHAEL SCHLENKER
-
-	* generic/tclCmdIL.c (SelectObjFromSublist): Element selection engine.
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd, Tcl_LsortObjCmd):
-	* tests/lsearch.test:	Set up and use of element selection engine,
-	* tests/cmdIL.test:	plus tests and documentation.
-	* doc/lsearch.n:	Based on [Patch 693836]
-	* doc/lsort.n:
-
-2003-10-13  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tcl.h:
-	* generic/tclFileName.c:
-	* generic/tclIOUtil.c:
-	* generic/tclPathObj.c:
-	* generic/tclTest.c:
-	* mac/tclMacFile.c:
-	* tests/fileName.test: better tests for [Bug 813273]
-	* unix/tclUnixFCmd.c:
-	* unix/tclUnixFile.c:
-	* win/tclWin32Dll.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c:
-	* win/tclFileInt.h:
-
-	Fixed [Bug 800106] in which 'glob' was incapable of merging the
-	results of a directory listing (real or virtual) and any virtual
-	filesystem mountpoints in that directory (the latter were ignored).
-	This meant boundaries between different filesystems were not seamless
-	(e.g. 'glob */*' across a filesystem boundary was wrong). Added new
-	entry to Tcl_GlobTypeData in a totally backwards compatible way. To
-	allow listing of mounts, registered filesystems must support the
-	'TCL_GLOB_TYPE_MOUNT' flag. If this is not supported (e.g. in tclvfs
-	1.2) then mounts will simply not be listed for that filesystem.
-
-	Fixed [Bug 749876] 'file writable/readable/etc' (NativeAccess) using
-	correct permission checking code for Windows NT/2000/XP where more
-	complex user-based security/access priveleges are available,
-	particularly on shared volumes. The performance impact of this extra
-	checking will need further investigation. Note: Win 95,98,ME have no
-	support for this.
-
-	Also made better use of normalized rather than translated paths in the
-	platform specific code.
-
-2003-10-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixTest.c (TestalarmCmd): don't bother checking return
-	value of alarm. [Bug #664755] (english)
-
-2003-10-09  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc:  Applied patches for bug #801467 by Joe Mistachkin
-	* win/tclAppInit.c: to fix incompatible TCL_MEM_DEBUG handling in
-	* generic/tclObj.c: Win32 VC builds.
-
-2003-10-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Save and restore the iPtr->flag bits that
-	control the state of errorCode and errorInfo management when calling
-	"leave" execution traces, so that all error information of the traced
-	command is still available whether traced or not. [Bug 760947]
-	Thanks to Yahalom Emet.
-
-2003-10-08  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclTest.c (TestNumUtfCharsCmd): Command to allow finer
-	access to Tcl_NumUtfChars for testing.
-	* generic/tclUtf.c (Tcl_NumUtfChars): Corrected string length
-	determining when the length parameter is negative; the terminator is a
-	zero byte, not (necessarily) a \u0000 character. [Bug 769812]
-
-2003-10-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/cmdAH.test:
-	* tests/exec.test:		Corrected temporary file management
-	* tests/fileSystem.test:	issues uncovered by -debug 1 test
-	* tests/io.test:		operations. Also backported some
-	* tests/ioCmd.test:		other fixes from the HEAD.
-	* tests/main.test:
-	* tests/pid.test:		[Bugs 675605, 675655, 675659]
-	* tests/socket.test:
-	* tests/source.test:
-
-	* tests/fCmd.test:	Run tests with the [temporaryDirectory] as the
-	current directory, so that tests can depend on ability to write files.
-	[Bug 575837]
-
-	* doc/OpenFileChnl.3:	Updated Tcl_Tell and Tcl_Seek documentation to
-	reflect that they now return Tcl_WideInt (TIP 72). [Bug 787537]
-
-	* tests/io.test:	Corrected several tests that failed when paths
-	* tests/ioCmd.test:	included regexp-special chars. [Bug 775394]
-
-2003-10-06  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/configure:
-	* win/tcl.m4: removed incorrect checks for existence of optimization.
-	TCL_CFG_OPTIMIZED is now defined whenever the user does not build with
-	--enable-symbols.
-
-2003-10-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/regexp.test:		Matched [makeFile] with [removeFile].
-	* tests/regexpComp.test:	[Bug 675652]
-
-	* tests/fCmd.test (fCmd-8.2):	Test only that tilde-substitution
-	happens, not for any particular result. [Bug 685991]
-
-	* unix/tcl.m4 (SC_PATH_TCLCONFIG):	Corrected search path so that
-	alpha and beta releases of Tcl are not favored. [Bug 608698]
-
-	* tests/reg.test:	Corrected duplicate test names.
-	* tests/resource.test:	[Bugs 710370, 710358]
-	* tests/dict.test:
-
-	* tests/dict.test:	Updated [package require tcltest] lines to
-	* tests/fileSystem.test:	indiciate that these test files
-	* tests/lrepeat.test:	use features of tcltest 2.  [Bug 706114]
-	* tests/notify.test:
-	* tests/parseExpr.test:
-	* tests/unixNotfy.test:
-	* tests/winDde.test:
-
-2003-10-04  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TEBC):
-	* tests/execute.test (execute-8.2): fix for [Bug 816641] - faulty
-	execution and catch stack management.
-
-2003-10-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Fixed error in ref count management of command
-	* generic/tclCmdMZ.c:	and execution traces that caused access to
-	freed memory in trace-32.1. [Bug 811483]
-
-2003-10-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclTrace.c: Corrected comingling of introspection results of
-	[trace info command] and [trace info execution]. [Bug 807243]
-	Thanks to Mark Saye.
-
-2003-10-01  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: fixed redo prebinding bug when DESTDIR="".
-	* mac/tclMacResource.c: fixed possible NULL dereference (bdesgraupes).
-
-2003-09-29  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c:
-	* tests/fileName.test: fix to inconsistent handling of backslash
-	path separators on Windows in 'file join' [Bug 813273]
-
-2003-09-29  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclPathObj.c (TclNativePathInFilesystem,TclFSGetPathType):
-	* generic/tclIOUtil.c (TclNativeDupInternalRep,TclGetPathType): Rename
-	to make sure function names won't interfere with other non-Tcl code
-	(reported by George Staplin)
-
-	TIP#121 IMPLEMENTATION FROM JOE MISTACHKIN
-
-	* generic/tclEvent.c (Tcl_SetExitProc,Tcl_Exit): Implementation of
-	application exit handler scheme.
-	* generic/tcl.decls (Tcl_SetExitProc): Public declaration.
-	* doc/Exit.3: Documentation of new API function.
-
-	TIP#112 IMPLEMENTATION
-
-	* generic/tclNamesp.c: Core of implementation.
-	* generic/tclInt.h (Namespace,TclInvalidateNsCmdLookup): Add command
-	list epoch counter and list of ensembles to namespace structure, and
-	define a macro to ease update of the epoch counter.
-	* generic/tclBasic.c (Tcl_CreateObjCommand,etc.): Update epoch counter
-	when list of commands in a namespace changes.
-	* generic/tclObj.c (TclInitObjSubsystem): Register ensemble subcommand
-	type.
-	* tests/namespace.test (42.1-47.6): Tests.
-	* doc/namespace.n: Documentation.
-
-	* library/http/http.tcl (geturl): Correctly check the type of
-	boolean-valued options. [Bug 811170]
-
-	* unix/tcl.m4 (SC_ENABLE_FRAMEWORK): Added note to make it clearer
-	that this is an OSX feature, not a general Unix feature. [Bug 619440]
-
-2003-09-28  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinPipe.c: The windows port of expect can call
-	TclWinAddProcess before any of the other pipe functions. Added a
-	missing PipeInit() call to make sure the initialization happens.
-
-2003-09-25  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: ensure SYMROOT exists if OBJROOT is overridden on
-	command line. Replaced explict use of /usr/bin by ${BINDIR}.
-
-2003-09-24  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* library/package.tcl (tcl::MacPkgUnknown, tcl::MacOSXPkgUnknown):
-	Minor performance tweaks to reduce the number of [file] invocations.
-	Meant to improve startup times, at least a little bit. (The generic
-	equivalent patch was applied on 2003-02-21).
-
-2003-09-24  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* trace.test: removed 'knownBug' from a test which doesn't illustrate
-	a bug, just a bad test.
-
-2003-09-23  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c:
-	* generic/tclInt.h: changed the evaluation-stack addressing mode, from
-	array-style to pointer-style; the catch stack and evaluation stack are
-	now contiguous in memory. [Patch 457449]
-
-2003-09-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/trace.test (trace-31,32-*):  Added tests for [Bug 807243] and
-	[Bug 811483].
-
-	* library/init.tcl (auto_load, auto_import):  Expanded Eric Melski's
-	2000-01-28 fix for [Bug 218871] to all potentially troubled uses of
-	[info commands] on input data, where glob-special characters could
-	cause problems.
-
-2003-09-20  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/expr.test (expr-23.4): Prevented accidental wrapping round of
-	exponential operation; it isn't portable, and not what I intended to
-	test either. [Bug 808244]
-
-2003-09-19  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c: adding (DE)CACHE_STACK_INFO() pairs to protect
-	all calls that may cause traces on ::errorInfo or ::errorCode to
-	corrupt the stack. [Bug 804681]
-
-2003-09-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tclPathObj.c: fix to test-suite problem introduced by the bug fix
-	below. No problem in ordinary code, just test suite code which
-	manually adjusts tclPlatform. [Bug 808247]
-
-2003-09-16  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/filename.n: documentation of Windows-specific feature as
-        discussed in [Bug 541989]
-	* generic/tclPathObj.c: fix for normalization of volume-relative paths
-	[Bug 767834]
-        * tests/winFCmd.test: new tests for both of the above.
-	* tests/cmdAH.test: fix for AFS problem in test suite [Bug 748960]
-
-2003-09-13  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	TIP#123 IMPLEMENTATION BASED ON WORK BY ARJEN MARKUS
-
-	* generic/tclCompile.h (INST_EXPON):		Implementation of
-	* generic/tclCompile.c (tclInstructionTable):	exponential operator.
-	* generic/tclCompExpr.c (operatorTable):
-	* generic/tclParseExpr.c (ParseExponentialExpr, GetLexeme):
-	* generic/tclExecute.c (TclExecuteByteCode, ExponWide, ExponLong):
-	(IllegalExprOperandType):
-	* tests/expr.test:
-	* tests/compExpr-old.test:
-	* doc/expr.n:
-
-2003-09-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/opt/optparse.tcl:	Latest revisions caused [OptGuessType]
-	to guess "int" instead of "string" for empty strings. Missed the
-	required "-strict" option to [string is]. Thanks to Revar Desmera.
-	[Bug 803968]
-
-2003-09-08  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinLoad.c (TclpDlopen): Changed the error message for
-	ERROR_PROC_NOT_FOUND to be a bit more helpful in giving us clues.
-	"can't find specified procedure" means a function in the import table,
-	for implicit loading, couldn't be resolved and that's why the load
-	failed.
-
-2003-09-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/Tcl_Main.3:
-	* doc/FileSystem.3:				Implementation of
-	* doc/source.n:					TIPs 137/151. Adds a
-	* doc/tclsh.1:					-encoding option to
-	* generic/tcl.decls:				the [source] command
-	* generic/tclCmdMZ.c (Tcl_SourceObjCmd):	and a new C routine,
-	* generic/tclIOUtil.c (Tcl_FSEvalFileEx):	Tcl_FSEvalFileEx(),
-	* generic/tclMain.c (Tcl_Main):			that provides C access
-	* mac/tclMacResource.c (Tcl_MacSourceObjCmd):	to the same function.
-	* tests/cmdMZ.test:				Also adds command line
-	* tests/main.test:	option handling in Tcl_Main() so that tclsh
-	* tests/source.test:	and other apps built on Tcl_Main() respect a
-	-encoding command line option before a script filename. Docs and tests
-	updated as well. [Patch 742683]
-	This is a ***POTENTIAL INCOMPATIBILITY*** only for those C programs
-	that embed Tcl, build on Tcl_Main(), and make use of Tcl_Main's former
-	ability to pass a leading "-encoding" option to interactive shell
-	operations.
-
-	* generic/tclInt.decls:				Added internal stub
-	* generic/tclMain.c (Tcl*StartupScript*):	table entries for two
-	new functions Tcl_SetStartupScript() and Tcl_GetStartupScript() that
-	set/get the path and encoding for the startup script to be evaluated
-	by either Tcl_Main() or Tk_Main(). Given public names in anticipation
-	of their exposure by a followup TIP.
-
-	* generic/tclDecls.h:		make genstubs
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-
-2003-09-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/SplitList.3:	Implementation of TIP 148.  Fixes [Bug 489537].
-	* generic/tcl.h:	Updated Tcl_ConvertCountedElement() to quote
-	* generic/tclUtil.c:	the leading "#" character of all list elements
-	unless the TCL_DONT_QUOTE_HASH flag is passed in.
-
-	* generic/tclDictObj.c:	Updated Tcl_ConvertCountedElement() callers
-	* generic/tclListObj.c:	to pass in the TCL_DONT_QUOTE_HASH flags
-	* generic/tclResult.c:	when appropriate.
-
-2003-08-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/return.n:	Updated [return] docs to cover new TIP 90 features.
-
-	* doc/break.n:		Added SEE ALSO references to return.n
-	* doc/continue.n:
-
-2003-09-01  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/Namespace.3: Basic documentation for the TIP#139 functions. This
-	will need improving, but the basic bits are there at least.
-
-2003-08-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/catch.n:	Updated [catch] docs to cover new TIP 90 features.
-
-2003-08-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdAH.c:	Corrected bug in TIP 90 implementation where
-	* tests/cmdMZ.test:	the default -errorcode NONE value was not
-	copied into the return options dictionary. This correction modified
-	one test result.
-
-2003-08-27  David Gravereaux <davygrvy@pobox.com>
-
-	* compat/strftime.c (_fmt): Removed syst array intializer that
-	couldn't take variables within it under the watcom compiler:
-	'Initializers must be constant'. I believe Borland has this strictness
-	as well. VC++ must be non-standard about this.
-
-	Changed Win32 platform #ifdef from 'WIN32' to '__WIN32__' as this is
-	the correct one to use across the Tcl sources. Even though we do force
-	it in tcl.h, the true parent one is __WIN32__.
-
-	Added missing CONST'ification usage to match prototype listed in
-	tclInt.decls.
-
-	* win/tclWinPort.h:  Added a block for OpenWatcom adjustments that
-	fixes 1) the same issue Mo did for MinGW lack of missing LPFN_*
-	typedefs in their WINE derived <winsock2.h> and 2) The need to be
-	strict about how the char type needs to be signed by default.
-
-	* win/tclWinSock.c:  Added OpenWatcom to the commentary about the
-	#ifdef HAVE_NO_LPFN_DECLS block.
-
-	* win/tclWinTime.c:  Changed use of '_timezone' to 'timezone' as this
-	difference is already adjusted for in tclWinPort.h. Removed
-	unreferenced posixEpoch file-scope global.
-
-	* win/tclWinFile.c (WinReadLinkDirectory): Fix for 'Initializers must
-	be constant' with the driveSpec array using OpenWatcom.
-
-2003-08-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c:	Corrected [Bug 411825] and other bugs in
-	TclNeedSpace() where non-breaking space (\u00A0) and backslash-escaped
-	spaces were handled incorrectly.
-	* tests/util.test:	Added new tests util-8.[2-6].
-
-2003-08-26  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tcl.h: Added some support for the LCC-Win32 compiler.
-	Unfortunetly, this compiler has a bug in its preprocessor and can't
-	build Tcl even with this minor patch. Also added some support for the
-	OpenWatcom compiler. A new win/makefile.wc to follow soon.
-
-2003-08-25  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tools/genStubs.tcl (genStubs::makeDecl): A more subtle way of
-	generating stubbed declarations allows us to have declarations of a
-	function in multiple interfaces simultaneously.
-
-	* generic/tcl.decls: Duplicated some namespace declarations from
-	tclInt.decls here, as mandated by TIP #139. This is OK since the
-	declarations match and will end up using the declarations in the
-	public code from now on because of #include ordering. Keeping the old
-	declarations in tclInt.decls; there's no need to gratuitously break
-	compatibility for those extensions which are already clients of the
-	namespace code.
-
-2003-08-23  Zoran Vasiljevic  <zoran@archiwrae.com>
-
-	* generic/tclIOUtil.c: merged fixes for thread-unsafe handling of
-	filesystem records [Bug 753315]. This also fixed the [Bug 788780]
-	* generic/tclPathObj.c: merged fixes for thread-unsafe handling of
-	filesystem records. [Bug 753315]
-
-	* generic/tclFileSystem.h: merged fixes for thread-unsafe handling of
-	filesystem records. [Bug 753315]
-
-2003-08-19  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/tclWinSerial.c (SerialErrorStr): Fixed a syntax error created in
-	the previous code cleanup.
-
-2003-08-19  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* win/tclWinSerial.c: Adjusted commenting and spacing usage to follow
-	the principles of the Style Guide better.
-
-2003-08-18  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_ENABLE_SYMBOLS): Use test instead of -eq, which does
-	not work. [Bug 781109]
-
-2003-08-13  Chengye Mao <chengye.geo@yahoo.com>
-
-	* win/tclWinPipe.c: fixed a bug in BuildCommandLine. This bug built a
-	command line with a missing space between tclpipe.dll and the
-	following arguments. It caused error in Windows 98 when exec
-	command.com (e.g. dir). [Bug 789040]
-
-2003-08-11  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	TIP #136 IMPLEMENTATION from Simon Geard <simon.geard@ntlworld.com>
-	* generic/tclCmdIL.c (Tcl_LrepeatObjCmd): Adapted version of Simon's
-	* doc/lrepeat.n:			  patch, updated to the HEAD
-	* tests/lrepeat.test:			  and matching the core style.
-	* generic/tclBasic.c (buildIntCmds):	Splice into core.
-	* generic/tclInt.h:
-	* doc/list.n:				Cross-reference.
-
-2003-08-06  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinInit.c: recognize amd64 and ia32_on_win64 cpus.
-
-2003-08-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/msgcat/msgcat.tcl:	Added escape so that non-Windows
-	* library/msgcat/pkgIndex.tcl:	platforms do not try to use the
-	registry package. This can save a costly and pointless package search.
-	Bumped to 1.3.1. Thanks to Dave Bodenstab. [Bug 781609]
-
-2003-08-05  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_INVOKE, INST_EVAL, INST_PUSH_RESULT):
-	added a Tcl_ResetResult(interp) at each point where the interp's
-	result is pushed onto the stack, to avoid keeping an extra reference
-	that may cause costly Tcl_Obj duplication. Detected by Franco Violi,
-	analyzed by Peter Spjuth and Donal Fellows. [Bug 781585]
-
-2003-07-28  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/FileSystem.3:
-	* doc/Translate.3: better documentation of Tcl_TranslateFileName and
-	related functions. [Bug 775220]
-
-2003-07-24  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tcl.h: Revert change made on 2003-07-21 since it made the
-	sizeof(Tcl_Obj) different for regular vs mem debug builds.
-	* generic/tclInt.h: Define TclDecrRefCount in terms of
-	Tcl_DbDecrRefCount which removes one layer of inderection.
-	* generic/tclObj.c (TclDbInitNewObj, Tcl_DbIncrRefCount,
-	(Tcl_DbDecrRefCount, Tcl_DbIsShared): Define ThreadSpecificData that
-	contains a hashtable. The table is used to ensure that a Tcl_Obj is
-	only acted upon in the thread that allocated it. This checking code is
-	enabled only when mem debug and threads are enabled.
-
-2003-07-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/async.test:	Added several tests that demonstrate [Bug
-	* tests/basic.test:	489537], Tcl's longstanding failure to
-	* tests/dict.test:	properly quote any leading '#' character when
-	* tests/dstring.test:	generating the string rep of a list so that
-	* tests/list.test:	the comment-power of that character is hidden
-	* tests/parse.test:	from any [eval], in order to satisfy the
-	* tests/util.test:	documentation that [list] does [eval]-safe
-				quoting.
-
-2003-07-24  Reinhard Max  <max@suse.de>
-
-	* library/package.tcl: Fixed a typo that broke pkg_mkIndex -verbose.
-	* tests/pkgMkIndex.test: Added a test for [pkg_mkIndex -verbose].
-
-	* ChangeLog.2002 (new file):
-	* ChangeLog: broke changes from 2002 into ChangeLog.2002 to reduce
-	size of the main ChangeLog.
-
-2003-07-23  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in: changes to html-tcl & html-tk targets for
-	compatibility with non-gnu makes.
-
-	* unix/Makefile.in: added macosx/README to dist target.
-
-2003-07-23  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/tclWinReg.c (OpenSubKey): Fixed bug 775976 which causes the
-	registry set command to fail when built with VC7.
-	* library/reg/pkgIndex.tcl: Incremented the version to 1.1.2.
-
-2003-07-21  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	Check that the thread incrementing or decrementing the ref count of a
-	Tcl_Obj is the thread that originally allocated the thread. This fail
-	fast behavior will catch programming errors that allow a single
-	Tcl_Obj to be accessed from multiple threads.
-
-	* generic/tcl.h (Tcl_Obj): Add allocThread member to Tcl_Obj. This
-	member records the thread id the Tcl_Obj was allocated. It is used to
-	check that any future ref count incr or decr is done from the same
-	thread that allocated the Tcl_Obj. This member is defined only when
-	threads and mem debug are enabled.
-	* generic/tclInt.h (TclNewObj, TclDbNewObj, TclDecrRefCount):
-	Define TclNewObj and TclDbNewObj using TclDbInitNewObj when mem debug
-	is enabled. This fixes a problem where TclNewObj calls did not work
-	the same as TclDbNewObj when mem debug was enabled.
-	* generic/tclObj.c (TclDbInitNewObj, Tcl_DbIncrRefCount,
-	(Tcl_DbDecrRefCount): Add new helper to init Tcl_Obj members when mem
-	debug is enabled. Init the allocThread member in TclDbInitNewObj and
-	check it in Tcl_DbIncrRefCount and Tcl_DbDecrRefCount to make sure a
-	Tcl_Obj allocated in one thread is not being acted upon in another
-	thread.
-
-2003-07-21  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* test/cmdAH.test: ensure certain tests run in local filesystem. [Bug
-	748960]
-
-2003-07-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: added option to allow installing manpages in
-	addition to default html help.
-
-2003-07-18  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/Utf.3: Tightened up documentation of Tcl_UtfNext and Tcl_UtfPrev
-	to better match the behaviour. [Bug 769895]
-
-2003-07-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/http/pkgIndex.tcl: upped to http v2.4.4
-	* library/http/http.tcl: add support for user:pass info in URL.
-	* tests/http.test:       [Bug 759888] (shiobara)
-
-2003-07-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:                Restored the [Eval] proc to replace
-	* library/tcltest/tcltest.tcl:  the [::puts] command when either the
-	-output or -error option for [test] is in use, in order to capture
-	data written to the output or error channels for comparison against
-	what is expected.  This is easier to document and agrees better with
-	most user expectations than the previous attempt to replace [puts]
-	only in the caller's namespace.  Documentation made more precise on
-	the subject.  [Bug 706359]
-
-	* doc/AddErrInfo.3:	Improved consistency of documentation by
-	* doc/CrtTrace.3:      	using "null" everywhere to refer to the
-	* doc/Encoding.3:      	character '\0', and using "NULL" everywhere
-	* doc/Eval.3:          	to refer to the value of a pointer that points
-	* doc/GetIndex.3:      	to nowhere. Also dropped references to ASCII
-	* doc/Hash.3:          	that are no longer true, and standardized on
-	* doc/LinkVar.3:       	the hyphenated spelling of "null-terminated".
-	* doc/Macintosh.3:
-	* doc/OpenFileChnl.3:
-	* doc/SetVar.3:
-	* doc/StringObj.3:
-	* doc/Utf.3:
-
-	* doc/CrtSlave.3 (Tcl_MakeSafe):  Removed warning about possible
-	deprecation (no TIP on that).
-
-2003-07-17  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixFCmd.c: fix for compilation errors on platforms where
-	configure detects non-functional chflags(). [Bug 748946]
-
-	* macosx/Makefile: Rewrote buildsystem for Mac OS X framework build
-	to be purely make driven; in order to become independent of Apple's
-	closed-source IDE and build tool. The changes are intended to be
-	transparent to the Makefile user, all existing make targets and cmd
-	line variable overrides should continue to work. Changed build to only
-	include tcl specific html help in Tcl.framework, the tk specific html
-	help is now included in Tk.framework. Added var to allow overriding of
-	tclsh used during html help building (Landon Fuller).
-
-	* macosx/Tcl.pbproj/project.pbxproj:
-	* macosx/Tcl.pbproj/jingham.pbxuser: Changed to purely call through to
-	the make driven buildsystem; Tcl.framework is no longer assembled by
-	ProjectBuilder.
-	Set default SYMROOT in target options to simplify setting up PB
-	(manually setting common build folder for tcl & tk no longer needed).
-
-	* tools/tcltk-man2html.tcl: Added options to allow building only the
-	tcl or tk html help files; the default behaviour with none of the new
-	options is to build both, as before.
-
-	* unix/Makefile.in: Added targets for building only the tcl or tk help
-
-	* macosx/README (new): Tcl specific excerpts of tk/macosx/README.
-
-	* generic/tcl.h: Updated reminder comment about editing
-	macosx/Tcl.pbproj/project.pbxproj when version number changes.
-
-2003-07-16  Mumit Khan  <khan@nanotech.wisc.edu>
-
-	* generic/tclPathObj.c (SetFsPathFromAny): Add Cygwin specific code to
-	convert POSIX filename to native format.
-	* generic/tclFileName.c (Tcl_TranslateFileName): And remove from here.
-	(TclDoGlob): Adjust for cygwin and append / for dirs instead of \
-	* win/tclWinFile.c (TclpObjChdir): Use chdir on Cygwin.
-	[Patch 679315]
-
-2003-07-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/safe.tcl (FileInAccessPath): normalize paths before
-	comparison. [Bug 759607] (myers)
-
-	* unix/tclUnixNotfy.c (NotifierThreadProc): correct size of found and
-	word vars from int to long. [Bug 767578] (hgo)
-
-	* generic/tcl.h:       Add recognition of -DTCL_UTF_MAX=6 on the make
-	* generic/regcustom.h: line to support UCS-4 mode. No config arg at
-	this time, as it is not the recommended build mode.
-
-	* generic/tclPreserve.c: In Result and Preserve'd routines, do not
-	* generic/tclUtil.c:     assume that ckfree == free, as that is not
-	* generic/tclResult.c:   always true. [Bug 756791] (fuller)
-
-2003-07-16  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/CrtSlave.3 (Tcl_MakeSafe): Updated documentation to strongly
-	discourage use. IMHO code outside the core that uses this function is
-	a bug... [Bug 655300]
-
-2003-07-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFileName.c (Tcl_GlobObjCmd):	[Bug 771840]
-	* generic/tclPathObj.c (Tcl_FSConvertToPathType):[Bug 771947]
-	* unix/tclUnixFCmd.c (GetModeFromPermString):	[Bug 771949]
-	Silence compiler warnings about unreached lines.
-
-	* library/tcltest/tcltest.tcl (ProcessFlags):	Corrected broken call
-	* library/tcltest/pkgIndex.tcl:			to [lrange]. Bumped to
-	version 2.2.4. [Bug 772333]
-
-2003-07-15  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/dltest/pkga.c (Pkga_EqObjCmd): Fix typo that was causing a
-	crash in load.test.
-
-2003-07-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/array.n: Make sure docs are synched with the 8.4 release.
-
-2003-07-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/http.n:  Updated SYNOPSIS to match actual syntax of commands.
-	[Bug 756112]
-
-	* unix/dltest/pkga.c:	Updated to not use Tcl_UtfNcmp and counted
-	strings instead of strcmp (not defined in any #include'd header) and
-	presumed NULL-terminated strings.
-
-	* generic/tclCompCmds.c (TclCompileIfCmd):  Prior fix of Bug 711371 on
-	2003-04-07 introduced a buffer overflow. Corrected. [Bug 771613]
-
-2003-07-15  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/rules.vc: Added a missing $(OPTDEFINES) which broke the build if
-	STATS=memdbg was specified.
-
-2003-07-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdIL.c (SortCompare): Cleared up confusing error
-	message. [Bug 771539]
-
-2003-07-11  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/binary.test (binary-46.*): Tests to help enforce the current
-	behaviour.
-	* doc/binary.n: Documented that [binary format a] and [binary scan a]
-	do encoding conversion by dropping high bytes, unlike the rest of the
-	core. [Bug 735364]
-
-2003-07-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/package.tcl:  Corrected [pkg_mkIndex] bug reported on
-	comp.lang.tcl. The indexer was searching for newly indexed packages
-	instead of newly provided packages.
-
-2003-07-08  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/winFCmd.test: fix for five tests under win98 [Bug 767679]
-
-2003-07-07  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/array.n: add examples from Welton
-
-2003-06-23  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/file.n: clarification of 'file tail' behaviour [Bug 737977]
-
-2003-07-04  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/expr.n: Tighten up the wording of some operations. [Bug 758488]
-
-	* tests/cmdAH.test: Made tests of [file mtime] work better on FAT
-	filesystems. [Patch 760768]  Also a little general cleanup.
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Made [string map] accept
-	dictionaries for maps.  This is much trickier than it looks, since map
-	entry ordering is significant. [Bug 759936]
-
-	* generic/tclVar.c (Tcl_ArrayObjCmd, TclArraySet): Made [array get]
-	and [array set] work with dictionaries, producing them and consuming
-	them. Note that for compatibility reasons, you will never get a dict
-	from feeding a string literal to [array set] since that alters the
-	trace behaviour of "multi-key" sets. [Bug 759935]
-
-2003-06-23  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclTrace.c: fix to Window debug build compilation error.
-
-2003-06-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/init.test: Added [cleanupTests] to report results of tests
-	* tests/pkg.test:  that run in slave interps.  [Bugs 761334,761344]
-
-	* tests/http.test: Used more reliable path to find httpd script.
-
-2003-06-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/init.test:  Added tests init-4.6.* to illustrate [Bug 760872]
-
-2003-06-25  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclTrace.c: New file, factoring out of virtually all the
-	various trace-related things from tclBasic.c and tclCmdMZ.c with the
-	goal of making this a separate maintenance area.
-
-2003-06-25  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Add -ieee when compiling with cc and
-	add -mieee when compiling with gcc under OSF1-V5 "Tru64" systems. [Bug
-	748957]
-
-2003-06-24  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/encoding.n: Corrected the docs to say that [source] uses the
-	system encoding, which it always did anyway (since 8.1) [Bug 742100]
-
-2003-06-24  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclHash.c (Tcl_HashStats): Prevented occurrence of
-	division-by-zero problems.  [Bug 759749]
-
-2003-06-24  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/tclUnixPort.h: #undef inet_ntoa before #define to avoid
-	compiler warning under freebsd. [Bug 745844]
-
-2003-06-23  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* doc/dde.n:                 Committed TIP #135 which changes the
-	* win/tclWinDde.c:           -exact option to -force. Also cleaned a
-	* tests/winDde.test:         bug in the tests.
-	* library/dde/pkgIndex.tcl:  Incremented version to 1.2.5
-
-	* doc/dde.n:                 Committed TIP #120 which provides the
-	* win/tclWinDde.c:           dde package for safe interpreters.
-	* tests/winDde.test:         Incremented package version to 1.2.4
-	* library/dde/pkgIndex.tcl:
-
-2003-06-23  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFCmd.c: fix to bad error message when trying to do 'file
-	copy foo ""'. [Bug 756951]
-	* tests/fCmd.test: added two new tests for the bug.
-
-	* win/tclWinFile.c:
-	* win/tclWin32Dll.c: recommitted some filesystem globbing speed-ups,
-	but disabled some on the older Win 95/98/ME where they don't seem to
-	work.
-
-	* doc/FileSystem.3: documentation fix [Bug 720634]
-
-2003-06-18  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclNamesp.c (Tcl_Export): removed erroneous comments. [Bug
-	756744]
-
-2003-06-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/makefile.vc:  fixes to check-in below so compilation now works
-	again on Windows.
-
-	* generic/tclCmdMZ.c:
-	* tests/regexp.test: fixing of bugs related to regexp and regsub
-	matching of empty strings. Addition of a number of new tests. [Bug
-	755335]
-
-2003-06-16  Andreas Kupries  <andreask@activestate.com>
-
-	* win/Makefile.in:  Haven't heard back from David for a week. Now
-	* win/configure:    committing the remaining changes.
-	* win/configure.in: Note: In active contact with Helmut Giese about
-	* win/makefile.vc:  the borland relatedchanges. This part will see
-	* win/rules.vc:     future updates.
-	* win/tcl.m4:
-	* win/makefile.bc:
-
-2003-06-10  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclConfig.c (ASSOC_KEY): Changed the key to
-	"tclPackageAboutDict" (tcl prefix) to make collisions with the keys of
-	other packages more unlikely.
-
-2003-06-10  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c:
-	* generic/tclExecute.c: let TclExecuteObjvInternal call
-	TclInterpReady instead of relying on its callers to do so; fix for the
-	part of [Bug 495830] that is new in 8.4.
-	* tests/interp.test: Added tests 18.9 (knownbug) and 18.10
-
-2003-06-09  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tcl.decls:  Ported the changes from the
-	* generic/tcl.h:      'tip-59-implementation' branch into the CVS
-	* generic/tclBasic.c: head. Regenerated stub table. Regenerated the
-	* generic/tclInt.h:   configure's scripts, with help from Joe English.
-	* generic/tclDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclConfig.c:
-	* generic/tclPkgConfig.c:
-	* unix/Makefile.in:
-	* unix/configure.in:  The changes in the windows section are not yet
-	* unix/tcl.m4:        committed, they await feedback from David
-	* unix/mkLinks:       Gravereaux.
-	* doc/RegConfig.3:
-	* mac/tclMacPkgConfig.c:
-	* tests/config.test:
-
-2003-06-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* string.test (string-4.15): Added test for [string first] bug
-	reported in Tcl 8.3, where test for all-single-byte-encoded strings
-	was not reliable.
-
-2003-06-04  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tools/man2help.tcl: Added duplicate help section checking and
-	* tools/index.tcl:    corrected a comment typo for the getTopics proc
-	in index.tcl. [Bug 748700]
-
-2003-06-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFCmd.c:
-	* tests/fCmd.test: fix to [Bug #747575] in which a bad error message
-	is given when trying to rename a busy directory to one with the same
-	prefix, but not the same name. Added three new tests.
-
-2003-05-23  D. Richard Hipp <drh@hwaci.com>
-
-	* win/tclWinTime.c: Add tests to detect and avoid a division by zero
-	in the windows precision timer calibration logic.
-
-2003-05-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclObj.c (tclCmdNameType):  Converted internal rep
-	management of the cmdName Tcl_ObjType the opposite way, to always use
-	the twoPtrValue instead of always using the otherValuePtr. Previous
-	fix on 2003-05-12 broke several extensions that wanted to poke around
-	with the twoPtrValue.ptr2 value of a cmdName Tcl_Obj, like TclBlend
-	and e4graph. [Bug 726018]
-	Thanks to George Petasis for the bug report and Jacob Levy for testing
-	assistance.
-
-2003-05-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/mkLinks: Set the var S to "" at the top of the file to avoid
-	error when user has set S to something. [Tk Bug 739833]
-
-2003-05-22  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.pbproj/project.pbxproj: added missing references to new
-	source files tclPathObj.c and tclMacOSXFCmd.c.
-
-	* macosx/tclMacOSXBundle.c: fixed a problem that caused only the first
-	call to Tcl_MacOSXOpenVersionedBundleResources() for a given bundle
-	identifier to succeed. This caused the tcl runtime library not to be
-	found in all interps created after the inital one.
-
-2003-05-19  Kevin B. Kenny  <kennykb@hippolyta>
-
-	* unix/tclUnixTime.c: Corrected a bug in conversion of non-ASCII
-	chars in the format string.
-
-2003-05-19  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.pbproj/project.pbxproj: changed tclConfig.sh location in
-	versioned framework subdirectories to be identical to location in
-	framework toplevel; fixed stub library symbolic links to be tcl
-	version specific.
-
-	* unix/tclUnixTime.c: fixed typo.
-
-2003-05-18  Kevin Kenny  <kennykb@acm.org>
-
-	* compat/strftime.c:  Modified TclpStrftime to return its result in
-	* generic/tclClock.c: UTF-8 encoding, and removed the conversion from
-	* mac/tclMacTime.c:   system encoding to UTF-8 from [clock format].
-	* unix/tclUnixTime.c: Needed to avoid double conversion of the
-	* win/tclWinTime.c:   timezone name on Windows systems. [Bug 624408]
-
-2003-05-16  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/dde/pkgIndex.tcl:  Applied TIP #130 which provides for
-	* tests/winDde.test:         unique dde server names. Added some more
-	* win/tclWinDde.c:           tests. Fixes [Bug 219293]
-
-	* doc/dde.n: Updated documentation re TIP #130.
-	* tests/winDde.test: Applied patch for [Bug 738929] by KKB and changed
-	to new-style tests.
-
-2003-05-16  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/Makefile.in:	Removed one excess source file tclDToA.c
-
-2003-05-16  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.pbproj/project.pbxproj: updated copyright year.
-
-2003-05-15  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclGetDate.y: added further hackery to the yacc
-	* generic/tclDate.c:    post-processing to arrange for the code to set
-	* unix/Makefile.in:     up exit handlers to free the stacks. [Bug
-				736425]
-
-2003-05-15  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinFile.c (TclpMatchInDirectory): revert glob code to r1.44
-	as 2003-04-11 optimizations broke Windows98 glob'ing.
-
-	* doc/socket.n: nroff font handling correction
-
-	* library/encoding/gb2312-raw.enc (new): This is the original
-	gb2312.enc renamed to allow for it to still be used. This is needed by
-	Tk (unix) because X fonts with gb2312* charsets really do want the
-	original gb2312 encoding. [Bug 557030]
-
-2003-05-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdAH.c (Tcl_FormatObjCmd): Stop unwarranted demotion of
-	wide values to longs by formatting of int values. [Bug 699060]
-
-2003-05-14  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/encoding/gb2312.enc: copy euc-cn.enc over original
-	gb2312.enc. gb2312.enc appeared to not work as expected, and most uses
-	of gb2312 really mean euc-cn (which may be the cause of the problem).
-	[Bug 557030]
-
-2003-05-14  Daniel Steffen  <das@users.sourceforge.net>
-
-	Implementation of TIP 118:
-
-	* generic/tclFCmd.c (TclFileAttrsCmd): return the list of attributes
-	that can be retrieved without error for a given file, instead of
-	aborting the whole command when any error occurs.
-
-	* unix/tclUnixFCmd.c: added support for new file attributes and for
-	copying Mac OS X file attributes & resource fork during [file copy].
-
-	* generic/tclInt.decls: added declarations of new external commands
-	needed by new file attributes support in tclUnixFCmd.c.
-
-	* macosx/tclMacOSXFCmd.c (new): Mac OS X specific implementation of
-	new file attributes and of attribute & resource fork copying.
-
-	* mac/tclMacFCmd.c: added implementation of -rsrclength attribute &
-	fixes to other attributes for consistency with OSX implementation.
-
-	* mac/tclMacResource.c: fixes to OSType handling.
-
-	* doc/file.n: documentation of [file attributes] changes.
-
-	* unix/configure.in: check for APIs needed by new file attributes.
-
-	* unix/Makefile.in:
-	* unix/tcl.m4: added new platform specifc tclMacOSXFCmd.c source.
-
-	* unix/configure:
-	* generic/tclStubInit.c:
-	* generic/tclIntPlatDecls.h: regen.
-
-	* tools/genStubs.tcl: fixes to completely broken code trying to
-	prevent overlap of "aqua", "macosx", "x11" and "unix" stub entries.
-
-	* tests/unixFCmd.test: added tests of -readonly attribute.
-
-	* tests/macOSXFCmd.test (new): tests of macosx file attributes and of
-	preservation of attributes & resource fork during [file copy].
-
-	* tests/macFCmd.test: restore -readonly attribute of test dir, as
-	otherwise its removal can fail on unices supporting -readonly.
-
-2003-05-13  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclEnv.c: Another putenv() copy behavior problem repaired
-	when compiling on windows and using microsoft's runtime. [Bug 736421]
-
-2003-05-13  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclIOUtil.c: ensure cd is thread-safe.
-	[Bug 710642] (vasiljevic)
-
-2003-05-13  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclEvent.c (Tcl_Finalize): Removed unused variable to reduce
-	compiler warnings. [Bug 664745]
-
-2003-05-13  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tcl.decls:  Changed Tcl_JoinThread parameter name from
-	* generic/tclDecls.h: "id" to "threadId". [Bug 732477]
-	* unix/tclUnixThrd.c:
-	* win/tclWinThrd.c:
-	* mac/tclMacThrd.c:
-
-2003-05-13  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tcl.decls:
-	* macosx/tclMacOSXBundle.c: added extended version of the
-	Tcl_MacOSXOpenBundleResources() API taking an extra version number
-	argument: Tcl_MacOSXOpenVersionedBundleResources(). This is needed to
-	be able to access bundle resources in versioned frameworks such as Tcl
-	and Tk, otherwise if multiple versions were installed, only the latest
-	version's resources could be accessed. [Bug 736774]
-
-	* unix/tclUnixInit.c (Tcl_MacOSXGetLibraryPath): use new versioned
-	bundle resource API to get tcl runtime library for TCL_VERSION. [Bug
-	736774]
-
-	* generic/tclPlatDecls.h:
-	* generic/tclStubInit.c: regen.
-
-	* unix/tclUnixPort.h: worked around the issue of realpath() not
-	being thread-safe on Mac OS X by defining NO_REALPATH for threaded
-	builds on Mac OS X. [Bug 711232]
-
-2003-05-12  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/cmdAH.test: General clean-up of tests so that all
-	tcltest-specific commands are protected by constraints and all
-	platforms see the same number of tests. [Bug 736431]
-
-2003-05-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInterp.c: (AliasObjCmd):   Added refCounting of the words
-	* tests/interp.test (interp-33.1):      of the target of an interp
-	alias during its execution. Also added test. [Bug 730244]
-
-	* generic/tclBasic.c (TclInvokeObjectCommand):  objv[argc] is no
-	longer set to NULL (Tcl_CreateObjCommand docs already say that it
-	should not be accessed).
-
-	* tests/cmdMZ.test:  Forgot to import [temporaryDirectory].
-
-	* generic/tclObj.c (tclCmdNameType):  Corrected variable use of the
-	otherValuePtr or the twoPtrValue.ptr1 fields to store a
-	(ResolvedCmdName *) as the internal rep. [Bug 726018]
-
-	* doc/Eval.3:  Corrected prototype for Tcl_GlobalEvalObj [Bug 727622].
-
-2003-05-12  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclObjLookupVar): [Bug 735335] temporary fix,
-	disabling usage of tclNsVarNameType.
-	* tests/var.test (var-15.1): test for [Bug 735335]
-
-2003-05-10  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinSerial.c (SerialCloseProc): correct mem leak on closing a
-	Windows serial port [Bug 718002] (schroedter)
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): prevent string repeat crash
-	when overflow sizes were given (throws error). [Bug 714106]
-
-2003-05-09  Joe Mistachkin <joe@mistachkin.com>
-
-	* generic/tclThreadAlloc.c (TclFreeAllocCache): Fixed memory leak
-	caused by treating cachePtr as a TLS index. [Bug 731754]
-
-	* win/tclAppInit.c (Tcl_AppInit): Fixed memory leaks caused by not
-	freeing the memory allocated by setargv and the async handler created
-	by Tcl_AppInit. An exit handler has been created that takes care of
-	both leaks. In addition, Tcl_AppInit now uses ckalloc instead of
-	Tcl_Alloc to allow for easier leak tracking and to be more consistent
-	with the rest of the Tcl core. [Bugs 733156, 733221]
-
-	* tools/encoding/txt2enc.c (main): Fixed memory leak caused by failing
-	to free the memory used by the toUnicode array of strings [Bug 733221]
-
-2003-05-09  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileScript):
-	* tests/compile.test (compile-3.5): corrected wrong test and
-	behaviour in the earlier fix for [Bug 705406]; Don Porter reported
-	this as [Bug 735055], and provided the solution.
-
-2003-05-09  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdMZ.c (Tcl_ReturnObjCmd): The array of strings passed
-	to Tcl_GetIndexFromObj must be NULL terminated. [Bug 735186]
-	Thanks to Joe Mistachkin for spotting this.
-
-2003-05-07  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/trace.n: Fixed very strange language in the documentation for
-	'trace add execution'. [Bug 729821]
-
-	* generic/tclCmdMZ.c (Tcl_TraceObjCmd): Made error message for 'trace
-	info' more consistent with documentation. [Bug 706961]
-
-	* generic/tclDictObj.c (DictInfoCmd): Fixed memory leak caused by
-	confusion about string ownership.  [Bug 731706]
-
-2003-05-05  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:		Implementation of TIP 90, which
-	* generic/tclCmdAH.c:		extends the [catch] and [return]
-	* generic/tclCompCmds.c:	commands to enable creation of a
-	* generic/tclExecute.c:		proc that is a replacement for
-	* generic/tclInt.h:		[return]. [Patch 531640]
-	* generic/tclProc.c:
-	* generic/tclResult.c:
-	* tests/cmdAH.test:
-	* tests/cmdMZ.test:
-	* tests/error.test:
-	* tests/proc-old.test:
-
-	* library/tcltest/tcltest.tcl: The -returnCodes option to [test]
-	failed to recognize the symbolic name "ok" for return code 0.
-
-2003-05-05  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclBasic.c (Tcl_HideCommand): Fixed error message for
-	grammar and spelling.
-
-2003-04-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclDictObj.c (DictIncrCmd): Updated to reflect the behaviour
-	with wide increments of the normal [incr] command.
-	* generic/tclInt.decls: Added TclIncrWideVar2 to internal stub table
-	and cleaned up.
-	* tests/incr.test (incr-3.*):
-	* generic/tclVar.c (TclIncrWideVar2, TclPtrIncrWideVar):
-	* generic/tclExecute.c (TclExecuteByteCode):
-	* generic/tclCmdIL.c (Tcl_IncrObjCmd): Make [incr] work when trying to
-	increment by wide values. [Bug 728838]
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Default mode of
-	operation of [switch] is exact matching. [Bug 727563]
-
-2003-04-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:  Tcl_EvalObjv() failed to honor the
-	TCL_EVAL_GLOBAL flag when resolving command names. Tcl_EvalEx passed a
-	string rep including leading whitespace and comments to
-	TclEvalObjvInternal().
-
-2003-04-25  Andreas Kupries  <andreask@activestate.com>
-
-	* win/tclWinThrd.c: Applied SF patch #727271. This patch changes the
-	code to catch any errors returned by the windows functions handling
-	TLS ASAP instead of waiting to get some mysterious crash later on due
-	to bogus pointers. Patch provided by Joe Mistachkin.
-
-	This is a stop-gap measure to deal with the low number of ?TLS slots
-	provided by some of the variants of Windows (60-80).
-
-2003-04-24  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c: fix to bug reported privately by Jeff where,
-	for example, 'glob -path {[tcl]} *' gets confused by the leading
-	special character (which is escaped internally), and instead lists
-	files in '/'. Bug only occurs on Windows where '\' is also a directory
-	separator.
-	* tests/fileName.test: added test for the above bug.
-
-2003-04-22  Andreas Kupries  <andreask@activestate.com>
-
-	* The changes below fix SF bugs [593810], and [718045].
-
-	* generic/tclIO.c (Tcl_CutChannel, Tcl_SpliceChannel): Invoke
-	TclpCutSockChannel and TclpSpliceSockChannel.
-
-	* generic/tclInt.h: Declare TclpCutSockChannel and
-	TclpSpliceSockChannel.
-
-	* unix/tclUnixSock.c (TclpCutSockChannel, TclpSpliceSockChannel):
-	Dummy functions, on unix the sockets are _not_ handled specially.
-
-	* mac/tclMacSock.c (TclpCutSockChannel, TclpSpliceSockChannel):
-	* win/tclWinSock.c (TclpCutSockChannel, TclpSpliceSockChannel): New
-	functions to handle socket specific cut/splice operations: auto-init
-	of socket system for thread on splice, management of the module
-	internal per-thread list of sockets, management of association of
-	sockets with HWNDs for event notification.
-
-	* win/tclWinSock.c (NewSocketInfo): Extended initialization
-	assignments to cover all items of the structure. During debugging of
-	the new code mentioned above I found that two fileds could contain
-	bogus data.
-
-	* win/tclWinFile.c: Added #undef HAVE_NO_FINDEX_ENUMS before
-	definition because when compiling in debug mode the compiler complains
-	about a redefinition, and this warning is also treated as an error.
-
-2003-04-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:  When the return code of a test does
-	not meet expectations, report that as the reason for test failure, and
-	do not attempt to check the test result for correctness. [Bug 725253]
-
-2003-04-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinInt.h (VER_PLATFORM_WIN32_CE): conditionally define.
-	* win/tclWinInit.c: recognize Windows CE as a Win platform. This just
-	recognizes CE - full support will come later.
-
-	* win/configure: regen
-	* win/configure.in (SHELL): force it to /bin/sh as autoconf 2.5x
-	uses /bin/bash, which can fail to find exes in the path (ie: lib).
-
-	* generic/tclExecute.c (ExprCallMathFunc): remove incorrect
-	extraneous cast from Tcl_WideAsDouble.
-
-2003-04-18  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/open.n:		Moved serial port options from [fconfigure] to
-	* doc/fconfigure.n:	[open] as it is up to the creator of a channel
-				to describe the channel's special config
-				options. [Bug 679010]
-
-2003-04-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Made changes so that the "wideInt" Tcl_ObjType
-	* generic/tclObj.c:	is defined on all platforms, even those where
-	* generic/tclPort.h:	TCL_WIDE_INT_IS_LONG is defined. Also made the
-	Tcl_Value struct have a wideValue field on all platforms. This is a
-	***POTENTIAL INCOMPATIBILITY*** for TCL_WIDE_INT_IS_LONG platforms
-	because that struct changes size. This is the same TIP 72
-	incompatibility that was seen on other platforms at the 8.4.0 release,
-	when this change should have happened as well. [Bug 713562]
-
-	* generic/tclInt.h:  New internal macros TclGetWide() and
-	TclGetLongFromWide() to deal with both forms of the "wideInt"
-	Tcl_ObjType, so that conditional TCL_WIDE_INT_IS_LONG code is confined
-	to the header file.
-
-	* generic/tclCmdAH.c:	Replaced most coding that was conditional
-	* generic/tclCmdIL.c:	on TCL_WIDE_INT_IS_LONG with code that
-	* generic/tclExecute.c: works across platforms, sometimes using
-	* generic/tclTest.c:	the new macros above to do it.
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-
-2003-04-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/socket.n: Added a paragraph to remind people to specify their
-	encodings when using sockets. [Bug 630621]
-
-2003-04-16  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/CrtMathFnc.3: Functions also have to deal with wide ints, but
-	this was not documented. [Bug 709720]
-
-2003-04-16  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: removed undesired 'static' for function which
-	is now shared (previously it was duplicated).
-
-2003-04-15  Joe English  <jenglish@users.sourceforge.net>
-
-	* doc/namespace.n: added example section "SCOPED SCRIPTS", supplied by
-	Kevin Kenny. [Bug 219183]
-
-2003-04-15  Kevin Kenny  <kennykb@acm.org>
-
-	* makefile.vc: Updated makefile.vc to conform with Mo DeJong's changes
-	to Makefile.in and tclWinPipe.c on 2003-04-14. Now passes TCL_PIPE_DLL
-	in place of TCL_DBGX.
-	* win/tclWinTime.c: Corrected use of types to make compilation
-	compatible with VC++5.
-
-2003-04-15  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: finished check-in from yesterday, removing
-	duplicate function definition.
-
-2003-04-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclClock.c:	Corrected compiler warnings.
-	* generic/tclTest.c:
-
-2003-04-14  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/Makefile.in: Don't define TCL_DBGX symbol for every compile.
-	Instead, define TCL_PIPE_DLL only when compiling tclWinPipe.c. This
-	will break other build systems, so they will need to remove the
-	TCL_DBGX define and replace it with a define for TCL_PIPE_DLL.
-	* win/tclWinPipe.c (TclpCreateProcess): Remove PREFIX_IDENT and
-	DEBUG_IDENT from top of file. Use TCL_PIPE_DLL passed in from build
-	env instead of trying to construct the dll name from already defined
-	symbols. This approach is more flexible and better in the long run.
-
-2003-04-14  Kevin Kenny  <kennykb@acm.org>
-
-	* win/tclWinFile.c: added conditionals to restore compilation on
-	VC++6, which was broken by recent changes.
-
-2003-04-14  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:
-	* generic/tclPathObj.c:
-	* generic/tclFileSystem.h: overlooked one function which was
-	duplicated, so this is now shared between modules.
-	* win/tclWinFile.c: allow this file to compile with VC++ 5.2 again
-	since Mingw build fixes broke that.
-
-2003-04-13  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Add check for FINDEX_INFO_LEVELS from winbase.h,
-	known to be a problem in VC++ 5.2. Define HAVE_NO_FINDEX_ENUMS if the
-	define does not exist.
-	* win/tclWinFile.c: Put declarations for FINDEX_INFO_LEVELS and
-	FINDEX_SEARCH_OPS inside a check for HAVE_NO_FINDEX_ENUMS so that
-	these are not declared twice. This fixes the Mingw build.
-	* win/tclWinTime.c: Rework the init of timeInfo so that the number or
-	initializers matches the declaration. This was broken under Mingw. Add
-	cast to avoid compile warning when calling the AccumulateSample
-	function.
-
-2003-04-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/Makefile.in (GENERIC_OBJS): add missing tclPathObj.c
-
-2003-04-12  Kevin Kenny  <kennykb@acm.org>
-
-	* doc/clock.n:
-	* generic/tclClock.c (Tcl_ClockObjCmd):
-	* tests/clock.test: Implementation of TIP #124. Also renumbered test
-	cases to avoid duplicates. [Bug 710310]
-	* tests/winTime.test:
-	* win/tclWinTest.c (TestwinclockCmd, TestwinsleepCmd):
-	* win/tclWinTime.c (Tcl_WinTime, UpdateTimeEachSecond,
-	(ResetCounterSamples, AccumulateSample, SAMPLES, TimeInfo): Made
-	substantial changes to the phase-locked loop (replaced an IIR filter
-	with an FIR one) in a quest for improved loop stability (Bug not
-	logged at SF, but cited in private communication from Jeff Hobbs).
-
-2003-04-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd,STR_IS_INT):  Corrected
-	inconsistent results of [string is integer] observed on systems where
-	sizeof(long) != sizeof(int). [Bug 718878]
-	* tests/string.test: Added tests for Bug 718878.
-	* doc/string.n: Clarified that [string is integer] accepts 32-bit
-	integers.
-
-2003-04-11  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (UpdateInterest): When dropping interest in
-	TCL_READABLE now dropping interest in TCL_EXCEPTION too. This fixes a
-	bug where Expect detects eof on a file prematurely on solaris 2.6 and
-	higher. A much more complete explanation is in the code itself (40
-	lines of comments for a one-line change :)
-
-2003-04-11  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/cmdAH.test: fix test suite problem if /home is a symlink. [Bug
-	703264]
-	* generic/tclIOUtil.c: fix bad error message with 'cd ""'. [Bug
-	704917]
-	* win/tclWinFile.c, win/tclWin32Dll.c:
-	* win/tclWinInt.h: allow Tcl to differentiate between reparse points
-	which are symlinks and mounted volumes, and correctly handle the
-	latter. This involves some elaborate code to find the actual drive
-	letter (if possible) corresponding to a mounted volume. [Bug 697862]
-	* tests/fileSystem.test: add constraints to stop tests running in
-	ordinary tcl interpreter. [Bug 705675]
-
-	* generic/tclIOUtil.c:
-	* generic/tclPathObj.c: (new file)
-	* generic/tclFileSystem.h: (new file)
-	* win/makefile.vc:
-	Split path object handling out of the virtual filesystem layer, into
-	tclPathObj.c. This refactoring cleans up the internal filesystem code,
-	and will make any future optimisations and forthcoming better
-	thread-safety much easier.
-
-	* generic/tclTest.c:
-	* tests/reg.test: added some 'knownBug' tests for problems in Tcl's
-	regexp code with the TCL_REG_CAN_MATCH flag (see Bug 703709). Code too
-	impenetrable to fix right now, but a fix is needed for tip113 to work
-	correctly.
-
-	* tests/fCmd.test
-	* win/tclWinFile.c: added some filesystem optimisation to the 'glob'
-	implementation, and some new tests.
-
-	* generic/tclCmdMZ.c: fix typo in comment
-
-	* tests/winFile.test:
-	* tests/ioUtil.test:
-	* tests/unixFCmd.test: renumbered tests with duplicate numbers. [Bug
-	710361]
-
-2003-04-10  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/binary.n: Fixed typo in [binary format w] desc. [Bug 718543]
-
-2003-04-08  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdAH.c (Tcl_ErrorObjCmd): Strings are only empty if
-	they have zero length, not if their first byte is zero, so fix test
-	guarding Tcl_AddObjErrorInfo to take this into account. [Bug
-	reported by Don Porter; no bug-id.]
-
-2003-04-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileIfCmd):  Corrected string limits of
-	arguments interpolated in error messages. [Bug 711371]
-
-	* generic/tclCmdMZ.c (TraceExecutionProc):  Added missing
-	Tcl_DiscardResult() call to avoid memory leak.
-
-2003-04-07  Donal K. Fellows  <zzcgudf@ernie.mvc.mcc.ac.uk>
-
-	* generic/tclDictObj.c (Tcl_DictObjCmd): Stopped compilers from
-	moaning about switch fall-through.  [Bug 716327]
-	(DictFilterCmd): Yet more warning killing, this time reported by
-	Miguel Sofer by private chat.
-
-2003-04-07  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/dict.test (dict-2.6):
-	* generic/tclDictObj.c (Tcl_NewDictObj, Tcl_DbNewDictObj): Oops!
-	Failed to fully initialise the Dict structure.
-	(DictIncrCmd): Moved valueAlreadyInDictionary label to stop compiler
-	complaints. [Bug 715751]
-
-	* generic/tclDictObj.c (DictIncrCmd): Followed style in the rest of
-	the core by commenting out wide-specific operations on platforms where
-	wides are longs, and used longs more thoroughly than ints through
-	[dict incr] anyway to forestall further bugs.
-	* generic/tclObj.c: Made sure there's always a tclWideIntType
-	implementation available, not that it is always useful. [Bug 713562]
-
-2003-04-05  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclDictObj.c: Removed commented out notes on declarations to
-	be moved to elsewhere in the Tcl core.
-
-	* generic/tclInt.h:	Final stages of plumbing in.
-	* generic/tclBasic.c:
-	* generic/tclObj.c (TclInitObjSubsystem):
-
-	* unix/Makefile.in, win/Makefile.in, win/makefile.[bv]c: Build support.
-	* generic/tcl.decls: Added dict public API to stubs table.
-	* generic/tcl.h (Tcl_DictSearch): Added declaration of structure to
-	allow user code to iterate over dictionaries.
-
-	* doc/DictObj.3:	New files containing dictionary implementation
-	* doc/dict.n:		documentation and tests as as mandated by TIP
-	* generic/tclDictObj.c: #111.
-	* tests/dict.test:
-
-2003-04-03  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure:
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Don't set TCL_LIBS if it is already
-	set to support use of TCL_LIBS var from tclConfig.sh in the Tk
-	configure script.
-
-2003-04-03  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/Makefile.in: Don't subst MATH_LIBS, LIBS, and DL_LIBS
-	separately. Instead, just subst TCL_LIBS since it includes the
-	others.
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS, SC_TCL_LINK_LIBS): Set and subst
-	TCL_LIBS in SC_CONFIG_CFLAGS instead of SC_TCL_LINK_LIBS. Don't subst
-	MATH_LIBS since it is now covered by TCL_LIBS.
-	* unix/tclConfig.sh.in: Use TCL_LIBS instead of DL_LIBS, LIBS, and
-	MATH_LIBS.
-	* unix/dltest/Makefile.in: Ditto.
-
-2003-04-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileReturnCmd):  Now that [return]
-	compiles to INST_RETURN, it is safe to compile even outside a proc.
-
-2003-04-02  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Set stub lib flag based on new LIBFLAGSUFFIX
-	variable.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Set new LIBFLAGSUFFIX that works like
-	LIBSUFFIX, it is used when creating library names. The previous
-	implementation would generate -ltclstub85 instead of -ltclstub85s when
-	configured with --disable-shared.
-
-2003-04-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclParse.c (TclSubstTokens):  Moved declaration of
-	utfCharBytes to beginning of procedure so that it does not go out of
-	scope (get free()d) while append is still pointing to it. [Bugs
-	703167, 713754]
-
-2003-04-01  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Check for inet_ntoa in -lbind inside
-	the BeOS block since doing it later broke the build under SuSE 7.3.
-	[Bug 713128]
-
-2003-04-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/README:  Direct [source] of *.test files is no longer
-	recommended. The tests/*.test files should only be evaluated under the
-	control of the [runAllTests] command in tests/all.tcl.
-
-	* generic/tclExecute.c (INST_RETURN):  Bytecompiled [return] failed to
-	reset iPtr->returnCode, causing tests parse-18.17 and parse-18.21 to
-	fail strangely.
-	* tests/parse.test (parse-18.21):  Corrected now functioning test.
-	Added further coverage tests.
-
-2003-03-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/parse.test (parse-18.*):  Coverage tests for the new
-	implementation of Tcl_SubstObj(). Note that tests parse-18.17 and
-	parse-18.21 demonstrate some bugs left to fix in the current code.
-
-2003-03-27  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Use -Wl,--export-dynamic instead of
-	-rdynamic for LDFLAGS. The -rdynamic is not documented so it seems
-	better to pass the --export-dynamic flag to the linker. [Patch 573395]
-
-2003-03-27  Miguel Sofer <msofer@users.sf.net>
-
-	* tests/encoding.test:
-	* tests/proc-old.test:
-	* tests/set-old.test: Altered test numers to eliminate duplicates,
-	[Bugs 710313, 710320, 710352]
-
-2003-03-27  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/parseOld.test:	Altered test numers to eliminate duplicates.
-	* tests/parse.test:	[Bugs 710365, 710369]
-	* tests/expr-old.test:
-	* tests/expr.test:
-
-	* tests/utf.test:	Altered test numers to eliminate duplicates.
-	* tests/trace.test:	[Bugs 710322, 710327, 710349, 710363]
-	* tests/lsearch.test:
-	* tests/list.test:
-	* tests/info.test:
-	* tests/incr-old.test:
-	* tests/if-old.test:
-	* tests/format.test:
-	* tests/foreach.test:
-
-2003-03-26  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS, SC_TCL_LINK_LIBS): Add BeOS system to
-	SC_CONFIG_CFLAGS. Check for inet_ntoa in -lbind, needed for BeOS.
-
-2003-03-26  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:
-	* library/tcltest/tcltest.tcl:  Added reporting during [configure
-	-debug 1] operations to warn about multiple uses of the same test
-	name. [FRQ 576693]
-
-	* tests/msgcat.test (msgcat-2.2.1): changed test name to avoid
-	duplication. [Bug 710356]
-
-	* unix/dltest/pkg?.c:  Changed all Tcl_InitStubs calls to pass
-	argument exact = 0, so that rebuilds are not required when Tcl
-	bumps to a new version.  [Bug 701926]
-
-2003-03-24  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c:
-	* tests/var.test: fixing ObjMakeUpvar's lookup algorithm for the
-	created local variable. [Bug 631741] (Chris Darroch) and [Bug 696893]
-	(David Hilker)
-
-2003-03-24  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/dde/pkgIndex.tcl: bumped version to 1.2.2 in tclWinDde.c,
-	now adding here too.
-
-2003-03-22  Kevin Kenny  <kennykb@acm.org>
-
-	* library/dde/pkgIndex.tcl:
-	* library/reg/pkgIndex.tcl: Fixed a bug where [package require dde]
-	or [package require registry] attempted to load the release version
-	of the DLL into a debug build. [Bug 708218] Thanks to Joe Mistachkin
-	for the patch.
-	* win/makefile.vc: Added quoting around the script name in the 'test'
-	target; Joe Mistachkin insists that he has a configuration that fails
-	to launch tcltest without it, and it appears harmless otherwise.
-
-2003-03-22  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/tclWinDde.c: Make dde services conform the the documentation
-	such that giving only a topic name really returns all services with
-	that topic. [Bug 219155]
-	Prevent hangup caused by dde server applications failing to process
-	messages. [Bug 707822]
-	* tests/winDde.test: Corrected labels and added a test for search by
-	topic name.
-
-2003-03-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h (tclOriginalNotifier):
-	* generic/tclStubInit.c (tclOriginalNotifier):
-	* mac/tclMacNotify.c (Tcl_SetTimer,Tcl_WaitForEvent):
-	* unix/tclUnixNotfy.c (Tcl_SetTimer,Tcl_WaitForEvent,
-	(Tcl_CreateFileHandler,Tcl_DeleteFileHandler):
-	* win/tclWinNotify.c (Tcl_SetTimer,Tcl_WaitForEvent):  Some linkers
-	apparently use a different representation for a pointer to a function
-	within the same compilation unit and a pointer to a function in a
-	different compilation unit. This causes checks like those in the
-	original notifier procedures to fall into infinite loops. The fix is
-	to store pointers to the original notifier procedures in a struct
-	defined in the same compilation unit as the stubs tables, and compare
-	against those values. [Bug 707174]
-
-	* generic/tclInt.h:  Removed definition of ParseValue struct that is
-	no longer used.
-
-2003-03-19  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c:
-	* tests/compile.test: bad command count on TCL_OUT_LINE_COMPILE.
-	[Bug 705406] (Don Porter)
-
-2003-03-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/auto.tcl:		Replaced [regexp] and [regsub] with
-	* library/history.tcl:		[string map] where possible.  Thanks
-	* library/ldAout.tcl:		to David Welton. [Bugs 667456,667558]
-	* library/safe.tcl:		Bumped to http 2.4.3, opt 0.4.5, and
-	* library/http/http.tcl:	tcltest 2.2.3.
-	* library/http/pkgIndex.tcl:
-	* library/opt/optparse.tcl:
-	* library/opt/pkgIndex.tcl:
-	* library/tcltest/tcltest.tcl:
-	* library/tcltest/pkgIndex.tcl:
-	* tools/genStubs.tcl:
-	* tools/tcltk-man2html.tcl:
-	* unix/mkLinks.tcl:
-
-	* doc/Eval.3 (Tcl_EvalObjEx):			Corrected CONST and
-	* doc/ParseCmd.3 (Tcl_EvalTokensStandard):	return type errors in
-	documentation. [Bug 683994]
-
-	* generic/tclCompCmds.c (TclCompileReturnCmd):  Alternative fix for
-	* generic/tclCompile.c (INST_RETURN):	[Bug 633204] that uses a new
-	* generic/tclCompile.h (INST_RETURN):	bytecode INST_RETURN to
-	* generic/tclExecute.c (INST_RETURN):	properly bytecode the [return]
-	command to something that returns TCL_RETURN.
-
-2003-03-18  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Don't run the AC_CYGWIN macro since it uses
-	AC_CANONICAL_HOST under autoconf 2.5X. Just check to see if __CYGWIN__
-	is defined by the compiler and set the ac_cv_cygwin variable based on
-	that. [Bug 705912]
-
-2003-03-18  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* tests/registry.test: Changed the conditionals to avoid an abort if
-	[testlocale] is missing, as when running the test in tclsh rather than
-	tcltest. [Bug 705677]
-
-2003-03-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tools/tcltk-man2html.tcl: added support for building 'make html'
-	from inside distribution directories named with 8.x.x version numbers.
-	tcltk-man2html now uses the latest tcl8.x.x resp. tk8.x.x directories
-	found inside its --srcdir argument.
-
-2003-03-17  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/format.test: Renumber tests, a bunch of tests all had the same
-	id.
-
-2003-03-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/lsearch.n:	Altered documentation of -ascii options so
-	* doc/lsort.n:		they don't specify that they operate on ASCII
-				strings, which they never did anyway. [Bug
-				703807]
-
-2003-03-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdAH.c (Tcl_FormatObjCmd): Only add the modifier that
-	indicates we've got a wide int when we're formatting in an integer
-	style.  Stops some libc's from going mad. [Bug 702622] Also tidied
-	whitespace.
-
-2003-03-13  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tcl.m4 (SC_WITH_TCL): Port version number fix that was made in
-	tk instead of tcl sources.
-
-2003-03-13  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	Require autoconf 2.57 or newer, see TIP 34 for a detailed explanation
-	of why this is good. This will no doubt break the build on some
-	platforms, let the flaming begin.
-
-	* tools/configure: Regen with autoconf 2.57.
-	* tools/configure.in: Require autoconf 2.57.
-	* unix/configure: Regen with autoconf 2.57.
-	* unix/configure.in: Require autoconf 2.57.
-	Apply AC_LIBOBJ changes from patch 529884.
-	* unix/tcl.m4: Ditto.
-	* win/configure: Regen with autoconf 2.57.
-	* win/configure.in: Require autoconf 2.57.
-	Don't subst LIBOBJS since this happens by default, this avoids an
-	autoconf error.
-
-2003-03-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_EvalTokensStandard):
-	* generic/tclCmdMZ.c (Tcl_SubstObj):
-	* generic/tclCompCmds.c (TclCompileSwitchCmd):
-	* generic/tclCompExpr.c (CompileSubExpr):
-	* generic/tclCompile.c (TclSetByteCodeFromAny,TclCompileScript,
-	(TclCompileTokens,TclCompileCmdWord):
-	* generic/tclCompile.h (TclCompileScript):
-	* generic/tclExecute.c (TclCompEvalObj):
-	* generic/tclInt.h (Interp,TCL_BRACKET_TERM,TclSubstTokens):
-	* generic/tclParse.c (ParseTokens,Tcl_SubstObj,TclSubstTokens):
-	* tests/subst.test (2.4, 8.7, 8.8, 11.4, 11.5):
-	Substantial refactoring of Tcl_SubstObj to make use of the same
-	parsing and substitution procedures as normal script evaluation.
-	Tcl_SubstObj() moved to tclParse.c. New routine TclSubstTokens()
-	created in tclParse.c which implements all substantial functioning of
-	Tcl_EvalTokensStandard(). TclCompileScript() loses its "nested"
-	argument, the Tcl_Interp struct loses its termOffset field and the
-	TCL_BRACKET_TERM flag in the evalFlags field, all of which were only
-	used (indirectly) by Tcl_SubstObj(). Tests subst-8.7,8.8,11.4,11.5
-	modified to accommodate the only behavior change: reporting of parse
-	errors now takes precedence over [return] and [continue] exceptions.
-	All other behavior should remain compatible. [RFE 536831,684982] [Bug
-	685106]
-
-	* generic/tcl.h:        Removed TCL_PREFIX_IDENT and TCL_DEBUG_IDENT
-	* win/tclWinPipe.c:     from tcl.h -- they are not part of Tcl's
-	public interface.  Put them in win/tclWinPipe.c where they are used.
-
-	* generic/tclInterp.c (Tcl_InterpObjCmd):       Corrected and added
-	* tests/interp.test (interp-2.13):              test for option
-	parsing beyond objc for [interp create --]. Thanks to Marco Maggi.
-	[Bug 702383]
-
-2003-03-11  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* win/makefile.vc: Added two missing uses of $(DBGX) so that
-	tclpip8x.dll loads without panicking on Win9x.
-
-2003-03-09  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* generic/tclTest.c (TestChannelCmd): Removed an unused local variable
-	that caused compilation problems on some platforms.
-
-2003-03-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:  Added missing "-body" to example. Thanks to Helmut
-	Giese. [Bug 700011]
-
-2003-03-07  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/io.test:
-	* tests/ioCmd.test: Define a fcopy constraint and add it to the
-	constraint list of any test that depends on the fcopy command. This is
-	only useful to Jacl which does not support fcopy.
-
-2003-03-07  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/encoding.test: Name temp files *.tcltestout instead of *.out
-	so that when they are removed later, we don't accidently toast any
-	files named *.out that the user has created in the build directory.
-
-2003-03-07  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCmdAH.c (Tcl_FileObjCmd): Fix the setting of a file's
-	mtime and atime on 64-bit platforms. [Bug 698146]
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/io.test: Doh! Undo accidental commenting out of a couple of
-	tests.
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/io.test: Define a fileevent constraint and add it to the
-	constraint list of any test that depends on the fileevent command.
-	This is only useful to Jacl which does not support fileevent.
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/io.test: Define an openpipe constraint and add it to the
-	constraint list of any test that creates a pipe using the open
-	command. This is only useful to Jacl which does not support pipes.
-
-2003-03-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/TclUtf.c (Tcl_UniCharNcasecmp):       Corrected failure to
-	* tests/utf.test (utf-25.*):    properly compare Unicode strings of
-	different case in a case insensitive manner.  [Bug 699042]
-
-2003-03-06  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd):
-	Replaced a non-portable 'bzero' with a portable 'memset'. [Bug 698442]
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_Seek, Tcl_OutputBuffered): If there is data
-	buffered in the statePtr->curOutPtr member then set the BUFFER_READY
-	flag in Tcl_Seek. This is needed so that the next call to FlushChannel
-	will write any buffered bytes before doing the seek. The existing code
-	would set the BUFFER_READY flag inside the Tcl_OutputBuffered
-	function. This was a programming error made when Tcl_OutputBuffered
-	was originally created in CVS revision 1.35. The setting of the
-	BUFFER_READY flag should not have been included in the
-	Tcl_OutputBuffered function.
-	* generic/tclTest.c (TestChannelCmd): Use the Tcl_InputBuffered and
-	Tcl_OutputBuffered util methods to query the amount of buffered input
-	and output.
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_Flush): Compare the nextAdded member of the
-	ChannelBuffer to the nextRemoved member to determine if any output has
-	been buffered. The previous check against the value 0 seems to have
-	just been a coding error. See other methods like Tcl_OutputBuffered
-	for examples where nextAdded is compared to nextRemoved to find the
-	number of bytes buffered.
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_GetsObj): Check that the eol pointer has not
-	gone past the end of the string when in auto translation mode and the
-	INPUT_SAW_CR flag is set. The previous code worked because the end of
-	string value \0 was being compared to \n, this patch just skips that
-	pointless check.
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (WriteBytes, WriteChars, Tcl_GetsObj, ReadBytes):
-	Rework calls to TranslateOutputEOL to make it clear that a boolean
-	value is being returned. Add some comments in an effort to make the
-	code more clear. This patch makes no functional changes.
-
-2003-03-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_SetChannelOption): Invoke the
-	Tcl_SetChannelBufferSize method as a result of changing the
-	-buffersize option to fconfigure. The previous implementation used
-	some inlined code that reset the buffer size to the default size
-	instead of ignoring the request as implemented in
-	Tcl_SetChannelBufferSize.
-	* tests/io.test: Update test case so that it actually checks the
-	implementation of Tcl_SetChannelBufferSize.
-
-2003-03-05  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/rules.vc: updated default tcl version to 8.5.
-
-2003-03-05  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): First attempt at a
-	bytecode-compiled switch command. It only handles the most common case
-	of switching, but that should be enough for this to speed up a lot of
-	people's code. It is expected that the speed gains come from two
-	things: better handling of the switch itself, and integrated
-	compilation of the arms instead of embedding separate bytecode
-	sequences (i.e. better local variable handling.)
-	* tests/switch.test (switch-10.*): Tests of both uncompiled and
-	compiled switch behaviour. [Patch #644819]
-
-	* generic/tclCompile.h (TclFixupForwardJumpToHere): Additional macro
-	to make the most common kind of jump fixup a bit easier.
-
-2003-03-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* README:				Bumped version number of
-	* generic/tcl.h:			Tcl to 8.5a0.
-	* library/init.tcl:
-	* mac/README:
-	* macosx/Tcl.pbproj/project.pbxproj:
-	* tests/basic.test:
-	* tools/configure.in:
-	* tools/tcl.hpj.in:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README:
-	* win/README.binary:
-	* win/configure.in:
-	* win/makefile.bc:
-	* win/makefile.vc:
-	* win/tcl.m4:
-
-	* tools/configure:	autoconf
-	* unix/configure:
-	* win/configure:
-
-2003-03-03  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	*** 8.4.2 TAGGED FOR RELEASE ***
-
-2003-03-03  Daniel Steffen  <das@users.sourceforge.net>
-
-	Mac OS Classic specific fixes:
-	* generic/tclIOUtil.c (TclNewFSPathObj): on TCL_PLATFORM_MAC, skip
-	potential directory separator at the beginning of addStrRep.
-	* mac/tclMacChan.c (OpenFileChannel, CommonWatch): followup fixes to
-	cut and splice implementation for file channels.
-	* mac/tclMacFile.c (TclpUtime): pass native path to utime().
-	* mac/tclMacFile.c (TclpObjLink): correctly implemented creation of
-	alias files via new static proc CreateAliasFile().
-	* mac/tclMacPort.h: define S_ISLNK macro to fix stat'ing of links.
-	* mac/tclMacUtil.c (FSpLocationFromPathAlias): fix to enable stat'ing
-	of broken links.
-
-2003-03-03  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* win/Makefile.vc: corrected bug introduced by 'g' for debug builds.
-
-2003-03-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/dde/pkgIndex.tcl:	dde bumped to version 1.2.1 for
-	* win/tclWinDde.c:		bundled release with Tcl 8.4.2
-
-	* library/reg/pkgIndex.tcl:	registry bumped to version 1.1.1 for
-	* win/tclWinReg.c:		bundled release with Tcl 8.4.2
-
-	* library/opt/pkgIndex.tcl:	updated package index to version 0.4.4
-
-2003-02-28  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/configure:
-	* win/configure.in: check for 'g' for debug build type, not 'd'.
-	* win/rules.vc (DBGX): correct to use 'g' for nmake win makefile to
-	match the cygwin makefile for debug builds. [Bug 635107]
-
-2003-02-28  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/file.n: subcommand is 'file volumes' not 'file volume'
-
-2003-02-27  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclIOUtil.c (MakeFsPathFromRelative): removed dead code
-	check of typePtr (darley).
-
-	* tests/winTime.test: added note about PCI hardware dependency issues
-	with high performance clock.
-
-2003-02-27  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/lsearch.test (lsearch-10.7):
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): Stopped -start option from
-	causing an option when used with an empty list. [Bug 694232]
-
-2003-02-26  Chengye Mao <chengye.geo@yahoo.com>
-
-	* win/tclWinInit.c: fixed a bug in TclpSetVariables by initializing
-	dwUserNameLen with the sizeof(szUserName) before calling GetUserName.
-	Don't know if this bug has been recorded: it caused crash in starting
-	Tcl or wish in Windows.
-
-2003-02-26  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclCmdMZ.c (TraceCommandProc): Fix mem leak when deleting a
-	command that had trace on it. [Bug 693564] (sofer)
-
-2003-02-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/pkgMkIndex.n:	Modified [pkg_mkIndex] to use -nocase matching
-	* library/package.tcl:	of -load patterns, to better accommodate common
-	user errors due to confusion between [package names] names and [info
-	loaded] names.
-
-2003-02-25  Andreas Kupries  <andreask@pliers.activestate.com>
-
-	* tests/pid.test: See below [Bug 678412].
-	* tests/io.test: Made more robust against spaces in paths [Bug 678400]
-
-2003-02-25  Miguel Sofer <msofer@users.sf.net>
-
-	* tests/execute.test: cleaning up testobj's at the end, to avoid
-	  leak warning by valgrind.
-
-2003-02-22  Zoran Vasiljevic  <zoran@archiwrae.com>
-
-	* generic/tclEvent.c (Tcl_FinalizeThread): Fix [Bug 571002]
-
-2003-02-21  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* tests/binary.test (binary-44.[34]):
-	* generic/tclBinary.c (ScanNumber): Fixed problem with unwanted
-	sign-bit propagation when scanning wide ints. [Bug 690774]
-
-2003-02-21  Daniel Steffen  <das@users.sourceforge.net>
-
-	* mac/tclMacChan.c (TclpCutFileChannel, TclpSpliceFileChannel):
-	Implemented missing cut and splice procs for file channels.
-
-2003-02-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/package.tcl (tclPkgUnknown):  Minor performance tweaks to
-	reduce the number of [file] invocations. Meant to improve startup
-	times, at least a little bit. [Patch 687906]
-
-2003-02-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4:
-	* unix/tclUnixPipe.c: (macosx) use vfork() instead of fork() to create
-	new processes, as recommended by Apple (vfork can be up to 100 times
-	faster thank fork on macosx).
-	* unix/configure: regen.
-
-2003-02-20  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclEncoding.c (LoadTableEncoding):
-	* library/encoding/cp932.enc:      Correct jis round-trip encoding
-	* library/encoding/euc-jp.enc:     by adding 'R' type to .enc files.
-	* library/encoding/iso2022-jp.enc: [Patch 689341] (koboyasi, taguchi)
-	* library/encoding/jis0208.enc:
-	* library/encoding/shiftjis.enc:
-	* tests/encoding.test:
-
-	* unix/tclUnixChan.c (Tcl_MakeTcpClientChannel): add
-	MakeTcpClientChannelMode that takes actual mode flags to avoid hang on
-	OS X (may be OS X bug, but patch works x-plat). [Bug 689835] (steffen)
-
-2003-02-20  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/regsub.n: Typo fix [Bug 688943]
-
-2003-02-19  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixThrd.c (TclpReaddir):
-	* unix/tclUnixPort.h: update to Bug 689100 patch to ensure that there
-	is a defined value of MAXNAMLEN (aka NAME_MAX in POSIX) and that we
-	have some buffer allocated.
-
-2003-02-19  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclStringObj.c: restored Tcl_SetObjLength() side-effect of
-	always invalidating unicode rep (if the obj has a string rep). Added
-	hasUnicode flag to String struct, allows decoupling of validity of
-	unicode rep from buffer size allocated to it (improves memory
-	allocation efficiency). [Bugs 686782, 671138, 635200]
-
-	* macosx/Tcl.pbproj/project.pbxproj:
-	* macosx/Makefile: reworked embedded build to no longer require
-	relinking but to use install_name_tool instead to change the
-	install_names for embedded frameworks. [Bug 644510]
-
-	* macosx/Tcl.pbproj/project.pbxproj: preserve mod dates when running
-	'make install' to build framework (avoids bogus rebuilds of dependent
-	frameworks because tcl headers appear changed).
-
-	* tests/ioCmd.test (iocmd-1.8): fix failure when system encoding is
-	utf-8: use iso8859-1 encoding explicitly.
-
-2003-02-18  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileExprWords): remove unused variable
-	"range" [Bug 664743]
-	* generic/tclExecute.c (ExprSrandFunc): remove unused variable
-	"result" [Bug 664743]
-	* generic/tclStringObj.c (UpdateStringOfString): remove unused
-	variable "length" [Bug 664751]
-	* tests/execute.test (execute-7.30): fix for [Bug 664775]
-
-2003-02-18  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/tcl.m4: [Bug #651811] Added definition of _XOPEN_SOURCE and
-	linkage of 'xnet' library to HP 11 branch. This kills a lot of
-	socket-related failures in the testsuite when Tcl was compiled in 64
-	bit mode (both PA-RISC 2.0W, and IA 64).
-
-	* unix/configure: Regenerated.
-
-2003-02-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclIO.c (HaveVersion): correctly decl static
-
-	* unix/tclUnixThrd.c (TclpReaddir): reduce size of name string in tsd
-	to NAME_MAX instead of PATH_MAX. [Bug 689100] (waters)
-
-2003-02-18  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_ENABLE_THREADS): Make sure -lpthread gets passed on
-	the link line when checking for the pthread_attr_setstacksize symbol.
-
-2003-02-18  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclTest.c: cleanup of new 'simplefs' test code, and better
-	documentation.
-
-2003-02-17  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclRenameCommand): fixing error in previous
-	commit.
-
-2003-02-17  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclExecute.c (TclExecuteByteCode INST_STR_MATCH):
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd STR_MATCH):
-	* generic/tclUtf.c (TclUniCharMatch):
-	* generic/tclInt.decls:  add private TclUniCharMatch function that
-	* generic/tclIntDecls.h: does string match on counted unicode
-	* generic/tclStubInit.c: strings. Tcl_UniCharCaseMatch has the failing
-	* tests/string.test:     that it can't handle strings or patterns with
-	* tests/stringComp.test: embedded NULLs. Added tests that actually try
-	strings/pats with NULLs. TclUniCharMatch should be TIPed and made
-	public in the next minor version rev.
-
-2003-02-17  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclRenameCommand): 'oldFullName' object was not
-	being freed on all function exits, causing a memory leak. [Bug 684756]
-
-2003-02-17  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_GetsObj): Minor change so that eol is only
-	assigned at the top of the TCL_TRANSLATE_AUTO case block. The other
-	cases assign eol so this does not change any functionality.
-
-2003-02-17  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* tests/notify.test: Removed Windows line terminators. [Bug 687913].
-
-2003-02-15  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_EvalEx):
-	* generic/tclCompExpr.c (CompileSubExpr):
-	* generic/tclCompile.c (TclCompileScript):
-	* generic/tclParse.c (Tcl_ParseCommand, ParseTokens):
-	* generic/tclParseExpr.c (ParsePrimaryExpr):
-	* tests/basic.test (47.1):
-	* tests/main.test (3.4):
-	* tests/misc.test (1.2):
-	* tests/parse.test (6.18):
-	* tests/parseExpr.test (15.35):
-	* tests/subst.test (8.6): Don Porter's fix for bad parsing of nested
-	scripts. [Bug 681841]
-
-2003-02-15  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* tests/notify.test (new-file):
-	* generic/tclTest.c (TclTest_Init, EventtestObjCmd, EventtestProc,
-	(EventTestDeleteProc):
-	* generic/tclNotify.c (Tcl_DeleteEvents): Fixed Tcl_DeleteEvents not
-	to get a pointer smash when deleting the last event in the queue.
-	Added test code in 'tcltest' and a new file of test cases
-	'notify.test' to exercise this functionality; several of the new test
-	cases fail for the original code and pass for the corrected code. [Bug
-	673714]
-
-	* unix/tclUnixTest.c (TestfilehandlerCmd): Corrected a couple of typos
-	in error messages. [Bug 596027]
-
-2003-02-14  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* README:		Bumped to version 8.4.2.
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* unix/configure:
-	* unix/configure.in:
-	* unix/tcl.m4:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure:
-	* win/configure.in:
-	* macosx/Tcl.pbproj/project.pbxproj:
-
-	* generic/tclStringObj.c (Tcl_GetCharLength): perf tweak
-
-	* unix/tcl.m4: correct HP-UX ia64 --enable-64bit build flags
-
-2003-02-14  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* win/tclWinTime.c: Added code to test and compensate for forward
-	leaps of the performance counter. See the MSDN Knowledge Base article
-	Q274323 for the hardware problem that makes this necessary on certain
-	machines.
-	* tests/winTime.test: Revised winTime-2.1 - it had a tolerance of
-	thousands of seconds, rather than milliseconds. (What's six orders of
-	magnitude among friends?) Both the above changes are triggered by a
-	problem reported at:
-	http://aspn.activestate.com/ASPN/Mail/Message/ActiveTcl/1536811
-	although the developers find it difficult to believe that it accounts
-	for the observed behavior and suspect a fault in the RTC chip.
-
-2003-02-13  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* win/tclWinInit.c: Added conversion from the system encoding to
-	tcl_platform(user), so that it works with non-ASCII7 user names. [Bug
-	685926]
-
-	* doc/tclsh.1: Added language to describe the handling of the
-	end-of-file character \u001a embedded in a script file. [Bug 685485]
-
-2003-02-11  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fileName.test:
-	* unix/tclUnixFile.c: fix for [Bug 685445] when using 'glob -l' on
-	broken symbolic links. Added two new tests for this bug.
-
-2003-02-11  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* tests/http.test: Corrected a problem where http-4.14 would fail when
-	run in an environment with a proxy server. Replaced references to
-	scriptics.com by tcl.tk.
-
-2003-02-11  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/lsearch.test:
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): protect against the case
-	that lsearch -regepx list and pattern objects are equal.
-
-	* tests/stringObj.test:
-	* generic/tclStringObj.c (Tcl_GetCharLength): correct ascii char opt
-	of 2002-11-11 to not stop early on \x00. [Bug 684699]
-
-	* tests.parse.test: remove excess EOF whitespace
-
-	* generic/tclParse.c (CommandComplete): more paranoid check to break
-	on (p >= end) instead of just (p == end).
-
-2003-02-11  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclParse.c (CommandComplete):
-	* tests/parse.test: fix for [Bug 684744], by Don Porter.
-
-2003-02-11  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclIOUtil.c (Tcl_FSJoinPath, Tcl_FSGetNormalizedPath):
-	(UpdateStringOfFsPath): revert the cwdLen == 0 check and instead
-	follow a different code path in Tcl_FSJoinPath.
-	(Tcl_FSConvertToPathType, Tcl_FSGetNormalizedPath):
-	(Tcl_FSGetFileSystemForPath): Update string rep of path objects before
-	freeing the internal object. (darley)
-
-	* tests/fileSystem.test: added test 8.3
-	* generic/tclIOUtil.c (Tcl_FSGetNormalizedPath):
-	(UpdateStringOfFsPath): handle the cwdLen == 0 case
-
-	* unix/tclUnixFile.c (TclpMatchInDirectory): simplify the hidden file
-	match check.
-
-2003-02-10  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure:
-	* win/configure.in: Generate error when attempting to build under
-	Cygwin. The Cygwin port of Tcl/Tk does not build and people are filing
-	bug reports under the mistaken impression that someone is actually
-	maintaining the Cygwin port. A post to comp.lang.tcl asking someone to
-	volunteer as an area maintainer has generated no results. Closing bugs
-	680840, 630199, and 634772 and marking as "Won't fix".
-
-2003-02-10  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/append.n: Return value was not documented. [Bug 683188]
-
-2003-02-10  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/FileSystem.3:
-	* generic/tclIOUtil.c:
-	* generic/tclInt.h:
-	* tests/fileSystem.test:
-	* unix/tclUnixFCmd.c:
-	* unix/tclUnixFile.c:
-	* win/tclWinFile.c: further filesystem optimization, applying [Patch
-	682500]. In particular, these code examples are faster now:
-	    foreach f $flist { if {[file exists $f]} {file stat $f arr;...}}
-	    foreach f [glob -dir $dir *] { # action and/or recursion on $f }
-	    cd $dir
-	    foreach f [glob *] { # action and/or recursion on $f }
-	    cd ..
-
-	* generic/tclTest.c: Fix for [Bug 683181] where test suite left files
-	in 'tmp'.
-
-2003-02-08  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/safe.tcl: code cleanup of eval and string comp use.
-
-2003-02-07  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFCmd.c: cleanup long lines
-	* win/tclWinFile.c: sped up pure 'glob' by a factor of 2.5
-	('foreach f [glob *] { file exists $f }' is still slow)
-	* tests/fileSystem.text:
-	* tests/fileName.test: added new tests to ensure correct behaviour in
-	optimized filesystem code.
-
-2003-02-07  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclTest.c:
-	* tests/fileSystem.text: fixed test 7.2 to avoid a possible crash, and
-	not change the pwd.
-
-	* tests/http.text: added comment to test 4.15, that it may fail if you
-	use a proxy server.
-
-2003-02-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileIncrCmd):
-	* tests/incr.test: Don't include the text "(increment expression)" in
-	the errorInfo generated by the compiled version of the incr command
-	since it does not match the message generated by the non-compiled
-	version of incr. It is also not possible to match this error output
-	under Jacl, which does not support a compiler.
-
-2003-02-06  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): When an error is
-	encountered reading the increment value during a compiled call to
-	incr, add a "(reading increment)" error string to the errorInfo
-	variable. This makes the errorInfo variable set by the compiled incr
-	command match the value set by the non-compiled version.
-	* tests/incr-old.test: Change errorInfo result for the compiled incr
-	command case to match the modified implementation.
-	* tests/incr.test: Add tests to make sure the compiled and
-	non-compiled errorInfo messages are the same.
-
-2003-02-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:  Filename arguments to [outputChannel]
-	and [errorChannel] (also -outfile and -errfile) were [open]ed but
-	never [closed]. Also, [cleanupTests] could remove output or error
-	files. [Bug 676978].
-	* library/tcltest/pkgIndex.tcl: Bumped to version 2.2.2.
-
-2003-02-05  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/interp.test:
-	* tests/set-old.test: Run test cases that depend on hash order through
-	lsort so that the tests also pass under Jacl. Does not change test
-	results under Tcl.
-
-2003-02-04  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:
-	* generic/tclEvent.c:
-	* generic/tclInt.h:
-	* mac/tclMacFCmd.c:
-	* unix/tclUnixFCmd.c:
-	* win/tclWin32Dll.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinInit.c:
-	* win/tclWinInt.h:
-	* tests/fileSystem.test: fix to finalization/unloading/encoding issues
-	to make filesystem much less dependent on encodings for its cleanup,
-	and therefore allow it to be finalized later in the exit process. This
-	fixes fileSystem.test-7.1. Also fixed one more bug in setting of
-	modification dates of files which have undergone cross-platform
-	copies. [Patch 676271]
-
-	* tests/basic.test:
-	* tests/exec.test:
-	* tests/fileName.test:
-	* tests/io.test: fixed some test failures when tests are run from a
-	directory containing spaces.
-
-	* tests/fileSystem.test:
-	* generic/tclTest.c: added regression test for the modification date
-	setting of cross-platform file copies.
-
-2003-02-03  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* generic/tclBasic.c: Changed [trace add command] so that 'rename'
-	callbacks get fully qualified names of the command. [Bug 651271].
-	***POTENTIAL INCOMPATIBILITY***
-	* tests/trace.test: Modified the test cases for [trace add command] to
-	expect fully qualified names on the 'rename' callbacks. Added a case
-	for renaming a proc within a namespace.
-	* doc/trace.n: Added language about use of fully qualified names in
-	trace callbacks.
-
-2003-02-01  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* generic/tclCompCmds.c: Removed an unused variable that caused
-	compiler warnings on SGI. [Bug 664379]
-
-	* generic/tclLoad.c: Changed the code so that if Tcl_StaticPackage is
-	called to report the same package as being loaded in two interps, it
-	shows up in [info loaded {}] in both of them (previously, it didn't
-	appear in the static package list in the second).
-
-	* tests/load.test Added regression test for the above bug. [Bug
-	670042]
-
-	* generic/tclClock.c: Fixed a bug that incorrectly allowed [clock
-	clicks {}] and [clock clicks -] to be accepted as if they were [clock
-	clicks -milliseconds].
-
-	* tests/clock.test: Added regression tests for the above bug. [Bug
-	675356]
-
-	* tests/unixNotfy.test: Added cleanup of working files. [Bug 675609]
-
-	* doc/Tcl.n: Added headings to the eleven paragraphs, to improve
-	formatting in the tools that attempt to extract tables of contents
-	from the manual pages. [Bug 627455]
-
-	* generic/tclClock.c: Expanded mutex protection around the setting of
-	env(TZ) and the thread-unsafe call to tzset(). [Bug 656660]
-
-2003-01-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/tcltest.test: Cleaned up management of file/directory
-	creation/deletion to improve "-debug 1" output. [Bug 675614]
-	The utility [slave] command failed to properly [list]-quote a
-	constructed [open] command, causing failure when the pathname
-	contained whitespace. [Bug 678415]
-
-	* tests/main.test: Stopped main.test from deleting existing file. Test
-	suite should not delete files that already exist. [Bug 675660]
-
-2003-01-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/main.test: Constrain tests that do not work on Windows. [Bug
-	674387]
-
-2003-01-28  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to setting modification date in
-	TclCrossFilesystemCopy. Also added 'panic' in
-	Tcl_FSGetFileSystemForPath under illegal calling circumstances which
-	lead to hard-to-track-down bugs.
-
-	* generic/tclTest.c: added test suite code to allow exercising a
-	vfs-crash-on-exit bug in Tcl's finalization caused by the encodings
-	being cleaned up before unloading occurs.
-	* tests/fileSystem.test: added new 'knownBug' test 7.1 to demonstrate
-	the crash on exit.
-
-2003-01-28  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tcl.h: Add TCL_PREFIX_IDENT and TCL_DEBUG_IDENT, used only
-	by TclpCreateProcess.
-	* unix/Makefile.in: Define TCL_DBGX.
-	* win/Makefile.in: Define TCL_DBGX.
-	* win/tclWinPipe.c (TclpCreateProcess): Check that the Tcl pipe dll
-	actually exists in the Tcl bin directory and panic if it is not found.
-	Incorporate TCL_DBGX into the Tcl pipe dll name. This fixes a really
-	mysterious error that would show up when exec'ing a 16 bit application
-	under Win95 or Win98 when Tcl was compiled with symbols. The error
-	seemed to indicate that the executable could not be found, but it was
-	actually the Tcl pipe dll that could not be found.
-
-2003-01-26  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/README: Update msys+mingw URL to release 6. This version bundles
-	gcc 3.
-
-2003-01-26  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Add test that checks to see if the compiler can
-	cast to a union type.
-	* win/tclWinTime.c: Squelch compiler warning about union initializer
-	by casting to union type when compiling with gcc.
-
-2003-01-25  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_CutChannel, Tcl_SpliceChannel): Invoke
-	TclpCutFileChannel and TclpSpliceFileChannel.
-	* generic/tclInt.h: Declare TclpCutFileChannel and
-	TclpSpliceFileChannel.
-	* unix/tclUnixChan.c (FileCloseProc, TclpOpenFileChannel,
-	(Tcl_MakeFileChannel, TclpCutFileChannel, TclpSpliceFileChannel):
-	Implement thread load data cut and splice for file channels. This
-	avoids an invalid memory ref when compiled with -DDEPRECATED.
-	* win/tclWinChan.c (FileCloseProc, TclpCutFileChannel,
-	(TclpSpliceFileChannel): Implement thread load data cut and splice for
-	file channels. This avoids an invalid memory ref that was showing up
-	in the thread extension.
-
-2003-01-25  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWin32Dll.c (TclpCheckStackSpace, squelch_warnings):
-	* win/tclWinChan.c (Tcl_MakeFileChannel, squelch_warnings):
-	* win/tclWinFCmd.c (DoRenameFile, DoCopyFile, squelch_warnings):
-	Re-implement inline ASM SEH handlers for gcc. The esp and ebp
-	registers are now saved on the stack instead of in global variables so
-	that the code is thread safe. Add additional checks when TCL_MEM_DEBUG
-	is defined to be sure the values were recovered from the stack
-	properly. Remove squelch_warnings functions and add a dummy call in
-	the handler methods to squelch compiler warnings.
-
-2003-01-25  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure:
-	* win/configure.in: Define HAVE_ALLOCA_GCC_INLINE when we detect that
-	no alloca function is found in malloc.h and we are compiling with GCC.
-	Remove HAVE_NO_ALLOC_DECL define.
-	* win/tclWin32Dll.c (TclpCheckStackSpace): Don't define alloca as a
-	cdecl function. Doing this caused a tricky runtime bug because the
-	_alloca function expects the size argument to be passed in a register
-	and not on the stack. To fix this problem, we use inline ASM when
-	compiling with gcc to invoke _alloca with the size argument loaded
-	into a register.
-
-2003-01-24  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinDde.c (Dde_Init): clarified use of tsdPtr.
-	(DdeServerProc): better refcount handling of returnPackagePtr.
-
-	* generic/tclEvent.c (Tcl_Finalize): revert finalize change on
-	2002-12-04 to correct the issue with extensions that have TSD needing
-	to finalize that before they are unloaded. This issue needs further
-	clarification.
-
-	* tests/unixFCmd.test: only do groups check on unix
-
-2003-01-24  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclStringObj.c: proper fixes for Tcl_SetObjLength and
-	Tcl_AttemptSetObjectLength dealing with string objects with both
-	pure-unicode and normal internal representations. Previous fix didn't
-	handle all cases correctly.
-	* generic/tclIO.c: Add 'Tcl_GetString()' to ensure the object has a
-	valid 'objPtr->bytes' field before manipulating it directly.
-
-	This fixes [Bug 635200] and [Bug 671138], but may reduce performance
-	of Unicode string handling in some cases. A further patch will be
-	applied to address this, once the code is known to be correct.
-
-2003-01-24  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Add test to see if alloca is undefined in
-	malloc.h.
-	* win/tclWin32Dll.c (TclpCheckStackSpace): Rework the SEH exception
-	handler logic to avoid using the stack since alloca will modify the
-	stack. This was causing a nasty bug that would set the exception
-	handler to 0 because it tried to pop the previous exception handler
-	off the top of the stack.
-
-2003-01-23  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
-
-	* doc/lset.n: Fixed fault in return values from lset in documentation
-	examples [SF Bug #658463] and tidied up a bit at the same time.
-
-2003-01-21  Joe English  <jenglish@users.sourceforge.net>
-
-	* doc/namespace.n (namespace inscope): Clarified documentation
-	[Patch 670110]
-
-2003-01-21  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Set SHLIB_SUFFIX so that
-	TCL_SHLIB_SUFFIX will be set to a useful value in the generated
-	tclConfig.sh. Set SHLIB_LD_LIBS to "" or '${LIBS}' based on the
-	--enable-shared flag. This matches the UNIX implementation.
-
-2003-01-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclCkalloc.c: change %ud to %u as appropriate.
-
-2003-01-17  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWinDde.c (DdeServerProc): Deallocate the Tcl_Obj returned by
-	ExecuteRemoteObject if it was not saved in a connection object.
-
-2003-01-17  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tcl.h: Revert earlier change that defined TCL_WIDE_INT_TYPE
-	as long long and TCL_LL_MODIFIER as L when compiling with mingw. This
-	change ended up causing some test case failures when compiling with
-	mingw.
-	* generic/tclObj.c (UpdateStringOfWideInt): Describe the warning
-	generated by mingw and why it needs to be ignored so that someone is
-	not tempted to "fix" this problem again in the future.
-
-2003-01-16  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclStringObj.c: Tcl_SetObjLength fix for when the object has
-	a unicode string rep. [Bug 635200]
-	* tests/stringObj.test: removed 'knownBug' constraint from test 14.1
-	now that this bug is fixed.
-
-	* generic/tclInt.h:
-	* generic/tclBasic.c:
-	* generic/tclCmdMZ.z:
-	* tests/trace.test: execution and command tracing bug fixes and
-	cleanup. In particular fixed [Bug 655645], [Bug 615043], [Bug 571385]
-	  - fixed some subtle cleanup problems with tracing. This required
-	    replacing Tcl_Preserve/Tcl_Release with a more robust refCount
-	    approach. Solves at least one known crash caused by memory
-	    corruption.
-	  - fixed some confusion in the code between new style traces (Tcl
-	    8.4) and the very limited 'Tcl_CreateTrace' which existed before.
-	  - made behaviour consistent with documentation (several tests even
-	    contradicted the documentation before).
-	  - fixed some minor error message details
-	  - added a number of new tests
-
-2003-01-16  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinSerial.c (SerialOutputProc): add casts for bytesWritten to
-	allow strict compilation (no warnings).
-
-	* tests/winDde.test:
-	* win/tclWinDde.c (Tcl_DdeObjCmd): Prevent crash when empty service
-	name is passed to 'dde eval' and goto errorNoResult in request and
-	poke error cases to free up any allocated data.
-
-2003-01-16  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWin32Dll.c (squelch_warnings): Squelch compiler warnings from
-	SEH ASM code.
-	* win/tclWinChan.c (squelch_warnings): Squelch compiler warnings from
-	SEH ASM code.
-	* win/tclWinDde.c: Add casts to avoid compiler warnings. Pass pointer
-	to DWORD instead of int to avoid compiler warnings.
-	* win/tclWinFCmd.c (squelch_warnings): Add casts and fixup decls to
-	avoid compiler warnings. Squelch compiler warnings from SEH ASM code.
-	* win/tclWinFile.c: Add casts and fixup decls to avoid compiler
-	warnings. Remove unused variable.
-	* win/tclWinNotify.c: Declare as DWORD instead of int to avoid
-	compiler warning.
-	* win/tclWinReg.c: Add casts to avoid compiler warning. Fix assignment
-	in if expression bug.
-	* win/tclWinSerial.c: Add casts to avoid compiler warnings. Remove
-	unused variable.
-	* win/tclWinSock.c: Add casts and fixup decls to avoid compiler
-	warnings.
-
-2003-01-14  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclClock.c (FormatClock): corrected typo that incorrectly
-	conditionally defined savedTZEnv and savedTimeZone.
-
-2003-01-13  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	Fix mingw build problems and compiler warnings.
-
-	* generic/tcl.h: Add if defined(__MINGW32__) check to code that sets
-	the TCL_WIDE_INT_TYPE and TCL_LL_MODIFIER.
-	* generic/tclClock.c (FormatClock): Don't define savedTimeZone and
-	savedTZEnv if we are not going to use them.
-	* generic/tclEnv.c: Add cast to avoid warning.
-	* win/tclWinChan.c: Use DWORD instead of int to avoid compiler warning
-	* win/tclWinThrd.c: Only define allocLock, allocLockPtr, and dataKey
-	when TCL_THREADS is defined. This avoid a compiler warning about
-	unused variables.
-
-2003-01-12  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/README: Update msys + mingw URL, the new release includes the
-	released 1.0.8 version of msys which includes a number of bug fixes.
-
-2003-01-12  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Pull in addition of shell32.lib to
-	LIBS_GUI that was added to the Tk tcl.m4 but never made it back into
-	the Tcl version.
-
-2003-01-12  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tcl.h: Skip Tcl's define of CHAR, SHORT, and LONG when
-	HAVE_WINNT_IGNORE_VOID is defined. This avoids a bunch of compiler
-	warnings when building with Cygwin or Mingw.
-	* win/configure: Regen.
-	* win/configure.in: Define HAVE_WINNT_IGNORE_VOID when we detect a
-	winnt.h that still defines CHAR, SHORT, and LONG when VOID has already
-	been defined.
-	* win/tcl.m4 (SC_LOAD_TCLCONFIG): Subst the TCL_DEFS loaded from
-	tclConfig.sh so that Tcl defines can make it into the Tk Makefile.
-
-2003-01-12  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Check for typedefs like LPFN_ACCEPT in winsock2.h
-	and define HAVE_NO_LPFN_DECLS if not found.
-	* win/tclWinSock.c: Define LPFN_* typedefs if HAVE_NO_LPFN_DECLS is
-	defined. This fixes the build under Mingw and Cygwin, it was broken by
-	the changes made on 2002-11-26.
-
-2003-01-10  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:
-	* win/tclWinInt.h:
-	* win/tclWinInit.c: fix to new WinTcl crash on exit with vfs,
-	introduced on 2002-12-06. Encodings must be cleaned up after the
-	filesystem.
-
-	* win/makefile.vc: fix to minor VC++ 5.2 syntax problem
-
-2003-01-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileReturnCmd):  Corrected off-by-one
-	problem with recent commit. [Bug 633204]
-
-2003-01-09  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c: remove unused variable 'macSpecialCase'
-	[Bug 664749]
-
-	* generic/tclIOUtil.c:
-	* generic/tclInt.h:
-	* unix/tclUnixFile.c:
-	* mac/tclMacFile.c:
-	* win/tclWinFile.c:
-	* win/tclWinInt.h:
-	* win/tclWin32Dll.c:
-	* tests/cmdAH.test: fix to non-ascii chars in paths when setting mtime
-	and atime through 'file (a|m)time $path $time'. [Bug 634151]
-
-2003-01-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExprFloatError):  Use the IS_NAN macro for
-	greater clarity of code.
-
-2003-01-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileReturnCmd):
-	* tests/compile.test:	Corrects failure of bytecompiled [catch
-	{return}] to have result TCL_RETURN (not TCL_OK) [Bug 633204]. This
-	patch is a workaround for 8.4.X. A new opcode INST_RETURN is a better
-	long term solution for 8.5 and later.
-
-2003-01-04  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/makefile.vc:
-	* win/rules.vc:  Fixed INSTALLDIR macro problem that blanked itself by
-	accident causing the install target to put the tree at the root of the
-	drive built on. Whoops..
-
-	Renamed the 'linkexten' option to be 'staticpkg'. Added 'thrdalloc' to
-	allow the switching _on_ of the thread allocator. Under testing, I
-	found it not to be benificial under windows for the purpose of the
-	application I was using it for. It was more important for this app
-	that resources for tcl threads be returned to the system rather than
-	saved/moved to the global recycler. Be extra clean or extra fast for
-	the default threaded build? Let's move to clean and allow it to be
-	switched on for users who find it benificial for their use of threads.
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"             ***
-	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"             ***
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"             ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/ChangeLog.2004 b/ChangeLog.2004
deleted file mode 100644
index e237382..0000000
--- a/ChangeLog.2004
+++ /dev/null
@@ -1,4619 +0,0 @@
-2004-12-29  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/tcl.m4, win/configure: update MSVC CFLAGS_OPT to -O2, remove -Gs
-	(included in -O2) and -GD (outdated). Use "link -lib" instead of "lib"
-	binary and remove -YX for MSVC7 portability. Add -fomit-frame-pointer
-	for gcc OPT compiles. [Bug 1092952, 1091967] Align LIBS_GUI with Tk
-	head needs.
-
-2004-12-29  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclDate.c: Regen
-	* generic/tclGetDate.y (TclDatelex): Fixed a problem where a
-	four-digit group with >=2 leading zeroes appeared to be a two-digit
-	group, leading to misinterpreting the time 0012 as 1200. [Bug 1090413]
-	* library/clock.tcl: Added code to interpret correctly months outside
-	the range 01-12 as reduced modulo 12 with a corresponding adjustment
-	to the year. [Bug 1092789]
-	* tests/clock.test: Added regression test cases for the above two bugs
-	* unix/Makefile.in: Added --no-lines to the 'bison' command line to
-	* win/Makefile.in: help constrain the number of diffs in a cvs checkin
-
-2004-12-24  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclLiteral.c:
-	* generic/tclProc.c:
-	Avoid sharing cmdName literals accross namespaces, and generalise
-	usage of the TclRegisterNewLiteral macro. [Patch 1090905]
-
-2004-12-20  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c: moved TclInitCompiledLocals to tclProc.c
-	* generic/tclProc.c: new static InitCompiledLocals to allow for a
-	single pass over the proc's arguments at proc load time (instead of
-	two as previously). TclObjInterpProc() now allocates the
-	compiledLocals on the tcl execution stack, using the new
-	TclStackAlloc/Free functions.
-
-2004-12-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInterp.c (Tcl_LimitSetTime, TimeLimitCallback):
-	(TclLimitRemoveAllHandlers, TclInitLimitSupport): Set a timer event to
-	trigger when the time limit runs out. All the time limit actually does
-	is check to see if the time limit has been exceeded, but this is
-	enough to fix [Bug 1085023].
-	* generic/tclInt.h (struct Interp): Added a field to hold the token
-	for the timer event handler associated with the current time limit.
-	* generic/tclEvent.c (Tcl_UpdateObjCmd, Tcl_VwaitObjCmd): Add error
-	message when limit exceeded.
-	* tests/interp.test (interp-34.[89]): Check that time limits handle
-	the two cases reported in [Bug 1085023]
-
-	* generic/tclTimer.c (TclCreateAbsoluteTimerHandler): New internal
-	function that allows setting a timer handler that will be triggered at
-	(or after) a specific time instead of at some number of milliseconds
-	in the future. This is a candidate for future exposure via a TIP.
-
-2004-12-15  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclNamesp.c:
-	* generic/tclProc.c:
-	* generic/tclStubInit.c:
-	* generic/tclTest.c: Added two new functions to allocate memory from
-	the execution stack (TclStackAlloc, TclStackFree). Added functions
-	TclPushStackFrame and TclPopStackFrame that do the work of
-	Tcl_PushCallFrame and Tcl_PopCallFrame, but using frames allocated in
-	the execution stack - i.e., heap instead of C-stack. The core uses
-	these two new functions exclusively; the old ones remain for backwards
-	compat, as at least two popular extensions (itcl, xotcl) are known to
-	use them.
-
-2004-12-14  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c:
-	* generic/tclInt.h:
-	* generic/tclProc.c:
-	* generic/tclVar.c: changing the isProcCallFrame field of the
-	CallFrame struct from a 0/1 field to flags. Should be perfectly
-	backwards compatible.
-
-2004-12-14  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/configure.in: Added special processing to remove "$U" from
-	libraries in the LIBOBJS value. This is an auto-make-ism we need to
-	avoid. [Bug 1081541]
-
-	* unix/configure: autoconf-2.57
-
-2004-12-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tcl.h: Restored extern "C" guards so that C++ code sees
-	function pointer typedef linkage consistent with earlier Tcl releases.
-	[Bug 1082349]
-
-	* generic/tclEncoding.c: Plugged some memory leaks. Thanks to Rolf Ade
-	* generic/tclUtil.c:	 for reports and testing [Bug 1083082]
-
-2004-12-13  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/clock.n: Clarify that the [clock scan] command does not accept
-	the full range of ISO8601 point-in-time formats. [Bug 1075433]
-
-2004-12-12  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclArrayObjCmd - ARRAY_NAMES): leaking an object
-	[Bug 1084111] - thanks to Rolf Ade.
-
-2004-12-12  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclObj.c (TclSetCmdNameObj): special handling for fully
-	qualified command names (as in fix [Patch 456668]).
-
-2004-12-11  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclNamesp.c: converting the static function
-	GetNamespaceFromObj() to MODULE_SCOPE TclGetNamespaceFromObj().
-
-2004-12-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/tcl.wse.in, unix/tcl.spec, win/README.binary, README:
-	* win/configure.in, unix/configure.in, generic/tcl.h:
-	Bumped version number to 8.5a3 to distinguish HEAD of CVS development
-	from the recent 8.5a2 release.
-
-2004-12-10  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclInitCompiledLocals):
-	* generic/tclCompile.h:
-	* generic/tclInt.h:
-	* generic/tclProc.c (TclObjInterpProc, TclCreateProc): optimised
-	loops that initialise a proc's arguments and compiled local
-	variables, removing tests from inner loops.
-
-2004-12-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInt.h: Move ensemble API decls here from tclNamesp.c
-
-2004-12-09  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (TclMakeEnsembleCmd, TclSetEnsemble*)
-	(TclSetEnsemble*, TclFindEnsemble): Build an internal API for creating
-	and manipulating ensembles; they can be deleted using the normal
-	command-deletion API.
-
-	* doc/Async.3: Reword for better grammar, better nroff and get the
-	flag name right. (Reported by David Welton.)
-
-2004-12-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (2.1-4): Added constraints so that when a value
-	of TCL_LIBRARY is required for process initialization, we skip the
-	tests that mess with that value.
-
-2004-12-07  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	*** 8.5a2 TAGGED FOR RELEASE ***
-
-	* unix/Makefile.in: add library/{tzdata,msgs} to dist target (kbk)
-
-	* doc/foreach.n: Adjust tabs to be friendlier to some HTML
-	converters. [Bug 1078760]
-
-2004-12-06  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tclUnixNotfy.c (NotifierThreadProc): init numFdBits
-	[Bug 1079286]
-
-	* doc/error.n, doc/SaveResult.3, doc/Thread.3: minor nroff typos
-
-2004-12-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/safe.test:	Trim auto_path to improve performance [1080039]
-
-	* tests/msgcat.test:	makeFile/removeFile cleanup [1079117]
-
-2004-12-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclEncoding.c:	Different fix for [Bug 1077005].
-	* generic/tclEvent.c:	Broke apart TclpSetInitialEncodings() on
-	* generic/tclInt.h:	Windows into TclpSetInterfaces(), that is
-	* unix/tclUnixInit.c:	fundamentally essential, and the initialization
-	* win/tclWinInit.c:	of the system encoding, which is not. Made
-	the TclpSetInterfaces call part of TclInitSubsystems so it cannot be
-	overlooked.
-
-2004-12-03  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* changes: updated for 8.5a2 release
-
-2004-12-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c (TclSetProcessGlobalValue): Handle the case where
-	a ProcessGlobalValue might be assigned to itself.
-
-	* generic/tclEncoding.c (MakeFileMap): Correct refcounting errors
-	managing values returned by TclPathPart (with refCount of 1!) that led
-	to a memory leak. [Bug 1077474].
-
-2004-12-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c:  fix and new tests for [Bug 1074671] to ensure
-	* tests/fileSystem.test: tilde paths are not returned specially by
-	'glob'.
-
-2004-12-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/Makefile.in: Added a 'sed' in the setting of ROOT_DIR_NATIVE to
-	compensate for a bug in cygpath (at least version 1.36) that leaves a
-	trailing backslash on the end of the converted path.
-
-2004-12-02  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInterp.c (Alias,Target,Master): Rewrote these so that the
-	aliases that refer to an interpreter are stored in a list and not a
-	hashtable (which was only ever a convenience, and forced the use of a
-	global mutex to generate keys!) [FRQ 1077210]
-	* generic/tclNamesp.c (numNsCreated): Moved into thread-local storage
-	to remove a global mutex. [FRQ 1077210]
-
-2004-12-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c (TclGetProcessGlobalValue): Narrowed the scope of
-	mutex locks.
-
-	* generic/tclUtil.c:		Updated Tcl_GetNameOfExecutable() to
-	* generic/tclEncoding.c:	make use of a ProcessGlobalValue for
-	* generic/tclEvent.c:		storing the executable name. Added
-	internal routines Tcl(Get|Set)ObjNameOfExecutable() to access that
-	storage in Tcl_Obj, rather than string format.
-
-	* unix/tclUnixFile.c:	Rewrote TclpFindExecutable() to use
-	* win/tclWinFile.c:	TclSetObjNameOfExecutable to store the
-	executable name it computes.
-
-	* generic/tclInt.h:	Added internal stub entries for
-	* generic/tclInt.decls: TclpFindExecutable and
-	Tcl(Get|Set)ObjNameOfExecutable.
-
-	* generic/tclIntDecls.h: make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclCmdIL.c:	Retrieve executable name in Tcl_Obj form
-	* win/tclWinPipe.c:	instead of string form.
-
-	* unix/tclUnixTest.c:	Update [testfindexecutable] command to use new
-	internal interfaces.
-
-	* generic/tclEncoding.c:	Moved TclpSetInitialEncodings() call
-	from Tcl_FindExecutable() into TclInitEncodingSubsystem(). This is
-	important on Windows where it establishes whether the "ascii" or
-	"unicode" set of system routines will be used, and that needs to be
-	done earlier to support filesystem operations. [Bug 1077005]
-
-2004-12-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/winDde.test: Rewritten to use tcltest2 features more
-	thoroughly (reducing the [catch] count!) and fix the problem with
-	winDde-6.1 being out of synch with the implementation.
-
-2004-11-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl ([unknown]): Restored the save/restore of the
-	variables ::errorCode and ::errorInfo. This is needed when the
-	[::bgerror] command is auto-loaded (as it is by Tk).
-
-	Patch 976520 reworks several of the details involved with
-	startup/initialization of the Tcl library, focused on the activities
-	of Tcl_FindExecutable().
-
-	* generic/tclIO.c:	Removed bogus claim in comment that encoding
-	"iso8859-1" is "built-in" to Tcl.
-
-	* generic/tclInt.h:	Created a new struct ProcessGlobalValue,
-	* generic/tclUtil.c:	routines Tcl(Get|Set)ProcessGlobalValue, and
-	function type TclInitProcessGlobalValueProc. Together, these take care
-	of the housekeeping for "values" (things that can be held in a
-	Tcl_Obj) that are global across a whole process. That is, they are
-	shared among multiple threads, and epoch and mutex protection must
-	govern the validity of cached copies maintained in each thread.
-
-	* generic/tclNotify.c:	Modified TclInitNotifier() to tolerate being
-	called multiple times in the same thread.
-	* generic/tclEvent.c:	Dropped the unused argv0 argument to
-	TclInitSubsystems(). Removed machinery to unsure only one
-	TclInitNotifier() call per thread, now that that is safe. Converted
-	Tcl(Get|Set)LibraryPath to use a ProcessGlobalValue, and moved them to
-	tclEncoding.c.
-	* generic/tclBasic.c:	Updated caller.
-
-	* generic/tclInt.h:	TclpFindExecutable now returns void.
-	* unix/tclUnixFile.c:
-	* win/tclWinFile.c:
-	* win/tclWinPipe.c:
-
-	* generic/tclEncoding.c: Built new encoding search initialization on a
-	foundation of ProcessGlobalValues, exposing new routines
-	Tcl(Get|Set)EncodingSearchPath. A cache of a map from encoding name to
-	directory pathname keeps track of where encodings are available for
-	loading. Tcl_FindExecutable greatly simplified into just three
-	function calls. The "library path" is now misnamed, as its only
-	remaining purpose is as a foundation for the default encoding search
-	path.
-
-	* generic/tclInterp.c:	Inlined the initScript that is evaluated by
-	Tcl_Init(). Added verification after initScript evaluation that Tcl
-	can find its installed *.enc files, and that it has initialized
-	[encoding system] in agreement with what the environment expects.
-	[tclInit] no longer driven by the value of $::tcl_libPath; it largely
-	constructs its own search path now, rather than attempt to share one
-	with the encoding system.
-
-	* unix/tclUnixInit.c:	TclpSetInitialEncodings factored so that a new
-	* win/tclWinInit.c:	routine TclpGetEncodingNameFromEnvironment can
-	reveal that Tcl thinks the [encoding system] should be, even when an
-	incomplete encoding search path, or a missing *.enc file won't allow
-	that initialization to succeed. TclpInitLibraryPath reworked as an
-	initializer of a ProcessGlobalValue.
-
-	* unix/tclUnixTest.c:	Update implementations of [testfindexecutable],
-	[testgetdefenc], and [testsetdefenc].
-
-	* tests/unixInit.test:	Corrected tests to operate properly even when
-	a value of TCL_LIBRARY is required to find encodings.
-
-	* generic/tclInt.decls: New internal stubs: TclGetEncodingSearchPath,
-	TclSetEncodingSearchPath, TclpGetEncodingNameFromEnvironment. These
-	are candidates for public exposure by future TIPs.
-
-	* generic/tclIntDecls.h: make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclTest.c:	Updated [testencoding] to use
-	* tests/encoding.test:	Tcl(Get|Set)EncodingSearchPath.	 Updated tests.
-
-2004-11-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl: Corrected the regular expressions that match a
-	time zone to allow for time zones specified as +HH or -HH.
-	* tests/clock.test: Added regression test case for the above issue.
-	Thanks to Rolf Ade for reporting this issue [https://wiki.tcl-lang.org/page/Parsing+ISO8601+dates+and+times]
-	* win/tclWinDde.c (Tcl_DdeObjCmd): Corrected a typo that caused a
-	compilation failure on VC++.
-
-2004-11-29  Andreas Kupries <andreask@activestate.com>
-
-	* win/Makefile.in (install-libraries): Brought entry '2004-10-26 Don
-	Porter (Tcl Modules)' into the windows world, actually the
-	win/configure buildsystem. The other windows buildsystems (.vc, .bc)
-	still have to be updated as well.
-
-2004-11-26  Andreas Kupries <andreask@activestate.com>
-
-	* win/tclWinDde.c (ExecuteRemoteObject): Removed bogus semicolon found
-	at the end of the header for the function definition, terminating it
-	early and preventing a compile. This is likely a fix for '2004-11-25
-	Donal'. I have to conclude that it is also unknown if the other
-	changes to this file actually pass the testsuite. Running testsuite
-	... They don't. winDde-6.1 fails. This is only a message discrepance,
-	i.e. not too bad. Leaving resolution of that to Pat and Donal.
-
-2004-11-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/auto.tcl (tcl_findLibrary): Made sure the uniquifying
-	operations on the search path does not also normalize. [Bug 1072136]
-
-2004-11-26  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/configure.in: Simplify the code to check for correctness of
-	strstr, strtoul and strtod.
-	* unix/tcl.m4 (SC_TCL_CHECK_BROKEN_FUNC): Split a complex stanza out
-	of configure.in into its own function. Also force it to do the right
-	thing with caching of results of AC_TRY_RUN to deal with issue raised
-	in [Patch 1073524]
-
-	* doc/foreach.n: Added simple example. [FRQ 1073334]
-
-2004-11-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclProc.c (TclObjInterpProc):	    Make it so that only
-	* generic/tclIndexObj.c (Tcl_WrongNumArgs): [proc] instances do
-	* tests/indexObj.test (indexObj-5.7):	    quoting of their first
-	arguments, so keeping [Bug 942757] fixed and making [Bug 1066837] be
-	fixed as well. Done with a load of #ifdef-ery because this hack is so
-	ugly nobody should keep it around once Itcl's fixed.
-
-2004-11-25  Reinhard Max  <max@suse.de>
-
-	* tests/tcltest.test: The order in which [glob] returns the file names
-	is undefined, so tests should not depend on it.
-
-2004-11-25  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* doc/Thread.3:
-	* doc/Notifier.3: Added changes from the core-8-4-branch
-
-2004-11-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/dde.n: Synchronized the documentation of the commands with the
-	header of the docs and what the package actually does. Thanks to
-	Andreas Kupries for spotting this.
-	* win/tclWinDde.c (Tcl_DdeObjCmd): Much cleanup of argument parsing
-	code.
-
-2004-11-24  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclPort.h: Relative include of tclWinPort.h returned as it
-	was requiring me set -I$(tcl_root)/win for my extensions that need to
-	include tclInt.h and doesn't appear to serve any purpose for windows
-	builds.
-
-2004-11-24  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/tcl.m4 (SC_ENABLE_THREADS): Corrected bad check for 3-argument
-	readdir_r [Bug 1001325].
-	* unix/configure: Regenerated.
-	* unix/tclUnixNotfy.c: Corrected all uses of 'select' to manage their
-	masks using the FD_CLR, FD_ISSET, FD_SET, and FD_ZERO macros rather
-	than bit-whacking that failed under Solaris-Sparc-64. [Bug 1071807]
-	* win/tclWinInit.c (TclpInitLibraryPath): Removed unused vars 'pathc'
-	and 'pathv' that caused compilation problems on VC++ with
-	--enable-symbols.
-
-2004-11-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tcl.m4 (SC_ENABLE_THREADS): Corrected failure to determine the
-	number of arguments for readdir_r on SunOS systems. [Bug 1071701]
-
-	* unix/configure:	autoconf-2.57
-
-	* generic/tclCmdIL.c (InfoVarsCmd):	Corrected segfault in new
-	* tests/info.test (info-19.6):	trivial matching branch [Bug 1072654]
-
-2004-11-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/man2html.tcl, tools/man2html1.tcl: Update to use Tcl 8.4.
-	* tools/man2html2.tcl: Fix broken .SS handling.
-
-2004-11-23  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/Makefile.in: Add (commented-out) code to integrate tclConfig.h
-	into the dependency tree and 'make distclean'. [Bug 1068171]
-
-	* generic/tclResult.c (Tcl_AppendResultVA): Remove call to
-	Tcl_GetStringResult to speed up repeated calls to Tcl_AppendResult
-	with the side effect that code that wants to access interp->result
-	should always call Tcl_GetStringResult first. See [Patch 1041072]
-	discussion for more details.
-
-2004-11-22  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_TCL_64BIT_FLAGS): Define HAVE_TYPE_OFF64_T only when
-	off64_t, open64(), and lseek64() are defined. IRIX 5.3 is known to not
-	include an open64 function. [Bug 1030465]
-
-2004-11-22  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_ENABLE_THREADS): Check for a 2 argument version of
-	readdir_r that is known to exists under IRIX 5.3.
-	* unix/tclUnixThrd.c (TclpReaddir): Use either 2 arg or 3 arg version
-	of readdir_r. [Bug 1001325]
-
-2004-11-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tclUnixInit.c (TclpInitLibraryPath): Purged dead code that used
-	* win/tclWinInit.c (TclpInitLibraryPath):  to extend the "library
-	path". Search path construction for init.tcl is now done within the
-	[tclInit] proc.
-	* generic/tclInterp.c:	Restored several directories to the search
-	* tests/unixInit.test:	path used to locate init.tcl within [tclInit].
-	This change does not restore any directories to the encoding search
-	path, so should still avoid the price of an unreasonably large number
-	of filesystem accesses during encoding initialization at startup
-	[Bug 976438]
-
-2004-11-22  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: fix and new test for [Bug 1043129] in the
-	* tests/fileSystem.test: treatment of backslashes in file join on
-	Windows.
-
-2004-11-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/AddErrInfo.3:	Typo corrections (Thanks Daniel South).
-	* doc/interp.n:
-
-2004-11-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/AddErrInfo.3:	Docs for Tcl_(Get|Set)ReturnOptions. [TIP 227]
-
-	* doc/AddErrInfo.3:
-	* doc/Async.3:		Documentation updates to replace references
-	* doc/BackgdErr.3:	to global variable ::errorInfo and ::errorCode
-	* doc/SaveResult.3:	and to the ::bgerror command with references
-	* doc/after.n:		to their preferred replacements, the
-	* doc/bgerror.n:	-errorinfo and -errorcode return options,
-	* doc/error.n:		the Tcl_*InterpState routines, and the
-	* doc/exec.n:		[interp bgerror] command.
-	* doc/exit.n:
-	* doc/fileevent.n:
-	* doc/interp.n:
-	* doc/return.n:
-	* doc/tclvars.n:
-	* doc/update.n:
-
-	* tests/unixInit.test: Removed "knownBug" constraints to prompt bug
-	fixing before 8.5a2 release.
-
-2004-11-19  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile:
-	* unix/configure.in:
-	* unix/tclUnixInit.c (MacOSXGetLibraryPath): changed detection of tcl
-	framework build when determining tclLibPath from overloaded
-	TCL_LIBRARY to configuration define TCL_FRAMEWORK. [Bug 1068088]
-
-	* unix/configure: autoconf-2.57
-	* unix/tclConfig.h.in: autoheader-2.57
-
-2004-11-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/SaveResult.3:	Documentation for Tcl_*InterpState (TIP 226).
-
-	* generic/tclEvent.c (HandleBgErrors):	Simplified program flow.
-
-	* tests/basic.test:	Updated functional (not testing) uses of
-	* tests/io.test:	[bgerror] to make use of [interp bgerror].
-	* tests/socket.test:
-	* tests/timer.test:
-
-	* tests/interp.test (interp-36.*):	[interp bgerror] tests.
-
-	* generic/tclInterp.c:	Corrected [interp bgerror] error messages.
-
-2004-11-18  Reinhard Max  <max@suse.de>
-
-	* unix/tcl.m4 (SC_CONFIG_MANPAGES): Applied an improved version of
-	* unix/configure.in:		    [Patch 996085], that introduces
-	* unix/Makefile.in:		    --enable-man-suffix.
-
-	* unix/installManPage:		    added
-	* unix/mkLinks.tcl:		    removed
-	* unix/mkLinks:			    removed
-	* unix/configure:		    generated
-
-	* unix/Makefile.in:		    Don't install tclConfig.h .
-
-2004-11-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/configure.in: The change below reveals that the public data
-	type Tcl_StatBuf relies on config information. For now, disabled the
-	use of the tclConfig.h file until its full impact on Tcl's interface
-	can be assessed.
-
-	* unix/configure:	autoconf-2.57
-
-	* generic/tcl.h:	Moved the #include "tclConfig.h" out of
-	* generic/tclInt.h:	tcl.h.	The config settings are not part of
-	* generic/tclPort.:	the public interface, and having it there
-	breaks compiled against uninstalled Tcl and extensions using
-	autoconf-2.5*.
-
-2004-11-16  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tclUnixChan.c (TtySetOptionProc): fixed crash configuring
-	-ttycontrol on a channel. [Bug 1067708]
-
-2004-11-16  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIOUtil.c (TclFSEpochOk): There were two code paths via
-	which the thread copy of filesystemEpoch could be synched with the
-	master copy, but only one kept the filesystem list cache up to date.
-	Fix routes everything through a single code path. [Bug 1035775].
-
-2004-11-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Stop architecture flags to 'ld' from
-	getting lost when [load] is disabled. [Bug 1016796]
-
-2004-11-16  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tcl.h:
-	* unix/configure.in: changed HAVE_CONFIG_H to HAVE_TCL_CONFIG_H.
-
-	* unix/configure: autoconf-2.57
-
-2004-11-15  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h: Added comment warning that the old ERR_IN_PROGRESS
-	and ERROR_CODE_SET flag values should not be re-used for the sake of
-	those extensions that have accessed them.
-
-	* generic/tclCmdMZ.c (Tcl_TraceObjCmd): Fixed Bug 1065378 which failed
-	* tests/trace.test (trace-33.1):	to permit a variable trace
-	created with [trace variable] to be destroyed with [trace remove].
-	Thanks to Keith Vetter for the report.
-
-2004-11-15  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/tclvars.n: Added section to documentation on global variables
-	that are specific to tclsh and wish. [Patch 1065732]
-
-2004-11-12  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclEncoding.c (TableFromUtfProc): correct crash condition
-	when TCL_UTF_MAX == 6. [Bug 1004065]
-
-2004-11-12  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/interp.n: Basic documentation of the TIP#221 API.
-
-2004-11-12  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP #221 IMPLEMENTATION
-	* generic/tclBasic.c:	Define [::tcl::Bgerror] in new interps.
-	* generic/tclEvent.c:	Update Tcl_BackgroundError to make use of the
-				registered [interp bgerror] command.
-	* generic/tclInterp.c:	New [interp bgerror] subcommand.
-	* tests/interp.test:	syntax tests updated.
-
-	TIP #226 IMPLEMENTATION
-	* generic/tcl.decls:	Stubs for Tcl_(Save|Restore|Discard)InterpState
-	* generic/tcl.h:	New public opaque type, Tcl_InterpState.
-	* generic/tclInt.h:	Drop old private declarations. Add
-				Tcl(Get|Set)BgErrorHandler
-	* generic/tclResult.c:	Tcl_*InterpState implementations.
-	* generic/tclDictObj.c:	Update callers.
-	* generic/tclIOGT.c:
-	* generic/tclTrace.c:
-
-	TIP #227 IMPLEMENTATION
-	* generic/tcl.decls:	Stubs for Tcl_(Get|Set)ReturnOptions.
-	* generic/tclInt.h:	Drop old private declarations.
-	* generic/tclResult.c:	Tcl_*ReturnOptions implementations.
-	* generic/tclCmdAH.c:	Update callers.
-	* generic/tclMain.c:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* unix/tclAppInit.c:	Removed tclConfig.h #include, now that tcl.h
-				takes care of it for us.
-
-	* generic/tclInt.h:	Moved verification of ptrdiff_t typedef from
-	* generic/tclExecute.c: multiple .c files into one common header where
-	* generic/tclVar.c:	it is verifiably after tclConfig.h inclusion.
-
-2004-11-12  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tcl.h:
-	* generic/tclInt.h:
-	* unix/Makefile.in: include tclConfig.h from tcl.h and install it as a
-	public header. Normalized compiler include path order to
-	-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR}.
-
-	* unix/dltest/Makefile.in: add ${BUILD_DIR}/.. to include path to pick
-	up tclConfig.h.
-
-	* unix/tclUnixInit.c: moved check for HAVE_CFBUNDLE define after
-	#include "tclInt.h" to ensure tclConfig.h has been included.
-
-2004-11-12  Reinhard Max  <max@suse.de>
-
-	* unix/config.h.in:
-	* unix/tclConfig.h.in:	renamed
-
-	* unix/Makefile.in:	Completed support for config header,
-	* unix/configure.in:	fixed building outside of the unix dir,
-	* unix/tclAppinit.c:	and reflected the name change of config.h.
-	* generic/tclInt.h:
-
-	* unix/configure:	generated
-
-2004-11-12  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/config.h.in:	Allow configure to put all the C #defs into
-	* unix/configure.in:	a file (called config.h) so that Unix builds
-	* unix/tcl.m4:		now take far fewer lines of scrollback to
-	* unix/Makefile.in:	proceed (making it less likely that any errors
-	* generic/tclInt.h:	or warnings will get missed).
-	* unix/tclAppInit.c:	Part of the TIP#34 upgrades.
-
-	* unix/tcl.m4, unix/tclUnixPort.h: Check for pthread_attr_get_np in
-	<pthread.h> before forcing the use of <pthread_np.h> to make things
-	work on NetBSD 2.0. [Bug 1064882]
-
-	* doc/binary.n, doc/upvar.n: More minor fixes.
-
-2004-11-12  Daniel Steffen  <das@users.sourceforge.net>
-
-	* doc/CrtChannel.3:
-	* doc/Interp.3:
-	* doc/Limit.3:
-	* doc/binary.n:
-	* doc/dict.n:
-	* doc/tm.n:
-	* doc/upvar.n: fixed *roff errors uncovered by running 'make html'.
-
-	* tools/tcltk-man2html.tcl: added faked support for bullet point
-	lists, i.e. *nroff ".IP \(bu" syntax.
-
-2004-11-11  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tests/fCmd.test:
-	* unix/tclUnixFCmd.c (TraverseUnixTree): added option to rewind() the
-	readdir() loop whenever the source hierarchy has been modified by
-	traverseProc (e.g. by deleting files); this is required to ensure
-	complete traversal of the source hierarchy on certain filesystems like
-	HFS+. Added test for failing recursive delete on Mac OS X that was due
-	to this. [Bug 1034337]
-
-	* generic/tclListObj.c (Tcl_ListObjReplace): use memmove() instead of
-	manual copy loop to shift list elements. Decreases time spent in
-	Tcl_ListObjReplace() from 5.2% to 1.7% of overall runtime of tclbench
-	on a ppc 7455 (i.e. 200% speed increase). [Patch 1064243]
-
-	* generic/tclHash.c: hoisted some constant pointer dereferences out of
-	loops to eliminate redundant loads that the gcc optimizer didn't deal
-	with. Decreases time spend in Tcl_FindHashEntry() by 10% over a full
-	run of the tcl testuite on a ppc 7455. [Patch 1064243]
-
-	* tests/fileName.test:
-	* tests/fileSystem.test:
-	* tests/io.test:
-	* tests/msgcat.test:
-	* tests/tcltest.test:
-	* tests/unixInit.test: fixed bugs causing failures when running tests
-	with -tmpdir arg not set to working dir.
-
-	* macosx/Makefile: corrected path to html help inside framework.
-	Prevent parallel make from building several targets at the same time.
-
-	* macosx/tclMacOSXFCmd.c (struct fileinfobuf): force struct to be
-	packed to prevent failures when builing with -malign=natural.
-
-2004-11-10  Andreas Kupries <andreask@activestate.com>
-
-	* unix/tclUnixChan.c: [Bug 727786]. Exterminated the code marked
-	DEPRECATED. This code has not been used in over a year now, and we
-	have no complaints.
-
-2004-11-08  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinPipe.c: The pipe channel driver now respects the -blocking
-	option when closing is the same way the UNIX side works. This is to
-	avoid a hung shell when exiting due to open pipes that refuse to close
-	in a graceful manner.
-	* doc/open.n: Added a note about -blocking 0 and lack of exit status
-	as it had never been documented. [Bug 947693]
-
-	***POTENTIAL INCOMPATIBILITY***
-
-	Scripts that use async pipes on windows, must (like the UNIX side) set
-	-blocking to 1 before calling [close] to receive the exit status.
-
-2004-11-07  David Gravereaux <davygrvy@pobox.com>
-
-	* tests/winFile.test: added contraint to winFile-4.0 to prevent it
-	being run on NT4 [Bug 981829]
-
-2004-11-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/reg.test: Major reorganization so that this file is much
-	easier for a normal Tcl maintainer to comprehend. The test flags are
-	still very cryptic, but they appear to have to be that way. The number
-	of skipped tests has increased, but now the skipped tests have much
-	more meaningful content.
-
-	* tests/tm.test (genpaths): Add a [file normalize] so we pick up
-	Windows drive letters, etc. [Bug 1053568]
-
-2004-11-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:	Updates toward an 8.5a2 release.
-
-2004-11-03  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (FreeScan): Fixed a bug where scanning "Monday"
-	with a base time other than midnight incorrectly carried the base time
-	forward.
-
-	* test/clock.test (clock-33.{5,5a}): Made the test failure more
-	informative.
-
-	* tests/clock.test (clock-34.{28,44,45,46}): Removed 'knownBug'
-	constraints from tests that no longer fail.
-
-	Thanks to Don Porter for reporting these.
-
-2004-11-03  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tcl.h:		Moved the preprocessor logic
-	* generic/tclDecls.h:		from tclInt.h of setting the
-	* generic/tclInt.h:		TCL_STORAGE_CLASS macro to the
-	* generic/tclIntDecls.h:	tcl*Decls.h files now that no
-	* generic/tclIntPlatDecls.h:	use of EXTERN is left in tclInt.h.
-	* generic/tclPlatDecls.h:	Proto for Tcl_Main moved in tcl.h
-	* win/tclWinPort.h:		to prior the inclusion of the Stubs
-	headers as they are now resetting TCL_STORAGE_CLASS. Removed
-	extraineous reset from tclWinPort.h. [Patch 1055668]
-
-	* generic/tclCompile.h: Removed extrainious reset of TCL_STORAGE_CLASS
-	missed in my last edit.
-
-2004-11-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl ([unknown]): Corrections to the 2004-10-25 mods to
-	Aunt ??? in [unknown]. Flaws revealed by Itcl test suite, which still
-	apparently relies on this brokenness. Also added comment suggesting
-	the error message that any code using this hack *ought* to receive in
-	reply.
-
-	* generic/tclTrace.c (TclCallVarTraces):  Improved ability to debug
-	* tests/incr-old.test (incr-old-2.6):	  errors during variable
-	* tests/incr.test (incr-{1,2}.28):	  traces by preserving the
-	* tests/set.test (set-{2,4}.4):		  -errorinfo data.
-	* tests/trace.test (trace-33.1):	  [Bug 527164]
-
-2004-11-02  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclInt.h: added a check for #ifdef __cplusplus around the
-	#define of MODULE_SCOPE. About the only time it would be problem is
-	when someone is statically linking to Tcl and accessing internals from
-	a C++ file and has name mangling issues from the lack of "C" after
-	'extern' [Patch 1055668].
-	* generic/tclCompile.h: Exchanged use of the EXTERN macro to the new
-	MODULE_SCOPE macro. Lowered exported internals count by 35. [Patch
-	1055668]
-	* win/tclWinInt.h:
-	* win/tclWinPort.h: exported internals dropped by a count of 14.
-	* generic/tclFileSystem.h: Added use of MODULE_SCOPE on protos.
-	* generic/tclRegexp.h: manipulating TCL_STORAGE_CLASS unnecessary.
-
-2004-11-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:		Corrected some misleading
-	* tests/tcltest.test (tcltest-26.1,2):	displays of ::errorInfo and
-	::errorCode information when the -setup, -body, and/or -cleanup scripts
-	return an unexpected return code. Thanks to Robert Seeger for the fix.
-	[RFE 1017151].
-
-2004-11-02  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Improved version of the
-	NaN fix from Miguel Sofer. [Bug 761471]
-
-2004-11-02  Kevin Kenny	 <kennykb@acm.org>
-
-	* library/tzdata/America/Cuiaba: Change to DST rules for
-	* library/tzdata/America/Havana: autumn of 2004.
-	[ftp://elsie.nci.nih.gov/pub/tzdata2004g.tar.gz]
-
-	* tools/tclZIC.tcl: Updated to be compatible with recent changes in
-	library/clock.tcl.
-
-2004-11-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFile.c: Simplify TclpUtime to use Tcl_FSGetNativePath, and
-	add comments.
-
-2004-11-02  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInt.h: Change uses of EXTERN to MODULE_SCOPE (defined in
-	this file too to be 'extern' if not overridden) as nothing declared in
-	tclInt.h is supposed to be visible outside the Tcl core. If there *is*
-	anything that extensions are actually using, we can open this up later
-	on. [Patch 1055668]
-
-	* doc/CrtChannel.3 (Tcl_GetChannelMode): Add synopsis. [Bug 1058446]
-
-2004-11-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclWinFile.c (FromCTime, TclpUtime): Replaced a call to the
-	Posix 'utime' function with calls to Windows-API equivalents, to avoid
-	a bug where the VC++ versions misconvert times across a Daylight
-	Saving Time boundary. [Bug 926106]
-	* win/tclWinInt.h (TclWinProcs):
-	* win/tclWin32Dll.c (asciiProcs, unicodeProcs): Removed now-unused
-	reference to 'utime'.
-	* tests/cmdAH.test (cmdAH-24.12): Added test case for the above bug.
-
-2004-11-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Make INST_EQ and friends
-	handle NaN correctly in all cases. [Bug 761471]
-
-	* generic/tclNamesp.c (NamespaceInscopeCmd): Make the error message
-	generation the same as in NamespaceEvalCmd().
-	(Tcl_Import): Rationalized to use Tcl_EvalObjv().
-
-2004-10-31  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/io.test (io-40.3): Convert umask2 test constraint into a form
-	that most people will be able to satisfy.
-
-	* tests/cmdAH.test (cmdAH-8.45): Removed broken test constraint. It
-	didn't do what it was intended to do, and it implied the other correct
-	constraint. [Bug 1053908]
-
-	* generic/tclCmdIL.c (InfoGlobalsCmd):
-	* tests/info.test (info-8.4): Strip leading global-namespace
-	specifiers from the pattern argument. [Bug 1057461]
-
-2004-10-30  Kevin Kenny	 <kennykb@acm.org>
-
-	* generic/clock.c: Replaced WIN32 macro with __WIN32__. [Bug 1054357].
-	Thanks to David Gravereaux for the patch.
-	* win/tclWinFile.c: Removed a long-standing bug that causes incorrect
-	conversion between file time and UTC time if the file time is recorded
-	in a different Daylight Saving Time status than the current one. [Bug
-	926106]
-
-2004-10-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Correct reaction to errors in the
-	obsolete processCmdLineArgsHook.	[Bug 1055673]
-	* library/tcltest/pkgIndex.tcl:	Bump to tcltest 2.2.7
-	* unix/Makefile.in:
-	* tests/all.tcl:	Update to use [tcltest::configure].
-
-2004-10-29  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* library/tm.tcl (::tcl::tm::*): Use the core proc engine to generate
-	the wrong-num-args error messages for the path ensemble.
-
-	Ensembles can now (sometimes) rewrite the error messages of their
-	subcommands so they appear more like the arguments that the user
-	passed to the ensemble. Below is a description of changes involved in
-	doing this.
-
-	* tests/namespace.test (namespace-50.*): Tests of ensemble subcommand
-	error message rewriting.
-	* generic/tclProc.c (TclObjInterpProc): Make procedures implement
-	their wrong-num-args message using Tcl_WrongNumArgs instead of
-	something baked-at-home.
-	* generic/tclNamesp.c (TclIsEnsemble, NsEnsembleImplementationCmd):
-	Added test of ensemble-hood (available to rest of core) and made
-	ensembles set up the rewriting for Tcl_WrongNumArgs to take advantage
-	of.
-	* generic/tclInt.h (Interp.ensembleRewrite): Extra fields.
-	* generic/tclIndexObj.c (Tcl_WrongNumArgs): Add knowledge of what is
-	going on in ensembles' command rewriting so this command can generate
-	the right error message itself.
-	* generic/tclBasic.c (Tcl_CreateInterp, TclEvalObjvInternal): Added
-	code to initialize (as empty) the rewriting fields and reset them when
-	we leak outside an ensemble implementation.
-
-2004-10-28  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_START_CMD):
-	* tests/execute.test (execute-8.3): fix for execution stack corruption
-	[Bug 1055676]. Credit dgp for detective work and fix.
-
-2004-10-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/socket.test (socket-13.1):	Balanced [makeFile] and
-	[removeFile] commands.
-
-	* tests/clock.test:	Correct duplicate test names.
-	* tests/namespace.test:
-	* tests/string.test:
-	* tests/io.test (io-50.4):	Use namespace variables.
-
-2004-10-27  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclInt.decls:	  The following 9 functions were moved from
-	* generic/tclInt.h:	  tclInt.h to the private/int Stubs table for
-	* generic/tclIntDecls.h:  use by the test suite. As tclTest.obj is
-	* generic/tclStubInit.c:  linked to the shell, these functions need
-	"blessed" status so as to always be exported from the library. Being
-	placed in the Stubs table guarantees this [Bug 1054748]:
-		TclpObjRemoveDirectory,	TclpObjCopyDirectory,
-		TclpObjCreateDirectory,	TclpObjDeleteFile,
-		TclpObjCopyFile,	TclpObjRenameFile,
-		TclpObjStat,		TclpObjAccess,
-		TclpOpenFileChannel
-
-	* tests/registry.test:	Fixed test files to load the correct
-	* tests/winDde.test:	registry and dde packages by using the info
-	* win/Makefile.in:	from makefiles to tell tcltest where to load
-	* win/makefile.vc:	them from. This avoids grabbing the wrong
-	package from $auto_path which might be the install point rather than
-	the dev location. Kudos to Jennifer Hom for adding -load and
-	-loadfile to the tcltest package. [Bug 926088]
-
-	* win/tclWinThrd.c (TclFinalizeLock): release the critical section
-	before deleting it. [Bug 731778]
-
-	* generic/tcl.h: Removed the file level 'extern "C" {' and the
-	coresponding closing block as it serves no purpose given that all the
-	function prototypes have the proper extern usage already.
-
-	* unix/tclAppInit.c:	When built as tcltest, TclThread_Init was
-	* win/tclAppInit.c:	getting called twice. First by Tcltest_Init,
-	then again in Tcl_AppInit. The call from Tcl_AppInit is now removed.
-
-2004-10-27  Andreas Kupries <andreask@activestate.com>
-
-	* tests/tm.test:  Expanded on the testsuite entered by Donal.
-	* library/tm.tcl: Even found bugs, these have been corrected.
-
-2004-10-26  Kevin Kenny <kennykb@acm.org>
-
-	* tests/format.test (format-19.1): Additional regression test for [Bug
-	868489].
-
-2004-10-27  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/*.n: Many small general documentation fixes.
-
-2004-10-26  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclPipe.c (TclCleanupChildren): bad cast of resolvedPid
-	caused PIDs on win95 to go negative. winpipe-4.2 brought this to the
-	surface. Fixed with sprintf in place of TclFormatInt. Thanks to hgiese
-	[Patch 767676]
-
-2004-10-26  Andreas Kupries <andreask@activestate.com>
-
-	* library/tm.tcl (::tcl::tm::Defaults): Added a second [file dirname]
-	around the location of the executable. This fixes [Bug 1038705].
-	Instable of a bogus "foo/bin/lib" we now have the correct "foo/lib" as
-	a base path for modules.
-
-2004-10-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParse.c (Tcl_SubstObj):	Fix for failed subst-12.3 test
-	* tests/subst.test (subst-12.3-5):	More tests for Bug 1036649.
-
-	* unix/Makefile.in (install-libraries): Updated the installation of
-	the http, msgcat, and tcltest packages to install as Tcl Modules on
-	Unix systems. Other platform Makefiles still need updating. [Patch
-	1054370]
-
-	* tests/basic.test:	Added missing constraints.
-	* tests/compile.test:
-	* tests/fileSystem.test:
-
-	* tests/init.test (init-2.8):	Updated to not rely on http package.
-
-2004-10-26  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclVar.c: removed more direct references to the VAR flags,
-	replaced with access macros.
-
-2004-10-26  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/expr.n: Clarified that non-num/non-bool literals require
-	quoting. [Bug 1027849]. Also listed booleans as acceptable values.
-
-2004-10-26  Kevin B. Kenny <kennykb@acm.org>
-
-	* library/clock.tcl (FreeScan): Fixed a bug that caused relative days
-	of the week in free-form [clock scan] to be evaluated in the wrong
-	time zone.
-	* tests/clock.test (clock-31.[456]): Made sure that there isn't an
-	env(TZ) or env(TCL_TZ) lying around that will override the time zone
-	that we're trying to establish with the simulated registry.
-	Both problems reported as [Bug 1054101].
-
-2004-10-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/string.n (map): Rewrote to clarify that we don't just map single
-	characters. [Bug 1048005]
-	* doc/info.n (procs): Clarified that the pattern argument may have
-	namespace separators in it. [Bug 1047928]
-
-	* tests/cmdAH.test (cmdAH-8.45): Simplify in the hope that the reasons
-	for [Bug 1053908] will become clearer.
-
-2004-10-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (IllegalExprOperandType,TclExecuteByteCode):
-	Removed several DECACHE_INFO/CACHE_INFO pairs that are no longer
-	needed for protection because routines like Tcl_SetErrorCode() and
-	Tcl_AddErrorInfo() can no longer re-enter bytecode execution.
-
-	* generic/tclResult.c (TclProcessReturn): Bug fix. Be sure that a
-	missing -errorinfo option when code == TCL_ERROR causes the errorInfo
-	field to get reset.
-
-	* tests/thread.test (thread-4.4): Test depended on a ::errorInfo value
-	initialized to "". Added code to test to setup that requirement.
-
-	* library/auto.tcl:	Purged Tcl's script library of all
-	* library/clock.tcl:	remaining references to global vars
-	* library/init.tcl:	::errorInfo and ::errorCode.
-
-	* generic/tclMain.c (Tcl_Main): Updated to make use of
-	TclGetReturnOptions instead of ::errorInfo variable.
-
-	* generic/tclInterp.c (tclInit): Bug fix. Access dict variables with
-	[dict get], not array syntax.
-
-2004-10-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/tm.test: Rewrote the tests to actually perform syntax checks
-	on the public API. Added a new test (currently failing) to indicate
-	that the test suite is not complete yet.
-	* library/tm.tcl (path): Rewrote to turn this command into an ensemble
-	to make it faster and simpler.
-
-2004-10-24  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclTrace.c: defined new macros to get/set the flags of
-	variables. The only files that still access the flag values directly
-	are tclCompCmds.c, tclCompile.c, tclProc.c and tclVar.c
-
-2004-10-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_LogCommandInfo,Tcl_AddObjErrorInfo): Shift
-	the initialization of errorCode to NONE to more central location.
-
-	* generic/tclEvent.c (BgError,Tcl_BackgroundError,HandleBgErrors):
-	Rewrite to build on the new TclGet/SetReturnOptions routines.
-
-	* generic/tclResult.c (TclGetReturnOptions): Add call to
-	Tcl_AddObjErrorInfo to be sure error fields are initialized.
-
-	* generic/tclResult.c (TclTransferResult): Rewrite to build on the new
-	TclGet/SetReturnOptions routines.
-
-2004-10-22  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/tm.n: Tightened up the documentation.
-	* tests/tm.test: Created (with partially dummy content) so TIP#189 can
-	be marked Final.
-
-	* generic/tclNamesp.c (NsEnsembleImplementationCmd): Make ensembles
-	cut their implementations out of error traces. This is the right thing
-	to do more often than not.
-
-2004-10-22  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl: Fixed a typo where the fallback time zone became
-	::localtime instead of :localtime. Fixed a bug where time zone names
-	containing hyphens could not be loaded.
-	* tests/clock.test: Added regression test cases that covers both bugs.
-	Thanks to Todd M. Helfter <tmh@jumpgate.itsp.purdue.edu> for finding
-	these bugs.
-
-2004-10-22  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclExecute.c (TclCompEvalObj, Tcl_ExprObj):
-	* generic/tclProc.c (TclProcCompileProc): Always call object
-	freeIntRepProc's in the same way.
-
-2004-10-22  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c: fixed bug in commit of 2004-07-23, which was
-	causing a leak of Proc structures and failure of compile-12.1. Two
-	lines were 'zombies' from the previous way localVarNames worked.
-	Credit dgp for finding this.
-
-2004-10-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h (Interp):
-	* generic/tclBasic.c (Tcl_CreateInterp,Tcl_DeleteInterp):
-	* generic/tclResult.c (GetKeys,ReleaseKeys,etc.): Moved the key values
-	of the return options dictionary out of private fields of the Interp
-	struct and into thread-static values managed in tclResult.c.
-
-	* generic/tclCmdAH.c (Tcl_CatchObjCmd, Tcl_ErrorObjCmd): Updated to
-	call the new TclGet/SetReturnOptions routines to do much of their
-	work.
-
-	* generic/tclInt.h (TclGetReturnOptions,TclSetReturnOptions):
-	* generic/tclResult.c (TclGetReturnOptions,TclSetReturnOptions): New
-	utility routines to get/set the return options of an interp. Intent is
-	that these routines will be converted to public routines after TIP
-	approval.
-
-	* generic/tclCmdMZ.c (TclProcessReturn,TclMergeReturnOptions):
-	* generic/tclResult.c (TclProcessReturn,TclMergeReturnOptions): Move
-	internal utility routines from tclCmdMZ.c to tclResult.c.
-
-	* generic/tclBasic.c (Tcl_CreateInterp, Tcl_DeleteInterp):
-	* generic/tclResult.c (TclTransferResult): Rework so that
-	iPtr->returnOpts can be NULL when there are no special options.
-
-	* generic/tclResult.c (TclRestoreInterpState): Plug potential memory
-	leak.
-
-2004-10-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclBasic.c: Various changes to [clock format] that,
-	* generic/tclClock.c: together, make it roughly twice as fast
-	* generic/tclInt.h:   while all tests in the test suite
-	* library/clock.tcl:  continue to pass.
-
-2004-10-20  Andreas Kupries <andreask@activestate.com>
-
-	* win/Makefile.in (install-msgs):   Fixed a problem with the
-	* win/Makefile.in (install-tzdata): installation of timezone data and
-	message catalogs. They used the installed tcl library directory, not
-	the source library. Before it was installed. Switched to source lib
-	dir. Thanks to Kevin for the help in figuring this out.
-
-2004-10-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclThreadTest.c (ThreadEventProc): Corrected subtle bug
-	where the returned (char *) from Tcl_GetStringResult(interp) continued
-	to be used without copying or refcounting, while activity on the
-	interp continued. That's not safe, and recent changes demonstrated the
-	lack of safety with failing tests thread-4.3 and thread-4.5.
-
-2004-10-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclDictObj.c (DictWithCmd): Make sure all paths (that are
-	not themselves error paths) do not lose the result code.
-
-2004-10-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h (Tcl*InterpState):		New internal routines
-	* generic/tclResult.c (Tcl*InterpState):	TclSaveInterpState,
-	TclRestoreInterpState, and TclDiscardInterpState are superior
-	replacements for Tcl_(Save|Restore|Discard)Result. Intent is that
-	these routines will be converted to public routines after TIP
-	approval. Interfaces for these routines were shamelessly stolen from
-	Itcl.
-
-	* generic/tclBasic.c (TclEvalObjvInternal):
-	* generic/tclDictObj.c (DictUpdateCmd, DictWithCmd):
-	* generic/tclIOGT.c (ExecuteCallback):
-	* generic/tclTrace.c (Trace*Proc,TclCheck*Traces,TclCallVarTraces):
-	Callers of Tcl_*Result updated to call the new routines. The calls
-	were relocated in several cases to perform save/restore operations
-	only when needed.
-
-	* generic/tclEvent.c (HandleBgErrors):
-	* generic/tclFCmd.c (CopyRenameOneFile): Calls to Tcl_*Result that
-	were eliminated because they appeared to serve no useful purpose,
-	typically saving/restoring an error message, only to throw it away.
-
-2004-10-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_CreateInterp,Tcl_DeleteInterp):
-	* generic/tclCmdAH.c (Tcl_CatchObjCmd):
-	* generic/tclCmdMZ.c (TclMergeReturnOptions,TclProcessReturn):
-	* generic/tclCompCmds.c (TclCompileReturnCmd):
-	* generic/tclExecute.c (TclCompEvalObj):
-	* generic/tclInt.h (Interp):
-	* generic/tclProc.c (TclUpdateReturnInfo): Place primary storage of
-	the -level and -code information in private fields of the Interp
-	struct, rather than in a DictObj. This should significantly improve
-	performance of TclUpdateReturnInfo.
-
-2004-10-17  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclResult.c: removed unused variable [Bug 1048588]. Thanks
-	to Daniel South.
-
-2004-10-15  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (TclProcessReturn):	Now that primary
-	* generic/tclProc.c (TclUpdateReturnInfo):	storage for the
-	errorInfo and errorCode values are internal fields, we can set them at
-	the time of the [return] command, and not have to wait until the
-	specified number of "-level"s have popped.
-
-	* generic/tclBasic.c (Tcl_CreateInterp, Tcl_DeleteInterp)
-	(TclEvalObjvInternal, Tcl_LogCommandInfo, TclAddObjErrorInfo):
-	* generic/tclCmdAH.c (Tcl_CatchObjCmd):
-	* generic/tclEvent.c (BgError, ErrAssocData, Tcl_BackgroundError)
-	(HandleBgErrors, BgErrorDeleteProc):
-	* generic/tclExecute.c (TclCreateExecEnv, TclDeleteExecEnv):
-	* generic/tclIOUtil.c (comments only):
-	* generic/tclInt.h (ExecEnv,Interp, ERR_IN_PROGRESS):
-	* generic/tclInterp.c ([tclInit]):
-	* generic/tclMain.c (comments only):
-	* generic/tclNamesp.c (Tcl_CreateNamespace, Tcl_DeleteNamespace)
-	(TclTeardownNamespace):
-	* generic/tclProc.c (TclUpdateReturnInfo):
-	* generic/tclResult.c (Tcl_ResetResult, TclTransferResult):
-	* generic/tclTrace.c (CallVarTraces):
-	Reworked management of the "errorInfo" data of an interp. That
-	information is now primarily stored in a new private (Tcl_Obj *) field
-	of the Interp struct, rather than using a global variable ::errorInfo
-	as the primary storage. The ERR_IN_PROGRESS flag bit value is no
-	longer required to manage the value in its new location, and is
-	removed. Variable traces are established to support compatibility for
-	any code expecting the ::errorInfo variable to hold the information.
-
-	***POTENTIAL INCOMPATIBILITY***
-	Code that sets traces on the ::errorInfo variable may notice a
-	difference in timing of the firing of those traces. Code that uses the
-	value ERR_IN_PROGRESS.
-
-2004-10-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	TIP#217 IMPLEMENTATION
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Add -indices option from James
-	Salsman. [Patch 1017532]
-
-	* generic/tclUtil.c (TclMatchIsTrivial): Detect degenerate cases of
-	glob matching that let us avoid scanning through hash tables.
-	* generic/tclCmdIL.c (InfoCommandsCmd, InfoGlobalsCmd, InfoProcsCmd):
-	(InfoVarsCmd): Use this to speed up some [info] subcommands.
-
-2004-10-12  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/America/Campo_Grande:
-	* library/tzdata/America/Cuiaba:
-	* library/tzdata/America/Sao_Paulo
-	* library/tzdata/America/Argentina/Mendoza:
-	* library/tzdata/America/Argentina/San_Juan:
-	Synchronized to Olson's 'tzdata2004e'.
-
-2004-10-08  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	TIP#201 AND TIP#212 IMPLEMENTATIONS
-
-	* doc/dict.n, doc/expr.n: Documentation for new functionality.
-	* tests/expr.test: Basic tests of 'in' and 'ni' behaviour.
-	* tests/dict.test (dict-21.*,dict-22.*): Tests for [dict update] and
-	[dict with].
-	* generic/tclExecute.c (TclExecuteByteCode): Implementation of the
-	INST_LIST_IN and INST_LIST_NOT_IN bytecodes.
-	* generic/tclParseExpr.c (GetLexeme): Parse the 'in' and 'ni'
-	operators for TIP#201.
-	* generic/tclDictObj.c (DictUpdateCmd,DictWithCmd): Core of
-	implementation of TIP#212; docs and tests still to do...
-
-2004-10-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclTest.c (TestsetobjerrorcodeCmd):  Simplified.
-
-2004-10-07  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c:
-	* generic/tclFileSystem.h:
-	* generic/tclIOUtil.c:
-	* generic/tclPathObj.c:
-	* unix/tclUnixFile.c:
-	* win/tclWinFile.c:
-	* tests/fileName.test:
-	* tests/winFCmd.test: code reorganization for better generic/platform
-	code splitting [Bug 925620] removing the need for several #ifdef's,
-	and tests and fix for an unreported Windows glob problem ('glob -dir
-	C: -tails *').
-
-2004-10-07  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* *.3: Convert CONST to const and VOID to void so we document how
-	people should actually use the Tcl API and not the compatibility hacks
-	that it has to have.
-
-	* doc/man.macros, *.3: Update .AS macro so it can know how wide to
-	make the third column of the argument list. Update documentation for C
-	API (only users) to take advantage of this.
-
-	* doc/FileSystem.3: Formatting fixes for greater documentation
-	clarity.
-
-2004-10-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclFileName.c (DoGlob, TclGlob): Stop messy sharing of
-	interpreter result and instead use a private object for collecting the
-	result of the glob. This simplifies TclGlob quite a lot.
-	* generic/tclIOUtil.c (Tcl_FSMatchInDirectory): Simplify by removing
-	some nesting. Also standardize variable names.
-	(FsAddMountsToGlobResult): Force updates to the list to be done
-	in-place, putting a side-condition of non-shared-ness on the resultPtr
-	argument to Tcl_FSMatchInDirectory, but everything would have broken
-	before if that was shared *anyway*.
-
-	* generic/tclEncoding.c (LoadTableEncoding): Removed reference to Tcl
-	interpreter; it wasn't needed as direct object use is more efficient.
-
-	* generic/tclPathObj.c: Made this file follow the style rules in the
-	Engineering Manual more closely, and also take advantage of the
-	internal object manipulation macros more.
-
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd): Reorganized to have fewer
-	magic flag variables and to separate the code that scans for a match
-	from the code that processes a match body.
-
-2004-10-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:
-	* generic/tclBinary.c:
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclCompExpr.c:
-	* generic/tclDictObj.c:
-	* generic/tclEncoding.c:
-	* generic/tclExecute.c:
-	* generic/tclFCmd.c:
-	* generic/tclHistory.c:
-	* generic/tclIndexObj.c:
-	* generic/tclInterp.c:
-	* generic/tclIO.c:
-	* generic/tclIOCmd.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclPkg.c:
-	* generic/tclResult.c:
-	* generic/tclScan.c:
-	* generic/tclTimer.c:
-	* generic/tclTrace.c:
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-	* unix/tclUnixFCmd.c:
-	* unix/tclUnixPipe.c:
-	* win/tclWinDde.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinPipe.c:
-	* win/tclWinReg.c:
-	It is a poor practice to directly set or append to the value of the
-	objResult of an interp, because that value might be shared, and in
-	that circumstance a Tcl_Panic() will be the result. Searched for
-	example of this practice and replaced with safer alternatives, often
-	using the Tcl_AppendResult() routine that dkf just rehabilitated.
-	* library/dde/pkgIndex.tcl: Bump to dde 1.3.1
-	* library/reg/pkgIndex.tcl: Bump to registry 1.1.5
-
-2004-10-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/SetResult.3: Made Tcl_AppendResult non-deprecated; better that
-	people use it than most of the common alternatives!
-	* generic/tclResult.c (Tcl_AppendResultVA): Make this work better with
-	Tcl_Objs. [Patch 1041072]
-	(Tcl_SetResult, Tcl_AppendElement): Change string to stringPtr to
-	avoid C++ keywords.
-
-2004-10-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclObjInvoke): More simplification of the
-	TclObjInvoke routine toward unification with the rest of the
-	evaluation stack.
-
-	* generic/tclBasic.c (Tcl_CreateInterp, Tcl_DeleteInterp)
-	(TclEvalObjvInternal, Tcl_LogCommandInfo):
-	* generic/tclCmdAH.c (Tcl_CatchObjCmd):
-	* generic/tclEvent.c (BgError, Tcl_BackgroundError, HandleBgErrors):
-	* generic/tclInt.h (Interp, ERROR_CODE_SET):
-	* generic/tclNamesp.c (Tcl_CreateNamespace, Tcl_DeleteNamespace)
-	(TclTeardownNamespace):
-	* generic/tclResult.c (Tcl_ResetResult, Tcl_SetObjErrorCode)
-	(TclTransferResult):
-	* generic/tclTrace.c (CallVarTraces):
-	Reworked management of the "errorCode" data of an interp. That
-	information is now primarily stored in a new private (Tcl_Obj *) field
-	of the Interp struct, rather than using a global variable ::errorCode
-	as the primary storage. The ERROR_CODE_SET flag bit value is no longer
-	required to manage the value in its new location, and is removed.
-	Variable traces are established to support compatibility for any code
-	expecting the ::errorCode variable to hold the information.
-
-	***POTENTIAL INCOMPATIBILITY***
-	Code that sets traces on the ::errorCode variable may notice a
-	difference in timing of the firing of those traces.
-
-	* generic/tclNamesp.c (Tcl_PopCallFrame): Removed Bug 1038021
-	workaround. That bug is now fixed.
-
-2004-10-04  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/clock.test (clock-34.*): Removed an antibug that forced
-	comparison of [clock scan] results with the :localtime time zone. Now
-	that [clock scan] uses the current time zone instead, the antibug
-	caused several tests to fail. [Bug 1038554]
-
-2004-10-04  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclParseExpr.c (GetLexeme): Ensure that the 'eq' and 'ne'
-	operators are followed by non-alphabetic characters so lexemes can't
-	run together. [Bug 884830]
-
-	* doc/DictObj.3, doc/dict.n: Clarified that a dictionary is not
-	order-preserving. [Bug 1032243] Also added another example to show off
-	more ways of using a dictionary and a few other formatting
-	improvements.
-
-2004-10-02  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclDictObj.c (TraceDictPath, Tcl_DictObjPutKeyList): Add
-	support for automatic creation of dictionary paths since that is what
-	everyone seems to actually expect of the API! [Bug 1037235]
-	(Tcl_DictObjNext): Make calling this after Tcl_DictObjDone non-fatal
-	as that simplifies a number of internal APIs. This doesn't break any
-	existing working code as it is a case which previously caused a panic.
-
-2004-10-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/namespace.test (namespace-8.7):	Another test for save/restore
-	of ::errorInfo and ::errorCode during global namespace teardown.
-
-2004-10-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclProc.c (TclObjGetFrame, Tcl_UplevelObjCmd):
-	* generic/tclVar.c (Tcl_UpvarObjCmd): Cache stackframe level
-	references in the level object for speed.
-
-2004-09-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_CreateInterp):
-	* generic/tclInt.h (Interp): Removed the flag bit value
-	EXPR_INITIALIZED. It was set during interp creation and never tested.
-	Whatever purpose it had is in the past.
-
-	* generic/tclBasic.c (Tcl_EvalObjEx):	Removed the flag bit value
-	* generic/tclInt.h (Interp):	        USE_EVAL_DIRECT. It was used
-	* generic/tcLTest.c (TestevalexObjCmd): only in the testing command
-	* tests/parser.test (parse-9.2):        [testevalex] and nothing in
-	the test suite made use of the capability it enabled.
-
-	* generic/tclBasic.c (Tcl_AddObjErrorInfo): More re-organization
-	* generic/tclCmdAH.c (Tcl_ErrorObjCmd):	    of the management of
-	* generic/tclCmdMZ.c (TclProcessReturn):    the errorCode value.
-	* tests/error.test (error-6.4-9):
-
-	* generic/tclNamespace.c (TclTeardownNamespace): Tcl_Obj-ified
-	* tests/namespace.test (namespace-8.5,6):	 the save/restore of
-	::errorInfo and ::errorCode during global namespace teardown. Revised
-	the comment to clarify why this is done, and added tests that will
-	fail if this is not done.
-
-	* generic/tclResult.c (TclTransferResult): Added safety checks so that
-	unexpected undefined ::errorInfo or ::errorCode will not lead to a
-	segfault.
-
-	* generic/tclTrace.c (TclCallVarTraces):  Save/restore the flag values
-	* tests/var.test (var-16.1):	          that define part of the
-	interpreter state during variable traces. [Bug 1038021].
-
-2004-09-30  Miguel Sofer <msofer@users.sf.net>
-
-	* tests/subst.test (12.1-2): added tests for [Bug 1036649]
-
-2004-09-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/basic.test (49.*): New tests for TCL_EVAL_GLOBAL.
-
-2004-09-29  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclVar.c (TclObjLookupVar, TclObjLookupVar):
-	(TclObjUnsetVar2, SetArraySearchObj):
-	* generic/tclUtil.c (SetEndOffsetFromAny):
-	* generic/tclStringObj.c (Tcl_SetStringObj):
-	(Tcl_SetUnicodeObj, SetStringFromAny):
-	* generic/tclResult.c (ResetObjResult):
-	* generic/tclRegexp.c (Tcl_GetRegExpFromObj):
-	* generic/tclPathObj.c (TclFSMakePathRelative, SetFsPathFromAny):
-	(TclFSMakePathFromNormalized, Tcl_FSNewNativePath):
-	* generic/tclObj.c (TclFreeObj, Tcl_SetBooleanObj, SetBooleanFromAny):
-	(Tcl_SetDoubleObj, SetDoubleFromAny, Tcl_SetIntObj):
-	(SetIntOrWideFromAny, Tcl_SetLongObj, SetWideIntFromAny):
-	(Tcl_SetWideIntObj, TclSetCmdNameObj, SetCmdNameFromAny):
-	* generic/tclNamesp.c (SetNsNameFromAny, MakeCachedEnsembleCommand):
-	* generic/tclListObj.c (Tcl_SetListObj, SetListFromAny):
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct):
-	* generic/tclDictObj.c (SetDictFromAny):
-	* generic/tclCompile.c (TclInitByteCodeObj):
-	* generic/tclBinary.c (Tcl_SetByteArrayObj, SetByteArrayFromAny):
-	* generic/tclInt.h (TclFreeIntRep): Factorize out deletion of object
-	internal representation to a shared macro, so simplifying much code.
-
-2004-09-27  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TclObjInvoke): fix for bogus gcc warning about
-	uninitialised variable.
-
-2004-09-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Removed internal routines TclInvoke,
-	* generic/tclInt.decls: TclGlobalInvoke, TclObjInvokeGlobal and the
-	* tests/basic.test:	portion of TclObjInvoke that handles calls
-	without TCL_INVOKE_HIDDEN enabled. None of this code is called any
-	longer within the core, and the superior public interface,
-	Tcl_EvalObjv, is available for any external callers.
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclEvent.c (HandleBgErrors): Updated [bgerror] invocations
-	to make use of Tcl_Obj based routines, dropping the calls to
-	TclGlobalInvoke()
-
-2004-09-27  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c:
-	* generic/tclFileSystem.h:
-	* generic/tclIOUtil.c:
-	* generic/tclPathObj.c:
-	* tests/cmdAH.test:
-	* tests/fileSystem.test:
-	* tests/winFCmd.test: fix to bad error message with 'cd' on windows,
-	when permissions are inadequate [Bug 1035462] and to treatment of a
-	volume-relative pwd on Windows [Bug 1018980].
-
-	* doc/FileSystem.3: added missing Tcl_GlobTypeData documentation [Bug
-	935853]
-
-2004-09-27  Kevin Kenny	 <kennykb@acm.org>
-
-	* compat/strftime.c (Removed):
-	* generic/tclClock.c (removed TclClockOldscanObjCmd):
-	* generic/tclDate.c (Regenerated):
-	* generic/tclGetDate.y:
-	* generic/tclInt.decls (removed TclGetDate and TclpStrftime):
-	* generic/tclInt.h (removed TclGetDateInfo):
-	* generic/tclIntDecls.h (Regenerated):
-	* generic/tclStubInit.c (Regenerated):
-	* library/clock.tcl:
-	* unix/tclUnixTime.c (removed TclpStrftime):
-	* win/Makefile.in:
-	* win/makefile.bc:
-	* win/makefile.bc:
-	* win/tcl.dsp:
-	Continued refactoring of [clock] for TIP 173 changes. Broke the
-	free-form parser apart so that the Bison parser is responsible for
-	only parsing, while clock.tcl handles relative times like "next
-	Thursday", "next January". This change is needed to make timezones
-	other than :localtime and :Etc/UTC work with free-form scanning. This
-	change closes out the issue identified as being "for another day" in
-	my log message of 2004-09-08. The refactored code also eliminates the
-	last known references to TclpStrftime and TclGetDate, so those
-	routines (including compat/strftime.c) have been removed. The
-	refactoring also has the benefit that all storage in the Bison parser
-	is now on the C stack, eliminating any need for mutex protection
-	around [clock scan]. Also, changed the Makefiles so that 'make
-	gendate' is available on Windows as well as Unix.
-
-	* generic/tclCmdAH.c (Tcl_FormatObjCmd): Removed some grubby
-	* generic/tclObj.c (SetBooleanFromAny):	 work-around code that was
-	needed only because of Bug 868489.
-
-	* generic/tclBasic.c (TclObjInvoke): Removed three unused variables to
-	silence a compiler warning in VC++.
-
-2004-09-27  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/FileSystem.3: fix to small typo.
-
-2004-09-26  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompCmds.c:
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclInt.h:
-	* generic/tclProc.c:
-	* tests/compExpr-old.test:
-	* tests/compExpr.test:
-	* tests/expr.test:
-	* tests/for.test:
-	* tests/if.test:
-	* tests/incr.test:
-	* tests/while.test:
-	Report compilation errors at runtime, [Patch 1033689] by dgp.
-
-2004-09-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/dltest/Makefile.in (clean): Fixup make clean rule so that it
-	does not delete all files when SHLIB_SUFFIX is set to the empty string
-	in a static build. [Bug 1016726]
-
-2004-09-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Corrections to the 2004-09-21 commit
-	* generic/tclExecute.c:	regarding ERR_ALREADY_LOGGED. That commit
-	* generic/tclNamesp.c:	caused Tk test send-10.7 to fail. Added
-	* tests/namespace.test (25.7,8): tests in the Tcl test suite
-	* tests/pkg.test (2.25,26):	 to catch this error without the aid
-	of Tk in the future.
-
-	* generic/tclCmdAH.c (Tcl_ExprObjCmd):	Simplified the TclObjCmdProc
-	of [expr] with a call to Tcl_ConcatObj.
-
-2004-09-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (TclProcessReturn):	Support the -errorline
-	* generic/tclCompile.c (TclCompileScript):	option to [return].
-	* tests/compile.test (16.23.*):	Use that capability to defer reporting
-	* tests/misc.test (1.2):	of parse errors until runtime. Updated
-	tests to reflect change. [Bug 1032805]
-
-2004-09-22  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_START_CMD):
-	* tests/proc.test (7.2-3): fix for [Bug 729692] was incorrect whenever
-	a loop exception was returned.
-
-2004-09-22  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/America/Montevideo: Updated to reflect
-	ftp://elsie.nci.nih.gov/pub/tzdata2004d.tar.gz. (Changes to
-	Asia/Jerusalem were in the comments only.) [Routine maintenance - no
-	bug] Spanish-language description of the change at
-	http://www.presidencia.gub.uy/decretos/2004091502.htm
-
-2004-09-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c:	Tolerate [append] syntax errors
-	* tests/appendComp.test (8.1):	at compile time, and allow runtime to
-	raise the error (or succeed if a redefined [append] allows).
-
-	* generic/tclBasic.c:	Reworked management of the interp flag
-	* generic/tclCompile.c:	ERR_ALREADY_LOGGED, to reduce its exposure.
-	* generic/tclExecute.c: Still left several referebces that are just
-	* generic/tclNamesp.c:	too nice on performace to do away with.	These
-	changes also resolve an inconsistency in the ::errorInfo values
-	produced by [namespace eval x error foo bar] and [namespace eval x
-	{error foo bar}].
-
-	* generic/tclExecute.c (TclCompEvalObj):	Simplified the
-	TclCompEvalObj routine. Much housekeeping now reliably happens
-	elsewhere. [Patch 1031949]
-
-2004-09-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/interp.n: Tighten up wording on how [interp eval] and [interp
-	invokehidden] operate w.r.t. stack frames. [Bug 926590]
-
-2004-09-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/error.test (error-6.2,3):	Added more tests to verify
-	::errorCode setting by/after a [catch].
-
-2004-09-19  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCmdAH.c: removed outdated comment [Bug 1029518].
-
-2004-09-18  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclAppInit.c: Dde package can load into a safe interp. Claim
-	this fact for the Tcl_StaticPackage() call when the shell is built
-	with the TCL_USE_STATIC_PACKAGES option.
-
-2004-09-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclExecute.c (TEBC-INST_LSHIFT,INST_RSHIFT): Ensure that
-	large shifts end up shifting correctly. [Bug 868467]
-
-	* doc/FileSystem.3, doc/OpenFileChnl.3: More documentation fixes from
-	Mikhail Kolesnitchenko. [Patch 1022527]
-	* doc/*: Standardize highlighting of symbols defined in tcl.h
-
-2004-09-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_AddObjErrorInfo, Tcl_LogCommandInfo):
-	* generic/tclCmdAH.c ([catch], [error]):
-	* generic/tclCmdMZ.c ([return]):
-	* generic/tclProc.c (TclUpdateReturnInfo):
-	* generic/tclResult.c (Tcl_SetErrorCodeVA, Tcl_SetObjErrorCode)
-	(TclTransferResult):	Refactored so that all errorCode setting flows
-	through Tcl_SetObjErrorCode(). This greatly reduces the number of
-	different places in the code that need to know details about an
-	internal bitflag field of the Interp struct. Also places errorCode
-	setting in one place for easier future mods.
-
-2004-09-17  Kevin B.Kenny  <kennykb@acm.org>
-
-	* generic/tclDate.c:	Revised tclGetDate.y to use bison instead of
-	* generic/tclGetDate.y: yacc to build the parser, eliminating all the
-	* generic/tclInt.h:	complicated hackery involving 'sed'
-	* unix/Makefile.in:	postprocessing. Rebuilt the parser.
-
-2004-09-14  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c (ClockOldscanObjCmd): Silenced a compiler warning
-	(long passed as a param where unsigend long was expected). 'Unsigned
-	long' is wrong, but the fix is really to change the signature of
-	TclGetDate to return a structure of its 'yy' variables and then do the
-	remaining work inside clock.tcl. But, as I said on 2004-09-08, that's
-	a job for another day. [Bug 1027993]
-
-2004-09-10  Miguel Sofer <msofer@users.sf.net>
-
-	* doc/interp.n:
-	* generic/tclInterp.c (TclPreventAliasLoop, AliasCreate):
-	* tests/interp.test (17.4-6, 19.3-4): fixing problems with renaming of
-	aliases [Bugs 707104 1026493]. Fix designed by dgp.
-
-2004-09-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (NsEnsembleImplementationCmd): Add token field
-	to internal rep of EnsembleCmdRep structure so that we can check it to
-	see if the subcommand object is really being used with the same
-	ensemble. [Bug 1026903]
-
-2004-09-11  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c (TclMktimeObjCmd): Corrected a bad check for
-	error return from 'mktime'.
-	* generic/tclObj.c (Tcl_GetIntFromObj): Corrected a problem where
-	demoting a wide to an int failed on a big-endian machine. [Bug
-	1026125].
-	* tests/clock.test (clock-43.1): Added regression test for error
-	return from 'mktime'.
-
-2004-09-11  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_CONCAT1): fix for [Bug 1025834]; avoid
-	unnecessary string copies.
-
-2004-09-10  David Gravereaux <davyrgvy@pobox.com>
-
-	* tests/tcltest.test: tcltest-12.3-4 needed to have
-	::tcltest::loadScript set to empty in their -setup
-
-2004-09-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclObj.c (SetIntOrWideFromAny): Rewritten integral value
-	parsing code so that values do not flip so easily between numeric
-	representations. Thanks to KBK for this! [Bug 868489]
-
-	* generic/tclIO.c (Tcl_Seek): Make sure wide seeks do not fail to set
-	::errorCode on error. [Bug 1025359]
-
-2004-09-10  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tcl.h: Micro formatting fixes.
-	* generic/tclIOGT.c: Channel version fixed, must be 3, to have
-	wideseekProc. Thanks to David Graveraux <davygrvy@pobox.com>.
-
-2004-09-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclNamespace.c (TclGetNamespaceForQualName): Resolved
-	longstanding inconsistency in the treatment of the TCL_NAMESPACE_ONLY
-	flag revealed by testing the 2004-09-09 commits against Itcl.
-	TCL_NAMESPACE_ONLY now acts as specified in the pre-function comment,
-	forcing resolution in the passed in context namespace. It has been
-	incorrectly forcing resolution in the interp's current namespace.
-
-2004-09-10  Kevin Kenny	 <kennykb@acm.org>
-
-	* library/clock.tcl: Fixed a bug where %z always put a plus sign on
-	the time zone in :localtime.
-	* tests/clock.test: Added test case for the above bug.
-
-2004-09-10  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_CONCAT1): added a peephole optimisation
-	for concatting an empty string. This enables replacing the idiom 'K $x
-	[set x {}]' by '$x[set x {}]' for fastest execution.
-
-2004-09-09  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinConsole.c: Calls to WriteFile and WriteConsoleA changed to
-	WriteConsole for simplicity.
-
-2004-09-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c (Tcl_ForgetImport):	Corrected faulty
-
-	* tests/namespace.test: logic that relied exclusively on string
-	matching and failed in the presence of [rename]s. [Bug 560297] Also
-	corrected faulty prevention of [namespace import] cycles. [Bug 1017299]
-
-2004-09-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_CreateInterp):	Removed obsolete field
-	for storing the string-based command procedure of built-in commands.
-	We no longer have any string-based built-in commands!
-
-2004-09-08  Kevin B. Kenny <kennykb@acm.org>
-
-	* compat/strftime.c (_conv): Corrected a problem where hour 0 would
-	format as a blank format group with %k.
-	* doc/clock.n: Corrected a buglet in the header information. [Bug
-	1024058]
-	* generic/tclClock.c (TclClockMktimeObjCmd): Fixed a bug where the
-	month was scanned incorrectly in -timezone :localtime.
-	* tests/clock.test (clock-34.*,clock-40.1, clock-41.1): Adjusted the
-	clock-34.* test cases so that the consistency check is performed in
-	:localtime rather than the current time zone. This change allows
-	dealing with issues where the C library has a different idea of DST
-	conversion than Tcl. (Real fix would be to break TclGetDate into
-	separate parser and time converter, and do the time conversion in
-	clock.tcl. That's for another day.) Added regression test case for the
-	bug where month was scanned incorrectly in -timezone :localtime. [Bug
-	1023779] Added regression test case for %k at the zero hour.
-
-2004-09-07  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: some quoting needed to be removed as it was
-	breaking with VC7. [Bug 1023150]
-
-2004-09-07  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/clock.n: Documented the default -format, and changed references
-	to a (nonexistent) msgcat command to refer to the msgcat package. [Bug
-	1023870]
-	* generic/tclTimer.c: Removed a premature optimisation that attempted
-	to store the assoc data in the client data; the optimisation caused a
-	bug that [after] would overwrite its imports. [Bug 1016167]
-	* library/clock.tcl (InitTZData, ClearCaches): Changed so that the
-	in-memory time zone :UTC (and its aliases) always gets reinitialised,
-	in case tzdata is absent. [Bug 1019537, 1023779]
-	* library/tzdata/*: Regenerated.
-	* tests/clock.test (clock-31.*, clock-39.1): Corrected a problem where
-	the 'system' locale tests fail on a non-English Windows machine. [Bug
-	1023761]. Added a test to make sure that alias time zones load
-	correctly. [Bug 1023779].
-	* tests/timer.test (timer-1.1, timer-2.1): Changed to (one hopes!) be
-	more resilient on an overloaded system, if [after 200] sleeps for 300
-	ms or longer.
-	* tools/tclZIC.tcl (writeLinks): Corrected a problem where alias time
-	zone names were written incorrectly, causing them to fail to load at
-	run time. [Bug 1023779].
-	* win/tclWinTime.c (Tcl_GetTime): Eliminated CPUID tests on Win64 -
-	assuming that HAL vendors now do a better job of keeping the
-	performance counters synchronized among CPU's. [Bug 1020445]
-
-2004-09-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/tclvars.n, doc/tcltest.n, doc/tclsh.1, doc/safe.n, doc/expr.n
-	* doc/WrongNumArgs.3, doc/Utf.3, doc/TraceVar.3, doc/Thread.3
-	* doc/TCL_MEM_DEBUG.3, doc/SubstObj.3, doc/StdChannels.3
-	* doc/SetResult.3, doc/RegExp.3, doc/RegConfig.3, doc/RecEvalObj.3
-	* doc/PrintDbl.3, doc/ParseCmd.3, doc/Panic.3, doc/ObjectType.3
-	* doc/Object.3, doc/Namespace.3, doc/Interp.3, doc/IntObj.3
-	* doc/Hash.3, doc/GetOpnFl.3, doc/GetIndex.3, doc/Eval.3
-	* doc/Encoding.3, doc/DoubleObj.3, doc/DictObj.3, doc/CrtTimerHdlr.3
-	* doc/CrtObjCmd.3, doc/CrtMathFnc.3, doc/CrtCommand.3, doc/CrtChannel.3
-	* doc/ChnlStack.3, doc/ByteArrObj.3, doc/AssocData.3, doc/Alloc.3:
-	More documentation fixes from Mikhail Kolesnitchenko. [Patch 1022527]
-
-2004-09-03  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tclUnixFCmd.c: Stop NULL interp arguments from triggering a
-	crash when an error happens. [Bug 1020538]
-
-2004-09-02  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/lsearch.n: Clarified meaning of -dictionary. [Bug 759545]
-
-2004-09-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/makefile.vc: clock.tcl needs to be installed.
-
-2004-09-01  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/tclWinReg.c (BroadcastValue): WIN64 cast corrections
-
-	* win/tclWinDde.c (DdeClientWindowProc):
-	(DdeServicesOnAck, DdeEnumWindowsCallback): WIN64 corrections
-
-	* win/tclWin32Dll.c (TclWinCPUID): need _asm for WIN64 (Itanium),
-	until we have it, just return unknown. [Bug 1020445]
-
-2004-09-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/regsub.n, doc/RegConfig.3, doc/Environment.3:
-	* doc/CrtChannel.3, doc/safe.n: Use correct abbreviations.
-
-2004-08-31  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/trace.n, doc/socket.n, doc/registry.n, doc/pid.n:
-	* doc/namespace.n, doc/msgcat.n, doc/lsort.n, doc/lsearch.n:
-	* doc/linsert.n, doc/info.n, doc/http.n, doc/history.n:
-	* doc/format.n, doc/file.n, doc/exec.n, doc/dde.n, doc/clock.n:
-	* doc/catch.n, doc/binary.n: More spelling and grammar fixes from
-	Mikhail Kolesnitchenko. [Patch 1018486]
-
-2004-08-31  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/FileSystem.3:
-	* generic/tclIOUtil.c: Clarified documentation regarding ability of a
-	filesystem to say that it doesn't support a given operation using the
-	EXDEV Posix error code (copyFileProc, renameFileProc, etc), and
-	updated one piece of code to ensure correct behaviour when an
-	operation is not supported [Bug 1017072]
-
-	* tests/fCmd.test: fix to test suite problem [Bug 1002884]
-
-2004-08-31  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in (install-libraries): portable sh fix.
-
-2004-08-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Stop [string map] from
-	crashing when its map and input string are the same object.
-
-2004-08-27  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (FindEnsemble): Factor out the code to convert a
-	command name into an ensemble configuration and add support for
-	ignoring [namespace import] link chains. [Bug 1017022]
-	(NamespaceWhichCmd): Rework to use newer option parsing API.
-
-2004-08-27  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in: added customization of default module path roots
-	via TCL_MODULE_PATH makefile variable.
-	* macosx/Makefile: add platform standard locations to default module
-	path roots. [Patch 942881]
-
-	* tests/env.test: macosx fixes.
-
-2004-08-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/timer.test (timer-10.1):	Test for Bug 1016167.
-	* generic/tclTimer.c: Workaround for situation when a [namespace
-	import] causes the objv[0] value to be something other than what
-	Tcl_AfterObjCmd expects. [Bug 1016167].
-
-2004-08-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (NsEnsembleImplementationCmd): Use the ensemble
-	command token to get the name of the ensemble for passing to the
-	-unknown handler instead of relying on objv[0], which may contain
-	useless info in the presence of [namespace import]. Problem found by
-	Don Porter when investigating [Bug 1016167].
-
-2004-08-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclProc.c:		The routine TclProcInterpProc was a
-	* generic/tclTestProcBodyObj.c: specific instance of the general
-	service already provided by TclObjInvokeProc. Removed
-	TclProcInterpProc and TclGetInterpProc from the code...
-
-	* generic/tclInt.decls:	...and from the internal stubs table.
-	* generic/tclIntDecls.h
-	* generic/tclStubInit.c
-
-2004-08-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/string.n: Added clarifying note.
-
-2004-08-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/auto.tcl:	Updated [tcl_findLibrary] search path to
-	include any [<pkg>::pkgconfig get scriptdir,runtime] directory, as
-	well as the $::auto_path. [RFE 695441]
-
-2004-08-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/clock.test (clock-38.1): Changed TZ setting to specify CET in
-	excruciating detail to deal with systems that lack the Posix defaults
-	for DST changes (and to be formally correct with the change dates for
-	CET).
-
-2004-08-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclScan.c (Tcl_ScanObjCmd, ValidateFormat): Ensure that the
-	%ld conversion works correctly on 64-bit platforms. [Bug 1011860]
-
-2004-08-19  Kevin Kenny	 <kennykb@acm.org>
-
-	* library/clock.tcl (format): Changed default timezone format from
-	alphabetic to numeric to produce scannable times in more locales.
-	* tests/clock.test (clock-37.1): Removed now-unused 'needPST'
-	constraint and the comments that refer to it.
-
-2004-08-18  Andreas Kupries  <andreask@activestate.com>
-
-	* library/init.tcl: Integrated TIP #189. We source a separate file
-	(see below), instead of inlining the contents of that file. This
-	should beeasier to maintain, and easier to backport/install in 8.4
-	installations.
-
-	Note: Usage of Tcl Modules is restricted to non-safe interps. It
-	cannot be loaded into a safe interp.
-
-	* library/tm.tcl: New file, the v2 reference implementation for TIP
-	#189, Tcl Modules.
-
-	* doc/tm.n: New file, documentation for Tcl Modules, based on the TIP.
-
-	* unix/mkLinks: Regenerated.
-	* win/makefile.vc: Added tm.tcl to list of files to install.
-
-2004-08-18  Kevin Kenny	 <kennykb@acm.org>
-
-	* tests/httpd (httpdRespond): Corrected an abuse of the [clock]
-	command that caused test failures for some values of [clock clicks].
-
-	* doc/clock.n
-	* generic/tclBasic.c (Tcl_CreateInterp, Tcl_HideUnsafeCommands):
-	* generic/tclClock.c (all):
-	* generic/tclInt.h:
-	* generic/tclInterp.c (CreateSlave):
-	* library/clock.tcl: (new file)
-	* library/init.tcl (clock):
-	* library/msgs/*.msg:(new files)
-	* library/tzdata/*:
-	* library/tzdata/*/*:
-	* library/tzdata/*/*/*: (new files)
-	* tools/installData.tcl: (new file)
-	* tools/loadICU.tcl: (new file)
-	* tools/makeTestCases.tcl: (new file)
-	* tools/tclZIC.tcl: (new file)
-	* unix/Makefile.in:
-	* unix/configure: (regenerated)
-	* unix/tcl.m4:
-	* tests/clock.test (all):
-	* win/Makefile.in:
-	* win/Makefile.vc:
-		Implementation of TIPs #173 and #209.
-
-	The [clock] command is now a Tcl ensemble, with most of its
-	functionality written in Tcl and callouts to C code only to access
-	low-level functions such as localtime, mktime and tzset.
-
-	In addition to the functionality changes called out in the two TIPs,
-	it is worth noting that the [clock] command in a safe slave
-	interpreter is now an alias to the [clock] command in the master, and
-	that [clock] is otherwise not expected to function entirely correctly
-	in safe interps. C code that simply does Tcl_MakeSafe needs to be
-	aware that [clock] may need special handling. (It appears unlikely
-	that such code actually exists.)
-
-	One incompatibility of note is that if the time zone cannot be
-	determined from the TZ, TCL_TZ environment variables, or from the
-	Windows control panel, so that the C library must be used for date and
-	time conversions, then times outside the range of time_t will fail;
-	they used to return bad data silently.
-
-	Many thanks to all the many people who assisted with testing,
-	debugging, criticism of the specification, and localisation. Deserving
-	of particular mention are Joe English, Clif Flynt, Donal K. Fellows,
-	Jeff Hobbs, Cameron Laird, Arjen Markus, Reinhard Max, Christopher
-	Nelson, Steve Offutt, Donald G. Porter, Pascal Scheffers, Peter da
-	Silva and Richard Suchenwirth-Bauersachs.
-
-	*** POTENTIAL INCOMPATIBILITY ***
-
-2004-08-16  Miguel Sofer <msofer@users.sf.net>
-
-	* doc/SetVar.3:
-	* generic/tclTest.c (TestseterrorcodeCmd):
-	* generic/tclVar.c (TclPtrSetVar):
-	* tests/result.test (result-4.*, result-5.*): [Bug 1008314] detected
-	and fixed by dgp.
-
-2004-08-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/msgcat/msgcat.tcl:	Added checks to prevent [mclocale]
-	* tests/msgcat.test:	from registering filesystem paths to possibly
-	malicious code to be evaluated by a later [mcload].
-
-2004-08-10  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* unix/tclUnixThrd.c (TclpThreadCreate): changed handling of the
-	returned thread ID since broken on 64-bit systems (Cray). Thanks to
-	Rob Ratcliff for reporting the bug.
-
-2004-08-03  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (MakeCachedEnsembleCommand): Initialize the
-	epoch field cached in the subcommand. [Bug 989298]
-	(NsEnsembleImplementationCmd): Plug a leak (thanks to Miguel Sofer for
-	spotting it with valgrind) and reduce the number of goto labels to
-	make the code clearer.
-
-2004-08-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/package.tcl (pkg_mkIndex):	Updated [pkg_mkIndex] to make
-	use of [glob -directory $dir -tails] and return options.
-
-	TIP#207 IMPLEMENTATION
-
-	* doc/interp.n:		Added support for a -namespace option to the
-	* generic/tclBasic.c:	[interp invokehidden] command.	Also added an
-	* generic/tclInt.h:	internal routine TclObjInvokeNamespace() and
-	* generic/tclInterp.c:	corrected the flag names TCL_FIND_ONLY_NS and
-	* generic/tclNamesp.c:	TCL_CREATE_NS_IF_UNKNOWN that are passed to the
-	* generic/tclTrace.c:	internal routine TclGetNamespaceForQualName().
-	* tests/interp.test:	[Patch 981841]
-
-	* generic/tclLiteral.c (TclCleanupLiteralTable):	Corrected
-	* tests/compile.test (compile-12.4):	flawed deletion of literal
-	internal reps that could lead to accessing of freed memory. Thanks to
-	Kevin Kenny for test case and fix [Bug 1001997].
-
-2004-07-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/safe.test (safe-2.1):  Disabled senseless test.	 [Bug 999612]
-
-	* library/auto.tcl (auto_reset):  Removed "protected" list of commands
-	from [auto_reset]. All entries in the auto_index can be re-loaded.
-	* library/package.tcl: Updated comment to reflect 2004-07-28 commit.
-
-	* generic/tclEvent.c (Tcl_Finalize):	Re-organized Tcl_Finalize so
-	that Tcl_ExitProc's that call Tcl_Finalize recursively do not cause
-	deadlock. [Patch 999084 fixes Tk Bug 714956]
-
-2004-07-30  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/configure:
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Darwin: instead of setting PLAT_OBJS
-	to explict object files in tcl.m4, refer to MAC_OSX_OBJS makefile var.
-	* unix/Makefile.in: added MAC_OSX_OBJS variable.
-
-2004-07-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/package.tcl: [::pkg::create] is now an alias. Test safe-2.1
-	will now fail until Bug 999612 is corrected.
-
-2004-07-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/package.tcl:		Moved private command
-	* library/tclIndex:		[pkg_compareExtension] into ::tcl::Pkg.
-	* tests/pkg_mkIndex.test:	Also moved implementation of
-	[::pkg::create] to [::tcl::Pkg::Create].
-
-2004-07-25  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* tests/io.test: Make io-61.1 create file as binary to pass on Win32
-
-2004-07-23  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c: simplify tclLocalVarNameType, removing the
-	reference to the corresponding proc. The reference is now seen as
-	unnecessary, and it may cause leaking circular references under some
-	circumstances (see for example [Bug 994838]).
-
-2004-07-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/eofchar.data (removed): Test io-61.1 now generates its own
-	* tests/io.test:	file of test data as needed.
-
-2004-07-20  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclEvent.c:	    Correct threaded obj allocator to
-	* generic/tclInt.h:	    fully cleanup on exit and allow for
-	* generic/tclThreadAlloc.c: reinitialization. [Bug 736426]
-	* unix/tclUnixThrd.c:	    (mistachkin, kenny)
-	* win/tclWinThrd.c:
-
-2004-07-21  Kevin Kenny	 <kennykb@acm.org>
-
-	* generic/tclBasic.c (DeleteInterpProc):
-	* generic/tclLiteral.c (TclCleanupLiteralTable):
-	* generic/tclInt.h: added a TclCleanupLiteralTable function, called
-	from DeleteInterpProc, that frees internal representations of shared
-	literals early when an interpreter is being deleted. This change
-	corrects a number of memory mismanagement issues in the cases where
-	the internal representation of one literal contains a reference to
-	another, and avoids conditions such as resolved variable names
-	referring to procedure and namespace contexts that no longer exist.
-	[Bug 994838]
-
-2004-07-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in:
-	* win/Makefile.in: added 'install-private-headers' makefile target to
-	allow optionally installing private tcl headers. [FR 922727]
-
-	* macosx/Makefile: use new 'install-private-headers' target to install
-	private headers into framework. [FR 922727]
-
-	* unix/tclUnixFile.c (NativeMatchType): added support for readonly
-	matching of user immutable files (where available).
-
-	* macosx/tclMacOSXBundle.c: dynamically acquire address for
-	CFBundleOpenBundleResourceMap symbol, since it is only present in full
-	CoreFoundation on Mac OS X and not in CFLite on pure Darwin.
-
-2004-07-19  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* win/tclwinThrd.c: redefined MASTER_LOCK to call TclpMasterLock.
-	Fixes [Bug 987967]
-
-2004-07-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to rare 'cd' infinite loop in normalization
-	with vfs [Bug 991420].
-	* tests/fileSystem.test: added test for above bug.
-
-	* doc/FileSystem.3: clarified documentation of Posix error codes in
-	'remove directory' FS proc - 'EEXIST' is used to signify a non-empty
-	directory error (bug reported against tclvfs).
-
-2004-07-16  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/Makefile.in, unix/tcl.m4:     move (C|LD)FLAGS after their
-	* unix/configure.in, unix/configure: _DEFAULT to allow for env setting
-	to override m4 switches. Move SC_MISSING_POSIX_HEADERS up and
-	consolidate calls to limit redundancy in configure.
-	(CFLAGS_WARNING): Remove -Wconversion
-	(SC_ENABLE_THREADS): Set m4 to force threaded build when built against
-	a threaded Tcl core.
-
-2004-07-16  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIOCmd.c (Tcl_FcopyObjCmd): Corrected a typo in the
-	generation of error messages and simplified by reusing data in a
-	variable instead of retrieving the string again. Fixes [Bug 835289].
-
-	* doc/OpenFileChnl.3: Added description of the behaviour of
-	Tcl_ReadChars when its 'charsToRead' argument is set to -1. Fixes [Bug
-	934511].
-
-	* doc/CrtCommand.3: Added note that the arguments given to the command
-	proc of a Tcl_CreateCommand are in utf-8 since Tcl 8.1. Closing [Patch
-	414778].
-
-	* doc/ChnlStack.3: Removed the declaration that the interp argument to
-	Tcl_(un)StackChannel can be NULL. This fixes [Bug 881220], reported by
-	Marco Maggi <marcomaggi@users.sourceforge.net>.
-
-	* tests/socket.test: Accepted two new testcases by Stuart Casoff
-	<stwo@users.sourceforge.net> checking that -server and -async don't go
-	together [Bug 796534].
-
-	* unix/tclUnixNotfy.c (NotifierThreadProc): Accepted Joe Mistachkin's
-	patch for [Bug 990500], properly closing the notifier thread when its
-	exits.
-
-2004-07-15  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/tclUnixThrd.c (TclpFinalizeMutex): Accepted Joe Mistachkin's
-	patch for [Bug 990453], closing leakage of mutexes. They were not
-	destroyed properly upon finalization.
-
-2004-07-15  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.h (CHANNEL_INCLOSE):	   New flag. Set in
-	* generic/tclIO.c (Tcl_UnregisterChannel): 'Tcl_Close' while the
-	* generic/tclIO.c (Tcl_Close):		   close callbacks are
-	run. Checked in 'Tcl_Close' and 'Tcl_Unregister' to prevent recursive
-	call of 'close' in the close-callbacks. This is a possible error made
-	by implementors of virtual filesystems based on 'tclvfs', thinking
-	that they have to close the channel in the close handler for the
-	filesystem.
-
-2004-07-14  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c:
-	* generic/tclIO.h:
-	* Not reverting, but #ifdef'ing the changes from May 19, 2004 out of
-	the core. This removes the ***POTENTIAL INCOMPATIBILITY*** for channel
-	drivers it introduced. This has become possible due to Expect gaining
-	a BlockModeProc and now handling blockingg and non-blocking modes
-	correctly. Thus [SF Tcl Bug 943274] is still fixed if a recent enough
-	version of Expect is used.
-
-	* doc/CrtChannel.3: Added warning about usage of a channel without a
-	BlockModeProc.
-
-2004-07-15  Andreas Kupries  <andreask@pliers.activestate.com>
-
-	* generic/tclIOCmd.c (Tcl_PutsObjCmd): Added length check to the old
-	depreceated newline syntax, to ensure that only "nonewline" is
-	accepted. [Tcl SF Bug 985869], reported by Joe Mistachkin
-	<mistachkin@users.sourceforge.net>.
-
-2004-07-15  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* generic/tclEvent.c (Tcl_Finalize): stuffed memory leak incurred by
-	re-initializing of TSD slots after the last call to
-	TclFinalizeThreadData (done from within Tcl_FinalizeThread()). We
-	basically just repeat the TclFinalizeThreadData() once more before
-	tearing down TSD keys in TclFinalizeSynchronization(). There should be
-	more elaborate mechanism in place for handling such issues, based on
-	thread cleanup handlers registered on the OS level. Such change
-	requires much more work and would also require TIP because some
-	visible parts of Tcl API would have to be modified. In the meantime,
-	this will do.
-
-	* generic/tclNotify.c (TclFinalizeNotifier): Added conditional
-	notifier finalization based on the fact that an TclInitNotifier has
-	been called for the current thread. This fixes the [Bug 770053] again.
-	Hopefully this time w/o unwanted side-effects.
-
-2004-07-15  Kevin Kenny	 <kennykb@acm.org>
-
-	* generic/tclLiteral.c (TclReleaseLiteral): Removed unused variable
-	'codePtr' to silence a message from VC++.
-
-2004-07-15  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileScript):
-	* generic/tclLiteral.c (TclReleaseLiteral): fix for [Bug 467523],
-	which resurfaced with the latest changes. The previous strategy was to
-	have special code in TclReleaseLiteral to handle the self-references
-	generated by empty scripts. The new approach avoids the self-reference
-	altogether, by having empty scripts return an unshared literal.
-
-2004-07-15  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* generic/tclEvent.c (NewThreadProc): Backout of changes to fix the
-	[Bug 770053]. See SF bugreport for more info.
-
-2004-07-11  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_EvalEx): leak fix by dgp, release
-	objv[objectsUsed] on error.
-
-2004-07-11  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclParse.c (Tcl_SubstObj): leak fix by dgp, release result
-	on error.
-
-2004-07-11  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (BuildEnsembleConfig): Don't forget to clean out
-	references when deleting the hash table.
-	* generic/tclDictObj.c (Tcl_DictObjRemoveKeyList): Oops, forgot to
-	delete value object when removing the hash entry. [Bug 989093 in part]
-
-2004-07-11  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TEBC): fixed leak of expandNestList objs when
-	there is an error while an expansion is in progress (code added at
-	checkForCatch).
-
-2004-07-11  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to 'cd' bug when vfs is active [tclvfs Bug
-	986944] - this bug recently introduced by some threading fixes. Need
-	to work out how to add tests for this.
-
-2004-07-10  Kevin Kenny	 <kennykb@acm.org>
-
-	* tests/clock.test (clock-2.11): Changed the test so that it isn't an
-	infinite loop when run under valgrind on a slow virtual machine.
-	Thanks to Miguel Sofer for the bug report. Also put in code to restore
-	env(LC_TIME) after tests complete, silencing a warning from 'make
-	TESTFLAGS="-debug 1" test'.
-
-2004-07-08  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (DeleteInterpProc): reverted the modification of
-	3 days ago, as the leak of [Bug 983660] is now handled by the change
-	in TclCleanupByteCode.
-	* generic/tclCompile.c (TclCleanupByteCode): let each bytecode remove
-	its references to literals at interp deletion, without updating the
-	dying literal table.
-	* generic/tclLiteral.c (TclDeleteLiteralTable): with the above change
-	to TclCleanupByteCode, this function now removes a single reference to
-	the literal object and cleans up its own structures.
-
-2004-07-08  Kevin Kenny	 <kennykb@acm.org>
-
-	* win/tclWinInit.c (AppendEnvironment): Silenced a compilation warning
-	about a type mismatch.
-
-2004-07-07  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileScript): fix for [Bug 458361].
-	Single-word scripts are compiled with an unshared cmdName to avoid
-	shimmering between bytecode and cmdName reps.
-
-2004-07-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (TclMergeReturnOptions):  Simplified logic and
-	removed potential memory leak. [Bug 986257].
-
-2004-07-07  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/man2help2.tcl (setTabs, IPmacro): Added support for the more
-	advanced *roff macros used in Tk's doc/bind.n
-
-	* generic/tclObj.c (TclInitObjSubsystem): Declare all current object
-	types.
-
-2004-07-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/cmdMZ.test (cmdMZ-return-2.17): Added a test that a word
-	containing backslash-quoted value is treated correctly.
-
-	* generic/tclCompile.c (TclWordKnownAtCompileTime): [Bug 986196]
-	Corrected flaw above and the flaw that caused TCL_TOKEN_SIMPLE_WORDs
-	to have their original word value copied ( "{a b}" ) rather than the
-	actual value ( "a b" ). Thanks to Kevin Kenny for report and tests.
-
-2004-07-06  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/cmdMZ.test (cmdMZ-return-2.15,cmdMZ-return-2.16): Added a test
-	that a return code containing spaces is correctly returned.
-
-2004-07-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/man2html2.tcl (IPmacro, setTabs): Added support for the more
-	advanced *roff macros used in Tk's doc/bind.n
-
-2004-07-05  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (DeleteInterpProc): fix for [Bug 983660], found
-	by pspjuth. Tear down the global namespace before freeing the interp
-	handle, to allow the bytecodes to free their non-shared literals.
-	* generic/tclLiteral.c (TclReleaseLiteral): moved special code for
-	self-ref so that it is also used for non-shared literals. Possible bug
-	found by inspection.
-
-2004-07-03  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (ExprRoundFunc):
-	* tests/expr-old.test (39.1): added support for wide integers to
-	round(); [Bug 908375], reported by Hemang Lavana.
-
-2004-07-03  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.h:
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c: Moved declaration of TclCompEvalObj() from
-	tclCompile.h to the internal stubs table, for compiler
-	experimentation.
-
-2004-07-02  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/regcomp.c (stid): correct minor pointer size error
-
-	* generic/tclPipe.c (TclCreatePipeline): applied TIP #202 patch that
-	* doc/exec.n, tests/exec.test:		 adds 2>@1 as a special case
-	redirection of stderr to the result output.
-
-2004-07-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/io.test: Changed several tests to run the event loop rather
-	than just calling [update] periodically, avoiding intermittent
-	failures (usually in io-29.32) that stemmed from unreaped processes on
-	Windows.
-	* tests/winPipe.test (winpipe-1.11): Fixed a bug that caused test to
-	fail if the path name of the working directory contained whitespace
-	[Bug 678430]
-
-2004-07-01  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fileSystem.test: Added test for [Bug 970529]
-
-2004-07-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* win/README.binary, win/README: Updated references to Tcl and Tk 8.4
-	to point to 8.5 instead. Thanks to Theo Verelst for spotting this.
-	* generic/tcl.h: Added note to help prevent those changes from getting
-	missed in the future.
-
-	* doc/Namespace.3, doc/load.n, doc/Limit.3: Typo fixes and remove
-	duplicate documentation. [Bug 983146]
-
-2004-06-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/fileSystem.test: Minor correction to new fileSystem-9.X tests
-	so that they clean up temporary directories correctly.
-
-2004-06-30  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/filename.n: clarified behaviour concerning trailing slashes in
-	filenames [Bug 971976]
-
-	* win/tclWinFile.c:
-	* tests/fileSystem.test: fix and tests for [Bug 979879]
-
-2004-06-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	TIP#188 IMPLEMENTATION
-
-	* doc/string.n, tests/string.test:	 Add 'wideinteger' to things
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): that can be tested for with
-	the [string is] subcommand. [Patch 940915, by Kevin Kenny]
-
-2004-06-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* win/tclWinInit.c:	Corrected reference counting flaw in recent
-	changes. Thanks to Pat Thoyts. [Bug 981893].
-
-2004-06-29  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWin32Dll.c: fix to compilation with VC++ 5.2
-
-2004-06-29  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* library/safe.tcl: Make sure that the temporary variable is local to
-	the namespace and not inadvertently global. [Bug 981733]
-
-2004-06-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/unixNotfy.test: Modified constraints so that testing with a
-	threaded tclsh (not tcltest) will not hang.
-
-2004-06-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclThreadStorage.c: Corrected type casting errors that led
-	to calculation of a negative index value, thus accesses outside the
-	threadStorageCache array, thus memory corruption. Crash observed on
-	Mac OS X platform.
-
-2004-06-23  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclThread.c: Implements platform independent thread storage
-	* generic/tclThreadStorage.c: mechanism and fixes associated bugs on
-	platforms where there is limited thread local storage space
-	(Win98/WinNT4). [Patch 976496]
-
-	* generic/tclInt.decls:
-	* generic/tclIntDecls.h: Added thread storage functions to the
-	* generic/tclStubInit.c: internal stubs table.
-
-	* unix/Makefile.in:
-	* unix/configure:
-	* unix/tcl.m4:
-	* win/makefile.vc:
-	* win/rules.vc:
-	* win/Makefile.in: Modified the unix, VC++, and Cygwin build systems
-	* win/configure: to include the new "tclThreadStorage.c" and the new
-	* win/tcl.m4: USE_THREAD_STORAGE define.
-
-2004-06-23  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* tests/io.test: Added -force to 18.1 and 18.2. This was failing on
-	WinXP.
-
-	* tests/winFCmd.test: Added a cleanup to winFCmd-16.11 to avoid a
-	failure in 16.12.
-
-	* tests/eofchar.data: Added -kb option to ensure a binary checkout to
-	win32 systems. This fixes a failure in io-61.1
-
-	* win/makefile.vc: fix for [Bug 977369] about launching tclsh to
-	generate a tclConfig.sh with the nmake build system
-
-2004-06-23  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/winDde.test (createChildProcess): Added a 200-ms delay (with
-	the event loop live) when shutting down the test DDE server process.
-	With the delay in place, nuisance failures of tests winDde-4.2, -6.5,
-	and -6.6 appear to be much less frequent. [Bug 957449]
-
-2004-06-23  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/*.test: Standardize use of platform constraints.
-
-	* unix/tclUnixInit.c (GetStackSize, TclpCheckStackSpace):
-	* unix/tclUnixThrd.c (TclpThreadGetStackSize): Added code to check
-	whether the C stack is about to be exceeded, from [Patch 746378] by
-	Joe Mistachkin but with substantial revisions.
-
-2004-06-22  Kevin Kenny	 <kennykb@acm.org>
-
-	* generic/tclEvent.c (NewThreadProc): Fixed broken build on Windows
-	caused by missing TCL_THREAD_CREATE_RETURN.
-
-	* tests/stack.test (stack-3.1): Corrected nuisance error in threaded
-	builds.
-
-2004-06-22  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* generic/tclEvent.c:
-	* generic/tclInt.h:
-	* unix/tclUnixNotfy.c:
-	* unix/tclUnixThrd.c:
-	* win/tclWinThrd.c: [Bug 770053]. See bug report for more information
-	about what it does.
-
-	* tests/unixNotfy.test: rewritten to use tcltest::threadReap to
-	gracefully wait for the test thread to exit. Otherwise we got a race
-	condition with main thread exiting before the test thread. This
-	exposed the long-standing Tcl lib issue with resource
-	garbage-collection on application exit.
-
-2004-06-21  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWin32Dll.c (DllMain, _except_dllmain_detach_handler)
-	(TclpCheckStackSpace, _except_checkstackspace_handler)
-	(TclWinCPUID, _except_TclWinCPUID_detach_handler):
-	* win/tclWinChan.c (Tcl_MakeFileChannel)
-	(_except_makefilechannel_handler):
-	* win/tclWinFCmd.c (DoRenameFile, _except_dorenamefile_handler)
-	(DoCopyFile, _except_docopyfile_handler):
-	Rework pushing of exception handler function pointer so that compiling
-	with gcc -O3 works. Remove empty function call to avoid compiler
-	warning. Mark the DllMain function as noinline to avoid compiler error
-	from duplicated asm labels in generated code.
-
-2004-06-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclThreadAlloc.c (Ptr2Block): Rewrote so as to maximize the
-	chance of detecting and reporting a memory inconsistency without
-	relying on things being consistent. [Bug 975895]
-
-2004-06-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/load.test:	Relaxed strictness of error message matching
-	for test load-2.3 so that it will pass on Mac OSX.
-
-	* generic/tclEncoding.c: Static TclFindEncodings -> FindEncodings.
-	* generic/tclInt.h:	Updated TclpFindExecutable() so that failed
-	* generic/tclUtil.c:	attempts to find the executable are saved
-	* unix/tclUnixFile.c:	just as successful finds are. [Patch 966053]
-	* unix/tclUnixTest.c:
-
-2004-06-18  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/winFCmd.test (winFCmd-16.12): Changed test to compute the
-	target directory, so as not to fail if the user's HOME isn't the root.
-
-2004-06-19  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4: autoconf 2.5 fixes in Darwin section.
-	* unix/configure: autoconf-2.57
-
-2004-06-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tclUnixInit.c (localeTable): Added some more locale to encoding
-	mapping info from Jim Huang <jserv@kaffe.org>
-
-	* generic/tclInt.h (PendingObjData,TclFreeObjMacro,etc):
-	* generic/tclObj.c (TclFreeObj): Added scheme for making TclFreeObj()
-	avoid blowing up the C stack when freeing up very large object trees.
-	[Bug 886231]
-
-	* win/tclWinInit.c (SetDefaultLibraryDir): Fix logic, simplify and add
-	comments.
-
-2004-06-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclObj.c:	Added missing space in panic message.
-
-	* win/tclWinInit.c:	Inform [tclInit] about the default library
-	directory via the ::tclDefaultLibrary variable. This should correct a
-	problem with my 2004-06-11 commit. Better solutions still in the
-	works. Thanks to Joe Mistachkin for pointing out the breakage.
-
-2004-06-16  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/library.n:	Moved variables ::auto_oldpath and
-	* library/auto.tcl:	::unknown_pending into ::tcl namespace.
-	* library/init.tcl:	[Bugs 808319, 948794]
-
-2004-06-15  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/binary.n: Added some notes to the documentation of the 'a'
-	format to address the point raised in [RFE 768852].
-
-2004-06-15  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tclConfig.sh.in (TCL_EXTRA_CFLAGS): set to @CFLAGS@, which is
-	the configure-time CFLAGS. Addendum to m4 change on 2004-05-26.
-
-2004-06-14  Kevin Kenny	 <kennykb@acm.org>
-
-	* win/Makefile.in: Corrected compilation flags for tclPkgConfig.c so
-	that it doesn't require Stubs.
-	* generic/tclBasic.c (Tcl_CreateInterp): Removed comment stating that
-	TclInitEmbeddedConfigurationInformation needs Stubs; with the change
-	above, the comment is now erroneous.
-
-2004-06-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/Encoding.3:	Removed bogus claims about tcl_libPath.
-
-	* generic/tclInterp.c (Tcl_Init):	Stopped setting the
-	tcl_libPath variable. [tclInit] can get all its directories without it.
-
-	* tests/unixInit.test:	Modified test code that made use of
-	tcl_libPath variable.
-
-	* unix/tclUnixInit.c:	Stopped setting the tclDefaultLibrary variable,
-	execept on the Mac OS X platform with HAVE_CFBUNDLE. In that
-	configuration we should seek some way to make use of the TIP 59
-	facilities and get rid of that usage of tclDefaultLibrary as well.
-
-	* generic/tclInterp.c:	Updated [tclInit] to make $env(TCL_LIBRARY) an
-	absolute path, and to include the scriptdir,runtime configuration value
-	on the search path for init.tcl.
-
-	* unix/tclUnixInit.c:	The routines Tcl_Init() and TclSourceRCFile()
-	* win/tclWinInit.c:	had identical implementations for both win and
-	* generic/tclInterp.c:	unix. Moved to a single generic implementation.
-	* generic/tclMain.c:
-	* library/init.tcl:
-	* generic/tclInitScript.h (removed):
-	* unix/Makefile.in:
-	* win/tcl.dsp:
-
-	* unix/configure.in:	Updated TCL_PACKAGE_PATH value to handle
-	* win/configure.in:	--libdir configuration.
-
-	* unix/configure.in:	autoconf-2.57
-	* win/configure.in:
-
-	* generic/tclBasic.c (Tcl_CreateInterp): Moved call to
-	TclInitEmbeddedConfigurationInformation() earlier in
-	Tcl_CreateInterp() so that other parts of interp creation and
-	initialization may access and use the config values.
-
-2004-06-11  Kevin Kenny	 <kennykb@acm.org>
-
-	* win/tclAppInit.c: Restored the 'setargv' procedure when compiling
-	with mingw. Apparently, the command line parsing in mingw doesn't work
-	as well as that in vc++, and the result was (1) that winPipe-8.19
-	failed, and (2) that 'make test' would work at all only with
-	TESTFLAGS='-singleproc 1'. [Bug 967195]
-
-2004-06-10  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* generic/tclIOUtil.c: removed forceful setting of the private cached
-	current working directory rep from within the Tcl_FSChdir(). We
-	delegate this task to the Tcl_FSGetCwd() which does this task anyway.
-	The relevant code is still present but disabled temporarily until the
-	change proves correct. The Tcl test suite passes all test with the
-	given change so I suppose it is good enough.
-
-2004-06-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tclUnixInit.c (TclpInitLibraryPath):	Disabled addition of
-	* win/tclWinInit.c (TclpInitLibraryPath):	relative-to-executable
-	directories to the library search path. A first step in reform of
-	Tcl's startup process.
-
-	***POTENTIAL INCOMPATIBILITY***
-	Attempts to directly run ./tclsh or ./tcltest out of a build directory
-	will either fail, or will make use of an installed script library in
-	preference to the one in the source tree. Use `make shell` or `make
-	runtest` instead.
-
-	* tests/unixInit.test:	Modified tests to suit above changes.
-
-	* generic/tclPathObj.c:	Corrected [file tail] results when operating
-	on a path produced by TclNewFSPathObj(). [Bug 970529]
-
-2004-06-09  Zoran Vasiljevic <vasiljevic@users.sf.net>
-
-	* generic/tclIOUtil.c: partially corrected [Bug 932314]. Also
-	corrected return values of Tcl_FSChdir() to reflect those of the
-	underlying platform-specific call. Originally, return codes were mixed
-	with those of Tcl.
-
-2004-06-08  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c:
-	* generic/tclExecute.c: handle warning [Bug 969066]
-
-2004-06-08  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclHash.c (RebuildTable): Move declaration of variable so it
-	is only declared when it is used. [Bug 969068]
-
-2004-06-07  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/lsearch.n: Added correct option to example. [Bug 968219]
-
-2004-06-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tcl.h: Corrected Tcl_WideInt declarations so that the mingw
-	build works again.
-	* generic/tclDecls.h:			Changes to the tests for clock
-	* generic/tclInt.decls:			frequency in Tcl_WinTime so
-	* generic/tclIntDecls.h:		that any clock frequency is
-	* generic/tclIntPlatDecls.h:		accepted provided that all
-	* generic/tclPlatDecls.h:		CPU's in the system share a
-	* generic/tclStubInit.c:		common chip, and hence,
-	* tests/platform.test (platform-1.3):	presumably, a common clock.
-	* win/tclWin32Dll.c (TclWinCPUID):	This change necessitated a
-	* win/tclWinTest.c (TestwincpuidCmd)	small burst of assembly code
-	* win/tclWinTime.c (Tcl_GetTime):	to read CPU ID information,
-	which was added as TclWinCPUID in the internal Stubs. To test this
-	code in the common case of a single-processor machine, a
-	'testwincpuid' command was added to tclWinTest.c, and a test case in
-	platform.test. Thanks to Jeff Godfrey and Richard Suchenwirth for
-	reporting this bug. [Bug 976722]
-
-2004-06-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Restored #include <stdio.h> to tcl.h,
-	rejecting the "fix" for "Bug" 945570. Tcl_FSSeek() needs the values of
-	SEEK_SET, etc. and too many extensions rely on tcl.h providing stdio.h
-	for them.
-
-2004-06-02  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/tclWinFile.c (TclpFindExecutable): when using GetModuleFileNameA
-	(Win9x), convert from CP_ACP to WCHAR then convert back to utf-8.
-	Adjunct to 2004-04-07 fix.
-
-2004-06-02  David Gravereaux <davygrvy@pobox.com>
-
-	* tests/winPipe.test (winpipe-6.1): blocking set to 1 before closing
-	to ensure we get an exitcode. The windows pipe channel driver doesn't
-	differentiate between a blocking and non-blocking close just yet, but
-	will soon. Part of [Bug 947693]
-
-2004-06-02  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/file.n: fix to documentation of 'file volumes' (Bug 962435)
-
-2004-06-01  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: check for either MSDEVDIR or MSVCDIR being in the
-	environment, for VC7. [Bug 942214]
-
-	* generic/tclIO.c (Tcl_SetChannelOption): -buffersize wasn't
-	understanding hexidecimal notation nor was reporting number conversion
-	errors. The behavior to silently ignore settings outside the
-	acceptable range of Tcl_SetChannelBufferSize (<10 or >1M) is
-	unchanged. This silent ignoring behavior might be up for review soon.
-
-2004-05-30  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinPipe.c:
-	* win/tclWinPort.h:  Reworked the win implementation of Tcl_WaitPid to
-	support exitcodes in the 'signed short' range. Even though this range
-	is non-portable, it is valid on windows. Detection of exception codes
-	are now more accurate. Previously, an application that exited with
-	ExitProcess((DWORD)-1); was improperly reported as exiting with
-	SIGABRT.
-
-2004-05-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInterp.c: Added comments describing the purposes of each
-	function in the limit implementation and rewrote the names of some
-	non-public functions for greater clarity of purpose.
-	* doc/interp.n: Added note about what happens when a limited
-	interpreter creates a slave interpreter.
-	* doc/Limit.3: Added manual page for the resource limit subsystem's C
-	API. [Bug 953903]
-
-2004-05-29  Joe English	 <jenglish@users.sourceforge.net>
-
-	* doc/global.n, doc/interp.n, doc/lrange.n: Fix minor markup errors.
-
-2004-05-28  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/*.n: Added examples to many (too many to list) more man pages.
-
-2004-05-25  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c:
-	* generic/tclVar.c: using (ptrdiff_t) instead of (int) casting to
-	correct compiler warnings [Bug 961657], reported by Bob Techentin.
-
-2004-05-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/clock.test: Added a single test for the presence of %G in
-	[clock format], and conditioned out the clock-10.x series if they're
-	all going to fail because of a broken strftime() call. [Bug 961714]
-
-2004-05-27  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclHash.c (CompareStringKeys): Added #ifdef to allow people
-	to instruct this function to use strcmp(). [FRQ 951168]
-
-	* generic/tclVar.c: Moved declarations into #if guards so they only
-	happen when required.
-	* unix/tclUnixPort.h: Guard declaration of strtod() so it is only
-	enabled when we don't have a declaration in stdlib.h
-	* unix/tclUnixThrd.c (Tcl_CreateThread):	Added declarations
-	* unix/tclUnixTest.c (AlarmHandler):		and casts so that
-	* unix/tclUnixChan.c (TtyModemStatusStr):	all functions are
-	* generic/tclScan.c (Tcl_ScanObjCmd):		defined before use
-	* generic/tclDictObj.c (InvalidateDictChain):	and no cross-type
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):	uses are performed.
-
-	The overall effect is to make building with gcc with the additional
-	flags -Wstrict-prototypes -Wmissing-prototypes produce no increase in
-	the total number of warnings (except for main(), which is undeclared
-	for traditional reasons.)
-
-2004-05-26  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/Makefile.in:  Rework configure ordering to TCL_LINK_LIBS,
-	* unix/tcl.m4:	     ENABLE_SHARED, CONFIG_CFLAGS, & ENABLE_SYMBOLS
-	* unix/configure:    before TCL_EARLY_FLAGS and TCL_64BIT_FLAGS
-	* unix/configure.in: (about 400 lines earlier) in configure.in. This
-	forces CFLAGS configuration to be done before many tests, which is
-	needed for 64-bit builds and may affect other builds. Also make
-	CONFIG_CFLAGS append to CFLAGS directly instead of using EXTRA_CFLAGS,
-	and have LDFLAGS append to any existing value. [Bug 874058]
-	* unix/dltest/Makefile.in: change EXTRA_CFLAGS to DEFS
-
-2004-05-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Correction to debug prints and testing
-	* library/tcltest/pkgIndex.tcl:	if TCLTEST_OPTIONS value. Corrected
-	* tests/tcltest.test:		double increment of numTestFiles in
-	-singleproc 1 configurations. Updated tcltest-19.1 to tcltest 2.1
-	behavior. Corrected tcltest-25.3 to not falsely report a failure in
-	tcltest.test. Bumped to tcltest 2.2.6. [Bugs 960560, 960926]
-
-2004-05-25  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* doc/http.n (http::config): add -urlencoding option (default utf-8)
-	* library/http/http.tcl:     that specifies encoding conversion of
-	* library/http/pkgIndex.tcl: args for http::formatQuery. Previously
-	* tests/http.test:	     undefined, RFC 2718 says it should be
-	utf-8. 'http::config -urlencoding {}' returns previous behavior, which
-	will throw errors processing non-latin-1 chars. Bumped http package to
-	2.5.0.
-
-2004-05-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInterp.c (DeleteScriptLimitCallback): Move all deletion
-	of script callback hash table entries to happen here so the entries
-	are correctly removed at the right time. [Bug 960410]
-
-2004-05-25  Miguel Sofer <msofer@users.sf.net>
-
-	* docs/global.n: added details for qualified variable names [Bug
-	959831]
-
-2004-05-25  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclNamesp.c (Tcl_FindNamespaceVar):
-	* tests/namespace.test (namespace-17.10-12): reverted commit of
-	2004-05-23 and removed the tests, as it interferes with the varname
-	resolver and there are apps that break (AlphaTk). A fix will have to
-	wait for Tcl9.
-
-	* generic/tclVar.c: Caching of namespace variables disabled: no simple
-	way was found to avoid interfering with the resolver's idea of
-	variable existence. A cached varName may keep a variable's name in the
-	namespace's hash table, which is the resolver's criterion for
-	existence.
-
-	* tests/namespace.c (namespace-17.10): testing for interference
-	between varname caching and name resolver.
-
-2004-05-25  Kevin Kenny	 <kennykb@acm.org>
-
-	* tests/winFCmd.test: Correct test for the presence of a CD-ROM so
-	that it doesn't misdetect some other sort of filesystem with a
-	write-protected root as being a CD-ROM drive. [Bug 918267]
-
-2004-05-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/winPipe.test:	Protect against path being set
-	* tests/unixInit.test:	Unset path when done.
-	* tests/unload.test (unload-3.1): Verify [pkgb_sub] does not exist.
-	Delete interps when done.
-	* tests/stringComp.test:	stop re-use of string.test test names
-	* tests/regexpComp.test:	stop re-use of regexp.test test names
-	* tests/namespace.test (namespace-46.3): Verify [p] does not exist.
-	* tests/http.test:	Clear away the custom [bgerror] when done.
-	* tests/io.test:	Take care to use namespace variables.
-	* tests/autoMkindex.test (autoMkindex-5.2): Use variable "result"
-	that gets cleaned up.
-	* tests/exec.test:	Clean up the "path" array.
-	* tests/interp.test (interp-9.3): Initialize res, so prior values
-	cannot make the test fail.
-	* tests/execute.test (execute-8.1):  Updated to remove the trace set
-	on ::errorInfo. When left in place, that trace can cause later tests
-	to fail.
-
-2004-05-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclBasic.c: Removed references to Tcl_RenameCommand from
-	* generic/tcl.h:      comments. [Bug 848440, second part]
-
-	* tests/fCmd.test: Rewrote tests that failed consistently on NFS so
-	they either succeed (through slightly more liberal matching of the
-	results) or are constrained to not run. [Bug 931312]
-
-	* doc/bgerror.n: Use idiomatic open flags for working with log
-	files. [Bug 959602]
-
-2004-05-24  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclExecute.c (VerifyExprObjType): use GET_WIDE_OR_INT to
-	properly have tclIntType used for smaller values. This corrects [TclX
-	Bug 896727] and any other 3rd party extension that created math
-	functions but was not yet WIDE_INT aware in them.
-
-2004-05-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInterp.c (TclInitLimitSupport): Made limits work on
-	platforms where sizeof(void*)!=sizeof(int). [Bug 959193]
-
-2004-05-24 Miguel Sofer <msofer@users.sf.net>
-
-	* doc/set.n: accurate description of name resolution process,
-	referring to namespace.n for details [Bug 959180]
-
-2004-05-23  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclNamesp.c (Tcl_FindNamespaceVar): [Bug 959052] fixed,
-	insuring that no "zombie" variables are found.
-	* generic/tclVar.c (TclLookupSimpleVar): comments re [Bug 736729]
-	(predecessor of [Bug 959052]) removed.
-	* tests/namespace.test: added tests 17.10-12
-
-	The patch modifies non-documented behaviour, and passes every test in
-	the testsuite. However, scripts relying on the old behaviour may
-	break.
-	Note that the only behaviour change concerns the creative writing of
-	unset variables. More precisely, which variable will be created when
-	neither a namespace variable nor a global variable by that name
-	exists, as defined by [info vars]. The new behaviour is that the
-	namespace resolution process deems a variable to exist exactly when
-	[info vars] finds it - ie, either it has value, or else it was "fixed"
-	by a call to [variable].
-	Note: this patch was removed on 2002-05-25.
-
-2004-05-22  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclObjLookupVar, TclObjUnsetVar2): fix for new (in
-	tcl8.4) exteriorisations of [Bug 736729] due to the use of
-	tclNsVarNameType obj types. Reenabling the use of this objType ("VAR
-	ref absolute" benchmark down to 66 ms, from 230). Added comments in
-	TclLookupSimpleVar explaining my current understanding of [Bug
-	736729].
-
-2004-05-22  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclVar.c: fix for [Bug 735335]. The use of tclNsVarNameType
-	objs is still disabled, pending resolution of [Bug 736729].
-
-2004-05-21  Miguel Sofer <msofer@users.sf.net>
-
-	* tests/namespace.test (namespace-41.3): removed the {knownBug}
-	constraint: [Bug 231259] is closed since nov 2001, and the fix of [Bug
-	729692] (INST_START_CMD) makes the test succeed.
-
-2004-05-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Move a few declarations a
-	short distance so pre-C99 compilers can cope. Also fix so
-	TCL_COMPILE_DEBUG path compiles...
-
-2004-05-21  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): reorganised TEBC
-	automatic variables, defining them in tight blocks instead of at the
-	function level. This has three purposes:
-	- it simplifies the analysis of individual instructions
-	- it is preliminary work to the non-recursive engine
-	- it allows a better register allocation by the optimiser; under
-	gcc3.3, this results in up to 10% runtime in some tests
-
-2004-05-20  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInterp.c (TclLimitRemoveAllHandlers):
-	* generic/tclBasic.c (DeleteInterpProc):
-	* tests/interp.test (interp-34.7): Ensure that all limit callbacks are
-	deleted when their interpreters are deleted. [Bug 956083]
-
-2004-05-19  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclWinFile.c (TclpMatchInDirectory): fix for an issue where
-	there was a sneak path from Tcl_DStringFree to SetErrorCode(0). The
-	result was that the error code could be reset between a call to
-	FindFirstFileEx and the check of its status return, leading to a
-	bizarre error return of {POSIX unknown {No error}}. (Found in
-	unplanned test - no incident logged at SourceForge.)
-
-2004-05-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/interp.test (interp-34.3): Rewrite this test to see if a time
-	limit can catch a tight bytecode loop, a maximally aggressive
-	denial-of-service attack.
-	* generic/tclInterp.c (Tcl_LimitCheck): Fix the sense of checks to see
-	whether a time limit has been extended.
-
-	* tests/*.test: Many minor fixes, including ensuring that every test
-	is run (so constraints control whether the test is doing anything) and
-	making sure that constraints are always set using the API instead of
-	poking around inside tcltest's internal datastructures. Also got rid
-	of all trailing whitespace lines from the test suite!
-
-2004-05-19  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c: Fixed [SF Tcl Bug 943274]. This is the same problem
-	* generic/tclIO.h: as [SF Tcl Bug 462317], see ChangeLog entry
-	2001-09-26. The fix done at that time is incomplete. It is possible to
-	get around it if the actual read operation is defered and not executed
-	in the event handler itself. Instead of tracking if we are in an read
-	caused by a synthesized fileevent we now track if the OS has delivered
-	a true event = actual data and bypass the driver if a read finds that
-	there is no actual data waiting. The flag is cleared by a short or
-	full read.
-
-	***POTENTIAL INCOMPATIBILITY*** for channel drivers.
-
-2004-05-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: fix to (Bug 956063) in 'file dirname'.
-	* tests/cmdAH.test: added test for this bug.
-
-	* doc/FileSystem.3: better documentation of refCount requirements of
-	some FS functions (Bug 956126)
-
-2004-05-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclTest.c (TestgetintCmd): Made the tests in get.test check
-	* tests/get.test:		     Tcl_GetInt() since the core now
-					     avoids that function.
-
-2004-05-18  Kevin B. Kenny  <kennykb@acm.org>
-
-	* compat/strftime.c (_fmt, ISO8601Week):
-	* doc/clock.n:
-	* tests/clock.test: Major rework to the handling of ISO8601 week
-	numbers. Now passes all the %G and %V test cases on Windows, Linux and
-	Solaris [Bugs 500285, 500389, and 852944]
-
-2004-05-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/append.n, doc/upvar.n: Added example.
-
-2004-05-18  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: now generates a tclConfig.sh from Pat Thoyts [Patch
-	909911]
-
-2004-05-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/lsearch.n: Improve clarity (based on [Patch 955361] by Peter
-	Spjuth)
-
-	* tools/man2help2.tcl (macro,SHmacro): Added support for subsection
-	(.SS) header macros.
-
-	* doc/interp.n: Added user documentation for the TIP#143 resource
-	limits and some examples.
-
-	* generic/tclInterp.c (Tcl_LimitCheck, Tcl_LimitTypeReset): Reset the
-	limit-exceeded flag when removing a limit.
-
-2004-05-18  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): added comments to
-	classify the variables according to their use in TEBC.
-
-2004-05-17  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/global.n, doc/uplevel.n: Added an example.
-
-	* tests/info.test (info-3.1): Corrected test result back to what it
-	used to be in Tcl 7.* now that command counts are being correctly kept
-
-	* generic/tclExecute.c (TEBC:INST_START_CMD): Make sure that the
-	command-count is always advanced. Allows TIP#143 limits to tell that
-	work is being done.
-
-	* doc/list.n: Updated example to fit with the unified format.
-	* doc/seek.n: Added some examples.
-
-2004-05-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* win/tclWinFile.c:
-	* tests/cmdAH.test: fix to (Bug 954263) where 'file executable' was
-	case-sensitive.
-
-2004-05-17  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/OpenFileChnl.3: Documented type of 'offset' argument to Tcl_Seek
-	was wrong. [Bug 953374]
-
-2004-05-16  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): remove one level of
-	indirection for compiledLocals addressing.
-
-2004-05-16  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_CALL_FUNC1): bugfix; restored
-	(DE)CACHE_STACK_INFO pair around the call - the user defined math
-	function could cause a recursive call to TEBC.
-
-2004-05-16  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_DeleteInterp):
-	* generic/tclExecute.c (INST_START_CMD): interp deletion now modifies
-	the compileEpoch, eliminating the need for the check for interp
-	deletion in INST_START_CMD.
-
-2004-05-16  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.h:
-	* generic/tclCompile.c:
-	* generic/tclExecute.c: changed implementation of {expand}, last
-	chance while in alpha as ...
-
-	***POTENTIAL INCOMPATIBILITY***
-	Scripts precompiled with ProComp under previous tcl8.5a versions may
-	malfunction due to changed instruction numbers for
-	INST_LIST_INDEX_IMM, INST_LIST_RANGE_IMM and INST_START_CMD.
-
-2004-05-14  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclInt.decls:	     Promoted TclpLocaltime and TclpGmtime
-	* generic/tclIntDecls.h:     from Unix-specific stubs to the generic
-	* generic/tclIntPlatDecls.h: internal Stubs table. Reran 'genstubs'
-	* generic/tclStubInit.c:
-	* unix/tclUnixPort.h:
-
-	* generic/tclClock.c: Changed a buggy 'GMT' timezone specification
-			      to the correct 'GMT0'. [Bug 922848]
-
-	* unix/tclUnixThrd.c: Moved TclpGmtime and TclpLocaltime to
-			      unix/tclUnixTime.c where they belong.
-
-	* unix/tclUnixTime.c (TclpGmtime, TclpLocaltime, TclpGetTimeZone,
-			      ThreadSafeGMTime [removed],
-			      ThreadSafeLocalTime [removed],
-			      SetTZIfNecessary, CleanupMemory):
-	Restructured to make sure that the same mutex protects all calls to
-	localtime, gmtime, and tzset. Added a check in front of those calls to
-	make sure that the TZ env var hasn't changed since the last call to
-	tzset, and repeat tzset if necessary. [Bug 942078] Removed a buggy
-	test of the Daylight Saving Time information in 'gettimeofday' in
-	favor of applying 'localtime' to a known value. [Bug 922848]
-
-	* tests/clock.test (clock-3.14): Added test to make sure that changes
-	to $env(TZ) take effect immediately.
-
-	* win/tclWinTime.c (TclpLocaltime, TclpGmtime): Added porting layer
-	for 'localtime' and 'gmtime' calls.
-
-2004-05-14  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c:
-	* generic/tclCompile.h: the math functions receive a pointer to top of
-	the stack (tosPtr) instead of the execution environment (eePtr). First
-	step towards a change in the execution stack management - it is now
-	only used within TEBC.
-
-2004-05-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	TIP#143 IMPLEMENTATION
-
-	* generic/tclExecute.c (TclCompEvalObj, TclExecuteByteCode):
-	* generic/tclBasic.c (TclEvalObjvInternal): Enable limit checking.
-	* generic/tclInterp.c (Tcl_Limit*): Public limit API.
-	* generic/tcl.decls:
-	* tests/interp.test: Basic tests of command limits.
-
-	* doc/binary.n:		TIP#129 IMPLEMENTATION [Patch 858211]
-	* generic/tclBinary.c:	Note that the test suite probably has many more
-	* tests/binary.test:	failures now due to alterations in constraints.
-
-2004-05-12  Miguel Sofer <msofer@users.sf.net>
-
-	Optimisations for INST_START_CMD [Bug 926164].
-	* generic/tclCompile.c (TclCompileScript): avoid emitting
-	INST_START_CMD as the first instruction in a bytecoded Tcl_Obj. It is
-	not needed, as the checks are done before calling TEBC.
-	* generic/tclExecute.c (TclExecuteByteCode): runtime peephole
-	optimisation: check at INST_POP if the next instruction is
-	INST_START_CMD, in which case we fall through.
-
-2004-05-11  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/split.n, doc/join.n: Updated examples and added more.
-
-2004-05-11  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/glob.n: documented behaviour of symbolic links with 'glob -types
-	d' (Bug 951489)
-
-2004-05-11  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/scan.n: Updated the examples to be clearer about their relevance
-	to the scan command.
-
-2004-05-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/scan.n: Added examples.
-
-2004-05-10  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinPipe.c (BuildCommandLine): Moved non-obvious appending
-	logic to outside the loop and added commentary for its purpose. Also
-	use the existence of contents in the linePtr rather than the scratch
-	DString post the append, as this more clear.
-
-	(TclpCreateProcess): When under NT, with no console, and executing a
-	DOS application, the path priming does not need an ending space as
-	BuildCommandLine() will do this for us.
-
-2004-05-08  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c:
-	* generic/tclIOUtil.c: remove some compiler warnings on MacOS X.
-
-2004-05-07  Chengye Mao <chengye.geo@yahoo.com>
-
-	* win/tclWinPipe.c: refixed bug 789040 re-entered in rev 1.41. Let's
-	be careful and don't re-enter previously fixed bugs.
-
-2004-05-08  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/format.n: Added examples.
-
-2004-05-07  Miguel Sofer <msofer@users.sf.net>
-
-	* doc/unset.n: added upvar.n to the "see also" list
-
-2004-05-07  Reinhard Max  <max@suse.de>
-
-	* generic/tclEncoding.c:
-	* tests/encoding.test: added support and tests for translating
-	embedded null characters between real nullbytes and the internal
-	representation on input/output [Bug 949905].
-
-2004-05-07  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c:
-	* generic/tclIOUtil.c:
-	* generic/tclFileSystem.h:
-	* tests/fileSystem.test: fix for [Bug 943995], in which vfs-registered
-	root volumes were not handled correctly as glob patterns in all
-	circumstances.
-
-2004-05-06  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclObj.c (TclFreeObj): made TclFreeObj use the new macro
-	TclFreeObjMacro(), so that the allocation and freeing of Tcl_Obj is
-	defined in a single spot (the macros in tclInt.h), with the exception
-	of the TCL_MEM_DEBUG case.
-	The #ifdef logic for the corresponding macros has been reformulated to
-	make it clearer.
-
-2004-05-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/break.n, doc/continue.n, doc/for.n, doc/while.n: More examples.
-
-2004-05-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (unixInit-2.10):	Test correction for Mac OSX.
-	Be sure to consistently compare normalized path names. Thanks to
-	Steven Abner (tauvan). [Bug 948177]
-
-2004-05-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/CrtObjCmd.3: Remove reference to Tcl_RenameCommand; there is no
-	such API. [Bug 848440]
-
-2004-05-05  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinSock.c (SocketEventProc) : connect errors should fire both
-	the readable and writable handlers because this is how it works on
-	UNIX [Bug 794839]
-
-	* generic/tclEncoding.c (TclFinalizeEncodingSubsystem):
-	FreeEncoding(systemEncoding); moved to before the hash table iteration
-	as it was causing a double free attempt under some conditions.
-
-	* win/coffbase.txt: Added the tls extension to the list of preferred
-	load addresses.
-
-2004-05-04  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* tests/fileSystem.test (filesystem-1.39): replace 'file volumes'
-	* tests/fileName.test (filename-12.9,10):  lindex with direct C:/
-	hard-coded because A:/ was being used and that is empty for most.
-
-	* tests/winFCmd.test (winFCmd-16.12): test volumerelative $HOME
-
-2004-05-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclAlloc.c:		Make sure Tclp*Alloc* routines get
-	* generic/tclInt.h:		declared in the TCL_MEM_DEBUG and
-	* generic/tclThreadAlloc.c:	TCL_THREADS configuration. [Bug 947564]
-
-	* tests/tcltest.test:	Test corrections for Mac OSX. Thanks to Steven
-	Abner (tauvan). [Bug 947440]
-
-2004-05-04  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclEvent.c (TclSetLibraryPath): Suppress a warning.
-
-2004-05-03  Andreas Kupries  <andreask@activestate.com>
-
-	* Applied [Patch 868853], fixing a mem leak in TtySetOptionProc.
-	Report and Patch provided by Stuart Cassoff <stwo@users.sf.net>.
-
-2004-05-03  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclProc.c (TclCreateProc): comments corrected.
-
-2004-05-03  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileScript): setting the compilation
-	namespace outside of the loop.
-
-2004-05-03  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c:
-	* generic/tclInt.h: reverted fix for [Bug 926445] of 2004-04-02,
-	restoring TCL_ALIGN to the header file. Todd Helfter reported that the
-	macro is required by tbcload.
-
-2004-05-03  Kevin Kenny	 <kennykb@acm.org>
-
-	* win/tclWin32Dll.c (TclpCheckStackSpace):
-	* tests/stack.test (stack-3.1): Fix for undetected stack overflow in
-	TclReExec on Windows. [Bug 947070]
-
-2004-05-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl:	Corrected unique prefix matching of
-	interactive command completion in [unknown]. [Bug 946952]
-
-2004-05-02  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclProc.c (TclObjInvokeProc):
-	* tests/proc.test (proc-3.6): fix for bad quoting of multi-word proc
-	names in error messages [Bug 942757]
-
-2004-04-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/glob.n, doc/incr.n, doc/set.n:	More examples.
-	* doc/if.n, doc/rename.n, doc/time.n:
-
-2004-04-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:		Replaced Kevin Kenny's temporary
-	* generic/tclThreadAlloc.c:	fix for Bug 945447 with a cleaner,
-	more permanent replacement.
-
-2004-04-30  Kevin B. Kenny   <kennykb@acm.org>
-
-	* generic/tclThreadAlloc.c: Added a temporary (or so I hope!)
-	inclusion of "tclWinInt.h" to avoid problems when compiling on
-	Win32-VC++ with --enable-threads. [Bug 945447]
-
-2004-04-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/puts.n: Added a few examples.
-
-2004-04-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/execute.test (execute-8.2):	Avoid crashes when there is
-	limited system stack space (threads-enabled).
-
-2004-04-28  Miguel Sofer <msofer@users.sf.net>
-
-	* doc/global.n:
-	* doc/upvar.n:
-	* generic/tclVar.c (ObjMakeUpvar):
-	* tests/upvar.test (upvar-8.11):
-	* tests/var.test (var-3.11): Avoid creation of unusable variables:
-	[Bug 600812] [TIP 184].
-
-2004-04-28  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/lsearch.n: Fixed fault in documentation of -index option [943448]
-
-2004-04-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tclUnixFCmd.c (TclpObjNormalizePath):  Corrected improper
-	positioning of returned checkpoint. [Bug 941108]
-
-2004-04-26  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/open.n, doc/close.n: Updated (thanks to David Welton) to be
-	clearer about pipeline errors and added example to open(n) that shows
-	simple pipeline use. [Patches 941377,941380]
-
-	* doc/DictObj.3: Added warning about the use of Tcl_DictObjDone and an
-	example of use of iteration. [Bug 940843]
-
-	* doc/Thread.3: Reworked to remove references to testing interfaces
-	and instead promote the use of the Thread package. [Patch 932527]
-	Also reworked and reordered the page for better readability.
-
-2004-04-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Removed obsolete declarations and #include's.
-	* generic/tclInt.h:	[Bugs 926459, 926486]
-
-2004-04-24  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWin32Dll.c (DllMain): Added DisableThreadLibraryCalls() for
-	the DLL_PROCESS_ATTACH case. We're not interested in knowing about
-	DLL_THREAD_ATTACH, so disable the notices.
-
-2004-04-24  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclPort.h:
-	* macosx/Makefile:
-	* unix/Makefile.in: followup on tcl header reform [FR 922727]: removed
-	use of relative #include paths in tclPort.h to allow installation of
-	private headers outside of tcl source tree; added 'unix' dir to
-	compiler header search path; add newly required tcl private headers to
-	Tcl.framework on Mac OSX.
-
-2004-04-23  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (Tcl_SetChannelOption): Fixed [SF Tcl Bug 930851].
-	When changing the eofchar we have to zap the related flags to prevent
-	them from prematurely aborting the next read.
-
-2004-04-25  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: fix to [Bug 940281]. Tcl_FSJoinPath will now
-	always return a valid Tcl_Obj when the input is valid.
-	* generic/tclIOUtil.c: fix to [Bug 931823] for a more consistent
-	Tcl_FSPathSeparator() implementation which allows filesystems not to
-	implement their Tcl_FSFilesystemSeparatorProc if they wish to use the
-	default '/'. Also fixed associated memory leak seen with, e.g., tclvfs
-	package.
-	* doc/FileSystem.3: documented Tcl_FSJoinPath return values more
-	clearly, and Tcl_FSFilesystemSeparatorProc requirements.
-
-2004-04-23  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWin32Dll.c: Removed my mistake from 4/19 of adding an exit
-	handler to TclWinInit. TclWinEncodingsCleanup called from
-	TclFinalizeFilesystem does the Tcl_FreeEncoding for us.
-
-	* win/tclWinChan.c (Tcl_MakeFileChannel): Case for CloseHandle
-	returning zero and not throwing a
-	RaiseException(EXCEPTION_INVALID_HANDLE) now being done.
-
-2004-04-22  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclEvent.c: TclSetLibraryPath's use of caching the stringrep
-	of the pathPtr object to TclGetLibraryPath called from another thread
-	was ineffective if the original's stringrep had been invalidated as
-	what happens when it gets muted to a list.
-
-	* win/tclWinTime.c: If the Tcl_ExitProc (StopCalibration) is called
-	from the stack frame of DllMain's PROCESS_DETACH, the wait operation
-	should timeout and continue.
-
-	* generic/tclInt.h:
-	* generic/tclThread.c:
-	* generic/tclEvent.c:
-	* unix/tclUnixThrd.c:
-	* win/tclWinThrd.c: Provisions made so masterLock, initLock, allocLock
-	and joinLock mutexes can be recovered during Tcl_Finalize.
-
-2004-04-22  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/switch.n: Reworked the examples to be more systematically named
-	and to cover some TIP#75 capabilities.
-
-	* doc/cd.n: Documentation clarification from David Welton.
-
-	* doc/exec.n: Added some examples, Windows ones from Arjen Markus and
-	Unix ones by myself.
-
-2004-04-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/Hash.3: Added note to Tcl_{First,Next}HashEntry docs that
-	deleting the element they return is supported (and is in fact the only
-	safe update you can do to the structure of a hashtable while an
-	iteration is going over it.)
-
-	* doc/bgerror.n: Added example from David Welton. [Patch 939473]
-
-	* doc/after.n: Added examples from David Welton. [Patch 938820]
-
-2004-04-19  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWin32Dll.c: Added an exit handler in TclWinInit() so
-	tclWinTCharEncoding could be freed during Tcl_Finalize().
-
-	* generic/tclEncoding.c: Added FreeEncoding(systemEncoding) in
-	TclFinalizeEncodingSubsystem because its ref count was incremented in
-	TclInitEncodingSubsystem.
-
-2004-04-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/read.n: Added example from David Welton. [Patch 938056]
-
-2004-04-19  Kevin B. Kenny   <kennykb@acm.org>
-
-	* generic/tclObj.c (Tcl_GetDoubleFromObj) Corrected "short circuit"
-	conversion of int to double. Reported by Jeff Hobbs on the Tcl'ers
-	Chat.
-
-2004-04-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/lreplace.n, doc/lrange.n, doc/llength.n:	More examples for
-	* doc/linsert.n, doc/lappend.n:			the documentation.
-
-2004-04-16  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/FileSystem.3: Corrected documentation of Tcl_FSUtime, and the
-	corresponding filesystem driver Tcl_FSUtimeProc. [Bug 935838]
-
-2004-04-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/socket.n: Added example from [Patch 936245].
-	* doc/gets.n: Added example based on [Patch 935911].
-
-2004-04-15  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclClock.c (Tcl_ClockObjCmd): Minor fault in a [clock
-	clicks] error message.
-
-2004-04-07  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/tclWinInit.c (TclpSetInitialEncodings): note that WIN32_CE is
-	also a unicode platform.
-	* generic/tclEncoding.c (TclFindEncodings, Tcl_FindExecutable):
-	* generic/tclInt.h:			    Correct handling of UTF
-	* unix/tclUnixInit.c (TclpInitLibraryPath): data that is actually
-	* win/tclWinFile.c (TclpFindExecutable):    "clean", allowing the
-	* win/tclWinInit.c (TclpInitLibraryPath):   loading of Tcl from paths
-	that contain multi-byte chars on Windows [Bug 920667]
-
-	* win/configure:    define TCL_LIB_FLAG, TCL_BUILD_LIB_SPEC,
-	* win/configure.in: TCL_LIB_SPEC, TCL_PACKAGE_PATH in tclConfig.sh.
-
-2004-04-06  Don Porter	<dgp@users.sourceforge.net>
-
-	Patch 922727 committed.	 Implements three changes:
-
-	* generic/tclInt.h:	Reworked the Tcl header files into a clean
-	* unix/tclUnixPort.h:	hierarchy where tcl.h < tclPort.h < tclInt.h
-	* win/tclWinInt.h:	and every C source file should #include
-	* win/tclWinPort.h:	at most one of those files to satisfy its
-	declaration needs. tclWinInt.h and tclWinPort.h also better organized
-	so that tclWinPort.h includes the Windows implementation of
-	cross-platform declarations, while tclWinInt.h makes declarations that
-	are available on Windows only.
-
-	* generic/tclBinary.c (TCL_NO_MATH):	Deleted the generic/tclMath.h
-	* generic/tclMath.h (removed):		header file. The internal Tcl
-	* macosx/Makefile (PRIVATE_HEADERS):	header, tclInt.h, has a
-	* win/tcl.dsp:				#include <math.h> directly,
-	and file external to Tcl needing libm should do the same.
-
-	* win/Makefile.in (WIN_OBJS):	Deleted the win/tclWinMtherr.c file.
-	* win/makefile.bc (TCLOBJS):	It's a vestige from matherr() days
-	* win/makefile.vc (TCLOBJS):	gone by.
-	* win/tcl.dsp:
-	* win/tclWinMtherr.c (removed):
-
-	End Patch 922727.
-
-	* tests/unixInit.test (unixInit-3.1):	Default encoding on Darwin
-	systems is utf-8. Thanks to Steven Abner (tauvan). [Bug 928808]
-
-2004-04-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/cmdAH.test (cmdAH-18.2): Added constraint because
-	access(...,X_OK) is defined to be permitted to be meaningless when
-	running as root, and OSX exhibits this. [Bug 929892]
-
-2004-04-02  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c:
-	* generic/tclInt.h: removed the macro TCL_ALIGN() from tclInt.h,
-	replaced by the static macro ALIGN() in tclCompile.c [Bug 926445]
-
-2004-04-02  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.h: removed redundant #ifdef _TCLINT [Bug 928415],
-	reported by tauvan.
-
-2004-04-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/tcltest.test: Corrected constraint typos: "nonRoot" ->
-	"notRoot". Thanks to Steven Abner (tauvan). [Bug 928353]
-
-2004-04-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:  Removed obsolete tclBlockTime* declarations. [Bug
-	926454]
-
-2004-04-01  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: Fix to privately reported vfs bug with 'glob
-	-type d -dir . *' across a vfs boundary. No tests for this are
-	currently possible without effectively moving tclvfs into Tcl's test
-	suite.
-
-2004-03-31  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/msgcat.n:	Clarified message catalog file encodings. [Bug 811457]
-	* library/msgcat/msgcat.tcl: Updated internals to make use of [dict]s
-	to store message catalog data and to use [source -encoding utf-8] to
-	access catalog files. Thanks to Michael Sclenker. [Patch 875055, RFE
-	811459] Corrected [mcset] to be able to successfully set a translation
-	to the empty string. [mcset $loc $src {}] was incorrectly set the $loc
-	translation of $src back to $src. Also changed [ConvertLocale] to
-	minimally require a non-empty "language" part in the locale value. If
-	not, an error raised prompts [Init] to keep looking for a valid locale
-	value, or ultimately fall back on the "C" locale. [Bug 811461].
-	* library/msgcat/pkgIndex.tcl:	Bump to msgcat 1.4.1.
-
-2004-03-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclHash.c (HashStringKey): Cleaned up. This function is not
-	faster, but it is a little bit clearer.
-	* generic/tclLiteral.c (HashString): Applied logic from HashObjKey.
-	* generic/tclObj.c (HashObjKey): Rewrote to fix fault which hashed
-	every single-character object to the same hash bucket. The new code is
-	shorter, simpler, clearer, and (happily) faster.
-
-2004-03-30  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TEBC): reverting to the previous method for
-	async tests in TEBC, as the new method turned out to be too costly.
-	Async tests now run every 64 instructions.
-
-2004-03-30  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c:	    New instruction code INST_START_CMD that
-	* generic/tclCompile.h:	    allows checking the bytecode's validity
-	* generic/tclExecute.c:	    [Bug 729692] and the interp's readyness
-	* tests/interp.test (18.9): [Bug 495830] before running the command.
-	* tests/proc.test (7.1):    It also changes the mechanics of the async
-	* tests/rename.test (6.1):  tests in TEBC, doing it now at command
-	start instead of every 16 instructions.
-
-2004-03-30  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c:  Fix to Windows glob where the pattern is a
-	* generic/tclIOUtil.c:	  volume relative path or a network share [Bug
-	* tests/fileName.test:	  898238]. On windows 'glob' will now return
-	* tests/fileSystem.test:  the results of 'glob /foo/bar' and 'glob
-	\\foo\\bar' as 'C:/foo/bar', i.e. a correct absolute path (rather than
-	a volume relative path).
-
-	Note that the test suite does not test commands like
-	'glob //Machine/Shared/*' (on a network share).
-
-2004-03-30  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	  Fix to filename bugs recently
-	* tests/fileName.test:	  introduced [Bug 918320].
-
-2004-03-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclMain.c (Tcl_Main, StdinProc):	Append newline only
-	* tests/basic.test (basic-46.1):		to incomplete scripts
-	as part of multi-line script construction. Do not add an extra
-	trailing newline to the complete script. [Bug 833150]
-
-2004-03-28  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileScript): corrected possible segfault
-	when a compilation returns TCL_OUTLINE_COMPILE after having grown the
-	compile environment [Bug 925121].
-
-2004-03-27  Miguel Sofer <msofer@users.sf.net>
-
-	* doc/array.n: added documentation for trace-realted behaviour of
-	'array get' [Bug 449893]
-
-2004-03-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* README:		Bumped version number to 8.5a2 to distinguish
-	* tools/tcl.wse.in:	HEAD of CVS development from the recent 8.5a1
-	* unix/configure.in:	release.
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.57
-	* win/configure:
-
-2004-03-26  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	  Fix to Windows-only volume relative path
-	* tests/fileSystem.test:  normalization. [Bug 923568]. Also fixed
-	another volume relative bug found while testing.
-
-2004-03-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (NsEnsembleImplementationCmd): Fix messed up
-	handling of strncmp result which just happened to work in some libc
-	implementations. [Bug 922752]
-
-2004-03-23  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/StringObj.3: Inverted the sense of the documentation of how the
-	bytes parameter is documented to match behaviour. [Bug 921464]
-
-2004-03-19  Kevin B. Kenny   <kennykb@acm.org>
-
-	* compat/strtoll.c:
-	* compat/strtoull.c:
-	* generic/tclIntDecls.h:
-	* generic/tclMain.c:
-	* generic/tclObj.c:
-	* win/tclWinDde.c:
-	* win/tclWinReg.c:
-	* win/tclWinTime.c:	   Made HEAD build on Windows VC++ again.
-
-2004-03-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclIntDecls.h: Made HEAD build on Solaris again by applying
-	fix recommended by Don Porter.
-
-2004-03-18  Reinhard Max  <max@suse.de>
-
-	* generic/tclIntDecls.h: Removed TclpTime_t. It wasn't really needed,
-	* generic/tclInt.h:	 but caused warnings related to
-	* generic/tclInt.decls:	 strict aliasing with GCC 3.3.
-	* generic/tclClock.c:
-	* generic/tclDate.c:
-	* generic/tclGetDate.y:
-	* win/tclWinTime.c:
-	* unix/tclUnixTime.c:
-
-	* generic/tclNamesp.c:	 Added temporary pointer variables to work
-	* generic/tclStubLib.c:	 around warnings related to
-	* unix/tclUnixChan.c:	 strict aliasing with GCC 3.3.
-
-	* unix/tcl.m4:		 Removed -Wno-strict-aliasing.
-
-2004-03-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	Removed support for Mac OS Classic platform [Patch 918142]
-
-	* README:
-	* compat/string.h:
-	* doc/Encoding.3:
-	* doc/FileSystem.3:
-	* doc/Init.3:
-	* doc/Macintosh.3 (removed):
-	* doc/OpenFileChnl.3:
-	* doc/OpenTcp.3:
-	* doc/SourceRCFile.3:
-	* doc/Thread.3:
-	* doc/clock.n:
-	* doc/exec.n:
-	* doc/fconfigure.n:
-	* doc/file.n:
-	* doc/filename.n:
-	* doc/glob.n:
-	* doc/open.n:
-	* doc/puts.n:
-	* doc/resource.n (removed):
-	* doc/safe.n:
-	* doc/source.n:
-	* doc/tclvars.n:
-	* doc/unload.n:
-	* generic/README:
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclAlloc.c:
-	* generic/tclBasic.c:
-	* generic/tclCmdAH.c:
-	* generic/tclDate.c:
-	* generic/tclDecls.h:
-	* generic/tclFCmd.c:
-	* generic/tclFileName.c:
-	* generic/tclGetDate.y:
-	* generic/tclIOCmd.c:
-	* generic/tclIOUtil.c:
-	* generic/tclInitScript.h:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclMain.c:
-	* generic/tclMath.h:
-	* generic/tclNotify.c:
-	* generic/tclPathObj.c:
-	* generic/tclPlatDecls.h:
-	* generic/tclPort.h:
-	* generic/tclStubInit.c:
-	* generic/tclTest.c:
-	* generic/tclThreadJoin.c:
-	* library/auto.tcl:
-	* library/init.tcl:
-	* library/package.tcl:
-	* library/safe.tcl:
-	* library/tclIndex:
-	* mac/AppleScript.html (removed):
-	* mac/Background.doc (removed):
-	* mac/MW_TclAppleScriptHeader.h (removed):
-	* mac/MW_TclAppleScriptHeader.pch (removed):
-	* mac/MW_TclBuildLibHeader.h (removed):
-	* mac/MW_TclBuildLibHeader.pch (removed):
-	* mac/MW_TclHeader.h (removed):
-	* mac/MW_TclHeader.pch (removed):
-	* mac/MW_TclHeaderCommon.h (removed):
-	* mac/MW_TclStaticHeader.h (removed):
-	* mac/MW_TclStaticHeader.pch (removed):
-	* mac/MW_TclTestHeader.h (removed):
-	* mac/MW_TclTestHeader.pch (removed):
-	* mac/README (removed):
-	* mac/bugs.doc (removed):
-	* mac/libmoto.doc (removed):
-	* mac/morefiles.doc (removed):
-	* mac/porting.notes (removed):
-	* mac/tclMac.h (removed):
-	* mac/tclMacAETE.r (removed):
-	* mac/tclMacAlloc.c (removed):
-	* mac/tclMacAppInit.c (removed):
-	* mac/tclMacApplication.r (removed):
-	* mac/tclMacBOAAppInit.c (removed):
-	* mac/tclMacBOAMain.c (removed):
-	* mac/tclMacChan.c (removed):
-	* mac/tclMacCommonPch.h (removed):
-	* mac/tclMacDNR.c (removed):
-	* mac/tclMacEnv.c (removed):
-	* mac/tclMacExit.c (removed):
-	* mac/tclMacFCmd.c (removed):
-	* mac/tclMacFile.c (removed):
-	* mac/tclMacInit.c (removed):
-	* mac/tclMacInt.h (removed):
-	* mac/tclMacInterupt.c (removed):
-	* mac/tclMacLibrary.c (removed):
-	* mac/tclMacLibrary.r (removed):
-	* mac/tclMacLoad.c (removed):
-	* mac/tclMacMath.h (removed):
-	* mac/tclMacNotify.c (removed):
-	* mac/tclMacOSA.c (removed):
-	* mac/tclMacOSA.r (removed):
-	* mac/tclMacPanic.c (removed):
-	* mac/tclMacPkgConfig.c (removed):
-	* mac/tclMacPort.h (removed):
-	* mac/tclMacProjects.sea.hqx (removed):
-	* mac/tclMacResource.c (removed):
-	* mac/tclMacResource.r (removed):
-	* mac/tclMacSock.c (removed):
-	* mac/tclMacTclCode.r (removed):
-	* mac/tclMacTest.c (removed):
-	* mac/tclMacThrd.c (removed):
-	* mac/tclMacThrd.h (removed):
-	* mac/tclMacTime.c (removed):
-	* mac/tclMacUnix.c (removed):
-	* mac/tclMacUtil.c (removed):
-	* mac/tcltkMacBuildSupport.sea.hqx (removed):
-	* tests/all.tcl:
-	* tests/binary.test:
-	* tests/cmdAH.test:
-	* tests/cmdMZ.test:
-	* tests/fCmd.test:
-	* tests/fileName.test:
-	* tests/fileSystem.test:
-	* tests/interp.test:
-	* tests/io.test:
-	* tests/ioCmd.test:
-	* tests/load.test:
-	* tests/macFCmd.test (removed):
-	* tests/osa.test (removed):
-	* tests/resource.test (removed):
-	* tests/socket.test:
-	* tests/source.test:
-	* tests/unload.test:
-	* tools/cvtEOL.tcl (removed):
-	* tools/genStubs.tcl:
-	* unix/Makefile.in:
-	* unix/README:
-	* unix/mkLinks:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/tcl.dsp:
-
-2004-03-17  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/lsearch.n: Improved examples on the advanced capabilities of
-	lsearch (with the right options, set element removal can be done)
-	following discussion on tkchat.
-
-2004-03-16  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/catch.n:	Compiled [catch] no longer fails to catch syntax
-	errors. Removed the claims in the documentation that it does.
-	* doc/return.n:	Updated example to use [dict merge].
-
-2004-03-16  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/configure, unix/tcl.m4: add -Wno-strict-aliasing for GCC to
-	suppress useless type puning warnings.
-
-2004-03-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/file.n: *roff formatting fix. [Bug 917171]
-
-2004-03-15  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinNotify.c: Fixed a mistake where the return value of
-	MsgWaitForMultipleObjectsEx for "a message is in the queue" wasn't
-	accurate. I removed the check on the case result==(WAIT_OBJECT_0 + 1)
-	This was having the error of falling into GetMessage and waiting there
-	by accident, which wasn't alertable through Tcl_AlertNotifier. I'll do
-	some more study on this and try to find-out why.
-
-2004-03-12  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	IMPLEMENTATION OF TIP#163
-	* generic/tclDictObj.c (DictMergeCmd):	This is based on work by Joe
-	* tests/dict.test (dict-20.*):		English in Tcl [FRQ 745851]
-	* doc/dict.n:				but not exactly.
-
-2004-03-10  Kevin B. Kenny <kennykb@acm.org>
-
-	* generic/tclGetDate.y (TclGetDate): Fix so that [clock scan
-	<timeOfDay> -gmt true] uses the GMT base date instead of the local
-	one. [Bug 913513]
-	* tests/clock.test: Added test cases for wrong ISO8601 week number
-	[Bug 500285] and wrong GMT base date [Bug 913513]. Several tests still
-	fail on Windows, and these are actual faults in [clock scan]. Fix is
-	still pending.
-	* generic/tclDate.c: Regenerated.
-
-2004-03-08  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c:  Fix to 'glob -path' near the root
-	* tests/fileName.test:	  of the filesystem. [Bug 910525]
-
-2004-03-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParse.c (TclParseInit):	Modified TclParseInit so
-	* generic/tclTest.c ([testexprparser]): that Tcl_Parse initialization
-	conforms to documented promised about what fields will not be
-	modified by what Tcl_Parse* routines. [Bug 910595]
-
-2004-03-05  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/configure.in: Check for define of MWMO_ALERTABLE in winuser.h.
-	* win/tclWinPort.h: If MWMO_ALERTABLE is not defined in winuser.h then
-	define it. This is needed for Mingw.
-
-2004-03-05  Kevin B. Kenny <kennykb@acm.org>
-
-	* generic/tclTest.c: Modified TesteventObjCmd to use a
-	Tcl_QueuePosition in place of an 'int' for the enumerated queue
-	position, to avoid a compiler warning on SGI. [Bug 771960]
-
-2004-03-05  Kevin B. Kenny <kennykb@acm.org>
-
-	* tests/registry.test: Applied fix from [Patch 910174] to make the test
-	for an English-language system include any country code, rather than
-	just English-United States.1252. Thanks to Pat Thoyts for the changes.
-
-2004-03-04  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* tests/registry.test: Applied fixed from [Bug 766159] to skip two
-	tests on Win98 that depend on a Unicode registry (NT specific).
-
-2004-03-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h (TclParseInit):	Factored the common code
-	* generic/tclParse.c (TclParseInit):	for initializing a Tcl_Parse
-	* generic/tclParseExpr.c:		struct into one routine.
-
-2004-03-04  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* library/reg/pkgIndex.tcl:  Added TIP #100 support to the
-	* win/tclWinReg.c:	     registry package [patch 903831]
-	This provides a Windows test of the TIP #100 mechanism and a sample to
-	show how unloading an extension can be done.
-
-2004-03-04  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/dltest/pkgua.c: Fix minor syntax problems. [Bug 909288]
-
-2004-03-03  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	*** 8.5a1 TAGGED FOR RELEASE ***
-
-	* changes: updated for 8.5a1
-
-2004-03-03  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: default environment variable for VC++ is %MSDevDir%
-	not %MSVCDir%, although vcvars32.bat sets both.
-
-	* win/tclWinNotify.c (Tcl_WaitForEvent) : Allows an idling notifier to
-	service "Asynchronous Procedure Calls" from its wait state. Only
-	useful for extension authors who decide they might want to try
-	"completion routines" with WriteFileEx(), as an example. From
-	experience, I recommend that "completion ports" should be used instead
-	as the execution of the callbacks are more managable.
-
-2004-03-01  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* README:	    update patchlevel to 8.5a1
-	* generic/tcl.h:
-	* tools/tcl.wse.in, tools/tclSplash.bmp:
-	* unix/configure, unix/configure.in, unix/tcl.spec:
-	* win/README.binary, win/configure, win/configure.in:
-
-	* unix/tcl.m4: update HP-11 build libs setup
-
-2004-03-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS):	Allow 64-bit enabling on
-	IRIX64-6.5* systems. [Bug 218561]
-	* unix/configure:	autoconf-2.57
-
-	* generic/tclTrace.c (TclCheckInterpTraces):	The TIP 62
-	* generic/tclTest.c (TestcmdtraceCmd):	implementation introduced a
-	* tests/trace.test (trace-29.10):	bug by testing the CallFrame
-	level instead of the iPtr->numLevels level when deciding what traces
-	created by Tcl_Create(Obj)Trace to call. Added test to expose the
-	error, and made fix. [FRQ 462580]
-
-2004-02-28  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fileSystem.test: fix to Tcl Bug 905163.
-	* tests/fileName.test: fix to Tcl Bug 904705.
-
-	* doc/{various}.n: removed 'the the' typos.
-
-2004-02-26  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: fixed copyright year in Tcl.framework Info.plist
-
-2004-02-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/basic.test:	Made several tests more robust to the
-	* tests/cmdMZ.test:	list-quoting of path names that might contain
-	* tests/exec.test:	Tcl-special chars like { or [. Should help us
-	* tests/io.test:	sort out [Bug 554068]
-	* tests/pid.test:
-	* tests/socket.test:
-	* tests/source.test:
-	* tests/unixInit.test:
-
-2004-02-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclLoad.c (Tcl_LoadObjCmd): Missing dereference caused
-	segfault with non-loadable extension. [Bug 904307]
-
-	* unix/tclUnixChan.c (TcpGetOptionProc): Stop memory leak with very
-	long hostnames. [Bug 888777]
-
-2004-02-25  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/tclWinDde.c: Removed some gcc warnings - except for the
-	-Wconversion warning for GetGlobalAtomName. gcc is just wrong about
-	this.
-
-2004-02-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	IMPLEMENTATION OF TIP#100 FROM GEORGIOS PETASIS
-	* generic/tclLoad.c (Tcl_UnloadObjCmd): Implementation.
-	* tests/unload.test:			Test suite.
-	* unix/dltest/pkgua.c:			Helper for test suite.
-	* doc/unload.n:				Documentation.
-	Also assorted changes (mostly small) to several other files.
-
-2004-02-23  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/regc_locale.c (cclass): Buffer was having its size reset
-	instead of being released => memleak. [Bug 902562]
-
-2004-02-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclLoad.c (Tcl_LoadObjCmd): Fixed memory leak due to an
-	improper error exit route.
-
-2004-02-20  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinSock.c (SocketThreadExitHandler): Don't call
-	TerminateThread when WaitForSingleObject returns a timeout.
-	Tcl_Finalize called from DllMain will pause all threads. Trust that
-	the thread will get the close notice at a later time if it does ever
-	wake up before being cleaned up by the system anyway.
-
-2004-02-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:
-	* library/tcltest/tcltest.tcl:	Changed -verbose default value to
-	{body error} so that detailed information on unexpected errors in
-	tests is provided by default, even after the fix for [Bug 725253]
-
-2004-02-17  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* tests/unixInit.test (unixInit-7.1):
-	* unix/tclUnixInit.c (TclpInitPlatform): ensure the std fds exist to
-	prevent crash condition [Bug 772288]
-
-2004-02-17  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Bozo mistake in memory
-	releasing order when in an error case. [Bug 898910]
-
-2004-02-16  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclTrace.c (TclTraceExecutionObjCmd)
-	(TclTraceCommandObjCmd): fix possible mem leak in trace info.
-
-2004-02-12  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWinInit.c (AppendEnvironment): Use the tail component of the
-	passed in lib path instead of just blindly using lib+4. That worked
-	when lib was "lib/..." but fails for other values. Thanks go to
-	Patrick Samson for pointing this out.
-
-2004-02-10  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/nmakehlp.c: better macro grepping logic.
-
-2004-02-07  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/makefile.vc:
-	* win/rules.vc:
-	* win/tcl.rc:
-	* win/tclsh.rc: Added an 'unchecked' option to the OPTS macro so a
-	core built with symbols can be linked to the non-debug enabled C
-	run-time. As per discussion with Kevin Kenny. Called like this:
-
-		nmake -af makefile.vc OPTS=unchecked,symbols
-
-	This clarifies the meaning of the 'g' naming suffix to mean only that
-	the binary requires the debug enabled C run-time. Whether the binary
-	contains symbols or not is a different condition.
-
-2004-02-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/clock.n:	Removed reference to non-existent [file ctime].
-
-2004-02-05  David Gravereaux  <davygrvy@pobox.com>
-
-	* docs/tclvars.n: Added clarification of the tcl_platform(debug) var
-	that it only refers to the flavor of the C run-time, and not whether
-	the core contains symbols.
-
-2004-02-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclFileName.c (SkipToChar): Corrected CONST and type-casting
-	issues that caused compiler warnings.
-
-2004-02-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdAH.c (StoreStatData): Removed improper refcount
-	decrement of the varName parameter. This error was causing segfaults
-	following test cmdAH-28.7.
-
-	* library/tcltest/tcltest.tcl: Corrected references to non-existent
-	$name variable in [cleanupTests]. [Bug 833637]
-
-2004-02-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Corrected parsing of single command
-	line argument (option with missing value) [Bug 833910]
-	* library/tcltest/pkgIndex.tcl:	Bump to version 2.2.5.
-
-2004-02-02  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tclIO.c (Tcl_Ungets): Fixes improper filling of the channel
-	buffer. This is the buffer before the splice. [Bug 405995]
-
-2004-02-01  David Gravereaux <davygrvy@pobox.com>
-
-	* tests/winPipe.test: more pass-thru commandline verifications.
-	* win/tclWinPipe.c (BuildCommandLine): Special case quoting for '{'
-	not required by the c-runtimes's parse_cmdline().
-	* win/tclAppInit.c: Removed our custom setargv() in favor of the work
-	provided by the c-runtime. [Bug 672938]
-
-	* win/nmakehlp.c: defensive techniques to avoid static buffer
-	overflows and a couple envars upsetting invocations of cl.exe and
-	link.exe. [Bug 885537]
-
-	* tests/winPipe.test: Added proof that BuildCommandLine() is not doing
-	the "N backslashes followed a quote -> insert N * 2 + 1 backslashes
-	then a quote" rule needed for the crt's parse_cmdline().
-	* win/tclWinPipe.c: Fixed BuildCommandLine() to pass the new cases.
-
-2004-01-30  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: Use the -GZ compiler switch when building for
-	symbols. This is supposed to emulate the release build better to avoid
-	hiding problems that only show themselves in a release build.
-
-2004-01-29  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: fix to [Bug 883143] in file normalization
-
-2004-01-29  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/file.n:
-	* generic/tclFCmd.c
-	* generic/tclTest.c
-	* library/init.tcl
-	* mac/tclMacFile.c
-	* tests/fileSystem.test: fix to [Bug 886352] where 'file copy -force'
-	had inconsistent behaviour wrt target files with insufficient
-	permissions, particular from vfs->native fs. Behaviour of '-force' is
-	now always consistent (and now consistent with behaviour of 'file
-	delete -force'). Added new tests and documentation and cleaned up the
-	'simplefs' test filesystem.
-
-	* generic/tclIOUtil.c
-	* unix/tclUnixFCmd.c
-	* unix/tclUnixFile.c
-	* win/tclWinFile.c: made native filesystems more robust to C code
-	which asks for mount lists.
-
-	* generic/tclPathObj.c: fix to [Bug 886607] removing warning/error
-	with some compilers.
-
-2004-01-28  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclObj.c (SetBooleanFromAny): Rewrite to do more efficient
-	string->bool conversion.
-	Many other minor whitespace/style fixes to this file too.
-
-2004-01-27  David Gravereaux <davygrvy@pobox.com>
-
-	* win/nmakehlp.c: Use '.\nul' as the sourcefile name instead of 'nul'
-	so VC 5.2 doesn't try searching the path for it and failing with a
-	possible dialogbox popping up about having to add a CD to an empty
-	drive. Also added a SetErrorMode() call to disable any dialogs that
-	cl.exe or link.exe might create. [Bug 885537]
-
-2004-01-22  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/file.n: clarified documentation of 'file system' [Bug 883825]
-	* tests/fCmd.test: improved test result in failure case.
-
-2004-01-22  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* tests/fileSystem.test: 3 new tests
-	* generic/tclPathObj.c: fix to [Bug 879555] in file normalization.
-	* doc/filename.n: small clarification to Windows behaviour with
-	filenames like '.....', 'a.....', '.....a'.
-
-	* generic/tclIOUtil.c: slight improvement to native cwd caching on
-	Windows.
-
-2004-01-21  David Gravereaux <davygrvy@pobox.com>
-
-	* doc/Panic.3:	Mentions of 'panic' and 'panicVA' removed from the
-	documentation.
-
-2004-01-21  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* doc/FileSystem.3:
-	* generic/tcl.decls:
-	* generic/tclCmdAH.c
-	* generic/tclDecls.h
-	* generic/tclFCmd.c
-	* generic/tclFileName.c
-	* generic/tclFileSystem.h
-	* generic/tclIOUtil.c
-	* generic/tclInt.decls
-	* generic/tclInt.h
-	* generic/tclIntDecls.h
-	* generic/tclPathObj.c
-	* generic/tclStubInit.c
-	* generic/tclTest.c
-	* mac/tclMacFile.c
-	* tests/fileName.test
-	* tests/fileSystem.test
-	* tests/winFCmd.test
-	* unix/tclUnixFile.c
-	* win/tclWin32Dll.c
-	* win/tclWinFCmd.c
-	* win/tclWinFile.c
-	* win/tclWinInt.h
-
-	Three main issues accomplished: (1) cleaned up variable names in the
-	filesystem code so that 'pathPtr' is used throughout. (2) applied a
-	round of filesystem optimisation with better handling and caching of
-	relative and absolute paths, requiring fewer conversions. (3)
-	clarifications to the documentation, particularly regarding the
-	acceptable refCounts of objects. Some new tests added. Tcl benchmarks
-	show a significant improvement over 8.4.5, and on Windows typically a
-	small improvement over 8.3.5 (Unix still appears to require
-	optimisation). TCL_FILESYSTEM_VERSION_2 introduced, but for internal
-	use only. There should be no public incompatibilities from these
-	changes. Thanks to dgp for extensive testing.
-
-2004-01-19  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinPipe.c (Tcl_WaitPid): Fixed a thread-safety problem with
-	the process list. The delayed cut operation after the wait was going
-	stale by being outside the list lock. It now cuts within the lock and
-	does a locked splice for when it needs to instead. [Bug 859820]
-
-2004-01-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompile.c, generic/tclCompile.h: Two new opcodes,
-	INST_LIST_INDEX_IMM and INST_LIST_RANGE_IMM, that have operand(s) of
-	new type OPERAND_IDX4 which represents indexes into things like lists
-	(and perhaps other things eventually.)
-	* generic/tclExecute.c (TclExecuteByteCode): Implementation of the new
-	opcodes. INST_LIST_INDEX_IMM does a simple [lindex] with either front-
-	or end-based simple indexing. INST_LIST_RANGE_IMM does an [lrange]
-	with front- or end-based simple indexing for both the reference to the
-	first and last items in the range.
-	* generic/tclCompCmds.c (TclCompileLassignCmd): Generate bytecode for
-	the [lassign] command.
-
-2004-01-17  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinInit.c: added #pragma comment(lib, "advapi32.lib") when
-	compiling under VC++ so we don't need to specify it when linking.
-
-2004-01-17  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LassignObjCmd): Add more shimmering
-	protection for when the list is also one of the variables.
-
-	BASIC IMPLEMENTATION OF TIP#57
-	* generic/tclCmdIL.c (Tcl_LassignObjCmd): Implementation of the
-	[lassign] command that takes full advantage of Tcl's object API.
-	* doc/lassign.n: New file documenting the command.
-	* tests/cmdIL.test (cmdIL-6.*): Test suite for the command.
-
-2004-01-15  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinReg.c: Placed the requirement for advapi.lib into the
-	object file itself with #pragma comment (lib, ...) when built with
-	VC++. This will simplify linking for users of the static library.
-
-	* win/rules.vc: Added new 'fullwarn' to the CHECKS commandline macro;
-	sets $(FULLWARNINGS).
-
-	* win/makefile.vc: Removed 'advapi.lib' from $(baselibs). Added new
-	logic to crank-up the warning levels for both compile and link when
-	$(FULLWARNINGS) is set. Some clean-up with how the resource files are
-	built and how -DTCL_USE_STATIC_PACKAGES is sent when compiling the
-	shells.
-
-	* win/tclAppInit.c: Small change in how TCL_USE_STATIC_PACKAGES is
-	used.
-
-	* win/tcl.rc:
-	* win/tclsh.rc: Some clean-up with how the resource files are built.
-	Fixed 'OriginalFilename' problem that still thought a debug suffix was
-	still 'd', now is 'g'.
-
-2004-01-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclDictObj.c (TraceDictPath, DictExistsCmd): Adjusted
-	behaviour of [dict exists] so a failure to look up a dictionary along
-	the path of dicts doesn't trigger an error. This is how it was
-	documented to behave previously... [Bug 871387]
-
-	* generic/tclDictObj.c: Assorted dict fixes from Peter Spjuth relating
-	to [Bug 876170].
-	(SetDictFromAny): Make sure that lists retain their ordering even when
-	converted to dictionaries and back.
-	(TraceDictPath): Correct object reference count handling!
-	(DictReplaceCmd, DictRemoveCmd): Stop object leak.
-	(DictIncrCmd,DictLappendCmd,DictAppendCmd,DictSetCmd,DictUnsetCmd):
-	Simpler handling of reference counts when assigning to variables.
-	* tests/dict.test (dict-19.2): Memory leak stress test
-
-2004-01-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd):  Silence compiler warnings.
-
-	Patch 876451: restores performance of [return]. Also allows forms such
-	as [return -code error $msg] to be bytecompiled.
-
-	* generic/tclInt.h:	Factored Tcl_ReturnObjCmd() into two pieces:
-	* generic/tclCmdMZ.c:	TclMergeReturnOptions(), which can parse the
-	options to [return], check their validity, and create the
-	corresponding return options dictionary, and TclProcessReturn(), which
-	takes that return options dictionary and performs the [return]
-	operation.
-
-	* generic/tclCompCmds.c: Rewrote TclCompileReturnCmd() to call
-	TclMergeReturnOptions() at compile time so the return options
-	dictionary is computed at compile time (when it is fully known). The
-	dictionary is pushed on the stack along with the result, and the code
-	and level values are included in the bytecode as operands. Also
-	supports optimized compilation of un[catch]ed [return]s from procs
-	with default options into the INST_DONE instruction.
-
-	* generic/tclExecute.c: Rewrote INST_RETURN instruction to retrieve
-	the code and level operands, pop the return options from the stack,
-	and call TclProcessReturn() to perform the [return] operation.
-
-	* generic/tclCompile.h:	New utilities include TclEmitInt4 macro
-	* generic/tclCompile.c:	and TclWordKnownAtCompileTime().
-
-	End Patch 876451.
-
-	* generic/tclFileName.c (Tcl_GlobObjCmd): Latest changes to management
-	of the interp result by Tcl_GetIndexFromObj() exposed improper interp
-	result management in the [glob] command procedure. Corrected by
-	adopting the Tcl_SetObjResult(Tcl_NewStringObj) pattern. This stopped
-	a segfault in test filename-11.36. [Bug 877677]
-
-2004-01-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct, Tcl_WrongNumArgs):
-	Create fresh objects instead of using the one currently in the
-	interpreter, which isn't guaranteed to be fresh and unshared. The cost
-	for the core will be minimal because of the object cache, and this
-	fixes [Bug 875395].
-
-2004-01-12  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompExpr.c (CompileLandOrLorExpr): cosmetic changes.
-
-2004-01-12  Miguel Sofer <msofer@users.sf.net>
-
-	* generic/tclCompExpr.c (CompileLandOrLorExpr): new logic, fewer
-	instructions. As a side effect, the instructions INST_LOR and
-	INST_LAND are now never used.
-	* generic/tclExecute.c (INST_JUMP*): small optimisation; fix a bug in
-	debug code.
-
-2004-01-11  David Gravereaux <davygrvy@pobox.com>
-
-	* win/tclWinThrd.c (Tcl_ConditionNotify): condPtr must be dereferenced
-	to see if there are waiters else uninitialized datum is manipulated.
-	[Bug 849007 789338 745068]
-
-2004-01-09  David Gravereaux <davygrvy@pobox.com>
-
-	* generic/tcl.h: Renamed and deprecated #defines moved to within the
-	#ifndef TCL_NO_DEPRECATED block. This allows us to build Tcl to check
-	for deprecated functions in use, such as panic() and Tcl_Ckalloc(). By
-	request from DKF. Extensions that build with -DTCL_NO_DEPRECATED now
-	have these macros as restricted.
-	***POTENTIAL INCOMPATIBILITY***
-
-	* win/makefile.vc:
-	* win/rules.vc:	 Added -DTCL_NO_DEPRECATED usage to makefile.vc.
-	Called like this:   nmake -af makefile.vc CHECKS=nodep
-
-2004-01-09  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to infinite loop in TclFinalizeFilesystem
-	[Bug 873311]
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2003 IN "ChangeLog.2003"	       ***
-	*** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"	       ***
-	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"	       ***
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"	       ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/ChangeLog.2005 b/ChangeLog.2005
deleted file mode 100644
index f2d1b65..0000000
--- a/ChangeLog.2005
+++ /dev/null
@@ -1,3822 +0,0 @@
-2005-12-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStubLib.c: Corrected a typo in "missing Stubs table
-	pointer."
-
-2005-12-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tcl.decls:  Destubbed TclTomMathInitializeStubs - it is in
-	* generic/tcl.h:      the stub library, not the main shared
-	* generic/tclBasic.c: library. Exported Tcl_InitBignumFromDouble.
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclStrToD.c:
-
-	* generic/tclDecls.h:
-	* generic/tclStubLib.c:
-	* generic/tclStubInit.c: Regenerated.
-
-	* generic/clock.tcl: Reverted to using the time zone abbreviation and
-	not its name to "stop the bleeding" on [Bug 1386377]. This is *not* a
-	good long-term solution, but there may not be one.
-
-	* libtommath/bn_mp_sqrt.c: Improved the initial approximation to the
-	square root, roughly doubling the speed of the routine. (This is a
-	local change that needs to be communicated to Tom.)
-
-	* win/Makefile.in: Corrected a bug where tommath_class.h and
-	tommath_superclass.h were not installed, making it impossible for
-	client code to compile against the tommath stubs.
-
-	* library/tzdata: Updated to Olson's tzdata2005r. (Latest changes to
-	Daylight Saving Time in Canada, plus redefinition of the Posix-style
-	zones [e.g., EST5EDT] to be locale-independent.)
-
-	* libtommath: Updated to Tom St.Denis's release 0.37.
-
-2005-12-20  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclThreadAlloc.c (Tcl_GetMemoryInfo): Format values as longs
-	and not ints, so they are less likely to wrap on 64-bit machines.
-
-2005-12-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	Modified [string is double] to use
-	* tests/string.test:	TclParseNumber() to parse trailing whitespace.
-	Ensures consistency, and makes it easier to cleanup after invalid
-	internal reps left behind by parsing [Bugs 1360532 1382287].
-
-	* generic/tclParseExpr.c:	Added TCL_PARSE_NO_WHITESPACE to
-	* generic/tclScan.c:	TclParseNumber() calls since [scan] and [expr]
-	* tests/scan.test:	parsing don't want spaces in parsed numbers.
-
-	* generic/tclInt.h:	Added TCL_PARSE_NO_WHITESPACE flag to the
-	* generic/tclStrToD.c:	TclParseNumber() interface.
-
-2005-12-19  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/Tcl.n: Clarify what is going on in variable substitution
-	following thread on comp.lang.tcl.
-
-2005-12-18  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileDictCmd): Ensure that we only do an
-	'endCatch' when there's a preceding 'beginCatch'. [Bug 1382528] Many
-	thanks to Anton Kovalenko for finding this and pointing out that it was
-	a catch stack handling problem!
-
-2005-12-14  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclIOUtil.c: workaround gcc warning "comparison is always
-	* generic/tclTest.c:   false due to limited range of data type".
-
-	* macosx/Tcl.xcode/project.pbxproj:
-	* macosx/Tcl.xcodeproj/project.pbxproj:
-	* unix/Makefile.in: add new tclTomMath* files.
-
-	* generic/tclBasic.c: replace panic with Tcl_Panic.
-
-2005-12-13  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tcl.decls:    Added changes to export an additional stubs
-	* generic/tclBasic.c:   table to represent the 'libtommath' routines
-	* generic/tclDecls.h:   that Tcl uses and export them to callers.
-	* generic/tclInt.decls: Reran 'genstubs'
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclStubLib.c:
-	* generic/tclTomMath.decls:
-	* generic/tclTomMath.h:
-	* generic/tclTomMathDecls.h:
-	* generic/tclTomMathInterface.c:
-	* generic/tommath.h:
-	* tools/fix_tommath_h.tcl:
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc:
-
-	* generic/tclClock.c:   Made changes to silence a number of compiler
-	* generic/tclIO.c:	warnings when building with mingw.
-	* generic/tclIORChan.c:
-	* generic/tclLink.c:
-	* generic/tclListObj.c:
-	* generic/tclObj.c:
-	* generic/tclParseExpr.c:
-	* generic/tclProc.c:
-	* generic/tclTimer.c:
-	* win/tclWinChan.c:
-	* win/tclWinConsole.c:
-	* win/tclWinDde.c:
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c:
-	* win/tclWinReg.c:
-	* win/tclWinSock.c:
-
-2005-12-13  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclExecute.c (TEBC:DICT_FIRST,DICT_DONE): Only decrease the
-	references to the dictionary once the iteration completes. Do this by
-	storing the dict in the iterator context variable. [Bug 1379349] Thanks
-	to Ulrich Ring and Tobias Hippler for finding this.
-
-2005-12-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tcl.m4, unix/configure: Fix sh quoting error reported in
-	bash-3.1+ [Bug 1377619] (schafer)
-
-2005-12-12  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/mathfunc.n: Changed two examples from the incorrect 'tcl::math::'
-	to 'tcl::mathfunc::' [Bug 1378818]
-
-2005-12-09  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Define MACHINE for gcc builds. The
-	lack of a definition of this variable in the manifest file was causing
-	a runtime error in wish built with gcc.
-
-2005-12-09  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tests/lsearch.test (lsearch-10.8..10):  If the -start is off the end,
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): searching should find nothing
-	at all. [Bug 1374778]
-
-2005-12-08  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/Makefile.in, win/makefile.vc: Add Win x64 and CE build support
-	* win/tcl.m4, win/configure:        CE still requires C code fixes.
-
-	* generic/tcl.h: use struct __stat64 (not _stat64) for MSC_VER >= 1400
-	(i.e. latest Platform SDK).
-
-2005-12-07  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/socket.n: Cross-referenced the socket documentation better to the
-	fconfigure documentation on the topic of asynch sockets.
-	* doc/fconfigure.n: Added keyword to documentation of -blocking option
-	so that people looking for "asynch" can find it as well.
-
-2005-12-05  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixPort.h (Darwin): fix incorrect __DARWIN_UNIX03 configure
-	overrides that were originally copied from Darwin CVS (rdar://3693001)
-
-2005-12-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tools/tclZIC.tcl: Updated to reflect changes in calling sequence when
-	GetJulianDateFromEraYearMonthDay moved to C.
-	* library/tzdata: Regenerated from Olson's tzdata2005p.tar.gz - the
-	'systemv' changes appear not to affect Tcl's processing of the dates.
-
-2005-12-05  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/configure.in: move check for fts API to configure.in and run it
-	* unix/tcl.m4:       on all platforms, since Linux glibc2 and *BSDs
-	also have this; using fts is more efficient than a recursive
-	opendir/readdir.
-	* unix/tclUnixFCmd.c (TraverseUnixTree): add support to fts code for
-	platforms with stat64.
-	* unix/configure:
-	* unix/tclConfig.h.in: regen.
-
-2005-12-05  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/configure:     Use fts file API on Darwin if available.
-	* unix/tcl.m4:        Addresses file delete issues in readdir noted
-	* unix/tclUnixFCmd.c: in [Bug 1034337]. (steffen)
-	Remove redundant stat call for each file in DoCopyFile. (steffen)
-
-2005-12-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c: Moved a tiny bit more of [clock format] from run
-	* library/clock.tcl: time to compile time, and fixed a l10n bug in the
-	process. [Bug 1371446]. Also, conditoned the call to SetupTimeZone to
-	speed the common case where TZData($timezone) already exists, and
-	achieved a puny speedup by making ::tcl::clock::getenv not throw
-	errors.
-	* unix/Makefile.in: Made some changes to support a 'make' command that
-	is present on some antiquated versions of Solaris.
-
-2005-12-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl: Continued rationalizing the code, eliminating
-	numerous redundant [mc] calls. Added another time boost by precompiling
-	a [::format] command to do the bulk of the work of [clock format].
-
-2005-12-01  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/Makefile.in: Add remaining dependency info. While automated
-	maintenance of this information would be good, having it at all is much
-	better than a poke in the eye with a sharp stick...
-
-2005-12-01  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclClock.c: fix warning.
-
-	* unix/tcl.m4 (Darwin): fix error when MACOSX_DEPLOYMENT_TARGET unset
-	* unix/configure: regen.
-
-2005-11-30  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/Makefile.in: Add dependency information relating to tclCompile.h
-	since when the list of opcodes changes it is usually useful to rebuild
-	everything that depends on it (but which is nonetheless a small
-	fraction of the total set of Tcl source files).
-
-	***POTENTIAL INCOMPATIBILITY*** for bytecode savers/loaders. See below
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Arrange for very simple
-	[switch] invocations to be compiled into hash lookups into jump tables;
-	only a very specific kind of [switch] can be safely compiled this way,
-	but that happens to be the most common kind. This makes around 5-10%
-	difference to the speed of execution of clock.test.
-	* generic/tclExecute.c (TEBC:INST_JUMP_TABLE): New instruction to allow
-	for jumps to locations looked up in a hashtable. Requires a new AuxData
-	type, tclJumptableInfoType (supported by the functions DupJumptableInfo
-	and FreeJumptableInfo in tclCompCmds.c) so anything that saves bytecode
-	containing this *must* be updated!
-
-2005-11-30  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c: Fixed a bad refcount in previous commit that led
-	to a corrupted heap. Also silenced a warning that some compilers gave
-	about the excessively long constant for JULIAN_SEC_POSIX_EPOCH. Also
-	fixed a bug where [clock format] would fail in the :localtime zone for
-	times before the Posix Epoch. Thanks to Miguel Sofer for pointing out
-	all of these. Also rationalized the code a little bit by moving parts
-	of [clock scan] into C, eliminating some code that was duplicated in
-	the C and Tcl layers.
-
-2005-11-29  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclBasic.c:	Moved a big part of [clock format] down
-	* generic/tclClock.c:   to the C level in order to make it go faster.
-	* generic/tclInt.h:     Preliminary measurements suggest that it
-	* generic/clock.tcl:    more than doubles in speed with this change.
-
-2005-11-29  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): Allow [lsearch -regexp] to
-	process REs that contain backreferences. This expensive mode of
-	operation is only used if the RE would otherwise cause a compilation
-	failure. [Bug 1366683]
-
-2005-11-28  Kevin Kenny  <kennykb@acm.org>
-
-	* tools/tclZIC.tcl (convertTimeOfDay): Corrected a typo that caused
-	wrong DST transitions in any time zone where the transition is
-	specified as local Standard Time (as opposed to wall-clock or UTC).
-	(Also updated the code to be bignum-safe.)
-	* tests/clock.test (clock-51.1): Added regression test for the above.
-	* library/tzdata: Updated to Olson's 'tzdata2005o' (changes for Cuba,
-	Nicaragua, Jordan, and Georgia) and regenerated. Thanks to Paul
-	Mackerras for reporting this problem.
-
-2005-11-27  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4 (Darwin): add 64bit support, check for Tiger copyfile(),
-	add CFLAGS to SHLIB_LD to support passing -isysroot in env(CFLAGS) to
-	configure (flag can't be present twice, so can't be in both CFLAGS and
-	LDFLAGS during configure), don't use -prebind when deploying on 10.4,
-	define TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING (rdar://3171542).
-	(SC_ENABLE_LANGINFO, SC_TIME_HANDLER): add/fix caching, fix obsolete
-	autoconf macros. Sync with tk/unix/tcl.m4.
-
-	* unix/configure.in: fix obsolete autoconf macros, sync gratuitous
-	formatting/ordering differences with tk/unix/configure.in.
-
-	* unix/Makefile.in: add CFLAGS to tclsh/tcltest link to make executable
-	linking the same as during configure (needed to avoid losing any linker
-	relevant flags in CFLAGS, in particular flags that cannot be in
-	LDFLAGS). Avoid concurrent linking of tclsh and compiling of
-	tclTestInit.o or xtTestInit.o during parallel make.
-	(checkstubs, checkdoc, checkexports): dependency and Darwin fixes
-	(dist): add new macosx files.
-
-	* unix/tclLoadDyld.c (TclpDlopen): use NSADDIMAGE_OPTION_WITH_SEARCHING
-	on second NSAddImage only. [Bug 1204237]
-	(TclGuessPackageName): should not be MODULE_SCOPE.
-	(TclpLoadMemory): ppc64 and endian (i386) fixes, add support for
-	loading universal (fat) bundles from memory.
-
-	* unix/tclUnixFCmd.c:
-	* macosx/tclMacOSXFCmd.c: ppc64 and endian (i386) fixes.
-	(TclMacOSXCopyFileAttributes): add support for new Tiger copyfile() API
-	to enable copying of xattrs & ACLs by [file copy].
-
-	* generic/tcl.h: add Darwin specifc configure overrides for TCL_WIDE
-	defines to support fat compiles of ppc and ppc64 at the same time,
-	(replaces Darwin CVS fix by emoy, rdar://3693001). add/correct location
-	of version numbers in macosx files.
-
-	* generic/tclInt.h: clarify fat compile comment.
-
-	* unix/tclUnixPort.h: add Darwin specifc configure overrides to support
-	fat compiles, where configure runs only once for multiple architectures
-	(replaces Darwin CVS fix by emoy, rdar://3693001).
-
-	* macosx/tclMacOSXBundle.c:
-	* macosx/tclMacOSXNotify.c:
-	* unix/tclUnixNotfy.c:
-	* unix/tclUnixPort.h: fix #include order to support compile time
-	override of HAVE_COREFOUNDATION in tclUnixPort.h when building for
-	ppc64
-
-	* macosx/Tcl.pbproj/default.pbxuser (new file):
-	* macosx/Tcl.pbproj/jingham.pbxuser:
-	* macosx/Tcl.pbproj/project.pbxproj:
-	* macosx/Tcl.xcode/default.pbxuser (new file):
-	* macosx/Tcl.xcode/project.pbxproj (new file):
-	* macosx/Tcl.xcodeproj/default.pbxuser (new file):
-	* macosx/Tcl.xcodeproj/project.pbxproj (new file): new/updated
-	projects for Xcode 2.2 on 10.4, Xcode 1.5 on 10.3 & ProjectBuilder on
-	10.2, with native tcltest targets and support for universal (fat)
-	compiles.
-
-	* macosx/README: clarification/cleanup, document new Xcode projects and
-	universal (fat) builds via CFLAGS (i.e. all of ppc ppc64 i386 at once).
-
-	* unix/Makefile.in:
-	* unix/aclocal.m4:
-	* unix/configure.in:
-	* unix/dltest/Makefile.in:
-	* macosx/configure.ac (new file): add support for inclusion of
-	unix/configure.in by macosx/configure.ac, allows generation of a config
-	headers enabled configure script in macosx (required by Xcode
-	projects).
-
-	* macosx/GNUmakefile: rename from Makefile to avoid overwriting by
-	configure run in tcl/macosx, add support for reusing configure cache,
-	build target fixes, remove GENERIC_FLAGS override now handled by
-	tcl.m4.
-
-	* generic/tcl.decls: add Tcl_Main declaration as comment to avoid
-	'checkstubs' target complaining about it missing from stubs.
-
-	* generic/regex.h:
-	* generic/tclDate.c:
-	* generic/tclEnv.c:
-	* generic/tclGetDate.y:
-	* generic/tclIOUtil.c:
-	* generic/tclObj.c:
-	* generic/tclStubInit.c:
-	* generic/tclStubLib.c:
-	* generic/tclPathObj.c:
-	* generic/tclThreadAlloc.c:
-	* generic/tclThreadStorage.c:
-	* generic/tclTrace.c:
-	* generic/tclVar.c:
-	* generic/tommath.h:
-	* tools/fix_tommath_h.tcl:
-	* unix/tclUnixFCmd.c: ensure externally visible symbols not contained
-	in stubs table are declared as MODULE_SCOPE (or as static if not used
-	outside of own source file). These changes allow 'make checkstubs' to
-	complete without error on Darwin with gcc 4.
-
-	* generic/rege_dfa.c (getvacant):
-	* generic/regexec.c (cfind):
-	* generic/tclCompExpr.c (CompileSubExpr):
-	* generic/tclNamesp.c (NamespaceEnsembleCmd):
-	* unix/tclUnixChan.c (TclUnixWaitForFile): initialise variables to
-	silence gcc 4 warnings.
-
-	* generic/tclExecute.c (TclExecuteByteCode): fix unused variable
-	warning when NO_WIDE_TYPE is defined.
-
-	* generic/regguts.h: only #define NDEBUG if not already #defined.
-
-	* unix/tclUnixNotfy.c:
-	* macosx/tclMacOSXNotify.c: sync whitespace & comments.
-
-	* unix/tclUnixPort.h:
-	* win/tclWinPort.h: remove declaration of obsolete&unused TclpMutex
-	API.
-
-	* unix/configure:
-	* unix/tclConfig.h.in: regen.
-
-2005-11-21  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/Makefile.in (install-libraries): Updated Makefile to new
-	* win/Makefile.in (install-libraries):  version of the http package.
-	This fixes the ifneeded/provide mismatch reported when trying to
-	require http. Should we maybe try to automatically extract the version
-	number from the http code to prevent future breakage ?
-
-	This follows the update of the version number by dgp on Nov 15 (No
-	entry found in the ChangeLog).
-
-2005-11-20  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tclStubLib.c: Don't set tclStubsPtr to 0 when
-	Tcl_PkgRequireEx() fails [Fix for [Bug 1091431] "Tcl_InitStubs failure
-	crashes wish"]
-
-2005-11-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/trace.test (trace-34.5): [Bug 1047286], added a second test
-	illustrating the role of "ns in callStack" in the ns's visibility
-	during deletion traces.
-
-2005-11-18  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/clock.n: Restored several missing lines near the %w format group
-	so that %w and %W are documented with their actual behaviour. [Bug
-	1359183]
-
-2005-11-18  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclIO.c (TclFinalizeIOSubsystem): preserve statePtr until we
-	retrieve the next statePtr from it.
-
-2005-11-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclObj.c (GetBignumFromObj): replace NULL with
-	tclEmptyStringRep to stop memcpy from complaining in a debug build
-	(the corresponding branch is eliminated by the optimiser otherwise).
-
-2005-11-18  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (TclFinalizeIOSubsystem): Applied Pat Thoyts' patch
-	for [Bug 1359094]. This moves the retrieval of the next channel state
-	to the end of the loop, as the called closeproc may close other
-	channels, i.e. modify the list we are iterating, invalidating any
-	pointer retrieved earlier.
-
-2005-11-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclListObj.c:	Restored the SetListFromAny routine to the
-	* generic/tclObj.c:	"list" Tcl_ObjType, and restored the
-	Tcl_RegisterObjType() call for "list". This addresses the needs of some
-	"bridge" extensions to examine whether the Tcl_ObjType of a Tcl_Obj is
-	that of the "list" Tcl_ObjType.
-
-2005-11-18  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* library/http/http.tcl (http::geturl): Improved syntactic validation
-	of URLs, and better error messages in some cases. [Bug 1358369]
-
-2005-11-17  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/namespace.test: fix comment
-
-2005-11-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStrToD.c:	More data in the "can't happen" Tcl_Panic to
-	aid debugging.
-
-	* generic/tclBasic.c (CallCommandTraces): Save/restore the interp
-	result during traces to fix [Bug 1355342].
-
-2005-11-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* tests/namespace.test: fix for [Bug 1354540] and [Bug 1355942]. The
-	new tests 7.3-6 and the modified 51.13 fail due to the unrelated [Bug
-	1355342]
-
-	* tests/trace.test: added tests 20.13-16 for [Bug 1355342]
-
-2005-11-12  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_DeleteCommandFromToken):
-	* generic/tclObj.c (Tcl_GetCommandFromObj): more partial fixes for
-	[Bug 1354540] - making sure that cached references to a command being
-	deleted cannot be made reusable by a delete trace.
-
-2005-11-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNamesp.c (Tcl_FindCommand): Do not find commands in dead
-	namespaces on the path. Partial fix for [Bug 1354540].
-
-2005-11-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	Revised TclParseNumber interface to enable
-	* generic/tclScan.c:	revision to the [scan] command implementation
-	* generic/tclStrToD.c:	to permit tests scan-4.44,55 to pass again.
-	[Bug 1348067].
-
-2005-11-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_DeleteCommandFromToken):
-	* generic/tclObj.c (Tcl_GetCommandFromObj): bump the cmd epoch early
-	to insure that cached references to this command are invalidated.
-	Partial fix for [Bug 1352734] - at least insures that namespace-51.13
-	does not cause a panic. The test is still marked as knownbug, pending
-	resolution of what is actually the correct return value ([Bug
-	1354540])
-
-2005-11-09  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclTimer.c: Changed [after] so that it behaves correctly
-	* tests/timer.test:   with negative arguments [Bug 1350293] and
-	arguments that overflow a 32-bit word. [Bug 1350291]
-
-2005-11-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/compile.test:	Updated tests with changed behavior
-	* tests/execute.test:	due to addition of bignums.
-	* tests/expr-old.test:
-	* tests/expr.test:
-	* tests/parseExpr.test:
-	* tests/platform.test:
-	* tests/string.test:
-
-2005-11-08  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixFCmd.c (MAX_READDIR_UNLINK_THRESHOLD): reduce to 130
-	based on errors seen on OS X 10.3 with lots of links in a dir.
-	[Bug 1034337 followup]
-
-2005-11-09  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/Makefile.in (gdb-test): Added a new target to make it easier to
-	run the test suite inside a debugger.
-
-2005-11-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/compExpr-old.test:	Updated tests with changed behavior due
-	to addition of bignums.
-
-	* tests/expr.test:      Portable tests expr-46.13-18 [Bug 1341368]
-
-	* generic/tclPkg.c:	Corrected inconsistencies in the value returned
-	* tests/pkg.test:	by Tcl_PkgRequire(Ex) so that the returned
-	values will always agree with what is stored in the package database.
-	This way repeated calls to Tcl_PkgRequire(Ex) have the same results.
-	Thanks to Hemang Lavana. [Bug 1162286].
-
-2005-11-08  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclTrace.c (TraceVarEx): Factor out heart of Tcl_TraceVar2
-	(TclTraceVariableObjCmd,TraceVarProc): Use the new internal API to
-	arrange for the clientData to be cleaned up at the same time as the
-	rest of the main trace record. This simplifies the code a bit at the
-	same time.
-
-2005-11-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/trace.test (trace-13.2-4): added tests to detect leak, see [Bug
-	1348775]. The recently added trace-8.9 test is now 13.4.
-
-2005-11-07  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tests/dict.test (dict-19.2): arrange for the stress testing code to
-	only stress test the dict code and not the trace code as well. [Bug
-	1342858]
-
-2005-11-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/trace.test (trace-8.9): added test to detect leak, see [Bug
-	1348775].
-
-2005-11-04  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/tclWinPort.h:  Applied [Patch 1267871] by Matt Newman for
-	* win/tclWinPipe.c:  extended error code support on Windows.
-	* tests/exec.test:   Tests for extended error codes.
-	* generic/tclPipe.c: Permit long codes (platform macros permitting).
-
-2005-11-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBinary.c:
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclDictObj.c:
-	* generic/tclExecute.c:
-	* generic/tclIOCmd.c:
-	* generic/tclLink.c:
-	* generic/tclTest.c:
-	* generic/tclVar.c: fix for [Bug 1334947]. The functions TclPtrSetVar,
-	Tcl_ObjSetVar2 and Tcl_SetVar2Ex now always consume the newValuePtr
-	argument - i.e., they will free a 0-refCount object if they failed to
-	set the variable. Fixed all callers in the core.
-
-2005-11-04  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclGetDate.y: Added abbreviations for the Korean
-	* library/clock.tcl:    timezone. [Patch 1298737]
-	* generic/tclDate.c:    Regenerated.
-
-	* tools/findBadExternals.tcl: Added this script, which locates external
-	symbols that do not begin with 'Tcl' or 'tcl' and hence might be in
-	conflict with other link libraries. Thanks to George Peter Staplin for
-	the idea and the initial version of the script. [Bug 1263012]
-
-	* unix/Makefile.in: Trimmed a bunch of fat out of the tommath/
-	directory in 'make dist'. [RFE 1333318]
-
-	* unix/tcl.m4: Added code to enable [load] on LynxOS. Thanks to
-	heidibr@users.sf.net for the patch. [Bug 1163896]. Removed the last
-	vestiges of GNU dld from the Unix build [RFE 1071992].
-
-	* unix/tclLoadDld.c: Removed.
-	* unix/configure: Regenerated.
-
-2005-11-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* generic/tclVar.c:
-	* tests/trace.test: fix for [Bugs 1338280/1337229]; changed to use the
-	same approach as the 8.4 patch in the ticket (i.e., removed the patch
-	committed on 2005-31-10).
-
-2005-11-03  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/tclWin32Dll.c:   Applied [Patch 1256872] to provide unicode
-	* win/tclWinConsole.c: support in the console on suitable systems.
-	* win/tclWinInt.h:     Patch by Anton Kovalenko
-
-2005-11-02  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	Applied [Patch 1096916] to support building with MSVC 8.
-	* generic/regerror.c: Avoid use of reserved word.
-	* generic/tcl.h:      Select the right Tcl_Stat structure
-	* generic/tclDate.c:  Casts to handle 64 bit time_t case.
-	* tests/env.test:     Include essential envvar on Win32
-	* win/nmakehlp.c:     Handle new return codes.
-	* win/makefile.vc:    Use the selected options.
-	* win/rules.vc:       Check options are applicable
-	* win/tclWinPort.h:   Disable deprecated function warnings
-	* win/tclWinSock.c:   Provide default value to avoid warning.
-	* win/tclWinTime.c:   Add casts to handle 64bit time_t type.
-
-2005-11-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclTrace.c (TclCheckExecutionTraces): Corrected mistaken
-	assumption that all command traces are set at the script level.
-	Report/fix from Jacques H. de Villiers. [Bug 1337941]
-
-	* tests/unixNotfy.test (1.1,2):	Update error message whitespace to
-	match changes in code.
-
-	* tests/expr-old.test (expr-32.52): Use int(.) to restrict result of
-	left shift to the C long range.
-
-	* expr.test (expr-46.13): Added test that illustrates shortcoming of
-	[Patch 1340260].
-
-2005-10-31  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclNamesp.c: fix for [Bugs 1338280/1337229]. Thanks Don.
-	* tests/trace.test: fix duplicate test numbers
-
-2005-10-31  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* win/tclWinSerial.c (SerialSetOptionProc): Cleaned up option parsing
-	to produce more informative error messages and separate error and
-	non-error code paths better.
-	* tests/ioCmd.test (iocmd-8-19): Updated.
-
-2005-10-29  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclTrace.c (TraceVarProc): [Bug 1337229], partial fix. Ensure
-	that a second call with TCL_TRACE_DESTROYED does not lead to a second
-	call to Tcl_EventuallyFree(). It is still true that that second call
-	should not happen, so the bug is not completely fixed.
-	* tests/trace.test (test-18.3-4): added tests for [Bug 1337229] and
-	[Bug 1338280].
-
-2005-10-23  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* generic/tclFileName.c: fix to memory leak in glob [Bug 1335006] Obj
-	leak detection and patch by Eric Melbardis.
-
-	* tests/fCmd.test:
-	* win/tclWinFile.c: where appropriate windows API is available, try to
-	set 'nlink' and 'ino' stat fields (previously they were always 0). [Bug
-	1325803]
-
-2005-10-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/foreach.test (foreach-8.1): added test for [Bug 1189274]
-
-2005-10-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_INCR_*): fixed [Bug 1334570]. Obj leak
-	detection and patch by Eric Melbardis.
-
-2005-10-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c (RefineApproximation): Plugged a memory leak
-	where two intermediate results were not freed on one return path. [Bug
-	1334461]. Thanks to Eric Melbardis for the patch.
-
-2005-10-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/binary.n: Clarify that virtually all code that uses the 'h'
-	format in [binary scan] should be using the 'H' format instead. It is
-	nearly always a bug to use the other!
-
-2005-10-20  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclListObj.c (TclLsetFlat):
-	* tests/lset.test (lset-10.3): fixed handling of unshared lists with
-	shared sublists, [Bug 1333036] reported by neuronstorm.
-
-2005-10-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIORChan.c (PassReceivedError,PassReceivedErrorInterp):
-	Fix crash caused by passing -1 as the length to TclNewStringObj(). Only
-	Tcl_NewStringObj (the function call, not the macro) handles that sort
-	of thing correctly. This makes ioCmd.test pass again.
-
-2005-10-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclClock.c:		Removed some dead code.
-	* generic/tclCmdIL.c:
-	* generic/tclCompCmds.c:
-	* generic/tclDictObj.c:
-	* generic/tclExecute.c:
-	* generic/tclLiteral.c:
-	* generic/tclParseExpr.c:
-	* generic/tclScan.c:
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-
-2005-10-19  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclIORChan.c: General cleanup, removing checks that are
-	unnecessary due to the general contracts of other functions in the
-	core, converting to using ANSI declarations, etc. Note that nearly the
-	whole file has changed, but it is often just cosmetic.
-
-2005-10-19  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_DICT_APPEND, INST_DICT_LAPPEND): fixed
-	faulty peephole optimisation that can cause crashes, [Bug 1331475]
-	reported by Aric Bills.
-
-2005-10-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Added optimization for I32L64 systems to avoid
-	using bignums to perform int multiplies. The improvement shows up most
-	dramatically in tclbench's matrix.bench.
-
-2005-10-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c:	Restored some optimizations of the
-	INST_INCR_SCALAR1_IMM opcode.
-
-2005-10-14  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_ClearChannelHandlers): removed change dated
-	2005-10-04 (see below). Look into [Bug 1323992] for detailed
-	discussion.
-
-	* generic/tcl.h: Fixed bad definition of CRTEXPORT which should have
-	been CRTIMPORT rather. This broke compilation of generic/tclMain.c and
-	was probably introduced by mistake while applying the fix for [Bug
-	1256937] below.
-
-2005-10-14  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclExecute.c (TclIncrObj, TclExecuteByteCode): Tidied up a
-	couple of infelicitous do {...} while(0) constructs.
-
-2005-10-14  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tcl.h:     Fix for [Bug 1256937] - correctly decorate
-	* generic/tclMain.c: imported functions from msvcrt in static builds.
-
-2005-10-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/format.test: "Forward"-port of test updates relating to [Bug
-	1284178]. The bug itself was fixed by TIP#237.
-
-2005-10-13  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_ClearChannelHandlers): temporary ifdef
-	TCL_THREADS changes done to de-activate pending event processing when
-	channel is being closed/cutted.
-
-2005-10-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c:	Removed obsolete use of NO_ERRNO_H.
-	* tools/man2tcl.c:
-	* unix/tcl.m4:
-	* unix/tclConfig.h.in:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-	* compat/tclErrno.h:	Removed obsolete file.
-
-	* generic/tclStrToD.c (TclParseNumber): Missing goto caused crash when
-	parsing "Na". [Bug 1325833]
-
-2005-10-12  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (GetNumberFromObj):	Restored some lost
-	optimizations for empty string values. We avoid cost of a call to
-	TclParseNumber just to tell us an empty string isn't a number.
-
-2005-10-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclPathObj.c (SetFsPathFromAny): TclGetString macro must not
-	be combined with post-increment arguments. [Bug 1325099]
-
-2005-10-12  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclExecute.c (Tcl_ExecuteByteCode, TclIncrObj): Several
-	common cases inlined in hopes of gaining a little performance in [incr]
-
-2005-10-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompCmds.c: New convenience macro CompileTokens().
-
-2005-10-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Corrections to the NO_WIDE_TYPE build. Also
-	added missing "break" to a switch that broke wide XOR operations.
-
-2005-10-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInterp.c (DeleteScriptLimitCallback)
-	(SetScriptLimitCallback): Improve the interlocking between the script
-	limit callback record and the hash table of current such records, to
-	prevent crashes in callbacks that create callbacks.
-	(Tcl_LimitSetTime): Reset the correct flag. Problem reported by
-	Nicolas Castagne <castagne@imag.fr> on comp.lang.tcl
-
-2005-10-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Fixing errors in last commit. (Two commits, the
-	second removes wrong comment).
-
-2005-10-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:
-	* generic/tclExecute.c:
-	* generic/tclStrToD.c:
-	* generic/tclStringObj.c: Initialise variables to avoid compiler
-	warnings ([Bug 1320818] among others).
-
-2005-10-08  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP#237 IMPLEMENTATION
-
-	[kennykb-numerics-branch] Resynchronized with the HEAD; at this
-	checkpoint [-rkennykb-numerics-branch-20051008], the HEAD and
-	kennykb-numerics-branch contain identical code.
-
-	[kennykb-numerics-branch]	Merge updates from HEAD
-
-	* generic/tclExecute.c: More performance macros and special handling of
-	the wide integer type for performance on 32-bit systems.
-
-2005-10-07  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c:	Macro GetNumberFromObj() is version of
-	TclGetNumberFromObj() that saves a function call for common uses.
-
-	* generic/tclInt.h:	Made #undef NO_WIDE_TYPE the default on 32-bit
-	systems. Being able to use 64-bit values without leaping to mp_int
-	should help with performance.
-
-	* generic/tclObj.c:	Bug fixes in the #undef NO_WIDE_TYPE
-	* generic/tclExecute.c:	configuration.
-
-	* generic/tclExecute.c: Improved performance of comparison opcodes and
-	bitwise operations and removed yet more dead code.
-
-2005-10-07  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/tclUnixFCmd.c (TraverseUnixTree): Adjust 2004-11-11 change to
-	* tests/fCmd.test (fCmd-20.2):           account for NFS special files
-	with a readdir rewind threshold. [Bug 1034337]
-
-2005-10-06  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c:	Improved performance of INST_RSHIFT and
-	INST_LSHIFT.
-
-2005-10-05  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c: Improved performance of INST_MULT, INST_DIV,
-	INST_ADD, and INST_SUB and replaced a "goto... label" with a "break
-	from loop" in TclIncrObj() and removed some dead code.
-
-2005-10-05  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclPipe.c (TclCreatePipeline): Fixed [Bug 1109294]. Applied
-	the patch provided by David Gravereaux.
-
-	* doc/CrtChannel.3: Fixed [Bug 1104682], by application of David
-	Welton's patch for it, and added a note about wideSeekProc.
-
-	* generic/tclIORChan.c (RcClose): Removed unreachable panic/return
-	statements. This fixes the remainder of [Bug 1286256].
-
-2005-10-05  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/env.test (env-6.1):
-	* win/tclWinPort.h: define USE_PUTENV_FOR_UNSET 1
-	* generic/tclEnv.c (TclSetEnv, TclUnsetEnv): add USE_PUTENV_FOR_UNSET
-	to existing USE_PUTENV define to account for various systems that have
-	putenv(), but can't unset env vars with it. Note difference between
-	Windows and Linux for actually unsetting the env var (use of '=').
-	Correct the resizing of the environ array. We assume that we are in
-	full ownership, but that's not correct.[Bug 979640]
-
-2005-10-04  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-	* generic/tclExecute.c: Updated TclIncrObj() to more efficiently add
-	native long integers. Also updated IllegalExprOperandType and the
-	INST_UMINUS, INST_UPLUS, INST_BITNOT, and INST_TRY_CVT_TO_NUMERIC
-	sections for performance.
-
-	* generic/tclBasic.c: Updated more callers to make use of
-	TclGetNumberFromObj. Removed some dead code.
-
-2005-10-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinSerial.c (SerialSetOptionProc): free argv [Bug 1067708]
-
-	* tests/http.test:              do not URI encode -._~ according
-	* library/http/http.tcl (init): to RFC3986. [Bug 1182373] (aho)
-
-	* unix/tclLoadShl.c (TclpDlopen): use DYNAMIC_PATH on second shl_load
-	only. [Bug 1204237]
-
-	* doc/scan.n: scan %[] requires "one or more chars" [Bug 1277503]
-
-	* tests/winFile.test (getuser): allow valid Windows usernames. [Bug
-	1311285]
-
-	* generic/tclParse.c (Tcl_ParseCommand): add code that recognizes {} in
-	addition to {expand} for word expansion (make with
-	-DALLOW_EMPTY_EXPAND).
-
-2005-10-04  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_ClearChannelHandlers): now deletes any
-	outstanding timer for the channel. Also, prevents events still in the
-	event queue from triggering on the current channel.
-
-	* generic/tclTimer.c (Tcl_DeleteTimerHandler): bail out early if passed
-	NULL argument.
-
-2005-10-03  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclBasic.c:	Re-implemented ExprRoundFunc and
-	ExprEntierFunc to use TclGetNumberFromObj.
-
-	* generic/tclInt.h:	Added new routine TclGetNumberFromObj to
-	* generic/tclObj.c:	provide efficient access to the actual
-	internal rep of a numeric Tcl_Obj without conversions.
-
-2005-10-03  Kevin Kenny  <kennykb@acm.org>
-
-	* tools/loadICU.tcl:  Changed the file names of message catalogs to
-			      lowercase.
-	* tools/makeTestCases.tcl:
-	* library/tzdata/*:   Olson's tzdata2005n.tar.gz. Includes new DST
-	rules for USA and a number of changes to other locales.
-	* tests/clock.test:   Regenerated for new US DST rules.
-
-2005-09-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclMain.c: Separate encoding conversion of command line
-	arguments from list formatting. [Bug 1306162].
-
-2005-09-30  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclStringObj.c:	Bug fix: Missing cast to large enough
-	integral size before << operations led to broken [format %llx] results.
-	Thanks to Robert Henry for reporting the bug.
-
-2005-09-29  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/mathfunc.n:   implementation for TIP #255, expr min/max
-	* library/init.tcl:
-	* tests/info.test, tests/expr-old.test:
-
-2005-09-27  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tcl.h:	Changed name of the new Tcl_Obj intrep field
-	* generic/tclObj.c:	from "bignumValue" to "ptrAndLongRep" as
-	* generic/tclProc.c:	described in TIP 237, and more suitable for
-	other more general uses.
-
-2005-09-27  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tests/binary.test (binary-14.18): Added test for [Bug 1116542] though
-	the bug itself was already fixed by unrelated changes.
-
-2005-09-26  Kevin Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Merge updates from HEAD.
-
-2005-09-26  Kevin Kenny  <kennykb@acm.org>
-
-	* libtommath/:                   Updated to release 0.36.
-	* generic/tommath.h:             Regenerated.
-	* generic/tclTomMathInterface.h: Added ten missing aliases for mp_*
-	functions to avoid namespace pollution in Tcl's exported symbols. [Bug
-	1263012]
-
-2005-09-23  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* unix/Makefile.in:	Added -DMP_PREC=4 switch to all compiles so
-	* win/Makefile.in:	that minimum memory requirements of mp_int's
-	* win/makefile.vc:	will not be quite so large. [Bug 1299153].
-
-	* generic/tclStrToD.c:	Fixed memory leak. [Bug 1299803].
-	* generic/tclObj.c:
-
-2005-09-20  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c:	Revise TclIncrObj() to call
-	Tcl_GetBignumAndClearObj.
-
-	* generic/tcl.decls:	Add Tcl_GetBignumAndClearObj.
-	* generic/tclObj.c:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2005-09-16  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclInt.h:		 Added TclBNInitBigNumFromWideInt() so
-	* generic/tclTomMathInterface.c: that every caller isn't required to
-	duplicate the sign logic to use the unsigned interface.
-
-	* generic/tclBasic.c:	Reduce the number of places where Tcl intrudes
-	* generic/tclExecute.c:	into the internal format details of the mp_int
-	* generic/tclObj.c:	struct.
-	* generic/tclStrToD.c:
-	* generic/tcLStringObj.c:
-
-	* generic/tclTomMath.h:	Added mp_cmp_d to routines from libtommath
-	* unix/Makefile.in:	used by Tcl.
-	* win/Makefile.in:
-	* win/makefile.vc:
-
-	* libtommath/bn_mp_add_d.c: Bug fix. For mp_add_d(&a, d, &c), when &a
-	has the value -d, then the value &c computed should be zero, but
-	mp_add_d was producing an inconsistent zero value with a sign field of
-	MP_NEG, something like a value of -0, which other routines in
-	libtommath can't handle.
-
-	* generic/tclExecute.c:	Dropped all creation of "bigOne" values and
-	just use tommath routines that accept the value "1" directly.
-
-2005-09-15  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/ParseCmd.3: copy/paste fix [Bug 1292427]
-
-2005-09-15  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]	Merge updates from HEAD.
-
-	* generic/tclStringObj.c (TclAppendFormattedObjs):	Revision to
-	eliminate one round of string copying.
-
-	* generic/tclBasic.c:	More callers of TclObjPrintf and
-	* generic/tclCkalloc.c:	TclFormatToErrorInfo.
-	* generic/tclCmdMZ.c:
-	* generic/tclExecute.c:
-	* generic/tclIORChan.c:
-	* generic/tclMain.c:
-	* generic/tclProc.c:
-	* generic/tclTimer.c:
-	* generic/tclUtil.c:
-	* unix/tclUnixFCmd.c
-
-	* unix/configure:	autoconf-2.59
-
-2005-09-15  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tcl.m4 (SC_TCL_EARLY_FLAGS): Added extra hack to allow Tcl to
-	transparently open large files on RHEL 3. [Bug 1287638]
-
-2005-09-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Bug fixes: ObjPrintfVA needed to
-	support "*" fields and needed to interpret precision limits on %s
-	conversions as a maximum number of bytes, not Tcl_UniChars, to take
-	from the (char *) argument.
-
-	* generic/tclBasic.c:	Updated several callers to use
-	* generic/tclCkalloc.c: TclFormatToErrorInfo() and/or
-	* generic/tclCmdAH.c:	TclObjPrintf().
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclDictObj.c:
-	* generic/tclExecute.c:
-	* generic/tclIORChan.c:
-	* generic/tclIOUtil.c:
-	* generic/tclNamesp.c:
-	* generic/tclProc.c:
-
-	* library/init.tcl:	Keep [unknown] in sync with errorInfo
-	formatting rules.
-
-2005-09-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	First caller of TclFormatToErrorInfo.
-
-	* generic/tclInt.h:		Using stdarg.h conventions, add more
-	* generic/tclStringObj.c:	fixed arguments to TclFormatObj() and
-	TclObjPrintf(). Added new routine TclFormatToErrorInfo().
-
-	* generic/tcl.h:	Explicitly standardized on the use of stdarg.h
-	* generic/tclBasic.c:	conventions for functions with variable number
-	* generic/tclInt.h:	of arguments. Support for varargs.h has been
-	* generic/tclPanic.c:	implicitly gone for some time now. All
-	* generic/tclResult.c:	TCL_VARARGS* macros purged from Tcl sources,
-	* generic/tclStringObj.c:	leaving only some deprecated #define's
-	* tools/genStubs.tcl:	in tcl.h for the sake of older extensions.
-
-	* generic/tclDecls.h:	make genstubs
-
-	* doc/AddErrInfo.3:	Replaced all documented requirement for use of
-	* doc/Eval.3:		TCL_VARARGS_START() with requirement for use of
-	* doc/Panic.3:		va_start().
-	* doc/SetResult.3:
-	* doc/StringObj.3:
-
-2005-09-12  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]	Merge updates from HEAD.
-
-	* generic/tclCmdAH.c:		Added support for the "ll" width
-	* generic/tclStringObj.c:	specifier to [format].
-
-	* generic/tclStringObj.c (TclAppendFormattedObjs):	Bug fix: make
-	sure %ld formats force the collection of a wide value, when the value
-	could be a different long.
-
-2005-09-09  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c (RcDecodeEventMask): Added missing type
-	declaration for the parameter 'mask'. This fixes the [Bug 1286256]. The
-	other warning can be removed only by removing the panic/return code.
-
-2005-09-09  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]	Merge updates from HEAD.
-
-2005-09-09  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclStringObj.c:  Added two missing casts to silence messages
-	from MSVC6.
-
-2005-09-09  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:		New internal routine TclObjPrintf()
-	* generic/tclStringObj.c:	is similar to TclFormatObj() but
-	accepts arguments in non-Tcl_Obj format.
-
-	* generic/tclInt.h:		New internal routines TclFormatObj()
-	* generic/tclStringObj.c:	and TclAppendFormattedObjs() to offer
-	sprintf()-like means to append to Tcl_Obj. Work in progress toward
-	[RFE 572392].
-
-	* generic/tclCmdAH.c:	Compiler directive NEW_FORMAT when #define'd
-	directs the [format] command to be implemented in terms of the new
-	TclAppendFormattedObjs() routine.
-
-2005-09-08  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	TIP#254 IMPLEMENTATION
-
-	* generic/tclLink.c (LinkTraceProc,ObjValue): Added many new of C var
-	* generic/tcl.h:			      to link to, making it
-	* doc/LinkVar.3:			      easier to seamlessly
-	* generic/tclTest.c (TestlinkCmd):	      couple C code and Tcl
-	* tests/link.test:			      scripts in an
-	application. [Patch 1242844]
-
-2005-09-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclUtf.c (Tcl_UniCharToUtf):	Corrected handling of negative
-	* tests/utf.test (utf-1.5):	    Tcl_UniChar input value. Incorrect
-	handling was producing byte sequences outside of Tcl's legal internal
-	encoding. [Bug 1283976].
-
-2005-09-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInt.h (List): Added flag to keep track of whether a list
-	* generic/tclListObj.c:    with a string rep is provably canonical.
-	* generic/tclUtil.c (Tcl_ConcatObj):  Do efficient concatenation and
-	* generic/tclBasic.c (Tcl_EvalObjEx): evaluation when the list is
-	canonical, and not just when the list is pure. This should make the
-	"pure list" hacking introduced in 8.3 much more robust.
-
-2005-09-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclObj.c (pendingObjDataKey): Added missing 'static' to stop
-	symbol from leaking outside the Tcl library. [Bug 1263012]
-
-2005-09-02  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclScan.c:	Bug fix: The %o, %x, %i formats of [scan] must
-	not accept any 0b or 0o prefixes. [scan $s %o] must continue to work
-	even with KILL_OCTAL enabled.
-
-	* generic/tclInt.h:	Added TCL_PARSE_SCAN_PREFIXES to the flags
-	* generic/tclStrToD.c:	accepted by TclParseNumber.
-
-2005-09-01  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/tclUnixSock.c (InitializeHostName): Synchronized use of static
-	modifier in declaration and definition of function.
-
-	* unix/tclUnixChan.c (FileTruncateProc): Synchronized use of static
-	modifier in declaration and definition of function.
-
-	* generic/tclResult.c (ReleaseKeys): Synchronized use of static
-	modifier in declaration and definition of function.
-
-	* generic/tclListObj.c (NewListIntRep): Synchronized use of static
-	modifier in declaration and definition of function.
-
-	* generic/tclEncoding.c (InitializeEncodingSearchPath): Synchronized
-	use of static modifier in declaration and definition of function.
-
-	* generic/tclEncoding.c (FillEncodingFileMap): Synchronized use of
-	static modifier in declaration and definition of function.
-
-	* generic/tclIORChan.c (RcNewHandle): Synchronized use of static
-	modifier in declaration and definition of function.
-
-2005-09-01  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclObj.c:	TclParseNumber calls meant to parse an integer
-	value now pass the TCL_PARSE_INTEGER_ONLY flag.
-
-	* generic/tclScan.c:	Extended [scan] to accept the %lld, %llo, %llx,
-	and %lli formats. Numeric scanning is now done via TclParseNumber calls
-
-	* generic/tclInt.h:	Extended TclParseNumber to accept new flag
-	* generic/tclStrToD.c:	values TCL_PARSE_INTEGER_ONLY,
-	TCL_PARSE_OCTAL_ONLY, and TCL_PARSE_HEXIDECIMAL_ONLY, to give caller
-	more control over the parsing rules.
-
-2005-08-31  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* doc/FileSystem.3:
-	* unix/tclUnixFile.c:
-	* windows/tclWinFile.c: clarify that Tcl_FSMatchInDirectory may be
-	called with a NULL interpreter, and fix the code so this is allowed.
-	Tcl's core itself (tclEncoding.c:FillEncodingFileMap()) calls this
-	with a NULL interpreter.
-
-2005-08-30  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclObj.c:	Extended bignum support to include bignums so
-	large they will not pack into a Tcl_Obj. When they outgrow Tcl's string
-	rep length limits, a panic will result.
-
-	* generic/tclTomMath.h:	Added mp_sqrt to routines from
-	* unix/Makefile.in:	libtommath used by Tcl.
-	* win/Makefile.in:
-	* win/makefile.vc:
-
-	* generic/tclBasic.c:	Extended sqrt(.) so that range covers the
-	entire double range, accepting as many bignums in the domain as that
-	will allow.
-
-2005-08-29  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tm.tcl (::tcl::tm::roots): Accepted Don Porter's patch for
-	[Bug 1189657]. Syncs the implementation to the specification (TIP #189)
-
-2005-08-29  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]	Merge updates from HEAD.
-
-	* generic/tclBasic.c:	Restored round(.) to the Tcl 8.4 rules.
-
-2005-08-29  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclBasic.c (ExprMathFunc): Restored "round away from zero"
-	* tests/expr.test (expr-46.*):       behaviour to the "round" function.
-	Added test cases for the behavior, including the awkward case of a
-	number whose fractional part is 1/2-1/2ulp. [Bug 1275043]
-
-2005-08-26  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c: Moved Tcl_{Cut,Splice}Channel to
-	{Cut,Splice}Channel for internal use, and created new public functions
-	for Tcl_{Cut,Splice}Channel which walk the whole stack of
-	transformations and invoke the necessary thread actions. Added code to
-	Tcl_(Un)StackChannel to properly invoke the thread actions when pushing
-	and popping transformations on/from a channel.
-
-2005-08-26  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (NamespaceEnsembleCmd): Reset the result after
-	creating an ensemble to clear any result object sharing (potentially
-	caused by delete traces) so that we can safely return the name of the
-	ensemble. Previously, this caused crashes in Snit's test suite.
-
-2005-08-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclListObj.c (UpdateStringOfList): Stop uncontrolled and
-	unsafe crashes from happening when working with very large string
-	representations. [Bug 1267380]
-
-	* generic/tclExecute.c (TEBC:INST_DICT_LAPPEND): Stop dropping a
-	duplicated object on the floor, which was a memory leak (and a wrong
-	result too). Thanks to Andreas Kupries for reporting this.
-
-2005-08-25  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch] Merge updates from HEAD
-
-	* generic/tclExecute.c: Bug fix. INST_RSHIFT: shift of negative values
-	produced incorrect results.
-
-	* generic/tclExecute.c: Bug fix. INST_*SHIFT opcodes stack management.
-	[expr 0<<6] should be 0, not 6.
-
-	* generic/tclBasic.c: Extended the domain of round(.) to all non-Inf,
-	non-NaN doubles, using bignums for the result as needed.
-
-2005-08-24  Andreas Kupries  <andreask@activestate.com>
-
-	TIP#219 IMPLEMENTATION
-
-	* doc/SetChanErr.3: ** New File **. Documentation of the new channel
-	API functions.
-	* generic/tcl.decls:  Stub declarations of the new channel API.
-	* generic/tclDecls.h: Regenerated
-	* generic/tclStubInit.c:
-
-	* tclIORChan.c: ** New File **. Implementation of the reflected
-	channel.
-	* generic/tclInt.h: Integration of reflected channel and new error
-	* generic/tclIO.c:  propagation into the generic I/O core.
-	* generic/tclIOCmd.c:
-	* generic/tclIO.h:
-	* library/init.tcl:
-
-	* tests/io.test:    Extended testsuite.
-	* tests/ioCmd.test:
-	* tests/chan.test:
-	* generic/tclTest.c:
-	* generic/tclThreadTest.c:
-
-	* unix/Makefile.in: Integration into the build machinery.
-	* win/Makefile.in:
-	* win/Makefile.vc:
-
-2005-08-24  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c (Tcl_DoubleDigits): Fixed the corner cases of
-	* tests/binary.test (binary-65.*)         formatting floating point
-	numbers with the largest and smallest possible significands, and added
-	test cases for them.
-
-2005-08-24  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c: Corrected some TRACE bugs that prevented
-	compilation with --enable-symbols=all.
-	* generic/tclStrToD.c: Revised commentary to prepare for a renaming of
-	the file, removed some dead code, and fixed a bug where
-	TclBignumToDouble failed on huge negative numbers.
-	* tests/binary.test (binary-65.*): Added missing 'ieeeFloatingPoint'
-	to large/small significand tests.
-	* tests/expr.test (expr-45.*) Added missing braces around expressions.
-
-2005-08-24  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclBasic.c:	Revised implementation of the ceil(.) and
-	* generic/tclInt.h:	floor(.) math functions in light of the
-	* generic/tclStrToD.c:	revised comparison operators, so that it is
-	always true that ($x <= ceil($x)) and ($x >= floor($x)). The simple
-	approach of "convert to double and call ceil() or floor()" could not
-	guarantee that.
-
-	* generic/tclExecute.c:	Bug fix: TclBignumToDouble return -Inf when
-	appropriate. Removed declarations of removed routines.
-
-	* generic/tclExecute.c: Revised the type promotion rules of the
-	comparison operators so that they form proper equivalence classes over
-	the set of numeric strings.
-
-2005-08-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure.in:
-	* win/configure: Regen.
-	* win/configure.in: Update minimum autoconf version to 2.59.
-
-2005-08-23  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):
-	* generic/tclInt.h:
-	* generic/tclObj.c (Tcl_GetBooleanFromObj, SetDoubleFromAny,
-	Tcl_GetLongFromObj, Tcl_GetWideIntFromObj, Tcl_GetBignumFromObj):
-	* generic/tclParseExpr.c (GetLexeme):
-	* generic/tclScan.c (Tcl_ScanObjCmd):
-	* generic/tclStrToD.c (TclParseNumber):
-	* tests/binary.test (binary-62.1-65.7):
-	* tests/expr.test (expr-40.1-42.1):
-	* scan.test (scan-14.1,14.2):
-	Modified Tcl_ParseNumber to accept an argument to force interpretation
-	as decimal, and modified [scan] to use it. Corrected a bug where Not a
-	Number with hexadecimal information bits returned consistently
-	incorrect values. #ifdef-ed out some code that is needed only for IBM
-	hexadecimal floating point. Fixed bugs in code to handle the corner
-	cases of smallest and largest significands. Added test cases to improve
-	test coverage in generic/tclStrToD.c. Added test cases for 0b notation
-	(TIP #114). Removed TclStrToD, and the static functions that it calls,
-	which are now dead code (TclParseNumber now does all input
-	floating-point conversions.)
-
-2005-08-23  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclStrToD.c:	Bug fix: set shift magnitude properly whether
-	we're expanding to mp_int type or not.
-
-	* generic/tclExecute.c:	Bug fix: ACCEPT_NAN under INST_UMINUS.
-
-	* generic/tclStrToD.c:	New macros TIP_114_FORMATS and KILL_OCTAL to
-	configure acceptance of 0o and 0b numbers and rejection of "leading
-	zero as octal".
-
-	* generic/tclBasic.c:	Re-used the guts of int(.) and wide(.) math
-	functions to perform conversions in OldMathFuncProc.
-
-	* generic/tclBasic.c:	Support for ACCEPT_NAN.
-	* generic/tclExecute.c:
-
-	* generic/tclInt.decls:	Restored TclExprFloatError to internal stubs
-	* generic/tclBasic.c:	table, and moved definition back to
-	* generic/tclExecute.c:	tclExecute.c from tclBasic.c to handle #undef
-	ACCEPT_NAN.
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclInt.h:	New internal macros TclIsNaN and TclIsInfinite
-	* generic/tclBasic.c:	replace the IS_NAN and IS_INF macros scattered
-	* generic/tclExecute.c:	here and there.
-	* generic/tclObj.c:
-	* generic/tclStrToD.c:
-	* generic/tclUtil.c:
-
-2005-08-22  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclConfig.h.in: autoheader-2.59.
-
-2005-08-22  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclInt.h:	New ACCEPT_NAN macro to mark code that
-	* generic/tclCmdAH.c:	supports or disables accepting of the NaN
-	* generic/tclExecute.c:	value at various points.
-	* generic/tclLink.c:
-
-	* generic/tclStrToD.c:	Bug fix. Parsing of +/- Infinity was reversed.
-
-	* generic/tclTestObj.c:	Disabled unused [testconvertobj] command.
-
-	* generic/tclBasic:	Added [expr {entier(.)}]. Rewrote int(.) and
-	wide(.) to use the same guts, accepting all non-Inf doubles as
-	arguments.
-
-	* generic/tclInt.h:	New routine TclInitBignumFromDouble.
-	* generic/tclStrToD.c:	Modified to return code and write error
-	message.
-
-	* generic/tclInt.h:	TCL_WIDE_INT_IS_LONG implies NO_WIDE_TYPE.
-	* generic/tclObj.c:	Removed now unnecessary tests of the
-	* generic/tclStrToD.c:	TCL_WIDE_INT_IS_LONG definition.
-
-	* generic/tclInt.h:	New internal routine TclSetBignumIntRep
-	* generic/tclObj.c:	consolidates packing of bignum value into a
-	* generic/tclStrToD.c:	Tcl_Obj within one source code file.
-
-	* tests/expr.test:	Corrected the wideIs64bit constraint.
-	* tests/format.test:
-	* tests/scan.test:
-
-2005-08-21  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclInt.h:		Moved TclParseInteger to tclUtil.c and
-	* generic/tclParseExpr.c:	made it static.
-	* generic/tclUtil.c:
-
-	* generic/tclInt.decls:	Moved TclExprFloatError to tclBasic.c and made
-	* generic/tclBasic.c:	it static.
-	* generic/tclExecute.c:
-
-	* generitc/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclExecute.c:	errno, IS_NAN, IS_INF, LLD no longer called in
-	this file; dropped/disabled support for them.
-
-	* generic/tclCompExpr.c:	errno no longer used in these files;
-	* generic/tclParseExpr.c:	dropped support "hack" for it.
-
-	* generic/tclStrToD.c:	Disabled out of date support "hack" for errno.
-
-	* generic/tclBasic.c:	Eliminated VerifyExprObjType. Initialize errno
-	to zero in OldMathFuncProc.
-
-2005-08-19  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclBasic.c:	Updated OldMathFuncProc and ExprAbsFunc to do
-	less invasion into numeric Tcl_Obj internals. Made ExprDoubleFunc,
-	ExprIntFunc, ExprWideFunc, and ExprRoundFunc bignum-aware. Revised
-	ExprSrandFunc error message.
-
-	* generic/tclProc.c:	Wrapped a few tclWideIntType uses in
-	* generic/tclCmdMZ.c:	#ifndef NO_WIDE_TYPE.
-
-	* generic/tclInt.h:	#define'd NO_WIDE_TYPE.
-
-	* generic/tclVar.c:	Replaced TclPtrIncrVar and TclPtrIncrWideVar
-	* generic/tclInt.h:	with TclPtrIncrObjVar and replaced TclIncrVar2
-	* generic/tclInt.decls:	and TclIncrWideVar2 with TclIncrObjVar2. New
-	routines call on TclIncrObj to do the work.
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclCmdIL.c:	Rework Tcl_IncrObjCmd and the INST_*INCR*
-	* generic/tclExecute.c:	opcodes to use the new routines.
-
-2005-08-18  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c:		Fixed string rep invalidation bug in
-	* tests/dict.test (dict-11.17):	INST_DICT_INCR_IMM rewrite.
-
-	* generic/tclDictObj.c:	DictIncrCmd rewrite to use TclIncrObj.
-
-	* generic/tclInt.h:	TclIncrObj static -> internal
-	* generic/tclExecute.c:
-
-2005-08-17  George Peter Staplin  <GeorgePS@XMission.com>
-
-	* generic/tclBasic.c: eliminate a namespace clash caused by
-	BuiltinFuncTable not being static.
-
-	* generic/tclObj.c: fix a namespace clash caused by a missing
-	static for pendingObjData.
-
-2005-08-17  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclEvent.c (Tcl_Finalize): Removed a copy-and-paste accident
-	that caused a (mostly harmless) double finalize of the load and
-	filesystem subsystems.
-	* tests/clock.test: Eliminated the bad test clock-43.1, and split
-	clock-50.1 into two tests, with a more permissive check on the error
-	message for an out-of-range value.
-
-2005-08-17  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclBasic.c (Tcl_Expr{Long,Double}{,Obj}): Updated to
-	* generic/tclTest.c:                                deal with
-	* tests/expr-old.test:                              bignums (well,
-	* tests/expr.test:                                  mostly).
-	Added a missing "errno=0;" in ExprUnaryFunc so that spurious error
-	returns aren't detected.
-	Added test cases for Tcl_Expr* and Tcl_Expr*Obj because there was very
-	poor test coverage in those areas.
-	* generic/tclParseExpr.c: Reworked parsing of numbers to call
-	TclParseNumber rather than trying to do things locally.
-	* generic/tclStrToD.c: Corrected a comment. Changed so that *endPtrPtr
-	does not include any trailing whitespace.
-
-2005-08-17  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c: New routine TclIncrObj to centralize the
-	increment operation needed in many places. Updated INST_DICT_INCR_IMM
-	to make use of it.
-
-2005-08-16  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c:	Made bit shifting opcodes and INST_MOD
-	bignum-aware.
-
-	* tests/scan.test:	Making << bignum-aware means that repeated
-	* tests/string.test:	left shifting cannot turn a positive into a
-	negative. Revised [int_range] and [largest_int] utility commands in the
-	test suite that relied on that happening. Without revision they became
-	infinite loops.
-
-	* generic/tclExecute.c:	Made binary bitwise opcodes bignum-aware.
-
-	* generic/tclTomMath.h:	Added mp_or and mp_xor to routines from
-	* unix/Makefile.in:	libtommath used by Tcl.
-	* win/Makefile.in:
-	* win/makefile.vc:
-
-2005-08-15  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]	Updates from HEAD.
-	* generic/tclExecute.c:	More revisions to IllegalExprOperandType.
-	Merged INST_BITNOT with INST_UMINUS and make it bignum-aware according
-	to the rule: ~a = -a - 1. Disabled unused code and noted more TODOs.
-
-	* generic/tclInt.decls: Disabled TclLooksLikeInt() and all callers.
-	* generic/tclUtil.c:
-	* generic/tclCompCmds.c:
-
-	* generic/tclBasic.c:	Rewrite of VerifyExprObjType().
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclExecute.c: Updated execution of comparison bytecodes to
-	be bignum-aware, routing string compares through INST_STR_CMP.
-
-2005-08-14  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c: Updated execution of arithmetic bytecodes to
-	be bignum-aware, and to allow calculations on NaN to produce a NaN
-	result. INST_UMINUS updated to call mp_neg.
-
-	* generic/tclTomMath.h:	Added mp_and, mp_expt_d, and mp_neg to
-	* unix/Makefile.in:	routines from libtommath used by Tcl.
-	* win/Makefile.in:
-	* win/makefile.vc:
-
-2005-08-13  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclObj.c:	Extended Bignum auto-narrowing to auto-narrow
-	to tclWideIntType when appropriate; this helps keep things working as
-	the bytecode execution code is migrated to supporting bignums.
-
-	* generic/tclExecute.c:	Major overhaul of IllegalExprOperandType.
-	Changed several TclNewFooObj() calls to more logically appropriate
-	ones. Added several TODO comments marking opportunies for future work.
-	Made more use of the eePtr->constants. Made INST_UMINUS bignum aware.
-
-2005-08-12  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c: Simplify doCondJump. Use eePtr->constants as
-	result of INST_DICT_NEXT, INST_LAND, and INST_LOR. Separate INST_LNOT
-	from INST_UMINUS and simplify.
-
-2005-08-12  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c (MktimeObjCmd):
-	* library/clock.tcl (GetSystemTimeZone, LoadZoneinfoFile)
-	(ReadZoneinfoFile):
-	* tests/clock.test (clock-50.1):
-	Added functionality to read /etc/localtime if it exists, so that Tcl's
-	time can track system time on Linux even if TZ is not set. Changed
-	::tcl::clock::Mktime to check for failure, and added a test case that
-	mimics failure but is really success.
-
-2005-08-11  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclExecute.c: Rewrite of INST_LAND/INST_LOR to take advantage
-	of loss of "pure double" issues. Merged INST_UPLUS with
-	INST_TRY_CVT_TO_NUMERIC and updated to use improved rules for impure
-	"double"s as well.
-
-	* generic/tclStrToD.c:	Restored conditional generation of
-	tclWideIntType values by TclParseNumber so that Tcl's not completely
-	broken while bignum calculation support is incomplete. The NO_WIDE_TYPE
-	macro can be used to disable this.
-
-	* generic/tclBasic.c (ExprAbsFunc): First pass making [expr abs(.)]
-	bignum-aware.
-
-2005-08-11  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclEvent.c:         Eliminated the USE_THREAD_STORAGE option
-	* generic/tclInt.h:           (which is on in every build generated by
-	* generic/tclThread.c:        by the standard configurator).
-	* generic/tclThreadStorage.c: Eliminated the code for thread specific
-	* unix/configure:             data without USE_THREAD_STORAGE and
-	* unix/tcl.m4:                radically refactored the code for
-	* unix/tclConfig.h.in:        USE_THREAD_STORAGE so that it has fewer
-	* unix/tclUnixThrd.c:         dependencies on the order of
-	* win/configure:              finalization. (Also, made 'make
-	* win/Makefile.in:            distclean' on Windows clean just a little
-	* win/rules.vc:               bit cleaner.)
-	* win/tcl.m4:
-	* win/tclWinThrd.c:
-
-2005-08-10  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclTomMath.h:	Added mp_shrink, mp_to_unsigned_bin,
-	* unix/Makefile.in:	mp_to_unsigned_bin_n, and mp_unsigned_bin_size
-	* win/Makefile.in:	to routines from libtommath used by Tcl.
-	* win/makefile.vc:
-
-	* generic/tommath.h:	make gentommath_h
-
-	* generic/tclObj.c:	Substantial rewrite to make all number parsing
-	flow through TclParseNumber(). Also established the NO_WIDE_TYPE and
-	BIGNUM_AUTO_NARROW #ifdef's to help track the assumptions of different
-	portions of the code.
-
-	* generic/tclInt.h:	Added NO_WIDE_TYPE #ifdefs
-
-2005-08-10  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclEvent.c (Tcl_Finalize): Pushed Tcl_FinalizeLoad and
-	Tcl_ResetFilesystem down after Tcl_FinalizeThreadAlloc because we can't
-	unload DLL's until after their TSD keys are finalized. (Note that we'll
-	still see aborts if an unloaded DLL has TSD - that still needs to be
-	fixed.
-
-	* tests/compExpr-old.test (compExpr-3.8): Made tests conditional on
-	* tests/expr.test (expr-3.8):             'unix' because they get
-	stack overflows on Win32 threaded builds,
-
-2005-08-09  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclPathObj.c: fix to [file rootname] bug in optimized code
-	path reported on comp.lang.tcl.
-
-2005-08-08  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclObj.c:	Replaced some goto's with loops and started
-	use of BIGNUM_AUTO_NARROW and NO_WIDE_TYPE.
-
-2005-08-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclThreadStorage.c: Stop exposing the guts of the thread
-	storage system through the internal stubs table. Client code should
-	always use the standard API.
-
-2005-08-05  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch]
-	* generic/tclObj.c:	Rewrote Tcl_GetDoubleFromObj().
-
-2005-08-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixInit.c (localeTable): Solaris uses a non-standard name
-	for the cp1251 charset. Thanks to Victor Wagner for reporting this.
-	[Bug 1252475]
-
-2005-08-05  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* win/makefile.vc: Removed unused file ldAout.tcl.
-	* win/makefile.bc: [Bug 1244361]
-
-	* tests/binary.test: Cleaned up testing for scanning of NaN. [Bug
-	1246264]
-
-	* generic/tclBasic.c (ExprAbsFunc): Added code to handle the corner
-	* tests/expr.test (expr-38.1):      case of applying 'abs' to the
-	smallest 32-bit integer. [Bug 1241572]
-
-2005-08-04  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (CloseChannel): Fixed comment nit, added apparently
-	missing word to complete a sentence.
-
-	* generic/tclObj.c (Tcl_DbDecrRefCount): Fixed whitespace nit in panic
-	message.
-
-2005-08-04  Don Porter  <dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch] Updated from HEAD
-
-	* generic/tclObj.c:	Rewrote Tcl_GetBooleanFromObj() and supporting
-	routines to make use of TclParseNumber. This reduces the potential
-	number of times a string value must be scanned.
-
-	* generic/tclObj.c:	Simplified routines that manage the typeTable.
-	Deleted the UpdateStringOfBoolean() routine, that can never be called.
-
-2005-08-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Untangled some dependencies in the
-	* generic/tclEvent.c:		order of finalization routines.
-	* generic/tclInt.h:		[Bug 1251399]
-	* generic/tclObj.c:
-
-2005-08-02  Don Porter	<dgp@users.sourceforge.net>
-
-	[kennykb-numerics-branch] Updated from HEAD
-
-2005-07-30  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclLoadDyld.c (TclpDlopen, TclpLoadMemory): workarounds for
-	bugs/changes in behaviour in Mac OS X 10.4 Tiger.
-
-2005-07-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (InfoGlobalsCmd): Even in high-speed mode, still
-	have to take care with non-existant variables. [Bug 1247135]
-
-2005-07-28  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/README: Update link to msys_mingw8.zip.
-
-2005-07-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/compExpr-old.test:	Still more conversion of "nonPortable"
-	* tests/error.test:		tests into tests with constraints that
-	* tests/expr-old.test:		describe the limits of their
-	* tests/expr.test:		portability. Also more consolidation
-	* tests/fileName.test:		of constraint synonyms.
-	* tests/format.test:		wideis64bit, 64bitInts => wideIs64bit
-	* tests/get.test:		wideIntegerUnparsed => wideIs32bit
-	* tests/load.test:		wideIntExpressions => wideBiggerThanInt
-	* tests/obj.test:
-	* tests/parseExpr.test:		Dropped "roundOffBug" constraint that
-	* tests/string.test:		protected from buggy sprintf.
-
-2005-07-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclPipe.c (TclCreatePipeline): Arrange for POSIX systems to
-	* unix/tclUnixPipe.c (TclpOpenFile):	 use the O_APPEND flag for
-	* tests/exec.test (exec-19.1):		 files opened in a pipeline
-	like ">>this". Note that Windows cannot support such access; there is
-	no equivalent flag on the handle that can be set at the kernel-call
-	level. The test is unix-specific in every way. [Bug 1245953]
-
-2005-07-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c:	Converted the $::tcl_precision value to be kept
-	per-thread to prevent different threads from stomping on each others'
-	formatting prescriptions.
-
-	***POTENTIAL INCOMPATIBILITY*** Multi-threaded programs that set the
-	value of ::tcl_precision will now have to set it in each thread.
-
-	* tests/expr.test:	Consolidated equivalent constraints into
-	* tests/fileName.test:	single definitions and (more precise) names:
-	* tests/get.test:	longis32bit, 32bit, !intsAre64bit => longIs32bit
-	* tests/listObj.test:	empty => emptyTest; winOnly => win
-	* tests/obj.test:	intsAre64bit => longIs64bit
-	Also updated some "nonPortable" tests to use constraints that mark
-	precisely what about them isn't portable, so the tests can run where
-	they work.
-
-	* library/init.tcl ([unknown]): Corrected return code handling in the
-	portions of [unknown] that expand incomplete commands during
-	interactive operations. [Bug 1214462].
-
-2005-07-26  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/configure.in: Check for a $prefix/share directory and add it the
-	the package if found. This will check for Tcl packages in
-	/usr/local/share when Tcl is configured with the default dist install.
-	[Patch 1231015]
-
-2005-07-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_CallWhenDeleted):	Converted to use
-	per-thread counter, rather than a process global one that required
-	mutex protection. [RFE 1077194]
-
-	* generic/tclNamesp.c (TclTeardownNamespace):	Re-ordering so that
-	* tests/trace.test (trace-34.4):	command delete traces fire
-	while the command still exists. [Bug 1047286]
-
-2005-07-24  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* unix/configure: Regen.
-	* unix/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH):
-	* win/configure: Regen.
-	* win/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH): Split confused search
-	for tclsh on PATH and build and install locations into two macros.
-	SC_PROG_TCLSH searches just the PATH. SC_BUILD_TCLSH determines the
-	name of the tclsh executable in the Tcl build directory. [Bug 1160114]
-	[Patch 1244153]
-
-2005-07-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/auto.tcl:	Updates to the Tcl script library to make use
-	* library/history.tcl:	of Tcl 8.4 features. Forward port of
-	* library/init.tcl:	appropriate portions of [Patch 1237755].
-	* library/package.tcl:
-	* library/safe.tcl:
-	* library/word.tcl:
-
-2005-07-23  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/string.test: Add string is tests for functionality that was not
-	tested.
-	* win/README: Update msys + mingw URL. Remove old Cygwin + mingw info.
-
-2005-07-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_DICT_*): stop 2 compiler warnings for
-	uninitialised variables.
-
-2005-07-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TEBC:INST_DICT_INCR_IMM): Fix the incrementor
-	to work correctly with wide values.
-
-2005-07-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileDictCmd): First run at a compiler
-	* generic/tclExecute.c (TclExecuteByteCode): for dictionaries. Also
-	added an instruction to support 'finally'-like clauses, exposed more of
-	the dict guts to the rest of the core, and defined a few tests to
-	exercise more obscure parts of the compiler's operation that were bugs
-	during development.
-
-2005-07-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/ldAout.tcl (***REMOVED***):	Removed support for ancient
-	* unix/configure:			BSD's, IRIX 4, RISCos and
-	* unix/Makefile.in:			Ultrix. Removed two files whose
-	* unix/tcl.m4:				code is used only on those
-	* unix/tclLoadAout.c (***REMOVED***):	antique platforms.
-
-	***POTENTIAL INCOMPATIBILITY*** if anyone actually uses those
-	platforms; it is to be noted though, that an error in the installer has
-	actually not caused a necessary file to be installed on those platforms
-	in several releases, and nobody's complained.
-
-2005-07-16  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c (RefineResult):  Plugged a stupid memory leak in
-	RefineResult (called from Tcl_StrToD). [Tk Bug 1227781]
-
-2005-07-15  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c (TclClockLocaltimeObjCmd,ThreadSafeLocalTime):
-	* library/clock.tcl (GuessWindowsTimeZone, ClearCaches):
-	* tests/clock.test (clock-49.1, clock-49.2):
-	Handle correctly the case where localtime() returns NULL to report a
-	conversion error. Also handle the case where the Windows registry
-	contains timezone values that can be mapped to a tzdata file name but
-	the corresponding file does not exist or is corrupted, by falling back
-	on a Posix timezone string instead; this last case will avoid calls to
-	localtime() in starpacks on Windows. [Bug 1237907]
-
-2005-07-14  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCompile.c: Update to follow style guidelines.
-	(TclPrintInstruction): Reorganize to do better printing out of bytecode
-	with far fewer "special hacks" for particular opcodes.
-	* generic/tclCompile.h: Requires two new opcode types.
-
-2005-07-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tclUnixSock.c:	Use a ProcessGlobalValue to store the value
-	* win/tclWinSock.c:	returned by Tcl_GetHostName() ([info
-	hostname]). Also re-order initialization of the value on Windows to
-	favor GetComputerName() over gethostname() as a source of the
-	information.
-
-2005-07-12  Kevin Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Updated from HEAD
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):
-	* generic/tclInt.h:
-	* generic/tclObj.c (Tcl_GetDoubleFromObj, SetDoubleFromAny)
-	(Tcl_GetIntFromObj, SetIntOrWideFromAny):
-	* generic/tclStrToD.c (TclParseNumber, etc.):
-	* tclTomMathInterface.c (TclBNInitBignumFromWideUInt):
-	* tests/obj.test (obj-1.1, obj-2.2, obj-3.1, obj-3.2):
-
-	Initial attempt at an implementation of TIP #249, comprising a unified
-	parser and modifications to the Tcl_Get*FromObj routines to use it.
-	Further integration of the parser is necessary and planned.
-
-2005-07-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/lsearch.n: Clarify documentation of -exact option; wording was
-	open to misinterpretation by non-English speakers.
-
-2005-07-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c: General style cleanup.
-
-2005-07-08  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Reimplement long and wide
-	type integer division and modulus operations so that the smallest and
-	largest integer values are handled properly. The divide operation is
-	more efficient since it no longer does a modulus or negation and only
-	checks for a remainder when the quotient will be a negative number.
-	The modulus operation is now a bit more complex because of a number of
-	special cases dealing with the smallest and largest integers.
-	* tests/expr.test: Add test cases for division and modulus operations
-	on the smallest and largest integer values for 32 and 64 bit types.
-	[Patch 1230205]
-
-2005-07-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclLink.c:	Simplified LinkTraceProc [Bug 1208108].
-
-2005-07-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Purged use of TCLTESTARGS [RFE 1161550].
-
-	* generic/tclUtil.c:	Converted TclFormatInt() into a macro.
-	* generic/tclInt.decls:	[RFE 1194015]
-	* generic/tclInt.h:
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclNamesp.c:	Allow for [namespace import] of a command
-	* tests/namespace.test:	over a previous [namespace import] of itself
-	without throwing an error. [RFE 1230597]
-
-2005-07-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (DictForCmd, DictFilterCmd): Interlocking of
-	dictionary internal representations is now done in the core of the dict
-	iterator. Purge the last attempts at doing it at a higher level as they
-	didn't work and were no longer needed.
-
-2005-07-01  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	* unix/tclUnixNotfy.c: protect against spurious wake-ups while waiting
-	on the condition variable when tearing down the notifier thread [Bug
-	1222872].
-
-2005-06-28  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode): When parsing an integer
-	operand for a unary minus expression operator, check for a wide integer
-	that is actually LONG_MIN. If found, convert back to a long int type.
-	* tests/expr.test: Add constraint for 32bit long int type and 64bit
-	wide int type. Add tests that parse the smallest/largest long int and
-	wide int values.
-
-2005-06-24  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclEvent.c (Tcl_Finalize):
-	* generic/tclInt.h:
-	* generic/tclPreserve.c (TclFinalizePreserve): Changed the finalization
-	logic so that Tcl_Preserve finalizes after exit handlers run; a lot of
-	code called from Tk's exit handlers presumes that Tcl_Preserve will
-	still work even from an exit handler.
-
-2005-06-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/auto.tcl:	Make file safe to re-[source] without
-	destroying registered auto_mkindex_parser hooks.
-
-2005-06-23  Kevin Kenny  <kennykb@acm.org>
-
-	* win/tclWinChan.c: More rewriting of __asm__ blocks that implement
-	* win/tclWinFCmd.c: SEH in GCC, because mingw's gcc 3.4.2 is not as
-	forgiving of violations committed by the old code and caused panics.
-	[Bug 1225957]
-
-2005-06-23  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tools/tcltk-man2html.tcl: fixed useversion glob pattern to accept
-	multi-digit patchlevels.
-
-2005-06-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* win/tclWinFile.c: Potential buffer overflow. [Bug 1225571] Thanks to
-	Pat Thoyts for discovery and fix.
-
-2005-06-22  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclInt.h:			    Changed the finalization
-	* generic/tclEvent.c (Tcl_Finalize):	    logic to defer the
-	* generic/tclIO.c (TclFinalizeIOSubsystem): shutdown of the pipe
-	* unix/tclUnixPipe.c (TclFinalizePipes):    management until after all
-	* win/tclWinPipe.c (TclFinalizePipes):	    channels have been closed,
-	in order to avoid a situation where the Windows PipeCloseProc2 would
-	re-establish the exit handler after exit handlers had already run,
-	corrupting the heap. [Bug 1225727] Also corrected a potential read of
-	uninitialized memory in PipeClose2Proc [Bug 1225044]
-
-2005-06-21  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclInt.h: Followup to change made on 2005-06-18 by Daniel
-	Steffen. There are compilers (*) who error out on the redefinition of
-	WORDS_BIGENDIAN. We have to undef the previous definition (on the
-	command line) first to make this acceptable. (*): AIX native.
-
-2005-06-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclFileName.c: Changed [file split] and [file join] to treat
-	Windows drive letters similarly to ~ syntax and make sure that they
-	appear with "./" in front when they are in intermediate components of
-	the path. [Bug 1194458]
-	* tests/fileName.test: Added test for the above bug.
-
-2005-06-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Added missing walk of the list of active
-	* generic/tclTrace.c:	traces to cleanup references to traces being
-	* generic/tclInt.h:	deleted. [Bug 1201035] Made the walk of the
-	* tests/trace.test (trace-34.*): active trace list aware of the
-	direction of trace scanning, so the proper correction can be made.
-	[Bug 1224585]
-
-2005-06-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tcl.m4 (SC_ENABLE_SYMBOLS): Only enable the 'compile' special
-	debugging feature when requested in configure.in; removes irrelevant
-	junk from the configure files of extensions that use Tcl's tcl.m4.
-
-2005-06-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompile.h (INST_PUSH_RETURN_OPTIONS): New opcode to allow
-	* generic/tclCompCmds.c (TclCompileCatchCmd):	   compilation of
-	* generic/tclCompile.c:				   TIP#90 catch [Bug
-	* generic/tclExecute.c (TclExecuteByteCode):	   1219112]
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Ensure we spill to the
-	command form in all cases where it generates an error.
-
-2005-06-20  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd): Generate an error if a mode
-	argument like -exact is passed more than once to the switch command.
-	The previous implementation silently accepted invalid switch
-	invocations like [switch -exact -glob $str ...].
-	* tests/for.test: Check some error cases when invoking continue and
-	break inside a for loop next script.
-	* tests/switch.test: Add checks for shortened version of a mode
-	argument like -exact. Add test for more than one mode argument. Add
-	test for odd case of passing a variable as a body script.
-
-2005-06-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.h: ensure WORDS_BIGENDIAN is defined correctly with
-	fat compiles on Darwin (i.e. ppc and i386 at the same time), the
-	configure AC_C_BIGENDIAN check is not sufficient in this case because a
-	single run of the compiler builds for two architectures with different
-	endianness.
-
-	* unix/tcl.m4 (Darwin): add -headerpad_max_install_names to LDFLAGS to
-	ensure we can always relocate binaries with install_name_tool.
-
-	* unix/configure: autoconf-2.59
-
-2005-06-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCmdAH.c (Tcl_FormatObjCmd): Fix for [Bug 1154163]; only
-	* tests/format.test: insert 'l' modifier when it is needed.
-
-2005-06-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclTimer.c (AfterDelay): Split out the code to manage
-	synchronous-delay [after] commands.
-	* tests/interp.test (interp-34.10): Time limits and synch-delay [after]
-	did not mix well... [Bug 1221395]
-
-2005-06-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_DeleteCommandFromToken): Only delete a
-	* tests/namespace.test (namespace-49.2): command from the hashtable on
-	reentrant processing if it has not been already deleted; at least three
-	deletes of the same command are possible. [Bug 1220058]
-	* generic/tclTrace.c (TraceCommandProc): Remove bogus error message
-	creation when traces trigger in situations where the command has
-	already been deleted.
-
-2005-06-13  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFCmd.c: correct fix to file mkdir 2005-06-09 [Bug 1219176]
-
-2005-06-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c: Factor out some common idioms into named forms
-	for greater clarity.
-
-2005-06-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/chan.n: Fold in the descriptive parts of the documentation for
-	all the commands that [chan] builds on top of.
-
-2005-06-09  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFCmd.c: fix to race condition in file mkdir [Bug 1217375]
-	* doc/glob.n: improve glob documentation [Bug 1190891]
-
-2005-06-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/expr.n, doc/mathfunc.n: Fix minor typos [Bug 1211078] and add
-	mention of distinctly-relevant [namespace path] subcommand.
-
-2005-06-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:		Reduced the Tcl_ObjTypes "index",
-	* generic/tclIndexObj.c:	"ensembleCmd", "localVarName", and
-	* generic/tclNamesp.c:		"levelReference" to file static scope.
-	* generic/tclProc.c:
-	* generic/tclVar.c:
-
-	* generic/tclObj.c:	Restored registration of the "procbody"
-	Tcl_ObjType, as required by the tclcompiler application.
-
-	* generic/tclDecls.h:		make genstubs
-	* generic/tclStubInit.c:
-
-2005-06-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIO.c (Tcl_ChannelTruncateProc): Stop proliferation of
-	* generic/tcl.h:			     channel type versions
-	* doc/CrtChannel.3:			     following advice from AKu
-
-	Bump patchlevel to a4 to distinguish from a3 release.
-
-	* generic/tclInt.h (INTERP_TRACE_IN_PROGRESS): Add flag so the error
-	* generic/tclIndexObj.c (Tcl_WrongNumArgs):    messages from ensembles
-	* generic/tclIOCmd.c (Tcl_ReadObjCmd):	       can be correct.
-
-	TIP#208 IMPLEMENTATION
-
-	* library/init.tcl: Create the chan ensemble.
-	* tests/chan.test: Rudimentary test suite.
-	* doc/chan.n: General documentation.
-
-	TRUNCATION API (part of TIP#208)
-	* generic/tcl.h, generic/tcl.decls: Declaration of the API.
-	* doc/CrtChannel.3, doc/OpenFileChnl.3: Documentation of the API.
-	* generic/tclBasic.c (Tcl_CreateInterp): Create the mapping into Tcl.
-	* generic/tclIOCmd.c (TclChanTruncateObjCmd): Implementation of
-	Tcl-level truncation API.
-	* generic/tclIO.c (Tcl_TruncateChannel): Generic C-level truncation API
-	implementation.
-	* unix/tclUnixChan.c (FileTruncateProc): Basic implementation of
-	truncating driver.
-
-	* win/tclWinChan.c (FileTruncateProc): Added implementation of file
-	truncation for Windows.
-	* tests/chan.test (chan-15.2): Added real test of truncation.
-
-2005-06-06  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclWin32Dll.c: Corrected another buglet in the assembly code for
-	stack probing on Win32/gcc. [Bug 1213678]
-	* generic/tclObj,c: Added missing 'static' on definition of
-	UpdateStringOfBignum, and removed a 'switch' on a 'long long' operand
-	(which HP-UX native 'cc' seems unable to handle). [Bug 1215775]
-
-2005-06-04  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	*** 8.5a3 TAGGED FOR RELEASE ***
-
-	* unix/Makefile.in (dist): add libtommath
-
-2005-06-03  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* library/parray.tcl (parray): Only generate the sorted list of element
-	names once. Thanks to Andreas Leitgeb for spotting this.
-
-2005-06-03  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: fixed 'embedded' target.
-
-2005-06-02  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/Makefile.in (html): add BUILD_HTML_FLAGS optional var
-	* tools/tcltk-man2html.tcl: add a --useversion to prevent confusion
-	when multiple Tcl source dirs exist.
-
-2005-06-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	For compatibility with earlier Tcl releases,
-	* generic/tclResult.c:	when a command procedure simply does a
-	* generic/tclTest.c:	"return TCL_RETURN;" we must interpret that
-	* tests/result.test:	the same as
-	"return Tcl_SetReturnOptions(interp, Tcl_NewObj());"  [Bug 1209759].
-
-2005-06-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Allow compilation of
-	-nocase -glob [switch]es (only one we know how to compile).
-
-	TIP#241 IMPLEMENTATION from Joe Mistachkin
-
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd, Tcl_LsortObjCmd):
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd): Implementation of -nocase
-	option for [lsearch], [lsort] and [switch] commands.
-	* win/tclWinPort.h: Win uses nonstandard function names...
-	* tests/cmdIL.test, tests/lsearch.test, tests/switch.test: Tests
-	* doc/lsearch.n, doc/lsort.n, doc/switch.n: Docs
-
-	* generic/tclCompCmds.c (TclCompileLindexCmd): Compile the most common
-	case of [lindex] more efficiently.
-
-	* unix/tclUnixNotfy.c (Tcl_FinalizeNotifier): Pass the correct number
-	of arguments to Tcl_JoinThread.
-
-2005-05-31  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/configure.in, unix/tcl.m4: Standardize generation of help
-	messages to always use AC_HELP_STRING and always (except for --with-tcl
-	and --with-tk, where the default is complex) say what the default is.
-
-2005-05-31  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	* unix/tclUnixNotfy.c: the notifier thread is now created as joinable
-	thread and it is properly joined in Tcl_FinalizeNotifier. This is an
-	attempt to fix the [Bug 1082283].
-
-2005-05-30  Zoran Vasiljevic  <vasiljevic@users.sf.net>
-
-	* win/tclWinThrd.c: Fixed [Bug 1204064]
-
-2005-05-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	TIP #229 IMPLEMENTATION
-
-	* generic/tclNamesp.c (Tcl_FindCommand, TclResetShadowedCmdRefs)
-	(NamespacePathCmd, SetNsPath, UnlinkNsPath, TclInvalidateNsPath):
-	Implementation of the [namespace path] command and the command name
-	resolution engine.
-	* doc/info.n, doc/namespace.n: Doc updates.
-	* tests/namespace.test (namespace-51.*): Test updates.
-	* generic/tclResolve.c (BumpCmdRefEpochs, Tcl_SetNamespaceResolvers):
-	* generic/tclBasic.c (Tcl_CreateCommand, Tcl_CreateObjCommand): Ensure
-	that people don't see stale paths.
-	* generic/tclInt.h (Namespace, NamespacePathEntry): Structure defs.
-	* generic/tclCmdIL.c (InfoCommandsCmd): Updates to [info commands].
-
-2005-05-26  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Makefile: moved & corrected EMBEDDED_BUILD check.
-
-	* unix/configure.in: corrected framework finalization to softlink stub
-	library to Versions/8.x subdir instead of Versions/Current.
-	* unix/configure: autoconf-2.59
-
-2005-05-25  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclCmdMZ.c (Tcl_TimeObjCmd): add necessary cast
-
-2005-05-25  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP#182 IMPLEMENTATION	[Patch 1165062]
-
-	* doc/mathfunc.n:	New built-in math function bool().
-	* generic/tclBasic.c:
-	* tests/expr.test:
-	* tests/info.test:
-
-2005-05-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl:	Updated [unknown] to be sure the [return]
-	* tests/init.test:	options from an auto-loaded command are seen
-	correctly by the caller.
-
-2005-05-24  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tests/env.test: added DYLD_FRAMEWORK_PATH to the list of env vars
-	that need to be handled specially.
-
-	* macosx/Makefile:
-	* macosx/README:
-	* macosx/Tcl-Info.plist.in (new file):
-	* unix/Makefile.in:
-	* unix/configure.in:
-	* unix/tcl.m4:
-	* unix/tclUnixInit.c: moved all Darwin framework build support from
-	macosx/Makefile into the standard unix configure/make buildsystem, the
-	macosx/Makefile is no longer required to build Tcl.framework (but its
-	functionality is still available for backwards compatibility).
-	* unix/configure: autoconf-2.59
-
-	* generic/tclIOUtil.c (TclLoadFile):
-	* generic/tclInt.h:
-	* unix/tcl.m4:
-	* unix/tclLoadDyld.c: added support for [load]ing .bundle binaries in
-	addition to .dylib's: .bundle's can be [unload]ed (unlike .dylib's),
-	and can be [load]ed from memory, e.g. directly from VFS without needing
-	to be written out to a temporary location first. [Bug 1202209]
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-	* generic/tclCmdMZ.c (Tcl_TimeObjCmd): change [time] called with a
-	count > 1 to return a string with a float value instead of a rounded
-	off integer. [Bug 1202178]
-
-	* doc/expr.n:
-	* doc/string.n: fixed roff syntax complaints from 'make html'.
-
-2005-05-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParseExpr.c:	Corrected parser to recognize all
-	boolean literals accepted by Tcl_GetBoolean, including prefixes like
-	"y" and "f", and to allow "eq" and "ne" as function names in the proper
-	context. [Bug 1201589].
-
-2005-05-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (TclEvalObjvInternal): Rewrite for greater
-	clarity; although 'goto' is Bad, the contortions you have to go through
-	to avoid it can be worse...
-
-2005-05-19  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXNotify.c (Tcl_InitNotifier): fixed crashing CFRelease
-	of runLoopSource in Tcl_InitNotifier (reported by Zoran):
-	CFRunLoopAddSource doesn't CFRetain, so can only CFRelease the
-	runLoopSource in Tcl_FinalizeNotifier.
-
-2005-05-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_ExprBoolean):	Rewrite as wrapper around
-	Tcl_ExprBooleanObj.
-
-	* generic/tclCmdMZ.c ([string is boolean/true/false]): Rewrite dropping
-	string-based Tcl_GetBoolean call, so that internal reps are kept for
-	subsequent quick boolean operations.
-
-	* generic/tclExecute.c:	Dropped most special handling of the "boolean"
-	Tcl_ObjType, since that type should now be rarely encountered.
-
-	* doc/BoolObj.3:	Rewrite of documentation dropping many details
-	about the internals of Tcl_Objs. Shorter documentation focuses on the
-	function and use of the routines.
-
-	* generic/tclInt.h:	Revision to the "boolean" Tcl_ObjType, so that
-	* generic/tclObj.c:	only string values like "yes" and "false" are
-	* tests/obj.test:	kept as the "boolean" Tcl_ObjType. The string
-	values "0" and "1" are kept as "int" Tcl_ObjType, which also produce
-	quick calls to Tcl_GetBooleanFromObj(). Since this internal change
-	means a Tcl_ConvertToType to a "boolean" Tcl_ObjType might not produce
-	a Tcl_Obj of type "boolean", the registration of the "boolean" type is
-	also removed.
-	***POTENTIAL INCOMPATIBILITY***
-	For callers of Tcl_GetObjType on the type name "boolean".
-
-2005-05-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclObj.c (TclInitObjSubsystem):	Removed the
-	* tests/listObj.test:	registration of the Tcl_ObjType's "list",
-	* tests/obj.test:	"procbody", "index", "ensembleCommand",
-	"localVarName", and "levelReference". The only reason to register a
-	Tcl_ObjType is to have it returned by Tcl_GetObjType, and the only
-	reason for that is to retrieve a (Tcl_ObjType *) to pass to
-	Tcl_ConvertToType(). None of the types above can support a
-	Tcl_ConvertToType() call; they panic. Better not to offer something
-	than to lead users into a panic.
-	***POTENTIAL INCOMPATIBILITY***
-	For callers of Tcl_GetObjType on the type names listed above.
-
-2005-05-15  Kevin Kenny  <kennykb@users.sourceforge.net>
-
-	* win/tclWin32Dll.c: conditioned definition of EXCEPTION_REGISTRATION
-	structures on HAVE_NO_SEH, to fix a bug in buildability on MSVC.
-
-2005-05-14  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.decls:
-	* generic/tclTest.c:
-	* generic/tclUtil.c:
-	* win/tclWin32Dll.c: fixed link error due to direct access by tclTest.c
-	to the MODULE_SCOPE tclPlatform global: renamed existing
-	TclWinGetPlatform() accessor to TclGetPlatform() and moved it to
-	generic code so that it can be used by on all platforms where
-	MODULE_SCOPE is enforced.
-
-	* macosx/tclMacOSXBundle.c:
-	* unix/tclUnixInit.c:
-	* unix/tcl.m4 (Darwin): made use of CoreFoundation API configurable and
-	added test of CoreFoundation availablility to allow building on ppc64,
-	replaced HAVE_CFBUNDLE by HAVE_COREFOUNDATION; test for availability of
-	Tiger or later OSSpinLockLock API.
-
-	* unix/tclUnixNotfy.c:
-	* unix/Makefile.in:
-	* macosx/tclMacOSXNotify.c (new file): when CoreFoundation is
-	available, use new CFRunLoop based notifier: allows easy integration
-	with other event loops on Mac OS X, in particular the TkAqua Carbon
-	event loop is now integrated via a standard tcl event source (instead
-	of TkAqua upon loading having to finalize the exsting notifier and
-	replace it with its custom version). [Patch 1202052]
-
-	* tests/unixNotfy.test: don't run unthreaded tests on Darwin since
-	notifier may be using threads even in unthreaded core.
-
-	* unix/tclUnixPort.h:
-	* unix/tcl.m4 (Darwin): test for thread-unsafe realpath during
-	configure, as Darwin 7 and later realpath is threadsafe.
-
-	* macosx/Makefile: enable configure caching.
-
-	* unix/configure.in: wrap tclConfig.h header in #ifndef _TCLCONFIG so
-	that it can be included more than once without warnings from gcc4.0 (as
-	happens e.g. when including both tclInt.h and tclPort.h)
-
-	* macosx/tclMacOSXBundle.c:
-	* unix/tclUnixChan.c:
-	* unix/tclLoadDyld.c:
-	* unix/tclUnixInit.c: fixed gcc 4.0 warnings.
-
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c: make genstubs
-
-2005-05-13  Kevin Kenny  <kennykb@acm.org>
-
-	* win/tclWin32Dll.c: Further rework of the SEH logic. All
-	EXCEPTION_REGISTRATION records are now in the activation record rather
-	than pushed on the stack.
-
-2005-05-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Dropped the TCL_NO_MATH configuration. It's
-	* generic/tclBinary.c:	believed this has not been working in a long
-	* generic/tclExecute.c: time. Tcl needs math.h. [RFE 1200680]
-	* unix/Makefile.in:
-
-2005-05-12  Kevin Kenny  <kennykb@acm.org>
-
-	* doc/mathfunc.n: Changed NAME line to match the name of the page.
-
-2005-05-11  Kevin Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Resynchronized with the HEAD; at this
-	checkpoint [-rkennykb-numerics-branch-20050511], the HEAD and
-	kennykb-numerics-branch contain identical code.
-
-2005-05-11  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c (TclStrToD, RefineResult, ParseNaN): Changed the
-	code to cast 'char' to UCHAR explicitly when using ctype macros, to
-	silence complaints from the Solaris compiler.
-
-2005-05-10  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tclUnixFCmd.c: add lint attr to enum to satisfy strictly
-	compliant compilers that don't like trailing ,s.
-
-	* tests/string.test: string-10.[21-30]
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): add extra checks to prevent
-	possible UMR in unichar cmp function for string map.
-
-2005-05-10  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclBinary.c (FormatNumber): Fixed a bug where NaN's resulted
-	in reads of uninitialized memory when using 'd', 'q', or 'Q' format.
-	* generic/tclStrToD.c (ParseNaN, TclFormatNaN): Added code to handle
-	the peculiarities of HP's PA_RISC, which uses a different 'quiet' bit
-	in NaN from everyone else.
-	* libtommath/tommath_superclass.h: Corrected C++-style comment.
-
-2005-05-10  Kevin Kenny  <kennykb@acm.org>
-
-	Merged all changes on kennykb-numerics-branch back into the HEAD.
-	TIP's 132 and 232 are now Final.
-
-2005-05-10  Kevin Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Merged changes from HEAD.
-
-2005-05-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (ExponLong, ExponWide):
-	* tests/expr.test (expr-23.34/35): fixed special case 'i**0' for i>0
-	[Bug 1198892]
-
-2005-05-09  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-	* win/tclWin32Dll.c (TclpCheckStackSpace, TclWinCPUID): Reworked
-	structured event handling to function even with -fomit-frame-pointers.
-
-2005-05-08  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-	* generic/tclStrToD.c: Made code more portable by finding a workaround
-	for MSVC's 'volatile' issue that does not require conditional
-	compilation.
-	* win/tclWin32Dll.c (TclWinCPUID): Removed structured event handling
-	from the GCC code since (a) bad code is generated by the instruction
-	scheduling with -O2, and (b) it's not needed on any reasonably modern
-	CPU.
-
-2005-05-07  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-	* generic/tclEvent.c:  Moved initialization of tclStrToD.c's
-	* generic/tclInt.h:    static constants into a procedure called
-	* generic/tclStrToD.c: from TclInitSubsystems to avoid double checked
-	locking protocol. Cleaned up an issue where MSVC ignored the
-	'volatile' specifier, causing incorrect comparison of an underflowed
-	number against zero.
-
-2005-05-06  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tcl.m4, unix/configure: correct Solaris 10 (5.10) check and add
-	support for x86_64 Solaris cc builds.
-
-2005-05-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Merged with HEAD.
-
-2005-05-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclWinThrd.c:  Corrected a compilation error on the
-			     --enable-threads configuration.
-
-2005-05-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.decls:	Converted TclMatchIsTrivial to a macro.
-	* generic/tclInt.h:
-	* generic/tclUtil.c:
-	* generic/tclIntDecls.h:	`make genstubs`
-	* generic/tclStubInit.c:
-	* generic/tclBasic.c:	Added callers of TclMatchIsTrivial where a
-	* generic/tclCmdIL.c:	search can be done more efficiently when it is
-	* generic/tclCompCmds.c:recognized that a pattern match is really an
-	* generic/tclDictObj.c:	exact match. [Patch 1076088]
-	* generic/tclIO.c:
-	* generic/tclNamesp.c:
-	* generic/tclVar.c:
-
-	* generic/tclCompCmds.c:	Factored common efficiency trick into a
-	macro named CompileWord.
-
-	* generic/tclCompCmds.c:	Replaced all instance of
-	* generic/tclCompile.c:		TCL_OUT_LINE_COMPILE with TCL_ERROR.
-	* generic/tclInt.h:		Now that we've eradicated the mistaken
-	* tests/appendComp.test:	notion of a "compile-time error", we
-	can use the TCL_ERROR return code to signal any failure to produce
-	bytecode.
-
-2005-05-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/DString.3:	Eliminated use of identifier "string" in Tcl's
-	* doc/Environment.3:	public C API to avoid conflict/confusion with
-	* doc/Eval.3:		the std::string of C++.
-	* doc/ExprLong.3, doc/ExprLongObj.3, doc/GetInt.3, doc/GetOpnFl.3:
-	* doc/ParseCmd.3, doc/RegExp.3, doc/SetResult.3, doc/StrMatch.3:
-	* doc/Utf.3, generic/tcl.decls, generic/tclBasic.c, generic/tclEnv.c:
-	* generic/tclGet.c, generic/tclParse.c, generic/tclParseExpr.c:
-	* generic/tclRegexp.c, generic/tclResult.c, generic/tclUtf.c:
-	* generic/tclUtil.c, unix/tclUnixChan.c:
-
-	* generic/tclDecls.h:	`make genstubs`
-
-2005-05-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tcl.decls:
-	* generic/tclBasic.c:	Simplified implementation of Tcl_ExprString.
-	* tests/expr-old.test:
-
-	* generic/tclDecls.h:	`make genstubs`
-
-2005-04-30  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixNotfy.c: applied dkf's tkMacOSXNotify.c cleanup changes.
-
-2005-04-29  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP#176 IMPLEMENTATION	[Patch 1165695]
-
-	* generic/tclUtil.c:	Extended TclGetIntForIndex to recognize index
-	formats including end+integer and integer+/-integer.
-
-	* generic/tclCmdMZ.c:	Extended the -start switch of [regexp] and
-	[regsub] to accept all index formats known by TclGetIntForIndex.
-
-	* doc/lindex.n:		Updated docs to note new index formats.
-	* doc/linsert.n, doc/lrange.n, doc/lreplace.n, doc/lsearch.n:
-	* doc/lset.n, doc/lsort.n, doc/regexp.n, doc/regsub.n, doc/string.n:
-
-	* tests/cmdIL.test:	Updated tests.
-	* tests/compile.test, tests/lindex.test, tests/linsert.test:
-	* tests/lrange.test, tests/lreplace.test, tests/lsearch.test:
-	* tests/lset.test, tests/regexp.test, tests/regexpComp.test:
-	* tests/string.test, tests/stringComp.test, tests/util.test:
-
-2005-04-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/unixInit.test (7.1): Alternative fix for the 2004-11-11 commit.
-
-2005-04-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl:	Corrected flaw in interactive command
-	* tests/main.test:	auto-completion. [Bug 1191409].
-
-	TIP#183 IMPLEMENTATION	[Patch 577093]
-
-	* generic/tclIOUtil.c (TclGetOpenModeEx):	New routine.
-	* generic/tclInt.h:
-
-	* generic/tclIO.c (Tcl_OpenObjCmd):	Support for "b" and
-	* doc/open.n:		"BINARY" in "access" argument to [open].
-	* tests/ioCmd.test:
-
-2005-04-26  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	* generic/tclBinary.c (FormatNumber): Dredge the NaN out of the
-	internal representation if Tcl_GetDoubleFromObj returns TCL_ERROR on a
-	NaN.
-
-	* generic/tclObj.c (Tcl_GetDoubleFromObj): Restored silent
-	overflow/underflow behaviour that the merge of 2004-04-25 messed up.
-	Thanks to Don Porter for calling attention to this bug. Also removed an
-	uninitialised memory reference in this function that valgrind caught.
-	Also changed to return TCL_ERROR on a pure NaN.
-
-	* generic/tclStrToD.c (RefineResult): Added a test for the initial
-	approximation being HUGE_VAL; this test avoids EDOM being returned from
-	ldexp on some platforms on input values exceeding the floating point
-	range.
-
-	* tests/expr.test (expr-29.*, expr-30.*): Added further tests of
-	overflow/underflow on input conversions.
-
-2005-04-25  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	[kennykb-numerics-branch] Merged with HEAD.
-
-	* doc/CrtMathFunc.n:		Revised documentation for TIP 232
-
-2005-04-25  Daniel Steffen  <das@users.sourceforge.net>
-
-	* compat/string.h: fixed memchr() protoype for __APPLE__ so that we
-	build on Mac OS X 10.1 again.
-
-	* generic/tclNotify.c (TclFinalizeNotifier): fixed notifier not being
-	finalized in unthreaded core (was testing for notifier initialization
-	in current thread by checking thread id != 0 but thread id is always 0
-	in untreaded core).
-
-	* win/tclWinNotify.c (Tcl_WaitForEvent):
-	* unix/tclUnixNotfy.c (Tcl_WaitForEvent): don't call ScaleTimeProc for
-	zero wait times (as specified in TIP 233).
-
-	* unix/Makefile.in: added @PLAT_SRCS@ to SRCS and split out NOTIFY_SRCS
-	from UNIX_SRCS for parity with UNIX_OBJS & NOTIFY_OBJS.
-
-	* unix/tcl.m4 (Darwin): added configure checks for recently added
-	linker flags -single_module and -search_paths_first to allow building
-	with older tools (and on Mac OS X 10.1), use -single_module in SHLIB_LD
-	and not just T{CL,K}_SHLIB_LD_EXTRAS, added unexporting from Tk of
-	symbols from libtclstub to avoid duplicate symbol warnings, added
-	PLAT_SRCS definition for Mac OS X, defined MODULE_SCOPE to
-	__private_extern__.
-	(SC_MISSING_POSIX_HEADERS): added caching of dirent.h check.
-
-	* unix/configure: autoconf-2.59
-
-2005-04-25  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	* library/tzdata/America/Boise:
-	* library/tzdata/America/Chicago:
-	* library/tzdata/America/Denver
-	* library/tzdata/America/Indianapolis:
-	* library/tzdata/America/Los_Angeles:
-	* library/tzdata/America/Louisville:
-	* library/tzdata/America/Managua:
-	* library/tzdata/America/New_York:
-	* library/tzdata/America/Phoenix:
-	* library/tzdata/America/Port-au-Prince:
-	* library/tzdata/America/Indiana/Knox:
-	* library/tzdata/America/Indiana/Marengo:
-	* library/tzdata/America/Indiana/Vevay:
-	* library/tzdata/America/Kentucky/Monticello:
-	* library/tzdata/America/North_Dakota/Center:
-	* library/tzdata/Asia/Tehran:
-	Olson's tzdata2005i. Corrects exact time at which Standard Time was
-	adopted in the US (generally, noon, Standard Time, rather than noon,
-	Local Mean Time). Adopts new civil rules for Nicaragua and Iran.
-
-2005-04-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl:	Use "ni" and "in" operators.
-
-2005-04-25  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: fix for [Bug 1189274].
-
-2005-04-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclLiteral.c:	Silence compiler warnings.
-	* generic/tclObj.c:	[Bug 1188863].
-
-2005-04-22  Don Porter	<dgp@users.sourceforge.net>
-
-	The 2005-04-21 changes to Tcl_GetBooleanFromObj were done to bring it
-	into agreement with its docs. Further investigation reveals it was the
-	docs that were incorrect.
-
-	* doc/BoolObj.3:	Corrections to the documentation of
-	Tcl_GetBooleanFromObj to bring it into agreement with what this public
-	interface has always done, including noting the difference in function
-	between Tcl_GetBooleanFromObj and Tcl_GetBoolean.
-
-	* generic/tclGet.c:	Revised Tcl_GetBoolean to no longer be a
-	wrapper around Tcl_GetBooleanFromObj (different function!).
-
-	* generic/tclObj.c:	Removed TclGetTruthValueFromObj routine that
-	was added yesterday. Revisions so that only Tcl_GetBoolean-approved
-	values get the "boolean" Tcl_ObjType. This retains the fix for [Bug
-	1187123].
-	* tests/string.test:	Test string-23.0 for Bug 1187123.
-
-	* generic/tclInt.h:	Revert most recent change.
-	* generic/tclBasic.c:
-	* generic/tclCompCmds.c:
-	* generic/tclDictObj.c:
-	* generic/tclExecute.c:
-	* tests/obj.test:
-
-2005-04-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/GetInt.3:	Convert argument "string" to "str" to agree with code.
-	Also clarified a few details on int and double formats.
-	* generic/tclGet.c:	Radical code simplification. Converted
-	Tcl_GetFoo() routines into wrappers around Tcl_GetFooFromObj(). Reduces
-	code duplication, and the resulting potential for inconsistency.
-
-	* generic/tclObj.c:	Several changes:
-
-	- Re-ordered error detection code so all values with trailing garbage
-	  receive a "not an integer" message instead of an "integer too large"
-	  message.
-	- Removed inactive code meant to deal with strtoul* routines that fail
-	  to parse leading signs. All of them do, and if any are detected that
-	  do not, the correct fix is replacement with compat/strtoul*.c, not a
-	  lot of special care by the callers.
-	- Tcl_GetDoubleFromObj now avoids shimmering away a "wideInt" intrep.
-	- Fixed Tcl_GetBooleanFromObj to agree with its documentation and with
-	  Tcl_GetBoolean, accepting only "0" and "1" and not other numeric
-	  strings. [Bug 1187123]
-	- Added new private routine TclGetTruthValueFromObj to perform the more
-	  permissive conversion of numeric values to boolean that is needed by
-	  the [expr] machinery.
-
-	* generic/tclInt.h (TclGetTruthValueFromObj):	New routine.
-	* generic/tclExecute.c:	Updated callers to call new routine.
-	* generic/tclBasic.c:	Updated callers to call new routine.
-	* generic/tclCompCmds.c:	Updated callers to call new routine.
-	* generic/tclDictObj.c:	Updated callers to call new routine.
-	* tests/obj.test:	Corrected bad tests that actually expected
-	values like "47" and "0xAC" to be accepted as booleans.
-
-	* generic/tclLiteral.c: Disabled the code that forces some literals
-	into the "int" Tcl_ObjType during registration. We can re-enable it if
-	this change causes trouble, but it seems more sensible to let Tcl's
-	"on-demand" shimmering rule, and not try to pre-guess things.
-
-2005-04-20  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-	* doc/expr.n:
-	* doc/mathfunc.n (new file):	Revised documentation for TIP 232
-
-2005-04-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclGet.c (Tcl_GetInt):	Corrected error that did not
-	* generic/tclObj.c (Tcl_GetIntFromObj): permit 0x80000000 to be
-	recognized as an integer on TCL_WIDE_INT_IS_LONG systems [Bug 1090869].
-
-2005-04-20  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclFileName.c: Silenced a compiler warning about '/*' within
-	a comment.
-
-2005-04-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Added unsupported command
-	* generic/tclCmdAH.c:	[::tcl::unsupported::EncodingDirs] to permit
-	* generic/tclInt.h:	query/set of the encoding search path at
-	* generic/tclInterp.c:	the script level. Updated init.tcl to make
-	* library/init.tcl:	use of the new command. Also updated several
-	coding practices in init.tcl ("eq" for [string equal], etc.)
-
-2005-04-19  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (Initialize): Put initialization code into a proc
-	to avoid inadvertently clobbering global variables. [Bug 1185933]
-	* tests/clock.test (clock-48.1): Added regression test for the above
-	bug.
-	Thanks to Ulrich Ring for reporting this bug.
-
-2005-04-16  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/Var.c (Tcl_ArrayObjCmd - ARRAY_NAMES): fix Tcl_Obj leak. [Bug
-	1084111]
-
-2005-04-16  Zoran Vasiljevic  <vasiljevic@users.sf.net>
-
-	* generic/tclIOUtil.c: force clenaup of the interp result in
-	TclLoadFile(). Some implementations of TclpFindSymbol() will seed the
-	interp result with error message when unable to find the requested
-	symbol (this is not considered to be an error).
-
-	Set of changes correcting huge memory waste (not a leak) when a thread
-	exits. This has been introduced in 8.4.7 within an attempt to correctly
-	cleanup after ourselves when Tcl library is being unloaded with the
-	Tcl_Finalize() call.
-
-	This fixes the [Bug 1178445]
-
-	* generic/tclInt.h: added prototypes for TclpFreeAllocCache() and
-	TclFreeAllocCache()
-
-	* generic/tclThreadAlloc.c: modified TclFinalizeThreadAlloc() to
-	explicitly call TclpFreeAllocCache with the NULL-ptr as argument
-	signalling cleanup of private tsd key used only by the threading
-	allocator.
-
-	* unix/tclUnixThrd.c: fixed TclpFreeAllocCache() to recognize when
-	being called with NULL argument. This is a signal for it to clean up
-	the tsd key associated with the threading allocator.
-
-	* win/tclWinThrd.c: renamed TclWinFreeAllocCache to TclpFreeAllocCache
-	and fixed to recognize when being called with NULL argument. This is a
-	signal for it to clean up the tsd key associated with the threading
-	allocator.
-
-2005-04-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/unixInit.test:	Disabled obsolete tests and removed code
-	* tests/encoding.test:	that supported them.
-	* generic/tclInterp.c:
-
-	* library/init.tcl:	Use auto-loading to bring in Tcl Module support
-	* library/tclIndex:	as needed. This reduces startup time by
-	* library/tm.tcl:	delaying this initialization to a later time.
-
-2005-04-15  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: missing semicolons caused failure to compile
-	with TCL_COMPILE_DEBUG.
-
-2005-04-13  David Gravereaux  <davygrvy@pobox.com>
-
-	* generic/tclIO.c (Tcl_SetChannelBufferSize): Lowest size limit
-	* tests/io.test:	changed from ten bytes to one byte. Need for
-	* tests/iogt.test:	this change was proven by Ross Cartlidge
-	<rossc@cisco.com> where [read stdin 1] was grabbing 10 bytes followed
-	by starting a child process that was intended to continue reading from
-	stdin. Even with -buffersize set to one, nine chars were getting lost
-	by the buffersize over reading for the native read() caused by [read].
-
-2005-04-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/tclUnixInit.c (TclpGetEncodingNameFromEnvironment): Reversed
-	order of verifying candidate [encoding system] value, checking against
-	a table in memory first before calling Tcl_GetEncoding and potentially
-	scanning through the filesystem. Also ordered the table so that a
-	binary search could be used within it. Improves startup time a bit more
-	on some systems.
-
-2005-04-13  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.n: Added a missing '--' on several [switch] commands to
-	improve performance of [clock format] and related operations. [FRQ
-	1182459]
-
-2005-04-13  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/fcopy.n: Improved documentation on copying binary files, added an
-	example and mentioned the use of [file copy].
-	* doc/fconfigure.n: Improved documentation of -encoding binary option.
-	This is all following comments from Steve Manning <steve@manning.net>
-	on comp.lang.tcl that the current documentation was not clear.
-
-2005-04-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c:Commented out the functions
-	TclPrintInstruction(), TclPrintObject() and TclPrintSource() when not
-	debugging the compiler, as they are never called in that case.
-
-2005-04-12  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInterp.c:	Corrected bad syntax of Tcl_Panic() call.
-
-	* generic/tclUtil.c (TclGetProcessGlobalValue):	More robust handling
-	of bad TclInitProcessGlobalValueProc behavior; an immediate panic
-	rather than a mysterious crash later.
-
-	* generic/tclEncoding.c:	Several changes to the way the
-	encodingFileMap cache is maintained. Previously, it was attempted to
-	keep the file map filled and up to date with changes in the encoding
-	search path. This contributed to slow startup times since it required
-	an expensive "glob" operation to fill the cache. Now the validity of
-	items in the cache are checked at the time they are used, so the cache
-	is permitted to fall out of sync with the encoding search path. Only
-	[encoding names] and Tcl_GetEncodingNames() now pay the full expense.
-	[Bug 1177363]
-
-2005-04-12  Kevin B. Kenny  <kennykb@acm.org>
-
-	* compat/strstr.c: Added default definition of NULL to accommodate
-	building on systems with badly broken headers. [Bug 1175161]
-
-2005-04-11  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tools/tclZIC.tcl: Rewrote to take advantage of more features of Tcl
-	8.5 (on which it was dependent anyway). Also added a [package require]
-	line to formalize the relationship.
-
-2005-04-11  Kevin Kenny  <kennykb@users.sf.net>
-
-	[kennykb-numerics-branch] Merged with HEAD. Updated to libtommath 0.35.
-
-	* generic/tclBasic.c: Attempted to repeat changes that applied to
-	tclExecute.c in Miguel Sofer's commit of 2005-04-01, together with
-	(possibly) a few more uses of his new object creation macros. Also
-	plugged a memory leak in TclObjInvoke. [Bug 1180368]
-
-2005-04-10  Kevin Kenny  <kennykb@acm.org>
-
-	* library/tzdata/America/Montevideo:
-	* library/tzdata/Asia/Almaty:
-	* library/tzdata/Asia/Aqtau:
-	* library/tzdata/Asia/Aqtobe:
-	* library/tzdata/Asia/Baku:
-	* library/tzdata/Asia/Jerusalem:
-	* library/tzdata/Asia/Oral:
-	* library/tzdata/Asia/Qyzylorda:
-	* library/tzdata/Indian/Chagos:
-	* library/tzdata/Indian/Cocos:		Olson's tzdata2005h
-
-2005-04-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclObjInvoke):	Plug memory leak. [Bug 1180368]
-
-2005-04-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: fix possible leak of expansion Tcl_Objs
-
-2005-04-09  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/README: updated requirements for OS & developer tool versions
-	and other small fixes/cleanup.
-
-	* generic/tclListObj.c (Tcl_ListObjIndex): added missing NULL return
-	when getting index from an empty list.
-
-	* unix/tcl.m4 (Darwin): added -single_module linker flag to
-	TCL_SHLIB_LD_EXTRAS and TK_SHLIB_LD_EXTRAS.
-	* unix/configure: autoconf-2.59
-
-2005-04-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h (TclGetEncodingFromObj):	 New function to
-	* generic/tclEncoding.c (TclGetEncodingFromObj): retrieve a
-	Tcl_Encoding value, as well as cache it in the internal rep of a new
-	"encoding" Tcl_ObjType.
-	* generic/tclCmdAH.c (Tcl_EncodingObjCmd):	Updated to call new
-	function so that Tcl_Encoding's used by [encoding convert*] routines
-	are not freed too quickly. [Bug 1077262]
-
-2005-04-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Rewritten to be able to
-	handle the other form of [switch] and generate slightly simpler (but
-	longer) code.
-
-2005-04-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/upvar.n, doc/unset.n, doc/tell.n, doc/tclvars.n, doc/subst.n:
-	* doc/seek.n, doc/scan.n, doc/regsub.n, doc/registry.n, doc/regexp.n:
-	* doc/read.n, doc/puts.n, doc/pkgMkIndex.n, doc/open.n, doc/lreplace.n:
-	* doc/lrange.n, doc/load.n, doc/llength.n, doc/linsert.n, doc/lindex.n:
-	* doc/lappend.n, doc/info.n, doc/gets.n, doc/format.n, doc/flush.n:
-	* doc/fileevent.n, doc/file.n, doc/fblocked.n, doc/close.n:
-	* doc/array.n, doc/Utf.3, doc/TraceVar.3, doc/StrMatch.3, doc/RegExp.3:
-	* doc/PrintDbl.3, doc/OpenTcp.3, doc/OpenFileChnl.3, doc/Object.3:
-	* doc/Notifier.3, doc/LinkVar.3, doc/IntObj.3, doc/Interp.3:
-	* doc/GetOpnFl.3, doc/GetIndex.3, doc/Eval.3, doc/CrtMathFnc.3:
-	* doc/CrtFileHdlr.3, doc/CrtCommand.3, doc/CrtChannel.3:
-	* doc/Backslash.3: Purge old .VS/.VE macro instances.
-
-	* tools/man2html2.tcl (IPmacro): Rewrote to understand what .IP really
-	is (.IP and .TP are really just two ways of doing the same thing).
-	Change below made this relevant.
-	* doc/re_syntax.n: Change some uses of .TP to .IP to work around bugs
-	in various *roff implementations. Also reworded the atom descriptions
-	slightly.
-
-2005-04-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (ExprSrandFunc):  Replaced incursions into the
-	* generic/tclUtil.c (TclGetIntForIndex): intreps of numeric types with
-	simpler calls of Tcl_GetIntFromObj and Tcl_GetLongFromObj, now that
-	those routines are better behaved wrt shimmering. [Patch 1177219]
-
-2005-04-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclObj.c: Change in TclDecrRefCount and TclFreeObj, to speed
-	up the freeing of simple Tcl_Obj [Patch 1174551]
-
-2005-04-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: small opts in obj handling
-
-2005-04-02  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c: converted a few function calls to macros.
-
-2005-04-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/ListObj.3:
-	* generic/tclBasic.c:
-	* generic/tclCmdIL.c:
-	* generic/tclConfig.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclListObj.c:
-	* generic/tclStubInit.c:
-	* generic/tclVar.c: Changed the internal representation of lists to
-	(a) reduce the malloc/free calls at list creation (from 2 to 1), (b)
-	reduce the cost of handling empty lists (we now never create a list
-	internal rep for them), (c) allow refcounting of the list internal rep.
-	The latter permits insuring that the pointers returned by
-	Tcl_ListObjGetElements remain valid even if the object shimmers away
-	from its original list type. This is [Patch 1158008]
-
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclObj.c:
-	* generic/tclStringObj.c:
-	(1) defined new internal macros for creating and setting frequently
-	used obj types (int,long, wideInt, double, string). Changed TEBC to use
-	eg 'TclNewIntObj(objPtr, i)' to avoid the function call in 'objPtr =
-	Tcl_NewIntObj(i)'
-	(2) ExecEnv now stores two Tcl_Obj* pointing to the constants "0" and
-	"1", for use by TEBC.
-	(3) slight reduction in cost of INST_START_CMD
-
-2005-03-31  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_JUMP_TRUE/FALSE): replaced "test and
-	branch" with "compute index into table"
-
-2005-03-30  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/FileSystem.3: Defined loadHandle argument. [Bug 1172401]
-
-2005-03-29  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/tcl.m4, win/configure: do not require cygpath in macros to allow
-	msys alone as an alternative.
-
-2005-03-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompile.h:	Move the TclInterpReady() declaration from
-	* generic/tclInt.h:	tclCompile.h to tclInt.h. Should have been done
-	as part of the 1115904 bug fix on 2005-03-18.
-
-	* generic/tclThreadTest.c:	Stop providing the phony package
-	"Thread 1.0" when the [::testthread] command is defined. It's never
-	used by anything, and conflicts with loading the real "Thread" package.
-
-2005-03-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c (TclCompileIncrCmd):	Corrected checks for
-	immediate operand usage to permit leading space and sign characters.
-	Restores more efficient bytecode for [incr x -1] that got lost in the
-	CONST string reforms of Tcl 8.4. [Bug 1165671]
-
-	* generic/tclBasic.c (Tcl_EvalEx):	Restored recursion limit
-	* generic/tclParse.c (TclSubstTokens):	testing in nested command
-	* tests/basic.test (basic-46.4):	substitutions within direct
-	* tests/parse.test (parse-19.*):	script evaluation (Tcl_EvalEx)
-	that got lost in the parser reforms of Tcl 8.1. Added tests for correct
-	behavior. [Bug 1115904]
-
-2005-03-15  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c:
-	* win/tclWinFile.c:
-	* tests/winFCMd.test: fix to 'file pathtype' and 'file norm' failures
-	on reserved filenames like 'COM1:', etc.
-
-2005-03-15  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* unix/tcl.m4:	  Updated the OpenBSD configuration and regenerated
-	* unix/configure: the configure script.
-
-2005-03-15  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Merged with HEAD.
-
-	* generic/tclBasic.c (many):
-	* generic/tclCompExpr.c (CompileMathFuncCall):
-	* generic/tclCompile.h:
-	* generic/tclExecute.c (many):
-	* generic/tclParseExpr.c (ParsePrimaryExpr):
-	* tests/compExpr-old.test:
-	* tests/compExpr.test:
-	* tests/compile.test:
-	* tests/expr-old.test:
-	* tests/expr.test:
-	* tests/for.test:
-	* tests/parseExpr.test: Initial implementation of TIP #232.
-
-	* generic/tclObj.c (Tcl_DbNewBignumObj): Fixed typo that broke
-	--enable-symbols=mem build
-	* tests/binary.test (binary-40.3, binary-40.6): Corrected tests to
-	allow NaN(7ffffffffffff).
-
-2005-03-14  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: fixed INST_PUSH1's debugging code (wrong obj
-	ref passed to TRACE_WITH_OBJ).
-
-2005-03-14  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c: fixed INST_RETURN's stack effect in
-	tclInstructionTable (-1 instead of -2)
-
-2005-03-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompCmds.c: removed debugging line
-
-2005-03-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclTrace.c (TclCheckInterpTraces):	Corrected mistaken cast
-	of ClientData to (TraceCommandInfo *) when not warranted. Thanks to
-	Yuri Victorovich for the report. [Bug 1153871]
-	* generic/tcl.h:	Moved flag values TCL_TRACE_ENTER_EXEC and
-	* generic/tclInt.h:	TCL_TRACE_LEAVE_EXEC from public interface into
-	private. Should be used only by internal workings of execution traces.
-
-2005-03-09  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Merged from HEAD.
-
-	* doc/PrintDbl.3:
-	* doc/tclVars.n: Documented new semantics for tcl_precision.
-	* generic/tclExecute.c (Tcl_ExecuteByteCode): Removed the check for
-	division-by-zero on IEEE-754 machines.
-	* generic/tclUtil.c (Tcl_PrintDouble): Corrected bug where numbers in
-	the range [1e-4 .. 1.) were printed incorrectly.
-	* tests/compExpr-old.test (compExpr-old-11.13): Revised test case for
-	division by zero.
-	* tests/expr-old.test (expr-34.11, expr-34.12): Revised test cases for
-	overflow in pow() to deal with infinities.
-	* tests/expr.test (expr-11.13, expr-29.1, expr-29.2): Revised test case
-	for division by zero and for underflow on input conversions.
-	* tests/parseExpr.test (parseExpr-16.11): Revised test case for
-	overflow on input conversion.
-	* tests/string.test (string-6.38 deleted): Removed test case for
-	underflow on input conversion, which is no longer an error.
-	* tests/util.test (util-10.*): Added test case for the bug in tclUtil.c
-
-2005-03-08  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/makefile.vc: clarify necessary defined vars that can come from
-	MSVC or the Platform SDK.
-
-2005-03-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/string.n: Minor typo. [Bug 1158247]
-
-2005-03-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: new peephole optimisation for INST_PUSH1; fixed
-	the peephole opt in INST_POP so that it is not used when
-	TCL_COMPILE_DEBUG is defined.
-
-2005-03-04  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclCmdMZ.c: Changed [scan] to treat out-of-range floating
-	point values as infinities and zeroes.
-	* generic/tclExecute.c: Changed [expr] to be permissive about
-	infinities, allowing them to propagate.
-	* generic/tclGet.c: Changed Tcl_GetDouble to be permissive about
-	over/underflow.
-	* generic/tclObj.c: Changed SetDoubleFromAny to be permissive about
-	over/underflow.
-	* generic/tclParseExpr.c: Made [expr] permissive about input numbers
-	out of range.
-
-2005-03-03  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclInt.h:
-	* generic/tclStrToD.c (Tcl_DoubleDigits, TclFormatNaN):
-	* generic/tclUtil.c (Tcl_PrintDouble): Changed the signature of
-	TclDoubleDigits so that it accepts a pointer to the signum of the
-	argument, and returns the signum via that pointer. Added very hacky
-	code to handle IEEE signed zeroes in Tcl_DoubleDigits. (It can't be
-	done other than as a hack until C9x; C89 simply doesn't deal with the
-	concept of -0.0). Added output conversion of tagged NaN values.
-	* generic/tclBinary.c (FormatNumber): Changed to allow [binary format]
-	to handle NaN.
-	* tests/binary.test (binary-60.1): Added a quick-n-dirty test to make
-	sure that NaN's can be scanned and formatted.
-	* generic/tclParseExpr.c (GetLexeme, ParseMaxDoubleLength): Modified so
-	that tagged NaN (e.g., NaN(DEADBEEF)) can be recognized.
-
-2005-03-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Merged with HEAD as of 2005-02-23.
-
-	* generic/tclExecute.c: Broadened test for NaN to work on Windows.
-	* generic/tclInt.h:
-	* generic/tclStrToD.c (Tcl_DoubleDigits):
-	* generic/tclUtil.c (Tcl_PrintDouble, TclPrecTraceProc): Added
-	Tcl_DoubleDigits to format 'double' numbers with the minimum number of
-	significant digits to yield correct rounding. Modified tcl_precision
-	to accept 0 as a precision (meaning "minimum digits"), and made 0 the
-	default. [TIP #132]
-	* generic/tclObj.c: Made NaN's throw an error in Tcl_GetDoubleFromObj.
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc: Added libtommath/bn_mp_init_set.c to the build.
-	* libtommath/tommath.h (mp_iseven): Fixed a bug that caused zero to
-	test 'odd'.
-	* generic/tommath.h: Regenerated.
-	* tests/binary.test:
-	* tests/expr-old.test:
-	* tests/expr.test:
-	* tests/scan.test: Corrected a number of tests that depended on
-	tcl_precision, and removed the {eformat} condition from tests that no
-	longer require it.
-	* tests/util.test: Corrected a number of tests that depended on
-	tcl_precision, and removed the {eformat} condition from tests that no
-	longer require it. Added a series of tests for correct rounding in
-	Tcl_PrintDouble. [TIP #132].
-
-2005-03-01  David N. Welton  <davidw@dedasys.com>
-
-	* doc/CrtSlave.3: Changed to Tcl_Object to Tcl_Obj in the man page.
-
-2005-02-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Better use of [glob -types] to avoid
-	* tests/tcltest.test:	failed attempts to [source] a directory, and
-	similar matters. Thanks to "mpettigr". [Bug 1119798]
-
-	* library/tcltest/pkgIndex.tcl: Bump to tcltest 2.2.8
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2005-02-23  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/CrtChannel.3 (THREADACTIONPROC): Formatting fix. [Bug 1149605]
-
-2005-02-17  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/tclWinFCmd.c (TraverseWinTree): use wcslen on wchar, not
-	Tcl_UniCharLen.
-
-2005-02-16  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/variable.n: fix for [Bug 1124160], variables are detected by
-	[info vars] but not by [info locals].
-
-2005-02-11  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/Makefile.in: remove SHLIB_LD_FLAGS (only for AIX, inlined into
-	* unix/tcl.m4:	    SHLIB_LD). Combine AIX-* and AIX-5 branches in
-	* unix/configure:   SC_CONFIG_CFLAGS. Correct gcc builds for AIX-4+
-	and HP-UX-11. autoconf-2.59 gen'd.
-
-2005-02-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/basic.test (basic-26.3): new test
-
-2005-02-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_EvalObjEx):
-	* tests/basic.test (basic-26.2): preserve the arguments passed to TEOV
-	in the pure-list branch, in case the list shimmers away. Fix for [Bug
-	1119369], reported by Peter MacDonald.
-
-2005-02-10  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c: fix for test failures introduced on 2005-01-17
-	[Bug 1119092]
-
-2005-02-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/binary.n: Made the documentation of sign bit masking and [binary
-	scan] consistent. [Bug 1117017]
-
-2005-02-08  David N. Welton  <davidw@dedasys.com>
-
-	* doc/CrtChannel.3: Typo: return->returns.
-
-2005-02-06  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclStrToD.c (TclStrToD, SafeLdExp): Added code to manage the
-	FPU precision on gcc+x86. Enabled fast conversion of floats with small
-	exponents now that precision is correct.
-	* tests/expr.test: Corrected test for the smallest representible value
-	to the right IEEE values.
-
-2005-02-06  David N. Welton  <davidw@dedasys.com>
-
-	* doc/Thread.3: One-word grammar fix.
-
-2005-02-05  David N. Welton  <davidw@dedasys.com>
-
-	* doc/Thread.3: Fixed sentence describing flags for Tcl_CreateThread.
-
-	* doc/FileSystem.3: Cleaned up typo in Tcl_FSNewNativePath
-	documentation.
-
-	* generic/tclPathObj.c: Cleaned up typo in comment.
-
-2005-02-03  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-
-	* generic/tclStrToD.c (TclStrToD, RefineResult, SafeLdExp): Added code
-	to ensure that 'ldexp' is never called with a value that will underflow
-	* tests/expr.test: Added tests for the smallest representible value,
-	and rounding between it and zero. (The tests reflect current
-	behaviour; plan is to change the specification of Tcl so that input
-	conversion of doubles underflows silently.)
-
-2005-02-02  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclProc.c (TclInitCompiledLocals): Add check for type of the
-	framePtr->procPtr->bodyPtr passed to TclInitCompiledLocals and panic if
-	it is not the correct type. If the body of the proc is not of the
-	compiled byte code type then the code will crash. This was discovered
-	while tracking down a crash in Itcl, that crash is fixed by Itcl patch
-	1115085.
-
-2005-02-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]  Merged with HEAD as of today.
-
-	* generic/tclInt.decls: Changed numbers of new stubs to resolve a
-	conflict.
-	* generic/tclInt.h: Added new TclStrToD routine that replaces the
-	native 'strtod' throughout Tcl.
-	* generic/tclCmdMZ (Tcl_StringObjCmd):
-	* generic/tclGet.c (Tcl_GetDouble):
-	* generic/tclObj.c (SetBooleanFromAny, SetDoubleFromAny):
-	* generic/tclParseExpr.c (GetLexeme):
-	* generic/tclScan.c (Tcl_ScanObjCmd): Replaced all uses of the native
-	'strtod' with a TclStrToD routine that performs correct rounding and
-	handles denormals.
-	* generic/tclStrToD.c: (new file)
-	New scanning function for extracting 'double' from a string that rounds
-	correctly, and handles denormals and infinities.
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc:
-	Added tclStrToD.c and the tommath routines that support it.
-
-	These changes represent a partial implementation of TIP #132. Output
-	conversion of floating point numbers, and proper handling of infinities
-	within expressions, still need to be addressed.
-
-2005-02-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclCompEvalObj): Removed stray statement left
-	behind in prior code reorganization.
-
-2005-01-31  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/configure:	autoconf-2.57
-
-2005-01-30  Joe English  <jenglish@users.sourceforge.net>
-
-	* unix/configure.in: Restored two double-evals that were removed in the
-	DBGX purge; these are still needed on some platforms to account for
-	TCL_TRIM_DOTS. [Bug 1112654]
-
-	* unix/configure: NOT REGENERATED: only have autoconf 2.59 here, need
-	to find someone with autoconf 2.57.
-
-2005-01-28  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/configure, unix/tcl.m4: add solaris 64-bit gcc build support.
-	[Bug 1021871]
-
-2005-01-28  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/expr-old.test (expr-old-37.2): Added test for [Bug 1109484]
-
-2005-01-27  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclBasic.c (Tcl_ExprBoolean, Tcl_ExprDouble)
-	(Tcl_ExprLong): Fix to recognize Tcl_WideInt type. [Bug 1109484]
-
-2005-01-26  Andreas Kupries  <andreask@activestate.com>
-
-	TIP#218 IMPLEMENTATION
-
-	* generic/tclDecls.h:	Regenerated from tcl.decls.
-	* generic/tclStubInit.c:
-
-	* doc/CrtChannel.3:	Documentation of extended API,
-	* generic/tcl.decls:	extended testsuite, and
-	* generic/tcl.h:	implementation. Removal of old
-	* generic/tclIO.c:	driver-specific TclpCut/Splice
-	* generic/tclInt.h:	functions. Replaced with generic
-	* tests/io.test:	thread-action calls through the
-	* unix/tclUnixChan.c:	new hooks. Update of all builtin
-	* unix/tclUnixPipe.c:	channel drivers to version 4.
-	* unix/tclUnixSock.c:	Windows drivers extended to
-	* win/tclWinChan.c:	manage thread state in a thread
-	* win/tclWinConsole.c:	action handler.
-	* win/tclWinPipe.c:
-	* win/tclWinSerial.c:
-	* win/tclWinSock.c:
-
-2005-01-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/auto.tcl:	Updated [auto_reset] to clear auto-loaded
-	commands in namespaces other than :: and to clear auto-loaded commands
-	that do not happen to be procs. [Bug 1101670]
-	***POTENTIAL INCOMPATIBILITY***
-
-2005-01-25  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4 (Darwin): fixed bug with static build linking to dynamic
-	library in /usr/lib etc instead of linking to static library earlier in
-	search path. [Bug 956908] Removed obsolete references to Rhapsody.
-	* unix/configure: autoconf-2.57
-
-2005-01-21  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclStubInit.c: Regenerated the stubs support code from the
-	* generic/tclDecls.h:	 modified tcl.decls (TIP #233, see below).
-
-	* doc/GetTime.3:       Implemented TIP #233, i.e. the
-	* generic/tcl.decls:   'Virtualization of Tcl's Sense of Time'.
-	* generic/tcl.h:       Declared, implemented, and documented the
-	* generic/tclInt.h:    specified new API functions. Moved the
-	* unix/tclUnixEvent.c: native (OS) access to time information
-	* unix/tclUnixNotfy.c: into standard handler functions. Inserted
-	* unix/tclUnixTime.c:  hooks calling on the handlers where native
-	* win/tclWinNotify.c:  access was done before, and where scaling
-	* win/tclWinTime.c:    between domains (real/virtual) is required.
-
-2005-01-21  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclThread.c: Typo police. Fixed some nits
-	* generic/tclCmdAH.c:  in header comments of functions.
-	* generic/tclBasic.c:  (Missing --).
-	* generic/tclFileName.c:
-
-2005-01-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/FileSystem.3: Add missing ARGUMENTS section definitions for
-	arguments to Tcl_FSLink. [Bug 1106272]
-
-2005-01-21  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch]
-
-	* unix/Makefile.in: Updated Makefile to build libtommath on Unix as
-	well as Windows. [Bug 1106865]
-
-	* generic/tclTestObj.c (TestbignumobjCmd): Silenced a compiler warning
-	about a mismatched 'const'.
-
-2005-01-20  Kevin B. Kenny  <kennykb@acm.org>
-
-	[kennykb-numerics-branch] Development checkpoint.
-
-	* compat/strtoll.c:	Reverted to HEAD.
-	* compat/strtoull.c:
-	* doc/Ensemble.3:
-	* generic/tclBasic.c:
-	* generic/tclCmdIL.c:
-	* generic/tclNamesp.c:
-	* generic/tclPathObj.c:
-	* generic/tclPort.h:
-	* unix/configure:
-	* unix/configure.in:
-	* unix/tcl.m4:
-	* win/configure:
-	* win/configure.in:
-	* win/rules.vc:
-	* win/tcl.m4:
-
-	* generic/tcl.h: Added declarations for bignum types, and for a
-	'bignumValue' in the Tcl_Obj structure.
-	* generic/tclInt.h: Added declarations of interface procedures for
-	memory allocation in libtommath.
-
-	* generic/tcl.decls: Added new interface to bignum objects.
-	* generic/tclInt.decls: Added internal stubs for bignum routines used
-	by the test code in tclTestObj.c.
-
-	* generic/tclDecls/h: Regen.
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.h:
-
-	* tools/fix_tommath_h.tcl: (New file) Script to edit
-	libtommath/tommath.h and produce generic/tommath.h so that storage
-	classes, allocation routines, and data types conform to Tcl's
-	conventions.
-	* generic/tommath.h: (New file) Generated by the above.
-
-	* generic/tclTomMath.h: (New file) Additional declarations to be
-	included in tommath.h when building Tcl.
-
-	* generic/tclTomMathInterface.c: (New file) Small 'glue' routines
-	adapting tommath's API to Tcl.
-
-	* libtommath/bn_fast_s_mp_mul_digs.c:
-	* libtommath/bn_mp_mul_d.c:
-	* libtommath/bn_mp_read_radix.c:
-	* libtommath/tommath.h: Applied suggested changes from Tom St Denis
-	that correct an off-by-one error in single-digit multiplication
-	(leading to a pointer smash if uncorrected) and change the string
-	argument to 'mp_read_radix' from 'char*' to 'const char*'.
-
-	* libtommath/bn_mp_radix_size.c: Local patch to ensure that sufficient
-	memory is requested even if the number has a single digit.
-
-	* libtommath/bn_mp_read_radix.c: Local patch to return MP_VAL if the
-	input string contains an invalid character.
-
-	* generic/tclObj.c: Added accessor functions for bignums.
-	* generic/tclTestObj.c: Added a 'testbignumobj' command to exercise the
-	accessor functions for bignums.
-
-	* win/Makefile.in: Added rules for making libtommath.
-
-2005-01-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	TIP#235 IMPLEMENTATION
-
-	* doc/Ensemble.3: Documentation for the new public API.
-	* generic/tclNamesp.c (Tcl_CreateEnsemble,...): Rename of
-	* generic/tcl.decls:		existing API into TIPped form.
-
-2005-01-19  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/tclWinChan.c (FileCloseProc): Invoke TclpCutFileChannel() to
-	remove a FileInfo from the thread local list before deallocating it.
-	This should have been done via an earlier call to Tcl_CutChannel, but I
-	was running into a crash in the next call to Tcl_CutChannel during the
-	I/O finalization stage.
-
-2005-01-18  Kevin Kenny  <kennykb@acm.org>
-
-	* library/tzdata/GMT+0:
-	* library/tzdata/GMT-0:
-	* library/tzdata/GMT0:
-	* library/tzdata/Greenwich:
-	* library/tzdata/Navajo:
-	* library/tzdata/Universal:
-	* library/tzdata/Zulu:
-	* library/tzdata/America/Asuncion:
-	* library/tzdata/America/Rosario:
-	* library/tzdata/Asia/Jerusalem:
-	* library/tzdata/Brazil/Acre:
-	Routine update per Olson's tzdata2005c. Removed links to links
-	(Greenwich in several aliases; Navajo; Acre). Updated Paraguayan DST
-	rules and "best guess" at this year's Israeli rules.
-
-2005-01-17  Vince Darley  <vincentdarley@users.sourceforge.net>
-
-	* generic/tclFileName.c: fix for glob failure on Windows shares [Bug
-	1100542].
-
-	* doc/pkgMkIndex.n: added documentation that 'pkg_mkIndex -lazy' is not
-	a good idea. [Bug 1101678]
-
-2005-01-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tests/compile.test (compile-17.1): Document known issue with binding
-	time of compiled command interpretations in [expr].
-
-	* generic/tclIOUtil.c (TclFSFileAttrIndex): New helper function so that
-	we don't need to hard-code attribute indexes. [Bug 1100671]
-
-2005-01-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/string.n: Removed the term 'set' from the documentation of the
-	[string trim] commands, as it caused confusion.
-
-2005-01-12  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tcl.m4 (SC_PATH_{TCL,TK}CONFIG): Added code to detect the case
-	when the --with-tcl/--with-tk arguments point to the config scripts
-	themselves and not their directory. If this is the case, they now
-	complain but keep working. [FRQ 951247]
-	* unix/configure:	autoconf-2.57
-
-2005-01-10  Joe English  <jenglish@users.sourceforge.net>
-
-	* unix/Makefile.in, unix/configure.in, unix/tcl.m4,
-	* unix/tclConfig.sh.in, unix/dltest/Makefile.in:
-	Remove ${DBGX}, ${TCL_DBGX} from Tcl build system [Patch 1081595].
-	* unix/configure: regenerated
-
-2005-01-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tclUnixFCmd.c (TclUnixCopyFile): Convert u_int to unsigned to
-	make clashes with types in standard C headers less of a problem. [Bug
-	1098829]
-
-2005-01-09  Joe English  <jenglish@users.sourceforge.net>
-
-	* unix/tclUnixThrd.c, unix/tclUnixPort.h: Remove readdir_r() and
-	related #ifdeffery (see [Bug 1095909]).
-	* unix/tcl.m4, unix/tclConfig.h.in: Don't check for HAVE_READDIR_R.
-	* unix/configure: Regenerated.
-
-2005-01-06  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* library/http/http.tcl (http::mapReply): Significant performance
-	enhancement by using [string map] instead of [regsub]/[subst], and
-	update version requirement to Tcl8.4. [Bug 1020491]
-
-2005-01-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/lsearch.n, doc/re_syntax.n: Convert to other form of emacs mode
-	control comment to prevent problems with old versions of man. [Bug
-	1085127]
-
-2005-01-05  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* tests/winDde.test: Fixed broken test result.
-
-2005-01-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInt.h, generic/tclPort.h: Move the #include of tclConfig.h
-	*first* before any reference to tcl.h so that the build configuration
-	is loaded before the first reference to any system headers. Issue
-	reported by Art Haas on tcl-core.
-
-2005-01-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/fCmd.test (fCmd-18.10):	Added notNetworkFilesystem constraint.
-	[Bug 456665]
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2004 IN "ChangeLog.2004"	       ***
-	*** CHANGELOG ENTRIES FOR 2003 IN "ChangeLog.2003"	       ***
-	*** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"	       ***
-	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"	       ***
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"	       ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/ChangeLog.2007 b/ChangeLog.2007
deleted file mode 100644
index 404bc4d..0000000
--- a/ChangeLog.2007
+++ /dev/null
@@ -1,5921 +0,0 @@
-2007-12-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/dict.n: Clarified meaning of dictionary values following
-	discussion on comp.lang.tcl.
-
-2007-12-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c: More [lsort] data handling streamlines. The
-	function MergeSort is gone, essentially inlined into Tcl_LsortObjCmd.
-	It is not a straight inlining, two loops over all lists elements where
-	merged in the process: the linked list elements are now built and
-	merged into the temporary sublists in the same pass.
-
-2007-12-25  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c: More [lsort] data handling streamlines. Extra
-	mem reqs of latest patches removed, restored to previous mem profile.
-	Improved -unique handling, now eliminating repeated elems immediately
-	instead of marking them to avoid reinsertion at the end.
-
-2007-12-23  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclCompCmds.c (TclCompileRegexpCmd):	TCL_REG_NOSUB cannot
-	* tests/regexp.test (regexp-22.2):		be used because it
-	* tests/regexpComp.test:	[Bug 1857126]	disallows backrefs.
-
-2007-12-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c: Speed patch for lsort. [Patch 1856994]
-
-2007-12-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd, Tcl_LsearchObjCmd): Avoid
-	calling SelectObjFromSublist when there are no sublists.
-
-2007-12-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Preallocate a listObj of
-	sufficient length for the sorted list instead of growing it. Second
-	commit replaces calls to Tcl_ListObjAppenElement with direct access to
-	the internal rep.
-
-2007-12-19  Don Porter	<dgp@users.sourceforge.net>
-
-	*** 8.5.0 TAGGED FOR RELEASE ***
-
-	* changes:		Updated for 8.5.0 release.
-
-2007-12-19  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd):	update switch -regexp
-	* tests/switch.test-14.*:			compilation to pass
-	the cflags to INST_REGEXP (changed on 12-07). Added tests for switch
-	-regexp compilation (need more). [Bug 1854399]
-
-2007-12-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:		Updated for 8.5.0 release.
-
-2007-12-18  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/regguts.h, generic/regc_color.c, generic/regc_nfa.c:
-	Fixes for problems created when processing regular expressions that
-	generate very large automata. An enormous number of thanks to Will
-	Drewry <wad_at_google.com>, Tavis Ormandy <taviso_at_google.com>,
-	and Tom Lane <tgl_at_sss.pgh.pa.us> from the Postgresql crowd for
-	their help in tracking these problems down. [Bug 1810264]
-
-2007-12-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:		Updated for 8.5.0 release.
-
-2007-12-17  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclAlloc.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclThreadAlloc.c: Fix alignment for memory returned by
-	TclStackAlloc; insure that all memory allocators align to 16-byte
-	boundaries on 64 bit platforms [Bug 1851832, 1851524]
-
-2007-12-14  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclIOUtil.c (FsAddMountsToGlobResult): fix the tail
-	conversion of vfs mounts. [Bug 1602539]
-
-	* win/README: updated notes
-
-2007-12-14  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* tests/winFile.test: Fixed tests for win2k with long machine name
-
-2007-12-14  Pat Thoyts <patthoyts@users.sourceforge.net>
-
-	* win/nmakehlp.c:  Support compilation with MSVC9 for AMD64.
-	* win/makefile.vc:
-
-2007-12-13  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/trace.n: Clarified documentation of enterstep and leavestep
-	traces, including adding example. [Bug 614282, 1701540, 1755984]
-
-2007-12-12  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/IntObj.3:	Update docs for the Tcl_GetBignumAndClearObj() ->
-	Tcl_TakeBignumFromObj() revision [TIP 298]. Added docs for the
-	Tcl_InitBignumFromDouble() routine. [Bug 1446971]
-
-	* changes:		Updated for 8.5.0 release.
-
-2007-12-10  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclUtil.c (TclReToGlob): reduce escapes in conversion
-	when not necessary
-
-	* generic/tclInt.decls:	 move TclByteArrayMatch and TclReToGlob
-	* generic/tclIntDecls.h: to tclInt.h from stubs.
-	* generic/tclStubInit.c: Add flags var to TclByteArrayMatch for
-	* generic/tclInt.h:	 future extensibility
-	* generic/tcl.h:  define TCL_MATCH_EXACT doc for Tcl_StringCaseMatch.
-	* doc/StrMatch.3: It is compatible with existing usage.
-	* generic/tclExecute.c (INST_STR_MATCH): flag for TclByteArrayMatch
-	* generic/tclUtil.c (TclByteArrayMatch, TclStringMatchObj):
-	* generic/tclRegexp.c (Tcl_RegExpExecObj):
-	* generic/tclCmdMZ.c (StringMatchCmd): Use TclStringMatchObj
-	* tests/string.test (11.9.* 11.10.*): more tests
-
-2007-12-10  Joe English	 <jenglish@users.sourceforge.net>
-
-	* doc/string.n, doc/UniCharIsAlpha.3: Fix markup errors.
-	* doc/CrtCommand.3, doc/CrtMathFnc.3, doc/FileSystem.3,
-	* doc/GetStdChan.3, doc/OpenFileChnl.3, doc/SetChanErr.3,
-	* doc/eval.n, doc/filename.n: Consistency: Move "KEYWORDS" section
-	after "SEE ALSO".
-
-2007-12-10  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tools/genStubs.tcl:		fix numerous issues handling 'macosx',
-					'aqua' or 'x11' entries interleaved
-					with 'unix' entries [Bug 1834288]; add
-					genStubs::export command
-					[Tk FR 1716117]; cleanup formatting.
-
-	* generic/tcl.decls:		use new genstubs 'export' command to
-	* generic/tclInt.decls:		mark exported symbols not in stubs
-	* generic/tclTomMath.decls:	table [Tk FR 1716117]; cleanup
-					formatting.
-
-	* generic/tclDecls.h:		regen with new genStubs.tcl.
-	* generic/tclIntDecls.h:	[Bug 1834288]
-	* generic/tclIntPlatDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclStubInit.c:
-
-2007-12-09  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* tests/io.test, tests/chanio.test (io-73.1): Make sure to invalidate
-	* generic/tclIO.c (SetChannelFromAny):	      internal rep only after
-	validating channel rep. [Bug 1847044]
-
-2007-12-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/expr.n, doc/mathop.n: Improved the documentation of the
-	operators. [Bug 1823622]
-
-	* generic/tclBasic.c (builtInCmds): Corrected list of hidden and
-	* doc/interp.n (SAFE INTERPRETERS): exposed commands so that the
-	documentation and reality now match. [Bug 1662436]
-
-2007-12-07  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclExecute.c (TclExecuteByteCode INST_REGEXP):
-	* generic/tclCompCmds.c (TclCompileRegexpCmd): Pass correct RE
-	compile flags at compile time, and use TCL_REG_NOSUB.
-
-	* generic/tclIOCmd.c (FinalizeIOCmdTSD, Tcl_PutsObjCmd): cache
-	stdout channel object for [puts $str] calls.
-
-2007-12-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* README:	Remove mention of dead comp.lang.tcl.announce
-	newsgroup. [Bug 1846433]
-
-	* unix/README:	Mention the stub library created by `make` and warn
-	about the effect of embedded paths in the installed binaries.
-	Thanks to Larry Virden. [Bug 1794084]
-
-	* doc/AddErrInfo.3:	Documentation for the new routines in TIP 270.
-	* doc/Interp.3:
-	* doc/StringObj.3:
-
-2007-12-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/namespace.n:	Documentation for zero-argument form of
-	[namespace import] (TIP 261) [Bug 1596416]
-
-2007-12-06  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclInt.h: add TclGetChannelFromObj decl
-	(TclMatchIsTrivial): simplify TclMatchIsTrivial to remove ] check.
-
-2007-12-06  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-
-	* generic/tclBasic.c (Tcl_CreateInterp): Simplify the setting up of
-	* generic/tclIOCmd.c (TclInitChanCmd):	 the [chan] ensemble. This
-	* library/init.tcl:			 gets rid of quite a bit of
-	code and makes it possible to understand the whole with less effort.
-
-	* generic/tclCompCmds.c (TclCompileEnsemble): Ensure that the right
-	number of tokens are copied. [Bug 1845320]
-
-	* generic/tclNamesp.c (TclMakeEnsemble): Added missing release of a
-	DString. [Bug 1845397]
-
-2007-12-05  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclIO.h:    Create Tcl_Obj for Tcl channels to reduce
-	* generic/tclIO.c:    overhead in lookup by Tcl_GetChannel. New
-	* generic/tclIOCmd.c: TclGetChannelFromObj for internal use.
-	* generic/tclIO.c (WriteBytes, WriteChars): add opt check to avoid
-	EOL translation when not linebuffered or using lf. [Bug 1845092]
-
-2007-12-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/stack.test: made the tests for stack overflow not care
-	about which mechanism caused the error (interp's recursion limit
-	or C-stack depth detector).
-
-2007-12-05  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32
-	-loleaut32 but not msvc for Tk's [send]. [Bug 1844749]
-
-2007-12-05  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): Prevent shimmering crash
-	when -exact and -integer/-real are mixed. [Bug 1844789]
-
-2007-12-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixChan.c (CreateSocketAddress): Add extra #ifdef-fery to
-	make code compile on BSD 5. [Bug 1618235, again]
-
-2007-12-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Bump tcltest to version 2.3.0 so that
-	* library/tcltest/pkgIndex.tcl: we release a stable tcltest with a
-	* unix/Makefile.in:	stable Tcl.
-	* win/Makefile.in:
-
-2007-12-03  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/configure, win/tcl.m4 (LIBS_GUI): remove ole32.lib oleaut32.lib
-
-2007-12-03  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Adjusted the [switch]
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd):       command so that when
-	passed two arguments, no check for options are performed. This is OK
-	since in the two-arg case, detecting an option would definitely lead
-	to a syntax error. [Patch 1836519]
-
-2007-11-29  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/makefile.vc: add ws2_32.lib to baselibs
-	* win/configure, win/tcl.m4: add ws2_32.lib / -lws2_32 to build.
-	* win/tclWinSock.c: remove dyn loading of winsock, assume that it is
-	always available now.
-
-2007-11-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclWinSock.c (InitializeHostName):	Correct error in
-	buffer length tracking. After gethostname() writes into a buffer,
-	convert only the written string to internal encoding, not the whole
-	buffer.
-
-2007-11-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclConfig.c:	Corrected failure of the [::foo::pkgconfig]
-	command to clean up registered configuration data when the query
-	command is deleted from the interp. [Bug 983501]
-
-	* generic/tclNamesp.c (Tcl_SetEnsembleMappingDict):	Added checks
-	that the dict value passed in is in the format required to make the
-	internals of ensembles work. [Bug 1436096]
-
-	* generic/tclIO.c:	Simplify test and improve accuracy of error
-	message in latest changes.
-
-2007-11-28  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* generic/tclIO.c: -eofchar must support no eofchar.
-
-2007-11-27  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: remove unneeded call in Tcl_CreateInterp, add
-	comments.
-
-2007-11-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* win/tclWinSock.c:	Add mising encoding conversion of the [info
-	hostname] value from the system encoding to Tcl's internal encoding.
-
-	* doc/chan.n:		"Fix" the limitation on channel -eofchar
-	* doc/fconfigure.n:	values to single byte characters by
-	* generic/tclIO.c:	documenting it and making it fail loudly.
-	* tests/chan.test:	Thanks to Stuart Cassoff for contributing the
-				fix. [Bug 800753]
-
-2007-11-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:
-	* generic/tclInt.h:
-	* unix/tclUnixInit.c:
-	* unix/tclUnixThrd.c: Fix stack checking via workaround for bug in
-	glibc's pthread_attr_get_np, patch from [Bug 1815573]. Many thanks to
-	Sergei Golovan (aka Teo) for detecting the bug and helping diagnose
-	and develop the fix.
-
-2007-11-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileDictAppendCmd): Fix bug in [dict
-	append] compiler which caused strange stack corruption. [Bug 1837392]
-
-2007-11-23  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c: Fixed a problem with reflected channels. 'chan
-	postevent' is defined to work only from within the interpreter
-	containing the handler command. Sensible, we want only handler
-	commands to use it. It identifies the channel by handle. The channel
-	moves to a different interpreter or thread. The interpreter containing
-	the handler command doesn't know the channel any longer. 'chan
-	postevent' fails, not finding the channel any longer. Uhm.
-
-	Fixed by creating a second per-interpreter channel table, just for
-	reflected channels, where each interpreter remembers for which
-	reflected channels it has the handler command. This info does not move
-	with the channel itself. The table is updated by 'chan create', and
-	used by 'chan postevent'.
-
-	* tests/ioCmd.test: Updated the testsuite.
-
-2007-11-23  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclVar.c (Tcl_ArrayObjCmd): handle the right data for
-	* tests/var.test (var-14.2):	      [array names $var -glob $ptn]
-
-2007-11-23  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCmdMZ.c (String*Cmd, TclInitStringCmd): Rebuilt [string]
-	* generic/tclCompCmds.c (TclCompileString*Cmd): as an ensemble.
-
-2007-11-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (Dict*Cmd,TclInitDictCmd): Rebuilt the [dict]
-	* generic/tclCompCmds.c (TclCompileDict*Cmd): command as an ensemble.
-
-2007-11-22  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Rewrote the [string] and
-	* generic/tclDictObj.c (Tcl_DictObjCmd): [dict] implementations to be
-	ready for conversion to ensembles.
-
-	* tests/string.test (string-12.22): Flag shimmering bug found in
-	[string range].
-
-2007-11-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileEnsemble): Rewrote the ensemble
-	compiler to remove many of the limitations. Can now compile scripts
-	that use unique prefixes of subcommands, and which have mappings of a
-	command to multiple words (provided the first is a compilable command
-	of course).
-
-2007-11-21  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclNamesp.c (TclMakeEnsemble): Factor out the code to set up
-	a core ensemble from a table of information about subcommands, ready
-	for reuse within the core.
-
-	* generic/various: Start to return more useful Error codes, currently
-	mainly on assorted lookup failures.
-
-2007-11-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c: Changed the underlying implementation of the
-	hash table used in dictionaries to additionally keep all entries in
-	the hash table in a linked list, which is only ever added to at the
-	end. This makes iteration over all entries in the dictionary in
-	key insertion order a trivial operation, and so cleans up a great deal
-	of complexity relating to dictionary representation and stability of
-	iteration order.
-
-	***POTENTIAL INCOMPATIBILITY***
-	For any code that depended on the (strange) old iteration order.
-
-	* generic/tclConfig.c (QueryConfigObjCmd): Correct usage of
-	Tcl_WrongNumArgs.
-
-2007-11-19  Don Porter	<dgp@users.sourceforge.net>
-
-	*** 8.5b3 TAGGED FOR RELEASE ***
-
-	* README:		Bump version number to 8.5b3.
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf (2.59)
-	* win/configure:
-
-	* changes:		Updated for 8.5b3 release.
-
-2007-11-19  Kevin Kenny	 <kennykb@users.sourceforge.net>
-
-	* library/tzdata/Africa/Cairo:
-	* library/tzdata/America/Campo_Grande:
-	* library/tzdata/America/Caracas:
-	* library/tzdata/America/Cuiaba:
-	* library/tzdata/America/Havana:
-	* library/tzdata/America/Sao_Paulo:
-	* library/tzdata/Asia/Damascus:
-	* library/tzdata/Asia/Gaza:
-	* library/tzdata/Asia/Tehran:  Olson's tzdata2007i imported.
-
-2007-11-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclExecuteByteCode:INST_EXIST_*): Fix read
-	traces not firing on non-existent array elements. [Bug 1833522]
-
-2007-11-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCmdIL.c (TclInitInfoCmd): Rename the implementation
-	commands for [info] to be something more "expected".
-
-	* generic/tclCompCmds.c (TclCompileInfoExistsCmd): Compiler for the
-	[info exists] subcommand.
-	(TclCompileEnsemble): Cleaned up version of ensemble compiler that was
-	in TclCompileInfoCmd, but which is now much more generally applicable.
-
-	* generic/tclInt.h (ENSEMBLE_COMPILE): Added flag to allow for cleaner
-	turning on and off of ensemble bytecode compilation.
-
-	* generic/tclCompile.c (TclCompileScript): Add the cmdPtr to the list
-	of arguments passed to command compilers.
-
-2007-11-15  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/regc_nfa.c:	Fixed infinite loop in the regexp compiler.
-	[Bug 1810038]
-
-	* generic/regc_nfa.c:	Corrected looping logic in fixempties() to
-	avoid wasting time walking a list of dead states. [Bug 1832612]
-
-2007-11-15  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclNamesp.c (NamespaceEnsembleCmd): Must pass a non-NULL
-	interp to Tcl_SetEnsemble* functions.
-
-	* doc/re_syntax.n: Try to make this easier to read. It's still a very
-	difficult manual page!
-
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Allow people to turn off the -rpath
-	option to their linker if they so desire. This is a configuration only
-	recommended for (some) vendors. Relates to [Patch 1231022].
-
-2007-11-15  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/tclWin32Dll.c: Prefer UINT_PTR to DWORD_PTR when casting
-	pointers to integer types for greater portability. [Bug 1831253]
-
-2007-11-15  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: add new chanio.test.
-	* macosx/Tcl.xcode/project.pbxproj:
-
-2007-11-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompile.c (TclCompileScript): Ensure that we get our
-	count in our INST_START_CMD calls right, even when there's a failure
-	to compile a command directly.
-
-	* generic/tclNamesp.c (Tcl_SetEnsembleSubcommandList)
-	(Tcl_SetEnsembleMappingDict):		Special code to make sure that
-	* generic/tclCmdIL.c (TclInitInfoCmd):	[info exists] is compiled
-	right while not allowing changes to the ensemble to cause havok.
-
-	* generic/tclCompCmds.c (TclCompileInfoCmd): Simple compiler for the
-	[info] command that only handles [info exists].
-
-	* generic/tclExecute.c (TclExecuteByteCode:INST_EXIST_*): New
-	instructions to allow the testing of whether a variable exists.
-
-2007-11-14  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/chanio.test: New file. This is essentially a duplicate of
-	'io.test', with all channel commands converted to their 'chan xxx'
-	notation.
-	* tests/io.test: Fixed typo in test description.
-
-2007-11-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/regc*.c: Eliminate multi-char collating element code
-	completely. Simplifies the code quite a bit. If people still want the
-	full code, it will remain on the 8.4 branch. [Bug 1831425]
-
-2007-11-13  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclCompCmds.c (TclCompileRegexpCmd): clean up comments, only
-	free dstring on OK from TclReToGlob.
-	(TclCompileSwitchCmd): simplify TclReToGlob usage.
-
-2007-11-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/regc*.c: #ifdef/comment out the code that deals with
-	multi-character collating elements, which have never been supported.
-	Cuts the memory consumption of the RE compiler. [Bug 1831425]
-
-2007-11-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd, TclCompileRegexpCmd):
-	Extend [switch] compiler to handle regular expressions as long as
-	things are not too complex. Fix [regexp] compiler so that non-trivial
-	literal regexps get fed to INST_REGEXP.
-
-	* doc/mathop.n: Clarify definitions of some operations.
-
-2007-11-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* unix/tclUnixInit.c: the TCL_NO_STACK_CHECK was being incorrectly
-	undefined here; this should be set (or not) in the compile options, it
-	is used elsewhere and needs to be consistent.
-
-2007-11-13  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* unix/tcl.m4:		Added autoconf goo to detect and make use of
-	* unix/configure.in:	getaddrinfo and friends.
-	* unix/configure:	(regenerated)
-
-2007-11-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tclUnixCompat.c (TclpGetHostByName): The six-argument form of
-	getaddressbyname_r() uses the fifth argument to indicate whether the
-	lookup succeeded or not on at least one platform. [Bug 1618235]
-
-2007-11-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/regcomp.c:	Convert optst() from expensive no-op to a
-	cheap no-op.
-
-2007-11-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tclUnixChan.c (CreateSocketAddress): Rewrote to use the
-	thread-safe version of gethostbyname() by forward-porting the code
-	used in 8.4, and added rudimentary support for getaddrinfo() (not
-	enabled by default, as no autoconf-ery written). Part of fix for [Bug
-	1618235].
-
-2007-11-12  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclGet.c (Tcl_Get, Tcl_GetInt): revert use of TclGet* macros
-	due to compiler warning. These cases won't save time either.
-
-	* generic/tclUtil.c (TclReToGlob): add more comments, set interp
-	result if specified on error.
-
-2007-11-12  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:		New macro TclResetResult, new iPtr
-	* generic/tclExecute.c:		flag bit INTERP_RESULT_UNCLEAN:
-	* generic/tclInt.h:		shortcut for Tcl_ResetResult for the
-	* generic/tclProc.c:		"normal" case: TCL_OK, no return
-	* generic/tclResult.c:		options, no errorCode nor errorInfo,
-	* generic/tclStubLib.c:		return at normal level. [Patch
-	* generic/tclUtil.c:		1830184]
-
-	THIS PATCH WAS REVERTED: initial (mis)measurements overstated the
-	perfomance wins, which turn out to be tiny. Not worth the
-	complication.
-
-2007-11-11  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclCompCmds.c, generic/tclCompile.c, generic/tclCompile.h:
-	* generic/tclExecute.c, generic/tclInt.decls, generic/tclIntDecls.h:
-	* generic/tclRegexp.c, generic/tclRegexp.h: Add INST_REGEXP and fully
-	* generic/tclStubInit.c, generic/tclUtil.c: compiled [regexp] for the
-	* tests/regexpComp.test:     [Bug 1830166]  simple cases. Also added
-	TclReToGlob function to convert RE to glob patterns and use these in
-	the possible cases.
-
-2007-11-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclResult.c (ResetObjResult): clarify the logic.
-
-	* generic/tclBasic.c:		Increased usage of macros to detect
-	* generic/tclBinary.c:		and take advantage of objTypes. Added
-	* generic/tclClock.c:		macros TclGet(Int|Long)FromObj,
-	* generic/tclCmdAH.c:		TclGetIntForIndexM & TclListObjLength,
-	* generic/tclCmdIL.c:		modified TclListObjGetElements.
-	* generic/tclCmdMZ.c:
-	* generic/tclCompCmds.c:	The TclGetInt* macros are only a
-	* generic/tclCompExpr.c:	shortcut on platforms where 'long' is
-	* generic/tclCompile.c:		'int'; it may be worthwhile to extend
-	* generic/tclDictObj.c:		their functionality to other cases.
-	* generic/tclExecute.c:
-	* generic/tclGet.c:		As this patch touches many files it
-	* generic/tclIO.c:		has been recorded as [Patch 1830038]
-	* generic/tclIOCmd.c:		in order to facilitate reviewing.
-	* generic/tclIOGT.c:
-	* generic/tclIndexObj.c:
-	* generic/tclInt.h:
-	* generic/tclInterp.c:
-	* generic/tclListObj.c:
-	* generic/tclLiteral.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclParse.c:
-	* generic/tclProc.c:
-	* generic/tclRegexp.c:
-	* generic/tclResult.c:
-	* generic/tclScan.c:
-	* generic/tclStringObj.c:
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-
-2007-11-11  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixTime.c (TclpWideClicksToNanoseconds): Fix issues with
-	* generic/tclInt.h:				    int64_t overflow.
-
-	* generic/tclBasic.c:	Fix stack check failure case if stack grows up
-	* unix/tclUnixInit.c:	Simplify non-crosscompiled case.
-
-	* unix/configure:	autoconf-2.59
-	* unix/tclConfig.h.in:	autoheader-2.59
-
-2007-11-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Fast path for INST_LIST_INDEX when the index
-	is not a list.
-
-	* generic/tclBasic.c:
-	* unix/configure.in:
-	* unix/tclUnixInit.c: Detect stack grwoth direction at compile time,
-	only fall to runtime detection when crosscompiling.
-
-	* unix/configure: autoconf 2.61
-
-	* generic/tclBasic.c:
-	* generic/tclInt.h:
-	* tests/interp.test:
-	* unix/tclUnixInit.c:
-	* win/tclWin32Dll.c: Restore simpler behaviour for stack checking, not
-	adaptive to stack size changes after a thread is launched. Consensus
-	is that "nobody does that", and so it is not worth the cost. Improved
-	failure comments (mistachkin).
-
-2007-11-10  Kevin Kenny	 <kennykb@acm.org>
-
-	* win/tclWin32Dll.c: Rewrote the Windows stack checking algorithm to
-	use information from VirtualQuery to determine the bound of the stack.
-	This change fixes a bug where the guard page of the stack was never
-	restored after an overflow. It also eliminates a nasty piece of
-	assembly code for structured exception handling on mingw. It
-	introduces an assumption that the stack is a single memory arena
-	returned from VirtualAlloc, but the code in MSVCRT makes the same
-	assumption, so it should be fairly safe.
-
-2007-11-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:
-	* generic/tclInt.h:
-	* unix/tclUnixInit.c:
-	* unix/tclUnixPort.h:
-	* win/tclWin32Dll.c: Modify the stack checking algorithm to recheck in
-	case of failure. The working assumptions are now that (a) a thread's
-	stack is never moved, and (b) a thread's stack can grow but not
-	shrink. Port to windows - could be more efficient, but is already
-	cheaper than it was.
-
-2007-11-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclResult.c (ResetObjResult): new shortcut.
-
-	* generic/tclAsync.c:
-	* generic/tclBasic.c:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclUnixInit.c:
-	* generic/tclUnixPort.h: New fields in interp (ekeko!) to cache TSD
-	data that is accessed at each command invocation, access macros to
-	replace Tcl_AsyncReady and TclpCheckStackSpace by much faster variants
-	[Patch 1829248]
-
-2007-11-09  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclInt.decls, generic/tclIntDecls.h: Use unsigned char for
-	* generic/tclExecute.c, generic/tclUtil.c:     TclByteArrayMatch and
-	don't allow a nocase option. [Bug 1828296]
-	For INST_STR_MATCH, ignore pattern type for TclByteArrayMatch case.
-
-	* generic/tclBinary.c (Tcl_GetByteArrayFromObj): check type before
-	func jump (perf).
-
-2007-11-07  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclStubInit.c:		     Added TclByteArrayMatch
-	* generic/tclInt.decls:			     for efficient glob
-	* generic/tclIntDecls.h:		     matching of ByteArray
-	* generic/tclUtil.c (TclByteArrayMatch):     Tcl_Objs, used in
-	* generic/tclExecute.c (TclExecuteByteCode): INST_STR_MATCH. [Bug
-						     1827996]
-
-	* generic/tclIO.c (TclGetsObjBinary): Add an efficient binary path for
-					      [gets].
-	(DoWriteChars): Special case for 1-byte channel write.
-
-2007-11-06  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclEncoding.c: Version of the embedded iso8859-1 encoding
-	handler that is faster (functions to do the encoding know exactly what
-	they're doing instead of pulling it from a table, though the table
-	itself has to be retained for use by shift encodings that depend on
-	iso8859-1). [Patch 1826906], committing for dkf.
-
-2007-11-05  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclConfig.c (Tcl_RegisterConfig): Modified to not extend the
-	config database if the encoding provided by the user is not found
-	(venc == NULL). Scripts expecting the data will error out, however we
-	neither crash nor provide bogus information. See [Bug 983509] for more
-	discussion.
-
-	* unix/tclUnixChan.c (TtyGetOptionProc): Accepted [Patch 1823576]
-	provided by Stuart Cassof <stwo@users.sourceforge.net>. The patch adds
-	the necessary utf/external conversions to the handling of the
-	arguments of option -xchar which will allow the use of \0 and similar
-	characters.
-
-2007-11-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclTest.c (TestSetCmd2):
-	* generic/tclVar.c (TclObjLookupVarEx):
-	* tests/set.test (set-5.1): Fix error branch when array name looks
-	like array element (code not normally exercised).
-
-2007-11-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/tcltk-man2html.tcl (output-directive): Convert .DS/.DE pairs
-	into tables since that is now all that they are used for.
-
-	* doc/RegExp.3: Clarified documentation of RE flags. [Bug 1167840]
-
-	* doc/refchan.n: Adjust internal name to be consistent with the file
-	name for reduced user confusion. After comment by Dan Steffen.
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd, UniCharIsAscii): Remember, the
-	NUL character is in ASCII too. [Bug 1808258]
-
-	* doc/file.n: Clarified use of [file normalize]. [Bug 1185154]
-
-2007-10-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Bump version number to 8.5b2.1 to distinguish
-	* library/init.tcl:	CVS development snapshots from the 8.5b2
-	* unix/configure.in:	release.
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf (2.59)
-	* win/configure:
-
-2007-10-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/expr.n, doc/mathfunc.n: Improve documentation to try to make
-	clearer what is going on.
-
-	* doc/interp.n: Shorten the basic descriptive text for some interp
-	subcommands so Solaris nroff doesn't truncate them. [Bug 1822268]
-
-2007-10-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl (output-widget-options): Enhance the HTML
-	generator so that it can produce multi-line option descriptions.
-
-2007-10-28  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclUtil.c (Tcl_ConcatObj): optimise for some of the
-	concatenees being empty objs. [Bug 1447328]
-
-2007-10-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclEncoding.c (TclInitEncodingSubsystem): Hard code the
-	iso8859-1 encoding, as it's needed for more than just text (especially
-	binary encodings...) Note that other encodings rely on the encoding
-	being a table encoding (!) so we can't use more efficient encoding
-	mapping functions.
-
-2007-10-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/regc_lex.c (lexescape): Close off one of the problems
-	mentioned in [Bug 1810264].
-
-2007-10-27  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclNamesp.c (Tcl_FindCommand): insure that FQ command names
-	are searched from the global namespace, ie, bypassing resolvers of the
-	current namespace. [Bug 1114355]
-
-	* doc/apply.n: fixed example [Bug 1811791]
-	* doc/namespace.n: improved example [Bug 1788984]
-	* doc/AddErrInfo.3: typo [Bug 1715087]
-	* doc/CrtMathFnc.3: fixed Tcl_ListMathFuncs entry [Bug 1672219]
-
-	* generic/tclCompile.h:
-	* generic/tclInt.h: moved declaration of TclSetCmdNameObj from
-	tclCompile.h to tclInt.h, reverting linker [Bug 1821159] caused by
-	commit of 2007-10-11 (both I and gcc missed one dep).
-
-	* generic/tclVar.c: try to preserve Tcl_Objs when doing variable
-	lookups by name, partially addressing [Bug 1793601].
-
-2007-10-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl (make-man-pages, htmlize-text)
-	(process-text): Make the man->HTML scraper work better.
-
-2007-10-26  Don Porter	<dgp@users.sourceforge.net>
-
-	*** 8.5b2 TAGGED FOR RELEASE ***
-
-	* changes:		Updated for 8.5b2 release.
-
-	* doc/*.1:		Revert doc changes that broke
-	* doc/*.3:		`make html` so we can get the release
-	* doc/*.n:		out the door.
-
-	* README:		Bump version number to 8.5b2.
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf (2.59)
-	* win/configure:
-
-2007-10-26  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/man2help2.tcl, tools/man2tcl.c: Made some of the tooling code
-	to do man->other formats work better with current manpage set. Long
-	way still to go.
-
-2007-10-25  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* generic/tclThread.c: Added TclpMasterLock/Unlock arround calls to
-	ForgetSyncObject in Tcl_MutexFinalize and Tcl_ConditionFinalize to
-	prevent from garbling the internal lists that track sync objects. [Bug
-	1726873]
-
-2007-10-24  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/man2html2.tcl (macro): Added support for converting the new
-	macros into HTML.
-
-	* doc/man.macros (QW,PQ,QR,MT): New macros that hide the ugly mess
-	needed to get proper GOOBE quoting in the manual pages.
-	* doc/*.n, doc/*.3, doc/*.1: Lots of changes to take advantage of the
-	new macros.
-
-2007-10-20  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c:	  Fix comments.
-	* generic/tclExecute.c:
-
-2007-10-18  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/mkdepend.tcl: sort the dep list for a more humanly readable
-	output.
-
-2007-10-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclResult.c (TclMergeReturnOptions):	Make sure any -code
-	values get pulled out of the dictionary, even if they are integer
-	valued.
-
-	* generic/tclCompCmds.c (TclCompileReturnCmd):	Added code to more
-	optimally compile [return -level 0 $x] to "push $x". [RFE 1794073]
-
-	* compat/tmpnam.c (removed):	The routine tmpnam() is no longer
-	* unix/Makefile.in:	called by Tcl source code. Remove autogoo the
-	* unix/configure.in:	supplied a replacement version on systems
-	* win/tcl.dsp:		where the routine was not available. [RFE
-	1811848]
-
-	* unix/configure:	autoconf-2.59
-
-	* generic/tcl.h:	Remove TCL_LL_MODIFIER_SIZE. [RFE 1811837]
-
-2007-10-17  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/mkdepend.tcl:	Improved defense from malformed object list
-	infile.
-
-2007-10-17  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tools/man2html2.tcl: Convert .DS/.DE into HTML tables, not
-	preformatted text.
-
-2007-10-17  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclCompExpr.c: Moved a misplaced declaration that blocked
-				 compilation on VC++.
-	* generic/tclExecute.c: Silenced several VC++ compiler warnings about
-				converting 'long' to 'unsigned short'.
-
-2007-10-16  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc: removed old dependency cruft that is no longer
-	needed.
-
-2007-10-15  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIOCmd.c:	Revise [open] so that it interprets leading
-	zero strings passed as the "permissions" argument as octal numbers,
-	even if Tcl itself no longer parses integers in that way.
-
-	* unix/tclUnixFCmd.c:	Revise the "-permissions" [file attribute] so
-	that it interprets leading zero strings as octal numbers, even if Tcl
-	itself no longer parses integers in that way.
-
-	* generic/tclCompExpr.c:	Corrections to code that produces
-	* generic/tclUtil.c:		extended "bad octal" error messages.
-
-	* tests/cmdAH.test:	Test revisions so that tests pass whether or
-	* tests/cmdIL.test:	not Tcl parses leading zero strings as octal.
-	* tests/compExpr-old.test:
-	* tests/compExpr.test:
-	* tests/compile.test:
-	* tests/expr-old.test:
-	* tests/expr.test:
-	* tests/incr.test:
-	* tests/io.test:
-	* tests/lindex.test:
-	* tests/link.test:
-	* tests/mathop.test:
-	* tests/parseExpr.test:
-	* tests/set.test:
-	* tests/string.test:
-	* tests/stringComp.test:
-
-2007-10-15  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/mkdepend.tcl:	Produces usable output. Include path problem
-	* win/makefile.vc:	fixed. Never fight city hall when it comes to
-	levels of quoting issues.
-
-2007-10-15  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclParse.c (Tcl_ParseBraces): fix for possible read after
-	the end of buffer. [Bug 1813528] (Joe Mistachkin)
-
-2007-10-14  David Gravereaux <davygrvy@pobox.com>
-
-	* tools/mkdepend.tcl (new):  Initial stab at generating automatic
-	* win/makefile.vc:	     dependencies.
-
-2007-10-12  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc:  Mine all version information from headers.
-	* win/rules.vc:	    Sync tcl and tk and bring extension versions
-	* win/nmakehlp.c:   closer together. Try and avoid using tclsh to do
-			    substitutions as we may cross compile.
-	* win/coffbase.txt: Added offsets for snack dlls.
-
-2007-10-11  David Gravereaux <davygrvy@pobox.com>
-
-	* win/makefile.vc:  Fixed my bad spelling mistakes from years back.
-	Dedependency, duh!  Rather funny.
-
-2007-10-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c:	Correct [string is (wide)integer] failure
-	* tests/string.test:	to report correct failindex values for
-	non-decimal integer strings. [Bug 1805887]
-
-	* compat/strtoll.c (removed):	The routines strtoll() and strtoull()
-	* compat/strtoull.c (removed):	are no longer called by the Tcl source
-	* generic/tcl.h:	code. (Their functionality has been replaced
-	* unix/Makefile.in:	by TclParseNumber().) Remove outdated comments
-	* unix/configure.in:	and mountains of configury autogoo that
-	* unix/tclUnixPort.h:	allegedly support the mythical systems where
-	* win/Makefile.in:	these routines might not have been available.
-	* win/makefile.bc:
-	* win/makefile.vc:
-	* win/tclWinPort.h:
-
-	* unix/configure:	autoconf-2.59
-
-2007-10-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclObj.c: remove superfluous #include of tclCompile.h
-
-2007-10-08  George Peter Staplin <georgeps@xmission.com>
-
-	* doc/Hash.3: Correct the valid usage of the flags member for the
-	Tcl_HashKeyType. It should be 0 or more of the flags mentioned.
-
-2007-10-02  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tcl.h (Tcl_DecrRefCount): Update change from 2006-05-29 to
-	make macro more warning-robust in unbraced if code.
-
-2007-10-02  Don Porter	<dgp@users.sourceforge.net>
-
-	[core-stabilizer-branch]
-
-	* README:		Bump version number to 8.5.0
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf (2.59)
-	* win/configure:
-
-2007-10-02  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tclIndex: Added 'tcl::tm::path' to the tclIndex. This fixes
-	[Bug 1806422] reported by Don Porter.
-
-2007-09-25  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclProc.c (Tcl_DisassembleObjCmd): Define a command,
-	::tcl::unsupported::disassemble, which can disassemble procedures,
-	lambdas and general scripts.
-	* generic/tclCompile.c (TclDisassembleByteCodeObj): Split apart the
-	code to print disassemblies of bytecode so that there is reusable code
-	that spits it out in a Tcl_Obj and then that code is used when doing
-	tracing.
-
-2007-09-20  Don Porter	<dgp@users.sourceforge.net>
-
-	*** 8.5b1 TAGGED FOR RELEASE ***
-
-	* changes: updates for 8.5b1 release.
-
-2007-09-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* README:		Bump version number to 8.5b1
-	* generic/tcl.h:	Merge from core-stabilizer-branch.
-	* library/init.tcl:	Stabilizing toward 8.5b1 release now done on
-	* tools/tcl.wse.in:	the HEAD. core-stabilizer-branch is now
-	* unix/configure.in:	suspended.
-	* unix/tcl.spec:
-	* win/configure.in:
-
-2007-09-19  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* generic/tclStubLib.: Replaced isdigit with internal implementation.
-
-2007-09-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclStubLib.c:	Remove C library calls from Tcl_InitStubs() so
-	* win/makefile.vc:	that we don't need the C library linked in to
-	libtclStub.
-
-2007-09-17  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc: Add crt flags for tclStubLib now it uses C-library
-			   functions.
-
-2007-09-17  Joe English	 <jenglish@users.sourceforge.net>
-
-	* tcl.m4: use '${CC} -shared' instead of 'ld -Bshareable' to build
-	shared libraries on current NetBSDs. [Bug 1749251]
-	* unix/configure: regenerated (autoconf-2.59).
-
-2007-09-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Update `make dist` so that tclDTrace.d is
-	included in the source code distribution.
-
-	* generic/tcl.h:	Revised Tcl_InitStubs() to restore Tcl 8.4
-	* generic/tclPkg.c:	source compatibility with callers of
-	* generic/tclStubLib.c:	Tcl_InitStubs(interp, TCL_VERSION, 1). [Bug
-	1578344]
-
-2007-09-17  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclTrace.c (Tcl_TraceObjCmd, TraceExecutionObjCmd)
-	(TraceCommandObjCmd, TraceVariableObjCmd):   Generate literal values
-	* generic/tclNamesp.c (NamespaceCodeCmd):    more efficiently using
-	* generic/tclFCmd.c (CopyRenameOneFile):     TclNewLiteralStringObj
-	* generic/tclEvent.c (TclSetBgErrorHandler): macro.
-
-2007-09-15  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4:	replace all direct references to compiler by ${CC} to
-			enable CC overriding at configure & make time; run
-			check for visibility "hidden" with all compilers;
-			quoting fixes from TEA tcl.m4.
-	(SunOS-5.1x):	replace direct use of '/usr/ccs/bin/ld' in SHLIB_LD by
-			'cc' compiler driver.
-	* unix/configure: autoconf-2.59
-
-2007-09-14  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclBasic.c (Tcl_CreateObjCommand): Only invalidate along the
-	namespace path once; that is enough. [Bug 1519940]
-
-2007-09-14  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclDTrace.d (new file): Add DTrace provider for Tcl; allows
-	* generic/tclCompile.h:		  tracing of proc and command entry &
-	* generic/tclBasic.c:		  return, bytecode execution, object
-	* generic/tclExecute.c:		  allocation and more; with
-	* generic/tclInt.h:		  essentially zero cost when tracing
-	* generic/tclObj.c:		  is inactive; enable with
-	* generic/tclProc.c:		  --enable-dtrace configure arg
-	* unix/Makefile.in:		  (disabled by default, will only
-	* unix/configure.in:		  enable if DTrace is present). [Patch
-	1793984]
-
-	* macosx/GNUmakefile:		  Enable DTrace support.
-	* macosx/Tcl-Common.xcconfig:
-	* macosx/Tcl.xcodeproj/project.pbxproj:
-
-	* generic/tclCmdIL.c:	Factor out core of InfoFrameCmd() into
-				internal TclInfoFrame() for use by DTrace
-				probes.
-
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2007-09-12  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Perform missing updates of the tcltest Tcl
-	* win/Makefile.in:	Module installed filename that should have
-	been part of the bump to tcltest 2.3b1. Thanks Larry Virden.
-
-2007-09-12  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc, win/rules.vc, win/nmakehlp.c: Use nmakehlp to
-	substitute values for tclConfig.sh (helps cross-compiling).
-
-2007-09-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl:	Accept underscores and colons in
-	* library/tcltest/pkgIndex.tcl: constraint names. Properly handle
-	constraint expressions that return non-numeric boolean results like
-	"false". Bump to tcltest 2.3b1. [Bug 1772989; RFE 1071322]
-	* tests/info.test:	Disable fragile tests.
-
-	* doc/package.n:	Restored the functioning of [package require
-	* generic/tclPkg.c:	-exact] to be compatible with Tcl 8.4. [Bug
-	* tests/pkg.test:	1578344]
-
-2007-09-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileDictCmd-update):
-	* generic/tclCompile.c (tclInstructionTable):
-	* generic/tclExecute.c (INST_DICT_UPDATE_END): fix stack management in
-	compiled [dict update]. [Bug 1786481]
-
-	***POTENTIAL INCOMPATIBILITY***
-	Scripts that were precompiled on earlier versions of 8.5 and use [dict
-	update] will crash. Workaround: recompile.
-
-2007-09-11  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclExecute.c: Corrected an off-by-one error in the setting
-	of MaxBaseWide for certain powers. [Bug 1767293 - problem reported in
-	comments when bug was reopened]
-
-2007-09-10  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclLink.c (Tcl_UpdateLinkedVar): guard against var being
-	unlinked. [Bug 1740631] (maros)
-
-2007-09-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c: fix tclInstructionTable entry for
-	dictUpdateEnd
-
-	* generic/tclExecute.c: remove unneeded setting of 'cleanup' variable
-	before jumping to checkForCatch.
-
-2007-09-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/package.n:	Restored the document parallel syntax of the
-	* generic/tclPkg.c:	[package present] and [package require]
-	* tests/pkg.test:	commands. [Bug 1723675]
-
-2007-09-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	Removed the "nsName" Tcl_ObjType from the
-	* generic/tclNamesp.c:	registered set. Revised the management of the
-	* generic/tclObj.c:	intrep of that Tcl_ObjType. Revised the
-	* tests/obj.test:	TclGetNamespaceFromObj() routine to return
-	TCL_ERROR and write a consistent error message when a namespace is not
-	found. [Bug 1588842. Patch 1686862]
-
-	***POTENTIAL INCOMPATIBILITY***
-	For callers of Tcl_GetObjType() on the name "nsName".
-
-	* generic/tclExecute.c: Update TclGetNamespaceFromObj() callers.
-	* generic/tclProc.c:
-
-	* tests/apply.test:		Updated tests to expect new consistent
-	* tests/namespace-old.test:	error message when a namespace is not
-	* tests/namespace.test:		found.
-	* tests/upvar.test:
-
-	* generic/tclCompCmds.c:	Use the new INST_REVERSE instruction
-	* tests/mathop.test:	to correct the compiled versions of math
-	operator commands. [Bug 1724437]
-
-	* generic/tclCompile.c: New bytecode instruction INST_REVERSE to
-	* generic/tclCompile.h: reverse the order of N items at the top of
-	* generic/tclExecute.c: stack.
-
-	* generic/tclCompCmds.c (TclCompilePowOpCmd):	Make a separate
-	routine to compile ** to account for its different associativity.
-
-2007-09-08  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (Tcl_SetVar2, TclPtrSetVar): [Bug 1710710] fixed
-	correctly, reverted fix of 2007-05-01.
-
-2007-09-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (DictUpdateCmd, DictWithCmd): Plug a hole that
-	* generic/tclExecute.c (TEBC,INST_DICT_UPDATE_END): allowed a careful
-	* tests/dict.test (dict-21.16,21.17,22.11): attacker to craft a dict
-	containing a recursive link to itself, violating one of Tcl's
-	fundamental datatype assumptions and causing a stack crash when the
-	dict was converted to a string. [Bug 1786481]
-
-2007-09-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclEvent.c ([::tcl::Bgerror]):	Corrections to Tcl's
-	* tests/event.test:	default [interp bgerror] handler so that when
-	it falls back to a hidden [bgerror] in a safe interp, it gets the
-	right error context data. [Bug 1790274]
-
-2007-09-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c (TclInitCompiledLocals): the refCount of resolved
-	variables was being managed without checking if they were Var or
-	VarInHash: itcl [Bug 1790184]
-
-2007-09-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclResult.c (Tcl_GetReturnOptions):	Take care that a
-	* tests/init.test:	non-TCL_ERROR code doesn't cause existing
-	-errorinfo, -errorcode, and -errorline entries to be omitted.
-	* generic/tclEvent.c:	With -errorInfo no longer lost, generate more
-	complete ::errorInfo when calling [bgerror] after a non-TCL_ERROR
-	background exception.
-
-2007-09-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInterp.c (Tcl_Init):	Removed constraint on ability
-	to define a custom [tclInit] before calling Tcl_Init(). Until now the
-	custom command had to be a proc. Now it can be any command.
-
-	* generic/tclInt.decls: New internal routine TclBackgroundException()
-	* generic/tclEvent.c:	that for the first time permits non-TCL_ERROR
-	exceptions to trigger [interp bgerror] handling. Closes a gap in TIP
-	221. When falling back to [bgerror] (which is designed only to handle
-	TCL_ERROR), convert exceptions into errors complaining about the
-	exception.
-
-	* generic/tclInterp.c:	Convert Tcl_BackgroundError() callers to call
-	* generic/tclIO.c:	TclBackgroundException().
-	* generic/tclIOCmd.c:
-	* generic/tclTimer.c:
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2007-09-06  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcode/project.pbxproj: discontinue unmaintained support
-	* macosx/Tcl.xcode/default.pbxuser: for Xcode 1.5; replace by Xcode2
-	project for use on Tiger (with Tcl.xcodeproj to be used on Leopard).
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: updates for Xcode 2.5 and 3.0.
-	* macosx/Tcl.xcodeproj/default.pbxuser:
-	* macosx/Tcl.xcode/project.pbxproj:
-	* macosx/Tcl.xcode/default.pbxuser:
-	* macosx/Tcl-Common.xcconfig:
-
-	* macosx/README: document project changes.
-
-2007-09-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Removed support for the unmaintained
-	* generic/tclExecute.c: -DTCL_GENERIC_ONLY configuration. [Bug
-	* unix/Makefile.in:	1264623]
-
-2007-09-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	It's unreliable to count on the release
-	manager to remember to `make genstubs` before `make dist`. Let the
-	Makefile remember the dependency for us.
-
-	* unix/Makefile.in:	Corrections to `make dist` dependencies to be
-	sure that macosx/configure gets generated whenever it does not exist.
-
-2007-09-03  Kevin B, Kenny  <kennykb@acm.org>
-
-	* library/tzdata/Africa/Cairo:
-	* library/tzdata/America/Grand_Turk:
-	* library/tzdata/America/Port-au-Prince:
-	* library/tzdata/America/Indiana/Petersburg:
-	* library/tzdata/America/Indiana/Tell_City:
-	* library/tzdata/America/Indiana/Vincennes:
-	* library/tzdata/Antarctica/McMurdo:
-	* library/tzdata/Australia/Adelaide:
-	* library/tzdata/Australia/Broken_Hill:
-	* library/tzdata/Australia/Currie:
-	* library/tzdata/Australia/Hobart:
-	* library/tzdata/Australia/Lord_Howe:
-	* library/tzdata/Australia/Melbourne:
-	* library/tzdata/Australia/Sydney:
-	* library/tzdata/Pacific/Auckland:
-	* library/tzdata/Pacific/Chatham: Olson's tzdata2007g.
-
-	* generic/tclListObj.c (TclLindexFlat):
-	* tests/lindex.test (lindex-17.[01]):	Added code to detect the error
-	when a script does [lindex {} end foo]; an overaggressive optimisation
-	caused this call to return an empty object rather than an error.
-
-2007-09-03  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclObj.c (TclInitObjSubsystem): restore registration of the
-	"wideInt" Tcl_ObjType for compatibility with 8.4 extensions that
-	access the tclWideIntType Tcl_ObjType; add setFromAnyProc for
-	tclWideIntType.
-
-2007-09-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/lsearch.n: Added note that order of results with the -all option
-	is that of the input list. It always was, but this makes it crystal.
-
-2007-08-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c: Added fflush() calls following all callers of
-	* generic/tclExecute.c: TclPrintByteCodeObj() so that tcl_traceCompile
-	output is less likely to get mangled when writes to stdout interleave
-	with other code.
-
-2007-08-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Use a table lookup in ParseLexeme() to
-	determine lexemes with single-byte representations.
-
-	* generic/tclBasic.c:	Used unions to better clarify overloading of
-	* generic/tclCompExpr.c:	the fields of the OpCmdInfo and
-	* generic/tclCompile.h:		TclOpCmdClientData structs.
-
-2007-08-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Call TclCompileSyntaxError() when
-	expression syntax errors are found when compiling expressions. With
-	this in place, convert TclCompileExpr to return void, since there's no
-	longer any need to report TCL_ERROR.
-	* generic/tclCompile.c: Update callers.
-	* generic/tclExecute.c:
-
-	* generic/tclCompCmds.c:	New routine TclCompileSyntaxError()
-	* generic/tclCompile.h: to directly compile bytecodes that report a
-	* generic/tclCompile.c: syntax error, rather than (ab)use a call to
-	TclCompileReturnCmd. Also, undo the most recent commit that papered
-	over some issues with that (ab)use. New routine produces a new opcode
-	INST_SYNTAX, which is a minor variation of INST_RETURN_IMM. Also a bit
-	of constification.
-
-	* generic/tclCompile.c: Move the deallocation of local LiteralTable
-	* generic/tclCompExpr.c:	entries into TclFreeCompileEnv().
-	* generic/tclExecute.c: Update callers.
-
-	* generic/tclCompExpr.c:	Force numeric and boolean literals in
-	expressions to register with their intreps intact, even if that means
-	overwriting existing intreps in already registered literals.
-
-2007-08-25  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Added code to handle
-	* tests/expr.test (expr-23.48-53)	     integer exponentiation
-	that results in 32- and 64-bit integer results, avoiding calls to wide
-	integer exponentiation routines in this common case. [Bug 1767293]
-
-	* library/clock.tcl (ParseClockScanFormat): Modified code to allow
-	* tests/clock.test (clock-60.*):	    case-insensitive matching
-	of time zone and month names. [Bug 1781282]
-
-2007-08-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Register literals found in expressions
-	* tests/compExpr.test:	to restore literal sharing. Preserve numeric
-	intreps when literals are created for the first time. Correct memleak
-	in ExecConstantExprTree() and add test for the leak.
-
-2007-08-24  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c: replaced copy loop that tripped some compilers
-	with memmove. [Bug 1780870]
-
-2007-08-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl ([auto_load_index]): Delete stray "]" that created
-	an expr syntax error (masked by a [catch]).
-
-	* generic/tclCompCmds.c (TclCompileReturnCmd):	Added crash protection
-	to handle callers other than TclCompileScript() failing to meet the
-	initialization assumptions of the TIP 280 code in CompileWord().
-
-	* generic/tclCompExpr.c:	Suppress the attempt to convert to
-	numeric when precompiling a constant expression indicates an error.
-
-2007-08-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TEBC): disable the new shortcut to frequent
-	INSTs for debug builds. REVERTED (collision with alternative fix)
-
-2007-08-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclMain.c:	Corrected the logic of dropping the last
-	* tests/main.test:	newline from an interactively typed command.
-	[Bug 1775878]
-
-2007-08-21  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* tests/thread.test: thread-4.4: clear ::errorInfo in the thread as a
-	message is left here from init.tcl on windows due to no tcl_pkgPath.
-
-2007-08-20  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_SUB): fix usage of the new macro for
-	overflow detection in sums, adapt to subtraction. Lengthy comment
-	added.
-
-2007-08-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (Overflowing, TclIncrObj, TclExecuteByteCode):
-	Encapsulate Miguel's last change in a more mnemonic macro.
-
-2007-08-19  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: changed the check for overflow in sums,
-	reducing objsize, number of branches and cache misses (according to
-	cachegrind). Non-overflow for s=a+b:
-	previous
-	  ((a >= 0 || b >= 0 || s < 0) && (s >= 0 || b < 0 || a < 0))
-	now
-	  (((a^s) >= 0) || ((a^b) < 0))
-	This expresses: "a and s have the same sign or else a and b have
-	different sign".
-
-2007-08-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/interp.n (RESOURCE LIMITS): Added text to better explain why
-	time limits are described using absolute times. [Bug 1752148]
-
-2007-08-16  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c: improved localVarNameType caching to leverage
-	the new availability of Tcl_Obj in variable names, avoiding string
-	comparisons to verify that the cached value is usable.
-
-	* generic/tclExecute.c: check the two most frequent instructions
-	before the switch. Reduces both runtime and obj size a tiny bit.
-
-2007-08-16  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Added a "constant" field to the OpNode
-	struct (again "free" due to alignment requirements) to mark those
-	subexpressions that are completely known at compile time. Enhanced
-	CompileExprTree() and its callers to precompute these constant
-	subexpressions at compile time. This resolves the issue raised in [Bug
-	1564517].
-
-2007-08-15  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclIOUtil.c (TclGetOpenModeEx): Only set the O_APPEND flag
-	* tests/ioUtil.test (ioUtil-4.1):	  on a channel for the 'a'
-	mode and not for 'a+'. [Bug 1773127]
-
-2007-08-14  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_INVOKE*): peephole opt, do not get the
-	interp's result if it will be pushed/popped.
-
-2007-08-14  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Use fully qualified variable names for
-	* tests/thread.test:	::errorInfo and ::errorCode so that string
-	* tests/trace.test:	reported to variable traces are fully
-	qualified in agreement with Tcl 8.4 operations.
-
-2007-08-14  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclLoadDyld.c: use dlfcn API on Mac OS X 10.4 and later; fix
-	issues with loading from memory on intel and 64bit; add debug messages
-
-	* tests/load.test: add test load-10.1 for loading from vfs.
-
-	* unix/dltest/pkga.c:		whitespace & comment cleanup, remove
-	* unix/dltest/pkgb.c:		unused pkgf.c.
-	* unix/dltest/pkgc.c:
-	* unix/dltest/pkge.c:
-	* unix/dltest/pkgf.c (removed):
-	* unix/dltest/pkgua.c:
-	* macosx/Tcl.xcodeproj/project.pbxproj:
-
-2007-08-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Provide DECACHE/CACHE protection to the
-	* tests/trace.test:	Tcl_LogCommandInfo() call. [Bug 1773040]
-
-2007-08-12  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdMZ.c (Tcl_SplitObjCmd): use TclNewStringObj macro
-	instead of calling the function.
-
-	* generic/tcl_Obj.c (TclAllocateFreeObjects): remove unneeded memset
-	to 0 of all allocated objects.
-
-2007-08-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h: remove redundant ops in TclNewStringObj macro.
-
-2007-08-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h: fix the TclSetVarNamespaceVar macro, was causing a
-	leak.
-
-2007-08-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Revise CompileExprTree() to use the
-	OpNode mark field scheme of tree traversal. This eliminates the need
-	to use magic values in the left and right fields for that purpose.
-	Also stop abusing the left field within ParseExpr() to store the
-	number of arguments in a parsed function call. CompileExprTree() now
-	determines that for itself at compile time. Then reorder code to
-	eliminate duplication.
-
-2007-08-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c (TclCreateProc): better comments on the required
-	varflag values when loading precompiled procs.
-
-	* generic/tclExecute.c (INST_STORE_ARRAY):
-	* tests/trace.test (trace-2.6): whole array write traces on compiled
-	local variables were not firing. [Bug 1770591]
-
-2007-08-08  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclProc.c (InitLocalCache): reference firstLocalPtr via
-	procPtr. codePtr->procPtr == NULL exposed by tbcload.
-
-2007-08-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Corrected failure to compile/link in the
-	-DNO_WIDE_TYPE configuration.
-
-	* generic/tclExecute.c: Corrected improper use of bignum arguments to
-	* tests/expr.test:	*SHIFT operations. [Bug 1770224]
-
-2007-08-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h: remove comments refering to VAR_SCALAR, as that
-	flag bit does not exist any longer.
-	* generic/tclProc.c (InitCompiledLocals): removed optimisation for
-	non-resolved case, as the function is never called in that case.
-	Renamed the function to InitResolvedLocals to calrify the point.
-
-	* generic/tclInt.decls:	  Exporting via stubs to help xotcl adapt to
-	* generic/tclInt.h:	  VarReform.
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-
-2007-08-07  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclEnv.c:	improve environ handling on Mac OS X (adapted
-	* unix/tclUnixPort.h:	from Apple changes in Darwin tcl-64).
-
-	* unix/Makefile.in:	add support for compile flags specific to
-				object files linked directly into executables.
-
-	* unix/configure.in (Darwin): only use -seg1addr flag when prebinding;
-	use -mdynamic-no-pic flag for object files linked directly into exes;
-	support overriding TCL_PACKAGE_PATH/TCL_MODULE_PATH in environment.
-
-	* unix/configure: autoconf-2.59
-
-2007-08-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/parseExpr.test: Update source file name of expr parser code.
-
-	* generic/tclCompExpr.c:	Added a "mark" field to the OpNode
-	struct, which is used to guide tree traversal. This field costs
-	nothing since alignement requirements used the memory already.
-	Rewrote ConvertTreeToTokens() to use the new field, which permitted
-	consolidation of utility routines CopyTokens() and
-	GenerateTokensForLiteral().
-
-2007-08-06  Kevin B. Kenny  <kennykb@users.sf.net>
-
-	* generic/tclGetDate.y: Added a cast to the definition of YYFREE to
-				silence compiler warnings.
-	* generic/tclDate.c:	Regenerated
-	* win/tclWinTest.c:	Added a cast to GetSecurityDescriptorDacl call
-				to silence compiler warnings.
-
-2007-08-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.decls:	  Exporting via stubs to help itcl adapt to
-	* generic/tclInt.h:	  VarReform. Added localCache initialization
-	* generic/tclIntDecls.h:  to TclInitCompiledLocals (which only exists
-	* generic/tclProc.c:	  for itcl).
-	* generic/tclStubInit.c:
-	* generic/tclVar.c:
-
-2007-08-01  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* library/word.tcl: Rewrote for greater efficiency. [Bug 1764318]
-
-2007-08-01  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* generic/tclInt.h:	Added a TclOffset macro ala Tk_Offset to
-	* generic/tclVar.c:	abstract out 'offsetof' which may not be
-	* generic/tclExceute.c: defined (eg: msvc6).
-
-2007-08-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclCleanupVar): fix [Bug 1765225], thx Larry
-	Virden.
-
-2007-07-31  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/Hash.3:
-	* generic/tclHash.c:
-	* generic/tclObj.c:
-	* generic/tclThreadStorage.c: (changes part of the patch below)
-	Stop Tcl_CreateHashVar from resetting hPtr->clientData to NULL after
-	calling the allocEntryProc for a custom table.
-
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCompCmds.c:
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclHash.c:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclLiteral.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclProc.c:
-	* generic/tclThreadStorage.c:
-	* generic/tclTrace.c:
-	* generic/tclVar.c: VarReform [Patch 1750051]
-
-	*** POTENTIAL INCOMPATIBILITY *** (tclInt.h and tclCompile.h)
-	Extensions that access internals defined in tclInt.h and/or
-	tclCompile.h may lose both binary and source compatibility. The
-	relevant changes are:
-	1. 'struct Var' is completely changed, all acceses to its internals
-	   (either direct or via the TclSetVar* and TclIsVar* macros) will
-	   malfunction. Var flag values and semantics changed too.
-	2. 'struct Bytecode' has an additional field that has to be
-	   initialised to NULL
-	3. 'struct Namespace' is larger, as the varTable is now one pointer
-	   larger than a Tcl_HashTable. Direct access to its fields will
-	   malfunction.
-	4. 'struct CallFrame' grew one more field (the second such growth with
-	   respect to Tcl8.4).
-	5. API change for the functions TclFindCompiledLocal, TclDeleteVars
-	   and many internal functions in tclVar.c
-
-	Additionally, direct access to variable hash tables via the standard
-	Tcl_Hash* interface is to be considered as deprecated. It still works
-	in the present version, but will be broken by further specialisation
-	of these hash tables. This concerns especially the table of array
-	elements in an array, as well as the varTable field in the Namespace
-	struct.
-
-2007-07-31  Miguel Sofer  <msofer@users.sf.net>
-
-	* unix/configure.in: allow use of 'inline' in Tcl sources. [Patch
-	* win/configure.in:  1754128]
-	* win/makefile.vc:   Regen with autoconf 2.61
-
-2007-07-31  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/tclUnixInit.c (TclpSetVariables): Use the thread-safe getpwuid
-	replacement to fill the tcl_platform(user) field as it is not subject
-	to spoofing. [Bug 681877]
-
-	* unix/tclUnixCompat.c: Simplify the #ifdef logic.
-
-	* unix/tclUnixChan.c (FileWatchProc): Fix test failures.
-
-2007-07-30  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/tclUnixChan.c (SET_BITS, CLEAR_BITS): Added macros to make this
-	file clearer.
-
-2007-07-24  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TEOvI, GetCommandSource):
-	* generic/tclExecute.c (TEBC, TclGetSrcInfoForCmd):
-	* generic/tclInt.h:
-	* generic/tclTrace.c (TclCheck(Interp|Execution)Traces):
-	Removed the need for TEBC to inspect the command before calling TEOvI,
-	leveraging the TIP 280 infrastructure. Moved the generation of a
-	correct nul-terminated command string away from the trace code, back
-	into TEOvI/GetCommandSource.
-
-2007-07-20  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/platform.tcl: Fixed bug in 'platform::patterns'
-	* library/platform/pkgIndex.tcl: where identifiers not matching
-	* unix/Makefile.in: the special linux and solaris forms would not
-	* win/Makefile.in: get 'tcl' as an acceptable platform added to
-	* doc/platform.n: the result. Bumped package to version 1.0.3 and
-	* doc/platform_shell.n: updated documentation and Makefiles. Also
-	fixed bad version info in the documentation of platform::shell.
-
-2007-07-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParse.c:	In contexts where interp and parsePtr->interp
-	might be different, be sure to use the latter for error reporting.
-	Also pulled the interp argument back out of ParseTokens() since we
-	already had a parsePtr->interp to work with.
-
-2007-07-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Removed unused arguments and variables
-
-2007-07-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c (ParseExpr):	While adding comments to
-	explain the operations of ParseExpr(), made significant revisions to
-	the code so it would be easier to explain, and in the process made the
-	code simpler and clearer as well.
-
-2007-07-15  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	More commentary.
-	* tests/parseExpr.test:		Several tests of syntax error messages
-	to check that when expression substrings are truncated they leave
-	visible the context relevant to the reported error.
-
-2007-07-12  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Factored out, corrected, and commented
-	common code for reporting syntax errors in LEAF elements.
-
-2007-07-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileWhileCmd):
-	* generic/tclCompile.c (TclCompileScript):
-	Corrected faulty avoidance of INST_START_CMD when the first opcode in
-	a script is within a loop (as produced by 'while 1'), so that the
-	corresponding command is properly counted. [Bug 1752146]
-
-2007-07-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Added a "parseOnly" flag argument to
-	ParseExpr() to indicate whether the caller is Tcl_ParseExpr(), with an
-	end goal of filling a Tcl_Parse with Tcl_Tokens representing the
-	parsed expression, or TclCompileExpr() with the goal of compiling and
-	executing the expression. In the latter case, more aggressive
-	conversion of QUOTED and BRACED lexeme to literals is done. In the
-	former case, all such conversion is avoided, since Tcl_Token
-	production would revert it anyway. This enables simplifications to the
-	GenerateTokensForLiteral() routine as well.
-
-2007-07-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Added a field for operator precedence
-	to be stored directly in the parse tree. There's no memory cost to
-	this addition, since that memory would have been lost to alignment
-	issues anyway. Also, converted precedence definitions and lookup
-	tables to use symbolic constants instead of raw number for improved
-	readability, and continued extending/improving/correcting comments.
-	Removed some unused counter variables. Renamed some variables for
-	clarity and replaced some cryptic logic with more readable macros.
-
-2007-07-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Revision so that the END lexeme never
-	gets inserted into the parse tree. Later tree traversal never reaches
-	it since its location in the tree is not variable. Starting and
-	stopping with the START lexeme (node 0) is sufficient. Also finished
-	lexeme code commentary.
-
-	* generic/tclCompExpr.c:	Added missing creation and return of
-	the Tcl_Parse fields that indicate error conditions. [Bug 1749987]
-
-2007-07-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/init.tcl (unknown):	Corrected inconsistent error message
-	in interactive [unknown] when empty command is invoked. [Bug 1743676]
-
-2007-07-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclNamesp.c (SetNsNameFromAny):
-	* generic/tclObj.c (SetCmdNameFromAny): Avoid unnecessary
-	ckfree/ckalloc when the old structs can be reused.
-
-2007-07-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclNamesp.c: Fix case where a FQ cmd or ns was being cached
-	* generic/tclObj.c:    in a different interp, tkcon. [Bug 1747512]
-
-2007-07-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Revised #define values so that there
-	is now more expansion room to define more BINARY operators.
-
-2007-07-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclHash.c (CompareStringKeys): Always use the strcmp()
-	version; the operation is functionally equivalent, the speed is
-	identical (up to measurement limitations), and yet the code is
-	simpler. [FRQ 951168]
-
-2007-07-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Removed TCL_PRESERVE_BINARY_COMPATIBILITY and
-	* generic/tclHash.c:	any code enabled when it is set to 0. We will
-	* generic/tclStubInit.c:	always want to preserve binary compat
-	of the structs that appear in the interface through the 8.* series of
-	releases, so it's pointless to drag around this never-enabled
-	alternative.
-
-	* generic/tclIO.c:	Removed dead code.
-	* unix/tclUnixChan.c:
-
-	* generic/tclCompExpr.c:	Removed dead code, old implementations
-	* generic/tclEvent.c:	of expr parsing and compiling, including the
-	* generic/tclInt.h:	routine TclFinalizeCompilation().
-
-2007-06-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Plug a memory leak caused by a
-	missing Tcl_DecrRefCount on an error path. [Bug 1717186]
-
-2007-06-30  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* generic/tclThread.c: Prevent RemeberSyncObj() from growing the sync
-	object lists by reusing already free'd slots, if possible. See
-	discussion on Bug 1726873 for more information.
-
-2007-06-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/DictObj.3 (Tcl_DictObjDone): Improved documentation of this
-	function to make it clearer how to use it. [Bug 1710795]
-
-2007-06-29  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclAlloc.c:		on Darwin, ensure memory allocated by
-	* generic/tclThreadAlloc.c:	the custom TclpAlloc()s is aligned to
-	16 byte boundaries (as is the case with the Darwin system malloc).
-
-	* generic/tclGetDate.y: use ckalloc/ckfree instead of malloc/free.
-	* generic/tclDate.c:	bison 1.875e
-
-	* generic/tclBasic.c (TclEvalEx): fix warnings.
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: better support for renamed tcl
-	* macosx/Tcl.xcodeproj/default.pbxuser: source dir; add 10.5 SDK build
-	* macosx/Tcl-Common.xcconfig:		config; remove tclMathOp.c.
-
-	* macosx/README: document Tcl.xcodeproj changes.
-
-2007-06-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:		Removed dead code, including the
-	* generic/tclExecute.c:		entire file tclMathOp.c.
-	* generic/tclInt.h:
-	* generic/tclMathOp.c (removed):
-	* generic/tclTestObj.c:
-	* win/tclWinFile.c:
-
-	* unix/Makefile.in:	Updated to reflect deletion of tclMathOp.c.
-	* win/Makefile.in:
-	* win/makefile.bc:
-	* win/makefile.vc:
-
-2007-06-28  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* generic/tclBasic.c:	  Silence constness warnings for TclStackFree
-	* generic/tclCompCmds.c:  when building with msvc.
-	* generic/tclFCmd.c:
-	* generic/tclIOCmd.c:
-	* generic/tclTrace.c:
-
-2007-06-28  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (UnsetVarStruct): fix possible segfault.
-
-2007-06-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclTrace.c:	Corrected broken trace reversal logic in
-	* generic/tclTest.c:	TclCheckInterpTraces that led to infinite loop
-	* tests/trace.test:	when multiple Tcl_CreateTrace traces were set
-	and one of them did not fire due to level restrictions. [Bug 1743931]
-
-2007-06-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclEvalEx):	Moved some arrays from the C
-	stack to the Tcl stack.
-
-2007-06-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (UnsetVarStruct): more streamlining.
-
-2007-06-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Safety checks to avoid crashes in the
-	TclStack* routines when called with an incompletely initialized
-	interp. [Bug 1743302]
-
-2007-06-25  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (UnsetVarStruct): fixing incomplete change, more
-	streamlining.
-
-2007-06-24  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclDeleteCompiledLocalVars): removed inlining that
-	ended up not really optimising (limited benchmarks). Now calling
-	UnsetVarStruct (streamlined old code is #ifdef'ed out, in case better
-	benchmarks do show a difference).
-
-	* generic/tclVar.c (UnsetVarStruct): fixed a leak introduced in last
-	commit.
-
-2007-06-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (UnsetVarStruct, TclDeleteVars): made the logic
-	slightly clearer, eliminated some duplicated code.
-
-	*** POTENTIAL INCOMPATIBILITY *** (tclInt.h and Var struct users)
-	The core never builds VAR_LINK variable to have traces. Such a
-	"monster", should one exist, will now have its unset traces called
-	*before* it is unlinked.
-
-2007-06-23  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXNotify.c (AtForkChild): don't call CoreFoundation
-	APIs after fork() on systems where that would lead to an abort().
-
-2007-06-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Revised TclStackRealloc() signature to better
-	* generic/tclInt.h:	parallel (and fall back on) Tcl_Realloc.
-
-	* generic/tclNamesp.c (TclResetShadowesCmdRefs):	Replaced
-	ckrealloc based allocations with TclStackRealloc allocations.
-
-	* generic/tclCmdIL.c:	More conversions to use TclStackAlloc.
-	* generic/tclScan.c:
-
-2007-06-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	 Move most instances of the Tcl_Parse struct
-	* generic/tclCompExpr.c: off the C stack and onto the Tcl stack. This
-	* generic/tclCompile.c:	 is a rather large struct (> 3kB).
-	* generic/tclParse.c:
-
-2007-06-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TEOvI):		Made sure that leave traces
-	* generic/tclExecute.c (INST_INVOKE):	that were created during
-	* tests/trace.test (trace-36.2):	execution of an originally
-	untraced command do not fire [Bug 1740962], partial fix.
-
-2007-06-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tcl.h, generic/tclCompile.h, generic/tclCompile.c: Remove
-	references in comments to obsolete {expand} notation. [Bug 1740859]
-
-2007-06-20  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c: streamline namespace vars deletion: only compute
-	the variable's full name if the variable is traced.
-
-2007-06-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.decls: Revised the interfaces of the routines
-	* generic/tclExecute.c: TclStackAlloc and TclStackFree to make them
-	easier for callers to use (or more precisely, harder to misuse).
-	TclStackFree now takes a (void *) argument which is the pointer
-	intended to be freed. TclStackFree will panic if that's not actually
-	the memory the call will free. TSA/TSF also now tolerate receiving
-	(interp == NULL), in which case they simply fall back to be calls to
-	Tcl_Alloc/Tcl_Free.
-
-	* generic/tclIntDecls.h:	make genstubs
-
-	* generic/tclBasic.c:	Updated callers
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCompCmds.c:
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclFCmd.c:
-	* generic/tclFileName.c:
-	* generic/tclIOCmd.c:
-	* generic/tclIndexObj.c:
-	* generic/tclInterp.c:
-	* generic/tclNamesp.c:
-	* generic/tclProc.c:
-	* generic/tclTrace.c:
-	* unix/tclUnixPipe.c:
-
-2007-06-20  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* tools/tcltk-man2html.tcl: revamp of html doc output to use CSS,
-	standardized headers, subheaders, dictionary sorting of names.
-
-2007-06-18  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* tools/tcltk-man2html.tcl: clean up copyright merging and output.
-	clean up coding constructs.
-
-2007-06-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIL.c (InfoFrameCmd):
-	* generic/tclCmdMZ.c (Tcl_SwitchObjCmd):
-	* generic/tclCompile.c (TclInitCompileEnv):
-	* generic/tclProc.c (Tcl_ProcObjCmd, SetLambdaFromAny): Moved the
-	CmdFrame off the C stack and onto the Tcl stack.
-
-	* generic/tclExecute.c (TEBC):	Moved the CmdFrame off the C stack and
-	onto the Tcl stack, between the catch and the execution stacks
-
-2007-06-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclEvalEx,TclEvalObjEx):	Moved the CmdFrame off
-	the C stack and onto the Tcl stack.
-
-2007-06-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (TclObjInterpProcCore): Minor fixes to make
-	* generic/tclExecute.c (TclExecuteByteCode): compilation debugging
-	builds work again. [Bug 1738542]
-
-2007-06-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (TclObjInterpProcCore): Use switch instead of a
-	chain of if's for a modest performance gain and a little more clarity.
-
-2007-06-15  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompCmds.c:  Simplified [variable] compiler and executor.
-	* generic/tclExecute.c:	  Missed updates to "there is always a valid
-	frame".
-
-	* generic/tclCompile.c: reverted TclEvalObjvInternal and INST_INVOKE
-	* generic/tclExecute.c: to essentially what they were previous to the
-	* generic/tclBasic.c:	commit of 2007-04-03 [Patch 1693802] and the
-	subsequent optimisations, as they break the new trace tests described
-	below.
-
-	* generic/trace.test: added tests 36 to 38 for dynamic trace creation
-	and addition. These tests expose a change in dynamics due to a recent
-	round of optimisations. The "correct" behaviour is not described in
-	docs nor TIP 62.
-
-2007-06-14  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.decls:	  Modif to the internals of TclObjInterpProc
-	* generic/tclInt.h:	  to reduce stack consumption and improve task
-	* generic/tclIntDecls.h:  separation. Changes the interface of
-	* generic/tclProc.c:	  TclObjInterpProcCore (patching TclOO
-	simultaneously).
-
-	* generic/tclProc.c (TclObjInterpProcCore): simplified obj management
-	in wrongNumArgs calls.
-
-2007-06-14  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c: SetByteCodeFromAny() can no longer return any
-	* generic/tclExecute.c: code other than TCL_OK, so remove code that
-	* generic/tclProc.c:	formerly handled exceptional codes.
-
-2007-06-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TclCompEvalObj): missed update to "there is
-	always a valid frame".
-
-	* generic/tclProc.c (TclObjInterpProcCore): call TEBC directly instead
-	of going through TclCompEvalObj - no need to check the compilation's
-	freshness, this has already been done. This improves speed and should
-	also provide some relief to [Bug 1066755].
-
-2007-06-12  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclBasic.c (Tcl_CreateInterp): Turn the [info] command into
-	* generic/tclCmdIL.c (TclInitInfoCmd):	 an ensemble, making it easier
-	for third-party code to plug into.
-
-	* generic/tclIndexObj.c (Tcl_WrongNumArgs):
-	* generic/tclNamesp.c, generic/tclInt.h (tclEnsembleCmdType): Make
-	Tcl_WrongNumArgs do replacement correctly with ensembles and other
-	sorts of complex replacement strategies.
-
-2007-06-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c:	 comments added to explain iPtr->numLevels
-	management.
-
-	* generic/tclNamesp.c:	 tweaks to Tcl_GetCommandFromObj and
-	* generic/tclObj.c:	 TclGetNamespaceFromObj; modified the usage of
-	structs ResolvedCmdName and ResolvedNsname so that the field refNsPtr
-	is NULL for fully qualified names.
-
-2007-06-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	 Further TEOvI split, creating a new
-	* generic/tclCompile.h:	 TclEvalObjvKnownCommand() function to handle
-	* generic/tclExecute.c:	 commands that are already known and are not
-	traced. INST_INVOKE now calls into this function instead of inlining
-	parts of TEOvI. Same perf, better isolation.
-
-	***POTENTIAL INCOMPAT*** There is a subtle issue with the timing of
-	execution traces that is changed here - first change appeared in my
-	commit of 2007-04-03 [Patch 1693802], which caused some divergence
-	between compiled and non-compiled code.
-	***THIS CHANGE IS UNDER REVIEW***
-
-2007-06-10  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* README: updated links. [Bug 1715081]
-
-	* generic/tclExecute.c (TclExecuteByteCode): restore support for
-	INST_CALL_BUILTIN_FUNC1 and INST_CALL_FUNC1 bytecodes to support 8.4-
-	precompiled sources (math functions). [Bug 1720895]
-
-2007-06-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclvar.c: new macros TclGetCurrentNamespace() and
-	TclGetGlobalNamespace(); Tcl_GetCommandFromObj and
-	TclGetNamespaceFromObj rewritten to make the logic clearer; slightly
-	faster too.
-
-2007-06-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_INVOKE): isolated two vars to the small
-	block where they are actually used.
-
-	* generic/tclObj.c (Tcl_GetCommandFromObj): rewritten to make the
-	logic clearer; slightly faster too.
-
-	* generic/tclBasic.c:	Split TEOv in two, by separating a processor
-	for non-TCL_OK returns. Also split TEOvI in a full version that
-	handles non-existing and traced commands, and a separate shorter
-	version for the regular case.
-
-	* generic/tclBasic.c:	Moved the generation of command strings for
-	* generic/tclTrace.c:	traces: previously in Tcl_EvalObjv(), now in
-	TclCheck[Interp|Execution]Traces(). Also insured that the strings are
-	properly NUL terminated at the correct length. [Bug 1693986]
-
-	***POTENTIAL INCOMPATIBILITY in internal API***
-	The functions TclCheckInterpTraces() and TclCheckExecutionTraces() (in
-	internal stubs) used to be noops if the command string was NULL, this
-	is not true anymore: if the command string is NULL, they generate an
-	appropriate string from (objc,objv) and use it to call the traces. The
-	caller might as well not call them with a NULL string if he was
-	expecting a noop.
-
-	* generic/tclBasic.c:	Extend usage of TclLimitReady() and
-	* generic/tclExecute.c: (new) TclLimitExceeded() macros.
-	* generic/tclInt.h:
-	* generic/tclInterp.c:
-
-	* generic/tclInt.h:	New TclCleanupCommandMacro for core usage.
-	* generic/tclBasic.c:
-	* generic/tclExecute.c:
-	* generic/tclObj.c:
-
-2007-06-09 Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: add new Tclsh-Info.plist.in.
-
-2007-06-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Changed [string first] and
-	* doc/string.n: [string last] so that they have clearer descriptions
-	for those people who know the adage about needles and haystacks. This
-	follows suggestions on comp.lang.tcl...
-
-2007-06-06  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclParse.c: fix for uninit read. [Bug 1732414]
-
-2007-06-06  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: add settings for Fix&Continue.
-
-	* unix/configure.in (Darwin):		add plist for tclsh; link the
-	* unix/Makefile.in  (Darwin):		Tcl and tclsh plists into
-	* macosx/Tclsh-Info.plist.in (new):	their binaries in all cases.
-	* macosx/Tcl-Common.xcconfig:
-
-	* unix/tcl.m4 (Darwin): fix CF checks in fat 32&64bit builds.
-	* unix/configure: autoconf-2.59
-
-2007-06-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Added interp flag value ERR_LEGACY_COPY to
-	* generic/tclInt.h:	control the timing with which the global
-	* generic/tclNamesp.c:	variables ::errorCode and ::errorInfo get
-	* generic/tclProc.c:	updated after an error. This keeps more
-	* generic/tclResult.c:	precise compatibility with Tcl 8.4.
-	* tests/result.test (result-6.2):	[Bug 1649062]
-
-2007-06-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.h:
-	* generic/tclExecute.c: Tcl-stack reform, [Patch 1701202]
-
-2007-06-03  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in: add datarootdir to silence autoconf-2.6x warning.
-
-2007-05-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Removed code that dealt with
-	* generic/tclCompile.c: TCL_TOKEN_EXPAND_WORD tokens representing
-	* generic/tclCompile.h: expanded literal words. These sections were
-	mostly in place to enable [info frame] to discover line information in
-	expanded literals. Since the parser now generates a token for each
-	post-expansion word referring to the right location in the original
-	script string, [info frame] gets all the data it needs.
-
-	* generic/tclInt.h:	Revised the parser so that it never produces
-	* generic/tclParse.c:	TCL_TOKEN_EXPAND_WORD tokens when parsing an
-	* tests/parse.test:	expanded literal word; that is, something like
-	{*}{x y z}. Instead, generate the series of TCL_TOKEN_SIMPLE_WORD
-	tokens to represent the words that expansion of the literal string
-	produces. [RFE 1725186]
-
-2007-05-29  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tclUnixThrd.c (Tcl_JoinThread): fix for 64-bit handling of
-	pthread_join exit return code storage. [Bug 1712723]
-
-2007-05-22  Don Porter	<dgp@users.sourceforge.net>
-
-	[core-stabilizer-branch]
-
-	* unix/configure:	autoconf-2.59 (FC6 fork)
-	* win/configure:
-
-	* README:		Bump version number to 8.5b1
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-2007-05-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* unix/configure:	autoconf-2.59 (FC6 fork)
-	* win/configure:
-
-	* README:		Bump version number to 8.5a7
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* generic/tclParse.c:	Disable and remove the ALLOW_EXPAND sections
-	* tests/info.test:	that continued to support the deprecated
-	* tests/mathop.test:	{expand} syntax. Updated the few remaining
-	users of that syntax in the test suite.
-
-2007-05-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TclLimitReady): Created a macro version of
-	Tcl_LimitReady just for TEBC, to reduce the amount of times that the
-	bytecode engine calls out to external functions on the critical path.
-	* generic/tclInterp.c (Tcl_LimitReady): Added note to remind anyone
-	doing maintenance that there is a macro version to update.
-
-2007-05-17  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tcl.decls: workaround 'make checkstubs' failures from
-	tclStubLib.c MODULE_SCOPE revert. [Bug 1716117]
-
-2007-05-16  Joe English	 <jenglish@users.sourceforge.net>
-
-	* generic/tclStubLib.c:	 Change Tcl_InitStubs(), tclStubsPtr, and the
-	auxilliary stubs table pointers back to public visibility.
-
-	These symbols need to be exported so that stub-enabled extensions may
-	be statically linked into an extended tclsh or Big Wish with a
-	dynamically-linked libtcl. [Bug 1716117]
-
-2007-05-15  Don Porter	<dgp@users.sourceforge.net>
-
-	* win/configure:	autoconf-2.59 (FC6 fork)
-
-	* library/reg/pkgIndex.tcl:	Bump to registry 1.2.1 to account for
-	* win/configure.in:		[Bug 1682211] fix.
-	* win/makefile.bc:
-	* win/tclWinReg.c:
-
-2007-05-11  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* generic/tclInt.h: Removed TclEvalObjEx and TclGetSrcInfoForPc from
-	tclInt.h now they are in the internal stubs table.
-
-2007-05-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:	TclFinalizeThreadAlloc() is always defined, so
-	make sure it is also always declared (with MODULE_SCOPE).
-
-2007-05-09  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.h: fix warning when building threaded with -DPURIFY.
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: add 'DebugUnthreaded' &
-	* macosx/Tcl.xcodeproj/default.pbxuser: 'DebugLeaks' configs and env
-	var settings needed to run the 'leaks' tool.
-
-2007-05-07  Don Porter	<dgp@users.sourceforge.net>
-
-	[Tcl Bug 1706140]
-
-	* generic/tclLink.c (LinkTraceProc):	Update Tcl_VarTraceProcs so
-	* generic/tclNamesp.c (Error*Read):	they call Tcl_InterpDeleted()
-	* generic/tclTrace.c (Trace*Proc):	for themselves, and do not
-	* generic/tclUtil.c (TclPrecTraceProc): rely on (frequently buggy)
-	setting of the TCL_INTERP_DESTROYED flag by the trace core.
-
-	* generic/tclVar.c:	Update callers of TclCallVarTraces to not pass
-	in the TCL_INTERP_DESTROYED flag. Also apply filters so that public
-	routines only pass documented flag values down to lower level routines
-
-	* generic/tclTrace.c (TclCallVarTraces):	The setting of the
-	TCL_INTERP_DESTROYED flag is now done entirely within the
-	TclCallVarTraces routine, the only place it can be done right.
-
-2007-05-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInt.h (ExtraFrameInfo): Create a new mechanism for
-	* generic/tclCmdIL.c (InfoFrameCmd): conveying what information needs
-	to be added to the results of [info frame] to replace the hack that
-	was there before.
-	* generic/tclProc.c (Tcl_ApplyObjCmd): Use the new mechanism for the
-	[apply] command, the only part of Tcl itself that needs it (so far).
-
-	* generic/tclInt.decls (TclEvalObjEx, TclGetSrcInfoForPc): Expose
-	these two functions through the internal stubs table, necessary for
-	extensions that need to integrate deeply with TIP#280.
-
-2007-05-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* win/tclWinFile.c (TclpGetUserHome):	Squelch type-pun warnings in
-	* win/tclWinInit.c (TclpSetVariables):	Win-specific code not found
-	* win/tclWinReg.c (AppendSystemError):	during earlier work on Unix.
-
-2007-05-04  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclIO.c (TclFinalizeIOSubsystem): Added an initializer to
-	silence a spurious gcc warning about use of an uninitialized
-	variable.
-	* tests/encoding.test: Modified so that encoding tests happen in a
-	private namespace, to avoid polluting the global one. This problem was
-	discovered when running the test suite '-singleproc 1 -skip exec.test'
-	because the 'path' variable in encoding.test conflicted with the one
-	in io.test.
-	* tests/io.test: Made more of the working variables private to the
-	namespace.
-
-2007-05-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclTest.c (SimpleMatchInDirectory): Corrected a refcount
-	imbalance that affected the filesystem-[147]* tests in the test suite.
-	Thanks to Don Porter for the patch. [Bug 1710707]
-	* generic/tclPathObj.c (Tcl_FSJoinPath, Tcl_FSGetNormalizedPath):
-	Corrected several memory leaks that caused refcount imbalances
-	resulting in memory leaks on Windows. Thanks to Joe Mistachkin for the
-	patch.
-
-2007-05-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclPtrSetVar): fixed leak whenever newvaluePtr had
-	refCount 0 and was used for appending (but not lappending). Thanks to
-	mistachkin and kbk. [Bug 1710710]
-
-2007-05-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclIO.c (DeleteChannelTable): Made changes so that
-	DeleteChannelTable tries to close all open channels, not just the
-	first. [Bug 1710285]
-	* generic/tclThread.c (TclFinalizeSynchronization): Make sure that TSD
-	blocks get freed on non-threaded builds. [Bug 1710825]
-	* tests/utf.test (utf-25.1--utf-25.4): Modified tests to clean up
-	after the 'testobj' extension to avoid spurious reports of memory
-	leaks.
-
-2007-05-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (STR_MAP): When [string map] has a pure dict map,
-	a missing Tcl_DictObjDone() call led to a memleak. [Bug 1710709]
-
-2007-04-30  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in: add 'tclsh' dependency to install targets that
-	rely on tclsh, fixes parallel 'make install' from empty build dir.
-
-2007-04-30  Andreas Kupries <andreask@gactivestate.com>
-
-	* generic/tclIO.c (FixLevelCode): Corrected reference count
-	mismanagement of newlevel, newcode. Changed to allocate the Tcl_Obj's
-	as late as possible, and only when actually needed. [Bug 1705778, leak
-	K29]
-
-2007-04-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclProc.c (Tcl_ProcObjCmd, SetLambdaFromAny): Corrected
-	reference count mismanagement on the name of the source file in the
-	TIP 280 code. [Bug 1705778, leak K02 among other manifestations]
-
-2007-04-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	*** 8.5a6 TAGGED FOR RELEASE ***
-
-	* generic/tclProc.c (TclObjInterpProcCore): Only allocate objects for
-	error message generation when associated with argument names that are
-	really used. [Bug 1705778, leak K15]
-
-2007-04-25  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclIOUtil.c (Tcl_FSChdir): Changed the memory management so
-	that the path returned from Tcl_FSGetNativePath is not duplicated
-	before being stored as the current directory, to avoid a memory leak.
-	[Bug 1705778, leak K01 among other manifestations]
-
-2007-04-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c (ParseExpr):	Revised to be sure that an
-	error return doesn't prevent all literals getting placed on the
-	litList to be returned to the caller for freeing. Corrects some
-	memleaks. [Bug 1705778, leak K23]
-
-2007-04-25  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in (dist): add macosx/*.xcconfig files to src dist;
-	copy license.terms to dist macosx dir; fix autoheader bits.
-
-2007-04-24  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclListObj.c: reverting [Patch 738900] (committed on
-	2007-04-20). Causes some Tk test breakage of unknown importance, but
-	the impact of the patch itself is likely to be so small that it does
-	not warrant investigation at this time.
-
-2007-04-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (DictKeysCmd): Rewrote so that the lock on the
-	internal representation of a dict is only set when necessary. [Bug
-	1705778, leak K04]
-	(DictFilterCmd): Added code to drop the lock in the trivial match
-	case. [Bug 1705778, leak K05]
-
-2007-04-24  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclBinary.c: Addressed several code paths where the error
-	return from the 'binary format' command leaked the result buffer.
-	* generic/tclListObj.c (TclLsetFlat): Fixed a bug where the new list
-	under construction was leaked in the error case. [Bug 1705778, leaks
-	K13 and K14]
-
-2007-04-24  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/Makefile.in (dist): add platform library package to src dist
-
-2007-04-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c (ParseExpr): Memory leak in error case; the
-	literal Tcl_Obj was not getting freed. [Bug 1705778, leak #1 (new)]
-
-	* generic/tclNamesp.c (Tcl_DeleteNamespace):	Corrected flaw in the
-	flag marking scheme to be sure that global namespaces are freed when
-	their interp is deleted. [Bug 1705778]
-
-2007-04-24  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Plugged six memory leaks
-	in bignum arithmetic.
-	* generic/tclIOCmd.c (Tcl_ReadObjCmd): Plugged a leak of the buffer
-	object if the physical read returned an error and the bypass area had
-	no message.
-	* generic/tclIORChan.c (TclChanCreateObjCmd): Plugged a leak of the
-	return value from the "initialize" method of a channel handler.
-	(All of the above under [Bug 1705778])
-
-2007-04-23  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclCkalloc.c: fix warnings from gcc build configured with
-	* generic/tclCompile.c: --enable-64bit --enable-symbols=all.
-	* generic/tclExecute.c:
-
-	* unix/tclUnixFCmd.c: add workaround for crashing bug in fts_open()
-	* unix/tclUnixInit.c: without FTS_NOSTAT on 64bit Darwin 8 or earlier.
-
-	* unix/tclLoadDyld.c (TclpLoadMemory): fix (void*) arithmetic.
-
-	* macosx/Tcl-Common.xcconfig: enable more warnings.
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: add 'DebugMemCompile' build
-	configuration that calls configure with --enable-symbols=all; override
-	configure check for __attribute__((__visibility__("hidden"))) in Debug
-	configuration to restore availability of ZeroLink.
-
-	* macosx/tclMacOSXNotify.c: fix warnings.
-
-	* macosx/tclMacOSXFCmd.c: const fixes.
-
-	* macosx/Tcl-Common.xcconfig:	fix whitespace.
-	* macosx/Tcl-Debug.xcconfig:
-	* macosx/Tcl-Release.xcconfig:
-	* macosx/README:
-
-	* macosx/GNUmakefile:		fix/add copyright and license refs.
-	* macosx/tclMacOSXBundle.c:
-	* macosx/Tcl-Info.plist.in:
-	* macosx/Tcl.xcode/project.pbxproj:
-	* macosx/Tcl.xcodeproj/project.pbxproj:
-
-	* unix/configure.in: install license.terms into Tcl.framework.
-	* unix/configure: autoconf-2.59
-
-2007-04-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclVar.c (UnsetVarStruct):	Make sure the
-	TCL_INTERP_DESTROYED flags gets passed to unset trace routines so they
-	can respond appropriately. [Bug 1705778, leak #9]
-
-2007-04-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclFreeCompileEnv): Tip 280's new field
-	extCmdMapPtr was not being freed. [Bug 1705778, leak #1]
-
-2007-04-23  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclCompCmds.c (TclCompileUpvarCmd): Plugged a memory leak in
-	'upvar' when compiling (a) upvar outside a proc, (b) upvar with a
-	syntax error, or (c) upvar where the frame index is not known at
-	compile time.
-	* generic/tclCompExpr.c (ParseExpr): Plugged a memory leak when
-	parsing expressions that contain syntax errors.
-	* generic/tclEnv.c (ReplaceString): Clear memory correctly when
-	growing the cache to avoid reads of uninitialised data.
-	* generic/tclIORChan.c (TclChanCreateObjCmd, FreeReflectedChannel):
-	Plugged two memory leaks.
-	* generic/tclStrToD.c (AccumulateDecimalDigit): Fixed a mistake where
-	we'd run beyond the end of the 'pow10_wide' array if a number begins
-	with a string of more than 'maxpow10_wide' zeroes.
-	* generic/tclTest.c (Testregexpobjcmd): Removed an invalid access
-	beyond the end of 'objv' in 'testregexp -about'.
-	All of these issues reported under [Bug 1705778] - detected with the
-	existing test suite, no new regression tests required.
-
-2007-04-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclDeleteNamespaceVars): fixed access to freed
-	memory detected by valgrind: Tcl_GetCurrentNamespace was being
-	called after freeing root CallFrame (on interp deletion).
-
-2007-04-20  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclListObj.c (SetListFromAny): avoid discarding internal
-	reps of objects converted to singleton lists. [Patch 738900]
-
-2007-04-20  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/clock.n: Corrected a silly error (transposed 'uppercase' and
-	'lowercase' in clock.n. [Bug 1656002]
-	Clarified that [clock scan] does not recognize a locale's alternative
-	calendar.
-	Deleted an entirely superfluous (and also incorrect) remark about the
-	effect of Daylight Saving Time on relative times in [clock scan]. [Bug
-	1582951]
-	* library/clock.tcl: Corrected an error in skipping over the %Ey field
-	on input.
-	* library/msgs/ja.msg:
-	* tools/loadICU.tcl: Corrected several localisation faults in the
-	Japanese locale (most notably, incorrect dates for the Emperors'
-	eras). Many thanks to SourceForge user 'nyademo' for pointing this out
-	and developing a fix. [Bug 1637471]
-	* generic/tclPathObj.c: Corrected a 'const'ness fault that caused
-	bitter complaints from MSVC.
-	* tests/clock.test (clock-40.1, clock-58.1, clock-59.1): Corrected a
-	test case that depended on ":localtime" being able to handle dates
-	prior to the Posix epoch. [Bug 1618445] Added a test case for the
-	dates of the Japanese emperors. [Bug 1637471] Added a regression test
-	for military time zone input conversion. [Bug 1586828]
-	* generic/tclGetDate.y (MilitaryTable): Fixed an ancient bug where the
-	military NZA time zones had the signs reversed. [Bug 1586828]
-	* generic/tclDate.c: Regenerated.
-	* doc/Notifier.3: Documented Tcl_SetNotifier and Tcl_ServiceModeHook.
-	Quite against my better judgment. [Bug 414933]
-	* generic/tclBasic.c, generic/tclCkalloc.c, generic/tclClock.c:
-	* generic/tclCmdIL.c, generic/tclCmdMZ.c, generic/tclFCmd.c:
-	* generic/tclFileName.c, generic/tclInterp.c, generic/tclIO.c:
-	* generic/tclIOUtil.c, generic/tclNamesp.c, generic/tclObj.c:
-	* generic/tclPathObj.c, generic/tclPipe.c, generic/tclPkg.c:
-	* generic/tclResult.c, generic/tclTest.c, generic/tclTestObj.c:
-	* generic/tclVar.c, unix/tclUnixChan.c, unix/tclUnixTest.c:
-	* win/tclWinLoad.c, win/tclWinSerial.c: Replaced commas in varargs
-	with string concatenation where possible. [Patch 1515234]
-	* library/tzdata/America/Tegucigalpa:
-	* library/tzdata/Asia/Damascus: Olson's tzdata 2007e.
-
-2007-04-19  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/regcomp.c, generic/regc_cvec.c, generic/regc_lex.c,
-	* generic/regc_locale.c: Improve the const-correctness of the RE
-	compiler.
-
-2007-04-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_LSHIFT): fixed a mistake introduced in
-	version 1.266 ('=' became '=='), which effectively turned the block
-	that handles native shifts into dead code. This explains why the
-	testsuite did not pick this mistake. Rewrote to make the intention
-	clear.
-
-	* generic/tclInt.h (TclDecrRefCount): change the order of the
-	branches, use empty 'if ; else' to handle use in unbraced outer
-	if/else conditions (as already done in tcl.h)
-
-	* generic/tclExecute.c: slight changes in Tcl_Obj management.
-
-2007-04-17  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl: Fixed the naming of
-	::tcl::clock::ReadZoneinfoFile because (yoicks!) it was in the global
-	namespace.
-	* doc/clock.n: Clarified the cases in which legacy time zone is
-	recognized. [Bug 1656002]
-
-2007-04-17  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: fixed checkInterp logic [Bug 1702212]
-
-2007-04-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* various (including generic/tclTest.c): Complete the purge of K&R
-	function definitions from manually-written code.
-
-2007-04-15  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclCompCmds.c: added a cast to silence a compiler error on
-	VC2005.
-	* library/clock.tcl: Restored unique-prefix matching of keywords on
-	the [clock] command. [Bug 1690041]
-	* tests/clock.test: Added rudimentary test cases for unique-prefix
-	matching of keywords.
-
-2007-04-14  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: removed some code at INST_EXPAND_SKTOP that
-	duplicates functionality already present at checkForCatch.
-
-2007-04-12  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: new macros OBJ_AT_TOS, OBJ_UNDER_TOS,
-	OBJ_AT_DEPTH(n) and CURR_DEPTH that remove all direct references to
-	tosPtr from TEBC (after initialisation and the code at the label
-	cleanupV_pushObjResultPtr).
-
-2007-04-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompCmds.c: moved all exceptDepth management to the
-	macros - the decreasing half was managed by hand.
-
-2007-04-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclInt.h (TclNewLiteralStringObj): New macro to make
-	allocating literal string objects (i.e. objects whose value is a
-	constant string) easier and more efficient, by allowing the omission
-	of the length argument. Based on [Patch 1529526] (afredd)
-	* generic/*.c: Make use of this (in many files).
-
-2007-04-08  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile (tclInstructionTable): Fixed bugs in description
-	of dict instructions.
-
-2007-04-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile (tclInstructionTable): Fixed bug in description
-	of INST_START_COMMAND.
-
-	* generic/tclExecute.c (TEBC): Small code reduction.
-
-2007-04-06  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (TEBC):
-	* generic/tclNamespace.c (NsEnsembleImplementationCmd):
-	* generic/tclProc.c (InitCompiledLocals, ObjInterpProcEx)
-	(TclObjInterpProcCore, ProcCompileProc): Code reordering to reduce
-	branching and improve branch prediction (assume that forward branches
-	are typically not taken).
-
-2007-04-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: INST_INVOKE optimisation. [Patch 1693802]
-
-2007-04-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c:	Revised ErrorCodeRead and ErrorInfoRead trace
-	routines so they guarantee the ::errorCode and ::errorInfo variable
-	always appear to exist. [Bug 1693252]
-
-2007-04-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInt.decls:	 Moved TclGetNamespaceFromObj() to the
-	* generic/tclInt.h:	 internal stubs table; regen.
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-
-2007-04-02  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	  Added bytecode compilers for the variable
-	* generic/tclCompCmds.c:  linking commands: 'global', 'variable',
-	* generic/tclCompile.h:	  'upvar', 'namespace upvar' [Patch 1688593]
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* generic/tclVar.c:
-
-2007-04-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Replace arrays on the C stack and ckalloc
-	* generic/tclExecute.c: calls with TclStackAlloc calls to use memory
-	* generic/tclFCmd.c:	on Tcl's evaluation stack.
-	* generic/tclFileName.c:
-	* generic/tclIOCmd.c:
-	* generic/tclIndexObj.c:
-	* generic/tclInterp.c:
-	* generic/tclNamesp.c:
-	* generic/tclTrace.c:
-	* unix/tclUnixPipe.c:
-
-2007-04-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileScript, TclPrintInstruction):
-	* generic/tclExecute.c (TclExecuteByteCode): Changed the definition of
-	INST_START_CMD so that it knows how many commands start at the current
-	location. This makes the interpreter command counter correct without
-	requiring a large number of instructions to be issued. (See my change
-	from 2007-01-19 for what triggered this.)
-
-2007-03-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c:
-	* generic/tclCompExpr.c:
-	* generic/tclCompCmds.c:	Replace arrays on the C stack and
-	ckalloc calls with TclStackAlloc calls to use memory on Tcl's
-	evaluation stack.
-
-	* generic/tclCmdMZ.c:	Revised [string to* $s $first $last]
-	implementation to reduce number of allocs/copies.
-
-	* tests/string.test:  More [string reverse] tests.
-
-2007-03-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: optimise the lookup of elements of indexed
-	arrays.
-
-2007-03-29  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c (Tcl_ApplyObjCmd):
-	* tests/apply.test (9.3): Fixed Tcl_Obj leak on error return; an
-	unneeded ref to lambdaPtr was being set and not released on an error
-	return path.
-
-2007-03-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (STR_REVERSE):	Implement the actual [string
-	reverse] command in terms of the new TclStringObjReverse() routine.
-
-	* generic/tclInt.h (TclStringObjReverse):	New internal routine
-	* generic/tclStringObj.c (TclStringObjReverse): that implements the
-	[string reverse] operation, making use of knowledge/surgery of the
-	String intrep to minimize the number of allocs and copies needed to do
-	the job.
-
-2007-03-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdMZ.c (STR_MAP): Replace ckalloc calls with
-	TclStackAlloc calls.
-
-2007-03-24  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* win/tclWinThrd.c: Thread exit handler marks the current thread as
-	uninitialized. This allows exit handlers that are registered later to
-	reinitialize this subsystem in case they need to use some sync
-	primitives (cond variables) from this file again.
-
-2007-03-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (DeleteInterpProc): pop the root frame pointer
-	before deleting the global namespace [Bug 1658572]
-
-2007-03-23  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/Makefile.in: Added code to keep a Cygwin path name from leaking
-	into LIBRARY_DIR when doing 'make test' or 'make runtest'.
-
-2007-03-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdAH.c (Tcl_ForeachObjCmd):	Replaced arrays on the
-	C stack and ckalloc calls with TclStackAlloc calls to use memory on
-	Tcl's evaluation stack.
-
-	* generic/tclExecute.c: Revised GrowEvaluationStack to take an
-	argument specifying the growth required by the caller, so that a
-	single reallocation / copy is the most that will ever be needed even
-	when required growth is large.
-
-2007-03-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: More ckalloc -> ckrealloc conversions.
-	* generic/tclLiteral.c:
-	* generic/tclNamesp.c:
-	* generic/tclParse.c:
-	* generic/tclPreserve.c:
-	* generic/tclStringObj.c:
-	* generic/tclUtil.c:
-
-2007-03-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclEnv.c:	Some more ckalloc -> ckrealloc replacements.
-	* generic/tclLink.c:
-
-2007-03-20  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclDate.c: Rebuilt, despite Donal Fellows's comment when
-	committing it that no rebuild was required.
-	* generic/tclGetDate.y: According to Donal Fellows, "Introduce modern
-	formatting standards; no need for rebuild of tclDate.c."
-
-	* library/tzdata/America/Cambridge_Bay:
-	* library/tzdata/America/Havana:
-	* library/tzdata/America/Inuvik:
-	* library/tzdata/America/Iqaluit:
-	* library/tzdata/America/Pangnirtung:
-	* library/tzdata/America/Rankin_Inlet:
-	* library/tzdata/America/Resolute:
-	* library/tzdata/America/Yellowknife:
-	* library/tzdata/Asia/Choibalsan:
-	* library/tzdata/Asia/Dili:
-	* library/tzdata/Asia/Hovd:
-	* library/tzdata/Asia/Jakarta:
-	* library/tzdata/Asia/Jayapura:
-	* library/tzdata/Asia/Makassar:
-	* library/tzdata/Asia/Pontianak:
-	* library/tzdata/Asia/Ulaanbaatar:
-	* library/tzdata/Europe/Istanbul: Upgraded to Olson's tzdata2007d.
-
-	* generic/tclListObj.c (TclLsetList, TclLsetFlat):
-	* tests/lset.test: Changes to deal with shared internal representation
-	for lists passed to the [lset] command. Thanks to Don Porter for
-	fixing this issue. [Bug 1677512]
-
-2007-03-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c: Revise the various expansion routines for
-	CompileEnv fields to use ckrealloc() where appropriate.
-
-	* generic/tclBinary.c (Tcl_SetByteArrayLength): Replaced ckalloc() /
-	memcpy() sequence with ckrealloc() call.
-
-	* generic/tclBasic.c (Tcl_CreateMathFunc):	Replaced some calls to
-	* generic/tclEvent.c (Tcl_CreateThread):	Tcl_Alloc() with calls
-	* generic/tclObj.c (UpdateStringOfBignum):	to ckalloc(), which
-	* unix/tclUnixTime.c (SetTZIfNecessary):	better supports memory
-	* win/tclAppInit.c (setargv):			debugging.
-
-2007-03-19  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/regsub.n: Corrected example so that it doesn't recommend
-	potentially unsafe practice. Many thanks to Konstantin Kushnir
-	<chpock@gmail.com> for reporting this.
-
-2007-03-17  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclWinReg.c (GetKeyNames): Size the buffer for enumerating key
-	names correctly, so that Unicode names exceeding 127 chars can be
-	retrieved without crashing. [Bug 1682211]
-	* tests/registry.test (registry-4.9): Added test case for the above
-	bug.
-
-2007-03-15  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIOUtil.c (Tcl_Stat): Reimplement workaround to avoid gcc
-	warning by using local variables. When the macro argument is of type
-	long long instead of long, the incorrect warning is not generated.
-
-2007-03-15  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* win/Makefile.in: Fully qualify LIBRARY_DIR so that `make test` does
-	not depend on working dir.
-
-2007-03-15  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* tests/parse.test: Add two backslash newline parse tests.
-
-2007-03-12  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (INST_FOREACH_STEP4):	Make private copy of
-	* tests/foreach.test (foreach-10.1):	value list to be assigned to
-	variables so that shimmering of that list doesn't lead to invalid
-	pointers. [Bug 1671087]
-
-	* generic/tclEvent.c (HandleBgErrors):	Make efficient private copy
-	* tests/event.test (event-5.3): of the command prefix for the interp's
-	background error handling command to avoid panics due to pointers to
-	memory invalid after shimmering. [Bug 1670155]
-
-	* generic/tclNamesp.c (NsEnsembleImplementationCmd):	Make efficient
-	* tests/namespace.test (namespace-42.8):	private copy of the
-	command prefix as we invoke the command appropriate to a particular
-	subcommand of a particular ensemble to avoid panic due to shimmering
-	of the List intrep. [Bug 1670091]
-
-	* generic/tclVar.c (TclArraySet):	Make efficient private copy of
-	* tests/var.test (var-17.1):	the "list" argument to [array set] to
-	avoid crash due to shimmering invalidating pointers. [Bug 1669489]
-
-2007-03-12  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Fix problems with declaration
-	positioning and memory leaks. [Bug 1679072]
-
-2007-03-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (Tcl_LreverseObjCmd): Ensure that a list is
-	correctly reversed even if its internal representation is shared
-	without the object itself being shared. [Bug 1675044]
-
-2007-03-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIL (Tcl_LsortObjCmd): changed fix to [Bug 1675116] to
-	use the cheaper TclListObjCopy() instead of Tcl_DuplicateObj().
-
-2007-03-09  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/shell.tcl: Made more robust if an older platform
-	* library/platform/pkgIndex.tcl: package is present in the inspected
-	* unix/Makefile.in: shell. Package forget it to prevent errors. Bumped
-	* win/Makefile.in: package version to 1.1.3, and updated the Makefiles
-	installing it as Tcl Module.
-
-2007-03-09  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Handle tricky case with loss
-	* tests/cmdIL.test (cmdIL-1.29):	of list rep during sorting due
-	to shimmering. [Bug 1675116]
-
-2007-03-09  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (ReadZoneinfoFile): Added Y2038 compliance to the
-	code for version-2 'zoneinfo' files.
-	* tests/clock.test (clock-56.3): Added a test case for Y2038 and
-	'zoneinfo'. Modified test initialisation to use the
-	'loadTestedCommands' function of tcltest to bring in the correct path
-	for the registry library.
-
-2007-03-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclListObj.c (TclLsetList):	Rewrite so that the routine
-	itself does not do any direct intrep surgery. Better isolates those
-	things into the implementation of the "list" Tcl_ObjType.
-
-2007-03-08  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclListObj.c (TclLindexList, TclLindexFlat): Moved these
-	functions to tclListObj.c from tclCmdIL.c to mirror the way that the
-	equivalent functions for [lset]'s guts are arranged.
-
-2007-03-08  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl: Further tweaks to the Windows time zone table
-	(restoring missing Mexican time zones). Added rudimentary handling of
-	version-2 'zoneinfo' files. Update US DST rules so that zones such as
-	'EST5EDT' get the correct transition dates.
-	* tests/clock.test: Added rudimentary test cases for 'zoneinfo'
-	parsing. Adjusted several tests that depended on obsolete US DST
-	transition rules.
-
-2007-03-07  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXNotify.c: add spinlock debugging and sanity checks.
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: ensure gcc version used by
-	* macosx/Tcl.xcodeproj/default.pbxuser: Xcode and configure/make are
-	* macosx/Tcl-Common.xcconfig:		consistent and independent of
-	gcc_select default and CC env var; fixes for Xcode 3.0.
-
-	* unix/tcl.m4 (Darwin): s/CFLAGS/CPPFLAGS/ in macosx-version-min check
-	* unix/configure: autoconf-2.59
-
-2007-03-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdIL.c (TclLindex*):	Rewrites to make efficient
-	private copies of the list and indexlist arguments, so we can operate
-	on the list elements directly with no fear of shimmering effects.
-	Replaces defensive coding schemes that are otherwise required. End
-	result is that TclLindexList is entirely a wrapper around
-	TclLindexFlat, which is now the core engine of all [lindex]
-	operations.
-
-	* generic/tclObj.c (Tcl_AppendAllObjTypes):	Converted to simpler
-	list validity test.
-
-2007-03-07  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclRegexp.c (TclRegAbout): Generate information about a
-	regexp as a Tcl_Obj instead of as a string, which is more efficient.
-
-2007-03-07  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl: Adjusted Windows time zone table to handle new US
-	DST rules by locale rather than as Posix time zone spec.
-	* tests/clock.test (clock-39.6, clock-49.2, testclock::registry):
-	Adjusted tests to simulate new US rules.
-	* library/tzdata/America/Indiana/Winamac:
-	* library/tzdata/Europe/Istanbul:
-	* library/tzdata/Pacific/Easter:
-	Olson's tzdata2007c.
-
-2007-03-05  Andreas Kupries  <andreask@activestate.com>
-
-	* library/platform/shell.tcl (::platform::shell::RUN): In the case of
-	* library/platform/pkgIndex.tcl: a failure put the captured stderr
-	* unix/Makefile.in: into the error message to aid in debugging. Bumped
-	* win/Makefile.in: package version to 1.1.2, and updated the makefiles
-	installing it as Tcl Module.
-
-2007-03-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclLink.c (LinkedVar): Added macro to conceal at least some
-	of the pointer hackery.
-
-2007-03-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdIL.c (Tcl_LreverseObjCmd):	Added missing
-	TclInvalidateStringRep() call when we directly manipulate the intrep
-	of an unshared "list" Tcl_Obj. [Bug 1672585]
-
-	* generic/tclCmdIL.c (Tcl_JoinObjCmd):	Revised [join] implementation
-	to append Tcl_Obj's instead of strings. [RFE 1669420]
-
-	* generic/tclCmdIL.c (Info*Cmd):	Code simplifications and
-	optimizations.
-
-2007-03-02  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCompile.c (TclPrintInstruction): Added a scheme to allow
-	* generic/tclCompile.h (AuxDataPrintProc):    aux-data to be printed
-	* generic/tclCompCmds.c (Print*Info):	      out for debugging. For
-	this to work, immediate operands referring to aux-data must be
-	identified as such in the instruction descriptor table using
-	OPERAND_AUX4 (all are always 4 bytes).
-
-	* generic/tclExecute.c (TclExecuteByteCode): Rewrote the compiled
-	* generic/tclCompCmds.c (TclCompileDictCmd): [dict update] so that it
-	* generic/tclCompile.h (DictUpdateInfo):     stores critical
-	* tests/dict.test (dict-21.{14,15}):	     non-varying data in an
-	aux-data value instead of a (shimmerable) literal. [Bug 1671001]
-
-2007-03-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdIL.c (Tcl_LinsertObjCmd):	Code simplifications
-	and optimizations.
-
-	* generic/tclCmdIL.c (Tcl_LreplaceObjCmd):	Code simplifications
-	and optimizations.
-
-	* generic/tclCmdIL.c (Tcl_LrangeObjCmd):	Rewrite in the same
-	spirit; avoid shimmer effects rather than react to them.
-
-	* generic/tclCmdAH.c (Tcl_ForeachObjCmd):	Stop throwing away
-	* tests/foreach.test (foreach-1.14):	useful error information when
-	loop variable sets fail.
-
-	* generic/tclCmdIL.c (Tcl_LassignObjCmd):	Rewrite to make an
-	efficient private copy of the list argument, so we can operate on the
-	list elements directly with no fear of shimmering effects. Replaces
-	defensive coding schemes that are otherwise required.
-
-	* generic/tclCmdAH.c (Tcl_ForeachObjCmd):	Rewrite to make
-	efficient private copies of the variable and value lists, so we can
-	operate on them without any special shimmer defense coding schemes.
-
-2007-03-01  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileForeachCmd): Prevent an unexpected
-	* tests/foreach.test (foreach-9.1):		infinite loop when the
-	variable list is empty and the foreach is compiled. [Bug 1671138]
-
-2007-02-26  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c (FreeReflectedChannel): Added the missing
-	refcount release between NewRC and FreeRC for the channel handle
-	object, spotted by Don Porter. [Bug 1667990]
-
-2007-02-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdAH.c (Tcl_ForeachObjCmd):	Removed surplus
-	copying of the objv array that used to be a workaround for [Bug
-	404865]. That bug is long fixed.
-
-2007-02-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Use new interface in Tcl_EvalObjEx so that the
-	recounting logic of the List internal rep need not be repeated there.
-	Better encapsulation of internal details.
-
-	* generic/tclInt.h:	New internal routine TclListObjCopy() used
-	* generic/tclListObj.c: to efficiently do the equivalent of [lrange
-	$list 0 end]. After some experience with this, might be a good
-	candidate for exposure as a public interface. It's useful for callers
-	of Tcl_ListObjGetElements() who want to control the ongoing validity
-	of the returned objv pointer.
-
-2007-02-22  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/pkg.test: Added tests for the case of an alpha package
-	satisfying a require for the regular package, demonstrating a corner
-	case specified in TIP#280. More notes in the comments to the test.
-
-2007-02-20  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls: Added "const" specifiers in TclSockGetPort
-	* generic/tclIntDecls.h: regenerated
-	* generic/*.c:
-	* unix/tclUnixChan.c
-	* unix/tclUnixPipe.c
-	* win/tclWinPipe.c
-	* win/tclWinSock.c: Added many "const" specifiers in implementation.
-
-2007-02-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/tcltest.n:	Typo fix. [Bug 1663539]
-
-2007-02-20  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* generic/tclFileName.c:  Handle extended paths on Windows NT and
-	* generic/tclPathObj.c:	  above. These have a \\?\ prefix. [Bug
-	* win/tclWinFile.c:	  1479814]
-	* tests/winFCmd.test:	  Tests for extended path handling.
-
-2007-02-19  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tcl.m4: use SHLIB_SUFFIX=".so" on HP-UX ia64 arch.
-	* unix/configure: autoconf-2.59
-
-	* generic/tclIOUtil.c (Tcl_FSEvalFileEx): safe incr of objPtr ref.
-
-2007-02-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/chan.n, doc/clock.n, doc/eval.n, doc/exit.n, doc/expr.n:
-	* doc/interp.n, doc/open.n, doc/platform_shell.n, doc/pwd.n:
-	* doc/refchan.n, doc/regsub.n, doc/scan.n, doc/tclvars.n, doc/tm.n:
-	* doc/unload.n: Apply [Bug 1610310] to fix typos. Thanks to Larry
-	Virden for spotting them.
-
-	* doc/interp.n: Partial fix of [Bug 1662436]; rest requires some
-	policy decisions on what should and shouldn't be safe commands from
-	the "new in 8.5" set.
-
-2007-02-13  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tools/fix_tommath_h.tcl: Further tweaking for the x86-64. The change
-	is to make 'mp_digit' be an 'unsigned int' on that platform; since
-	we're using only 32 bits of it, there's no reason to make it a 64-bit
-	'unsigned long.'
-	* generic/tclTomMath.h: Regenerated.
-
-2007-02-13  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/re_syntax.n: Corrected description of 'print' class [Bug
-	1614687] and enhanced description of 'graph' class.
-
-2007-02-12  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tools/fix_tommath_h.tcl: Added code to patch out a check for
-	__x86_64__ that caused Tommath to use __attributes(TI)__ for the
-	mp_word type. Tetra-int's simply fail on too many gcc-glibc-OS
-	combinations to be ready for shipment today, even if they work for
-	some of us. This change allows reversion of das's change of 2006-08-18
-	that accomplised the same thing on Darwin. [Bugs 1601380, 1603737,
-	1609936, 1656265]
-	* generic/tclTomMath.h: Regenerated.
-	* library/tzdata/Africa/Asmara:
-	* library/tzdata/Africa/Asmera:
-	* library/tzdata/America/Nassau:
-	* library/tzdata/Atlantic/Faeroe:
-	* library/tzdata/Atlantic/Faroe:
-	* library/tzdata/Australia/Eucla:
-	* library/tzdata/Pacific/Easter: Rebuilt from Olson's tzdata2007b.
-
-2007-02-09  Joe Mistachkin  <joe@mistachkin.com>
-
-	* win/nmakehlp.c: Properly cleanup after nmakehlp, including the
-	* win/makefile.vc: vcX0.pch file.
-
-2007-02-08  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* unix/tclUnixInit.c (TclpCheckStackSpace): do stack size checks with
-	unsigned size_t to correctly validate stackSize in the 2^31+ range.
-	[Bug 1654104]
-
-2007-02-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c:	Corrected broken logic in Tcl_DeleteNamespace
-	* tests/namespace.test: introduced in Patch 1577278 that caused
-	[namespace delete ::] to be effective only at level #0. New test
-	namespace-7.7 should prevent similar error in the future [Bug 1655305]
-
-2007-02-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c:	Corrected broken implementation of the
-	* tests/namespace.test: TclMatchIsTrivial optimization on [namespace
-	children $namespace $pattern].
-
-2007-02-04  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4: use gcc4's __attribute__((__visibility__("hidden"))) if
-	available to define MODULE_SCOPE effective on all platforms.
-	* unix/configure.in: add caching to -pipe and zoneinfo checks.
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2007-02-03  Joe Mistachkin  <joe@mistachkin.com>
-
-	* win/rules.vc: Fix platform specific file copy macros for downlevel
-	Windows.
-
-2007-01-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclResult.c: Added optimization case to TclTransferResult to
-	cover common case where there's big savings over the fully general
-	path. Thanks to Peter MacDonald. [Bug 1626518]
-
-	* generic/tclLink.c:	Broken linked float logic corrected. Thanks to
-	Andy Goth. [Bug 1602538]
-
-	* doc/fcopy.n:	Typo fix. [Bug 1630627]
-
-2007-01-28  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcodeproj/project.pbxproj:	  extract build settings that
-	* macosx/Tcl.xcodeproj/default.pbxuser:	  were common to multiple
-	* macosx/Tcl-Common.xcconfig (new file):  configurations into external
-	* macosx/Tcl-Debug.xcconfig (new file):	  xcconfig files; add extra
-	* macosx/Tcl-Release.xcconfig (new file): configurations for building
-	with SDKs and 64bit; convert legacy jam-based 'Tcl' target to native
-	target with single script phase; correct syntax of build setting
-	references to use $() throughout.
-
-	* macosx/README: document new Tcl.xcodeproj configurations; other
-	minor updates/corrections.
-
-	* generic/tcl.h: update location of version numbers in macosx files.
-
-	* macosx/Tcl.xcode/project.pbxproj: restore 'tcltest' target to
-	* macosx/Tcl.xcode/default.pbxuser: working order by replicating
-	applicable changes to Tcl.xcodeproj since 2006-07-20.
-
-2007-01-25  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4: integrate CPPFLAGS into CFLAGS as late as possible and
-	move (rather than duplicate) -isysroot flags from CFLAGS to CPPFLAGS
-	to avoid errors about multiple -isysroot flags from some older gcc
-	builds.
-
-	* unix/configure: autoconf-2.59
-
-2007-01-22  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* compat/memcmp.c (memcmp): Reworked so that arithmetic is never
-	performed upon void pointers, since that is illegal. [Bug 1631017]
-
-2007-01-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompile.c (TclCompileScript): Reduce the frequency with
-	which we issue INST_START_CMD, making bytecode both more compact and
-	somewhat faster. The optimized case is where we would otherwise be
-	issuing a sequence of those instructions; in those cases, it is only
-	ever the first one encountered that could possibly trigger.
-
-2007-01-19  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tools/man2tcl.c: Include stdlib.h for exit() and improve comment
-	detection.
-	* win/nmakehlp.c: Update usage.
-	* win/makefile.vc: Properly build man2tcl.c for MSVC8.
-
-2007-01-19  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXFCmd.c (TclMacOSXSetFileAttribute): on some versions
-	of Mac OS X, truncate() fails on resource forks, in that case use
-	open() with O_TRUNC instead.
-
-	* macosx/tclMacOSXNotify.c: accommodate changes to prototypes of
-	OSSpinLock(Un)Lock API.
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: ensure HOME and USER env vars
-	* macosx/Tcl.xcodeproj/default.pbxuser: are defined when running
-						testsuite from Xcode.
-
-	* tests/env.test: add extra system env vars that need to be preserved
-	on some Mac OS X versions for testsuite to work.
-
-	* unix/Makefile.in:  Move libtommath defines into configure.in to
-	* unix/configure.in: avoid replicating them across multiple
-	* macosx/Tcl.xcodeproj/project.pbxproj: buildsystems.
-
-	* unix/tcl.m4: ensure CPPFLAGS env var is used when set. [Bug 1586861]
-	(Darwin): add -isysroot and -mmacosx-version-min flags to CPPFLAGS
-	when present in CFLAGS to avoid discrepancies between what headers
-	configure sees during preprocessing tests and compiling tests.
-
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2007-01-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompile.c (TclCompileScript): Make sure that when parsing
-	an expanded literal fails, a correct bytecode sequence is still
-	issued. [Bug 1638414]. Also make sure that the start of the expansion
-	bytecode sequence falls inside the span of bytecodes for a command.
-	* tests/compile.test (compile-16.24): Added test for [Bug 1638414]
-
-2007-01-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIO.c: Added macros to make usage of ChannelBuffers
-	clearer.
-
-2007-01-11  Joe English	 <jenglish@users.sourceforge.net>
-
-	* win/tcl.m4(CFLAGS_WARNING): Remove "-Wconversion". This was removed
-	from unix/tcl.m4 2004-07-16 but not from here.
-	* win/configure: Regenerated.
-
-2007-01-11  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc: Fixes to work better on Win98. Read version numbers
-	* win/nmakehlp.c:  from package index file to avoid keeping numbers in
-	* win/rules.vc:	   the makefile where they may become de-synchronized.
-
-2007-01-10  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/regcomp.c (compile, freev):	     Define a strategy for
-	* generic/regexec.c (exec):		     managing the internal
-	* generic/regguts.h (AllocVars, FreeVars):   vars of the RE engine to
-	* generic/regcustom.h (AllocVars, FreeVars): reduce C stack usage.
-	This will make Tcl as a whole much less likely to run out of stack
-	space...
-
-2007-01-09  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileLindexCmd):
-	* tests/lindex.test (lindex-9.2): Fix silly bug that ended up
-	sometimes compiling list arguments in the wrong order. [Bug 1631364]
-
-2007-01-03  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclDate.c: Regenerated to recover a lost fix from patthoyts.
-	[Bug 1618523]
-
-2006-12-26  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclIO.c (Tcl_GetsObj): Avoid checking for for the LF in a
-	possible CRLF sequence when EOF has already been found.
-
-2006-12-26  Mo DeJong  <mdejong@users.sourceforge.net>
-
-	* generic/tclEncoding.c (EscapeFromUtfProc): Clear the
-	TCL_ENCODING_END flag when end bytes are written. This fix keep this
-	method from writing escape bytes for an encoding like iso2022-jp
-	multiple times when the escape byte overlap with the end of the IO
-	buffer.
-	* tests/io.test: Add test for escape byte overlap issue.
-
-2006-12-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* unix/tclUnixThrd.c (Tcl_GetAllocMutex, TclpNewAllocMutex): Add
-	intermediate variables to shut up unwanted warnings. [Bug 1618838]
-
-2006-12-19  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixThrd.c (TclpInetNtoa): fix for 64 bit.
-
-	* unix/tcl.m4 (Darwin): --enable-64bit: verify linking with 64bit
-	-arch flag succeeds before enabling 64bit build.
-	* unix/configure: autoconf-2.59
-
-2006-12-17  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tests/macOSXLoad.test (new file): add testing of .bundle loading and
-	* tests/load.test:		    unloading on Darwin (in addition
-	* tests/unload.test:		    to existing tests of .dylib
-	loading).
-	* macosx/Tcl.xcodeproj/project.pbxproj: add building of dltest
-	binaries so that testsuite run from Xcode can use them; fix testsuite
-	run script
-	* unix/configure.in:	   add support for building dltest binaries as
-	* unix/dltest/Makefile.in: .bundle (in addition to .dylib) on Darwin.
-	* unix/Makefile.in: add stub lib dependency to dltest target.
-	* unix/configure: autoconf-2.59
-
-	* tests/append.test: fix cleanup failure when all tests are skipped.
-
-	* tests/chan.test (chan-16.9): cleanup chan event handler to avoid
-	causing error in event.test when running testsuite with -singleproc 1.
-
-	* tests/info.test: add !singleTestInterp constraint to tests that fail
-	when running testsuite with -singleproc 1. [Bug 1605269]
-
-2006-12-14  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/string.n: Fix example. [Bug 1615277]
-
-2006-12-12  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Now that the new internal structs are
-	in use to support operator commands, might as well make them the
-	default for [expr] as well and avoid passing every parsed expression
-	through the inefficient Tcl_Token array format. This addresses most
-	issues in [RFE 1517602]. Assuming no performance disasters result from
-	this, much dead code supporting the other implementation might now be
-	removed.
-
-	* generic/tclBasic.c:	Final step routing all direct evaluation forms
-	* generic/tclCompExpr.c: of the operator commands through TEBC,
-	* generic/tclCompile.h: dropping all the routines in tclMathOp.c.
-	* generic/tclMathOp.c:	Still needs Engineering Manual attention.
-
-2006-12-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Another step with all sorting operator
-	* generic/tclCompExpr.c: commands now routing through TEBC via
-	* generic/tclCompile.h: TclSortingOpCmd().
-
-2006-12-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	 Another step down the path of re-using
-	* generic/tclCompExpr.c: TclExecuteByteCode to implement the TIP 174
-	* generic/tclCompile.h: commands instead of using a mass of code
-	* generic/tclMathOp.c:	duplication. Now all operator commands that
-	* tests/mathop.test:	demand exactly one operation are implemented
-	via TclSingleOpCmd and a call to TEBC.
-
-	* generic/tclCompExpr.c: Revised implementation of TclInvertOpCmd to
-	* generic/tclMathOp.c:	perform a bytecode compile / execute sequence.
-	This demonstrates a path toward avoiding mountains of code duplication
-	in tclMathOp.c and tclExecute.c.
-
-	* generic/tclCompile.h: Change TclExecuteByteCode() from static to
-	* generic/tclExecute.c: MODULE_SCOPE so all files including
-	tclCompile.h may call it.
-
-	* generic/tclMathOp.c:	More revisions to make tests pass.
-	* tests/mathop.test:
-
-2006-12-08  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclNamesp.c (TclTeardownNamespace): Ensure that dying
-	namespaces unstitch themselves from their referents. [Bug 1571056]
-	(NsEnsembleImplementationCmd): Silence GCC warning.
-
-	* tests/mathop.test: Full tests for & | and ^ operators
-
-2006-12-08  Daniel Steffen  <das@users.sourceforge.net>
-
-	* library/tcltest/tcltest.tcl: use [info frame] for "-verbose line".
-
-2006-12-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c:	Additional commits correct most
-	* generic/tclExecute.c:		failing tests illustrating bugs
-	* generic/tclMathOp.c:		uncovered in [Patch 1578137].
-
-	* generic/tclBasic.c:	Biggest source of TIP 174 failures was that
-	the commands were not [namespace export]ed from the ::tcl::mathop
-	namespace. More bits from [Patch 1578137] correct that.
-
-	* tests/mathop.test:	Commmitted several new tests from Peter Spjuth
-	found in [Patch 1578137]. Many failures now demonstrate issues to fix
-	in the TIP 174 implementation.
-
-2006-12-07  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tests/mathop.test: Added tests for ! ~ eq operators.
-	* generic/tclMathOp.c (TclInvertOpCmd): Add in check for non-integral
-	numeric values.
-	* generic/tclCompCmds.c (CompileCompareOpCmd): Factor out the code
-	generation for the chained comparison operators.
-
-2006-12-07  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* tests/exec.test: Fixed line endings (caused win32 problems).
-
-2006-12-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompCmds.c:	Revised and consolidated into utility
-	* tests/mathop.test:		routines some of routines that compile
-	the new TIP 174 commands. This corrects some known bugs. More to come.
-
-2006-12-06  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/expr.test (expr-47.12): Improved error reporting in hopes of
-	having more information to pursue [Bug 1609936].
-
-2006-12-05  Andreas Kupries  <andreask@activestate.com>
-
-	TIP#291 IMPLEMENTATION
-
-	* generic/tclBasic.c: Define tcl_platform element for pointerSize.
-	* doc/tclvars.n:
-
-	* win/Makefile.in: Added installation instructions for the platform
-	* win/makefile.vc: package. Added the platform package.
-	* win/makefile.bc:
-	* unix/Makefile.in:
-
-	* tests/platform.test:
-	* tests/safe.test:
-
-	* library/platform/platform.tcl:
-	* library/platform/shell.tcl:
-	* library/platform/pkgIndex.tcl:
-
-	* doc/platform.n:
-	* doc/platform_shell.n:
-
-2006-12-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclPkg.c:	When no requirements are supplied to a
-	* tests/pkg.test:	[package require $pkg] and [package unknown]
-	is invoked to find a satisfying package, pass the requirement argument
-	"0-" (which means all versions are acceptable). This permits a
-	registered [package unknown] command to call [package vsatisfies
-	$testVersion {*}$args] without any special handling of the empty $args
-	case. This fixes/avoids a bug in [::tcl::tm::UnknownHandler] that was
-	causing old TM versions to be provided in preference to newer TM
-	versions. Thanks to Julian Noble for discovering the issue.
-
-2006-12-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP#267 IMPLEMENTATION
-
-	* generic/tclIOCmd.c (Tcl_ExecObjCmd): Added -ignorestderr option,
-	* tests/exec.test, doc/exec.n:	       loosely from [Patch 1476191]
-
-2006-12-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Added implementation for the
-	CompileExprTree() routine that can produce expression bytecode
-	directly from internal structures with no need to pass through the
-	Tcl_Token array representation. Still disabled by default. #undef
-	USE_EXPR_TOKENS to try it out.
-
-2006-12-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Added expr parsing routines that
-	produce a different set of internal structures representing the parsed
-	expression, as well as routines that go on to convert those structures
-	into the traditional Tcl_Token array format. Use of these routines is
-	currently disabled. #undef PARSE_DIRECT_EXPR_TOKENS to enable them.
-	These routines will only become really useful when more routines that
-	compile directly from the new internal structures are completed.
-
-2006-12-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/file.n: Clarification of [file pathtype] docs. [Bug 1606454]
-
-2006-12-01  Kevin B. Kenny	 <kennykb@acm.org>
-
-	* libtommath/bn_mp_add.c:	Corrected the effects of a
-	* libtommath/bn_mp_div.c:	bollixed 'cvs merge' operation
-	* libtommath/bncore.c:		that inadvertently committed some
-	* libtommath/tommath_class.h:	half-developed code.
-
-	TIP#299 IMPLEMENTATION
-
-	* doc/mathfunc.n:	Added isqrt() function to docs
-	* generic/tclBasic.c:	Added isqrt() math function (ExprIsqrtFunc)
-	* tests/expr.test (expr-47.*): Added tests for isqrt()
-	* tests/info.test (info-20.2): Added isqrt() to expected math funcs.
-
-2006-12-01  Don Porter	<dgp@users.sourceforge.net>
-
-	* tests/chan.test:	Correct timing sensitivity in new test. [Bug
-	1606860]
-
-	TIP#287 IMPLEMENTATION
-
-	* doc/chan.n:		New subcommand [chan pending].
-	* generic/tclBasic.c:	Thanks to Michael Cleverly for proposal
-	* generic/tclInt.h:	and implementation.
-	* generic/tclIOCmd.c:
-	* library/init.tcl:
-	* tests/chan.test:
-	* tests/ioCmd.test:
-
-	TIP#298 IMPLEMENTATION
-
-	* generic/tcl.decls: Tcl_GetBignumAndClearObj -> Tcl_TakeBignumFromObj
-	* generic/tclObj.c:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclExecute.c: Update callers.
-	* generic/tclMathOp.c:
-
-2006-11-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata: Olson's tzdata2006p.
-	* libtommath/bn_mp_sqrt.c: Fixed a bug where the initial approximation
-	to the square root could be on the wrong side, causing failure of
-	convergence.
-
-2006-11-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (Tcl_AppendObjToErrorInfo):  Added
-	Tcl_DecrRefCount() on the objPtr argument to plug memory leaks. This
-	makes the routine a consumer, which makes it easiest to use.
-
-2006-11-28  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclBasic.c: TIP #280 implementation.
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclCompCmds.c:
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclIOUtil.c:
-	* generic/tclInt.h:
-	* generic/tclInterp.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclProc.c:
-	* tests/compile.test:
-	* tests/info.test:
-	* tests/platform.test:
-	* tests/safe.test:
-
-2006-11-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/tclUnixChan.c (TclUnixWaitForFile):
-	* tests/event.test (event-14.*): Corrected a bug where
-	TclUnixWaitForFile would present select() with the wrong mask on an
-	LP64 machine if a fd number exceeds 32. Thanks to Jean-Luc Fontaine
-	for reporting and diagnosing. [Bug 1602208]
-
-2006-11-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (TclIncrObj):	Correct failure to detect
-	floating-point increment values. Thanks to William Coleda [Bug
-	1602991]
-
-2006-11-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/mathop.test, doc/mathop.n: More bits and pieces of the TIP#174
-	implementation. Note that the test suite is not yet complete.
-
-2006-11-26  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4 (Linux): --enable-64bit support.	[Patch 1597389]
-	* unix/configure: autoconf-2.59			[Bug 1230558]
-
-2006-11-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP#174 IMPLEMENTATION
-
-	* generic/tclMathOp.c (new file): Completed the implementation of the
-	interpreted versions of all the tcl::mathop commands. Moved to a new
-	file to make tclCompCmds.c more focused in purpose.
-
-2006-11-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (Tcl*OpCmd, TclCompile*OpCmd):
-	* generic/tclBasic.c (Tcl_CreateInterp): Partial implementation of
-	TIP#174; the commands are compiled, but (mostly) not interpreted yet.
-
-2006-11-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP#269 IMPLEMENTATION
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd): Implementation of the [string
-	* tests/string.test (string-25.*):	 is list] command, based on
-	* doc/string.n:				 work by Joe Mistachkin, with
-	enhancements by Donal Fellows for better failindex behaviour.
-
-2006-11-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* tools/genWinImage.tcl (removed):	Removed two files used in
-	* win/README.binary (removed):	production of binary distributions
-	for Windows, a task we no longer perform. [Bug 1476980]
-	* generic/tcl.h:	Remove mention of win/README.binary in comment
-
-	* generic/tcl.h:	Moved TCL_REG_BOSONLY #define from tcl.h to
-	* generic/tclInt.h:	tclInt.h. Only know user is Expect, which
-	already #include's tclInt.h. No need to continue greater exposure.
-	[Bug 926500]
-
-2006-11-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_CreateInterp, TclHideUnsafeCommands):
-	* library/init.tcl: Refactored the [chan] command's guts so that it
-	does not use aliases to global commands, making the code more robust.
-
-2006-11-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (INST_EXPON):	Corrected crash on
-	[expr 2**(1<<63)]. Was operating on cleared bignum Tcl_Obj.
-
-2006-11-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/apply.n, doc/chan.n: Added examples.
-
-2006-11-15  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP#270 IMPLEMENTATION
-
-	* generic/tcl.decls:		New public routines Tcl_ObjPrintf,
-	* generic/tclStringObj.c:	Tcl_AppendObjToErrorInfo, Tcl_Format,
-	* generic/tclInt.h:		Tcl_AppendLimitedToObj,
-	Tcl_AppendFormatToObj and Tcl_AppendPrintfToObj. Former internal
-	versions removed.
-
-	* generic/tclDecls.h:		make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclBasic.c:		Updated callers.
-	* generic/tclCkalloc.c:
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclCompExpr.c:
-	* generic/tclCompile.c:
-	* generic/tclDictObj.c:
-	* generic/tclExecute.c:
-	* generic/tclIORChan.c:
-	* generic/tclIOUtil.c:
-	* generic/tclMain.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclPkg.c:
-	* generic/tclProc.c:
-	* generic/tclStrToD.c:
-	* generic/tclTimer.c:
-	* generic/tclUtil.c:
-	* unix/tclUnixFCmd.c:
-
-	* tools/genStubs.tcl:	Updated script to no longer produce the
-	_ANSI_ARGS_ wrapper in generated declarations. Also revised to accept
-	variadic prototypes with more than one fixed argument. (This is
-	possible since TCL_VARARGS and its limitations are no longer in use).
-	* generic/tcl.h:	Some reordering so that macro definitions do
-	not interfere with the now _ANSI_ARGS_-less stub declarations.
-
-	* generic/tclDecls.h:		make genstubs
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclTomMathDecls.h:
-
-2006-11-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/ChnlStack.3, doc/CrtObjCmd.3, doc/GetIndex.3, doc/OpenTcp.3:
-	* doc/chan.n, doc/fconfigure.n, doc/fcopy.n, doc/foreach.n:
-	* doc/history.n, doc/http.n, doc/library.n, doc/lindex.n:
-	* doc/lrepeat.n, doc/lreverse.n, doc/pkgMkIndex.n, doc/re_syntax.n:
-	Convert \fP to \fR so that man-page scrapers have an easier time.
-
-2006-11-14  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP#261 IMPLEMENTATION
-
-	* generic/tclNamesp.c:	[namespace import] with 0 arguments
-	introspects the list of imported commands.
-
-2006-11-13  Kevin B. Kenny  <kennykb@users.sourceforge.net>
-
-	* generic/tclThreadStorage.c (Tcl_InitThreadStorage):
-	(Tcl_FinalizeThreadStorage): Silence a compiler warning about
-	presenting a volatile pointer to 'memset'.
-
-2006-11-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIO.c:	When [gets] on a binary channel needs to use
-	the "iso8859-1" encoding, save a copy of that encoding per-thread to
-	avoid repeated freeing and re-loading of it from the file system. This
-	replaces the cached copy of this encoding that the platform
-	initialization code used to keep in pre-8.5 releases.
-
-2006-11-13  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Fix gcc warnings about 'cast to/from
-	* generic/tclEncoding.c:	pointer from/to integer of different
-	* generic/tclEvent.c:		size' on 64-bit platforms by casting
-	* generic/tclExecute.c:		to intermediate types
-	* generic/tclHash.c:		intptr_t/uintptr_t via new PTR2INT(),
-	* generic/tclIO.c:		INT2PTR(), PTR2UINT() and UINT2PTR()
-	* generic/tclInt.h:		macros. [Patch 1592791]
-	* generic/tclProc.c:
-	* generic/tclTest.c:
-	* generic/tclThreadStorage.c:
-	* generic/tclTimer.c:
-	* generic/tclUtil.c:
-	* unix/configure.in:
-	* unix/tclUnixChan.c:
-	* unix/tclUnixPipe.c:
-	* unix/tclUnixPort.h:
-	* unix/tclUnixTest.c:
-	* unix/tclUnixThrd.c:
-
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2006-11-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInt.h, generic/tclInt.decls: Transfer TclPtrMakeUpvar and
-	TclObjLookupVar to the internal stubs table.
-
-2006-11-10  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tests/fCmd.test (fCmd-6.26): fix failure when env(HOME) path
-	contains symlinks.
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: remove tclParseExpr.c; when
-	running testsuite from inside Xcdoe, skip stack-3.1 (it only fails
-	under those circumstances).
-
-	* unix/tcl.m4 (Darwin): suppress linker arch warnings when building
-	universal for both 32 & 64 bit and no 64bit CoreFoundation is
-	available; sync with tk tcl.m4 change.
-	* unix/configure.in: whitespace.
-	* unix/configure: autoconf-2.59
-
-2006-11-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParseExpr.c (removed):	Moved all the code of
-	* generic/tclCompExpr.c:	tclParseExpr.c into tclCompExpr.c.
-	* unix/Makefile.in:	This sets the stage for expr compiling to work
-	* win/Makefile.in:	directly with the full parse tree structures,
-	* win/makefile.bc:	and not have to pass through the information
-	* win/makefile.vc:	lossy format of an array of Tcl_Tokens.
-	* win/tcl.dsp:
-
-2006-11-09  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	TIP#272 IMPLEMENTATION
-
-	* generic/tclCmdMZ.c (Tcl_StringObjCmd):    Implementation of the
-	* tests/string.test, tests/stringComp.test: [string reverse] command
-	* doc/string.n:				    from TIP#272.
-
-	* generic/tclCmdIL.c (Tcl_LreverseObjCmd): Implementation of the
-	* generic/tclBasic.c, generic/tclInt.h:	   [lreverse] command from
-	* tests/cmdIL.test (cmdIL-7.*):		   TIP#272.
-	* doc/lreverse.n:
-
-2006-11-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIO.c, generic/tclPkg.c: Style & clarity rewrites.
-
-2006-11-07  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/tclUnixFCmd.c (CopyFile): Added code to fall back to a
-	hardwired default block size should the filesystem report a bogus
-	value. [Bug 1586470]
-
-2006-11-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Changed Tcl_ObjPrintf() response to an
-	invalid format specifier string. No longer panics; now produces an
-	error message as output.
-
-	TIP#274 IMPLEMENTATION
-
-	* generic/tclParseExpr.c:	Exponentiation operator is now right
-	* tests/expr.test:		associative. [Patch 1556802]
-
-2006-11-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TEOVI): fix por possible leak of a Command in
-	the presence of execution traces that delete it.
-
-	* generic/tclBasic.c (TEOVI):
-	* tests/trace.test (trace-21.11): fix for [Bug 1590232], execution
-	traces may cause a second command resolution in the wrong namespace.
-
-2006-11-03  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tests/event.test (event-11.5):	Rewrote tests to stop Tcl from
-	* tests/io.test (multiple tests):	opening sockets that are
-	* tests/ioCmd.test (iocmd-15.1,16,17):	reachable from outside hosts
-	* tests/iogt.test (__echo_srv__.tcl):	where not necessary. This is
-	* tests/socket.test (multiple tests):	noticably annoying on some
-	* tests/unixInit.test (unixInit-1.2):	systems (e.g., Windows).
-
-2006-11-02  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: check autoconf/autoheader exit
-	status and stop build if they fail.
-
-2006-11-02  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* doc/ParseCmd.3, doc/Tcl.n, doc/eval.n, doc/exec.n:
-	* doc/fconfigure.n, doc/interp.n, doc/unknown.n:
-	* library/auto.tcl, library/init.tcl, library/package.tcl:
-	* library/safe.tcl, library/tm.tcl, library/msgcat/msgcat.tcl:
-	* tests/all.tcl, tests/basic.test, tests/cmdInfo.test:
-	* tests/compile.test, tests/encoding.test, tests/execute.test:
-	* tests/fCmd.test, tests/http.test, tests/init.test:
-	* tests/interp.test, tests/io.test, tests/ioUtil.test:
-	* tests/iogt.test, tests/namespace-old.test, tests/namespace.test:
-	* tests/parse.test, tests/pkg.test, tests/pkgMkIndex.test:
-	* tests/proc.test, tests/reg.test, tests/trace.test:
-	* tests/upvar.test, tests/winConsole.test, tests/winFCmd.test:
-	* tools/tclZIC.tcl:
-	* generic/tclParse.c (Tcl_ParseCommand): Replace {expand} with {*}
-	officially (TIP #293). Leave -DALLOW_EXPAND=0|1 option to keep
-	{expand} syntax for transition users. [Bug 1589629]
-
-2006-11-02  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclBasic.c, generic/tclInterp.c, generic/tclProc.c: Silence
-	warnings from gcc over signed/unsigned and TclStackAlloc().
-	* generic/tclCmdMZ.c: Update to more compact and clearer coding style.
-
-2006-11-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCmdAH.c:	Further revisions to produce the routines
-	* generic/tclInt.h:	TclFormat() and TclAppendFormatToObj() that
-	* generic/tclNamesp.c:	accept (objc, objv) arguments rather than
-	* generic/tclStringObj.c:	any varargs stuff.
-
-	* generic/tclBasic.c:	Further revised TclAppendPrintToObj() and
-	* generic/tclCkalloc.c: TclObjPrintf() routines to panic when unable
-	* generic/tclCmdAH.c:	to complete their formatting operations,
-	* generic/tclCmdIL.c:	rather than report an error message. This
-	* generic/tclCmdMZ.c:	means an interp argument for error message
-	* generic/tclDictObj.c: recording is no longer needed, further
-	* generic/tclExecute.c: simplifying the interface for callers.
-	* generic/tclIORChan.c:
-	* generic/tclIOUtil.c:
-	* generic/tclInt.h:
-	* generic/tclMain.c:
-	* generic/tclNamesp.c:
-	* generic/tclParseExpr.c:
-	* generic/tclPkg.c:
-	* generic/tclProc.c:
-	* generic/tclStringObj.c:
-	* generic/tclTimer.c:
-	* generic/tclUtil.c:
-	* unix/tclUnixFCmd.c:
-
-2006-11-02  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tests/winPipe.test (winpipe-4.[2345]): Made robust when run in
-	directory with spaces in its name.
-
-	* generic/tclCmdAH.c: Clean up uses of cast NULLs.
-
-	* generic/tclInterp.c (AliasObjCmd): Added more explanatory comments.
-
-	* generic/tclBasic.c (TclEvalObjvInternal): Rewrote so that comments
-	are relevant and informative once more. Also made the unknown handler
-	processing use the Tcl execution stack for working space, and not the
-	general heap.
-
-2006-11-01  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixPort.h: ensure MODULE_SCOPE is defined before use, so
-	that tclPort.h can once again be included without tclInt.h.
-
-	* generic/tclEnv.c (Darwin): mark _environ symbol as unexported even
-	when MODULE_SCOPE != __private_extern__.
-
-2006-10-31  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Refactored and renamed the routines
-	* generic/tclCkalloc.c: TclObjPrintf, TclFormatObj, and
-	* generic/tclCmdAH.c:	TclFormatToErrorInfo to a new set of routines
-	* generic/tclCmdIL.c:	TclAppendPrintfToObj, TclAppendFormatToObj,
-	* generic/tclCmdMZ.c:	TclObjPrintf, and TclObjFormat, with the
-	* generic/tclDictObj.c: intent of making the latter list, plus
-	* generic/tclExecute.c: TclAppendLimitedToObj and
-	* generic/tclIORChan.c: TclAppendObjToErrorInfo, public via a revised
-	* generic/tclIOUtil.c:	TIP 270.
-	* generic/tclInt.h:
-	* generic/tclMain.c:
-	* generic/tclNamesp.c:
-	* generic/tclParseExpr.c:
-	* generic/tclPkg.c:
-	* generic/tclProc.c:
-	* generic/tclStringObj.c:
-	* generic/tclTimer.c:
-	* generic/tclUtil.c:
-	* unix/tclUnixFCmd.c:
-
-2006-10-31  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c, generic/tcl.h, generic/tclInterp.c:
-	* generic/tclNamesp.c: removing the flag bit TCL_EVAL_NOREWRITE, the
-	last remnant of the callObjc/v fiasco. It is not needed, as it is now
-	always set and checked or'ed with TCL_EVAL_INVOKE.
-
-2006-10-31  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/rules.vc: Fix for [Bug 1582769] - options conflict with VC2003.
-
-2006-10-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c, generic/tclNamesp.c, generic/tclProc.c:
-	* generic/tclInt.h: Removed the callObjc and callObjv fields from the
-	Interp structure. They did not function correctly and made other parts
-	of the core amazingly complex, resulting in a substantive change to
-	[info level] behaviour. [Bug 1587618]
-	* library/clock.tcl: Removed use of [info level 0] for calculating the
-	command name as used by the user and replace with a literal. What's
-	there now is sucky, but at least appears to be right to most users.
-	* tests/namespace.test (namespace-42.7,namespace-47.1): Reverted
-	changes to these tests.
-	* tests/info.test (info-9.11,info-9.12): Added knownBug constraint
-	since these tests require a different behaviour of [info level] than
-	is possible because of other dependencies.
-
-2006-10-30  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* tools/tcltk-man2html.tcl (option-toc): handle any kind of options
-	defined toc section (needed for ttk docs)
-
-2006-10-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (TEOVI): insured that the interp's callObjc/v
-	fields are restored after traces run, as they be spoiled. This was
-	causing a segfault in tcllib's profiler tests.
-
-2006-10-30  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (INST_MOD): Corrected improper testing of the
-	* tests/expr.test:		   sign of bignums when applying Tcl's
-	division rules. Thanks to Peter Spjuth. [Bug 1585704]
-
-2006-10-29  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclNamesp.c (EnsembleImplementationCmd):
-	* tests/namespace.test (47.7-8): reverted a wrong "optimisation" that
-	completely broke snit; added two tests.
-
-2006-10-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (ObjInterpProcEx, TclObjInterpProcCore): Split the
-	core of procedures to make it easier to build procedure-like code
-	without going through horrible contortions. This is the last critical
-	component to make advanced OO systems workable as simple loadable
-	extensions. TOIPC is now in the internal stub table.
-	(MakeProcError, MakeLambdaError): Refactored ProcessProcResultCode to
-	be simpler, some of which goes to TclObjInterpProcCore, and the rest
-	of which is now in these far simpler routines which just do errorInfo
-	stack generation for different types of procedure-like entity.
-	* tests/apply.test (apply-5.1): Updated to expect the more informative
-	form of message.
-
-2006-10-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclVar.c (HasLocalVars): New macro to make various bits and
-	pieces cleaner.
-
-	* generic/tclNamesp.c (TclSetNsPath): Expose SetNsPath() through
-	internal stubs table with semi-external name.
-
-	* generic/tclInt.h (CallFrame): Add a field for handling context data
-	for extensions (like object systems) that should be tied to a call
-	frame (and not a command or interpreter).
-
-	* generic/tclBasic.c (TclRenameCommand): Change to take CONST args;
-	they were only ever used in a constant way anyway, so this appears to
-	be a spot that was missed during TIP#27 work.
-
-2006-10-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c (SetLambdaFromAny): minor change, eliminate
-	redundant call to Tcl_GetString (thanks aku).
-
-	* generic/tclInterp.c (ApplyObjCmd):
-	* generic/tclNamesp.c (EnsembleImplementationCmd): replaced ckalloc
-	(heap) with TclStackAlloc (execution stack).
-
-2006-10-24  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/info.test (info-9.11-12): tests for [Bug 1577492]
-	* tests/apply.test (apply-4.3-5): tests for [Bug 1574835]
-
-	* generic/tclProc.c (ObjInterpProcEx): disable itcl hacks for calls
-	from ApplyObjCmd (islambda==1), as they mess apply's error messages
-	[Bug 1583266]
-
-2006-10-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c (ApplyObjCmd): fix wrong#args for apply by using
-	the ensemble rewrite engine. [Bug 1574835]
-	* generic/tclInterp.c (AliasObjCmd): previous commit missed usage of
-	TCL_EVAL_NOREWRITE for aliases.
-
-	* generic/tclBasic.c (TclEvalObjvInternal): removed redundant check
-	for ensembles. [Bug 1577628]
-
-	* library/clock.tcl (format, scan): corrected wrong # args messages to
-	* tests/clock.test (3.1, 34.1):	    make use of the new rewrite
-	capabilities of [info level]
-
-	* generic/tcl.h:	   Lets TEOV update the iPtr->callObj[cv] new
-	* generic/tclBasic.c:	   fields, except when the flag bit
-	* generic/tclInt.h:	   TCL_EVAL_NOREWRITE is present. These values
-	* generic/tclNamesp.c:	   are used by Tcl_PushCallFrame to initialise
-	* generic/tclProc.c:	   the frame's obj[cv] fields, and allows
-	* tests/namespace.test:	   [info level] to know and use ensemble
-	rewrites. [Bug 1577492]
-
-	***POTENTIAL INCOMPATIBILITY***
-	The return value from [info level 0] on interp alias calls is changed:
-	previously returned the target command (including curried values), now
-	returns the source - what was actually called.
-
-2006-10-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tcl.h:	   Modified the Tcl call stack so there is
-	* generic/tclBasic.c:	   always a valid CallFrame, even at level 0
-	* generic/tclCmdIL.c:	   [Patch 1577278]. Most of the changes
-	* generic/tclInt.h:	   involve removing tests for a NULL
-	* generic/tclNamesp.c:	   iPtr->(var)framePtr. There is now a
-	* generic/tclObj.c:	   CallFrame pushed at interp creation with a
-	* generic/tclProc.c:	   pointer to it stored in iPtr->rootFramePtr.
-	* generic/tclTrace.c:	   A second unused field in Interp is
-	* generic/tclVar.c:	   hijacked to enable further functionality,
-	currently unused (but with several FRQs depending on it).
-
-	***POTENTIAL INCOMPATIBILITY***
-	Any user that includes tclInt.h and needs to determine if it is
-	running at level 0 should change (iPtr->varFramePtr == NULL) to
-	(iPtr->varFramePtr == iPtr->rootFramePtr).
-
-2006-10-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* README:		Bump version number to 8.5a6
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2006-10-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tcl.h, generic/tclHash.c: Tcl_FindHashEntry now calls
-	Tcl_CreateHashEntry with a newPtr set to NULL: this would have caused
-	a segfault previously and eliminates duplicated code. A macro has been
-	added to tcl.h (only used when TCL_PRESERVE_BINARY_COMPATABALITY is
-	not set - i.e., not by default).
-
-2006-10-20  Reinhard Max  <max@tclers.tk>
-
-	* unix/configure.in: Added autodetection for OS-supplied timezone
-	* unix/Makefile.in:  files and configure switches to override the
-	* unix/configure:    detected default.
-
-2006-10-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	*** 8.5a5 TAGGED FOR RELEASE ***
-
-	* tools/tcltk-man2html.tcl: add support for alpha & beta versions to
-	useversion glob pattern. [Bug 1579941]
-
-2006-10-18  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:		8.5a5 release date set
-
-	* doc/Encoding.3:	Missing doc updates (mostly Table of
-	* doc/Ensemble.3:	Contents) exposed by `make checkdoc`
-	* doc/FileSystem.3:
-	* doc/GetTime.3:
-	* doc/PkgRequire.3:
-
-2006-10-17  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInterp.c (ApplyObjCmd): fixed bad error in 2006-10-12
-	commit: interp released too early. Spotted by mistachkin.
-
-2006-10-16  Miguel Sofer  <msofer@users.sf.net>
-
-	* tclProc.c (SetLambdaFromAny):
-	* tests/apply.test (9.1-9.2): plugged intrep leak [Bug 1578454],
-	found by mjanssen.
-
-2006-10-16  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclBasic.c: Moved TIP#219 cleanup to DeleteInterpProc.
-
-2006-10-16  Daniel Steffen  <das@users.sourceforge.net>
-
-	* changes: updates for 8.5a5 release.
-
-	* unix/tclUnixThrd.c (TclpThreadGetStackSize): Darwin: fix for main
-	thread, where pthread_get_stacksize_np() returns incorrect info.
-
-	* macosx/GNUmakefile: don't redo prebinding of non-prebound binaires.
-
-2006-10-16  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclPkg.c (ExactRequirement):	Plugged memory leak. Also
-	changed Tcl_Alloc()/Tcl_Free() calls to ckalloc()/ckfree() for easier
-	memory debugging in the future. [Bug 1568373]
-
-	* library/tcltest/tcltest.tcl:	Revise tcltest bump to 2.3a1.
-	* library/tcltest/pkgIndex.tcl: This permits more features to be
-	* unix/Makefile.in:	added to tcltest before we reach version 2.3.0
-	* win/Makefile.in:	best timed to match the release of Tcl 8.5.0.
-	* win/makefile.vc:	This also serves as a demo of TIP 268 features
-
-2006-10-13  Colin McCormack <coldstore@users.sf.net>
-
-	* win/tclWinFile.c: corrected erroneous attempt to protect against
-	NULL return from Tcl_FSGetNormalizedPath per [Bug 1548263] causing
-	[Bug 1575837].
-	* win/tclWinFile.c: alfredd supplied patch to fix [Bug 1575837]
-
-2006-10-13  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixThrd.c (TclpThreadGetStackSize): on Darwin, use
-	* unix/tcl.m4: pthread_get_stacksize_np() API to get thread stack size
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2006-10-12  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInterp.c (ApplyObjCmd):
-	* tests/interp.test (interp-14.5-10): made [interp alias] use the
-	ensemble rewrite machinery to produce better error messages [Bug
-	1576006]
-
-2006-10-12  David Gravereaux <davygrvy@pobox.com>
-
-	* win/nmakehlp.c: Replaced all wnsprintf() calls with snprintf().
-	wnsprintf was not in my shwlapi header file (VC++6)
-
-2006-10-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclPkg.c (Tcl_PackageRequireEx):	Corrected crash when
-	argument version=NULL passed in.
-
-2006-10-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.5a5 release.
-
-	* generic/tclNamespace.c (TclTeardownNamespace):  After the
-	commandPathSourceList of a namespace is cleared, set the
-	commandPathSourceList to NULL so we don't try to walk the list a
-	second time, possibly after it is freed. [Bug 1566526]
-	* tests/namespace.test (namespace-51.16):	Added test.
-
-2006-10-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/UpVar.3: brough the docs in accordance to the code. Ever since
-	8.0, Tcl_UpVar(2)? accepts TCL_NAMESPACE_ONLY as a flag value, and
-	var-3.4 tests for proper behaviour. The docs only allowed 0 and
-	TCL_GLOBAL_ONLY. [Bug 1574099]
-
-2006-10-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/*.test: updated all tests to refer explicitly to the global
-	variables ::errorInfo, ::errorCode, ::env and ::tcl_platform: many
-	were relying on the alternative lookup in the global namespace, that
-	feature is tested specifically in namespace and variable tests.
-
-	The modified testfiles are: apply.test, basic.test, case.test,
-	cmdIL.test, cmdMZ.test, compExpr-old.test, error.test, eval.test,
-	event.test, expr.test, fileSystem.test, for.test, http.test, if.test,
-	incr-old.test, incr.test, interp.test, io.test, ioCmd.test, load.test,
-	misc.test, namespace.test, parse.test, parseOld.test, pkg.test,
-	proc-old.test, set.test, switch.test, tcltest.test, thread.test,
-	var.test, while-old.test, while.test.
-
-2006-10-06  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/rules.vc: [Bug 1571954] avoid /RTCc flag with MSVC8
-
-2006-10-06  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* doc/binary.n:	       TIP #275: Support unsigned values in binary
-	* generic/tclBinary.c: command. Tests and documentation updated.
-	* tests/binary.test:
-
-2006-10-05  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tm.tcl: Fixed bug in TIP #189 implementation, now allowing
-	'_' in module names.
-
-2006-10-05  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* library/http/http.tcl (http::geturl): only do geturl url rfc 3986
-	validity checking if $::http::strict is true (default true for 8.5).
-	[Bug 1560506]
-
-	* generic/tcl.h: note limitation on changing Tcl_UniChar size
-	* generic/tclEncoding.c (UtfToUnicodeProc, UnicodeToUtfProc):
-	* tests/encoding.test (encoding-16.1): fix alignment issues in
-	unicode <> utf conversion procs. [Bug 1122671]
-
-2006-10-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (Tcl_LappendObjCmd):
-	* tests/append.test(4.21-22): fix for longstanding [Bug 1570718],
-	lappending nothing to non-list. Reported by lvirden
-
-2006-10-04  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tzdata/: Olson's tzdata2006m.
-
-2006-10-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/clock.test (clock-49.2): Removed a locale dependency that
-	caused a spurious failure in the German locale. [Bug 1567956]
-
-2006-10-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/Eval.3 (TclEvalObjv): added note on refCount management for the
-	elements of objv. [Bug 730244]
-
-2006-10-01  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/tclWinFile.c: Handle possible missing define.
-
-	* win/tclWinFile.c (TclpUtime): [Bug 1420432] file mtime fails for
-	* tests/cmdAH.test:		directories on windows
-
-	* tests/winFile.test: Handle Msys environment a little differently in
-	getuser function. [Bug 1567956]
-
-2006-09-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclUtil.c (Tcl_SplitList): optimisation, [Patch 1344747] by
-	dgp.
-
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclObj.c:
-	* generic/tclStubInit.c: added an internal function TclObjBeingDeleted
-	to provide info as to the reason for the loss of an internal rep. [FR
-	1512138]
-
-	* generic/tclCompile.c:
-	* generic/tclHistory.c:
-	* generic/tclInt.h:
-	* generic/tclProc.c: made Tcl_RecordAndEvalObj not call "history" if
-	it has been redefined to an empty proc, in order to reduce the noise
-	when debugging [FR 1190441]. Moved TclCompileNoOp from tclProc.c to
-	tclCompile.c
-
-2006-09-28  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclPkg.c (CompareVersions): Bugfix. Check string lengths
-	* tests/pkg.test: before comparison. The shorter string is the smaller
-	number. Added testcases as well. Interestingly all existing test cases
-	for vcompare compared numbers of the same length with each other. [Bug
-	1563836]
-
-2006-09-28  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclIO.c (Tcl_GetsObj): added two test'n'panic guards for
-	possible NULL derefs, [Bug 1566382] and coverity #33.
-
-2006-09-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Corrected error in INST_LSHIFT in the
-	* tests/expr.test:	calculation done to determine whether a shift
-	in the (long int) type is possible. The calculation had literal value
-	"1" where it needed a value "1L" to compute the correct result. Error
-	detected via testing with the math::bigfloat package [Bug 1567222]
-
-	* generic/tclPkg.c (CompareVersion):	Flatten strcmp() results to
-	{-1, 0, 1} to match expectations of CompareVersion() callers.
-
-2006-09-27  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/regc_color.c (singleton):
-	* generic/regc_cvec.c (addmcce):
-	* generic/regcomp.c (compile, dovec): the static function addmcce does
-	nothing when called with two NULL pointers; the only call is by
-	compile with two NULL pointers (regcomp.c #includes regc_cvec.c).
-	Large parts (all?) the code for mcce (multi character collating
-	element) that we do not use is ifdef'ed out with the macro
-	REGEXP_MCCE_ENABLE.
-	This silences coverity bugs 7, 16, 80
-
-	* generic/regc_color.c (uncolorchain):
-	* generic/regc_nfa.c (freearc): changed tests and asserts to
-	equivalent formulation, designed to avoid an explicit comparison to
-	NULL and satisfy coverity that 6 and 9 are not bugs.
-
-2006-09-27  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/pkg.test: Added test for version comparison at the 32bit
-	boundary. [Bug 1563836]
-
-	* generic/tclPkg.c: Rewrote CompareVersion to perform string
-	comparison instead of numeric. This breaks through the 32bit limit on
-	version numbers. See code for details (handling of leading zeros,
-	signs, etc.). un-CONSTed some arguments of CompareVersions,
-	RequirementSatisfied, and AllRequirementsSatisfied. The new compare
-	modifies the string (temporary string terminators). All callers use
-	heap-allocated ver-intreps, so we are good with that. [Bug 1563836]
-
-2006-09-27  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclFileName.c (TclGlob): added a panic for a call with
-	TCL_GLOBMODE_TAILS and pathPrefix==NULL. This would cause a segfault,
-	as found by coverity #26.
-
-2006-09-26  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/Encoding.3:	 Added covariant 'const' qualifier for the
-	* generic/tcl.decls:	 Tcl_EncodingType argument to
-	* generic/tclEncoding.c: Tcl_CreateEncoding. [Further TIP#27 work.]
-	* generic/tclDecls.h:	 Reran 'make genstubs'.
-
-2006-09-26  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc:  Additional compiler flags and amd64 support.
-	* win/nmakehlp.c:
-	* win/rules.vc:
-
-2006-09-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	As 2006-09-22 commit from Donal K. Fellows
-	demonstrates, "#define NULL 0" is just wrong, and as a quotable chat
-	figure observed, "If NULL isn't defined, we're not using a C compiler"
-	Improper fallback definition of NULL removed.
-
-2006-09-25  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* generic/tcl.h:	More fixing which struct stat to refer to.
-	* generic/tclGetDate.y: Some casts from time_t to int required.
-	* generic/tclTimer.c:	Tcl_Time structure members are longs.
-	* win/makefile.vc:	Support for varying compiler options
-	* win/rules.vc:		and build to platform-specific subdirs.
-
-2006-09-25  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (Tcl_StackChannel): Fixed [Bug 1564642], aka
-	coverity #51. Extended loop condition, added checking for NULL to
-	prevent seg.fault.
-
-2006-09-25  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/package.n: Fixed nits reported by Daniel Steffen in the TIP#268
-	changes.
-
-2006-09-25  Kevin B. Kenny   <kennykb@acm.org>
-
-	* generic/tclNotify.c (Tcl_DeleteEvents): Simplified the code in hopes
-	of making the invariants clearer and proving to Coverity that the
-	event queue memory is managed correctly.
-
-2006-09-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNotify.c (Tcl_DeleteEvents): Make it clear what happens
-	when the event queue is mismanaged. [Bug 1564677], coverity bug #10.
-
-2006-09-24  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclParse.c (Tcl_ParseCommand): also return an error if
-	start==NULL and numBytes<0. This is coverity's bug #20
-
-	* generic/tclStringObj.c (STRING_SIZE): fix allocation for 0-length
-	strings. This is coverity's bugs #54-5
-
-2006-09-22  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclInt.h: Moved TIP#268's field 'packagePrefer' to the end
-	of the structure, for better backward compatibility.
-
-2006-09-22  Andreas Kupries  <andreask@activestate.com>
-
-	TIP#268 IMPLEMENTATION
-
-	* generic/tclDecls.h:	 Regenerated from tcl.decls.
-	* generic/tclStubInit.c:
-
-	* doc/PkgRequire.3: Documentation of extended API, extended testsuite.
-	* doc/package.n:
-	* tests/pkg.test:
-
-	* generic/tcl.decls: Implementation.
-	* generic/tclBasic.c:
-	* generic/tclConfig.c:
-	* generic/tclInt.h:
-	* generic/tclPkg.c:
-	* generic/tclTest.c:
-	* generic/tclTomMathInterface.c:
-	* library/init.tcl:
-	* library/package.tcl:
-	* library/tm.tcl:
-
-2006-09-22  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclThreadTest.c (TclCreateThread): Use NULL instead of 0 as
-	end-of-strings marker to Tcl_AppendResult; the difference matters on
-	64-bit machines. [Bug 1562528]
-
-2006-09-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclUtil.c:	Dropped ParseInteger() routine. TclParseNumber
-	covers the task just fine.
-
-2006-09-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclEvent.c (Tcl_VwaitObjCmd): Rewrite so that an exceeded
-	limit trapped in a vwait cannot cause a dangerous dangling trace.
-
-2006-09-19  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (INST_EXPON):	Native type overflow detection
-	* tests/expr.test:	was completely broken. Falling back on use of
-	bignums for all non-trivial ** calculations until
-	native-type-constrained special cases can be done carefully and
-	correctly. [Bug 1561260]
-
-2006-09-15  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* library/http/http.tcl:      Change " " -> "+" url encoding mapping
-	* library/http/pkgIndex.tcl:  to " " -> "%20" as per RFC 3986.
-	* tests/http.test (http-5.1): bump http to 2.5.3
-	* unix/Makefile.in:
-	* win/Makefile.in:
-
-2006-09-12  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/configure.in (HAVE_MTSAFE_GETHOST*): Modified to recognize
-	HP-UX 11.00 and beyond as having mt-safe implementations of the
-	gethost functions.
-	* unix/configure: Regenerated, using autoconf 2.59
-
-	* unix/tclUnixCompat.c (PadBuffer): Fixed bug in calculation of the
-	increment needed to align the pointer, and added documentation
-	explaining why the macro is implemented as it is.
-
-2006-09-11  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/rules.vc:	   Updated to install http, tcltest and msgcat as
-	* win/makefile.vc: Tcl Modules (as per Makefile.in).
-	* win/makefile.vc: Added tommath_(super)class headers.
-
-2006-09-11  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/Makefile.in (install-libraries): Fixed typo tcltest 2.3.9 ->
-	2.3.0.
-
-2006-09-11  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixCompat.c: make compatLock static and only declare it
-	when it will actually be used; #ifdef parts of TSD that are not always
-	needed; adjust #ifdefs to cover all possible cases; fix whitespace.
-
-2006-09-11  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/msgcat.test: Bumped version in auxiliary files as well.
-	* doc/msgcat.n:
-
-2006-09-11  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/Makefile.in:	Bumped msgcat version to 1.4.2 to be
-	* win/Makefile.in:	consistent with dgp's commits of 2006-09-10.
-
-2006-09-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* library/msgcat/msgcat.tcl:	Removed some unneeded [uplevel]s.
-
-2006-09-10  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c:		Corrected INST_EXPON flaw that treated
-	* tests/expr.test:		$x**1 as $x**3. [Bug 1555371]
-
-	* doc/tcltest.n:		Bump to version tcltest 2.3.0 to
-	* library/tcltest/pkgIndex.tcl: account for new "-verbose line"
-	* library/tcltest/tcltest.tcl:	feature.
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.bc:
-	* win/makefile.vc:
-
-	* library/msgcat/msgcat.tcl:	Bump to version msgcat 1.4.2 to
-	* library/msgcat/pkgIndex.tcl:	account for modifications.
-
-2006-09-10  Daniel Steffen  <das@users.sourceforge.net>
-
-	* library/msgcat/msgcat.tcl (msgcat::Init): on Darwin, add fallback of
-	* tests/msgcat.test:			    default msgcat locale to
-	* unix/tclUnixInit.c (TclpSetVariables):    current CFLocale
-	identifier if available (via private ::tcl::mac::locale global, set at
-	interp init when on Mac OS X 10.3 or later with CoreFoundation).
-
-	* library/tcltest/tcltest.tcl: add 'line' verbose level: prints source
-	* doc/tcltest.n:	       file line information of failing tests.
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: add new tclUnixCompat.c file;
-	revise tests target to use new tcltest 'line' verbose level.
-
-	* unix/configure.in: add descriptions to new AC_DEFINEs for MT-safe.
-	* unix/tcl.m4: add caching to new SC_TCL_* macros for MT-safe wrappers
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2006-09-08  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* unix/tclUnixCompat.c: Added fallback to gethostbyname() and
-	gethostbyaddr() if the implementation is known to be MT-safe
-	(currently for Darwin 6 or later only).
-
-	* unix/configure.in: Assume gethostbyname() and gethostbyaddr() are
-	MT-safe starting with Darwin 6 (Mac OSX 10.2).
-
-	* unix/configure: Regenerated with autoconf V2.59
-
-2006-09-08  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/tclUnixCompat.c: Fixed conditions for CopyArray/CopyString, and
-	CopyHostent. Also fixed bad var names in TclpGetHostByName.
-
-2006-09-07  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* unix/tclUnixCompat.c: Added fallback to MT-unsafe library calls if
-	TCL_THREADS is not defined.
-	Fixed alignment of arrays copied by CopyArray() to be on the
-	sizeof(char *) boundary.
-
-2006-09-07  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* unix/tclUnixChan.c:	Rewritten MT-safe wrappers to return ptrs to
-	* unix/tclUnixCompat.c: TSD storage making them all look like their
-	* unix/tclUnixFCmd.c:	MT-unsafe pendants API-wise.
-	* unix/tclUnixPort.h:
-	* unix/tclUnixSock.c:
-
-2006-09-06  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* unix/tclUnixChan.c: Added TCL_THREADS ifdef'ed usage of MT-safe
-	* unix/tclUnixFCmd.c: calls like: getpwuid, getpwnam, getgrgid,
-	* unix/tclUnixSock.c: getgrnam, gethostbyname and gethostbyaddr.
-	* unix/tclUnixPort.h: See [Bug 999544]
-	* unix/Makefile.in:
-	* unix/configure.in:
-	* unix/tcl.m4:
-	* unix/configure: Regenerated.
-
-	* unix/tclUnixCompat.c: New file containing MT-safe implementation of
-	some library calls.
-
-2006-09-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Removed much complexity that is no
-	longer needed.
-
-	* tests/main.text (Tcl_Main-4.4):	Test corrected to not be
-	timing sensitive to the Bug 1481986 fix. [Bug 1550858]
-
-2006-09-04  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* doc/package.n: correct package example
-
-2006-08-31  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Corrected flawed logic for disabling
-	the INST_TRY_CVT_TO_NUMERIC instruction at the end of an expression
-	when function arguments contain operators. [Bug 1541274]
-
-	* tests/expr-old.test:	The remaining failing tests reported in
-	* tests/expr.test:	[Bug 1381715] are all new in Tcl 8.5, so
-	there's really no issue of compatibility with Tcl 8.4 result to deal
-	with. Fixed by updating tests to expect 8.5 results.
-
-2006-08-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParseExpr.c:	Dropped the old expr parser.
-
-2006-08-30  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclBasic.c (Tcl_CreateInterp): init iPtr->threadId
-
-	* win/tclWinChan.c [Bug 819667] Improve logic for identifying COM
-	ports.
-
-	* generic/tclIOGT.c (ExecuteCallback):
-	* generic/tclPkg.c (Tcl_PkgRequireEx): replace Tcl_GlobalEval(Obj)
-	with more efficient Tcl_Eval(Obj)Ex
-
-	* unix/Makefile.in (valgrindshell): add valgrindshell target and
-	update default VALGRINDARGS. User can override, or add to it with
-	VALGRIND_OPTS env var.
-
-	* generic/tclFileName.c (DoGlob): match incrs with decrs.
-
-2006-08-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParseExpr.c:	Use the "parent" field of orphan
-	ExprNodes to store the closure of left pointers. This lets us avoid
-	repeated re-scanning leftward for the left boundary of subexpressions,
-	which in worst case led to near O(N^2) runtime.
-
-2006-08-29  Joe Mistachkin  <joe@mistachkin.com>
-
-	* unix/tclUnixInit.c: Fixed the issue (typo) that was causing
-	* unix/tclUnixThrd.c (TclpThreadGetStackSize): stack.test to fail on
-	FreeBSD (and possibly other Unix platforms).
-
-2006-08-29  Colin McCormack  <coldstore@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:	Added test for NULL return from
-	* generic/tclPathObj.c: Tcl_FSGetNormalizedPath which was causing
-	* unix/tclUnixFile.c:	segv's per [Bug 1548263]
-	* win/tclWinFCmd.c:
-	* win/tclWinFile.c:
-
-2006-08-28  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/America/Havana:      Regenerated from Olson's
-	* library/tzdata/America/Tegucigalpa: tzdata2006k.
-	* library/tzdata/Asia/Gaza:
-
-2006-08-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c:	Revised ObjPrintfVA to take care to
-	* generic/tclParseExpr.c:	copy only whole characters when doing
-	%s formatting. This relieves callers of TclObjPrintf() and
-	TclFormatToErrorInfo() from needing to fix arguments to character
-	boundaries. Tcl_ParseExpr() simplified by taking advantage. [Bug
-	1547786]
-
-	* generic/tclStringObj.c:	Corrected TclFormatObj's failure to
-	count up the number of arguments required by examining the format
-	string. [Bug 1547681]
-
-2006-08-27  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclClock.c (ClockClicksObjCmd): Fix nested macro breakage
-	with TCL_MEM_DEBUG enabled. [Bug 1547662]
-
-2006-08-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/namespace.n:
-	* generic/tclNamesp.c:
-	* tests/upvar.test: bugfix, docs clarification and new tests for
-	[namespace upvar] as follow up to [Bug 1546833], reported by Will
-	Duquette.
-
-2006-08-24  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata: Regenerated, including several new files, from
-	Olson's tzdata2006j.
-	* library/clock.tcl:
-	* tests/clock.test: Removed an early testing hack that allowed loading
-	'registry' from the build tree rather than an installed one. This is a
-	workaround for [Bug 15232730], which remains open because it's a
-	symptom of a deeper underlying problem.
-
-2006-08-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParseExpr.c:	Minimal collection of new tests
-	* tests/parseExpr.test:		testing the error messages of the new
-	expr parser. Several bug fixes and code simplifications that appeared
-	during that effort.
-
-2006-08-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:	Revisions to complete the thread finalization
-	of the cwdPathPtr. [Bug 1536142]
-
-	* generic/tclParseExpr.c:	Revised mistaken call to
-	TclCheckBadOctal(), so both [expr 08] and [expr 08z] have same
-	additional info in error message.
-
-	* tests/compExpr-old.test:	Update existing tests to not fail with
-	* tests/compExpr.test:		the new expr parser.
-	* tests/compile.test:
-	* tests/expr-old.test:
-	* tests/expr.test:
-	* tests/for.test:
-	* tests/if.test:
-	* tests/parseExpr.test:
-	* tests/while.test:
-
-2006-08-21  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* win/Makefile.in (gdb): Make this target work so that debugging an
-	msys build is possible.
-
-2006-08-21  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXNotify.c (Tcl_WaitForEvent): if the run loop is
-	already running (e.g. if Tcl_WaitForEvent was called recursively),
-	re-run it in a custom run loop mode containing only the source for the
-	notifier thread, otherwise wakeups from other sources added to the
-	common run loop modes might get lost.
-
-	* unix/tclUnixNotfy.c (Tcl_WaitForEvent): on 64-bit Darwin,
-	pthread_cond_timedwait() appears to have a bug that causes it to wait
-	forever when passed an absolute time which has already been exceeded
-	by the system time; as a workaround, when given a very brief timeout,
-	just do a poll on that platform. [Bug 1457797]
-
-	* generic/tclClock.c (ClockClicksObjCmd): add support for Darwin
-	* generic/tclCmdMZ.c (Tcl_TimeObjCmd):	  nanosecond resolution timer
-	* generic/tclInt.h:			  to [clock clicks] and [time]
-	* unix/configure.in (Darwin):		  when TCL_WIDE_CLICKS defined
-	* unix/tclUnixTime.c (TclpGetWideClicks, TclpWideClicksToNanoseconds):
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-	* unix/tclUnixPort.h (Darwin): override potentially faulty configure
-	detection of termios availability in all cases, since termios is known
-	to be present on all Mac OS X releases since 10.0. [Bug 497147]
-
-2006-08-18  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4 (Darwin): add support for --enable-64bit on x86_64, for
-	universal builds including x86_64, for 64-bit CoreFoundation on
-	Leopard and for use of -mmacosx-version-min instead of
-	MACOSX_DEPLOYMENT_TARGET
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-	* generic/tcl.h:	  add fixes for building on Leopard and
-	* unix/tclUnixPort.h:	  support for 64-bit CoreFoundation on Leopard
-	* macosx/tclMacOSXFCmd.c:
-
-	* unix/tclUnixPort.h: on Darwin x86_64, disable use of vfork as it
-	causes execve to fail intermittently. (rdar://4685553)
-
-	* generic/tclTomMath.h: on Darwin 64-bit, for now disable use of
-	128-bit arithmetic through __attribute__ ((mode(TI))), as it leads to
-	link errors due to missing fallbacks. (rdar://4685527)
-
-	* macosx/Tcl.xcodeproj/project.pbxproj: add x86_64 to universal build,
-	switch native release targets to use DWARF with dSYM, Xcode 3.0
-	changes
-	* macosx/README: updates for x86_64 and Xcode 2.4.
-
-	* macosx/Tcl.xcodeproj/default.pbxuser: add test suite target that
-	* macosx/Tcl.xcodeproj/project.pbxproj: runs the tcl test suite at
-	build time and shows clickable test suite errors in the GUI build
-	window.
-
-	* tests/macOSXFCmd.test: fix use of deprecated resource fork paths.
-
-	* unix/tclUnixInit.c (TclpInitLibraryPath): move code that is only
-	needed when TCL_LIBRARY is defined to run only in that case.
-
-	* generic/tclLink.c (LinkTraceProc): fix 64-bit signed-with-unsigned
-	comparison warning from gcc4 -Wextra.
-
-	* unix/tclUnixChan.c (TclUnixWaitForFile): with timeout < 0, if
-	select() returns early (e.g. due to a signal), call it again instead
-	of returning a timeout result. Fixes intermittent event-13.8 failures.
-
-2006-08-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclCompile.c:		Revised the new set of expression
-	* generic/tclParseExpr.c:	parse error messages.
-
-2006-08-16  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParseExpr.c:	Replace PrecedenceOf() function with
-	prec[] static array.
-
-2006-08-14  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* library/clock.tcl (::tcl::clock::add): Added missing braces to
-	clockval validation code. Pointed out on comp.lang.tcl.
-
-2006-08-11  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclNamesp.c: Improvements in buffer management to make
-	namespace creation faster. Plus selected other minor improvements to
-	code quality. [Patch 1352382]
-
-2006-08-10  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	Misc patches to make code more efficient. [Bug 1530474] (afredd)
-	* generic/*.c, macosx/tclMacOSXNotify.c, unix/tclUnixNotfy.c,
-	* win/tclWinThrd.c: Tidy up invocations of Tcl_Panic() to promote
-	string constant sharing and consistent style.
-	* generic/tclBasic.c (Tcl_CreateInterp): More efficient handling of
-	* generic/tclClock.c (TclClockInit):	 registration of commands not
-						 in global namespace.
-	* generic/tclVar.c (Tcl_UnsetObjCmd): Remove unreachable clause.
-
-2006-08-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclEncoding.c:	Replace buffer copy in for loop with
-	call to memcpy(). Thanks to afredd. [Patch 1530262]
-
-2006-08-09  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclCmdIL.c (Tcl_LassignObjCmd): Make the wrong#args message
-	a bit more consistent with those used elsewhere. [Bug 1534628]
-
-	* generic/tclDictObj.c (DictForCmd): Stop crash when attempting to
-	iterate over an invalid dictionary. [Bug 1531184]
-
-	* doc/ParseCmd.3, doc/expr.n, doc/set.n, doc/subst.n, doc/switch.n:
-	* doc/tclvars.n: Ensure that uses of [expr] in documentation examples
-	are also good style (with braces) unless otherwise necessary. [Bug
-	1526581]
-
-2006-08-03  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixPipe.c (TclpCreateProcess): for USE_VFORK: ensure
-	standard channels are initialized before vfork() so that the child
-	doesn't potentially corrupt global state in the parent's address space
-
-	* tests/compExpr-old.test: add 'oldExprParser' constraint to all tests
-	* tests/compExpr.test:	   that depend on the exact format of the
-	* tests/compile.test:	   error messages of the pre-2006-07-05
-	* tests/expr-old.test:	   expression parser. The constraint is on by
-	* tests/expr.test:	   default (i.e those tests still fail), but
-	* tests/for.test:	   can be turned off by passing '-constraints
-	* tests/if.test:	   newExprParser' to tcltest, which will skip
-	* tests/parseExpr.test:	   the 196 failing tests in the testsuite that
-	* tests/while.test:	   are caused by the new expression parser
-	error messages.
-
-2006-07-31  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c (ConvertLocalToUTCUsingC): Corrected a regression
-	that caused dates before 1969 to be one day off in the :localtime time
-	zone if TZ is not set. [Bug 1531530]
-
-2006-07-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c (GetJulianDayFromEraYearMonthDay): Corrected
-	several errors in converting dates before the Common Era [Bug 1426279]
-	* library/clock.tcl: Corrected syntax errors in generated code for %EC
-	%Ey, and %W format groups [Bug 1505383]. Corrected a bug in cache
-	management for format strings containing [glob] metacharacters [Bug
-	1494664]. Corrected several errors in formatting/scanning of years
-	prior to the Common Era, and added the missing %EE format group to
-	indicate the era.
-	* tools/makeTestCases.tcl: Added code to make sure that %U and %V
-	format groups are included in the tests. (The code depends on %U and
-	%V formatting working correctly when 'makeTestCases.tcl' is run,
-	rather than making a completely independent check.) Added tests for
-	[glob] metacharacters in strings. Added tests for years prior to the
-	Common Era.
-	* tests/clock.test: Rebuilt with new test cases for all the above.
-
-2006-07-30  Joe English	 <jenglish@users.sourceforge.net>
-
-	* doc/AppInit.3: Fix typo [Bug 1496886]
-
-2006-07-26  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Corrected flawed overflow detection in
-	* tests/expr.test:	INST_EXPON that caused [expr 2**64] to return
-	0 instead of the same value as [expr 1<<64].
-
-2006-07-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* win/tclWinSock.c:	Correct uninitialized Tcl_DString. Thanks to
-	afredd. [Bug 1518166]
-
-2006-07-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c:
-	* tests/execute.test (execute-9.1): dgp's fix for [Bug 1522803].
-
-2006-07-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXNotify.c (Tcl_InitNotifier, Tcl_WaitForEvent):
-	create notifier thread lazily upon first call to Tcl_WaitForEvent()
-	rather than in Tcl_InitNotifier(). Allows calling exeve() in processes
-	where the event loop has not yet been run (Darwin's execve() fails in
-	processes with more than one thread), in particular allows embedders
-	to call fork() followed by execve(), previously the pthread_atfork()
-	child handler's call to Tcl_InitNotifier() would immediately recreate
-	the notifier thread in the child after a fork.
-
-	* macosx/tclMacOSXFCmd.c (TclMacOSXCopyFileAttributes):	   add support
-	* macosx/tclMacOSXNotify.c (Tcl_InitNotifier):		   for weakly
-	* unix/tclUnixInit.c (Tcl_GetEncodingNameFromEnvironment): importing
-	symbols not available on OSX 10.2 or 10.3, enables binaires built on
-	later OSX versions to run on earlier ones.
-	* macosx/Tcl.xcodeproj/project.pbxproj: enable weak-linking; turn on
-						extra warnings.
-	* macosx/README: document how to enable weak-linking; cleanup.
-	* unix/tclUnixPort.h: add support for weak-linking; conditionalize
-	AvailabilityMacros.h inclusion; only disable realpath on 10.2 or
-	earlier when threads are enabled.
-	* unix/tclLoadDyld.c (TclpLoadMemoryGetBuffer): change runtime Darwin
-	* unix/tclUnixInit.c (TclpInitPlatform):	release check to use
-							global initialized
-							once
-	* unix/tclUnixFCmd.c (DoRenameFile, TclpObjNormalizePath): add runtime
-	Darwin release check to determine if realpath is threadsafe.
-	* unix/configure.in: add check on Darwin for compiler support of weak
-	* unix/tcl.m4:	     import and for AvailabilityMacros.h header; move
-	Darwin specific checks & defines that are only relevant to the tcl
-	build out of tcl.m4; restrict framework option to Darwin; clean up
-	quoting and help messages.
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-	* generic/regc_locale.c (cclass):
-	* generic/tclExecute.c (TclExecuteByteCode):
-	* generic/tclIOCmd.c (Tcl_ExecObjCmd):
-	* generic/tclListObj.c (NewListIntRep):
-	* generic/tclObj.c (Tcl_GetLongFromObj, Tcl_GetWideIntFromObj)
-	(FreeBignum, Tcl_SetBignumObj):
-	* generic/tclParseExpr.c (Tcl_ParseExpr):
-	* generic/tclStrToD.c (TclParseNumber):
-	* generic/tclStringObj.c (TclAppendFormattedObjs):
-	* unix/tclLoadDyld.c (TclpLoadMemory):
-	* unix/tclUnixPipe.c (TclpCreateProcess): fix signed-with-unsigned
-	comparison and other warnings from gcc4 -Wextra.
-
-2006-07-13  Andreas Kupries <andreask@activestate.com>
-
-	* unix/tclUnixPort.h: Added the inclusion of <AvailabilityMacros.h>.
-	The missing header caused the upcoming #if conditions to wrongly
-	exclude realpath, causing file normalize to ignore symbolic links in
-	the path.
-
-2006-07-11  Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
-
-	* generic/tclAsync.c: Made Tcl_AsyncDelete() more tolerant when called
-	after all thread TSD has been garbage-collected.
-
-2006-07-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclParseExpr.c:	Completely new expression parser that
-	builds a parse tree instead of operating with deep recursion. This
-	corrects reports of stack-blowing crashes parsing long expressions
-	[Bug 906201] and replaces a fundamentally O(N^2) algorithm with an
-	O(N) one [RFE 903765]. The new parser is better able to generate error
-	messages that clearly report both the nature and context of the syntax
-	error [Bugs 1029267, 1381715]. For now, the code for the old parser is
-	still present and can be activated with a "#define OLD_EXPR_PARSER
-	1". This is for the sake of a clean implementation patch, and for ease
-	of benchmarking. The new parser is non-recursive, so much lighter in
-	stack consumption, but it does use more heap, so there may be cases
-	where parsing of long expressions that succeeded with the old parser
-	will lead to out of memory panics with the new one. There are still
-	more improvements possible on that point, though significant progress
-	may require changes to the Tcl_Token specifications documented for the
-	public Tcl_Parse*() routines.
-	***POTENTIAL INCOMPATIBILITY*** for any callers that rely on the exact
-	(usually terrible) error messages generated by the old parser. This
-	includes a large number of tests in the test suite.
-
-	* generic/tclInt.h:		Replaced TclParseWhiteSpace() with
-	* generic/tclParse.c:		TclParseAllWhiteSpace() which is what
-	* generic/tclParseExpr.c:	all the callers really needed.
-	Breaking whitespace runs at newlines is useful only to the command
-	parsing function, and it can call the file scoped routine
-	ParseWhiteSpace() to do that.
-
-	* tests/expr-old.test:	Removed knownBug constraints that masked
-	* tests/expr.test:	failures due to revised error messages.
-	* tests/parseExpr.test:
-
-2006-06-20  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:	Changed default configuration to
-	* generic/tclInt.decls: #undef USE_OBSOLETE_FS_HOOKS which disables
-	* generic/tclTest.c:	access to the Tcl 8.3 internal routines for
-	hooking into filesystem operations. Everyone ought to have migrated to
-	Tcl_Filesystems by now.
-	***POTENTIAL INCOMPATIBILITY*** for any code still stuck in the
-	pre-Tcl_Filesystem era.
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	* generic/tclStrToD.c:	Removed dead code that permitted disabling of
-	recognition of the new 0b and 0o numeric formats.
-
-	* generic/tclExecute.c: Removed dead code that implemented alternative
-	* generic/tclObj.c:	design where numeric values did not
-	automatically narrow to the smallest Tcl_ObjType required to hold them
-
-	* generic/tclCmdAH.c:	Removed dead code that was old implementation
-	of [format].
-
-2006-06-14  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tclUnixPort.h (Darwin): support MAC_OS_X_VERSION_MAX_ALLOWED
-	define from AvailabilityMacros.h: override configure detection and
-	only use API available in the indicated OS version or earlier.
-
-2006-06-14  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/format.n, doc/scan.n: Added examples for converting between
-	characters and their numeric interpretations following user prompting.
-
-2006-06-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclLoadDl.c (TclpDlopen): Workaround for a compiler bug in Sun
-	Forte 6. [Bug 1503729]
-
-2006-06-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/GetStdChan.3:	Added recommendation that each call to
-	Tcl_SetStdChannel() be accompanied by a call to Tcl_RegisterChannel().
-
-2006-06-05  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/Alloc.3: Added documentation of promise that Tcl_Realloc(NULL,x)
-	is the same as Tcl_Alloc(x), as discussed in comp.lang.tcl. Also fixed
-	nonsense sentence to say something meaningful.
-
-2006-05-29  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tcl.h (Tcl_DecrRefCount): use if/else construct to allow
-	placement in unbraced outer if/else conditions. (jcw)
-
-2006-05-27  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/tclMacOSXNotify.c: implemented pthread_atfork() handler that
-	* unix/tcl.m4 (Darwin):	    recreates CoreFoundation state and
-	notifier thread in the child after a fork(). Note that pthread_atfork
-	is available starting with Tiger only. Because vfork() is used by the
-	core on Darwin, [exec]/[open] are not affected by this fix, only
-	extensions or embedders that call fork() directly (such as TclX).
-	However, this only makes fork() safe from corefoundation tcl with
-	--disable-threads; as on all platforms, forked children may deadlock
-	in threaded tcl due to the potential for stale locked mutexes in the
-	child. [Patch 923072]
-
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2006-05-24  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/tcl.m4 (SC_CONFIG_SYSTEM): Fixed quoting of command script to
-	awk; it was a rarely used branch, but it was wrong. [Bug 1494160]
-
-2006-05-23  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* doc/chan.n, doc/refchan.n: Tighten up the documentation to follow a
-	slightly more consistent style with regard to argument capitalization.
-
-2006-05-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclProc.c (ProcCompileProc): When a bump of the compile
-	epoch forces the re-compile of a proc body, take care not to overwrite
-	any Proc struct that may be referred to on the active call stack. Note
-	that the fix will not be effective for code that calls the private
-	routine TclProcCompileProc() directly. [Bug 1482718]
-
-2006-05-13  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclEvent.c (HandleBgErrors): fix leak. [Coverity issue 86]
-
-2006-05-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclMain.c (Tcl_Main):		Corrected flaw that required
-	* tests/main.test: (Tcl_Main-4.5):	processing of one interactive
-	command before passing control to the loop routine registered with
-	Tcl_SetMainLoop(). [Bug 1481986]
-
-2006-05-04  Don Porter	<dgp@users.sourceforge.net>
-
-	* README:		Bump version number to 8.5a5
-	* generic/tcl.h:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README.binary:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-	* generic/tclBasic.c (ExprSrandFunc): Restore acceptance of wide/big
-	* doc/mathfunc.n: integer values by srand(). [Bug 1480509]
-
-2006-04-26  Don Porter	<dgp@users.sourceforge.net>
-
-	*** 8.5a4 TAGGED FOR RELEASE ***
-
-	* changes:	Updates for another RC.
-
-	* generic/tclBinary.c:	Revised the handling of the Q and q format
-	* generic/tclInt.h:	specifiers for [binary] to account for the
-	* generic/tclStrToD.c:	"middle endian" floating point format used in
-	Nokia N770.
-
-2006-04-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/DoubleObj.3:	More doc updates for TIP 237.
-	* doc/expr.n:
-	* doc/format.n:
-	* doc/mathfunc.n:
-	* doc/scan.n:
-	* doc/string.n:
-
-	* generic/tclScan.c:	[scan $s %u] is documented to accept only
-	* tests/scan.test:	decimal formatted integers. Fixed to match.
-
-2006-04-19  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclStrToD.c: Added code to support the "middle endian"
-	floating point format used in the Nokia N770's software-based floating
-	point. Thanks to Bruce Johnson for reporting this bug, originally on
-	https://wiki.tcl-lang.org/page/Nokia+770.
-	* library/clock.tcl: Fixed a bug with Daylight Saving Time and Posix
-	time zone specifiers reported by Martin Lemburg in
-	http://groups.google.com/group/comp.lang.tcl/browse_thread/thread/9a8b15a4dfc0b7a0
-	(and not at SourceForge).
-	* tests/clock.test: Added test case for the above bug.
-
-2006-04-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/IntObj.3: Minor review fixes, including better documentation of
-	the behaviour of Tcl_GetBignumAndClearObj.
-
-2006-04-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* doc/IntObj.3: Documentation changes to account for TIP 237 changes.
-	* doc/Object.3: [Bug 1446971]
-
-2006-04-12  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/regc_locale.c (cclass): Redefined the meaning of [:print:]
-	to be exactly UNICODE letters, numbers, punctuation, symbols and
-	spaces (*not* whitespace). [Bug 1376892]
-
-2006-04-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclTrace.c:	Stop some interference between enter traces
-	* tests/trace.test:	and enterstep traces. [Bug 1458266]
-
-2006-04-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c: Yet another revised fix for the [Bug 1379287]
-	* tests/fileSystem.test:	family of path normalization bugs.
-
-2006-04-06  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* generic/tclRegexp.c (FinalizeRegexp): full reset data to indicate
-	readiness for reinitialization.
-
-2006-04-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct):	It seems there
-	* tests/indexObj.test:	are extensions that rely on the prior behavior
-	* doc/GetIndex.3:	that the empty string cannot succeed as a
-	unique prefix matcher, so I'm restoring Donal Fellows's solution.
-	Added mention of this detail to the documentation. [Bug 1464039]
-
-	* tests/compExpr-old.test:	Updated testmathfunctions constraint
-	* tests/compExpr.test:		to post-TIP-232 world.
-	* tests/expr-old.test:
-	* tests/expr.test:
-	* tests/info.test:
-
-	* tests/indexObj.test:	Corrected other test errors revealed by
-	* tests/upvar.test:	testing outside the tcltest application.
-
-	* generic/tclPathObj.c: Revised fix for the [Bug 1379287] family of
-	path normalization bugs.
-
-2006-04-06  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4: removed TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING
-	define on Darwin. [Bug 1457515]
-	* unix/configure: autoconf-2.59
-	* unix/tclConfig.h.in: autoheader-2.59
-
-2006-04-05  Don Porter	<dgp@users.sourceforge.net>
-
-	* win/tclWinInit.c:	More careful calls to Tcl_DStringSetLength()
-	* win/tclWinSock.c:	to avoid creating invalid DString states. Bump
-	* win/tclWinDde.c:	to version 1.3.2. [RFE 1366195]
-	* library/dde/pkgIndex.tcl:
-
-	* library/reg/pkgIndex.tcl:	Bump to registry 1.2 because
-	* win/tclWinReg.c:	Registry_Unload() is a new public routine
-	* win/Makefile.in:	compared to the 1.1.* releases.
-
-	* win/configure.in:	Bump package version numbers.
-	* win/configure:	autoconf 2.59
-
-2006-04-05  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct): Allow empty
-	strings to be matched by the Tcl_GetIndexFromObj machinery, in the
-	same manner as any other key. [Bug 1464039]
-
-2006-04-03  Andreas Kupries <andreask@activestate.com>
-
-	* generic/tclIO.c (ReadChars): Added check, panic and commentary to a
-	piece of code which relies on BUFFER_PADDING to create enough space at
-	the beginning of each buffer for the insertion of partial multibyte
-	data at the beginning of a buffer. Commentary explains why this code
-	is OK, and the panic is as a precaution if someone twiddled the
-	BUFFER_PADDING into uselessness.
-
-	* generic/tclIO.c (ReadChars): Temporarily suppress the use of
-	TCL_ENCODING_END set when EOF was reached while the buffer we are
-	converting is not truly the last buffer in the queue. Together with
-	the Utf bug below it was possible to completely wreck the buffer data
-	structures, eventually crashing Tcl. [Bug 1462248]
-
-	* generic/tclEncoding.c (UtfToUtfProc): Stop accessing memory beyond
-	the end of the input buffer when TCL_ENCODING_END is set and the last
-	bytes of the buffer start a multi-byte sequence. This bug contributed
-	to [Bug 1462248].
-
-2006-03-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: remove unused var and silence gcc warning
-
-2006-03-29  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/Makefile.in: convert _NATIVE paths to use / to avoid ".\"
-	path-as-escape issue.
-
-2006-03-29  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:	Updates for another RC.
-
-	* generic/tclPathObj.c:	 More fixes for path normalization when /../
-	* tests/fileSystem.test: tries to go beyond root.[Bug 1379287]
-
-	* generic/tclExecute.c: Revised INST_MOD implementation to do
-	calculations in native types as much as possible, moving to mp_ints
-	only when necessary.
-
-2006-03-28  Jeff Hobbs	<jeffh@ActiveState.com>
-
-	* win/tclWinPipe.c (TclpCreateProcess): change panics to Tcl errors
-	and do proper refcounting of noe objPtr. [Bug 1194429]
-
-	* unix/tcl.m4, win/tcl.m4: []-quote AC_DEFUN functions.
-
-2006-03-28  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcode/default.pbxuser:	add '-singleproc 1' cli arg to
-	* macosx/Tcl.xcodeproj/default.pbxuser: tcltest to ease test debugging
-
-	* macosx/Tcl.xcode/project.pbxproj:	removed $prefix/share from
-	* macosx/Tcl.xcodeproj/project.pbxproj: TCL_PACKAGE_PATH as per change
-	to unix/configure.in of 2006-03-13.
-
-	* unix/tclUnixFCmd.c (TclpObjNormalizePath): deal with *BSD/Darwin
-	realpath() converting relative paths into absolute paths [Bug 1064247]
-
-2006-03-28  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* generic/tclIOUtil.c: fix to nativeFilesystemRecord comparisons
-	(lesser part of [Bug 1064247])
-
-2006-03-27  Pat Thoyts	<patthoyts@users.sourceforge.net>
-
-	* win/tclWinTest.c:	Fixes for [Bug 1456373] (mingw-gcc issue)
-
-2006-03-27  Andreas Kupries <andreask@activestate.com>
-
-	* doc/CrtChannel.3:    Added TCL_CHANNEL_VERSION_5, made it the
-	* generic/tcl.h:       version where the "truncateProc" is defined at,
-	* generic/tclIO.c:     and moved all channel drivers of Tcl to v5.
-	* generic/tclIOGT.c, generic/tclIORChan.c, unix/tclUnixChan.c:
-	* unix/tclUnixPipe.c, win/tclWinChan.c, win/tclWinConsole.c:
-	* win/tclWinPipe.c, win/tclWinSerial.c, win/tclWinSock.c:
-
-2006-03-27  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Merge INST_MOD computation in with the
-	INST_?SHIFT instructions, which also operate only on two integral
-	values. Also corrected flaw that made INST_BITNOT of wide values
-	require mp_int calculations. Also corrected type that missed optimized
-	handling of the tclBooleanType by the TclGetBooleanFromObj macro.
-
-	* changes:	Updates for another RC.
-
-2006-03-25  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Corrections to INST_EXPON detection of
-	overflow to use mp_int calculations.
-
-2006-03-24  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclExecute.c (TclExecuteByteCode): Added a couple of missing
-	casts to 'int' that were affecting compilablity on VC6.
-
-2006-03-24  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclEncoding.c: Reverted latest change [Bug 506653] since it
-	reportedly killed test performance on Windows.
-
-	* generic/tclExecute.c: Revised INST_EXPON implementation to do
-	calculations in native types as much as possible, moving to mp_ints
-	only when necessary.
-
-2006-03-23  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Merged INST_EXPON handling in with the other
-	binary operators that operate on all number types (INST_ADD, etc.).
-
-	* tests/env.test: With case preserved (see 2006-03-21 commit) be sure
-	to do case-insensitive filtering. [Bug 1457065]
-
-2006-03-23  Reinhard Max  <max@suse.de>
-
-	* unix/tcl.spec: Cleaned up and completed the spec file. An RPM can
-	now be built from the tcl source distribution with "rpmbuild -tb
-	<tarball>"
-
-2006-03-22  Reinhard Max  <max@suse.de>
-
-	* tests/stack.test: Run the stack tests in subshells, so that they are
-	reported as failed tests rather than bugs in the test suite if the
-	recursion causes a segfault.
-
-2006-03-21  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:	Updates for another RC.
-
-	* generic/tclStrToD.c:	One of the branches of AccumulateDecimalDigit
-	* tests/parseExpr.test: did not. [Bug 1451233]
-
-	* tests/env.test:	Preserve case of saved env vars. [Bug 1409272]
-
-2006-03-21  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.decls:	 implement globbing for HFS creator & type
-	* macosx/tclMacOSXFCmd.c:codes and 'hidden' flag, as documented in
-	* tests/macOSXFCmd.test: glob.n; objectified OSType handling in [glob]
-	* unix/tclUnixFile.c:	 and [file attributes]; fix globbing for
-	hidden files with pattern==NULL arg. [Bug 823329]
-	* generic/tclIntPlatDecls.h:
-	* generic/tclStubInit.c: make genstubs
-
-2006-03-20  Andreas Kupries <andreask@activestate.com>
-
-	* win/Makefile.in (install-libraries): Generate tcl8/8.4 directory
-	under Windows as well (cygwin Makefile). Related entry: 2006-03-07,
-	dgp. This moved the installation of http from 8.2 to 8.4, partially. A
-	fix of the required directory creation was done for unix on Mar 10,
-	without entry in the Changelog. This entry is for the fix of the
-	directory creation under Windows.
-
-	* unix/installManPage: There is always one even more broken "sed".
-	Moved the # comment starting character in the sed script to the
-	beginning of their respective lines. The AIX sed will not recognize
-	them as comments otherwise :( The actual text stays indented for
-	better association with the commands they belong to.
-
-2006-03-20  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* tests/cmdAH.test, tests/fCmd.test, tests/unixFCmd.test:
-	* tests/winFCmd.test: Cleanup of some test constraint handling, and a
-	few other minor issues.
-
-2006-03-18  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* generic/tclFileName.c:
-	* doc/FileSystem.3:
-	* tests/fileName.test: Fix to [Bug 1084705] so that 'glob -nocomplain'
-	finally agrees with its documentation and doesn't swallow genuine
-	errors.
-
-	***POTENTIAL INCOMPATIBILITY*** for scripts that assumed '-nocomplain'
-	removes the need for 'catch' to deal with non-understood path names.
-
-	Small optimisation to implementation of pattern==NULL case of TclGlob,
-	and clarification to the documentation. [Tclvfs bug 1405317]
-
-2006-03-18  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* tests/fCmd.test: added knownBug test case for [Bug 1394972]
-
-	* tests/winFCmd.test:
-	* tests/tcltest.test: corrected tests to better account for behaviour
-	of writable/non-writable directories on Windows 2000/XP. This, with
-	the previous patches, closes [Bug 1193497]
-
-2006-03-17  Andreas Kupries <andreask@activestate.com>
-
-	* doc/chan.n: Updated with documentation for the commands 'chan
-	create' and 'chan postevent' (TIP #219).
-
-	* doc/refchan.n: New file. Documentation of the command handler API
-	for reflected channels (TIP #219).
-
-2006-03-17  Joe Mistachkin <joe@mistachkin.com>
-
-	* unix/tclUnixPort.h: Include pthread.h prior to pthread_np.h [Bug
-	1444692]
-
-	* win/tclWinTest.c: Corrected typo of 'initializeMutex' that prevented
-	successful compilation.
-
-2006-03-16  Andreas Kupries <andreask@activestate.com>
-
-	* doc/open.n: Documented the changed behaviour of 'a'ppend mode.
-
-	* tests/io.test (io-43.1 io-44.[1234]): Rewritten to be self-contained
-	with regard to setup and cleanup. [Bug 681793]
-
-	* generic/tclIOUtil.c (TclGetOpenMode): Added the flag O_APPEND to the
-	list of POSIX modes used when opening a file for 'a'ppend. This
-	enables the proper automatic seek-to-end-on-write by the OS. See [Bug
-	680143] for longer discussion.
-
-	* tests/ioCmd.test (iocmd-13.7.*): Extended the testsuite to check the
-	new handling of 'a'.
-
-2006-03-15  Andreas Kupries <andreask@activestate.com>
-
-	* tests/socket.test: Extended the timeout in socket-11.11 from 10 to
-	40 seconds to allow for really slow machines. Also extended
-	actual/expected results with value of variable 'done' to make it
-	clearer when a test fails due to a timeout. [Bug 792159]
-
-2006-03-15  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* win/fCmd.test: add proper test constraints so the new tests don't
-	run on Unix.
-
-2006-03-14  Andreas Kupries <andreask@activestate.com>
-
-	* generic/tclPipe.c (TclCreatePipeline): Modified the processing of
-	pipebars to fail if the last bar is followed only by redirections.
-	[Bug 768659]
-
-2006-03-14  Andreas Kupries <andreask@activestate.com>
-
-	* doc/fconfigure.n: Clarified that -translation is binary is reported
-	as lf when queried, because it is identical to lf, except for the
-	special additional behaviour when setting it. [Bug 666770]
-
-2006-03-14  Andreas Kupries <andreask@activestate.com>
-
-	* doc/clock.n: Removed double-quotes around section title NAME; not
-	needed.
-	* unix/installManpage: Reverted part to handle double-quotes in
-	section NAME, chokes older sed installations.
-
-2006-03-14  Andreas Kupries <andreask@activestate.com>
-
-	* library/tm.tcl (::tcl::tm::Defaults): Fixed handling of environment
-	variable TCLX.y_TM_PATH, bad variable reference. Thanks to Julian
-	Noble. [Bug 1448251]
-
-2006-03-14  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* win/tclWinFile.c: updated patch to deal with 'file writable' issues
-	on Windows XP/2000.
-	* generic/tclTest.c:
-	* unix/tclUnixTest.c:
-	* win/tclWinTest.c:
-	* tests/fCmd.test: updated test suite to deal with correct permissions
-	setting and differences between XP/2000 and 95/98 3 tests still fail;
-	to be dealt with shortly
-
-2006-03-13  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclEncoding.c: Report error when an escape encoding is
-	missing one of its sub-encodings. [Bug 506653]
-
-	* unix/configure.in:	Revert change from 2005-07-26 that sometimes
-	* unix/configure:	added $prefix/share to the tcl_pkgPath. See
-	[Patch 1231015]. autoconf-2.59.
-
-2006-03-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c (ObjInterpProcEx):
-	* tests/apply.test (apply-5.1): Fix [apply] error messages so that
-	they quote the lambda expression. [Bug 1447355]
-
-2006-03-10  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	-- Summary of changes fixing [Bug 1437595] --
-
-	* generic/tclEvent.c: Cosmetic touches and identation
-	* generic/tclInt.h: Added TclpFinalizeSockets() call.
-
-	* generic/tclIO.c: Calls TclpFinalizeSockets() as part of the
-	TclFinalizeIOSubsystem().
-
-	* unix/tclUnixSock.c: Added no-op TclpFinalizeSockets().
-
-	* win/tclWinPipe.c, win/tclWinSock.c: Finalization of sockets/pipes is
-	now solely done in TclpFinalizeSockets() and TclpFinalizePipes() and
-	not over the thread-exit handler, because the order of actions the Tcl
-	generic core will impose may result in cores/hangs if the thread exit
-	handler tears down corresponding subsystem(s) too early.
-
-2006-03-10  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* win/tclWinFile.c: previous patch breaks tests, so removed.
-
-2006-03-09  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* win/tclWinFile.c: fix to 'file writable' in certain XP directories.
-	Thanks to fvogel and jfg. [Patch 1344540] Modified patch to make use
-	of existing use of getSecurityProc.
-
-2006-03-08  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Complete missing bit of TIP 215 implementation
-	* tests/incr.test:
-
-2006-03-07  Joe English	 <jenglish@users.sourceforge.net>
-
-	* unix/tcl.m4: Set SHLIB_LD_FLAGS='${LIBS}' on NetBSD, as per the
-	other *BSD variants. [Bug 1334613]
-	* unix/configure: Regenerated.
-
-2006-03-07  Don Porter	<dgp@users.sourceforge.net>
-
-	* changes:	Update in prep. for 8.5a4 release.
-
-	* unix/Makefile.in:	Package http 2.5.2 requires Tcl 8.4, so the
-	* win/Makefile.in:	*.tm installation has to be placed in an "8.4"
-	directory, not an "8.2" directory.
-
-2006-03-06  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Revised handling of TCL_EVAL_* flags to
-	* tests/parse.test:	simplify TclEvalObjvInternal and to correct
-	the auto-loading of alias targets (parse-8.12). [Bug 1444291]
-
-2006-03-03  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c: Revised yesterday's fix for [Bug 1379287] to
-	work on Windows.
-
-	* generic/tclObj.c:	Compatibility support for existing code that
-	calls Tcl_GetObjType("boolean").
-
-2006-03-02  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c:		Fix for failed normalization of paths
-	* tests/fileSystem.test:	with /../ that lead back to the root
-	of the filesystem, like /foo/.. [Bug 1379287]
-
-2006-03-01  Reinhard Max  <max@suse.de>
-
-	* unix/installManPage: Fix the script for manpages that have quotes
-	around the .SH arguments, as doctools produces them. [Bug 1292145]
-	Some minor cleanups and improvements.
-
-2006-02-28  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Corrections to be sure that TCL_EVAL_GLOBAL
-	* tests/namespace.test: evaluations act the same as [uplevel #0]
-	* tests/parse.test:	evaluations, even when execution traces or
-	* tests/trace.test:	invocations of [::unknown] are present. [Bug
-	1439836]
-
-2006-02-22  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Corrected a few bugs in how [namespace
-	* tests/namespace.test: unknown] interacts with TCL_EVAL_* flags.
-	[Patch 958222]
-
-2006-02-17  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIORChan.c: Revised error message generation and handling
-	* tests/ioCmd.test:	of exceptional return codes in the channel
-	reflection layer. [Bug 1372348]
-
-2006-02-16  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIndexObj.c:	Disallow the "ambiguous" error message
-	* tests/indexObj.test:		when TCL_EXACT matching is requested.
-	* tests/ioCmd.test:
-
-2006-02-15  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclIO.c:	Made several routines tolerant of
-	* generic/tclIORChan.c: interp == NULL arguments. [Bug 1380662]
-	* generic/tclIOUtil.c:
-
-2006-02-09  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP#215 IMPLEMENTATION
-
-	* doc/incr.n:		Revised [incr] to auto-initialize when varName
-	* generic/tclExecute.c: argument is unset. [Patch 1413115]
-	* generic/tclVar.c:
-	* tests/compile.test:
-	* tests/incr-old.test:
-	* tests/incr.test:
-	* tests/set.test:
-
-	* tests/main.test (Tcl_Main-6.7):	Improved robustness of
-	command auto-completion test. [Bug 1422736]
-
-2006-02-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/Encoding.3, doc/encoding.n: Updates due to review at request of
-	Don Porter. Mostly minor changes.
-
-2006-02-08  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP#258 IMPLEMENTATION
-
-	* doc/Encoding.3:	New subcommand [encoding dirs].
-	* doc/encoding.n:	New routine Tcl_GetEncodingNameFromEnvironment
-	* generic/tcl.decls:	Made public:
-	* generic/tclBasic.c:	TclGetEncodingFromObj
-	* generic/tclCmdAH.c:		-> Tcl_GetEncodingFromObj
-	* generic/tclEncoding.c:TclGetEncodingSearchPath
-	* generic/tclInt.decls:		-> Tcl_GetEncodingSearchPath
-	* generic/tclInt.h:	TclSetEncodingSearchPath
-	* generic/tclTest.c:		-> Tcl_SetEncodingSearchPath
-	* library/init.tcl:	Removed commands:
-	* tests/cmdAH.test:		[tcl::unsupported::EncodingDirs]
-	* tests/encoding.test:		[testencoding path] (Tcltest)
-	* unix/tclUnixInit.c:	[Patch 1413934]
-	* win/tclWinInit.c:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-
-2006-02-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c: minor improvements to [apply]
-	* tests/apply.test: new tests; apply-5.1 currently fails to indicate
-	missing work in error reporting
-
-2006-02-01  Don Porter	<dgp@users.sourceforge.net>
-
-	TIP#194 IMPLEMENTATION
-
-	* doc/apply.n:	(New file)	New command [apply]. [Patch 944803]
-	* doc/uplevel.n:
-	* generic/tclBasic.c:
-	* generic/tclInt.h:
-	* generic/tclProc.c:
-	* tests/apply.test: (New file)
-	* tests/proc-old.test:
-	* tests/proc.test:
-
-	TIP#181 IMPLEMENTATION
-
-	* doc/Namespace.3:	New command [namespace unknown]. New public C
-	* doc/namespace.n:	routines Tcl_(Get|Set)NamespaceUnknownHandler.
-	* doc/unknown.n:	[Patch 958222]
-	* generic/tcl.decls:
-	* generic/tclBasic.c:
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* tests/namespace.test:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-	TIP#250 IMPLEMENTATION
-
-	* doc/namespace.n:	New command [namespace upvar]. [Patch 1275435]
-	* generic/tclInt.h:
-	* generic/tclNamesp.c:
-	* generic/tclVar.c:
-	* tests/namespace.test:
-	* tests/upvar.test:
-
-2006-01-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/dict.n: Fixed silly bug in example. Thanks to Heiner Marxen
-	<heiner.marxen@unsel.de> for catching this! [Bug 1415725]
-
-2006-01-26  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/tclUnixChan.c (TclpOpenFileChannel): Tidy up and comment the
-	mess to do with setting up serial channels. This (deliberately) breaks
-	a broken FreeBSD port, indicates what we're really doing, and reduces
-	the amount of conditional compilation sections for better maintenance.
-
-2006-01-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/tclUnixInit.c (TclpInitPlatform): Improved conditions on when
-	to update the FP rounding mode on FreeBSD, taken from FreeBSD port.
-
-2006-01-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/string.test (string-12.21): Added test for [Bug 1410553] based
-	on original bug report.
-
-2006-01-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclStringObj.c: fixed incorrect handling of internal rep in
-	Tcl_GetRange. Thanks to twylite and Peter Spjuth. [Bug 1410553]
-
-	* generic/tclProc.c: fixed args handling for precompiled bodies [Bug
-	1412695]; thanks to Uwe Traum.
-
-2006-01-16  Reinhard Max  <max@suse.de>
-
-	* generic/tclPipe.c (FileForRedirect): Prevent nameString from being
-	freed without having been initialized.
-	* tests/exec.test: Added a test for the above.
-
-2006-01-12  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	* generic/tclPathObj.c (Tcl_FSGetInternalRep): backported patch from
-	core-8-4-branch. A freed pointer has been overwritten causing all
-	sorts of coredumps.
-
-2006-01-12  Vince Darley  <vincentdarley@sourceforge.net>
-
-	* win/tclWinFile.c: fix to sharing violation [Bug 1366227]
-
-2006-01-11  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Moved Tcl_LogCommandInfo from tclBasic.c to
-	* generic/tclNamesp.c:	tclNamesp.c to get access to identifier with
-	* tests/error.test (error-7.0): file scope. Added check for traces on
-	::errorInfo, and when present fall back to contruction of the stack
-	trace in the variable so that write trace notification timings are
-	compatible with earlier Tcl releases. This reduces, but does not
-	completely eliminate the ***POTENTIAL INCOMPATIBILITY*** created by
-	the 2004-10-15 commit. [Bug 1397843]
-
-2006-01-10  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/configure:    add caching, use AC_CACHE_CHECK instead of
-	* unix/configure.in: AC_CACHE_VAL where possible, consistent message
-	* unix/tcl.m4:	     quoting, sync relevant tclconfig/tcl.m4 changes
-	and gratuitous formatting differences, fix SC_CONFIG_MANPAGES with
-	default argument, Darwin improvements to SC_LOAD_*CONFIG.
-
-2006-01-09  Don Porter	<dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c (NamespaceInscopeCmd):	[namespace inscope]
-	* tests/namespace.test: commands were not reported by [info level].
-	[Bug 1400572]
-
-2006-01-09  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* generic/tclTrace.c: Stop exporting the guts of the trace command;
-	nothing outside this file needs to see it. [Bug 971336]
-
-2006-01-05  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
-
-	* unix/tcl.m4 (TCL_CONFIG_SYSTEM): Factor out the code to determine
-	the operating system version number, as it was replicated in several
-	places.
-
-2006-01-04  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/tclAppInit.c: WIN32 native console signal handler removed. This
-	was found to be interfering with TWAPI extension one. IMO, special
-	services such as signal handlers should best be done with extensions
-	to the core after discussions on c.l.t. about Roy Terry's tclsh
-	children of a real windows service shell.
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2005 IN "ChangeLog.2005"	       ***
-	*** CHANGELOG ENTRIES FOR 2004 IN "ChangeLog.2004"	       ***
-	*** CHANGELOG ENTRIES FOR 2003 IN "ChangeLog.2003"	       ***
-	*** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"	       ***
-	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"	       ***
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"	       ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/ChangeLog.2008 b/ChangeLog.2008
deleted file mode 100644
index 7df6cbc..0000000
--- a/ChangeLog.2008
+++ /dev/null
@@ -1,3796 +0,0 @@
-2008-12-31  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Set TCLLIBPATH in SHELL_ENV so that targets
-	like `make shell` have access to builds of bundled packages.
-
-2008-12-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (Tcl_ZlibStreamPut): Plug a memory leak.
-
-2008-12-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ZlibStreamCmd): Fix compilation consistency. [Bug
-	* generic/tcl.decls:		     2470237]
-
-	* generic/tclZlib.c (Tcl_ZlibStreamGet): Corrected the semantics of
-	this function to be useful to the PNG implementation. If the argument
-	object is empty, this gives the previous semantics.
-	(Tcl_ZlibStreamChecksum): Corrected name to be less misleading; it
-	only produced Adler-32 checksums when the stream was processing the
-	right type of compressed data format.
-	(Tcl_ZlibAdler32, Tcl_ZlibCRC32): Corrected types so that they work
-	naturally with the results of Tcl_GetByteArrayFromObj().
-	*** POTENTIAL INCOMPATIBILITY *** for all above changes, but very
-	unlikely to be difficult for anyone to deal with.
-
-2008-12-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tcl.decls: Tidy up the commenting style, adding markers for
-	each of the big release points under TCT stewardship and noting the
-	general purpose of each TIP that added C API. Overall effect is to
-	make this file much more informative to read without having to spend
-	effort correlating with TIPs and ChangeLogs.
-
-2008-12-23  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in:	Fix build of zlib objects with msvc
-	* win/tcl.m4:
-	* win/configure:	autoconf-2.59
-
-2008-12-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* win/Makefile.in: Handle file extensions correctly. [Bug 2459725]
-
-2008-12-22  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	*** 8.6b1 TAGGED FOR RELEASE ***
-
-	* win/makefile.vc: Ensure pkgs directories are suitable and quote the
-			   paths. [Bug 2458395]
-
-2008-12-22  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tools/man2help2.tcl: Added support for "\(mi" nroff macro. [Bug
-	2330040]
-
-2008-12-22  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc: Support the pkgs tree in the NMAKE builds.
-
-2008-12-21  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in:	Fix broken build of bundled packages when path
-				to build dir contains spaces by switching to
-				relative paths to toplevel build dir.
-
-	* unix/configure.in:	Preserve configure environment variables for
-				sub-configures of bundled packages; reuse
-				configure cache file for sub-configures.
-
-	* unix/configure:	autoconf-2.59
-
-2008-12-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/TclZlib.3: Fix minor typo. [Bug 2455165]
-
-2008-12-20  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/Makefile.in:	Renamed the static library libtcl86s.a to
-	* win/configure.in:	have a name distinct from the import library
-				libtcl86.a. This renaming dodges an ancient
-				bug in the Makefile revealed by the last
-				commit where the $(TCL_LIB_FILE) rule can
-				fire to try to build the static library in a
-				--enable-shared build (and create a static
-				library that subsequently fails to link).
-				Revised the zlib objects so that they are
-				built directly into the build dir, without
-				building an intermediate static library.
-				*** POTENTIAL INCOMPATIBILITY *** for
-				embedders who link to the static library, but
-				I couldn't figure out how to sort this out
-				any other way.
-	* win/configure:	Autoconf 2.59
-
-2008-12-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* win/Makefile.in: Minor updates to make building work better with
-	msys on Windows. (Apparently the gcc used doesn't like a / at the end
-	of a -I argument...)
-
-2008-12-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6b1 release.
-
-2008-12-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in:	Make package install directory of bundled
-	* unix/configure.in:	packages configurable via PACKAGE_DIR makefile
-				variable (set to platform-specific default).
-
-	* unix/Makefile.in (*-packages): Ensure toplevel targets fail if
-				sub-make/configure fails; fix quoting when
-				builddir path contains spaces.
-
-	* macosx/GNUmakefile:	Add install-packages to install targets.
-
-	* unix/configure:	autoconf-2.59
-
-2008-12-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/NRE.3:		Formatting errors found by `make html`
-	* doc/Tcl_Main.3:
-	* doc/zlib.n:
-
-	* tests/chanio.test:	Add missing [removeFile] cleanups.
-	* tests/io.test:	Add missing [close $f] to io-73.2.
-
-	* unix/Makefile.in:	Update `make dist' target to include the files
-	from the compat/zlib directory as well as all the bundled packages
-	found under the pkgs directory, according to their individual `make
-	dist' targets. Change includes breaking a `configure-packages' target
-	out of the `packages` target.
-
-	* README:		Bump version number to 8.6b1
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2008-12-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls: CONSTify TclGetLoadedPackages second param
-	* generic/tclLoad.c
-	* generic/tclIntDecls.h (regenerated)
-
-2008-12-19  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclExecute.c:	Fix compile warnings when --enable-symbols=all
-
-	* win/configure.in:
-	* win/Makefile.in: Added build of packages in the 'pkgs/' directory.
-	* win/configure: Autoconf 2.59
-
-2008-12-19  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc: Added build of compat/zlib
-
-2008-12-18  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (Tcl_CloseEx, CloseWrite, CloseChannelPart)
-	(ChanCloseHalf): Rewrite the half-close to properly flush the channel,
-	like is done for a full close, going through FlushChannel, and using
-	the flag BG_FLUSH_SCHEDULED (async flush during close). New functions
-	CloseWrite, CloseChannelPart, new flag CHANNEL_CLOSEDWRITE.
-
-	* tests/chanio.test (chanio-28.[67]): Reactivated these tests.
-	Replaced tclsh -> [interpreter] to get correct executable for the pipe
-	process, and added after cancel to kill the fail timers when we are
-	done. Removed the explicits calls to [flush], now that [close] handles
-	this correctly.
-
-2008-12-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/chanio.test:	Replaced [chan event] handlers that returned
-	TCL_RETURN return code, with more conventional ones that return TCL_OK
-	to suppress otherwise strange writes of outdated $::errorInfo values
-	to stderr. [Bug 2444274]
-
-	* generic/tclExecute.c:	Disabled apparently faulty assertion. [Bug
-	2415422]
-
-2008-12-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/configure.in, unix/Makefile.in: Autoconf wizardry.
-	* compat/zlib/*: Import of zlib 1.2.3. The license is directly
-	compatible with Tcl's. This import omits the obsolete and contributed
-	parts (i.e. selected directories) and the supplied examples.
-
-	* generic/tclZlib.c:	First implementation of the compressing and
-	* doc/zlib.n:		decompressing channel transformations.
-	* tests/zlib.test (zlib-8.*):
-
-2008-12-18  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.decls:	VOID -> void
-	* generic/tclInt.decls:
-	* compat/dlfcn.h:
-	* generic/tclDecls.h:	(regenerated)
-	* generic/tclIntDecls.h:
-
-2008-12-18  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	TIP #332 IMPLEMENTATION - Half-Close for Bidirectional Channels
-
-	* doc/close.n, generic/tclIO.c, generic/tclIOCmd.c:
-	* unix/tclUnixChan.c, unix/tclUnixPipe.c, win/tclWinSock.c:
-	* generic/tcl.decls, generic/tclDecls.h, generic/tclStubInit.c:
-	* tests/chan.test, tests/chanio.test, tests/ioCmd.test:
-
-2008-12-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/SetChanErr.3: General improvements in nroff rendering and some
-	corrections to language issues.
-
-2008-12-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclResult.c:	   Move variable "length" inside if()
-	* generic/tclStringObj.c:  Don't use ckfree((void *)...) but
-	* generic/tclVar.c:	   ckfree((char *)...)
-	* generic/tclZlib.c
-	* generic/tclBasic.c
-
-2008-12-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/namespace.test (namespace-28.1):	Make tests not
-	* tests/namespace-old.test (namespace-old-9.5): dependent on the
-	global namespace's particular imports. [Bug 2433936]
-
-2008-12-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* unix/Makefile.in:	Modify the distclean-packages target so that
-	empty build directories are deleted.
-
-	* unix/Makefile.in:	Add build support for collections of TEA
-	* unix/configure.in:	packages found under the pkgs directory.
-	[Patch 1163406]. Still needs porting to Windows.
-
-	* unix/configure:	autoconf-2.59
-
-2008-12-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tcl.h, generic/tclZlib.c: Removed undocumented flag.
-
-2008-12-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclThreadTest.c: Eliminate -Wwrite-strings warnings in
-				   --enable-threads build.
-	* generic/tclExecute.c:	   Use TclNewLiteralStringObj()
-	* unix/tclUnixFCmd.c:	   Use TclNewLiteralStringObj()
-	* win/tclWinFCmd.c:	   Use TclNewLiteralStringObj()
-
-2008-12-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #329 IMPLEMENTATION
-
-	* tests/error.test: Tests for the new commands.
-	* doc/throw.n, doc/try.n: Documentation of the new commands.
-	* library/init.tcl (throw, try): Implementation of commands documented
-	in TIP. This implementation is in Tcl and is a stop-gap until
-	higher-performance ones can be written.
-
-2008-12-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Add TIP 338 routines to stub table.
-	* generic/tcl.decls:	[Bug 2431338]
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2008-12-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclExecute.c (TEBC:INST_DICT_GET): Make sure that the result
-	is empty when generating an error message. [Bug 2431847]
-
-2008-12-15  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclBinary.c:	Redefine non-strict decoding to ignore only
-	* doc/binary.n:		whitespace. [Bug 2380293]
-	* tests/binary.test:
-
-2008-12-15  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/AddErrInfo.3:	Documented Tcl_(Set|Get)ErrorLine (TIP 336).
-	* doc/CrtCommand.3:	Various other documentation updates to
-	* doc/CrtInterp.3:	reflect the lack of access to Tcl_Interp
-	* doc/Interp.3:		fields by default.
-	* doc/SetResult.3:
-	* doc/tcl.decls:
-
-	TIP #338 IMPLEMENTATION
-
-	* doc/AppInit.c:	Made routines Tcl_SetStartupScript and
-	* doc/Tcl_Main.3:	Tcl_GetStartupScript public. Removed all
-	* generic/tcl.h:	internal stub access to Tcl*Startup* routines,
-	* generic/tclInt.decls:	and removed their implementations. Their
-	* generic/tclMain.c:	function can now be completely performed with
-				the new public interface.
-	*** POTENTIAL INCOMPATIBILITY for callers of the internal
-	    Tcl*Startup* routines. ***
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-	* generic/tclDecls.h:
-
-2008-12-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/zlib.test: Added constraint so that tests don't fail where
-	they cannot work due to zlib support being missing.
-
-	* unix/configure.in, win/configure.in: Improve the autodetection code.
-	* win/tcl.m4 (SC_CONFIG_CFLAGS): Remove the assumption of the presence
-	of zlib library on Windows.
-	* win/makefile.vc, win/makefile.bc: Add support for building tclZlib.o
-	but only in stubbed-out mode for now.
-
-2008-12-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/TclZlib.3: Basic documentation of the C-level API.
-	* doc/zlib.n: Substantially improve documentation of Tcl-level API.
-	* generic/tclZlib.c (ZlibCmd): Flesh out the argument parsing for the
-	command to integrate with channels.
-
-2008-12-12  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclZlib.c (Tcl_ZlibInflate): Change PATH_MAX to MAXPATHLEN,
-	since MSVC doesn't have PATH_MAX.
-
-	* doc/clock.n:	Document new DST fallback rules.
-	* library/clock.tcl (ProcessPosixTimeZone): Fix time change in Eastern
-	Europe (not 3:00 but 4:00 local time). [Bug 2207436]
-
-2008-12-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c, unix/configure.in: Added stubs to use when the
-	version of zlib is not capable enough, and automagic to detect when
-	that is the case. [Bug 2421265]
-
-2008-12-12  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* unix/tclUnixNotfy.c: Fix missing CLOEXEC on internal pipes [2417695]
-	* unix/tclUnixPipe.c:  Fix missing CLOEXEC on [chan pipe] fds.
-
-2008-12-12  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (Tcl_ZlibDeflate): Add a bit of extra space for
-	the gzip header. [Bug 2419061]
-	(Tcl_ZlibInflate): Ensure that gzip header extraction is done
-	correctly.
-
-2008-12-12  Kevin Kenny  <kennykb@acm.org>
-
-	TIP #322 IMPLEMENTATION
-
-	* doc/NRE.3 (new file): Added documentation of the published API for
-	Non-Recursive Evaluation (NRE).
-
-2008-12-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclZlib.c: Eliminate warning: different 'const' qualifiers
-	with msvc compiler. A few more 'const' optimizations.
-	* win/tcl.m4: Fix Windows build (msvc) for TIP #234 implementation
-	* win/Makefile.in:
-	* win/configure:
-
-2008-12-11  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (SetChannelFromAny and related): Modified the
-	* tests/io.test: internal representation of the tclChannelType to
-	contain not only the ChannelState pointer, but also a reference to
-	the interpreter it was made in. Invalidate and recompute the
-	internal representation when it is used in a different interpreter,
-	like cmdName intrep's. Added testcase. [Bug 2407783]
-
-2008-12-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclZlib.c (ConvertError): Factor out code to turn zlib
-	errors into Tcl errors.
-
-	* doc/zlib.n: Added a start at the documentation. Still very rough.
-
-2008-12-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/Makefile.in: Fix Windows build (mingw) for TIP #234
-	implementation (additionally, first make sure that zlib is available,
-	and rename the standard zdll.lib to libz.a, but at least this works so
-	far).
-
-2008-12-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/zlib.test: Start of test suite for zlib command.
-
-2008-12-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* library/clock.tcl (ProcessPosixTimeZone): Fallback to European time
-	zone DST rules, when the timezone is between 0 and -12. [Bug 2207436]
-	* tests/clock.test (clock-52.[23]): Test cases for [Bug 2207436]
-
-2008-12-11  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #234 IMPLEMENTATION
-
-	* generic/tclZlib.c: A very preliminary hack at an interface to the
-	zlib library, based on code from Pascal Scheffers.
-	WARNING! The C API may be subect to change without much warning! USE
-	AT YOUR OWN RISK!
-
-2008-12-10  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/*: Update from Olson's tzdata2008i.
-
-2008-12-10  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	TIP #343 IMPLEMENTATION - A Binary Specifier for [format/scan]
-
-	* doc/format.n
-	* doc/scan.n
-	* generic/tclInt.h
-	* generic/tclScan.c
-	* generic/tclStrToD.c
-	* generic/tclStringObj.c
-	* tests/format.test
-	* tests/scan.test
-
-2008-12-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #341 IMPLEMENTATION
-
-	* generic/tclDictObj.c (DictFilterCmd): Made key and value filtering
-	* tests/dict.test, doc/dict.n:		accept arbitrary numbers of
-						glob arguments.
-
-2008-12-09  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls: Restore source and binary compatibility for
-				TIP #337 implementation. (When it is _that_
-				simple, there is no excuse not to do it! :-))
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2008-12-09  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #337 IMPLEMENTATION
-
-	* doc/BackgdErr.3:	Converted internal routine
-	* doc/interp.n:		TclBackgroundException() into public routine
-	* generic/tcl.decls:	Tcl_BackgroundException().
-	* generic/tclEvent.c:
-	* generic/tclInt.decls:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-
-	* generic/tclIO.c:	Update callers.
-	* generic/tclIOCmd.c:
-	* generic/tclInterp.c:
-	* generic/tclTimer.c:
-	*** POTENTIAL INCOMPATIBILITY only for extensions using the converted
-	    internal routine ***
-
-2008-12-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIO.c (ChanClose,ChanRead,...): Factored out some of the
-	code to connect to channel drivers that was common in multiple
-	locations so as to make code more readable.
-
-2008-12-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdAH.c (FileTempfileCmd): Force temporary files to be
-	created in the native filesystem. Attempting to provide a template
-	that puts it elsewhere will result in the directory part of the
-	template being ignored. Partial address of [Bug 2388866] concerns.
-
-2008-12-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #335 IMPLEMENTATION
-
-	* generic/tclBasic.c (Tcl_InterpActive): Added function for working
-	* doc/CrtInterp.3:			 out if an interp is in use.
-
-	TIP #307 IMPLEMENTATION
-
-	* generic/tclResult.c (Tcl_TransferResult): Renamed function from
-	* generic/tcl.decls:			    TclTransferResult. Added
-	* doc/SetResult.3:			    to public stubs table.
-
-2008-12-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c (Tcl_FSGetNormalizedPath):	Added another
-	flag value TCLPATH_NEEDNORM to mark those intreps which need more
-	complete normalization attention for correct results. [Bug 2385549]
-
-2008-12-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	* win/tclWinPipe.c (TclpOpenTemporaryFile): Avoid an infinite loop due
-	to GetTempFileName/CreateFile interaction. [Bug 2380318]
-
-2008-12-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFileName.c (DoGlob):    One of the Tcl_FSMatchInDirectory
-	calls did not have its return code checked. This caused error messages
-	returned by some Tcl_Filesystem drivers to be swallowed.
-
-2008-12-02  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #336 IMPLEMENTATION
-
-	* generic/tcl.decls:	New routines Tcl_(Get|Set)ErrorLine.
-	* generic/tcl.h:	Dropped default access to interp->errorLine.
-	* generic/tclCmdAH.c:	Restore it with -DUSE_INTERP_ERRORLINE.
-	* generic/tclCmdMZ.c:	Updated callers.
-	* generic/tclDictObj.c:
-	* generic/tclIOUtil.c:
-	* generic/tclNamesp.c:
-	* generic/tclOOBasic.c:
-	* generic/tclOODefinedCmds.c:
-	* generic/tclOOMethod.c:
-	* generic/tclProc.c:
-	* generic/tclResult.c:
-	*** POTENTIAL INCOMPATIBILITY for C code directly using the
-	    interp->errorLine field ***
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2008-12-02  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (TclFinalizeIOSubsystem): Replaced Alexandre
-	Ferrieux's first patch for [Bug 2270477] with a gentler version, also
-	supplied by him.
-
-2008-12-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclParse.c:  Coding standards fixups.
-
-2008-12-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/cmdAH.test (cmdAH-32.6): Test was not portable; depended on a
-	C API function not universally available. [Bug 2371623]
-
-2008-11-30  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/clock.tcl (format, ParseClockScanFormat): Added a [string
-	map] to get rid of namespace delimiters before caching a scan or
-	format procedure. [Bug 2362156]
-	* tests/clock.test (clock-64.[12]): Added test cases for the bug that
-	was tickled by a namespace delimiter inside a format string.
-
-2008-11-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #210 IMPLEMENTATION
-
-	* generic/tclCmdAH.c (FileTempfileCmd):
-	* unix/tclUnixFCmd.c (TclpOpenTemporaryFile, DefaultTempDir):
-	* win/tclWinPipe.c (TclpOpenTemporaryFile):
-	* doc/file.n, tests/cmdAH.test: Implementation of [file tempfile]. I
-	do not claim that this is a brilliant implementation, especially on
-	Windows, but it covers the main points.
-
-	* generic/tclThreadStorage.c: General revisions to make code clearer
-	and more like the style used in the rest of the core. Includes adding
-	more comments and explanation of what is going on. Reduce the amount
-	of locking required.
-
-2008-11-27  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tcl.h:	Alternate fix for [Bug 2251175]: missing
-	* generic/tclCompile.c:	backslash substitution on expanded literals.
-	* generic/tclParse.c:
-	* generic/tclTest.c:
-	* tests/parse.test:
-
-2008-11-26  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIndexObj.c:   Eliminate warning: unused variable
-	* generic/tclTest.c:	   A few more (harmless) Tcl_SetResult
-				   eliminations.
-
-2008-11-26  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tclIndex: Removed reference to no-longer-extant procedure
-			    'tclLdAout'.
-	* doc/library.n: Corrected mention of 'auto_exec' to 'auto_execok'.
-	[Patch 2114900] thanks to Stuart Cassoff <stwo@users.sf.net>
-
-2008-11-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclIndexObj.c: Eliminate 3 calls to Tcl_SetResult, as
-	* generic/tclIO.c:	 examples how it should have been done.
-	* generic/tclTestObj.c:	 purpose: contribute in the TIP #340
-				 discussion.
-
-2008-11-25  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (TclFinalizeIOSubsystem): Applied Alexandre
-	Ferrieux's patch for [Bug 2270477] to prevent infinite looping during
-	finalization of channels not bound to interpreters.
-
-2008-11-25  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclTest.c: Don't assume that Tcl_SetResult sets
-	interp->result, especially not in a DString test, in preparation for
-	TIP #340
-
-2008-11-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tools/tcltk-man2html.tcl: Improvements to tackle tricky aspects of
-	cross references and new entities to map. [Bug 2330040]
-
-2008-11-19  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclThreadTest.c: Convert Tcl_SetResult(......, TCL_DYNAMIC)
-	to Tcl_SetResult(......, TCL_VOLATILE), in preparation for TIP #340
-
-2008-11-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.decls:	Fix signature and implementation of
-	* generic/tclDecls.h:	Tcl_HashStats, such that it conforms to the
-	* generic/tclHash.c:	documentation. [Bug 2308236]
-	* generic/tclVar.c:
-	* doc/Hash.3:
-	* generic/tclDictObj.c: Convert Tcl_SetResult call to
-	Tcl_SetObjResult.
-
-2008-11-17  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tests/for.test: Check for uncompiled-for-continue [Bug 2186888]
-	fixed earlier.
-
-	* generic/tcl.h:	 Fix [Bug 2251175]: missing backslash
-	* generic/tclCompCmds.c: substitution on expanded literals.
-	* generic/tclCompile.c
-	* generic/tclParse.c
-	* generic/tclTest.c
-	* tests/compile.test
-	* tests/parse.test
-
-2008-11-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclTest.c: Replace two times Tcl_SetResult with
-	Tcl_SetObjResult, a little simplification in preparation for the TIP
-	#340 patch.
-
-2008-11-13  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h:	Rename static function FSUnloadTempFile to
-	* generic/tclIOUtil.c:	TclFSUnloadTempFile, needed in tclLoad.c
-
-	* generic/tclLoad.c:	Fixed [Bug 2269431]: Load of shared
-				objects leaves temporary files on windows.
-
-2008-11-12  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/registry.test: Use HKCU to avoid requiring admin access for
-	registry testing on Vista/Server2008
-
-2008-11-11  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclNamesp.c:	Eliminate warning: passing arg 4 of
-				Tcl_SplitList from incompatible pointer type.
-	* win/tcl.m4:	Reverted change from 2008-11-06 (was under the
-			impression that "-Wno-implicit-int" added an extra
-			warning)
-	* win/configure: (regenerated)
-	* unix/tcl.m4:	Use -O2 as gcc optimization compiler flag, and get rid
-			of -Wno-implicit-int for UNIX.
-	* unix/configure: (regenerated)
-
-2008-11-10  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/platform_shell.n: Fixed [Bug 2255235], reported by Ulrich
-	* library/platform/pkgIndex.tcl: Ring <uring@users.sourceforge.net>.
-	* library/platform/shell.tcl: Updated the LOCATE command in the
-	* library/tm.tcl:   package 'platform::shell' to handle the new form
-	* unix/Makefile.in: of 'provide' commands generated by tm.tcl. Bumped
-	* win/Makefile.in:  package to version 1.1.4. Added cross-references
-	to the relevant parts of the code to avoid future desynchronization.
-
-2008-11-07  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tclInt.h:    Applied [Patch 2215022] from Duoas to clean up
-	* generic/tclBinary.c: the binary ensemble initiailization code.
-	* generic/tclNamesp.c: Extends the TclMakeEnsemble to do
-	* doc/ByteArrObj.3:    sub-ensembles from tables.
-
-2008-11-06  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* win/tcl.m4:	    Add "-Wno-implicit-int" flag for gcc, as on UNIX
-	* win/configure:    (regenerated)
-	* generic/tclIO.c:  Eliminate an 'array index out of bounds' warning
-			    on HP-UX.
-
-2008-11-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclPort.h: Remove the ../win/ header dir as the build system
-	already has it, and it confuses builds when used with private headers
-	installed.
-
-2008-11-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.h (TCLOO_VERSION): Bump version of TclOO.
-
-2008-10-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOBasic.c (TclOONRUpcatch): Reworked the code that does
-	* generic/tclOO.c (InitFoundation):	 class constructor handling so
-	that it is more robust and runs the constructor call in the context of
-	the caller of the class's constructor method. Needed because the
-	previously used code did not work at all after applying the fix below;
-	no Tcl existing command could reliably do what was needed any more.
-
-	* generic/tclOODefineCmds.c (GetClassInOuterContext): Rework and
-	factor out the code to resolve class names in definitions so that
-	classes are resolved from the perspective of the caller of the
-	[oo::define] command, rather than from the oo::define namespace! This
-	makes much code simpler by reducing how often fully-qualified names
-	are required (previously always in practice, so no back-compat issues
-	exist). [Bug 2200824]
-
-2008-10-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCompile.h: CONSTify TclDTraceInfo
-	* generic/tclBasic.c:
-	* generic/tclProc.c:
-	* generic/tclEnv.c:	Eliminate some -Wwrite-strings warnings
-	* generic/tclLink.c:
-
-2008-10-27  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclEncoding.c:	Use "iso8859-1" and not "identity" as
-	the default and original [encoding system] value. Since "iso8859-1" is
-	built in to the C source code for Tcl now, there's no availability
-	issue, and it has the good feature of "identity" that we must have
-	("bytes in" == "bytes out") without the bad feature of "identity"
-	("broken as designed") that makes us want to abandon it. [RFE 2008609]
-	*** POTENTIAL INCOMPATIBILITY for older releases of Tclkit and any
-	other code expecting a particular value for Tcl's default system
-	encoding ***
-
-2008-10-24  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/http.tcl: Fixed a failure to read SHOUTcast streams
-	with the new 2.7 package. Introduced a new intial state as the first
-	response may not be HTTP*.
-
-2008-10-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdAH.c (ForNextCallback): handle TCL_CONTINUE in the for
-	body. [Bug 2186888]
-
-2008-10-22  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tcl.h:	      CONST -> const and white-spacing
-	* generic/tclCompile.h:
-	* generic/tclEncoding.c:
-	* generic/tclStubInit.c:
-	* generic/tclStubLib.c:
-	* generic/tcl.decls
-	* generic/tclInt.decls
-	* generic/tclTomMath.decls
-	* generic/tclDecls.h:	      (regenerated)
-	* generic/tclIntDecls.h:      (regenerated)
-	* generic/tclIntPlatDecls.h:  (regenerated)
-	* generic/tclOODecls.h:	      (regenerated)
-	* generic/tclOOIntDecls.h:    (regenerated)
-	* generic/tclPlatDecls.h:     (regenerated)
-	* generic/tclTomMathDecls.h:  (regenerated)
-	* generic/tclIntDecls.h:      (regenerated)
-	* tools/genStubs.tcl:	      CONST -> const and white-spacing
-
-2008-10-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclProc.c:	Reset -level and -code values to defaults
-	after they are used. [Bug 2152286]
-
-2008-10-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (TclInfoCoroutineCmd): Added code to make this
-	check for being invoked in a syntactically correct way.
-
-	* doc/info.n: Added documentation of [info coroutine].
-
-	* doc/prefix.n: Improved the documentation by fixing formatting,
-	adding good-practice recommendations and cross-references, etc.
-
-2008-10-17  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclOO.decls:		CONST -> const.
-	* generic/tclOODecls.h:		(regenerated)
-	* generic/tclOOIntDecls.h:	(regenerated)
-
-2008-10-17  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORTrans.c (DeleteReflectedTransformMap): Removed debug
-	output in C++ comment.
-
-2008-10-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompile.h:	Declare the internal tclInstructionTable to
-	* generic/tclExecute.c:	simply be "const", not CONST86.
-
-	* generic/tclCmdAH.c:	whitespace.
-	* generic/tclCmdIL.c:	Uninitialized variable warning.
-	* generic/tclTest.c:	const correctness warning.
-
-2008-10-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/*: Many very small formatting fixes.
-	* doc/{glob,http,if}.n: More substantial reformatting for clarity.
-	* doc/split.n: Remove mention of defunct c.l.t.announce
-
-2008-10-16  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/regc_locale.c: Add "const" to many internal const tables.
-	* generic/tclClock.c:	 No functional or API change.
-	* generic/tclCmdIL.c
-	* generic/tclConfig.c
-	* generic/tclDate.c
-	* generic/tclEncoding.c
-	* generic/tclEvent.c
-	* generic/tclExecute.c
-	* generic/tclFileName.c
-	* generic/tclGetDate.y
-	* generic/tclInterp.c
-	* generic/tclIO.c
-	* generic/tclIOCmd.c
-	* generic/tclIORChan.c
-	* generic/tclIORTrans.c
-	* generic/tclLoad.c
-	* generic/tclObj.c
-	* generic/tclOOBasic.c
-	* generic/tclOOCall.c
-	* generic/tclOOInfo.c
-	* generic/tclPathObj.c
-	* generic/tclPkg.c
-	* generic/tclResult.c
-	* generic/tclStringObj.c
-	* generic/tclTest.c
-	* generic/tclTestObj.c
-	* generic/tclThreadTest.c
-	* generic/tclTimer.c
-	* generic/tclTrace.c
-	* macosx/tclMacOSXFCmd.c
-	* win/cat.c
-	* win/tclWinInit.c
-	* win/tclWinTest.c
-
-2008-10-16  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/init.tcl:	Revised [unknown] so that it carefully
-	preserves the state of the ::errorInfo and ::errorCode variables at
-	the start of auto-loading and restores that state before the
-	autoloaded command is evaluated. [Bug 2140628]
-
-2008-10-15  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.h:	Add "const" to many internal const tables, so
-	* generic/tclBinary.c:	those will be put by the C-compiler in the
-	* generic/tclCompile.c:	TEXT segment in stead of the DATA segment.
-	* generic/tclDictObj.c: This makes those tables sharable in shared
-	* generic/tclHash.c:	libraries.
-	* generic/tclListObj.c:
-	* generic/tclNamesp.c:
-	* generic/tclObj.c:
-	* generic/tclProc.c:
-	* generic/tclRegexp.c:
-	* generic/tclStringObj.c:
-	* generic/tclUtil.c:
-	* generic/tclVar.c:
-
-2008-10-14  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclCmdAH.c:	Fix minor compiler warnings when compiling
-	* generic/tclCmdMZ.c:	with -Wwrite-strings.
-	* generic/tclIndexObj.c:
-	* generic/tclProc.c:
-	* generic/tclStubLib.c:
-	* generic/tclUtil.c:
-	* win/tclWinChan.c:
-	* win/tclWinDde.c:
-	* win/tclWinInit.c:
-	* win/tclWinReg.c:
-	* win/tclWinSerial.c:
-
-2008-10-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/binary.n: Formatting fix.
-
-2008-10-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* README:		Bump version number to 8.6a4
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-	* generic/tclExecute.c:	Fix compile warnings when --enable-symbols=all
-
-	* generic/tclCmdIL.c:	Fix write to unallocated memory whenever
-	[lrepeat] returns an empty list.
-
-2008-10-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/chan.n, doc/fconfigure.n: Added even more emphatic text to
-	direct people to the correct manual pages for specific channel types,
-	suitable for the hard-of-reading. Following discussion on tcl-core.
-
-2008-10-13  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/tclWinThrd.c (TclpThreadCreate): We need to initialize the
-	thread id variable to 0 as on 64 bit windows this is a pointer sized
-	field while windows only fills it with a 32 bit value. The result is
-	an inability to join the threads as the ids cannot be matched.
-
-	* generic/tclTest.c (TestNRELevels): Set array to the right size.
-
-2008-10-13  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOInfo.c (InfoClassDestrCmd): Handle error case.
-
-	* generic/tclOOInt.h: Added macro magic to make things work with
-	Objective C. [Bug 2163447]
-
-2008-10-12  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c: Fix bug in srcDelta encoding within ByteCodes.
-	The bug can only be triggered under conditions that cannot happen in
-	Tcl, but were met during development of L. Thanks go to Robert Netzer
-	for diagnosis and fix.
-
-2008-10-10  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.6a3 TAGGED FOR RELEASE ***
-
-	* changes:	Updates for 8.6a3 release.
-
-2008-10-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOODefineCmds.c (TclOODefineUnexportObjCmd)
-	(TclOODefineExportObjCmd): Corrected export/unexport record synthesis.
-	[Bug 2155658]
-
-2008-10-08  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* unix/tclUnixChan.c:	Fix minor compiler warning.
-	* unix/tcl.m4:		Fix for [Bug 2073255]
-	* unix/configure:	Regenerated
-
-2008-10-08  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic (TclInfoCoroutineCmd):
-	* tests/unsupported.test: Arrange for [info coroutine] to return {}
-	when a coroutine is running but the resume command has been deleted.
-	[Bug 2153080]
-
-2008-10-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclTrace.c:	Corrected handling of errors returned by
-	variable traces so that the errorInfo value contains the original
-	error message. [Bug 2151707]
-
-	* generic/tclVar.c:	Revised implementation of TclObjVarErrMsg so
-	that error message construction does not disturb an existing
-	iPtr->errorInfo that may be in progress.
-
-2008-10-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/binary.n: Added better documentation of the [binary encode] and
-	[binary decode] subcommands.
-
-2008-10-07  Miguel Sofer  <msofer@users.sf.net>
-
-	TIP #327,#328 IMPLEMENTATIONS
-
-	* generic/tclBasic.c:	   Move [tailcall], [coroutine] and
-	* generic/tclCmdIL.c:	   [yield] out of ::tcl::unsupported
-	* tclInt.h:
-	* tests/info.test:	   and into global scope: TIPs #327
-	* tests/unsupported.test:  and #328
-
-2008-10-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/chan.n, doc/transchan.n: Documented the channel transformation
-	API of TIP #230.
-
-2008-10-06  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* tests/winFCmd.test: Fixed some erroneous tests on Vista+.
-	* generic/tclFCmd.c: Fix constness for msvc of last commit
-
-2008-10-06  Joe Mistachkin  <joe@mistachkin.com>
-
-	* tools/man2tcl.c: Added missing line from patch by Harald Oehlmann.
-	[Bug 1934200]
-
-2008-10-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/FileSystem.3:	CONSTified Tcl_FSFileAttrStringsProc
-	* generic/tclFCmd.c:	and tclpFileAttrStrings. This allows
-	* generic/tclIOUtil.c:	FileSystems to report their attributes
-	* generic/tclTest.c:	as const strings, without worrying that
-	* unix/tclUnixFCmd.c:	Tcl modifies them (which Tcl should not
-	* win/tclWinFCmd.c:	do anyway, but the API didn't indicate that)
-	* generic/tcl.decls
-	* generic/tclDecls.h:	regenerated
-	* generic/tcl.h:	Make sure that if CONST84 is defined as empty,
-				CONST86 should be defined as empty as well
-				(unless overridden). This change complies with
-				TIP #27
-	*** POTENTIAL INCOMPATIBILITY ***
-
-2008-10-05  Kevin B, Kenny  <kennykb@acm.org>
-
-	* libtommath/bn_mp_sqrt.c (bn_mp_sqrt): Handle the case where a
-	* tests/expr.test (expr-47.13):		number's square root is
-	between n<<DIGIT_BIT and n<<DIGIT_BIT+1. [Bug 2143288]
-	Thanks to Malcolm Boffey (malcolm.boffey@virgin.net) for the patch.
-
-	TIP #331 IMPLEMENTATION
-
-	* doc/lset.n:
-	* generic/tclListObj.c (TclLsetFlat):
-	* tests/lset.test: Modified the [lset] command so that it allows for
-	an index of 'end+1', which has the effect of appending an element to
-	the list.
-
-2008-10-05  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclInt.decls:	 CONSTified the AuxDataType argument
-	* generic/tclCompCmds.c: of TclCreateAuxData and
-	* generic/tclCompile.c:	 TclRegisterAuxDataType and the return
-	* generic/tclCompile.h:	 values of TclGetAuxDataType and
-	* generic/tclExecute.c:	 TclGetInstructionTable
-	* generic/tclIntDecls.h:		regenerated
-	This change complies with TIP #27 (even though it only involves
-	internal function, so this is not even necessary).
-
-2008-10-05  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclIndexObj.c (TclInitPrefixCmd): Make the [tcl::prefix]
-	into an exported command. [Bug 2144595]
-
-2008-10-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdIL.c (InfoFrameCmd):	Improved hygiene of result
-	* generic/tclRegexp.c (TclRegAbout):	handling.
-
-2008-10-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/tclLoad.c: Make sure that any library which doesn't have an
-	unloadproc is only really unloaded when no library code is executed
-	yet. [Bug 2059262]
-
-2008-10-04  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOInfo.c (GetClassFromObj): Factor out the code to parse
-	a Tcl_Obj and get a class. Also make result handling hygienic.
-	* generic/tclOOBasic.c (TclOOSelfObjCmd): Better hygiene of results,
-	and stop allocating quite so much memory by sharing special "method"
-	names.
-
-2008-10-04  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/ChnlStack.3:	CONSTified the typePtr argument
-	* doc/CrtChannel.3:	of Tcl_CreateChannel and Tcl_StackChannel
-	* generic/tcl.decls:	and the return value of Tcl_GetChannelType
-	* generic/tcl.h
-	* generic/tclIO.h
-	* generic/tclIO.c
-	* generic/tclDecls.h:	regenerated
-	This change complies with TIP #27.
-
-	* doc/Hash.3:		CONSTified the typePtr argument
-	* generic/tcl.decls:	of Tcl_InitCustomHashTable.
-	* generic/tcl.h
-	* generic/tclHash.c
-	* generic/tclDecls.h:	regenerated
-	This change complies with TIP #27.
-
-	* doc/RegConfig.3:	CONSTified the configuration argument
-	* generic/tcl.decls:	of Tcl_RegisterConfig.
-	* generic/tcl.h
-	* generic/tclConfig.c
-	* generic/tclPkgConfig.c
-	* generic/tclDecls.h:	regenerated
-	This change complies with TIP #27.
-
-	* doc/GetIndex.3:	CONSTified the tablePtr argument
-	* generic/tcl.decls:	of Tcl_GetIndexFromObj.
-	* generic/tclIndexObj.c
-	* generic/tclDecls.h:	regenerated
-	This change complies with TIP #27.
-
-2008-10-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/stack.test:
-	* unix/tclUnixTest.c: Removed test command teststacklimit and the
-	corresponding constraint: it is not needed with NRE
-
-2008-10-03  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #195 IMPLEMENTATION
-
-	* generic/tclIndexObj.c (TclGetIndexFromObjList, PrefixMatchObjCmd)
-	* doc/prefix.n, tests/string.test: Added [tcl::prefix] command for
-	working with prefixes of strings at the Tcl level. [Patch 1040206]
-
-	TIP #265 IMPLEMENTATION
-
-	* generic/tclIndexObj.c (Tcl_ParseArgsObjv, PrintUsage):
-	* generic/tcl.h (Tcl_ArgvInfo):	Added function for simple parsing of
-	* doc/ParseArgs.3 (new file):	optional arguments to commands. Still
-	needs tests and the like. [FRQ 1446696] Note that some of the type
-	signatures are changed a bit from the proposed implementation so that
-	they better reflect codified good practice for argument order.
-
-2008-10-02  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/info.test (info-23.3): Updated output of the test to handle
-	the NRE-enabled eval and the proper propagation of location
-	information through it. [Bug 2017632]
-
-	* doc/info.n: Rephrased the documentation of 'info frame' for positive
-	numbers as level argument. [Bug 2134049]
-
-	* tests/info.test (info-22.8): Made pattern for file containing
-	tcltest less specific to accept both .tcl and .tm variants of the file
-	during matching. [Bug 2129828]
-
-2008-10-02  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #330 IMPLEMENTATION
-
-	* generic/tcl.h:	Remove the "result" and "freeProc" fields
-	* generic/tclBasic.c:	from the default public declaration of the
-	* generic/tclResult.c:	Tcl_Interp struct. Code should no longer
-	* generic/tclStubLib.c:	be accessing these fields. Access can be
-	* generic/tclTest.c:	restored by defining USE_INTERP_RESULT, but
-	* generic/tclUtil.c:	that should only be a temporary migration aid.
-	*** POTENTIAL INCOMPATIBILITY ***
-
-2008-10-02  Joe Mistachkin  <joe@mistachkin.com>
-
-	* doc/info.n: Fix unmatched font change.
-	* doc/tclvars.n: Fix unmatched font change.
-	* doc/variable.n: Fix unmatched font change.
-	* tools/man2help2.tcl: Integrated patch from Harald Oehlmann.
-	[Bug 1934272]
-	* tools/man2tcl.c: Increase MAX_LINE_SIZE to fix "Too long line" error.
-	* win/buildall.vc.bat: Prefer the HtmlHelp target over the WinHelp
-	target. [Bug 2072891]
-	* win/makefile.vc: Fix the HtmlHelp and WinHelp targets to not be
-	mutually exclusive.
-
-2008-09-29  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #323 IMPLEMENTATION (partial)
-
-	* doc/glob.n:		Revise [glob] to accept zero patterns.
-	* generic/tclFileName.c:
-	* tests fileName.test:
-
-	* doc/linsert.n:	Revise [linsert] to accept zero elements.
-	* generic/tclCmdIL.c:
-	* tests/linsert.test:
-
-2008-09-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #326 IMPLEMENTATION
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Added -stride option to carry
-	* doc/lsort.n, tests/cmdIL.test:	out sorting of lists where the
-	elements are grouped. Adapted from [Patch 2082681]
-
-	TIP #313 IMPLEMENTATION
-
-	* generic/tclCmdIL.c (Tcl_LsearchObjCmd): Added -bisect option to
-	* doc/lsearch.n, tests/lsearch.test:	  allow the finding of the
-	place to insert an element in a sorted list when that element is
-	not already there. [Patch 1894241]
-
-	TIP #318 IMPLEMENTATION
-
-	* generic/tclCmdMZ.c (StringTrimCmd,StringTrimLCmd,StringTrimRCmd):
-	Update the default set of trimmed characters to include some from the
-	larger UNICODE space. Factor out the default trim set into a macro so
-	that it is easier to keep them in synch.
-
-2008-09-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #314 IMPLEMENTATION
-
-	* generic/tclCompCmds.c (TclCompileEnsemble)
-	* generic/tclNamesp.c (NamespaceEnsembleCmd)
-	(Tcl_SetEnsembleParameterList, Tcl_GetEnsembleParameterList)
-	(NsEnsembleImplementationCmdNR):
-	* generic/tcl.decls, doc/Ensemble.3, doc/namespace.n
-	* tests/namespace.test: Allow the handling of a (fixed) number of
-	formal parameters between an ensemble's command and subcommand at
-	invocation time. [Patch 1901783]
-
-2008-09-28  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	   Fix the numLevels computations on
-	* generic/tclInt.h:	   coroutine yield/resume
-	* tests/unsupported.test:
-
-2008-09-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclFileName.c (Tcl_GetBlock*FromStat): Made this work
-	acceptably when working with OSes that don't support reporting the
-	block size from the stat() call. [Bug 2130726]
-
-	* generic/tclCmdIL.c (Tcl_LrepeatObjCmd): Improve the handling of the
-	case where the combination of number of elements and repeat count
-	causes the resulting list to be too large. [Bug 2130992]
-
-2008-09-26  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #323 IMPLEMENTATION (partial)
-
-	* doc/lrepeat.n:	Revise [lrepeat] to accept both zero
-	* generic/tclCmdIL.c:	repetitions and zero elements to be repeated.
-	* tests/lrepeat.test:
-
-	* doc/object.n:		Revise standard oo method [my variable] to
-	* generic/tclOOBasic.c:	accept zero variable names.
-	* tests/oo.test:
-
-	* doc/tm.n:		Revise [tcl::tm::path add] and
-	* library/tm.tcl:	[tcl::tm::path remove] to accept zero paths.
-	* tests/tm.test:
-
-	* doc/namespace.n:	Revise [namespace upvar] to accept zero
-	* generic/tclNamesp.c:	variable names.
-	* tests/upvar.test:
-
-	* doc/lassign.n:	Revise [lassign] to accept zero variable names.
-	* generic/tclCmdIL.c:
-	* tests/cmdIL.test:
-
-2008-09-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.h (TCLOO_VERSION): Bump the version.
-
-2008-09-25  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #323 IMPLEMENTATION (partial)
-
-	* doc/global.n:		Revise [global] to accept zero variable names.
-	* doc/variable.n:	Revise [variable] likewise.
-	* generic/tclVar.c:
-	* tests/proc-old.test:
-	* tests/var.test:
-
-	* doc/global.n: Correct false claim about [info locals].
-
-2008-09-25  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #315 IMPLEMENTATION
-
-	* tests/platform.test:	Update tests to expect revised results
-	* tests/safe.test:	corresponding to the TIP 315 change.
-
-	* unix/tclUnixInit.c, win/tclWinInit.c (TclpSetVariables):
-	* doc/tclvars.n (tcl_platform): Define what character is used for
-	separating PATH-like lists. Forms part of the tcl_platform array.
-
-	* generic/tclOOCall.c (InitCallChain, IsStillValid):
-	* tests/oo.test (oo-25.2): Revise call chain cache management so that
-	it takes into account class-wide caching correctly. [Bug 2120903]
-
-2008-09-24  Don Porter  <dgp@users.sourceforge.net>
-
-	TIP #323 IMPLEMENTATION (partial)
-
-	* doc/file.n:		Revise [file delete] and [file mkdir] to
-	* generic/tclCmdAH.c:	accept zero "pathname" arguments (the
-	* generic/tclFCmd.c:	no-op case).
-	* tests/cmdAH.test:
-	* tests/fCmd.test:
-
-2008-09-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (DBPRINT): Remove obsolete debugging macro.
-	[Bug 2124814]
-
-	TIP #316 IMPLEMENTATION
-
-	* generic/tcl.decls, generic/tclFileName.c (Tcl_GetSizeFromStat, etc):
-	* doc/FileSystem.3: Added reader functions for Tcl_StatBuf.
-
-2008-09-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/Method.3: Corrected documentation. [Patch 2082450]
-
-	* doc/lreverse.n, mathop.n, regexp.n, regsub.n: Make sure that the
-	initial line of the manpage includes nothing that chokes old versions
-	of man. [Bug 2118123]
-
-2008-09-22  Donal K. Fellows  <dkf@users.sf.net>
-
-	TIP #320 IMPLEMENTATION
-
-	* generic/tclOODefineCmds.c (TclOODefineVariablesObjCmd):
-	* generic/tclOOInfo.c (InfoObjectVariablesCmd, InfoClassVariablesCmd):
-	* generic/tclOOMethod.c (TclOOSetupVariableResolver, etc):
-	* doc/define.n, doc/ooInfo.n, benchmarks/cps.tcl:
-	* tests/oo.test (oo-26.*): Allow the declaration of the common
-	variables used in methods of a class or object. These are then mapped
-	in using a variable resolver. This makes many class declarations much
-	simpler overall, encourages good usage of variable names, and also
-	boosts speed a bit.
-
-	* generic/tclOOMethod.c (TclOOGetMethodBody): Factor out the code to
-	get the body of a procedure-like method. Reduces the amount of "poking
-	inside the abstraction" that is done by the introspection code.
-
-2008-09-22  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* doc/chan.n: Clean up paragraph order.
-
-2008-09-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (NEXT_INST_F):
-	* generic/tclInt.h (TCL_CT_ASSERT): New compile-time assertions,
-	adapted from www.pixelbeat.org/programming/gcc/static_assert.html
-
-2008-09-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h: Correct the TclGetLongFromObj, TclGetIntFromObj,
-	and TclGetIntForIndexM macros so that they retrieve the longValue
-	field from the internalRep instead of casting the otherValuePtr field
-	to type long.
-
-2008-09-17  Miguel Sofer  <msofer@users.sf.net>
-
-	* library/init.tcl: Export min and max commands from the mathfunc
-	namespace. [Bug 2116053]
-
-2008-09-16  Joe Mistachkin  <joe@mistachkin.com>
-
-	* generic/tclParse.c: Move TclResetCancellation to be called on
-	returning to level 0, as opposed to it being called on starting a
-	substitution at level 0.
-
-2008-09-16  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c: Move TclResetCancellation to be called on
-	returning to level 0, as opposed to it being called on starting a
-	command at level 0. Add a call on returning via Tcl_EvalObjEx to fix
-	[Bug 2114165].
-
-2008-09-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/binary.n: Added partial documentation of [binary encode] and
-	[binary decode].
-
-	* tests/binary.test,cmdAH.test,cmdIL.test,cmdMZ.test,fileSystem.test:
-	More use of tcltest2 to simplify the tests as exposed to people.
-	* tests/compile.test (compile-18.*): Added *some* tests of the
-	disassmbler, though not of its output format.
-
-2008-09-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/nre.test: Add missing constraints; enable test of foreach
-	recursion.
-
-	* generic/tclBasic.c:
-	* generic/tclCompile.h:
-	* generic/tclExecute.c (INST_EVAL_STK): Wrong numLevels when evaling a
-	canonical list. [Bug 2102930]
-
-2008-09-10  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclListObj.c (Tcl_ListObjGetElements): Make this list->dict
-	transformation - encountered when using [foreach] with dicts - not as
-	expensive as it was before. Spotted by Kieran Elby and reported on
-	tcl-core.
-
-2008-09-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/append.test, appendComp.test, cmdAH.test: Use the powers of
-	tcltest2 to make these files simpler.
-
-2008-09-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c (TclCompileTokens):
-	* generic/tclExecute.c (CompileExprObj): Fix a perf bug (found by Alex
-	Ferrieux) where some variables in the LVT where not being accessed by
-	index. Fix missing localCache management in compiled expressions found
-	while analyzing the bug.
-
-2008-09-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* doc/namespace.n: Fix [Bug 2098441]
-
-2008-09-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclTrace.test (TraceVarProc):
-	* generic/unsupported.test: Insure that unset traces are run even when
-	the coroutine is unwinding. [Bug 2093947]
-
-	* generic/tclExecute.c (CACHE_STACK_INFO):
-	* tests/unsupported.test: Restore execEnv's bottomPtr. [Bug 2093188]
-
-2008-09-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Stripped "callers" of the _ANSI_ARGS_ macro
-	* compat/dirent2.h:	to support a TCL_NO_DEPRECATED build.
-	* compat/dlfcn.h:
-	* unix/tclUnixPort.h:
-
-	* generic/tcl.h:	Removed the conditional #define of
-	_ANSI_ARGS_ that would support pre-prototype C compilers. Since
-	_ANSI_ARGS_ is no longer used in tclDecls.h, it's clear no one
-	compiling against Tcl 8.5 headers is making use of a -DNO_PROTOTYPES
-	configuration.
-
-2008-09-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/socket.test: Rewrote so as to use tcltest2 better.
-
-2008-09-01  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdAH.c:	   NRE-enabling [eval]; eval scripts are now
-	* generic/tclOOBasic.c:	   bytecompiled. Adapted recursion limit tests
-	* tests/interp.test:	   that were relying on eval not being
-	* tests/nre.test:	   compiled. Part of the [Bug 2017632] project.
-	* tests/unsupported.test:
-
-2008-09-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (InvokeProcedureMethod):
-	* generic/tclOO.c (ObjectRenamedTrace): Arrange for only methods that
-	involve callbacks into the Tcl interpreter to be skipped when the
-	interpreter is being torn down. Allows the semantics of destructors in
-	a dying interpreter to be more useful when they're implemented in C.
-
-2008-08-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* unix/Makefile.in: Ensure that all TclOO headers get installed.
-	* win/Makefile.in:  [Bug 2082299]
-	* win/makefile.bc:
-	* win/makefile.vc:
-
-2008-08-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* README:		Bump version number to 8.6a3
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2008-08-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/tclvars.n, doc/library.n: Ensured that these two manual pages
-	properly cross-reference each other. Issue reported on Tcler's Chat.
-
-2008-08-26  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (InfoCoroutine):
-	* tests/unsupported.test: New command that returns the FQN of the
-	currently executing coroutine. Lives as infoCoroutine under
-	unsupported, but is designed to become a subcommand of [info]
-
-2008-08-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (NRInterpCoroutine): Store the caller's eePtr,
-	stop assuming the coroutine is invoked from the same execEnv where it
-	was created.
-
-2008-08-24  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCmdAH.c (TclNRForeachCmd): Converted the [foreach]
-	command to have an NRE-aware non-compiled implementation. Part of the
-	[Bug 2017632] project. Also restructured the code so as to manage its
-	temporary memory more efficiently.
-
-2008-08-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	  Removed unused var; fixed function pointer
-	* generic/tclOOInt.h:	  declarations (why did gcc start complaining
-	* generic/tclOOMethod.c:  all of a sudden?)
-	* generic/tclProc.c:
-
-2008-08-23  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclInt.h (EnsembleImplMap): Added extra field to make it
-	* generic/tclNamesp.c (TclMakeEnsemble): easier to build non-recursive
-	ensembles in the core.
-
-	* generic/tclDictObj.c (DictForNRCmd): Converted the [dict for]
-	command to have an NRE-aware non-compiled implementation. Part of the
-	[Bug 2017632] project.
-
-2008-08-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:
-	* generic/tclExecute.c: Set special errocodes: COROUTINE_BUSY,
-	COROUTINE_CANT_YIELD, COROUTINE_ILLEGAL_YIELD.
-
-2008-08-22  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.6a2 TAGGED FOR RELEASE ***
-
-	* changes:	Updates for 8.6a2 release.
-
-	* generic/tcl.h:	Drop use of USE_COMPAT85_CONST. That added
-	indirection without value. Use -DCONST86="" to engage source compat
-	support for code written for 8.5 headers.
-
-	* generic/tclUtil.c (TclReToGlob):	Added missing set of the
-	*exactPtr value to really fix [Bug 2065115]. Also avoid possible
-	DString overflow.
-	* tests/regexpComp.test:	Correct duplicate test names.
-
-2008-08-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	  Previous fix, now done right.
-	* generic/tclCmdIL.c:
-	* generic/tclInt.h:
-	* tests/unsupported.test:
-
-2008-08-21  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/regexp.test, tests/regexpComp.test: Correct re2glob ***=
-	* generic/tclUtil.c (TclReToGlob):	    translation from exact
-	to anywhere-in-string match. [Bug 2065115]
-
-2008-08-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Reduced the use of CONST86 and eliminated
-	* generic/tcl.decls:	the use of CONST86_RETURN to support source
-	code compatibility with Tcl 8.5 on those public routines passing
-	(Tcl_Filesystem *), (Tcl_Timer *), and (Tcl_Objtype *) values which
-	have been const-ified. What remains is the minimum configurability
-	needed to support code written for pre-8.6 headers via the new
-	-DUSE_COMPAT85_CONST compiler directive.
-	*** POTENTIAL INCOMPATIBILITY ***
-
-	* generic/tclDecls.h:	make genstubs
-
-2008-08-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	Fix the cmdFrame level count in
-	* generic/tclCmdIL.c:	coroutines. Fix small bug on coroutine
-	* generic/tclInt.h:	rewind.
-
-2008-08-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (Tcl_DisassembleObjCmd): Added ability to
-	disassemble TclOO methods. The code to do this is very ugly.
-
-2008-08-21  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tclOOMethod.c: Added casts to make MSVC happy
-	* generic/tclBasic.c:
-
-2008-08-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (AllocObject): Suppress compilation of commands in
-	the namespace allocated for each object.
-	* generic/tclOOMethod.c (PushMethodCallFrame): Restore some of the
-	hackery that makes calling methods of classes fast. Fixes performance
-	problem introduced by the fix of [Bug 2037727].
-
-	* generic/tclCompile.c (TclCompileScript):    Allow the suppression of
-	* generic/tclInt.h (NS_SUPPRESS_COMPILATION): compilation of commands
-	* generic/tclNamesp.c (Tcl_CreateNamespace):  from a namespace or its
-	children.
-
-2008-08-20  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclTest.c (TestconcatobjCmd):	Fix use of internal-only
-	TclInvalidateStringRep macro. [Bug 2057479]
-
-2008-08-17  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	   Implementation of [coroutine] and [yield]
-	* generic/tclCmdAH.c:	   commands (in tcl::unsupported).
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclInt.h:
-	* tests/unsupported.test:
-
-	* generic/tclTest.c (TestconcatobjCmd):
-	* generic/tclUtil.c (Tcl_ConcatObj):
-	* tests/util.test (util-4.7):
-	Fix [Bug 1447328]; the original "fix" turned Tcl_ConcatObj() into a
-	hairy monster. This was exposed by [Bug 2055782]. Additionally,
-	Tcl_ConcatObj could corrupt its input under certain conditions!
-
-	*** NASTY BUG FIXED ***
-
-2008-08-16  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Better cmdFrame management
-
-2008-08-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/fileName.test:	Revise new tests for portability to case
-	insensitive filesystems.
-
-2008-08-14  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclNREvalObjv, Tcl_NRCallObjProc):
-	* generic/tclProc.c (TclNRInterpProcCore, InterpProcNR2):
-	DTrace probes for NRE. [Bug 2017160]
-
-	* generic/tclBasic.c (TclDTraceInfo):	Add two extra arguments to
-	* generic/tclCompile.h:			DTrace 'info' probes for tclOO
-	* generic/tclDTrace.d:			method & class/object info.
-
-	* generic/tclCompile.h:	Add support for debug logging of DTrace
-	* generic/tclBasic.c:	'proc', 'cmd' and 'inst' probes (does _not_
-				require a platform with DTrace).
-
-	* generic/tclCmdIL.c (TclInfoFrame):	Check fPtr->line before
-						dereferencing as line info may
-						not exists when TclInfoFrame()
-						is called from a DTrace probe.
-
-	* tests/fCmd.test (fCmd-6.23):	Made result matching robust when test
-					workdir and /tmp are not on same FS.
-
-	* unix/tclUnixThrd.c:		Remove unused TclpThreadGetStackSize()
-	* generic/tclInt.h:		and related ifdefs and autoconf tests.
-	* unix/tclUnixPort.h:		[Bug 2017264] (jenglish)
-	* unix/tcl.m4:
-
-	* unix/Makefile.in:		Ensure Makefile shell is /bin/bash for
-	* unix/configure.in (SunOS):	DTrace-enabled build on Solaris.
-					(followup to 2008-06-12) [Bug 2016584]
-
-	* unix/tcl.m4 (SC_PATH_X):	Check for libX11.dylib in addition to
-					libX11.so et al.
-
-	* unix/configure:		autoconf-2.59
-	* unix/tclConfig.h.in:		autoheader-2.59
-
-2008-08-13  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/nre.test: Added test for large {*}-expansion effects
-
-2008-08-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclFileName.c:	Fix for errors handling -types {}
-	* tests/fileName.test:		option to [glob]. [Bug 1750300]
-	Thanks to Matthias Kraft and George Peter Staplin.
-
-2008-08-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclOOInfo.c (InfoObjectDefnCmd, InfoObjectMixinsCmd):
-	Fix # args displayed. [Bug 2048676]
-
-2008-08-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclOOMethod.c (PushMethodCallFrame):	Added missing check
-	for bytecode validity. [Bug 2037727]
-
-	* generic/tclProc.c (TclProcCompileProc):	On recompile of a
-	proc, clear away any entries on the CompiledLocal list from the
-	previous compile. This will prevent compile of temporary variables in
-	the proc body from growing the localCache arbitrarily large.
-
-	* README:		Bump version number to 8.6a2
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-	* changes:	Updates for 8.6a2 release.
-
-2008-08-11  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/http.tcl: Remove 8.5 requirement.
-	* library/http/pkgIndex.tcl:
-	* unix/Makefile.in:
-	* win/Makefile.in:
-	* win/makefile.vc:
-
-2008-08-11  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tm.tcl: Added a 'package provide' command to the generated
-	ifneeded scripts of Tcl Modules, for early detection of conflicts
-	between the version specified through the file name and a 'provide'
-	command in the module implementation, if any. Note that this change
-	also now allows Tcl Modules to not provide a 'provide' command at all,
-	and declaring their version only through their filename.
-
-	* generic/tclProc.c (Tcl_ProcObjCmd): Fixed memory leak triggered by
-	* tests/proc.test: procbody::test::proc. See [Bug 2043636]. Added a
-	test case demonstrating the leak before the fix. Fixed a few spelling
-	errors in test descriptions as well.
-
-2008-08-11  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/http/http.tcl:	Bump http version to 2.7.1 to account
-	* library/http/pkgIndex.tcl:	for [Bug 2046486] bug fix. This
-	* unix/Makefile.in:		release of http now requires a
-	* win/Makefile.in:		dependency on Tcl 8.5 to be able to
-	* win/makefile.bc:		use the unsigned formats in the
-	* win/makefile.vc:		[binary scan] command.
-
-2008-08-11  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/http.tcl: CRC field from zlib data should be treated as
-	unsigned for 64bit support. [Bug 2046846]
-
-2008-08-10  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclProc.c: Completely removed ProcCompileProc, which was a
-	fix for [Bug 1482718]. This is not needed at least since varReform,
-	where the local variable data at runtime is read from the CallFrame
-	and/or the LocalCache.
-
-2008-08-09  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	Slight cleanup
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-
-2008-08-09  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclExecute.c:	Fix warnings.
-
-	* generic/tclOOMethod.c (PushMethodCallFrame):	Fix uninitialized efi
-							name field.
-
-	* tests/lrange.test (lrange-1.17):	Add test cleanup; whitespace.
-
-2008-08-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6a2 release.
-
-2008-08-08  Kevin Kenny  <kennykb@acm.org>
-
-	* library/tzdata/CET:
-	* library/tzdata/MET:
-	* library/tzdata/Africa/Casablanca:
-	* library/tzdata/America/Eirunepe:
-	* library/tzdata/America/Rio_Branco:
-	* library/tzdata/America/Santarem:
-	* library/tzdata/America/Argentina/San_Luis:
-	* library/tzdata/Asia/Karachi:
-	* library/tzdata/Europe/Belgrade:
-	* library/tzdata/Europe/Berlin:
-	* library/tzdata/Europe/Budapest:
-	* library/tzdata/Europe/Sofia:
-	* library/tzdata/Indian/Mauritius:  Olson's tzdata2008e.
-
-2008-08-07  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	Fix tailcalls falling out of tebc into
-	* generic/tclExecute.c: Tcl_EvalEx. [Bug 2017946]
-	* generic/tclInt.h:
-
-2008-08-06  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclOO.c:	Revised TclOO's check for an interp being
-	deleted during handling of object command deletion. The old code was
-	relying on documented features of command delete traces that do not in
-	fact work. [Bug 2039178]
-
-	* tests/oo.test (oo-26.*):	Added tests that demonstrate failure
-	of TclOO to check for various kinds of invalid bytecode during method
-	dispatch. [Bug 2037727]
-
-2008-08-06  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclLookupSimpleVar): Fix bug that the core could
-	not trigger before TclOO: the number of locals was being read from the
-	Proc, which can under some circumstance be out of sync with the
-	localCache's. Found by dgp while investigating [Bug 2037727].
-
-	* library/init.tcl (::unknown): Removed the [namespace inscope]
-	hack that was maintained for Itcl
-
-	*** POTENTIAL INCOMPATIBILITY *** for Itcl
-	Itcl users will need a new release with Itcl's [Patch 2040295], or
-	else load the tiny script in that patch by themselves (rewrite
-	::unknown). Note that it is a script-only patch.
-
-2008-08-05  Joe English  <jenglish@users.sourceforge.net>
-
-	* unix/tclUnixChan.c: Streamline async connect logic [Patch 1994512]
-
-2008-08-05  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Fix for [Bug 2038069] by dgp.
-	* tests/execute.test:
-
-2008-08-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/nre.test: Added tests for [if], [while] and [for]. A test
-	for [foreach] has been added and marked as knownbug, awaiting for it
-	to be NR-enabled.
-
-	* generic/tclBasic.c:	   Made atProcExit commands run
-	* generic/tclCompile.h:	   unconditionally, streamlined
-	* generic/tclExecute.c:	   atProcExit/tailcall processing in TEBC.
-	* generic/tclProc.c:
-	* tests/unsupported.test:
-
-2008-08-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c: Stopped faulty double-logging of errors to
-	* tests/execute.test:	stack trace when a compile epoch bump triggers
-	fallback to direct evaluation of commands in a compiled script.
-	[Bug 2037338]
-
-2008-08-03  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	   New unsupported command atProcExit that
-	* generic/tclCompile.h:	   shares the implementation with tailcall.
-	* generic/tclExecute.c:	   Fixed a segfault in tailcalls. Tests added.
-	* generic/tclInt.h:
-	* generic/tclInterp.c:
-	* generic/tclNamesp.c:
-	* tests/unsupported.test:
-
-2008-08-02  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/NRE.test (removed):	Migrated tests to standard locations,
-	* tests/nre.test (new):		separating core functionality from the
-	* tests/unsupported.test (new):	experimental commands.
-
-2008-08-01  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* doc/Exit.3:			Do not call Tcl_Finalize implicitly
-	* generic/tclEvent.c:		on DLL_PROCESS_DETACH as it may lead
-	* win/tclWin32Dll.c (DllMain):	to issues and the user should be
-	explicitly calling Tcl_Finalize before unloading regardless. Clarify
-	the docs to note the explicit need in embedded use.
-
-2008-08-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c:	Revised timing of the CmdFrame stack
-	* tests/info.test:	management in TclEvalEx so that the CmdFrame
-	will still be on the stack at the time Tcl_LogCommandInfo is called to
-	append another level of -errorinfo information. Sets the stage to add
-	file and line data to the stack trace. Added test to check that [info
-	frame] functioning remains unchanged by the revision.
-
-2008-07-31  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/NRE.test:  Replaced all deep-recursing tests by shallower
-	tests that actually measure the C-stack depth. This makes them
-	bearable again (even under memdebug) and avoid crashing on failure.
-
-	* generic/tclBasic.c:	NR-enabling [catch], [if] and [for] and
-	* generic/tclCmdAH.c:	[while] (the script, not the tests)
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclInt.h:
-	* tests/NRE.test:
-
-	* generic/tclBasic.c:	Moved the few remaining defs from tclNRE.h to
-	* generic/tclDictObj.c: tclInt.h, eliminated inclusion of tclNRE.h
-	* generic/tclExecute.c: everywhere.
-	* generic/tclInt.h:
-	* generic/tclInterp.c:
-	* generic/tclNRE.h (removed):
-	* generic/tclNamesp.c:
-	* generic/tclOOBasic.c:
-	* generic/tclOOInt.h:
-	* generic/tclProc.c:
-	* generic/tclTest.c:
-	* unix/Makefile.in:
-
-2008-07-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	 Improved tailcalls.
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:
-	* generic/tclTest.c:
-	* tests/NRE.test:
-
-	* generic/tclBasic.c (TclNREvalObjEx): New comments and code reorg
-	to clarify what is happening.
-
-	* generic/tclBasic.c: Guard against the value of iPtr->evalFlags
-	changing between the times where TEOV and TEOV_exception run. Thanks
-	dgp for catching this.
-
-2008-07-29  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/NRE.test: New tests that went MIA in the NRE revamping
-
-	* generic/tclBasic.c:	Clean up
-	* generic/tclNRE.h:
-	* generic/tclExecute.c:
-
-	* generic/tclBasic.c:	Made use of the thread's alloc cache stored in
-	* generic/tclInt.h:	the ekeko at interp creation to avoid hitting
-	* generic/tclNRE.h:	the TSD each time an NRE callback is pushed or
-	* generic/tclThreadAlloc.c: pulled; the approach is suitably general
-	to extend to every other obj allocation where an interp is know; this
-	is left for some other time, requires a lot of grunt work.
-
-	* generic/tclExecute.c:	 Fix [Bug 2030670] that cause TclStackRealloc
-	to panic on rare corner cases. Thx ajpasadyn for diagnose and patch.
-
-	* generic/tcl.decls:	 Completely revamped NRE implementation, with
-	* generic/tclBasic.c:	 (almost) unchanged API.
-	* generic/tclCompile.h:
-	* generic/tclExecute.c:	 TEBC will require a bit of a facelift, but
-	* generic/tclInt.decls:	 TEOV at least looks great now. There are new
-	* generic/tclInt.h:	 tests (incomplete!) to verify that execution
-	* generic/tclInterp.c:	 is indeed in the same TEBC instance, at the
-	* generic/tclNRE.h:	 same level in all stacks involved. Tailcalls
-	* generic/tclNamesp.c:	 are still a bit leaky, still deserving to be
-	* generic/tclOOBasic.c:	 in tcl::unsupported.
-	* generic/tclOOMethod.c:
-	* generic/tclProc.c:	 Uninit'd var warnings in TEBC with -O2, no
-	* generic/tclTest.c:	 warnings otherwise.
-
-2008-07-28  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/FileSystem.3:		CONSTified many functions using
-	* generic/tcl.decls:		Tcl_Filesystem which all are supposed
-	* generic/tclDecls.h:		to be a constant, but this was not
-	* generic/tclFileSystem.h:	reflected in the API: Tcl_FSData,
-	* generic/tclIOUtil.c:		Tcl_FSGetInternalRep, Tcl_FSRegister,
-	* generic/tclPathObj.c:		Tcl_FSNewNativePath, Tcl_FSUnregister,
-	* generic/tclTest.c:		Tcl_FSGetFileSystemForPath ...
-	This change complies with TIP #27.
-	***POTENTIAL INCOMPATIBILITY***
-
-2008-07-28  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclBasic.c: Added missing ref count when creating an empty
-	string as path (TclEvalEx). In 8.4 the missing code caused panics in
-	the testsuite. It doesn't in 8.5. I am guessing that the code path
-	with the missing the incr-refcount is not invoked any longer. Because
-	the bug in itself is certainly the same.
-
-2008-07-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (PushMethodCallFrame): Remove hack that should
-	have gone when this code was merged into Tcl.
-
-2008-07-27  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/Object.3:		CONSTified 3 functions using Tcl_ObjType
-	* doc/ObjectType.3:	which all are supposed to be a constant, but
-	* generic/tcl.decls:	this was not reflected in the API:
-	* generic/tcl.h:	Tcl_RegisterObjType, Tcl_ConvertToType,
-	* generic/tclDecls.h:	Tcl_GetObjType
-	* generic/tclObj.c:	Introduced a CONST86_RETURN, so extensions
-	* generic/tclCompCmds.c: which use Tcl_ObjType directly can be
-	* generic/tclOOMethod.c: modified to compile against both Tcl 8.5 and
-	* generic/tclTestobj.c:	Tcl 8.6. tclDecls.h regenerated
-	This change complies with TIP #27.
-	***POTENTIAL INCOMPATIBILITY***
-
-2008-07-25  Andreas Kupries  <andreask@activestate.com>
-
-	* test/info.test: More work on singleTestInterp usability. [1605269]
-
-	* tests/info.test: Tests 38.* added, exactly testing the tracking of
-	location for uplevel scripts. Resolved merge conflict on info-37.0,
-	switched !singleTestInterp constraint to glob matching instead. Ditto
-	info-22.8, removed constraint, more glob matching, and reduced the
-	depth of the stack we check. More is coming, right now I want to
-	commit the bug fixes.
-
-	* tests/oo.test: Updated oo-22.1 for expanded location tracking.
-
-	* generic/tclCompile.c (TclInitCompileEnv): Reorganized the
-	initialization of the #280 location information to match the flow in
-	TclEvalObjEx to get more absolute contexts.
-
-	* generic/tclBasic.c (TclEvalObjEx): Added missing cleanup of extended
-	location information.
-
-2008-07-25  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tests/info.test (info-37.0): Add !singleTestInterp constraint;
-	(info-22.8, info-23.0): switch to glob matching to avoid sensitivity
-	to tcltest.tcl line number changes, remove knownBug constraint, fix
-	expected result. [Bug 1605269]
-
-2008-07-24  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* doc/Notifier.3:      CONSTified 4 functions in the Notifier which
-	* doc/Thread.3:	       all have a Tcl_Time* in it which is supposed
-	* generic/tcl.decls:   to be a constant, but this was not reflected
-	* generic/tcl.h:       reflected in the API:
-	* generic/tclDecls.h:	    Tcl_SetTimer, Tcl_WaitForEvent,
-	* generic/tclNotify.c:	    Tcl_ConditionWait, Tcl_SetMaxBlockTime
-	* macosx/tclMacOSXNotify.c:
-	* generic/tclThread.c: Introduced a CONST86, so extensions which have
-	* unix/tclUnixNotfy.c: have their own Notifier (are there any?) can
-	* unix/tclUnixThrd.c:  can be modified to compile against both Tcl
-	* win/tclWinNotify.c:  Tcl 8.5 and Tcl 8.6
-	* win/tclWinThrd.c:    Regenerated tclDecls.h with "make stubs".
-	This change complies with TIP #27
-	***POTENTIAL INCOMPATIBILITY***
-
-2008-07-23  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* tests/lrange.test: Added relative speed test to check for lrange
-	in-place optimization committed 2008-06-30.
-	* tests/binary.test: Added relative speed test to check for pure byte
-	array CONCAT1 optimization committed 2008-06-30.
-
-2008-07-23  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/info.test: Reordered the tests to have monotonously increasing
-	numbers.
-
-	* generic/tclBasic.c: Modified TclArgumentGet to reject pure lists
-	* generic/tclCmdIL.c: immediately, without search. Reworked setup of
-	* generic/tclCompile.c: eoFramePtr, doesn't need the line information,
-	* tests/info.test: more sensible to have everything on line 1 when
-	eval'ing a pure list. Updated the users of the line information to
-	special case this based on the frame type (i.e.
-	TCL_LOCATION_EVAL_LIST). Added a testcase demonstrating the new
-	behaviour.
-
-2008-07-23  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c (GetCommandSource): Added comment with
-	explanation and warning for waintainers.
-
-2008-07-22  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclCompile.c: Made the new TclEnterCmdWordIndex static, and
-	* generic/tclCompile.h: ansified.
-
-	* generic/tclBasic.c: Ansified the new functions. Added missing
-	function comments.
-
-	* generic/tclBasic.c: Reworked the handling of bytecode literals for
-	* generic/tclCompile.c: #280 to fix the abysmal performance for deep
-	* generic/tclCompile.h: recursion, replaced the linear search through
-	* generic/tclExecute.c: the whole stack with another hashtable and
-	* generic/tclInt.h: simplified the data structure used by the compiler
-	by using an array instead of a hashtable. Incidentially this also
-	fixes the memory leak reported via [Bug 2024937].
-
-2008-07-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	 Added numLevels field to CommandFrame, let
-	* generic/tclExecute.c:	 GetCommandSource use it. This solves [Bug
-	* generic/tclInt.h:	 2017146]. Thx dgp for the analysis.
-
-2008-07-21  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclBasic.c: Extended the existing TIP #280 system (info
-	* generic/tclCmdAH.c: frame), added the ability to track the absolute
-	* generic/tclCompCmds.c: location of literal procedure arguments, and
-	* generic/tclCompile.c: making this information available to uplevel
-	* generic/tclCompile.h: eval, and siblings. This allows proper
-	* generic/tclInterp.c: tracking of absolute location through custom
-	* generic/tclInt.h: (Tcl-coded) control structures based on uplevel,
-	* generic/tclNamesp.c: etc.
-	* generic/tclProc.c:
-	* tests/info.test:
-
-2008-07-21  Jan Nijtmans  <nijtmans@users.sf.net>
-
-	* generic/*.c: Fix [2021443] inconsistant "wrong # args" messages
-	* win/tclWinReg.c
-	* win/tclWinTest.c
-	* tests/*.test
-
-2008-07-21  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	TIP #304 IMPLEMENTATION
-
-	* generic/tcl.decls:	Public API
-	* generic/tclIOCmds.c:	Generic part
-	* unix/tclUnixPipe.c:	OS part
-	* win/tclWinPipe.c:	OS part
-	* tests/chan.test:	[chan pipe] tests
-	* tests/ioCmd.test:	Modernized checks
-	* tests/ioTrans.test:
-
-2008-07-21  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tclFCmd.c:  Inodes on windows are unreliable. [Bug 2015723]
-	* tests/winFCmd.test: test rename with inode collision
-
-2008-07-21  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tcl.decls:	  Changed the implementation of
-	* generic/tclBasic.c:	  [namespace import]; removed
-	* generic/tclDecls.h:	  Tcl_NRObjProc, replaced with
-	* generic/tclExecute.c:	  Tcl_NRCmdSwap (proposed public
-	* generic/tclInt.h:	  NRE API). This should fix
-	* generic/tclNRE.h:	  [Bug 582506].
-	* generic/tclNamesp.c:
-	* generic/tclStubInit.c:
-
-	* generic/tclBasic.c:	 NRE: enabled calling NR commands
-	* generic/tclExecute.c:	 from the callbacks. Completely
-	* generic/tclInt.h:	 redone tailcall implementation
-	* generic/tclNRE.h:	 using the new feature. [Bug 2021489]
-	* generic/tclProc.c:
-	* tests/NRE.test:
-
-2008-07-20  Kevin B. Kenny  <kenykb@acm.org>
-
-	* tests/fileName.test: Repaired the failing test fileName-15.7 from
-	dkf's commit earlier today.
-
-2008-07-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (SetDictFromAny): Make the list->dict
-	transformation a bit more efficient; modern dicts are ordered and so
-	we can round-trip through lists without needing the string rep at all.
-	* generic/tclListObj.c (SetListFromAny): Make the dict->list
-	transformation not lossy of internal representations and hence more
-	efficient. [Bug 2008248] (ajpasadyn) but using a more efficient patch.
-
-	* tests/fileName.test: Revise to reduce the obscurity of tests. In
-	particular, all tests should now produce informative messages on
-	failure and the quantity of [catch]-based obscurity is now greatly
-	reduced; non-erroring is now checked for directly.
-
-2008-07-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/env.test: Add LANG to the list of variables that are not
-	touched by the environment variable tests, so that subprocesses can
-	get their system encoding correct.
-
-	* tests/exec.test, tests/env.test: Rewrite so that non-ASCII
-	characters are not used in the final comparison. Part of fixing [Bug
-	1513659].
-
-2008-07-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	 Optimization: replace calls to
-	* generic/tclDictObj.c:	 Tcl_NRAddCallback with the macro
-	* generic/tclExecute.c:	 TclNRAddCallback.
-	* generic/tclInterp.c:
-	* generic/tclNRE.h:
-	* generic/tclNamesp.c:
-	* generic/tclOO.c:
-	* generic/tclOOBasic.c:
-	* generic/tclOOCall.c:
-	* generic/tclOOInt.h:
-	* generic/tclOOMethod.c:
-	* generic/tclProc.c:
-
-2008-07-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (TclNRNewObjectInstance, FinalizeAlloc):
-	* generic/tclOOBasic.c (TclOO_Class_Create, TclOO_Class_CreateNs)
-	(TclOO_Class_New, FinalizeConstruction, AddConstructionFinalizer):
-	NRE-enablement of the class construction methods.
-
-2008-07-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/NRE.test:  Added basic tests for deep TclOO calls
-
-	* generic/tcl.decls:	   Change the public api prefix from
-	* generic/tcl.h:	   TclNR_foo to Tcl_NRfoo
-	* generic/tclBasic.c:
-	* generic/tclDecls.h:
-	* generic/tclDictObj.c:
-	* generic/tclExecute.c:
-	* generic/tclInterp.c:
-	* generic/tclNRE.h:
-	* generic/tclNamesp.c:
-	* generic/tclOO.c:
-	* generic/tclOOBasic.c:
-	* generic/tclOOCall.c:
-	* generic/tclOOMethod.c:
-	* generic/tclProc.c:
-	* generic/tclStubInit.c:
-
-2008-07-18  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOBasic.c (TclOO_Object_Eval, FinalizeEval): NRE-enable
-	the oo::object.eval method.
-
-2008-07-18  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclDictObj.c (DictWithCmd, DictUpdateCmd): Fix refcounting
-	bugs that caused crashes [Bug 2017857].
-
-	* generic/tclBasic.c (TclNREvalObjEx): Streamline the management of
-	the command frame (opt).
-
-2008-07-17  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclDictObj.c (DictWithCmd, FinalizeDictWith): Split the
-	implementation of [dict with] so that it works with NRE.
-	(DictUpdateCmd, FinalizeDictUpdate): Similarly for the non-compiled
-	version of [dict update].
-
-2008-07-16  George Peter Staplin  <georgeps@users.sf.net>
-
-	* win/tclWinThrd.c: Test for TLS_OUT_OF_INDEXES to make certain that
-	thread key creation is successful.
-
-2008-07-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c, generic/tclOOInt.h, generic/tclOOBasic.c:
-	* generic/tclOOCall.c, generic/tclOOMethod.c: NRE-enable the TclOO
-	implementation in Tcl. No change to public APIs, except that method
-	implementations can now be NRE-aware if they choose (which normal
-	methods and forwards are). On the other hand, callers of
-	TclOOInvokeObject (which is only in the internal stub table) will need
-	to deal with the fact that it's only safe to call inside an NRE-aware
-	context.
-	***POTENTIAL INCOMPATIBILITY***
-
-2008-07-15  Miguel Sofer  <msofer@users.sf.net>
-
-	* tests/NRE.test:	Better constraint for testing the existence of
-	* tests/stack.test:	teststacklimit, to insure that the test suite
-				runs under tclsh.
-
-	* generic/tclParse.c: Fixing incomplete reversion of "fix" for [Bug
-	2017583], missing TclResetCancellation call.
-
-2008-07-15  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclBasic.c (Tcl_CancelEval): Fix blunder. [Bug 2018603]
-
-	* doc/DictObj.3: Fix error in example. [Bug 2016740]
-
-	* generic/tclNamesp.c (EnsembleUnknownCallback): Factor out some of
-	the more complex parts of the ensemble code to make it easier to
-	understand and hence to permit tighter compilation of code on the
-	critical path.
-
-2008-07-14  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclParse.c: Reverting the "fix" for [Bug 2017583], numLevel
-	* tests/parse.test:   management and TclInterpReady check seems to be
-			      necessary after all.
-
-2008-07-14  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclProc.c (TclNRApplyObjCmd, TclObjInterpProcCore):
-	* generic/tclBasic.c (TclNR_AddCallback, TclEvalObjv_NR2):
-	* generic/tclNRE.h (TEOV_callback): Change the callback storage type
-	to use an array, so guaranteeing correct inter-member spacing and
-	memory layout.
-
-2008-07-14  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c:	 Remove unneeded TclInterpReady calls
-	* generic/tclParse.c:
-
-	* generic/tclBasic.c.:	 Embedded Tcl_Canceled() calls into
-	* generic/tclExecute.c:	 TclInterpReady().
-	* generic/tclParse.c:
-
-	* generic/tclVar.c: Fix error message
-
-	* generic/tclParse.c: Remove unnecessary numLevel management
-	* tests/parse.test:   [Bug 2017583]
-
-	* generic/tclBasic.c.:	 NRE left too many calls to
-	* generic/tclExecute.c:	 TclResetCancellation lying around: it
-	* generic/tclProc.c:	 only needs to be called prior to any
-				 iPtr->numLevels++. Thanks mistachkin.
-
-	* generic/tclBasic.c: TclResetCancellation() calls were misplaced
-	(merge mishap); stray //. Thanks patthoyts.
-
-	* generic/tclInt.h: The new macros TclSmallAlloc and TclSmallFree
-	were badly defined under mem debugging [Bug 2017240] (thx das)
-
-2008-07-13  Miguel Sofer  <msofer@users.sf.net>
-
-	NRE implementation [Patch 2017110]
-
-	* generic/tcl.decls:	 The NRE infrastructure
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclCmdAH.c:
-	* generic/tclCompile.h:
-	* generic/tclDecls.h:
-	* generic/tclExecute.c:
-	* generic/tclHistory.c:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclNRE.h:
-	* generic/tclStubInit.c:
-	* unix/Makefile.in:
-
-	* generic/tclInterp.c:	 NRE-enabling: procs, lambdas, uplevel,
-	* generic/tclNamesp.c:	 same-interp aliases, ensembles, imports
-	* generic/tclProc.c:	 and namespace_eval.
-
-	* generic/tclTestProcBodyObj.c: New NRE specific tests (few, but
-	* tests/NRE.test:		note that the thing is actually
-					tested by the whole testsuite.
-
-	* tests/interp.test:	 Fixed numLevel counting.
-	* tests/parse.test:
-	* tests/stack.test:
-
-	* unix/configure:	 Removing support for the hacky nonportable
-	* unix/configure.in:	 stack check: it is not needed anymore, Tcl
-	* unix/tclConfig.h.in:	 is very thrifty on the C stack.
-	* unix/tclUnixInit.c:
-	* unix/tclUnixTest.c:
-	* win/tclWin32Dll.c:
-
-2008-07-08  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclGet.c:	Corrected out of date comments and removed
-	* generic/tclInt.decls:	internal routine TclGetLong() that's no
-	longer used. If an extension is using this from the internal stubs
-	table, it can shift to the public routine Tcl_GetLongFromObj() or
-	can request addition of a public Tcl_GetLong().
-	***POTENTIAL INCOMPATIBILITY***
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2008-07-08  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/CrtInterp.3: Tighten up the descriptions of behaviour to make
-	this page easier to read for a "Tcl 8.6" audience.
-
-2008-07-07  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclCmdIL.c (InfoFrameCmd): Fixed unsafe idiom of setting
-	the interp result found by Don Porter.
-
-2008-07-07  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/regexp.n, doc/regsub.n: Correct examples. [Bug 1982642]
-
-2008-07-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/lindex.n: Improve examples.
-
-2008-07-03  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c (InvokeTclMethod): Fixed the memory leak
-	reported in [Bug 1987821]. Thanks to Miguel for the report and Don
-	Porter for tracking the cause down.
-
-2008-07-03  Don Porter  <dgp@users.sourceforge.net>
-
-	* library/package.tcl:	Removed [file readable] testing from
-	[tclPkgUnknown] and friends. We find out soon enough whether a file is
-	readable when we try to [source] it, and not testing before allows us
-	to workaround the bugs on some common filesystems where [file
-	readable] lies to us. [Patch 1969717]
-
-2008-07-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/regc_nfa.c (duptraverse): Impose a maximum stack depth on
-	the single most recursive part of the RE engine. The actual maximum
-	may need tuning, but that needs a system with a small stack to carry
-	out. [Bug 1905562]
-
-	* tests/string.test: Eliminate non-ASCII characters from the actual
-	test script. [Bug 2006884]
-
-2008-06-30  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/ObjectType.3: Clean up typedef formatting.
-
-2008-06-30  Don Porter  <dgp@users.sourceforge.net>
-
-	* doc/ObjectType.3:	Updated documentation of the Tcl_ObjType
-	struct to match expectations of Tcl 8.5. [Bug 1917650]
-
-2008-06-30  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
-
-	* generic/tclCmdIL.c: Lrange cleanup and in-place optimization. [Patch
-	1890831]
-
-	* generic/tclExecute.c: Avoid useless String conversion for CONCAT1 of
-	pure byte arrays. [Patch 1953758]
-
-2008-06-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/*.1, doc/*.3, doc/*.n: Many small updates, purging out of date
-	change bars and cleaning up the formatting of typedefs. Added a few
-	missing bits of documentation in the process.
-
-2008-06-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	 Plug memory leak in [Bug 1999176] fix. Thanks
-	to Rolf Ade for detecting.
-
-2008-06-29  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/interp.n: Corrected order of subcommands. [Bug 2004256]
-	Removed obsolete (i.e. 8.5) .VS/.VE pairs.
-
-	* doc/object.n (EXAMPLES): Fix incorrect usage of oo::define to be
-	done with oo::objdefine instead. [Bug 2004480]
-
-2008-06-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c:	 Plug memory leak in [Bug 1972879] fix. Thanks
-	to Rolf Ade for detecting and Dan Steffen for the fix. [Bug 2004654]
-
-2008-06-26  Andreas Kupries  <andreask@activestate.com>
-
-	* unix/Makefile.in: Followup to my change of 2008-06-25, make code
-	generated by the Makefile and put into the installed tm.tcl
-	conditional on interpreter safeness as well. Thanks to Daniel Steffen
-	for reminding me of that code.
-
-2008-06-25  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.6a1 TAGGED FOR RELEASE ***
-
-	* changes:	Updates for 8.6a1 release.
-
-	* generic/tclOO.h:	Bump to TclOO 0.5.
-
-2008-06-25  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tm.tcl:   Modified the handling of Tcl Modules and of the
-	* library/safe.tcl: Safe Base to interact nicely with each other,
-	* library/init.tcl: enabling requiring Tcl Modules in safe
-	* tests/safe.test:  interpreters. [Bug 1999119]
-
-2008-06-25  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/rules.vc: Fix versions of dde and registry dlls
-	* win/makefile.vc: Fix problem building with staticpkg option
-
-2008-06-24  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c: Fixed some internals management in the "path"
-	Tcl_ObjType for the empty string value. Problem led to a crash in the
-	command [glob -dir {} a]. [Bug 1999176]
-
-2008-06-24  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* doc/fileevent.n: Fix examples and comment on eof use. [Bug 1995063]
-
-2008-06-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclPathObj.c: Fixed bug in Tcl_GetTranslatedPath() when
-	operating on the "Special path" variant of the "path" Tcl_ObjType
-	intrep. A full normalization was getting done, in particular, coercing
-	relative paths to absolute, contrary to what the function of producing
-	the "translated path" is supposed to do. [Bug 1972879]
-
-2008-06-20  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6a1 release.
-
-	* generic/tclInterp.c:	Fixed completely boneheaded mistake that
-	* tests/interp.test:	[interp bgerror $slave] and [$slave bgerror]
-	would always act like [interp bgerror {}]. [Bug 1999035]
-
-	* tests/chanio.test:	Corrected flawed tests revealed by a -debug 1
-	* tests/cmdAH.test:	-singleproc 1 test suite run.
-	* tests/event.test:
-	* tests/interp.test:
-	* tests/io.test:
-	* tests/ioTrans.test:
-	* tests/namespace.test:
-
-	* tests/encoding.test:	Make failing tests pass again. [Bug 1972867]
-
-2008-06-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (Tcl_ObjectContextInvokeNext): Corrected 'next' (at
-	* tests/oo.test (oo-7.8):	end of a call chain) to make it
-	* doc/next.n:			consistent with the TIP. [Bug 1998244]
-
-	* generic/tclOOCall.c (AddSimpleClassChainToCallContext): Make sure
-	* tests/oo.test (oo-14.8): that class mixins are processed in the
-	documented order. [Bug 1998221]
-
-2008-06-19  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:	Updates for 8.6a1 release.
-
-	* README:		Bump version number to 8.6a1
-	* generic/tcl.h:
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2008-06-17  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclClock.c (ClockConvertlocaltoutcObjCmd): Removed left
-	over debug output.
-
-2008-06-17  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/tm.n: Followup to changelog entry 2008-03-18 regarding
-	::tcl::tm::Defaults. Updated the documentation to not only mention the
-	new (underscored) form of environment variable names, but make it the
-	encouraged form as well. [Bug 1914604]
-
-2008-06-17  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclClock.c (ConvertLocalToUTC):
-	* tests/clock.test (clock-63.1): Fixed a bug where the internal
-	ConvertLocalToUTC command segfaulted if passed a dictionary without
-	the 'localSeconds' key. To the best of my knowledge, the bug was not
-	observable in the [clock] command itself.
-
-2008-06-16  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclCmdIL.c (TclInfoFrame): Moved the code looking up the
-	* tests/info.test: information for key 'proc' out of the
-	TCL_LOCATION_BC branch to after the switch, this is common to all
-	frame types. Updated the testsuite to match. This was exposed by the
-	2008-06-08 commit (Miguel), switching uplevel from direct eval to
-	compilation. [Bug 1987851]
-
-2008-06-16  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/ioTrans.test (iortrans-11.*): Fixed same issue as for
-	iortrans.tf-11.*, cleanup of temp file, making this a followup to the
-	entry on 2008-06-10 by myself.
-
-2008-06-13  David Gravereaux  <davygrvy@pobox.com>
-
-	* win/rules.vc: SYMBOLS macro is now being set to zero when $(OPTS) is
-	not available.
-	* win/makefile.vc: The Stubs source files (tclStubLib.c and
-	tclOOStubLib.c) should not be compiled with the -GL flag.
-
-2008-06-13  Joe Mistachkin  <joe@mistachkin.com>
-
-	TIP #285 IMPLEMENTATION
-
-	* doc/Eval.3: Added documentation for the Tcl_CancelEval and
-	Tcl_Canceled functions and the TCL_CANCEL_UNWIND flag bit.
-	* doc/after.n: Corrected the spelling of 'canceled' in the
-	documentation.
-	* doc/interp.n: Added documentation for [interp cancel].
-	* generic/tcl.decls: Added the Tcl_CancelEval and Tcl_Canceled
-	functions to the stubs table.
-	* generic/tcl.h: Added the TCL_CANCEL_UNWIND flag bit.
-	* generic/tclBasic.c: The bulk of the script cancellation
-	functionality is defined here. Added code to initialize and manage the
-	script cancellation hash table in a thread-safe manner. Reset script
-	cancellation flags prior to increasing the nesting level (if the
-	nesting level is currently zero) and always cooperatively check for
-	script cancellation near the start of TclEvalObjvInternal and after
-	invoking async handlers.
-	* generic/tclDecls.h: Regenerated.
-	* generic/tclEvent.c: Call TclFinalizeEvaluation during finalization
-	to cleanup the script cancellation hash table. During [vwait], always
-	cooperatively check for script cancellation. Corrected the spelling of
-	'canceled' in comments to be consistent with the documentation.
-	* generic/tclExecute.c: Reset script cancellation flags prior to
-	increasing the nesting level (if the nesting level is currently zero)
-	and always cooperatively check for script cancellation after invoking
-	async handlers. Prevent [catch] from catching script cancellation when
-	the TCL_CANCEL_UNWIND flag is set (similar to the manner used by TIP
-	143 when a limit has been exceeded).
-	* generic/tclInt.decls: Added TclResetCancellation to the internal
-	stubs table.
-	* generic/tclInt.h: Added asyncCancel and asyncCancelMsg fields to the
-	private Interp structure. Added private interp flag value CANCELED to
-	help control script cancellation.
-	* generic/tclIntDecls.h: Regenerated.
-	* generic/tclInterp.c (Tcl_InterpObjCmd): Added [interp cancel]
-	subcommand.
-	* generic/tclNotify.c (Tcl_DeleteEventSource): Corrected the spelling
-	of 'canceled' in comments to be consistent with the documentation.
-	* generic/tclParse.c: Reset script cancellation flags prior to
-	* generic/tclProc.c: increasing the nesting level (if the nesting
-	level is currently zero) and cooperatively check for script
-	cancellation prior to evaluating commands.
-	* generic/tclStubInit.c: Regenerated.
-	* generic/tclThreadTest.c (Tcl_ThreadObjCmd): Added script
-	cancellation support ([testthread cancel]).
-	Modified [testthread id] to allow querying of the 'main' thread ID.
-	Corrected comments to reflect the actual command syntax. Made
-	[testthread wait] cooperatively check for script cancellation. Added
-	[testthread event] to allow for processing one pending event without
-	blocking.
-	* generic/tclTimer.c: Delay for a maximum of 500 milliseconds prior to
-	checking for async handlers and script cancellation.
-	* tests/cmdAH.test: Changed [interp c] to [interp create].
-	* tests/interp.test: Added and fixed tests for [interp cancel].
-	* tests/thread.test: Added tests for script cancellation via
-	[testthread cancel].
-	* tools/man2help2.tcl: Fixed problems with WinHelp target (see
-	* tools/man2tcl.c: [Bug 1934200], [Bug 1934265], and [Bug 1934272]).
-	* win/makefile.vc: Added 'pdbs' option for Windows build rules to
-	* win/rules.vc:	   allow for non-debug builds with full symbols.
-	* win/tcl.hpj.in: Corrected version for WinHelp target.
-	* win/tclWinNotify.c: Used SleepEx and WaitForSingleObjectEx on
-	* win/tclWinThrd.c: Windows because they are alertable.
-
-2008-06-12  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in:		Add complete deps on tclDTrace.h.
-
-	* generic/tclOO.c:		Use TclOOStubs hooks field to retrieve
-	* generic/tclOODecls.h:		TclOOIntStubs pointer. [Bug 1980953]
-	* generic/tclOOIntDecls.h:
-	* generic/tclOOStubInit.c:
-	* generic/tclOOStubLib.c:
-
-	* generic/tclIORTrans.c:	Fix signed <-> unsigned cast warnings.
-
-	* unix/Makefile.in:		Clean generated tclDTrace.h file.
-	* unix/configure.in (SunOS):	Fix static DTrace-enabled build.
-
-	* unix/tcl.m4 (SunOS-5.11): Fix 64bit amd64 support with gcc & Sun cc.
-	* unix/configure: autoconf-2.59
-
-	* macosx/Tcl.xcodeproj/project.pbxproj:	Add tclIORTrans.c; updates and
-						cleanup for Xcode 3.1/Leopard.
-	* macosx/Tcl.xcode/project.pbxproj:	Sync Tcl.xcodeproj changes.
-	* macosx/README:			Document new build configs.
-
-2008-06-10  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tclEncoding.c(UtfToUtfProc): Avoid unwanted sign extension
-	when converting incomplete UTF-8 sequences. See [Bug 1908443] for
-	details.
-
-2008-06-10  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/ioTrans.test (iortrans.tf-6.1): Fixed the [Bug 1988552],
-	reported by Kevin. Have to close the channel before removal of the
-	file. Fixed same bug in test 'iortrans.tf-11.0', after fixing missing
-	cleanup of the file in 'iortrans.tf-11.*'. Lastly fixed the names of
-	the threaded tests 'iortrans-8.*' to the correct 'iortrans.tf-8.*'.
-
-2008-06-09  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-
-	* generic/tclIORTrans.c (ReflectInput): Fixed a bug triggered by Pat
-	Thoyts <patthoyts@users.sourceforge.net>. Reset the EOF flag after
-	draining the Tcl level into the result buffer, to make sure that the
-	result buffer will be drained as well by repeated calls to
-	ReflectInput should it contain more than one buffer-full of data.
-	Without that reset the higher I/O system will not call on ReflectInput
-	anymore due to the assumed EOF, thus losing the data which did not fit
-	in the buffer of the call which caused the eof and drain.
-
-2008-06-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOCall.c (TclOOGetSortedMethodList): Plug memory leak
-	that occurred when all methods were hidden. [Bug 1987817]
-
-2008-06-08  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	   Compilation of uplevel scripts, allow
-	* generic/tclCompCmds.c:   non-body compiled scripts to access the
-	* generic/tclCompile.c:	   LVT (but not to extend it) and enable the
-	* generic/tclCompile.h:	   canonical list opt to sidestep the
-	* generic/tclExecute.c:	   compiler. [Patch 1973096]
-	* generic/tclProc.c:
-	* tests/uplevel.test:
-
-2008-06-06  Andreas Kupries  <andreask@activestate.com>
-
-	TIP #230 IMPLEMENTATION
-
-	* generic/tclIOCmd.c: Integration of transform commands into 'chan'
-			      ensemble.
-	* generic/tclInt.h: Definitions of the transform commands.
-	* generic/tclIORTrans.c: Implementation of the reflection transforms.
-	* tests/chan.test:  Tests updated for new sub-commands of 'chan'.
-	* tests/ioCmd.test: Tests updated for new sub-commands of 'chan'.
-	* tests/ioTrans.test: Whole new set of tests for the reflection
-			      transform.
-	* unix/Makefile.in: Integration of new files into build rules.
-	* win/Makefile.in:  Integration of new files into build rules.
-	* win/makefile.vc:  Integration of new files into build rules.
-
-	NOTE: The file 'tclIORTrans.c' has a lot of code in common with the
-	      file 'tclIORChan.c', as that made it much easier to develop the
-	      reference implementation as a separate module. Now that the
-	      transforms have been committed the one thing left to do is to go
-	      over both modules and see which of the common parts we can
-	      factor out and share.
-
-2008-06-04  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tclBinary.c: TIP #317 implementation
-	* tests/binary.test:
-
-2008-06-02  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclOO.c (ReleaseClassContents): Fix the one remaining
-	valgrind complaint about oo.test, caused by failing to protect the
-	Object as well as the Class corresponding to a subclass being deleted
-	and hence getting a freed-memory read when attempting to delete the
-	class command. [Bug 1981001]
-
-2008-06-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOOMethod.c (Tcl_NewMethod): Complete the fix of [Bug
-	1981001], previous fix was incomplete though helpful in telling me
-	where to look.
-
-2008-06-01  Joe Mistachkin  <joe@mistachkin.com>
-
-	* win/Makefile.in: Add tclOO genstubs to Windows makefiles and remove
-	* win/makefile.vc: -DBUILD_tcloo because it is no longer required.
-
-2008-06-01  Kevin B. Kenny  <kennykb@acm.org>
-
-	* generic/tclOODecls.h:	   Added the swizzling of DLLEXPORT and
-	* generic/tclOOIntDecls.h: DLLIMPORT needed to make EXTERN work.
-
-	* generic/tclDictObj.c:	 Added missing initializers to the ensemble
-				 map to silence a compiler warning. Thanks to
-				 George Peter Staplin for the report.
-
-	* generic/tclOOMethod.c: Fix a bug where the refcount of a method was
-				 reset if the method was redefined while there
-				 was an active invocation. [Bug 1981001]
-
-2008-06-01  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.decls, unix/Makefile.in (genstubs): Make generation of
-	stub tables correct.
-	* generic/tclOO{Decls.h,IntDecls.h,StubInit.c,StubLib.c}: Fixes to
-	make the generation work correctly, removing subtle differences
-	between output of different versions of stub generator.
-
-2008-06-01  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclOOStubLib.c:	Ensure use of tcl stubs; include in
-	* unix/Makefile.in:		stub lib; disable broken tclOO
-					genstubs
-
-	* generic/tclOO.c:		Make tclOO stubs tables 'static const'
-	* generic/tclOODecls.h:		and stub table pointers MODULE_SCOPE
-	* generic/tclOOIntDecls.h:	(change generated files manually
-	* generic/tclOOStubInit.c:	pending genstubs support for tclOO).
-	* generic/tclOOStubLib.c:
-
-	* generic/tclOO.c:		Fix warnings for 'int<->ptr
-	* generic/tclOOCall.c:		conversion' and 'signed vs unsigned
-	* generic/tclOOMethod.c:	comparison'.
-
-	* tests/msgcat.test:	Fix for ::tcl::mac::locale with @modifier.
-
-	* tools/tsdPerf.tcl:	Use [info sharedlibextension]
-
-	* unix/tclConfig.h.in:	autoheader-2.59
-
-	* macosx/Tcl.xcodeproj/project.pbxproj:	Add new tclOO files; add debug
-	* macosx/README:			configs with corefoundation
-						disabled and with gcov; update
-						to Xcode 3.1.
-
-2008-05-31  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclOO.c (InitFoundation): Correct reference counting for
-	strings used when creating the constructor for classes.
-	* generic/tclOOMethod.c (TclOODelMethodRef): Correct fencepost error
-	in reference counting of method implementation structures.
-	* tests/oo.test (oo-0.5): Added a test to detect a memory leak problem
-	relating to disposal of the core object system.
-
-	TIP#257 IMPLEMENTATION
-
-	* generic/tclBasic.c, generic/tclOOInt.h: Correct declarations.
-	* win/Makefile.in, win/makefile.bc, win/makefile.vc: Build support for
-	Win32, from Joe Mistachkin. [Patch 1980861]
-
-	* generic/tclOO*, doc/*, tests/oo.test: Port of implementation of
-	TclOO to sit directly inside Tcl. Note that this is incomplete (e.g.
-	no build support yet for Windows).
-
-2008-05-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tests/io.test (io-53.9): Need to close chan before removing file.
-
-2008-05-26  Donal K. Fellows  <dkf@users.sf.net>
-
-	* win/makefile.bc:		    Remove deprecated winhelp target.
-	* win/Makefile.in, win/makefile.vc: It didn't work correctly anyway.
-
-2008-05-23  Andreas Kupries  <andreask@activestate.com>
-
-	* win/tclWinChan.c (FileWideSeekProc): Accepted a patch by Alexandre
-	Ferrieux <ferrieux@users.sourceforge.net> to fix the [Bug 1965787].
-	'tell' now works for locations > 2 GB as well instead of going
-	negative.
-
-	* generic/tclIO.c (Tcl_SetChannelBufferSize): Accepted a patch by
-	* tests/io.test: Alexandre Ferrieux <ferrieux@users.sourceforge.net>
-	* tests/chanio.test: to fix the [Bug 1969953]. Buffersize outside of
-	the supported range are now clipped to nearest boundary instead of
-	ignored.
-
-2008-05-22  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclNamesp.c (Tcl_LogCommandInfo):	Restored ability to
-	handle the argument value length = -1. Thanks to Chris Darroch for
-	discovering the bug and providing the fix. [Bug 1968245]
-
-2008-05-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclParse.c (ParseComment):	The new TclParseAllWhiteSpace
-	* tests/parse.test (parse-15.60):	routine has no mechanism to
-	return the "incomplete" status of "\\\n" so calling this routine
-	anywhere that can be reached within a Tcl_ParseCommand() call is a
-	mistake. In particular, ParseComment() must not use it. [Bug 1968882]
-
-2008-05-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclNamesp.c (Tcl_SetNamespaceUnknownHandler): Corrected odd
-	logic for handling installation of namespace unknown handlers which
-	could lead too very strange things happening in the error case.
-
-2008-05-16  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompile.c: Fix crash with tcl_traceExec. Found and fixed
-	by Alexander Pasadyn. [Bug 1964803]
-
-2008-05-15  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* win/makefile.vc: We should use the thread allocator for threaded
-	* win/rules.vc:	   builds. Added 'tclalloc' option to disable.
-
-2008-05-09  George Peter Staplin  <georgeps@xmission.com>
-
-	* tools/tsdPerf.c:	A loadable Tcl extension for testing TSD
-	performance.
-	* tools/tsdPerf.tcl:	A simplistic tool that uses the thread
-	extension and tsdPerf.so to get some performance metrics by,
-	simulating, simple TSD contention.
-
-2008-05-09  George Peter Staplin  <georgeps@xmission.com>
-
-	* generic/tcl.h:	Make Tcl_ThreadDataKey a void *.
-	* generic/tclInt.h:	Change around some function names and add some
-	new per-platform declarations for thread-specific data functions.
-	* generic/tclThread.c:	Make use of of the new function names that no
-	longer have a Tclp prefix.
-	* generic/tclThreadStorage.c: Replace the core thread-specific data
-	(TSD) mechanism with an array offset solution that eliminates the hash
-	tables, and only uses one slot of native TSD. Many thanks to Kevin B.
-	Kenny for his help with this.
-
-	* unix/tclUnixThrd.c:	Add platform-specific TSD functions for use by
-	* win/tclWinThrd.c:	tclThreadStorage.c.
-
-2008-05-09  Kevin B. Kenny  <kennykb@acm.org>
-
-	* tests/dict.test (dict-19.2): Corrected a bug where the test was
-	changed to use [apply] instead of a temporary proc, but the cleanup
-	script still attempted to delete the temporary proc.
-
-2008-05-07  Donal K. Fellows  <dkf@cspool38.cs.man.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileDictAppendCmd): Fix silly off-by
-	one error that caused a crash every time a compiled 'dict append' with
-	more than one argument was used. Found by Colin McCormack.
-
-2008-05-02  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tclBasic.c:	 Converted the [binary] command into an
-	* generic/tclBinary.c:	 ensemble.
-	* generic/tclInt.h:
-	* test/binary.test:	 Updated the error tests for ensemble errors.
-
-	* generic/tclFileName.c: Reverted accidental commit of TIP 316 APIs.
-
-2008-04-27  Donal K. Fellows  <dkf@users.sf.net>
-
-	* */*.c: A large tranche of getting rid of pre-C89-isms; if your
-	compiler doesn't support things like proper function declarations,
-	'void' and 'const', borrow a proper one when building Tcl. (The header
-	files allow building things that link against Tcl with really ancient
-	compilers still; the requirement is just when building Tcl itself.)
-
-2008-04-26  Zoran Vasiljevic  <vasiljevic@users.sourceforge.net>
-
-	* generic/tclAsync.c: Tcl_AsyncDelete(): panic if attempt to locate
-	handler token fails. Happens when some other thread attempts to delete
-	somebody else's token.
-
-	Also, panic early if we find out the wrong thread attempting to delete
-	the async handler (common trap). As, only the one that created the
-	handler is allowed to delete it.
-
-2008-04-24  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/ioCmd.test: Extended testsuite for reflected channel
-	implementation. Added test cases about how it handles if the rug is
-	pulled out from under a channel (= killing threads, interpreters
-	containing the tcl command for a channel, and channel sitting in a
-	different interpreter/thread.)
-
-	* generic/tclIORChan.c: Fixed the bugs exposed by the new testcases,
-	redone most of the cleanup and exit handling.
-
-2008-04-21  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclIOUtil.c:		Removed all code delimited by
-	* generic/tclTest.c:		USE_OBSOLETE_FS_HOOKS, completing
-	* tests/ioCmd.test:		the deprecation path for these
-	* tests/ioUtil.test (removed):	obsolete interfaces. (Code was active
-	in Tcl 8.4, present but enabled only by customized compile switch in
-	Tcl 8.5, and now completely gone for Tcl 8.6). Also removed all tests
-	relevant only to the removed interfaces.
-
-2008-04-19  George Peter Staplin  <georgeps@xmission.com>
-
-	* doc/Ensemble.3: Fix a typo: s/defiend/defined/
-	Thanks to hat0 for spotting this.
-
-2008-04-16  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclInt.h:		Make stubs tables 'static const' and
-	* generic/tclStubInit.c:	export only module-scope pointers to
-	* generic/tclStubLib.c:		the main stubs tables (for package
-	* tools/genStubs.tcl:		initialization). [Patch 1938497]
-	* generic/tclBasic.c (Tcl_CreateInterp):
-	* generic/tclTomMathInterface.c (TclTommath_Init):
-
-	* generic/tclInt.h:		Revise Tcl_SetNotifier() to use a
-	* generic/tclNotify.c:		module-scope hooks table instead of
-	* generic/tclStubInit.c:	runtime stubs-table modification;
-	* macosx/tclMacOSXNotify.c:	ensure all hookable notifier functions
-	* win/tclWinNotify.c:		check for hooks; remove hook checks in
-	* unix/tclUnixNotfy.c:		notifier API callers. [Patch 1938497]
-
-2008-04-15  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (CopyData):	Applied another patch by Alexandre
-	* io.test (io-53.8a):		Ferrieux <ferrieux@users.sf.net>,
-	* chanio.test (chan-io-53.8a):	to shift EOF handling to the async
-	part of the command if a callback is specified, should the channel be
-	at EOF already when fcopy is called. Testcase by myself.
-
-2008-04-15  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/Makefile.in:	Adjust tclDTrace.h dependencies for removal
-				of tclStubLib.o from TCL_OBJS. [Bug 1942795]
-
-2008-04-14  Kevin B. Kenny  <kennykb@acm.org>
-
-	* unix/tclUnixTime.c (NativeGetTime): Removed obsolete use of
-	'struct timezone' in the call to 'gettimeofday'. [Bug 1942197]
-
-	* tests/clock.test (clock-33.5, clock-33.5a, clock-33.8, clock-33.8a):
-	Added comments to the test that it can fail on a heavily loaded
-	system.
-
-2008-04-10  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIOCmd.c (Tcl_FcopyObjCmd): Keeping check for negative
-	values, changed to not be an error, but behave like the special value
-	-1 (copy all, default).
-
-	* tests/iocmd.test (iocmd-15.{12,13}): Removed.
-
-	* tests/io.test (io-52.5{,a,b}): Reverted last change, added
-	* tests/chanio.test (chan-io-52.5{,a,b}): comment regarding the
-	meaning of -1, added two more testcases for other negative values,
-	and input wrapped to negative.
-
-2008-04-09  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/{fCmd,unixFCmd,winFCmd,winFile}.test: Tidying up of the test
-	suite to make better use of tcltest2 and be clearer about what is
-	being tested.
-
-	* win/Makefile.in (html): Added target for doing convenient
-	documentation builds, mirroring the one from unix/Makefile.
-
-2008-04-09  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/chanio.test (chan-io-52.5): Removed '-size -1' from test,
-	* tests/io.test (io-52.5): does not seem to have any bearing, and was
-	an illegal value. Test case is not affected by the value of -size,
-	test flag restoration and that evrything was properly copied.
-
-	* generic/tclIOCmd.c (Tcl_FcopyObjCmd): Added checking of -size value
-	* tests/ioCmd.test (iocmd-15.{13,14}): to reject negative values, and
-	values overflowing 32-bit signed. Basic patch by Alexandre Ferrieux
-	<ferrieux@users.sourceforge.net>, with modifications from me to
-	separate overflow from true negative value. Extended testsuite. [Bug
-	1557855]
-
-2008-04-09  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tests/chanio.test (chan-io-53.8,53.9,53.10): Fix typo & quoting for
-	* tests/io.test (io-53.8,53.9,53.10):	       spaces in builddir path
-
-2008-04-08  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c: Added comments to the alignment macros used in
-	GrowEvaluationStack() and friends.
-
-2008-04-08  Daniel Steffen  <das@users.sourceforge.net>
-
-	* tools/genStubs.tcl:	Revert erroneous 2008-04-02 change marking
-				*StubsPtr as EXTERN instead of extern.
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclTomMathDecls.h:
-
-2008-04-07  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/io.test (io-53.10): Testcase for bi-directional fcopy.
-	* tests/chanio.test:
-	* generic/tclIO.c: Additional changes to data structures for fcopy and
-	* generic/tclIO.h: channels to perform proper cleanup in case of a
-	channel having two background copy operations running as is now
-	possible.
-
-	* generic/tclIO.c (BUSY_STATE, CheckChannelErrors, TclCopyChannel):
-	New macro, and the places using it. This change allows for
-	bi-directional fcopy on channels. Thanks to Alexandre Ferrieux
-	<ferrieux@users.sourceforge.net> for the patch. [Bug 1350564]
-
-2008-04-07  Reinhard Max  <max@suse.de>
-
-	* generic/tclStringObj.c (Tcl_AppendFormatToObj): Fix [format {% d}]
-	so that it behaves the same way as in 8.4 and as C's printf().
-	* tests/format.test: Add a test for '% d' and '%+d'.
-
-2008-04-05  Kevin B. Kenny  <kennykb@acm.org>
-
-	* win/tclWinFile.c: (WinSymLinkDirectory): Fixed a problem that Tcl
-	was creating an NTFS junction point (IO_REPARSE_TAG_MOUNT_POINT) but
-	filling in the union member for a Vista symbolic link. We had gotten
-	away with this error because the union member
-	(SymbolicLinkReparseBuffer) was misdefined in this file and in the
-	'winnt.h' in early versions of MinGW. MinGW 3.4.2 has the correct
-	definition of SymbolicLinkReparseBuffer, exposing the mismatch, and
-	making tests cmdAH-19.4.1, fCmd-28.*, and filename-11.* fail.
-	* tests/chanio.test (chan-io-53.9):
-	* tests/io.test (io-53.9): Made test cleanup robust against the
-	possibility of slow process shutdown on Windows.
-
-	* win/tcl.m4: Added -D_CRT_SECURE_NO_DEPRECATE and
-	-DCRT_NONSTDC_NO_DEPRECATE to the MSVC compilation flags so that the
-	compilation doesn't barf on perfectly reasonable Posix system calls.
-	* win/configure: Manually patched (don't have the right autoconf to
-	hand).
-
-2008-04-04  Andreas Kupries  <andreask@activestate.com>
-
-	* tests/io.test (io-53.9): Added testcase for [Bug 780533], based
-	* tests/chanio.test: on Alexandre's test script. Also fixed problem
-	with timer in preceding test, was not canceled properly in the ok case
-
-2008-04-04  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIORChan.c (ReflectOutput): Allow zero return from write
-	when input was zero-length anyway. Otherwise keept it an error, and
-	separate the message from 'written too much'.
-
-	* tests/ioCmd.test (iocmd-24.6): Testcase updated for changed message.
-
-	* generic/tclIORChan.c (ReflectClose): Added missing removal of the
-	now closed channel from the reflection map. Before we could crash the
-	system by invoking 'chan postevent' on a closed reflected channel,
-	dereferencing the dangling pointer in the map.
-
-	* tests/ioCmd.test (iocmd-31.8): Testcase for the above.
-
-2008-04-03  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (CopyData): Applied patch [Bug 1932639] to
-	* tests/io.test: prevent fcopy from calling -command synchronously
-	* tests/chanio.test: the first time. Thanks to Alexandre Ferrieux
-	<ferrieux@users.sourceforge.net> for report and patch.
-
-2008-04-02  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tcl.decls:	Remove 'export' declarations of symbols now
-				only in libtclstub and no longer in libtcl.
-
-	* generic/tclStubLib.c:	Make symbols in libtclstub.a MODULE_SCOPE to
-	* tools/genStubs.tcl:	avoid exporting them from libraries that link
-				with -ltclstub; constify tcl*StubsPtr and stub
-				table hook pointers. [Bug 1819422]
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclTomMathDecls.h:
-
-2008-04-02  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclIO.c (CopyData): Applied patch for fcopy problem [Bug
-	780533], with many thanks to Alexandre Ferrieux
-	<ferrieux@users.sourceforge.net> for tracking it down and providing a
-	solution. Still have to convert his test script into a proper test
-	case.
-
-2008-04-01  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclStrToD.c: Applied patch for [Bug 1839067] (fp rounding
-	* unix/tcl.m4:	       setup on solaris x86, native cc), provided by
-			       Michael Schlenker.
-
-2008-04-01  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStubLib.c:	Removed needless #ifdef complexity.
-
-	* generic/tclStubLib.c (Tcl_InitStubs):	Added missing error message.
-	* generic/tclPkg.c (Tcl_PkgInitStubsCheck):
-
-	* README:		Bump version number to 8.6a0
-	* generic/tcl.h:
-	* library/init.tcl:
-	* macosx/Tcl-Common.xcconfig:
-	* macosx/Tcl.pbproj/default.pbxuser:
-	* macosx/Tcl.pbproj/project.pbxproj:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/README:
-	* win/configure.in:
-	* win/makefile.bc:
-	* win/tcl.m4:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-	* generic/tclBasic.c:	Revised stubs-generation tool and interp
-	* tools/genStubs.tcl:	creation so that "tclStubsPtr" is not present
-	* unix/Makefile.in:	in libtcl.so, but is present only in
-	* win/Makefile.in:	libtclstub.a. This tightens up the rules for
-	* win/makefile.bc:	users of the stubs interfaces. [Bug 1819422]
-	* win/makefile.vc:
-
-	* generic/tclDecls.h:	make genstubs
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclTomMathDecls.h:
-
-2008-03-30  Kevin Kenny  <kennykb@acm.org>
-
-	* generic/tclInt.h (TclIsNaN):
-	* unix/configure.in: Added code to the configurator to check for a
-			     standard isnan() macro and use it if one is
-			     found. This change avoids bugs where the test of
-			     ((d) != (d)) is optimized away by an
-			     overaggressive compiler. [Bug 1783544]
-	* generic/tclObj.c: Added missing #include <math.h> needed to locate
-			    isnan() after the above change.
-
-	* unix/configure: autoconf-2.61
-
-	* tests/mathop.test (mathop-25.9, mathop-25.14): Modified tests to
-	deal with (slightly buggy) math libraries in which pow() returns an
-	incorrectly rounded result. [Bug 1808174]
-
-2008-03-26  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.5.2 TAGGED FOR RELEASE ***
-
-	* generic/tcl.h:	Bump to 8.5.2 for release.
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-	* changes:		Updated for 8.5.2 release.
-
-2008-03-28  Donal K. Fellows  <dkf@users.sf.net>
-
-	* tests/fCmd.test: Substantial rewrite to use many more tcltest
-	features. Great reduction in quantity of [catch] gymnastics. Several
-	buggy tests fixed, including one where the result of the previous test
-	was being checked!
-
-2008-03-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* library/tzdata/America/Marigot:
-	* library/tztata/America/St_Barthelemy:
-	* library/tzdata/America/Argentina/San_Luis:
-	* library/tzdata/Asia/Ho_Chi_Minh:
-	* library/tzdata/Asia/Kolkata:	(new files)
-	* library/tzdata/America/Caracas:
-	* library/tzdata/America/Havana:
-	* library/tzdata/America/Santiago:
-	* library/tzdata/America/Argentina/Buenos_Aires:
-	* library/tzdata/America/Argentina/Catamarca:
-	* library/tzdata/America/Argentina/Cordoba:
-	* library/tzdata/America/Argentina/Jujuy:
-	* library/tzdata/America/Argentina/La_Rioja:
-	* library/tzdata/America/Argentina/Mendoza:
-	* library/tzdata/America/Argentina/Rio_Gallegos:
-	* library/tzdata/America/Argentina/San_Juan:
-	* library/tzdata/America/Argentina/Tucuman:
-	* library/tzdata/America/Argentina/Ushuaia:
-	* library/tzdata/Asia/Baghdad:
-	* library/tzdata/Asia/Calcutta:
-	* library/tzdata/Asia/Damascus:
-	* library/tzdata/Asia/Saigon:
-	* library/tzdata/Pacific/Easter:
-		Changes up to and including Olson's tzdata2008b.
-
-2008-03-27  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/tcl.m4 (SunOS-5.1x): Fix 64bit support for Sun cc. [Bug
-	1921166]
-
-	* unix/configure: autoconf-2.59
-
-2008-03-26  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:		Updated for 8.5.2 release.
-
-2008-03-24  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* generic/tclBinary.c: [Bug 1923966] - crash in binary format
-	* tests/binary.test:   Added tests for the above crash condition.
-
-2008-03-21  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/switch.n: Clarified documentation in respect of two-argument
-	invocation. [Bug 1899962]
-
-	* tests/switch.test: Added more tests of regexp-mode compilation of
-	the [switch] command. [Bug 1854435]
-
-2008-03-20  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tcl.h, generic/tclThreadAlloc.c: Tidied up the declarations
-	of Tcl_GetMemoryInfo so that it is always defined. Will panic when
-	called against a Tcl that was previously built without it at all,
-	which is OK because that also indicates a serious mismatch between
-	memory configuration options.
-
-2008-03-19  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tcl.h, generic/tclThreadAlloc.c (Tcl_GetMemoryInfo): Make
-	sure this function is available when direct linking. [Bug 1868171]
-
-	* tests/reg.test (reg-33.14): Marked nonPortable because some
-	environments have small default stack sizes. [Bug 1905562]
-
-2008-03-18  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tm.tcl (::tcl::tm::UnknownHandler): Changed 'source' to
-	'source -encoding utf-8'. This fixes a portability problem of Tcl
-	Modules pointed out by Don Porter. By using plain 'source' we were at
-	the mercy of 'encoding system', making modules less portable than they
-	could be. The exact scenario: A writes a TM in some weird encoding
-	which is A's system encoding, distributes it, and somewhere else it
-	cannot be read/used because the system encoding is different. Forcing
-	the use of utf-8 makes the module portable.
-
-	***INCOMPATIBILITY*** for all Tcl Modules already written in non-utf-8
-	compatible encodings.
-
-2008-03-18  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c:	Patch from Miguel Sofer to correct the
-	alignment of memory allocated by GrowEvaluationStack(). [Bug 1914503]
-
-2008-03-18  Andreas Kupries  <andreask@activestate.com>
-
-	* library/tm.tcl (::tcl::tm::Defaults): Modified handling of
-	environment variables. Solution slightly different than proposed in
-	the report. Using the underscored form TCLX_y_TM_PATH even if
-	TCLX.y_TM_PATH exists. Also using a loop to cut prevent code
-	replication. [Bug 1914604]
-
-2008-03-16  Donal K. Fellows  <dkf@users.sf.net>
-
-	* generic/tclCompCmds.c (TclCompileDictForCmd): Correct the handling
-	of stack space calculation (the jump pattern used was confusing the
-	simple-minded code doing the calculations). [Bug 1903325]
-
-	* doc/lreplace.n: Clarified documentation of what happens with
-	negative indices. [Bug 1905809] Added example, tidied up formatting.
-
-2008-03-14  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (OldMathFuncProc):	Same workaround protection
-	from bad TclStackAlloc() alignment. Thanks George Peter Staplin.
-
-	* generic/tclCmdIL.c (Tcl_LsortObjCmd):	Use ckalloc() to allocate
-	SortElement arrays instead of TclStackAlloc() which isn't getting
-	alignment right. Workaround for [Bug 1914503].
-
-2008-03-14  Reinhard Max  <max@suse.de>
-
-	* generic/tclTest.c:  Ignore the return value of write() when we are
-	* unix/tclUnixPipe.c: about to exit anyways.
-
-2008-03-13  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/configure.in: Use backslash-quoting instead of double-quoting
-	* unix/tcl.m4:	     for lib paths in tclConfig.sh. [Bug 1913622]
-	* unix/configure:    autoconf-2.59
-
-2008-03-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:		Updated for 8.5.2 release.
-
-	* generic/tclStrToD.c:	Resolve identifier conflict over "pow10" with
-	libm in Cygwin and DJGPP. Thanks to Gordon Schumacher and Philip
-	Moore. [Patch 1800636]
-
-2008-03-12  Daniel Steffen  <das@users.sourceforge.net>
-
-	* macosx/Tcl.xcodeproj/project.pbxproj:	Add support for Xcode 3.1
-	* macosx/Tcl.xcodeproj/default.pbxuser:	CODE_SIGN_IDENTITY and
-	* macosx/Tcl-Common.xcconfig:		'xcodebuild install'.
-
-2008-03-12  Andreas Kupries  <andreask@activestate.com>
-
-	* doc/info.n: Replaced {expand} with {*}.
-
-2008-03-12  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/Makefile.in (install-libraries):	Bump http to 2.7
-	* win/Makefile.in (install-libraries):	Added -myaddr option to allow
-	* library/http/http.tcl (http::geturl):	control of selected socket
-	* library/http/pkgIndex.tcl:		interface. [Bug 559898]
-	* doc/http.n, tests/http.test:		Added -keepalive and
-	-protocol 1.1 with chunked transfer encoding support. [Bug 1063703,
-	1470377, 219225] (default keepalive is 0)
-	Added ability to override Host in -headers. [Bug 928154]
-	Added -strict option to control URL validation on per-call basis.
-	[Bug 1560506]
-
-2008-03-11  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* library/http/http.tcl (http::geturl): Add -method option to support
-	* tests/http.test (http-3.1):		http PUT and DELETE requests.
-	* doc/http.n:				[Bug 1599901, 862554]
-
-	* library/http/http.tcl: Whitespace changes, code cleanup. Allow http
-	to be re-sourced without overwriting http state.
-
-2008-03-11  Daniel Steffen  <das@users.sourceforge.net>
-
-	* generic/tclEncoding.c (LoadEscapeEncoding): Avoid leaking escape
-	sub-encodings, fixes encoding-11.1 failing after iso2022-jp loaded.
-	[Bug 1893053]
-
-	* macosx/tclMacOSXNotify.c: Avoid using CoreFoundation after fork() on
-	Darwin 9 even when TclpCreateProcess() uses vfork().
-
-	* macosx/Tcl.xcodeproj/project.pbxproj:	Add support for Xcode 3.1 and
-	* macosx/Tcl.xcodeproj/default.pbxuser:	configs for building with
-	* macosx/Tcl-Common.xcconfig:		gcc-4.2 and llvm-gcc-4.2.
-
-	* unix/tclUnixPort.h:			Workaround vfork() problems in
-						llvm-gcc-4.2.1 -O4 build.
-
-	* unix/tclUnixPort.h:			Move MODULE_SCOPE compat
-						define to top. [Bug 1911102]
-
-	* macosx/GNUmakefile:			Fix quoting to allow paths
-	* macosx/Tcl-Common.xcconfig:		to ${builddir} and
-	* unix/Makefile.in:			${INSTALL_ROOT} to contain
-	* unix/configure.in:			spaces.
-	* unix/install-sh:
-	* unix/tcl.m4:
-	* tests/ioCmd.test:
-
-	* unix/configure:			autoconf-2.59
-
-	* unix/Makefile.in (install-strip):	Strip non-global symbols from
-						dynamic library.
-
-	* unix/tclUnixNotfy.c:			Fix warning.
-
-	* tests/exec.test (exec-9.7):		Reduce timing sensitivity
-	* tests/socket.test (socket-2.11):	(esp. on multi-proc machines).
-
-	* tests/fCmd.test (fCmd-9.4):		Skip on Darwin 9 (xfail).
-
-2008-03-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclVar.c (TclDeleteNamespaceVars):
-	* tests/var.test (var-8.2): Unset traces on vars should be called with
-	a FQ named during namespace deletion. This was causing infinite loops
-	when unset traces recreated the var, as reported by Julian Noble. [Bug
-	1911919]
-
-2008-03-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:		Updated for 8.5.2 release.
-
-	* doc/http.n:	Revised to indicate that [package require http 2.5.5]
-	is needed to get all the documented commands ([http::meta]).
-
-	* generic/tclEvent.c (TclDefaultBgErrorHandlerObjCmd):	Added error
-	* tests/event.test (event-5.*):	checking to protect against callers
-	passing invalid return options dictionaries. [Bug 1901113]
-
-	* generic/tclBasic.c (ExprAbsFunc):	Revised so that the abs()
-	* tests/expr.test:	function and the [::tcl::mathfunc::abs]
-	command do not return the value of -0, or equivalent values with more
-	alarming string reps like -1e-350. [Bug 1893815]
-
-2008-03-07  Andreas Kupries  <andreask@activestate.com>
-
-	* generic/tclResult.c (ReleaseKeys): Workaround for [Bug 1904907].
-	Reset the return option keys to NULL to allow full re-initialization
-	by GetKeys(). This introduces a memory leak for the key objects, but
-	gets us around a crash in the finalization of reflected channels when
-	handling returns, either at compile- or runtime. In both cases we
-	access the keys after they have been released by their thread exit
-	handler. A proper fix is entangled with the untangling of the
-	finalization ordering and attendant issues. For now we choose the
-	lesser evil.
-
-2008-03-07  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclExecute.c (Tcl_ExprObj):	Revised expression bytecode
-	compiling so that bytecodes invalid due to changing context or due to
-	the difference between expressions and scripts are not reused. [Bug
-	1899164]
-
-	* generic/tclCmdAH.c:	Revised direct evaluation implementation of
-	[expr] so that [expr $e] caches compiled bytecodes for the expression
-	as the intrep of $e.
-
-	* tests/execute.test (execute-6.*):	More tests checking that
-	script bytecode is invalidated in the right situations.
-
-2008-03-07  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* win/configure.in: Add AC_HEADER_STDC to support msys/win64.
-
-2008-03-06  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/namespace.n: Minor tidying up. [Bug 1909019]
-
-2008-03-04  Don Porter  <dgp@users.sourceforge.net>
-
-	* tests/execute.test (6.3,4):	Added tests for [Bug 1899164].
-
-2008-03-03  Reinhard Max  <max@suse.de>
-
-	* unix/tclUnixChan.c: Fix mark and space parity on Linux, which uses
-	CMSPAR instead of PAREXT.
-
-2008-03-02  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclNamesp.c (GetNamespaceFromObj):
-	* tests/interp.test (interp-28.2): Spoil the intrep of an nsNameType
-	obj when the reference crosses interpreter boundaries.
-
-2008-02-29  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclResult.c (Tcl_SetReturnOptions):	Revised the refcount
-	management of Tcl_SetReturnOptions to become that of a conventional
-	Consumer routine. Thanks to Peter Spjuth for pointing out the
-	difficulties calling Tcl_SetReturnOptions with non-0-count value for
-	options.
-	* generic/tclExecute.c (INST_RETURN_STK): Revised the one caller
-	within Tcl itself which passes a non-0-count value to
-	Tcl_SetReturnOptions().
-
-	* generic/tclBasic.c (Tcl_AppendObjToErrorInfo):	Revised the
-	refcount management of Tcl_AppendObjToErrorInfo to become that of a
-	conventional Consumer routine. This preserves the ease of use for the
-	overwhelming common callers who pass in a 0-count value, but makes the
-	proper call with a non-0-count value less surprising.
-	* generic/tclEvent.c (TclDefaultBgErrorHandlerObjCmd):	Revised the
-	one caller within Tcl itself which passes a non-0-count value to
-	Tcl_AppendObjToErrorInfo().
-
-2008-02-28  Joe English  <jenglish@users.sourceforge.net>
-
-	* unix/tclPort.h, unix/tclCompat.h, unix/tclUnixChan.h: Reduce scope
-	of <sys/filio.h> and <sys/ioctl.h> #includes. [Patch 1903339]
-
-2008-02-28  Joe English  <jenglish@users.sourceforge.net>
-
-	* unix/tclUnixChan.c, unix/tclUnixNotfy.c, unix/tclUnixPipe.c:
-	Consolidate all code conditionalized on -DUSE_FIONBIO into one place.
-	* unix/tclUnixPort.h, unix/tclUnixCompat.c: New routine
-	TclUnixSetBlockingMode(). [Patch 1903339]
-
-2008-02-28  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclBasic.c (TclEvalObjvInternal):	Plug memory leak when
-	an enter trace deletes or changes the command, prompting a reparsing.
-	Don't let the second pass lose commandPtr value allocated during the
-	first pass.
-
-	* generic/tclCompExpr.c (ParseExpr):	Plug memory leak in error
-	message generation.
-
-	* generic/tclStringObj.c (Tcl_AppendFormatToObj): [format %llx $big]
-	leaked an mp_int.
-
-	* generic/tclCompCmds.c (TclCompileReturnCmd):	The 2007-10-18 commit
-	to optimize compiled [return -level 0 $x] [RFE 1794073] introduced a
-	memory leak of the return options dictionary. Fixing that.
-
-2008-02-27  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/http.tcl: [Bug 705956] - fix inverted logic when
-	cleaning up socket error in geturl.
-
-2008-02-27  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/clock.n: Corrected minor indentation gaffe in the penultimate
-	paragraph. [Bug 1898025]
-	* generic/tclClock.c (ParseClockFormatArgs): Changed to check that the
-	clock value is in the range of a 64-bit integer. [Bug 1862555]
-	* library/clock.tcl (::tcl::clock::format, ::tcl::clock::scan,
-	(::tcl::clock::add, ::tcl::clock::LocalizeFormat): Fixed bugs in
-	caching of localized strings that caused weird results when localized
-	date/time formats were used. [Bug 1902423]
-	* tests/clock.test (clock-61.*, clock-62.1): Regression tests for [Bug
-	1862555] and [Bug 1902423].
-
-2008-02-26  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tclIOUtil.c, unix/tclUnixPort.h, unix/tclUnixChan.c:
-	Remove dead/unused portability-related #defines and unused conditional
-	code. See [Patch 1901828] for discussion.
-
-2008-02-26  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tclIORChan.c (enum MethodName),
-	* generic/tclCompExpr.c (enum Marks): More stray trailing ","s
-
-2008-02-26  Joe English  <jenglish@users.sourceforge.net>
-
-	* unix/configure.in(socklen_t test): Define socklen_t as "int" if
-	missing, not "unsigned". Use AC_TRY_COMPILE instead of
-	AC_EGREP_HEADER.
-	* unix/configure: regenerated.
-
-2008-02-26  Joe English  <jenglish@users.sourceforge.net>
-
-	* generic/tclCompile.h: Remove stray trailing "," from enum
-	InstOperandType definition (C99ism).
-
-2008-02-26  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* generic/tclUtil.c (TclReToGlob): Fix the handling of the last star
-	* tests/regexpComp.test:	   possibly being escaped in
-	determining right anchor. [Bug 1902436]
-
-2008-02-26  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/pkgIndex.tcl: Set version 2.5.5
-	* library/http/http.tcl:     It is better to do the [eof] check after
-	trying to read from the socket. No clashes found in testing. Added
-	http::meta command to access the http headers. [Bug 1868845]
-
-2008-02-22  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* library/http/pkgIndex.tcl: Set version 2.5.4
-	* library/http/http.tcl:     Always check that the state array exists
-	in the http::status command. [Bug 1818565]
-
-2008-02-13  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Bump version number to 8.5.2b1 to distinguish
-	* library/init.tcl:	CVS development snapshots from the 8.5.1 and
-	* unix/configure.in:	8.5.2 releases.
-	* unix/tcl.spec:
-	* win/configure.in:
-	* README
-
-	* unix/configure:	autoconf (2.59)
-	* win/configure:
-
-2008-02-12  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* generic/tclCompCmds.c (TclCompileSwitchCmd): Corrected logic for
-	* tests/switch.test (switch-10.15): handling -nocase compilation; the
-	-exact -nocase option cannot be compiled currently. [Bug 1891827]
-
-	* unix/README: Documented missing configure flags. [Bug 1799011]
-
-2008-02-06  Kevin B. Kenny  <kennykb@acm.org>
-
-	* doc/clock.n (%N): Corrected an error in the explanation of the %N
-	format group.
-	* generic/tclClock.c (ClockParseformatargsObjCmd):
-	* library/clock.tcl (::tcl::clock::format):
-	* tests/clock.test (clock-1.0, clock-1.4):
-	Performance enhancements in [clock format] (moving the analysis of
-	$args into C code, holding on to Tcl_Objs with resolved command names,
-	[lassign] in place of [foreach], avoiding [namespace which] for
-	command resolution).
-
-2008-02-04  Don Porter  <dgp@users.sourceforge.net>
-
-	*** 8.5.1 TAGGED FOR RELEASE ***
-
-	* changes:		Updated for 8.5.1 release.
-
-	* generic/tcl.h:	Bump to 8.5.1 for release.
-	* library/init.tcl:
-	* tools/tcl.wse.in:
-	* unix/configure.in:
-	* unix/tcl.spec:
-	* win/configure.in:
-
-	* unix/configure:	autoconf-2.59
-	* win/configure:
-
-2008-02-04  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclExecute.c (INST_CONCAT1): Fix optimisation for in-place
-	concatenation (was going over String type)
-
-2008-02-02  Daniel Steffen  <das@users.sourceforge.net>
-
-	* unix/configure.in (Darwin):	Correct Info.plist year substitution
-					in non-framework builds.
-
-	* unix/configure:		autoconf-2.59
-
-2008-01-30  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclInterp.c (Tcl_GetAlias): Fix for [Bug 1882373], thanks go
-	to an00na.
-
-2008-01-30  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* tools/tcltk-man2html.tcl: Reworked manual page scraper to do a
-	proper job of handling references to Ttk options. [Tk Bug 1876493]
-
-2008-01-29  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
-
-	* doc/man.macros (SO, SE): Adjusted macros so that it is possible for
-	Ttk to have its "standard options" on a manual page that is not called
-	"options". [Tk Bug 1876493]
-
-2008-01-25  Don Porter  <dgp@users.sourceforge.net>
-
-	* changes:		Updated for 8.5.1 release.
-
-2008-01-23  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclInt.h:		New macro TclGrowParseTokenArray() to
-	* generic/tclCompCmds.c:	simplify code that might need to grow
-	* generic/tclCompExpr.c:	an array of Tcl_Tokens in the parsePtr
-	* generic/tclParse.c:		field of a Tcl_Parse. Replaces the
-	TclExpandTokenArray() routine via replacing:
-		int needed = parsePtr->numTokens + growth;
-		while (needed > parsePtr->tokensAvailable) {
-		    TclExpandTokenArray(parsePtr);
-		}
-	with:
-		TclGrowParseTokenArray(parsePtr, growth);
-	This revision merged over from dgp-refactor branch.
-
-	* generic/tclCompile.h:	Demote TclCompEvalObj() from internal stubs to
-	* generic/tclInt.decls:	a MODULE_SCOPE routine declared in
-	tclCompile.h.
-
-	* generic/tclIntDecls.h:	make genstubs
-	* generic/tclStubInit.c:
-
-2008-01-22  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclTimer.c (AfterProc):	Replace Tcl_EvalEx() with
-	Tcl_EvalObjEx() to evaluate [after] callbacks. Part of trend to favor
-	compiled execution over direct evaluation.
-
-2008-01-22  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCmdIl.c (Tcl_LreverseObjCmd):
-	* tests/cmdIL.test (cmdIL-7.7): Fix crash on reversing an empty list.
-	[Bug 1876793]
-
-2008-01-20  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* unix/README: Minor typo fixes [Bug 1853072]
-
-	* generic/tclIO.c (TclGetsObjBinary): Operate on topmost channel.
-	[Bug 1869405] (Ficicchia)
-
-2008-01-17  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclCompExpr.c:	Revision to preserve parsed intreps of
-	numeric and boolean literals when compiling expressions with (optimize
-	== 1).
-
-2008-01-15  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclCompExpr.c: Add an 'optimize' argument to
-	* generic/tclCompile.c:	 TclCompileExpr() to profit from better
-	* generic/tclCompile.h:	 literal management according to usage.
-	* generic/tclExecute.c:
-
-	* generic/tclCompExpr.c: Fix literal leak in exprs [Bug 1869989] (dgp)
-	* generic/tclExecute.c:
-	* tests/compExpr.test:
-
-	* doc/proc.n: Changed wording for access to non-local variables; added
-	mention to [namespace upvar]. Lame attempt at dealing with
-	documentation. [Bug 1872708]
-
-2008-01-15  Miguel Sofer  <msofer@users.sf.net>
-
-	* generic/tclBasic.c:	 Replacing 'operator' by 'op' in the def of
-	* generic/tclCompExpr.c: struct TclOpCmdClientData to accommodate C++
-	* generic/tclCompile.h:	 compilers. [Bug 1855644]
-
-2008-01-13  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* win/tclWinSerial.c (SerialCloseProc, TclWinOpenSerialChannel): Use
-	critical section for read & write side. [Bug 1353846] (newman)
-
-2008-01-11  Miguel Sofer  <msofer@users.sf.net>
-
-	* unix/tclUnixThrd.c (TclpThreadGetStackSize): Restore stack checking
-	functionality in freebsd. [Bug 1850424]
-
-	* unix/tclUnixThrd.c (TclpThreadGetStackSize): Fix for crash in
-	freebsd. [Bug 1860425]
-
-2008-01-10  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tclStringObj.c (Tcl_AppendFormatToObj):  Correct failure to
-	* tests/format.test:	account for big.used == 0 corner case in the
-	%ll(idox) format directives. [Bug 1867855]
-
-2008-01-09  George Peter Staplin  <georgeps@xmission.com>
-
-	* doc/vwait.n: Add a missing be to fix a typo.
-
-2008-01-04  Jeff Hobbs  <jeffh@ActiveState.com>
-
-	* tools/tcltk-man2html.tcl (make-man-pages): Make man page title use
-	more specific info on lhs to improve tabbed browser view titles.
-
-2008-01-02  Donal K. Fellows  <dkf@users.sf.net>
-
-	* doc/binary.n: Fixed documentation bug reported on tcl-core, and
-	reordered documentation to discourage people from using the hex
-	formatter that is hardly ever useful.
-
-2008-01-02  Don Porter  <dgp@users.sourceforge.net>
-
-	* generic/tcl.h:	Bump version number to 8.5.1b1 to distinguish
-	* library/init.tcl:	CVS development snapshots from the 8.5.0 and
-	* unix/configure.in:	8.5.1 releases.
-	* unix/tcl.spec:
-	* win/configure.in:
-	* README
-
-	* unix/configure:	autoconf (2.59)
-	* win/configure:
-
-	******************************************************************
-	*** CHANGELOG ENTRIES FOR 2006-2007 IN "ChangeLog.2007"	       ***
-	*** CHANGELOG ENTRIES FOR 2005 IN "ChangeLog.2005"	       ***
-	*** CHANGELOG ENTRIES FOR 2004 IN "ChangeLog.2004"	       ***
-	*** CHANGELOG ENTRIES FOR 2003 IN "ChangeLog.2003"	       ***
-	*** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"	       ***
-	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"	       ***
-	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"	       ***
-	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-	******************************************************************
diff --git a/changes b/changes
index 75642de..009fd08 100644
--- a/changes
+++ b/changes
@@ -4650,7 +4650,7 @@ threading may still cause problems on AIX. (hobbs)
 9/21/99 (bug fix) fixed bug when setting array in non-existent
 namespace. [Bug: 2613] (hobbs)
 
---- Released 8.2.1, October 04, 1999 --- See ChangeLog for details ---
+--- Released 8.2.1, October 04, 1999
 
 10/30/99 (feature enhancement) new regexp engine from Henry Spencer
 was patched in - should greatly reduce stack space usage. (spencer)
@@ -4680,7 +4680,7 @@ when indexing into one (test case string-5.16) [Bug: 2871] (hobbs)
 
 10/30/99 (bug fix) fixes for mac UTF filename handling (ingham)
 
---- Released 8.2.2, November 04, 1999 --- See ChangeLog for details ---
+--- Released 8.2.2, November 04, 1999
 
 11/19/99 (feature enhancement) bug fixes for http package as well as
 patch required by TLS (SSL) extension that adds http::(un)register
@@ -4705,7 +4705,7 @@ atexit handlers.
 12/07/99 (bug fix) fixes for 'expr + {[incr]}' and 'expr + {[error]}'
 cases (different causes).
 
---- Released 8.2.3, December 16, 1999 --- See ChangeLog for details ---
+--- Released 8.2.3, December 16, 1999
 
 1999-09-14 (feature enhancement) added -start switch to regexp and regsub.
 
@@ -4762,7 +4762,7 @@ ExitThread to _endthreadex to prevent 4K mem leak (gravereaux)
 
 1999-12-21 (bug fix) changed thread ids to longs (for 64bit systems)
 
---- Released 8.3b1, December 22, 1999 --- See ChangeLog for details ---
+--- Released 8.3b1, December 22, 1999
 
 2000-01-10 (feature enhancement) clock scan now supports the common
 ISO 8601 date/time formats.  See docs for details. (melski)
@@ -4788,7 +4788,7 @@ symbolicly (like chmod) in [file attributes $file -permissions ...] (schoebel)
 2000-01-13 (bug fix) fixed lsort -dictionary problem when sorting
 characters between 'Z' and 'a' (flawed upper/lower comparison logic) (melski)
 
---- Released 8.3b2, January 13, 2000 --- See ChangeLog for details ---
+--- Released 8.3b2, January 13, 2000
 
 2000-01-14 (feature enhancement) clock format %Q added, clock scan updated
 
@@ -4827,7 +4827,7 @@ mac panic from an error when closing an async socket (steffen, ingham)
 2000-02-10 (feature enhancement) improved error reporting for failed
 loads on Windows (dejong, hobbs)
 
---- Released 8.3.0, February 10, 2000 --- See ChangeLog for details ---
+--- Released 8.3.0, February 10, 2000
 
 2000-03 (bug fixes, feature enhancement) overhaul of http package for
 proper handling of async callbacks (new options), version is now at 2.3
@@ -4870,7 +4870,7 @@ tclLoadDyld.c dl type. (sanchez)
 2000-04-24 (bug fix) fixed hang in threaded Unix case when backgrounded
 exec process was running (dejong)
 
---- Released 8.3.1, April 26, 2000 --- See ChangeLog for details ---
+--- Released 8.3.1, April 26, 2000
 
 2000-04-26 (doc fix) updated/added documentation for many API's and
 commands (melski)
@@ -4920,7 +4920,7 @@ pattern matching for [array names] (gazetta)
 2000-05-31 (feature enhancement) added -nocomplain and -- flags to
 [unset] to allow for silent unset operation (hobbs)
 
---- Released 8.4a1, June 6, 2000 --- See ChangeLog for details ---
+--- Released 8.4a1, June 6, 2000
 
 2000-05-29 (bug fix) corrected resource cleanup in http error cases.
 Improved handling of error cases in http. (tamhankar)
@@ -4959,7 +4959,7 @@ sections. (english)
 2000-08-07 (bug fix) new man pages memory.n, TCL_MEM_DEBUG.3, Init.3 and
 DumpActiveMemory.3. (melski)
 
---- Released 8.3.2, August 9, 2000 --- See ChangeLog for details ---
+--- Released 8.3.2, August 9, 2000
 
 2000-06 thru 2000-11 (build improvements) Added support for mingw (gcc on
 Windows), AIX-5 and Win64 builds (dejong, hobbs)
@@ -5018,7 +5018,7 @@ environment (gravereaux)
 2000-11-03 (new feature) Tcl_SetMainLoop enables defining an event loop for
 tclsh.  This enables Tk as a truly loadable package. (hobbs)
 
---- Released 8.4a2, November 3, 2000 --- See ChangeLog for details ---
+--- Released 8.4a2, November 3, 2000
 
 2000-09-27 (bug fix) fixed a bug introduced by a partial fix in 8.3.2 that
 didn't set nonBlocking correctly when resetting the flags for the write
@@ -5076,7 +5076,7 @@ Update of READMEs.
 Corrected IRIX-5* configure (english).  Added support for AIX-5 (hobbs).
 Added support for Win64 (hobbs).
 
---- Released 8.3.3, April 6, 2001 --- See ChangeLog for details ---
+--- Released 8.3.3, April 6, 2001
 
 2000-11-23 (new feature)[TIP 7] higher resolution timer on Windows (kenny)
 
@@ -5150,7 +5150,7 @@ system.  This includes the addition of 'file normalize', 'file system',
 
  * corrected several minor errors noted by Purify (hobbs)
 
---- Released 8.4a3, August 6, 2001 --- See ChangeLog for details ---
+--- Released 8.4a3, August 6, 2001
 
 2001-06-27 (bug fix)[217987] corrected backslash substitution of non-ASCII
 characters.  (hobbs, riefenstahl)
@@ -5256,7 +5256,7 @@ bundles to standard .dylib dynamic libraries like on other unices.
 2001-10-18 (bug fix) corrected off-by-one-day error in clock scan with
 relative months and years during swing hours. (lavana)
 
---- Released 8.3.4, October 19, 2001 --- See ChangeLog for details ---
+--- Released 8.3.4, October 19, 2001
 
 2001-08-21 (bug fix)[219184] overagressive compilation of [catch] (sofer)
 
@@ -5435,7 +5435,7 @@ of prior Tcl releases.  Others will need to be reconciled.
 related to the handling of iso2022 text and finalization of escape-based
 encodings. (taguchi, takahashi, hobbs)
 
---- Released 8.4a4, March 5, 2002 --- See ChangeLog for details ---
+--- Released 8.4a4, March 5, 2002
 
 2002-03-06 (new feature)[TIP 80] expanded [lsearch] options (wilkason, fellows)
 
@@ -5545,7 +5545,7 @@ options to configure (max)
 
 2002-07-03 (bug fix)[577015] [catch] catches even compile errors (sofer)
 
---- Released 8.4b1, July 5, 2002 --- See ChangeLog for details ---
+--- Released 8.4b1, July 5, 2002
 
 2002-07-08 (bug fix) restored compatibility of [viewFile] in tcltest (porter)
 
@@ -5583,7 +5583,7 @@ options to configure (max)
 Many internal bugs fixed.
 Considerable cleanup of the test suite.
 
---- Released 8.4b2, August 9, 2002 --- See ChangeLog for details ---
+--- Released 8.4b2, August 9, 2002
 
 2002-08-20 (new feature) --enable-memdebug configure option (kupries)
 
@@ -5598,7 +5598,7 @@ Considerable cleanup of the test suite.
 
 2002-09-02 (platfrom support) 64-bit compile on HP-11 (martin)
 
---- Released 8.4.0, September 10, 2002 --- See ChangeLog for details ---
+--- Released 8.4.0, September 10, 2002
 
 2002-09-18 (platform support) Updated support for compiling with Cygwin and
 either mingw or gcc. (khan, howell, dejong)
@@ -5661,7 +5661,7 @@ dirs to tcl_pkgPath: @executable_path/../Frameworks and
 @executable_path/../PrivateFrameworks (if they exist), as well as the dirs
 in DYLD_FRAMEWORK_PATH (if set). (steffen)
 
---- Released 8.4.1, October 22, 2002 --- See ChangeLog for details ---
+--- Released 8.4.1, October 22, 2002
 
 2002-10-28 (bug fix)[627660] [package unknown] chaining for platform specifics
 
@@ -5754,7 +5754,7 @@ packages in multiple interps.
 
 2003-02-27 (bug fix)[694232] stop [lsearch -start 0 {} x] segfault
 
---- Released 8.4.2, March 3, 2003 --- See ChangeLog for details ---
+--- Released 8.4.2, March 3, 2003
 
 2003-03-06 (bug fix)[699042] Correct case-insensitive unicode string
 comparison in Tcl_UniCharNcasecmp
@@ -5836,7 +5836,7 @@ encoding for the original.  Most uses of gb2312 really mean euc-cn.
 2003-05-14 (bug fix)[736421] Corrected another putenv() copy behavior
 problem when compiling on Windows and using Microsoft's runtime.
 
---- Released 8.4.3, May 20, 2003 --- See ChangeLog for details ---
+--- Released 8.4.3, May 20, 2003
 
 2003-05-23 (bug fix)[726018] reverted internals change to the
 'cmdName' Tcl_ObjType that broke several extensions (TclBlend, e4graph...)
@@ -5877,7 +5877,7 @@ Improved documentation, new tests, and some code cleanup.
 [655300, 720634, 735364, 748700, 756112, 756744, 756951, 758488, 760768,
 763312, 769895, 771539, 771840, 771947, 771949, 772333]
 
---- Released 8.4.4, July 22, 2003 --- See ChangeLog for details ---
+--- Released 8.4.4, July 22, 2003
 
 2003-07-23 (bug fix)[775976] fix registry compilation for VC7.
 
@@ -5923,7 +5923,7 @@ asked for writable events by the generic layer.
 2003-11-17 (bug fix)[230589, 504785, 505048, 703709, 840258] fixes to
 various odd regexp "can't happen" bugs.
 
---- Released 8.4.5, November 20, 2003 --- See ChangeLog for details ---
+--- Released 8.4.5, November 20, 2003
 
 2003-12-02 (bug fix)[851747] object sharing fix in [binary scan]
 
@@ -5960,7 +5960,7 @@ various odd regexp "can't happen" bugs.
 
 2004-03-01 (platform support)[218561] Allow 64-bit configure on IRIX64-6.5*
 
---- Released 8.4.6, March 1, 2004 --- See ChangeLog for details ---
+--- Released 8.4.6, March 1, 2004
 
 Changes to 8.5a1 include all changes to the 8.4 line through 8.4.6,
 plus the following, which focuses on the high-level feature changes
@@ -6046,7 +6046,7 @@ in this changeset (new minor version) rather than bug fixes:
  * [TIP #157] leading {expand} syntax on words to cause argument expansion.
    This is a safer/cleaner alternative to the use of 'eval'.
 
---- Released 8.5a1, March 3, 2004 --- See ChangeLog for details ---
+--- Released 8.5a1, March 3, 2004
 
 2004-03-04 (new feature) registry package is [unload]able (thoyts)
 => registry 1.1.4
@@ -6346,7 +6346,7 @@ Doc improvements [759545,926590,935853,1017072,1018486,1022527,1027849,
 	1032243,1047928,1048005,1058446,1062647,1065732,1073334,etc.]
 Test suite expansion [1036649,1001997,etc.]
 
---- Released 8.5a2, December 7, 2004 --- See ChangeLog for details ---
+--- Released 8.5a2, December 7, 2004
 
 2004-12-13 (bug fix)[1083082] encoding memory leaks (ade,porter)
 
@@ -6490,7 +6490,7 @@ Can support [load] from memory as well (steffen)
 
 Documentation improvements [1075433,1085127,1117017,1124160,1149605,etc.]
 
---- Released 8.5a3, June 4, 2005 --- See ChangeLog for details ---
+--- Released 8.5a3, June 4, 2005
 
 2005-06-06 (bug fix)[1213678] Windows/gcc: crash in stack.test (kenny)
 
@@ -6741,7 +6741,7 @@ removed (steffen)
 Documentation improvements [1211078,1190891,1292427,1277503,1104682,1359183,
 1415725,666770]
 
---- Released 8.5a4, April 27, 2006 --- See ChangeLog for details ---
+--- Released 8.5a4, April 27, 2006
 
 2006-05-04 (bug fix)[1480509] srand() accept wide input (porter,afredd)
 
@@ -6837,7 +6837,7 @@ URL validity checking against RFC 2986 (hobbs)
 
 2006-10-13 (platform support) get stack size on Darwin (steffen)
 
---- Released 8.5a5, October 20, 2006 --- See ChangeLog for details ---
+--- Released 8.5a5, October 20, 2006
 
 2006-10-20 (configure change) Added autodetection for OS-supplied timezone
 files (max)
@@ -6919,7 +6919,7 @@ upvar and namespace upvar (sofer)
 
 2007-04-23 (bug fix) fts_open() crash on 64bit Darwin 8 or earlier (steffen)
 
---- Released 8.5a6, April 25, 2007 --- See ChangeLog for details ---
+--- Released 8.5a6, April 25, 2007
 
 2007-04-30 (bug fix)[1705778] many valgrind-detected leaks corrected
 
@@ -7022,7 +7022,7 @@ project for Xcode 3.0 (steffen)
 (bug fix)[1066755] Several stack efficiency efforts increases recursion limit
 on Windows to be larger than the default [interp recursionlimit] value
 
---- Released 8.5b1, September 26, 2007 --- See ChangeLog for details ---
+--- Released 8.5b1, September 26, 2007
 
 2007-10-02 (bug fix)[1806422] proper [tcl::tm::path] autoload (porter)
 
@@ -7034,7 +7034,7 @@ on Windows to be larger than the default [interp recursionlimit] value
 
 2007-10-25 (bug fix)[1726873] intermittent crash in threads (vasiljevic)
 
---- Released 8.5b2, October 26, 2007 --- See ChangeLog for details ---
+--- Released 8.5b2, October 26, 2007
 
 2007-10-27 (bug fix)[1821159] fixed broken compile on x86_64 (sofer)
 
@@ -7070,7 +7070,7 @@ on Windows to be larger than the default [interp recursionlimit] value
 
 Many significant documentation improvements (fellows, sofer)
 
---- Released 8.5b3, November 19, 2007 --- See ChangeLog for details ---
+--- Released 8.5b3, November 19, 2007
 
 2007-11-20 (enhancement) string rep of dict has stable order (fellows)
 
@@ -7104,7 +7104,7 @@ over-consumption of resources (drewry,lane,ormandy,fellows)
 
 Several documentation and release notes improvements
 
---- Released 8.5.0, December 20, 2007 --- See ChangeLog for details ---
+--- Released 8.5.0, December 20, 2007
 
 2007-12-23 (bug fix)[1857126] restore backref support to regexps (hobbs)
 
@@ -7126,7 +7126,7 @@ Several documentation and release notes improvements
 
 Several documentation and release notes improvements
 
---- Released 8.5.1, February 5, 2008 --- See ChangeLog for details ---
+--- Released 8.5.1, February 5, 2008
 
 2008-02-06 (enhancement) [clock format] performance (kenny)
 
@@ -7187,7 +7187,7 @@ variables without "." added to customization hooks (kupries)
 
 2008-03-27 clock tzdata updated to Olson's tzdata2008b (kenny)
 
---- Released 8.5.2, March 28, 2008 --- See ChangeLog for details ---
+--- Released 8.5.2, March 28, 2008
 
 2008-03-30 (bug fix)[1783544] more robust TclIsNaN() (kenny,teterin)
 
@@ -7242,7 +7242,7 @@ variables without "." added to customization hooks (kupries)
 
 2008-06-25 (bug fix)[1999119] Support TM packages in Safe Base (kupries)
 
---- Released 8.6a1, June 25, 2008 --- See ChangeLog for details ---
+--- Released 8.6a1, June 25, 2008
 
 2008-06-29 (bug fix)[2004480] plug memory leaks (ade,porter,steffen)
 
@@ -7295,7 +7295,7 @@ in a deleted interp. (porter)
 
 2008-08-21 (bug fix)[2065115] Restored ***= regexp functioning (hobbs,porter)
 
---- Released 8.6a2, August 25, 2008 --- See ChangeLog for details ---
+--- Released 8.6a2, August 25, 2008
 
 2008-08-29 (bug fix)[2082299] Install TclOO header files (fellows)
 
@@ -7376,7 +7376,7 @@ Tcl_FSFileAttrStringsProc prototype. (nijtmans)
 
 2008-10-10 (bug fix)[2155658] crash in oo method export (fellows)
 
---- Released 8.6a3, October 10, 2008 --- See ChangeLog for details ---
+--- Released 8.6a3, October 10, 2008
 
 2008-10-13 (bug fix) Fix ability to join threads on 64-bit Windows (thoyts)
 
@@ -7446,7 +7446,7 @@ evaluation in extensions (sofer,kenny)
 
 2008-12-18 (bug fix)[2444274] panic in long commands from {*} (goth,porter)
 
---- Released 8.6b1, December 19, 2008 --- See ChangeLog for details ---
+--- Released 8.6b1, December 19, 2008
 
 2008-12-27 [TIP 234] Tcl_Zlib* interface revisions (fellows)
 	*** INCOMPATIBILITY with interface of 8.6b1 ***
@@ -7954,7 +7954,7 @@ memory with buffer backup (ferrieux)
 
 Many more Tcl built-in command errors now set an -errorcode.
 
---- Released 8.6b2, August 8, 2011 --- See ChangeLog for details ---
+--- Released 8.6b2, August 8, 2011
 
 2011-07-02 (bug fix)[3349507] correct double(1[string repeat 0 23]) (kenny)
 
@@ -8115,7 +8115,7 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 
---- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
+--- Released 8.6b3, September 18, 2012
 
 2012-09-20 (enhancement) full Unicode support (nijtmans)
 => dde 1.4.0
@@ -8162,7 +8162,7 @@ Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 
 2012-12-13 (bug fix) crash: [zlib gunzip $data -header noSuchNs::var] (porter)
 
---- Released 8.6.0, December 20, 2012 --- See ChangeLog for details ---
+--- Released 8.6.0, December 20, 2012
 
 2012-12-22 (bug fix)[3598150] DString to Tcl_Obj memleak (afredd)
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index e092a2d..802472b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2293,9 +2293,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 	cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
 	cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
 	cp -p $(GENERIC_DIR)/tclGetDate.y $(DISTDIR)/generic
-	cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog $(TOP_DIR)/README.md \
-		$(TOP_DIR)/ChangeLog.[12]??? $(TOP_DIR)/license.terms \
-		$(DISTDIR)
+	cp -p $(TOP_DIR)/changes $(TOP_DIR)/README.md \
+		$(TOP_DIR)/license.terms $(DISTDIR)
 	@mkdir $(DISTDIR)/library
 	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
 		$(TOP_DIR)/library/manifest.txt \
-- 
cgit v0.12


From c03808607bc887be83b093a4925d764bfb3531fb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 10 May 2023 19:39:20 +0000
Subject: Backport various changes from 9.0 branch

---
 generic/tclTest.c    | 158 ++++++++++++++++++++++++++-------------------------
 generic/tclTestObj.c |  54 +++++++++---------
 2 files changed, 107 insertions(+), 105 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 893f073..6ab1979 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -251,7 +251,7 @@ static Tcl_ObjCmdProc	TestsetbytearraylengthObjCmd;
 static Tcl_ObjCmdProc	TestpurebytesobjObjCmd;
 static Tcl_ObjCmdProc	TeststringbytesObjCmd;
 static Tcl_ObjCmdProc	Testutf16stringObjCmd;
-static Tcl_CmdProc	TestcmdinfoCmd;
+static Tcl_ObjCmdProc	TestcmdinfoObjCmd;
 static Tcl_CmdProc	TestcmdtokenCmd;
 static Tcl_CmdProc	TestcmdtraceCmd;
 static Tcl_CmdProc	TestconcatobjCmd;
@@ -617,7 +617,7 @@ Tcltest_Init(
 	    NULL, NULL);
     Tcl_CreateCommand(interp, "testcmdtoken", TestcmdtokenCmd, NULL,
 	    NULL);
-    Tcl_CreateCommand(interp, "testcmdinfo", TestcmdinfoCmd, NULL,
+    Tcl_CreateObjCommand(interp, "testcmdinfo", TestcmdinfoObjCmd, NULL,
 	    NULL);
     Tcl_CreateCommand(interp, "testcmdtrace", TestcmdtraceCmd,
 	    NULL, NULL);
@@ -956,7 +956,7 @@ TestasyncCmd(
 		break;
 	    }
 	}
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(argv[3], TCL_INDEX_NONE));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(argv[3], -1));
 	Tcl_MutexUnlock(&asyncTestMutex);
 	return code;
     } else if (strcmp(argv[1], "marklater") == 0) {
@@ -1000,7 +1000,8 @@ AsyncHandlerProc(
 {
     TestAsyncHandler *asyncPtr;
     int id = PTR2INT(clientData);
-    const char *listArgv[4], *cmd;
+    const char *listArgv[4];
+    char *cmd;
     char string[TCL_INTEGER_SPACE];
 
     Tcl_MutexLock(&asyncTestMutex);
@@ -1093,7 +1094,7 @@ TestbumpinterpepochObjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * TestcmdinfoCmd --
+ * TestcmdinfoObjCmd --
  *
  *	This procedure implements the "testcmdinfo" command.  It is used to
  *	test Tcl_GetCommandInfo, Tcl_SetCommandInfo, and command creation and
@@ -1109,28 +1110,27 @@ TestbumpinterpepochObjCmd(
  */
 
 static int
-TestcmdinfoCmd(
+TestcmdinfoObjCmd(
     TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int argc,			/* Number of arguments. */
-    const char **argv)		/* Argument strings. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])      /* Argument objects. */
 {
     Tcl_CmdInfo info;
 
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option cmdName\"", NULL);
+    if (objc != 3) {
+	Tcl_WrongNumArgs(interp, 1, objv, "command arg");
 	return TCL_ERROR;
     }
-    if (strcmp(argv[1], "create") == 0) {
-	Tcl_CreateCommand(interp, argv[2], CmdProc1, (void *) "original",
+    if (strcmp(Tcl_GetString(objv[1]), "create") == 0) {
+	Tcl_CreateCommand(interp, Tcl_GetString(objv[2]), CmdProc1, (void *) "original",
 		CmdDelProc1);
-    } else if (strcmp(argv[1], "delete") == 0) {
+    } else if (strcmp(Tcl_GetString(objv[1]), "delete") == 0) {
 	Tcl_DStringInit(&delString);
-	Tcl_DeleteCommand(interp, argv[2]);
+	Tcl_DeleteCommand(interp, Tcl_GetString(objv[2]));
 	Tcl_DStringResult(interp, &delString);
-    } else if (strcmp(argv[1], "get") == 0) {
-	if (Tcl_GetCommandInfo(interp, argv[2], &info) ==0) {
+    } else if (strcmp(Tcl_GetString(objv[1]), "get") == 0) {
+	if (Tcl_GetCommandInfo(interp, Tcl_GetString(objv[2]), &info) ==0) {
 	    Tcl_AppendResult(interp, "??", NULL);
 	    return TCL_OK;
 	}
@@ -1158,23 +1158,24 @@ TestcmdinfoCmd(
 	} else {
 	    Tcl_AppendResult(interp, " stringProc", NULL);
 	}
-    } else if (strcmp(argv[1], "modify") == 0) {
+    } else if (strcmp(Tcl_GetString(objv[1]), "modify") == 0) {
 	info.proc = CmdProc2;
 	info.clientData = (void *) "new_command_data";
 	info.objProc = NULL;
 	info.objClientData = NULL;
 	info.deleteProc = CmdDelProc2;
 	info.deleteData = (void *) "new_delete_data";
-	if (Tcl_SetCommandInfo(interp, argv[2], &info) == 0) {
+	if (Tcl_SetCommandInfo(interp, Tcl_GetString(objv[2]), &info) == 0) {
 	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(0));
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(1));
 	}
     } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
+	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),
 		"\": must be create, delete, get, or modify", NULL);
 	return TCL_ERROR;
     }
+
     return TCL_OK;
 }
 
@@ -1239,8 +1240,8 @@ CmdDelProc1(
     void *clientData)	/* String to save. */
 {
     Tcl_DStringInit(&delString);
-    Tcl_DStringAppend(&delString, "CmdDelProc1 ", TCL_INDEX_NONE);
-    Tcl_DStringAppend(&delString, (char *) clientData, TCL_INDEX_NONE);
+    Tcl_DStringAppend(&delString, "CmdDelProc1 ", -1);
+    Tcl_DStringAppend(&delString, (char *) clientData, -1);
 }
 
 static void
@@ -1248,8 +1249,8 @@ CmdDelProc2(
     void *clientData)	/* String to save. */
 {
     Tcl_DStringInit(&delString);
-    Tcl_DStringAppend(&delString, "CmdDelProc2 ", TCL_INDEX_NONE);
-    Tcl_DStringAppend(&delString, (char *) clientData, TCL_INDEX_NONE);
+    Tcl_DStringAppend(&delString, "CmdDelProc2 ", -1);
+    Tcl_DStringAppend(&delString, (char *) clientData, -1);
 }
 
 /*
@@ -1502,7 +1503,7 @@ ObjTraceProc(
     const char *word = Tcl_GetString(objv[0]);
 
     if (!strcmp(word, "Error")) {
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(command, TCL_INDEX_NONE));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(command, -1));
 	return TCL_ERROR;
     } else if (!strcmp(word, "Break")) {
 	return TCL_BREAK;
@@ -1866,7 +1867,7 @@ TestdoubledigitsObjCmd(
     type = types[type];
     if (objc > 4) {
 	if (strcmp(Tcl_GetString(objv[4]), "shorten")) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("bad flag", TCL_INDEX_NONE));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("bad flag", -1));
 	    return TCL_ERROR;
 	}
 	type |= TCL_DD_SHORTEST;
@@ -2174,10 +2175,10 @@ static int UtfExtWrapper(
     memmove(bufPtr + dstLen, "\xAB\xCD\xEF\xAB", 4);   /* overflow detection */
     bytes = Tcl_GetByteArrayFromObj(objv[3], &srcLen); /* Last! to avoid shimmering */
     result = (*transformer)(interp, encoding, (const char *)bytes, srcLen, flags,
-                               encStatePtr, (char *) bufPtr, dstLen,
-                               srcReadVar ? &srcRead : NULL,
-                               &dstWrote,
-                               dstCharsVar ? &dstChars : NULL);
+                            encStatePtr, (char *) bufPtr, dstLen,
+                            srcReadVar ? &srcRead : NULL,
+                            &dstWrote,
+                            dstCharsVar ? &dstChars : NULL);
     if (memcmp(bufPtr + bufLen - 4, "\xAB\xCD\xEF\xAB", 4)) {
         Tcl_SetResult(interp,
                       "Tcl_ExternalToUtf wrote past output buffer",
@@ -2269,7 +2270,7 @@ TestencodingObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tcl_Encoding encoding;
-    int index, length;
+    Tcl_Size length;
     const char *string;
     TclEncoding *encodingPtr;
     static const char *const optionStrings[] = {
@@ -2278,6 +2279,7 @@ TestencodingObjCmd(
     enum options {
 	ENC_CREATE, ENC_DELETE, ENC_NULLENGTH, ENC_EXTTOUTF, ENC_UTFTOEXT
     };
+    int index;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "command ?args?");
@@ -3460,7 +3462,7 @@ TestlinkCmd(
 	    }
 	}
 	if (argv[6][0] != 0) {
-	    tmp = Tcl_NewStringObj(argv[6], TCL_INDEX_NONE);
+	    tmp = Tcl_NewStringObj(argv[6], -1);
 	    if (Tcl_GetWideIntFromObj(interp, tmp, &wideVar) != TCL_OK) {
 		Tcl_DecrRefCount(tmp);
 		return TCL_ERROR;
@@ -3518,7 +3520,7 @@ TestlinkCmd(
 	}
 	if (argv[15][0]) {
 	    Tcl_WideInt w;
-	    tmp = Tcl_NewStringObj(argv[15], TCL_INDEX_NONE);
+	    tmp = Tcl_NewStringObj(argv[15], -1);
 	    if (Tcl_GetWideIntFromObj(interp, tmp, &w) != TCL_OK) {
 		Tcl_DecrRefCount(tmp);
 		return TCL_ERROR;
@@ -3568,7 +3570,7 @@ TestlinkCmd(
 	    Tcl_UpdateLinkedVar(interp, "string");
 	}
 	if (argv[6][0] != 0) {
-	    tmp = Tcl_NewStringObj(argv[6], TCL_INDEX_NONE);
+	    tmp = Tcl_NewStringObj(argv[6], -1);
 	    if (Tcl_GetWideIntFromObj(interp, tmp, &wideVar) != TCL_OK) {
 		Tcl_DecrRefCount(tmp);
 		return TCL_ERROR;
@@ -3635,7 +3637,7 @@ TestlinkCmd(
 	}
 	if (argv[15][0]) {
 	    Tcl_WideInt w;
-	    tmp = Tcl_NewStringObj(argv[15], TCL_INDEX_NONE);
+	    tmp = Tcl_NewStringObj(argv[15], -1);
 	    if (Tcl_GetWideIntFromObj(interp, tmp, &w) != TCL_OK) {
 		Tcl_DecrRefCount(tmp);
 		return TCL_ERROR;
@@ -3743,7 +3745,7 @@ TestlinkarrayCmd(
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetIntFromObj(interp, objv[i++], &size) == TCL_ERROR) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("wrong size value", TCL_INDEX_NONE));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("wrong size value", -1));
 	    return TCL_ERROR;
 	}
 	name = Tcl_GetString(objv[i++]);
@@ -3755,7 +3757,7 @@ TestlinkarrayCmd(
 	if (i < objc) {
 	    if (Tcl_GetWideIntFromObj(interp, objv[i], &addr) == TCL_ERROR) {
  		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"wrong address value", TCL_INDEX_NONE));
+			"wrong address value", -1));
 		return TCL_ERROR;
 	    }
 	} else {
@@ -3855,7 +3857,7 @@ TestlistrepCmd(
 #define APPEND_FIELD(targetObj_, structPtr_, fld_)                        \
     do {                                                                  \
 	Tcl_ListObjAppendElement(                                         \
-	    interp, (targetObj_), Tcl_NewStringObj(#fld_, TCL_INDEX_NONE));           \
+	    interp, (targetObj_), Tcl_NewStringObj(#fld_, -1));           \
 	Tcl_ListObjAppendElement(                                         \
 	    interp, (targetObj_), Tcl_NewWideIntObj((structPtr_)->fld_)); \
     } while (0)
@@ -3873,10 +3875,10 @@ TestlistrepCmd(
 		return TCL_ERROR;
 	    }
 	    ListObjGetRep(objv[2], &listRep);
-	    listRepObjs[0] = Tcl_NewStringObj("store", TCL_INDEX_NONE);
+	    listRepObjs[0] = Tcl_NewStringObj("store", -1);
 	    listRepObjs[1] = Tcl_NewListObj(12, NULL);
 	    Tcl_ListObjAppendElement(
-		interp, listRepObjs[1], Tcl_NewStringObj("memoryAddress", TCL_INDEX_NONE));
+		interp, listRepObjs[1], Tcl_NewStringObj("memoryAddress", -1));
 	    Tcl_ListObjAppendElement(
 		interp, listRepObjs[1], Tcl_ObjPrintf("%p", listRep.storePtr));
 	    APPEND_FIELD(listRepObjs[1], listRep.storePtr, firstUsed);
@@ -3885,11 +3887,11 @@ TestlistrepCmd(
 	    APPEND_FIELD(listRepObjs[1], listRep.storePtr, refCount);
 	    APPEND_FIELD(listRepObjs[1], listRep.storePtr, flags);
 	    if (listRep.spanPtr) {
-		listRepObjs[2] = Tcl_NewStringObj("span", TCL_INDEX_NONE);
+		listRepObjs[2] = Tcl_NewStringObj("span", -1);
 		listRepObjs[3] = Tcl_NewListObj(8, NULL);
 		Tcl_ListObjAppendElement(interp,
 					 listRepObjs[3],
-					 Tcl_NewStringObj("memoryAddress", TCL_INDEX_NONE));
+					 Tcl_NewStringObj("memoryAddress", -1));
 		Tcl_ListObjAppendElement(
 		    interp, listRepObjs[3], Tcl_ObjPrintf("%p", listRep.spanPtr));
 		APPEND_FIELD(listRepObjs[3], listRep.spanPtr, spanStart);
@@ -3909,7 +3911,7 @@ TestlistrepCmd(
 	}
 	resultObj = Tcl_NewListObj(2, NULL);
 	Tcl_ListObjAppendElement(
-	    NULL, resultObj, Tcl_NewStringObj("LIST_SPAN_THRESHOLD", TCL_INDEX_NONE));
+	    NULL, resultObj, Tcl_NewStringObj("LIST_SPAN_THRESHOLD", -1));
 	Tcl_ListObjAppendElement(
 	    NULL, resultObj, Tcl_NewWideIntObj(LIST_SPAN_THRESHOLD));
 	break;
@@ -3983,7 +3985,7 @@ TestlocaleCmd(
     }
     locale = setlocale(lcTypes[index], locale);
     if (locale) {
-	Tcl_SetStringObj(Tcl_GetObjResult(interp), locale, TCL_INDEX_NONE);
+	Tcl_SetStringObj(Tcl_GetObjResult(interp), locale, -1);
     }
     return TCL_OK;
 }
@@ -4158,7 +4160,7 @@ PrintParse(
     Tcl_Obj *objPtr;
     const char *typeString;
     Tcl_Token *tokenPtr;
-    int i;
+    Tcl_Size i;
 
     objPtr = Tcl_GetObjResult(interp);
     if (parsePtr->commentSize > 0) {
@@ -4207,7 +4209,7 @@ PrintParse(
 	    break;
 	}
 	Tcl_ListObjAppendElement(NULL, objPtr,
-		Tcl_NewStringObj(typeString, TCL_INDEX_NONE));
+		Tcl_NewStringObj(typeString, -1));
 	Tcl_ListObjAppendElement(NULL, objPtr,
 		Tcl_NewStringObj(tokenPtr->start, tokenPtr->size));
 	Tcl_ListObjAppendElement(NULL, objPtr,
@@ -4438,6 +4440,7 @@ TestregexpObjCmd(
 	REGEXP_XFLAGS,
 	REGEXP_LAST
     };
+	int index;
 
     indices = 0;
     about = 0;
@@ -4447,7 +4450,6 @@ TestregexpObjCmd(
 
     for (i = 1; i < objc; i++) {
 	const char *name;
-	int index;
 
 	name = Tcl_GetString(objv[i]);
 	if (name[0] != '-') {
@@ -5407,7 +5409,7 @@ GetTimesObjCmd(
 
     /* TclGetString 100000 times */
     fprintf(stderr, "Tcl_GetStringFromObj of \"12345\" 100000 times\n");
-    objPtr = Tcl_NewStringObj("12345", TCL_INDEX_NONE);
+    objPtr = Tcl_NewStringObj("12345", -1);
     Tcl_GetTime(&start);
     for (i = 0;  i < 100000;  i++) {
 	(void) TclGetString(objPtr);
@@ -5710,7 +5712,7 @@ TestbytestringObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
-    size_t n = 0;
+    Tcl_Size n = 0;
     const char *p;
 
     if (objc != 2) {
@@ -6180,7 +6182,7 @@ TestChannelCmd(
 
     if ((cmdName[0] == 's') && (strncmp(cmdName, "setchannelerror", len) == 0)) {
 
-	Tcl_Obj *msg = Tcl_NewStringObj(argv[3], TCL_INDEX_NONE);
+	Tcl_Obj *msg = Tcl_NewStringObj(argv[3], -1);
 
 	Tcl_IncrRefCount(msg);
 	Tcl_SetChannelError(chan, msg);
@@ -6193,7 +6195,7 @@ TestChannelCmd(
     }
     if ((cmdName[0] == 's') && (strncmp(cmdName, "setchannelerrorinterp", len) == 0)) {
 
-	Tcl_Obj *msg = Tcl_NewStringObj(argv[3], TCL_INDEX_NONE);
+	Tcl_Obj *msg = Tcl_NewStringObj(argv[3], -1);
 
 	Tcl_IncrRefCount(msg);
 	Tcl_SetChannelErrorInterp(interp, msg);
@@ -6580,7 +6582,7 @@ TestChannelCmd(
 	}
 
 	return TclChannelTransform(interp, chan,
-		Tcl_NewStringObj(argv[4], TCL_INDEX_NONE));
+		Tcl_NewStringObj(argv[4], -1));
     }
 
     if ((cmdName[0] == 'u') && (strncmp(cmdName, "unstack", len) == 0)) {
@@ -6671,7 +6673,7 @@ TestChannelEventCmd(
 	esPtr->chanPtr = chanPtr;
 	esPtr->interp = interp;
 	esPtr->mask = mask;
-	esPtr->scriptPtr = Tcl_NewStringObj(argv[4], TCL_INDEX_NONE);
+	esPtr->scriptPtr = Tcl_NewStringObj(argv[4], -1);
 	Tcl_IncrRefCount(esPtr->scriptPtr);
 
 	Tcl_CreateChannelHandler((Tcl_Channel) chanPtr, mask,
@@ -6738,10 +6740,10 @@ TestChannelEventCmd(
 	     esPtr = esPtr->nextPtr) {
 	    if (esPtr->mask) {
 		Tcl_ListObjAppendElement(interp, resultListPtr, Tcl_NewStringObj(
-		    (esPtr->mask == TCL_READABLE) ? "readable" : "writable", TCL_INDEX_NONE));
+		    (esPtr->mask == TCL_READABLE) ? "readable" : "writable", -1));
 	    } else {
 		Tcl_ListObjAppendElement(interp, resultListPtr,
-			Tcl_NewStringObj("none", TCL_INDEX_NONE));
+			Tcl_NewStringObj("none", -1));
 	    }
 	    Tcl_ListObjAppendElement(interp, resultListPtr, esPtr->scriptPtr);
 	}
@@ -7096,7 +7098,7 @@ TestFilesystemObjCmd(
 	res = Tcl_FSUnregister(&testReportingFilesystem);
 	msg = (res == TCL_OK) ? "unregistered" : "failed";
     }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , TCL_INDEX_NONE));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , -1));
     return res;
 }
 
@@ -7178,7 +7180,7 @@ TestReport(
 	Tcl_DString ds;
 
 	Tcl_DStringInit(&ds);
-	Tcl_DStringAppend(&ds, "lappend filesystemReport ", TCL_INDEX_NONE);
+	Tcl_DStringAppend(&ds, "lappend filesystemReport ", -1);
 	Tcl_DStringStartSublist(&ds);
 	Tcl_DStringAppendElement(&ds, cmd);
 	if (path != NULL) {
@@ -7467,7 +7469,7 @@ TestSimpleFilesystemObjCmd(
 	res = Tcl_FSUnregister(&simpleFilesystem);
 	msg = (res == TCL_OK) ? "unregistered" : "failed";
     }
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , TCL_INDEX_NONE));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(msg , -1));
     return res;
 }
 
@@ -7494,7 +7496,7 @@ SimpleRedirect(
 	Tcl_IncrRefCount(pathPtr);
 	return pathPtr;
     }
-    origPtr = Tcl_NewStringObj(str+10, TCL_INDEX_NONE);
+    origPtr = Tcl_NewStringObj(str+10, -1);
     Tcl_IncrRefCount(origPtr);
     return origPtr;
 }
@@ -7526,7 +7528,7 @@ SimpleMatchInDirectory(
     origPtr = SimpleRedirect(dirPtr);
     res = Tcl_FSMatchInDirectory(interp, resPtr, origPtr, pattern, types);
     if (res == TCL_OK) {
-	size_t gLength, j;
+	Tcl_Size gLength, j;
 	Tcl_ListObjLength(NULL, resPtr, &gLength);
 	for (j = 0; j < gLength; j++) {
 	    Tcl_Obj *gElt, *nElt;
@@ -7594,7 +7596,7 @@ SimpleListVolumes(void)
     /* Add one new volume */
     Tcl_Obj *retVal;
 
-    retVal = Tcl_NewStringObj("simplefs:/", TCL_INDEX_NONE);
+    retVal = Tcl_NewStringObj("simplefs:/", -1);
     Tcl_IncrRefCount(retVal);
     return retVal;
 }
@@ -7612,7 +7614,7 @@ TestUtfNextCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    int numBytes;
+    Tcl_Size numBytes;
     char *bytes;
     const char *result, *first;
     char buffer[32];
@@ -7748,7 +7750,7 @@ TestFindFirstCmd(
 	if (objc > 2) {
 	    (void) Tcl_GetIntFromObj(interp, objv[2], &len);
 	}
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_UtfFindFirst(Tcl_GetString(objv[1]), len), TCL_INDEX_NONE));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_UtfFindFirst(Tcl_GetString(objv[1]), len), -1));
     }
     return TCL_OK;
 }
@@ -7770,7 +7772,7 @@ TestFindLastCmd(
 	if (objc > 2) {
 	    (void) Tcl_GetIntFromObj(interp, objv[2], &len);
 	}
-	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_UtfFindLast(Tcl_GetString(objv[1]), len), TCL_INDEX_NONE));
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(Tcl_UtfFindLast(Tcl_GetString(objv[1]), len), -1));
     }
     return TCL_OK;
 }
@@ -7796,7 +7798,7 @@ TestGetIntForIndexCmd(
     if (Tcl_GetIntForIndex(interp, objv[1], endvalue, &result) != TCL_OK) {
 	return TCL_ERROR;
     }
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(result));
+    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(result));
     return TCL_OK;
 }
 
@@ -7847,7 +7849,7 @@ TestcpuidCmd(
     status = TclWinCPUID(index, regs);
     if (status != TCL_OK) {
 	Tcl_SetObjResult(interp,
-		Tcl_NewStringObj("operation not available", TCL_INDEX_NONE));
+		Tcl_NewStringObj("operation not available", -1));
 	return status;
     }
     for (i=0 ; i<4 ; ++i) {
@@ -7893,7 +7895,7 @@ TestHashSystemHashCmd(
 	hPtr = Tcl_CreateHashEntry(&hash, INT2PTR(i), &isNew);
 	if (!isNew) {
 	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(i));
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," creation problem", TCL_INDEX_NONE);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," creation problem", -1);
 	    Tcl_DeleteHashTable(&hash);
 	    return TCL_ERROR;
 	}
@@ -7910,13 +7912,13 @@ TestHashSystemHashCmd(
 	hPtr = Tcl_FindHashEntry(&hash, (char *) INT2PTR(i));
 	if (hPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(i));
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," lookup problem", TCL_INDEX_NONE);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," lookup problem", -1);
 	    Tcl_DeleteHashTable(&hash);
 	    return TCL_ERROR;
 	}
 	if (PTR2INT(Tcl_GetHashValue(hPtr)) != i+42) {
 	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(i));
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," value problem", TCL_INDEX_NONE);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp)," value problem", -1);
 	    Tcl_DeleteHashTable(&hash);
 	    return TCL_ERROR;
 	}
@@ -8036,7 +8038,7 @@ TestNRELevels(
     static ptrdiff_t *refDepth = NULL;
     ptrdiff_t depth;
     Tcl_Obj *levels[6];
-    int i = 0;
+    Tcl_Size i = 0;
     NRE_callback *cbPtr = iPtr->execEnvPtr->callbackPtr;
 
     if (refDepth == NULL) {
@@ -8090,7 +8092,7 @@ TestconcatobjCmd(
 {
     Tcl_Obj *list1Ptr, *list2Ptr, *emptyPtr, *concatPtr, *tmpPtr;
     int result = TCL_OK;
-    size_t len;
+    Tcl_Size len;
     Tcl_Obj *objv[3];
 
     /*
@@ -8099,15 +8101,15 @@ TestconcatobjCmd(
      */
 
     Tcl_SetObjResult(interp,
-	    Tcl_NewStringObj("Tcl_ConcatObj is unsafe:", TCL_INDEX_NONE));
+	    Tcl_NewStringObj("Tcl_ConcatObj is unsafe:", -1));
 
     emptyPtr = Tcl_NewObj();
 
-    list1Ptr = Tcl_NewStringObj("foo bar sum", TCL_INDEX_NONE);
+    list1Ptr = Tcl_NewStringObj("foo bar sum", -1);
     Tcl_ListObjLength(NULL, list1Ptr, &len);
     Tcl_InvalidateStringRep(list1Ptr);
 
-    list2Ptr = Tcl_NewStringObj("eeny meeny", TCL_INDEX_NONE);
+    list2Ptr = Tcl_NewStringObj("eeny meeny", -1);
     Tcl_ListObjLength(NULL, list2Ptr, &len);
     Tcl_InvalidateStringRep(list2Ptr);
 
@@ -8447,7 +8449,7 @@ TestparseargsCmd(
     Tcl_Obj *const objv[])	/* Arguments. */
 {
     static int foo = 0;
-    size_t count = objc;
+    Tcl_Size count = objc;
     Tcl_Obj **remObjv, *result[3];
     Tcl_ArgvInfo argTable[] = {
         {TCL_ARGV_CONSTANT, "-bool", INT2PTR(1), &foo, "booltest", NULL},
@@ -8670,7 +8672,7 @@ InterpCompiledVarResolver(
  	resVarInfo->vInfo.fetchProc = MyCompiledVarFetch;
  	resVarInfo->vInfo.deleteProc = MyCompiledVarFree;
  	resVarInfo->var = NULL;
- 	resVarInfo->nameObj = Tcl_NewStringObj(name, TCL_INDEX_NONE);
+ 	resVarInfo->nameObj = Tcl_NewStringObj(name, -1);
  	Tcl_IncrRefCount(resVarInfo->nameObj);
  	*rPtr = &resVarInfo->vInfo;
  	return TCL_OK;
@@ -8754,12 +8756,12 @@ int TestApplyLambdaObjCmd (
 
     /* Create a lambda {{} {set a 42}} */
     lambdaObjs[0] = Tcl_NewObj(); /* No parameters */
-    lambdaObjs[1] = Tcl_NewStringObj("set a 42", TCL_INDEX_NONE); /* Body */
+    lambdaObjs[1] = Tcl_NewStringObj("set a 42", -1); /* Body */
     lambdaObj = Tcl_NewListObj(2, lambdaObjs);
     Tcl_IncrRefCount(lambdaObj);
 
     /* Create the command "apply {{} {set a 42}" */
-    evalObjs[0] = Tcl_NewStringObj("apply", TCL_INDEX_NONE);
+    evalObjs[0] = Tcl_NewStringObj("apply", -1);
     Tcl_IncrRefCount(evalObjs[0]);
     /*
      * NOTE: IMPORTANT TO EXHIBIT THE BUG. We duplicate the lambda because
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 0f5f21f..7aeb329 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -188,13 +188,13 @@ TestbignumobjCmd(
 	string = Tcl_GetString(objv[3]);
 	if (mp_init(&bignumValue) != MP_OKAY) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_init", TCL_INDEX_NONE));
+		    Tcl_NewStringObj("error in mp_init", -1));
 	    return TCL_ERROR;
 	}
 	if (mp_read_radix(&bignumValue, string, 10) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_read_radix", TCL_INDEX_NONE));
+		    Tcl_NewStringObj("error in mp_read_radix", -1));
 	    return TCL_ERROR;
 	}
 
@@ -238,7 +238,7 @@ TestbignumobjCmd(
 	if (mp_mul_d(&bignumValue, 10, &bignumValue) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_mul_d", TCL_INDEX_NONE));
+		    Tcl_NewStringObj("error in mp_mul_d", -1));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -263,7 +263,7 @@ TestbignumobjCmd(
 	if (mp_div_d(&bignumValue, 10, &bignumValue, NULL) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_div_d", TCL_INDEX_NONE));
+		    Tcl_NewStringObj("error in mp_div_d", -1));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -288,7 +288,7 @@ TestbignumobjCmd(
 	if (mp_mod_2d(&bignumValue, 1, &bignumValue) != MP_OKAY) {
 	    mp_clear(&bignumValue);
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewStringObj("error in mp_mod_2d", TCL_INDEX_NONE));
+		    Tcl_NewStringObj("error in mp_mod_2d", -1));
 	    return TCL_ERROR;
 	}
 	if (!Tcl_IsShared(varPtr[varIndex])) {
@@ -606,7 +606,7 @@ TestindexobjCmd(
     }
 
     if (objc < 5) {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", TCL_INDEX_NONE);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", -1);
 	return TCL_ERROR;
     }
 
@@ -617,7 +617,7 @@ TestindexobjCmd(
 	return TCL_ERROR;
     }
 
-    argv = (const char **)ckalloc(((unsigned)objc-3) * sizeof(char *));
+    argv = (const char **)ckalloc((objc-3) * sizeof(char *));
     for (i = 4; i < objc; i++) {
 	argv[i-4] = Tcl_GetString(objv[i]);
     }
@@ -746,7 +746,7 @@ TestintobjCmd(
 	    return TCL_ERROR;
 	}
 	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		((wideValue == WIDE_MAX)? "1" : "0"), TCL_INDEX_NONE);
+		((wideValue == WIDE_MAX)? "1" : "0"), -1);
     } else if (strcmp(subCmd, "get") == 0) {
 	if (objc != 3) {
 	    goto wrongNumArgs;
@@ -762,7 +762,7 @@ TestintobjCmd(
 	if (CheckIfVarUnset(interp, varPtr,varIndex)) {
 	    return TCL_ERROR;
 	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), TCL_INDEX_NONE);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), -1);
     } else if (strcmp(subCmd, "inttoobigtest") == 0) {
 	/*
 	 * If long ints have more bits than ints on this platform, verify that
@@ -775,7 +775,7 @@ TestintobjCmd(
 	    goto wrongNumArgs;
 	}
 #if (INT_MAX == LONG_MAX)   /* int is same size as long int */
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_INDEX_NONE);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
 #else
 	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
 	    Tcl_SetWideIntObj(varPtr[varIndex], LONG_MAX);
@@ -784,10 +784,10 @@ TestintobjCmd(
 	}
 	if (Tcl_GetIntFromObj(interp, varPtr[varIndex], &i) != TCL_OK) {
 	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", TCL_INDEX_NONE);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
 	    return TCL_OK;
 	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", TCL_INDEX_NONE);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", -1);
 #endif
     } else if (strcmp(subCmd, "mult10") == 0) {
 	if (objc != 3) {
@@ -1112,7 +1112,7 @@ TestobjCmd(
 	    const char *typeName;
 
 	    if (objv[2]->typePtr == NULL) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", TCL_INDEX_NONE));
+		Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
 	    } else {
 		typeName = objv[2]->typePtr->name;
 		if (!strcmp(typeName, "utf32string"))
@@ -1120,7 +1120,7 @@ TestobjCmd(
 #ifndef TCL_WIDE_INT_IS_LONG
 	    else if (!strcmp(typeName, "wideInt")) typeName = "int";
 #endif
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, TCL_INDEX_NONE));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeName, -1));
 	    }
 	}
 	return TCL_OK;
@@ -1214,15 +1214,15 @@ TestobjCmd(
 	    goto wrongNumArgs;
 	}
 	if (varPtr[varIndex]->typePtr == NULL) { /* a string! */
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", TCL_INDEX_NONE);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", -1);
 #ifndef TCL_WIDE_INT_IS_LONG
 	} else if (!strcmp(varPtr[varIndex]->typePtr->name, "wideInt")) {
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "int", TCL_INDEX_NONE);
+		    "int", -1);
 #endif
 	} else {
 	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    varPtr[varIndex]->typePtr->name, TCL_INDEX_NONE);
+		    varPtr[varIndex]->typePtr->name, -1);
 	}
 	break;
     default:
@@ -1353,7 +1353,7 @@ TeststringobjCmd(
 	    if (CheckIfVarUnset(interp, varPtr, varIndex)) {
 		return TCL_ERROR;
 	    }
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), TCL_INDEX_NONE);
+	    Tcl_AppendToObj(Tcl_GetObjResult(interp), Tcl_GetString(varPtr[varIndex]), -1);
 	    break;
 	case 4:				/* length */
 	    if (objc != 3) {
@@ -1373,10 +1373,10 @@ TeststringobjCmd(
 		    strPtr = (String *)varPtr[varIndex]->internalRep.twoPtrValue.ptr1;
 		    length = (int) strPtr->allocated;
 		} else {
-		    length = -1;
+		    length = TCL_INDEX_NONE;
 		}
 	    } else {
-		length = -1;
+		length = TCL_INDEX_NONE;
 	    }
 	    Tcl_SetWideIntObj(Tcl_GetObjResult(interp), length);
 	    break;
@@ -1431,10 +1431,10 @@ TeststringobjCmd(
 		    strPtr = (String *)varPtr[varIndex]->internalRep.twoPtrValue.ptr1;
 		    length = strPtr->maxChars;
 		} else {
-		    length = -1;
+		    length = TCL_INDEX_NONE;
 		}
 	    } else {
-		length = -1;
+		length = TCL_INDEX_NONE;
 	    }
 	    Tcl_SetWideIntObj(Tcl_GetObjResult(interp), length);
 	    break;
@@ -1474,7 +1474,7 @@ TeststringobjCmd(
 	    }
 	    if (length == TCL_INDEX_NONE) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"index value out of range", TCL_INDEX_NONE));
+			"index value out of range", -1));
 		return TCL_ERROR;
 	    }
 
@@ -1505,7 +1505,7 @@ TeststringobjCmd(
 	    }
 	    if (length == TCL_INDEX_NONE) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"index value out of range", TCL_INDEX_NONE));
+			"index value out of range", -1));
 		return TCL_ERROR;
 	    }
 
@@ -1599,7 +1599,7 @@ GetVariableIndex(
     }
     if (index == TCL_INDEX_NONE) {
 	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", TCL_INDEX_NONE);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", -1);
 	return TCL_ERROR;
     }
 
@@ -1634,9 +1634,9 @@ CheckIfVarUnset(
     if (varPtr[varIndex] == NULL) {
 	char buf[32 + TCL_INTEGER_SPACE];
 
-	snprintf(buf, sizeof(buf), "variable %d is unset (NULL)", varIndex);
+	snprintf(buf, sizeof(buf), "variable %" TCL_SIZE_MODIFIER "d is unset (NULL)", varIndex);
 	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, TCL_INDEX_NONE);
+	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
 	return 1;
     }
     return 0;
-- 
cgit v0.12


From 36cebb89fe04bab244acd87f76950ec68ec3b946 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 11 May 2023 22:20:17 +0000
Subject: Use 'attempt'-functions for libtommath, when built into Tcl

---
 generic/tclTomMathDecls.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 009f914..b4ab607 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -35,11 +35,11 @@
 /* Define custom memory allocation for libtommath */
 
 /* MODULE_SCOPE void* TclBNAlloc( size_t ); */
-#define TclBNAlloc(s) ((void*)ckalloc((size_t)(s)))
+#define TclBNAlloc(s) ((void*)attemptckalloc((size_t)(s)))
 /* MODULE_SCOPE void* TclBNCalloc( size_t, size_t ); */
-#define TclBNCalloc(m,s) memset(ckalloc((size_t)(m)*(size_t)(s)),0,(size_t)(m)*(size_t)(s))
+#define TclBNCalloc(m,s) memset(attemptckalloc((size_t)(m)*(size_t)(s)),0,(size_t)(m)*(size_t)(s))
 /* MODULE_SCOPE void* TclBNRealloc( void*, size_t ); */
-#define TclBNRealloc(x,s) ((void*)ckrealloc((char*)(x),(size_t)(s)))
+#define TclBNRealloc(x,s) ((void*)attemptckrealloc((char*)(x),(size_t)(s)))
 /* MODULE_SCOPE void  TclBNFree( void* ); */
 #define TclBNFree(x) (ckfree((char*)(x)))
 
@@ -48,9 +48,9 @@
 #undef MP_REALLOC
 #undef MP_FREE
 #define MP_MALLOC(size)                   TclBNAlloc(size)
-#define MP_CALLOC(nmemb, size)            TclBNCalloc(nmemb, size)
-#define MP_REALLOC(mem, oldsize, newsize) TclBNRealloc(mem, newsize)
-#define MP_FREE(mem, size)                TclBNFree(mem)
+#define MP_CALLOC(nmemb, size)            TclBNCalloc((nmemb), (size))
+#define MP_REALLOC(mem, oldsize, newsize) TclBNRealloc((mem), ((void)(oldsize), (newsize)))
+#define MP_FREE(mem, size)                TclBNFree(((void)(size), (mem)))
 
 #ifndef MODULE_SCOPE
 #   ifdef __cplusplus
-- 
cgit v0.12


From 062f4d052949b2cd7d7a912c8c4980913a8d6f5b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 15 May 2023 11:15:28 +0000
Subject: ckalloc -> attemptckalloc (since return-value is checked). Fix bug in
 unix/dltest/pkgooa.c, where last NULL-argument was missing

---
 compat/opendir.c     | 2 +-
 unix/dltest/pkgooa.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compat/opendir.c b/compat/opendir.c
index 07ef572..64aedaa 100644
--- a/compat/opendir.c
+++ b/compat/opendir.c
@@ -28,7 +28,7 @@ opendir(
     if ((fd = open(myname, 0, 0)) == -1) {
 	return NULL;
     }
-    dirp = (DIR *) ckalloc(sizeof(DIR));
+    dirp = (DIR *) attemptckalloc(sizeof(DIR));
     if (dirp == NULL) {
 	/* unreachable? */
 	close(fd);
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index 06ff3ac..d731e48 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -110,18 +110,18 @@ Pkgooa_Init(
     }
     if (tclStubsPtr == NULL) {
 	Tcl_AppendResult(interp, "Tcl stubs are not initialized, "
-		"did you compile using -DUSE_TCL_STUBS? ");
+		"did you compile using -DUSE_TCL_STUBS? ", NULL);
 	return TCL_ERROR;
     }
     if (Tcl_OOInitStubs(interp) == NULL) {
 	return TCL_ERROR;
     }
     if (tclOOStubsPtr == NULL) {
-	Tcl_AppendResult(interp, "TclOO stubs are not initialized");
+	Tcl_AppendResult(interp, "TclOO stubs are not initialized", NULL);
 	return TCL_ERROR;
     }
     if (tclOOIntStubsPtr == NULL) {
-	Tcl_AppendResult(interp, "TclOO internal stubs are not initialized");
+	Tcl_AppendResult(interp, "TclOO internal stubs are not initialized", NULL);
 	return TCL_ERROR;
     }
 
-- 
cgit v0.12


From db43c8cbed9e1d40d644e2ecb9112606d4a528bd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 15 May 2023 11:43:15 +0000
Subject: One more ckalloc -> attemptckalloc (in compat/waitpid.c), since we
 can handle the error.

---
 compat/waitpid.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/compat/waitpid.c b/compat/waitpid.c
index 6f43934..e41361b 100644
--- a/compat/waitpid.c
+++ b/compat/waitpid.c
@@ -156,7 +156,11 @@ waitpid(
 		goto waitAgain;
 	    }
 	}
-	waitPtr = (WaitInfo *) ckalloc(sizeof(WaitInfo));
+	waitPtr = (WaitInfo *) attemptckalloc(sizeof(WaitInfo));
+	if (!waitPtr) {
+	    errno = ENOMEM;
+	    return -1;
+	}
 	waitPtr->pid = result;
 	waitPtr->status = status;
 	waitPtr->nextPtr = deadList;
-- 
cgit v0.12


From 45dd8baf7657f116a83f9bf84c890fb7e0d6937a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 15 May 2023 15:44:34 +0000
Subject: No need to init string rep, if we throw away the object immediately

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

diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 9791cb3..a295e41 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2091,9 +2091,9 @@ ParseLexeme(
 	if (end < start + numBytes && !TclIsBareword(*end)) {
 
 	number:
-	    TclInitStringRep(literal, start, end-start);
 	    *lexemePtr = NUMBER;
 	    if (literalPtr) {
+		TclInitStringRep(literal, start, end-start);
 		*literalPtr = literal;
 	    } else {
 		Tcl_DecrRefCount(literal);
@@ -2165,7 +2165,7 @@ ParseLexeme(
     }
     *lexemePtr = BAREWORD;
     if (literalPtr) {
-	Tcl_SetStringObj(literal, start, (int) (end-start));
+	Tcl_SetStringObj(literal, start, end-start);
 	*literalPtr = literal;
     } else {
 	Tcl_DecrRefCount(literal);
-- 
cgit v0.12


From 4db805463e61965d5e4093a8481fa83f797d7085 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 15 May 2023 15:45:57 +0000
Subject: Backport test improvements from 9.0

---
 generic/tclTest.c            | 43 +++++++++++++++++++++++++++++--------------
 generic/tclTestObj.c         |  2 +-
 generic/tclTestProcBodyObj.c |  6 +++---
 generic/tclThreadTest.c      |  8 ++++----
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 6ab1979..ef9997a 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1020,7 +1020,7 @@ AsyncHandlerProc(
 
     TclFormatInt(string, code);
     listArgv[0] = asyncPtr->command;
-    listArgv[1] = Tcl_GetString(Tcl_GetObjResult(interp));
+    listArgv[1] = Tcl_GetStringResult(interp);
     listArgv[2] = string;
     listArgv[3] = NULL;
     cmd = Tcl_Merge(3, listArgv);
@@ -1116,20 +1116,33 @@ TestcmdinfoObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])      /* Argument objects. */
 {
+    static const char *const subcmds[] = {
+	   "create", "delete", "get", "modify", NULL
+    };
+    enum options {
+	CMDINFO_CREATE, CMDINFO_DELETE, CMDINFO_GET, CMDINFO_MODIFY
+    } idx;
     Tcl_CmdInfo info;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "command arg");
 	return TCL_ERROR;
     }
-    if (strcmp(Tcl_GetString(objv[1]), "create") == 0) {
-	Tcl_CreateCommand(interp, Tcl_GetString(objv[2]), CmdProc1, (void *) "original",
-		CmdDelProc1);
-    } else if (strcmp(Tcl_GetString(objv[1]), "delete") == 0) {
+    if (Tcl_GetIndexFromObj(interp, objv[1], subcmds, "option", 0,
+	    &idx) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    switch (idx) {
+    case CMDINFO_CREATE:
+	Tcl_CreateCommand(interp, Tcl_GetString(objv[2]), CmdProc1,
+		(void *)"original", CmdDelProc1);
+	break;
+    case CMDINFO_DELETE:
 	Tcl_DStringInit(&delString);
 	Tcl_DeleteCommand(interp, Tcl_GetString(objv[2]));
 	Tcl_DStringResult(interp, &delString);
-    } else if (strcmp(Tcl_GetString(objv[1]), "get") == 0) {
+	break;
+    case CMDINFO_GET:
 	if (Tcl_GetCommandInfo(interp, Tcl_GetString(objv[2]), &info) ==0) {
 	    Tcl_AppendResult(interp, "??", NULL);
 	    return TCL_OK;
@@ -1153,12 +1166,17 @@ TestcmdinfoObjCmd(
 	    Tcl_AppendResult(interp, " unknown", NULL);
 	}
 	Tcl_AppendResult(interp, " ", info.namespacePtr->fullName, NULL);
-	if (info.isNativeObjectProc) {
+	if (info.isNativeObjectProc == 0) {
+	    Tcl_AppendResult(interp, " stringProc", NULL);
+	} else if (info.isNativeObjectProc == 1) {
 	    Tcl_AppendResult(interp, " nativeObjectProc", NULL);
 	} else {
-	    Tcl_AppendResult(interp, " stringProc", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("Invalid isNativeObjectProc value %d",
+		    info.isNativeObjectProc));
+	    return TCL_ERROR;
 	}
-    } else if (strcmp(Tcl_GetString(objv[1]), "modify") == 0) {
+	break;
+    case CMDINFO_MODIFY:
 	info.proc = CmdProc2;
 	info.clientData = (void *) "new_command_data";
 	info.objProc = NULL;
@@ -1170,10 +1188,7 @@ TestcmdinfoObjCmd(
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(1));
 	}
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),
-		"\": must be create, delete, get, or modify", NULL);
-	return TCL_ERROR;
+	break;
     }
 
     return TCL_OK;
@@ -7627,7 +7642,7 @@ TestUtfNextCmd(
     }
 	bytes = Tcl_GetStringFromObj(objv[1], &numBytes);
 
-    if (numBytes + 4U > sizeof(buffer)) {
+    if ((size_t)numBytes > sizeof(buffer) - 4) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"\"testutfnext\" can only handle %" TCL_Z_MODIFIER "u bytes",
 		sizeof(buffer) - 4));
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
index 7aeb329..3b21eaf 100644
--- a/generic/tclTestObj.c
+++ b/generic/tclTestObj.c
@@ -1631,7 +1631,7 @@ CheckIfVarUnset(
     Tcl_Obj ** varPtr,
     Tcl_Size varIndex)		/* Index of the test variable to check. */
 {
-    if (varPtr[varIndex] == NULL) {
+    if (varIndex < 0 || varPtr[varIndex] == NULL) {
 	char buf[32 + TCL_INTEGER_SPACE];
 
 	snprintf(buf, sizeof(buf), "variable %" TCL_SIZE_MODIFIER "d is unset (NULL)", varIndex);
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index b6dbc3f..07800ca 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -35,7 +35,7 @@ static const char checkCommand[] = "check";
  * procs
  */
 
-typedef struct CmdTable {
+typedef struct {
     const char *cmdName;		/* command name */
     Tcl_ObjCmdProc *proc;	/* command proc */
     int exportIt;		/* if 1, export the command */
@@ -188,7 +188,7 @@ ProcBodyTestInitInternal(
 	}
     }
 
-    return Tcl_PkgProvide(interp, packageName, packageVersion);
+    return Tcl_PkgProvideEx(interp, packageName, packageVersion, NULL);
 }
 
 /*
@@ -337,7 +337,7 @@ ProcBodyTestCheckObjCmd(
 	return TCL_ERROR;
     }
 
-    version = Tcl_PkgPresent(interp, packageName, packageVersion, 1);
+    version = Tcl_PkgPresentEx(interp, packageName, packageVersion, 1, NULL);
     Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
 	    strcmp(version, packageVersion) == 0));
     return TCL_OK;
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index 44d2b0e..99f9838 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -656,10 +656,10 @@ ThreadErrorProc(
     errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY);
     if (errorProcString == NULL) {
 	errChannel = Tcl_GetStdChannel(TCL_STDERR);
-	Tcl_WriteChars(errChannel, "Error from thread ", TCL_INDEX_NONE);
-	Tcl_WriteChars(errChannel, buf, TCL_INDEX_NONE);
+	Tcl_WriteChars(errChannel, "Error from thread ", -1);
+	Tcl_WriteChars(errChannel, buf, -1);
 	Tcl_WriteChars(errChannel, "\n", 1);
-	Tcl_WriteChars(errChannel, errorInfo, TCL_INDEX_NONE);
+	Tcl_WriteChars(errChannel, errorInfo, -1);
 	Tcl_WriteChars(errChannel, "\n", 1);
     } else {
 	argv[0] = errorProcString;
@@ -984,7 +984,7 @@ ThreadCancel(
     Tcl_MutexUnlock(&threadMutex);
     Tcl_ResetResult(interp);
     return Tcl_CancelEval(tsdPtr->interp,
-    	(result != NULL) ? Tcl_NewStringObj(result, TCL_INDEX_NONE) : NULL, 0, flags);
+    	(result != NULL) ? Tcl_NewStringObj(result, -1) : NULL, 0, flags);
 }
 
 /*
-- 
cgit v0.12


From ebcc04616c592e0b368e687f4ed1d5dfc8900c13 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 16 May 2023 06:05:22 +0000
Subject: More int -> Tcl_Size (in tclInt.h)

---
 generic/tclInt.h      | 147 +++++++++++++++++++++++++-------------------------
 generic/tclStubInit.c |   2 +
 2 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/generic/tclInt.h b/generic/tclInt.h
index d3b2548..bc16cb2 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -232,9 +232,9 @@ typedef struct Tcl_Ensemble Tcl_Ensemble;
 typedef struct NamespacePathEntry NamespacePathEntry;
 
 /*
- * Special hash table for variables: this is just a Tcl_HashTable with an nsPtr
- * field added at the end: in this way variables can find their namespace
- * without having to copy a pointer in their struct: they can access it via
+ * Special hashtable for variables:  This is just a Tcl_HashTable with a nsPtr
+ * field added at the end, so that variables can find their namespace
+ * without having to copy a pointer in their struct by accessing them via
  * their hPtr->tablePtr.
  */
 
@@ -881,19 +881,22 @@ typedef struct VarInHash {
  * Macros for direct variable access by TEBC.
  */
 
-#define TclIsVarDirectReadable(varPtr) \
-    (   !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_READ)) \
-    &&  (varPtr)->value.objPtr)
+#define TclIsVarTricky(varPtr,trickyFlags)				\
+    ((varPtr)->flags & (VAR_ARRAY|VAR_LINK|trickyFlags))
+
+#define TclIsVarDirectReadable(varPtr)					\
+    (   (!TclIsVarTricky(varPtr,VAR_TRACED_READ))			\
+          && (varPtr)->value.objPtr)
 
 #define TclIsVarDirectWritable(varPtr) \
-    !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_WRITE|VAR_DEAD_HASH))
+    (!TclIsVarTricky(varPtr,VAR_TRACED_WRITE|VAR_DEAD_HASH))
 
 #define TclIsVarDirectUnsettable(varPtr) \
-    !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_READ|VAR_TRACED_WRITE|VAR_TRACED_UNSET|VAR_DEAD_HASH))
+    (!TclIsVarTricky(varPtr,VAR_TRACED_READ|VAR_TRACED_WRITE|VAR_TRACED_UNSET|VAR_DEAD_HASH))
 
 #define TclIsVarDirectModifyable(varPtr) \
-    (   !((varPtr)->flags & (VAR_ARRAY|VAR_LINK|VAR_TRACED_READ|VAR_TRACED_WRITE)) \
-    &&  (varPtr)->value.objPtr)
+    (   (!TclIsVarTricky(varPtr,VAR_TRACED_READ|VAR_TRACED_WRITE))	\
+          &&  (varPtr)->value.objPtr)
 
 #define TclIsVarDirectReadable2(varPtr, arrayPtr) \
     (TclIsVarDirectReadable(varPtr) &&\
@@ -2484,7 +2487,7 @@ typedef struct ListStore {
 		   / sizeof(Tcl_Obj *)))
 /* Memory size needed for a ListStore to hold numSlots_ elements */
 #define LIST_SIZE(numSlots_) \
-	((int)(offsetof(ListStore, slots) + ((numSlots_) * sizeof(Tcl_Obj *))))
+	((Tcl_Size)(offsetof(ListStore, slots) + ((numSlots_) * sizeof(Tcl_Obj *))))
 
 /*
  * ListSpan --
@@ -2573,6 +2576,7 @@ typedef struct ListRep {
     (((objv_) = &ListObjStorePtr(listObj_)->slots[ListObjStart(listObj_)]), \
      (ListObjLength(listObj_, (objc_))))
 
+
 /*
  * Returns 1/0 whether the internal representation (not the Tcl_Obj itself)
  * is shared.  Note by intent this only checks for sharing of ListStore,
@@ -2859,6 +2863,7 @@ typedef struct ProcessGlobalValue {
 #define TCL_PARSE_NO_UNDERSCORE	128
 				/* Reject underscore digit separator */
 
+
 /*
  *----------------------------------------------------------------------
  * Internal convenience macros for manipulating encoding flags. See
@@ -3064,12 +3069,12 @@ struct Tcl_LoadHandle_ {
  */
 
 MODULE_SCOPE void	TclAppendBytesToByteArray(Tcl_Obj *objPtr,
-			    const unsigned char *bytes, int len);
+			    const unsigned char *bytes, Tcl_Size len);
 MODULE_SCOPE int	TclNREvalCmd(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    int flags);
-MODULE_SCOPE void	TclAdvanceContinuations(int *line, int **next,
+MODULE_SCOPE void	TclAdvanceContinuations(Tcl_Size *line, int **next,
 			    int loc);
-MODULE_SCOPE void	TclAdvanceLines(int *line, const char *start,
+MODULE_SCOPE void	TclAdvanceLines(Tcl_Size *line, const char *start,
 			    const char *end);
 MODULE_SCOPE void	TclArgumentEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc, CmdFrame *cf);
@@ -3077,7 +3082,7 @@ MODULE_SCOPE void	TclArgumentRelease(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc);
 MODULE_SCOPE void	TclArgumentBCEnter(Tcl_Interp *interp,
 			    Tcl_Obj *objv[], int objc,
-			    void *codePtr, CmdFrame *cfPtr, int cmd, int pc);
+			    void *codePtr, CmdFrame *cfPtr, int cmd, Tcl_Size pc);
 MODULE_SCOPE void	TclArgumentBCRelease(Tcl_Interp *interp,
 			    CmdFrame *cfPtr);
 MODULE_SCOPE void	TclArgumentGet(Tcl_Interp *interp, Tcl_Obj *obj,
@@ -3087,8 +3092,8 @@ MODULE_SCOPE int	TclAsyncNotifier(int sigNumber, Tcl_ThreadId threadId,
 MODULE_SCOPE void	TclAsyncMarkFromNotifier(void);
 MODULE_SCOPE double	TclBignumToDouble(const void *bignum);
 MODULE_SCOPE int	TclByteArrayMatch(const unsigned char *string,
-			    int strLen, const unsigned char *pattern,
-			    int ptnLen, int flags);
+			    Tcl_Size strLen, const unsigned char *pattern,
+			    Tcl_Size ptnLen, int flags);
 MODULE_SCOPE double	TclCeil(const void *a);
 MODULE_SCOPE void	TclChannelPreserve(Tcl_Channel chan);
 MODULE_SCOPE void	TclChannelRelease(Tcl_Channel chan);
@@ -3103,14 +3108,14 @@ MODULE_SCOPE Tcl_ObjCmdProc TclChannelNamesCmd;
 MODULE_SCOPE Tcl_NRPostProc TclClearRootEnsemble;
 MODULE_SCOPE int	TclCompareTwoNumbers(Tcl_Obj *valuePtr,
 			    Tcl_Obj *value2Ptr);
-MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, int num,
+MODULE_SCOPE ContLineLoc *TclContinuationsEnter(Tcl_Obj *objPtr, Tcl_Size num,
 			    int *loc);
 MODULE_SCOPE void	TclContinuationsEnterDerived(Tcl_Obj *objPtr,
 			    int start, int *clNext);
 MODULE_SCOPE ContLineLoc *TclContinuationsGet(Tcl_Obj *objPtr);
 MODULE_SCOPE void	TclContinuationsCopy(Tcl_Obj *objPtr,
 			    Tcl_Obj *originObjPtr);
-MODULE_SCOPE int	TclConvertElement(const char *src, int length,
+MODULE_SCOPE Tcl_Size	TclConvertElement(const char *src, Tcl_Size length,
 			    char *dst, int flags);
 MODULE_SCOPE Tcl_Command TclCreateObjCommandInNs(Tcl_Interp *interp,
 			    const char *cmdName, Tcl_Namespace *nsPtr,
@@ -3122,12 +3127,12 @@ MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(Tcl_Interp *interp,
 MODULE_SCOPE void	TclDeleteNamespaceVars(Namespace *nsPtr);
 MODULE_SCOPE void	TclDeleteNamespaceChildren(Namespace *nsPtr);
 MODULE_SCOPE int	TclFindDictElement(Tcl_Interp *interp,
-			    const char *dict, int dictLength,
+			    const char *dict, Tcl_Size dictLength,
 			    const char **elementPtr, const char **nextPtr,
-			    int *sizePtr, int *literalPtr);
+			    Tcl_Size *sizePtr, int *literalPtr);
 /* TIP #280 - Modified token based evaluation, with line information. */
 MODULE_SCOPE int	TclEvalEx(Tcl_Interp *interp, const char *script,
-			    int numBytes, int flags, int line,
+			    Tcl_Size numBytes, int flags, Tcl_Size line,
 			    int *clNextOuter, const char *outerScript);
 MODULE_SCOPE Tcl_ObjCmdProc TclFileAttrsCmd;
 MODULE_SCOPE Tcl_ObjCmdProc TclFileCopyCmd;
@@ -3149,7 +3154,7 @@ MODULE_SCOPE char *	TclDStringAppendObj(Tcl_DString *dsPtr,
 MODULE_SCOPE char *	TclDStringAppendDString(Tcl_DString *dsPtr,
 			    Tcl_DString *toAppendPtr);
 MODULE_SCOPE Tcl_Obj *const *TclFetchEnsembleRoot(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, int objc, int *objcPtr);
+			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size *objcPtr);
 MODULE_SCOPE Tcl_Obj *const *TclEnsembleGetRewriteValues(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Namespace *TclEnsureNamespace(Tcl_Interp *interp,
 			    Tcl_Namespace *namespacePtr);
@@ -3233,7 +3238,7 @@ MODULE_SCOPE void	TclInitObjSubsystem(void);
 MODULE_SCOPE int	TclInterpReady(Tcl_Interp *interp);
 MODULE_SCOPE int	TclIsDigitProc(int byte);
 MODULE_SCOPE int	TclIsBareword(int byte);
-MODULE_SCOPE Tcl_Obj *	TclJoinPath(int elements, Tcl_Obj * const objv[],
+MODULE_SCOPE Tcl_Obj *	TclJoinPath(Tcl_Size elements, Tcl_Obj * const objv[],
 			    int forceRelative);
 MODULE_SCOPE int	MakeTildeRelativePath(Tcl_Interp *interp, const char *user,
 			    const char *subPath, Tcl_DString *dsPtr);
@@ -3246,25 +3251,25 @@ MODULE_SCOPE void	TclLimitRemoveAllHandlers(Tcl_Interp *interp);
 MODULE_SCOPE Tcl_Obj *	TclLindexList(Tcl_Interp *interp,
 			    Tcl_Obj *listPtr, Tcl_Obj *argPtr);
 MODULE_SCOPE Tcl_Obj *	TclLindexFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    int indexCount, Tcl_Obj *const indexArray[]);
+			    Tcl_Size indexCount, Tcl_Obj *const indexArray[]);
 /* TIP #280 */
-MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, int line, int n,
+MODULE_SCOPE void	TclListLines(Tcl_Obj *listObj, Tcl_Size line, int n,
 			    int *lines, Tcl_Obj *const *elems);
 MODULE_SCOPE Tcl_Obj *	TclListObjCopy(Tcl_Interp *interp, Tcl_Obj *listPtr);
 MODULE_SCOPE int	TclListObjAppendElements(Tcl_Interp *interp,
-			    Tcl_Obj *toObj, int elemCount,
+			    Tcl_Obj *toObj, Tcl_Size elemCount,
 			    Tcl_Obj *const elemObjv[]);
 MODULE_SCOPE Tcl_Obj *	TclListObjRange(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    int fromIdx, int toIdx);
+			    Tcl_Size fromIdx, Tcl_Size toIdx);
 MODULE_SCOPE Tcl_Obj *	TclLsetList(Tcl_Interp *interp, Tcl_Obj *listPtr,
 			    Tcl_Obj *indexPtr, Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Obj *	TclLsetFlat(Tcl_Interp *interp, Tcl_Obj *listPtr,
-			    int indexCount, Tcl_Obj *const indexArray[],
+			    Tcl_Size indexCount, Tcl_Obj *const indexArray[],
 			    Tcl_Obj *valuePtr);
 MODULE_SCOPE Tcl_Command TclMakeEnsemble(Tcl_Interp *interp, const char *name,
 			    const EnsembleImplMap map[]);
 MODULE_SCOPE int TclMakeSafe(Tcl_Interp *interp);
-MODULE_SCOPE int	TclMaxListLength(const char *bytes, int numBytes,
+MODULE_SCOPE Tcl_Size	TclMaxListLength(const char *bytes, Tcl_Size numBytes,
 			    const char **endPtr);
 MODULE_SCOPE int	TclMergeReturnOptions(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], Tcl_Obj **optionsPtrPtr,
@@ -3282,15 +3287,15 @@ MODULE_SCOPE int	TclObjInvokeNamespace(Tcl_Interp *interp,
 MODULE_SCOPE int	TclObjUnsetVar2(Tcl_Interp *interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags);
 MODULE_SCOPE int	TclParseBackslash(const char *src,
-			    int numBytes, int *readPtr, char *dst);
-MODULE_SCOPE int	TclParseHex(const char *src, int numBytes,
+			    Tcl_Size numBytes, Tcl_Size *readPtr, char *dst);
+MODULE_SCOPE int	TclParseHex(const char *src, Tcl_Size numBytes,
 			    int *resultPtr);
 MODULE_SCOPE int	TclParseNumber(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    const char *expected, const char *bytes,
-			    int numBytes, const char **endPtrPtr, int flags);
+			    Tcl_Size numBytes, const char **endPtrPtr, int flags);
 MODULE_SCOPE void	TclParseInit(Tcl_Interp *interp, const char *string,
-			    int numBytes, Tcl_Parse *parsePtr);
-MODULE_SCOPE int	TclParseAllWhiteSpace(const char *src, int numBytes);
+			    Tcl_Size numBytes, Tcl_Parse *parsePtr);
+MODULE_SCOPE Tcl_Size	TclParseAllWhiteSpace(const char *src, Tcl_Size numBytes);
 MODULE_SCOPE int	TclProcessReturn(Tcl_Interp *interp,
 			    int code, int level, Tcl_Obj *returnOpts);
 MODULE_SCOPE int	TclpObjLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf);
@@ -3298,7 +3303,7 @@ MODULE_SCOPE Tcl_Obj *	TclpTempFileName(void);
 MODULE_SCOPE Tcl_Obj *  TclpTempFileNameForLibrary(Tcl_Interp *interp,
 			    Tcl_Obj* pathPtr);
 MODULE_SCOPE Tcl_Obj *	TclNewFSPathObj(Tcl_Obj *dirPtr, const char *addStrRep,
-			    int len);
+			    Tcl_Size len);
 MODULE_SCOPE void	TclpAlertNotifier(void *clientData);
 MODULE_SCOPE void *TclpNotifierData(void);
 MODULE_SCOPE void	TclpServiceModeHook(int mode);
@@ -3325,7 +3330,7 @@ MODULE_SCOPE int	TclCreateSocketAddress(Tcl_Interp *interp,
 MODULE_SCOPE int	TclpThreadCreate(Tcl_ThreadId *idPtr,
 			    Tcl_ThreadCreateProc *proc, void *clientData,
 			    int stackSize, int flags);
-MODULE_SCOPE int	TclpFindVariable(const char *name, int *lengthPtr);
+MODULE_SCOPE Tcl_Size	TclpFindVariable(const char *name, Tcl_Size *lengthPtr);
 MODULE_SCOPE void	TclpInitLibraryPath(char **valuePtr,
 			    TCL_HASH_TYPE *lengthPtr, Tcl_Encoding *encodingPtr);
 MODULE_SCOPE void	TclpInitLock(void);
@@ -3340,15 +3345,15 @@ MODULE_SCOPE int	TclpMatchFiles(Tcl_Interp *interp, char *separators,
 MODULE_SCOPE int	TclpObjNormalizePath(Tcl_Interp *interp,
 			    Tcl_Obj *pathPtr, int nextCheckpoint);
 MODULE_SCOPE void	TclpNativeJoinPath(Tcl_Obj *prefix, const char *joining);
-MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, int *lenPtr);
+MODULE_SCOPE Tcl_Obj *	TclpNativeSplitPath(Tcl_Obj *pathPtr, Tcl_Size *lenPtr);
 MODULE_SCOPE Tcl_PathType TclpGetNativePathType(Tcl_Obj *pathPtr,
-			    int *driveNameLengthPtr, Tcl_Obj **driveNameRef);
+			    Tcl_Size *driveNameLengthPtr, Tcl_Obj **driveNameRef);
 MODULE_SCOPE int	TclCrossFilesystemCopy(Tcl_Interp *interp,
 			    Tcl_Obj *source, Tcl_Obj *target);
 MODULE_SCOPE int	TclpMatchInDirectory(Tcl_Interp *interp,
 			    Tcl_Obj *resultPtr, Tcl_Obj *pathPtr,
 			    const char *pattern, Tcl_GlobTypeData *types);
-MODULE_SCOPE void *TclpGetNativeCwd(void *clientData);
+MODULE_SCOPE void	*TclpGetNativeCwd(void *clientData);
 MODULE_SCOPE Tcl_FSDupInternalRepProc TclNativeDupInternalRep;
 MODULE_SCOPE Tcl_Obj *	TclpObjLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr,
 			    int linkType);
@@ -3373,9 +3378,9 @@ MODULE_SCOPE void	TclRememberJoinableThread(Tcl_ThreadId id);
 MODULE_SCOPE void	TclRememberMutex(Tcl_Mutex *mutex);
 MODULE_SCOPE void	TclRemoveScriptLimitCallbacks(Tcl_Interp *interp);
 MODULE_SCOPE int	TclReToGlob(Tcl_Interp *interp, const char *reStr,
-			    int reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
+			    Tcl_Size reStrLen, Tcl_DString *dsPtr, int *flagsPtr,
 			    int *quantifiersFoundPtr);
-MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, int length,
+MODULE_SCOPE TCL_HASH_TYPE TclScanElement(const char *string, Tcl_Size length,
 			    char *flagPtr);
 MODULE_SCOPE void	TclSetBgErrorHandler(Tcl_Interp *interp,
 			    Tcl_Obj *cmdPrefix);
@@ -3390,37 +3395,37 @@ MODULE_SCOPE void	TclSetProcessGlobalValue(ProcessGlobalValue *pgvPtr,
 			    Tcl_Obj *newValue, Tcl_Encoding encoding);
 MODULE_SCOPE void	TclSignalExitThread(Tcl_ThreadId id, int result);
 MODULE_SCOPE void	TclSpellFix(Tcl_Interp *interp,
-			    Tcl_Obj *const *objv, int objc, int subIdx,
+			    Tcl_Obj *const *objv, Tcl_Size objc, Tcl_Size subIdx,
 			    Tcl_Obj *bad, Tcl_Obj *fix);
 MODULE_SCOPE void *	TclStackRealloc(Tcl_Interp *interp, void *ptr,
-			    int numBytes);
+			    Tcl_Size numBytes);
 typedef int (*memCmpFn_t)(const void*, const void*, size_t);
 MODULE_SCOPE int	TclStringCmp(Tcl_Obj *value1Ptr, Tcl_Obj *value2Ptr,
-			    int checkEq, int nocase, int reqlength);
+			    int checkEq, int nocase, Tcl_Size reqlength);
 MODULE_SCOPE int	TclStringCmpOpts(Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[], int *nocase,
-			    int *reqlength);
-MODULE_SCOPE int	TclStringMatch(const char *str, int strLen,
+			    Tcl_Size *reqlength);
+MODULE_SCOPE int	TclStringMatch(const char *str, Tcl_Size strLen,
 			    const char *pattern, int ptnLen, int flags);
 MODULE_SCOPE int	TclStringMatchObj(Tcl_Obj *stringObj,
 			    Tcl_Obj *patternObj, int flags);
 MODULE_SCOPE void	TclSubstCompile(Tcl_Interp *interp, const char *bytes,
-			    int numBytes, int flags, int line,
+			    Tcl_Size numBytes, int flags, Tcl_Size line,
 			    struct CompileEnv *envPtr);
-MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, int numOpts,
+MODULE_SCOPE int	TclSubstOptions(Tcl_Interp *interp, Tcl_Size numOpts,
 			    Tcl_Obj *const opts[], int *flagPtr);
 MODULE_SCOPE void	TclSubstParse(Tcl_Interp *interp, const char *bytes,
-			    int numBytes, int flags, Tcl_Parse *parsePtr,
+			    Tcl_Size numBytes, int flags, Tcl_Parse *parsePtr,
 			    Tcl_InterpState *statePtr);
 MODULE_SCOPE int	TclSubstTokens(Tcl_Interp *interp, Tcl_Token *tokenPtr,
-			    int count, int *tokensLeftPtr, int line,
+			    Tcl_Size count, int *tokensLeftPtr, Tcl_Size line,
 			    int *clNextOuter, const char *outerScript);
-MODULE_SCOPE int	TclTrim(const char *bytes, int numBytes,
-			    const char *trim, int numTrim, int *trimRight);
-MODULE_SCOPE int	TclTrimLeft(const char *bytes, int numBytes,
-			    const char *trim, int numTrim);
-MODULE_SCOPE int	TclTrimRight(const char *bytes, int numBytes,
-			    const char *trim, int numTrim);
+MODULE_SCOPE Tcl_Size	TclTrim(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim, Tcl_Size *trimRight);
+MODULE_SCOPE Tcl_Size	TclTrimLeft(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim);
+MODULE_SCOPE Tcl_Size	TclTrimRight(const char *bytes, Tcl_Size numBytes,
+			    const char *trim, Tcl_Size numTrim);
 MODULE_SCOPE const char*TclGetCommandTypeName(Tcl_Command command);
 MODULE_SCOPE void	TclRegisterCommandTypeName(
 			    Tcl_ObjCmdProc *implementationProc,
@@ -3474,7 +3479,7 @@ MODULE_SCOPE void	TclpThreadDeleteKey(void *keyPtr);
 MODULE_SCOPE void	TclpThreadSetGlobalTSD(void *tsdKeyPtr, void *ptr);
 MODULE_SCOPE void *	TclpThreadGetGlobalTSD(void *tsdKeyPtr);
 MODULE_SCOPE void	TclErrorStackResetIf(Tcl_Interp *interp,
-			    const char *msg, int length);
+			    const char *msg, Tcl_Size length);
 /* Tip 430 */
 MODULE_SCOPE int    TclZipfs_Init(Tcl_Interp *interp);
 
@@ -3564,7 +3569,7 @@ MODULE_SCOPE int	TclDictWithFinish(Tcl_Interp *interp, Var *varPtr,
 			    Tcl_Obj *part2Ptr, int index, int pathc,
 			    Tcl_Obj *const pathv[], Tcl_Obj *keysPtr);
 MODULE_SCOPE Tcl_Obj *	TclDictWithInit(Tcl_Interp *interp, Tcl_Obj *dictPtr,
-			    int pathc, Tcl_Obj *const pathv[]);
+			    Tcl_Size pathc, Tcl_Obj *const pathv[]);
 MODULE_SCOPE Tcl_ObjCmdProc Tcl_DisassembleObjCmd;
 
 /* Assemble command function */
@@ -4087,16 +4092,16 @@ MODULE_SCOPE int	TclCompileAssembleCmd(Tcl_Interp *interp,
  * candidates for public interface.
  */
 
-MODULE_SCOPE Tcl_Obj *	TclStringCat(Tcl_Interp *interp, int objc,
+MODULE_SCOPE Tcl_Obj *	TclStringCat(Tcl_Interp *interp, Tcl_Size objc,
 			    Tcl_Obj *const objv[], int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    int start);
+			    Tcl_Size start);
 MODULE_SCOPE Tcl_Obj *	TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
-			    int last);
+			    Tcl_Size last);
 MODULE_SCOPE Tcl_Obj *	TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int count, int flags);
+			    Tcl_Size count, int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReplace(Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int first, int count, Tcl_Obj *insertPtr,
+			    Tcl_Size first, Tcl_Size count, Tcl_Obj *insertPtr,
 			    int flags);
 MODULE_SCOPE Tcl_Obj *	TclStringReverse(Tcl_Obj *objPtr, int flags);
 
@@ -4211,7 +4216,7 @@ MODULE_SCOPE Tcl_Obj *	TclGetArrayDefault(Var *arrayPtr);
 
 MODULE_SCOPE int	TclIndexEncode(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			    int before, int after, int *indexPtr);
-MODULE_SCOPE int	TclIndexDecode(int encoded, int endValue);
+MODULE_SCOPE Tcl_Size	TclIndexDecode(int encoded, Tcl_Size endValue);
 
 /* Constants used in index value encoding routines. */
 #define TCL_INDEX_END           ((Tcl_Size)-2)
@@ -4464,9 +4469,6 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
 # define TclDecrRefCount(objPtr) \
     Tcl_DbDecrRefCount(objPtr, __FILE__, __LINE__)
 
-# define TclNewListObjDirect(objc, objv) \
-    TclDbNewListObjDirect(objc, objv, __FILE__, __LINE__)
-
 #undef USE_THREAD_ALLOC
 #endif /* TCL_MEM_DEBUG */
 
@@ -5191,7 +5193,7 @@ typedef struct NRE_callback {
 #define TCLNR_FREE(interp, ptr)  TclSmallFreeEx((interp), (ptr))
 #else
 #define TCLNR_ALLOC(interp, ptr) \
-    ((ptr) = ((void *)ckalloc(sizeof(NRE_callback))))
+    ((ptr) = (void *)ckalloc(sizeof(NRE_callback)))
 #define TCLNR_FREE(interp, ptr)  ckfree(ptr)
 #endif
 
@@ -5204,11 +5206,10 @@ typedef struct NRE_callback {
 #include "tclIntDecls.h"
 #include "tclIntPlatDecls.h"
 
-
 #if !defined(USE_TCL_STUBS) && !defined(TCL_MEM_DEBUG)
-#define Tcl_AttemptAlloc(size)        TclpAlloc(size)
-#define Tcl_AttemptRealloc(ptr, size) TclpRealloc((ptr), (size))
-#define Tcl_Free(ptr)                 TclpFree(ptr)
+#define Tcl_AttemptAlloc        TclpAlloc
+#define Tcl_AttemptRealloc      TclpRealloc
+#define Tcl_Free                TclpFree
 #endif
 
 /*
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index e2d52b9..c567736 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -28,6 +28,8 @@
  */
 
 #undef Tcl_Alloc
+#undef Tcl_AttemptAlloc
+#undef Tcl_AttemptRealloc
 #undef Tcl_Free
 #undef Tcl_Realloc
 #undef Tcl_NewBooleanObj
-- 
cgit v0.12


From 4eb91b8e5b59d6af6a2d612f6767f2f62d0cddd2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 16 May 2023 06:07:51 +0000
Subject: Remove some more references to removed ChangeLog

---
 changes                              | 8 ++------
 macosx/Tcl.xcodeproj/project.pbxproj | 2 --
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/changes b/changes
index 009fd08..9bdb8c9 100644
--- a/changes
+++ b/changes
@@ -5282,8 +5282,6 @@ compiles to 0 bytecodes (sofer)
 
 2001-09-13 (new feature)[TIP 56] Tcl_EvalTokensStandard API (sofer)
 
-2001-09-13 (new feature) Old ChangeLog entries => ChangeLog.1999 (hobbs)
-
 2001-09-17 (new feature) compiling with TCL_COMPILE_DEBUG now required to
 enable all compile and execution tracing (sofer)
         *** POTENTIAL INCOMPATIBILITY ***
@@ -5368,8 +5366,6 @@ of the Host: header value
 2002-01-25 (new feature)[496733] socket options -eofchar and -translation
 return read-only values (dejong)
 
-2002-01-28 (new feature) Old ChangeLog entries => ChangeLog.20900 (hobbs)
-
 2002-01-28 (performance enhancement) bytecompiled [regexp] for trivial cases
 that amount to string matching.  Also -nocase and --. (hobbs)
 
@@ -5394,7 +5390,7 @@ errored out. (kupries, sofer)
 
 2002-02-15 (new feature)[TIP 72] support for 64-bit integer values on
 32-bit platforms and ability to work with >2GiB files.  Extends many
-commands.  See ChangeLog and TIP for details.
+commands.  See TIP for details.
 	*** POTENTIAL INCOMPATIBILITY ***
 
 2002-02-22 (bug fix)[476537] Fix panic when loading shared library without
@@ -6070,7 +6066,7 @@ each command/interp validity before executing. (sofer)
 
 2004-04-06 (clean up) refactored Tcl header file #include order.  Might
 create need for changes in extensions that #include private headers.
-Changed source code files should work with older Tcl as well.  See ChangeLog.
+Changed source code files should work with older Tcl as well.
      *** POTENTIAL INCOMPATIBILITY ***
 
 2004-04-07 (bug fix)[920667] install into any Unicode path on Win (hobbs)
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 68b9418..cdc97c6 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -223,7 +223,6 @@
 		F96437C90EF0D4B2003F468E /* tclZlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclZlib.c; sourceTree = "<group>"; };
 		F96437E60EF0D652003F468E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
 		F966C07408F2820D005CB29B /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		F96D3DFA08F272A4004A47F5 /* ChangeLog */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = ChangeLog; sourceTree = "<group>"; };
 		F96D3DFB08F272A4004A47F5 /* changes */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = changes; sourceTree = "<group>"; };
 		F